Merge branch '1.1.x' into 1.2.x

* 1.1.x: Fix wrong return type hint for selectManager Remove dupes in FileDriver::getAllClassNames
doctrine · Apr 23, 2019 · 43526ae · 43526ae
2 parents 38dc039 + 3da7c9d
commit 43526ae
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/lib/Doctrine/Common/Persistence/AbstractManagerRegistry.php b/lib/Doctrine/Common/Persistence/AbstractManagerRegistry.php
@@ -235,7 +235,7 @@ public function resetManager($name = null)
         return $this->getManager($name);
     }
 
-    private function selectManager(string $persistentObjectName, ?string $persistentManagerName = null) : ?ObjectManager
+    private function selectManager(string $persistentObjectName, ?string $persistentManagerName = null) : ObjectManager
     {
         if ($persistentManagerName !== null) {
             return $this->getManager($persistentManagerName);

diff --git a/lib/Doctrine/Common/Persistence/Mapping/Driver/FileDriver.php b/lib/Doctrine/Common/Persistence/Mapping/Driver/FileDriver.php
@@ -6,6 +6,7 @@
 use Doctrine\Common\Persistence\Mapping\MappingException;
 use function array_keys;
 use function array_merge;
+use function array_unique;
 use function is_file;
 use function str_replace;
 
@@ -126,10 +127,10 @@ public function getAllClassNames()
             return (array) $this->locator->getAllClassNames($this->globalBasename);
         }
 
-        return array_merge(
+        return array_unique(array_merge(
             array_keys($this->classCache),
             (array) $this->locator->getAllClassNames($this->globalBasename)
-        );
+        ));
     }
 
     /**

diff --git a/tests/Doctrine/Tests/Common/Persistence/Mapping/FileDriverTest.php b/tests/Doctrine/Tests/Common/Persistence/Mapping/FileDriverTest.php
@@ -101,6 +101,22 @@ public function testGetAllClassNamesBothSources()
         self::assertSame(['stdGlobal', 'stdGlobal2', 'stdClass'], $classNames);
     }
 
+    public function testGetAllClassNamesBothSourcesNoDupes() : void
+    {
+        $locator = $this->newLocator();
+        $locator->expects($this->once())
+                ->method('getAllClassNames')
+                ->with($this->equalTo('global'))
+                ->willReturn(['stdClass']);
+        $driver = new TestFileDriver($locator);
+        $driver->setGlobalBasename('global');
+
+        $driver->getElement('stdClass');
+        $classNames = $driver->getAllClassNames();
+
+        self::assertSame(['stdGlobal', 'stdGlobal2', 'stdClass'], $classNames);
+    }
+
     public function testIsNotTransient()
     {
         $locator = $this->newLocator();