Leverage FileClassLocator

Author: GromNaN

lib/Doctrine/ODM/MongoDB/Mapping/Driver/AttributeDriver.php

@@ -4,7 +4,6 @@
 
 namespace Doctrine\ODM\MongoDB\Mapping\Driver;
 
-use ArrayIterator;
 use Doctrine\Common\Annotations\Reader;
 use Doctrine\ODM\MongoDB\Events;
 use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
@@ -18,7 +17,6 @@
 use Doctrine\Persistence\Mapping\Driver\ClassLocator;
 use Doctrine\Persistence\Mapping\Driver\ColocatedMappingDriver;
 use Doctrine\Persistence\Mapping\Driver\MappingDriver;
-use LogicException;
 use MongoDB\BSON\Document;
 use MongoDB\Driver\Exception\UnexpectedValueException;
 use ReflectionClass;
@@ -33,9 +31,6 @@
 use function constant;
 use function count;
 use function is_array;
-use function is_string;
-use function property_exists;
-use function sprintf;
 use function trigger_deprecation;
 
 /**

tests/Doctrine/ODM/MongoDB/Tests/BaseTestCase.php

@@ -6,20 +6,22 @@
 
 use Doctrine\ODM\MongoDB\Configuration;
 use Doctrine\ODM\MongoDB\DocumentManager;
+use Doctrine\ODM\MongoDB\Mapping\Driver\AttributeDriver;
 use Doctrine\ODM\MongoDB\Proxy\InternalProxy;
 use Doctrine\ODM\MongoDB\Tests\Query\Filter\Filter;
 use Doctrine\ODM\MongoDB\UnitOfWork;
+use Doctrine\Persistence\Mapping\Driver\FileClassLocator;
 use Doctrine\Persistence\Mapping\Driver\MappingDriver;
 use MongoDB\Client;
 use MongoDB\Driver\Manager;
 use MongoDB\Driver\Server;
 use MongoDB\Model\DatabaseInfo;
 use PHPUnit\Framework\TestCase;
 use ProxyManager\Proxy\LazyLoadingInterface;
-use Stubs\AttributeDriverFactory;
 
 use function array_key_exists;
 use function array_map;
+use function class_exists;
 use function count;
 use function explode;
 use function getenv;
@@ -124,7 +126,14 @@ public static function isLazyObject(object $document): bool
 
     protected static function createMetadataDriverImpl(): MappingDriver
     {
-        return AttributeDriverFactory::createAttributeDriver([__DIR__ . '/../../../../Documents']);
+        $paths = [__DIR__ . '/../../../../Documents'];
+
+        // Available in Doctrine Persistence 4.1+
+        if (class_exists(FileClassLocator::class)) {
+            $paths = FileClassLocator::createFromDirectories($paths);
+        }
+
+        return AttributeDriver::create($paths);
     }
 
     protected static function createTestDocumentManager(): DocumentManager

tests/Doctrine/ODM/MongoDB/Tests/Mapping/AbstractAnnotationDriverTestCase.php

@@ -14,7 +14,6 @@
 use Generator;
 use PHPUnit\Framework\Attributes\DataProvider;
 use stdClass;
-use Stubs\AnnotationDriverFactory;
 
 use function assert;
 
@@ -76,7 +75,7 @@ public function testFieldInheritance(): void
     public function testLoadMetadataForNonDocumentThrowsException(): void
     {
         $cm               = new ClassMetadata('stdClass');
-        $annotationDriver = AnnotationDriverFactory::createAnnotationDriver();
+        $annotationDriver = AnnotationDriver::create();
 
         $this->expectException(MappingException::class);
         $annotationDriver->loadMetadataForClass('stdClass', $cm);
@@ -86,7 +85,7 @@ public function testLoadMetadataForNonDocumentThrowsException(): void
     public function testColumnWithMissingTypeDefaultsToString(): void
     {
         $cm               = new ClassMetadata(ColumnWithoutType::class);
-        $annotationDriver = AnnotationDriverFactory::createAnnotationDriver();
+        $annotationDriver = AnnotationDriver::create();
 
         $annotationDriver->loadMetadataForClass(stdClass::class, $cm);
         self::assertEquals('id', $cm->fieldMappings['id']['type']);

tests/Doctrine/ODM/MongoDB/Tests/Mapping/AnnotationDriverTest.php

@@ -7,10 +7,12 @@
 use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
 use Doctrine\ODM\MongoDB\Mapping\Annotations\Document;
 use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
+use Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver;
+use Doctrine\Persistence\Mapping\Driver\FileClassLocator;
 use Doctrine\Persistence\Mapping\Driver\MappingDriver;
-use Stubs\AnnotationDriverFactory;
 
 use function call_user_func;
+use function class_exists;
 use function restore_error_handler;
 use function set_error_handler;
 use function sprintf;
@@ -21,7 +23,11 @@ class AnnotationDriverTest extends AbstractAnnotationDriverTestCase
 {
     protected static function loadDriver(array $paths = []): MappingDriver
     {
-        return AnnotationDriverFactory::createAnnotationDriver($paths);
+        if (class_exists(FileClassLocator::class)) {
+            $paths = FileClassLocator::createFromDirectories($paths);
+        }
+
+        return AnnotationDriver::create($paths);
     }
 
     public function testIndexesClassAnnotationEmitsDeprecationMessage(): void

tests/Doctrine/ODM/MongoDB/Tests/Mapping/AttributeDriverTest.php

@@ -4,13 +4,20 @@
 
 namespace Doctrine\ODM\MongoDB\Tests\Mapping;
 
+use Doctrine\ODM\MongoDB\Mapping\Driver\AttributeDriver;
+use Doctrine\Persistence\Mapping\Driver\FileClassLocator;
 use Doctrine\Persistence\Mapping\Driver\MappingDriver;
-use Stubs\AttributeDriverFactory;
+
+use function class_exists;
 
 class AttributeDriverTest extends AbstractAnnotationDriverTestCase
 {
     protected static function loadDriver(array $paths = []): MappingDriver
     {
-        return AttributeDriverFactory::createAttributeDriver($paths);
+        if (class_exists(FileClassLocator::class)) {
+            $paths = FileClassLocator::createFromDirectories($paths);
+        }
+
+        return AttributeDriver::create($paths);
     }
 }

tests/Doctrine/ODM/MongoDB/Tests/Tools/Console/Command/Schema/UpdateCommandTest.php

@@ -7,11 +7,13 @@
 use Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver;
 use Doctrine\ODM\MongoDB\Tests\Tools\Console\Command\AbstractCommandTestCase;
 use Doctrine\ODM\MongoDB\Tools\Console\Command\Schema\UpdateCommand;
+use Doctrine\Persistence\Mapping\Driver\FileClassLocator;
 use Documents\SchemaValidated;
-use Stubs\AnnotationDriverFactory;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Tester\CommandTester;
 
+use function class_exists;
+
 class UpdateCommandTest extends AbstractCommandTestCase
 {
     protected ?Command $command;
@@ -87,6 +89,12 @@ public function testDisabledValidatorsProcessing(): void
 
     private function createDriver(): AnnotationDriver
     {
-        return AnnotationDriverFactory::createAnnotationDriver([__DIR__ . '/../../../../../../../../Documents/Ecommerce']);
+        $paths = [__DIR__ . '/../../../../Documents/SchemaValidated'];
+        // Available in Doctrine Persistence 4.1+
+        if (class_exists(FileClassLocator::class)) {
+            $paths = FileClassLocator::createFromDirectories($paths);
+        }
+
+        return AnnotationDriver::create([__DIR__ . '/../../../../../../../../Documents/Ecommerce']);
     }
 }