Merge branch '6.4' into 7.3

* 6.4:
  Fix remaining SplObjectStorage deprecation

Author: nicolas-grekas

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

@@ -1098,7 +1098,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
                         $guardsConfiguration[$eventName][] = $configuration;
                     }
                     if ($transition['metadata']) {
-                        $transitionsMetadataDefinition->addMethodCall('attach', [
+                        $transitionsMetadataDefinition->addMethodCall('offsetSet', [
                             new Reference($transitionId),
                             $transition['metadata'],
                         ]);
@@ -1118,7 +1118,7 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
                                 $guardsConfiguration[$eventName][] = $configuration;
                             }
                             if ($transition['metadata']) {
-                                $transitionsMetadataDefinition->addMethodCall('attach', [
+                                $transitionsMetadataDefinition->addMethodCall('offsetSet', [
                                     new Reference($transitionId),
                                     $transition['metadata'],
                                 ]);

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php

@@ -389,7 +389,7 @@ public function testWorkflows()
         $transitionsMetadata = $metadataStoreDefinition->getArgument(2);
         $this->assertSame(\SplObjectStorage::class, $transitionsMetadata->getClass());
         $transitionsMetadataCall = $transitionsMetadata->getMethodCalls()[0];
-        $this->assertSame('attach', $transitionsMetadataCall[0]);
+        $this->assertSame('offsetSet', $transitionsMetadataCall[0]);
         $params = $transitionsMetadataCall[1];
         $this->assertCount(2, $params);
         $this->assertInstanceOf(Reference::class, $params[0]);

src/Symfony/Component/Console/Helper/TreeHelper.php

@@ -100,10 +100,10 @@ public function render(): void
         $visited = new \SplObjectStorage();
         foreach ($treeIterator as $node) {
             $currentNode = $node instanceof TreeNode ? $node : $treeIterator->getInnerIterator()->current();
-            if ($visited->contains($currentNode)) {
+            if (isset($visited[$currentNode])) {
                 throw new \LogicException(\sprintf('Cycle detected at node: "%s".', $currentNode->getValue()));
             }
-            $visited->attach($currentNode);
+            $visited[$currentNode] = true;
 
             $this->output->writeln($node);
         }