Merge branch '7.2' into 7.3

nicolas-grekas · nicolas-grekas · commit a7c6caa9d611 · 2025-06-27T21:55:54.000+02:00
* 7.2:
  -
  [Console] Table counts wrong column width when using colspan and `setColumnMaxWidth()`
  [Console] Table counts wrong number of padding symbols in `renderCell()` method when cell contain unicode variant selector
  [Cache] Fix using a `ChainAdapter` as an adapter for a pool
  [Serializer] Fix collect_denormalization_errors flag in defaultContext
  [TypeInfo] Fix handling `ConstFetchNode`
  [VarDumper] Avoid deprecated call in PgSqlCaster
  Fix command option mode (InputOption::VALUE_REQUIRED)
  use an EOL-agnostic approach to parse class uses
  [Uid] Improve entropy of the increment for UUIDv7
  [HttpKernel] Fix `#[MapUploadedFile]` handling for optional file uploads
diff --git a/DependencyInjection/CachePoolPass.php b/DependencyInjection/CachePoolPass.php
@@ -55,9 +55,11 @@ public function process(ContainerBuilder $container): void
                 continue;
             }
             $class = $adapter->getClass();
+            $providers = $adapter->getArguments();
             while ($adapter instanceof ChildDefinition) {
                 $adapter = $container->findDefinition($adapter->getParent());
                 $class = $class ?: $adapter->getClass();
+                $providers += $adapter->getArguments();
                 if ($t = $adapter->getTag('cache.pool')) {
                     $tags[0] += $t[0];
                 }
@@ -87,7 +89,7 @@ public function process(ContainerBuilder $container): void
 
             if (ChainAdapter::class === $class) {
                 $adapters = [];
-                foreach ($adapter->getArgument(0) as $provider => $adapter) {
+                foreach ($providers['index_0'] ?? $providers[0] as $provider => $adapter) {
                     if ($adapter instanceof ChildDefinition) {
                         $chainedPool = $adapter;
                     } else {
diff --git a/Tests/DependencyInjection/CachePoolPassTest.php b/Tests/DependencyInjection/CachePoolPassTest.php
@@ -209,7 +209,8 @@ public function testChainAdapterPool()
         $container->register('cache.adapter.apcu', ApcuAdapter::class)
             ->setArguments([null, 0, null])
             ->addTag('cache.pool');
-        $container->register('cache.chain', ChainAdapter::class)
+        $container->register('cache.adapter.chain', ChainAdapter::class);
+        $container->setDefinition('cache.chain', new ChildDefinition('cache.adapter.chain'))
             ->addArgument(['cache.adapter.array', 'cache.adapter.apcu'])
             ->addTag('cache.pool');
         $container->setDefinition('cache.app', new ChildDefinition('cache.chain'))
@@ -224,7 +225,7 @@ public function testChainAdapterPool()
         $this->assertSame('cache.chain', $appCachePool->getParent());
 
         $chainCachePool = $container->getDefinition('cache.chain');
-        $this->assertNotInstanceOf(ChildDefinition::class, $chainCachePool);
+        $this->assertInstanceOf(ChildDefinition::class, $chainCachePool);
         $this->assertCount(2, $chainCachePool->getArgument(0));
         $this->assertInstanceOf(ChildDefinition::class, $chainCachePool->getArgument(0)[0]);
         $this->assertSame('cache.adapter.array', $chainCachePool->getArgument(0)[0]->getParent());
