Merge branch '1.12.x' into 2.0.x

* 1.12.x: Fix error when resetting manager registry
doctrine · Dec 18, 2019 · fd15f18 · fd15f18
2 parents 651107e + f7f32a3
commit fd15f18
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/Registry.php b/Registry.php
@@ -50,7 +50,7 @@ public function getAliasNamespace($alias)
 
     public function reset() : void
     {
-        foreach ($this->getManagerNames() as $managerName) {
+        foreach (array_keys($this->getManagerNames()) as $managerName) {
             $this->resetManager($managerName);
         }
     }

diff --git a/Tests/RegistryTest.php b/Tests/RegistryTest.php
@@ -122,4 +122,20 @@ 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')
+            ->with($this->equalTo('doctrine.orm.default_entity_manager'))
+            ->will($this->returnValue($em));
+
+        $registry = new Registry($container, [], ['default' => 'doctrine.orm.default_entity_manager'], 'default', 'default');
+        $registry->reset();
+    }
 }