add exception support to PreferPHPUnitSelfCallRector

Author: TomasVotruba

rules-tests/CodeQuality/Rector/Class_/PreferPHPUnitSelfCallRector/Fixture/include_exceptions.php.inc

@@ -0,0 +1,35 @@
+<?php
+
+namespace Rector\PHPUnit\Tests\CodeQuality\Rector\Class_\PreferPHPUnitSelfCallRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+
+final class IncludeExceptions extends TestCase
+{
+    public function testMe()
+    {
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('foo');
+        $this->expectExceptionCode(123);
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\PHPUnit\Tests\CodeQuality\Rector\Class_\PreferPHPUnitSelfCallRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+
+final class IncludeExceptions extends TestCase
+{
+    public function testMe()
+    {
+        self::expectException(\RuntimeException::class);
+        self::expectExceptionMessage('foo');
+        self::expectExceptionCode(123);
+    }
+}
+
+?>

rules/CodeQuality/Enum/NonAssertStaticableMethods.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\PHPUnit\CodeQuality\Enum;
+
+final class NonAssertStaticableMethods
+{
+    /**
+     * @var string[]
+     */
+    public const ALL = [
+        'createMock',
+        'atLeast',
+        'atLeastOnce',
+        'once',
+        'never',
+        'expectException',
+        'expectExceptionMessage',
+        'expectExceptionCode',
+        'expectExceptionMessageMatches',
+    ];
+}

rules/CodeQuality/Rector/Class_/PreferPHPUnitSelfCallRector.php

@@ -10,14 +10,17 @@
 use PhpParser\Node\Stmt\Class_;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Type\ObjectType;
+use Rector\Enum\ClassName;
+use Rector\PHPUnit\CodeQuality\Enum\NonAssertStaticableMethods;
+use Rector\PHPUnit\Enum\PHPUnitClassName;
 use Rector\PHPUnit\NodeAnalyzer\TestsNodeAnalyzer;
 use Rector\Rector\AbstractRector;
 use Rector\Reflection\ReflectionResolver;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 /**
- * @see \Rector\PHPUnit\Tests\Rector\Class_\PreferPHPUnitSelfCallRector\PreferPHPUnitSelfCallRectorTest
+ * @see \Rector\PHPUnit\Tests\CodeQuality\Rector\Class_\PreferPHPUnitSelfCallRector\PreferPHPUnitSelfCallRectorTest
  */
 final class PreferPHPUnitSelfCallRector extends AbstractRector
 {
@@ -86,31 +89,36 @@ public function refactor(Node $node): ?Node
                 return null;
             }
 
-            if (! str_starts_with($methodName, 'assert')) {
+            if (! str_starts_with($methodName, 'assert') && ! in_array($methodName, NonAssertStaticableMethods::ALL)) {
                 return null;
             }
 
             if (! $this->isName($node->var, 'this')) {
                 return null;
             }
 
-            if (! $this->isObjectType($node->var, new ObjectType('PHPUnit\Framework\TestCase'))) {
+            if (! $this->isObjectType($node->var, new ObjectType(ClassName::TEST_CASE_CLASS))) {
                 return null;
             }
 
             $classReflection = $this->reflectionResolver->resolveClassReflection($node);
             if ($classReflection instanceof ClassReflection && $classReflection->hasNativeMethod($methodName)) {
-                $method = $classReflection->getNativeMethod($methodName);
-
                 if ($node->isFirstClassCallable()) {
                     return null;
                 }
 
-                if ($method->isStatic()) {
-                    $hasChanged = true;
-
-                    return $this->nodeFactory->createStaticCall('self', $methodName, $node->getArgs());
+                // only handle methods in TestCase class
+                $methodReflection = $classReflection->getNativeMethod($methodName);
+                if (! in_array(
+                    $methodReflection->getDeclaringClass()
+                        ->getName(),
+                    [PHPUnitClassName::TEST_CASE, PHPUnitClassName::ASSERT]
+                )) {
+                    return null;
                 }
+
+                $hasChanged = true;
+                return $this->nodeFactory->createStaticCall('self', $methodName, $node->getArgs());
             }
 
             return null;

rules/CodeQuality/Rector/Class_/PreferPHPUnitThisCallRector.php

@@ -11,6 +11,7 @@
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\NodeVisitor;
+use Rector\PHPUnit\CodeQuality\Enum\NonAssertStaticableMethods;
 use Rector\PHPUnit\NodeAnalyzer\TestsNodeAnalyzer;
 use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -21,20 +22,20 @@
  */
 final class PreferPHPUnitThisCallRector extends AbstractRector
 {
-    /**
-     * @var string[]
-     */
-    private const NON_ASSERT_STATIC_METHODS = [
-        'createMock',
-        'atLeast',
-        'atLeastOnce',
-        'once',
-        'never',
-        'expectException',
-        'expectExceptionMessage',
-        'expectExceptionCode',
-        'expectExceptionMessageMatches',
-    ];
+    //    /**
+    //     * @var string[]
+    //     */
+    //    private const NON_ASSERT_STATIC_METHODS = [
+    //        'createMock',
+    //        'atLeast',
+    //        'atLeastOnce',
+    //        'once',
+    //        'never',
+    //        'expectException',
+    //        'expectExceptionMessage',
+    //        'expectExceptionCode',
+    //        'expectExceptionMessageMatches',
+    //    ];
 
     public function __construct(
         private readonly TestsNodeAnalyzer $testsNodeAnalyzer,
@@ -114,7 +115,7 @@ public function refactor(Node $node): ?Node
                 return null;
             }
 
-            if (! str_starts_with($methodName, 'assert') && ! in_array($methodName, self::NON_ASSERT_STATIC_METHODS)) {
+            if (! str_starts_with($methodName, 'assert') && ! in_array($methodName, NonAssertStaticableMethods::ALL)) {
                 return null;
             }