replace deprecated methods in 8.5

alternatives have been around since 5.3

Signed-off-by: Kent Rasmussen <kent@gplusmedia.com>

Author: earthiverse

rector.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+
+return RectorConfig::configure()
+    ->withPaths([
+        __DIR__ . '/benchmark',
+        __DIR__ . '/src',
+        __DIR__ . '/test',
+    ])
+    // uncomment to reach your current PHP version
+    ->withPhpSets(php85: true)
+    ->withTypeCoverageLevel(0)
+    ->withDeadCodeLevel(0)
+    ->withCodeQualityLevel(0);

src/Storage/Adapter/AbstractAdapter.php

@@ -259,7 +259,7 @@ protected function triggerException($eventName, ArrayObject $args, mixed &$resul
     public function hasPlugin(Plugin\PluginInterface $plugin)
     {
         $registry = $this->getPluginRegistry();
-        return $registry->contains($plugin);
+        return $registry->offsetExists($plugin);
     }
 
     /**
@@ -268,15 +268,15 @@ public function hasPlugin(Plugin\PluginInterface $plugin)
     public function addPlugin(Plugin\PluginInterface $plugin, $priority = 1)
     {
         $registry = $this->getPluginRegistry();
-        if ($registry->contains($plugin)) {
+        if ($registry->offsetExists($plugin)) {
             throw new Exception\LogicException(sprintf(
                 'Plugin of type "%s" already registered',
                 $plugin::class
             ));
         }
 
         $plugin->attach($this->getEventManager(), $priority);
-        $registry->attach($plugin);
+        $registry->offsetSet($plugin);
 
         return $this;
     }
@@ -287,9 +287,9 @@ public function addPlugin(Plugin\PluginInterface $plugin, $priority = 1)
     public function removePlugin(Plugin\PluginInterface $plugin)
     {
         $registry = $this->getPluginRegistry();
-        if ($registry->contains($plugin)) {
+        if ($registry->offsetExists($plugin)) {
             $plugin->detach($this->getEventManager());
-            $registry->detach($plugin);
+            $registry->offsetUnset($plugin);
         }
         return $this;
     }

test/Pattern/CallbackCacheTest.php

@@ -51,7 +51,7 @@ public function getCommonPatternNamesProvider(): array
     public function testCallEnabledCacheOutputByDefault(): void
     {
         $this->executeCallbackAndMakeAssertions(
-            [TestCallbackCache::class, 'bar'],
+            TestCallbackCache::bar(...),
             ['testCallEnabledCacheOutputByDefault', 'arg2']
         );
     }
@@ -61,7 +61,7 @@ public function testCallDisabledCacheOutput(): void
         $options = $this->pattern->getOptions();
         $options->setCacheOutput(false);
         $this->executeCallbackAndMakeAssertions(
-            [TestCallbackCache::class, 'bar'],
+            TestCallbackCache::bar(...),
             ['testCallDisabledCacheOutput', 'arg2']
         );
     }
@@ -76,7 +76,7 @@ public function testMagicFunctionCall(): void
 
     public function testGenerateKey(): void
     {
-        $callback = [TestCallbackCache::class, 'emptyMethod'];
+        $callback = TestCallbackCache::emptyMethod(...);
         $args     = ['arg1', 2, 3.33, null];
 
         $generatedKey = $this->pattern->generateKey($callback, $args);

test/Pattern/TestAsset/FailableCallback.php

@@ -8,7 +8,7 @@
 
 final class FailableCallback
 {
-    public function __invoke()
+    public function __invoke(): never
     {
         throw new Exception('This callback should either fail or never be invoked');
     }

test/Storage/Adapter/AbstractAdapterTest.php

@@ -423,7 +423,7 @@ public function testEventHandlingSimple(
         $storage
             ->expects($this->once())
             ->method($internalMethodName)
-            ->with(...array_map([$this, 'equalTo'], $methodArgs))
+            ->with(...array_map($this->equalTo(...), $methodArgs))
             ->willReturn($retVal);
 
         call_user_func_array([$storage, $methodName], $methodArgs);
@@ -463,7 +463,7 @@ public function testEventHandlingCatchException(
         $storage
             ->expects($this->once())
             ->method($internalMethodName)
-            ->with(...array_map([$this, 'equalTo'], $methodArgs))
+            ->with(...array_map($this->equalTo(...), $methodArgs))
             ->willThrowException(new \Exception('test'));
 
         call_user_func_array([$storage, $methodName], $methodArgs);
@@ -1100,7 +1100,7 @@ protected function checkPreEventCanChangeArguments(string $method, array $args,
         foreach ($expectedArgs as $v) {
             $equals[] = $this->equalTo($v);
         }
-        call_user_func_array([$tmp, 'with'], $equals);
+        call_user_func_array($tmp->with(...), $equals);
 
         // run
         call_user_func_array([$storage, $method], $args);