Update lint jobs

kylekatarnls · kylekatarnls · commit 168cfc5bec01 · 2026-03-12T08:42:49.000+01:00
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -41,6 +41,7 @@ jobs:
       if: steps.composer-cache.outputs.cache-hit != 'true'
       run: |
         composer config version 1.9.0
+        composer remove --no-update phan/phan friendsofphp/php-cs-fixer nette/utils phpmd/phpmd phpstan/phpstan squizlabs/php_codesniffer vimeo/psalm
         composer update --prefer-dist ${{ matrix.setup != 'next' && format('--prefer-{0}', matrix.setup) || '' }} --no-progress ${{ matrix.php >= 8.1 && '--ignore-platform-req=php' || '' }}
 
     - name: Prepare git config
diff --git a/.github/workflows/phan.yml b/.github/workflows/phan.yml
@@ -38,7 +38,9 @@ jobs:
 
     - name: Install dependencies
       if: steps.composer-cache.outputs.cache-hit != 'true'
-      run: composer update --prefer-dist ${{ matrix.setup != 'next' && format('--prefer-{0}', matrix.setup) || '' }} --no-progress
+      run: |
+        composer remove --no-update phpunit/phpunit friendsofphp/php-cs-fixer nette/utils phpmd/phpmd phpstan/phpstan squizlabs/php_codesniffer vimeo/psalm
+        composer update --prefer-dist ${{ matrix.setup != 'next' && format('--prefer-{0}', matrix.setup) || '' }} --no-progress
 
     - name: Check style with Phan
       run: composer run-script phan
diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml
@@ -32,13 +32,15 @@ jobs:
       uses: actions/cache@v4
       with:
         path: vendor
-        key: style-${{ runner.os }}-${{ matrix.setup }}-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
+        key: cs-${{ runner.os }}-${{ matrix.setup }}-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
         restore-keys: |
-          style-${{ runner.os }}-${{ matrix.setup }}-${{ matrix.php }}-
+          cs-${{ runner.os }}-${{ matrix.setup }}-${{ matrix.php }}-
 
     - name: Install dependencies
       if: steps.composer-cache.outputs.cache-hit != 'true'
-      run: composer update --prefer-dist ${{ matrix.setup != 'next' && format('--prefer-{0}', matrix.setup) || '' }} --no-progress
+      run: |
+        composer remove --no-update phpunit/phpunit phan/phan friendsofphp/php-cs-fixer nette/utils phpmd/phpmd phpstan/phpstan vimeo/psalm
+        composer update --prefer-dist ${{ matrix.setup != 'next' && format('--prefer-{0}', matrix.setup) || '' }} --no-progress
 
     - name: Check style with PHPCS
       run: composer run-script phpcs
diff --git a/.github/workflows/phpcsf.yml b/.github/workflows/phpcsf.yml
@@ -32,13 +32,15 @@ jobs:
       uses: actions/cache@v4
       with:
         path: vendor
-        key: style-${{ runner.os }}-${{ matrix.setup }}-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
+        key: csf-${{ runner.os }}-${{ matrix.setup }}-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
         restore-keys: |
-          style-${{ runner.os }}-${{ matrix.setup }}-${{ matrix.php }}-
+          csf-${{ runner.os }}-${{ matrix.setup }}-${{ matrix.php }}-
 
     - name: Install dependencies
       if: steps.composer-cache.outputs.cache-hit != 'true'
-      run: composer update --prefer-dist ${{ matrix.setup != 'next' && format('--prefer-{0}', matrix.setup) || '' }} --no-progress
+      run: |
+        composer remove --no-update phpunit/phpunit phan/phan nette/utils phpmd/phpmd phpstan/phpstan squizlabs/php_codesniffer vimeo/psalm
+        composer update --prefer-dist ${{ matrix.setup != 'next' && format('--prefer-{0}', matrix.setup) || '' }} --no-progress
 
     - name: Check style with phpcsf
       run: composer run-script phpcsf
diff --git a/.github/workflows/phpmd.yml b/.github/workflows/phpmd.yml
@@ -38,7 +38,9 @@ jobs:
 
     - name: Install dependencies
       if: steps.composer-cache.outputs.cache-hit != 'true'
-      run: composer update --prefer-dist ${{ matrix.setup != 'next' && format('--prefer-{0}', matrix.setup) || '' }} --no-progress
+      run: |
+        composer remove --no-update phpunit/phpunit phan/phan friendsofphp/php-cs-fixer nette/utils phpstan/phpstan squizlabs/php_codesniffer vimeo/psalm
+        composer update --prefer-dist ${{ matrix.setup != 'next' && format('--prefer-{0}', matrix.setup) || '' }} --no-progress
 
     - name: Check style with phpmd
       run: composer run-script phpmd
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.2']
+        php: ['8.4']
         setup: ['stable']
 
     name: PHP ${{ matrix.php }} - ${{ matrix.setup }}
@@ -38,9 +38,8 @@ jobs:
 
     - name: Install dependencies
       if: steps.composer-cache.outputs.cache-hit != 'true'
-      # tests/use-fork.php because of https://github.com/vimeo/psalm/issues/8957
       run: |
-        php tests/use-fork.php vimeo/psalm 5.14.2 https://github.com/kylekatarnls/psalm.git fix/datetime-inheritance-5.x
+        composer remove --no-update phan/phan phpunit/phpunit friendsofphp/php-cs-fixer nette/utils phpmd/phpmd phpstan/phpstan squizlabs/php_codesniffer
         composer update --prefer-dist ${{ matrix.setup != 'next' && format('--prefer-{0}', matrix.setup) || '' }} --no-progress
 
     - name: Check style with psalm
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -45,6 +45,7 @@ jobs:
       if: steps.composer-cache.outputs.cache-hit != 'true'
       run: |
         composer config version 1.9.0
+        composer remove --no-update phan/phan friendsofphp/php-cs-fixer nette/utils phpmd/phpmd phpstan/phpstan squizlabs/php_codesniffer vimeo/psalm
         composer update --prefer-dist ${{ matrix.setup != 'next' && format('--prefer-{0}', matrix.setup) || '' }} --no-progress ${{ matrix.php >= 8.1 && '--ignore-platform-req=php' || '' }} --no-interaction
 
     - name: Prepare git config
diff --git a/composer.json b/composer.json
@@ -27,13 +27,13 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.15.0 || ^3.23.0",
-        "nette/utils": "^3.2.10",
+        "nette/utils": "^3.2.10 || ^4.1.3",
         "phan/phan": "^3.2.10 || ^5.4.2",
         "phpunit/phpunit": "^8.5.52 || ^9.6.34",
         "phpmd/phpmd": "^2.13.0",
         "phpstan/phpstan": "^0.11.15 || ^1.10.29",
         "squizlabs/php_codesniffer": "^3.7.2",
-        "vimeo/psalm": "^4.30.0 || ^5.14.1"
+        "vimeo/psalm": "^4.30.0 || ^5.14.1 || ^6.15.1"
     },
     "autoload": {
         "psr-4": {
diff --git a/psalm.xml b/psalm.xml
@@ -32,6 +32,9 @@
         <InternalProperty errorLevel="info" />
         <InternalClass errorLevel="info" />
 
+        <ClassMustBeFinal errorLevel="info" />
+        <MissingOverrideAttribute errorLevel="info" />
+
         <MissingClosureReturnType errorLevel="info" />
         <MissingReturnType errorLevel="info" />
         <MissingPropertyType errorLevel="info" />
diff --git a/src/Phug/Split/Command/CommandBase.php b/src/Phug/Split/Command/CommandBase.php
@@ -55,7 +55,7 @@ protected function gitEscape(string $value): string
      *
      * @psalm-suppress UndefinedThisPropertyFetch RiskyTruthyFalsyComparison
      */
-    protected function getGitCommand(string $command, array $options = [], string $redirect = null): string
+    protected function getGitCommand(string $command, array $options = [], ?string $redirect = null): string
     {
         foreach ($options as $name => $value) {
             $command .= ' --'.$name.'='.$this->gitEscape($value);
@@ -73,7 +73,7 @@ protected function getGitCommand(string $command, array $options = [], string $r
      *
      * @return string|null
      */
-    protected function git(string $command, array $options = [], string $redirect = null): ?string
+    protected function git(string $command, array $options = [], ?string $redirect = null): ?string
     {
         $command = $this->getGitCommand($command, $options, $redirect);
 
diff --git a/src/Phug/Split/Git/Commit.php b/src/Phug/Split/Git/Commit.php
@@ -76,7 +76,7 @@ public static function fromGitLogString(string $log): self
                 new Author(trim($matches['commitName']), trim($matches['commitEmail'])),
                 new Date($matches['commitDate']),
             ),
-            preg_replace('/^ {4}/m', '', trim($matches['message'])),
+            (string) preg_replace('/^ {4}/m', '', trim($matches['message'])),
         );
     }
 
diff --git a/src/Phug/Split/Git/EmptyLogList.php b/src/Phug/Split/Git/EmptyLogList.php
@@ -7,7 +7,7 @@
 
 class EmptyLogList extends InvalidArgumentException
 {
-    public function __construct(int $code = 0, Throwable $previous = null)
+    public function __construct(int $code = 0, ?Throwable $previous = null)
     {
         parent::__construct('Log list should contain at least one commit.', $code, $previous);
     }
diff --git a/src/Phug/Split/Git/ImmutableLogException.php b/src/Phug/Split/Git/ImmutableLogException.php
@@ -7,7 +7,7 @@
 
 class ImmutableLogException extends InvalidArgumentException
 {
-    public function __construct(int $code = 0, Throwable $previous = null)
+    public function __construct(int $code = 0, ?Throwable $previous = null)
     {
         parent::__construct(
             'Log instance is immutable, create a new instance new Log($commits) with a new list of commits',
diff --git a/src/Phug/Split/Git/InvalidGitLogStringException.php b/src/Phug/Split/Git/InvalidGitLogStringException.php
@@ -7,7 +7,7 @@
 
 class InvalidGitLogStringException extends InvalidArgumentException
 {
-    public function __construct(string $log = '', int $code = 0, Throwable $previous = null)
+    public function __construct(string $log = '', int $code = 0, ?Throwable $previous = null)
     {
         parent::__construct("Invalid git log string: $log", $code, $previous);
     }
diff --git a/src/Phug/Split/Git/InvalidGitLogUnit.php b/src/Phug/Split/Git/InvalidGitLogUnit.php
@@ -7,7 +7,7 @@
 
 class InvalidGitLogUnit extends InvalidArgumentException
 {
-    public function __construct(string $unit = '', int $code = 0, Throwable $previous = null)
+    public function __construct(string $unit = '', int $code = 0, ?Throwable $previous = null)
     {
         parent::__construct("Invalid git log unit: $unit, ".Commit::class.' expected', $code, $previous);
     }
diff --git a/src/Phug/Split/Git/Log.php b/src/Phug/Split/Git/Log.php
@@ -70,13 +70,13 @@ public static function fromGitLogString(string $log): self
     {
         $commitLogs = preg_split('/[\n\r](?=commit )/', $log);
 
-        return new self(array_map(static function (string $commitLog) {
+        return new self($commitLogs === false ? [] : array_map(static function (string $commitLog) {
             return Commit::fromGitLogString($commitLog);
         }, $commitLogs));
     }
 
     /**
-     * Whether a offset exists.
+     * Whether an offset exists.
      *
      * @link https://php.net/manual/en/arrayaccess.offsetexists.php
      *
diff --git a/src/Phug/Split/InvalidCli.php b/src/Phug/Split/InvalidCli.php
@@ -8,7 +8,7 @@
 
 class InvalidCli extends InvalidArgumentException
 {
-    public function __construct(object $cli, int $code = 0, Throwable $previous = null)
+    public function __construct(object $cli, int $code = 0, ?Throwable $previous = null)
     {
         $class = get_class($cli);
 
diff --git a/tests/use-fork.php b/tests/use-fork.php

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ protected function gitEscape(string $value): string`
`55`	`55`	`*`
`56`	`56`	`* @psalm-suppress UndefinedThisPropertyFetch RiskyTruthyFalsyComparison`
`57`	`57`	`*/`
`58`		`- protected function getGitCommand(string $command, array $options = [], string $redirect = null): string`
	`58`	`+ protected function getGitCommand(string $command, array $options = [], ?string $redirect = null): string`
`59`	`59`	`{`
`60`	`60`	`foreach ($options as $name => $value) {`
`61`	`61`	`$command .= ' --'.$name.'='.$this->gitEscape($value);`
`@@ -73,7 +73,7 @@ protected function getGitCommand(string $command, array $options = [], string $r`
`73`	`73`	`*`
`74`	`74`	`* @return string\|null`
`75`	`75`	`*/`
`76`		`- protected function git(string $command, array $options = [], string $redirect = null): ?string`
	`76`	`+ protected function git(string $command, array $options = [], ?string $redirect = null): ?string`
`77`	`77`	`{`
`78`	`78`	`$command = $this->getGitCommand($command, $options, $redirect);`
`79`	`79`