fix(tests): introduce rector

Author: rtm-ctrlz

.github/workflows/php.yml

@@ -23,6 +23,9 @@ jobs:
       - name: Run phpstan
         run: composer run-script phpstan
 
+      - name: Run rector:test
+        run: composer run-script rector:test
+
       - name: Run phpcs
         run: composer run-script phpcs
 

composer.json

@@ -10,7 +10,8 @@
   },
   "require-dev": {
     "squizlabs/php_codesniffer": "^3.12",
-    "phpstan/phpstan": "^2.1"
+    "phpstan/phpstan": "^2.1",
+    "rector/rector": "^2.3"
   },
   "license": "MIT",
   "autoload": {
@@ -37,6 +38,8 @@
     "phpstan:baseline": "@phpstan --generate-baseline --allow-empty-baseline -vv",
     "phpunit": "phpunit",
     "phpcs": "phpcs",
-    "phpcbf": "phpcbf"
+    "phpcbf": "phpcbf",
+    "rector:test": "@rector:fix --dry-run",
+    "rector:fix": "rector process"
   }
 }

rector.php

@@ -0,0 +1,82 @@
+<?php
+
+/** @noinspection UsingInclusionReturnValueInspection */
+
+declare(strict_types=1);
+
+use Rector\CodeQuality\Rector\BooleanOr\RepeatedOrEqualToInArrayRector;
+use Rector\CodeQuality\Rector\ClassConstFetch\VariableConstFetchToClassConstFetchRector;
+use Rector\CodeQuality\Rector\ClassMethod\LocallyCalledStaticMethodToNonStaticRector;
+use Rector\CodeQuality\Rector\Empty_\SimplifyEmptyCheckOnEmptyArrayRector;
+use Rector\CodeQuality\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector;
+use Rector\CodeQuality\Rector\Ternary\SwitchNegatedTernaryRector;
+use Rector\CodingStyle\Rector\Catch_\CatchExceptionNameMatchingTypeRector;
+use Rector\CodingStyle\Rector\ClassLike\NewlineBetweenClassLikeStmtsRector;
+use Rector\CodingStyle\Rector\ClassMethod\NewlineBeforeNewAssignSetRector;
+use Rector\CodingStyle\Rector\Stmt\NewlineAfterStatementRector;
+use Rector\CodingStyle\Rector\String_\SimplifyQuoteEscapeRector;
+use Rector\Config\RectorConfig;
+use Rector\EarlyReturn\Rector\If_\ChangeOrIfContinueToMultiContinueRector;
+use Rector\EarlyReturn\Rector\Return_\ReturnBinaryOrToEarlyReturnRector;
+use Rector\EarlyReturn\Rector\StmtsAwareInterface\ReturnEarlyIfVariableRector;
+use Rector\Naming\Rector\Assign\RenameVariableToMatchMethodCallReturnTypeRector;
+use Rector\Naming\Rector\Class_\RenamePropertyToMatchTypeRector;
+use Rector\Naming\Rector\ClassMethod\RenameParamToMatchTypeRector;
+use Rector\Naming\Rector\ClassMethod\RenameVariableToMatchNewTypeRector;
+use Rector\Naming\Rector\Foreach_\RenameForeachValueVariableToMatchExprVariableRector;
+use Rector\Naming\Rector\Foreach_\RenameForeachValueVariableToMatchMethodCallReturnTypeRector;
+use Rector\PHPUnit\CodeQuality\Rector\Class_\PreferPHPUnitThisCallRector;
+use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector;
+use Rector\TypeDeclaration\Rector\Class_\TypedPropertyFromCreateMockAssignRector;
+
+$config = RectorConfig::configure();
+
+$config->withPreparedSets(
+    true,
+    true,
+    true,
+    true,
+    true,
+    true,
+    true,
+    true,
+    true,
+    false,
+    true,
+    true,
+    true,
+);
+
+$config
+    ->withPaths(
+        [
+            './src',
+            './test/phpunit',
+            // './.php-cs-fixer.dist.php',
+            './rector.php',
+        ]
+    )
+    ->withSkip(
+        [
+            // Control
+            DisallowedEmptyRuleFixerRector::class,
+            FlipTypeControlToUseExclusiveTypeRector::class,
+
+            // New lines
+            NewlineAfterStatementRector::class,
+            NewlineBeforeNewAssignSetRector::class,
+            NewlineBetweenClassLikeStmtsRector::class,
+
+            // Naming
+            RenamePropertyToMatchTypeRector::class,
+            RenameParamToMatchTypeRector::class,
+            RenameVariableToMatchNewTypeRector::class,
+            RenameVariableToMatchMethodCallReturnTypeRector::class,
+
+            // PHPUnit
+            PreferPHPUnitThisCallRector::class,
+        ]
+    )
+;
+
+return $config;

src/MockedFunction.php

@@ -50,12 +50,7 @@ static function (...$args) use (&$mockObject, &$method) {
             : $mockObject->expects($invocationRule)->method($method);
     }
 
-    /**
-     * @param mixed ...$args
-     *
-     * @return mixed
-     */
-    public function callOriginal(...$args): mixed
+    public function callOriginal(mixed ...$args): mixed
     {
         return $this->mockedFunction->callOriginal(...$args);
     }

src/MockedMethod.php

@@ -20,14 +20,10 @@ class MockedMethod extends AbstractMocked
     /**
      * MockedMethod constructor.
      *
-     * @param TestCase $testCase
-     * @param string $class
+     * @param class-string $class
      * @param non-empty-string $method
-     * @param InvocationOrder|null $invocationRule
      *
      * @throws ReflectionException
-     *
-     * @phpstan-param class-string $class
      */
     public function __construct(
         TestCase $testCase,

test/phpunit/MockedFunctionTest.php

@@ -9,10 +9,9 @@
 
 use function QratorLabs\SmockyPHPUnit\Test\fixtures\someFunction;
 
-class MockedFunctionTest extends RunkitDependantTestCase
+final class MockedFunctionTest extends RunkitDependantTestCase
 {
     /**
-     * @return void
      * @throws ReflectionException
      */
     public function testCallOriginal(): void
@@ -26,27 +25,27 @@ public function testCallOriginal(): void
         // This was a bit tricky: we have to use `&$mock` to maintain variable-ref but not just object-ref
         // to do proper object destruction
         $mock->getMocker()->willReturnCallback(
-            static function () use (&$mock, &$extValue) {
+            static function () use (&$mock, &$extValue): string {
                 $extValue = $mock->callOriginal();
 
                 return 'someFunction';
             }
         );
 
         // is there any change?
-        self::assertNotEquals($originalValue, $function());
+        self::assertNotSame($originalValue, $function());
 
         // call from outside
-        self::assertEquals($originalValue, $mock->callOriginal());
+        self::assertSame($originalValue, $mock->callOriginal());
 
         // call from closure
-        self::assertEquals($originalValue, $extValue);
+        self::assertSame($originalValue, $extValue);
 
         // assigment is used instead of `unset` because closure have link (ref) to mock-object
         // unsetting of local variable will not destruct object, but assigning variable to `null`
         // will do the job
         $mock = null;
-        self::assertEquals($originalValue, $function());
+        self::assertSame($originalValue, $function());
     }
 
     /**

test/phpunit/MockedMethodTest.php

@@ -14,7 +14,7 @@
 /**
  * @internal
  */
-class MockedMethodTest extends RunkitDependantTestCase
+final class MockedMethodTest extends RunkitDependantTestCase
 {
     /**
      * @throws ReflectionException
@@ -177,7 +177,7 @@ public function getValue(): string
 
         self::assertSame('initial', $object->getValue());
         $mock = new MockedMethod($this, get_class($object), 'getValue', $this->once());
-        $mock->getMocker()->willReturnCallback(static function () use ($object) {
+        $mock->getMocker()->willReturnCallback(static function () use ($object): string {
             $object->value = 'changed';
 
             return 'mocked';

test/phpunit/fixtures/ClassWithMethods.php

@@ -19,8 +19,7 @@ public static function publicStaticMethod(): string
     }
 
     /**
-     * @return Generator
-     * @phpstan-return Generator<string, array{class-string, string}>
+     * @return Generator<string, array{class-string, string}>
      * @throws ReflectionException
      */
     public static function getDataForTests(): Generator