[Rector] Add rector to require-dev and use single autoload vendor for run PHPUnit (#1001)

samsonasik · web-flow · commit 660942d56aa4 · 2025-10-10T00:14:21.000+02:00
diff --git a/composer.json b/composer.json
@@ -50,7 +50,8 @@
         "symfony/uid": "^6.4|^7.0|^8.0",
         "symfony/var-dumper": "^6.4|^7.0|^8.0",
         "symfony/yaml": "^6.4|^7.0|^8.0",
-        "webmozart/assert": "^1.11"
+        "webmozart/assert": "^1.11",
+        "rector/rector": "^2.2"
     },
     "autoload": {
         "psr-4": {
diff --git a/tests/Integration/Maker/MakeFactoryTest.php b/tests/Integration/Maker/MakeFactoryTest.php
@@ -54,11 +54,11 @@ protected function tearDown(): void
     {
         parent::tearDown();
 
-        $removeSCAMock = static function(string $file): void {
+        $removeSCAMock = function(string $file): void {
             if (\file_exists($file)) {
                 \unlink($file);
-                \rmdir(\dirname($file));
-                \rmdir(\dirname($file, 2));
+                $this->rrmdir(\dirname($file));
+                $this->rrmdir(\dirname($file, 2));
             }
         };
         $removeSCAMock(self::PHPSTAN_PATH);
@@ -524,4 +524,36 @@ private function makeFactoryCommandTester(array $options = []): CommandTester
     {
         return new CommandTester((new Application(self::bootKernel($options)))->find('make:factory'));
     }
+
+    /**
+     * Recursively remove a directory.
+     * @see https://stackoverflow.com/questions/1653771/how-do-i-remove-a-directory-that-is-not-empty
+     */
+    private function rrmdir(string $dir): void
+    {
+        if (is_dir($dir))
+        {
+            $objects = scandir($dir);
+
+            if ($objects === false)
+            {
+                return;
+            }
+
+            foreach ($objects as $object)
+            {
+                if ($object !== '.' && $object !== '..')
+                {
+                    if (filetype($dir.'/'.$object) === 'dir') {
+                        $this->rrmdir($dir.'/'.$object);
+                    } else {
+                        unlink($dir.'/'.$object);
+                    }
+                }
+            }
+
+            reset($objects);
+            rmdir($dir);
+        }
+    }
 }
diff --git a/utils/rector/phpstan.neon b/utils/rector/phpstan.neon
@@ -7,9 +7,5 @@ parameters:
     level: 8
     bootstrapFiles:
         - ./../../vendor/autoload.php
-        - ./../../bin/tools/rector/vendor/autoload.php
     excludePaths:
         - ./tests/Fixtures
-
-    ignoreErrors:
-        - identifier: missingType.iterableValue
diff --git a/utils/rector/src/RemoveMethodCall/RemoveMethodCallRector.php b/utils/rector/src/RemoveMethodCall/RemoveMethodCallRector.php
@@ -28,7 +28,10 @@ public function getNodeTypes() : array
         return [Node\Expr\MethodCall::class, Node\Expr\NullsafeMethodCall::class, Node\Stmt\Expression::class];
     }
 
-    /** @param Node\Expr\MethodCall|Node\Expr\NullsafeMethodCall|Node\Stmt\Expression $node */
+    /**
+     * @param Node\Expr\MethodCall|Node\Expr\NullsafeMethodCall|Node\Stmt\Expression $node
+     * @return Node|null|\PhpParser\NodeVisitor::REMOVE_NODE
+     */
     public function refactor(Node $node) : Node|int|null
     {
         foreach ($this->removeMethodCalls as $removeMethodCall) {
diff --git a/utils/rector/src/RemoveWithoutAutorefreshCallRector.php b/utils/rector/src/RemoveWithoutAutorefreshCallRector.php
@@ -24,8 +24,11 @@ public function getNodeTypes() : array
         return [Node\Stmt\Expression::class];
     }
 
-    /** @param Node\Stmt\Expression $node */
-    public function refactor(Node $node) : array|Node|null
+    /**
+     * @param Node\Stmt\Expression $node
+     * @return Node\Stmt\Expression|array<Node\Stmt>|null
+     */
+    public function refactor(Node $node) : Node\Stmt\Expression|null|array
     {
         $method = $node->expr;
 
diff --git a/utils/rector/tests/bootstrap.php b/utils/rector/tests/bootstrap.php
@@ -9,6 +9,4 @@
  * file that was distributed with this source code.
  */
 
-require \dirname(__DIR__).'/../../bin/tools/rector/vendor/rector/rector/preload.php';
 require \dirname(__DIR__).'/../../vendor/autoload.php';
-require \dirname(__DIR__).'/../../bin/tools/rector/vendor/autoload.php';

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,10 @@ public function getNodeTypes() : array`
`28`	`28`	`return [Node\Expr\MethodCall::class, Node\Expr\NullsafeMethodCall::class, Node\Stmt\Expression::class];`
`29`	`29`	`}`
`30`	`30`
`31`		`- /** @param Node\Expr\MethodCall\|Node\Expr\NullsafeMethodCall\|Node\Stmt\Expression $node */`
	`31`	`+ /**`
	`32`	`+ * @param Node\Expr\MethodCall\|Node\Expr\NullsafeMethodCall\|Node\Stmt\Expression $node`
	`33`	`+ * @return Node\|null\|\PhpParser\NodeVisitor::REMOVE_NODE`
	`34`	`+ */`
`32`	`35`	`public function refactor(Node $node) : Node\|int\|null`
`33`	`36`	`{`
`34`	`37`	`foreach ($this->removeMethodCalls as $removeMethodCall) {`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,11 @@ public function getNodeTypes() : array`
`24`	`24`	`return [Node\Stmt\Expression::class];`
`25`	`25`	`}`
`26`	`26`
`27`		`- /** @param Node\Stmt\Expression $node */`
`28`		`- public function refactor(Node $node) : array\|Node\|null`
	`27`	`+ /**`
	`28`	`+ * @param Node\Stmt\Expression $node`
	`29`	`+ * @return Node\Stmt\Expression\|array<Node\Stmt>\|null`
	`30`	`+ */`
	`31`	`+ public function refactor(Node $node) : Node\Stmt\Expression\|null\|array`
`29`	`32`	`{`
`30`	`33`	`$method = $node->expr;`
`31`	`34`