Upgrade tools

veewee · Oct 21, 2024 · 76ab7e3 · 76ab7e3
1 parent 24b9244
commit 76ab7e3
Show file tree

Hide file tree

Showing 14 changed files with 86,754 additions and 74,752 deletions.
diff --git a/.github/workflows/analyzers.yaml b/.github/workflows/analyzers.yaml
@@ -7,7 +7,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+                php-versions: ['8.1', '8.2', '8.3', '8.4']
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
         steps:
@@ -23,3 +23,4 @@ jobs:
               run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.composer-options }}
             - name: Run the tests
               run: composer run psalm
+              continue-on-error: ${{ matrix.php-versions == '8.4'}}
diff --git a/.github/workflows/code-style.yaml b/.github/workflows/code-style.yaml
@@ -7,7 +7,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+                php-versions: ['8.1', '8.2', '8.3', '8.4']
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
         steps:

diff --git a/.github/workflows/functional.yaml b/.github/workflows/functional.yaml
@@ -7,7 +7,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest, windows-latest, macos-latest]
-                php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+                php-versions: ['8.1', '8.2', '8.3', '8.4']
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
         steps:

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -7,7 +7,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+                php-versions: ['8.1', '8.2', '8.3', '8.4']
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
         steps:

diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpunit" version="^9.5.26" installed="9.5.26" location="./tools/phpunit.phar" copy="true"/>
-  <phar name="psalm" version="^4.29.0" installed="4.29.0" location="./tools/psalm.phar" copy="true"/>
-  <phar name="infection" version="^0.26" installed="0.26.1" location="./tools/infection.phar" copy="true"/>
-  <phar name="php-cs-fixer" version="^3.13.0" installed="3.13.0" location="./tools/php-cs-fixer.phar" copy="true"/>
+  <phar name="phpunit" version="^9.5.26" installed="9.6.21" location="./tools/phpunit.phar" copy="true"/>
+  <phar name="psalm" version="^5.26.1" installed="5.26.1" location="./tools/psalm.phar" copy="true"/>
+  <phar name="infection" version="^0.26" installed="0.26.21" location="./tools/infection.phar" copy="true"/>
+  <phar name="php-cs-fixer" version="^3.13.0" installed="3.64.0" location="./tools/php-cs-fixer.phar" copy="true"/>
 </phive>
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
         "composer-plugin-api": "~2.0"
     },
     "require-dev": {

diff --git a/src/Executor/AsyncTaskExecutor.php b/src/Executor/AsyncTaskExecutor.php
@@ -41,6 +41,8 @@ public function __invoke(string $task, array $args): PromiseInterface
      * @param list<string> $args
      *
      * @throws ParallelException
+     *
+     * @psalm-suppress RiskyTruthyFalsyComparison
      */
     private function buildProcess(string $task, array $args): string
     {

diff --git a/src/Finder/PhpExecutableFinder.php b/src/Finder/PhpExecutableFinder.php
@@ -32,7 +32,7 @@ public static function default(): self
     public function __invoke(): string
     {
         $phpPath = $this->finder->find(false);
-        if (!$phpPath) {
+        if (false === $phpPath) {
             throw ParallelException::phpBinaryNotFound();
         }
 

diff --git a/src/Result/ResultMap.php b/src/Result/ResultMap.php
@@ -59,7 +59,7 @@ public function listFailedTasks(): array
     }
 
     /**
-     *     @throws ParallelException
+     * @throws ParallelException
      *
      * @return list<string>
      */
@@ -96,7 +96,7 @@ public function getResultCode(): int
      */
     public function conclude(
         callable $onSuccess,
-        callable $onFailure
+        callable $onFailure,
     ) {
         $resultCode = $this->getResultCode();
 

diff --git a/tests/Unit/Scripts/ParallelScriptTest.php b/tests/Unit/Scripts/ParallelScriptTest.php
@@ -41,7 +41,13 @@ protected function setUp(): void
         $finder->method('find')->willReturn('php');
         $finder->method('findArguments')->willReturn([]);
 
+        // Composer comes with symfony console 2.8, which has deprecated methods:
+        // Deprecated: Return type of Symfony\Component\Console\Helper\HelperSet::getIterator() should either be compatible with IteratorAggregate::getIterator(): Traversable,
+        // Since it's a composer dependency, we can't change it, so we need to suppress the deprecation notice
+        // Let's mute it for now.
+        $previousErrorLevel = error_reporting(0);
         $this->io = new BufferIO();
+        error_reporting($previousErrorLevel);
 
         $dispatcher = $this->createMock(EventDispatcher::class);
         $dispatcher

diff --git a/tools/infection.phar b/tools/infection.phar
diff --git a/tools/php-cs-fixer.phar b/tools/php-cs-fixer.phar