Replace deprecated method calls from SplObjectStorage

Author: mbabker

src/WAMP/Middleware/ParseWAMPMessage.php

@@ -62,7 +62,7 @@ public function onOpen(Connection $connection): void
             throw new InvalidMessage($exception->getMessage(), $exception->getCode(), $exception);
         }
 
-        $this->connections->attach($connection, $decoratedConnection);
+        $this->connections->offsetSet($connection, $decoratedConnection);
 
         $this->middleware->onOpen($decoratedConnection);
     }
@@ -159,7 +159,7 @@ public function onMessage(Connection $connection, string $data): void
     public function onClose(Connection $connection): void
     {
         $decoratedConnection = $this->connections[$connection];
-        $this->connections->detach($connection);
+        $this->connections->offsetUnset($connection);
 
         $this->middleware->onClose($decoratedConnection);
     }
@@ -169,7 +169,7 @@ public function onClose(Connection $connection): void
      */
     public function onError(Connection $connection, \Throwable $throwable): void
     {
-        if ($this->connections->contains($connection)) {
+        if ($this->connections->offsetExists($connection)) {
             $this->middleware->onError($this->connections[$connection], $throwable);
         } else {
             $this->middleware->onError($connection, $throwable);

src/WAMP/Middleware/UpdateTopicSubscriptions.php

@@ -85,7 +85,7 @@ public function onSubscribe(WAMPConnection $connection, Topic $topic): void
         /** @var \SplObjectStorage<Topic, null> $subscriptions */
         $subscriptions = $connection->getAttributeStore()->get('wamp.subscriptions', new \SplObjectStorage());
 
-        if ($subscriptions->contains($topic)) {
+        if ($subscriptions->offsetExists($topic)) {
             return;
         }
 
@@ -95,7 +95,7 @@ public function onSubscribe(WAMPConnection $connection, Topic $topic): void
 
         $topic->add($connection);
 
-        $subscriptions->attach($topic);
+        $subscriptions->offsetSet($topic);
 
         try {
             $this->middleware->onSubscribe($connection, $topic);
@@ -114,7 +114,7 @@ public function onUnsubscribe(WAMPConnection $connection, Topic $topic): void
         /** @var \SplObjectStorage<Topic, null> $subscriptions */
         $subscriptions = $connection->getAttributeStore()->get('wamp.subscriptions', new \SplObjectStorage());
 
-        if (!$subscriptions->contains($topic)) {
+        if (!$subscriptions->offsetExists($topic)) {
             return;
         }
 
@@ -146,8 +146,8 @@ private function cleanTopic(Topic $topic, Connection $connection): void
         /** @var \SplObjectStorage<Topic, null> $subscriptions */
         $subscriptions = $connection->getAttributeStore()->get('wamp.subscriptions', new \SplObjectStorage());
 
-        if ($subscriptions->contains($topic)) {
-            $subscriptions->detach($topic);
+        if ($subscriptions->offsetExists($topic)) {
+            $subscriptions->offsetUnset($topic);
         }
 
         $topic->remove($connection);

src/WAMP/Topic.php

@@ -36,7 +36,7 @@ public function add(Connection $connection): void
             throw new UnsupportedConnection(\sprintf('Connections registered in "%s" must be an instance of "%s", "%s" given.', self::class, WAMPConnection::class, get_debug_type($connection)));
         }
 
-        $this->subscribers->attach($connection);
+        $this->subscribers->offsetSet($connection);
     }
 
     public function has(Connection $connection): bool
@@ -45,7 +45,7 @@ public function has(Connection $connection): bool
             return false;
         }
 
-        return $this->subscribers->contains($connection);
+        return $this->subscribers->offsetExists($connection);
     }
 
     public function remove(Connection $connection): void
@@ -54,8 +54,8 @@ public function remove(Connection $connection): void
             return;
         }
 
-        if ($this->subscribers->contains($connection)) {
-            $this->subscribers->detach($connection);
+        if ($this->subscribers->offsetExists($connection)) {
+            $this->subscribers->offsetUnset($connection);
         }
     }
 

src/WebSocket/Middleware/EstablishWebSocketConnection.php

@@ -116,7 +116,7 @@ function (FrameInterface $frame) use ($decoratedConnection): void {
             },
         );
 
-        $this->connections->attach($connection, new WebSocketConnectionContext($decoratedConnection, $buffer));
+        $this->connections->offsetSet($connection, new WebSocketConnectionContext($decoratedConnection, $buffer));
 
         $this->middleware->onOpen($decoratedConnection);
     }
@@ -138,9 +138,9 @@ public function onMessage(Connection $connection, string $data): void
      */
     public function onClose(Connection $connection): void
     {
-        if ($this->connections->contains($connection)) {
+        if ($this->connections->offsetExists($connection)) {
             $context = $this->connections[$connection];
-            $this->connections->detach($connection);
+            $this->connections->offsetUnset($connection);
 
             $this->middleware->onClose($context->connection);
         }
@@ -151,7 +151,7 @@ public function onClose(Connection $connection): void
      */
     public function onError(Connection $connection, \Throwable $throwable): void
     {
-        if ($this->connections->contains($connection)) {
+        if ($this->connections->offsetExists($connection)) {
             $this->middleware->onError($this->connections[$connection]->connection, $throwable);
         } else {
             $this->middleware->onError($connection, $throwable);
@@ -177,7 +177,7 @@ public function enableKeepAlive(LoopInterface $loop, int $interval = 30): void
 
         $this->pongReceiver = static function (FrameInterface $frame, Connection $connection) use ($pingedConnections, &$lastPing): void {
             if ($frame->getPayload() === $lastPing->getPayload()) {
-                $pingedConnections->detach($connection);
+                $pingedConnections->offsetUnset($connection);
             }
         };
 
@@ -196,7 +196,7 @@ function () use ($pingedConnections, &$lastPing, $splClearer): void {
                     $webSocketConnection = $this->connections[$connection]->connection;
 
                     $webSocketConnection->send($lastPing);
-                    $pingedConnections->attach($webSocketConnection);
+                    $pingedConnections->offsetSet($webSocketConnection);
                 }
             }
         );

tests/WAMP/Middleware/UpdateTopicSubscriptionsTest.php

@@ -87,9 +87,9 @@ public function testOnClose(): void
 
         /** @var \SplObjectStorage<Topic, null> $subscriptions */
         $subscriptions = new \SplObjectStorage();
-        $subscriptions->attach($topic1);
-        $subscriptions->attach($topic2);
-        $subscriptions->attach($topic3);
+        $subscriptions->offsetSet($topic1);
+        $subscriptions->offsetSet($topic2);
+        $subscriptions->offsetSet($topic3);
 
         $attributeStore->set('wamp.subscriptions', $subscriptions);
 
@@ -182,7 +182,7 @@ public function testOnSubscribe(): void
 
         $this->middleware->onSubscribe($connection, $topic);
 
-        $this->assertTrue($subscriptions->contains($topic));
+        $this->assertTrue($subscriptions->offsetExists($topic));
         $this->assertTrue($topic->has($connection));
     }
 
@@ -197,7 +197,7 @@ public function testOnUnsubscribe(): void
 
         /** @var \SplObjectStorage<Topic, null> $subscriptions */
         $subscriptions = new \SplObjectStorage();
-        $subscriptions->attach($topic);
+        $subscriptions->offsetSet($topic);
 
         $attributeStore->set('wamp.subscriptions', $subscriptions);
 
@@ -215,7 +215,7 @@ public function testOnUnsubscribe(): void
 
         $this->middleware->onUnsubscribe($connection, $topic);
 
-        $this->assertFalse($subscriptions->contains($topic));
+        $this->assertFalse($subscriptions->offsetExists($topic));
         $this->assertFalse($this->topicRegistry->has($topic->id));
     }