Merge pull request #290 from php-school/cs-tools

Upgrade CS tools

Author: AydinHassan

.github/workflows/static.yml

@@ -25,8 +25,8 @@ jobs:
       - name: Install Dependencies
         run: composer update --no-interaction --no-progress
 
-      - name: Run PHPCS
-        run: composer run cs
+      - name: Run cs fixer
+        run: composer run cs-dry-run
 
       - name: Run PHPStan
         run: composer run static

.github/workflows/test.yml

@@ -27,7 +27,7 @@ jobs:
           echo "::add-matcher::${{ runner.tool_cache }}/php.json"
           echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
-      - name: Install dependencies
+      - name: Install cdependencies
         run: composer update --no-interaction --no-progress
 
       - name: Tests

.gitignore

@@ -3,3 +3,4 @@ vendor/
 /composer.lock
 /.phpunit.result.cache
 /.phpunit.cache
+/.php-cs-fixer.cache

composer.json

@@ -15,8 +15,8 @@
     ],
     "require-dev": {
         "phpunit/phpunit": "^11.5",
-        "squizlabs/php_codesniffer": "^3.2",
-        "phpstan/phpstan": "^1.2.0"
+        "phpstan/phpstan": "^2.1",
+        "friendsofphp/php-cs-fixer": "*"
     },
     "require": {
         "php" : ">=8.2",
@@ -37,9 +37,13 @@
         "psr-4": { "PhpSchool\\CliMenuTest\\": "test/" }
     },
     "scripts" : {
+        "cs-dry-run" : [
+            "php-cs-fixer check src --rules=@PSR12",
+            "php-cs-fixer check test --rules=@PSR12"
+        ],
         "cs" : [
-            "phpcs src --standard=PSR2",
-            "phpcs test --standard=PSR2"
+            "php-cs-fixer fix src --rules=@PSR12",
+            "php-cs-fixer fix test --rules=@PSR12"
         ],
         "static" : [
             "phpstan analyse src --level=7"

phpstan.neon

@@ -1,2 +0,0 @@
-parameters:
-    checkMissingIterableValueType: false

src/Action/ExitAction.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpSchool\CliMenu\Action;
@@ -10,7 +11,7 @@
  */
 class ExitAction
 {
-    public function __invoke(CliMenu $menu) : void
+    public function __invoke(CliMenu $menu): void
     {
         $menu->close();
     }

src/Action/GoBackAction.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpSchool\CliMenu\Action;
@@ -10,7 +11,7 @@
  */
 class GoBackAction
 {
-    public function __invoke(CliMenu $menu) : void
+    public function __invoke(CliMenu $menu): void
     {
         if ($parent = $menu->getParent()) {
             $menu->closeThis();