Merge pull request #907 from ergebnis/feature/rector-rules

Enhancement: Require and use `ergebnis/rector-rules`
ergebnis · Sep 30, 2023 · 4984242 · 4984242
2 parents 87b3772 + 3dc40bb
commit 4984242
Show file tree

Hide file tree

Showing 12 changed files with 224 additions and 341 deletions.
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -35,7 +35,6 @@
         '.build/',
         '.github/',
         '.note/',
-        'test/Fixture/',
     ])
     ->ignoreDotFiles(false)
     ->in(__DIR__);

diff --git a/composer.json b/composer.json
@@ -28,6 +28,7 @@
     "ergebnis/data-provider": "^3.0.0",
     "ergebnis/license": "^2.2.0",
     "ergebnis/phpunit-slow-test-detector": "^2.3.0",
+    "ergebnis/rector-rules": "~0.1.0",
     "fakerphp/faker": "^1.23.0",
     "phpunit/phpunit": "^10.3.5",
     "psalm/plugin-phpunit": "~0.18.4",

diff --git a/composer.lock b/composer.lock
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -104,11 +104,6 @@
       <code>provideValueGreaterThanNinetyNine</code>
     </PossiblyUnusedMethod>
   </file>
-  <file src="test/Unit/Rector/SortAssociativeArrayByKey/SortAssociativeArrayByKeyTest.php">
-    <PossiblyUnusedMethod>
-      <code>provideData</code>
-    </PossiblyUnusedMethod>
-  </file>
   <file src="test/Unit/RuleSet/AbstractRuleSetTestCase.php">
     <InternalClass>
       <code>new FixerFactory()</code>

diff --git a/psalm.xml b/psalm.xml
@@ -18,9 +18,7 @@
 
     <projectFiles>
         <directory name="src/" />
-        <directory name="test/EndToEnd/" />
-        <directory name="test/Unit/" />
-        <directory name="test/Util/" />
+        <directory name="test/" />
         <file name="rector.php" />
         <ignoreFiles>
             <directory name="vendor/" />

diff --git a/rector.php b/rector.php
@@ -11,7 +11,7 @@
  * @see https://github.com/ergebnis/php-cs-fixer-config
  */
 
-use Ergebnis\PhpCsFixer;
+use Ergebnis\Rector\Rules;
 use Rector\Config;
 use Rector\Core;
 use Rector\Php81;
@@ -24,16 +24,14 @@
 
     $rectorConfig->paths([
         __DIR__ . '/src/',
-        __DIR__ . '/test/EndToEnd/',
-        __DIR__ . '/test/Unit/',
-        __DIR__ . '/test/Util/',
+        __DIR__ . '/test/',
     ]);
 
     $rectorConfig->phpVersion(Core\ValueObject\PhpVersion::PHP_81);
 
     $rectorConfig->rules([
         Php81\Rector\Property\ReadOnlyPropertyRector::class,
-        PhpCsFixer\Config\Test\Rector\SortAssociativeArrayByKey::class,
+        Rules\Arrays\SortAssociativeArrayByKeyRector::class,
     ]);
 
     $rectorConfig->sets([

diff --git a/test/Fixture/Rector/SortAssociativeArrayByKey/class.php.inc b/test/Fixture/Rector/SortAssociativeArrayByKey/class.php.inc