chore: add more php-cs-fixer rules

Author: innocenzi

.github/workflows/coding-conventions.yml

@@ -9,13 +9,21 @@ jobs:
     name: Run Style Check
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
-      - name: Run PHP-CS-Fixer
-        uses: docker://oskarstark/php-cs-fixer-ga
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
         with:
-          args: --config=.php-cs-fixer.dist.php --allow-risky=yes --dry-run -v
+          php-version: 8.4
+          coverage: none
+
+      - name: Install composer dependencies
+        uses: ramsey/composer-install@v3
+
+      - name: Run php-cs-fixer
+        run: vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.dist.php --allow-risky=yes --dry-run -vvv
+        env:
+          PHP_CS_FIXER_IGNORE_ENV: true
 
   phpstan:
     name: "Run Static Analysis: PHPStan"
@@ -52,4 +60,4 @@ jobs:
         uses: ramsey/composer-install@v3
 
       - name: Run Rector
-        run: vendor/bin/rector process --no-ansi --dry-run --no-progress-bar
+        run: vendor/bin/rector process --no-ansi --dry-run --no-progress-bar

.github/workflows/quality-assurance.yml

@@ -28,13 +28,24 @@ jobs:
     name: Check Styling
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
-      - name: Run PHP-CS-Fixer
-        uses: docker://oskarstark/php-cs-fixer-ga
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
         with:
-          args: --config=.php-cs-fixer.dist.php --allow-risky=yes --dry-run -v
+          php-version: 8.3
+          coverage: none
+
+      - name: Install composer dependencies
+        uses: ramsey/composer-install@v3
+
+      - name: Run PHPStan
+        run: vendor/bin/phpstan --error-format=github
+
+      - name: Run PHP-CS-Fixer
+        run: vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.dist.php --allow-risky=yes --dry-run -vvv
+        env:
+          PHP_CS_FIXER_IGNORE_ENV: true
 
   phpstan:
     name: Perform Static Analysis

.php-cs-fixer.dist.php

@@ -13,11 +13,50 @@
     ->ignoreVCS(true);
 
 return (new PhpCsFixer\Config())
+    ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
     ->setCacheFile('.cache/fixer/cs-fixer.cache')
     ->setRules([
         '@PSR12' => true,
+        '@PHP84Migration' => true,
+        'ordered_attributes' => true,
+        'ordered_traits' => true,
+        'attribute_empty_parentheses' => true,
+        'yoda_style' => [
+            'equal' => false,
+            'identical' => false,
+            'less_and_greater' => false
+        ],
+        'get_class_to_class_keyword' => true,
+        'cast_spaces' => true,
+        'single_space_around_construct' => true,
+        'heredoc_indentation' => true,
+        'types_spaces' => true,
+        'single_quote' => true,
+        'no_short_bool_cast' => true,
+        'explicit_string_variable' => true,
+        'no_extra_blank_lines' => [
+            'tokens' => [
+                'case',
+                'continue',
+                'curly_brace_block',
+                'default',
+                'extra',
+                'parenthesis_brace_block',
+                'square_brace_block',
+                'switch',
+                'throw',
+                'use',
+            ],
+        ],
         'array_syntax' => ['syntax' => 'short'],
-        'ordered_imports' => ['sort_algorithm' => 'alpha'],
+        'ordered_imports' => [
+            'sort_algorithm' => 'alpha',
+            'imports_order' => [
+                'class',
+                'function',
+                'const',
+            ],
+        ],
         'no_unused_imports' => true,
         'no_unneeded_import_alias' => true,
         'blank_line_between_import_groups' => false,
@@ -33,7 +72,9 @@
             'import_functions' => true,
         ],
         'not_operator_with_successor_space' => true,
-        'trailing_comma_in_multiline' => true,
+        'trailing_comma_in_multiline' => [
+            'elements' => ['arrays', 'arguments', 'parameters', 'match'],
+        ],
         'phpdoc_scalar' => true,
         'unary_operator_spaces' => true,
         'binary_operator_spaces' => true,

src/Tempest/Auth/src/AuthBootstrap.php

@@ -11,7 +11,7 @@
 final readonly class AuthBootstrap
 {
     public function __construct(
-        private Router $router
+        private Router $router,
     ) {
     }
 

src/Tempest/Auth/src/CurrentUserNotLoggedIn.php

@@ -10,6 +10,6 @@ final class CurrentUserNotLoggedIn extends Exception
 {
     public function __construct()
     {
-        parent::__construct("Tried to request the current user, but no one is logged in");
+        parent::__construct('Tried to request the current user, but no one is logged in');
     }
 }

src/Tempest/Auth/src/Install/Permission.php

@@ -20,7 +20,7 @@ public function __construct(
 
     public function matches(string|UnitEnum|self $match): bool
     {
-        $match = match(true) {
+        $match = match (true) {
             is_string($match) => $match,
             $match instanceof BackedEnum => $match->value,
             $match instanceof UnitEnum => $match->name,

src/Tempest/Auth/src/Install/User.php

@@ -10,8 +10,8 @@
 use Tempest\Auth\CanAuthorize;
 use Tempest\Database\DatabaseModel;
 use Tempest\Database\IsDatabaseModel;
-use function Tempest\Support\arr;
 use UnitEnum;
+use function Tempest\Support\arr;
 
 final class User implements DatabaseModel, CanAuthenticate, CanAuthorize
 {

src/Tempest/Cache/src/CacheClearCommand.php

@@ -25,7 +25,7 @@ public function __invoke(bool $all = false): void
 
         if ($all === false) {
             $caches = $this->ask(
-                question: "Which caches do you want to clear?",
+                question: 'Which caches do you want to clear?',
                 options: $this->cacheConfig->caches,
                 multiple: true,
             );

src/Tempest/Cache/src/CacheConfig.php

@@ -29,8 +29,8 @@ public function __construct(
         ?bool $enable = null,
     ) {
         $this->enable = $enable ?? env('CACHE') ?? null;
-        $this->projectCache = (bool)env('PROJECT_CACHE', false);
-        $this->viewCache = (bool)env('VIEW_CACHE', false);
+        $this->projectCache = (bool) env('PROJECT_CACHE', false);
+        $this->viewCache = (bool) env('VIEW_CACHE', false);
         $this->discoveryCache = $this->resolveDiscoveryCacheStrategy();
     }
 

src/Tempest/Cache/src/CacheStatusCommand.php

@@ -29,7 +29,7 @@ public function __invoke(): void
             /** @var Cache $cache */
             $cache = $this->container->get($cacheClass);
 
-            $reason = match($this->cacheConfig->enable) {
+            $reason = match ($this->cacheConfig->enable) {
                 true => ' (global CACHE = true)',
                 false => ' (global CACHE = false)',
                 null => '',
@@ -39,7 +39,7 @@ public function __invoke(): void
                 '<em>%s</em> %s%s',
                 $cacheClass,
                 $cache->isEnabled() ? '<style="fg-green">enabled</style>' : '<style="fg-red">disabled</style>',
-                $reason
+                $reason,
             ));
         }
     }