[cs] Re-run ECS dev version to try out regression (#4595)

rectorphp · Jul 25, 2023 · c1e03db · c1e03db
1 parent 20d8c79
commit c1e03db
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 60 deletions.
diff --git a/composer.json b/composer.json
@@ -60,7 +60,7 @@
         "rector/rector-generator": "dev-main",
         "spatie/enum": "^3.13",
         "symplify/easy-ci": "^11.1.18",
-        "symplify/easy-coding-standard": "^11.3",
+        "symplify/easy-coding-standard": "^11.5",
         "symplify/phpstan-extensions": "^11.2",
         "symplify/phpstan-rules": "^12.0",
         "symplify/rule-doc-generator": "^11.2",

diff --git a/config/config.php b/config/config.php
@@ -78,10 +78,10 @@
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
-use function Symfony\Component\DependencyInjection\Loader\Configurator\tagged_iterator;
 use Symfony\Component\Filesystem\Filesystem;
 use Symplify\EasyParallel\ValueObject\EasyParallelConfig;
+use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
+use function Symfony\Component\DependencyInjection\Loader\Configurator\tagged_iterator;
 
 return static function (RectorConfig $rectorConfig): void {
     // make use of https://github.com/symplify/easy-parallel
@@ -263,9 +263,15 @@
 
     $services->set(\PHPStan\PhpDocParser\Lexer\Lexer::class);
     $services->set(TypeParser::class)
-        ->arg('$usedAttributes', ['lines' => true, 'indexes' => true]);
+        ->arg('$usedAttributes', [
+            'lines' => true,
+            'indexes' => true,
+        ]);
     $services->set(ConstExprParser::class)
-        ->arg('$usedAttributes', ['lines' => true, 'indexes' => true]);
+        ->arg('$usedAttributes', [
+            'lines' => true,
+            'indexes' => true,
+        ]);
 
     // tagged services
     $services->set(PhpDocNodeMapper::class)

diff --git a/ecs.php b/ecs.php
@@ -10,12 +10,11 @@
 use PhpCsFixer\Fixer\Phpdoc\PhpdocNoEmptyReturnFixer;
 use PhpCsFixer\Fixer\Phpdoc\PhpdocTypesFixer;
 use PhpCsFixer\Fixer\PhpUnit\PhpUnitStrictFixer;
-use Symplify\CodingStandard\Fixer\LineLength\DocBlockLineLengthFixer;
 use Symplify\EasyCodingStandard\Config\ECSConfig;
 use Symplify\EasyCodingStandard\ValueObject\Set\SetList;
 
 return static function (ECSConfig $ecsConfig): void {
-    $ecsConfig->sets([SetList::PSR_12, SetList::SYMPLIFY, SetList::COMMON, SetList::CLEAN_CODE]);
+    $ecsConfig->sets([SetList::SYMPLIFY, SetList::COMMON, SetList::CLEAN_CODE, SetList::PSR_12]);
 
     $ecsConfig->paths([
         __DIR__ . '/bin',
@@ -60,9 +59,6 @@
         '*/Fixture/*',
         '*/Expected/*',
 
-        // buggy - @todo fix on Symplify master
-        DocBlockLineLengthFixer::class,
-
         PhpdocTypesFixer::class => [
             // double to Double false positive
             __DIR__ . '/rules/Php74/Rector/Double/RealToFloatTypeCastRector.php',

diff --git a/packages/BetterPhpDocParser/PhpDocParser/BetterPhpDocParser.php b/packages/BetterPhpDocParser/PhpDocParser/BetterPhpDocParser.php
@@ -50,7 +50,10 @@ public function __construct(
             // preserveTypeAliasesWithInvalidTypes
             false,
             // usedAttributes
-            ['lines' => true, 'indexes' => true],
+            [
+                'lines' => true,
+                'indexes' => true,
+            ],
             // parseDoctrineAnnotations
             false,
             // textBetweenTagsBelongsToDescription, default to false, exists since 1.23.0

diff --git a/packages/PHPStanStaticTypeMapper/TypeMapper/ClosureTypeMapper.php b/packages/PHPStanStaticTypeMapper/TypeMapper/ClosureTypeMapper.php
@@ -37,17 +37,21 @@ public function mapToPHPStanPhpDocTypeNode(Type $type): TypeNode
         $typeNode = $type->toPhpDocNode();
 
         $phpDocNodeTraverser = new PhpDocNodeTraverser();
-        $phpDocNodeTraverser->traverseWithCallable($typeNode, '', static function (AstNode $astNode) : ?FullyQualifiedIdentifierTypeNode {
-            if (! $astNode instanceof IdentifierTypeNode) {
-                return null;
-            }
+        $phpDocNodeTraverser->traverseWithCallable(
+            $typeNode,
+            '',
+            static function (AstNode $astNode): ?FullyQualifiedIdentifierTypeNode {
+                if (! $astNode instanceof IdentifierTypeNode) {
+                    return null;
+                }
 
-            if ($astNode->name !== 'Closure') {
-                return null;
-            }
+                if ($astNode->name !== 'Closure') {
+                    return null;
+                }
 
-            return new FullyQualifiedIdentifierTypeNode('Closure');
-        });
+                return new FullyQualifiedIdentifierTypeNode('Closure');
+            }
+        );
 
         return $typeNode;
     }

diff --git a/packages/StaticTypeMapper/ValueObject/Type/FullyQualifiedObjectType.php b/packages/StaticTypeMapper/ValueObject/Type/FullyQualifiedObjectType.php
@@ -21,9 +21,8 @@ public function getShortNameType(): ShortenedObjectType
         return new ShortenedObjectType($this->getShortName(), $this->getClassName());
     }
 
-    public function areShortNamesEqual(
-        AliasedObjectType | \Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType $comparedObjectType
-    ): bool {
+    public function areShortNamesEqual(AliasedObjectType | self $comparedObjectType): bool
+    {
         return $this->getShortName() === $comparedObjectType->getShortName();
     }
 

diff --git a/rules/DeadCode/Rector/PropertyProperty/RemoveNullPropertyInitializationRector.php b/rules/DeadCode/Rector/PropertyProperty/RemoveNullPropertyInitializationRector.php
@@ -9,9 +9,9 @@
 use PhpParser\Node\Expr\ConstFetch;
 use PhpParser\Node\Stmt\Property;
 use Rector\Core\Rector\AbstractRector;
-use function strtolower;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use function strtolower;
 
 /**
  * @see \Rector\Tests\DeadCode\Rector\PropertyProperty\RemoveNullPropertyInitializationRector\RemoveNullPropertyInitializationRectorTest

diff --git a/...TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorReadonlyClassRector.php b/...TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorReadonlyClassRector.php
@@ -49,8 +49,8 @@ public function getRuleDefinition(): RuleDefinition
         return new RuleDefinition(
             'Add typed public properties based only on strict constructor types in readonly classes',
             [
-            new CodeSample(
-                <<<'CODE_SAMPLE'
+                new CodeSample(
+                    <<<'CODE_SAMPLE'
 /**
  * @immutable
  */
@@ -65,8 +65,8 @@ public function __construct(string $name)
 }
 CODE_SAMPLE
 
-                ,
-                <<<'CODE_SAMPLE'
+                    ,
+                    <<<'CODE_SAMPLE'
 /**
  * @immutable
  */
@@ -80,9 +80,10 @@ public function __construct(string $name)
     }
 }
 CODE_SAMPLE
-            ),
-
-        ]);
+                ),
+
+            ]
+        );
     }
 
     /**

diff --git a/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector.php b/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector.php
@@ -118,11 +118,10 @@ public function refactor(Node $node): ?Node
 
             // public property can be anything
             if ($property->isPublic()) {
-                if (!$phpDocInfo->getVarType() instanceof MixedType) {
+                if (! $phpDocInfo->getVarType() instanceof MixedType) {
                     continue;
                 }
 
-
                 $this->phpDocTypeChanger->changeVarType($property, $phpDocInfo, $propertyType);
                 $hasChanged = true;
                 continue;

diff --git a/src/Console/Command/SetupCICommand.php b/src/Console/Command/SetupCICommand.php
@@ -7,12 +7,12 @@
 use Nette\Utils\FileSystem;
 use Nette\Utils\Strings;
 use OndraM\CiDetector\CiDetector;
-use function sprintf;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Process\Process;
+use function sprintf;
 
 final class SetupCICommand extends Command
 {

diff --git a/stubs/PhpCsFixer/Tokenizer/Tokens.php b/stubs/PhpCsFixer/Tokenizer/Tokens.php