Fix rector deprecations

phplrt · Sep 10, 2024 · 0a71127 · 0a71127
1 parent 8359f13
commit 0a71127
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 35 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
+        php: [ '8.1', '8.2', '8.3', '8.4' ]
         os: [ ubuntu-latest, macos-latest, windows-latest ]
         stability: [ prefer-lowest, prefer-stable ]
     steps:

diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": "^8.1",
-        "phplrt/ast-contracts": "^4.0"
+        "phplrt/ast-contracts": "^3.7"
     },
     "autoload": {
         "psr-4": {
@@ -37,8 +37,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "4.x-dev",
-            "dev-main": "4.x-dev"
+            "dev-master": "3.x-dev",
+            "dev-main": "3.x-dev"
         }
     },
     "config": {

diff --git a/src/Executor.php b/src/Executor.php
@@ -114,14 +114,17 @@ class Executor implements ExecutorInterface
     private const ERROR_NESTED_ARRAY =
         'Nested arrays are not a valid traversable AST structure';
 
+    /**
+     * @var array|VisitorInterface[]
+     */
+    private array $visitors = [];
+
     private bool $stop = false;
 
-    public function __construct(
-        /**
-         * @var array|VisitorInterface[]
-         */
-        private array $visitors = []
-    ) {}
+    public function __construct(array $visitors = [])
+    {
+        $this->visitors = $visitors;
+    }
 
     /**
      * @param iterable<array-key, object> $nodes
@@ -224,12 +227,12 @@ protected function traverseArray(array $nodes): array
 
                         case \is_array($return):
                             $error = self::ERROR_ENTER_RETURN_ARRAY;
-                            $error = \sprintf($error, $visitor::class, \gettype($visitor));
+                            $error = \sprintf($error, \get_class($visitor), \gettype($visitor));
 
                             throw new BadMethodException($error, static::ERROR_CODE_ARRAY_ENTERING);
                         default:
                             $error = self::ERROR_ENTER_RETURN_TYPE;
-                            $error = \sprintf($error, $visitor::class, \gettype($visitor));
+                            $error = \sprintf($error, \get_class($visitor), \gettype($visitor));
 
                             throw new BadReturnTypeException($error, static::ERROR_CODE_ARRAY_ENTERING);
                     }
@@ -268,7 +271,7 @@ protected function traverseArray(array $nodes): array
 
                         default:
                             $error = self::ERROR_LEAVE_RETURN_TYPE;
-                            $error = \sprintf($error, $visitor::class, \gettype($return));
+                            $error = \sprintf($error, \get_class($visitor), \gettype($return));
 
                             throw new BadReturnTypeException($error, static::ERROR_CODE_ARRAY_LEAVING);
                     }
@@ -335,7 +338,7 @@ protected function traverseNode(NodeInterface $node): NodeInterface
 
                             default:
                                 $error = self::ERROR_ENTER_RETURN_TYPE;
-                                $error = \sprintf($error, $visitor::class, \gettype($return));
+                                $error = \sprintf($error, \get_class($visitor), \gettype($return));
 
                                 throw new BadReturnTypeException($error, static::ERROR_CODE_NODE_ENTERING);
                         }
@@ -370,12 +373,12 @@ protected function traverseNode(NodeInterface $node): NodeInterface
 
                             case \is_array($return):
                                 $error = self::ERROR_MODIFY_BY_ARRAY;
-                                $error = \sprintf($error, $visitor::class);
+                                $error = \sprintf($error, \get_class($visitor));
 
                                 throw new BadReturnTypeException($error, static::ERROR_CODE_NODE_LEAVING);
                             default:
                                 $error = self::ERROR_LEAVE_RETURN_TYPE;
-                                $error = \sprintf($error, $visitor::class, \gettype($return));
+                                $error = \sprintf($error, \get_class($visitor), \gettype($return));
 
                                 throw new BadReturnTypeException($error, static::ERROR_CODE_NODE_LEAVING);
                         }
@@ -397,12 +400,12 @@ private function updateNodeValue(NodeInterface $node, int|string $key, mixed $va
             // @phpstan-ignore-next-line
             $node->$key = $value;
         } catch (\Error $e) {
-            if (!\str_starts_with($e->getMessage(), 'Cannot access')) {
+            if (\strpos($e->getMessage(), 'Cannot access') !== 0) {
                 throw $e;
             }
 
             $error = self::ERROR_READONLY_MODIFY;
-            $error = \sprintf($error, $key, $node::class);
+            $error = \sprintf($error, $key, \get_class($node));
 
             throw new AttributeException($error);
         }

diff --git a/src/Traverser.php b/src/Traverser.php
@@ -46,12 +46,18 @@
 
 class Traverser implements TraverserInterface
 {
+    /**
+     * @var list<VisitorInterface>
+     */
+    private array $visitors = [];
+
     /**
      * @param list<VisitorInterface> $visitors
      */
-    final public function __construct(
-        private array $visitors = [],
-    ) {}
+    final public function __construct(array $visitors = [])
+    {
+        $this->visitors = $visitors;
+    }
 
     public static function through(VisitorInterface ...$visitors): self
     {
@@ -60,7 +66,7 @@ public static function through(VisitorInterface ...$visitors): self
 
     public function with(VisitorInterface $visitor, bool $prepend = false): TraverserInterface
     {
-        $fn = $prepend ? \array_unshift(...) : \array_push(...);
+        $fn = $prepend ? '\\array_unshift' : '\\array_push';
         $fn($this->visitors, $visitor);
 
         return $this;

diff --git a/tests/Unit/Mutations/AfterTraversingMutationsTest.php b/tests/Unit/Mutations/AfterTraversingMutationsTest.php
@@ -9,16 +9,16 @@
 use Phplrt\Visitor\Visitor;
 use PHPUnit\Framework\Attributes\TestDox;
 
-#[TestDox('A set of tests that verify an AST modification using the Visitor::after() method.')]
+#[TestDox('A set of tests that verify an AST modification using the Visitor::after() method')]
 class AfterTraversingMutationsTest extends TestCase
 {
     #[TestDox('Modifying a collection of AST nodes using array return')]
     public function testUpdateRootsByArrayWhenEntering(): void
     {
         $actual = $this->traverse($original = $this->nodes(2), new class () extends Visitor {
-            public function after(iterable $nodes): ?iterable
+            public function after(iterable $node): ?iterable
             {
-                return \is_array($nodes) ? [] : null;
+                return \is_array($node) ? [] : null;
             }
         });
 
@@ -30,9 +30,9 @@ public function after(iterable $nodes): ?iterable
     public function testUpdateRootByArrayWhenEntering(): void
     {
         $actual = $this->traverse($original = $this->node(), new class () extends Visitor {
-            public function after(iterable $nodes): ?iterable
+            public function after(iterable $node): ?iterable
             {
-                return $nodes instanceof Node && $nodes->getId() === 0 ? [] : $nodes;
+                return $node instanceof Node && $node->getId() === 0 ? [] : $node;
             }
         });
 
@@ -44,9 +44,9 @@ public function after(iterable $nodes): ?iterable
     public function testUpdateRootsByNodeWhenEntering(): void
     {
         $actual = $this->traverse($original = $this->nodes(2), new class () extends Visitor {
-            public function after(iterable $nodes): ?iterable
+            public function after(iterable $node): ?iterable
             {
-                return \is_array($nodes) ? new Node(42) : null;
+                return \is_array($node) ? new Node(42) : null;
             }
         });
 
@@ -58,9 +58,9 @@ public function after(iterable $nodes): ?iterable
     public function testUpdateRootByNodeWhenEntering(): void
     {
         $actual = $this->traverse($original = $this->node(), new class () extends Visitor {
-            public function after(iterable $nodes): ?iterable
+            public function after(iterable $node): ?iterable
             {
-                return $nodes instanceof Node && $nodes->getId() === 0 ? new Node(42) : $nodes;
+                return $node instanceof Node && $node->getId() === 0 ? new Node(42) : $node;
             }
         });
 

diff --git a/tests/Unit/Mutations/BeforeTraversingMutationsTest.php b/tests/Unit/Mutations/BeforeTraversingMutationsTest.php
@@ -9,7 +9,7 @@
 use Phplrt\Visitor\Visitor;
 use PHPUnit\Framework\Attributes\TestDox;
 
-#[TestDox('A set of tests that verify an AST modification using the Visitor::before() method.')]
+#[TestDox('A set of tests that verify an AST modification using the Visitor::before() method')]
 class BeforeTraversingMutationsTest extends TestCase
 {
     #[TestDox('Modifying a collection of AST nodes using array return')]

diff --git a/tests/Unit/Mutations/EnteringMutationsTest.php b/tests/Unit/Mutations/EnteringMutationsTest.php
@@ -12,7 +12,7 @@
 use Phplrt\Visitor\Visitor;
 use PHPUnit\Framework\Attributes\TestDox;
 
-#[TestDox('A set of tests that verify an AST modification using the Visitor::enter() method.')]
+#[TestDox('A set of tests that verify an AST modification using the Visitor::enter() method')]
 class EnteringMutationsTest extends TestCase
 {
     #[TestDox('Modifying a collection of AST nodes using array return')]

diff --git a/tests/Unit/Mutations/LeavingMutationsTest.php b/tests/Unit/Mutations/LeavingMutationsTest.php
@@ -11,7 +11,7 @@
 use Phplrt\Visitor\Visitor;
 use PHPUnit\Framework\Attributes\TestDox;
 
-#[TestDox('A set of tests that verify an AST modification using the Visitor::leave() method.')]
+#[TestDox('A set of tests that verify an AST modification using the Visitor::leave() method')]
 class LeavingMutationsTest extends TestCase
 {
     #[TestDox('Modifying a collection of AST nodes using array return')]

diff --git a/tests/Unit/TraversableTest.php b/tests/Unit/TraversableTest.php
@@ -5,6 +5,7 @@
 namespace Phplrt\Visitor\Tests\Unit;
 
 use Phplrt\Visitor\Tests\Unit\Stub\Counter;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\Attributes\TestDox;
 
 #[TestDox('A set of tests that count the number of passes by nodes.')]

diff --git a/tests/Unit/VisitorsTest.php b/tests/Unit/VisitorsTest.php
@@ -8,7 +8,7 @@
 use Phplrt\Visitor\Traverser;
 use PHPUnit\Framework\Attributes\TestDox;
 
-#[TestDox('A set of tests that check the interaction of Visitor instances with the Traversable container.')]
+#[TestDox('A set of tests that check the interaction of Visitor instances with the Traversable container')]
 class VisitorsTest extends TestCase
 {
     #[TestDox('Check that the visitor worked if added')]