Replace StyleCI with PHP CS Fixer

.github/workflows/rector-cs.yml

@@ -0,0 +1,28 @@
+name: Rector + PHP CS Fixer
+
+on:
+  pull_request_target:
+    paths:
+      - 'config/**'
+      - '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.1'

.gitignore

@@ -26,3 +26,7 @@ composer.phar
 /phpunit.phar
 /phpunit.xml
 /.phpunit.cache
+
+# PHP CS Fixer
+/.php-cs-fixer.cache
+/.php-cs-fixer.php

.php-cs-fixer.dist.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+use PhpCsFixer\Finder;
+use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;
+use Yiisoft\CodeStyle\ConfigBuilder;
+
+$finder = (new Finder())->in([
+    __DIR__ . '/config',
+    __DIR__ . '/src',
+    __DIR__ . '/tests',
+]);
+
+return ConfigBuilder::build()
+    ->setRiskyAllowed(true)
+    ->setParallelConfig(ParallelConfigFactory::detect())
+    ->setRules([
+        '@Yiisoft/Core' => true,
+        '@Yiisoft/Core:risky' => true,
+    ])
+    ->setFinder($finder);

composer.json

@@ -45,12 +45,14 @@
         "yiisoft/request-provider": "^1.0"
     },
     "require-dev": {
+        "friendsofphp/php-cs-fixer": "^3.93",
         "maglnet/composer-require-checker": "^4.7.1",
         "phpunit/phpunit": "^10.5.45",
         "rector/rector": "^2.0.11",
         "roave/infection-static-analysis-plugin": "^1.35",
         "spatie/phpunit-watcher": "^1.24",
         "vimeo/psalm": "^5.26.1 || ^6.10",
+        "yiisoft/code-style": "^1.0",
         "yiisoft/di": "^1.3",
         "yiisoft/test-support": "^3.0.2"
     },
@@ -82,6 +84,7 @@
     },
     "scripts": {
         "test": "phpunit --testdox --no-interaction",
-        "test-watch": "phpunit-watcher watch"
+        "test-watch": "phpunit-watcher watch",
+        "cs-fix": "php-cs-fixer fix"
     }
 }

config/di-web.php

@@ -12,8 +12,8 @@
     RequestInputParametersResolver::class => [
         '__construct()' => [
             'hydrator' => Reference::to(ValidatingHydrator::class),
-            'throwInputValidationException' =>
-                $params['yiisoft/input-http']['requestInputParametersResolver']['throwInputValidationException'],
+            'throwInputValidationException'
+                => $params['yiisoft/input-http']['requestInputParametersResolver']['throwInputValidationException'],
         ],
     ],
 ];

src/Attribute/Data/FromBody.php

@@ -29,8 +29,7 @@ public function __construct(
         private string|array|null $name = null,
         private array $map = [],
         private bool $strict = false,
-    ) {
-    }
+    ) {}
 
     /**
      * Get the name of the field in the request body to get data from.

src/Attribute/Data/FromBodyResolver.php

@@ -24,8 +24,7 @@ final class FromBodyResolver implements DataAttributeResolverInterface
      */
     public function __construct(
         private RequestProviderInterface $requestProvider,
-    ) {
-    }
+    ) {}
 
     public function prepareData(DataAttributeInterface $attribute, DataInterface $data): DataInterface
     {

src/Attribute/Data/FromQuery.php

@@ -29,8 +29,7 @@ public function __construct(
         private string|array|null $name = null,
         private array $map = [],
         private bool $strict = false,
-    ) {
-    }
+    ) {}
 
     /**
      * Get the name of the field in the query string to get data from.

src/Attribute/Data/FromQueryResolver.php

@@ -24,8 +24,7 @@ final class FromQueryResolver implements DataAttributeResolverInterface
      */
     public function __construct(
         private RequestProviderInterface $requestProvider,
-    ) {
-    }
+    ) {}
 
     public function prepareData(DataAttributeInterface $attribute, DataInterface $data): DataInterface
     {

src/Attribute/Parameter/Body.php

@@ -18,9 +18,8 @@ final class Body implements ParameterAttributeInterface
      * @psalm-param string|list<string>|null $name
      */
     public function __construct(
-        private string|array|null $name = null
-    ) {
-    }
+        private string|array|null $name = null,
+    ) {}
 
     /**
      * Get the name of the field in the request body to get data from.

src/Attribute/Parameter/BodyResolver.php

@@ -23,9 +23,8 @@
      * @param RequestProviderInterface $requestProvider The request provider.
      */
     public function __construct(
-        private RequestProviderInterface $requestProvider
-    ) {
-    }
+        private RequestProviderInterface $requestProvider,
+    ) {}
 
     public function getParameterValue(
         ParameterAttributeInterface $attribute,
@@ -44,7 +43,7 @@
         }
 
         if (!ArrayHelper::pathExists($parsedBody, $name)) {
             return Result::fail();
         }
 
         return Result::success(ArrayHelper::getValueByPath($parsedBody, $name));

src/Attribute/Parameter/Query.php

@@ -18,9 +18,8 @@ final class Query implements ParameterAttributeInterface
      * @psalm-param string|list<string>|null $name
      */
     public function __construct(
-        private string|array|null $name = null
-    ) {
-    }
+        private string|array|null $name = null,
+    ) {}
 
     /**
      * Get the name of the field in the query string to get data from.

src/Attribute/Parameter/QueryResolver.php

@@ -21,9 +21,8 @@ final class QueryResolver implements ParameterAttributeResolverInterface
      * @param RequestProviderInterface $requestProvider The request provider.
      */
     public function __construct(
-        private RequestProviderInterface $requestProvider
-    ) {
-    }
+        private RequestProviderInterface $requestProvider,
+    ) {}
 
     public function getParameterValue(
         ParameterAttributeInterface $attribute,

src/Attribute/Parameter/Request.php

@@ -18,9 +18,8 @@ final class Request implements ParameterAttributeInterface
      * @psalm-param string|list<string>|null $name
      */
     public function __construct(
-        private string|array|null $name = null
-    ) {
-    }
+        private string|array|null $name = null,
+    ) {}
 
     /**
      * Get the name of the field in the request attributes to get data from.

src/Attribute/Parameter/RequestResolver.php

@@ -21,9 +21,8 @@
      * @param RequestProviderInterface $requestProvider The request provider.
      */
     public function __construct(
-        private RequestProviderInterface $requestProvider
-    ) {
-    }
+        private RequestProviderInterface $requestProvider,
+    ) {}
 
     public function getParameterValue(
         ParameterAttributeInterface $attribute,
@@ -38,7 +37,7 @@
         $name = $attribute->getName() ?? $context->getParameter()->getName();
 
         if (!ArrayHelper::pathExists($requestAttributes, $name)) {
             return Result::fail();
         }
 
         return Result::success(ArrayHelper::getValueByPath($requestAttributes, $name));

src/Attribute/Parameter/UploadedFiles.php

@@ -18,9 +18,8 @@ final class UploadedFiles implements ParameterAttributeInterface
      * @psalm-param string|list<string>|null $name
      */
     public function __construct(
-        private string|array|null $name = null
-    ) {
-    }
+        private string|array|null $name = null,
+    ) {}
 
     /**
      * Get the name of the field in the uploaded files to get data from.

src/Attribute/Parameter/UploadedFilesResolver.php

@@ -22,8 +22,7 @@ final class UploadedFilesResolver implements ParameterAttributeResolverInterface
      */
     public function __construct(
         private RequestProviderInterface $requestProvider,
-    ) {
-    }
+    ) {}
 
     public function getParameterValue(
         ParameterAttributeInterface $attribute,

src/HydratorAttributeParametersResolver.php

@@ -58,7 +58,7 @@ private function prepareValue(Result $handleResult, ReflectionParameter $paramet
 
         $typeCastResult = $this->typeCaster->cast(
             $value,
-            new TypeCastContext($this->hydrator, $parameter)
+            new TypeCastContext($this->hydrator, $parameter),
         );
 
         return $typeCastResult->isResolved() ? $typeCastResult->getValue() : $value;

src/RequestInputInterface.php

@@ -7,6 +7,4 @@
 /**
  * `RequestInputInterface` marks a DTO as a request input.
  */
-interface RequestInputInterface
-{
-}
+interface RequestInputInterface {}

src/RequestInputParametersResolver.php

@@ -24,8 +24,7 @@ final class RequestInputParametersResolver implements ParametersResolverInterfac
     public function __construct(
         private HydratorInterface $hydrator,
         private bool $throwInputValidationException = false,
-    ) {
-    }
+    ) {}
 
     /**
      * @param ReflectionParameter[] $parameters The parameters to resolve.

tests/Attribute/Parameter/BodyTest.php

@@ -25,7 +25,7 @@ public function testBase(): void
             'c' => 'three',
         ]);
 
-        $input = new class () {
+        $input = new class {
             #[Body('a')]
             public string $a = '';
             #[Body('b')]
@@ -45,7 +45,7 @@ public function testWithoutBody(): void
     {
         $hydrator = $this->createHydrator(null);
 
-        $input = new class () {
+        $input = new class {
             #[Body('a')]
             public string $a = '';
             #[Body('b')]
@@ -68,7 +68,7 @@ public function testNonExistPath(): void
             'b' => 'two',
         ]);
 
-        $input = new class () {
+        $input = new class {
             #[Body('a.b')]
             public string $a = '';
         };