Update dependencies

chiiya · Jun 19, 2023 · 3c66254 · 3c66254
1 parent 2889071
commit 3c66254
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -19,15 +19,15 @@
     ],
     "require": {
         "php": "^8.1",
-        "friendsofphp/php-cs-fixer": "^3.14",
-        "kubawerlos/php-cs-fixer-custom-fixers": "^3.13",
-        "rector/rector": "^0.15",
-        "slevomat/coding-standard": "^8.8",
-        "symplify/coding-standard": "^11.3",
-        "symplify/easy-coding-standard": "^11.2"
+        "friendsofphp/php-cs-fixer": "^3.18",
+        "kubawerlos/php-cs-fixer-custom-fixers": "^3.14",
+        "rector/rector": "^0.17",
+        "slevomat/coding-standard": "^8.12",
+        "symplify/coding-standard": "^11.4",
+        "symplify/easy-coding-standard": "^11.4"
     },
     "require-dev": {
-        "phpro/grumphp": "^1.15"
+        "phpro/grumphp": "^2.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Config.php b/src/Config.php
@@ -75,13 +75,14 @@ protected function rules(): array
                         'property_protected',
                         'property_private',
                         'construct',
+                        'method:__invoke',
                         'method_public_static',
                         'method_protected_static',
                         'method_private_static',
                         'method_public',
                         'method_protected',
                         'method_private',
-                        // 'magic', -> Waiting for https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/6360
+                        'magic',
                     ],
                 ],
                 'self_static_accessor' => true,
@@ -159,6 +160,9 @@ protected function rules(): array
                 'concat_space' => [
                     'spacing' => 'none',
                 ],
+                'align_multiline_comment' => true,
+                'no_null_property_initialization' => true,
+                'single_line_empty_body' => true,
                 ConstructorEmptyBracesFixer::name() => true,
                 MultilineCommentOpeningClosingAloneFixer::name() => true,
                 MultilinePromotedPropertiesFixer::name() => true,

diff --git a/src/rector.php b/src/rector.php
@@ -10,7 +10,6 @@
 use Rector\CodeQuality\Rector\Foreach_\ForeachToInArrayRector;
 use Rector\CodeQuality\Rector\Foreach_\SimplifyForeachToArrayFilterRector;
 use Rector\CodeQuality\Rector\Foreach_\UnusedForeachValueToArrayKeysRector;
-use Rector\CodeQuality\Rector\FuncCall\ArrayKeysAndInArrayToArrayKeyExistsRector;
 use Rector\CodeQuality\Rector\FuncCall\CompactToVariablesRector;
 use Rector\CodeQuality\Rector\FuncCall\IsAWithStringWithThirdArgumentRector;
 use Rector\CodeQuality\Rector\FuncCall\SimplifyRegexPatternRector;
@@ -26,6 +25,7 @@
 use Rector\CodeQuality\Rector\If_\ExplicitBoolCompareRector;
 use Rector\CodeQuality\Rector\If_\ShortenElseIfRector;
 use Rector\CodeQuality\Rector\If_\SimplifyIfElseToTernaryRector;
+use Rector\CodeQuality\Rector\NullsafeMethodCall\CleanupUnneededNullsafeOperatorRector;
 use Rector\CodeQuality\Rector\Switch_\SingularSwitchToIfRector;
 use Rector\CodeQuality\Rector\Ternary\ArrayKeyExistsTernaryThenValueToCoalescingRector;
 use Rector\CodeQuality\Rector\Ternary\SwitchNegatedTernaryRector;
@@ -37,7 +37,6 @@
 use Rector\CodingStyle\Rector\Switch_\BinarySwitchToIfElseRector;
 use Rector\Config\RectorConfig;
 use Rector\DeadCode\Rector\Assign\RemoveUnusedVariableAssignRector;
-use Rector\DeadCode\Rector\ClassMethod\RemoveDelegatingParentCallRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodParameterRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPromotedPropertyRector;
@@ -50,19 +49,18 @@
 use Rector\EarlyReturn\Rector\Foreach_\ChangeNestedForeachIfsToEarlyContinueRector;
 use Rector\EarlyReturn\Rector\If_\ChangeNestedIfsToEarlyReturnRector;
 use Rector\EarlyReturn\Rector\StmtsAwareInterface\ReturnEarlyIfVariableRector;
+use Rector\Php70\Rector\StmtsAwareInterface\IfIssetToCoalescingRector;
 use Rector\Php71\Rector\ClassConst\PublicConstantVisibilityRector;
 use Rector\Php71\Rector\TryCatch\MultiExceptionCatchRector;
 use Rector\Php80\Rector\Catch_\RemoveUnusedVariableInCatchRector;
 use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;
-use Rector\Php80\Rector\FunctionLike\UnionTypesRector;
 use Rector\Php80\Rector\Identical\StrEndsWithRector;
 use Rector\Php80\Rector\Identical\StrStartsWithRector;
 use Rector\Php80\Rector\NotIdentical\StrContainsRector;
 use Rector\Php80\Rector\Switch_\ChangeSwitchToMatchRector;
 use Rector\Php81\Rector\ClassConst\FinalizePublicClassConstantRector;
 use Rector\Php81\Rector\ClassMethod\NewInInitializerRector;
 use Rector\Php81\Rector\FunctionLike\IntersectionTypesRector;
-use Rector\Restoration\Rector\Property\MakeTypedPropertyNullableIfCheckedRector;
 
 return static function (RectorConfig $config): void {
     $config->rules([
@@ -76,7 +74,6 @@
         FlipTypeControlToUseExclusiveTypeRector::class,
         ForeachToInArrayRector::class,
         GetClassToInstanceOfRector::class,
-        ArrayKeysAndInArrayToArrayKeyExistsRector::class,
         InlineIfToExplicitIfRector::class,
         IsAWithStringWithThirdArgumentRector::class,
         ShortenElseIfRector::class,
@@ -101,7 +98,6 @@
         RemoveDeadContinueRector::class,
         RemoveDeadIfForeachForRector::class,
         RemoveDeadInstanceOfRector::class,
-        RemoveDelegatingParentCallRector::class,
         RemoveUnusedForeachKeyRector::class,
         RemoveUnusedPrivateMethodParameterRector::class,
         RemoveUnusedPrivateMethodRector::class,
@@ -120,11 +116,11 @@
         StrContainsRector::class,
         StrEndsWithRector::class,
         StrStartsWithRector::class,
-        UnionTypesRector::class,
         FinalizePublicClassConstantRector::class,
         IntersectionTypesRector::class,
         NewInInitializerRector::class,
-        MakeTypedPropertyNullableIfCheckedRector::class,
         InlineArrayReturnAssignRector::class,
+        CleanupUnneededNullsafeOperatorRector::class,
+        IfIssetToCoalescingRector::class,
     ]);
 };