Remove deprecated calls to deprecated methods of SplObjectStorage

nicolas-grekas · nicolas-grekas · commit a038d699328b · 2025-08-13T11:41:44.000+02:00
diff --git a/src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php b/src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php
@@ -144,7 +144,7 @@ private function sendToElasticsearch(array $records): void
             ],
         ]);
 
-        $this->responses->attach($response);
+        $this->responses[$response] = null;
 
         $this->wait(false);
     }
@@ -178,10 +178,10 @@ private function wait(bool $blocking): void
                     continue;
                 }
                 if ($chunk->isLast()) {
-                    $this->responses->detach($response);
+                    unset($this->responses[$response]);
                 }
             } catch (ExceptionInterface $e) {
-                $this->responses->detach($response);
+                unset($this->responses[$response]);
                 error_log(\sprintf("Could not push logs to Elasticsearch:\n%s", (string) $e));
             }
         }
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/WorkflowExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/WorkflowExtensionTest.php
@@ -36,7 +36,7 @@ protected function setUp(): void
         ];
 
         $transitionsMetadata = new \SplObjectStorage();
-        $transitionsMetadata->attach($this->t1, ['title' => 't1 title']);
+        $transitionsMetadata[$this->t1] = ['title' => 't1 title'];
         $metadataStore = new InMemoryMetadataStore(
             ['title' => 'workflow title'],
             ['orderer' => ['title' => 'ordered title']],
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -814,7 +814,7 @@ private function addServiceConfigurator(Definition $definition, string $variable
 
         if (\is_array($callable)) {
             if ($callable[0] instanceof Reference
-                || ($callable[0] instanceof Definition && $this->definitionVariables->contains($callable[0]))
+                || ($callable[0] instanceof Definition && $this->definitionVariables->offsetExists($callable[0]))
             ) {
                 return \sprintf("        %s->%s(\$%s);\n", $this->dumpValue($callable[0]), $callable[1], $variableName);
             }
@@ -1205,15 +1205,15 @@ private function addNewInstance(Definition $definition, string $return = '', ?st
 
             if (['...'] === $arguments && ('Closure' !== ($class = $definition->getClass() ?: 'Closure') || $definition->isLazy() && (
                 $callable[0] instanceof Reference
-                || ($callable[0] instanceof Definition && !$this->definitionVariables->contains($callable[0]))
+                || ($callable[0] instanceof Definition && !$this->definitionVariables->offsetExists($callable[0]))
             ))) {
                 $initializer = 'fn () => '.$this->dumpValue($callable[0]);
 
                 return $return.LazyClosure::getCode($initializer, $callable, $class, $this->container, $id).$tail;
             }
 
             if ($callable[0] instanceof Reference
-                || ($callable[0] instanceof Definition && $this->definitionVariables->contains($callable[0]))
+                || ($callable[0] instanceof Definition && $this->definitionVariables->offsetExists($callable[0]))
             ) {
                 return $return.\sprintf('%s->%s(%s)', $this->dumpValue($callable[0]), $callable[1], $arguments ? implode(', ', $arguments) : '').$tail;
             }
@@ -1920,7 +1920,7 @@ private function dumpValue(mixed $value, bool $interpolate = true): string
             if ($value->hasErrors() && $e = $value->getErrors()) {
                 return \sprintf('throw new RuntimeException(%s)', $this->export(reset($e)));
             }
-            if ($this->definitionVariables?->contains($value)) {
+            if ($this->definitionVariables?->offsetExists($value)) {
                 return $this->dumpValue($this->definitionVariables[$value], $interpolate);
             }
             if ($value->getMethodCalls()) {
diff --git a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
@@ -279,7 +279,7 @@ private function preProcess(string $eventName): void
             $this->wrappedListeners[$eventName][] = $wrappedListener;
             $this->dispatcher->removeListener($eventName, $listener);
             $this->dispatcher->addListener($eventName, $wrappedListener, $priority);
-            $this->callStack->attach($wrappedListener, [$eventName, $this->currentRequestHash]);
+            $this->callStack[$wrappedListener] = [$eventName, $this->currentRequestHash];
         }
     }
 
@@ -303,7 +303,7 @@ private function postProcess(string $eventName): void
             if ($listener->wasCalled()) {
                 $this->logger?->debug('Notified event "{event}" to listener "{listener}".', $context);
             } else {
-                $this->callStack->detach($listener);
+                unset($this->callStack[$listener]);
             }
 
             if (null !== $this->logger && $skipped) {
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php
@@ -40,7 +40,7 @@ public function collect(Request $request, Response $response, ?\Throwable $excep
             $this->data['redirect'] = true;
             $this->data['url'] = $response->getTargetUrl();
 
-            if ($this->controllers->contains($request)) {
+            if ($this->controllers->offsetExists($request)) {
                 $this->data['route'] = $this->guessRoute($request, $this->controllers[$request]);
             }
         }
diff --git a/src/Symfony/Component/Mailer/Transport/RoundRobinTransport.php b/src/Symfony/Component/Mailer/Transport/RoundRobinTransport.php
@@ -86,7 +86,7 @@ protected function getNextTransport(): ?TransportInterface
             }
 
             if ((microtime(true) - $this->deadTransports[$transport]) > $this->retryPeriod) {
-                $this->deadTransports->detach($transport);
+                unset($this->deadTransports[$transport]);
 
                 break;
             }
@@ -103,7 +103,7 @@ protected function getNextTransport(): ?TransportInterface
 
     protected function isTransportDead(TransportInterface $transport): bool
     {
-        return $this->deadTransports->contains($transport);
+        return $this->deadTransports->offsetExists($transport);
     }
 
     protected function getInitialCursor(): int
diff --git a/src/Symfony/Component/Messenger/Tests/WorkerTest.php b/src/Symfony/Component/Messenger/Tests/WorkerTest.php
@@ -619,7 +619,7 @@ public function dispatch(object $message, array $stamps = []): Envelope
         $unacks = $unacksProperty->getValue($worker);
         $dummyHandler = new DummyBatchHandler();
         $envelopeWithNoAutoAck = $envelope->with(new NoAutoAckStamp(new HandlerDescriptor($dummyHandler)));
-        $unacks->attach($dummyHandler, [$envelopeWithNoAutoAck, 'transport']);
+        $unacks[$dummyHandler] = [$envelopeWithNoAutoAck, 'transport'];
 
         $worker->run();
 
diff --git a/src/Symfony/Component/Notifier/Transport/RoundRobinTransport.php b/src/Symfony/Component/Notifier/Transport/RoundRobinTransport.php
@@ -103,7 +103,7 @@ protected function getNextTransport(MessageInterface $message): ?TransportInterf
             }
 
             if ((microtime(true) - $this->deadTransports[$transport]) > $this->retryPeriod) {
-                $this->deadTransports->detach($transport);
+                unset($this->deadTransports[$transport]);
 
                 break;
             }
@@ -120,7 +120,7 @@ protected function getNextTransport(MessageInterface $message): ?TransportInterf
 
     protected function isTransportDead(TransportInterface $transport): bool
     {
-        return $this->deadTransports->contains($transport);
+        return $this->deadTransports->offsetExists($transport);
     }
 
     protected function getInitialCursor(): int
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php
@@ -148,7 +148,7 @@ public static function provideCastSplDoublyLinkedList()
     public function testCastObjectStorageIsntModified()
     {
         $var = new \SplObjectStorage();
-        $var->attach(new \stdClass());
+        $var[new \stdClass()] = null;
         $var->rewind();
         $current = $var->current();
 
@@ -159,7 +159,7 @@ public function testCastObjectStorageIsntModified()
     public function testCastObjectStorageDumpsInfo()
     {
         $var = new \SplObjectStorage();
-        $var->attach(new \stdClass(), new \DateTimeImmutable());
+        $var[new \stdClass()] = new \DateTimeImmutable();
 
         $this->assertDumpMatchesFormat('%ADateTimeImmutable%A', $var);
     }
diff --git a/src/Symfony/Component/VarExporter/Internal/Hydrator.php b/src/Symfony/Component/VarExporter/Internal/Hydrator.php
@@ -86,7 +86,7 @@ public static function getHydrator($class)
                         if ("\0" === $name) {
                             foreach ($values as $i => $v) {
                                 for ($j = 0; $j < \count($v); ++$j) {
-                                    $objects[$i]->attach($v[$j], $v[++$j]);
+                                    $objects[$i][$v[$j]] = $v[++$j];
                                 }
                             }
                             continue;
@@ -194,7 +194,7 @@ public static function getSimpleHydrator($class)
                             continue;
                         }
                         for ($i = 0; $i < \count($value); ++$i) {
-                            $object->attach($value[$i], $value[++$i]);
+                            $object[$value[$i]] = $value[++$i];
                         }
                     }
                 };

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ private function sendToElasticsearch(array $records): void`
`144`	`144`	`],`
`145`	`145`	`]);`
`146`	`146`
`147`		`- $this->responses->attach($response);`
	`147`	`+ $this->responses[$response] = null;`
`148`	`148`
`149`	`149`	`$this->wait(false);`
`150`	`150`	`}`
`@@ -178,10 +178,10 @@ private function wait(bool $blocking): void`
`178`	`178`	`continue;`
`179`	`179`	`}`
`180`	`180`	`if ($chunk->isLast()) {`
`181`		`- $this->responses->detach($response);`
	`181`	`+ unset($this->responses[$response]);`
`182`	`182`	`}`
`183`	`183`	`} catch (ExceptionInterface $e) {`
`184`		`- $this->responses->detach($response);`
	`184`	`+ unset($this->responses[$response]);`
`185`	`185`	`error_log(\sprintf("Could not push logs to Elasticsearch:\n%s", (string) $e));`
`186`	`186`	`}`
`187`	`187`	`}`
Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ private function preProcess(string $eventName): void`
`279`	`279`	`$this->wrappedListeners[$eventName][] = $wrappedListener;`
`280`	`280`	`$this->dispatcher->removeListener($eventName, $listener);`
`281`	`281`	`$this->dispatcher->addListener($eventName, $wrappedListener, $priority);`
`282`		`- $this->callStack->attach($wrappedListener, [$eventName, $this->currentRequestHash]);`
	`282`	`+ $this->callStack[$wrappedListener] = [$eventName, $this->currentRequestHash];`
`283`	`283`	`}`
`284`	`284`	`}`
`285`	`285`
`@@ -303,7 +303,7 @@ private function postProcess(string $eventName): void`
`303`	`303`	`if ($listener->wasCalled()) {`
`304`	`304`	`$this->logger?->debug('Notified event "{event}" to listener "{listener}".', $context);`
`305`	`305`	`} else {`
`306`		`- $this->callStack->detach($listener);`
	`306`	`+ unset($this->callStack[$listener]);`
`307`	`307`	`}`
`308`	`308`
`309`	`309`	`if (null !== $this->logger && $skipped) {`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public function collect(Request $request, Response $response, ?\Throwable $excep`
`40`	`40`	`$this->data['redirect'] = true;`
`41`	`41`	`$this->data['url'] = $response->getTargetUrl();`
`42`	`42`
`43`		`- if ($this->controllers->contains($request)) {`
	`43`	`+ if ($this->controllers->offsetExists($request)) {`
`44`	`44`	`$this->data['route'] = $this->guessRoute($request, $this->controllers[$request]);`
`45`	`45`	`}`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ protected function getNextTransport(): ?TransportInterface`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`if ((microtime(true) - $this->deadTransports[$transport]) > $this->retryPeriod) {`
`89`		`- $this->deadTransports->detach($transport);`
	`89`	`+ unset($this->deadTransports[$transport]);`
`90`	`90`
`91`	`91`	`break;`
`92`	`92`	`}`
`@@ -103,7 +103,7 @@ protected function getNextTransport(): ?TransportInterface`
`103`	`103`
`104`	`104`	`protected function isTransportDead(TransportInterface $transport): bool`
`105`	`105`	`{`
`106`		`- return $this->deadTransports->contains($transport);`
	`106`	`+ return $this->deadTransports->offsetExists($transport);`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`protected function getInitialCursor(): int`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ public static function provideCastSplDoublyLinkedList()`
`148`	`148`	`public function testCastObjectStorageIsntModified()`
`149`	`149`	`{`
`150`	`150`	`$var = new \SplObjectStorage();`
`151`		`- $var->attach(new \stdClass());`
	`151`	`+ $var[new \stdClass()] = null;`
`152`	`152`	`$var->rewind();`
`153`	`153`	`$current = $var->current();`
`154`	`154`
`@@ -159,7 +159,7 @@ public function testCastObjectStorageIsntModified()`
`159`	`159`	`public function testCastObjectStorageDumpsInfo()`
`160`	`160`	`{`
`161`	`161`	`$var = new \SplObjectStorage();`
`162`		`- $var->attach(new \stdClass(), new \DateTimeImmutable());`
	`162`	`+ $var[new \stdClass()] = new \DateTimeImmutable();`
`163`	`163`
`164`	`164`	`$this->assertDumpMatchesFormat('%ADateTimeImmutable%A', $var);`
`165`	`165`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public static function getHydrator($class)`
`86`	`86`	`if ("\0" === $name) {`
`87`	`87`	`foreach ($values as $i => $v) {`
`88`	`88`	`for ($j = 0; $j < \count($v); ++$j) {`
`89`		`- $objects[$i]->attach($v[$j], $v[++$j]);`
	`89`	`+ $objects[$i][$v[$j]] = $v[++$j];`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`	`continue;`
`@@ -194,7 +194,7 @@ public static function getSimpleHydrator($class)`
`194`	`194`	`continue;`
`195`	`195`	`}`
`196`	`196`	`for ($i = 0; $i < \count($value); ++$i) {`
`197`		`- $object->attach($value[$i], $value[++$i]);`
	`197`	`+ $object[$value[$i]] = $value[++$i];`
`198`	`198`	`}`
`199`	`199`	`}`
`200`	`200`	`};`