Replace StyleCI to PHP CS Fixer

.github/workflows/rector-cs.yml

@@ -0,0 +1,27 @@
+name: Rector + PHP CS Fixer
+
+on:
+  pull_request_target:
+    paths:
+      - 'src/**'
+      - 'tests/**'
+      - '.github/workflows/rector-cs.yml'
+      - 'composer.json'
+      - 'rector.php'
+      - '.php-cs-fixer.dist.php'
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  rector:
+    uses: yiisoft/actions/.github/workflows/rector-cs.yml@master
+    secrets:
+      token: ${{ secrets.YIISOFT_GITHUB_TOKEN }}
+    with:
+      repository: ${{ github.event.pull_request.head.repo.full_name }}
+      php: '8.4'

.gitignore

@@ -28,3 +28,6 @@ phpunit.phar
 /phpunit.xml
 # phpunit cache
 /.phpunit.cache/*
+
+# PHP CS Fixer
+/.php-cs-fixer.cache

.php-cs-fixer.dist.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+use PhpCsFixer\Config;
+use PhpCsFixer\Finder;
+use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;
+
+$finder = (new Finder())->in([
+    __DIR__ . '/src',
+    __DIR__ . '/tests',
+]);
+
+return (new Config())
+    ->setParallelConfig(ParallelConfigFactory::detect())
+    ->setRules([
+        '@PER-CS3.0' => true,
+        'no_unused_imports' => true,
+        'ordered_class_elements' => true,
+        'class_attributes_separation' => ['elements' => ['method' => 'one']],
+    ])
+    ->setFinder($finder);

composer.json

@@ -36,9 +36,10 @@
         "yiisoft/arrays": "^3.0"
     },
     "require-dev": {
+        "friendsofphp/php-cs-fixer": "^3.89.2",
         "maglnet/composer-require-checker": "^4.7.1",
         "phpunit/phpunit": "^10.5.52",
-        "rector/rector": "^2.1.4",
+        "rector/rector": "^2.2.8",
         "roave/infection-static-analysis-plugin": "^1.35",
         "spatie/phpunit-watcher": "^1.24",
         "vimeo/psalm": "^5.26.1 || ^6.10.3"
@@ -62,6 +63,7 @@
     },
     "scripts": {
         "test": "phpunit --testdox --no-interaction",
-        "test-watch": "phpunit-watcher watch"
+        "test-watch": "phpunit-watcher watch",
+        "cs-fix": "php-cs-fixer fix"
     }
 }

src/Paginator/InvalidPageException.php

@@ -9,6 +9,4 @@
 /**
  * Thrown when the page is invalid.
  */
-class InvalidPageException extends LogicException
-{
-}
+class InvalidPageException extends LogicException {}

src/Paginator/KeysetFilterContext.php

@@ -10,7 +10,6 @@ public function __construct(
         public readonly string $field,
         public readonly string $value,
         public readonly int $sorting,
-        public readonly bool $isReverse
-    ) {
-    }
+        public readonly bool $isReverse,
+    ) {}
 }

src/Paginator/KeysetPaginator.php

@@ -469,7 +469,7 @@ private function prepareSortInDataReader(ReadableDataInterface $dataReader, ?Sor
                 throw new InvalidArgumentException('Data should be always sorted to work with keyset pagination.');
             }
             $sort = $sort->withOrder(
-                array_slice($defaultOrder, 0, 1, true)
+                array_slice($defaultOrder, 0, 1, true),
             );
         }
 

src/Paginator/PageNotFoundException.php

@@ -11,7 +11,7 @@ final class PageNotFoundException extends InvalidPageException
     public function __construct(int $page)
     {
         parent::__construct(
-            sprintf('Page %d not found.', $page)
+            sprintf('Page %d not found.', $page),
         );
     }
 }

src/Paginator/PageToken.php

@@ -9,8 +9,7 @@ final class PageToken
     private function __construct(
         public readonly string $value,
         public readonly bool $isPrevious,
-    ) {
-    }
+    ) {}
 
     public static function previous(string $value): self
     {

src/Processor/DataProcessorException.php

@@ -13,6 +13,4 @@
  *
  * @psalm-suppress ClassMustBeFinal We assume that the class may be extended in userland.
  */
-class DataProcessorException extends RuntimeException
-{
-}
+class DataProcessorException extends RuntimeException {}

src/Reader/DataReaderException.php

@@ -13,6 +13,4 @@
  *
  * @psalm-suppress ClassMustBeFinal We assume that the class may be extended in userland.
  */
-class DataReaderException extends RuntimeException
-{
-}
+class DataReaderException extends RuntimeException {}

src/Reader/DataReaderInterface.php

@@ -31,6 +31,4 @@ interface DataReaderInterface extends
     CountableDataInterface,
     SortableDataInterface,
     FilterableDataInterface,
-    IteratorAggregate
-{
-}
+    IteratorAggregate {}

src/Reader/Filter/All.php

@@ -10,6 +10,4 @@
  * Represents a filter that matches all items.
  * Used to indicate that no filtering should be applied.
  */
-final class All implements FilterInterface
-{
-}
+final class All implements FilterInterface {}

src/Reader/Filter/Between.php

@@ -22,7 +22,6 @@ final class Between implements FilterInterface
     public function __construct(
         public readonly string $field,
         public readonly bool|DateTimeInterface|float|int|string|Stringable $minValue,
-        public readonly bool|DateTimeInterface|float|int|string|Stringable $maxValue
-    ) {
-    }
+        public readonly bool|DateTimeInterface|float|int|string|Stringable $maxValue,
+    ) {}
 }

src/Reader/Filter/Compare.php

@@ -20,8 +20,7 @@ abstract class Compare implements FilterInterface
     final public function __construct(
         public readonly string $field,
         public readonly bool|DateTimeInterface|float|int|string|Stringable $value,
-    ) {
-    }
+    ) {}
 
     /**
      * @param bool|DateTimeInterface|float|int|string|Stringable $value Value to compare to.

src/Reader/Filter/Equals.php

@@ -7,6 +7,4 @@
 /**
  * `Equals` filter defines a criteria for ensuring field value equals a given value.
  */
-final class Equals extends Compare
-{
-}
+final class Equals extends Compare {}

src/Reader/Filter/EqualsNull.php

@@ -16,6 +16,5 @@ final class EqualsNull implements FilterInterface
      */
     public function __construct(
         public readonly string $field,
-    ) {
-    }
+    ) {}
 }

src/Reader/Filter/GreaterThan.php

@@ -7,6 +7,4 @@
 /**
  * `GreaterThan` filter defines a criteria for ensuring field value is greater than a given value.
  */
-final class GreaterThan extends Compare
-{
-}
+final class GreaterThan extends Compare {}

src/Reader/Filter/GreaterThanOrEqual.php

@@ -7,6 +7,4 @@
 /**
  * `GreaterThanOrEqual` filter defines a criteria for ensuring field value is greater than or equal to a given value.
  */
-final class GreaterThanOrEqual extends Compare
-{
-}
+final class GreaterThanOrEqual extends Compare {}

src/Reader/Filter/In.php

@@ -23,7 +23,7 @@ final class In implements FilterInterface
     public function __construct(
         public readonly string $field,
         /** @var bool[]|float[]|int[]|string[]|Stringable[] Values to check against. */
-        public readonly array $values
+        public readonly array $values,
     ) {
         $this->assertValues($values);
     }
@@ -36,7 +36,7 @@ private function assertValues(array $values): void
                     sprintf(
                         'The value should be scalar or Stringable. "%s" is received.',
                         get_debug_type($value),
-                    )
+                    ),
                 );
             }
         }

src/Reader/Filter/LessThan.php

@@ -7,6 +7,4 @@
 /**
  * `LessThan` filter defines a criteria for ensuring field value is less than a given value.
  */
-final class LessThan extends Compare
-{
-}
+final class LessThan extends Compare {}

src/Reader/Filter/LessThanOrEqual.php

@@ -7,6 +7,4 @@
 /**
  * `LessThanOrEqual` filter defines a criteria for ensuring field value is less than or equal to a given value.
  */
-final class LessThanOrEqual extends Compare
-{
-}
+final class LessThanOrEqual extends Compare {}

src/Reader/Filter/Like.php

@@ -27,6 +27,5 @@ public function __construct(
         public readonly string|Stringable $value,
         public readonly ?bool $caseSensitive = null,
         public readonly LikeMode $mode = LikeMode::Contains,
-    ) {
-    }
+    ) {}
 }

src/Reader/Filter/None.php

@@ -10,6 +10,4 @@
  * Represents a filter that matches no items.
  * Used to indicate that all items should be excluded.
  */
-final class None implements FilterInterface
-{
-}
+final class None implements FilterInterface {}

src/Reader/Filter/Not.php

@@ -16,6 +16,5 @@ final class Not implements FilterInterface
      */
     public function __construct(
         public readonly FilterInterface $filter,
-    ) {
-    }
+    ) {}
 }

src/Reader/FilterInterface.php

@@ -7,6 +7,4 @@
 /**
  * Filter is a set of settings for modifying data reader criteria.
  */
-interface FilterInterface
-{
-}
+interface FilterInterface {}

src/Reader/Iterable/Context.php

@@ -18,8 +18,7 @@ public function __construct(
          */
         public readonly array $iterableFilterHandlers,
         private readonly ValueReaderInterface $valueReader,
-    ) {
-    }
+    ) {}
 
     /**
      * @psalm-param class-string<FilterInterface> $class