Merge branch '5.4' into 6.0

* 5.4:
  Fix merge
  [HttpKernel] Guard against bad profile data
  Fix deprecations on PHP 8.2

Author: nicolas-grekas

DependencyInjection/Compiler/AddAnnotationsCachedReaderPass.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;
 
+use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
@@ -28,14 +29,18 @@ public function process(ContainerBuilder $container)
         // "annotation_reader" at build time don't get any cache
         foreach ($container->findTaggedServiceIds('annotations.cached_reader') as $id => $tags) {
             $reader = $container->getDefinition($id);
+            $reader->setPublic(false);
             $properties = $reader->getProperties();
 
             if (isset($properties['cacheProviderBackup'])) {
                 $provider = $properties['cacheProviderBackup']->getValues()[0];
                 unset($properties['cacheProviderBackup']);
                 $reader->setProperties($properties);
-                $container->set($id, null);
-                $container->setDefinition($id, $reader->replaceArgument(1, $provider));
+                $reader->replaceArgument(1, $provider);
+            } elseif (4 <= \count($arguments = $reader->getArguments()) && $arguments[3] instanceof ServiceClosureArgument) {
+                $arguments[1] = $arguments[3]->getValues()[0];
+                unset($arguments[3]);
+                $reader->setArguments($arguments);
             }
         }
     }

DependencyInjection/FrameworkExtension.php

@@ -1594,9 +1594,10 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
 
         $container
             ->getDefinition('annotations.cached_reader')
+            ->setPublic(true) // set to false in AddAnnotationsCachedReaderPass
             ->replaceArgument(2, $config['debug'])
-            // temporary property to lazy-reference the cache provider without using it until AddAnnotationsCachedReaderPass runs
-            ->setProperty('cacheProviderBackup', new ServiceClosureArgument(new Reference($cacheService)))
+            // reference the cache provider without using it until AddAnnotationsCachedReaderPass runs
+            ->addArgument(new ServiceClosureArgument(new Reference($cacheService)))
             ->addTag('annotations.cached_reader')
         ;