[cs] Make use of new ECS config (#5445)

* [cs] Make use of new ECS config * apply cs * cs
rectorphp · Jan 8, 2024 · 08ac19c · 08ac19c
1 parent e3ccf17
commit 08ac19c
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 31 deletions.
diff --git a/composer.json b/composer.json
@@ -53,7 +53,7 @@
         "rector/rector-generator": "^0.7",
         "spatie/enum": "^3.13",
         "symplify/easy-ci": "^11.3",
-        "symplify/easy-coding-standard": "^12.0",
+        "symplify/easy-coding-standard": "^12.1",
         "symplify/phpstan-extensions": "^11.4",
         "symplify/phpstan-rules": "^12.2",
         "symplify/rule-doc-generator": "^12.1",

diff --git a/ecs.php b/ecs.php
@@ -3,30 +3,22 @@
 declare(strict_types=1);
 
 use PhpCsFixer\Fixer\ClassNotation\SelfAccessorFixer;
-use PhpCsFixer\Fixer\FunctionNotation\FunctionTypehintSpaceFixer;
 use PhpCsFixer\Fixer\Phpdoc\PhpdocTypesFixer;
 use Symplify\EasyCodingStandard\Config\ECSConfig;
-use Symplify\EasyCodingStandard\ValueObject\Set\SetList;
 
-return static function (ECSConfig $ecsConfig): void {
-    $ecsConfig->sets([SetList::SYMPLIFY, SetList::COMMON, SetList::CLEAN_CODE, SetList::PSR_12]);
-
-    $ecsConfig->paths([
+return ECSConfig::configure()
+    ->withPreparedSets(symplify: true, common: true, psr12: true)
+    ->withPaths([
         __DIR__ . '/bin',
         __DIR__ . '/src',
         __DIR__ . '/rules',
         __DIR__ . '/rules-tests',
         __DIR__ . '/tests',
         __DIR__ . '/utils',
         __DIR__ . '/config',
-        __DIR__ . '/ecs.php',
-        __DIR__ . '/rector.php',
         __DIR__ . '/build/build-preload.php',
-    ]);
-
-    $ecsConfig->rules([FunctionTypehintSpaceFixer::class]);
-
-    $ecsConfig->skip([
+    ])
+    ->withSkip([
         '*/Source/*',
         '*/Fixture/*',
         '*/Expected/*',
@@ -39,5 +31,5 @@
         ],
 
         SelfAccessorFixer::class => ['*/*Rector.php'],
-    ]);
-};
+    ])
+    ->withRootFiles();
diff --git a/scoper.php b/scoper.php
@@ -43,9 +43,7 @@
         '#^Symplify\\\\RuleDocGenerator#',
         '#^Symfony\\\\Polyfill#',
     ],
-    'exclude-files' => [
-        ...$polyfillsBootstraps,
-    ],
+    'exclude-files' => [...$polyfillsBootstraps],
 
     // expose
     'expose-classes' => ['Normalizer'],
@@ -60,7 +58,7 @@
             $content
         ),
 
-        static fn(string $filePath, string $prefix, string $content): string =>
+        static fn (string $filePath, string $prefix, string $content): string =>
             // comment out
             str_replace('\\' . $prefix . '\trigger_deprecation(', '// \trigger_deprecation(', $content),
 

diff --git a/src/NodeTypeResolver/NodeTypeResolver.php b/src/NodeTypeResolver/NodeTypeResolver.php
@@ -4,7 +4,6 @@
 
 namespace Rector\NodeTypeResolver;
 
-use PhpParser\Node\Expr\NullsafeMethodCall;
 use PhpParser\Node;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\ArrayDimFetch;
@@ -13,6 +12,7 @@
 use PhpParser\Node\Expr\ConstFetch;
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\New_;
+use PhpParser\Node\Expr\NullsafeMethodCall;
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Expr\Ternary;
 use PhpParser\Node\Name;

diff --git a/src/Testing/Fixture/FixtureFileUpdater.php b/src/Testing/Fixture/FixtureFileUpdater.php
@@ -25,10 +25,8 @@ public static function updateFixtureContent(
         FileSystem::write($fixtureFilePath, $newOriginalContent);
     }
 
-    private static function resolveNewFixtureContent(
-        string $originalContent,
-        string $changedContent
-    ): string {
+    private static function resolveNewFixtureContent(string $originalContent, string $changedContent): string
+    {
         if ($originalContent === $changedContent) {
             return $originalContent;
         }

diff --git a/src/Testing/Fixture/FixtureSplitter.php b/src/Testing/Fixture/FixtureSplitter.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Rector\Testing\Fixture;

diff --git a/src/Testing/Fixture/FixtureTempFileDumper.php b/src/Testing/Fixture/FixtureTempFileDumper.php
@@ -19,7 +19,9 @@ final class FixtureTempFileDumper
     public static function dump(string $fileContents, string $suffix = 'php'): string
     {
         // the "php" suffix is important, because that will hook into \Rector\Application\FileProcessor\PhpFileProcessor
-        $temporaryFileName = sys_get_temp_dir() . self::TEMP_FIXTURE_DIRECTORY . '/' . md5($fileContents) . '.' . $suffix;
+        $temporaryFileName = sys_get_temp_dir() . self::TEMP_FIXTURE_DIRECTORY . '/' . md5(
+            $fileContents
+        ) . '.' . $suffix;
         FileSystem::write($temporaryFileName, $fileContents);
 
         return $temporaryFileName;

diff --git a/tests/Issues/ChangeSwitchTernary/config/configured_rule.php b/tests/Issues/ChangeSwitchTernary/config/configured_rule.php
@@ -2,13 +2,10 @@
 
 declare(strict_types=1);
 
-use Rector\Php80\Rector\Switch_\ChangeSwitchToMatchRector;
 use Rector\CodeQuality\Rector\Expression\TernaryFalseExpressionToIfRector;
 use Rector\Config\RectorConfig;
+use Rector\Php80\Rector\Switch_\ChangeSwitchToMatchRector;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->rules([
-        ChangeSwitchToMatchRector::class,
-        TernaryFalseExpressionToIfRector::class
-    ]);
+    $rectorConfig->rules([ChangeSwitchToMatchRector::class, TernaryFalseExpressionToIfRector::class]);
 };