From f1b1108804062b749915cdebe708b4da178b3526 Mon Sep 17 00:00:00 2001 From: Amine Ben hammou Date: Thu, 1 Aug 2019 12:02:56 +0100 Subject: [PATCH] Remove Doctrine unneeded annotations directory --- build.sh | 3 +++ lib/Doctrine/ConfigurationFactory.php | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/build.sh b/build.sh index 5a842dbac0..1316682050 100755 --- a/build.sh +++ b/build.sh @@ -104,6 +104,9 @@ rm -rf $plugin_name/vendor/swiftmailer/swiftmailer/tests rm -rf $plugin_name/vendor/symfony/translation/Tests rm -rf $plugin_name/vendor/twig/twig/test +# Remove Doctrinne Annotations (no need since generated metadata are packed) +rm -rf $plugin_name/vendor-prefixed/doctrine/annotations + # Remove risky files from 3rd party extensions echo '[BUILD] Removing risky and demo files from vendor libraries' rm -f $plugin_name/vendor/j4mie/idiorm/demo.php diff --git a/lib/Doctrine/ConfigurationFactory.php b/lib/Doctrine/ConfigurationFactory.php index de41022503..e4d1fe83b1 100644 --- a/lib/Doctrine/ConfigurationFactory.php +++ b/lib/Doctrine/ConfigurationFactory.php @@ -7,6 +7,7 @@ use MailPoetVendor\Doctrine\Common\Cache\ArrayCache; use MailPoetVendor\Doctrine\Common\Proxy\AbstractProxyFactory; use MailPoetVendor\Doctrine\ORM\Configuration; use MailPoetVendor\Doctrine\ORM\Mapping\UnderscoreNamingStrategy; +use MailPoetVendor\Doctrine\ORM\Mapping\Driver\PHPDriver; class ConfigurationFactory { const ENTITY_DIR = __DIR__ . '/../Entities'; @@ -42,6 +43,9 @@ class ConfigurationFactory { // (i.e. in dev environment, on production metadata is dumped in the build) if (class_exists(SimpleAnnotationReader::class)) { $configuration->setMetadataDriverImpl($configuration->newDefaultAnnotationDriver([self::ENTITY_DIR])); + } else { + // Should never be called but Doctrine requires having driver set + $configuration->setMetadataDriverImpl(new PHPDriver([])); } }