Registry improve manager rebinding

Author: patrickbrouwers

src/DoctrineServiceProvider.php

@@ -117,7 +117,6 @@ protected function registerManagerRegistry()
             // Add all managers into the registry
             foreach ($app->make('config')->get('doctrine.managers', []) as $manager => $settings) {
                 $registry->addManager($manager, $settings);
-                $registry->addConnection($manager);
             }
 
             return $registry;

src/IlluminateRegistry.php

@@ -77,27 +77,25 @@ public function __construct(Container $container, EntityManagerFactory $factory)
      */
     public function addManager($manager, array $settings = [])
     {
-        if (!$this->container->bound($this->getManagerBindingName($manager))) {
-            $this->container->singleton($this->getManagerBindingName($manager), function () use ($settings) {
-                return $this->factory->create($settings);
-            });
+        $this->container->singleton($this->getManagerBindingName($manager), function () use ($settings) {
+            return $this->factory->create($settings);
+        });
 
-            $this->managers[$manager] = $manager;
-        }
+        $this->addConnection($manager);
+
+        $this->managers[$manager] = $manager;
     }
 
     /**
      * @param $connection
      */
     public function addConnection($connection)
     {
-        if (!$this->container->bound($this->getConnectionBindingName($connection))) {
-            $this->container->singleton($this->getConnectionBindingName($connection), function () use ($connection) {
-                return $this->getManager($connection)->getConnection();
-            });
+        $this->container->singleton($this->getConnectionBindingName($connection), function () use ($connection) {
+            return $this->getManager($connection)->getConnection();
+        });
 
-            $this->connections[$connection] = $connection;
-        }
+        $this->connections[$connection] = $connection;
     }
 
     /**
@@ -275,7 +273,12 @@ public function resetManager($name = null)
             $this->getManagerBindingName($this->managers[$name])
         );
 
+        $this->resetService(
+            $this->getConnectionBindingName($this->connections[$name])
+        );
+
         unset($this->managersMap[$name]);
+        unset($this->connectionsMap[$name]);
     }
 
     /**

tests/IlluminateRegistryTest.php

@@ -29,7 +29,6 @@ class IlluminateRegistryTest extends PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->container = m::mock(Container::class);
-        $this->container->shouldReceive('bound')->andReturn(false);
         $this->factory   = m::mock(EntityManagerFactory::class);
 
         $this->registry = new IlluminateRegistry(
@@ -40,7 +39,7 @@ protected function setUp()
 
     public function test_can_add_manager()
     {
-        $this->container->shouldReceive('singleton')->once();
+        $this->container->shouldReceive('singleton')->twice();
         $this->registry->addManager('default', ['settings']);
 
         $this->assertTrue($this->registry->managerExists('default'));
@@ -70,7 +69,7 @@ public function test_get_default_connection_name()
     public function test_get_default_manager_name()
     {
         // Will return first, when no default name
-        $this->container->shouldReceive('singleton')->once();
+        $this->container->shouldReceive('singleton')->times(3);
         $this->registry->addManager('custom');
         $this->assertEquals('custom', $this->registry->getDefaultManagerName());
 
@@ -178,7 +177,7 @@ public function test_can_get_all_connections()
 
     public function test_can_get_default_manager()
     {
-        $this->container->shouldReceive('singleton')->once();
+        $this->container->shouldReceive('singleton')->times(2);
         $this->registry->addManager('default');
 
         $this->container->shouldReceive('make')
@@ -191,7 +190,7 @@ public function test_can_get_default_manager()
 
     public function test_can_get_custom_manager()
     {
-        $this->container->shouldReceive('singleton')->once();
+        $this->container->shouldReceive('singleton')->times(2);
         $this->registry->addManager('custom');
 
         $this->container->shouldReceive('make')
@@ -213,7 +212,7 @@ public function test_cannot_non_existing_manager()
 
     public function test_manager_gets_only_resolved_once()
     {
-        $this->container->shouldReceive('singleton')->once();
+        $this->container->shouldReceive('singleton')->times(2);
         $this->registry->addManager('default');
 
         $this->container->shouldReceive('make')
@@ -231,7 +230,7 @@ public function test_manager_gets_only_resolved_once()
 
     public function test_can_check_if_manager_exists()
     {
-        $this->container->shouldReceive('singleton')->once();
+        $this->container->shouldReceive('singleton')->times(2);
         $this->registry->addManager('default');
 
         $this->assertFalse($this->registry->managerExists('non-existing'));
@@ -240,7 +239,7 @@ public function test_can_check_if_manager_exists()
 
     public function test_can_get_manager_names()
     {
-        $this->container->shouldReceive('singleton')->twice();
+        $this->container->shouldReceive('singleton')->times(4);
 
         $this->registry->addManager('default');
         $this->registry->addManager('custom');
@@ -252,7 +251,7 @@ public function test_can_get_manager_names()
 
     public function test_can_get_all_managers()
     {
-        $this->container->shouldReceive('singleton')->twice();
+        $this->container->shouldReceive('singleton')->times(4);
 
         $this->container->shouldReceive('make')
                         ->with('doctrine.managers.default')
@@ -302,7 +301,7 @@ public function test_cannot_reset_non_existing_managers()
         $this->registry->resetManager('non-existing');
     }
 
-    public function test_get_alias_namespace_from_unkown_namespace()
+    public function test_get_alias_namespace_from_unknown_namespace()
     {
         $this->setExpectedException(
             ORMException::class,