Merge pull request #560 from kenjis/fix-rector-config

chore: update rector.php
codeigniter4 · Dec 17, 2022 · 22ccaf4 · 22ccaf4
2 parents eeebfc8 + 23c2527
commit 22ccaf4
Show file tree

Hide file tree

Showing 15 changed files with 42 additions and 27 deletions.
diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml
@@ -63,5 +63,5 @@ jobs:
 
       - name: Analyze for refactoring
         run: |
-          composer global require --dev rector/rector:^0.13.3
+          composer global require --dev rector/rector:^0.15.1
           rector process --dry-run --no-progress-bar
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -13,7 +13,10 @@
         __DIR__ . '/tests/',
     ])
     ->exclude('build')
-    ->append([__FILE__]);
+    ->append([
+        __FILE__,
+        __DIR__ . '/rector.php',
+    ]);
 
 $overrides = [
     'declare_strict_types' => true,

diff --git a/rector.php b/rector.php
@@ -1,6 +1,9 @@
 <?php
 
+declare(strict_types=1);
+
 use Rector\CodeQuality\Rector\BooleanAnd\SimplifyEmptyArrayCheckRector;
+use Rector\CodeQuality\Rector\Class_\CompleteDynamicPropertiesRector;
 use Rector\CodeQuality\Rector\Expression\InlineIfToExplicitIfRector;
 use Rector\CodeQuality\Rector\For_\ForToForeachRector;
 use Rector\CodeQuality\Rector\Foreach_\UnusedForeachValueToArrayKeysRector;
@@ -30,15 +33,23 @@
 use Rector\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector;
 use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
 use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector;
-use Rector\Php74\Rector\Property\TypedPropertyRector;
+use Rector\PHPUnit\Rector\Class_\AnnotationWithValueToAttributeRector;
 use Rector\PHPUnit\Set\PHPUnitSetList;
+use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
 use Rector\PSR4\Rector\FileWithoutNamespace\NormalizeNamespaceByPSR4ComposerAutoloadRector;
 use Rector\Set\ValueObject\LevelSetList;
 use Rector\Set\ValueObject\SetList;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->sets([SetList::DEAD_CODE, LevelSetList::UP_TO_PHP_74, PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD, PHPUnitSetList::PHPUNIT_80]);
+    $rectorConfig->sets([
+        SetList::DEAD_CODE,
+        LevelSetList::UP_TO_PHP_74,
+        PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD,
+        PHPUnitSetList::PHPUNIT_100,
+    ]);
+
     $rectorConfig->parallel();
+
     // The paths to refactor (can also be supplied with CLI arguments)
     $rectorConfig->paths([
         __DIR__ . '/src/',
@@ -74,6 +85,7 @@
 
         // Note: requires php 8
         RemoveUnusedPromotedPropertyRector::class,
+        AnnotationWithValueToAttributeRector::class,
 
         // Ignore tests that might make calls without a result
         RemoveEmptyMethodCallRector::class => [
@@ -97,6 +109,9 @@
             __DIR__ . '/src/Models/UserModel.php',
         ],
     ]);
+    // auto import fully qualified class names
+    $rectorConfig->importNames();
+
     $rectorConfig->rule(SimplifyUselessVariableRector::class);
     $rectorConfig->rule(RemoveAlwaysElseRector::class);
     $rectorConfig->rule(CountArrayToEmptyArrayComparisonRector::class);
@@ -119,8 +134,7 @@
     $rectorConfig->rule(MakeInheritedMethodVisibilitySameAsParentRector::class);
     $rectorConfig->rule(SimplifyEmptyArrayCheckRector::class);
     $rectorConfig->rule(NormalizeNamespaceByPSR4ComposerAutoloadRector::class);
-    $rectorConfig
-        ->ruleWithConfiguration(TypedPropertyRector::class, [
-            TypedPropertyRector::INLINE_PUBLIC => false,
-        ]);
+    $rectorConfig->rule(StringClassNameToClassConstantRector::class);
+    $rectorConfig->rule(PrivatizeFinalClassPropertyRector::class);
+    $rectorConfig->rule(CompleteDynamicPropertiesRector::class);
 };
diff --git a/tests/Authentication/AuthenticationTest.php b/tests/Authentication/AuthenticationTest.php
@@ -16,7 +16,7 @@
  */
 final class AuthenticationTest extends DatabaseTestCase
 {
-    protected Authentication $auth;
+    private Authentication $auth;
 
     protected function setUp(): void
     {

diff --git a/tests/Authentication/Authenticators/AccessTokenAuthenticatorTest.php b/tests/Authentication/Authenticators/AccessTokenAuthenticatorTest.php
@@ -22,7 +22,7 @@
  */
 final class AccessTokenAuthenticatorTest extends DatabaseTestCase
 {
-    protected AccessTokens $auth;
+    private AccessTokens $auth;
 
     protected function setUp(): void
     {

diff --git a/tests/Authentication/Authenticators/SessionAuthenticatorTest.php b/tests/Authentication/Authenticators/SessionAuthenticatorTest.php
@@ -27,9 +27,9 @@ final class SessionAuthenticatorTest extends TestCase
     use DatabaseTestTrait;
     use FakeUser;
 
-    protected Session $auth;
+    private Session $auth;
     protected $namespace;
-    protected $events;
+    private MockEvents $events;
 
     protected function setUp(): void
     {

diff --git a/tests/Authentication/Filters/AbstractFilterTest.php b/tests/Authentication/Filters/AbstractFilterTest.php
@@ -18,6 +18,7 @@ abstract class AbstractFilterTest extends TestCase
     use FeatureTestTrait;
     use AuthenticationTesting;
 
+    protected string $routeFilter;
     protected $namespace;
     protected string $alias;
     protected string $classname;

diff --git a/tests/Authentication/HasAccessTokensTest.php b/tests/Authentication/HasAccessTokensTest.php
@@ -15,7 +15,7 @@
  */
 final class HasAccessTokensTest extends DatabaseTestCase
 {
-    protected User $user;
+    private User $user;
 
     protected function setUp(): void
     {

diff --git a/tests/Authorization/AuthorizableTest.php b/tests/Authorization/AuthorizableTest.php
@@ -23,14 +23,11 @@ final class AuthorizableTest extends TestCase
 
     protected $refresh = true;
     protected $namespace;
-    protected UserModel $model;
 
     protected function setUp(): void
     {
         parent::setUp();
 
-        $this->model = new UserModel();
-
         // Refresh should take care of this....
         db_connect()->table('auth_groups_users')->truncate();
         db_connect()->table('auth_permissions_users')->truncate();

diff --git a/tests/Language/AbstractTranslationTestCase.php b/tests/Language/AbstractTranslationTestCase.php
@@ -305,12 +305,12 @@ final public function testAllConfiguredLanguageKeysAreInOrder(string $locale): v
     /**
      * @return string[][]
      */
-    final public function localesProvider(): iterable
+    final public static function localesProvider(): iterable
     {
         $locale = self::$locales[static::class] ?? null;
 
         if (null === $locale) {
-            $this->fail('The locale code should be defined in the $locales property.');
+            static::fail('The locale code should be defined in the $locales property.');
         }
 
         return [$locale => [$locale]];

diff --git a/tests/Unit/CompositionValidatorTest.php b/tests/Unit/CompositionValidatorTest.php
@@ -14,8 +14,8 @@
  */
 final class CompositionValidatorTest extends TestCase
 {
-    protected CompositionValidator $validator;
-    protected Auth $config;
+    private CompositionValidator $validator;
+    private Auth $config;
 
     protected function setUp(): void
     {

diff --git a/tests/Unit/DictionaryValidatorTest.php b/tests/Unit/DictionaryValidatorTest.php
@@ -13,7 +13,7 @@
  */
 final class DictionaryValidatorTest extends CIUnitTestCase
 {
-    protected DictionaryValidator $validator;
+    private DictionaryValidator $validator;
 
     protected function setUp(): void
     {

diff --git a/tests/Unit/FilterInCliTest.php b/tests/Unit/FilterInCliTest.php
@@ -31,7 +31,7 @@ public function testWhenInCliDoNothing(FilterInterface $filter): void
         $filter->before($clirequest);
     }
 
-    public function filterProvider(): Generator
+    public static function filterProvider(): Generator
     {
         yield from [
             [new AuthRates()],

diff --git a/tests/Unit/NothingPersonalValidatorTest.php b/tests/Unit/NothingPersonalValidatorTest.php
@@ -14,7 +14,7 @@
  */
 final class NothingPersonalValidatorTest extends CIUnitTestCase
 {
-    protected NothingPersonalValidator $validator;
+    private NothingPersonalValidator $validator;
 
     protected function setUp(): void
     {
@@ -180,7 +180,7 @@ public function testIsNotPersonalFalsePositivesCaughtByIsNotSimilar($password):
         $this->assertNotSame($isNotPersonal, $isNotSimilar);
     }
 
-    public function passwordProvider(): array
+    public static function passwordProvider(): array
     {
         return [
             ['JoeTheCaptain'],
@@ -225,7 +225,7 @@ public function testConfigPersonalFieldsValues($firstName, $lastName, $expected)
         $this->assertSame($expected, $result->isOK());
     }
 
-    public function firstLastNameProvider()
+    public static function firstLastNameProvider()
     {
         return [
             [
@@ -275,7 +275,7 @@ public function testMaxSimilarityZeroTurnsOffSimilarityCalculation($maxSimilarit
         $this->assertSame($expected, $result->isOK());
     }
 
-    public function maxSimilarityProvider()
+    public static function maxSimilarityProvider()
     {
         return [
             [

diff --git a/tests/Unit/PwnedValidatorTest.php b/tests/Unit/PwnedValidatorTest.php
@@ -18,7 +18,7 @@
  */
 final class PwnedValidatorTest extends CIUnitTestCase
 {
-    protected PwnedValidator $validator;
+    private PwnedValidator $validator;
 
     protected function setUp(): void
     {