New paths and namespaces should never be added to all connections

Author: patrickbrouwers

src/Auth/Passwords/PasswordResetServiceProvider.php

@@ -17,7 +17,7 @@ public function boot(DoctrineManager $manager)
         // The path to PasswordReminder should be added, so the entity can be found
         $manager->addPaths([
             __DIR__
-        ], $manager->getDefaultManagerName());
+        ]);
     }
 
     /**

src/DoctrineManager.php

@@ -80,11 +80,9 @@ public function extendAll($callback)
      */
     public function addNamespace($namespace, $connection = false)
     {
-        $connections = $connection ? [$connection] : $this->registry->getManagerNames();
+        $connection = $connection ?: $this->registry->getDefaultManagerName();
 
-        foreach ($connections as $connection) {
-            $this->getMetaDataDriver($connection)->addNamespace($namespace);
-        }
+        $this->getMetaDataDriver($connection)->addNamespace($namespace);
     }
 
     /**
@@ -93,11 +91,9 @@ public function addNamespace($namespace, $connection = false)
      */
     public function addPaths(array $paths = [], $connection = false)
     {
-        $connections = $connection ? [$connection] : $this->registry->getManagerNames();
+        $connection = $connection ?: $this->registry->getDefaultManagerName();
 
-        foreach ($connections as $connection) {
-            $this->getMetaDataDriver($connection)->addPaths($paths);
-        }
+        $this->getMetaDataDriver($connection)->addPaths($paths);
     }
 
     /**

tests/DoctrineManagerTest.php

@@ -156,39 +156,6 @@ public function test_can_add_a_new_namespace_to_default_connection()
         $this->manager->addNamespace('NewNamespace', 'default');
     }
 
-    public function test_can_add_a_new_namespace_to_all_connections()
-    {
-        $this->registry->shouldReceive('getManagerNames')->once()->andReturn([
-            'default',
-            'custom'
-        ]);
-
-        $this->registry->shouldReceive('getManager')
-                       ->once()
-                       ->with('default')
-                       ->andReturn($this->em);
-
-        $this->registry->shouldReceive('getManager')
-                       ->once()
-                       ->with('custom')
-                       ->andReturn($this->em);
-
-        $configuration = m::mock(Configuration::class);
-
-        $mappingDriver = m::mock(MappingDriverChain::class);
-        $mappingDriver->shouldReceive('addNamespace')
-            ->twice()->with('NewNamespace');
-
-        $configuration->shouldReceive('getMetadataDriverImpl')
-                      ->twice()
-                      ->andReturn($mappingDriver);
-
-        $this->em->shouldReceive('getConfiguration')
-                 ->twice()->andReturn($configuration);
-
-        $this->manager->addNamespace('NewNamespace');
-    }
-
     public function test_can_add_paths_to_default_connection()
     {
         $this->registry->shouldReceive('getManager')
@@ -211,39 +178,6 @@ public function test_can_add_paths_to_default_connection()
         $this->manager->addPaths(['paths'], 'default');
     }
 
-    public function test_can_add_paths_to_all_connections()
-    {
-        $this->registry->shouldReceive('getManagerNames')->once()->andReturn([
-            'default',
-            'custom'
-        ]);
-
-        $this->registry->shouldReceive('getManager')
-                       ->once()
-                       ->with('default')
-                       ->andReturn($this->em);
-
-        $this->registry->shouldReceive('getManager')
-                       ->once()
-                       ->with('custom')
-                       ->andReturn($this->em);
-
-        $configuration = m::mock(Configuration::class);
-
-        $mappingDriver = m::mock(MappingDriverChain::class);
-        $mappingDriver->shouldReceive('addPaths')
-                      ->twice()->with(['paths']);
-
-        $configuration->shouldReceive('getMetadataDriverImpl')
-                      ->twice()
-                      ->andReturn($mappingDriver);
-
-        $this->em->shouldReceive('getConfiguration')
-                 ->twice()->andReturn($configuration);
-
-        $this->manager->addPaths(['paths']);
-    }
-
     protected function tearDown()
     {
         m::close();