Merge remote-tracking branch 'upstream/main' into feat/phpunit12

Author: theofidry

.github/workflows/docs.yaml

@@ -18,7 +18,7 @@ jobs:
                 uses: "actions/checkout@v4"
 
             -   name: "Check Markdown formatting"
-                uses: "DavidAnson/markdownlint-cli2-action@v18.0.0"
+                uses: "DavidAnson/markdownlint-cli2-action@v20.0.0"
                 with:
                     globs: "*.md|docs/**/*.md"
 
@@ -38,7 +38,7 @@ jobs:
                     restore-keys: cache-lychee-
 
             -   name: "Run Lychee"
-                uses: "lycheeverse/lychee-action@v2.1.0"
+                uses: "lycheeverse/lychee-action@v2.4.1"
                 with:
                     # To keep in sync with Makefile#lychee
                     args: "--verbose --no-progress '*.md' 'docs/**/*.md' --cache --max-cache-age 1d ."

.gitignore

@@ -7,7 +7,7 @@
 /composer.lock
 /dist/
 /phpunit.xml
+/tests/Integration/App/var/
 /tests/Integration/output
-/tests/Integration/var/
 /vendor-bin/*/vendor/
 /vendor/

.php-cs-fixer.php

@@ -13,14 +13,11 @@
 use PhpCsFixer\Finder;
 
 $finder = Finder::create()
+    ->files()
     ->in(__DIR__)
-    ->append([
-        '.github/fix-symfony-versions',
-        'set-composer-conflicts.php',
-    ])
     ->exclude([
         'dist',
-        'tests/Integration/var',
+        'tests/Integration/App/var',
     ]);
 
 $config = new FidryConfig(

bin/console

@@ -1,18 +1,21 @@
 #!/usr/bin/env php
 <?php
 
+/*
+ * This file is part of the Webmozarts Console Parallelization package.
+ *
+ * (c) Webmozarts GmbH <office@webmozarts.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 require __DIR__.'/../vendor/autoload.php';
 
 use Symfony\Bundle\FrameworkBundle\Console\Application;
-use Symfony\Component\DependencyInjection\Container;
-use Webmozarts\Console\Parallelization\Fixtures\Command\AbsoluteScriptPathCommand;
-use Webmozarts\Console\Parallelization\Fixtures\Command\ImportMoviesCommand;
-use Webmozarts\Console\Parallelization\Fixtures\Command\ImportUnknownMoviesCountCommand;
-use Webmozarts\Console\Parallelization\Fixtures\Command\LegacyCommand;
-use Webmozarts\Console\Parallelization\Fixtures\Command\NoSubProcessCommand;
-use Webmozarts\Console\Parallelization\Integration\Kernel;
+use Webmozarts\Console\Parallelization\Integration\App\Kernel;
 use function Safe\ini_set;
 
 error_reporting(E_ALL);

bin/fix-symfony-versions

@@ -18,7 +18,6 @@ use function file_get_contents;
 use function file_put_contents;
 use function json_decode;
 use function json_encode;
-use function shell_exec;
 use const JSON_PRETTY_PRINT;
 use const JSON_UNESCAPED_SLASHES;
 

bin/no-framework

@@ -1,6 +1,15 @@
 #!/usr/bin/env php
 <?php
 
+/*
+ * This file is part of the Webmozarts Console Parallelization package.
+ *
+ * (c) Webmozarts GmbH <office@webmozarts.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 require __DIR__.'/../vendor/autoload.php';

composer.json

@@ -33,13 +33,13 @@
         "ergebnis/composer-normalize": "^2.45",
         "fidry/makefile": "^1.1.1",
         "infection/infection": "^0.29.14",
-        "jangregor/phpstan-prophecy": "^2.0",
+        "jangregor/phpstan-prophecy": "^2.1.1",
         "phpspec/prophecy-phpunit": "^2.3",
-        "phpstan/extension-installer": "^1.4.3",
-        "phpstan/phpstan": "^1.12.23",
-        "phpstan/phpstan-phpunit": "^1.4.2",
-        "phpstan/phpstan-symfony": "^1.4.14",
-        "phpstan/phpstan-webmozart-assert": "^1.2.11",
+        "phpstan/extension-installer": "^1.1",
+        "phpstan/phpstan": "^2.1.10",
+        "phpstan/phpstan-phpunit": "^2.0.4",
+        "phpstan/phpstan-symfony": "^2.0.3",
+        "phpstan/phpstan-webmozart-assert": "^2.0",
         "phpunit/phpunit": "^12.0",
         "symfony/framework-bundle": "^6.4.19 || ^7.2.4",
         "webmozarts/strict-phpunit": "^7.13.1"

phpstan-src.neon.dist

@@ -8,8 +8,14 @@ parameters:
         - path: src/Logger/DecoratorLogger.php
           message: '#Parameter \#1#'
 
-        - path: src/ChunkedItemsIterator.php
-          message: '#ChunkedItemsIterator::\$itemsChunks#'
-
         - path: src/Input/ChildCommandFactory.php
           message: '#Parameter \#1 \$callback of function array_map expects#'
+
+        - path: src/Configuration.php
+          identifier: staticMethod.alreadyNarrowedType
+
+        - path: src/Input/RawInput.php
+          identifier: return.type
+
+        - path: src/Parallelization.php
+          identifier: trait.unused

phpstan-tests.neon.dist

@@ -4,14 +4,10 @@ parameters:
         - bin/set-composer-conflicts.php
         - tests
     excludePaths:
-        - tests/Integration/var
+        - tests/Integration/App/var
         - tests/Input/FakeInput.php
-        - tests/Input/FakeInput74.php
-        - tests/Input/FakeInput81.php
         - tests/Input/FakeSymfony6Input.php
         - tests/Process/DummyProcess.php
-        - tests/Process/DummyProcess74.php
-        - tests/Process/DummyProcess81.php
     ignoreErrors:
         - path: tests/Integration/TestLogger.php
           message: '#TestLogger::\$outputHandler#'
@@ -24,6 +20,8 @@ parameters:
           message: '#ParallelizationIntegrationTest::\$noSubProcessCommand#'
         - path: tests/Integration/ParallelizationIntegrationTest.php
           message: '#ParallelizationIntegrationTest::\$legacyCommand#'
+        - path: tests/Integration/DebugChildProcessInputsTest.php
+          message: '#DebugChildProcessInputsTest::\$command#'
 
         - path: tests/ChunkedItemsIteratorTest.php
           message: '#Parameter \#2 \$fetchItems of static method .+ChunkedItemsIterator::fromItemOrCallable\(\) expects callable\(\)#'
@@ -40,4 +38,9 @@ parameters:
           message: '#Static method .* is unused#'
 
         - path: tests/Input/RawInputTest.php
-          message: '#Webmozarts\\Console\\Parallelization\\Input\\FakeInput#'
+          message: '#Webmozarts\\Console\\Parallelization\\Input\\FakeInput#'
+
+        - path: tests/LazyRewindableIteratorTest.php
+          identifier: staticMethod.alreadyNarrowedType
+        - path: tests/LazyRewindableIteratorTest.php
+          identifier: staticMethod.impossibleType

phpunit.xml.dist

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-         cacheResultFile="dist/.phpunit.result.cache"
+         cacheDirectory="dist/phpunit-cache"
          bootstrap="vendor/autoload.php"
          beStrictAboutChangesToGlobalState="true"
          beStrictAboutOutputDuringTests="true"