Update dependencies

.github/workflows/tests.yml

@@ -13,7 +13,7 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-22.04, windows-2022]
-        php: [8.2, 8.3]
+        php: [8.2, 8.3, 8.4, 8.5]
 
     name: PHP ${{ matrix.php }} - ${{ matrix.os }}
 

CONTRIBUTING.md

@@ -42,10 +42,10 @@ To update dependencies to latest:
 
 ```bash
 # Production
-composer require friendsofphp/php-cs-fixer laravel-zero/framework laravel/pint squizlabs/php_codesniffer tightenco/tlint --dev
+composer require friendsofphp/php-cs-fixer laravel-zero/framework laravel/pint nunomaduro/termwind squizlabs/php_codesniffer tightenco/tlint --dev
 
 # Development
-COMPOSER=composer-dev.json composer require friendsofphp/php-cs-fixer laravel-zero/framework laravel/pint squizlabs/php_codesniffer tightenco/tlint  --dev
+COMPOSER=composer-dev.json composer require friendsofphp/php-cs-fixer larastan/larastan laravel-zero/framework laravel/pint nunomaduro/termwind pestphp/pest phpstan/phpstan rector/rector spatie/laravel-ray squizlabs/php_codesniffer tightenco/tlint  --dev
 ```
 
 ## PHPStan

app/Fixer/ClassNotation/CustomPhpUnitOrderFixer.php

@@ -4,7 +4,7 @@
 
 namespace App\Fixer\ClassNotation;
 
-use PhpCsFixer\Indicator\PhpUnitTestCaseIndicator;
+use PhpCsFixer\Tokenizer\Analyzer\PhpUnitTestCaseAnalyzer;
 use PhpCsFixer\Tokenizer\Tokens;
 use SplFileInfo;
 
@@ -56,13 +56,11 @@ protected function configurePreNormalisation(array &$configuration): void
 
     protected function applyFix(SplFileInfo $file, Tokens $tokens): void
     {
-        $phpUnitTestCaseIndicator = new PhpUnitTestCaseIndicator;
+        $analyzer = new PhpUnitTestCaseAnalyzer;
 
-        for ($index = $tokens->count() - 1; $index > 0; $index--) {
-            if ($tokens[$index]->isGivenKind(T_CLASS) && $phpUnitTestCaseIndicator->isPhpUnitClass($tokens, $index)) {
-                parent::applyFix($file, $tokens);
-                break;
-            }
+        foreach ($analyzer->findPhpUnitClasses($tokens) as $_) {
+            parent::applyFix($file, $tokens);
+            break;
         }
     }
 }

app/Support/PhpCodeSniffer.php

@@ -39,7 +39,9 @@ private function process(string $tool, array $params = []): int
     {
         $serverArgv = $_SERVER['argv'];
 
-        $this->installTightenCodingStandard();
+        if (defined('PHP_CODESNIFFER_CBF') === false) {
+            define('PHP_CODESNIFFER_CBF', $tool === 'runPHPCBF');
+        }
 
         $ignore = $this->dusterConfig->get('exclude')
             ? ['--ignore=' . implode(',', $this->dusterConfig->get('exclude'))]
@@ -52,7 +54,9 @@ private function process(string $tool, array $params = []): int
             ...$params,
         ];
 
-        $this->resetConfig($tool);
+        $this->installTightenCodingStandard();
+
+        $this->resetConfig();
 
         $runner = new Runner;
 
@@ -84,20 +88,16 @@ private function getPaths(): array
 
     private function installTightenCodingStandard(): void
     {
-        Config::setConfigData('installed_paths', base_path('standards/Tighten'), true);
+        (new Config)->setConfigData('installed_paths', base_path('standards/Tighten'), true);
     }
 
     /**
      * Config uses a private static property $overriddenDefaults
      * which doesn't allow us to update the config between runs
      * we need to reset it so we can also lint in the fix command.
      */
-    private function resetConfig(string $tool): void
+    private function resetConfig(): void
     {
-        if (defined('PHP_CODESNIFFER_CBF') === false) {
-            define('PHP_CODESNIFFER_CBF', $tool === 'runPHPCBF');
-        }
-
         invade(new Config)->overriddenDefaults = [];
     }
 

app/Support/Pint.php

@@ -6,6 +6,7 @@
 use App\Actions\FixCode;
 use App\Commands\DefaultCommand;
 use App\Contracts\Tool;
+use Symfony\Component\Console\Input\ArrayInput;
 
 class Pint extends Tool
 {
@@ -27,6 +28,10 @@ private function process(): int
     {
         $defaultCommand = new DefaultCommand;
 
+        $input = new ArrayInput([]);
+        $input->bind($defaultCommand->getDefinition());
+        $defaultCommand->setInput($input);
+
         return $defaultCommand->handle(resolve(FixCode::class), resolve(ElaborateSummary::class));
     }
 }

composer-dev.json

@@ -3,17 +3,17 @@
         "php": "^8.2.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.66",
-        "larastan/larastan": "^2.7",
-        "laravel-zero/framework": "^11.0",
-        "laravel/pint": "^1.21",
-        "nunomaduro/termwind": "^2.0",
-        "pestphp/pest": "^2.0",
-        "phpstan/phpstan": "^1.11",
-        "rector/rector": "^1.1",
+        "friendsofphp/php-cs-fixer": "^3.94",
+        "larastan/larastan": "^3.9",
+        "laravel-zero/framework": "^12.0",
+        "laravel/pint": "^1.27",
+        "nunomaduro/termwind": "^2.4",
+        "pestphp/pest": "^3.8",
+        "phpstan/phpstan": "^2.1",
+        "rector/rector": "^2.3",
         "spatie/invade": "^1.1",
-        "spatie/laravel-ray": "^1.36",
-        "squizlabs/php_codesniffer": "^3.12",
+        "spatie/laravel-ray": "^1.43",
+        "squizlabs/php_codesniffer": "^4.0",
         "tightenco/tlint": "^9.5"
     },
     "autoload": {