Merge pull request #780 from doctrine/4.4.x-merge-up-into-5.0.x_V9RvRLEU

Merge release 4.4.2 into 5.0.x

Author: driehle

composer.json

@@ -68,7 +68,7 @@
     },
     "require-dev": {
         "doctrine/coding-standard": "^9.0.0",
-        "doctrine/orm": "^2.10.4",
+        "doctrine/orm": "^2.10.5",
         "jangregor/phpstan-prophecy": "^1.0.0",
         "laminas/laminas-cache-storage-adapter-blackhole": "^2.0.0",
         "laminas/laminas-cache-storage-adapter-memory": "^2.0.0",
@@ -83,6 +83,9 @@
         "predis/predis": "^1.1.9",
         "vimeo/psalm": "^4.16.1"
     },
+    "conflict": {
+        "doctrine/orm": "2.12.0"
+    },
     "suggest": {
         "doctrine/data-fixtures":         "Data Fixtures if you want to generate test data or bootstrap data for your deployments",
         "laminas/laminas-mvc-console":    "^1.1.11 if you want to use the Laminas console libraries"

phpstan.neon

@@ -5,5 +5,6 @@ parameters:
         - src
         - tests
 includes:
+    - vendor/phpstan/phpstan-phpunit/extension.neon
     - vendor/phpstan/phpstan-phpunit/rules.neon
     - vendor/jangregor/phpstan-prophecy/extension.neon

src/Form/Element/Proxy.php

@@ -24,7 +24,6 @@
 use function current;
 use function get_class;
 use function gettype;
-use function interface_exists;
 use function is_callable;
 use function is_object;
 use function is_string;
@@ -594,5 +593,3 @@ protected function loadValueOptions(): void
         $this->valueOptions = $options;
     }
 }
-
-interface_exists(ObjectManager::class);

src/Options/Authentication.php

@@ -12,7 +12,6 @@
 use Laminas\Stdlib\AbstractOptions;
 
 use function gettype;
-use function interface_exists;
 use function is_callable;
 use function is_string;
 use function sprintf;
@@ -256,6 +255,3 @@ public function setStorage($storage): void
         $this->storage = $storage;
     }
 }
-
-interface_exists(ClassMetadata::class);
-interface_exists(ObjectRepository::class);

src/Persistence/ObjectManagerAwareInterface.php

@@ -6,8 +6,6 @@
 
 use Doctrine\Persistence\ObjectManager;
 
-use function interface_exists;
-
 interface ObjectManagerAwareInterface
 {
     /**
@@ -20,5 +18,3 @@ public function setObjectManager(ObjectManager $objectManager): void;
      */
     public function getObjectManager(): ObjectManager;
 }
-
-interface_exists(ObjectManager::class);

src/Persistence/ProvidesObjectManager.php

@@ -6,8 +6,6 @@
 
 use Doctrine\Persistence\ObjectManager;
 
-use function interface_exists;
-
 /**
  * Trait to provide object manager to a form (only works from PHP 5.4)
  */
@@ -31,5 +29,3 @@ public function getObjectManager(): ObjectManager
         return $this->objectManager;
     }
 }
-
-interface_exists(ObjectManager::class);

src/Service/DriverFactory.php

@@ -18,7 +18,6 @@
 
 use function class_exists;
 use function get_class;
-use function interface_exists;
 use function is_subclass_of;
 use function sprintf;
 
@@ -128,5 +127,3 @@ protected function createDriver(ContainerInterface $container, Driver $options):
         return $driver;
     }
 }
-
-interface_exists(MappingDriver::class);

src/Validator/Service/AbstractValidatorFactory.php

@@ -13,7 +13,6 @@
 use Laminas\Stdlib\ArrayUtils;
 
 use function class_exists;
-use function interface_exists;
 use function is_string;
 use function sprintf;
 
@@ -98,6 +97,3 @@ protected function merge(array $previousOptions, array $newOptions): array
         return ArrayUtils::merge($previousOptions, $newOptions, true);
     }
 }
-
-interface_exists(ObjectManager::class);
-interface_exists(ObjectRepository::class);

tests/Service/DriverFactoryTest.php

@@ -4,6 +4,9 @@
 
 namespace DoctrineModuleTest\Service;
 
+use Doctrine\Common\Annotations\Reader;
+use Doctrine\Common\Cache\ArrayCache;
+use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
 use Doctrine\ORM\Mapping\Driver\AttributeDriver;
 use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
 use DoctrineModule\Service\DriverFactory;
@@ -90,4 +93,28 @@ public function testCreateAttributeDriver(): void
         $driver  = $factory->__invoke($serviceManager, AttributeDriver::class);
         $this->assertInstanceOf(AttributeDriver::class, $driver);
     }
+
+    public function testCreateAnnotationDriver(): void
+    {
+        $serviceManager = new ServiceManager();
+        $serviceManager->setService(
+            'config',
+            [
+                'doctrine' => [
+                    'driver' => [
+                        'testDriver' => ['class' => AnnotationDriver::class],
+                    ],
+                ],
+            ]
+        );
+        $serviceManager->setService(
+            'doctrine.cache.array',
+            new ArrayCache()
+        );
+
+        $factory = new DriverFactory('testDriver');
+        $driver  = $factory->__invoke($serviceManager, AnnotationDriver::class);
+        $this->assertInstanceOf(AnnotationDriver::class, $driver);
+        $this->assertInstanceOf(Reader::class, $driver->getReader());
+    }
 }