Support ClassLocator in StaticPHPDriver

phpstan-baseline.neon

@@ -30,18 +30,6 @@ parameters:
 			count: 1
 			path: tests/Mapping/ClassMetadataFactoryTest.php
 
-		-
-			message: '#^Parameter \#1 \$directories of static method Doctrine\\Persistence\\Mapping\\Driver\\FileClassLocator\:\:createFromDirectories\(\) expects list\<string\>, non\-empty\-array\<int, string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: tests/Mapping/ColocatedMappingDriverTest.php
-
-		-
-			message: '#^Parameter \#2 \$excludedDirectories of static method Doctrine\\Persistence\\Mapping\\Driver\\FileClassLocator\:\:createFromDirectories\(\) expects list\<string\>, array\<int, string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: tests/Mapping/ColocatedMappingDriverTest.php
-
 		-
 			message: '#^Call to static method PHPUnit\\Framework\\Assert\:\:assertSame\(\) with array\{''Doctrine\\\\Tests…'', ''Doctrine\\\\Tests\\\\ORM…'', ''Doctrine\\\\Tests\\\\ORM…''\} and list\<class\-string\> will always evaluate to false\.$#'
 			identifier: staticMethod.impossibleType

src/Mapping/Driver/ColocatedMappingDriver.php

@@ -50,7 +50,7 @@ trait ColocatedMappingDriver
      */
     public function addPaths(array $paths): void
     {
-        $this->paths = array_unique(array_merge($this->paths, $paths));
+        $this->paths = array_unique([...$this->paths, ...$paths]);
     }
 
     /**

src/Mapping/Driver/FileClassLocator.php

@@ -81,9 +81,9 @@ public function getClassNames(): array
     /**
      * Creates a FileClassLocator from an array of directories.
      *
-     * @param list<string> $directories
-     * @param list<string> $excludedDirectories Directories to exclude from the search.
-     * @param string       $fileExtension       The file extension to look for (default is '.php').
+     * @param string[] $directories
+     * @param string[] $excludedDirectories Directories to exclude from the search.
+     * @param string   $fileExtension       The file extension to look for (default is '.php').
      *
      * @throws MappingException if any of the directories are not valid.
      */

src/Mapping/Driver/StaticPHPDriver.php

@@ -5,115 +5,32 @@
 namespace Doctrine\Persistence\Mapping\Driver;
 
 use Doctrine\Persistence\Mapping\ClassMetadata;
-use Doctrine\Persistence\Mapping\MappingException;
-use RecursiveDirectoryIterator;
-use RecursiveIteratorIterator;
-use ReflectionClass;
 
-use function array_unique;
-use function get_declared_classes;
-use function in_array;
-use function is_dir;
 use function method_exists;
-use function realpath;
 
 /**
  * The StaticPHPDriver calls a static loadMetadata() method on your entity
  * classes where you can manually populate the ClassMetadata instance.
  */
 class StaticPHPDriver implements MappingDriver
 {
-    /**
-     * Paths of entity directories.
-     *
-     * @var array<int, string>
-     */
-    private array $paths = [];
+    use ColocatedMappingDriver;
 
-    /**
-     * Map of all class names.
-     *
-     * @var array<int, string>
-     * @phpstan-var list<class-string>
-     */
-    private array|null $classNames = null;
-
-    /** @param array<int, string>|string $paths */
-    public function __construct(array|string $paths)
-    {
-        $this->addPaths((array) $paths);
-    }
-
-    /** @param array<int, string> $paths */
-    public function addPaths(array $paths): void
+    /** @param array<int, string>|string|ClassLocator $paths */
+    public function __construct(array|string|ClassLocator $paths)
     {
-        $this->paths = array_unique([...$this->paths, ...$paths]);
+        if ($paths instanceof ClassLocator) {
+            $this->classLocator = $paths;
+        } else {
+            $this->addPaths((array) $paths);
+        }
     }
 
     public function loadMetadataForClass(string $className, ClassMetadata $metadata): void
     {
         $className::loadMetadata($metadata);
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @todo Same code exists in ColocatedMappingDriver, should we re-use it
-     * somehow or not worry about it?
-     */
-    public function getAllClassNames(): array
-    {
-        if ($this->classNames !== null) {
-            return $this->classNames;
-        }
-
-        if ($this->paths === []) {
-            throw MappingException::pathRequiredForDriver(static::class);
-        }
-
-        $classes       = [];
-        $includedFiles = [];
-
-        foreach ($this->paths as $path) {
-            if (! is_dir($path)) {
-                throw MappingException::fileMappingDriversRequireConfiguredDirectoryPath($path);
-            }
-
-            $iterator = new RecursiveIteratorIterator(
-                new RecursiveDirectoryIterator($path),
-                RecursiveIteratorIterator::LEAVES_ONLY,
-            );
-
-            foreach ($iterator as $file) {
-                if ($file->getBasename('.php') === $file->getBasename()) {
-                    continue;
-                }
-
-                $sourceFile = realpath($file->getPathName());
-                require_once $sourceFile;
-                $includedFiles[] = $sourceFile;
-            }
-        }
-
-        $declared = get_declared_classes();
-
-        foreach ($declared as $className) {
-            $rc = new ReflectionClass($className);
-
-            $sourceFile = $rc->getFileName();
-
-            if (! in_array($sourceFile, $includedFiles, true) || $this->isTransient($className)) {
-                continue;
-            }
-
-            $classes[] = $className;
-        }
-
-        $this->classNames = $classes;
-
-        return $classes;
-    }
-
     public function isTransient(string $className): bool
     {
         return ! method_exists($className, 'loadMetadata');

tests/Mapping/ColocatedMappingDriverTest.php

@@ -130,7 +130,7 @@ public function __construct(array|ClassLocator $paths)
         if ($paths instanceof ClassLocator) {
             $this->classLocator = $paths;
         } else {
-            $this->paths = $paths;
+            $this->addPaths($paths);
         }
     }
 

tests/Mapping/StaticPHPDriverTest.php

@@ -5,7 +5,9 @@
 namespace Doctrine\Tests\Persistence\Mapping;
 
 use Doctrine\Persistence\Mapping\ClassMetadata;
+use Doctrine\Persistence\Mapping\Driver\ClassNames;
 use Doctrine\Persistence\Mapping\Driver\StaticPHPDriver;
+use Doctrine\Tests\Persistence\Mapping\_files\colocated\Entity;
 use PHPUnit\Framework\TestCase;
 
 class StaticPHPDriverTest extends TestCase
@@ -15,24 +17,23 @@ public function testLoadMetadata(): void
         $metadata = $this->createMock(ClassMetadata::class);
         $metadata->expects(self::once())->method('getFieldNames');
 
-        $driver = new StaticPHPDriver([__DIR__]);
-        $driver->loadMetadataForClass(TestEntity::class, $metadata);
+        $driver = new StaticPHPDriver([]);
+        $driver->loadMetadataForClass(Entity::class, $metadata);
     }
 
     public function testGetAllClassNames(): void
     {
-        $driver     = new StaticPHPDriver([__DIR__]);
+        $driver     = new StaticPHPDriver([__DIR__ . '/_files/colocated/']);
         $classNames = $driver->getAllClassNames();
 
-        self::assertContains(TestEntity::class, $classNames);
+        self::assertContains(Entity::class, $classNames);
     }
-}
 
-class TestEntity
-{
-    /** @phpstan-param ClassMetadata<object> $metadata */
-    public static function loadMetadata(ClassMetadata $metadata): void
+    public function testGetAllClassesNamesWithClassLocator(): void
     {
-        $metadata->getFieldNames();
+        $driver     = new StaticPHPDriver(new ClassNames([Entity::class]));
+        $classNames = $driver->getAllClassNames();
+
+        self::assertSame([Entity::class], $classNames);
     }
 }

tests/Mapping/_files/colocated/Entity.php

@@ -4,10 +4,17 @@
 
 namespace Doctrine\Tests\Persistence\Mapping\_files\colocated;
 
+use Doctrine\Persistence\Mapping\ClassMetadata;
+
 /**
  * The driver should include this file and return its class name
  * from {@see \Doctrine\Persistence\Mapping\Driver\ColocatedMappingDriver::getAllClassNames()} method.
  */
 class Entity
 {
+    /** @phpstan-param ClassMetadata<object> $metadata */
+    public static function loadMetadata(ClassMetadata $metadata): void
+    {
+        $metadata->getFieldNames();
+    }
 }