[ecs] tidy up config (#5403)

ecs.php

@@ -2,13 +2,9 @@
 
 declare(strict_types=1);
 
-use PHP_CodeSniffer\Standards\Generic\Sniffs\CodeAnalysis\AssignmentInConditionSniff;
 use PhpCsFixer\Fixer\ClassNotation\SelfAccessorFixer;
 use PhpCsFixer\Fixer\FunctionNotation\FunctionTypehintSpaceFixer;
-use PhpCsFixer\Fixer\Phpdoc\NoSuperfluousPhpdocTagsFixer;
-use PhpCsFixer\Fixer\Phpdoc\PhpdocNoEmptyReturnFixer;
 use PhpCsFixer\Fixer\Phpdoc\PhpdocTypesFixer;
-use PhpCsFixer\Fixer\PhpUnit\PhpUnitStrictFixer;
 use Symplify\EasyCodingStandard\Config\ECSConfig;
 use Symplify\EasyCodingStandard\ValueObject\Set\SetList;
 
@@ -33,10 +29,6 @@
 
     $ecsConfig->rules([FunctionTypehintSpaceFixer::class]);
 
-    $ecsConfig->ruleWithConfiguration(NoSuperfluousPhpdocTagsFixer::class, [
-        'allow_mixed' => true,
-    ]);
-
     $ecsConfig->skip([
         '*/Source/*',
         '*/Fixture/*',
@@ -49,16 +41,6 @@
             __DIR__ . '/rules/Php70/Rector/MethodCall/ThisCallOnStaticMethodToStaticCallRector.php',
         ],
 
-        // breaking and handled better by Rector PHPUnit code quality set, removed in symplify dev-main
-        PhpUnitStrictFixer::class,
-
-        AssignmentInConditionSniff::class . '.FoundInWhileCondition',
-
-        // null on purpose as no change
-        PhpdocNoEmptyReturnFixer::class => [
-            __DIR__ . '/rules/DeadCode/Rector/ConstFetch/RemovePhpVersionIdCheckRector.php',
-        ],
-
         SelfAccessorFixer::class => ['*/*Rector.php'],
     ]);
 };

rules/TypeDeclaration/NodeAnalyzer/ReturnTypeAnalyzer/StrictScalarReturnTypeAnalyzer.php

@@ -4,11 +4,11 @@
 
 namespace Rector\TypeDeclaration\NodeAnalyzer\ReturnTypeAnalyzer;
 
-use PhpParser\Node\Expr\UnaryPlus;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Closure;
 use PhpParser\Node\Expr\ConstFetch;
 use PhpParser\Node\Expr\UnaryMinus;
+use PhpParser\Node\Expr\UnaryPlus;
 use PhpParser\Node\Scalar;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Function_;