chore: adjusts sponsors

Add SerpApi as a sponsor in the README.

.github/workflows/static.yml

@@ -2,10 +2,15 @@ name: Static Analysis
 
 on:
   push:
+    branches: [4.x]
   pull_request:
   schedule:
     - cron: '0 0 * * *'
 
+concurrency:
+  group: static-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   static:
     if: github.event_name != 'schedule' || github.repository == 'pestphp/pest'
@@ -19,7 +24,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -29,8 +34,22 @@ jobs:
         coverage: none
         extensions: sockets
 
+    - name: Get Composer cache directory
+      id: composer-cache
+      shell: bash
+      run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+    - name: Cache Composer dependencies
+      uses: actions/cache@v4
+      with:
+        path: ${{ steps.composer-cache.outputs.dir }}
+        key: static-php-8.3-${{ matrix.dependency-version }}-composer-${{ hashFiles('**/composer.json') }}
+        restore-keys: |
+          static-php-8.3-${{ matrix.dependency-version }}-composer-
+          static-php-8.3-composer-
+
     - name: Install Dependencies
-      run: composer update --prefer-stable --no-interaction --no-progress --ansi
+      run: composer update --${{ matrix.dependency-version }} --no-interaction --no-progress --ansi
 
     - name: Profanity Check
       run: composer test:profanity

.github/workflows/tests.yml

@@ -2,8 +2,13 @@ name: Tests
 
 on:
   push:
+    branches: [4.x]
   pull_request:
 
+concurrency:
+  group: tests-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   tests:
     if: github.event_name != 'schedule' || github.repository == 'pestphp/pest'
@@ -13,15 +18,18 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, macos-latest] # windows-latest
-        symfony: ['7.3']
-        php: ['8.3', '8.4']
+        symfony: ['7.4', '8.0']
+        php: ['8.3', '8.4', '8.5']
         dependency_version: [prefer-stable]
+        exclude:
+          - php: '8.3'
+            symfony: '8.0'
 
     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
@@ -31,6 +39,20 @@ jobs:
         coverage: none
         extensions: sockets
 
+    - name: Get Composer cache directory
+      id: composer-cache
+      shell: bash
+      run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+    - name: Cache Composer dependencies
+      uses: actions/cache@v4
+      with:
+        path: ${{ steps.composer-cache.outputs.dir }}
+        key: ${{ matrix.os }}-php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-composer-${{ hashFiles('**/composer.json') }}
+        restore-keys: |
+          ${{ matrix.os }}-php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-composer-
+          ${{ matrix.os }}-php-${{ matrix.php }}-composer-
+
     - name: Setup Problem Matches
       run: |
         echo "::add-matcher::${{ runner.tool_cache }}/php.json"

Makefile

@@ -1,14 +0,0 @@
-# Well documented Makefiles
-DEFAULT_GOAL := help
-help:
-	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z0-9_-]+:.*?##/ { printf "  \033[36m%-40s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
-
-build: ## Build all docker images. Specify the command e.g. via make build ARGS="--build-arg PHP=8.2"
-	docker compose build $(ARGS)
-
-##@ [Application]
-install: ## Install the composer dependencies
-	docker compose run --rm composer install
-
-test: ## Run the tests
-	docker compose run --rm composer test

README.md

@@ -5,6 +5,7 @@
         <a href="https://packagist.org/packages/pestphp/pest"><img alt="Total Downloads" src="https://img.shields.io/packagist/dt/pestphp/pest"></a>
         <a href="https://packagist.org/packages/pestphp/pest"><img alt="Latest Version" src="https://img.shields.io/packagist/v/pestphp/pest"></a>
         <a href="https://packagist.org/packages/pestphp/pest"><img alt="License" src="https://img.shields.io/packagist/l/pestphp/pest"></a>
+        <a href="https://whyphp.dev"><img src="https://img.shields.io/badge/Why_PHP-in_2026-7A86E8?style=flat-square&labelColor=18181b" alt="Why PHP in 2026"></a>
     </p>
 </p>
 
@@ -16,8 +17,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)**
@@ -30,23 +31,23 @@ We cannot thank our sponsors enough for their incredible support in funding Pest
 
 ### Platinum Sponsors
 
-- **[Laracasts](https://laracasts.com/?ref=pestphp)**
+- **[CodeRabbit](https://coderabbit.ai/?ref=pestphp)**
+- **[Mailtrap](https://l.rw.rw/pestphp)**
+- **[SerpApi](https://serpapi.com/?ref=nunomaduro)**
+- **[Tighten](https://tighten.com/?ref=nunomaduro)**
+- **[Redberry](https://redberry.international/laravel-development/?utm_source=pest&utm_medium=banner&utm_campaign=pest_sponsorship)**
 
 ### 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
 
+- [Zapiet](https://zapiet.com/?ref=pestphp)
+- [Load Forge](https://loadforge.com/?ref=pestphp)
+- [Route4Me](https://route4me.com/pt?ref=pestphp)
+- [Nerdify](https://getnerdify.com/?ref=pestphp)
 - [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)
+- [TestMu AI](https://www.testmuai.com/?utm_medium=sponsor&utm_source=pest)
 
 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.19.0",
+        "nunomaduro/collision": "^8.9.0",
+        "nunomaduro/termwind": "^2.4.0",
         "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.5",
-        "symfony/process": "^7.3.0"
+        "pestphp/pest-plugin-profanity": "^4.2.1",
+        "phpunit/phpunit": "^12.5.12",
+        "symfony/process": "^7.4.5|^8.0.5"
     },
     "conflict": {
         "filp/whoops": "<2.18.3",
-        "phpunit/phpunit": ">12.3.5",
+        "phpunit/phpunit": ">12.5.12",
         "sebastian/exporter": "<7.0.0",
         "webmozart/assert": "<1.11.0"
     },
@@ -55,10 +55,10 @@
         ]
     },
     "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-dev-tools": "^4.1.0",
+        "pestphp/pest-plugin-browser": "^4.3.0",
+        "pestphp/pest-plugin-type-coverage": "^4.0.3",
+        "psy/psysh": "^0.12.20"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,

docker-compose.yml

@@ -1,14 +0,0 @@
-version: "3.8"
-
-services:
-  php:
-    build:
-      context: ./docker
-    volumes:
-      - .:/var/www/html
-  composer:
-    build:
-      context: ./docker
-    volumes:
-      - .:/var/www/html
-    entrypoint: ["composer"]

overrides/Report/PHP.php

@@ -1,98 +0,0 @@
-<?php
-
-/*
- * BSD 3-Clause License
- *
- * Copyright (c) 2001-2023, Sebastian Bergmann
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-declare(strict_types=1);
-
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace SebastianBergmann\CodeCoverage\Report;
-
-use const PHP_EOL;
-
-use SebastianBergmann\CodeCoverage\CodeCoverage;
-use SebastianBergmann\CodeCoverage\Util\Filesystem;
-use SebastianBergmann\CodeCoverage\WriteOperationFailedException;
-
-use function dirname;
-use function serialize;
-use function str_contains;
-
-final class PHP
-{
-    public function process(CodeCoverage $coverage, ?string $target = null): string
-    {
-        $coverage->clearCache();
-
-        $buffer = "<?php return \unserialize(<<<'END_OF_COVERAGE_SERIALIZATION'".PHP_EOL.serialize($coverage).PHP_EOL.'END_OF_COVERAGE_SERIALIZATION'.PHP_EOL.');';
-
-        if ($target !== null) {
-            if (! str_contains($target, '://')) {
-                Filesystem::createDirectory(dirname($target));
-            }
-
-            if (! is_writable(dirname($target))) {
-                throw new WriteOperationFailedException($target);
-            }
-
-            $fp = @fopen($target, 'wb');
-            if (! $fp) {
-                throw new WriteOperationFailedException($target);
-            }
-
-            $chunkSize = 1024 * 1024 * 8;
-            $offset = 0;
-            $total = strlen($buffer);
-
-            while ($offset < $total) {
-                $written = @fwrite($fp, substr($buffer, $offset, $chunkSize));
-                if ($written === false) {
-                    fclose($fp);
-                    throw new WriteOperationFailedException($target);
-                }
-                $offset += $written;
-            }
-
-            fclose($fp);
-        }
-
-        return $buffer;
-    }
-}

rector.php

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

src/ArchPresets/Laravel.php

@@ -150,7 +150,7 @@ final class Laravel extends AbstractPreset
             ->toHaveSuffix('Controller');
 
         $this->expectations[] = expect('App\Http')
-            ->toOnlyBeUsedIn('App\Http');
+            ->toOnlyBeUsedIn(['App\Http', 'App\Providers']);
 
         $this->expectations[] = expect('App\Http\Controllers')
             ->not->toHavePublicMethodsBesides(['__construct', '__invoke', 'index', 'show', 'create', 'store', 'edit', 'update', 'destroy', 'middleware']);

src/ArchPresets/Php.php

@@ -4,9 +4,6 @@ declare(strict_types=1);
 
 namespace Pest\ArchPresets;
 
-use Pest\Arch\Contracts\ArchExpectation;
-use Pest\Expectation;
-
 /**
  * @internal
  */
@@ -92,9 +89,5 @@ final class Php extends AbstractPreset
             'xdebug_var_dump',
             'trap',
         ])->not->toBeUsed();
-
-        $this->eachUserNamespace(
-            fn (Expectation $namespace): ArchExpectation => $namespace->not->toHaveSuspiciousCharacters(),
-        );
     }
 }

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/Bootstrappers/BootOverrides.php

@@ -26,7 +26,6 @@ final class BootOverrides implements Bootstrapper
         'TextUI/TestSuiteFilterProcessor.php',
         'Event/Value/ThrowableBuilder.php',
         'Logging/JUnit/JunitXmlLogger.php',
-        'Report/PHP.php',
     ];
 
     /**

src/Concerns/Extendable.php

@@ -8,6 +8,8 @@ use Closure;
 
 /**
  * @internal
+ *
+ * @template T of object
  */
 trait Extendable
 {
@@ -20,6 +22,8 @@ trait Extendable
 
     /**
      * Register a new extend.
+     *
+     * @param-closure-this T $extend
      */
     public function extend(string $name, Closure $extend): void
     {

src/Configuration.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Pest;
 
+use Pest\PendingCalls\BeforeEachCall;
 use Pest\PendingCalls\UsesCall;
 
 /**
@@ -62,6 +63,14 @@ final readonly class Configuration
         return (new UsesCall($this->filename, []))->group(...$groups);
     }
 
+    /**
+     * Marks all tests in the current file to be run exclusively.
+     */
+    public function only(): void
+    {
+        (new BeforeEachCall(TestSuite::getInstance(), $this->filename))->only();
+    }
+
     /**
      * Depending on where is called, it will extend the given classes and traits globally or locally.
      */

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

@@ -52,7 +52,9 @@ use ReflectionProperty;
  */
 final class Expectation
 {
+    /** @use Extendable<self<TValue>> */
     use Extendable;
+
     use Pipeable;
     use Retrievable;
 
@@ -397,7 +399,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/Expectations/OppositeExpectation.php

@@ -15,6 +15,7 @@ use Pest\Arch\PendingArchExpectation;
 use Pest\Arch\SingleArchExpectation;
 use Pest\Arch\Support\FileLineFinder;
 use Pest\Exceptions\InvalidExpectation;
+use Pest\Exceptions\MissingDependency;
 use Pest\Expectation;
 use Pest\Support\Arr;
 use Pest\Support\Exporter;
@@ -284,6 +285,10 @@ final readonly class OppositeExpectation
      */
     public function toHaveSuspiciousCharacters(): ArchExpectation
     {
+        if (! class_exists(Spoofchecker::class)) {
+            throw new MissingDependency(__FUNCTION__, 'ext-intl >= 2.0');
+        }
+
         $checker = new Spoofchecker;
 
         /** @var Expectation<array<int, string>|string> $original */

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/PendingCalls/TestCall.php

@@ -759,7 +759,12 @@ final class TestCall // @phpstan-ignore-line
         $this->testSuite->tests->set($this->testCaseMethod);
 
         if (! is_null($testCase = $this->testSuite->tests->get($this->filename))) {
-            $testCase->attributes = array_merge($testCase->attributes, $this->testCaseFactoryAttributes);
+            $attributesToMerge = array_filter(
+                $this->testCaseFactoryAttributes,
+                fn (Attribute $attributeToMerge): bool => array_filter($testCase->attributes, fn (Attribute $attribute): bool => serialize($attributeToMerge) === serialize($attribute)) === []
+            );
+
+            $testCase->attributes = array_merge($testCase->attributes, $attributesToMerge);
         }
     }
 }

src/Pest.php

@@ -6,7 +6,7 @@ namespace Pest;
 
 function version(): string
 {
-    return '4.0.1';
+    return '4.4.1';
 }
 
 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'] = [...[[
@@ -141,6 +142,9 @@ final readonly class Help implements HandlesArguments
         ], [
             'arg' => '--retry',
             'desc' => 'Run non-passing tests first and stop execution upon first error or failure',
+        ], [
+            'arg' => '--dirty',
+            'desc' => 'Only run tests that have uncommitted changes according to Git',
         ], ...$content['Selection']];
 
         $content['Reporting'] = [...$content['Reporting'], ...[

src/Plugins/Parallel/Paratest/WrapperRunner.php

@@ -131,6 +131,7 @@ final class WrapperRunner implements RunnerInterface
         $parameters = $this->handleLaravelHerd($parameters);
 
         $parameters[] = $wrapper;
+        $parameters[] = '--test-directory='.TestSuite::getInstance()->testPath;
 
         $this->parameters = $parameters;
         $this->codeCoverageFilterRegistry = new CodeCoverageFilterRegistry;

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/Coverage.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace Pest\Support;
 
 use Pest\Exceptions\ShouldNotHappen;
+use SebastianBergmann\CodeCoverage\CodeCoverage;
 use SebastianBergmann\CodeCoverage\Node\Directory;
 use SebastianBergmann\CodeCoverage\Node\File;
 use SebastianBergmann\Environment\Runtime;
@@ -87,20 +88,10 @@ final class Coverage
             throw ShouldNotHappen::fromMessage(sprintf('Coverage not found in path: %s.', $reportPath));
         }
 
-        $handle = fopen($reportPath, 'r');
-        $code = '';
-        while (is_resource($handle) && ! feof($handle)) {
-            $code .= fread($handle, 8192);
-        }
-
-        if (is_resource($handle)) {
-            fclose($handle);
-        }
-
+        /** @var CodeCoverage $codeCoverage */
+        $codeCoverage = require $reportPath;
         unlink($reportPath);
 
-        $codeCoverage = eval(substr($code, 5));
-
         $totalCoverage = $codeCoverage->getReport()->percentageOfExecutedLines();
 
         /** @var Directory<File|Directory> $report */

src/Support/HigherOrderCallables.php

@@ -46,6 +46,7 @@ final readonly class HigherOrderCallables
      */
     public function and(mixed $value): Expectation
     {
+        // @phpstan-ignore-next-line
         return $this->expect($value);
     }
 

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};

src/Support/Str.php

@@ -79,7 +79,7 @@ final class Str
             return $subject;
         }
 
-        return substr($subject, 0, $pos);
+        return mb_substr($subject, 0, $pos);
     }
 
     /**

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.1.  
+  Pest Testing Framework 4.4.1.  
 
   USAGE: pest <file> [options]  
 
@@ -27,6 +27,8 @@
   --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  
+  --dirty ...... Only run tests that have uncommitted changes according to Git  
+  --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 +140,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.1.  
+  Pest Testing Framework 4.4.1.  
 

tests/.snapshots/SuccessOnly.php.inc

@@ -1,15 +1,19 @@
 ##teamcity[testSuiteStarted name='Tests/tests/SuccessOnly' locationHint='pest_qn://tests/.tests/SuccessOnly.php' flowId='1234']
-##teamcity[testCount count='3' flowId='1234']
+##teamcity[testCount count='4' flowId='1234']
 ##teamcity[testStarted name='it can pass with comparison' locationHint='pest_qn://tests/.tests/SuccessOnly.php::it can pass with comparison' flowId='1234']
 ##teamcity[testFinished name='it can pass with comparison' duration='100000' flowId='1234']
 ##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[testSuiteStarted name='`block` → can pass with dataset in describe block' locationHint='pest_qn://tests/.tests/SuccessOnly.php::`block` → can pass with dataset in describe block' flowId='1234']
+##teamcity[testStarted name='`block` → can pass with dataset in describe block with data set "(1)"' locationHint='pest_qn://tests/.tests/SuccessOnly.php::`block` → can pass with dataset in describe block with data set "(1)"' flowId='1234']
+##teamcity[testFinished name='`block` → can pass with dataset in describe block with data set "(1)"' duration='100000' flowId='1234']
+##teamcity[testSuiteFinished name='`block` → can pass with dataset in describe block' flowId='1234']
 ##teamcity[testSuiteFinished name='Tests/tests/SuccessOnly' flowId='1234']
 
-  Tests:    3 passed (3 assertions)
+  Tests:    4 passed (4 assertions)
   Duration: 1.00s
 

tests/.snapshots/success.txt

@@ -1782,4 +1782,4 @@
   ✓ pass with dataset with ('my-datas-set-value')
   ✓ within describe → pass with dataset with ('my-datas-set-value')
 
-  Tests:    2 deprecated, 4 warnings, 5 incomplete, 2 notices, 39 todos, 35 skipped, 1188 passed (2814 assertions)
+  Tests:    2 deprecated, 4 warnings, 5 incomplete, 2 notices, 39 todos, 35 skipped, 1188 passed (2813 assertions)

tests/.tests/SuccessOnly.php

@@ -13,3 +13,9 @@ test('can also pass', function () {
 test('can pass with dataset', function ($value) {
     expect($value)->toEqual(true);
 })->with([true]);
+
+describe('block', function () {
+    test('can pass with dataset in describe block', function ($number) {
+        expect($number)->toBeInt();
+    })->with([1]);
+});

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/JUnit.php

@@ -36,8 +36,8 @@ test('junit output', function () use ($normalizedPath, $run) {
     expect($result['testsuite']['@attributes'])
         ->name->toBe('Tests\tests\SuccessOnly')
         ->file->toBe($normalizedPath('tests/.tests/SuccessOnly.php'))
-        ->tests->toBe('3')
-        ->assertions->toBe('3')
+        ->tests->toBe('4')
+        ->assertions->toBe('4')
         ->errors->toBe('0')
         ->failures->toBe('0')
         ->skipped->toBe('0');

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 (2789 assertions)')
         ->toContain('Parallel: 3 processes');
 })->skipOnWindows();