Merge pull request #456 from doctrine/3.4.x-merge-up-into-4.1.x_0uP2KmOr

Merge release 3.4.3 into 4.1.x

Author: GromNaN

src/Persistence/Mapping/Driver/MappingDriverChain.php

@@ -8,7 +8,6 @@
 use Doctrine\Persistence\Mapping\MappingException;
 
 use function array_keys;
-use function rtrim;
 use function spl_object_id;
 use function strpos;
 
@@ -57,7 +56,7 @@ public function getDrivers(): array
     public function loadMetadataForClass(string $className, ClassMetadata $metadata): void
     {
         foreach ($this->drivers as $namespace => $driver) {
-            if ($this->isInNamespace($className, $namespace)) {
+            if (strpos($className, $namespace) === 0) {
                 $driver->loadMetadataForClass($className, $metadata);
 
                 return;
@@ -89,7 +88,7 @@ public function getAllClassNames(): array
             }
 
             foreach ($driverClasses[$oid] as $className) {
-                if (! $this->isInNamespace($className, $namespace)) {
+                if (strpos($className, $namespace) !== 0) {
                     continue;
                 }
 
@@ -109,7 +108,7 @@ public function getAllClassNames(): array
     public function isTransient(string $className): bool
     {
         foreach ($this->drivers as $namespace => $driver) {
-            if ($this->isInNamespace($className, $namespace)) {
+            if (strpos($className, $namespace) === 0) {
                 return $driver->isTransient($className);
             }
         }
@@ -120,11 +119,4 @@ public function isTransient(string $className): bool
 
         return true;
     }
-
-    private function isInNamespace(string $className, string $namespace): bool
-    {
-        $namespace = rtrim($namespace, '\\') . '\\';
-
-        return strpos($className, $namespace) === 0;
-    }
 }

tests/Persistence/Mapping/DriverChainTest.php

@@ -17,9 +17,9 @@
 
 class DriverChainTest extends DoctrineTestCase
 {
-    #[TestWith(['Doctrine\Tests\Models\Company'])]
-    #[TestWith(['Doctrine\Tests\Persistence\Map'])]
-    public function testDelegateToMatchingNamespaceDriver(string $namespace): void
+    #[TestWith(['Doctrine\Tests\Models\Company', 'Doctrine\Tests\Persistence\Mapping'])]
+    #[TestWith(['Doctrine\Tests\Persistence\Map\\', 'Doctrine\Tests\Persistence\Map'])]
+    public function testDelegateToMatchingNamespaceDriver(string $namespace1, string $namespace2): void
     {
         $className     = DriverChainEntity::class;
         $classMetadata = $this->createMock(ClassMetadata::class);
@@ -41,8 +41,8 @@ public function testDelegateToMatchingNamespaceDriver(string $namespace): void
                 ->with(self::equalTo($className))
                 ->willReturn(true);
 
-        $chain->addDriver($driver1, $namespace);
-        $chain->addDriver($driver2, 'Doctrine\Tests\Persistence\Mapping');
+        $chain->addDriver($driver1, $namespace1);
+        $chain->addDriver($driver2, $namespace2);
 
         $chain->loadMetadataForClass($className, $classMetadata);