Merge branch '6.4' into 7.0

* 6.4:
  [PhpUnitBridge] Kill the last concurrent process when it stales for more than 60s
  [Intl] fix test
  [Intl] Use VarExporter::export() in PhpBundleWriter
  [Console] The application also catch `\Throwable` exceptions
  FrameworkBundle] Fix tests
  [Mailer] Fix Brevo transport factory registration
  Simplify tests
  [Notifier] Fix Esendex messages serialization
  Use triggering class to generate baseline for deprecation messages from DebugClassLoader
  [Security] Fix false-string handling in RememberMeAuthenticator
  [CssSelector] Tests on Xpath translator will always pass
  [Serializer] Fix Normalizer not utilizing converted name for index variadic param
  [DepdencyInjection] Fix costly logic when checking errored definitions
  Fix merge
  fix children cond
  [DoctrineBridge] Load refreshed user proxy
  [DependencyInjection] Don't ignore attributes on the actual decorator
  [FrameworkBundle] Prevent `cache:clear` to lose files on subsequent runs

Author: nicolas-grekas

Compiler/DefinitionErrorExceptionPass.php

@@ -28,53 +28,17 @@ class DefinitionErrorExceptionPass extends AbstractRecursivePass
     protected bool $skipScalars = true;
 
     private array $erroredDefinitions = [];
-    private array $targetReferences = [];
     private array $sourceReferences = [];
 
     public function process(ContainerBuilder $container): void
     {
         try {
             parent::process($container);
 
-            if (!$this->erroredDefinitions) {
-                return;
-            }
-
-            $runtimeIds = [];
-
-            foreach ($this->sourceReferences as $id => $sourceIds) {
-                foreach ($sourceIds as $sourceId => $isRuntime) {
-                    if (!$isRuntime) {
-                        continue 2;
-                    }
-                }
-
-                unset($this->erroredDefinitions[$id]);
-                $runtimeIds[$id] = $id;
-            }
-
-            if (!$this->erroredDefinitions) {
-                return;
-            }
-
-            foreach ($this->targetReferences as $id => $targetIds) {
-                if (!isset($this->sourceReferences[$id]) || isset($runtimeIds[$id]) || isset($this->erroredDefinitions[$id])) {
-                    continue;
-                }
-                foreach ($this->targetReferences[$id] as $targetId => $isRuntime) {
-                    foreach ($this->sourceReferences[$id] as $sourceId => $isRuntime) {
-                        if ($sourceId !== $targetId) {
-                            $this->sourceReferences[$targetId][$sourceId] = false;
-                            $this->targetReferences[$sourceId][$targetId] = false;
-                        }
-                    }
-                }
-
-                unset($this->sourceReferences[$id]);
-            }
+            $visitedIds = [];
 
             foreach ($this->erroredDefinitions as $id => $definition) {
-                if (isset($this->sourceReferences[$id])) {
+                if ($this->isErrorForRuntime($id, $visitedIds)) {
                     continue;
                 }
 
@@ -85,7 +49,6 @@ public function process(ContainerBuilder $container): void
             }
         } finally {
             $this->erroredDefinitions = [];
-            $this->targetReferences = [];
             $this->sourceReferences = [];
         }
     }
@@ -101,10 +64,8 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
         if ($value instanceof Reference && $this->currentId !== $targetId = (string) $value) {
             if (ContainerInterface::RUNTIME_EXCEPTION_ON_INVALID_REFERENCE === $value->getInvalidBehavior()) {
                 $this->sourceReferences[$targetId][$this->currentId] ??= true;
-                $this->targetReferences[$this->currentId][$targetId] ??= true;
             } else {
                 $this->sourceReferences[$targetId][$this->currentId] = false;
-                $this->targetReferences[$this->currentId][$targetId] = false;
             }
 
             return $value;
@@ -118,4 +79,29 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
 
         return parent::processValue($value);
     }
+
+    private function isErrorForRuntime(string $id, array &$visitedIds): bool
+    {
+        if (!isset($this->sourceReferences[$id])) {
+            return false;
+        }
+
+        if (isset($visitedIds[$id])) {
+            return $visitedIds[$id];
+        }
+
+        $visitedIds[$id] = true;
+
+        foreach ($this->sourceReferences[$id] as $sourceId => $isRuntime) {
+            if ($visitedIds[$sourceId] ?? $visitedIds[$sourceId] = $this->isErrorForRuntime($sourceId, $visitedIds)) {
+                continue;
+            }
+
+            if (!$isRuntime) {
+                return false;
+            }
+        }
+
+        return true;
+    }
 }

Compiler/ResolveInstanceofConditionalsPass.php

@@ -84,7 +84,7 @@ private function processDefinition(ContainerBuilder $container, string $id, Defi
                 $instanceofDef->setAbstract(true)->setParent($parent ?: '.abstract.instanceof.'.$id);
                 $parent = '.instanceof.'.$interface.'.'.$key.'.'.$id;
                 $container->setDefinition($parent, $instanceofDef);
-                $instanceofTags[] = $instanceofDef->getTags();
+                $instanceofTags[] = [$interface, $instanceofDef->getTags()];
                 $instanceofBindings = $instanceofDef->getBindings() + $instanceofBindings;
 
                 foreach ($instanceofDef->getMethodCalls() as $methodCall) {
@@ -123,8 +123,9 @@ private function processDefinition(ContainerBuilder $container, string $id, Defi
             // Don't add tags to service decorators
             $i = \count($instanceofTags);
             while (0 <= --$i) {
-                foreach ($instanceofTags[$i] as $k => $v) {
-                    if (null === $definition->getDecoratedService() || \in_array($k, $tagsToKeep, true)) {
+                [$interface, $tags] = $instanceofTags[$i];
+                foreach ($tags as $k => $v) {
+                    if (null === $definition->getDecoratedService() || $interface === $definition->getClass() || \in_array($k, $tagsToKeep, true)) {
                         foreach ($v as $v) {
                             if ($definition->hasTag($k) && \in_array($v, $definition->getTag($k))) {
                                 continue;

Tests/Compiler/ResolveInstanceofConditionalsPassTest.php

@@ -318,18 +318,26 @@ public function testDecoratorsAreNotAutomaticallyTagged()
         $decorator->setDecoratedService('decorated');
         $decorator->setInstanceofConditionals([
             parent::class => (new ChildDefinition(''))->addTag('tag'),
+            self::class => (new ChildDefinition(''))->addTag('other-tag'),
         ]);
         $decorator->setAutoconfigured(true);
         $decorator->addTag('manual');
 
         $container->registerForAutoconfiguration(parent::class)
             ->addTag('tag')
         ;
+        $container->registerForAutoconfiguration(self::class)
+            ->addTag('last-tag')
+        ;
 
         (new ResolveInstanceofConditionalsPass())->process($container);
         (new ResolveChildDefinitionsPass())->process($container);
 
-        $this->assertSame(['manual' => [[]]], $container->getDefinition('decorator')->getTags());
+        $this->assertSame([
+            'manual' => [[]],
+            'other-tag' => [[]],
+            'last-tag' => [[]],
+        ], $container->getDefinition('decorator')->getTags());
     }
 
     public function testDecoratorsKeepBehaviorDescribingTags()