Merge pull request #1586 from jackbayliss/bump-checkout-action

[4.x] Bump checkout version from 5 to 6

.github/workflows/static.yml

@@ -19,7 +19,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2

.github/workflows/tests.yml

@@ -14,14 +14,14 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest] # windows-latest
         symfony: ['7.3']
-        php: ['8.3', '8.4']
+        php: ['8.3', '8.4', '8.5']
         dependency_version: [prefer-stable]
 
     name: PHP ${{ matrix.php }} - Symfony ^${{ matrix.symfony }} - ${{ matrix.os }} - ${{ matrix.dependency_version }}
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2

README.md

@@ -16,8 +16,8 @@
 
 - Explore our docs at **[pestphp.com »](https://pestphp.com)**
 - Follow the creator Nuno Maduro:
-    - YouTube: **[youtube.com/@nunomaduro](https://www.youtube.com/@nunomaduro)** — Videos every weekday
-    - Twitch: **[twitch.tv/enunomaduro](https://www.twitch.tv/enunomaduro)** — Streams (almost) every weekday
+    - YouTube: **[youtube.com/@nunomaduro](https://youtube.com/@nunomaduro)** — Videos every week
+    - Twitch: **[twitch.tv/nunomaduro](https://twitch.tv/nunomaduro)** — Live coding on Mondays, Wednesdays, and Fridays at 9PM UTC
     - Twitter / X: **[x.com/enunomaduro](https://x.com/enunomaduro)**
     - LinkedIn: **[linkedin.com/in/nunomaduro](https://www.linkedin.com/in/nunomaduro)**
     - Instagram: **[instagram.com/enunomaduro](https://www.instagram.com/enunomaduro)**
@@ -31,22 +31,24 @@ We cannot thank our sponsors enough for their incredible support in funding Pest
 ### Platinum Sponsors
 
 - **[Laracasts](https://laracasts.com/?ref=pestphp)**
+- **[NativePHP](https://nativephp.com/mobile?ref=pestphp.com)**
 
 ### Gold Sponsors
 
 - **[CodeRabbit](https://coderabbit.ai/?ref=pestphp)**
-- **[NativePHP](https://nativephp.com/mobile?ref=pestphp.com)**
 - **[CMS Max](https://cmsmax.com/?ref=pestphp)**
 
 ### Premium Sponsors
 
-- [Akaunting](https://akaunting.com/?ref=pestphp)
-- [DocuWriter.ai](https://www.docuwriter.ai/?ref=pestphp)
-- [Localazy](https://localazy.com/?ref=pestphp)
 - [Forge](https://forge.laravel.com/?ref=pestphp)
-- [Route4Me](https://www.route4me.com/?ref=pestphp)
-- [Spatie](https://spatie.be/?ref=pestphp)
-- [Worksome](https://www.worksome.com/?ref=pestphp)
 - [Zapiet](https://www.zapiet.com/?ref=pestphp)
+- [Localazy](https://localazy.com/?ref=pestphp)
+- [Load Forge](https://loadforge.com/?ref=pestphp)
+- [DocuWriter.ai](https://www.docuwriter.ai/?ref=pestphp)
+- [Route4Me](https://www.route4me.com/?ref=pestphp)
+- [Devtools for Livewire](https://devtools-for-livewire.com/?ref=pestphp)
+- [Nerdify](https://www.getnerdify.com/?ref=pestphp)
+- [Akaunting](https://akaunting.com/?ref=pestphp)
+- [LambdaTest](https://lambdatest.com/?ref=pestphp)
 
 Pest is an open-sourced software licensed under the **[MIT license](https://opensource.org/licenses/MIT)**.

bin/worker.php

@@ -86,7 +86,7 @@ $bootPest = (static function (): void {
         $getopt['teamcity-file'] ?? null,
         $getopt['testdox-file'] ?? null,
         isset($getopt['testdox-color']),
-        (int) $getopt['testdox-columns'] ?? null,
+        (int) ($getopt['testdox-columns'] ?? null),
     );
 
     while (true) {

composer.json

@@ -18,19 +18,19 @@
     ],
     "require": {
         "php": "^8.3.0",
-        "brianium/paratest": "^7.11.2",
-        "nunomaduro/collision": "^8.8.2",
-        "nunomaduro/termwind": "^2.3.1",
+        "brianium/paratest": "^7.16.0",
+        "nunomaduro/collision": "^8.8.3",
+        "nunomaduro/termwind": "^2.3.3",
         "pestphp/pest-plugin": "^4.0.0",
         "pestphp/pest-plugin-arch": "^4.0.0",
         "pestphp/pest-plugin-mutate": "^4.0.1",
-        "pestphp/pest-plugin-profanity": "^4.0.1",
-        "phpunit/phpunit": "^12.3.6",
-        "symfony/process": "^7.3.0"
+        "pestphp/pest-plugin-profanity": "^4.2.1",
+        "phpunit/phpunit": "^12.5.3",
+        "symfony/process": "^7.4.0|^8.0.0"
     },
     "conflict": {
         "filp/whoops": "<2.18.3",
-        "phpunit/phpunit": ">12.3.6",
+        "phpunit/phpunit": ">12.5.3",
         "sebastian/exporter": "<7.0.0",
         "webmozart/assert": "<1.11.0"
     },
@@ -56,9 +56,9 @@
     },
     "require-dev": {
         "pestphp/pest-dev-tools": "^4.0.0",
-        "pestphp/pest-plugin-browser": "^4.0.2",
-        "pestphp/pest-plugin-type-coverage": "^4.0.2",
-        "psy/psysh": "^0.12.10"
+        "pestphp/pest-plugin-browser": "^4.1.1",
+        "pestphp/pest-plugin-type-coverage": "^4.0.3",
+        "psy/psysh": "^0.12.17"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,

rector.php

@@ -3,7 +3,9 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
+use Rector\TypeDeclaration\Rector\ClassMethod\NarrowObjectReturnTypeRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector;
+use Rector\CodingStyle\Rector\ArrowFunction\ArrowFunctionDelegatingCallToFirstClassCallableRector;
 
 return RectorConfig::configure()
     ->withPaths([
@@ -12,6 +14,8 @@ return RectorConfig::configure()
     ->withSkip([
         __DIR__.'/src/Plugins/Parallel/Paratest/WrapperRunner.php',
         ReturnNeverTypeRector::class,
+        ArrowFunctionDelegatingCallToFirstClassCallableRector::class,
+        NarrowObjectReturnTypeRector::class,
     ])
     ->withPreparedSets(
         deadCode: true,

src/Bootstrappers/BootFiles.php

@@ -83,7 +83,7 @@ final class BootFiles implements Bootstrapper
 
     private function bootDatasets(string $testsPath): void
     {
-        assert(strlen($testsPath) > 0);
+        assert($testsPath !== '');
 
         $files = (new PhpUnitFileIterator)->getFilesAsArray($testsPath, '.php');
 

src/Console/Thanks.php

@@ -25,8 +25,8 @@ final readonly class Thanks
     private const array FUNDING_MESSAGES = [
         'Star' => 'https://github.com/pestphp/pest',
         'YouTube' => 'https://youtube.com/@nunomaduro',
-        'TikTok' => 'https://tiktok.com/@nunomaduro',
-        'Twitch' => 'https://twitch.tv/enunomaduro',
+        'TikTok' => 'https://tiktok.com/@enunomaduro',
+        'Twitch' => 'https://twitch.tv/nunomaduro',
         'LinkedIn' => 'https://linkedin.com/in/nunomaduro',
         'Instagram' => 'https://instagram.com/enunomaduro',
         'X' => 'https://x.com/enunomaduro',

src/Expectation.php

@@ -397,7 +397,7 @@ final class Expectation
      *
      * @return Expectation<TValue>|OppositeExpectation<TValue>|EachExpectation<TValue>|HigherOrderExpectation<Expectation<TValue>, TValue|null>|TValue
      */
-    public function __get(string $name)
+    public function __get(string $name): mixed
     {
         if (! self::hasMethod($name)) {
             if (! is_object($this->value) && method_exists(PendingArchExpectation::class, $name)) {

src/Kernel.php

@@ -71,7 +71,7 @@ final readonly class Kernel
             $output,
         );
 
-        register_shutdown_function(fn () => $kernel->shutdown());
+        register_shutdown_function($kernel->shutdown(...));
 
         foreach (self::BOOTSTRAPPERS as $bootstrapper) {
             $bootstrapper = Container::getInstance()->get($bootstrapper);

src/Logging/Converter.php

@@ -131,7 +131,7 @@ final readonly class Converter
 
         // clean the paths of each frame.
         $frames = array_map(
-            fn (string $frame): string => $this->toRelativePath($frame),
+            $this->toRelativePath(...),
             $frames
         );
 

src/Pest.php

@@ -6,7 +6,7 @@ namespace Pest;
 
 function version(): string
 {
-    return '4.0.3';
+    return '4.2.0';
 }
 
 function testDirectory(string $file = ''): string

src/Plugins/Help.php

@@ -99,6 +99,7 @@ final readonly class Help implements HandlesArguments
     {
         $helpReflection = new PHPUnitHelp;
 
+        // @phpstan-ignore-next-line
         $content = (fn (): array => $this->elements())->call($helpReflection);
 
         $content['Configuration'] = [...[[

src/Repositories/DatasetsRepository.php

@@ -67,11 +67,11 @@ final class DatasetsRepository
     }
 
     /**
-     * @return Closure|array<int|string, mixed>
+     * @return array<int|string, mixed>
      *
      * @throws ShouldNotHappen
      */
-    public static function get(string $filename, string $description): Closure|array // @phpstan-ignore-line
+    public static function get(string $filename, string $description): array // @phpstan-ignore-line
     {
         $dataset = self::$withs[$filename.self::SEPARATOR.$description];
 
@@ -191,6 +191,7 @@ final class DatasetsRepository
             return str_starts_with($currentTestFile, $datasetScope);
         }, ARRAY_FILTER_USE_KEY);
 
+        /** @var string|null $closestScopeDatasetKey */
         $closestScopeDatasetKey = array_reduce(
             array_keys($matchingDatasets),
             fn (string|int|null $keyA, string|int|null $keyB): string|int|null => $keyA !== null && strlen((string) $keyA) > strlen((string) $keyB) ? $keyA : $keyB

src/Support/HigherOrderTapProxy.php

@@ -31,10 +31,8 @@ final class HigherOrderTapProxy
 
     /**
      * Dynamically pass properties gets to the target.
-     *
-     * @return mixed
      */
-    public function __get(string $property)
+    public function __get(string $property): mixed
     {
         if (property_exists($this->target, $property)) {
             return $this->target->{$property};

tests-external/Features/Expect/toMatchSnapshot.php

@@ -19,7 +19,7 @@ test('pass with dataset', function ($data) {
     [$filename] = TestSuite::getInstance()->snapshots->get();
 
     expect($filename)->toStartWith('tests/.pest/snapshots-external/')
-        ->toEndWith('pass_with_dataset_with_data_set_____my_datas_set_value___.snap')
+        ->toEndWith('pass_with_dataset_with_data_set____my_datas_set_value___.snap')
         ->and($this->snapshotable)->toMatchSnapshot();
 })->with(['my-datas-set-value']);
 
@@ -29,7 +29,7 @@ describe('within describe', function () {
         [$filename] = TestSuite::getInstance()->snapshots->get();
 
         expect($filename)->toStartWith('tests/.pest/snapshots-external/')
-            ->toEndWith('pass_with_dataset_with_data_set_____my_datas_set_value___.snap')
+            ->toEndWith('pass_with_dataset_with_data_set____my_datas_set_value___.snap')
             ->and($this->snapshotable)->toMatchSnapshot();
     });
 })->with(['my-datas-set-value']);

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/_within_describe__→_pass_with_dataset_with_data_set____my_datas_set_value___.snap

@@ -0,0 +1,7 @@
+    <div class="container">
+        <div class="row">
+            <div class="col-md-12">
+                <h1>Snapshot</h1>
+            </div>
+        </div>
+    </div>

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/pass_with_dataset_with_data_set____my_datas_set_value___.snap

@@ -0,0 +1,7 @@
+    <div class="container">
+        <div class="row">
+            <div class="col-md-12">
+                <h1>Snapshot</h1>
+            </div>
+        </div>
+    </div>

tests/.pest/snapshots/Visual/Help/visual_snapshot_of_help_command_output.snap

@@ -1,5 +1,5 @@
 
-  Pest Testing Framework 4.0.3.  
+  Pest Testing Framework 4.2.0.  
 
   USAGE: pest <file> [options]  
 
@@ -27,6 +27,7 @@
   --pr .... Output to standard output tests with the given pull request number  
   --pull-request  Output to standard output tests with the given pull request number (alias for --pr)  
   --retry  Run non-passing tests first and stop execution upon first error or failure  
+  --all .................... Ignore test selection from XML configuration file  
   --list-suites ................................... List available test suites  
   --testsuite [name] ......... Only run tests from the specified test suite(s)  
   --exclude-testsuite [name] .. Exclude tests from the specified test suite(s)  
@@ -138,6 +139,7 @@
   --only-summary-for-coverage-text  Option for code coverage report in text format: only show summary  
   --show-uncovered-for-coverage-text  Option for code coverage report in text format: show uncovered files  
   --coverage-xml [dir] . Write code coverage report in XML format to directory  
+  --exclude-source-from-xml-coverage  Exclude [source] element from code coverage report in XML format  
   --warm-coverage-cache ........................... Warm static analysis cache  
   --coverage-filter [dir] ........... Include [dir] in code coverage reporting  
   --path-coverage .......... Report path coverage in addition to line coverage  

tests/.pest/snapshots/Visual/Version/visual_snapshot_of_help_command_output.snap

@@ -1,3 +1,3 @@
 
-  Pest Testing Framework 4.0.3.  
+  Pest Testing Framework 4.2.0.  
 

tests/.snapshots/SuccessOnly.php.inc

@@ -5,8 +5,8 @@
 ##teamcity[testStarted name='can also pass' locationHint='pest_qn://tests/.tests/SuccessOnly.php::can also pass' flowId='1234']
 ##teamcity[testFinished name='can also pass' duration='100000' flowId='1234']
 ##teamcity[testSuiteStarted name='can pass with dataset' locationHint='pest_qn://tests/.tests/SuccessOnly.php::can pass with dataset' flowId='1234']
-##teamcity[testStarted name='can pass with dataset with data set "@(true)"' locationHint='pest_qn://tests/.tests/SuccessOnly.php::can pass with dataset with data set "@(true)"' flowId='1234']
-##teamcity[testFinished name='can pass with dataset with data set "@(true)"' duration='100000' flowId='1234']
+##teamcity[testStarted name='can pass with dataset with data set "(true)"' locationHint='pest_qn://tests/.tests/SuccessOnly.php::can pass with dataset with data set "(true)"' flowId='1234']
+##teamcity[testFinished name='can pass with dataset with data set "(true)"' duration='100000' flowId='1234']
 ##teamcity[testSuiteFinished name='can pass with dataset' flowId='1234']
 ##teamcity[testSuiteFinished name='Tests/tests/SuccessOnly' flowId='1234']
 

tests/Features/Expect/toMatchSnapshot.php

@@ -75,7 +75,7 @@ test('pass with dataset', function ($data) {
     [$filename] = TestSuite::getInstance()->snapshots->get();
 
     expect($filename)->toStartWith('tests/.pest/snapshots/')
-        ->toEndWith('pass_with_dataset_with_data_set_____my_datas_set_value___.snap')
+        ->toEndWith('pass_with_dataset_with_data_set____my_datas_set_value___.snap')
         ->and($this->snapshotable)->toMatchSnapshot();
 })->with(['my-datas-set-value']);
 
@@ -85,7 +85,7 @@ describe('within describe', function () {
         [$filename] = TestSuite::getInstance()->snapshots->get();
 
         expect($filename)->toStartWith('tests/.pest/snapshots/')
-            ->toEndWith('pass_with_dataset_with_data_set_____my_datas_set_value___.snap')
+            ->toEndWith('pass_with_dataset_with_data_set____my_datas_set_value___.snap')
             ->and($this->snapshotable)->toMatchSnapshot();
     });
 })->with(['my-datas-set-value']);

tests/Visual/Parallel.php

@@ -16,7 +16,7 @@ $run = function () {
 
 test('parallel', function () use ($run) {
     expect($run('--exclude-group=integration'))
-        ->toContain('Tests:    2 deprecated, 4 warnings, 5 incomplete, 2 notices, 39 todos, 26 skipped, 1178 passed (2790 assertions)')
+        ->toContain('Tests:    2 deprecated, 4 warnings, 5 incomplete, 2 notices, 39 todos, 26 skipped, 1177 passed (2790 assertions)')
         ->toContain('Parallel: 3 processes');
 })->skipOnWindows();