Fix: prevent $sourceFilePathNames from shadowing retroactively added paths when ColocatedMappingDriver::addPaths() is called after instance creation.

After github.com/doctrine/pull/429/ had been merged, it could bring in subtle bugs during migration toward the new `$sourceFilePathNames` approach. If the client code had called `addPaths()` after the instance creation, it would've been ignored (without any warning or so), and paths would not have been used. This commit fixes that. Retroactively added paths will be taken into account as well as ``$sourceFilePathNames`.

Author: rela589n

src/Persistence/Mapping/Driver/ColocatedMappingDriver.php

@@ -161,7 +161,10 @@ public function getAllClassNames(): array
         }
 
         /** @var iterable<string> $sourceFilePathNames */
-        $sourceFilePathNames = $this->sourceFilePathNames ?? $this->pathNameIterator($filesIterator);
+        $sourceFilePathNames = $this->mergeIterables(
+            $this->sourceFilePathNames ?? [],
+            $this->pathNameIterator($filesIterator),
+        );
         $includedFiles       = [];
 
         foreach ($sourceFilePathNames as $sourceFile) {
@@ -217,4 +220,24 @@ private function pathNameIterator(iterable $filesIterator): Generator
             yield $file->getPathname();
         }
     }
+
+    /**
+     * @param iterable<TKey, T> $iterable1
+     * @param iterable<TKey, T> $iterable2
+     *
+     * @return Generator<TKey, T>
+     *
+     * @template TKey
+     * @template T
+     */
+    private function mergeIterables(iterable $iterable1, iterable $iterable2): Generator
+    {
+        foreach ($iterable1 as $key => $item) {
+            yield $key => $item;
+        }
+
+        foreach ($iterable2 as $key => $item) {
+            yield $key => $item;
+        }
+    }
 }

tests/Persistence/Mapping/ColocatedMappingDriverTest.php

@@ -81,6 +81,22 @@ public function testGetAllClassNamesForIterableFilePathNames(): void
         self::assertSame([Entity::class], $classes, 'The driver should only return the class names from the provided file path names, excluding transient class names.');
     }
 
+    public function testGetAllClassNamesForBothIterableFilePathNamesAndRetroactivelyAddedDirectoryPaths(): void
+    {
+        $driver = $this->createFilePathNamesDriver([__DIR__ . '/_files/colocated/Entity.php']);
+
+        $driver->addPaths([__DIR__ . '/_files/colocated/']);
+
+        $classes = $driver->getAllClassNames();
+        sort($classes);
+
+        self::assertSame(
+            [Entity::class, EntityFixture::class],
+            $classes,
+            'The driver should return class names from both the provided file path names and the retroactively added directory paths (these should not be ignored).',
+        );
+    }
+
     /** @return Generator<string, array{string}> */
     public static function pathProvider(): Generator
     {