Merge pull request #448 from HypeMC/fix-namespace-matching

Fix `MappingDriverChain` namespace matching

Author: greg0ire

src/Persistence/Mapping/Driver/MappingDriverChain.php

@@ -8,6 +8,7 @@
 use Doctrine\Persistence\Mapping\MappingException;
 
 use function array_keys;
+use function rtrim;
 use function spl_object_hash;
 use function strpos;
 
@@ -73,7 +74,7 @@ public function getDrivers()
     public function loadMetadataForClass(string $className, ClassMetadata $metadata)
     {
         foreach ($this->drivers as $namespace => $driver) {
-            if (strpos($className, $namespace) === 0) {
+            if ($this->isInNamespace($className, $namespace)) {
                 $driver->loadMetadataForClass($className, $metadata);
 
                 return;
@@ -105,7 +106,7 @@ public function getAllClassNames()
             }
 
             foreach ($driverClasses[$oid] as $className) {
-                if (strpos($className, $namespace) !== 0) {
+                if (! $this->isInNamespace($className, $namespace)) {
                     continue;
                 }
 
@@ -128,7 +129,7 @@ public function getAllClassNames()
     public function isTransient(string $className)
     {
         foreach ($this->drivers as $namespace => $driver) {
-            if (strpos($className, $namespace) === 0) {
+            if ($this->isInNamespace($className, $namespace)) {
                 return $driver->isTransient($className);
             }
         }
@@ -139,4 +140,11 @@ public function isTransient(string $className)
 
         return true;
     }
+
+    private function isInNamespace(string $className, string $namespace): bool
+    {
+        $namespace = rtrim($namespace, '\\') . '\\';
+
+        return strpos($className, $namespace) === 0;
+    }
 }

tests/Persistence/Mapping/DriverChainTest.php

@@ -15,7 +15,11 @@
 
 class DriverChainTest extends DoctrineTestCase
 {
-    public function testDelegateToMatchingNamespaceDriver(): void
+    /**
+     * @testWith ["Doctrine\\Tests\\Models\\Company"]
+     *           ["Doctrine\\Tests\\Persistence\\Map"]
+     */
+    public function testDelegateToMatchingNamespaceDriver(string $namespace): void
     {
         $className     = DriverChainEntity::class;
         $classMetadata = $this->createMock(ClassMetadata::class);
@@ -37,7 +41,7 @@ public function testDelegateToMatchingNamespaceDriver(): void
                 ->with(self::equalTo($className))
                 ->willReturn(true);
 
-        $chain->addDriver($driver1, 'Doctrine\Tests\Models\Company');
+        $chain->addDriver($driver1, $namespace);
         $chain->addDriver($driver2, 'Doctrine\Tests\Persistence\Mapping');
 
         $chain->loadMetadataForClass($className, $classMetadata);