chore: updates sponsors

* Fixed typo in message

* Fixed typo in message

.github/SECURITY.md

@@ -0,0 +1,13 @@
+# Security Policy
+
+**PLEASE DON'T DISCLOSE SECURITY-RELATED ISSUES PUBLICLY, [SEE BELOW](#reporting-a-vulnerability).**
+
+## Reporting a Vulnerability
+
+If you discover a security vulnerability in Pest, please report it privately using one of the following channels:
+
+1. **GitHub Private Vulnerability Reporting** (preferred) — go to the repository's **Security** tab and click **"Report a vulnerability"**. This creates a private advisory visible only to maintainers and provides a structured workflow for triage, fix coordination, and CVE assignment.
+
+2. **Email** — send the details to Nuno Maduro at **enunomaduro@gmail.com**.
+
+All security vulnerabilities will be promptly addressed.

.github/dependabot.yml

@@ -0,0 +1,12 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    cooldown:
+      default-days: 5
+    groups:
+      github-actions:
+        patterns:
+          - "*"

.github/workflows/static.yml

@@ -2,9 +2,17 @@ name: Static Analysis
 
 on:
   push:
+    branches: [5.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:
@@ -12,33 +20,51 @@ jobs:
     name: Static Tests
 
     runs-on: ubuntu-latest
+    timeout-minutes: 15
     strategy:
       fail-fast: true
       matrix:
-        dependency-version: [prefer-lowest, prefer-stable]
+        dependency-version: [prefer-stable]
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
     - name: Setup PHP
-      uses: shivammathur/setup-php@v2
+      uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # v2
       with:
-        php-version: 8.2
+        php-version: 8.4
         tools: composer:v2
         coverage: none
+        extensions: sockets
+
+    - name: Get Composer cache directory
+      id: composer-cache
+      shell: bash
+      run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+    - name: Cache Composer dependencies
+      uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v5
+      with:
+        path: ${{ steps.composer-cache.outputs.dir }}
+        key: static-php-8.4-${{ matrix.dependency-version }}-composer-${{ hashFiles('**/composer.json', '**/composer.lock') }}
+        restore-keys: |
+          static-php-8.4-${{ matrix.dependency-version }}-composer-
+          static-php-8.4-composer-
 
     - name: Install Dependencies
-      run: composer update --prefer-stable --no-interaction --no-progress --ansi
+      env:
+        COMPOSER_ROOT_VERSION: 5.x-dev
+      run: composer update --${{ matrix.dependency-version }} --no-interaction --no-progress --ansi
 
-  # - name: Type Check
+    - name: Profanity Check
-  #   run: composer test:type:check
+      run: composer test:profanity
+
+    - name: Type Check
+      run: composer test:type:check
 
     - name: Type Coverage
       run: composer test:type:coverage
 
-    - name: Refacto
-      run: composer test:refacto
-
     - name: Style
       run: composer test:lint

.github/workflows/tests.yml

@@ -2,33 +2,59 @@ name: Tests
 
 on:
   push:
+    branches: [5.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:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-latest] # windows-latest
-        symfony: ['7.1']
+        symfony: ['8.0']
-        php: ['8.2', '8.3', '8.4']
+        php: ['8.4', '8.5']
-        dependency_version: [prefer-lowest, prefer-stable]
+        dependency_version: [prefer-stable]
 
     name: PHP ${{ matrix.php }} - Symfony ^${{ matrix.symfony }} - ${{ matrix.os }} - ${{ matrix.dependency_version }}
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
     - name: Setup PHP
-      uses: shivammathur/setup-php@v2
+      uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # v2
       with:
         php-version: ${{ matrix.php }}
         tools: composer:v2
         coverage: none
+        extensions: sockets
+
+    - name: Get Composer cache directory
+      id: composer-cache
+      shell: bash
+      run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+    - name: Cache Composer dependencies
+      uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v5
+      with:
+        path: ${{ steps.composer-cache.outputs.dir }}
+        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-
 
     - name: Setup Problem Matches
       run: |
@@ -37,12 +63,9 @@ jobs:
 
     - name: Install PHP dependencies
       shell: bash
-      run: |
+      env:
-        if [[ "${{ matrix.php }}" == "8.4" ]]; then
+        COMPOSER_ROOT_VERSION: 5.x-dev
-          composer update --${{ matrix.dependency_version }} --no-interaction --no-progress --ansi --with="symfony/console:^${{ matrix.symfony }}" --ignore-platform-req=php
+      run: composer update --${{ matrix.dependency_version }} --no-interaction --no-progress --ansi --with="symfony/console:^${{ matrix.symfony }}"
-        else
-          composer update --${{ matrix.dependency_version }} --no-interaction --no-progress --ansi --with="symfony/console:^${{ matrix.symfony }}"
-        fi
 
     - name: Unit Tests
       run: composer test:unit
@@ -51,5 +74,4 @@ jobs:
       run: composer test:parallel
 
     - name: Integration Tests
-      if: ${{ matrix.php != '8.4' }}
       run: composer test:integration

.gitignore

@@ -1,7 +1,7 @@
 .idea/*
 .idea/codeStyleSettings.xml
 .temp/*
-composer.lock
+/composer.lock
 /vendor/
 coverage.xml
 .phpunit.result.cache
@@ -12,3 +12,5 @@ coverage.xml
 *.swp
 *.swo
 .vscode/
+.STREAM.md
+

CLAUDE.md

@@ -0,0 +1,34 @@
+# CLAUDE.md
+
+**Do not edit this file.** Agents must never add, remove, or reword anything here. If a change seems needed, say so and let a human do it.
+
+## Ask before testing
+
+When asked to review code or build a feature, do not run the test suite and do not write new tests. Make the change, report it, then ask the user whether tests should be added — describing the tests you have in mind — and wait for the user to confirm.
+
+Two reasons this matters here: the suite takes minutes, and `tests/.snapshots/success.txt` plus the tally in `tests/Visual/Parallel.php` encode the whole suite's result, so a single added test breaks both.
+
+Once the user confirms:
+
+```bash
+composer test:unit         # fast, excludes the visual group
+composer test:integration  # visual and snapshot tests
+composer test              # everything CI runs, in CI's order
+composer update:snapshots  # only when a test was added or removed
+```
+
+## TIA scenario tests
+
+`tests/Features/Tia/*` scaffold a throwaway git project, run a real `pest` subprocess against it, and diff the TIA graph it wrote. They exist because TIA's contract is about what a run *writes* — replay, branch keys, and the COMPLETE / RESULTS-ONLY / HARD-SUPPRESSED tiers are invisible to ordinary assertions, and every case used to be measured by hand against a playground app.
+
+Add one whenever a change touches branch resolution, replay, filtered mode, or the write tiers. How:
+
+- `Project::make('master')` scaffolds; `seed('master')` writes a graph and sentinels every cached result (`time=9.999`, `assertions=42`) so any rewrite shows up.
+- `$project->pest('--tia', …)` runs it; `$project->delta()` compares against that snapshot. `writtenCount()` is the discriminator — `0` means "replayed", not "wrote the same values". `mutateGraph()` bends one entry; overlays in `tests/Fixtures/Tia/overlays/<name>/` supply a different `tests/Pest.php`.
+- Keep expectations driver-independent: a cold recording run needs pcov/xdebug and behaves differently without one. Seed a graph instead of recording one.
+
+Run them by file (a directory argument finds nothing) or by `--filter`:
+
+```bash
+php bin/pest tests/Features/Tia/PartialRunWriteTier.php
+```

CONTRIBUTING.md

@@ -42,7 +42,7 @@ composer test
 
 Check types:
 ```bash
-composer test:types
+composer test:type:check
 ```
 
 Unit tests:

Makefile

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

README.md

@@ -1,43 +1,46 @@
 <p align="center">
-    <img src="https://raw.githubusercontent.com/pestphp/art/master/v3/banner.png" width="600" alt="PEST">
+    <img src="https://raw.githubusercontent.com/pestphp/art/master/v5/social.png" width="600" alt="PEST">
     <p align="center">
-        <a href="https://github.com/pestphp/pest/actions"><img alt="GitHub Workflow Status (master)" src="https://img.shields.io/github/actions/workflow/status/pestphp/pest/tests.yml?branch=2.x&label=Tests%202.x"></a>
+        <a href="https://github.com/pestphp/pest/actions"><img alt="GitHub Workflow Status (5.x)" src="https://img.shields.io/github/actions/workflow/status/pestphp/pest/tests.yml?branch=5.x&label=Tests%205.x"></a>
         <a href="https://packagist.org/packages/pestphp/pest"><img alt="Total Downloads" src="https://img.shields.io/packagist/dt/pestphp/pest"></a>
         <a href="https://packagist.org/packages/pestphp/pest"><img alt="Latest Version" src="https://img.shields.io/packagist/v/pestphp/pest"></a>
         <a href="https://packagist.org/packages/pestphp/pest"><img alt="License" src="https://img.shields.io/packagist/l/pestphp/pest"></a>
+        <a href="https://whyphp.dev"><img src="https://img.shields.io/badge/Why_PHP-in_2026-7A86E8?style=flat-square&labelColor=18181b" alt="Why PHP in 2026"></a>
+        <a href="https://youtube.com/@nunomaduro?sub_confirmation=1"><img alt="YouTube Channel Subscribers" src="https://img.shields.io/youtube/channel/subscribers/UCO_hYZF2gb_CyG5sA7ArlGg?style=flat&label=youtube&color=brightgreen"></a>
     </p>
 </p>
 
 ------
 
-> Pest v3 Now Available: **[Read the announcement »](https://pestphp.com/docs/pest3-now-available)**.
+> Pest v5 Now Available: **[Read the announcement »](https://pestphp.com/docs/pest5-now-available)**.
 
-**Pest** is an elegant PHP testing Framework with a focus on simplicity, meticulously designed to bring back the joy of testing in PHP.
+**Pest** is an elegant testing framework for PHP developers and AI agents.
 
 - Explore our docs at **[pestphp.com »](https://pestphp.com)**
-- Follow us on Twitter at **[@pestphp »](https://twitter.com/pestphp)**
+- Follow the creator Nuno Maduro:
-- Join us at **[discord.gg/kaHY6p54JH »](https://discord.gg/kaHY6p54JH)** or **[t.me/+kYH5G4d5MV83ODk0 »](https://t.me/+kYH5G4d5MV83ODk0)**
+    - YouTube: **[youtube.com/@nunomaduro](https://youtube.com/@nunomaduro)** — Videos every week
+    - Twitch: **[twitch.tv/nunomaduro](https://twitch.tv/nunomaduro)** — Live coding on Mondays, Wednesdays, and Fridays at 9PM UTC
+    - Twitter / X: **[x.com/enunomaduro](https://x.com/enunomaduro)**
+    - LinkedIn: **[linkedin.com/in/nunomaduro](https://www.linkedin.com/in/nunomaduro)**
+    - Instagram: **[instagram.com/enunomaduro](https://www.instagram.com/enunomaduro)**
+    - Tiktok: **[tiktok.com/@enunomaduro](https://www.tiktok.com/@enunomaduro)**
 
 ## Sponsors
 
 We cannot thank our sponsors enough for their incredible support in funding Pest's development. Their contributions have been instrumental in making Pest the best it can be. For those who are interested in becoming a sponsor, please visit Nuno Maduro's Sponsor page at **[github.com/sponsors/nunomaduro](https://github.com/sponsors/nunomaduro)**.
 
-### Platinum Sponsors
+- **[PhpStorm](https://jb.gg/nuno)**
-
+- **[CodeRabbit](https://coderabbit.link/nunomaduro)**
-- **[LaraJobs](https://larajobs.com)**
+- **[SerpApi](https://serpapi.com/?ref=nunomaduro)**
-- **[Brokerchooser](https://brokerchooser.com)**
+- **[Bento](https://bentonow.com/?ref=nunomaduro)**
-- **[Forge](https://forge.laravel.com)**
+- **[CMS Max](https://cmsmax.com/?ref=nunomaduro)**
-- **[Spatie](https://spatie.be)**
+- **[Redberry](https://redberry.international/laravel-development/?utm_source=pest&utm_medium=banner&utm_campaign=pest_sponsorship)**
-- **[Worksome](https://www.worksome.com/)**
+- **[Typesense](https://typesense.org/?ref=nunomaduro)**
-
+- **[Pixel](https://wearepixel.com.au/?ref=nunomaduro)**
-### Premium Sponsors
+- [TestMu AI](https://www.testmuai.com/?utm_medium=sponsor&utm_source=pest)
-
+- [Zapiet](https://zapiet.com/?ref=nunomaduro)
-- [Akaunting](https://akaunting.com/?ref=pestphp)
+- [LoadForge](https://loadforge.com/?ref=nunomaduro)
-- [Codecourse](https://codecourse.com/?ref=pestphp)
+- [Route4Me](https://route4me.com/?ref=nunomaduro)
-- [DocuWriter.ai](https://www.docuwriter.ai/?ref=pestphp)
+- [Nerdify](https://getnerdify.com/?ref=nunomaduro)
-- [Laracasts](https://laracasts.com/?ref=pestphp)
-- [Localazy](https://localazy.com/?ref=pestphp)
-- [Route4Me](https://www.route4me.com/?ref=pestphp)
-- [Zapiet](https://www.zapiet.com/?ref=pestphp)
 
 Pest is an open-sourced software licensed under the **[MIT license](https://opensource.org/licenses/MIT)**.

RELEASE.md

@@ -2,10 +2,10 @@
 
 When releasing a new version of Pest there are some checks and updates that need to be done:
 
-> **For Pest v2 you should use the `2.x` branch instead.**
+> **For Pest v4 you should use the `4.x` branch instead.**
 
-- Clear your local repository with: `git add . && git reset --hard && git checkout 3.x`
+- Clear your local repository with: `git add . && git reset --hard && git checkout 5.x`
-- On the GitHub repository, check the contents of [github.com/pestphp/pest/compare/{latest_version}...3.x](https://github.com/pestphp/pest/compare/{latest_version}...3.x)
+- On the GitHub repository, check the contents of [github.com/pestphp/pest/compare/{latest_version}...5.x](https://github.com/pestphp/pest/compare/{latest_version}...5.x)
 - Update the version number in [src/Pest.php](src/Pest.php)
 - Run the tests locally using: `composer test`
 - Commit the Pest file with the message: `git commit -m "release: vX.X.X"`

bin/pest

@@ -1,13 +1,18 @@
 #!/usr/bin/env php
-<?php declare(strict_types=1);
+<?php
 
+declare(strict_types=1);
+
+use Pest\Contracts\Restarter;
 use Pest\Kernel;
 use Pest\Panic;
+use Pest\Support\Container;
 use Pest\TestCaseFilters\GitDirtyTestCaseFilter;
 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;
@@ -21,6 +26,7 @@ use Symfony\Component\Console\Output\ConsoleOutput;
 
     $dirty = false;
     $todo = false;
+    $flaky = false;
     $notes = false;
 
     foreach ($arguments as $key => $value) {
@@ -37,7 +43,7 @@ use Symfony\Component\Console\Output\ConsoleOutput;
 
         if (str_contains($value, '--test-directory=')) {
             unset($arguments[$key]);
-        } else if ($value === '--test-directory') {
+        } elseif ($value === '--test-directory') {
             unset($arguments[$key]);
 
             if (isset($arguments[$key + 1])) {
@@ -55,6 +61,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]);
@@ -62,7 +73,7 @@ use Symfony\Component\Console\Output\ConsoleOutput;
 
         if (str_contains($value, '--assignee=')) {
             unset($arguments[$key]);
-        } else if ($value === '--assignee') {
+        } elseif ($value === '--assignee') {
             unset($arguments[$key]);
 
             if (isset($arguments[$key + 1])) {
@@ -72,7 +83,7 @@ use Symfony\Component\Console\Output\ConsoleOutput;
 
         if (str_contains($value, '--issue=')) {
             unset($arguments[$key]);
-        } else if ($value === '--issue') {
+        } elseif ($value === '--issue') {
             unset($arguments[$key]);
 
             if (isset($arguments[$key + 1])) {
@@ -82,7 +93,7 @@ use Symfony\Component\Console\Output\ConsoleOutput;
 
         if (str_contains($value, '--ticket=')) {
             unset($arguments[$key]);
-        } else if ($value === '--ticket') {
+        } elseif ($value === '--ticket') {
             unset($arguments[$key]);
 
             if (isset($arguments[$key + 1])) {
@@ -92,7 +103,7 @@ use Symfony\Component\Console\Output\ConsoleOutput;
 
         if (str_contains($value, '--pr=')) {
             unset($arguments[$key]);
-        } else if ($value === '--pr') {
+        } elseif ($value === '--pr') {
             unset($arguments[$key]);
 
             if (isset($arguments[$key + 1])) {
@@ -102,7 +113,7 @@ use Symfony\Component\Console\Output\ConsoleOutput;
 
         if (str_contains($value, '--pull-request=')) {
             unset($arguments[$key]);
-        } else if ($value === '--pull-request') {
+        } elseif ($value === '--pull-request') {
             unset($arguments[$key]);
 
             if (isset($arguments[$key + 1])) {
@@ -117,7 +128,6 @@ use Symfony\Component\Console\Output\ConsoleOutput;
         }
     }
 
-
     // Used when Pest is required using composer.
     $vendorPath = dirname(__DIR__, 4).'/vendor/autoload.php';
 
@@ -134,7 +144,8 @@ use Symfony\Component\Console\Output\ConsoleOutput;
 
     // Get $rootPath based on $autoloadPath
     $rootPath = dirname($autoloadPath, 2);
-    $input = new ArgvInput();
+
+    $input = new ArgvInput;
 
     $testSuite = TestSuite::getInstance(
         $rootPath,
@@ -146,11 +157,15 @@ use Symfony\Component\Console\Output\ConsoleOutput;
     }
 
     if ($todo) {
-        $testSuite->tests->addTestCaseMethodFilter(new TodoTestCaseFilter());
+        $testSuite->tests->addTestCaseMethodFilter(new TodoTestCaseFilter);
+    }
+
+    if ($flaky) {
+        $testSuite->tests->addTestCaseMethodFilter(new FlakyTestCaseFilter);
     }
 
     if ($notes) {
-        $testSuite->tests->addTestCaseMethodFilter(new NotesTestCaseFilter());
+        $testSuite->tests->addTestCaseMethodFilter(new NotesTestCaseFilter);
     }
 
     if ($assignee = $input->getParameterOption('--assignee')) {
@@ -180,6 +195,15 @@ use Symfony\Component\Console\Output\ConsoleOutput;
     try {
         $kernel = Kernel::boot($testSuite, $input, $output);
 
+        $container = Container::getInstance();
+
+        foreach (Kernel::RESTARTERS as $restarterClass) {
+            $restarter = $container->get($restarterClass);
+            assert($restarter instanceof Restarter);
+
+            $restarter->maybeRestart($rootPath, $originalArguments);
+        }
+
         $result = $kernel->handle($originalArguments, $arguments);
 
         $kernel->terminate();

bin/pest-tia-vite-deps.mjs

@@ -0,0 +1,374 @@
+#!/usr/bin/env node
+
+import { readdir, readFile } from 'node:fs/promises'
+import { existsSync } from 'node:fs'
+import { createRequire } from 'node:module'
+import { resolve, relative, extname, sep, join } from 'node:path'
+import { pathToFileURL } from 'node:url'
+
+const PAGE_EXTENSIONS = new Set([
+  '.vue', '.svelte',
+  '.tsx', '.jsx',
+  '.ts', '.js',
+  '.mts', '.cts', '.mjs', '.cjs',
+])
+const ASSET_EXT_RE = /\.(css|scss|sass|less|styl|stylus|svg|png|jpe?g|gif|webp|avif|ico|bmp|woff2?|ttf|eot|otf|md|mdx|txt|html|mp4|webm|mp3|wav|ogg|m4a|pdf|wasm|glsl|frag|vert)$/i
+const PROJECT_ROOT = resolve(process.argv[2] ?? process.cwd())
+const PAGE_DIR_CANDIDATES = [
+  'resources/js/Pages',
+  'resources/js/pages',
+  'assets/js/Pages',
+  'assets/js/pages',
+  'assets/Pages',
+  'assets/pages',
+]
+
+async function loadRolldown() {
+  const projectRequire = createRequire(join(PROJECT_ROOT, 'package.json'))
+  let path = null
+
+  try { path = projectRequire.resolve('rolldown') } catch {}
+
+  if (path === null) {
+    // rolldown-vite installs (vite@npm:rolldown-vite) ship rolldown as a
+    // dependency of the vite package rather than a top-level install.
+    try {
+      const viteRequire = createRequire(projectRequire.resolve('vite/package.json'))
+      path = viteRequire.resolve('rolldown')
+    } catch {}
+  }
+
+  if (path === null) return null
+
+  return await import(pathToFileURL(path).href)
+}
+
+export function stripJsonComments(raw) {
+  let out = ''
+  let inString = false
+  let quote = ''
+  let inLine = false
+  let inBlock = false
+
+  for (let i = 0; i < raw.length; i++) {
+    const c = raw[i]
+    const n = raw[i + 1]
+
+    if (inLine) {
+      if (c === '\n') { inLine = false; out += c }
+      continue
+    }
+    if (inBlock) {
+      if (c === '*' && n === '/') { inBlock = false; i++ }
+      continue
+    }
+    if (inString) {
+      out += c
+      if (c === '\\') { out += n ?? ''; i++; continue }
+      if (c === quote) inString = false
+      continue
+    }
+    if (c === '"' || c === "'") { inString = true; quote = c; out += c; continue }
+    if (c === '/' && n === '/') { inLine = true; i++; continue }
+    if (c === '/' && n === '*') { inBlock = true; i++; continue }
+    if (c === '}' || c === ']') out = out.replace(/,\s*$/, '')
+    out += c
+  }
+
+  return out
+}
+
+async function readJsonWithComments(path) {
+  const raw = await readFile(path, 'utf8')
+  return JSON.parse(stripJsonComments(raw))
+}
+
+export async function loadAliasFromTsconfig(projectRoot = PROJECT_ROOT) {
+  const alias = {}
+  for (const name of ['tsconfig.json', 'jsconfig.json']) {
+    const p = join(projectRoot, name)
+    if (!existsSync(p)) continue
+    let cfg
+    try { cfg = await readJsonWithComments(p) } catch { continue }
+    const baseUrl = resolve(projectRoot, cfg?.compilerOptions?.baseUrl ?? '.')
+    const paths = cfg?.compilerOptions?.paths ?? {}
+    for (const [key, targets] of Object.entries(paths)) {
+      if (!key.endsWith('/*')) continue
+      const t0 = Array.isArray(targets) ? targets[0] : null
+      if (typeof t0 !== 'string' || !t0.endsWith('/*')) continue
+      const aliasKey = key.slice(0, -2)
+      if (alias[aliasKey] !== undefined) continue
+      alias[aliasKey] = resolve(baseUrl, t0.slice(0, -2))
+    }
+  }
+  return alias
+}
+
+const VITE_CONFIG_FILES = [
+  'vite.config.ts',
+  'vite.config.js',
+  'vite.config.mjs',
+  'vite.config.cjs',
+  'vite.config.mts',
+  'vite.config.cts',
+]
+
+function resolveAliasTarget(projectRoot, target) {
+  if (target.startsWith('/')) {
+    // Vite resolves a leading slash against the project root, unless the
+    // config author used a genuinely absolute path.
+    return existsSync(target) ? target : resolve(projectRoot, '.' + target)
+  }
+
+  return resolve(projectRoot, target)
+}
+
+async function usesLaravelVitePlugin(projectRoot) {
+  const p = join(projectRoot, 'package.json')
+  if (!existsSync(p)) return false
+
+  try {
+    const pkg = JSON.parse(await readFile(p, 'utf8'))
+    return Boolean(pkg.dependencies?.['laravel-vite-plugin'] ?? pkg.devDependencies?.['laravel-vite-plugin'])
+  } catch {
+    return false
+  }
+}
+
+export async function loadAliasFromViteConfig(projectRoot = PROJECT_ROOT) {
+  const alias = {}
+  let source = null
+
+  for (const name of VITE_CONFIG_FILES) {
+    const p = join(projectRoot, name)
+    if (!existsSync(p)) continue
+    try { source = await readFile(p, 'utf8') } catch { continue }
+    break
+  }
+
+  if (source !== null) {
+    // The config is executable code we cannot import safely, so extract alias
+    // entries textually: a quoted `@…`/`~…` key, then the last quoted path in
+    // the value expression — covers `'@': '/resources/js'` as well as
+    // `'@': path.resolve(__dirname, 'resources/js')`. The value stops at a
+    // top-level comma; call arguments are kept via the paren group.
+    for (const m of source.matchAll(/['"`]([@~][\w./-]*)['"`]\s*:\s*((?:\([^)\n]*\)|[^,\n])*)/g)) {
+      const key = m[1]
+      if (alias[key] !== undefined) continue
+
+      const paths = [...m[2].matchAll(/['"`]([^'"`]+)['"`]/g)].map((p) => p[1])
+      const target = paths.length > 0 ? paths[paths.length - 1] : null
+      if (!target || target.includes('*')) continue
+
+      alias[key] = resolveAliasTarget(projectRoot, target)
+    }
+  }
+
+  // laravel-vite-plugin registers '@' → resources/js by default.
+  if (alias['@'] === undefined && (await usesLaravelVitePlugin(projectRoot))) {
+    alias['@'] = resolve(projectRoot, 'resources/js')
+  }
+
+  return alias
+}
+
+async function listPageFiles(pagesDir) {
+  if (!existsSync(pagesDir)) return []
+
+  const out = []
+  const walk = async (dir) => {
+    let entries
+    try { entries = await readdir(dir, { withFileTypes: true }) } catch { return }
+    for (const entry of entries) {
+      const full = resolve(dir, entry.name)
+      if (entry.isDirectory()) { await walk(full); continue }
+      if (PAGE_EXTENSIONS.has(extname(entry.name))) out.push(full)
+    }
+  }
+
+  await walk(pagesDir)
+  return out
+}
+
+async function discoverPagesDir() {
+  const override = process.env.TIA_VITE_PAGES_DIR
+  if (override && override.length > 0) {
+    return resolve(PROJECT_ROOT, override.replace(/\\/g, '/'))
+  }
+
+  for (const rel of PAGE_DIR_CANDIDATES) {
+    const abs = resolve(PROJECT_ROOT, rel)
+    if (!existsSync(abs)) continue
+    const files = await listPageFiles(abs)
+    if (files.length > 0) return abs
+  }
+
+  return null
+}
+
+function componentNameFor(pageAbs, pagesDir) {
+  const rel = relative(pagesDir, pageAbs).split(sep).join('/')
+  const ext = extname(rel)
+  return rel.slice(0, rel.length - ext.length)
+}
+
+function isLocalSpecifier(source, aliasKeys) {
+  if (source.startsWith('.') || source.startsWith('/')) return true
+  for (const key of aliasKeys) {
+    if (source === key || source.startsWith(key + '/')) return true
+  }
+  return false
+}
+
+async function main() {
+  const pagesDir = await discoverPagesDir()
+
+  if (pagesDir === null) {
+    process.stdout.write('{}')
+    return
+  }
+
+  const pages = await listPageFiles(pagesDir)
+
+  if (pages.length === 0) {
+    process.stdout.write('{}')
+    return
+  }
+
+  const loaded = await loadRolldown()
+
+  if (loaded === null) {
+    process.stdout.write('{}')
+    return
+  }
+
+  const { rolldown } = loaded
+  // The vite config is what the dev server actually resolves with — let it win.
+  const alias = { ...(await loadAliasFromTsconfig()), ...(await loadAliasFromViteConfig()) }
+  const aliasKeys = Object.keys(alias)
+
+  const graph = new Map()
+
+  const collector = {
+    name: 'pest-tia-collector',
+    moduleParsed(info) {
+      const id = info.id
+      if (!id || id.startsWith('\0')) return
+      const deps = new Set()
+      for (const i of info.importedIds) if (i && !i.startsWith('\0')) deps.add(i)
+      for (const i of info.dynamicallyImportedIds) if (i && !i.startsWith('\0')) deps.add(i)
+      graph.set(id, deps)
+    },
+  }
+
+  const externalBare = {
+    name: 'pest-tia-external-bare',
+    resolveId(source) {
+      if (!source) return null
+      if (isLocalSpecifier(source, aliasKeys)) return null
+      return { id: source, external: true }
+    },
+  }
+
+  const assetStub = {
+    name: 'pest-tia-asset-stub',
+    load(id) {
+      if (!id) return null
+      if (ASSET_EXT_RE.test(id)) {
+        return { code: 'export default null', moduleSideEffects: false }
+      }
+      return null
+    },
+  }
+
+  const input = Object.create(null)
+  for (let i = 0; i < pages.length; i++) input[`p${i}`] = pages[i]
+
+  const bundle = await rolldown({
+    input,
+    cwd: PROJECT_ROOT,
+    resolve: {
+      alias,
+      extensions: ['.tsx', '.ts', '.jsx', '.js', '.mts', '.cts', '.mjs', '.cjs', '.json', '.vue', '.svelte'],
+    },
+    transform: { jsx: 'preserve' },
+    treeshake: false,
+    plugins: [externalBare, assetStub, collector],
+    logLevel: 'silent',
+    onLog: () => {},
+  })
+
+  try {
+    await bundle.generate({ format: 'esm' })
+  } finally {
+    await bundle.close()
+  }
+
+  const reverse = new Map()
+  const transitiveCache = new Map()
+
+  const computeTransitive = (id, stack) => {
+    const cached = transitiveCache.get(id)
+    if (cached) return cached
+    if (stack.has(id)) return null
+
+    stack.add(id)
+    const acc = new Set()
+    // A set computed while skipping an in-stack (cyclic) dependency is missing
+    // that dependency's subtree and must not be memoized — the ancestor call
+    // completes it for the current traversal, but a cached copy would leak the
+    // incomplete set into other pages' traversals.
+    let complete = true
+    const deps = graph.get(id)
+    if (deps) {
+      for (const dep of deps) {
+        if (!dep || dep.startsWith('\0')) continue
+        if (dep.startsWith(PROJECT_ROOT)) {
+          const rel = relative(PROJECT_ROOT, dep).split(sep).join('/')
+          acc.add(rel)
+        }
+        if (stack.has(dep)) {
+          complete = false
+          continue
+        }
+        const child = computeTransitive(dep, stack)
+        if (child) for (const r of child) acc.add(r)
+        if (!transitiveCache.has(dep)) complete = false
+      }
+    }
+    stack.delete(id)
+    if (complete) transitiveCache.set(id, acc)
+    return acc
+  }
+
+  for (const page of pages) {
+    const pageComponent = componentNameFor(page, pagesDir)
+    const reachable = computeTransitive(page, new Set())
+    if (!reachable) continue
+    for (const rel of reachable) {
+      const bucket = reverse.get(rel) ?? new Set()
+      bucket.add(pageComponent)
+      reverse.set(rel, bucket)
+    }
+  }
+
+  const payload = Object.create(null)
+  const keys = [...reverse.keys()].sort()
+  for (const key of keys) {
+    payload[key] = [...reverse.get(key)].sort()
+  }
+
+  process.stdout.write(JSON.stringify(payload))
+}
+
+const invokedDirectly = process.argv[1] !== undefined
+  && import.meta.url === pathToFileURL(process.argv[1]).href
+
+if (invokedDirectly) {
+  try {
+    await main()
+  } catch (err) {
+    process.stderr.write(String(err?.stack ?? err ?? 'unknown error'))
+    process.exit(1)
+  }
+}

bin/worker.php

@@ -6,6 +6,7 @@ use ParaTest\WrapperRunner\ApplicationForWrapperWorker;
 use ParaTest\WrapperRunner\WrapperWorker;
 use Pest\Kernel;
 use Pest\Plugins\Actions\CallsHandleArguments;
+use Pest\Support\Container;
 use Pest\TestSuite;
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Console\Output\ConsoleOutput;
@@ -32,10 +33,13 @@ $bootPest = (static function (): void {
         'status-file:',
         'progress-file:',
         'unexpected-output-file:',
-        'testresult-file:',
+        'test-result-file:',
+        'result-cache-file:',
         'teamcity-file:',
         'testdox-file:',
         'testdox-color',
+        'testdox-columns:',
+        'testdox-summary',
         'phpunit-argv:',
     ]);
 
@@ -55,13 +59,23 @@ $bootPest = (static function (): void {
         }
     }
 
+    $container = Container::getInstance();
+    $rootPath = dirname(PHPUNIT_COMPOSER_INSTALL, 2);
+
+    foreach (Kernel::RESTARTERS as $restarterClass) {
+        $restarter = $container->get($restarterClass);
+
+        $restarter->maybeRestart($rootPath, $_SERVER['argv']);
+    }
+
     assert(isset($getopt['status-file']) && is_string($getopt['status-file']));
     $statusFile = fopen($getopt['status-file'], 'wb');
     assert(is_resource($statusFile));
 
     assert(isset($getopt['progress-file']) && is_string($getopt['progress-file']));
     assert(isset($getopt['unexpected-output-file']) && is_string($getopt['unexpected-output-file']));
-    assert(isset($getopt['testresult-file']) && is_string($getopt['testresult-file']));
+    assert(isset($getopt['test-result-file']) && is_string($getopt['test-result-file']));
+    assert(! isset($getopt['result-cache-file']) || is_string($getopt['result-cache-file']));
     assert(! isset($getopt['teamcity-file']) || is_string($getopt['teamcity-file']));
     assert(! isset($getopt['testdox-file']) || is_string($getopt['testdox-file']));
 
@@ -77,11 +91,12 @@ $bootPest = (static function (): void {
         $phpunitArgv,
         $getopt['progress-file'],
         $getopt['unexpected-output-file'],
-        $getopt['testresult-file'],
+        $getopt['test-result-file'],
+        $getopt['result-cache-file'] ?? null,
         $getopt['teamcity-file'] ?? null,
         $getopt['testdox-file'] ?? null,
         isset($getopt['testdox-color']),
-        $getopt['testdox-columns'] ?? null,
+        (int) ($getopt['testdox-columns'] ?? null),
     );
 
     while (true) {
@@ -96,7 +111,6 @@ $bootPest = (static function (): void {
             exit;
         }
 
-        // It must be a 1 byte string to ensure filesize() is equal to the number of tests executed
         $exitCode = $application->runTest(realpath(trim($testPath)));
 
         fwrite($statusFile, (string) $exitCode);

composer.json

@@ -17,18 +17,21 @@
         }
     ],
     "require": {
-        "php": "^8.2.0",
+        "php": "^8.4",
-        "brianium/paratest": "^7.5.5",
+        "brianium/paratest": "^7.24.0",
-        "nunomaduro/collision": "^8.4.0",
+        "nunomaduro/collision": "^8.9.5",
-        "nunomaduro/termwind": "^2.1.0",
+        "nunomaduro/termwind": "^2.4.0",
-        "pestphp/pest-plugin": "^3.0.0",
+        "pestphp/pest-plugin": "^5.0.0",
-        "pestphp/pest-plugin-arch": "^3.0.0",
+        "pestphp/pest-plugin-arch": "^5.0.0",
-        "pestphp/pest-plugin-mutate": "^3.0.5",
+        "pestphp/pest-plugin-mutate": "^5.0.1",
-        "phpunit/phpunit": "^11.3.6"
+        "pestphp/pest-plugin-profanity": "^5.0.0",
+        "phpunit/phpunit": "^13.3.0",
+        "symfony/process": "^8.1.0"
     },
     "conflict": {
-        "phpunit/phpunit": ">11.3.6",
+        "filp/whoops": "<2.18.3",
-        "sebastian/exporter": "<6.0.0",
+        "phpunit/phpunit": ">13.3.0",
+        "sebastian/exporter": "<7.0.0",
         "webmozart/assert": "<1.11.0"
     },
     "autoload": {
@@ -45,22 +48,30 @@
             "Tests\\Fixtures\\Covers\\": "tests/Fixtures/Covers",
             "Tests\\Fixtures\\Inheritance\\": "tests/Fixtures/Inheritance",
             "Tests\\Fixtures\\Arch\\": "tests/Fixtures/Arch",
+            "Tests\\Fixtures\\Tia\\": "tests/Fixtures/Tia",
             "Tests\\": "tests/PHPUnit/"
         },
+        "classmap": [
+            "tests/Fixtures/Arch/ToBeCasedCorrectly/IncorrectCasing/incorrectCasing.php"
+        ],
         "files": [
             "tests/Autoload.php"
         ]
     },
     "require-dev": {
-        "pestphp/pest-dev-tools": "^3.0.0",
+        "pestphp/pest-dev-tools": "^5.0.0",
-        "pestphp/pest-plugin-type-coverage": "^3.0.0",
+        "pestphp/pest-plugin-browser": "^5.0.0",
-        "symfony/process": "^7.1.5"
+        "pestphp/pest-plugin-phpstan": "^5.0.2",
+        "pestphp/pest-plugin-rector": "^5.0.3",
+        "pestphp/pest-plugin-type-coverage": "^5.0.2",
+        "psy/psysh": "^0.12.24"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "config": {
         "sort-packages": true,
         "preferred-install": "dist",
+        "process-timeout": 0,
         "allow-plugins": {
             "pestphp/pest-plugin": true
         }
@@ -69,19 +80,24 @@
         "bin/pest"
     ],
     "scripts": {
-        "refacto": "rector",
+        "lint": [
-        "lint": "pint",
+            "rector",
-        "test:refacto": "rector --dry-run",
+            "pint --parallel"
-        "test:lint": "pint --test",
+        ],
+        "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",
-        "test:unit": "php bin/pest --colors=always --exclude-group=integration --compact",
+        "test:unit": "php bin/pest --exclude-group=integration --compact",
-        "test:inline": "php bin/pest --colors=always --configuration=phpunit.inline.xml",
+        "test:inline": "php bin/pest --configuration=phpunit.inline.xml",
-        "test:parallel": "php bin/pest --colors=always --exclude-group=integration --parallel --processes=3",
+        "test:parallel": "php bin/pest --exclude-group=integration --parallel --processes=3",
-        "test:integration": "php bin/pest --colors=always --group=integration -v",
+        "test:integration": "php bin/pest --group=integration -v",
-        "update:snapshots": "REBUILD_SNAPSHOTS=true php bin/pest --colors=always --update-snapshots",
+        "test:tia": "php bin/pest --group=tia -v",
+        "update:snapshots": "REBUILD_SNAPSHOTS=true php bin/pest --update-snapshots --exclude-group=tia",
         "test": [
-            "@test:refacto",
             "@test:lint",
             "@test:type:check",
             "@test:type:coverage",
@@ -110,6 +126,8 @@
                 "Pest\\Plugins\\Snapshot",
                 "Pest\\Plugins\\Verbose",
                 "Pest\\Plugins\\Version",
+                "Pest\\Plugins\\Shard",
+                "Pest\\Plugins\\Tia",
                 "Pest\\Plugins\\Parallel"
             ]
         },

docker-compose.yml

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

overrides/Event/Value/ThrowableBuilder.php

@@ -1,37 +1,5 @@
 <?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);
 
 /*
@@ -52,6 +20,8 @@ use PHPUnit\Util\Filter;
 use PHPUnit\Util\ThrowableToStringMapper;
 
 /**
+ * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
+ *
  * @internal This class is not covered by the backward compatibility promise for PHPUnit
  */
 final readonly class ThrowableBuilder
@@ -68,7 +38,7 @@ final readonly class ThrowableBuilder
             $previous = self::from($previous);
         }
 
-        $trace = Filter::getFilteredStacktrace($t);
+        $trace = Filter::stackTraceFromThrowableAsString($t);
 
         if ($t instanceof RenderableOnCollisionEditor && $frame = $t->toCollisionEditor()) {
             $file = $frame->getFile();
@@ -82,7 +52,7 @@ final readonly class ThrowableBuilder
             $t->getMessage(),
             ThrowableToStringMapper::map($t),
             $trace,
-            $previous
+            $previous,
         );
     }
 }

overrides/Logging/JUnit/JunitXmlLogger.php

@@ -1,6 +1,7 @@
 <?php
 
 declare(strict_types=1);
+
 /*
  * This file is part of PHPUnit.
  *
@@ -14,6 +15,9 @@ namespace PHPUnit\Logging\JUnit;
 
 use DOMDocument;
 use DOMElement;
+use Pest\Logging\Converter;
+use Pest\Support\Container;
+use Pest\TestSuite;
 use PHPUnit\Event\Code\Test;
 use PHPUnit\Event\Code\TestMethod;
 use PHPUnit\Event\EventFacadeIsSealedException;
@@ -27,6 +31,7 @@ use PHPUnit\Event\Test\Finished;
 use PHPUnit\Event\Test\MarkedIncomplete;
 use PHPUnit\Event\Test\PreparationStarted;
 use PHPUnit\Event\Test\Prepared;
+use PHPUnit\Event\Test\PrintedUnexpectedOutput;
 use PHPUnit\Event\Test\Skipped;
 use PHPUnit\Event\TestSuite\Started;
 use PHPUnit\Event\UnknownSubscriberTypeException;
@@ -41,13 +46,15 @@ use function str_replace;
 use function trim;
 
 /**
+ * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
+ *
  * @internal This class is not covered by the backward compatibility promise for PHPUnit
  */
 final class JunitXmlLogger
 {
     private readonly Printer $printer;
 
-    private readonly \Pest\Logging\Converter $converter; // pest-added
+    private readonly Converter $converter;
 
     private DOMDocument $document;
 
@@ -59,32 +66,32 @@ final class JunitXmlLogger
     private array $testSuites = [];
 
     /**
-     * @psalm-var array<int,int>
+     * @var array<int,int>
      */
     private array $testSuiteTests = [0];
 
     /**
-     * @psalm-var array<int,int>
+     * @var array<int,int>
      */
     private array $testSuiteAssertions = [0];
 
     /**
-     * @psalm-var array<int,int>
+     * @var array<int,int>
      */
     private array $testSuiteErrors = [0];
 
     /**
-     * @psalm-var array<int,int>
+     * @var array<int,int>
      */
     private array $testSuiteFailures = [0];
 
     /**
-     * @psalm-var array<int,int>
+     * @var array<int,int>
      */
     private array $testSuiteSkipped = [0];
 
     /**
-     * @psalm-var array<int,int>
+     * @var array<int,int>
      */
     private array $testSuiteTimes = [0];
 
@@ -105,15 +112,14 @@ final class JunitXmlLogger
     public function __construct(Printer $printer, Facade $facade)
     {
         $this->printer = $printer;
-        $this->converter = new \Pest\Logging\Converter(\Pest\Support\Container::getInstance()->get(\Pest\TestSuite::class)->rootPath); // pest-added
+        $this->converter = new Converter(Container::getInstance()->get(TestSuite::class)->rootPath);
-
         $this->registerSubscribers($facade);
         $this->createDocument();
     }
 
     public function flush(): void
     {
-        $this->printer->print($this->document->saveXML());
+        $this->printer->print($this->document->saveXML() ?: '');
 
         $this->printer->flush();
     }
@@ -121,10 +127,9 @@ final class JunitXmlLogger
     public function testSuiteStarted(Started $event): void
     {
         $testSuite = $this->document->createElement('testsuite');
-        $testSuite->setAttribute('name', $this->converter->getTestSuiteName($event->testSuite())); // pest-changed
+        $testSuite->setAttribute('name', $this->converter->getTestSuiteName($event->testSuite()));
-
         if ($event->testSuite()->isForTestClass()) {
-            $testSuite->setAttribute('file', $this->converter->getTestSuiteLocation($event->testSuite()) ?? ''); // pest-changed
+            $testSuite->setAttribute('file', $this->converter->getTestSuiteLocation($event->testSuite()) ?? '');
         }
 
         if ($this->testSuiteLevel > 0) {
@@ -195,28 +200,34 @@ final class JunitXmlLogger
         $this->createTestCase($event);
     }
 
-    /**
-     * @throws InvalidArgumentException
-     */
     public function testPreparationFailed(): void
     {
         $this->preparationFailed = true;
     }
 
-    /**
-     * @throws InvalidArgumentException
-     */
     public function testPrepared(): void
     {
         $this->prepared = true;
     }
 
+    public function testPrintedUnexpectedOutput(PrintedUnexpectedOutput $event): void
+    {
+        assert($this->currentTestCase !== null);
+
+        $systemOut = $this->document->createElement(
+            'system-out',
+            Xml::prepareString($event->output()),
+        );
+
+        $this->currentTestCase->appendChild($systemOut);
+    }
+
     /**
      * @throws InvalidArgumentException
      */
     public function testFinished(Finished $event): void
     {
-        if ($this->preparationFailed) {
+        if (! $this->prepared || $this->preparationFailed) {
             return;
         }
 
@@ -305,9 +316,11 @@ final class JunitXmlLogger
             new TestPreparationStartedSubscriber($this),
             new TestPreparationFailedSubscriber($this),
             new TestPreparedSubscriber($this),
+            new TestPrintedUnexpectedOutputSubscriber($this),
             new TestFinishedSubscriber($this),
             new TestErroredSubscriber($this),
             new TestFailedSubscriber($this),
+            new TestMarkedIncompleteSubscriber($this),
             new TestSkippedSubscriber($this),
             new TestRunnerExecutionFinishedSubscriber($this),
         );
@@ -333,12 +346,11 @@ final class JunitXmlLogger
 
         assert($this->currentTestCase !== null);
 
-        $buffer = $this->converter->getTestCaseMethodName($event->test()); // pest-changed
+        $buffer = $this->converter->getTestCaseMethodName($event->test());
-
         $throwable = $event->throwable();
         $buffer .= trim(
-            $this->converter->getExceptionMessage($throwable).PHP_EOL. // pest-changed
+            $this->converter->getExceptionMessage($throwable).PHP_EOL.
-            $this->converter->getExceptionDetails($throwable), // pest-changed
+            $this->converter->getExceptionDetails($throwable),
         );
 
         $fault = $this->document->createElement(
@@ -431,25 +443,22 @@ final class JunitXmlLogger
     /**
      * @throws InvalidArgumentException
      *
-     * @psalm-assert !null $this->currentTestCase
+     * @phpstan-assert !null $this->currentTestCase
      */
     private function createTestCase(Errored|Failed|MarkedIncomplete|PreparationStarted|Prepared|Skipped $event): void
     {
         $testCase = $this->document->createElement('testcase');
 
         $test = $event->test();
-        $file = $this->converter->getTestCaseLocation($test); // pest-added
+        $file = $this->converter->getTestCaseLocation($test);
-
+        $testCase->setAttribute('name', $this->converter->getTestCaseMethodName($test));
-        $testCase->setAttribute('name', $this->converter->getTestCaseMethodName($test)); // pest-changed
+        $testCase->setAttribute('file', $file);
-        $testCase->setAttribute('file', $file); // pest-changed
-
         if ($test->isTestMethod()) {
             assert($test instanceof TestMethod);
 
-            //$testCase->setAttribute('line', (string) $test->line()); // pest-removed
+            $className = $this->converter->getTrimmedTestClassName($test);
-            $className = $this->converter->getTrimmedTestClassName($test); // pest-added
+            $testCase->setAttribute('class', $className);
-            $testCase->setAttribute('class', $className); // pest-changed
+            $testCase->setAttribute('classname', str_replace('\\', '.', $className));
-            $testCase->setAttribute('classname', str_replace('\\', '.', $className)); // pest-changed
         }
 
         $this->currentTestCase = $testCase;

overrides/ParaTest/WrapperRunner/ProgressPrinterOutput.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ParaTest\WrapperRunner;
+
+use PHPUnit\TextUI\Output\Printer;
+
+use function preg_match;
+
+/**
+ * @internal
+ */
+final readonly class ProgressPrinterOutput implements Printer
+{
+    public function __construct(
+        private Printer $progressPrinter,
+        private Printer $outputPrinter,
+    ) {}
+
+    public function print(string $buffer): void
+    {
+        if (
+            $buffer === "\n"
+            || preg_match('/^ +$/', $buffer) === 1
+            || preg_match('/^ \d+ \/ \d+ \(...%\)$/', $buffer) === 1
+        ) {
+            return;
+        }
+
+        match ($buffer) {
+            'E', 'F', 'I', 'N', 'D', 'R', 'W', 'S', 'T', '.' => $this->progressPrinter->print($buffer),
+            default => $this->outputPrinter->print($buffer),
+        };
+    }
+
+    public function flush(): void
+    {
+        $this->progressPrinter->flush();
+        $this->outputPrinter->flush();
+    }
+}

overrides/Runner/Filter/NameFilterIterator.php

@@ -1,37 +1,5 @@
 <?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);
 
 /*
@@ -48,42 +16,32 @@ namespace PHPUnit\Runner\Filter;
 use Pest\Contracts\HasPrintableTestCaseName;
 use PHPUnit\Framework\Test;
 use PHPUnit\Framework\TestSuite;
-use PHPUnit\Runner\PhptTestCase;
+use PHPUnit\Runner\Phpt\TestCase as PhptTestCase;
 use RecursiveFilterIterator;
 use RecursiveIterator;
 
 use function end;
 use function preg_match;
-use function sprintf;
+use function trim;
-use function str_replace;
 
 /**
+ * @extends RecursiveFilterIterator<int, Test, RecursiveIterator<int, Test>>
+ *
  * @internal This class is not covered by the backward compatibility promise for PHPUnit
  */
 abstract class NameFilterIterator extends RecursiveFilterIterator
 {
-    /**
+    private readonly CompiledNameFilter $filter;
-     * @psalm-var non-empty-string
-     */
-    private readonly string $regularExpression;
-
-    private readonly ?int $dataSetMinimum;
-
-    private readonly ?int $dataSetMaximum;
 
     /**
-     * @psalm-param RecursiveIterator<int, Test> $iterator
+     * @param  RecursiveIterator<int, Test>  $iterator
-     * @psalm-param non-empty-string $filter
+     * @param  non-empty-string  $filter
      */
     public function __construct(RecursiveIterator $iterator, string $filter)
     {
         parent::__construct($iterator);
 
-        $preparedFilter = $this->prepareFilter($filter);
+        $this->filter = CompiledNameFilter::from($filter);
-
-        $this->regularExpression = $preparedFilter['regularExpression'];
-        $this->dataSetMinimum = $preparedFilter['dataSetMinimum'];
-        $this->dataSetMaximum = $preparedFilter['dataSetMaximum'];
     }
 
     public function accept(): bool
@@ -99,80 +57,22 @@ abstract class NameFilterIterator extends RecursiveFilterIterator
         }
 
         if ($test instanceof HasPrintableTestCaseName) {
-            $name = $test::getPrintableTestCaseName().'::'.$test->getPrintableTestCaseMethodName();
+            $name = trim(
+                $test::getPrintableTestCaseName().'::'.$test->getPrintableTestCaseMethodName().$test->dataSetAsString()
+            );
         } else {
             $name = $test::class.'::'.$test->nameWithDataSet();
         }
 
-        $accepted = @preg_match($this->regularExpression, $name, $matches) === 1;
+        $accepted = @preg_match($this->filter->regularExpression(), $name, $matches) === 1;
 
-        if ($accepted && isset($this->dataSetMaximum)) {
+        if ($accepted && $this->filter->hasDataSetRange()) {
             $set = end($matches);
-            $accepted = $set >= $this->dataSetMinimum && $set <= $this->dataSetMaximum;
+            $accepted = $set >= $this->filter->dataSetMinimum() && $set <= $this->filter->dataSetMaximum();
         }
 
         return $this->doAccept($accepted);
     }
 
     abstract protected function doAccept(bool $result): bool;
-
-    /**
-     * @psalm-param non-empty-string $filter
-     *
-     * @psalm-return array{regularExpression: non-empty-string, dataSetMinimum: ?int, dataSetMaximum: ?int}
-     */
-    private function prepareFilter(string $filter): array
-    {
-        $dataSetMinimum = null;
-        $dataSetMaximum = null;
-
-        if (@preg_match($filter, '') === false) {
-            // Handles:
-            //  * testAssertEqualsSucceeds#4
-            //  * testAssertEqualsSucceeds#4-8
-            if (preg_match('/^(.*?)#(\d+)(?:-(\d+))?$/', $filter, $matches)) {
-                if (isset($matches[3]) && $matches[2] < $matches[3]) {
-                    $filter = sprintf(
-                        '%s.*with data set #(\d+)$',
-                        $matches[1],
-                    );
-
-                    $dataSetMinimum = (int) $matches[2];
-                    $dataSetMaximum = (int) $matches[3];
-                } else {
-                    $filter = sprintf(
-                        '%s.*with data set #%s$',
-                        $matches[1],
-                        $matches[2],
-                    );
-                }
-            } // Handles:
-            //  * testDetermineJsonError@JSON_ERROR_NONE
-            //  * testDetermineJsonError@JSON.*
-            elseif (preg_match('/^(.*?)@(.+)$/', $filter, $matches)) {
-                $filter = sprintf(
-                    '%s.*with data set "%s"$',
-                    $matches[1],
-                    $matches[2],
-                );
-            }
-
-            // Escape delimiters in regular expression. Do NOT use preg_quote,
-            // to keep magic characters.
-            $filter = sprintf(
-                '/%s/i',
-                str_replace(
-                    '/',
-                    '\\/',
-                    $filter,
-                ),
-            );
-        }
-
-        return [
-            'regularExpression' => $filter,
-            'dataSetMinimum' => $dataSetMinimum,
-            'dataSetMaximum' => $dataSetMaximum,
-        ];
-    }
 }

overrides/Runner/ResultCache/DefaultResultCache.php

@@ -1,195 +0,0 @@
-<?php
-
-/*
- * BSD 3-Clause License
- *
- * Copyright (c) 2001-2023, Sebastian Bergmann
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-declare(strict_types=1);
-
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace PHPUnit\Runner\ResultCache;
-
-use const DIRECTORY_SEPARATOR;
-
-use PHPUnit\Framework\TestStatus\TestStatus;
-use PHPUnit\Runner\DirectoryCannotBeCreatedException;
-use PHPUnit\Runner\Exception;
-use PHPUnit\Util\Filesystem;
-
-use function array_keys;
-use function assert;
-use function dirname;
-use function file_get_contents;
-use function file_put_contents;
-use function is_array;
-use function is_dir;
-use function is_file;
-use function json_decode;
-use function json_encode;
-use function Pest\version;
-
-/**
- * @internal This class is not covered by the backward compatibility promise for PHPUnit
- */
-final class DefaultResultCache implements ResultCache
-{
-    /**
-     * @var string
-     */
-    private const DEFAULT_RESULT_CACHE_FILENAME = '.phpunit.result.cache';
-
-    private readonly string $cacheFilename;
-
-    /**
-     * @psalm-var array<string, TestStatus>
-     */
-    private array $defects = [];
-
-    /**
-     * @psalm-var array<string, float>
-     */
-    private array $times = [];
-
-    public function __construct(?string $filepath = null)
-    {
-        if ($filepath !== null && is_dir($filepath)) {
-            $filepath .= DIRECTORY_SEPARATOR.self::DEFAULT_RESULT_CACHE_FILENAME;
-        }
-
-        $this->cacheFilename = $filepath ?? $_ENV['PHPUNIT_RESULT_CACHE'] ?? self::DEFAULT_RESULT_CACHE_FILENAME;
-    }
-
-    public function setStatus(string $id, TestStatus $status): void
-    {
-        if ($status->isSuccess()) {
-            return;
-        }
-
-        $this->defects[$id] = $status;
-    }
-
-    public function status(string $id): TestStatus
-    {
-        return $this->defects[$id] ?? TestStatus::unknown();
-    }
-
-    public function setTime(string $id, float $time): void
-    {
-        $this->times[$id] = $time;
-    }
-
-    public function time(string $id): float
-    {
-        return $this->times[$id] ?? 0.0;
-    }
-
-    public function load(): void
-    {
-        if (! is_file($this->cacheFilename)) {
-            return;
-        }
-
-        $contents = file_get_contents($this->cacheFilename);
-
-        if ($contents === false) {
-            return;
-        }
-
-        $data = json_decode(
-            $contents,
-            true,
-        );
-
-        if ($data === null) {
-            return;
-        }
-
-        if (! isset($data['version'])) {
-            return;
-        }
-
-        if ($data['version'] !== $this->cacheVersion()) {
-            return;
-        }
-
-        assert(isset($data['defects']) && is_array($data['defects']));
-        assert(isset($data['times']) && is_array($data['times']));
-
-        foreach (array_keys($data['defects']) as $test) {
-            $data['defects'][$test] = TestStatus::from($data['defects'][$test]);
-        }
-
-        $this->defects = $data['defects'];
-        $this->times = $data['times'];
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function persist(): void
-    {
-        if (! Filesystem::createDirectory(dirname($this->cacheFilename))) {
-            throw new DirectoryCannotBeCreatedException($this->cacheFilename);
-        }
-
-        $data = [
-            'version' => $this->cacheVersion(),
-            'defects' => [],
-            'times' => $this->times,
-        ];
-
-        foreach ($this->defects as $test => $status) {
-            $data['defects'][$test] = $status->asInt();
-        }
-
-        file_put_contents(
-            $this->cacheFilename,
-            json_encode($data),
-            LOCK_EX,
-        );
-    }
-
-    /**
-     * Returns the cache version.
-     */
-    private function cacheVersion(): string
-    {
-        return 'pest_'.version();
-    }
-}

overrides/Runner/TestRunHistory/DefaultTestRunHistory.php

@@ -0,0 +1,302 @@
+<?php
+
+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\TestRunHistory;
+
+use const DIRECTORY_SEPARATOR;
+use const LOCK_EX;
+use const LOCK_UN;
+
+use PHPUnit\Framework\TestStatus\TestStatus;
+use PHPUnit\Runner\DirectoryDoesNotExistException;
+use PHPUnit\Runner\Exception;
+use PHPUnit\Util\Filesystem;
+
+use function array_keys;
+use function dirname;
+use function fclose;
+use function file_get_contents;
+use function flock;
+use function fopen;
+use function ftruncate;
+use function fwrite;
+use function is_array;
+use function is_dir;
+use function is_file;
+use function is_float;
+use function is_int;
+use function is_string;
+use function json_decode;
+use function json_encode;
+use function Pest\version;
+use function rewind;
+use function stream_get_contents;
+
+/**
+ * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ */
+final class DefaultTestRunHistory implements TestRunHistory
+{
+    private const string DEFAULT_FILENAME = '.phpunit.result.cache';
+
+    private readonly string $filename;
+
+    /**
+     * @var array<string, TestStatus>
+     */
+    private array $defects = [];
+
+    /**
+     * @var array<string, float>
+     */
+    private array $times = [];
+
+    /**
+     * @var array<string, true>
+     */
+    private array $changedDefects = [];
+
+    /**
+     * @var array<string, true>
+     */
+    private array $changedTimes = [];
+
+    public function __construct(?string $filepath = null)
+    {
+        if ($filepath !== null && is_dir($filepath)) {
+            $filepath .= DIRECTORY_SEPARATOR.self::DEFAULT_FILENAME;
+        }
+
+        $this->filename = $filepath ?? $_ENV['PHPUNIT_RESULT_CACHE'] ?? self::DEFAULT_FILENAME;
+    }
+
+    public function setStatus(TestRunHistoryId $id, TestStatus $status): void
+    {
+        if ($status->isSuccess()) {
+            return;
+        }
+
+        $this->defects[$id->asString()] = $status;
+        $this->changedDefects[$id->asString()] = true;
+    }
+
+    public function remove(TestRunHistoryId $id): void
+    {
+        unset($this->defects[$id->asString()]);
+
+        $this->changedDefects[$id->asString()] = true;
+    }
+
+    public function status(TestRunHistoryId $id): TestStatus
+    {
+        return $this->defects[$id->asString()] ?? TestStatus::unknown();
+    }
+
+    public function setTime(TestRunHistoryId $id, float $time): void
+    {
+        $this->times[$id->asString()] = $time;
+        $this->changedTimes[$id->asString()] = true;
+    }
+
+    public function time(TestRunHistoryId $id): float
+    {
+        return $this->times[$id->asString()] ?? 0.0;
+    }
+
+    public function mergeWith(self $other): void
+    {
+        foreach ($other->defects as $id => $defect) {
+            $this->defects[$id] = $defect;
+            $this->changedDefects[$id] = true;
+        }
+
+        foreach ($other->times as $id => $time) {
+            $this->times[$id] = $time;
+            $this->changedTimes[$id] = true;
+        }
+    }
+
+    public function load(): void
+    {
+        if (! is_file($this->filename)) {
+            return;
+        }
+
+        $contents = file_get_contents($this->filename);
+
+        if ($contents === false) {
+            // @codeCoverageIgnoreStart
+            return;
+            // @codeCoverageIgnoreEnd
+        }
+
+        $parsed = $this->parse($contents);
+
+        if ($parsed === null) {
+            return;
+        }
+
+        [$this->defects, $this->times] = $parsed;
+
+        $this->changedDefects = [];
+        $this->changedTimes = [];
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function persist(): void
+    {
+        $this->writeToFile(false);
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function persistAndPrune(): void
+    {
+        $this->writeToFile(true);
+    }
+
+    /**
+     * @throws Exception
+     */
+    private function writeToFile(bool $prune): void
+    {
+        if (! Filesystem::createDirectory(dirname($this->filename))) {
+            throw new DirectoryDoesNotExistException(dirname($this->filename));
+        }
+
+        $handle = fopen($this->filename, 'c+');
+
+        if ($handle === false) {
+            // @codeCoverageIgnoreStart
+            return;
+            // @codeCoverageIgnoreEnd
+        }
+
+        flock($handle, LOCK_EX);
+
+        if ($prune) {
+            $defects = [];
+
+            foreach ($this->defects as $id => $status) {
+                if (isset($this->changedDefects[$id])) {
+                    $defects[$id] = $status;
+                }
+            }
+
+            $times = [];
+
+            foreach ($this->times as $id => $time) {
+                if (isset($this->changedTimes[$id]) || isset($this->changedDefects[$id])) {
+                    $times[$id] = $time;
+                }
+            }
+        } else {
+            $parsed = $this->parse((string) stream_get_contents($handle));
+
+            if ($parsed !== null) {
+                [$defects, $times] = $parsed;
+
+                foreach (array_keys($this->changedDefects) as $id) {
+                    if (isset($this->defects[$id])) {
+                        $defects[$id] = $this->defects[$id];
+                    } else {
+                        unset($defects[$id]);
+                    }
+                }
+
+                foreach ($this->times as $id => $time) {
+                    if (isset($this->changedTimes[$id])) {
+                        $times[$id] = $time;
+                    }
+                }
+            } else {
+                $defects = $this->defects;
+                $times = $this->times;
+            }
+        }
+
+        $data = [
+            'version' => $this->version(),
+            'defects' => [],
+            'times' => $times,
+        ];
+
+        foreach ($defects as $test => $status) {
+            $data['defects'][$test] = $status->asInt();
+        }
+
+        $json = json_encode($data);
+
+        if ($json !== false) {
+            ftruncate($handle, 0);
+            rewind($handle);
+            fwrite($handle, $json);
+        }
+
+        flock($handle, LOCK_UN);
+        fclose($handle);
+    }
+
+    /**
+     * @return ?array{0: array<string, TestStatus>, 1: array<string, float>}
+     */
+    private function parse(string $contents): ?array
+    {
+        $data = json_decode(
+            $contents,
+            true,
+        );
+
+        if (! is_array($data)) {
+            return null;
+        }
+
+        if (! isset($data['version']) || $data['version'] !== $this->version()) {
+            return null;
+        }
+
+        if (! isset($data['defects'], $data['times']) || ! is_array($data['defects']) || ! is_array($data['times'])) {
+            return null;
+        }
+
+        $defects = [];
+
+        foreach ($data['defects'] as $test => $status) {
+            if (! is_string($test) || ! is_int($status)) {
+                continue;
+            }
+
+            $defects[$test] = TestStatus::from($status);
+        }
+
+        $times = [];
+
+        foreach ($data['times'] as $test => $time) {
+            if (! is_string($test) || (! is_float($time) && ! is_int($time))) {
+                continue;
+            }
+
+            $times[$test] = (float) $time;
+        }
+
+        return [$defects, $times];
+    }
+
+    private function version(): string
+    {
+        return 'pest_'.version();
+    }
+}

overrides/Runner/TestSuiteLoader.php

@@ -1,37 +1,5 @@
 <?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);
 
 namespace PHPUnit\Runner;
@@ -90,11 +58,11 @@ final class TestSuiteLoader
         (static function () use ($suiteClassFile) {
             try {
                 include_once $suiteClassFile;
+
+                TestSuite::getInstance()->tests->makeIfNeeded($suiteClassFile);
             } catch (Throwable $e) {
                 Panic::with($e);
             }
-
-            TestSuite::getInstance()->tests->makeIfNeeded($suiteClassFile);
         })();
 
         $loadedClasses = array_values(

overrides/Runner/TestSuiteSorter.php

@@ -0,0 +1,389 @@
+<?php
+
+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\IterativeTestSuite;
+use PHPUnit\Framework\Reorderable;
+use PHPUnit\Framework\Test;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\TestSuite;
+use PHPUnit\Runner\TestRunHistory\NullTestRunHistory;
+use PHPUnit\Runner\TestRunHistory\TestRunHistory;
+use PHPUnit\Runner\TestRunHistory\TestRunHistoryId;
+
+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_ASCENDING = 4;
+
+    public const int ORDER_SIZE_ASCENDING = 5;
+
+    public const int ORDER_DURATION_DESCENDING = 6;
+
+    public const int ORDER_SIZE_DESCENDING = 7;
+
+    /**
+     * @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 TestRunHistory $testRunHistory;
+
+    public function __construct(?TestRunHistory $testRunHistory = null)
+    {
+        $this->testRunHistory = $testRunHistory ?? new NullTestRunHistory;
+    }
+
+    /**
+     * @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_ASCENDING,
+            self::ORDER_SIZE_ASCENDING,
+            self::ORDER_DURATION_DESCENDING,
+            self::ORDER_SIZE_DESCENDING,
+        ];
+
+        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 IterativeTestSuite) {
+            return;
+        }
+
+        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
+    {
+        $tests = $suite->tests();
+
+        if ($tests === []) {
+            return;
+        }
+
+        if ($order === self::ORDER_REVERSED) {
+            $tests = $this->reverse($tests);
+        } elseif ($order === self::ORDER_RANDOMIZED) {
+            $tests = $this->randomize($tests);
+        } elseif ($order === self::ORDER_DURATION_ASCENDING) {
+            $tests = $this->sortByDuration($tests);
+        } elseif ($order === self::ORDER_DURATION_DESCENDING) {
+            $tests = $this->sortByDurationDescending($tests);
+        } elseif ($order === self::ORDER_SIZE_ASCENDING) {
+            $tests = $this->sortBySize($tests);
+        } elseif ($order === self::ORDER_SIZE_DESCENDING) {
+            $tests = $this->sortBySizeDescending($tests);
+        }
+
+        if ($orderDefects === self::ORDER_DEFECTS_FIRST) {
+            $tests = $this->sortDefectsFirst($tests);
+        }
+
+        if ($resolveDependencies && ! ($suite instanceof DataProviderTestSuite)) {
+            /** @noinspection PhpParamsInspection */
+            /** @phpstan-ignore argument.type */
+            $tests = $this->resolveDependencies($tests);
+        }
+
+        $suite->setTests($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->testRunHistory->status(TestRunHistoryId::fromReorderable($test))->sortWeight();
+            }
+
+            $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 sortByDurationDescending(array $tests): array
+    {
+        usort(
+            $tests,
+            fn (Test $left, Test $right) => $this->cmpDuration($right, $left),
+        );
+
+        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;
+    }
+
+    /**
+     * @param  list<Test>  $tests
+     * @return list<Test>
+     */
+    private function sortBySizeDescending(array $tests): array
+    {
+        usort(
+            $tests,
+            fn (Test $left, Test $right) => $this->cmpSize($right, $left),
+        );
+
+        return $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;
+
+        return $priorityB <=> $priorityA;
+    }
+
+    private function cmpDuration(Test $a, Test $b): int
+    {
+        return $this->durationWeight($a) <=> $this->durationWeight($b);
+    }
+
+    private function durationWeight(Test $test): float
+    {
+        if ($test instanceof TestSuite) {
+            $sum = 0.0;
+
+            foreach ($test->tests() as $inner) {
+                $sum += $this->durationWeight($inner);
+            }
+
+            return $sum;
+        }
+
+        if ($test instanceof Reorderable) {
+            return $this->testRunHistory->time(TestRunHistoryId::fromReorderable($test));
+        }
+
+        return 0.0;
+    }
+
+    private function cmpSize(Test $a, Test $b): int
+    {
+        return $this->sizeWeight($a) <=> $this->sizeWeight($b);
+    }
+
+    /**
+     * @return positive-int
+     */
+    private function sizeWeight(Test $test): int
+    {
+        if ($test instanceof TestCase || $test instanceof DataProviderTestSuite) {
+            return self::SIZE_SORT_WEIGHT[$test->size()->asString()];
+        }
+
+        if ($test instanceof TestSuite) {
+            $max = 0;
+
+            foreach ($test->tests() as $inner) {
+                $weight = $this->sizeWeight($inner);
+
+                if ($weight > $max) {
+                    $max = $weight;
+                }
+            }
+
+            if ($max > 0) {
+                return $max;
+            }
+        }
+
+        return self::SIZE_SORT_WEIGHT['unknown'];
+    }
+
+    /**
+     * @param  list<TestCase>  $tests
+     * @return list<TestCase>
+     */
+    private function resolveDependencies(array $tests): array
+    {
+        if (! $this->anyTestHasDependencies($tests)) {
+            return $tests;
+        }
+
+        $newTestOrder = [];
+        $i = 0;
+        $provided = [];
+
+        while ($tests !== [] && $i < count($tests)) {
+            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++;
+            }
+        }
+
+        return array_merge($newTestOrder, $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;
+    }
+}

overrides/TextUI/Command/Commands/WarmCodeCoverageCacheCommand.php

@@ -1,37 +1,5 @@
 <?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);
 
 /*

overrides/TextUI/Output/Default/ProgressPrinter/Subscriber/TestSkippedSubscriber.php

@@ -1,37 +1,5 @@
 <?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);
 
 /*
@@ -43,7 +11,7 @@ declare(strict_types=1);
  * file that was distributed with this source code.
  */
 
-namespace Pest\Logging\TeamCity\Subscriber;
+namespace PHPUnit\TextUI\Output\Default\ProgressPrinter;
 
 use PHPUnit\Event\Test\Skipped;
 use PHPUnit\Event\Test\SkippedSubscriber;
@@ -52,24 +20,21 @@ use ReflectionClass;
 /**
  * @internal This class is not covered by the backward compatibility promise for PHPUnit
  */
-final class TestSkippedSubscriber extends Subscriber implements SkippedSubscriber
+final readonly class TestSkippedSubscriber extends Subscriber implements SkippedSubscriber
 {
     public function notify(Skipped $event): void
     {
-        if (str_contains($event->message(), '__TODO__')) {
+        if ($event->message() === '__TODO__') {
             $this->printTodoItem();
         }
 
-        $this->logger()->testSkipped($event);
+        $this->printer()->testSkipped();
     }
 
-    /**
-     * Prints a "T" to the standard PHPUnit output to indicate a todo item.
-     */
     private function printTodoItem(): void
     {
         $mirror = new ReflectionClass($this->printer());
-        $printerMirror = $mirror->getMethod('printProgress');
+        $printProgress = $mirror->getMethod('printProgress');
-        $printerMirror->invoke($this->printer(), 'T');
+        $printProgress->invoke($this->printer(), 'T');
     }
 }

overrides/TextUI/TestSuiteFilterProcessor.php

@@ -1,37 +1,5 @@
 <?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.
@@ -45,6 +13,7 @@ declare(strict_types=1);
 namespace PHPUnit\TextUI;
 
 use Pest\Plugins\Only;
+use Pest\Runner\Filter\EnsureTestCaseIsInitiatedFilter;
 use PHPUnit\Event;
 use PHPUnit\Framework\TestSuite;
 use PHPUnit\Runner\Filter\Factory;
@@ -66,6 +35,12 @@ final readonly class TestSuiteFilterProcessor
     {
         $factory = new Factory;
 
+        // @phpstan-ignore-next-line
+        (fn () => $this->filters[] = [
+            'className' => EnsureTestCaseIsInitiatedFilter::class,
+            'argument' => '',
+        ])->call($factory);
+
         if (! $configuration->hasFilter() &&
             ! $configuration->hasGroups() &&
             ! $configuration->hasExcludeGroups() &&
@@ -73,6 +48,8 @@ final readonly class TestSuiteFilterProcessor
             ! $configuration->hasTestsCovering() &&
             ! $configuration->hasTestsUsing() &&
             ! Only::isEnabled()) {
+            $suite->injectFilter($factory);
+
             return;
         }
 

phpstan-baseline.neon

@@ -0,0 +1,121 @@
+parameters:
+	ignoreErrors:
+		-
+			message: '#^Trait Pest\\Concerns\\Expectable is used zero times and is not analysed\.$#'
+			identifier: trait.unused
+			count: 1
+			path: src/Concerns/Expectable.php
+
+		-
+			message: '#^Trait Pest\\Concerns\\Logging\\WritesToConsole is used zero times and is not analysed\.$#'
+			identifier: trait.unused
+			count: 1
+			path: src/Concerns/Logging/WritesToConsole.php
+
+		-
+			message: '#^Trait Pest\\Concerns\\Testable is used zero times and is not analysed\.$#'
+			identifier: trait.unused
+			count: 1
+			path: src/Concerns/Testable.php
+
+		-
+			message: '#^Method Pest\\Expectation\:\:and\(\) should return Pest\\Expectation\<TAndValue\> but returns \(Pest\\Expectation&TAndValue\)\|Pest\\Expectation\<TAndValue of mixed\>\.$#'
+			identifier: return.type
+			count: 1
+			path: src/Expectation.php
+
+		-
+			message: '#^PHPDoc tag @property for property Pest\\Expectation\:\:\$each contains generic class Pest\\Expectations\\EachExpectation but does not specify its types\: TValue$#'
+			identifier: missingType.generics
+			count: 1
+			path: src/Expectation.php
+
+		-
+			message: '#^PHPDoc tag @property for property Pest\\Expectation\:\:\$not contains generic class Pest\\Expectations\\OppositeExpectation but does not specify its types\: TValue$#'
+			identifier: missingType.generics
+			count: 1
+			path: src/Expectation.php
+
+		-
+			message: '#^Parameter \#2 \$newScope of method Closure\:\:bindTo\(\) expects ''static''\|class\-string\|object\|null, string given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/Expectation.php
+
+		-
+			message: '#^Function expect\(\) should return Pest\\Expectation\<TValue\|null\> but returns Pest\\Expectation\<TValue\|null\>\.$#'
+			identifier: return.type
+			count: 1
+			path: src/Functions.php
+
+		-
+			message: '#^Parameter \#1 \$argv of method PHPUnit\\TextUI\\Application\:\:run\(\) expects list\<string\>, array\<int, string\> given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/Kernel.php
+
+		-
+			message: '#^Call to an undefined method object&TValue of mixed\:\:__toString\(\)\.$#'
+			identifier: method.notFound
+			count: 1
+			path: src/Mixins/Expectation.php
+
+		-
+			message: '#^Call to an undefined method object&TValue of mixed\:\:toArray\(\)\.$#'
+			identifier: method.notFound
+			count: 4
+			path: src/Mixins/Expectation.php
+
+		-
+			message: '#^Call to an undefined method object&TValue of mixed\:\:toSnapshot\(\)\.$#'
+			identifier: method.notFound
+			count: 1
+			path: src/Mixins/Expectation.php
+
+		-
+			message: '#^Call to an undefined method object&TValue of mixed\:\:toString\(\)\.$#'
+			identifier: method.notFound
+			count: 1
+			path: src/Mixins/Expectation.php
+
+		-
+			message: '#^Call to static method PHPUnit\\Framework\\Assert\:\:assertTrue\(\) with true will always evaluate to true\.$#'
+			identifier: staticMethod.alreadyNarrowedType
+			count: 2
+			path: src/Mixins/Expectation.php
+
+		-
+			message: '#^PHPDoc tag @var with type callable\(\)\: bool is not subtype of native type Closure\|null\.$#'
+			identifier: varTag.nativeType
+			count: 1
+			path: src/PendingCalls/TestCall.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 \#7 \$testSuiteSkippedEvents of class PHPUnit\\TestRunner\\TestResult\\TestResult constructor expects list\<PHPUnit\\Event\\TestSuite\\Skipped\>, array given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/Plugins/Parallel/Paratest/WrapperRunner.php
+
+		-
+			message: '#^Parameter \#8 \$testSkippedEvents of class PHPUnit\\TestRunner\\TestResult\\TestResult constructor expects list\<PHPUnit\\Event\\Test\\Skipped\>, array given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/Plugins/Parallel/Paratest/WrapperRunner.php
+
+		-
+			message: '#^Parameter \#9 \$testMarkedIncompleteEvents of class PHPUnit\\TestRunner\\TestResult\\TestResult constructor expects list\<PHPUnit\\Event\\Test\\MarkedIncomplete\>, array given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/Plugins/Parallel/Paratest/WrapperRunner.php
+
+		-
+			message: '#^Property Pest\\Plugins\\Parallel\\Paratest\\WrapperRunner\:\:\$pending \(list\<non\-empty\-string\>\) does not accept array\<int, non\-empty\-string\>\.$#'
+			identifier: assign.propertyType
+			count: 1
+			path: src/Plugins/Parallel/Paratest/WrapperRunner.php

phpstan-pest-extension.neon

@@ -0,0 +1,5 @@
+services:
+    -
+        class: Pest\PHPStan\HigherOrderExpectationTypeExtension
+        tags:
+            - phpstan.broker.expressionTypeResolverExtension

phpstan.neon

@@ -1,23 +1,11 @@
 includes:
-    - vendor/phpstan/phpstan-strict-rules/rules.neon
+    - phpstan-baseline.neon
-    - vendor/ergebnis/phpstan-rules/rules.neon
+    - phpstan-pest-extension.neon
-    - vendor/thecodingmachine/phpstan-strict-rules/phpstan-strict-rules.neon
+    - vendor/pestphp/pest-plugin-phpstan/extension.neon
 
 parameters:
-    level: max
+    level: 7
     paths:
         - src
 
-    checkMissingIterableValueType: true
+    reportUnmatchedIgnoredErrors: false
-    reportUnmatchedIgnoredErrors: true
-
-    ignoreErrors:
-        - "#has a nullable return type declaration.#"
-        - "#Language construct isset\\(\\) should not be used.#"
-        - "#is not allowed to extend#"
-        - "#is concrete, but does not have a Test suffix#"
-        - "#with a nullable type declaration#"
-        - "#type mixed is not subtype of native#"
-        - "# with null as default value#"
-        - "#has parameter \\$closure with default value.#"
-        - "#has parameter \\$description with default value.#"

phpunit.xml

@@ -16,9 +16,11 @@
   <testsuites>
     <testsuite name="default">
       <directory suffix=".php">./tests</directory>
+      <directory suffix=".php">./tests-external</directory>
       <exclude>./tests/.snapshots</exclude>
-      <exclude>./tests/.tests</exclude>
       <exclude>./tests/Fixtures/Inheritance</exclude>
+      <exclude>./tests/Fixtures/Suites</exclude>
+      <exclude>./tests/Fixtures/Tia</exclude>
     </testsuite>
   </testsuites>
   <source>

pint.json

@@ -0,0 +1,8 @@
+{
+    "exclude": [
+        "tests/Fixtures/Suites"
+    ],
+    "rules": {
+        "Pint/phpdoc_type_annotations_only": true
+    }
+}

rector.php

@@ -2,16 +2,55 @@
 
 declare(strict_types=1);
 
+use Pest\Rector\Rules\UseToMatchArrayRector;
+use Pest\Rector\Set\PestSetList;
+use Rector\CodingStyle\Rector\ArrowFunction\ArrowFunctionDelegatingCallToFirstClassCallableRector;
 use Rector\Config\RectorConfig;
+use Rector\DeadCode\Rector\ClassMethod\RemoveDuplicatedReturnSelfDocblockRector;
+use Rector\DeadCode\Rector\ClassMethod\RemoveEmptyClassMethodRector;
+use Rector\DeadCode\Rector\ClassMethod\RemoveParentDelegatingConstructorRector;
+use Rector\DeadCode\Rector\ClassMethod\RemoveReturnTagIncompatibleWithNativeTypeRector;
+use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedConstructorParamRector;
+use Rector\DeadCode\Rector\ClassMethod\RemoveUselessUnionReturnDocblockRector;
+use Rector\DeadCode\Rector\Property\RemoveUnusedPrivatePropertyRector;
+use Rector\TypeDeclaration\Rector\ArrowFunction\AddArrowFunctionReturnTypeRector;
+use Rector\TypeDeclaration\Rector\ClassMethod\NarrowObjectReturnTypeRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector;
 
 return RectorConfig::configure()
     ->withPaths([
         __DIR__.'/src',
+        __DIR__.'/tests',
+    ])
+    ->withSets([
+        PestSetList::CODING_STYLE,
     ])
     ->withSkip([
         __DIR__.'/src/Plugins/Parallel/Paratest/WrapperRunner.php',
+        __DIR__.'/tests/Fixtures/Arch',
+        __DIR__.'/tests/Fixtures/Suites',
         ReturnNeverTypeRector::class,
+        ArrowFunctionDelegatingCallToFirstClassCallableRector::class,
+        NarrowObjectReturnTypeRector::class,
+        RemoveParentDelegatingConstructorRector::class,
+        RemoveDuplicatedReturnSelfDocblockRector::class,
+        RemoveUselessUnionReturnDocblockRector::class,
+        RemoveReturnTagIncompatibleWithNativeTypeRector::class => [
+            __DIR__.'/src/Expectations/HigherOrderExpectation.php',
+        ],
+        UseToMatchArrayRector::class,
+        RemoveEmptyClassMethodRector::class => [
+            __DIR__.'/tests',
+        ],
+        RemoveUnusedConstructorParamRector::class => [
+            __DIR__.'/tests',
+        ],
+        RemoveUnusedPrivatePropertyRector::class => [
+            __DIR__.'/tests',
+        ],
+        AddArrowFunctionReturnTypeRector::class => [
+            __DIR__.'/tests',
+        ],
     ])
     ->withPreparedSets(
         deadCode: true,

resources/boost/skills/pest-testing/SKILL.blade.php

@@ -0,0 +1,196 @@
+---
+name: pest-testing
+description: "Use this skill for Pest PHP testing in Laravel projects only. Trigger whenever any test is being written, edited, fixed, or refactored — including fixing tests that broke after a code change, adding assertions, converting PHPUnit to Pest, adding datasets, and TDD workflows. Always activate when the user asks how to write something in Pest, mentions test files or directories (tests/Feature, tests/Unit, tests/Browser), or needs browser testing, smoke testing multiple pages for JS errors, architecture tests, or faster test runs with Test Impact Analysis. Covers: test()/it()/expect() syntax, datasets, mocking, browser testing (visit/click/fill), smoke testing, arch(), Livewire component tests, RefreshDatabase, Tia (--tia), sharding, and all Pest 5 features. Do not use for factories, seeders, migrations, controllers, models, or non-test PHP code."
+license: MIT
+metadata:
+  author: laravel
+---
+@php
+/** @var \Laravel\Boost\Install\GuidelineAssist $assist */
+@endphp
+# Pest Testing 5
+
+## Documentation
+
+Use `search-docs` for detailed Pest 5 patterns and documentation.
+
+## Basic Usage
+
+### Creating Tests
+
+All tests must be written using Pest. Use `{{ $assist->artisanCommand('make:test --pest {name}') }}`.
+
+The `{name}` argument should include only the path and test name, but should not include the test suite.
+- Incorrect: `{{ $assist->artisanCommand('make:test --pest Feature/SomeFeatureTest') }}` will generate `tests/Feature/Feature/SomeFeatureTest.php`
+- Correct: `{{ $assist->artisanCommand('make:test --pest SomeControllerTest') }}` will generate `tests/Feature/SomeControllerTest.php`
+- Incorrect: `{{ $assist->artisanCommand('make:test --pest --unit Unit/SomeServiceTest') }}` will generate `tests/Unit/Unit/SomeServiceTest.php`
+- Correct: `{{ $assist->artisanCommand('make:test --pest --unit SomeServiceTest') }}` will generate `tests/Unit/SomeServiceTest.php`
+
+### Test Organization
+
+- Unit/Feature tests: `tests/Feature` and `tests/Unit` directories.
+- Browser tests: `tests/Browser/` directory.
+- Do NOT remove tests without approval - these are core application code.
+
+### Basic Test Structure
+
+Pest supports both `test()` and `it()` functions. Before writing new tests, check existing test files in the same directory to match the project's convention. Use `test()` if existing tests use `test()`, or `it()` if they use `it()`.
+
+@boostsnippet("Basic Pest Test Example", "php")
+it('is true', function () {
+    expect(true)->toBeTrue();
+});
+@endboostsnippet
+
+### Running Tests
+
+- Run minimal tests with filter before finalizing: `{{ $assist->artisanCommand('test --compact --filter=testName') }}`.
+- Run all tests: `{{ $assist->artisanCommand('test --compact') }}`.
+- Run file: `{{ $assist->artisanCommand('test --compact tests/Feature/ExampleTest.php') }}`.
+- Run only tests affected by recent changes (Tia): `./vendor/bin/pest --parallel --tia`.
+
+## Assertions
+
+Use specific assertions (`assertSuccessful()`, `assertNotFound()`) instead of `assertStatus()`:
+
+@boostsnippet("Pest Response Assertion", "php")
+it('returns all', function () {
+    $this->postJson('/api/docs', [])->assertSuccessful();
+});
+@endboostsnippet
+
+| Use | Instead of |
+|-----|------------|
+| `assertSuccessful()` | `assertStatus(200)` |
+| `assertNotFound()` | `assertStatus(404)` |
+| `assertForbidden()` | `assertStatus(403)` |
+
+## Mocking
+
+Import mock function before use: `use function Pest\Laravel\mock;`
+
+## Datasets
+
+Use datasets for repetitive tests (validation rules, etc.):
+
+@boostsnippet("Pest Dataset Example", "php")
+it('has emails', function (string $email) {
+    expect($email)->not->toBeEmpty();
+})->with([
+    'james' => 'james@laravel.com',
+    'taylor' => 'taylor@laravel.com',
+]);
+@endboostsnippet
+
+## Pest 5 Features
+
+| Feature | Purpose |
+|---------|---------|
+| Tia (Test Impact Analysis) | Rerun only tests affected by recent changes |
+| Time-Balanced Sharding | Split tests across CI shards by execution time |
+| New Validation Expectations | `toBeEmail()`, `toBeUlid()`, `toBeIpAddress()`, and more |
+| Browser Testing | Full integration tests in real browsers |
+| Smoke Testing | Validate multiple pages quickly |
+| Visual Regression | Compare screenshots for visual changes |
+| Architecture Testing | Enforce code conventions |
+
+### Tia (Test Impact Analysis)
+
+Tia reruns only tests affected by recent changes and replays cached results for the rest, dramatically reducing suite duration:
+
+@boostsnippet("Tia Example", "shell")
+./vendor/bin/pest --parallel --tia
+@endboostsnippet
+
+- Replayed tests are not skipped — cached tests store everything they produced, including covered lines and branches.
+- Detects Laravel, Symfony, Livewire, and Inertia automatically.
+
+### New Validation Expectations
+
+Pest 5 ships eight new validation matchers, all supporting `.not` negation:
+
+@boostsnippet("Pest 5 Validation Expectations", "php")
+expect('nuno@pestphp.com')->toBeEmail();
+expect('01ARZ3NDEKTSV4RRFFQ69G5FAV')->toBeUlid();
+expect('192.168.1.1')->toBeIpAddress();
+expect('00:1a:2b:3c:4d:5e')->toBeMacAddress();
+expect('example.com')->toBeHostname();
+expect('example.co.uk')->toBeDomain();
+expect('Zm9vYmFy')->toBeBase64();
+expect('deadbeef')->toBeHexadecimal();
+@endboostsnippet
+
+### Time-Balanced Sharding
+
+Distribute tests across CI shards by execution time rather than count:
+
+@boostsnippet("Pest Sharding Example", "shell")
+./vendor/bin/pest --update-shards
+./vendor/bin/pest --shard=1/4
+@endboostsnippet
+
+Commit `tests/.pest/shards.json` to the repository so CI shards stay consistent.
+
+### Browser Test Example
+
+Browser tests run in real browsers for full integration testing:
+
+- Browser tests live in `tests/Browser/`.
+- Use Laravel features like `Event::fake()`, `assertAuthenticated()`, and model factories.
+- Use `RefreshDatabase` for clean state per test.
+- Interact with page: click, type, scroll, select, submit, drag-and-drop, touch gestures.
+- Test on multiple browsers (Chrome, Firefox, Safari) if requested.
+- Test on different devices/viewports (iPhone 14 Pro, tablets) if requested.
+- Switch color schemes (light/dark mode) when appropriate.
+- Take screenshots or pause tests for debugging.
+
+@boostsnippet("Pest Browser Test Example", "php")
+it('may reset the password', function () {
+    Notification::fake();
+
+    $this->actingAs(User::factory()->create());
+
+    $page = visit('/sign-in');
+
+    $page->assertSee('Sign In')
+        ->assertNoJavaScriptErrors()
+        ->click('Forgot Password?')
+        ->fill('email', 'nuno@laravel.com')
+        ->click('Send Reset Link')
+        ->assertSee('We have emailed your password reset link!');
+
+    Notification::assertSent(ResetPassword::class);
+});
+@endboostsnippet
+
+### Smoke Testing
+
+Quickly validate multiple pages have no JavaScript errors:
+
+@boostsnippet("Pest Smoke Testing Example", "php")
+$pages = visit(['/', '/about', '/contact']);
+
+$pages->assertNoJavaScriptErrors()->assertNoConsoleLogs();
+@endboostsnippet
+
+### Visual Regression Testing
+
+Capture and compare screenshots to detect visual changes.
+
+### Architecture Testing
+
+@boostsnippet("Architecture Test Example", "php")
+arch('controllers')
+    ->expect('App\Http\Controllers')
+    ->toExtendNothing()
+    ->toHaveSuffix('Controller');
+@endboostsnippet
+
+## Common Pitfalls
+
+- Not importing `use function Pest\Laravel\mock;` before using mock
+- Using `assertStatus(200)` instead of `assertSuccessful()`
+- Forgetting datasets for repetitive validation tests
+- Deleting tests without approval
+- Forgetting `assertNoJavaScriptErrors()` in browser tests
+- Prefixing `Feature/` or `Unit/` in `{name}` when using `make:test`

resources/views/components/badge.php

@@ -5,6 +5,8 @@
 [$bgBadgeColor, $bgBadgeText] = match ($type) {
     'INFO' => ['blue', 'INFO'],
     'ERROR' => ['red', 'ERROR'],
+    'WARN' => ['yellow', 'WARN'],
+    'SUCCESS' => ['green', 'SUCCESS'],
 };
 
 ?>

resources/views/installers/plugin-browser.php

@@ -0,0 +1,22 @@
+<div class="mx-2 mb-1">
+    <p>
+        <span>Using the <span class="text-yellow font-bold">visit()</span> function requires the Pest Plugin Browser to be installed.</span>
+
+        <span class="ml-1 text-yellow font-bold">Run:</span>
+    </p>
+
+    <div>
+        <span class="text-gray mr-1">- </span>
+        <span>composer require pestphp/pest-plugin-browser:^5.0 --dev</span>
+    </div>
+
+    <div>
+        <span class="text-gray mr-1">- </span>
+        <span>npm install playwright@latest</span>
+    </div>
+
+    <div>
+        <span class="text-gray mr-1">- </span>
+        <span>npx playwright install</span>
+    </div>
+</div>

src/ArchPresets/AbstractPreset.php

@@ -13,15 +13,11 @@ use Pest\Expectation;
 abstract class AbstractPreset // @pest-arch-ignore-line
 {
     /**
-     * The expectations.
-     *
      * @var array<int, Expectation<mixed>|ArchExpectation>
      */
     protected array $expectations = [];
 
     /**
-     * Creates a new preset instance.
-     *
      * @param  array<int, string>  $userNamespaces
      */
     public function __construct(
@@ -31,15 +27,11 @@ abstract class AbstractPreset // @pest-arch-ignore-line
     }
 
     /**
-     * Executes the arch preset.
-     *
      * @internal
      */
     abstract public function execute(): void;
 
     /**
-     * Ignores the given "targets" or "dependencies".
-     *
      * @param  array<int, string>|string  $targetsOrDependencies
      */
     final public function ignoring(array|string $targetsOrDependencies): void
@@ -51,9 +43,7 @@ abstract class AbstractPreset // @pest-arch-ignore-line
     }
 
     /**
-     * Runs the given callback for each namespace.
+     * @param  callable(Expectation<string>): ArchExpectation  ...$callbacks
-     *
-     * @param  callable(Expectation<string|null>): ArchExpectation  ...$callbacks
      */
     final public function eachUserNamespace(callable ...$callbacks): void
     {
@@ -64,9 +54,6 @@ abstract class AbstractPreset // @pest-arch-ignore-line
         }
     }
 
-    /**
-     * Flushes the expectations.
-     */
     final public function flush(): void
     {
         $this->expectations = [];

src/ArchPresets/Custom.php

@@ -14,8 +14,6 @@ use Pest\Expectation;
 final class Custom extends AbstractPreset
 {
     /**
-     * Creates a new preset instance.
-     *
      * @param  array<int, string>  $userNamespaces
      * @param  Closure(array<int, string>): array<Expectation<mixed>|ArchExpectation>  $execute
      */
@@ -27,17 +25,11 @@ final class Custom extends AbstractPreset
         parent::__construct($userNamespaces);
     }
 
-    /**
-     * Returns the name of the preset.
-     */
     public function name(): string
     {
         return $this->name;
     }
 
-    /**
-     * Executes the arch preset.
-     */
     public function execute(): void
     {
         $this->expectations = ($this->execute)($this->userNamespaces);

src/ArchPresets/Laravel.php

@@ -11,9 +11,6 @@ use Throwable;
  */
 final class Laravel extends AbstractPreset
 {
-    /**
-     * Executes the arch preset.
-     */
     public function execute(): void
     {
         $this->expectations[] = expect('App\Traits')
@@ -27,17 +24,21 @@ final class Laravel extends AbstractPreset
             ->ignoring('App\Enums');
 
         $this->expectations[] = expect('App\Enums')
-            ->toBeEnums();
+            ->toBeEnums()
+            ->ignoring('App\Enums\Concerns');
 
         $this->expectations[] = expect('App\Features')
-            ->toBeClasses();
+            ->toBeClasses()
+            ->ignoring('App\Features\Concerns');
 
         $this->expectations[] = expect('App\Features')
-            ->toHaveMethod('resolve');
+            ->toHaveMethod('resolve')
+            ->ignoring('App\Features\Concerns');
 
         $this->expectations[] = expect('App\Exceptions')
             ->classes()
-            ->toImplement('Throwable');
+            ->toImplement('Throwable')
+            ->ignoring('App\Exceptions\Handler');
 
         $this->expectations[] = expect('App')
             ->not->toImplement(Throwable::class)
@@ -65,6 +66,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')
@@ -114,6 +116,7 @@ final class Laravel extends AbstractPreset
             ->toHaveMethod('handle');
 
         $this->expectations[] = expect('App\Notifications')
+            ->classes()
             ->toExtend('Illuminate\Notifications\Notification');
 
         $this->expectations[] = expect('App')
@@ -124,6 +127,7 @@ final class Laravel extends AbstractPreset
             ->toHaveSuffix('ServiceProvider');
 
         $this->expectations[] = expect('App\Providers')
+            ->classes()
             ->toExtend('Illuminate\Support\ServiceProvider');
 
         $this->expectations[] = expect('App\Providers')
@@ -146,10 +150,10 @@ final class Laravel extends AbstractPreset
             ->toHaveSuffix('Controller');
 
         $this->expectations[] = expect('App\Http')
-            ->toOnlyBeUsedIn('App\Http');
+            ->toOnlyBeUsedIn(['App\Http', 'App\Providers']);
 
         $this->expectations[] = expect('App\Http\Controllers')
-            ->not->toHavePublicMethodsBesides(['__construct', '__invoke', 'index', 'show', 'create', 'store', 'edit', 'update', 'destroy']);
+            ->not->toHavePublicMethodsBesides(['__construct', '__invoke', 'index', 'show', 'create', 'store', 'edit', 'update', 'destroy', 'middleware']);
 
         $this->expectations[] = expect([
             'dd',
@@ -159,5 +163,15 @@ final class Laravel extends AbstractPreset
             'exit',
             'ray',
         ])->not->toBeUsed();
+
+        $this->expectations[] = expect('App\Policies')
+            ->classes()
+            ->toHaveSuffix('Policy');
+
+        $this->expectations[] = expect('App\Attributes')
+            ->classes()
+            ->toImplement('Illuminate\Contracts\Container\ContextualAttribute')
+            ->toHaveAttribute('Attribute')
+            ->toHaveMethod('resolve');
     }
 }

src/ArchPresets/Php.php

@@ -9,9 +9,6 @@ namespace Pest\ArchPresets;
  */
 final class Php extends AbstractPreset
 {
-    /**
-     * Executes the arch preset.
-     */
     public function execute(): void
     {
         $this->expectations[] = expect([

src/ArchPresets/Relaxed.php

@@ -12,9 +12,6 @@ use Pest\Expectation;
  */
 final class Relaxed extends AbstractPreset
 {
-    /**
-     * Executes the arch preset.
-     */
     public function execute(): void
     {
         $this->eachUserNamespace(

src/ArchPresets/Security.php

@@ -9,9 +9,6 @@ namespace Pest\ArchPresets;
  */
 final class Security extends AbstractPreset
 {
-    /**
-     * Executes the arch preset.
-     */
     public function execute(): void
     {
         $this->expectations[] = expect([
@@ -32,7 +29,6 @@ final class Security extends AbstractPreset
             'create_function',
             'unserialize',
             'extract',
-            'parse_str',
             'mb_parse_str',
             'dl',
             'assert',

src/ArchPresets/Strict.php

@@ -12,9 +12,6 @@ use Pest\Expectation;
  */
 final class Strict extends AbstractPreset
 {
-    /**
-     * Executes the arch preset.
-     */
     public function execute(): void
     {
         $this->eachUserNamespace(

src/Bootstrappers/BootExcludeList.php

@@ -13,11 +13,9 @@ use PHPUnit\Util\ExcludeList;
 final class BootExcludeList implements Bootstrapper
 {
     /**
-     * The directories to exclude.
-     *
      * @var array<int, non-empty-string>
      */
-    private const EXCLUDE_LIST = [
+    private const array EXCLUDE_LIST = [
         'bin',
         'overrides',
         'resources',
@@ -25,9 +23,6 @@ final class BootExcludeList implements Bootstrapper
         'stubs',
     ];
 
-    /**
-     * Boots the "exclude list" for PHPUnit to ignore Pest files.
-     */
     public function boot(): void
     {
         $baseDirectory = dirname(__DIR__, 2);

src/Bootstrappers/BootFiles.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace Pest\Bootstrappers;
 
 use Pest\Contracts\Bootstrapper;
+use Pest\Exceptions\FatalException;
 use Pest\Support\DatasetInfo;
 use Pest\Support\Str;
 use Pest\TestSuite;
@@ -20,11 +21,9 @@ use function Pest\testDirectory;
 final class BootFiles implements Bootstrapper
 {
     /**
-     * The structure of the tests directory.
-     *
      * @var array<int, string>
      */
-    private const STRUCTURE = [
+    private const array STRUCTURE = [
         'Expectations',
         'Expectations.php',
         'Helpers',
@@ -32,14 +31,15 @@ final class BootFiles implements Bootstrapper
         'Pest.php',
     ];
 
-    /**
-     * Boots the structure of the tests directory.
-     */
     public function boot(): void
     {
         $rootPath = TestSuite::getInstance()->rootPath;
         $testsPath = $rootPath.DIRECTORY_SEPARATOR.testDirectory();
 
+        if (! is_dir($testsPath)) {
+            throw new FatalException(sprintf('The test directory [%s] does not exist.', $testsPath));
+        }
+
         foreach (self::STRUCTURE as $filename) {
             $filename = sprintf('%s%s%s', $testsPath, DIRECTORY_SEPARATOR, $filename);
 
@@ -62,9 +62,6 @@ final class BootFiles implements Bootstrapper
         $this->bootDatasets($testsPath);
     }
 
-    /**
-     * Loads, if possible, the given file.
-     */
     private function load(string $filename): void
     {
         if (! Str::endsWith($filename, '.php')) {
@@ -78,7 +75,7 @@ final class BootFiles implements Bootstrapper
 
     private function bootDatasets(string $testsPath): void
     {
-        assert(strlen($testsPath) > 0);
+        assert($testsPath !== '');
 
         $files = (new PhpUnitFileIterator)->getFilesAsArray($testsPath, '.php');
 

src/Bootstrappers/BootKernelDump.php

@@ -14,18 +14,12 @@ use Symfony\Component\Console\Output\OutputInterface;
  */
 final readonly class BootKernelDump implements Bootstrapper
 {
-    /**
-     * Creates a new Boot Kernel Dump instance.
-     */
     public function __construct(
         private OutputInterface $output,
     ) {
-        // ...
+        //
     }
 
-    /**
-     * Boots the kernel dump.
-     */
     public function boot(): void
     {
         Container::getInstance()->add(KernelDump::class, $kernelDump = new KernelDump(

src/Bootstrappers/BootOverrides.php

@@ -13,24 +13,21 @@ use Pest\Exceptions\ShouldNotHappen;
 final class BootOverrides implements Bootstrapper
 {
     /**
-     * The list of files to be overridden.
+     * @var array<int, string>
-     *
-     * @var array<string, string>
      */
-    public const FILES = [
+    public const array FILES = [
-        'c96b1cb57d7fc8e649f4c13a8abe418c2541bcfab194fb6702b99f777f52ee84' => 'Runner/Filter/NameFilterIterator.php',
+        'ParaTest/WrapperRunner/ProgressPrinterOutput.php',
-        'a4a43de01f641c6944ee83d963795a46d32b5206b5ab3bbc6cce76e67190acbf' => 'Runner/ResultCache/DefaultResultCache.php',
+        'Runner/Filter/NameFilterIterator.php',
-        'd0e81317889ad88c707db4b08a94cadee4c9010d05ff0a759f04e71af5efed89' => 'Runner/TestSuiteLoader.php',
+        'Runner/TestRunHistory/DefaultTestRunHistory.php',
-        '3bb609b0d3bf6dee8df8d6cd62a3c8ece823c4bb941eaaae39e3cb267171b9d2' => 'TextUI/Command/Commands/WarmCodeCoverageCacheCommand.php',
+        'Runner/TestSuiteLoader.php',
-        '8abdad6413329c6fe0d7d44a8b9926e390af32c0b3123f3720bb9c5bbc6fbb7e' => 'TextUI/Output/Default/ProgressPrinter/Subscriber/TestSkippedSubscriber.php',
+        'Runner/TestSuiteSorter.php',
-        '43883b7e5811886cf3731c8ed6304d5a77078d9731e1e505abc2da36bde19f3e' => 'TextUI/TestSuiteFilterProcessor.php',
+        'TextUI/Command/Commands/WarmCodeCoverageCacheCommand.php',
-        '357d5cd7007f8559b26e1b8cdf43bb6fb15b51b79db981779da6f31b7ec39dad' => 'Event/Value/ThrowableBuilder.php',
+        'TextUI/Output/Default/ProgressPrinter/Subscriber/TestSkippedSubscriber.php',
-        '676273f1fe483877cf2d95c5aedbf9ae5d6a8e2f4c12d6ce716df6591e6db023' => 'Logging/JUnit/JunitXmlLogger.php',
+        'TextUI/TestSuiteFilterProcessor.php',
+        'Event/Value/ThrowableBuilder.php',
+        'Logging/JUnit/JunitXmlLogger.php',
     ];
 
-    /**
-     * Boots the list of files to be overridden.
-     */
     public function boot(): void
     {
         foreach (self::FILES as $file) {

src/Bootstrappers/BootPhpUnitConfiguration.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Bootstrappers;
+
+use Pest\Contracts\Bootstrapper;
+use PHPUnit\TextUI\Configuration\Builder;
+
+/**
+ * @internal
+ */
+final class BootPhpUnitConfiguration implements Bootstrapper
+{
+    public function boot(): void
+    {
+        (new Builder)->build(['pest']);
+    }
+}

src/Bootstrappers/BootSubscribers.php

@@ -16,27 +16,36 @@ use PHPUnit\Event\Subscriber;
 final readonly class BootSubscribers implements Bootstrapper
 {
     /**
-     * The list of Subscribers.
-     *
      * @var array<int, class-string<Subscriber>>
      */
-    private const SUBSCRIBERS = [
+    private const array SUBSCRIBERS = [
         Subscribers\EnsureConfigurationIsAvailable::class,
         Subscribers\EnsureIgnorableTestCasesAreIgnored::class,
         Subscribers\EnsureKernelDumpIsFlushed::class,
         Subscribers\EnsureTeamCityEnabled::class,
+        Subscribers\EnsureTiaIsRunningPestTestsOnly::class,
+        Subscribers\EnsureTiaStarts::class,
+        Subscribers\EnsureTiaEnds::class,
+        Subscribers\EnsureTiaResultsAreCollected::class,
+        Subscribers\EnsureTiaResultIsRecordedOnPassed::class,
+        Subscribers\EnsureTiaResultIsRecordedOnFailed::class,
+        Subscribers\EnsureTiaResultIsRecordedOnErrored::class,
+        Subscribers\EnsureTiaResultIsRecordedOnSkipped::class,
+        Subscribers\EnsureTiaResultIsRecordedOnIncomplete::class,
+        Subscribers\EnsureTiaResultIsRecordedOnRisky::class,
+        Subscribers\EnsureTiaResultIsRecordedOnNoticeTriggered::class,
+        Subscribers\EnsureTiaResultIsRecordedOnPhpNoticeTriggered::class,
+        Subscribers\EnsureTiaResultIsRecordedOnDeprecationTriggered::class,
+        Subscribers\EnsureTiaResultIsRecordedOnPhpDeprecationTriggered::class,
+        Subscribers\EnsureTiaResultIsRecordedOnWarningTriggered::class,
+        Subscribers\EnsureTiaResultIsRecordedOnPhpWarningTriggered::class,
+        Subscribers\EnsureTiaAssertionsAreRecordedOnFinished::class,
     ];
 
-    /**
-     * Creates a new instance of the Boot Subscribers.
-     */
     public function __construct(
         private Container $container,
     ) {}
 
-    /**
-     * Boots the list of Subscribers.
-     */
     public function boot(): void
     {
         foreach (self::SUBSCRIBERS as $subscriber) {

src/Bootstrappers/BootView.php

@@ -13,18 +13,12 @@ use Symfony\Component\Console\Output\OutputInterface;
  */
 final readonly class BootView implements Bootstrapper
 {
-    /**
-     * Creates a new instance of the Boot View.
-     */
     public function __construct(
         private OutputInterface $output
     ) {
-        // ..
+        //
     }
 
-    /**
-     * Boots the view renderer.
-     */
     public function boot(): void
     {
         View::renderUsing($this->output);

src/Collision/Events.php

@@ -16,22 +16,13 @@ use function Termwind\renderUsing;
  */
 final class Events
 {
-    /**
-     * Sets the output.
-     */
     private static ?OutputInterface $output = null;
 
-    /**
-     * Sets the output.
-     */
     public static function setOutput(OutputInterface $output): void
     {
         self::$output = $output;
     }
 
-    /**
-     * Fires before the test method description is printed.
-     */
     public static function beforeTestMethodDescription(TestResult $result, string $description): string
     {
         if (($context = $result->context) === []) {
@@ -73,9 +64,6 @@ final class Events
         return $description;
     }
 
-    /**
-     * Fires after the test method description is printed.
-     */
     public static function afterTestMethodDescription(TestResult $result): void
     {
         if (($context = $result->context) === []) {

src/Concerns/Expectable.php

@@ -14,8 +14,6 @@ trait Expectable
     /**
      * @template TValue
      *
-     * Creates a new Expectation.
-     *
      * @param  TValue  $value
      * @return Expectation<TValue>
      */

src/Concerns/Extendable.php

@@ -8,27 +8,24 @@ use Closure;
 
 /**
  * @internal
+ *
+ * @template T of object
  */
 trait Extendable
 {
     /**
-     * The list of extends.
-     *
      * @var array<string, Closure>
      */
     private static array $extends = [];
 
     /**
-     * Register a new extend.
+     * @param-closure-this T $extend
      */
     public function extend(string $name, Closure $extend): void
     {
         static::$extends[$name] = $extend;
     }
 
-    /**
-     * Checks if given extend name is registered.
-     */
     public static function hasExtend(string $name): bool
     {
         return array_key_exists($name, static::$extends);

src/Concerns/Logging/WritesToConsole.php

@@ -9,33 +9,21 @@ namespace Pest\Concerns\Logging;
  */
 trait WritesToConsole
 {
-    /**
-     * Writes the given success message to the console.
-     */
     private function writeSuccess(string $message): void
     {
         $this->writePestTestOutput($message, 'fg-green, bold', '✓');
     }
 
-    /**
-     * Writes the given error message to the console.
-     */
     private function writeError(string $message): void
     {
         $this->writePestTestOutput($message, 'fg-red, bold', '⨯');
     }
 
-    /**
-     * Writes the given warning message to the console.
-     */
     private function writeWarning(string $message): void
     {
         $this->writePestTestOutput($message, 'fg-yellow, bold', '-');
     }
 
-    /**
-     * Writes the give message to the console.
-     */
     private function writePestTestOutput(string $message, string $color, string $symbol): void
     {
         $this->writeWithColor($color, "$symbol ", false);

src/Concerns/Pipeable.php

@@ -12,30 +12,21 @@ use Closure;
 trait Pipeable
 {
     /**
-     * The list of pipes.
-     *
      * @var array<string, array<Closure(Closure, mixed ...$arguments): void>>
      */
     private static array $pipes = [];
 
     /**
-     * The list of interceptors.
-     *
      * @var array<string, array<Closure(Closure, mixed ...$arguments): void>>
      */
     private static array $interceptors = [];
 
-    /**
-     * Register a pipe to be applied before an expectation is checked.
-     */
     public function pipe(string $name, Closure $pipe): void
     {
         self::$pipes[$name][] = $pipe;
     }
 
     /**
-     * Register an interceptor that should replace an existing expectation.
-     *
      * @param  string|Closure(mixed $value, mixed ...$arguments):bool  $filter
      */
     public function intercept(string $name, string|Closure $filter, Closure $handler): void
@@ -60,12 +51,10 @@ trait Pipeable
     }
 
     /**
-     * Get the list of pipes by the given name.
-     *
      * @return array<int, Closure>
      */
     private function pipes(string $name, object $context, string $scope): array
     {
-        return array_map(fn (Closure $pipe): \Closure => $pipe->bindTo($context, $scope), self::$pipes[$name] ?? []);
+        return array_map(fn (Closure $pipe): Closure => $pipe->bindTo($context, $scope), self::$pipes[$name] ?? []);
     }
 }

src/Concerns/Retrievable.php

@@ -11,8 +11,6 @@ trait Retrievable
 {
     /**
      * @template TRetrievableValue
-     *
-     * Safely retrieve the value at the given key from an object or array.
      * @template TRetrievableValue
      *
      * @param  array<string, TRetrievableValue>|object  $value

src/Concerns/Testable.php

@@ -6,13 +6,25 @@ namespace Pest\Concerns;
 
 use Closure;
 use Pest\Exceptions\DatasetArgumentsMismatch;
+use Pest\Panic;
+use Pest\Plugins\Tia;
+use Pest\Plugins\Tia\Collectors;
+use Pest\Plugins\Tia\Enums\ReplayType;
+use Pest\Plugins\Tia\Recorder;
 use Pest\Preset;
 use Pest\Support\ChainableClosure;
+use Pest\Support\Container;
 use Pest\Support\ExceptionTrace;
 use Pest\Support\Reflection;
+use Pest\Support\Shell;
 use Pest\TestSuite;
+use PHPUnit\Framework\AssertionFailedError;
 use PHPUnit\Framework\Attributes\PostCondition;
+use PHPUnit\Framework\IncompleteTest;
+use PHPUnit\Framework\SkippedTest;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\TestCase\ExceptionExpectation;
+use PHPUnit\Framework\TestCase\OutputBuffer;
 use ReflectionException;
 use ReflectionFunction;
 use ReflectionParameter;
@@ -25,113 +37,53 @@ use Throwable;
  */
 trait Testable
 {
-    /**
-     * The test's description.
-     */
     private string $__description;
 
-    /**
-     * The test's latest description.
-     */
     private static string $__latestDescription;
 
-    /**
-     * The test's assignees.
-     */
     private static array $__latestAssignees = [];
 
-    /**
-     * The test's notes.
-     */
     private static array $__latestNotes = [];
 
     /**
-     * The test's issues.
-     *
      * @var array<int, int>
      */
     private static array $__latestIssues = [];
 
     /**
-     * The test's PRs.
-     *
      * @var array<int, int>
      */
     private static array $__latestPrs = [];
 
     /**
-     * The test's describing, if any.
+     * @var array<int, string>
      */
-    public ?string $__describing = null;
+    public array $__describing = [];
 
-    /**
-     * Whether the test has ran or not.
-     */
     public bool $__ran = false;
 
-    /**
+    private ReplayType $__replay = ReplayType::None;
-     * The test's test closure.
+
-     */
+    private int $__replayAssertions = 0;
+
     private Closure $__test;
 
-    /**
-     * The test's before each closure.
-     */
     private ?Closure $__beforeEach = null;
 
-    /**
-     * The test's after each closure.
-     */
     private ?Closure $__afterEach = null;
 
-    /**
-     * The test's before all closure.
-     */
     private static ?Closure $__beforeAll = null;
 
-    /**
-     * The test's after all closure.
-     */
     private static ?Closure $__afterAll = null;
 
-    /**
-     * The list of snapshot changes, if any.
-     */
     private array $__snapshotChanges = [];
 
-    /**
-     * Creates a new Test Case instance.
-     */
-    public function __construct(string $name)
-    {
-        parent::__construct($name);
-
-        $test = TestSuite::getInstance()->tests->get(self::$__filename);
-
-        if ($test->hasMethod($name)) {
-            $method = $test->getMethod($name);
-            $this->__description = self::$__latestDescription = $method->description;
-            self::$__latestAssignees = $method->assignees;
-            self::$__latestNotes = $method->notes;
-            self::$__latestIssues = $method->issues;
-            self::$__latestPrs = $method->prs;
-            $this->__describing = $method->describing;
-            $this->__test = $method->getClosure();
-        }
-    }
-
-    /**
-     * Resets the test case static properties.
-     */
     public static function flush(): void
     {
         self::$__beforeAll = null;
         self::$__afterAll = null;
     }
 
-    /**
-     * Adds a new "note" to the Test Case.
-     */
     public function note(array|string $note): self
     {
         $note = is_array($note) ? $note : [$note];
@@ -141,12 +93,9 @@ trait Testable
         return $this;
     }
 
-    /**
-     * Adds a new "setUpBeforeClass" to the Test Case.
-     */
     public function __addBeforeAll(?Closure $hook): void
     {
-        if (! $hook instanceof \Closure) {
+        if (! $hook instanceof Closure) {
             return;
         }
 
@@ -155,12 +104,9 @@ trait Testable
             : $hook;
     }
 
-    /**
-     * Adds a new "tearDownAfterClass" to the Test Case.
-     */
     public function __addAfterAll(?Closure $hook): void
     {
-        if (! $hook instanceof \Closure) {
+        if (! $hook instanceof Closure) {
             return;
         }
 
@@ -169,28 +115,19 @@ trait Testable
             : $hook;
     }
 
-    /**
-     * Adds a new "setUp" to the Test Case.
-     */
     public function __addBeforeEach(?Closure $hook): void
     {
         $this->__addHook('__beforeEach', $hook);
     }
 
-    /**
-     * Adds a new "tearDown" to the Test Case.
-     */
     public function __addAfterEach(?Closure $hook): void
     {
         $this->__addHook('__afterEach', $hook);
     }
 
-    /**
-     * Adds a new "hook" to the Test Case.
-     */
     private function __addHook(string $property, ?Closure $hook): void
     {
-        if (! $hook instanceof \Closure) {
+        if (! $hook instanceof Closure) {
             return;
         }
 
@@ -199,9 +136,6 @@ trait Testable
             : $hook;
     }
 
-    /**
-     * This method is called before the first test of this Test Case is run.
-     */
     public static function setUpBeforeClass(): void
     {
         parent::setUpBeforeClass();
@@ -212,12 +146,13 @@ trait Testable
             $beforeAll = ChainableClosure::boundStatically(self::$__beforeAll, $beforeAll);
         }
 
-        call_user_func(Closure::bind($beforeAll, null, self::class));
+        try {
+            call_user_func(Closure::bind($beforeAll, null, self::class));
+        } catch (Throwable $e) {
+            Panic::with($e);
+        }
     }
 
-    /**
-     * This method is called after the last test of this Test Case is run.
-     */
     public static function tearDownAfterClass(): void
     {
         $afterAll = TestSuite::getInstance()->afterAll->get(self::$__filename);
@@ -231,17 +166,12 @@ trait Testable
         parent::tearDownAfterClass();
     }
 
-    /**
-     * Gets executed before the Test Case.
-     */
     protected function setUp(...$arguments): void
     {
         TestSuite::getInstance()->test = $this;
 
         $method = TestSuite::getInstance()->tests->get(self::$__filename)->getMethod($this->name());
 
-        $method->setUp($this);
-
         $description = $method->description;
         if ($this->dataName()) {
             $description = str_contains((string) $description, ':dataset')
@@ -272,8 +202,37 @@ trait Testable
         self::$__latestIssues = $method->issues;
         self::$__latestPrs = $method->prs;
 
+        /** @var Tia $tia */
+        $tia = Container::getInstance()->get(Tia::class);
+        $status = $tia->getStatus(self::$__filename, $this->valueObjectForEvents()->id());
+        $replay = ReplayType::fromStatus($status);
+
+        if ($replay !== ReplayType::None) {
+            assert($status !== null);
+
+            $this->__replay = $replay;
+
+            match ($replay) {
+                ReplayType::Pass, ReplayType::Risky => $this->__beginReplay($replay, $tia),
+                ReplayType::Skipped => $this->markTestSkipped($status->message()),
+                ReplayType::Incomplete => $this->markTestIncomplete($status->message()),
+                ReplayType::Failure => throw new AssertionFailedError($status->message() ?: 'Cached failure'),
+            };
+
+            return;
+        }
+
+        $recorder = Container::getInstance()->get(Recorder::class);
+        assert($recorder instanceof Recorder);
+
+        if ($recorder->isActive()) {
+            $recorder->beginTest($this::class, $this->name(), self::$__filename);
+        }
+
         parent::setUp();
 
+        Collectors::armAll($recorder);
+
         $beforeEach = TestSuite::getInstance()->beforeEach->get(self::$__filename)[1];
 
         if ($this->__beforeEach instanceof Closure) {
@@ -283,11 +242,44 @@ trait Testable
         $this->__callClosure($beforeEach, $arguments);
     }
 
-    /**
+    private function __beginReplay(ReplayType $replay, Tia $tia): void
-     * Gets executed after the Test Case.
+    {
-     */
+        $this->__replay = $replay;
+        $this->__replayAssertions = $tia->getAssertionCount($this->valueObjectForEvents()->id());
+        $this->__ran = true;
+    }
+
+    public function __initializeTestCase(): void
+    {
+        if (isset($this->__test)) {
+            return;
+        }
+
+        $name = $this->name();
+        $test = TestSuite::getInstance()->tests->get(self::$__filename);
+
+        if ($test->hasMethod($name)) {
+            $method = $test->getMethod($name);
+            $this->__description = self::$__latestDescription = $method->description;
+            self::$__latestAssignees = $method->assignees;
+            self::$__latestNotes = $method->notes;
+            self::$__latestIssues = $method->issues;
+            self::$__latestPrs = $method->prs;
+            $this->__describing = $method->describing;
+            $this->__test = $method->getClosure();
+
+            $method->setUp($this);
+        }
+    }
+
     protected function tearDown(...$arguments): void
     {
+        if ($this->__replay !== ReplayType::None) {
+            TestSuite::getInstance()->test = null;
+
+            return;
+        }
+
         $afterEach = TestSuite::getInstance()->afterEach->get(self::$__filename);
 
         if ($this->__afterEach instanceof Closure) {
@@ -307,21 +299,110 @@ trait Testable
     }
 
     /**
-     * Executes the Test Case current test.
-     *
      * @throws Throwable
      */
     private function __runTest(Closure $closure, ...$args): mixed
     {
+        if ($this->__replay === ReplayType::Pass || $this->__replay === ReplayType::Risky) {
+            if ($this->__replay === ReplayType::Pass && $this->__replayAssertions === 0) {
+                $this->expectNotToPerformAssertions();
+            }
+
+            $this->addToAssertionCount($this->__replayAssertions);
+
+            return null;
+        }
+
         $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});
+                    }
+
+                    $outputBuffer = Closure::bind(fn () => $this->outputBuffer, $this, TestCase::class)();
+
+                    if ($outputBuffer->hasExpectation()) {
+                        ob_clean();
+
+                        Closure::bind(function (): void {
+                            $this->expectedString = null;
+                            $this->expectedRegularExpression = null;
+                        }, $outputBuffer, OutputBuffer::class)();
+                    }
+
+                    $this->setUp();
+                }
+            }
+        }
+
+        throw $lastException;
+    }
+
+    private function __isExpectedException(Throwable $e): bool
+    {
+        $expectation = Closure::bind(fn () => $this->exceptionExpectation, $this, TestCase::class)();
+
+        $read = fn (string $property): mixed => Closure::bind(fn () => $this->{$property}, $expectation, ExceptionExpectation::class)();
+
+        $expectedClass = $read('expectedException');
+
+        if ($expectedClass !== null) {
+            return $e instanceof $expectedClass;
+        }
+
+        $expectedMessage = $read('expectedMessage');
+
+        if ($expectedMessage !== null) {
+            return str_contains($e->getMessage(), (string) $expectedMessage);
+        }
+
+        $expectedMessageRegex = $read('expectedMessageRegularExpression');
+
+        if ($expectedMessageRegex !== null) {
+            return preg_match($expectedMessageRegex, $e->getMessage()) === 1;
+        }
+
+        $expectedCode = $read('expectedCode');
+
+        if ($expectedCode !== null) {
+            return $e->getCode() === $expectedCode;
+        }
+
+        return false;
     }
 
     /**
-     * Resolve the passed arguments. Any Closures will be bound to the testcase and resolved.
-     *
      * @throws Throwable
      */
     private function __resolveTestArguments(array $arguments): array
@@ -329,16 +410,13 @@ trait Testable
         $method = TestSuite::getInstance()->tests->get(self::$__filename)->getMethod($this->name());
 
         if ($method->repetitions > 1) {
-            // If the test is repeated, the first argument is the iteration number
-            // we need to move it to the end of the arguments list
-            // so that the datasets are the first n arguments
-            // and the iteration number is the last argument
             $firstArgument = array_shift($arguments);
             $arguments[] = $firstArgument;
         }
 
         $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) {
@@ -346,7 +424,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;
                 }
 
@@ -372,12 +454,10 @@ trait Testable
             return [$boundDatasetResult];
         }
 
-        return array_values($boundDatasetResult);
+        return $boundDatasetResult;
     }
 
     /**
-     * Ensures dataset items count matches underlying test case required parameters
-     *
      * @throws ReflectionException
      * @throws DatasetArgumentsMismatch
      */
@@ -417,9 +497,6 @@ trait Testable
         return ExceptionTrace::ensure(fn (): mixed => call_user_func_array(Closure::bind($closure, $this, $this::class), $arguments));
     }
 
-    /**
-     * Uses the given preset on the test.
-     */
     public function preset(): Preset
     {
         return new Preset;
@@ -432,44 +509,24 @@ trait Testable
             return;
         }
 
-        if (count($this->__snapshotChanges) === 1) {
+        $this->markTestIncomplete(implode('. ', $this->__snapshotChanges));
-            $this->markTestIncomplete($this->__snapshotChanges[0]);
-
-            return;
-        }
-
-        $messages = implode(PHP_EOL, array_map(static fn (string $message): string => '- $message', $this->__snapshotChanges));
-
-        $this->markTestIncomplete($messages);
     }
 
-    /**
-     * The printable test case name.
-     */
     public static function getPrintableTestCaseName(): string
     {
         return preg_replace('/P\\\/', '', self::class, 1);
     }
 
-    /**
-     * The printable test case method name.
-     */
     public function getPrintableTestCaseMethodName(): string
     {
         return $this->__description;
     }
 
-    /**
-     * The latest printable test case method name.
-     */
     public static function getLatestPrintableTestCaseMethodName(): string
     {
-        return self::$__latestDescription;
+        return self::$__latestDescription ?? '';
     }
 
-    /**
-     * The printable test case method context.
-     */
     public static function getPrintableContext(): array
     {
         return [
@@ -479,4 +536,9 @@ trait Testable
             'notes' => self::$__latestNotes,
         ];
     }
+
+    public function shell(): void
+    {
+        Shell::open();
+    }
 }

src/Configuration.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Pest;
 
+use Pest\PendingCalls\BeforeEachCall;
 use Pest\PendingCalls\UsesCall;
 
 /**
@@ -13,31 +14,19 @@ use Pest\PendingCalls\UsesCall;
  */
 final readonly class Configuration
 {
-    /**
-     * The filename of the configuration.
-     */
     private string $filename;
 
-    /**
-     * Creates a new configuration instance.
-     */
     public function __construct(
         string $filename,
     ) {
         $this->filename = str_ends_with($filename, DIRECTORY_SEPARATOR.'Pest.php') ? dirname($filename) : $filename;
     }
 
-    /**
-     * Use the given classes and traits in the given targets.
-     */
     public function in(string ...$targets): UsesCall
     {
-        return (new UsesCall($this->filename, []))->in(...$targets);
+        return new UsesCall($this->filename, [])->in(...$targets);
     }
 
-    /**
-     * Depending on where is called, it will extend the given classes and traits globally or locally.
-     */
     public function extend(string ...$classAndTraits): UsesCall
     {
         return new UsesCall(
@@ -46,65 +35,62 @@ final readonly class Configuration
         );
     }
 
-    /**
-     * Depending on where is called, it will extend the given classes and traits globally or locally.
-     */
     public function extends(string ...$classAndTraits): UsesCall
     {
         return $this->extend(...$classAndTraits);
     }
 
-    /**
-     * Depending on where is called, it will add the given groups globally or locally.
-     */
     public function group(string ...$groups): UsesCall
     {
-        return (new UsesCall($this->filename, []))->group(...$groups);
+        return new UsesCall($this->filename, [])->group(...$groups);
+    }
+
+    public function only(): void
+    {
+        new BeforeEachCall(TestSuite::getInstance(), $this->filename)->only();
     }
 
-    /**
-     * Depending on where is called, it will extend the given classes and traits globally or locally.
-     */
     public function use(string ...$classAndTraits): UsesCall
     {
         return $this->extend(...$classAndTraits);
     }
 
-    /**
-     * Depending on where is called, it will extend the given classes and traits globally or locally.
-     */
     public function uses(string ...$classAndTraits): UsesCall
     {
         return $this->extends(...$classAndTraits);
     }
 
-    /**
-     * Gets the printer configuration.
-     */
     public function printer(): Configuration\Printer
     {
         return new Configuration\Printer;
     }
 
-    /**
-     * Gets the presets configuration.
-     */
     public function presets(): Configuration\Presets
     {
         return new Configuration\Presets;
     }
 
-    /**
-     * Gets the project configuration.
-     */
     public function project(): Configuration\Project
     {
         return Configuration\Project::getInstance();
     }
 
+    public function browser(): Browser\Configuration
+    {
+        return new Browser\Configuration;
+    }
+
+    public function evals(): Evals\Configuration // @phpstan-ignore-line
+    {
+        return new Evals\Configuration; // @phpstan-ignore-line
+    }
+
+    public function tia(): Plugins\Tia\Configuration
+    {
+        return new Plugins\Tia\Configuration;
+    }
+
     /**
-     * Proxies calls to the uses method.
-     *
      * @param  array<array-key, mixed>  $arguments
      */
     public function __call(string $name, array $arguments): mixed

src/Configuration/Presets.php

@@ -9,9 +9,6 @@ use Pest\Preset;
 
 final class Presets
 {
-    /**
-     * Creates a custom preset instance, and adds it to the list of presets.
-     */
     public function custom(string $name, Closure $execute): void
     {
         Preset::custom($name, $execute);

src/Configuration/Printer.php

@@ -11,9 +11,6 @@ use NunoMaduro\Collision\Adapters\Phpunit\Printers\DefaultPrinter;
  */
 final readonly class Printer
 {
-    /**
-     * Sets the theme to compact.
-     */
     public function compact(): self
     {
         DefaultPrinter::compact(true);

src/Configuration/Project.php

@@ -10,42 +10,27 @@ namespace Pest\Configuration;
 final class Project
 {
     /**
-     * The assignees link.
-     *
      * @internal
      */
     public string $assignees = '';
 
     /**
-     * The issues link.
-     *
      * @internal
      */
     public string $issues = '';
 
     /**
-     * The PRs link.
-     *
      * @internal
      */
     public string $prs = '';
 
-    /**
-     * The singleton instance.
-     */
     private static ?self $instance = null;
 
-    /**
-     * Creates a new instance of the project.
-     */
     public static function getInstance(): self
     {
         return self::$instance ??= new self;
     }
 
-    /**
-     * Sets the test project to GitHub.
-     */
     public function github(string $project): self
     {
         $this->issues = "https://github.com/{$project}/issues/%s";
@@ -56,22 +41,18 @@ final class Project
         return $this;
     }
 
-    /**
+    public function gitlab(string $project, string $hostname = 'gitlab.com'): self
-     * Sets the test project to GitLab.
-     */
-    public function gitlab(string $project): self
     {
-        $this->issues = "https://gitlab.com/{$project}/issues/%s";
+        $hostname = parse_url($hostname, PHP_URL_HOST) ?? $hostname;
-        $this->prs = "https://gitlab.com/{$project}/merge_requests/%s";
 
-        $this->assignees = 'https://gitlab.com/%s';
+        $this->issues = "https://{$hostname}/{$project}/-/work_items/%s";
+        $this->prs = "https://{$hostname}/{$project}/-/merge_requests/%s";
+
+        $this->assignees = "https://{$hostname}/%s";
 
         return $this;
     }
 
-    /**
-     * Sets the test project to Bitbucket.
-     */
     public function bitbucket(string $project): self
     {
         $this->issues = "https://bitbucket.org/{$project}/issues/%s";
@@ -82,9 +63,6 @@ final class Project
         return $this;
     }
 
-    /**
-     * Sets the test project to Jira.
-     */
     public function jira(string $namespace, string $project): self
     {
         $this->issues = "https://{$namespace}.atlassian.net/browse/{$project}-%s";
@@ -94,9 +72,6 @@ final class Project
         return $this;
     }
 
-    /**
-     * Sets the test project to custom.
-     */
     public function custom(string $issues, string $prs, string $assignees): self
     {
         $this->issues = $issues;

src/Console/Help.php

@@ -12,11 +12,9 @@ use Symfony\Component\Console\Output\OutputInterface;
 final readonly class Help
 {
     /**
-     * The Command messages.
-     *
      * @var array<int, string>
      */
-    private const HELP_MESSAGES = [
+    private const array HELP_MESSAGES = [
         '<comment>Pest Options:</comment>',
         '  <info>--init</info>                      Initialise a standard Pest configuration',
         '  <info>--coverage</info>                  Enable coverage and output to standard output',
@@ -24,17 +22,11 @@ final readonly class Help
         '  <info>--group=<fg=cyan><name></></info>              Only runs tests from the specified group(s)',
     ];
 
-    /**
-     * Creates a new Console Command instance.
-     */
     public function __construct(private OutputInterface $output)
     {
-        // ..
+        //
     }
 
-    /**
-     * Executes the Console Command.
-     */
     public function __invoke(): void
     {
         foreach (self::HELP_MESSAGES as $message) {

src/Console/Thanks.php

@@ -18,30 +18,26 @@ use Symfony\Component\Console\Question\ConfirmationQuestion;
 final readonly class Thanks
 {
     /**
-     * The support options.
-     *
      * @var array<string, string>
      */
-    private const FUNDING_MESSAGES = [
+    private const array FUNDING_MESSAGES = [
         'Star' => 'https://github.com/pestphp/pest',
-        'News' => 'https://twitter.com/pestphp',
+        'YouTube' => 'https://youtube.com/@nunomaduro',
-        'Videos' => 'https://youtube.com/@nunomaduro',
+        'TikTok' => 'https://tiktok.com/@enunomaduro',
+        'Twitch' => 'https://twitch.tv/nunomaduro',
+        'LinkedIn' => 'https://linkedin.com/in/nunomaduro',
+        'Instagram' => 'https://instagram.com/enunomaduro',
+        'X' => 'https://x.com/enunomaduro',
         'Sponsor' => 'https://github.com/sponsors/nunomaduro',
     ];
 
-    /**
-     * Creates a new Console Command instance.
-     */
     public function __construct(
         private InputInterface $input,
         private OutputInterface $output
     ) {
-        // ..
+        //
     }
 
-    /**
-     * Executes the Console Command.
-     */
     public function __invoke(): void
     {
         $bootstrapper = new BootView($this->output);

src/Contracts/Bootstrapper.php

@@ -9,8 +9,5 @@ namespace Pest\Contracts;
  */
 interface Bootstrapper
 {
-    /**
-     * Boots the bootstrapper.
-     */
     public function boot(): void;
 }

src/Contracts/HasPrintableTestCaseName.php

@@ -11,5 +11,5 @@ use NunoMaduro\Collision\Contracts\Adapters\Phpunit\HasPrintableTestCaseName as
  */
 interface HasPrintableTestCaseName extends BaseHasPrintableTestCaseName
 {
-    // ..
+    //
 }

src/Contracts/Panicable.php

@@ -11,13 +11,7 @@ use Symfony\Component\Console\Output\OutputInterface;
  */
 interface Panicable
 {
-    /**
-     * Renders the panic on the given output.
-     */
     public function render(OutputInterface $output): void;
 
-    /**
-     * The exit code to be used.
-     */
     public function exitCode(): int;
 }

src/Contracts/Plugins/AddsOutput.php

@@ -9,8 +9,5 @@ namespace Pest\Contracts\Plugins;
  */
 interface AddsOutput
 {
-    /**
-     * Adds output after the Test Suite execution.
-     */
     public function addOutput(int $exitCode): int;
 }

src/Contracts/Plugins/Bootable.php

@@ -9,8 +9,5 @@ namespace Pest\Contracts\Plugins;
  */
 interface Bootable
 {
-    /**
-     * Boots the plugin.
-     */
     public function boot(): void;
 }

src/Contracts/Plugins/HandlesArguments.php

@@ -10,8 +10,6 @@ namespace Pest\Contracts\Plugins;
 interface HandlesArguments
 {
     /**
-     * Adds arguments before the Test Suite execution.
-     *
      * @param  array<int, string>  $arguments
      * @return array<int, string>
      */

src/Contracts/Plugins/HandlesOriginalArguments.php

@@ -10,8 +10,6 @@ namespace Pest\Contracts\Plugins;
 interface HandlesOriginalArguments
 {
     /**
-     * Adds original arguments before the Test Suite execution.
-     *
      * @param  array<int, string>  $arguments
      */
     public function handleOriginalArguments(array $arguments): void;

src/Contracts/Plugins/Terminable.php

@@ -9,8 +9,5 @@ namespace Pest\Contracts\Plugins;
  */
 interface Terminable
 {
-    /**
-     * Terminates the plugin.
-     */
     public function terminate(): void;
 }

src/Contracts/Restarter.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Contracts;
+
+/**
+ * @internal
+ */
+interface Restarter
+{
+    /**
+     * @param  array<int, string>  $arguments
+     */
+    public function maybeRestart(string $projectRoot, array $arguments): void;
+}

src/Contracts/TestCaseFilter.php

@@ -6,8 +6,5 @@ namespace Pest\Contracts;
 
 interface TestCaseFilter
 {
-    /**
-     * Whether the test case is accepted.
-     */
     public function accept(string $testCaseFilename): bool;
 }

src/Contracts/TestCaseMethodFilter.php

@@ -8,8 +8,5 @@ use Pest\Factories\TestCaseMethodFactory;
 
 interface TestCaseMethodFilter
 {
-    /**
-     * Whether the test case method is accepted.
-     */
     public function accept(TestCaseMethodFactory $factory): bool;
 }

src/Evaluators/Attributes.php

@@ -12,8 +12,6 @@ use Pest\Factories\Attribute;
 final class Attributes
 {
     /**
-     * Evaluates the given attributes and returns the code.
-     *
      * @param  iterable<int, Attribute>  $attributes
      */
     public static function code(iterable $attributes): string

src/Exceptions/AfterAllAlreadyExist.php

@@ -14,11 +14,8 @@ use Symfony\Component\Console\Exception\ExceptionInterface;
  */
 final class AfterAllAlreadyExist extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
 {
-    /**
-     * Creates a new Exception instance.
-     */
     public function __construct(string $filename)
     {
-        parent::__construct(sprintf('The afterAll already exists in the filename `%s`.', $filename));
+        parent::__construct(sprintf('The [afterAll] hook is already defined in [%s]. Each test file may only define it once.', $filename));
     }
 }

src/Exceptions/AfterAllWithinDescribe.php

@@ -14,11 +14,8 @@ use Symfony\Component\Console\Exception\ExceptionInterface;
  */
 final class AfterAllWithinDescribe extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
 {
-    /**
-     * Creates a new Exception instance.
-     */
     public function __construct(string $filename)
     {
-        parent::__construct(sprintf('The afterAll method can not be used within describe functions. Filename `%s`.', $filename));
+        parent::__construct(sprintf('The [afterAll] hook may not be used inside a [describe] block. Please move it to the top level of [%s].', $filename));
     }
 }

src/Exceptions/AfterBeforeTestFunction.php

@@ -14,11 +14,8 @@ use Symfony\Component\Console\Exception\ExceptionInterface;
  */
 final class AfterBeforeTestFunction extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
 {
-    /**
-     * Creates a new Exception instance.
-     */
     public function __construct(string $filename)
     {
-        parent::__construct('After method cannot be used with before the [test|it] functions in the filename `['.$filename.']`.');
+        parent::__construct(sprintf('The [after] hook may only be chained onto [beforeEach] inside a [describe] block. Please move it inside one in [%s].', $filename));
     }
 }

src/Exceptions/BaselineFetchFailed.php

@@ -0,0 +1,54 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Exceptions;
+
+use NunoMaduro\Collision\Contracts\RenderlessEditor;
+use NunoMaduro\Collision\Contracts\RenderlessTrace;
+use Pest\Contracts\Panicable;
+use Pest\Support\View;
+use RuntimeException;
+use Symfony\Component\Console\Exception\ExceptionInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * @internal
+ */
+final class BaselineFetchFailed extends RuntimeException implements ExceptionInterface, Panicable, RenderlessEditor, RenderlessTrace
+{
+    public function __construct(
+        private readonly string $headline,
+        private readonly string $hint,
+        private readonly bool $hasAnchor = false,
+    ) {
+        parent::__construct($headline);
+    }
+
+    public function render(OutputInterface $output): void
+    {
+        View::renderUsing($output);
+
+        if (! $this->hasAnchor) {
+            View::render('components.badge', ['type' => 'ERROR', 'content' => $this->headline]);
+            $this->renderChild($output, $this->hint.' Or use [--fresh] to record locally.');
+            $output->writeln('');
+
+            return;
+        }
+
+        $this->renderChild($output, $this->headline);
+        $this->renderChild($output, $this->hint.' Or use [--fresh] to record locally.');
+        $output->writeln('');
+    }
+
+    public function exitCode(): int
+    {
+        return 1;
+    }
+
+    private function renderChild(OutputInterface $output, string $text): void
+    {
+        $output->writeln(sprintf('  <fg=gray>─ %s</>', $text));
+    }
+}

src/Exceptions/BeforeAllAlreadyExist.php

@@ -14,11 +14,8 @@ use Symfony\Component\Console\Exception\ExceptionInterface;
  */
 final class BeforeAllAlreadyExist extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
 {
-    /**
-     * Creates a new Exception instance.
-     */
     public function __construct(string $filename)
     {
-        parent::__construct(sprintf('The beforeAll already exists in the filename `%s`.', $filename));
+        parent::__construct(sprintf('The [beforeAll] hook is already defined in [%s]. Each test file may only define it once.', $filename));
     }
 }

src/Exceptions/BeforeAllWithinDescribe.php

@@ -14,11 +14,8 @@ use Symfony\Component\Console\Exception\ExceptionInterface;
  */
 final class BeforeAllWithinDescribe extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
 {
-    /**
-     * Creates a new Exception instance.
-     */
     public function __construct(string $filename)
     {
-        parent::__construct(sprintf('The beforeAll method can not be used within describe functions. Filename `%s`.', $filename));
+        parent::__construct(sprintf('The [beforeAll] hook may not be used inside a [describe] block. Please move it to the top level of [%s].', $filename));
     }
 }

src/Exceptions/DatasetAlreadyExists.php

@@ -14,11 +14,8 @@ use Symfony\Component\Console\Exception\ExceptionInterface;
  */
 final class DatasetAlreadyExists extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
 {
-    /**
-     * Creates a new Exception instance.
-     */
     public function __construct(string $name, string $scope)
     {
-        parent::__construct(sprintf('A dataset with the name `%s` already exists in scope [%s].', $name, $scope));
+        parent::__construct(sprintf('A dataset named [%s] is already registered in [%s]. Please choose a different name.', $name, $scope));
     }
 }

src/Exceptions/DatasetArgumentsMismatch.php

@@ -11,11 +11,9 @@ final class DatasetArgumentsMismatch extends Exception
     public function __construct(int $requiredCount, int $suppliedCount)
     {
         if ($requiredCount <= $suppliedCount) {
-            parent::__construct('Test argument names and dataset keys do not match');
+            parent::__construct('The test arguments do not match the dataset keys. Please make sure each argument is named after a key in the dataset.');
         } else {
-            parent::__construct(sprintf('Test expects %d arguments but dataset only provides %d', $requiredCount, $suppliedCount));
+            parent::__construct(sprintf('The test expects [%d] argument(s), but the dataset only provides [%d].', $requiredCount, $suppliedCount));
         }
     }
-
-    //
 }

src/Exceptions/DatasetDoesNotExist.php

@@ -14,11 +14,8 @@ use Symfony\Component\Console\Exception\ExceptionInterface;
  */
 final class DatasetDoesNotExist extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
 {
-    /**
-     * Creates a new Exception instance.
-     */
     public function __construct(string $name)
     {
-        parent::__construct(sprintf("A dataset with the name `%s` does not exist. You can create it using `dataset('%s', ['a', 'b']);`.", $name, $name));
+        parent::__construct(sprintf("A dataset named [%s] does not exist. You may create one using `dataset('%s', ['a', 'b']);`.", $name, $name));
     }
 }

src/Exceptions/DatasetMissing.php

@@ -15,18 +15,16 @@ use Symfony\Component\Console\Exception\ExceptionInterface;
 final class DatasetMissing extends BadFunctionCallException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
 {
     /**
-     * Creates a new Exception instance.
-     *
      * @param  array<string, string>  $arguments
      */
     public function __construct(string $file, string $name, array $arguments)
     {
         parent::__construct(sprintf(
-            "A test with the description '%s' has %d argument(s) ([%s]) and no dataset(s) provided in %s",
+            'The test [%s] in [%s] expects [%d] argument(s) ([%s]), but no dataset was provided. Please chain [with()] onto the test to supply one.',
             $name,
+            $file,
             count($arguments),
             implode(', ', array_map(static fn (string $arg, string $type): string => sprintf('%s $%s', $type, $arg), array_keys($arguments), $arguments)),
-            $file,
         ));
     }
 }

src/Exceptions/DatasetProviderError.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Exceptions;
+
+use RuntimeException;
+use Throwable;
+
+/**
+ * @internal
+ */
+final class DatasetProviderError extends RuntimeException
+{
+    public function __construct(Throwable $previous)
+    {
+        parent::__construct($previous->getMessage(), (int) $previous->getCode(), $previous);
+    }
+}

src/Exceptions/ExpectationNotFound.php

@@ -11,11 +11,8 @@ use Exception;
  */
 final class ExpectationNotFound extends Exception
 {
-    /**
-     * Creates a new ExpectationNotFound instance from the given name.
-     */
     public static function fromName(string $name): ExpectationNotFound
     {
-        return new self("Expectation [$name] does not exist.");
+        return new self("The expectation [$name] does not exist. You may register it using [expect()->extend()].");
     }
 }

src/Exceptions/FileOrFolderNotFound.php

@@ -14,11 +14,8 @@ use Symfony\Component\Console\Exception\ExceptionInterface;
  */
 final class FileOrFolderNotFound extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
 {
-    /**
-     * Creates a new Exception instance.
-     */
     public function __construct(string $filename)
     {
-        parent::__construct(sprintf('The file or folder with the name `%s` could not be found.', $filename));
+        parent::__construct(sprintf('The file or folder [%s] could not be found. Please check the path and try again.', $filename));
     }
 }

src/Exceptions/InvalidArgumentException.php

@@ -14,9 +14,6 @@ use Symfony\Component\Console\Exception\ExceptionInterface;
  */
 final class InvalidArgumentException extends BaseInvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
 {
-    /**
-     * Creates a new Exception instance.
-     */
     public function __construct(string $message)
     {
         parent::__construct($message, 1);

src/Exceptions/InvalidExpectation.php

@@ -21,6 +21,6 @@ final class InvalidExpectation extends LogicException implements ExceptionInterf
      */
     public static function fromMethods(array $methods): never
     {
-        throw new self(sprintf('Expectation [%s] is not valid.', implode('->', $methods)));
+        throw new self(sprintf('The expectation [%s] does not exist. Please check the spelling, or register it using [expect()->extend()].', implode('->', $methods)));
     }
 }

src/Exceptions/InvalidExpectationValue.php

@@ -16,6 +16,6 @@ final class InvalidExpectationValue extends InvalidArgumentException
      */
     public static function expected(string $type): never
     {
-        throw new self(sprintf('Invalid expectation value type. Expected [%s].', $type));
+        throw new self(sprintf('This expectation may only be used on a value of type [%s].', $type));
     }
 }

src/Exceptions/InvalidOption.php

@@ -14,9 +14,6 @@ use Symfony\Component\Console\Exception\ExceptionInterface;
  */
 final class InvalidOption extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
 {
-    /**
-     * Creates a new Exception instance.
-     */
     public function __construct(string $message)
     {
         parent::__construct($message, 1);

src/Exceptions/InvalidPestCommand.php

@@ -14,11 +14,8 @@ use Symfony\Component\Console\Exception\ExceptionInterface;
  */
 final class InvalidPestCommand extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
 {
-    /**
-     * Creates a new Exception instance.
-     */
     public function __construct()
     {
-        parent::__construct('Please run [./vendor/bin/pest] instead.');
+        parent::__construct('Pest must be run through its own binary. Please run [./vendor/bin/pest] instead.');
     }
 }

src/Exceptions/InvalidTestClassName.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Exceptions;
+
+use InvalidArgumentException;
+use NunoMaduro\Collision\Contracts\RenderlessEditor;
+use NunoMaduro\Collision\Contracts\RenderlessTrace;
+use Symfony\Component\Console\Exception\ExceptionInterface;
+
+/**
+ * @internal
+ */
+final class InvalidTestClassName extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
+{
+    public static function fromClassName(string $filename, string $className): self
+    {
+        return new self(sprintf(
+            'The test file [%s] would create the class [%s], which is not a valid PHP class name. Please rename the file.',
+            $filename,
+            $className,
+        ));
+    }
+
+    public static function fromNamespace(string $filename, string $namespace, string $part): self
+    {
+        return new self(sprintf(
+            'The test file [%s] would create the namespace [%s], which is not a valid PHP namespace, because [%s] may not be used as a namespace name. Please rename that folder.',
+            $filename,
+            $namespace,
+            $part,
+        ));
+    }
+}

src/Exceptions/MissingDependency.php

@@ -14,11 +14,8 @@ use Symfony\Component\Console\Exception\ExceptionInterface;
  */
 final class MissingDependency extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
 {
-    /**
-     * Creates a new Exception instance.
-     */
     public function __construct(string $feature, string $dependency)
     {
-        parent::__construct(sprintf('The feature "%s" requires "%s".', $feature, $dependency));
+        parent::__construct(sprintf('The [%s] feature requires [%s]. Please install it and try again.', $feature, $dependency));
     }
 }

src/Exceptions/NoAffectedTestsFound.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Exceptions;
+
+use InvalidArgumentException;
+use NunoMaduro\Collision\Contracts\RenderlessEditor;
+use NunoMaduro\Collision\Contracts\RenderlessTrace;
+use Pest\Contracts\Panicable;
+use Symfony\Component\Console\Exception\ExceptionInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * @internal
+ */
+final class NoAffectedTestsFound extends InvalidArgumentException implements ExceptionInterface, Panicable, RenderlessEditor, RenderlessTrace
+{
+    public function render(OutputInterface $output): void
+    {
+        $output->writeln([
+            '',
+            '  <fg=white;options=bold;bg=blue> INFO </> No affected tests found.',
+            '',
+        ]);
+    }
+
+    public function exitCode(): int
+    {
+        return 0;
+    }
+}

src/Exceptions/NoDirtyTestsFound.php

@@ -16,9 +16,6 @@ use Symfony\Component\Console\Output\OutputInterface;
  */
 final class NoDirtyTestsFound extends InvalidArgumentException implements ExceptionInterface, Panicable, RenderlessEditor, RenderlessTrace
 {
-    /**
-     * Renders the panic on the given output.
-     */
     public function render(OutputInterface $output): void
     {
         $output->writeln([
@@ -28,9 +25,6 @@ final class NoDirtyTestsFound extends InvalidArgumentException implements Except
         ]);
     }
 
-    /**
-     * The exit code to be used.
-     */
     public function exitCode(): int
     {
         return 0;

src/Exceptions/ShouldNotHappen.php

@@ -12,15 +12,12 @@ use RuntimeException;
  */
 final class ShouldNotHappen extends RuntimeException
 {
-    /**
-     * Creates a new Exception instance.
-     */
     public function __construct(Exception $exception)
     {
         $message = $exception->getMessage();
 
         parent::__construct(sprintf(<<<'EOF'
-This should not happen - please create an new issue here: https://github.com/pestphp/pest.
+This should not have happened. Please report it here: https://github.com/pestphp/pest/issues
 
   Issue: %s
   PHP version: %s
@@ -29,9 +26,6 @@ EOF
             , $message, phpversion(), PHP_OS), 1, $exception);
     }
 
-    /**
-     * Creates a new instance of should not happen without a specific exception.
-     */
     public static function fromMessage(string $message): ShouldNotHappen
     {
         return new ShouldNotHappen(new Exception($message));

src/Exceptions/TestAlreadyExist.php

@@ -14,11 +14,8 @@ use Symfony\Component\Console\Exception\ExceptionInterface;
  */
 final class TestAlreadyExist extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
 {
-    /**
-     * Creates a new Exception instance.
-     */
     public function __construct(string $fileName, string $description)
     {
-        parent::__construct(sprintf('A test with the description `%s` already exists in the filename `%s`.', $description, $fileName));
+        parent::__construct(sprintf('A test named [%s] already exists in [%s]. Please give this test a different description.', $description, $fileName));
     }
 }

src/Exceptions/TestCaseAlreadyInUse.php

@@ -14,12 +14,13 @@ use Symfony\Component\Console\Exception\ExceptionInterface;
  */
 final class TestCaseAlreadyInUse extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
 {
-    /**
-     * Creates a new Exception instance.
-     */
     public function __construct(string $inUse, string $newOne, string $folder)
     {
-        parent::__construct(sprintf('Test case `%s` can not be used. The folder `%s` already uses the test case `%s`',
+        parent::__construct(sprintf(
-            $newOne, $folder, $inUse));
+            'The test case [%s] may not be used here. The folder [%s] is already bound to the test case [%s].',
+            $newOne,
+            $folder,
+            $inUse,
+        ));
     }
 }

src/Exceptions/TestCaseClassOrTraitNotFound.php

@@ -14,11 +14,8 @@ use Symfony\Component\Console\Exception\ExceptionInterface;
  */
 final class TestCaseClassOrTraitNotFound extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
 {
-    /**
-     * Creates a new Exception instance.
-     */
     public function __construct(string $testCaseClass)
     {
-        parent::__construct(sprintf('The class `%s` was not found.', $testCaseClass));
+        parent::__construct(sprintf('The class or trait [%s] could not be found. Please check the name, and make sure it is autoloadable.', $testCaseClass));
     }
 }