Merge branch '4.4' into 5.4

* 4.4:
  [FrameworkBundle] fix tests
  [FrameworkBundle] fix wiring of annotations.cached_reader
  Fix BC break

Author: nicolas-grekas

Command/AbstractConfigCommand.php

@@ -16,7 +16,6 @@
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\StyleInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\ConfigurationExtensionInterface;
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 
@@ -61,7 +60,7 @@ protected function listBundles($output)
     /**
      * @return ExtensionInterface
      */
-    protected function findExtension(string $name, ContainerBuilder $container)
+    protected function findExtension(string $name)
     {
         $bundles = $this->initializeBundles();
         $minScore = \INF;
@@ -99,6 +98,8 @@ protected function findExtension(string $name, ContainerBuilder $container)
             }
         }
 
+        $container = $this->getContainerBuilder();
+
         if ($container->hasExtension($name)) {
             return $container->getExtension($name);
         }

Command/ConfigDebugCommand.php

@@ -92,9 +92,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             return 0;
         }
 
-        $container = $this->compileContainer();
-        $extension = $this->findExtension($name, $container);
+        $extension = $this->findExtension($name);
         $extensionAlias = $extension->getAlias();
+        $container = $this->compileContainer();
 
         $config = $this->getConfig($extension, $container);
 
@@ -197,8 +197,7 @@ public function complete(CompletionInput $input, CompletionSuggestions $suggesti
 
         if ($input->mustSuggestArgumentValuesFor('path') && null !== $name = $input->getArgument('name')) {
             try {
-                $container = $this->compileContainer();
-                $config = $this->getConfig($this->findExtension($name, $container), $container);
+                $config = $this->getConfig($this->findExtension($name), $this->compileContainer());
                 $paths = array_keys(self::buildPathsCompletion($config));
                 $suggestions->suggestValues($paths);
             } catch (LogicException $e) {

Command/ConfigDumpReferenceCommand.php

@@ -105,13 +105,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             return 0;
         }
 
-        $container = $this->getContainerBuilder($this->getApplication()->getKernel());
-        $extension = $this->findExtension($name, $container);
+        $extension = $this->findExtension($name);
 
         if ($extension instanceof ConfigurationInterface) {
             $configuration = $extension;
         } else {
-            $configuration = $extension->getConfiguration([], $container);
+            $configuration = $extension->getConfiguration([], $this->getContainerBuilder());
         }
 
         $this->validateConfiguration($extension, $configuration);

DependencyInjection/Compiler/AddAnnotationsCachedReaderPass.php

@@ -29,7 +29,6 @@ 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'])) {

DependencyInjection/Compiler/UnusedTagsPass.php

@@ -30,6 +30,7 @@ class UnusedTagsPass implements CompilerPassInterface
         'chatter.transport_factory',
         'config_cache.resource_checker',
         'console.command',
+        'container.do_not_inline',
         'container.env_var_loader',
         'container.env_var_processor',
         'container.hot_path',

DependencyInjection/FrameworkExtension.php

@@ -634,6 +634,8 @@ public function load(array $configs, ContainerBuilder $container)
             ->addTag('routing.route_loader');
 
         $container->setParameter('container.behavior_describing_tags', [
+            'annotations.cached_reader',
+            'container.do_not_inline',
             'container.service_locator',
             'container.service_subscriber',
             'kernel.event_subscriber',
@@ -1661,11 +1663,9 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
 
         $container
             ->getDefinition('annotations.cached_reader')
-            ->setPublic(true) // set to false in AddAnnotationsCachedReaderPass
             ->replaceArgument(2, $config['debug'])
             // reference the cache provider without using it until AddAnnotationsCachedReaderPass runs
             ->addArgument(new ServiceClosureArgument(new Reference($cacheService)))
-            ->addTag('annotations.cached_reader')
         ;
 
         $container->setAlias('annotation_reader', 'annotations.cached_reader');

Resources/config/annotations.php

@@ -38,6 +38,8 @@
                 inline_service(ArrayAdapter::class),
                 abstract_arg('Debug-Flag'),
             ])
+            ->tag('annotations.cached_reader')
+            ->tag('container.do_not_inline')
 
         ->set('annotations.filesystem_cache_adapter', FilesystemAdapter::class)
             ->args([

Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -1969,6 +1969,8 @@ public function testRegisterParameterCollectingBehaviorDescribingTags()
 
         $this->assertTrue($container->hasParameter('container.behavior_describing_tags'));
         $this->assertEquals([
+            'annotations.cached_reader',
+            'container.do_not_inline',
             'container.service_locator',
             'container.service_subscriber',
             'kernel.event_subscriber',