Merge branch '6.0' into 6.1

* 6.0:
  Fix merge
  [FrameworkBundle] fix tests
  [FrameworkBundle] fix wiring of annotations.cached_reader
  [SecurityBundle] Remove dead `class_exists` checks
  Fix BC break
  [DependencyInjection] Ignore unused bindings defined by attribute
  [ErrorHandler] update tentative types

Author: nicolas-grekas

Compiler/DecoratorServicePass.php

@@ -40,6 +40,10 @@ public function process(ContainerBuilder $container)
         }
         $decoratingDefinitions = [];
 
+        $tagsToKeep = $container->hasParameter('container.behavior_describing_tags')
+            ? $container->getParameter('container.behavior_describing_tags')
+            : ['container.do_not_inline', 'container.service_locator', 'container.service_subscriber'];
+
         foreach ($definitions as [$id, $definition]) {
             $decoratedService = $definition->getDecoratedService();
             [$inner, $renamedId] = $decoratedService;
@@ -90,8 +94,8 @@ public function process(ContainerBuilder $container)
                 $decoratingTags = $decoratingDefinition->getTags();
                 $resetTags = [];
 
-                // container.service_locator and container.service_subscriber have special logic and they must not be transferred out to decorators
-                foreach (['container.service_locator', 'container.service_subscriber'] as $containerTag) {
+                // Behavior-describing tags must not be transferred out to decorators
+                foreach ($tagsToKeep as $containerTag) {
                     if (isset($decoratingTags[$containerTag])) {
                         $resetTags[$containerTag] = $decoratingTags[$containerTag];
                         unset($decoratingTags[$containerTag]);

Compiler/InlineServiceDefinitionsPass.php

@@ -163,7 +163,7 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
      */
     private function isInlineableDefinition(string $id, Definition $definition): bool
     {
-        if ($definition->hasErrors() || $definition->isDeprecated() || $definition->isLazy() || $definition->isSynthetic()) {
+        if ($definition->hasErrors() || $definition->isDeprecated() || $definition->isLazy() || $definition->isSynthetic() || $definition->hasTag('container.do_not_inline')) {
             return false;
         }
 

Compiler/RegisterAutoconfigureAttributesPass.php

@@ -77,7 +77,8 @@ private static function registerForAutoconfiguration(ContainerBuilder $container
                         ],
                     ],
                 ],
-                $class->getFileName()
+                $class->getFileName(),
+                false
             );
         };
 

Loader/YamlFileLoader.php

@@ -220,7 +220,7 @@ private function parseImports(array $content, string $file)
         }
     }
 
-    private function parseDefinitions(array $content, string $file)
+    private function parseDefinitions(array $content, string $file, bool $trackBindings = true)
     {
         if (!isset($content['services'])) {
             return;
@@ -246,14 +246,14 @@ private function parseDefinitions(array $content, string $file)
                 if (\is_string($service) && str_starts_with($service, '@')) {
                     throw new InvalidArgumentException(sprintf('Type definition "%s" cannot be an alias within "_instanceof" in "%s". Check your YAML syntax.', $id, $file));
                 }
-                $this->parseDefinition($id, $service, $file, []);
+                $this->parseDefinition($id, $service, $file, [], false, $trackBindings);
             }
         }
 
         $this->isLoadingInstanceof = false;
         $defaults = $this->parseDefaults($content, $file);
         foreach ($content['services'] as $id => $service) {
-            $this->parseDefinition($id, $service, $file, $defaults);
+            $this->parseDefinition($id, $service, $file, $defaults, false, $trackBindings);
         }
     }
 
@@ -338,7 +338,7 @@ private function isUsingShortSyntax(array $service): bool
     /**
      * @throws InvalidArgumentException When tags are invalid
      */
-    private function parseDefinition(string $id, array|string|null $service, string $file, array $defaults, bool $return = false)
+    private function parseDefinition(string $id, array|string|null $service, string $file, array $defaults, bool $return = false, bool $trackBindings = true)
     {
         if (preg_match('/^_[a-zA-Z0-9_]*$/', $id)) {
             throw new InvalidArgumentException(sprintf('Service names that start with an underscore are reserved. Rename the "%s" service or define it in XML instead.', $id));
@@ -662,7 +662,7 @@ private function parseDefinition(string $id, array|string|null $service, string
                 $bindingType = $this->isLoadingInstanceof ? BoundArgument::INSTANCEOF_BINDING : BoundArgument::SERVICE_BINDING;
                 foreach ($bindings as $argument => $value) {
                     if (!$value instanceof BoundArgument) {
-                        $bindings[$argument] = new BoundArgument($value, true, $bindingType, $file);
+                        $bindings[$argument] = new BoundArgument($value, $trackBindings, $bindingType, $file);
                     }
                 }
             }

Tests/Compiler/InlineServiceDefinitionsPassTest.php

@@ -323,6 +323,34 @@ public function testProcessDoesNotSetLazyArgumentValuesAfterInlining()
         $this->assertSame('inline', (string) $values[0]);
     }
 
+    public function testDoNotInline()
+    {
+        $container = new ContainerBuilder();
+        $container->register('decorated1', 'decorated1')->addTag('container.do_not_inline');
+        $container->register('decorated2', 'decorated2')->addTag('container.do_not_inline');
+        $container->setAlias('alias2', 'decorated2');
+
+        $container
+            ->register('s1', 's1')
+            ->setDecoratedService('decorated1')
+            ->setPublic(true)
+            ->setProperties(['inner' => new Reference('s1.inner')]);
+
+        $container
+            ->register('s2', 's2')
+            ->setDecoratedService('alias2')
+            ->setPublic(true)
+            ->setProperties(['inner' => new Reference('s2.inner')]);
+
+        $container->compile();
+
+        $this->assertFalse($container->hasAlias('alias2'));
+        $this->assertEquals(new Reference('decorated2'), $container->getDefinition('s2')->getProperties()['inner']);
+        $this->assertEquals(new Reference('s1.inner'), $container->getDefinition('s1')->getProperties()['inner']);
+        $this->assertSame('decorated2', $container->getDefinition('decorated2')->getClass());
+        $this->assertSame('decorated1', $container->getDefinition('s1.inner')->getClass());
+    }
+
     protected function process(ContainerBuilder $container)
     {
         (new InlineServiceDefinitionsPass(new AnalyzeServiceReferencesPass()))->process($container);

Tests/Compiler/RegisterAutoconfigureAttributesPassTest.php

@@ -31,7 +31,7 @@ public function testProcess()
 
         (new RegisterAutoconfigureAttributesPass())->process($container);
 
-        $argument = new BoundArgument(1, true, BoundArgument::INSTANCEOF_BINDING, realpath(__DIR__.'/../Fixtures/AutoconfigureAttributed.php'));
+        $argument = new BoundArgument(1, false, BoundArgument::INSTANCEOF_BINDING, realpath(__DIR__.'/../Fixtures/AutoconfigureAttributed.php'));
         $values = $argument->getValues();
         --$values[1];
         $argument->setValues($values);