Fix: addressed MR comments — fixed Psalm issues and re-ran PHP-CS-Fixer

Author: Влaдислaв Новиков

.github/workflows/cs.yml

@@ -1,22 +1,12 @@
-name: PHP-CS-Fixer Check
+on:
+    push:
+        branches:
+            - '*'
 
-on: [push, pull_request]
+name: Fix Code Style
 
 jobs:
-    phpcsfixer:
-        runs-on: ubuntu-latest
-
-        steps:
-            - uses: actions/checkout@v3
-
-            - name: Setup PHP
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: '8.1'
-
-            - name: Install dependencies
-              run: composer install --no-progress --no-suggest --prefer-dist
-
-            - name: Run PHP-CS-Fixer dry run
-              run: |
-                  vendor/bin/php-cs-fixer fix --dry-run -v --diff
+    cs-fix:
+        permissions:
+            contents: write
+        uses: spiral/gh-actions/.github/workflows/cs-fix.yml@master

.github/workflows/phpunit.yml

@@ -13,6 +13,6 @@ jobs:
             os: >-
                 ['ubuntu-latest']
             php: >-
-                ['8.1', '8.2', '8.3']
+                ['8.1', '8.2', '8.3', '8.4']
             stability: >-
                 ['prefer-lowest', 'prefer-stable']

.gitignore

@@ -10,4 +10,4 @@ docs
 vendor
 node_modules
 .php-cs-fixer.cache
-/runtime/php-cs-fixer.cache
+/runtime

.php-cs-fixer.dist.php

@@ -6,7 +6,12 @@
 
 require_once 'vendor/autoload.php';
 
+
 return Builder::create()
     ->include(__DIR__ . '/src')
     ->include(__FILE__)
-    ->build();
+    ->build()->setRules([
+        'ordered_imports' => ['sort_algorithm' => 'alpha'],
+        'fully_qualified_strict_types' => true,
+        'no_unused_imports' => true,
+    ]);

README.md

@@ -8,12 +8,6 @@
 [![Total Downloads](https://poser.pugx.org/roadrunner-php/version-checker/downloads)](https://packagist.org/roadrunner-php/version-checker/phpunit)
 <a href="https://discord.gg/8bZsjYhVVk"><img src="https://img.shields.io/badge/discord-chat-magenta.svg"></a>
 
-## Requirements
-
-Make sure that your server is configured with following PHP version and extensions:
-
-- PHP 8.1+
-
 ## Installation
 
 You can install the package via composer:

composer.json

@@ -15,11 +15,10 @@
         "symfony/process": "^5.4 || ^6.0 || ^7.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.8",
         "phpcompatibility/php-compatibility": "^9.3",
         "phpunit/phpunit": "^9.6 || ^10.0",
         "spiral/code-style": "^2.2",
-        "vimeo/psalm": "^5.9"
+        "vimeo/psalm": "^6.0"
     },
     "autoload": {
         "psr-4": {
@@ -34,7 +33,6 @@
     "scripts": {
         "test": "vendor/bin/phpunit",
         "psalm": "vendor/bin/psalm --config=psalm.xml ./src",
-        "cs": "vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.dist.php -vvv --dry-run --using-cache=no",
         "cs:diff": "php-cs-fixer fix --dry-run -v --diff",
         "cs:fix": "php-cs-fixer fix -v"
     },

psalm.xml

@@ -13,11 +13,4 @@
             <directory name="vendor" />
         </ignoreFiles>
     </projectFiles>
-    <issueHandlers>
-        <UndefinedAttributeClass>
-            <errorLevel type="suppress">
-                <referencedClass name="JetBrains\PhpStorm\ExpectedValues" />
-            </errorLevel>
-        </UndefinedAttributeClass>
-    </issueHandlers>
 </psalm>

src/Composer/Package.php

@@ -11,22 +11,34 @@ final class Package implements PackageInterface
 {
     /**
      * @param non-empty-string $packageName
-     * @return non-empty-string[]
+     *
+     * @return string[]
+     *
+     * @psalm-return list<non-empty-string>
      */
+    #[\Override]
     public function getRequiredVersions(string $packageName): array
     {
         $versions = [];
         foreach (InstalledVersions::getInstalledPackages() as $package) {
             $path = InstalledVersions::getInstallPath($package);
             if ($path !== null && \file_exists($path . '/composer.json')) {
                 /** @var array{require?: array<non-empty-string, non-empty-string>} $composerJson */
-                $composerJson = \json_decode(\file_get_contents($path . '/composer.json'), true);
+                $fileContent = \file_get_contents($path . '/composer.json');
+                /** @var array<string, mixed>|null $composerJson */
+                $composerJson = $fileContent === false ? null : \json_decode($fileContent, true);
+
+                if (isset($composerJson['require'][$packageName])) {
+                    /** @var mixed $rawPackage */
+                    $rawPackage = $composerJson['require'][$packageName];
+
+                    if (is_string($rawPackage) && strlen($rawPackage) > 0) {
+                        assert($rawPackage !== '');
 
-                if (
-                    isset($composerJson['require'][$packageName]) &&
-                    $this->isSupportedVersion($composerJson['require'][$packageName])
-                ) {
-                    $versions[] = $this->getMinVersion($composerJson['require'][$packageName]);
+                        if ($this->isSupportedVersion($rawPackage)) {
+                            $versions[] = $this->getMinVersion($rawPackage);
+                        }
+                    }
                 }
             }
         }

src/Environment/Native.php

@@ -15,6 +15,7 @@ public function __construct(
     /**
      * @param non-empty-string $name
      */
+    #[\Override]
     public function get(string $name, mixed $default = null): mixed
     {
         return $this->values[$name] ?? $default;

src/Exception/UnsupportedVersionException.php

@@ -18,20 +18,4 @@ public function __construct(
     ) {
         parent::__construct($message);
     }
-
-    /**
-     * @return non-empty-string
-     */
-    public function getInstalledVersion(): string
-    {
-        return $this->installed;
-    }
-
-    /**
-     * @return non-empty-string
-     */
-    public function getRequestedVersion(): string
-    {
-        return $this->requested;
-    }
 }