[code-quality] add exception support to PreferPHPUnitThisCallRector (#477)

* bump couple deprecations

* add exception support to PreferPHPUnitThisCallRector

Author: TomasVotruba

composer.json

@@ -7,17 +7,19 @@
         "php": ">=8.2"
     },
     "require-dev": {
-        "rector/rector-src": "dev-main",
-        "phpunit/phpunit": "^11.5",
-        "phpstan/phpstan": "^2.1.8",
         "phpecs/phpecs": "^2.0",
         "phpstan/extension-installer": "^1.4",
+        "phpstan/phpstan": "^2.1.8",
+        "phpstan/phpstan-deprecation-rules": "^2.0",
+        "phpstan/phpstan-webmozart-assert": "^2.0",
+        "phpunit/phpunit": "^11.5",
+        "rector/rector-src": "dev-main",
+        "rector/swiss-knife": "^1.0",
+        "rector/type-perfect": "^2.0",
+        "symplify/phpstan-extensions": "^12.0",
         "symplify/vendor-patches": "^11.4",
-        "tracy/tracy": "^2.10",
         "tomasvotruba/class-leak": "^1.2",
-        "rector/swiss-knife": "^1.0",
-        "phpstan/phpstan-webmozart-assert": "^2.0",
-        "rector/type-perfect": "^2.0"
+        "tracy/tracy": "^2.10"
     },
     "autoload": {
         "psr-4": {

phpstan.neon

@@ -9,6 +9,7 @@ parameters:
         - rules-tests
 
     reportUnmatchedIgnoredErrors: false
+    errorFormat: symplify
 
     scanDirectories:
         - stubs

rules-tests/CodeQuality/Rector/Class_/PreferPHPUnitThisCallRector/Fixture/expect_exception.php.inc

@@ -0,0 +1,39 @@
+<?php
+
+namespace Rector\PHPUnit\Tests\CodeQuality\Rector\Class_\PreferPHPUnitThisCallRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+
+final class ExpectException extends TestCase
+{
+    public function test()
+    {
+        self::expectException('some class');
+        self::expectExceptionMessage('some message');
+
+        self::expectExceptionCode(100);
+        self::expectExceptionMessageMatches('some regex');
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\PHPUnit\Tests\CodeQuality\Rector\Class_\PreferPHPUnitThisCallRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+
+final class ExpectException extends TestCase
+{
+    public function test()
+    {
+        $this->expectException('some class');
+        $this->expectExceptionMessage('some message');
+
+        $this->expectExceptionCode(100);
+        $this->expectExceptionMessageMatches('some regex');
+    }
+}
+
+?>

rules/AnnotationsToAttributes/Rector/ClassMethod/TestWithAnnotationToAttributeRector.php

@@ -137,7 +137,7 @@ public function refactor(Node $node): ?Node
             $testWithItems = explode("\n", trim($genericTagValueNode->value));
 
             foreach ($testWithItems as $testWithItem) {
-                $jsonArray = Json::decode(trim($testWithItem), Json::FORCE_ARRAY);
+                $jsonArray = Json::decode(trim($testWithItem), forceArrays: true);
 
                 $attributeGroups[] = $this->phpAttributeGroupFactory->createFromClassWithItems(
                     self::TEST_WITH_ATTRIBUTE,

rules/CodeQuality/Rector/ClassMethod/RemoveEmptyTestMethodRector.php

@@ -6,7 +6,7 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Stmt\ClassMethod;
-use PhpParser\NodeTraverser;
+use PhpParser\NodeVisitor;
 use Rector\PHPUnit\NodeAnalyzer\TestsNodeAnalyzer;
 use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -78,6 +78,6 @@ public function refactor(Node $node): ?int
             return null;
         }
 
-        return NodeTraverser::REMOVE_NODE;
+        return NodeVisitor::REMOVE_NODE;
     }
 }

rules/CodeQuality/Rector/Class_/ConstructClassMethodToSetUpTestCaseRector.php

@@ -13,7 +13,7 @@
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Expression;
-use PhpParser\NodeTraverser;
+use PhpParser\NodeVisitor;
 use PHPStan\Reflection\ClassReflection;
 use Rector\NodeAnalyzer\ClassAnalyzer;
 use Rector\NodeTypeResolver\Node\AttributeKey;
@@ -160,12 +160,12 @@ private function shouldSkip(Class_ $class, ClassMethod $classMethod): bool
             (array) $classMethod->stmts,
             function (Node $subNode) use ($paramNames, &$isFoundParamUsed): ?int {
                 if ($subNode instanceof StaticCall && $this->isName($subNode->name, MethodName::CONSTRUCT)) {
-                    return NodeTraverser::DONT_TRAVERSE_CHILDREN;
+                    return NodeVisitor::DONT_TRAVERSE_CHILDREN;
                 }
 
                 if ($subNode instanceof Variable && $this->isNames($subNode, $paramNames)) {
                     $isFoundParamUsed = true;
-                    return NodeTraverser::STOP_TRAVERSAL;
+                    return NodeVisitor::STOP_TRAVERSAL;
                 }
 
                 return null;

rules/CodeQuality/Rector/Class_/PreferPHPUnitThisCallRector.php

@@ -10,7 +10,7 @@
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
-use PhpParser\NodeTraverser;
+use PhpParser\NodeVisitor;
 use Rector\PHPUnit\NodeAnalyzer\TestsNodeAnalyzer;
 use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -24,7 +24,17 @@ final class PreferPHPUnitThisCallRector extends AbstractRector
     /**
      * @var string[]
      */
-    private const NON_ASSERT_STATIC_METHODS = ['createMock', 'atLeast', 'atLeastOnce', 'once', 'never'];
+    private const NON_ASSERT_STATIC_METHODS = [
+        'createMock',
+        'atLeast',
+        'atLeastOnce',
+        'once',
+        'never',
+        'expectException',
+        'expectExceptionMessage',
+        'expectExceptionCode',
+        'expectExceptionMessageMatches',
+    ];
 
     public function __construct(
         private readonly TestsNodeAnalyzer $testsNodeAnalyzer,
@@ -84,7 +94,7 @@ public function refactor(Node $node): ?Node
         $this->traverseNodesWithCallable($node, function (Node $node) use (&$hasChanged): int|null|MethodCall {
             $isInsideStaticFunctionLike = ($node instanceof ClassMethod && $node->isStatic()) || ($node instanceof Closure && $node->static);
             if ($isInsideStaticFunctionLike) {
-                return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
+                return NodeVisitor::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
             }
 
             if (! $node instanceof StaticCall) {

rules/CodeQuality/Rector/Class_/TestWithToDataProviderRector.php

@@ -189,7 +189,7 @@ private function extractTestWithData(GenericTagValueNode $genericTagValueNode):
         $jsonArray = [];
 
         foreach ($testWithItems as $testWithItem) {
-            $jsonArray[] = Json::decode(trim($testWithItem), Json::FORCE_ARRAY);
+            $jsonArray[] = Json::decode(trim($testWithItem), forceArrays: true);
         }
 
         return $jsonArray;

rules/PHPUnit100/Rector/StmtsAwareInterface/ExpectsMethodCallDecorator.php

@@ -11,7 +11,7 @@
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Stmt\Expression;
-use PhpParser\NodeTraverser;
+use PhpParser\NodeVisitor;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
 use Rector\PHPUnit\Enum\ConsecutiveVariable;
@@ -78,7 +78,7 @@ public function decorate(Expression $expression): MethodCall|StaticCall|null
                     new Arg(new Variable(ConsecutiveVariable::MATCHER)),
                 ]);
 
-                return NodeTraverser::STOP_TRAVERSAL;
+                return NodeVisitor::STOP_TRAVERSAL;
             });
         }