feature: add support for

Author: rela589n

composer.json

@@ -134,7 +134,7 @@
         "async-aws/sns": "^1.0",
         "cache/integration-tests": "dev-master",
         "doctrine/collections": "^1.8|^2.0",
-        "doctrine/data-fixtures": "^1.1",
+        "doctrine/data-fixtures": "^1.1|^2.0",
         "doctrine/dbal": "^3.6|^4",
         "doctrine/orm": "^2.15|^3",
         "dragonmantank/cron-expression": "^3.1",

src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php

@@ -11,10 +11,13 @@
 
 namespace Symfony\Bridge\Doctrine\DependencyInjection;
 
+use Doctrine\Persistence\Mapping\Driver\ClassLocator;
+use Doctrine\Persistence\Mapping\Driver\FileClassLocator;
 use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\Finder\Finder;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
@@ -30,6 +33,8 @@ abstract class AbstractDoctrineExtension extends Extension
     protected array $aliasMap = [];
 
     /**
+     * @var array<string,array<string,string>> An array of directory paths by namespace, indexed by driver type.
+     *
      * Used inside metadata driver method to simplify aggregation of data.
      */
     protected array $drivers = [];
@@ -202,6 +207,15 @@ protected function registerMappingDrivers(array $objectManager, ContainerBuilder
                 $mappingDriverDef->setArguments([array_flip($driverPaths)]);
                 $mappingDriverDef->addMethodCall('setGlobalBasename', ['mapping']);
             }
+            // Available since doctrine/persistence >= 4.1
+            if (interface_exists(ClassLocator::class)
+                && \in_array($driverType, ['annotation', 'attribute'], true)
+            ) {
+                /** @var string[] $directoryPaths */
+                $directoryPaths = $mappingDriverDef->getArgument(0);
+                $classLocator = $this->registerMappingClassLocatorService($objectManager['name'].'_'.$driverType, $container, $directoryPaths);
+                $mappingDriverDef->replaceArgument(0, new Reference($classLocator));
+            }
 
             $container->setDefinition($mappingService, $mappingDriverDef);
 
@@ -213,6 +227,40 @@ protected function registerMappingDrivers(array $objectManager, ContainerBuilder
         $container->setDefinition($this->getObjectManagerElementName($objectManager['name'].'_metadata_driver'), $chainDriverDef);
     }
 
+    /** @param string[] $dirs */
+    private function registerMappingClassLocatorService(string $driverName, ContainerBuilder $container, array $dirs): string
+    {
+        $classLocator = $this->getObjectManagerElementName($driverName.'_mapping_class_locator');
+
+        $iteratorDefinition = new Definition(
+            FileClassLocator::class,
+            [new Reference($this->registerMappingClassFinderService($driverName, $container, $dirs))],
+        );
+
+        $container->setDefinition($classLocator, $iteratorDefinition);
+
+        return $classLocator;
+    }
+
+    private function registerMappingClassFinderService(string $driverName, ContainerBuilder $container, array $dirs): string
+    {
+        $finderService = $this->getObjectManagerElementName($driverName.'_mapping_class_finder');
+
+        if ($container->hasDefinition($finderService)) {
+            $finderDefinition = $container->getDefinition($finderService);
+        } else {
+            $finderDefinition = new Definition(Finder::class, []);
+        }
+
+        $finderDefinition->addMethodCall('files');
+        $finderDefinition->addMethodCall('name', ['*.php']);
+        $finderDefinition->addMethodCall('in', [$dirs]);
+
+        $container->setDefinition($finderService, $finderDefinition);
+
+        return $finderService;
+    }
+
     /**
      * Assertion if the specified mapping information is valid.
      *

src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php

@@ -11,13 +11,16 @@
 
 namespace Symfony\Bridge\Doctrine\Tests\DependencyInjection;
 
+use Doctrine\Persistence\Mapping\Driver\ClassLocator;
+use Doctrine\Persistence\Mapping\Driver\FileClassLocator;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\Doctrine\DependencyInjection\AbstractDoctrineExtension;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+use Symfony\Component\Finder\Finder;
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 
 /**
@@ -55,6 +58,37 @@ protected function setUp(): void
             ->willReturn('orm');
     }
 
+    public function testRegisterMappingFilesIteratorService(): void
+    {
+        if (!interface_exists(ClassLocator::class)) {
+            $this->markTestSkipped('This test is only relevant for versions of doctrine/persistence >= 4.1');
+        }
+
+        $driverName = 'default_attribute';
+        $container = $this->createContainer();
+        $dirs = [__DIR__.'/../Fixtures'];
+
+        $locatorServiceId = $this->invokeRegisterMappingClassLocatorService($driverName, $container, $dirs);
+
+        $this->assertSame('doctrine.orm.default_attribute_mapping_class_locator', $locatorServiceId);
+        $fileClassLocator = $container->get($locatorServiceId);
+        $this->assertInstanceOf(FileClassLocator::class, $fileClassLocator);
+
+        $classNames = $fileClassLocator->getClassNames();
+        self::assertGreaterThan(1, \count($classNames));
+
+        $finderServiceId = 'doctrine.orm.default_attribute_mapping_class_finder';
+        $finderDefinition = $container->getDefinition($finderServiceId);
+
+        $this->assertSame(Finder::class, $finderDefinition->getClass());
+        $this->assertTrue($finderDefinition->isShared());
+        $this->assertSame([
+            ['files', []],
+            ['name', ['*.php']],
+            ['in', [$dirs]],
+        ], $finderDefinition->getMethodCalls());
+    }
+
     public function testFixManagersAutoMappingsWithTwoAutomappings()
     {
         $emConfigs = [
@@ -334,4 +368,16 @@ protected function createContainer(array $data = [], array $extraBundles = []):
             'kernel.project_dir' => __DIR__,
         ], $data)));
     }
+
+    /** @param string[] $dirs */
+    private function invokeRegisterMappingClassLocatorService(string $driverName, ContainerBuilder $container, array $dirs): string
+    {
+        $reflection = new \ReflectionClass($this->extension);
+        $method = $reflection->getMethod('registerMappingClassLocatorService');
+
+        /** @var string $locatorServiceId */
+        $locatorServiceId = $method->invoke($this->extension, $driverName, $container, $dirs);
+
+        return $locatorServiceId;
+    }
 }