Merge pull request #452 from greg0ire/4.1.x

Merge 3.4.x up into 4.1.x

Author: greg0ire

.github/workflows/coding-standards.yml

@@ -12,4 +12,4 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@8.0.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@12.0.0"

.github/workflows/continuous-integration.yml

@@ -12,7 +12,7 @@ on:
 jobs:
   phpunit:
     name: "PHPUnit"
-    uses: "doctrine/.github/.github/workflows/continuous-integration.yml@8.0.0"
+    uses: "doctrine/.github/.github/workflows/continuous-integration.yml@12.0.0"
     with:
       php-versions: '["8.1", "8.2", "8.3", "8.4", "8.5"]'
     secrets:

.github/workflows/release-on-milestone-closed.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   release:
     name: "Git tag, release & create merge-up PR"
-    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@8.0.0"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@12.0.0"
     secrets:
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

.github/workflows/static-analysis.yml

@@ -12,4 +12,4 @@ on:
 jobs:
   static-analysis:
     name: "Static Analysis"
-    uses: "doctrine/.github/.github/workflows/phpstan.yml@8.0.0"
+    uses: "doctrine/.github/.github/workflows/phpstan.yml@12.0.0"

src/Persistence/Mapping/Driver/MappingDriverChain.php

@@ -8,8 +8,9 @@
 use Doctrine\Persistence\Mapping\MappingException;
 
 use function array_keys;
+use function rtrim;
 use function spl_object_id;
-use function str_starts_with;
+use function strpos;
 
 /**
  * The DriverChain allows you to add multiple other mapping drivers for
@@ -56,7 +57,7 @@ public function getDrivers(): array
     public function loadMetadataForClass(string $className, ClassMetadata $metadata): void
     {
         foreach ($this->drivers as $namespace => $driver) {
-            if (str_starts_with($className, $namespace)) {
+            if ($this->isInNamespace($className, $namespace)) {
                 $driver->loadMetadataForClass($className, $metadata);
 
                 return;
@@ -88,7 +89,7 @@ public function getAllClassNames(): array
             }
 
             foreach ($driverClasses[$oid] as $className) {
-                if (! str_starts_with($className, $namespace)) {
+                if (! $this->isInNamespace($className, $namespace)) {
                     continue;
                 }
 
@@ -108,7 +109,7 @@ public function getAllClassNames(): array
     public function isTransient(string $className): bool
     {
         foreach ($this->drivers as $namespace => $driver) {
-            if (str_starts_with($className, $namespace)) {
+            if ($this->isInNamespace($className, $namespace)) {
                 return $driver->isTransient($className);
             }
         }
@@ -119,4 +120,11 @@ 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

@@ -12,11 +12,14 @@
 use Doctrine\Tests\Persistence\Mapping\Fixtures\Manager\Manager;
 use Doctrine\Tests\Persistence\Mapping\Fixtures\Model;
 use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\TestWith;
 use stdClass;
 
 class DriverChainTest extends DoctrineTestCase
 {
-    public function testDelegateToMatchingNamespaceDriver(): void
+    #[TestWith(['Doctrine\Tests\Models\Company'])]
+    #[TestWith(['Doctrine\Tests\Persistence\Map'])]
+    public function testDelegateToMatchingNamespaceDriver(string $namespace): void
     {
         $className     = DriverChainEntity::class;
         $classMetadata = $this->createMock(ClassMetadata::class);
@@ -38,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);