Run PHPStan on latest and prefer-lowest Symfony dependencies.

Restore Symfony 5 compatibility in safeAddCommand via InstalledVersions and fix PHPStan issues exposed by older dependency resolution.

Author: mnapoli

.github/workflows/ci.yml

@@ -7,28 +7,35 @@ on:
 
 jobs:
     phpstan:
-        name: PHPStan
+        name: PHPStan - PHP ${{ matrix.php }} ${{ matrix.dependency-version }}
         runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                php: [ '8.1', '8.2', '8.3', '8.4' ]
+                dependency-version: [ '' ]
+                include:
+                    -   php: '8.1'
+                        dependency-version: '--prefer-lowest'
         steps:
             - name: Checkout
               uses: actions/checkout@v6
 
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.3'
+                  php-version: ${{ matrix.php }}
                   tools: composer:v2
                   coverage: none
 
             - name: Cache Composer dependencies
               uses: actions/cache@v5
               with:
                   path: ~/.composer/cache
-                  key: php-composer-locked-${{ hashFiles('composer.lock') }}
-                  restore-keys: php-composer-locked-
+                  key: php-${{ matrix.php }}-composer-${{ matrix.dependency-version }}-${{ hashFiles('composer.json') }}
+                  restore-keys: php-${{ matrix.php }}-composer-${{ matrix.dependency-version }}-
 
             - name: Install dependencies
-              run: composer update --no-interaction --prefer-dist --no-progress
+              run: composer update ${{ matrix.dependency-version }} --no-interaction --prefer-dist --no-progress
 
             - name: PHPStan
               run: vendor/bin/phpstan analyse --no-progress

src/Application.php

@@ -5,6 +5,7 @@
 use Aws\Exception\CredentialsException;
 use Bref\Cli\Cli\IO;
 use Bref\Cli\Cli\Styles;
+use Composer\InstalledVersions;
 use ErrorException;
 use Exception;
 use Symfony\Component\Console\Command\Command;
@@ -37,7 +38,26 @@ public function __construct()
 
     public function safeAddCommand(Command $command): ?Command
     {
-        return $this->addCommand($command);
+        // addCommand() exists since Symfony Console 7.4; add() was removed in Symfony 8.
+        $usesAddCommand = self::usesAddCommand();
+
+        $method = $usesAddCommand ? 'addCommand' : 'add';
+
+        /** @var callable(Command): ?Command $register */
+        $register = [$this, $method];
+
+        return $register($command);
+    }
+
+    private static function usesAddCommand(): bool
+    {
+        if (! class_exists(InstalledVersions::class) || ! InstalledVersions::isInstalled('symfony/console')) {
+            throw new Exception('symfony/console is not installed');
+        }
+
+        $version = InstalledVersions::getVersion('symfony/console');
+
+        return $version !== null && version_compare($version, '7.4.0', '>=');
     }
 
     public function doRun(InputInterface $input, OutputInterface $output): int

src/Commands/SecretCreate.php

@@ -31,12 +31,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     {
         // If --app and --team are provided, we can skip loading the config file
         if ($input->getOption('app') && $input->getOption('team')) {
-            /** @var string $appName */
             $appName = $input->getOption('app');
-            /** @var string $team */
             $team = $input->getOption('team');
-            /** @var string $environment */
             $environment = $input->getOption('env');
+            if (! is_string($appName) || ! is_string($team) || ! is_string($environment)) {
+                throw new Exception('Invalid app, team, or environment option');
+            }
         } else {
             [
                 'appName' => $appName,

src/Components/ServerlessFramework.php

@@ -244,11 +244,14 @@ private function serverlessExec(string $oslsPackage, string $command, string $en
     }
 
     /**
-     * @param array<mixed, mixed> $outputs
      * @return array<string, string>
      */
-    private function cleanupCfOutputs(array $outputs): array
+    private function cleanupCfOutputs(mixed $outputs): array
     {
+        if (! is_array($outputs)) {
+            return [];
+        }
+
         $result = [];
         foreach ($outputs as $name => $value) {
             if (! is_string($name) || ! is_string($value)) {

src/Token.php

@@ -73,8 +73,12 @@ private static function saveConfig(array $config): void
     private static function getConfigPath(): string
     {
         $home = $_SERVER['HOME'] ?? null;
-        if ($home === null && isset($_SERVER['HOMEDRIVE'], $_SERVER['HOMEPATH'])) {
-            $home = $_SERVER['HOMEDRIVE'] . $_SERVER['HOMEPATH'];
+        if ($home === null) {
+            $homeDrive = $_SERVER['HOMEDRIVE'] ?? null;
+            $homePath = $_SERVER['HOMEPATH'] ?? null;
+            if (is_string($homeDrive) && is_string($homePath)) {
+                $home = $homeDrive . $homePath;
+            }
         }
         if (! is_string($home) || $home === '') {
             throw new Exception('Cannot determine home directory');