release: v4.6.1

chore: bumps phpunit
fix: allow to update individual screenshots
2026-04-20 22:20:17 +02:00 · 2026-04-15 09:03:09 -07:00 · 2026-04-15 08:49:34 -07:00 · 2026-04-15 08:34:06 -07:00 · 2026-04-15 08:20:50 -07:00 · 2026-04-15 07:47:38 -07:00
79 changed files with 2700 additions and 254 deletions
--- a/.github/workflows/static.yml
+++ b/.github/workflows/static.yml
@ -5,18 +5,22 @@ on:
    branches: [4.x]
  pull_request:
  schedule:
-    - cron: '0 0 * * *'
+    - cron: '0 9 * * *'

 concurrency:
  group: static-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
  cancel-in-progress: true

+permissions:
+  contents: read
+
 jobs:
  static:
    if: github.event_name != 'schedule' || github.repository == 'pestphp/pest'
    name: Static Tests

    runs-on: ubuntu-latest
+    timeout-minutes: 15
    strategy:
      fail-fast: true
      matrix:
@ -40,10 +44,10 @@ jobs:
      run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

    - name: Cache Composer dependencies
-      uses: actions/cache@v4
+      uses: actions/cache@v5
      with:
        path: ${{ steps.composer-cache.outputs.dir }}
-        key: static-php-8.3-${{ matrix.dependency-version }}-composer-${{ hashFiles('**/composer.json') }}
+        key: static-php-8.3-${{ matrix.dependency-version }}-composer-${{ hashFiles('**/composer.json', '**/composer.lock') }}
        restore-keys: |
          static-php-8.3-${{ matrix.dependency-version }}-composer-
          static-php-8.3-composer-
@ -60,8 +64,5 @@ jobs:
    - name: Type Coverage
      run: composer test:type:coverage

-    - name: Refacto
-      run: composer test:refacto
-
    - name: Style
      run: composer test:lint
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@ -4,16 +4,22 @@ on:
  push:
    branches: [4.x]
  pull_request:
+  schedule:
+    - cron: '0 9 * * *'

 concurrency:
  group: tests-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
  cancel-in-progress: true

+permissions:
+  contents: read
+
 jobs:
  tests:
    if: github.event_name != 'schedule' || github.repository == 'pestphp/pest'

    runs-on: ${{ matrix.os }}
+    timeout-minutes: 15
    strategy:
      fail-fast: true
      matrix:
@ -45,10 +51,10 @@ jobs:
      run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

    - name: Cache Composer dependencies
-      uses: actions/cache@v4
+      uses: actions/cache@v5
      with:
        path: ${{ steps.composer-cache.outputs.dir }}
-        key: ${{ matrix.os }}-php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-composer-${{ hashFiles('**/composer.json') }}
+        key: ${{ matrix.os }}-php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-composer-${{ hashFiles('**/composer.json', '**/composer.lock') }}
        restore-keys: |
          ${{ matrix.os }}-php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-composer-
          ${{ matrix.os }}-php-${{ matrix.php }}-composer-
--- a/bin/pest
+++ b/bin/pest
@ -10,6 +10,7 @@ use Pest\TestCaseMethodFilters\AssigneeTestCaseFilter;
 use Pest\TestCaseMethodFilters\IssueTestCaseFilter;
 use Pest\TestCaseMethodFilters\NotesTestCaseFilter;
 use Pest\TestCaseMethodFilters\PrTestCaseFilter;
+use Pest\TestCaseMethodFilters\FlakyTestCaseFilter;
 use Pest\TestCaseMethodFilters\TodoTestCaseFilter;
 use Pest\TestSuite;
 use Symfony\Component\Console\Input\ArgvInput;
@ -23,6 +24,7 @@ use Symfony\Component\Console\Output\ConsoleOutput;

    $dirty = false;
    $todo = false;
+    $flaky = false;
    $notes = false;

    foreach ($arguments as $key => $value) {
@ -57,6 +59,11 @@ use Symfony\Component\Console\Output\ConsoleOutput;
            unset($arguments[$key]);
        }

+        if ($value === '--flaky') {
+            $flaky = true;
+            unset($arguments[$key]);
+        }
+
        if ($value === '--notes') {
            $notes = true;
            unset($arguments[$key]);
@ -150,6 +157,10 @@ use Symfony\Component\Console\Output\ConsoleOutput;
        $testSuite->tests->addTestCaseMethodFilter(new TodoTestCaseFilter);
    }

+    if ($flaky) {
+        $testSuite->tests->addTestCaseMethodFilter(new FlakyTestCaseFilter);
+    }
+
    if ($notes) {
        $testSuite->tests->addTestCaseMethodFilter(new NotesTestCaseFilter);
    }
--- a/composer.json
+++ b/composer.json
@ -19,18 +19,18 @@
    "require": {
        "php": "^8.3.0",
        "brianium/paratest": "^7.20.0",
-        "nunomaduro/collision": "^8.9.2",
+        "nunomaduro/collision": "^8.9.3",
        "nunomaduro/termwind": "^2.4.0",
        "pestphp/pest-plugin": "^4.0.0",
-        "pestphp/pest-plugin-arch": "^4.0.0",
+        "pestphp/pest-plugin-arch": "^4.0.2",
        "pestphp/pest-plugin-mutate": "^4.0.1",
        "pestphp/pest-plugin-profanity": "^4.2.1",
-        "phpunit/phpunit": "^12.5.16",
-        "symfony/process": "^7.4.5|^8.0.8"
+        "phpunit/phpunit": "^12.5.20",
+        "symfony/process": "^7.4.8|^8.0.8"
    },
    "conflict": {
        "filp/whoops": "<2.18.3",
-        "phpunit/phpunit": ">12.5.16",
+        "phpunit/phpunit": ">12.5.20",
        "sebastian/exporter": "<7.0.0",
        "webmozart/assert": "<1.11.0"
    },
@ -50,14 +50,18 @@
            "Tests\\Fixtures\\Arch\\": "tests/Fixtures/Arch",
            "Tests\\": "tests/PHPUnit/"
        },
+        "classmap": [
+            "tests/Fixtures/Arch/ToBeCasedCorrectly/IncorrectCasing/incorrectCasing.php"
+        ],
        "files": [
            "tests/Autoload.php"
        ]
    },
    "require-dev": {
+        "mrpunyapal/peststan": "^0.2.5",
        "pestphp/pest-dev-tools": "^4.1.0",
-        "pestphp/pest-plugin-browser": "^4.3.0",
-        "pestphp/pest-plugin-type-coverage": "^4.0.3",
+        "pestphp/pest-plugin-browser": "^4.3.1",
+        "pestphp/pest-plugin-type-coverage": "^4.0.4",
        "psy/psysh": "^0.12.22"
    },
    "minimum-stability": "dev",
@ -73,10 +77,14 @@
        "bin/pest"
    ],
    "scripts": {
-        "refacto": "rector",
-        "lint": "pint --parallel",
-        "test:refacto": "rector --dry-run",
-        "test:lint": "pint --parallel --test",
+        "lint": [
+            "rector",
+            "pint --parallel"
+        ],
+        "test:lint": [
+            "rector --dry-run",
+            "pint --parallel --test"
+        ],
        "test:profanity": "php bin/pest --profanity --compact",
        "test:type:check": "phpstan analyse --ansi --memory-limit=-1 --debug",
        "test:type:coverage": "php -d memory_limit=-1  bin/pest --type-coverage --min=100",
@ -86,7 +94,6 @@
        "test:integration": "php bin/pest --group=integration -v",
        "update:snapshots": "REBUILD_SNAPSHOTS=true php bin/pest --update-snapshots",
        "test": [
-            "@test:refacto",
            "@test:lint",
            "@test:type:check",
            "@test:type:coverage",
--- a/overrides/Logging/JUnit/JunitXmlLogger.php
+++ b/overrides/Logging/JUnit/JunitXmlLogger.php
@ -1,6 +1,39 @@
 <?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.
 *
--- a/overrides/Runner/TestSuiteSorter.php
+++ b/overrides/Runner/TestSuiteSorter.php
@ -0,0 +1,388 @@
+<?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 PHPUnit\Runner;
+
+use PHPUnit\Framework\DataProviderTestSuite;
+use PHPUnit\Framework\Reorderable;
+use PHPUnit\Framework\Test;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\TestSuite;
+use PHPUnit\Runner\ResultCache\NullResultCache;
+use PHPUnit\Runner\ResultCache\ResultCache;
+use PHPUnit\Runner\ResultCache\ResultCacheId;
+
+use function array_diff;
+use function array_merge;
+use function array_reverse;
+use function array_splice;
+use function assert;
+use function count;
+use function in_array;
+use function max;
+use function shuffle;
+use function usort;
+
+/**
+ * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ */
+final class TestSuiteSorter
+{
+    public const int ORDER_DEFAULT = 0;
+
+    public const int ORDER_RANDOMIZED = 1;
+
+    public const int ORDER_REVERSED = 2;
+
+    public const int ORDER_DEFECTS_FIRST = 3;
+
+    public const int ORDER_DURATION = 4;
+
+    public const int ORDER_SIZE = 5;
+
+    /**
+     * @var non-empty-array<non-empty-string, positive-int>
+     */
+    private const array SIZE_SORT_WEIGHT = [
+        'small' => 1,
+        'medium' => 2,
+        'large' => 3,
+        'unknown' => 4,
+    ];
+
+    /**
+     * @var array<string, int> Associative array of (string => DEFECT_SORT_WEIGHT) elements
+     */
+    private array $defectSortOrder = [];
+
+    private readonly ResultCache $cache;
+
+    public function __construct(?ResultCache $cache = null)
+    {
+        $this->cache = $cache ?? new NullResultCache;
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function reorderTestsInSuite(Test $suite, int $order, bool $resolveDependencies, int $orderDefects): void
+    {
+        $allowedOrders = [
+            self::ORDER_DEFAULT,
+            self::ORDER_REVERSED,
+            self::ORDER_RANDOMIZED,
+            self::ORDER_DURATION,
+            self::ORDER_SIZE,
+        ];
+
+        if (! in_array($order, $allowedOrders, true)) {
+            // @codeCoverageIgnoreStart
+            throw new InvalidOrderException;
+            // @codeCoverageIgnoreEnd
+        }
+
+        $allowedOrderDefects = [
+            self::ORDER_DEFAULT,
+            self::ORDER_DEFECTS_FIRST,
+        ];
+
+        if (! in_array($orderDefects, $allowedOrderDefects, true)) {
+            // @codeCoverageIgnoreStart
+            throw new InvalidOrderException;
+            // @codeCoverageIgnoreEnd
+        }
+
+        if ($suite instanceof TestSuite) {
+            foreach ($suite as $_suite) {
+                $this->reorderTestsInSuite($_suite, $order, $resolveDependencies, $orderDefects);
+            }
+
+            if ($orderDefects === self::ORDER_DEFECTS_FIRST) {
+                $this->addSuiteToDefectSortOrder($suite);
+            }
+
+            $this->sort($suite, $order, $resolveDependencies, $orderDefects);
+        }
+    }
+
+    private function sort(TestSuite $suite, int $order, bool $resolveDependencies, int $orderDefects): void
+    {
+        if ($suite->tests() === []) {
+            return;
+        }
+
+        if ($order === self::ORDER_REVERSED) {
+            $suite->setTests($this->reverse($suite->tests()));
+        } elseif ($order === self::ORDER_RANDOMIZED) {
+            $suite->setTests($this->randomize($suite->tests()));
+        } elseif ($order === self::ORDER_DURATION) {
+            $suite->setTests($this->sortByDuration($suite->tests()));
+        } elseif ($order === self::ORDER_SIZE) {
+            $suite->setTests($this->sortBySize($suite->tests()));
+        }
+
+        if ($orderDefects === self::ORDER_DEFECTS_FIRST) {
+            $suite->setTests($this->sortDefectsFirst($suite->tests()));
+        }
+
+        if ($resolveDependencies && ! ($suite instanceof DataProviderTestSuite)) {
+            $tests = $suite->tests();
+
+            /** @noinspection PhpParamsInspection */
+            /** @phpstan-ignore argument.type */
+            $suite->setTests($this->resolveDependencies($tests));
+        }
+    }
+
+    private function addSuiteToDefectSortOrder(TestSuite $suite): void
+    {
+        $max = 0;
+
+        foreach ($suite->tests() as $test) {
+            assert($test instanceof Reorderable);
+
+            $sortId = $test->sortId();
+
+            if (! isset($this->defectSortOrder[$sortId])) {
+                $this->defectSortOrder[$sortId] = $this->cache->status(ResultCacheId::fromReorderable($test))->asInt();
+                $max = max($max, $this->defectSortOrder[$sortId]);
+            }
+        }
+
+        $this->defectSortOrder[$suite->sortId()] = $max;
+    }
+
+    /**
+     * @param  list<Test>  $tests
+     * @return list<Test>
+     */
+    private function reverse(array $tests): array
+    {
+        return array_reverse($tests);
+    }
+
+    /**
+     * @param  list<Test>  $tests
+     * @return list<Test>
+     */
+    private function randomize(array $tests): array
+    {
+        shuffle($tests);
+
+        return $tests;
+    }
+
+    /**
+     * @param  list<Test>  $tests
+     * @return list<Test>
+     */
+    private function sortDefectsFirst(array $tests): array
+    {
+        usort(
+            $tests,
+            fn (Test $left, Test $right) => $this->cmpDefectPriorityAndTime($left, $right),
+        );
+
+        return $tests;
+    }
+
+    /**
+     * @param  list<Test>  $tests
+     * @return list<Test>
+     */
+    private function sortByDuration(array $tests): array
+    {
+        usort(
+            $tests,
+            fn (Test $left, Test $right) => $this->cmpDuration($left, $right),
+        );
+
+        return $tests;
+    }
+
+    /**
+     * @param  list<Test>  $tests
+     * @return list<Test>
+     */
+    private function sortBySize(array $tests): array
+    {
+        usort(
+            $tests,
+            fn (Test $left, Test $right) => $this->cmpSize($left, $right),
+        );
+
+        return $tests;
+    }
+
+    /**
+     * Comparator callback function to sort tests for "reach failure as fast as possible".
+     *
+     * 1. sort tests by defect weight defined in self::DEFECT_SORT_WEIGHT
+     * 2. when tests are equally defective, sort the fastest to the front
+     * 3. do not reorder successful tests
+     */
+    private function cmpDefectPriorityAndTime(Test $a, Test $b): int
+    {
+        assert($a instanceof Reorderable);
+        assert($b instanceof Reorderable);
+
+        $priorityA = $this->defectSortOrder[$a->sortId()] ?? 0;
+        $priorityB = $this->defectSortOrder[$b->sortId()] ?? 0;
+
+        if ($priorityA !== $priorityB) {
+            // Sort defect weight descending
+            return $priorityB <=> $priorityA;
+        }
+
+        if ($priorityA > 0 || $priorityB > 0) {
+            return $this->cmpDuration($a, $b);
+        }
+
+        // do not change execution order
+        return 0;
+    }
+
+    /**
+     * Compares test duration for sorting tests by duration ascending.
+     */
+    private function cmpDuration(Test $a, Test $b): int
+    {
+        if (! ($a instanceof Reorderable && $b instanceof Reorderable)) {
+            return 0;
+        }
+
+        return $this->cache->time(ResultCacheId::fromReorderable($a)) <=> $this->cache->time(ResultCacheId::fromReorderable($b));
+    }
+
+    /**
+     * Compares test size for sorting tests small->medium->large->unknown.
+     */
+    private function cmpSize(Test $a, Test $b): int
+    {
+        $sizeA = ($a instanceof TestCase || $a instanceof DataProviderTestSuite)
+            ? $a->size()->asString()
+            : 'unknown';
+        $sizeB = ($b instanceof TestCase || $b instanceof DataProviderTestSuite)
+            ? $b->size()->asString()
+            : 'unknown';
+
+        return self::SIZE_SORT_WEIGHT[$sizeA] <=> self::SIZE_SORT_WEIGHT[$sizeB];
+    }
+
+    /**
+     * Reorder Tests within a TestCase in such a way as to resolve as many dependencies as possible.
+     * The algorithm will leave the tests in original running order when it can.
+     * For more details see the documentation for test dependencies.
+     *
+     * Short description of algorithm:
+     * 1. Pick the next Test from remaining tests to be checked for dependencies.
+     * 2. If the test has no dependencies: mark done, start again from the top
+     * 3. If the test has dependencies but none left to do: mark done, start again from the top
+     * 4. When we reach the end add any leftover tests to the end. These will be marked 'skipped' during execution.
+     *
+     * @param  array<TestCase>  $tests
+     * @return array<TestCase>
+     */
+    private function resolveDependencies(array $tests): array
+    {
+        // Pest: Fast-path. If no test in this suite declares dependencies, the
+        // original O(N^2) algorithm is wasted work — it would splice each test
+        // one-by-one back into the same order. The check deliberately walks
+        // TestCase instances directly instead of calling TestSuite::requires(),
+        // because the latter lazily builds TestSuite::provides() via
+        // ExecutionOrderDependency::mergeUnique, which is O(N^2) in the total
+        // number of tests. With thousands of tests that single call alone can
+        // burn several seconds before the sort even begins. Reading the
+        // cached TestCase::$dependencies property stays O(N) and costs nothing
+        // when no test uses `->depends()` / PHPUnit `@depends`.
+        if (! $this->anyTestHasDependencies($tests)) {
+            return $tests;
+        }
+
+        $newTestOrder = [];
+        $i = 0;
+        $provided = [];
+
+        do {
+            if (array_diff($tests[$i]->requires(), $provided) === []) {
+                $provided = array_merge($provided, $tests[$i]->provides());
+                $newTestOrder = array_merge($newTestOrder, array_splice($tests, $i, 1));
+                $i = 0;
+            } else {
+                $i++;
+            }
+        } while ($tests !== [] && ($i < count($tests)));
+
+        return array_merge($newTestOrder, $tests);
+    }
+
+    /**
+     * Cheaply determines whether any test in the tree declares @depends.
+     *
+     * Walks `TestSuite` containers recursively and inspects each `TestCase`
+     * directly so it never triggers `TestSuite::provides()`, which is O(N^2)
+     * in the total number of aggregated tests.
+     *
+     * @param  iterable<Test>  $tests
+     */
+    private function anyTestHasDependencies(iterable $tests): bool
+    {
+        foreach ($tests as $test) {
+            if ($test instanceof TestSuite) {
+                if ($this->anyTestHasDependencies($test->tests())) {
+                    return true;
+                }
+
+                continue;
+            }
+
+            if ($test instanceof TestCase && $test->requires() !== []) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@ -1,11 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: '#^Parameter \#1 of callable callable\(Pest\\Expectation\<string\|null\>\)\: Pest\\Arch\\Contracts\\ArchExpectation expects Pest\\Expectation\<string\|null\>, Pest\\Expectation\<string\|null\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/ArchPresets/AbstractPreset.php
-
 		-
 			message: '#^Trait Pest\\Concerns\\Expectable is used zero times and is not analysed\.$#'
 			identifier: trait.unused
@ -24,12 +18,6 @@ parameters:
 			count: 1
 			path: src/Concerns/Testable.php

-		-
-			message: '#^Loose comparison using \!\= between \(Closure\|null\) and false will always evaluate to false\.$#'
-			identifier: notEqual.alwaysFalse
-			count: 1
-			path: src/Expectation.php
-
 		-
 			message: '#^Method Pest\\Expectation\:\:and\(\) should return Pest\\Expectation\<TAndValue\> but returns \(Pest\\Expectation&TAndValue\)\|Pest\\Expectation\<TAndValue of mixed\>\.$#'
 			identifier: return.type
@ -102,78 +90,12 @@ parameters:
 			count: 1
 			path: src/PendingCalls/TestCall.php

-		-
-			message: '#^Parameter \#1 \$argv of class Symfony\\Component\\Console\\Input\\ArgvInput constructor expects list\<string\>\|null, array\<int, string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/Plugins/Parallel.php
-
-		-
-			message: '#^Parameter \#13 \$testRunnerTriggeredDeprecationEvents of class PHPUnit\\TestRunner\\TestResult\\TestResult constructor expects list\<PHPUnit\\Event\\TestRunner\\DeprecationTriggered\>, array given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/Plugins/Parallel/Paratest/WrapperRunner.php
-
-		-
-			message: '#^Parameter \#14 \$testRunnerTriggeredWarningEvents of class PHPUnit\\TestRunner\\TestResult\\TestResult constructor expects list\<PHPUnit\\Event\\TestRunner\\WarningTriggered\>, array given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/Plugins/Parallel/Paratest/WrapperRunner.php
-
-		-
-			message: '#^Parameter \#15 \$errors of class PHPUnit\\TestRunner\\TestResult\\TestResult constructor expects list\<PHPUnit\\TestRunner\\TestResult\\Issues\\Issue\>, array given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/Plugins/Parallel/Paratest/WrapperRunner.php
-
-		-
-			message: '#^Parameter \#16 \$deprecations of class PHPUnit\\TestRunner\\TestResult\\TestResult constructor expects list\<PHPUnit\\TestRunner\\TestResult\\Issues\\Issue\>, array given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/Plugins/Parallel/Paratest/WrapperRunner.php
-
-		-
-			message: '#^Parameter \#17 \$notices of class PHPUnit\\TestRunner\\TestResult\\TestResult constructor expects list\<PHPUnit\\TestRunner\\TestResult\\Issues\\Issue\>, array given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/Plugins/Parallel/Paratest/WrapperRunner.php
-
-		-
-			message: '#^Parameter \#18 \$warnings of class PHPUnit\\TestRunner\\TestResult\\TestResult constructor expects list\<PHPUnit\\TestRunner\\TestResult\\Issues\\Issue\>, array given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/Plugins/Parallel/Paratest/WrapperRunner.php
-
-		-
-			message: '#^Parameter \#19 \$phpDeprecations of class PHPUnit\\TestRunner\\TestResult\\TestResult constructor expects list\<PHPUnit\\TestRunner\\TestResult\\Issues\\Issue\>, array given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/Plugins/Parallel/Paratest/WrapperRunner.php
-
-		-
-			message: '#^Parameter \#20 \$phpNotices of class PHPUnit\\TestRunner\\TestResult\\TestResult constructor expects list\<PHPUnit\\TestRunner\\TestResult\\Issues\\Issue\>, array given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/Plugins/Parallel/Paratest/WrapperRunner.php
-
-		-
-			message: '#^Parameter \#21 \$phpWarnings of class PHPUnit\\TestRunner\\TestResult\\TestResult constructor expects list\<PHPUnit\\TestRunner\\TestResult\\Issues\\Issue\>, array given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/Plugins/Parallel/Paratest/WrapperRunner.php
-
 		-
 			message: '#^Parameter \#4 \$testErroredEvents of class PHPUnit\\TestRunner\\TestResult\\TestResult constructor expects list\<PHPUnit\\Event\\Test\\AfterLastTestMethodErrored\|PHPUnit\\Event\\Test\\BeforeFirstTestMethodErrored\|PHPUnit\\Event\\Test\\Errored\>, array given\.$#'
 			identifier: argument.type
 			count: 1
 			path: src/Plugins/Parallel/Paratest/WrapperRunner.php

-		-
-			message: '#^Parameter \#5 \$testFailedEvents of class PHPUnit\\TestRunner\\TestResult\\TestResult constructor expects list\<PHPUnit\\Event\\Test\\Failed\>, array given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/Plugins/Parallel/Paratest/WrapperRunner.php
-
 		-
 			message: '#^Parameter \#7 \$testSuiteSkippedEvents of class PHPUnit\\TestRunner\\TestResult\\TestResult constructor expects list\<PHPUnit\\Event\\TestSuite\\Skipped\>, array given\.$#'
 			identifier: argument.type
--- a/phpstan-pest-extension.neon
+++ b/phpstan-pest-extension.neon
@ -0,0 +1,5 @@
+services:
+    -
+        class: Pest\PHPStan\HigherOrderExpectationTypeExtension
+        tags:
+            - phpstan.broker.expressionTypeResolverExtension
--- a/phpstan.neon
+++ b/phpstan.neon
@ -1,5 +1,7 @@
 includes:
    - phpstan-baseline.neon
+    - phpstan-pest-extension.neon
+    - vendor/mrpunyapal/peststan/extension.neon

 parameters:
    level: 7
@ -7,6 +9,3 @@ parameters:
        - src

    reportUnmatchedIgnoredErrors: false
-
-    ignoreErrors:
-        - "#type mixed is not subtype of native#"
--- a/src/ArchPresets/AbstractPreset.php
+++ b/src/ArchPresets/AbstractPreset.php
@ -53,7 +53,7 @@ abstract class AbstractPreset // @pest-arch-ignore-line
    /**
     * Runs the given callback for each namespace.
     *
-     * @param  callable(Expectation<string|null>): ArchExpectation  ...$callbacks
+     * @param  callable(Expectation<string>): ArchExpectation  ...$callbacks
     */
    final public function eachUserNamespace(callable ...$callbacks): void
    {
--- a/src/ArchPresets/Laravel.php
+++ b/src/ArchPresets/Laravel.php
@ -69,6 +69,7 @@ final class Laravel extends AbstractPreset
            ->toHaveSuffix('Request');

        $this->expectations[] = expect('App\Http\Requests')
+            ->classes()
            ->toExtend('Illuminate\Foundation\Http\FormRequest');

        $this->expectations[] = expect('App\Http\Requests')
@ -118,6 +119,7 @@ final class Laravel extends AbstractPreset
            ->toHaveMethod('handle');

        $this->expectations[] = expect('App\Notifications')
+            ->classes()
            ->toExtend('Illuminate\Notifications\Notification');

        $this->expectations[] = expect('App')
@ -128,6 +130,7 @@ final class Laravel extends AbstractPreset
            ->toHaveSuffix('ServiceProvider');

        $this->expectations[] = expect('App\Providers')
+            ->classes()
            ->toExtend('Illuminate\Support\ServiceProvider');

        $this->expectations[] = expect('App\Providers')
--- a/src/Bootstrappers/BootOverrides.php
+++ b/src/Bootstrappers/BootOverrides.php
@ -21,6 +21,7 @@ final class BootOverrides implements Bootstrapper
        'Runner/Filter/NameFilterIterator.php',
        'Runner/ResultCache/DefaultResultCache.php',
        'Runner/TestSuiteLoader.php',
+        'Runner/TestSuiteSorter.php',
        'TextUI/Command/Commands/WarmCodeCoverageCacheCommand.php',
        'TextUI/Output/Default/ProgressPrinter/Subscriber/TestSkippedSubscriber.php',
        'TextUI/TestSuiteFilterProcessor.php',
--- a/src/Concerns/Testable.php
+++ b/src/Concerns/Testable.php
@ -14,6 +14,8 @@ use Pest\Support\Reflection;
 use Pest\Support\Shell;
 use Pest\TestSuite;
 use PHPUnit\Framework\Attributes\PostCondition;
+use PHPUnit\Framework\IncompleteTest;
+use PHPUnit\Framework\SkippedTest;
 use PHPUnit\Framework\TestCase;
 use ReflectionException;
 use ReflectionFunction;
@ -328,7 +330,80 @@ trait Testable
        $arguments = $this->__resolveTestArguments($args);
        $this->__ensureDatasetArgumentNameAndNumberMatches($arguments);

-        return $this->__callClosure($closure, $arguments);
+        $method = TestSuite::getInstance()->tests->get(self::$__filename)->getMethod($this->name());
+
+        if ($method->flakyTries === null) {
+            return $this->__callClosure($closure, $arguments);
+        }
+
+        $lastException = null;
+        $initialProperties = get_object_vars($this);
+
+        for ($attempt = 1; $attempt <= $method->flakyTries; $attempt++) {
+            try {
+                return $this->__callClosure($closure, $arguments);
+            } catch (Throwable $e) {
+                if ($e instanceof SkippedTest
+                    || $e instanceof IncompleteTest
+                    || $this->__isExpectedException($e)) {
+                    throw $e;
+                }
+
+                $lastException = $e;
+
+                if ($attempt < $method->flakyTries) {
+                    if ($this->__snapshotChanges !== []) {
+                        throw $e;
+                    }
+
+                    $this->tearDown();
+
+                    Closure::bind(fn (): array => $this->mockObjects = [], $this, TestCase::class)();
+
+                    foreach (array_keys(array_diff_key(get_object_vars($this), $initialProperties)) as $property) {
+                        unset($this->{$property});
+                    }
+
+                    $hasOutputExpectation = Closure::bind(fn (): bool => is_string($this->outputExpectedString) || is_string($this->outputExpectedRegex), $this, TestCase::class)();
+
+                    if ($hasOutputExpectation) {
+                        ob_clean();
+                    }
+
+                    $this->setUp();
+                }
+            }
+        }
+
+        throw $lastException;
+    }
+
+    /**
+     * Determines if the given exception matches PHPUnit's expected exception.
+     */
+    private function __isExpectedException(Throwable $e): bool
+    {
+        $read = fn (string $property): mixed => Closure::bind(fn () => $this->{$property}, $this, TestCase::class)();
+
+        $expectedClass = $read('expectedException');
+
+        if ($expectedClass !== null) {
+            return $e instanceof $expectedClass;
+        }
+
+        $expectedMessage = $read('expectedExceptionMessage');
+
+        if ($expectedMessage !== null) {
+            return str_contains($e->getMessage(), (string) $expectedMessage);
+        }
+
+        $expectedCode = $read('expectedExceptionCode');
+
+        if ($expectedCode !== null) {
+            return $e->getCode() === $expectedCode;
+        }
+
+        return false;
    }

    /**
@ -350,7 +425,8 @@ trait Testable
        }

        $underlyingTest = Reflection::getFunctionVariable($this->__test, 'closure');
-        $testParameterTypes = array_values(Reflection::getFunctionArguments($underlyingTest));
+        $testParameterTypesByName = Reflection::getFunctionArguments($underlyingTest);
+        $testParameterTypes = array_values($testParameterTypesByName);

        if (count($arguments) !== 1) {
            foreach ($arguments as $argumentIndex => $argumentValue) {
@ -358,7 +434,11 @@ trait Testable
                    continue;
                }

-                if (in_array($testParameterTypes[$argumentIndex], [Closure::class, 'callable', 'mixed'])) {
+                $parameterType = is_string($argumentIndex)
+                    ? $testParameterTypesByName[$argumentIndex]
+                    : $testParameterTypes[$argumentIndex];
+
+                if (in_array($parameterType, [Closure::class, 'callable', 'mixed'])) {
                    continue;
                }

@ -384,7 +464,7 @@ trait Testable
            return [$boundDatasetResult];
        }

-        return array_values($boundDatasetResult);
+        return $boundDatasetResult;
    }

    /**
--- a/src/Expectation.php
+++ b/src/Expectation.php
@ -18,6 +18,7 @@ use Pest\Arch\Expectations\ToOnlyUse;
 use Pest\Arch\Expectations\ToUse;
 use Pest\Arch\Expectations\ToUseNothing;
 use Pest\Arch\PendingArchExpectation;
+use Pest\Arch\Support\Composer;
 use Pest\Arch\Support\FileLineFinder;
 use Pest\Concerns\Extendable;
 use Pest\Concerns\Pipeable;
@ -669,6 +670,41 @@ final class Expectation
        throw InvalidExpectation::fromMethods(['toHavePrivateMethods']);
    }

+    /**
+     * Asserts that the given expectation target is cased correctly.
+     */
+    public function toBeCasedCorrectly(): ArchExpectation
+    {
+        return Targeted::make(
+            $this,
+            function (ObjectDescription $object): bool {
+                if (! isset($object->reflectionClass)) {
+                    return false;
+                }
+
+                $realPath = realpath($object->path);
+
+                if ($realPath === false) {
+                    return false;
+                }
+
+                foreach (Composer::allNamespacesWithDirectories() as $directory => $namespace) {
+                    if (str_starts_with($realPath, $directory)) {
+                        $relativePath = substr($realPath, strlen($directory) + 1);
+                        $relativePath = explode('.', $relativePath)[0];
+                        $classFromPath = $namespace.'\\'.str_replace(DIRECTORY_SEPARATOR, '\\', $relativePath);
+
+                        return $classFromPath === $object->reflectionClass->getName();
+                    }
+                }
+
+                return false;
+            },
+            'to be cased correctly',
+            FileLineFinder::where(fn (string $line): bool => str_contains($line, 'class')),
+        );
+    }
+
    /**
     * Asserts that the given expectation target is enum.
     */
@ -783,7 +819,22 @@ final class Expectation
                        return false;
                    }

-                    if (! in_array($trait, $object->reflectionClass->getTraitNames(), true)) {
+                    $currentClass = $object->reflectionClass;
+                    $usedTraits = [];
+
+                    do {
+                        $classTraits = $currentClass->getTraits();
+                        foreach ($classTraits as $traitReflection) {
+                            $usedTraits[$traitReflection->getName()] = $traitReflection->getName();
+
+                            $nestedTraits = $traitReflection->getTraits();
+                            foreach ($nestedTraits as $nestedTrait) {
+                                $usedTraits[$nestedTrait->getName()] = $nestedTrait->getName();
+                            }
+                        }
+                    } while ($currentClass = $currentClass->getParentClass());
+
+                    if (! array_key_exists($trait, $usedTraits)) {
                        return false;
                    }
                }
--- a/src/Factories/TestCaseFactory.php
+++ b/src/Factories/TestCaseFactory.php
@ -59,6 +59,11 @@ final class TestCaseFactory
        Concerns\Expectable::class,
    ];

+    /**
+     * The namespace for the test case, overrides the path-based namespace when set.
+     */
+    public ?string $namespace = null;
+
    /**
     * Creates a new Factory instance.
     */
@ -111,8 +116,8 @@ final class TestCaseFactory
        $relativePath = (string) preg_replace('|%[a-fA-F0-9][a-fA-F0-9]|', '', $relativePath);
        // Remove escaped quote sequences (maintain namespace)
        $relativePath = str_replace(array_map(fn (string $quote): string => sprintf('\\%s', $quote), ['\'', '"']), '', $relativePath);
-        // Limit to A-Z, a-z, 0-9, '_', '-'.
-        $relativePath = (string) preg_replace('/[^A-Za-z0-9\\\\]/', '', $relativePath);
+        // Limit to Unicode letters and numbers.
+        $relativePath = (string) preg_replace('/[^\p{L}\p{N}\\\\]/u', '', $relativePath);

        $classFQN = 'P\\'.$relativePath;

@ -127,7 +132,7 @@ final class TestCaseFactory

        $partsFQN = explode('\\', $classFQN);
        $className = array_pop($partsFQN);
-        $namespace = implode('\\', $partsFQN);
+        $namespace = $this->namespace ?? implode('\\', $partsFQN);
        $baseClass = sprintf('\%s', $this->class);

        if (trim($className) === '') {
--- a/src/Factories/TestCaseMethodFactory.php
+++ b/src/Factories/TestCaseMethodFactory.php
@ -50,6 +50,11 @@ final class TestCaseMethodFactory
     */
    public int $repetitions = 1;

+    /**
+     * The test's number of flaky retry tries.
+     */
+    public ?int $flakyTries = null;
+
    /**
     * Determines if the test is a "todo".
     */
--- a/src/Functions.php
+++ b/src/Functions.php
@ -4,7 +4,6 @@ declare(strict_types=1);

 use Pest\Browser\Api\ArrayablePendingAwaitablePage;
 use Pest\Browser\Api\PendingAwaitablePage;
-use Pest\Concerns\Expectable;
 use Pest\Configuration;
 use Pest\Exceptions\AfterAllWithinDescribe;
 use Pest\Exceptions\BeforeAllWithinDescribe;
@ -48,7 +47,7 @@ if (! function_exists('beforeAll')) {
    function beforeAll(Closure $closure): void
    {
        if (DescribeCall::describing() !== []) {
-            $filename = Backtrace::file();
+            $filename = Backtrace::testFile();

            throw new BeforeAllWithinDescribe($filename);
        }
@ -61,13 +60,11 @@ if (! function_exists('beforeEach')) {
    /**
     * Runs the given closure before each test in the current file.
     *
-     * @param-closure-this TestCase  $closure
-     *
-     * @return HigherOrderTapProxy<Expectable|TestCall|TestCase>|Expectable|TestCall|TestCase|mixed
+     * @param-closure-this TestCall  $closure
     */
    function beforeEach(?Closure $closure = null): BeforeEachCall
    {
-        $filename = Backtrace::file();
+        $filename = Backtrace::testFile();

        return new BeforeEachCall(TestSuite::getInstance(), $filename, $closure);
    }
@ -92,8 +89,6 @@ if (! function_exists('describe')) {
     * Adds the given closure as a group of tests. The first argument
     * is the group description; the second argument is a closure
     * that contains the group tests.
-     *
-     * @return HigherOrderTapProxy<Expectable|TestCall|TestCase>|Expectable|TestCall|TestCase|mixed
     */
    function describe(string $description, Closure $tests): DescribeCall
    {
@ -112,7 +107,7 @@ if (! function_exists('uses')) {
     */
    function uses(string ...$classAndTraits): UsesCall
    {
-        $filename = Backtrace::file();
+        $filename = Backtrace::testFile();

        return new UsesCall($filename, array_values($classAndTraits));
    }
@ -124,7 +119,7 @@ if (! function_exists('pest')) {
     */
    function pest(): Configuration
    {
-        return new Configuration(Backtrace::file());
+        return new Configuration(Backtrace::testFile());
    }
 }

@ -134,9 +129,9 @@ if (! function_exists('test')) {
     * is the test description; the second argument is
     * a closure that contains the test expectations.
     *
-     * @param-closure-this TestCase  $closure
+     * @param-closure-this TestCall  $closure
     *
-     * @return Expectable|TestCall|TestCase|mixed
+     * @return ($description is string ? TestCall : HigherOrderTapProxy|TestCall)
     */
    function test(?string $description = null, ?Closure $closure = null): HigherOrderTapProxy|TestCall
    {
@ -156,34 +151,23 @@ if (! function_exists('it')) {
     * is the test description; the second argument is
     * a closure that contains the test expectations.
     *
-     * @param-closure-this TestCase  $closure
-     *
-     * @return Expectable|TestCall|TestCase|mixed
+     * @param-closure-this TestCall  $closure
     */
    function it(string $description, ?Closure $closure = null): TestCall
    {
        $description = sprintf('it %s', $description);

-        /** @var TestCall $test */
-        $test = test($description, $closure);
-
-        return $test;
+        return test($description, $closure);
    }
 }

 if (! function_exists('todo')) {
    /**
     * Creates a new test that is marked as "todo".
-     *
-     * @return Expectable|TestCall|TestCase|mixed
     */
    function todo(string $description): TestCall
    {
-        $test = test($description);
-
-        assert($test instanceof TestCall);
-
-        return $test->todo();
+        return test($description)->todo();
    }
 }

@ -191,13 +175,11 @@ if (! function_exists('afterEach')) {
    /**
     * Runs the given closure after each test in the current file.
     *
-     * @param-closure-this TestCase  $closure
-     *
-     * @return Expectable|HigherOrderTapProxy<Expectable|TestCall|TestCase>|TestCall|mixed
+     * @param-closure-this TestCall  $closure
     */
    function afterEach(?Closure $closure = null): AfterEachCall
    {
-        $filename = Backtrace::file();
+        $filename = Backtrace::testFile();

        return new AfterEachCall(TestSuite::getInstance(), $filename, $closure);
    }
@ -210,7 +192,7 @@ if (! function_exists('afterAll')) {
    function afterAll(Closure $closure): void
    {
        if (DescribeCall::describing() !== []) {
-            $filename = Backtrace::file();
+            $filename = Backtrace::testFile();

            throw new AfterAllWithinDescribe($filename);
        }
@ -227,7 +209,7 @@ if (! function_exists('covers')) {
     */
    function covers(array|string ...$classesOrFunctions): void
    {
-        $filename = Backtrace::file();
+        $filename = Backtrace::testFile();

        $beforeEachCall = (new BeforeEachCall(TestSuite::getInstance(), $filename));

@ -256,7 +238,7 @@ if (! function_exists('mutates')) {
     */
    function mutates(array|string ...$targets): void
    {
-        $filename = Backtrace::file();
+        $filename = Backtrace::testFile();

        $beforeEachCall = (new BeforeEachCall(TestSuite::getInstance(), $filename));
        $beforeEachCall->group('__pest_mutate_only');
--- a/src/Mixins/Expectation.php
+++ b/src/Mixins/Expectation.php
@ -14,6 +14,7 @@ use InvalidArgumentException;
 use JsonSerializable;
 use Pest\Exceptions\InvalidExpectationValue;
 use Pest\Matchers\Any;
+use Pest\Plugins\Snapshot;
 use Pest\Support\Arr;
 use Pest\Support\Exporter;
 use Pest\Support\NullClosure;
@ -851,18 +852,31 @@ final class Expectation
            default => InvalidExpectationValue::expected('array|object|string'),
        };

-        if ($snapshots->has()) {
-            [$filename, $content] = $snapshots->get();
-
-            Assert::assertSame(
-                strtr($content, ["\r\n" => "\n", "\r" => "\n"]),
-                strtr($string, ["\r\n" => "\n", "\r" => "\n"]),
-                $message === '' ? "Failed asserting that the string value matches its snapshot ($filename)." : $message
-            );
-        } else {
+        if (! $snapshots->has()) {
            $filename = $snapshots->save($string);

            TestSuite::getInstance()->registerSnapshotChange("Snapshot created at [$filename]");
+        } else {
+            [$filename, $content] = $snapshots->get();
+
+            $normalizedContent = strtr($content, ["\r\n" => "\n", "\r" => "\n"]);
+            $normalizedString = strtr($string, ["\r\n" => "\n", "\r" => "\n"]);
+
+            if (Snapshot::$updateSnapshots && $normalizedContent !== $normalizedString) {
+                $snapshots->save($string);
+
+                TestSuite::getInstance()->registerSnapshotChange("Snapshot updated at [$filename]");
+            } else {
+                if (Snapshot::$updateSnapshots) {
+                    TestSuite::getInstance()->registerSnapshotChange("Snapshot unchanged at [$filename]");
+                }
+
+                Assert::assertSame(
+                    $normalizedContent,
+                    $normalizedString,
+                    $message === '' ? "Failed asserting that the string value matches its snapshot ($filename)." : $message
+                );
+            }
        }

        return $this;
--- a/src/PHPStan/HigherOrderExpectationTypeExtension.php
+++ b/src/PHPStan/HigherOrderExpectationTypeExtension.php
@ -0,0 +1,57 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\PHPStan;
+
+use Pest\Expectations\HigherOrderExpectation;
+use PhpParser\Node\Expr;
+use PhpParser\Node\Expr\PropertyFetch;
+use PhpParser\Node\Identifier;
+use PHPStan\Analyser\Scope;
+use PHPStan\Reflection\ReflectionProvider;
+use PHPStan\Type\ExpressionTypeResolverExtension;
+use PHPStan\Type\ObjectType;
+use PHPStan\Type\Type;
+
+/**
+ * Prevents native declared properties of HigherOrderExpectation (like $original,
+ * $expectation, $opposite, $shouldReset) from being incorrectly resolved as
+ * higher-order value property accesses by downstream ExpressionTypeResolverExtensions.
+ *
+ * This extension must be registered BEFORE the peststan HigherOrderExpectationTypeExtension.
+ *
+ * @internal
+ */
+final readonly class HigherOrderExpectationTypeExtension implements ExpressionTypeResolverExtension
+{
+    public function __construct(
+        private ReflectionProvider $reflectionProvider,
+    ) {}
+
+    public function getType(Expr $expr, Scope $scope): ?Type
+    {
+        if (! $expr instanceof PropertyFetch || ! $expr->name instanceof Identifier) {
+            return null;
+        }
+
+        $varType = $scope->getType($expr->var);
+
+        if (! (new ObjectType(HigherOrderExpectation::class))->isSuperTypeOf($varType)->yes()) {
+            return null;
+        }
+
+        if (! $this->reflectionProvider->hasClass(HigherOrderExpectation::class)) {
+            return null;
+        }
+
+        $propertyName = $expr->name->name;
+        $classReflection = $this->reflectionProvider->getClass(HigherOrderExpectation::class);
+
+        if (! $classReflection->hasNativeProperty($propertyName)) {
+            return null;
+        }
+
+        return $varType->getProperty($propertyName, $scope)->getReadableType();
+    }
+}
--- a/src/PendingCalls/DescribeCall.php
+++ b/src/PendingCalls/DescribeCall.php
@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace Pest\PendingCalls;

 use Closure;
-use Pest\Support\Backtrace;
 use Pest\Support\Description;
 use Pest\TestSuite;

@ -53,7 +52,11 @@ final class DescribeCall
     */
    public function __destruct()
    {
-        unset($this->currentBeforeEachCall);
+        // Ensure BeforeEachCall destructs before creating tests
+        // by moving to local scope and clearing the reference
+        $beforeEach = $this->currentBeforeEachCall;
+        $this->currentBeforeEachCall = null;
+        unset($beforeEach);  // Trigger destructor immediately

        self::$describing[] = $this->description;

@ -71,12 +74,13 @@ final class DescribeCall
     */
    public function __call(string $name, array $arguments): self
    {
-        $filename = Backtrace::file();
-
        if (! $this->currentBeforeEachCall instanceof BeforeEachCall) {
-            $this->currentBeforeEachCall = new BeforeEachCall(TestSuite::getInstance(), $filename);
+            $this->currentBeforeEachCall = new BeforeEachCall(TestSuite::getInstance(), $this->filename);

-            $this->currentBeforeEachCall->describing[] = $this->description;
+            $this->currentBeforeEachCall->describing = array_merge(
+                DescribeCall::describing(),
+                [$this->description]
+            );
        }

        $this->currentBeforeEachCall->{$name}(...$arguments);
--- a/src/PendingCalls/TestCall.php
+++ b/src/PendingCalls/TestCall.php
@ -412,6 +412,20 @@ final class TestCall // @phpstan-ignore-line
        return $this;
    }

+    /**
+     * Marks the test as flaky, retrying it up to the given number of times.
+     */
+    public function flaky(int $tries = 3): self
+    {
+        if ($tries < 1) {
+            throw new InvalidArgumentException('The number of tries must be greater than 0.');
+        }
+
+        $this->testCaseMethod->flakyTries = $tries;
+
+        return $this;
+    }
+
    /**
     * Marks the test as "todo".
     */
--- a/src/Pest.php
+++ b/src/Pest.php
@ -6,7 +6,7 @@ namespace Pest;

 function version(): string
 {
-    return '4.4.4';
+    return '4.6.1';
 }

 function testDirectory(string $file = ''): string
--- a/src/Plugins/Concerns/HandleArguments.php
+++ b/src/Plugins/Concerns/HandleArguments.php
@ -56,4 +56,31 @@ trait HandleArguments

        return array_values(array_flip($arguments));
    }
+
+    /**
+     * Pops the given argument and its value from the arguments, returning the value.
+     *
+     * @param  array<int, string>  $arguments
+     */
+    public function popArgumentValue(string $argument, array &$arguments): ?string
+    {
+        foreach ($arguments as $key => $value) {
+            if (str_contains($value, "$argument=")) {
+                unset($arguments[$key]);
+                $arguments = array_values($arguments);
+
+                return substr($value, strlen($argument) + 1);
+            }
+
+            if ($value === $argument && isset($arguments[$key + 1])) {
+                $result = $arguments[$key + 1];
+                unset($arguments[$key], $arguments[$key + 1]);
+                $arguments = array_values($arguments);
+
+                return $result;
+            }
+        }
+
+        return null;
+    }
 }
--- a/src/Plugins/Coverage.php
+++ b/src/Plugins/Coverage.php
@ -23,6 +23,8 @@ final class Coverage implements AddsOutput, HandlesArguments

    private const string EXACTLY_OPTION = 'exactly';

+    private const string ONLY_COVERED_OPTION = 'only-covered';
+
    /**
     * Whether it should show the coverage or not.
     */
@ -43,6 +45,11 @@ final class Coverage implements AddsOutput, HandlesArguments
     */
    public ?float $coverageExactly = null;

+    /**
+     * Whether it should show only covered files.
+     */
+    public bool $showOnlyCovered = false;
+
    /**
     * Creates a new Plugin instance.
     */
@ -57,7 +64,7 @@ final class Coverage implements AddsOutput, HandlesArguments
    public function handleArguments(array $originals): array
    {
        $arguments = [...[''], ...array_values(array_filter($originals, function (string $original): bool {
-            foreach ([self::COVERAGE_OPTION, self::MIN_OPTION, self::EXACTLY_OPTION] as $option) {
+            foreach ([self::COVERAGE_OPTION, self::MIN_OPTION, self::EXACTLY_OPTION, self::ONLY_COVERED_OPTION] as $option) {
                if ($original === sprintf('--%s', $option)) {
                    return true;
                }
@ -80,6 +87,7 @@ final class Coverage implements AddsOutput, HandlesArguments
        $inputs[] = new InputOption(self::COVERAGE_OPTION, null, InputOption::VALUE_NONE);
        $inputs[] = new InputOption(self::MIN_OPTION, null, InputOption::VALUE_REQUIRED);
        $inputs[] = new InputOption(self::EXACTLY_OPTION, null, InputOption::VALUE_REQUIRED);
+        $inputs[] = new InputOption(self::ONLY_COVERED_OPTION, null, InputOption::VALUE_NONE);

        $input = new ArgvInput($arguments, new InputDefinition($inputs));
        if ((bool) $input->getOption(self::COVERAGE_OPTION)) {
@ -120,6 +128,10 @@ final class Coverage implements AddsOutput, HandlesArguments
            $this->coverageExactly = (float) $exactlyOption;
        }

+        if ((bool) $input->getOption(self::ONLY_COVERED_OPTION)) {
+            $this->showOnlyCovered = true;
+        }
+
        if ($_SERVER['COLLISION_PRINTER_COMPACT'] ?? false) {
            $this->compact = true;
        }
@ -144,7 +156,7 @@ final class Coverage implements AddsOutput, HandlesArguments
                exit(1);
            }

-            $coverage = \Pest\Support\Coverage::report($this->output, $this->compact);
+            $coverage = \Pest\Support\Coverage::report($this->output, $this->compact, $this->showOnlyCovered);
            $exitCode = (int) ($coverage < $this->coverageMin);

            if ($exitCode === 0 && $this->coverageExactly !== null) {
--- a/src/Plugins/Help.php
+++ b/src/Plugins/Help.php
@ -107,6 +107,13 @@ final readonly class Help implements HandlesArguments
            'desc' => 'Initialise a standard Pest configuration',
        ]], ...$content['Configuration']];

+        $content['AI'] = [
+            [
+                'arg' => '--ai',
+                'desc' => 'Run a code snippet as a fully scaffolded test for AI verification',
+            ],
+        ];
+
        $content['Execution'] = [...[
            [
                'arg' => '--parallel',
@ -116,6 +123,10 @@ final readonly class Help implements HandlesArguments
                'arg' => '--update-snapshots',
                'desc' => 'Update snapshots for tests using the "toMatchSnapshot" expectation',
            ],
+            [
+                'arg' => '--update-shards',
+                'desc' => 'Update shards.json with test timing data for time-balanced sharding',
+            ],
        ], ...$content['Execution']];

        $content['Selection'] = [[
@ -145,6 +156,9 @@ final readonly class Help implements HandlesArguments
        ], [
            'arg' => '--dirty',
            'desc' => 'Only run tests that have uncommitted changes according to Git',
+        ], [
+            'arg' => '--flaky',
+            'desc' => 'Output to standard output tests marked as flaky',
        ], ...$content['Selection']];

        $content['Reporting'] = [...$content['Reporting'], ...[
@ -160,6 +174,12 @@ final readonly class Help implements HandlesArguments
        ], [
            'arg' => '--coverage --min',
            'desc' => 'Set the minimum required coverage percentage, and fail if not met',
+        ], [
+            'arg' => '--coverage --exactly',
+            'desc' => 'Set the exact required coverage percentage, and fail if not met',
+        ], [
+            'arg' => '--coverage --only-covered',
+            'desc' => 'Hide files with 0% coverage from the code coverage report',
        ], ...$content['Code Coverage']];

        $content['Mutation Testing'] = [[
--- a/src/Plugins/Parallel.php
+++ b/src/Plugins/Parallel.php
@ -34,7 +34,7 @@ final class Parallel implements HandlesArguments
    /**
     * @var string[]
     */
-    private const array UNSUPPORTED_ARGUMENTS = ['--todo', '--todos', '--retry', '--notes', '--issue', '--pr', '--pull-request'];
+    private const array UNSUPPORTED_ARGUMENTS = ['--todo', '--todos', '--retry', '--notes', '--issue', '--pr', '--pull-request', '--flaky'];

    /**
     * Whether the given command line arguments indicate that the test suite should be run in parallel.
@ -127,7 +127,9 @@ final class Parallel implements HandlesArguments
            $arguments
        );

-        $exitCode = $this->paratestCommand()->run(new ArgvInput($filteredArguments), new CleanConsoleOutput);
+        $filteredArguments = $this->processTeamcityArguments($filteredArguments);
+
+        $exitCode = $this->paratestCommand()->run(new ArgvInput(array_values($filteredArguments)), new CleanConsoleOutput);

        return CallsAddsOutput::execute($exitCode);
    }
@ -197,4 +199,18 @@ final class Parallel implements HandlesArguments

        return $this->popArgument('-p', $arguments);
    }
+
+    /**
+     * @param  string[]  $arguments
+     * @return string[]
+     */
+    public function processTeamcityArguments(array $arguments): array
+    {
+        $argv = new ArgvInput;
+        if ($argv->hasParameterOption('--teamcity')) {
+            $arguments[] = '--teamcity';
+        }
+
+        return $arguments;
+    }
 }
--- a/src/Plugins/Parallel/Paratest/ResultPrinter.php
+++ b/src/Plugins/Parallel/Paratest/ResultPrinter.php
@ -81,7 +81,9 @@ final class ResultPrinter
            public function flush(): void {}
        };

-        $this->compactPrinter = CompactPrinter::default();
+        $this->compactPrinter = CompactPrinter::default(
+            decorated: ! in_array('--colors=never', $_SERVER['argv'] ?? [], true),
+        );

        if (! $this->options->configuration->hasLogfileTeamcity()) {
            return;
@ -92,14 +94,13 @@ final class ResultPrinter
        $this->teamcityLogFileHandle = $teamcityLogFileHandle;
    }

-    /** @param  list<SplFileInfo>  $teamcityFiles */
    public function printFeedback(
        SplFileInfo $progressFile,
        SplFileInfo $outputFile,
-        array $teamcityFiles
+        ?SplFileInfo $teamcityFile,
    ): void {
-        if ($this->options->needsTeamcity) {
-            $teamcityProgress = $this->tailMultiple($teamcityFiles);
+        if ($this->options->needsTeamcity && $teamcityFile instanceof SplFileInfo) {
+            $teamcityProgress = $this->tailMultiple([$teamcityFile]);

            if ($this->teamcityLogFileHandle !== null) {
                fwrite($this->teamcityLogFileHandle, $teamcityProgress);
@ -171,8 +172,18 @@ final class ResultPrinter

        $state = (new StateGenerator)->fromPhpUnitTestResult($this->passedTests, $testResult);

-        $this->compactPrinter->errors($state);
-        $this->compactPrinter->recap($state, $testResult, $duration, $this->options);
+        if ($testResult->numberOfTestsRun() === 0 && $state->testSuiteTestsCount() === 0) {
+            $this->output->writeln([
+                '',
+                '  <fg=white;options=bold;bg=blue> INFO </> No tests found.',
+                '',
+            ]);
+        }
+
+        if (! isset($_SERVER['PEST_PARALLEL_NO_OUTPUT'])) {
+            $this->compactPrinter->errors($state);
+            $this->compactPrinter->recap($state, $testResult, $duration, $this->options);
+        }
    }

    private function printFeedbackItem(string $item): void
--- a/src/Plugins/Parallel/Paratest/WrapperRunner.php
+++ b/src/Plugins/Parallel/Paratest/WrapperRunner.php
@ -39,6 +39,7 @@ use function dirname;
 use function file_get_contents;
 use function max;
 use function realpath;
+use function str_starts_with;
 use function unlink;
 use function unserialize;
 use function usleep;
@ -51,6 +52,11 @@ final class WrapperRunner implements RunnerInterface
    /**
     * The time to sleep between cycles.
     */
+    /**
+     * The merged test result from the parallel run.
+     */
+    public static ?TestResult $result = null;
+
    private const int CYCLE_SLEEP = 10000;

    /**
@ -226,7 +232,7 @@ final class WrapperRunner implements RunnerInterface
        $this->printer->printFeedback(
            $worker->progressFile,
            $worker->unexpectedOutputFile,
-            $this->teamcityFiles,
+            $worker->teamcityFile ?? null,
        );
        $worker->reset();
    }
@ -386,6 +392,8 @@ final class WrapperRunner implements RunnerInterface
            $testResultSum->numberOfIssuesIgnoredByBaseline(),
        );

+        self::$result = $testResultSum;
+
        if ($this->options->configuration->cacheResult()) {
            $resultCacheSum = new DefaultResultCache($this->options->configuration->testResultCacheFile());
            foreach ($this->resultCacheFiles as $resultCacheFile) {
@ -484,15 +492,61 @@ final class WrapperRunner implements RunnerInterface
     */
    private function getTestFiles(SuiteLoader $suiteLoader): array
    {
-        /** @var array<string, non-empty-string> $files */
-        $files = [
-            ...array_values(array_filter(
-                $suiteLoader->tests,
-                fn (string $filename): bool => ! str_ends_with($filename, "eval()'d code")
-            )),
-            ...TestSuite::getInstance()->tests->getFilenames(),
-        ];
+        /** @var array<string, null> $files */
+        $files = [];

-        return $files; // @phpstan-ignore-line
+        foreach (array_filter(
+            $suiteLoader->tests,
+            fn (string $filename): bool => ! str_ends_with($filename, "eval()'d code")
+        ) as $filename) {
+            $resolved = realpath($filename) ?: $filename;
+            $files[$resolved] = null;
+        }
+
+        foreach (TestSuite::getInstance()->tests->getFilenames() as $filename) {
+            if ($this->shouldIncludeBootstrappedTestFile($filename)) {
+                $resolved = realpath($filename)
+                    ?: realpath($this->options->cwd.DIRECTORY_SEPARATOR.$filename)
+                    ?: $filename;
+                $files[$resolved] = null;
+            }
+        }
+
+        return array_keys($files); // @phpstan-ignore-line
+    }
+
+    private function shouldIncludeBootstrappedTestFile(string $filename): bool
+    {
+        if (! $this->options->configuration->hasCliArguments()) {
+            return true;
+        }
+
+        $resolvedFilename = realpath($filename);
+
+        if ($resolvedFilename === false) {
+            $resolvedFilename = realpath($this->options->cwd.DIRECTORY_SEPARATOR.$filename);
+        }
+
+        if ($resolvedFilename === false) {
+            return false;
+        }
+
+        foreach ($this->options->configuration->cliArguments() as $path) {
+            $resolvedPath = realpath($path);
+
+            if ($resolvedPath === false) {
+                continue;
+            }
+
+            if ($resolvedFilename === $resolvedPath) {
+                return true;
+            }
+
+            if (is_dir($resolvedPath) && str_starts_with($resolvedFilename, $resolvedPath.DIRECTORY_SEPARATOR)) {
+                return true;
+            }
+        }
+
+        return false;
    }
 }
--- a/src/Plugins/Parallel/Support/CompactPrinter.php
+++ b/src/Plugins/Parallel/Support/CompactPrinter.php
@ -62,12 +62,12 @@ final class CompactPrinter
    /**
     * Creates a new instance of the Compact Printer.
     */
-    public static function default(): self
+    public static function default(bool $decorated = true): self
    {
        return new self(
            terminal(),
-            new ConsoleOutput(decorated: true),
-            new Style(new ConsoleOutput(decorated: true)),
+            new ConsoleOutput(decorated: $decorated),
+            new Style(new ConsoleOutput(decorated: $decorated)),
            terminal()->width() - 4,
        );
    }
--- a/src/Plugins/Shard.php
+++ b/src/Plugins/Shard.php
@ -6,7 +6,13 @@ namespace Pest\Plugins;

 use Pest\Contracts\Plugins\AddsOutput;
 use Pest\Contracts\Plugins\HandlesArguments;
+use Pest\Contracts\Plugins\Terminable;
 use Pest\Exceptions\InvalidOption;
+use Pest\Subscribers\EnsureShardTimingFinished;
+use Pest\Subscribers\EnsureShardTimingsAreCollected;
+use Pest\Subscribers\EnsureShardTimingStarted;
+use Pest\TestSuite;
+use PHPUnit\Event;
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@ -15,7 +21,7 @@ use Symfony\Component\Process\Process;
 /**
 * @internal
 */
-final class Shard implements AddsOutput, HandlesArguments
+final class Shard implements AddsOutput, HandlesArguments, Terminable
 {
    use Concerns\HandleArguments;

@ -33,6 +39,40 @@ final class Shard implements AddsOutput, HandlesArguments
     */
    private static ?array $shard = null;

+    /**
+     * Whether to update the shards.json file.
+     */
+    private static bool $updateShards = false;
+
+    /**
+     * Whether time-balanced sharding was used.
+     */
+    private static bool $timeBalanced = false;
+
+    /**
+     * Whether the shards.json file is outdated.
+     */
+    private static bool $shardsOutdated = false;
+
+    /**
+     * Whether the test suite passed.
+     */
+    private static bool $passed = false;
+
+    /**
+     * Collected timings from workers or subscribers.
+     *
+     * @var array<string, float>|null
+     */
+    private static ?array $collectedTimings = null;
+
+    /**
+     * The canonical list of test classes from --list-tests.
+     *
+     * @var list<string>|null
+     */
+    private static ?array $knownTests = null;
+
    /**
     * Creates a new Plugin instance.
     */
@ -47,6 +87,19 @@ final class Shard implements AddsOutput, HandlesArguments
     */
    public function handleArguments(array $arguments): array
    {
+        if ($this->hasArgument('--update-shards', $arguments)) {
+            return $this->handleUpdateShards($arguments);
+        }
+
+        if (Parallel::isWorker() && Parallel::getGlobal('UPDATE_SHARDS') === true) {
+            self::$updateShards = true;
+
+            Event\Facade::instance()->registerSubscriber(new EnsureShardTimingStarted);
+            Event\Facade::instance()->registerSubscriber(new EnsureShardTimingFinished);
+
+            return $arguments;
+        }
+
        if (! $this->hasArgument('--shard', $arguments)) {
            return $arguments;
        }
@ -63,7 +116,24 @@ final class Shard implements AddsOutput, HandlesArguments

        /** @phpstan-ignore-next-line */
        $tests = $this->allTests($arguments);
-        $testsToRun = (array_chunk($tests, max(1, (int) ceil(count($tests) / $total))))[$index - 1] ?? [];
+
+        $timings = $this->loadShardsFile();
+        if ($timings !== null) {
+            $knownTests = array_values(array_filter($tests, fn (string $test): bool => isset($timings[$test])));
+            $newTests = array_values(array_diff($tests, $knownTests));
+
+            $partitions = $this->partitionByTime($knownTests, $timings, $total);
+
+            foreach ($newTests as $i => $test) {
+                $partitions[$i % $total][] = $test;
+            }
+
+            $testsToRun = $partitions[$index - 1] ?? [];
+            self::$timeBalanced = true;
+            self::$shardsOutdated = $newTests !== [];
+        } else {
+            $testsToRun = (array_chunk($tests, max(1, (int) ceil(count($tests) / $total))))[$index - 1] ?? [];
+        }

        self::$shard = [
            'index' => $index,
@ -72,9 +142,43 @@ final class Shard implements AddsOutput, HandlesArguments
            'testsCount' => count($tests),
        ];

+        if ($testsToRun === []) {
+            return $arguments;
+        }
+
        return [...$arguments, '--filter', $this->buildFilterArgument($testsToRun)];
    }

+    /**
+     * Handles the --update-shards argument.
+     *
+     * @param  array<int, string>  $arguments
+     * @return array<int, string>
+     */
+    private function handleUpdateShards(array $arguments): array
+    {
+        if ($this->hasArgument('--shard', $arguments)) {
+            throw new InvalidOption('The [--update-shards] option cannot be combined with [--shard].');
+        }
+
+        $arguments = $this->popArgument('--update-shards', $arguments);
+
+        self::$updateShards = true;
+
+        /** @phpstan-ignore-next-line */
+        self::$knownTests = $this->allTests($arguments);
+
+        if ($this->hasArgument('--parallel', $arguments) || $this->hasArgument('-p', $arguments)) {
+            Parallel::setGlobal('UPDATE_SHARDS', true);
+            Parallel::setGlobal('SHARD_RUN_ID', uniqid('pest-shard-', true));
+        } else {
+            Event\Facade::instance()->registerSubscriber(new EnsureShardTimingStarted);
+            Event\Facade::instance()->registerSubscriber(new EnsureShardTimingFinished);
+        }
+
+        return $arguments;
+    }
+
    /**
     * Returns all tests that the test suite would run.
     *
@ -87,7 +191,7 @@ final class Shard implements AddsOutput, HandlesArguments
            'php',
            ...$this->removeParallelArguments($arguments),
            '--list-tests',
-        ]))->mustRun()->getOutput();
+        ]))->setTimeout(120)->mustRun()->getOutput();

        preg_match_all('/ - (?:P\\\\)?(Tests\\\\[^:]+)::/', $output, $matches);

@ -116,6 +220,22 @@ final class Shard implements AddsOutput, HandlesArguments
     */
    public function addOutput(int $exitCode): int
    {
+        self::$passed = $exitCode === 0;
+
+        if (self::$updateShards && self::$passed && ! Parallel::isWorker()) {
+            self::$collectedTimings = $this->collectTimings();
+
+            $count = self::$knownTests !== null
+                ? count(array_intersect_key(self::$collectedTimings, array_flip(self::$knownTests)))
+                : count(self::$collectedTimings);
+
+            $this->output->writeln(sprintf(
+                '  <fg=gray>Shards:</>   <fg=default>shards.json updated with timings for %d test class%s.</>',
+                $count,
+                $count === 1 ? '' : 'es',
+            ));
+        }
+
        if (self::$shard === null) {
            return $exitCode;
        }
@ -128,17 +248,250 @@ final class Shard implements AddsOutput, HandlesArguments
        ] = self::$shard;

        $this->output->writeln(sprintf(
-            '  <fg=gray>Shard:</>    <fg=default>%d of %d</> — %d file%s ran, out of %d.',
+            '  <fg=gray>Shard:</>    <fg=default>%d of %d</> — %d file%s ran, out of %d%s.',
            $index,
            $total,
            $testsRan,
            $testsRan === 1 ? '' : 's',
            $testsCount,
+            self::$timeBalanced ? ' <fg=gray>(time-balanced)</>' : '',
        ));

+        if (self::$shardsOutdated) {
+            $this->output->writeln('  <fg=yellow;options=bold>WARN</>  <fg=default>The [tests/.pest/shards.json] file is out of date. Run [--update-shards] to update it.</>');
+        }
+
        return $exitCode;
    }

+    /**
+     * Terminates the plugin.
+     */
+    public function terminate(): void
+    {
+        if (! self::$updateShards) {
+            return;
+        }
+
+        if (Parallel::isWorker()) {
+            $this->writeWorkerTimings();
+
+            return;
+        }
+
+        if (! self::$passed) {
+            return;
+        }
+
+        $timings = self::$collectedTimings ?? $this->collectTimings();
+
+        if ($timings === []) {
+            return;
+        }
+
+        $this->writeTimings($timings);
+    }
+
+    /**
+     * Collects timings from subscribers or worker temp files.
+     *
+     * @return array<string, float>
+     */
+    private function collectTimings(): array
+    {
+        $runId = Parallel::getGlobal('SHARD_RUN_ID');
+
+        if (is_string($runId)) {
+            return $this->readWorkerTimings($runId);
+        }
+
+        return EnsureShardTimingsAreCollected::timings();
+    }
+
+    /**
+     * Writes the current worker's timing data to a temp file.
+     */
+    private function writeWorkerTimings(): void
+    {
+        $timings = EnsureShardTimingsAreCollected::timings();
+
+        if ($timings === []) {
+            return;
+        }
+
+        $runId = Parallel::getGlobal('SHARD_RUN_ID');
+
+        if (! is_string($runId)) {
+            return;
+        }
+
+        $path = sys_get_temp_dir().DIRECTORY_SEPARATOR.'__pest_sharding_'.$runId.'-'.getmypid().'.json';
+
+        file_put_contents($path, json_encode($timings, JSON_THROW_ON_ERROR));
+    }
+
+    /**
+     * Reads and merges timing data from all worker temp files.
+     *
+     * @return array<string, float>
+     */
+    private function readWorkerTimings(string $runId): array
+    {
+        $pattern = sys_get_temp_dir().DIRECTORY_SEPARATOR.'__pest_sharding_'.$runId.'-*.json';
+        $files = glob($pattern);
+
+        if ($files === false || $files === []) {
+            return [];
+        }
+
+        $merged = [];
+
+        foreach ($files as $file) {
+            $contents = file_get_contents($file);
+
+            if ($contents === false) {
+                continue;
+            }
+
+            $timings = json_decode($contents, true);
+
+            if (is_array($timings)) {
+                $merged = array_merge($merged, $timings);
+            }
+
+            unlink($file);
+        }
+
+        return $merged;
+    }
+
+    /**
+     * Returns the path to shards.json.
+     */
+    private function shardsPath(): string
+    {
+        $testSuite = TestSuite::getInstance();
+
+        return implode(DIRECTORY_SEPARATOR, [$testSuite->rootPath, $testSuite->testPath, '.pest', 'shards.json']);
+    }
+
+    /**
+     * Loads the timings from shards.json.
+     *
+     * @return array<string, float>|null
+     */
+    private function loadShardsFile(): ?array
+    {
+        $path = $this->shardsPath();
+
+        if (! file_exists($path)) {
+            return null;
+        }
+
+        $contents = file_get_contents($path);
+
+        if ($contents === false) {
+            throw new InvalidOption('The [tests/.pest/shards.json] file could not be read. Delete it or run [--update-shards] to regenerate.');
+        }
+
+        $data = json_decode($contents, true);
+
+        if (! is_array($data) || ! isset($data['timings']) || ! is_array($data['timings'])) {
+            throw new InvalidOption('The [tests/.pest/shards.json] file is corrupted. Delete it or run [--update-shards] to regenerate.');
+        }
+
+        return $data['timings'];
+    }
+
+    /**
+     * Partitions tests across shards using the LPT (Longest Processing Time) algorithm.
+     *
+     * @param  list<string>  $tests
+     * @param  array<string, float>  $timings
+     * @return list<list<string>>
+     */
+    private function partitionByTime(array $tests, array $timings, int $total): array
+    {
+        $knownTimings = array_filter(
+            array_map(fn (string $test): ?float => $timings[$test] ?? null, $tests),
+            fn (?float $t): bool => $t !== null,
+        );
+
+        $median = $knownTimings !== [] ? $this->median(array_values($knownTimings)) : 1.0;
+
+        $testsWithTimings = array_map(
+            fn (string $test): array => ['test' => $test, 'time' => $timings[$test] ?? $median],
+            $tests,
+        );
+
+        usort($testsWithTimings, fn (array $a, array $b): int => $b['time'] <=> $a['time']);
+
+        /** @var list<list<string>> */
+        $bins = array_fill(0, $total, []);
+        /** @var non-empty-list<float> */
+        $binTimes = array_fill(0, $total, 0.0);
+
+        foreach ($testsWithTimings as $item) {
+            $minIndex = array_search(min($binTimes), $binTimes, strict: true);
+            assert(is_int($minIndex));
+
+            $bins[$minIndex][] = $item['test'];
+            $binTimes[$minIndex] += $item['time'];
+        }
+
+        return $bins;
+    }
+
+    /**
+     * Calculates the median of an array of floats.
+     *
+     * @param  list<float>  $values
+     */
+    private function median(array $values): float
+    {
+        sort($values);
+
+        $count = count($values);
+        $middle = (int) floor($count / 2);
+
+        if ($count % 2 === 0) {
+            return ($values[$middle - 1] + $values[$middle]) / 2;
+        }
+
+        return $values[$middle];
+    }
+
+    /**
+     * Writes the timings to shards.json.
+     *
+     * @param  array<string, float>  $timings
+     */
+    private function writeTimings(array $timings): void
+    {
+        $path = $this->shardsPath();
+
+        $directory = dirname($path);
+        if (! is_dir($directory)) {
+            mkdir($directory, 0755, true);
+        }
+
+        if (self::$knownTests !== null) {
+            $knownSet = array_flip(self::$knownTests);
+            $timings = array_intersect_key($timings, $knownSet);
+        }
+
+        ksort($timings);
+
+        $canonical = self::$knownTests ?? array_keys($timings);
+        sort($canonical);
+
+        file_put_contents($path, json_encode([
+            'timings' => $timings,
+            'checksum' => md5(implode("\n", $canonical)),
+            'updated_at' => date('c'),
+        ], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)."\n");
+    }
+
    /**
     * Returns the shard information.
     *
--- a/src/Plugins/Snapshot.php
+++ b/src/Plugins/Snapshot.php
@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace Pest\Plugins;

 use Pest\Contracts\Plugins\HandlesArguments;
-use Pest\Exceptions\InvalidOption;
 use Pest\TestSuite;

 /**
@ -15,21 +14,116 @@ final class Snapshot implements HandlesArguments
 {
    use Concerns\HandleArguments;

+    /**
+     * Whether snapshots should be updated on this run.
+     */
+    public static bool $updateSnapshots = false;
+
    /**
     * {@inheritDoc}
     */
    public function handleArguments(array $arguments): array
    {
+        if (Parallel::isWorker() && Parallel::getGlobal('UPDATE_SNAPSHOTS') === true) {
+            self::$updateSnapshots = true;
+
+            return $arguments;
+        }
+
        if (! $this->hasArgument('--update-snapshots', $arguments)) {
            return $arguments;
        }

-        if ($this->hasArgument('--parallel', $arguments)) {
-            throw new InvalidOption('The [--update-snapshots] option is not supported when running in parallel.');
+        self::$updateSnapshots = true;
+
+        if ($this->isFullRun($arguments)) {
+            TestSuite::getInstance()->snapshots->flush();
        }

-        TestSuite::getInstance()->snapshots->flush();
+        if ($this->hasArgument('--parallel', $arguments) || $this->hasArgument('-p', $arguments)) {
+            Parallel::setGlobal('UPDATE_SNAPSHOTS', true);
+        }

        return $this->popArgument('--update-snapshots', $arguments);
    }
+
+    /**
+     * Options that take a value as the next argument (rather than via "=value").
+     *
+     * @var list<string>
+     */
+    private const array FLAGS_WITH_VALUES = [
+        '--filter',
+        '--group',
+        '--exclude-group',
+        '--test-suffix',
+        '--covers',
+        '--uses',
+        '--cache-directory',
+        '--cache-result-file',
+        '--configuration',
+        '--colors',
+        '--test-directory',
+        '--bootstrap',
+        '--order-by',
+        '--random-order-seed',
+        '--log-junit',
+        '--log-teamcity',
+        '--log-events-text',
+        '--log-events-verbose-text',
+        '--coverage-clover',
+        '--coverage-cobertura',
+        '--coverage-crap4j',
+        '--coverage-html',
+        '--coverage-php',
+        '--coverage-text',
+        '--coverage-xml',
+        '--assignee',
+        '--issue',
+        '--ticket',
+        '--pr',
+        '--pull-request',
+        '--retry',
+        '--shard',
+        '--repeat',
+    ];
+
+    /**
+     * Determines whether the command targets the entire suite (no filter, no path).
+     *
+     * @param  array<int, string>  $arguments
+     */
+    private function isFullRun(array $arguments): bool
+    {
+        if ($this->hasArgument('--filter', $arguments)) {
+            return false;
+        }
+
+        $tokens = array_slice($arguments, 1);
+        $skipNext = false;
+
+        foreach ($tokens as $arg) {
+            if ($skipNext) {
+                $skipNext = false;
+
+                continue;
+            }
+
+            if ($arg === '') {
+                continue;
+            }
+
+            if ($arg[0] === '-') {
+                if (in_array($arg, self::FLAGS_WITH_VALUES, true)) {
+                    $skipNext = true;
+                }
+
+                continue;
+            }
+
+            return false;
+        }
+
+        return true;
+    }
 }
--- a/src/Repositories/SnapshotRepository.php
+++ b/src/Repositories/SnapshotRepository.php
@ -59,8 +59,10 @@ final class SnapshotRepository
    {
        $snapshotFilename = $this->getSnapshotFilename();

-        if (! file_exists(dirname($snapshotFilename))) {
-            mkdir(dirname($snapshotFilename), 0755, true);
+        $directory = dirname($snapshotFilename);
+
+        if (! is_dir($directory)) {
+            @mkdir($directory, 0755, true);
        }

        file_put_contents($snapshotFilename, $snapshot);
--- a/src/Repositories/TestRepository.php
+++ b/src/Repositories/TestRepository.php
@ -113,6 +113,16 @@ final class TestRepository
        $this->testCaseMethodFilters[] = $filter;
    }

+    /**
+     * Gets the class and traits configured for the given directory path.
+     *
+     * @return array<int, string>
+     */
+    public function getUsesForPath(string $path): array
+    {
+        return $this->uses[$path][0] ?? [];
+    }
+
    /**
     * Gets the test case factory from the given filename.
     */
--- a/src/Subscribers/EnsureShardTimingFinished.php
+++ b/src/Subscribers/EnsureShardTimingFinished.php
@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Subscribers;
+
+use PHPUnit\Event\TestSuite\Finished;
+use PHPUnit\Event\TestSuite\FinishedSubscriber;
+
+/**
+ * @internal
+ */
+final class EnsureShardTimingFinished implements FinishedSubscriber
+{
+    /**
+     * Runs the subscriber.
+     */
+    public function notify(Finished $event): void
+    {
+        EnsureShardTimingsAreCollected::finished($event);
+    }
+}
--- a/src/Subscribers/EnsureShardTimingStarted.php
+++ b/src/Subscribers/EnsureShardTimingStarted.php
@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Subscribers;
+
+use PHPUnit\Event\TestSuite\Started;
+use PHPUnit\Event\TestSuite\StartedSubscriber;
+
+/**
+ * @internal
+ */
+final class EnsureShardTimingStarted implements StartedSubscriber
+{
+    /**
+     * Runs the subscriber.
+     */
+    public function notify(Started $event): void
+    {
+        EnsureShardTimingsAreCollected::started($event);
+    }
+}
--- a/src/Subscribers/EnsureShardTimingsAreCollected.php
+++ b/src/Subscribers/EnsureShardTimingsAreCollected.php
@ -0,0 +1,75 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Subscribers;
+
+use PHPUnit\Event\Telemetry\HRTime;
+use PHPUnit\Event\TestSuite\Finished;
+use PHPUnit\Event\TestSuite\Started;
+
+/**
+ * @internal
+ */
+final class EnsureShardTimingsAreCollected
+{
+    /**
+     * The start times for each test class.
+     *
+     * @var array<string, HRTime>
+     */
+    private static array $startTimes = [];
+
+    /**
+     * The collected timings for each test class.
+     *
+     * @var array<string, float>
+     */
+    private static array $timings = [];
+
+    /**
+     * Records the start time for a test suite.
+     */
+    public static function started(Started $event): void
+    {
+        if (! $event->testSuite()->isForTestClass()) {
+            return;
+        }
+
+        $name = preg_replace('/^P\\\\/', '', $event->testSuite()->name());
+
+        if (is_string($name)) {
+            self::$startTimes[$name] = $event->telemetryInfo()->time();
+        }
+    }
+
+    /**
+     * Records the duration for a test suite.
+     */
+    public static function finished(Finished $event): void
+    {
+        if (! $event->testSuite()->isForTestClass()) {
+            return;
+        }
+
+        $name = preg_replace('/^P\\\\/', '', $event->testSuite()->name());
+
+        if (! is_string($name) || ! isset(self::$startTimes[$name])) {
+            return;
+        }
+
+        $duration = $event->telemetryInfo()->time()->duration(self::$startTimes[$name]);
+
+        self::$timings[$name] = round($duration->asFloat(), 4);
+    }
+
+    /**
+     * Returns the collected timings.
+     *
+     * @return array<string, float>
+     */
+    public static function timings(): array
+    {
+        return self::$timings;
+    }
+}
--- a/src/Support/Backtrace.php
+++ b/src/Support/Backtrace.php
@ -23,7 +23,9 @@ final class Backtrace
        $current = null;

        foreach (debug_backtrace(self::BACKTRACE_OPTIONS) as $trace) {
-            assert(array_key_exists(self::FILE, $trace));
+            if (array_key_exists(self::FILE, $trace) === false) {
+                break;
+            }

            $traceFile = str_replace(DIRECTORY_SEPARATOR, '/', $trace[self::FILE]);

--- a/src/Support/Coverage.php
+++ b/src/Support/Coverage.php
@ -74,7 +74,7 @@ final class Coverage
     * Reports the code coverage report to the
     * console and returns the result in float.
     */
-    public static function report(OutputInterface $output, bool $compact = false): float
+    public static function report(OutputInterface $output, bool $compact = false, bool $showOnlyCovered = false): float
    {
        if (! file_exists($reportPath = self::getPath())) {
            if (self::usingXdebug()) {
@ -109,6 +109,10 @@ final class Coverage
                $basename,
            ]);

+            if ($showOnlyCovered && $file->percentageOfExecutedLines()->asFloat() === 0.0) {
+                continue;
+            }
+
            $percentage = $file->numberOfExecutableLines() === 0
                ? '100.0'
                : number_format($file->percentageOfExecutedLines()->asFloat(), 1, '.', '');
--- a/src/Support/DatasetInfo.php
+++ b/src/Support/DatasetInfo.php
@ -17,7 +17,7 @@ final class DatasetInfo

    public static function isInsideADatasetsDirectory(string $file): bool
    {
-        return basename(dirname($file)) === self::DATASETS_DIR_NAME;
+        return in_array(self::DATASETS_DIR_NAME, self::directorySegmentsInsideTestsDirectory($file), true);
    }

    public static function isADatasetsFile(string $file): bool
@ -32,7 +32,23 @@ final class DatasetInfo
        }

        if (self::isInsideADatasetsDirectory($file)) {
-            return dirname($file, 2);
+            $scope = [];
+
+            foreach (self::directorySegmentsInsideTestsDirectory($file) as $segment) {
+                if ($segment === self::DATASETS_DIR_NAME) {
+                    break;
+                }
+
+                $scope[] = $segment;
+            }
+
+            $testsDirectoryPath = self::testsDirectoryPath($file);
+
+            if ($scope === []) {
+                return $testsDirectoryPath;
+            }
+
+            return $testsDirectoryPath.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, $scope);
        }

        if (self::isADatasetsFile($file)) {
@ -41,4 +57,45 @@ final class DatasetInfo

        return $file;
    }
+
+    /**
+     * @return list<string>
+     */
+    private static function directorySegmentsInsideTestsDirectory(string $file): array
+    {
+        $directory = dirname(self::pathInsideTestsDirectory($file));
+
+        if ($directory === '.' || $directory === DIRECTORY_SEPARATOR) {
+            return [];
+        }
+
+        return array_values(array_filter(
+            explode(DIRECTORY_SEPARATOR, trim($directory, DIRECTORY_SEPARATOR)),
+            static fn (string $segment): bool => $segment !== '',
+        ));
+    }
+
+    private static function pathInsideTestsDirectory(string $file): string
+    {
+        $testsDirectory = DIRECTORY_SEPARATOR.trim(testDirectory(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
+        $position = strrpos($file, $testsDirectory);
+
+        if ($position === false) {
+            return $file;
+        }
+
+        return substr($file, $position + strlen($testsDirectory));
+    }
+
+    private static function testsDirectoryPath(string $file): string
+    {
+        $testsDirectory = DIRECTORY_SEPARATOR.trim(testDirectory(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
+        $position = strrpos($file, $testsDirectory);
+
+        if ($position === false) {
+            return dirname($file);
+        }
+
+        return substr($file, 0, $position + strlen($testsDirectory) - 1);
+    }
 }
--- a/src/Support/StateGenerator.php
+++ b/src/Support/StateGenerator.php
@ -11,6 +11,10 @@ use PHPUnit\Event\Code\TestDoxBuilder;
 use PHPUnit\Event\Code\TestMethod;
 use PHPUnit\Event\Code\ThrowableBuilder;
 use PHPUnit\Event\Test\Errored;
+use PHPUnit\Event\Test\PhpunitDeprecationTriggered;
+use PHPUnit\Event\Test\PhpunitErrorTriggered;
+use PHPUnit\Event\Test\PhpunitNoticeTriggered;
+use PHPUnit\Event\Test\PhpunitWarningTriggered;
 use PHPUnit\Event\TestData\TestDataCollection;
 use PHPUnit\Framework\SkippedWithMessageException;
 use PHPUnit\Metadata\MetadataCollection;
@ -43,6 +47,8 @@ final class StateGenerator
            ));
        }

+        $this->addTriggeredPhpunitEvents($state, $testResult->testTriggeredPhpunitErrorEvents(), TestResult::FAIL);
+
        foreach ($testResult->testMarkedIncompleteEvents() as $testResultEvent) {
            $state->add(TestResult::fromPestParallelTestCase(
                $testResultEvent->test(),
@ -99,6 +105,8 @@ final class StateGenerator
            }
        }

+        $this->addTriggeredPhpunitEvents($state, $testResult->testTriggeredPhpunitDeprecationEvents(), TestResult::DEPRECATED);
+
        foreach ($testResult->notices() as $testResultEvent) {
            foreach ($testResultEvent->triggeringTests() as $triggeringTest) {
                ['test' => $test] = $triggeringTest;
@ -123,6 +131,8 @@ final class StateGenerator
            }
        }

+        $this->addTriggeredPhpunitEvents($state, $testResult->testTriggeredPhpunitNoticeEvents(), TestResult::NOTICE);
+
        foreach ($testResult->warnings() as $testResultEvent) {
            foreach ($testResultEvent->triggeringTests() as $triggeringTest) {
                ['test' => $test] = $triggeringTest;
@ -135,6 +145,8 @@ final class StateGenerator
            }
        }

+        $this->addTriggeredPhpunitEvents($state, $testResult->testTriggeredPhpunitWarningEvents(), TestResult::WARN);
+
        foreach ($testResult->phpWarnings() as $testResultEvent) {
            foreach ($testResultEvent->triggeringTests() as $triggeringTest) {
                ['test' => $test] = $triggeringTest;
@ -165,4 +177,24 @@ final class StateGenerator

        return $state;
    }
+
+    /**
+     * @param  array<string, list<PhpunitDeprecationTriggered|PhpunitErrorTriggered|PhpunitNoticeTriggered|PhpunitWarningTriggered>>  $testResultEvents
+     */
+    private function addTriggeredPhpunitEvents(State $state, array $testResultEvents, string $type): void
+    {
+        foreach ($testResultEvents as $events) {
+            foreach ($events as $event) {
+                if (! $event->test()->isTestMethod()) {
+                    continue;
+                }
+
+                $state->add(TestResult::fromPestParallelTestCase(
+                    $event->test(),
+                    $type,
+                    ThrowableBuilder::from(new TestOutcome($event->message()))
+                ));
+            }
+        }
+    }
 }
--- a/src/TestCaseMethodFilters/FlakyTestCaseFilter.php
+++ b/src/TestCaseMethodFilters/FlakyTestCaseFilter.php
@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\TestCaseMethodFilters;
+
+use Pest\Contracts\TestCaseMethodFilter;
+use Pest\Factories\TestCaseMethodFactory;
+
+final readonly class FlakyTestCaseFilter implements TestCaseMethodFilter
+{
+    /**
+     * Filter the test case methods.
+     */
+    public function accept(TestCaseMethodFactory $factory): bool
+    {
+        return $factory->flakyTries !== null;
+    }
+}
--- a/stubs/init-laravel/Pest.php.stub
+++ b/stubs/init-laravel/Pest.php.stub
@ -10,7 +10,7 @@ use Tests\TestCase;
 |
 | The closure you provide to your test functions is always bound to a specific PHPUnit test
 | case class. By default, that class is "PHPUnit\Framework\TestCase". Of course, you may
-| need to change it using the "pest()" function to bind a different classes or traits.
+| need to change it using the "pest()" function to bind different classes or traits.
 |
 */

--- a/stubs/init/Pest.php.stub
+++ b/stubs/init/Pest.php.stub
@ -9,7 +9,7 @@ use Tests\TestCase;
 |
 | The closure you provide to your test functions is always bound to a specific PHPUnit test
 | case class. By default, that class is "PHPUnit\Framework\TestCase". Of course, you may
-| need to change it using the "pest()" function to bind a different classes or traits.
+| need to change it using the "pest()" function to bind different classes or traits.
 |
 */

--- a/tests/.pest/snapshots/Features/Expect/toMatchSnapshot/failures.snap
+++ b/tests/.pest/snapshots/Features/Expect/toMatchSnapshot/failures.snap
@ -1,7 +0,0 @@
-    <div class="container">
-        <div class="row">
-            <div class="col-md-12">
-                <h1>Snapshot</h1>
-            </div>
-        </div>
-    </div>
--- a/tests/.pest/snapshots/Features/Expect/toMatchSnapshot/failures_with_custom_message.snap
+++ b/tests/.pest/snapshots/Features/Expect/toMatchSnapshot/failures_with_custom_message.snap
@ -1,7 +0,0 @@
-    <div class="container">
-        <div class="row">
-            <div class="col-md-12">
-                <h1>Snapshot</h1>
-            </div>
-        </div>
-    </div>
--- a/tests/.pest/snapshots/Visual/Help/visual_snapshot_of_help_command_output.snap
+++ b/tests/.pest/snapshots/Visual/Help/visual_snapshot_of_help_command_output.snap
@ -1,5 +1,5 @@

-  Pest Testing Framework 4.4.4.  
+  Pest Testing Framework 4.6.1.  

  USAGE: pest <file> [options]  

@ -28,6 +28,7 @@
  --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  
+  --flaky .................... Output to standard output tests marked as flaky  
  --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)  
@ -48,6 +49,7 @@
  EXECUTION OPTIONS:
  --parallel ........................................... Run tests in parallel  
  --update-snapshots  Update snapshots for tests using the "toMatchSnapshot" expectation  
+  --update-shards  Update shards.json with test timing data for time-balanced sharding  
  --globals-backup ................. Backup and restore $GLOBALS for each test  
  --static-backup ......... Backup and restore static properties for each test  
  --strict-coverage ................... Be strict about code coverage metadata  
@ -89,7 +91,11 @@
  --cache-result ............................ Write test results to cache file  
  --do-not-cache-result .............. Do not write test results to cache file  
  --order-by [order]  Run tests in order: default|defects|depends|duration|no-depends|random|reverse|size  
+  --resolve-dependencies ...................... Alias for "--order-by depends"  
+  --ignore-dependencies .................... Alias for "--order-by no-depends"  
+  --random-order ............................... Alias for "--order-by random"  
  --random-order-seed [N]  Use the specified random seed when running tests in random order  
+  --reverse-order ............................. Alias for "--order-by reverse"  

  REPORTING OPTIONS:
  --colors=[flag] ......... Use colors in output ("never", "auto" or "always")  
@ -130,6 +136,8 @@
  CODE COVERAGE OPTIONS:
  --coverage ..... Generate code coverage report and output to standard output  
  --coverage --min  Set the minimum required coverage percentage, and fail if not met  
+  --coverage --exactly  Set the exact required coverage percentage, and fail if not met  
+  --coverage --only-covered  Hide files with 0% coverage from the code coverage report  
  --coverage-clover [file]  Write code coverage report in Clover XML format to file  
  --coverage-openclover [file]  Write code coverage report in OpenClover XML format to file  
  --coverage-cobertura [file]  Write code coverage report in Cobertura XML format to file  
@ -147,6 +155,9 @@
  --disable-coverage-ignore ...... Disable metadata for ignoring code coverage  
  --no-coverage  Ignore code coverage reporting configured in the XML configuration file  

+  AI OPTIONS:
+  --ai ..... Run a code snippet as a fully scaffolded test for AI verification  
+
  MUTATION TESTING OPTIONS:
  --mutate .... Runs mutation testing, to understand the quality of your tests  
  --mutate --parallel ...................... Runs mutation testing in parallel  
--- a/tests/.pest/snapshots/Visual/Todo/todo.snap
+++ b/tests/.pest/snapshots/Visual/Todo/todo.snap
@ -15,6 +15,9 @@
  ↓ todo on describe → should not fail
  ↓ todo on describe → should run

+   TODO  Tests\Features\Flaky - 1 todo
+  ↓ it does not retry todo tests
+
   TODO  Tests\Features\Todo - 29 todos
  ↓ something todo later
  ↓ something todo later chained
@ -81,6 +84,6 @@
   PASS  Tests\CustomTestCase\ParentTest
  ✓ override method

-  Tests:    39 todos, 3 passed (21 assertions)
+  Tests:    40 todos, 3 passed (21 assertions)
  Duration: x.xxs

--- a/tests/.pest/snapshots/Visual/Todo/todo_in_parallel.snap
+++ b/tests/.pest/snapshots/Visual/Todo/todo_in_parallel.snap
@ -15,6 +15,9 @@
  ↓ todo on describe → should not fail
  ↓ todo on describe → should run

+   TODO  Tests\Features\Flaky - 1 todo
+  ↓ it does not retry todo tests
+
   TODO  Tests\Features\Todo - 29 todos
  ↓ something todo later
  ↓ something todo later chained
@ -81,6 +84,6 @@
   PASS  Tests\CustomTestCase\ParentTest
  ✓ override method

-  Tests:    39 todos, 3 passed (21 assertions)
+  Tests:    40 todos, 3 passed (21 assertions)
  Duration: x.xxs

--- a/tests/.pest/snapshots/Visual/Todo/todos.snap
+++ b/tests/.pest/snapshots/Visual/Todo/todos.snap
@ -15,6 +15,9 @@
  ↓ todo on describe → should not fail
  ↓ todo on describe → should run

+   TODO  Tests\Features\Flaky - 1 todo
+  ↓ it does not retry todo tests
+
   TODO  Tests\Features\Todo - 29 todos
  ↓ something todo later
  ↓ something todo later chained
@ -81,6 +84,6 @@
   PASS  Tests\CustomTestCase\ParentTest
  ✓ override method

-  Tests:    39 todos, 3 passed (21 assertions)
+  Tests:    40 todos, 3 passed (21 assertions)
  Duration: x.xxs

--- a/tests/.pest/snapshots/Visual/Todo/todos_in_parallel.snap
+++ b/tests/.pest/snapshots/Visual/Todo/todos_in_parallel.snap
@ -15,6 +15,9 @@
  ↓ todo on describe → should not fail
  ↓ todo on describe → should run

+   TODO  Tests\Features\Flaky - 1 todo
+  ↓ it does not retry todo tests
+
   TODO  Tests\Features\Todo - 29 todos
  ↓ something todo later
  ↓ something todo later chained
@ -81,6 +84,6 @@
   PASS  Tests\CustomTestCase\ParentTest
  ✓ override method

-  Tests:    39 todos, 3 passed (21 assertions)
+  Tests:    40 todos, 3 passed (21 assertions)
  Duration: x.xxs

--- a/tests/.pest/snapshots/Visual/Version/visual_snapshot_of_help_command_output.snap
+++ b/tests/.pest/snapshots/Visual/Version/visual_snapshot_of_help_command_output.snap
@ -1,3 +1,3 @@

-  Pest Testing Framework 4.4.4.  
+  Pest Testing Framework 4.6.1.  

--- a/tests/.snapshots/success.txt
+++ b/tests/.snapshots/success.txt
@ -95,6 +95,48 @@
   PASS  Tests\Features\Covers\TraitCoverage
  ✓ it uses the correct PHPUnit attribute for trait

+   PASS  Tests\Features\DatasetMethodChaining
+  ✓ beforeEach()->with() applies dataset to tests → receives the dataset value with (10)
+  ✓ beforeEach()->with() applies dataset to tests → it also receives the dataset value in it() with (10)
+  ✓ beforeEach()->with() with multiple dataset values → receives each value from the dataset with (1)
+  ✓ beforeEach()->with() with multiple dataset values → receives each value from the dataset with (2)
+  ✓ beforeEach()->with() with multiple dataset values → receives each value from the dataset with (3)
+  ✓ beforeEach()->with() with keyed dataset → receives keyed dataset values with dataset "first"
+  ✓ beforeEach()->with() with keyed dataset → receives keyed dataset values with dataset "second"
+  ✓ beforeEach()->with() with closure dataset → receives values from closure dataset with (100)
+  ✓ beforeEach()->with() with closure dataset → receives values from closure dataset with (200)
+  ✓ describe()->with() passes dataset to tests → receives the dataset value with (42)
+  ✓ describe()->with() passes dataset to tests → it also receives it in it() with (42)
+  ✓ describe()->with() with multiple values → receives each value with (5)
+  ✓ describe()->with() with multiple values → receives each value with (10)
+  ✓ describe()->with() with multiple values → receives each value with (15)
+  ✓ describe()->with() with keyed dataset → receives keyed values with dataset "alpha"
+  ✓ describe()->with() with keyed dataset → receives keyed values with dataset "beta"
+  ✓ describe()->with() with closure dataset → receives closure dataset values with (7)
+  ✓ describe()->with() with closure dataset → receives closure dataset values with (14)
+  ✓ outer with dataset → inner without dataset → inherits outer dataset with (1)
+  ✓ nested describe blocks with datasets at multiple levels → level 1 → receives level 1 dataset with (10)
+  ✓ nested describe blocks with datasets at multiple levels → level 1 → level 2 → receives datasets from all ancestor levels with (10) / (20)
+  ✓ deeply nested describe with datasets → a → b → c → receives all ancestor datasets with (1) / (2) / (3)
+  ✓ beforeEach()->with() combined with test->with() → receives both datasets as cross product with (10) / (1)
+  ✓ beforeEach()->with() combined with test->with() → receives both datasets as cross product with (10) / (2)
+  ✓ describe()->with() combined with test->with() → receives both datasets with (5) / (50)
+  ✓ describe()->with() combined with test->with() → receives both datasets with (5) / (60)
+  ✓ beforeEach closure and beforeEach()->with() coexist → has both the closure state and dataset with (99)
+  ✓ beforeEach()->with() does not interfere with closure hooks → closures run in order and dataset is applied with (42)
+  ✓ first describe with dataset → gets its own dataset with (111)
+  ✓ second describe with different dataset → gets its own dataset, not the sibling with (222)
+  ✓ third describe without dataset → has no dataset leaking from siblings
+  ✓ describe()->with() with beforeEach closure → both hook and dataset work with (77)
+  ✓ describe()->with() with afterEach closure → dataset is available and afterEach runs with (88)
+  ✓ multiple tests share the same beforeEach dataset → first test gets the dataset with (33)
+  ✓ multiple tests share the same beforeEach dataset → second test also gets the dataset with (33)
+  ✓ multiple tests share the same beforeEach dataset → it third test with it() also gets the dataset with (33)
+  ✓ outer describe → inner describe with dataset on hook → inherits outer beforeEach and has inner dataset with (55)
+  ✓ outer describe → outer test is unaffected by inner dataset
+  ✓ describe()->with() preserves depends → first with (9)
+  ✓ describe()->with() preserves depends → second with (9)
+
   PASS  Tests\Features\DatasetsTests - 1 todo
  ✓ it throws exception if dataset does not exist
  ✓ it throws exception if dataset already exist
@ -215,6 +257,20 @@
  ✓ it may be used with high order after describe block with dataset "formal"
  ✓ it may be used with high order after describe block with dataset "informal"
  ✓ after describe block with named dataset with ('after')
+  ✓ named parameters match by parameter name with ('Taylor', 'taylor@laravel.com')
+  ✓ named parameters work with multiple dataset items with ('Taylor', 'taylor@laravel.com')
+  ✓ named parameters work with multiple dataset items with ('James', 'james@laravel.com')
+  ✓ named parameters work in different order than closure params with ('a', 'b', 'c')
+  ✓ named parameters work with named dataset keys with dataset "taylor"
+  ✓ named parameters work with named dataset keys with dataset "james"
+  ✓ named parameters work with closures that should be resolved with (Closure Object (), Closure Object ())
+  ✓ named parameters work with closure type hints with ('Taylor', Closure Object ())
+  ✓ named parameters work with registered datasets with ('Taylor', 'taylor@laravel.com')
+  ✓ named parameters work with registered datasets with ('James', 'james@laravel.com')
+  ✓ named parameters work with bound closure returning associative array with (Closure Object ())
+  ✓ dataset items can mix named and sequential styles with ('Taylor', 'taylor@laravel.com')
+  ✓ dataset items can mix named and sequential styles with ('James', 'james@laravel.com') #1
+  ✓ dataset items can mix named and sequential styles with ('James', 'james@laravel.com') #2

   PASS  Tests\Features\Depends
  ✓ first
@ -448,6 +504,10 @@
  ✓ failures with custom message
  ✓ not failures

+   PASS  Tests\Features\Expect\toBeCasedCorrectly
+  ✓ pass
+  ✓ failure
+
   PASS  Tests\Features\Expect\toBeDigits
  ✓ pass
  ✓ failures
@ -977,8 +1037,6 @@
  ✓ pass with toArray
  ✓ pass with array
  ✓ pass with toSnapshot
-  ✓ failures
-  ✓ failures with custom message
  ✓ not failures
  ✓ multiple snapshot expectations
  ✓ multiple snapshot expectations with datasets with (1)
@ -1034,6 +1092,10 @@
  ✓ pass
  ✓ failures
  ✓ not failures
+  ✓ trait inheritance - direct usage
+  ✓ trait inheritance - inherited usage
+  ✓ trait inheritance - negative case
+  ✓ nested trait inheritance

   PASS  Tests\Features\Expect\unless
  ✓ it pass
@ -1065,6 +1127,40 @@
  ✓ it may return a file path
  ✓ it may throw an exception if the file does not exist

+   WARN  Tests\Features\Flaky - 1 todo
+  ✓ it passes on first try
+  ✓ it passes on a subsequent try
+  ✓ it has a default of 3 tries
+  ✓ it succeeds on the last possible try
+  ✓ it works with tries of 1
+  ✓ it retries assertion failures
+  ✓ it works with a dataset with (1)
+  ✓ it works with a dataset with (2)
+  ✓ it works with a dataset with (3)
+  ✓ it retries each dataset independently with ('alpha')
+  ✓ it retries each dataset independently with ('beta')
+  ✓ within a describe block → it retries inside describe
+  ✓ lifecycle hooks with flaky → it re-runs beforeEach on each retry
+  ✓ afterEach with flaky → it runs afterEach between retries
+  - it does not retry skipped tests → intentionally skipped
+  ✓ it works with repeat and flaky @ repetition 1 of 2
+  ✓ it works with repeat and flaky @ repetition 2 of 2
+  ✓ it works as higher order test
+  ✓ it fails after exhausting all retries
+  ✓ it throws when tries is less than 1
+  ✓ it throws when tries is negative
+  ↓ it does not retry todo tests
+  ✓ it retries php errors
+  ✓ it works with throws and flaky
+  ✓ it does not retry expected exceptions
+  ✓ it does not retry fails()
+  ✓ it retries unexpected exceptions even with throws set
+  ✓ it does not leak mock objects between retries
+  ✓ it does not stop retrying when snapshot changes are absent
+  ✓ it does not leak dynamic properties between retries
+  ✓ it clears output buffer between retries when expectOutputString is used
+  ✓ it preserves output between retries when no output expectation is set
+
   WARN  Tests\Features\Helpers
  ✓ it can set/get properties on $this
  ! it gets null if property do not exist → Undefined property Tests\Features\Helpers::$wqdwqdqw
@ -1490,6 +1586,10 @@
   PASS  Tests\Fixtures\ExampleTest
  ✓ it example 2

+   PASS  Tests\Fixtures\ParallelNestedDatasets\TestFileWithNestedDataset
+  ✓ loads nested dataset with ('alice')
+  ✓ loads nested dataset with ('bob')
+
   WARN  Tests\Fixtures\UnexpectedOutput
  - output

@ -1640,9 +1740,14 @@
  ✓ it cannot resolve a parameter without type

   PASS  Tests\Unit\Support\DatasetInfo
-  ✓ it can check if dataset is defined inside a Datasets directory with ('/var/www/project/tests/Datase…rs.php', true)
+  ✓ it can check if dataset is defined inside a Datasets directory with ('/var/www/Datasets/project/tes…rs.php', true) #1
+  ✓ it can check if dataset is defined inside a Datasets directory with ('/var/www/Datasets/project/tes…rs.php', true) #2
+  ✓ it can check if dataset is defined inside a Datasets directory with ('/var/www/project/tests/Datase…rs.php', true) #1
+  ✓ it can check if dataset is defined inside a Datasets directory with ('/var/www/project/tests/Datase…rs.php', true) #2
  ✓ it can check if dataset is defined inside a Datasets directory with ('/var/www/project/tests/Datasets.php', false)
-  ✓ it can check if dataset is defined inside a Datasets directory with ('/var/www/project/tests/Featur…rs.php', true)
+  ✓ it can check if dataset is defined inside a Datasets directory with ('/var/www/project/tests/Featur…rs.php', true) #1
+  ✓ it can check if dataset is defined inside a Datasets directory with ('/var/www/project/tests/Featur…rs.php', true) #2
+  ✓ it can check if dataset is defined inside a Datasets directory with ('/var/www/project/tests/Featur…rs.php', true) #3
  ✓ it can check if dataset is defined inside a Datasets directory with ('/var/www/project/tests/Featur…rs.php', false)
  ✓ it can check if dataset is defined inside a Datasets directory with ('/var/www/project/tests/Featur…ts.php', false)
  ✓ it can check if dataset is defined inside a Datasets.php file with ('/var/www/project/tests/Datase…rs.php', false)
@ -1650,12 +1755,18 @@
  ✓ it can check if dataset is defined inside a Datasets.php file with ('/var/www/project/tests/Featur…rs.php', false) #1
  ✓ it can check if dataset is defined inside a Datasets.php file with ('/var/www/project/tests/Featur…rs.php', false) #2
  ✓ it can check if dataset is defined inside a Datasets.php file with ('/var/www/project/tests/Featur…ts.php', true)
-  ✓ it computes the dataset scope with ('/var/www/project/tests/Datase…rs.php', '/var/www/project/tests')
+  ✓ it computes the dataset scope with ('/var/www/Datasets/project/tes…rs.php', '/var/www/Datasets/project/tests')
+  ✓ it computes the dataset scope with ('/var/www/Datasets/project/tes…rs.php', '/var/www/Datasets/project/tes…atures')
+  ✓ it computes the dataset scope with ('/var/www/project/tests/Datase…rs.php', '/var/www/project/tests') #1
+  ✓ it computes the dataset scope with ('/var/www/project/tests/Datase…rs.php', '/var/www/project/tests') #2
  ✓ it computes the dataset scope with ('/var/www/project/tests/Datasets.php', '/var/www/project/tests')
-  ✓ it computes the dataset scope with ('/var/www/project/tests/Featur…rs.php', '/var/www/project/tests/Features')
+  ✓ it computes the dataset scope with ('/var/www/project/tests/Featur…rs.php', '/var/www/project/tests/Features') #1
+  ✓ it computes the dataset scope with ('/var/www/project/tests/Featur…rs.php', '/var/www/project/tests/Features') #2
  ✓ it computes the dataset scope with ('/var/www/project/tests/Featur…rs.php', '/var/www/project/tests/Featur…rs.php') #1
  ✓ it computes the dataset scope with ('/var/www/project/tests/Featur…ts.php', '/var/www/project/tests/Features')
-  ✓ it computes the dataset scope with ('/var/www/project/tests/Featur…rs.php', '/var/www/project/tests/Featur…ollers')
+  ✓ it computes the dataset scope with ('/var/www/project/tests/Featur…rs.php', '/var/www/project/tests/Featur…ollers') #1
+  ✓ it computes the dataset scope with ('/var/www/project/tests/Featur…rs.php', '/var/www/project/tests/Featur…ollers') #2
+  ✓ it computes the dataset scope with ('/var/www/project/tests/Featur…rs.php', '/var/www/project/tests/Features') #3
  ✓ it computes the dataset scope with ('/var/www/project/tests/Featur…rs.php', '/var/www/project/tests/Featur…rs.php') #2
  ✓ it computes the dataset scope with ('/var/www/project/tests/Featur…ts.php', '/var/www/project/tests/Featur…ollers')

@ -1749,13 +1860,17 @@
   PASS  Tests\Visual\Help
  ✓ visual snapshot of help command output

-   WARN  Tests\Visual\JUnit
+   PASS  Tests\Visual\JUnit
  ✓ junit output
-  - junit with parallel → Not working yet
+  ✓ junit with parallel

   PASS  Tests\Visual\Parallel
  ✓ parallel
  ✓ a parallel test can extend another test with same name
+  ✓ parallel reports invalid datasets as failures
+
+   PASS  Tests\Visual\ParallelNestedDatasets
+  ✓ parallel loads nested datasets from nested directories

   PASS  Tests\Visual\SingleTestOrDirectory
  ✓ allows to run a single test
@ -1775,6 +1890,10 @@
  - todo
  - todo in parallel

+   PASS  Tests\Visual\UnicodeFilename
+  ✓ filter works with unicode characters in filename
+  ✓ filter with unicode regex matches unicode filename
+
   WARN  Tests\Visual\Version
  - visual snapshot of help command output

@ -1782,4 +1901,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 (2813 assertions)
+  Tests:    2 deprecated, 4 warnings, 5 incomplete, 2 notices, 40 todos, 35 skipped, 1294 passed (2971 assertions)
--- a/tests/.tests/FlakyFailure.php
+++ b/tests/.tests/FlakyFailure.php
@ -0,0 +1,5 @@
+<?php
+
+it('fails after exhausting all retries', function () {
+    throw new Exception('Always fails');
+})->flaky(tries: 2);
--- a/tests/.tests/ParallelInvalidDataset/MissingDatasetTest.php
+++ b/tests/.tests/ParallelInvalidDataset/MissingDatasetTest.php
@ -0,0 +1,5 @@
+<?php
+
+test('missing dataset', function (string $value) {
+    expect($value)->toBe('x');
+})->with('missing.dataset');
--- a/tests/.tests/ParallelInvalidDataset/PassingTest.php
+++ b/tests/.tests/ParallelInvalidDataset/PassingTest.php
@ -0,0 +1,3 @@
+<?php
+
+it('passes')->assertTrue(true);
--- a/tests/.tests/StraßenTest.php
+++ b/tests/.tests/StraßenTest.php
@ -0,0 +1,3 @@
+<?php
+
+it('tests unicode filename with ß')->assertTrue(true);
--- a/tests/Arch.php
+++ b/tests/Arch.php
@ -17,7 +17,9 @@ arch()->preset()->security()->ignoring([
    'eval',
    'str_shuffle',
    'exec',
+    'md5',
    'unserialize',
+    'uniqid',
    'extract',
    'assert',
 ]);
--- a/tests/Features/DatasetMethodChaining.php
+++ b/tests/Features/DatasetMethodChaining.php
@ -0,0 +1,287 @@
+<?php
+
+/**
+ * Tests for dataset method chaining with hooks and describe blocks.
+ *
+ * Covers the fix from PR #1565: beforeEach()->with(), describe()->with(),
+ * and nested describe blocks with datasets.
+ */
+
+// ---------------------------------------------------------------
+// beforeEach()->with() inside describe blocks
+// ---------------------------------------------------------------
+
+describe('beforeEach()->with() applies dataset to tests', function () {
+    beforeEach()->with([10]);
+
+    test('receives the dataset value', function ($value) {
+        expect($value)->toBe(10);
+    });
+
+    it('also receives the dataset value in it()', function ($value) {
+        expect($value)->toBe(10);
+    });
+});
+
+describe('beforeEach()->with() with multiple dataset values', function () {
+    beforeEach()->with([1, 2, 3]);
+
+    test('receives each value from the dataset', function ($value) {
+        expect($value)->toBeIn([1, 2, 3]);
+    });
+});
+
+describe('beforeEach()->with() with keyed dataset', function () {
+    beforeEach()->with(['first' => [10], 'second' => [20]]);
+
+    test('receives keyed dataset values', function ($value) {
+        expect($value)->toBeIn([10, 20]);
+    });
+});
+
+describe('beforeEach()->with() with closure dataset', function () {
+    beforeEach()->with(function () {
+        yield [100];
+        yield [200];
+    });
+
+    test('receives values from closure dataset', function ($value) {
+        expect($value)->toBeIn([100, 200]);
+    });
+});
+
+// ---------------------------------------------------------------
+// describe()->with() method chaining
+// ---------------------------------------------------------------
+
+describe('describe()->with() passes dataset to tests', function () {
+    test('receives the dataset value', function ($value) {
+        expect($value)->toBe(42);
+    });
+
+    it('also receives it in it()', function ($value) {
+        expect($value)->toBe(42);
+    });
+})->with([42]);
+
+describe('describe()->with() with multiple values', function () {
+    test('receives each value', function ($value) {
+        expect($value)->toBeIn([5, 10, 15]);
+    });
+})->with([5, 10, 15]);
+
+describe('describe()->with() with keyed dataset', function () {
+    test('receives keyed values', function ($value) {
+        expect($value)->toBeIn([100, 200]);
+    });
+})->with(['alpha' => [100], 'beta' => [200]]);
+
+describe('describe()->with() with closure dataset', function () {
+    test('receives closure dataset values', function ($value) {
+        expect($value)->toBeIn([7, 14]);
+    });
+})->with(function () {
+    yield [7];
+    yield [14];
+});
+
+// ---------------------------------------------------------------
+// Nested describe blocks with datasets
+// ---------------------------------------------------------------
+
+describe('outer with dataset', function () {
+    describe('inner without dataset', function () {
+        test('inherits outer dataset', function (...$args) {
+            expect($args)->toBe([1]);
+        });
+    });
+})->with([1]);
+
+describe('nested describe blocks with datasets at multiple levels', function () {
+    describe('level 1', function () {
+        test('receives level 1 dataset', function (...$args) {
+            expect($args)->toBe([10]);
+        });
+
+        describe('level 2', function () {
+            test('receives datasets from all ancestor levels', function (...$args) {
+                expect($args)->toBe([10, 20]);
+            });
+        })->with([20]);
+    })->with([10]);
+});
+
+describe('deeply nested describe with datasets', function () {
+    describe('a', function () {
+        describe('b', function () {
+            describe('c', function () {
+                test('receives all ancestor datasets', function (...$args) {
+                    expect($args)->toBe([1, 2, 3]);
+                });
+            })->with([3]);
+        })->with([2]);
+    })->with([1]);
+});
+
+// ---------------------------------------------------------------
+// Combining hook datasets with test-level datasets
+// ---------------------------------------------------------------
+
+describe('beforeEach()->with() combined with test->with()', function () {
+    beforeEach()->with([10]);
+
+    test('receives both datasets as cross product', function ($hookValue, $testValue) {
+        expect($hookValue)->toBe(10);
+        expect($testValue)->toBeIn([1, 2]);
+    })->with([1, 2]);
+});
+
+describe('describe()->with() combined with test->with()', function () {
+    test('receives both datasets', function ($describeValue, $testValue) {
+        expect($describeValue)->toBe(5);
+        expect($testValue)->toBeIn([50, 60]);
+    })->with([50, 60]);
+})->with([5]);
+
+// ---------------------------------------------------------------
+// beforeEach()->with() combined with beforeEach closure
+// ---------------------------------------------------------------
+
+describe('beforeEach closure and beforeEach()->with() coexist', function () {
+    beforeEach(function () {
+        $this->setupValue = 'initialized';
+    });
+
+    beforeEach()->with([99]);
+
+    test('has both the closure state and dataset', function ($value) {
+        expect($this->setupValue)->toBe('initialized');
+        expect($value)->toBe(99);
+    });
+});
+
+describe('beforeEach()->with() does not interfere with closure hooks', function () {
+    beforeEach(function () {
+        $this->counter = 1;
+    });
+
+    beforeEach(function () {
+        $this->counter++;
+    });
+
+    beforeEach()->with([42]);
+
+    test('closures run in order and dataset is applied', function ($value) {
+        expect($this->counter)->toBe(2);
+        expect($value)->toBe(42);
+    });
+});
+
+// ---------------------------------------------------------------
+// Dataset isolation between describe blocks
+// ---------------------------------------------------------------
+
+describe('first describe with dataset', function () {
+    beforeEach()->with([111]);
+
+    test('gets its own dataset', function ($value) {
+        expect($value)->toBe(111);
+    });
+});
+
+describe('second describe with different dataset', function () {
+    beforeEach()->with([222]);
+
+    test('gets its own dataset, not the sibling', function ($value) {
+        expect($value)->toBe(222);
+    });
+});
+
+describe('third describe without dataset', function () {
+    test('has no dataset leaking from siblings', function () {
+        expect(true)->toBeTrue();
+    });
+});
+
+// ---------------------------------------------------------------
+// describe()->with() combined with beforeEach hooks
+// ---------------------------------------------------------------
+
+describe('describe()->with() with beforeEach closure', function () {
+    beforeEach(function () {
+        $this->hookRan = true;
+    });
+
+    test('both hook and dataset work', function ($value) {
+        expect($this->hookRan)->toBeTrue();
+        expect($value)->toBe(77);
+    });
+})->with([77]);
+
+describe('describe()->with() with afterEach closure', function () {
+    afterEach(function () {
+        expect($this->value)->toBe(88);
+    });
+
+    test('dataset is available and afterEach runs', function ($value) {
+        $this->value = $value;
+        expect($value)->toBe(88);
+    });
+})->with([88]);
+
+// ---------------------------------------------------------------
+// Multiple tests in a describe with beforeEach()->with()
+// ---------------------------------------------------------------
+
+describe('multiple tests share the same beforeEach dataset', function () {
+    beforeEach()->with([33]);
+
+    test('first test gets the dataset', function ($value) {
+        expect($value)->toBe(33);
+    });
+
+    test('second test also gets the dataset', function ($value) {
+        expect($value)->toBe(33);
+    });
+
+    it('third test with it() also gets the dataset', function ($value) {
+        expect($value)->toBe(33);
+    });
+});
+
+// ---------------------------------------------------------------
+// Nested describe with beforeEach()->with() at inner level
+// ---------------------------------------------------------------
+
+describe('outer describe', function () {
+    beforeEach(function () {
+        $this->outer = true;
+    });
+
+    describe('inner describe with dataset on hook', function () {
+        beforeEach()->with([55]);
+
+        test('inherits outer beforeEach and has inner dataset', function ($value) {
+            expect($this->outer)->toBeTrue();
+            expect($value)->toBe(55);
+        });
+    });
+
+    test('outer test is unaffected by inner dataset', function () {
+        expect($this->outer)->toBeTrue();
+    });
+});
+
+// ---------------------------------------------------------------
+// describe()->with() with depends
+// ---------------------------------------------------------------
+
+describe('describe()->with() preserves depends', function () {
+    test('first', function ($value) {
+        expect($value)->toBe(9);
+    });
+
+    test('second', function ($value) {
+        expect($value)->toBe(9);
+    })->depends('first');
+})->with([9]);
--- a/tests/Features/DatasetsTests.php
+++ b/tests/Features/DatasetsTests.php
@ -457,3 +457,88 @@ dataset('after-describe', ['after']);
 test('after describe block with named dataset', function (...$args) {
    expect($args)->toBe(['after']);
 })->with('after-describe');
+
+test('named parameters match by parameter name', function (string $email, string $name) {
+    expect($name)->toBe('Taylor');
+    expect($email)->toBe('taylor@laravel.com');
+})->with([
+    ['name' => 'Taylor', 'email' => 'taylor@laravel.com'],
+]);
+
+test('named parameters work with multiple dataset items', function (string $email, string $name) {
+    expect($name)->toBeString();
+    expect($email)->toContain('@');
+})->with([
+    ['name' => 'Taylor', 'email' => 'taylor@laravel.com'],
+    ['name' => 'James', 'email' => 'james@laravel.com'],
+]);
+
+test('named parameters work in different order than closure params', function (string $third, string $first, string $second) {
+    expect($first)->toBe('a');
+    expect($second)->toBe('b');
+    expect($third)->toBe('c');
+})->with([
+    ['first' => 'a', 'second' => 'b', 'third' => 'c'],
+]);
+
+test('named parameters work with named dataset keys', function (string $email, string $name) {
+    expect($name)->toBeString();
+    expect($email)->toContain('@');
+})->with([
+    'taylor' => ['name' => 'Taylor', 'email' => 'taylor@laravel.com'],
+    'james' => ['name' => 'James', 'email' => 'james@laravel.com'],
+]);
+
+test('named parameters work with closures that should be resolved', function (string $email, string $name) {
+    expect($name)->toBe('bar');
+    expect($email)->toBe('bar@example.com');
+})->with([
+    [
+        'name' => function () {
+            return $this->foo;
+        },
+        'email' => function () {
+            return $this->foo.'@example.com';
+        },
+    ],
+]);
+
+test('named parameters work with closure type hints', function (Closure $callback, string $name) {
+    expect($name)->toBe('Taylor');
+    expect($callback())->toBe('resolved');
+})->with([
+    [
+        'name' => 'Taylor',
+        'callback' => function () {
+            return 'resolved';
+        },
+    ],
+]);
+
+dataset('named-params-dataset', [
+    ['name' => 'Taylor', 'email' => 'taylor@laravel.com'],
+    ['name' => 'James', 'email' => 'james@laravel.com'],
+]);
+
+test('named parameters work with registered datasets', function (string $email, string $name) {
+    expect($name)->toBeString();
+    expect($email)->toContain('@');
+})->with('named-params-dataset');
+
+test('named parameters work with bound closure returning associative array', function (string $email, string $name) {
+    expect($name)->toBe('bar');
+    expect($email)->toBe('test@example.com');
+})->with([
+    function () {
+        return ['name' => $this->foo, 'email' => 'test@example.com'];
+    },
+]);
+
+test('dataset items can mix named and sequential styles', function (string $name, string $email) {
+    expect($name)->toBeString();
+    expect($email)->toContain('@');
+})->with([
+    ['name' => 'Taylor', 'email' => 'taylor@laravel.com'],
+    ['James', 'james@laravel.com'],
+    ['James', 'email' => 'james@laravel.com'],
+]);
--- a/tests/Features/Expect/toBeCasedCorrectly.php
+++ b/tests/Features/Expect/toBeCasedCorrectly.php
@ -0,0 +1,12 @@
+<?php
+
+use Pest\Arch\Exceptions\ArchExpectationFailedException;
+
+test('pass')
+    ->expect('Tests\Fixtures\Arch\ToBeCasedCorrectly\CorrectCasing')
+    ->toBeCasedCorrectly();
+
+test('failure')
+    ->expect('Tests\Fixtures\Arch\ToBeCasedCorrectly\IncorrectCasing')
+    ->toBeCasedCorrectly()
+    ->throws(ArchExpectationFailedException::class);
--- a/tests/Features/Expect/toMatchSnapshot.php
+++ b/tests/Features/Expect/toMatchSnapshot.php
@ -134,18 +134,6 @@ test('pass with `toSnapshot`', function () {
    expect($object)->toMatchSnapshot();
 });

-test('failures', function () {
-    TestSuite::getInstance()->snapshots->save($this->snapshotable);
-
-    expect('contain that does not match snapshot')->toMatchSnapshot();
-})->throws(ExpectationFailedException::class, 'Failed asserting that two strings are identical.');
-
-test('failures with custom message', function () {
-    TestSuite::getInstance()->snapshots->save($this->snapshotable);
-
-    expect('contain that does not match snapshot')->toMatchSnapshot('oh no');
-})->throws(ExpectationFailedException::class, 'oh no');
-
 test('not failures', function () {
    TestSuite::getInstance()->snapshots->save($this->snapshotable);

--- a/tests/Features/Expect/toUseTrait.php
+++ b/tests/Features/Expect/toUseTrait.php
@ -14,3 +14,19 @@ test('failures', function () {
 test('not failures', function () {
    expect('Pest\Expectations\HigherOrderExpectation')->not->toUseTrait('Pest\Concerns\Retrievable');
 })->throws(ArchExpectationFailedException::class);
+
+test('trait inheritance - direct usage', function () {
+    expect('Tests\Fixtures\Arch\ToUseTrait\HasTrait\ParentClassWithTrait')->toUseTrait('Tests\Fixtures\Arch\ToUseTrait\HasTrait\TestTraitForInheritance');
+});
+
+test('trait inheritance - inherited usage', function () {
+    expect('Tests\Fixtures\Arch\ToUseTrait\HasInheritedTrait\ChildClassExtendingParent')->toUseTrait('Tests\Fixtures\Arch\ToUseTrait\HasTrait\TestTraitForInheritance');
+});
+
+test('trait inheritance - negative case', function () {
+    expect('Tests\Fixtures\Arch\ToUseTrait\HasInheritedTrait\ChildClassExtendingParent')->not->toUseTrait('NonExistentTrait');
+});
+
+test('nested trait inheritance', function () {
+    expect('Tests\Fixtures\Arch\ToUseTrait\HasInheritedTrait\ChildClassExtendingParent')->toUseTrait('Tests\Fixtures\Arch\ToUseTrait\HasNestedTrait\NestedTrait');
+});
--- a/tests/Features/Flaky.php
+++ b/tests/Features/Flaky.php
@ -0,0 +1,300 @@
+<?php
+
+use Symfony\Component\Process\Process;
+
+it('passes on first try', function () {
+    expect(true)->toBeTrue();
+})->flaky();
+
+it('passes on a subsequent try', function () {
+    $file = sys_get_temp_dir().'/pest_flaky_'.crc32(__FILE__.__LINE__);
+    $count = file_exists($file) ? (int) file_get_contents($file) : 0;
+    file_put_contents($file, (string) ++$count);
+
+    if ($count < 2) {
+        throw new Exception('Flaky failure');
+    }
+
+    @unlink($file);
+    expect(true)->toBeTrue();
+})->flaky(tries: 3);
+
+it('has a default of 3 tries', function () {
+    expect(true)->toBeTrue();
+})->flaky();
+
+it('succeeds on the last possible try', function () {
+    $file = sys_get_temp_dir().'/pest_flaky_last_try';
+    $count = file_exists($file) ? (int) file_get_contents($file) : 0;
+    file_put_contents($file, (string) ++$count);
+
+    if ($count < 3) {
+        throw new Exception('Not yet');
+    }
+
+    @unlink($file);
+    expect(true)->toBeTrue();
+})->flaky(tries: 3);
+
+it('works with tries of 1', function () {
+    expect(true)->toBeTrue();
+})->flaky(tries: 1);
+
+it('retries assertion failures', function () {
+    $file = sys_get_temp_dir().'/pest_flaky_assertion';
+    $count = file_exists($file) ? (int) file_get_contents($file) : 0;
+    file_put_contents($file, (string) ++$count);
+
+    if ($count < 2) {
+        expect(false)->toBeTrue();
+    }
+
+    @unlink($file);
+    expect(true)->toBeTrue();
+})->flaky(tries: 3);
+
+it('works with a dataset', function (int $number) {
+    expect($number)->toBeGreaterThan(0);
+})->flaky(tries: 2)->with([1, 2, 3]);
+
+it('retries each dataset independently', function (string $label) {
+    $file = sys_get_temp_dir().'/pest_flaky_dataset_'.md5($label);
+    $count = file_exists($file) ? (int) file_get_contents($file) : 0;
+    file_put_contents($file, (string) ++$count);
+
+    if ($count < 2) {
+        throw new Exception("Flaky for $label");
+    }
+
+    @unlink($file);
+    expect(true)->toBeTrue();
+})->flaky(tries: 3)->with(['alpha', 'beta']);
+
+describe('within a describe block', function () {
+    it('retries inside describe', function () {
+        $file = sys_get_temp_dir().'/pest_flaky_describe';
+        $count = file_exists($file) ? (int) file_get_contents($file) : 0;
+        file_put_contents($file, (string) ++$count);
+
+        if ($count < 2) {
+            throw new Exception('Flaky inside describe');
+        }
+
+        @unlink($file);
+        expect(true)->toBeTrue();
+    })->flaky(tries: 2);
+});
+
+describe('lifecycle hooks with flaky', function () {
+    beforeEach(function () {
+        $this->setupCount = ($this->setupCount ?? 0) + 1;
+    });
+
+    it('re-runs beforeEach on each retry', function () {
+        $file = sys_get_temp_dir().'/pest_flaky_lifecycle';
+        $count = file_exists($file) ? (int) file_get_contents($file) : 0;
+        file_put_contents($file, (string) ++$count);
+
+        if ($count < 2) {
+            throw new Exception('Flaky lifecycle');
+        }
+
+        @unlink($file);
+        // After retry: setUp ran for initial + retry = setupCount should be 2
+        expect($this->setupCount)->toBe(2);
+    })->flaky(tries: 3);
+});
+
+describe('afterEach with flaky', function () {
+    $state = new stdClass;
+    $state->teardownCount = 0;
+
+    afterEach(function () use ($state) {
+        $state->teardownCount++;
+    });
+
+    it('runs afterEach between retries', function () use ($state) {
+        $file = sys_get_temp_dir().'/pest_flaky_aftereach';
+        $count = file_exists($file) ? (int) file_get_contents($file) : 0;
+        file_put_contents($file, (string) ++$count);
+
+        if ($count < 2) {
+            throw new Exception('Flaky afterEach');
+        }
+
+        @unlink($file);
+        // tearDown was called once between retries
+        expect($state->teardownCount)->toBe(1);
+    })->flaky(tries: 3);
+});
+
+it('does not retry skipped tests')
+    ->skip('intentionally skipped')
+    ->flaky(tries: 3);
+
+it('works with repeat and flaky', function () {
+    expect(true)->toBeTrue();
+})->repeat(times: 2)->flaky(tries: 2);
+
+it('works as higher order test')
+    ->assertTrue(true)
+    ->flaky(tries: 2);
+
+it('fails after exhausting all retries', function () {
+    $process = new Process(
+        ['php', 'bin/pest', 'tests/.tests/FlakyFailure.php'],
+        dirname(__DIR__, 2),
+        ['COLLISION_PRINTER' => 'DefaultPrinter', 'COLLISION_IGNORE_DURATION' => 'true'],
+    );
+
+    $process->run();
+
+    expect($process->getExitCode())->not->toBe(0);
+    expect(removeAnsiEscapeSequences($process->getOutput()))
+        ->toContain('FAILED')
+        ->toContain('Always fails');
+});
+
+it('throws when tries is less than 1', function () {
+    it('invalid', function () {})->flaky(tries: 0);
+})->throws(InvalidArgumentException::class, 'The number of tries must be greater than 0.');
+
+it('throws when tries is negative', function () {
+    it('invalid negative', function () {})->flaky(tries: -1);
+})->throws(InvalidArgumentException::class, 'The number of tries must be greater than 0.');
+
+it('does not retry todo tests')
+    ->todo()
+    ->flaky(tries: 3);
+
+it('retries php errors', function () {
+    $file = sys_get_temp_dir().'/pest_flaky_error';
+    $count = file_exists($file) ? (int) file_get_contents($file) : 0;
+    file_put_contents($file, (string) ++$count);
+
+    if ($count < 2) {
+        throw new TypeError('type error');
+    }
+
+    @unlink($file);
+    expect(true)->toBeTrue();
+})->flaky(tries: 3);
+
+it('works with throws and flaky', function () {
+    throw new RuntimeException('Expected exception');
+})->throws(RuntimeException::class, 'Expected exception')->flaky(tries: 2);
+
+it('does not retry expected exceptions', function () {
+    // If flaky retried this, the temp file counter would reach 2 and
+    // the test would NOT throw — causing PHPUnit's "expected exception
+    // was not raised" to fail. The test passes only if we don't retry.
+    $file = sys_get_temp_dir().'/pest_flaky_expected';
+    $count = file_exists($file) ? (int) file_get_contents($file) : 0;
+    file_put_contents($file, (string) ++$count);
+
+    if ($count >= 2) {
+        @unlink($file);
+
+        // Second call means flaky retried — don't throw, which will FAIL
+        // because PHPUnit expects the exception
+        return;
+    }
+
+    @unlink($file);
+    throw new RuntimeException('Expected on first attempt');
+})->throws(RuntimeException::class)->flaky(tries: 3);
+
+it('does not retry fails()', function () {
+    $this->fail('Expected failure');
+})->fails('Expected failure')->flaky(tries: 2);
+
+it('retries unexpected exceptions even with throws set', function () {
+    $file = sys_get_temp_dir().'/pest_flaky_unexpected';
+    $count = file_exists($file) ? (int) file_get_contents($file) : 0;
+    file_put_contents($file, (string) ++$count);
+
+    if ($count < 2) {
+        throw new LogicException('Unexpected flaky error');
+    }
+
+    @unlink($file);
+    throw new RuntimeException('Expected exception');
+})->throws(RuntimeException::class)->flaky(tries: 3);
+
+it('does not leak mock objects between retries', function () {
+    $mock = $this->createMock(Countable::class);
+    $mock->expects($this->once())->method('count')->willReturn(1);
+
+    $file = sys_get_temp_dir().'/pest_flaky_mock';
+    $count = file_exists($file) ? (int) file_get_contents($file) : 0;
+    file_put_contents($file, (string) ++$count);
+
+    if ($count < 2) {
+        @unlink(sys_get_temp_dir().'/pest_flaky_mock'); // clean before retry writes again
+        file_put_contents($file, '1');
+        throw new Exception('Flaky mock failure');
+    }
+
+    @unlink($file);
+    // Call mock — only the mock from THIS attempt should be verified
+    expect($mock->count())->toBe(1);
+})->flaky(tries: 3);
+
+it('does not stop retrying when snapshot changes are absent', function () {
+    // Ensures the snapshot guard only triggers when __snapshotChanges is non-empty
+    $file = sys_get_temp_dir().'/pest_flaky_no_snapshot';
+    $count = file_exists($file) ? (int) file_get_contents($file) : 0;
+    file_put_contents($file, (string) ++$count);
+
+    if ($count < 2) {
+        throw new Exception('No snapshots here');
+    }
+
+    @unlink($file);
+    expect(true)->toBeTrue();
+})->flaky(tries: 3);
+
+it('does not leak dynamic properties between retries', function () {
+    $file = sys_get_temp_dir().'/pest_flaky_props';
+    $count = file_exists($file) ? (int) file_get_contents($file) : 0;
+    file_put_contents($file, (string) ++$count);
+
+    if ($count < 2) {
+        $this->leakedProperty = 'from attempt 1';
+        throw new Exception('Flaky props');
+    }
+
+    @unlink($file);
+    expect(isset($this->leakedProperty))->toBeFalse();
+})->flaky(tries: 3);
+
+it('clears output buffer between retries when expectOutputString is used', function () {
+    $file = sys_get_temp_dir().'/pest_flaky_output';
+    $count = file_exists($file) ? (int) file_get_contents($file) : 0;
+    file_put_contents($file, (string) ++$count);
+
+    $this->expectOutputString('clean');
+
+    if ($count < 2) {
+        echo 'stale';
+        throw new Exception('Flaky output');
+    }
+
+    @unlink($file);
+    echo 'clean';
+})->flaky(tries: 3);
+
+it('preserves output between retries when no output expectation is set', function () {
+    $file = sys_get_temp_dir().'/pest_flaky_output_no_expect';
+    $count = file_exists($file) ? (int) file_get_contents($file) : 0;
+    file_put_contents($file, (string) ++$count);
+
+    if ($count < 2) {
+        echo 'from attempt 1';
+        throw new Exception('Flaky output no expect');
+    }
+
+    @unlink($file);
+    // Output from attempt 1 is still in the buffer
+    $this->expectOutputString('from attempt 1');
+})->flaky(tries: 3);
--- a/tests/Fixtures/Arch/ToBeCasedCorrectly/CorrectCasing/CorrectCasing.php
+++ b/tests/Fixtures/Arch/ToBeCasedCorrectly/CorrectCasing/CorrectCasing.php
@ -0,0 +1,5 @@
+<?php
+
+namespace Tests\Fixtures\Arch\ToBeCasedCorrectly\CorrectCasing;
+
+class CorrectCasing {}
--- a/tests/Fixtures/Arch/ToBeCasedCorrectly/IncorrectCasing/incorrectCasing.php
+++ b/tests/Fixtures/Arch/ToBeCasedCorrectly/IncorrectCasing/incorrectCasing.php
@ -0,0 +1,5 @@
+<?php
+
+namespace Tests\Fixtures\Arch\ToBeCasedCorrectly\IncorrectCasing;
+
+class IncorrectCasing {}
--- a/tests/Fixtures/Arch/ToBeCasedCorrectly/incorrectDirectoryCasing/CorrectCasing.php
+++ b/tests/Fixtures/Arch/ToBeCasedCorrectly/incorrectDirectoryCasing/CorrectCasing.php
@ -0,0 +1,5 @@
+<?php
+
+namespace Tests\Fixtures\Arch\ToBeCasedCorrectly\IncorrectDirectoryCasing;
+
+class CorrectCasing {}
--- a/tests/Fixtures/Arch/ToUseTrait/HasInheritedTrait/ChildClassExtendingParent.php
+++ b/tests/Fixtures/Arch/ToUseTrait/HasInheritedTrait/ChildClassExtendingParent.php
@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Fixtures\Arch\ToUseTrait\HasInheritedTrait;
+
+use Tests\Fixtures\Arch\ToUseTrait\HasTrait\ParentClassWithTrait;
+
+class ChildClassExtendingParent extends ParentClassWithTrait {}
--- a/tests/Fixtures/Arch/ToUseTrait/HasNestedTrait/NestedTrait.php
+++ b/tests/Fixtures/Arch/ToUseTrait/HasNestedTrait/NestedTrait.php
@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Fixtures\Arch\ToUseTrait\HasNestedTrait;
+
+trait NestedTrait
+{
+    public function nestedMethod()
+    {
+        return 'nested';
+    }
+}
--- a/tests/Fixtures/Arch/ToUseTrait/HasTrait/ParentClassWithTrait.php
+++ b/tests/Fixtures/Arch/ToUseTrait/HasTrait/ParentClassWithTrait.php
@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Fixtures\Arch\ToUseTrait\HasTrait;
+
+class ParentClassWithTrait
+{
+    use TestTraitForInheritance;
+}
--- a/tests/Fixtures/Arch/ToUseTrait/HasTrait/TestTraitForInheritance.php
+++ b/tests/Fixtures/Arch/ToUseTrait/HasTrait/TestTraitForInheritance.php
@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Fixtures\Arch\ToUseTrait\HasTrait;
+
+use Tests\Fixtures\Arch\ToUseTrait\HasNestedTrait\NestedTrait;
+
+trait TestTraitForInheritance
+{
+    use NestedTrait;
+
+    public function testMethod()
+    {
+        return 'test';
+    }
+}
--- a/tests/Fixtures/ParallelNestedDatasets/Datasets/Nested/Users.php
+++ b/tests/Fixtures/ParallelNestedDatasets/Datasets/Nested/Users.php
@ -0,0 +1,6 @@
+<?php
+
+dataset('nested.users', [
+    ['alice'],
+    ['bob'],
+]);
--- a/tests/Fixtures/ParallelNestedDatasets/TestFileWithNestedDataset.php
+++ b/tests/Fixtures/ParallelNestedDatasets/TestFileWithNestedDataset.php
@ -0,0 +1,5 @@
+<?php
+
+test('loads nested dataset', function (string $name) {
+    expect($name)->not->toBeEmpty();
+})->with('nested.users');
--- a/tests/Pest.php
+++ b/tests/Pest.php
@ -86,5 +86,12 @@ dataset('dataset_in_pest_file', ['A', 'B']);

 function removeAnsiEscapeSequences(string $input): ?string
 {
-    return preg_replace('#\\x1b[[][^A-Za-z]*[A-Za-z]#', '', $input);
+    return preg_replace(
+        [
+            '#\\x1b[[][^A-Za-z]*[A-Za-z]#',       // CSI (colors, cursor, etc.)
+            '#\\x1b\\]8;[^\\x1b\\x07]*(?:\\x1b\\\\|\\x07)#', // OSC 8 hyperlinks
+        ],
+        '',
+        $input,
+    );
 }
--- a/tests/Unit/Support/DatasetInfo.php
+++ b/tests/Unit/Support/DatasetInfo.php
@ -5,9 +5,14 @@ use Pest\Support\DatasetInfo;
 it('can check if dataset is defined inside a Datasets directory', function (string $file, bool $inside) {
    expect(DatasetInfo::isInsideADatasetsDirectory($file))->toBe($inside);
 })->with([
+    ['file' => '/var/www/Datasets/project/tests/Datasets/Nested/Numbers.php', 'inside' => true],
+    ['file' => '/var/www/Datasets/project/tests/Features/Datasets/Nested/Numbers.php', 'inside' => true],
    ['file' => '/var/www/project/tests/Datasets/Numbers.php', 'inside' => true],
+    ['file' => '/var/www/project/tests/Datasets/Nested/Numbers.php', 'inside' => true],
    ['file' => '/var/www/project/tests/Datasets.php', 'inside' => false],
    ['file' => '/var/www/project/tests/Features/Datasets/Numbers.php', 'inside' => true],
+    ['file' => '/var/www/project/tests/Features/Datasets/Nested/Numbers.php', 'inside' => true],
+    ['file' => '/var/www/project/tests/Features/Datasets/Nested/Datasets/Numbers.php', 'inside' => true],
    ['file' => '/var/www/project/tests/Features/Numbers.php', 'inside' => false],
    ['file' => '/var/www/project/tests/Features/Datasets.php', 'inside' => false],
 ]);
@ -25,12 +30,18 @@ it('can check if dataset is defined inside a Datasets.php file', function (strin
 it('computes the dataset scope', function (string $file, string $scope) {
    expect(DatasetInfo::scope($file))->toBe($scope);
 })->with([
+    ['file' => '/var/www/Datasets/project/tests/Datasets/Nested/Numbers.php', 'scope' => '/var/www/Datasets/project/tests'],
+    ['file' => '/var/www/Datasets/project/tests/Features/Datasets/Nested/Numbers.php', 'scope' => '/var/www/Datasets/project/tests/Features'],
    ['file' => '/var/www/project/tests/Datasets/Numbers.php', 'scope' => '/var/www/project/tests'],
+    ['file' => '/var/www/project/tests/Datasets/Nested/Numbers.php', 'scope' => '/var/www/project/tests'],
    ['file' => '/var/www/project/tests/Datasets.php', 'scope' => '/var/www/project/tests'],
    ['file' => '/var/www/project/tests/Features/Datasets/Numbers.php', 'scope' => '/var/www/project/tests/Features'],
+    ['file' => '/var/www/project/tests/Features/Datasets/Nested/Numbers.php', 'scope' => '/var/www/project/tests/Features'],
    ['file' => '/var/www/project/tests/Features/Numbers.php', 'scope' => '/var/www/project/tests/Features/Numbers.php'],
    ['file' => '/var/www/project/tests/Features/Datasets.php', 'scope' => '/var/www/project/tests/Features'],
    ['file' => '/var/www/project/tests/Features/Controllers/Datasets/Numbers.php', 'scope' => '/var/www/project/tests/Features/Controllers'],
+    ['file' => '/var/www/project/tests/Features/Controllers/Datasets/Nested/Numbers.php', 'scope' => '/var/www/project/tests/Features/Controllers'],
+    ['file' => '/var/www/project/tests/Features/Datasets/Nested/Datasets/Numbers.php', 'scope' => '/var/www/project/tests/Features'],
    ['file' => '/var/www/project/tests/Features/Controllers/Numbers.php', 'scope' => '/var/www/project/tests/Features/Controllers/Numbers.php'],
    ['file' => '/var/www/project/tests/Features/Controllers/Datasets.php', 'scope' => '/var/www/project/tests/Features/Controllers'],
 ]);
--- a/tests/Visual/JUnit.php
+++ b/tests/Visual/JUnit.php
@ -60,20 +60,17 @@ test('junit with parallel', function () use ($normalizedPath, $run) {
    expect($result['testsuite']['@attributes'])
        ->name->toBe('Tests\tests\SuccessOnly')
        ->file->toBe($normalizedPath('tests/.tests/SuccessOnly.php'))
-        ->tests->toBe('2')
-        ->assertions->toBe('2')
+        ->tests->toBe('1')
+        ->assertions->toBe('1')
        ->errors->toBe('0')
        ->failures->toBe('0')
        ->skipped->toBe('0');

-    expect($result['testsuite']['testcase'])
-        ->toHaveCount(2);
-
-    expect($result['testsuite']['testcase'][0]['@attributes'])
+    expect($result['testsuite']['testcase']['@attributes'])
        ->name->toBe('it can pass with comparison')
        ->file->toBe($normalizedPath('tests/.tests/SuccessOnly.php::it can pass with comparison'))
        ->class->toBe('Tests\tests\SuccessOnly')
        ->classname->toBe('Tests.tests.SuccessOnly')
        ->assertions->toBe('1')
        ->time->toStartWith('0.0');
-})->skip('Not working yet');
+});
--- a/tests/Visual/Parallel.php
+++ b/tests/Visual/Parallel.php
@ -15,11 +15,34 @@ $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, 1177 passed (2789 assertions)')
+    $output = $run('--exclude-group=integration');
+
+    if (getenv('REBUILD_SNAPSHOTS')) {
+        preg_match('/Tests:\s+(.+\(\d+ assertions\))/', $output, $matches);
+
+        $file = file_get_contents(__FILE__);
+        $file = preg_replace(
+            '/\$expected = \'.*?\';/',
+            "\$expected = '2 deprecated, 4 warnings, 5 incomplete, 3 notices, 40 todos, 27 skipped, 1278 passed (2920 assertions)';",
+            $file,
+        );
+        file_put_contents(__FILE__, $file);
+    }
+
+    $expected = '2 deprecated, 4 warnings, 5 incomplete, 3 notices, 40 todos, 27 skipped, 1278 passed (2920 assertions)';
+
+    expect($output)
+        ->toContain("Tests:    {$expected}")
        ->toContain('Parallel: 3 processes');
 })->skipOnWindows();

 test('a parallel test can extend another test with same name', function () use ($run) {
-    expect($run('tests/Fixtures/Inheritance'))->toContain('Tests:    1 skipped, 2 passed (2 assertions)');
-});
+    expect($run('tests/Fixtures/Inheritance'))->toContain('Tests:    1 skipped, 1 passed (1 assertions)');
+})->skipOnWindows();
+
+test('parallel reports invalid datasets as failures', function () use ($run) {
+    expect($run('tests/.tests/ParallelInvalidDataset'))
+        ->toContain("A dataset with the name `missing.dataset` does not exist. You can create it using `dataset('missing.dataset', ['a', 'b']);`.")
+        ->toContain('Tests:    1 failed, 1 passed (1 assertions)')
+        ->toContain('Parallel: 3 processes');
+})->skipOnWindows();
--- a/tests/Visual/ParallelNestedDatasets.php
+++ b/tests/Visual/ParallelNestedDatasets.php
@ -0,0 +1,40 @@
+<?php
+
+use Symfony\Component\Process\Process;
+
+$run = function (bool $parallel = false): array {
+    $command = [
+        'php',
+        'bin/pest',
+        'tests/Fixtures/ParallelNestedDatasets/TestFileWithNestedDataset.php',
+        '--colors=never',
+    ];
+
+    if ($parallel) {
+        $command[] = '--parallel';
+        $command[] = '--processes=2';
+    }
+
+    $process = new Process($command, dirname(__DIR__, 2),
+        ['COLLISION_PRINTER' => 'DefaultPrinter', 'COLLISION_IGNORE_DURATION' => 'true'],
+    );
+
+    $process->run();
+
+    return [
+        'exitCode' => $process->getExitCode(),
+        'output' => removeAnsiEscapeSequences($process->getOutput().$process->getErrorOutput()),
+    ];
+};
+
+test('parallel loads nested datasets from nested directories', function () use ($run) {
+    $serial = $run();
+    $parallel = $run(true);
+
+    expect($serial['exitCode'])->toBe(0)
+        ->and($parallel['exitCode'])->toBe(0)
+        ->and($serial['output'])->toContain('Tests:    2 passed (2 assertions)')
+        ->and($parallel['output'])->toContain('Tests:    2 passed (2 assertions)')
+        ->and($parallel['output'])->toContain('Parallel: 2 processes')
+        ->and($parallel['output'])->not->toContain('No tests found.');
+})->skipOnWindows();
--- a/tests/Visual/Success.php
+++ b/tests/Visual/Success.php
@ -12,7 +12,7 @@ test('visual snapshot of test suite on success', function () {

    $output = function () use ($testsPath) {
        $process = (new Process(
-            ['php', 'bin/pest'],
+            ['php', '-d', 'memory_limit=256M', 'bin/pest'],
            dirname($testsPath),
            ['EXCLUDE' => 'integration', '--exclude-group' => 'integration', 'REBUILD_SNAPSHOTS' => false, 'PARATEST' => 0, 'COLLISION_PRINTER' => 'DefaultPrinter', 'COLLISION_IGNORE_DURATION' => 'true'],
        ));
@ -21,8 +21,10 @@ test('visual snapshot of test suite on success', function () {

        return preg_replace([
            '#\\x1b[[][^A-Za-z]*[A-Za-z]#',
+            '#\\x1b\\]8;[^\\x1b\\x07]*(?:\\x1b\\\\|\\x07)#',
            '/(Tests\\\PHPUnit\\\CustomAffixes\\\InvalidTestName)([A-Za-z0-9]*)/',
        ], [
+            '',
            '',
            '$1',
        ], $process->getOutput());
--- a/tests/Visual/UnicodeFilename.php
+++ b/tests/Visual/UnicodeFilename.php
@ -0,0 +1,37 @@
+<?php
+
+use Symfony\Component\Process\Process;
+
+test('filter works with unicode characters in filename', function () {
+    $process = new Process([
+        'php',
+        'bin/pest',
+        'tests/.tests/StraßenTest.php',
+        '--colors=never',
+    ], dirname(__DIR__, 2), ['COLLISION_PRINTER' => 'DefaultPrinter', 'COLLISION_IGNORE_DURATION' => 'true']);
+
+    $process->run();
+
+    $output = $process->getOutput();
+
+    expect($output)->toContain('StraßenTest');
+    expect($output)->toContain('tests unicode filename');
+    expect($output)->toContain('1 passed');
+})->skipOnWindows();
+
+test('filter with unicode regex matches unicode filename', function () {
+    $process = new Process([
+        'php',
+        'bin/pest',
+        '--filter=.*Straß.*',
+        'tests/.tests/',
+        '--colors=never',
+    ], dirname(__DIR__, 2), ['COLLISION_PRINTER' => 'DefaultPrinter', 'COLLISION_IGNORE_DURATION' => 'true']);
+
+    $process->run();
+
+    $output = $process->getOutput();
+
+    expect($output)->toContain('StraßenTest');
+    expect($output)->toContain('1 passed');
+})->skipOnWindows();
Author	SHA1	Message	Date
nuno maduro	87db0b4847	release: v4.6.1	2026-04-15 09:03:09 -07:00
nuno maduro	6ba373a772	chore: bumps phpunit	2026-04-15 08:49:34 -07:00
nuno maduro	945d476409	fix: allow to update individual screenshots	2026-04-15 08:34:06 -07:00
nuno maduro	a8cf0fe2cb	chore: improves CI	2026-04-15 08:20:50 -07:00
nuno maduro	2ae072bb95	feat: makes boot time much faster	2026-04-15 07:47:38 -07:00
nuno maduro	59d066950c	chore: missing header	2026-04-15 07:47:22 -07:00
nuno maduro	0dd1aa72ef	fix: updating snapshots in `--parallel`	2026-04-15 07:22:10 -07:00
nuno maduro	4e03cd3edb	release: v4.6.0	2026-04-14 10:23:26 -07:00
nuno maduro	eeab24e2bb	Merge pull request #1671 from pestphp/feat/time-based-sharding [4.x] Time based sharding	2026-04-14 18:18:09 +01:00
nuno maduro	9b64d5425a	removes time balanced	2026-04-14 10:12:57 -07:00
nuno maduro	0acab1cbb4	wip	2026-04-14 09:53:57 -07:00
nuno maduro	e616eab9fb	wip	2026-04-14 09:36:38 -07:00
nuno maduro	7cbb1fcdb2	wip	2026-04-14 09:29:41 -07:00
nuno maduro	cb5f6e1bd2	chore: style	2026-04-14 09:17:18 -07:00
nuno maduro	985dadd934	update	2026-04-14 09:16:32 -07:00
nuno maduro	10aee6045c	feat(time-based-sharding): updates exception name	2026-04-14 09:08:52 -07:00
nuno maduro	4ac14b2528	feat(time-based-sharding): updates plugin	2026-04-14 08:34:41 -07:00
nuno maduro	13c322bab3	ci: fixes `incorrectCasing` test	2026-04-10 20:51:40 +01:00
nuno maduro	3855249ce9	feat: adds `--flaky` cli option	2026-04-10 20:03:50 +01:00
nuno maduro	f528bd8427	feat: adds `flaky`	2026-04-10 19:52:31 +01:00
nuno maduro	acd8aafa63	fix: printer with `--colors`	2026-04-10 19:21:49 +01:00
nuno maduro	e8d630e774	fix: printer with `--colors`	2026-04-10 19:21:41 +01:00
nuno maduro	b6385dc865	fix: namespaces on `toBeCasedCorrectly`	2026-04-10 19:21:31 +01:00
nuno maduro	02dc8d7bcc	chore: bumps deps	2026-04-10 19:21:18 +01:00
nuno maduro	729f18a152	fix: stacktrace with nested with calls	2026-04-10 17:25:05 +01:00
nuno maduro	bdf60cea91	Merge pull request #1565 from louisbels/fix-dataset-method-chaining fix: dataset inheritance with method chaining (beforeEach()->with(), describe()->with())	2026-04-10 17:05:25 +01:00
nuno maduro	3a8ee8291c	Merge pull request #1628 from DevDavido/patch-1 fix: Parameter closure this type annotations in Functions	2026-04-10 16:58:39 +01:00
nuno maduro	654cb726c9	Merge branch '4.x' into patch-1	2026-04-10 16:58:26 +01:00
nuno maduro	bce26aeaad	Merge pull request #1634 from dbpolito/dataset_named_params Dataset Named Parameters	2026-04-10 16:54:57 +01:00
nuno maduro	5948bcd71e	chore: type improvements	2026-04-10 16:50:10 +01:00
nuno maduro	89006d83a9	chore: env	2026-04-10 16:27:44 +01:00
nuno maduro	a8e974d64a	chore: updates snapshots	2026-04-10 14:42:34 +01:00
nuno maduro	617b074049	Merge pull request #1626 from SimonBroekaert/feat/add_only-covered_option feat: add '--only-covered' option to '--coverage'	2026-04-10 12:53:17 +01:00
nuno maduro	2eea71a664	Merge pull request #1624 from Vmadmax/fix/unicode-filename-filter fix: preserve Unicode characters in filenames for --filter matching	2026-04-10 12:29:40 +01:00
nuno maduro	4b5374d507	Merge branch '4.x' into fix/unicode-filename-filter	2026-04-10 12:29:30 +01:00
nuno maduro	9085561ece	chore: runs at `9am`	2026-04-10 12:24:30 +01:00
nuno maduro	b71bfc513a	chore: guards	2026-04-10 12:23:49 +01:00
nuno maduro	75938ac9eb	ci: updates deps	2026-04-10 12:18:28 +01:00
nuno maduro	e766825f5b	chore: fixes `test:unit`	2026-04-10 12:15:00 +01:00
nuno maduro	8a83a1a1a9	Merge pull request #1655 from stsepelin/fix/parallel-empty-suite-reporting fix: nested dataset discovery and parallel invalid-dataset reporting	2026-04-10 11:59:48 +01:00
nuno maduro	109bb22c5e	Merge pull request #1615 from smirok/parallel-teamcity-concurrency-fix fix: enhance support for --parallel and --teamcity arguments by restoring --teamcity for ParaTest and fixing teamcity output concurrency	2026-04-10 11:42:45 +01:00
nuno maduro	89dd212d84	Merge pull request #1580 from bibrokhim/patch-1 Add Rules to Laravel preset	2026-04-10 11:42:13 +01:00
nuno maduro	cd07c6d966	Merge pull request #1569 from treyssatvincent/patch-1 add missing classes before toExtend on laravel preset	2026-04-10 11:41:53 +01:00
nuno maduro	8dddb47ad5	Merge branch '4.x' into fix-dataset-method-chaining	2026-04-10 11:41:13 +01:00
nuno maduro	3a6c2fab37	Merge pull request #1515 from yondifon/fix-trait-inheritance-detection BugFix: Fix toUseTrait to detect inherited and nested traits	2026-04-10 11:39:56 +01:00
nuno maduro	281dbf6cf4	Merge pull request #1455 from SimonBroekaert/feat/to_be_cased_correctly_arch_test_assertion feat: add toBeCasedCorrectly arch test assertion	2026-04-10 11:38:46 +01:00
nuno maduro	40c8429058	Merge pull request #1653 from orphanedrecord/fix/pest-php-stub-typo Fix typo in Pest.php stubs	2026-04-10 11:35:41 +01:00
nuno maduro	d9d46c73f8	chore: stores statically the result	2026-04-09 21:36:49 +01:00
nuno maduro	e44c554a0b	chore: bumps dependencies	2026-04-06 21:57:05 +01:00
nuno maduro	9797a71dbc	feat(ai): allow temporary namesapce	2026-04-03 14:43:28 +01:00
nuno maduro	c1a54df233	feat: `--ai` work in progress	2026-04-03 14:04:20 +01:00
dbpolito	be3ff37517	Merge branch '4.x' of https://github.com/pestphp/pest into dataset_named_params	2026-03-26 18:08:26 -03:00
Aleksandr Štšepelin	4b50cb486d	Restore success snapshot coverage with lower memory limit	2026-03-25 23:59:29 +02:00
Aleksandr Štšepelin	f7175ecfd7	Fix parallel dataset reporting and nested fixtures	2026-03-25 23:59:29 +02:00
Aleksandr Štšepelin	07737bc0b2	Fix parallel file selection and empty-suite reporting	2026-03-25 23:59:28 +02:00
brianseymour	1a4c06bd6e	Fix Pest comment typo while still honoring the Otwellian Waterfall	2026-03-18 20:51:45 -07:00
SimonBroekaert	1675dd1d41	chore: add tests for toBeCasedCorrectly() arch test	2026-02-17 19:03:46 +01:00
SimonBroekaert	df7b6c8454	feat: add toBeCasedCorrectly arch test assertion	2026-02-17 17:31:02 +01:00
dbpolito	b081584ab6	Improvements	2026-02-11 18:09:09 -03:00
dbpolito	6966802afc	Cleanup	2026-02-11 18:02:21 -03:00
dbpolito	c61dcad42b	Dataset Named Parameters	2026-02-11 17:57:07 -03:00
David B.	ec3e0b2d33	fix: Parameter closure this type annotations in Functions.php	2026-02-09 20:48:56 +01:00
SimonBroekaert	c3620840b4	feat: add '--only-covered' option to '--coverage'	2026-02-06 11:57:21 +01:00
vmadmax	10a19f16ba	refactor: simplify regex to use Unicode properties \p{L} and \p{N	2026-02-02 09:41:54 +01:00
vmadmax	a956de5446	fix: preserve Unicode characters in class names for --filter matching	2026-02-02 09:01:24 +01:00
Ilia Smirnov	e6f511302b	fix: enhance support for --parallel and --teamcity arguments by restoring --teamcity for ParaTest and fixing teamcity output concurrency	2026-01-27 16:47:24 +01:00
Bakhromjon	0e7c2abe8b	Add Rules to Laravel preset	2025-11-25 15:32:36 +05:00
Nino	bd5fed9e12	add missing classes before toExtend on laravel preset Add missing `->classes()` before `->toExtend()` on the laravel preset for 2 namespaces. Otherwise you can't use interfaces on theses namespace. For example, if you create an interface `YourSuperRequestContract` on the `app/Http/Requests` namespace you will get this error: ``` Expecting 'app/Http/Requests/YourSuperRequestContract.php' to extend 'Illuminate\Foundation\Http\FormRequest'. ```	2025-11-10 15:26:56 +00:00
Louis	26345fd9f4	fix: dataset inheritance with method chaining (beforeEach()->with(), describe()->with()) Fixes issue where datasets were not applied when using method chaining patterns like beforeEach()->with([...]) or describe()->with([...]) inside nested describe blocks. Root cause: Multiple functions were using Backtrace::file() which returns the immediate caller's filename. This breaks when called through method chaining because the backtrace returns internal Pest files instead of the test file. Solution: Use Backtrace::testFile() which walks the entire backtrace to find the actual test file being executed. This matches the pattern already used by test() and describe() functions. Changes in src/Functions.php: - beforeEach(): Use testFile() to fix beforeEach()->with() pattern - afterEach(): Use testFile() for consistency with beforeEach() - beforeAll(): Use testFile() for better error messages - afterAll(): Use testFile() for better error messages - pest(): Use testFile() to fix pest()->beforeEach() pattern - uses(): Use testFile() for consistency with pest() - covers(): Use testFile() for correct test file context - mutates(): Use testFile() for correct test file context Changes in src/PendingCalls/DescribeCall.php: - __destruct(): Force BeforeEachCall destructor before test creation - __call(): Use $this->filename instead of Backtrace, more efficient - __call(): Properly merge describing context for nested describe blocks Fixes patterns: - beforeEach()->with([...]) - describe()->with([...]) - pest()->beforeEach()->with([...] Tests passing: - tests/Features/Describe.php (all dataset tests) - tests/Hooks/BeforeEachTest.php (global hook execution) - tests/Features/Expect/toMatchSnapshot.php (28 tests)	2025-11-05 17:46:52 +01:00
Malico	dc9a1e8ace	BugFix: Fix toUseTrait to detect inherited and nested traits	2025-09-20 19:06:23 +01:00