Merge branch '5.4' into 6.0

* 5.4: (22 commits)
  fix cs
  Update validators.lv.xlf
  Fix API gateway service name
  Improve recommendation message for "composer req"
  Fix CS in composer.json
  [DependencyInjection] fix preloading
  Update validators.uz.xlf
  AddMake ExpressionVoter Cacheable
  Add framework config for DBAL cache adapter
  [ExpressionLanguage] Fix LexerTest number types
  [Process] intersect with getenv() to populate default envs
  Improve CI script a bit
  Fix deprecation message placeholders
  [Cache] Fix calculate ttl in couchbase sdk 3.0
  Fix Loco Provider
  [Cache] fix dbindex Redis
  Fix typos in a test message
  [Cache] fix releasing not acquired locks
  [DependencyInjection] fix creating 2nd container instances
  Never rely on dynamic properties
  ...

Author: nicolas-grekas

CHANGELOG.md

@@ -12,6 +12,9 @@ CHANGELOG
  * Add `DoctrineOpenTransactionLoggerMiddleware` to log when a transaction has been left open
  * Deprecate `PdoCacheAdapterDoctrineSchemaSubscriber` and add `DoctrineDbalCacheAdapterSchemaSubscriber` instead
  * `UniqueEntity` constraint retrieves a maximum of two entities if the default repository method is used.
+ * Add support for the newer bundle structure to `AbstractDoctrineExtension::loadMappingInformation()`
+ * Add argument `$bundleDir` to `AbstractDoctrineExtension::getMappingDriverBundleConfigDefaults()`
+ * Add argument `$bundleDir` to `AbstractDoctrineExtension::getMappingResourceConfigDirectory()`
 
 5.3
 ---

DependencyInjection/AbstractDoctrineExtension.php

@@ -73,9 +73,11 @@ protected function loadMappingInformation(array $objectManager, ContainerBuilder
 
             if ($mappingConfig['is_bundle']) {
                 $bundle = null;
+                $bundleMetadata = null;
                 foreach ($container->getParameter('kernel.bundles') as $name => $class) {
                     if ($mappingName === $name) {
                         $bundle = new \ReflectionClass($class);
+                        $bundleMetadata = $container->getParameter('kernel.bundles_metadata')[$name];
 
                         break;
                     }
@@ -85,7 +87,7 @@ protected function loadMappingInformation(array $objectManager, ContainerBuilder
                     throw new \InvalidArgumentException(sprintf('Bundle "%s" does not exist or it is not enabled.', $mappingName));
                 }
 
-                $mappingConfig = $this->getMappingDriverBundleConfigDefaults($mappingConfig, $bundle, $container);
+                $mappingConfig = $this->getMappingDriverBundleConfigDefaults($mappingConfig, $bundle, $container, $bundleMetadata['path']);
                 if (!$mappingConfig) {
                     continue;
                 }
@@ -135,9 +137,9 @@ protected function setMappingDriverConfig(array $mappingConfig, string $mappingN
      *
      * @return array|false
      */
-    protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \ReflectionClass $bundle, ContainerBuilder $container): array|false
+    protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \ReflectionClass $bundle, ContainerBuilder $container, string $bundleDir = null): array|false
     {
-        $bundleDir = \dirname($bundle->getFileName());
+        $bundleDir ??= \dirname($bundle->getFileName());
 
         if (!$bundleConfig['type']) {
             $bundleConfig['type'] = $this->detectMetadataDriver($bundleDir, $container);
@@ -152,7 +154,7 @@ protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \Re
             if (\in_array($bundleConfig['type'], ['annotation', 'staticphp', 'attribute'])) {
                 $bundleConfig['dir'] = $bundleDir.'/'.$this->getMappingObjectDefaultName();
             } else {
-                $bundleConfig['dir'] = $bundleDir.'/'.$this->getMappingResourceConfigDirectory();
+                $bundleConfig['dir'] = $bundleDir.'/'.$this->getMappingResourceConfigDirectory($bundleDir);
             }
         } else {
             $bundleConfig['dir'] = $bundleDir.'/'.$bundleConfig['dir'];
@@ -244,7 +246,7 @@ protected function assertValidMappingConfiguration(array $mappingConfig, string
      */
     protected function detectMetadataDriver(string $dir, ContainerBuilder $container): ?string
     {
-        $configPath = $this->getMappingResourceConfigDirectory();
+        $configPath = $this->getMappingResourceConfigDirectory($dir);
         $extension = $this->getMappingResourceExtension();
 
         if (glob($dir.'/'.$configPath.'/*.'.$extension.'.xml', \GLOB_NOSORT)) {
@@ -426,7 +428,7 @@ abstract protected function getMappingObjectDefaultName(): string;
     /**
      * Relative path from the bundle root to the directory where mapping files reside.
      */
-    abstract protected function getMappingResourceConfigDirectory(): string;
+    abstract protected function getMappingResourceConfigDirectory(string $bundleDir = null): string;
 
     /**
      * Extension used by the mapping files.

SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriber.php

@@ -14,7 +14,7 @@
 use Doctrine\Common\EventSubscriber;
 use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
 use Doctrine\ORM\Tools\ToolEvents;
-use Symfony\Component\Cache\Adapter\DoctrineSchemaConfiguratorInterface;
+use Symfony\Component\Cache\Adapter\DoctrineDbalAdapter;
 
 /**
  * Automatically adds the cache table needed for the DoctrineDbalAdapter of
@@ -27,7 +27,7 @@ final class DoctrineDbalCacheAdapterSchemaSubscriber implements EventSubscriber
     private $dbalAdapters;
 
     /**
-     * @param iterable<mixed, DoctrineSchemaConfiguratorInterface> $dbalAdapters
+     * @param iterable<mixed, DoctrineDbalAdapter> $dbalAdapters
      */
     public function __construct(iterable $dbalAdapters)
     {

Tests/SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriberTest.php

@@ -17,7 +17,7 @@
 use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\Doctrine\SchemaListener\DoctrineDbalCacheAdapterSchemaSubscriber;
-use Symfony\Component\Cache\Adapter\DoctrineSchemaConfiguratorInterface;
+use Symfony\Component\Cache\Adapter\DoctrineDbalAdapter;
 
 class DoctrineDbalCacheAdapterSchemaSubscriberTest extends TestCase
 {
@@ -29,14 +29,15 @@ public function testPostGenerateSchema()
         $entityManager->expects($this->once())
             ->method('getConnection')
             ->willReturn($dbalConnection);
+
         $event = new GenerateSchemaEventArgs($entityManager, $schema);
 
-        $pdoAdapter = $this->createMock(DoctrineSchemaConfiguratorInterface::class);
-        $pdoAdapter->expects($this->once())
+        $dbalAdapter = $this->createMock(DoctrineDbalAdapter::class);
+        $dbalAdapter->expects($this->once())
             ->method('configureSchema')
             ->with($schema, $dbalConnection);
 
-        $subscriber = new DoctrineDbalCacheAdapterSchemaSubscriber([$pdoAdapter]);
+        $subscriber = new DoctrineDbalCacheAdapterSchemaSubscriber([$dbalAdapter]);
         $subscriber->postGenerateSchema($event);
     }
 }