Merge branch '6.4' into 7.3

nicolas-grekas · nicolas-grekas · commit a1e23cf779af · 2025-08-13T15:39:13.000+02:00
* 6.4:
  Fix remaining SplObjectStorage deprecation
diff --git a/Helper/TreeHelper.php b/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);
         }

Original file line number	Diff line number	Diff line change
`@@ -100,10 +100,10 @@ public function render(): void`
`100`	`100`	`$visited = new \SplObjectStorage();`
`101`	`101`	`foreach ($treeIterator as $node) {`
`102`	`102`	`$currentNode = $node instanceof TreeNode ? $node : $treeIterator->getInnerIterator()->current();`
`103`		`- if ($visited->contains($currentNode)) {`
	`103`	`+ if (isset($visited[$currentNode])) {`
`104`	`104`	`throw new \LogicException(\sprintf('Cycle detected at node: "%s".', $currentNode->getValue()));`
`105`	`105`	`}`
`106`		`- $visited->attach($currentNode);`
	`106`	`+ $visited[$currentNode] = true;`
`107`	`107`
`108`	`108`	`$this->output->writeln($node);`
`109`	`109`	`}`