Bump deps (#804)

* bump deps * fix cs
rectorphp · Aug 31, 2021 · 93f0232 · 93f0232
1 parent 25d3555
commit 93f0232
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 26 deletions.
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
         "rector/rector-cakephp": "^0.11.3",
         "rector/rector-doctrine": "^0.11.17",
         "rector/rector-laravel": "^0.11.5",
-        "rector/rector-nette": "^0.11.21",
+        "rector/rector-nette": "^0.11.23",
         "rector/rector-phpunit": "^0.11.7",
         "rector/rector-symfony": "^0.11.18",
         "rector/rector-phpoffice": "^0.11.2",
@@ -38,16 +38,16 @@
         "symfony/http-kernel": "^5.3",
         "symfony/process": "^5.3",
         "symfony/yaml": "^5.3",
-        "symplify/astral": "^9.4.40",
-        "symplify/autowire-array-parameter": "^9.4.40",
-        "symplify/composer-json-manipulator": "^9.4.40",
-        "symplify/console-color-diff": "^9.4.40",
-        "symplify/package-builder": "^9.4.40",
-        "symplify/rule-doc-generator-contracts": "^9.4.40",
-        "symplify/simple-php-doc-parser": "^9.4.40",
-        "symplify/skipper": "^9.4.40",
-        "symplify/smart-file-system": "^9.4.40",
-        "symplify/symfony-php-config": "^9.4.40",
+        "symplify/astral": "^9.4.49",
+        "symplify/autowire-array-parameter": "^9.4.49",
+        "symplify/composer-json-manipulator": "^9.4.49",
+        "symplify/console-color-diff": "^9.4.49",
+        "symplify/package-builder": "^9.4.49",
+        "symplify/rule-doc-generator-contracts": "^9.4.49",
+        "symplify/simple-php-doc-parser": "^9.4.49",
+        "symplify/skipper": "^9.4.49",
+        "symplify/smart-file-system": "^9.4.49",
+        "symplify/symfony-php-config": "^9.4.49",
         "tracy/tracy": "^2.8",
         "webmozart/assert": "^1.10"
     },
@@ -59,14 +59,14 @@
         "rector/phpstan-rules": "^0.3.5",
         "rector/rector-generator": "^0.3",
         "spatie/enum": "^3.9",
-        "symplify/coding-standard": "^9.4.40",
-        "symplify/easy-ci": "^9.4.40",
-        "symplify/easy-coding-standard": "^9.4.40",
-        "symplify/easy-testing": "^9.4.40",
-        "symplify/monorepo-builder": "^9.4.40",
-        "symplify/phpstan-extensions": "^9.4.40",
-        "symplify/phpstan-rules": "^9.4.40",
-        "symplify/rule-doc-generator": "^9.4.40",
+        "symplify/coding-standard": "^9.4.49",
+        "symplify/easy-ci": "^9.4.49",
+        "symplify/easy-coding-standard": "^9.4.49",
+        "symplify/easy-testing": "^9.4.49",
+        "symplify/monorepo-builder": "^9.4.49",
+        "symplify/phpstan-extensions": "^9.4.49",
+        "symplify/phpstan-rules": "^9.4.49",
+        "symplify/rule-doc-generator": "^9.4.49",
         "timeweb/phpstan-enum": "^2.3"
     },
     "replace": {

diff --git a/ecs.php b/ecs.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+use PhpCsFixer\Fixer\Import\NoUnusedImportsFixer;
 use PhpCsFixer\Fixer\Operator\UnaryOperatorSpacesFixer;
 use PhpCsFixer\Fixer\Phpdoc\GeneralPhpdocAnnotationRemoveFixer;
 use PhpCsFixer\Fixer\Phpdoc\NoSuperfluousPhpdocTagsFixer;
@@ -10,7 +11,6 @@
 use PhpCsFixer\Fixer\ReturnNotation\ReturnAssignmentFixer;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symplify\CodingStandard\Fixer\Commenting\ParamReturnAndVarTagMalformsFixer;
-use Symplify\CodingStandard\Fixer\Commenting\RemoveCommentedCodeFixer;
 use Symplify\CodingStandard\Fixer\LineLength\DocBlockLineLengthFixer;
 use Symplify\EasyCodingStandard\ValueObject\Option;
 use Symplify\EasyCodingStandard\ValueObject\Set\SetList;
@@ -75,9 +75,11 @@
         UnaryOperatorSpacesFixer::class,
 
         // buggy - @todo fix on Symplify master
-        RemoveCommentedCodeFixer::class,
         DocBlockLineLengthFixer::class,
 
+        // buggy on closure in interface union
+        NoUnusedImportsFixer::class => [__DIR__ . '/rules/Naming/Contract/RenameParamValueObjectInterface.php'],
+
         // breaks on-purpose annotated variables
         ReturnAssignmentFixer::class,
 

diff --git a/rules/CodingStyle/Naming/NameRenamer.php b/rules/CodingStyle/Naming/NameRenamer.php
@@ -87,8 +87,7 @@ private function renameClassConstFetch(
         string $lastName,
         ClassConstFetch $classConstFetch,
         Name | Identifier $usedNameNode
-    ): void
-    {
+    ): void {
         if (! $this->nodeNameResolver->areNamesEqual($classConstFetch->class, $usedNameNode)) {
             return;
         }

diff --git a/rules/EarlyReturn/Rector/If_/ChangeOrIfReturnToEarlyReturnRector.php b/rules/EarlyReturn/Rector/If_/ChangeOrIfReturnToEarlyReturnRector.php
@@ -13,7 +13,6 @@
 use PhpParser\Node\Stmt\Return_;
 use Rector\Core\NodeManipulator\IfManipulator;
 use Rector\Core\Rector\AbstractRector;
-use Rector\NodeTypeResolver\Node\AttributeKey;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 

diff --git a/rules/EarlyReturn/Rector/If_/RemoveAlwaysElseRector.php b/rules/EarlyReturn/Rector/If_/RemoveAlwaysElseRector.php
@@ -6,7 +6,6 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\BinaryOp\BooleanAnd;
-use PhpParser\Node\Expr\BinaryOp\BooleanOr;
 use PhpParser\Node\Expr\Exit_;
 use PhpParser\Node\Stmt\Continue_;
 use PhpParser\Node\Stmt\Else_;

diff --git a/tests/Issues/Issue6655/config/configured_rule.php b/tests/Issues/Issue6655/config/configured_rule.php
@@ -1,7 +1,9 @@
 <?php
 
-use Rector\DeadCode\Rector\Assign\RemoveUnusedAssignVariableRector;
+declare(strict_types=1);
+
 use Rector\CodeQuality\Rector\If_\SimplifyIfElseToTernaryRector;
+use Rector\DeadCode\Rector\Assign\RemoveUnusedAssignVariableRector;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {