Merge pull request #1106 from nicolas-grekas/fix-reset

Skip resetting managers when proxy-manager is not installed

Registry.php

@@ -4,10 +4,12 @@
 
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\ORMException;
+use ProxyManager\Proxy\LazyLoadingInterface;
 use Psr\Container\ContainerInterface;
 use Symfony\Bridge\Doctrine\ManagerRegistry;
 use Symfony\Bridge\Doctrine\RegistryInterface;
 use Symfony\Contracts\Service\ResetInterface;
+use function interface_exists;
 
 /**
  * References all Doctrine connections and entity managers in a given Container.
@@ -168,6 +170,10 @@ public function getEntityManagerForClass($class)
 
     public function reset() : void
     {
+        if (! interface_exists(LazyLoadingInterface::class)) {
+            return;
+        }
+
         foreach (array_keys($this->getManagerNames()) as $managerName) {
             $this->resetManager($managerName);
         }

Tests/RegistryTest.php

@@ -123,17 +123,13 @@ public function testResetUnknownEntityManager()
         $registry->resetManager('default');
     }
 
-    /**
-     * @group legacy
-     */
     public function testReset()
     {
-        $em        = new stdClass();
         $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
         $container->expects($this->once())
-            ->method('get')
+            ->method('initialized')
             ->with($this->equalTo('doctrine.orm.default_entity_manager'))
-            ->will($this->returnValue($em));
+            ->will($this->returnValue(false));
 
         $registry = new Registry($container, [], ['default' => 'doctrine.orm.default_entity_manager'], 'default', 'default');
         $registry->reset();

composer.json

@@ -41,6 +41,7 @@
     "require-dev": {
         "doctrine/coding-standard": "^6.0",
         "doctrine/orm": "^2.6",
+        "ocramius/proxy-manager": "^2.1",
         "php-coveralls/php-coveralls": "^2.1",
         "phpunit/phpunit": "^7.5",
         "symfony/phpunit-bridge": "^4.2",