release: v2.2.0

[2.x] Fix `--dirty` not working on Windows

.gitattributes

@@ -1,14 +1,18 @@
-/art                     export-ignore
+/docker                  export-ignore
 /docs                    export-ignore
 /tests                   export-ignore
 /scripts                 export-ignore
 /.github                 export-ignore
-/.php-cs-fixer.dist.php  export-ignore
 .editorconfig            export-ignore
 .gitattributes           export-ignore
 .gitignore               export-ignore
-phpstan.neon             export-ignore
+/phpstan.neon            export-ignore
 /phpunit.xml             export-ignore
-CHANGELOG.md             export-ignore
+/CHANGELOG.md            export-ignore
-CONTRIBUTING.md          export-ignore
+/CONTRIBUTING.md         export-ignore
-README.md                export-ignore
+/docker-compose.yml      export-ignore
+/Makefile                export-ignore
+/rector.php              export-ignore
+/README.md               export-ignore
+/RELEASE.md              export-ignore
+

.github/FUNDING.yml

@@ -1,4 +1,4 @@
 # These are supported funding model platforms
 
-github: [nunomaduro,owenvoke,olivernybroe,octoper,lukeraymonddowning]
+github: [nunomaduro]
-patreon: nunomaduro
+custom: https://www.paypal.com/paypalme/enunomaduro

.github/workflows/changelog.yml

@@ -1,63 +0,0 @@
-name: Changelog
-
-on:
-  push:
-    branches: [ master ]
-    paths:
-      - CHANGELOG.md
-      - .github/workflows/changelog.yml
-  pull_request:
-    branches: [ master ]
-    paths:
-      - CHANGELOG.md
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    if: github.repository == 'pestphp/pest'
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Checkout website repository
-      uses: actions/checkout@v2
-      with:
-        token: ${{ secrets.CHANGELOG_KEY }}
-        repository: pestphp/docs
-        path: pestphp-docs
-        ref: master
-
-    - name: Read CHANGELOG.md
-      id: package
-      uses: juliangruber/read-file-action@v1
-      with:
-        path: ./CHANGELOG.md
-
-    - name: Add file headers
-      uses: DamianReeves/write-file-action@v1.0
-      with:
-        path: ./CHANGELOG.md
-        contents: |
-          ---
-          title: Changelog
-          description: Changelog
-          ---
-          ${{ steps.package.outputs.content }}
-
-          ----
-
-          Next section: [Upgrade Guide →](/docs/upgrade-guide)
-        write-mode: overwrite
-
-    - name: Copy CHANGELOG to website repository
-      run: cp CHANGELOG.md pestphp-docs/changelog.md
-
-    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v3
-      with:
-        token: ${{ secrets.CHANGELOG_KEY }}
-        commit-message: Update changelog.md
-        committer: GitHub Action <noreply@github.com>
-        author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
-        title: 'Update changelog.md'
-        path: ./pestphp-docs

.github/workflows/static.yml

@@ -1,38 +1,20 @@
 name: Static Analysis
 
-on: ['push', 'pull_request']
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '0 0 * * *'
 
 jobs:
-  cs:
+  static:
-    runs-on: ubuntu-latest
+    name: Static Tests
 
-    name: Code Style
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: 8.0
-        tools: composer:v2
-        coverage: none
-
-    - name: Install Dependencies
-      run: composer update --no-interaction --no-progress
-
-    - name: Run PHP-CS-Fixer
-      run: vendor/bin/php-cs-fixer fix -v --allow-risky=yes --dry-run
-
-  phpstan:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         dependency-version: [prefer-lowest, prefer-stable]
 
-    name: PHPStan ${{ matrix.dependency-version }}
-
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -40,12 +22,18 @@ jobs:
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: 8.0
+        php-version: 8.1
         tools: composer:v2
         coverage: none
 
     - name: Install Dependencies
-      run: composer update --prefer-stable --no-interaction --no-progress
+      run: composer update --prefer-stable --no-interaction --no-progress --ansi
 
-    - name: Run PHPStan
+    - name: Types
-      run: vendor/bin/phpstan analyse --no-progress
+      run: composer test:types
+
+    - name: Refacto
+      run: composer test:refacto
+
+    - name: Style
+      run: composer test:lint

.github/workflows/tests.yml

@@ -1,6 +1,11 @@
 name: Tests
 
-on: ['push', 'pull_request']
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '0 0 * * *'
+
 
 jobs:
   ci:
@@ -8,11 +13,10 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        php: ['7.3', '7.4', '8.0']
+        php: ['8.1', '8.2']
         dependency-version: [prefer-lowest, prefer-stable]
-        parallel: ['', '--parallel']
 
-    name: PHP ${{ matrix.php }} - ${{ matrix.os }} - ${{ matrix.dependency-version }} - ${{ matrix.parallel }}
+    name: PHP ${{ matrix.php }} - ${{ matrix.os }} - ${{ matrix.dependency-version }}
 
     steps:
     - name: Checkout
@@ -30,16 +34,15 @@ jobs:
         echo "::add-matcher::${{ runner.tool_cache }}/php.json"
         echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
-    - name: Install PHP 7 dependencies
+    - name: Install PHP dependencies
-      run: composer update --${{ matrix.dependency-version }} --no-interaction --no-progress
+      run: composer update --${{ matrix.dependency-version }} --no-interaction --no-progress --ansi
-      if: "matrix.php < 8"
-
-    - name: Install PHP 8 dependencies
-      run: composer update --${{ matrix.dependency-version }} --ignore-platform-req=php --no-interaction --no-progress
-      if: "matrix.php >= 8"
 
     - name: Unit Tests
-      run: php bin/pest --colors=always --exclude-group=integration ${{ matrix.parallel }}
+      run: composer test:unit
+
+    - name: Unit Tests in Parallel
+      run: composer test:parallel
+      if: startsWith(matrix.os, 'windows') != true
 
     - name: Integration Tests
-      run: php bin/pest --colors=always --group=integration
+      run: composer test:integration

.gitignore

@@ -1,9 +1,11 @@
 .idea/*
 .idea/codeStyleSettings.xml
+.temp/*
 composer.lock
 /vendor/
 coverage.xml
 .phpunit.result.cache
+.phpunit.cache
 /.php-cs-fixer.php
 .php-cs-fixer.cache
 .temp/coverage.php

.php-cs-fixer.dist.php

@@ -1,30 +0,0 @@
-<?php
-
-$finder = PhpCsFixer\Finder::create()
-    ->in(__DIR__ . DIRECTORY_SEPARATOR . 'tests')
-    ->in(__DIR__ . DIRECTORY_SEPARATOR . 'bin')
-    ->in(__DIR__ . DIRECTORY_SEPARATOR . 'stubs')
-    ->in(__DIR__ . DIRECTORY_SEPARATOR . 'src')
-    ->append(['.php-cs-fixer.dist.php']);
-
-$rules = [
-    '@Symfony'               => true,
-    'phpdoc_no_empty_return' => false,
-    'array_syntax'           => ['syntax' => 'short'],
-    'yoda_style'             => false,
-    'binary_operator_spaces' => [
-        'operators' => [
-            '=>' => 'align',
-            '='  => 'align',
-        ],
-    ],
-    'concat_space'            => ['spacing' => 'one'],
-    'not_operator_with_space' => false,
-];
-
-$rules['increment_style'] = ['style' => 'post'];
-
-return (new PhpCsFixer\Config())
-    ->setUsingCache(true)
-    ->setRules($rules)
-    ->setFinder($finder);

CHANGELOG.md

@@ -1,313 +1,35 @@
-# Changelog
+# Release Notes for 2.x
-All notable changes to this project will be documented in this file.
 
-The format is based on [Keep a Changelog](http://keepachangelog.com/)
+## Unreleased
-and this project adheres to [Semantic Versioning](http://semver.org/).
+
+## [v2.2.0 (2023-03-22)](https://github.com/pestphp/pest/compare/v2.1.0...v2.2.0)
 
-## [v1.16.0 (2021-08-19)](https://github.com/pestphp/pest/compare/v1.15.0...v1.16.0)
 ### Added
-- Support for new parallel options ([#369](https://github.com/pestphp/pest/pull/369))
+- Improved error messages on dataset arguments mismatch ([#698](https://github.com/pestphp/pest/pull/698))
-
+- Allows the usage of `DateTimeInterface` on multiple expectations ([#716](https://github.com/pestphp/pest/pull/716))
-## [v1.15.0 (2021-08-04)](https://github.com/pestphp/pest/compare/v1.14.0...v1.15.0)
-### Added
-- `toBeTruthy` and `toBeFalsy` ([#367](https://github.com/pestphp/pest/pull/367))
-
-## [v1.14.0 (2021-08-03)](https://github.com/pestphp/pest/compare/v1.13.0...v1.14.0)
-### Added
-- A new bound closure that allows you to access the test case in Datasets ([#364](https://github.com/pestphp/pest/pull/364))
-
-## [v1.13.0 (2021-08-02)](https://github.com/pestphp/pest/compare/v1.12.0...v1.13.0)
-### Added
-- A cleaner output when running the Pest runner in PhpStorm ([#350](https://github.com/pestphp/pest/pull/350)) 
-- `toBeIn` expectation ([#363](https://github.com/pestphp/pest/pull/363))
 
 ### Fixed
-- `skip` with false condition marking test as skipped ([22b822c](https://github.com/pestphp/pest/commit/22b822ce87a3d19d84960fa5c93eb286820b525d))
+- `--dirty` option on Windows environments ([#721](https://github.com/pestphp/pest/pull/721))
+- Parallel exit code when `phpunit.xml` is outdated ([14dd5cb](https://github.com/pestphp/pest/commit/14dd5cb57b9432300ac4e8095f069941cb43bdb5))
+
+## [v2.1.0 (2023-03-21)](https://github.com/pestphp/pest/compare/v2.0.2...v2.1.0)
 
-## [v1.12.0 (2021-07-26)](https://github.com/pestphp/pest/compare/v1.11.0...v1.12.0)
 ### Added
-- `--force` option to override tests in `pest:test` artisan command ([#353](https://github.com/pestphp/pest/pull/353))
+- `only` test case method ([bcd1503](https://github.com/pestphp/pest/commit/bcd1503cade938853a55c1283b02b6b820ea0b69))
-- Support for PHPUnit `^9.3.7` ([ca9d783](https://github.com/pestphp/pest/commit/ca9d783cf942a2caabc85ff7a728c7f28350c67a))
 
 ### Fixed
-- `beforeAll` and `afterAll` behind called multiple times per test ([#357](https://github.com/pestphp/pest/pull/357))
+- Issues with different characters on test names ([715](https://github.com/pestphp/pest/pull/715))
 
-## [v1.11.0 (2021-07-21)](https://github.com/pestphp/pest/compare/v1.10.0...v1.11.0)
+## [v2.0.2 (2023-03-20)](https://github.com/pestphp/pest/compare/v2.0.1...v2.0.2)
-### Added
-- Support for interacting with datasets in higher order tests ([#352](https://github.com/pestphp/pest/pull/352))
-
-### Changed
-- The unit test stub now uses the expectation API ([#348](https://github.com/pestphp/pest/pull/348))
 
 ### Fixed
-- PhpStorm will no longer show 0 assertions in the output ([#349](https://github.com/pestphp/pest/pull/349))
+- `Pest.php` not being loaded in certain scenarios ([b887116](https://github.com/pestphp/pest/commit/b887116e5ce9a69403ad620cad20f0a029474eb5))
 
-## [v1.10.0 (2021-07-12)](https://github.com/pestphp/pest/compare/v1.9.1...v1.10.0)
+## [v2.0.1 (2023-03-20)](https://github.com/pestphp/pest/compare/v2.0.0...v2.0.1)
-### Added
-- The ability to use higher order expectations inside higher order tests ([#341](https://github.com/pestphp/pest/pull/341))
-
-## [v1.9.1 (2021-07-11)](https://github.com/pestphp/pest/compare/v1.9.0...v1.9.1)
-### Fixed
-- Callable `expect` values in higher order tests failing if the value was an existing method name ([#334](https://github.com/pestphp/pest/pull/344)) 
-
-## [v1.9.0 (2021-07-09)](https://github.com/pestphp/pest/compare/v1.8.0...v1.9.0)
-### Changed
-- You may now pass just an exception message when using the `throws` method ([#339](https://github.com/pestphp/pest/pull/339)) 
-
-## [v1.8.0 (2021-07-08)](https://github.com/pestphp/pest/compare/v1.7.1...v1.8.0)
-### Added
-- A new `tap` and test case aware `expect` methods for higher order tests ([#331](https://github.com/pestphp/pest/pull/331))
-- Access to test case methods and properties when using `skip` ([#338](https://github.com/pestphp/pest/pull/338))
-
-## [v1.7.1 (2021-06-24)](https://github.com/pestphp/pest/compare/v1.7.0...v1.7.1)
-### Fixed
-- The `and` method not being usable in Higher Order expectations ([#330](https://github.com/pestphp/pest/pull/330))
-
-## [v1.7.0 (2021-06-19)](https://github.com/pestphp/pest/compare/v1.6.0...v1.7.0)
-### Added
-- Support for non-callable values in the sequence method, which will be passed as `toEqual` ([#323](https://github.com/pestphp/pest/pull/323))
-- Support for nested Higher Order Expectations ([#324](https://github.com/pestphp/pest/pull/324))
-
-## [v1.6.0 (2021-06-18)](https://github.com/pestphp/pest/compare/v1.5.0...v1.6.0)
-### Added
-- Adds a new `json` expectation method to improve testing with JSON strings ([#325](https://github.com/pestphp/pest/pull/325))
-- Adds dot notation support to the `toHaveKey` and `toHaveKeys` expectations ([#322](https://github.com/pestphp/pest/pull/322))
-
-## [v1.5.0 (2021-06-15)](https://github.com/pestphp/pest/compare/v1.4.0...v1.5.0)
-### Changed
-- Moves plugins from the `require` section to the core itself ([#317](https://github.com/pestphp/pest/pull/317)), ([#318](https://github.com/pestphp/pest/pull/318)), ([#320](https://github.com/pestphp/pest/pull/320))
-
-## [v1.4.0 (2021-06-10)](https://github.com/pestphp/pest/compare/v1.3.2...v1.4.0)
-### Added
-- Support for multiple datasets (Matrix) on the `with` method ([#303](https://github.com/pestphp/pest/pull/303))
-- Support for incompleted tests ([49de462](https://github.com/pestphp/pest/commit/49de462250cf9f65f09e13eaf6dcc0e06865b930))
-
-## [v1.3.2 (2021-06-07)](https://github.com/pestphp/pest/compare/v1.3.1...v1.3.2)
-### Fixed 
-- Test cases with the @ symbol in the directory fail ([#308](https://github.com/pestphp/pest/pull/308))
-
-## [v1.3.1 (2021-06-06)](https://github.com/pestphp/pest/compare/v1.3.0...v1.3.1)
-### Added
-- Added for PHPUnit 9.5.5 ([#310](https://github.com/pestphp/pest/pull/310))
-
-### Changed
-- Lock minimum Pest plugin versions ([#306](https://github.com/pestphp/pest/pull/306))
-
-## [v1.3.0 (2021-05-23)](https://github.com/pestphp/pest/compare/v1.2.1...v1.3.0)
-### Added
-- Named datasets no longer show the arguments ([#302](https://github.com/pestphp/pest/pull/302))
 
 ### Fixed
-- Wraps global functions within `function_exists` ([#300](https://github.com/pestphp/pest/pull/300))
+- Wrong `version` configuration key on `composer.json` ([8f91f40](https://github.com/pestphp/pest/commit/8f91f40e8ea8b35e04b7989bed6a8f9439e2a2d6))
 
-## [v1.2.1 (2021-05-14)](https://github.com/pestphp/pest/compare/v1.2.0...v1.2.1)
+## [v2.0.0 (2023-03-20)](https://github.com/pestphp/pest/compare/v1.22.6...v2.0.0)
-### Fixed
-- Laravel commands failing with new `--test-directory` option ([#297](https://github.com/pestphp/pest/pull/297))
 
-## [v1.2.0 (2021-05-13)](https://github.com/pestphp/pest/compare/v1.1.0...v1.2.0)
+Please consult the [upgrade guide](https://pestphp.com/docs/upgrade-guide) and [release notes](https://pestphp.com/docs/announcing-pest2) in the official Pest documentation.
-### Added
-- Adds JUnit / Infection support ([#291](https://github.com/pestphp/pest/pull/291))
-- `--test-directory` command line option ([#283](https://github.com/pestphp/pest/pull/283))
-
-## [v1.1.0 (2021-05-02)](https://github.com/pestphp/pest/compare/v1.0.5...v1.1.0)
-### Added
-- Possibility of "hooks" being added using the "uses" function ([#282](https://github.com/pestphp/pest/pull/282))
-
-## [v1.0.5 (2021-03-31)](https://github.com/pestphp/pest/compare/v1.0.4...v1.0.5)
-### Added
-- Add `--browse` option to `pest:dusk` command ([#280](https://github.com/pestphp/pest/pull/280))
-- Support for PHPUnit 9.5.4 ([#284](https://github.com/pestphp/pest/pull/284))
-
-## [v1.0.4 (2021-03-17)](https://github.com/pestphp/pest/compare/v1.0.3...v1.0.4)
-### Added
-- Support for PHPUnit 9.5.3 ([#278](https://github.com/pestphp/pest/pull/278))
-
-## [v1.0.3 (2021-03-13)](https://github.com/pestphp/pest/compare/v1.0.2...v1.0.3)
-### Added
-- Support for test extensions ([#269](https://github.com/pestphp/pest/pull/269))
-
-## [v1.0.2 (2021-02-04)](https://github.com/pestphp/pest/compare/v1.0.1...v1.0.2)
-### Added
-- Support for PHPUnit 9.5.2 ([#267](https://github.com/pestphp/pest/pull/267))
-
-## [v1.0.1 (2021-01-18)](https://github.com/pestphp/pest/compare/v1.0.0...v1.0.1)
-### Added
-- Support for PHPUnit 9.5.1 ([#261](https://github.com/pestphp/pest/pull/261))
-
-### Fixed
-- Fix `TestCase@expect` PHPDoc tag ([#251](https://github.com/pestphp/pest/pull/251))
-
-## [v1.0.0 (2021-01-03)](https://github.com/pestphp/pest/compare/v0.3.19...v1.0.0)
-### Added
-- `pest:test --dusk` option ([#245](https://github.com/pestphp/pest/pull/245))
-
-### Changed
-- Stable version
-- Updates init structure ([#240](https://github.com/pestphp/pest/pull/240))
-
-## [v0.3.19 (2020-12-27)](https://github.com/pestphp/pest/compare/v0.3.18...v0.3.19)
-### Fixed
-- Fix binary path in `pest:dusk` command ([#239](https://github.com/pestphp/pest/pull/239))
-
-## [v0.3.18 (2020-12-26)](https://github.com/pestphp/pest/compare/v0.3.17...v0.3.18)
-### Added
-- `toBeJson()` expectation ([plugin-expectations#2](https://github.com/pestphp/pest-plugin-expectations/pull/2))
-
-## [v0.3.17 (2020-12-20)](https://github.com/pestphp/pest/compare/v0.3.16...v0.3.17)
-### Fixed
-- Class inheritance with `depends()` ([#236](https://github.com/pestphp/pest/pull/236))
-
-## [v0.3.16 (2020-12-13)](https://github.com/pestphp/pest/compare/v0.3.15...v0.3.16)
-### Changed
-- Moves expectation API for external plugin ([5d7f262](https://github.com/pestphp/pest/commit/5d7f262f4ab280a660a85900f402eebb23abfda8))
-
-## [v0.3.15 (2020-12-04)](https://github.com/pestphp/pest/compare/v0.3.14...v0.3.15)
-### Added
-- Support for PHPUnit 9.5.0 ([#234](https://github.com/pestphp/pest/pull/234))
-- Support for extending expectation API ([#232](https://github.com/pestphp/pest/pull/232))
-
-### Fixed
-- Static analysis while using string as key for datasets ([#233](https://github.com/pestphp/pest/pull/233))
-
-## [v0.3.14 (2020-11-28)](https://github.com/pestphp/pest/compare/v0.3.13...v0.3.14)
-### Added
-- `pest:dusk` command ([#223](https://github.com/pestphp/pest/pull/223))
-- Better feedback on errors in `toMatchArray` and `toMatchObject` ([#231](https://github.com/pestphp/pest/pull/231))
-
-## [v0.3.13 (2020-11-23)](https://github.com/pestphp/pest/compare/v0.3.12...v0.3.13)
-### Added
-- `toMatchArray` expectation ([7bea51f](https://github.com/pestphp/pest/commit/7bea51fe09dd2eca7093e4c34cf2dab2e8d39fa5), [3fd24d9](https://github.com/pestphp/pest/commit/3fd24d96d3145dcebdb0aab40aa8b76faa8b6979))
-- Add Pest options to `--help` output ([#217](https://github.com/pestphp/pest/pull/217))
-
-### Fixed
-- Resolve issue with name resolution in `depends()` ([#216](https://github.com/pestphp/pest/pull/216))
-
-## [v0.3.12 (2020-11-11)](https://github.com/pestphp/pest/compare/v0.3.11...v0.3.12)
-### Added
-- Add support for PHPUnit 9.4.3 ([#219](https://github.com/pestphp/pest/pull/219))
-
-## [v0.3.11 (2020-11-09)](https://github.com/pestphp/pest/compare/v0.3.10...v0.3.11)
-### Changed
-- Improved the exception output for the TeamCity printer (usage with phpstorm plugin) ([#215](https://github.com/pestphp/pest/pull/215))
-
-## [v0.3.10 (2020-11-01)](https://github.com/pestphp/pest/compare/v0.3.9...v0.3.10)
-### Added
-- Add support for PHPUnit 9.4.2 ([d177ab5](https://github.com/pestphp/pest/commit/d177ab5ec2030c5bb8e418d10834c370c94c433d))
-
-## [v0.3.9 (2020-10-13)](https://github.com/pestphp/pest/compare/v0.3.8...v0.3.9)
-### Added
-- Add support for named datasets in description output ([#134](https://github.com/pestphp/pest/pull/134))
-- Add Pest version to `--help` output ([#203](https://github.com/pestphp/pest/pull/203))
-- Add support for PHPUnit 9.4.1 ([#207](https://github.com/pestphp/pest/pull/207))
-
-## [v0.3.8 (2020-10-03)](https://github.com/pestphp/pest/compare/v0.3.7...v0.3.8)
-### Added
-- Add support for PHPUnit 9.4.0 ([#199](https://github.com/pestphp/pest/pull/199))
-
-### Fixed
-- Fix chained higher order assertions returning void ([#196](https://github.com/pestphp/pest/pull/196))
-
-## [v0.3.7 (2020-09-30)](https://github.com/pestphp/pest/compare/v0.3.6...v0.3.7)
-### Added
-- Add support for PHPUnit 9.3.11 ([#193](https://github.com/pestphp/pest/pull/193))
-
-## [v0.3.6 (2020-09-21)](https://github.com/pestphp/pest/compare/v0.3.5...v0.3.6)
-### Added
-- `toMatch` expectation ([#191](https://github.com/pestphp/pest/pull/191))
-- `toMatchConstraint` expectation ([#190](https://github.com/pestphp/pest/pull/190))
-
-## [v0.3.5 (2020-09-16)](https://github.com/pestphp/pest/compare/v0.3.4...v0.3.5)
-### Added
-- `toStartWith` and `toEndWith` expectations ([#187](https://github.com/pestphp/pest/pull/187))
-
-## [v0.3.4 (2020-09-15)](https://github.com/pestphp/pest/compare/v0.3.3...v0.3.4)
-### Added
-- `toMatchObject` expectation ([4e184b2](https://github.com/pestphp/pest/commit/4e184b2f906c318a5e9cd38fe693cdab5c48d8a2))
-
-## [v0.3.3 (2020-09-13)](https://github.com/pestphp/pest/compare/v0.3.2...v0.3.3)
-### Added
-- `toHaveKeys` expectation ([204f343](https://github.com/pestphp/pest/commit/204f343831adc17bb3734553c24fac92d02f27c7))
-
-## [v0.3.2 (2020-09-12)](https://github.com/pestphp/pest/compare/v0.3.1...v0.3.2)
-### Added
-- Support to PHPUnit 9.3.9, and 9.3.10 ([1318bf9](https://github.com/pestphp/pest/commit/97f98569bc86e8b87f8cde963fe7b4bf5399623b))
-
-## [v0.3.1 (2020-08-29)](https://github.com/pestphp/pest/compare/v0.3.0...v0.3.1)
-### Added
-- Support to PHPUnit 9.3.8 ([#174](https://github.com/pestphp/pest/pull/174))
-
-## [v0.3.0 (2020-08-27)](https://github.com/pestphp/pest/compare/v0.2.3...v0.3.0)
-### Added
-- Expectation API (TODO)
-- PHPUnit 9.3 and PHP 8 support ([#128](https://github.com/pestphp/pest/pull/128))
-- Forwards `$this` calls to globals ([#169](https://github.com/pestphp/pest/pull/169))
-
-### Fixed
-- don't decorate output if --colors=never is set ([36b879f](https://github.com/pestphp/pest/commit/36b879f97d7b187c87a94eb60af5b7d3b7253d56))
-
-## [v0.2.3 (2020-07-01)](https://github.com/pestphp/pest/compare/v0.2.2...v0.2.3)
-### Added
-- `--init` and `pest:install` artisan command output changes ([#118](https://github.com/pestphp/pest/pull/118), [db7c4b1](https://github.com/pestphp/pest/commit/db7c4b174f0974969450dda71dcd649ef0c073a3))
-- `--version` option to view the current version of Pest ([9ea51ca](https://github.com/pestphp/pest/commit/9ea51caf3f74569debb1e465992e9ea916cb80fe))
-
-## [v0.2.2 (2020-06-21)](https://github.com/pestphp/pest/compare/v0.2.1...v0.2.2)
-### Added
-- `depends` phpunit feature ([#103](https://github.com/pestphp/pest/pull/103))
-
-### Fixes
-- datasets name conflict ([#101](https://github.com/pestphp/pest/pull/101))
-
-## [v0.2.1 (2020-06-17)](https://github.com/pestphp/pest/compare/v0.2.0...v0.2.1)
-### Fixes
-- Multiple `uses` in the same path override previous `uses` ([#97](https://github.com/pestphp/pest/pull/97))
-
-## [v0.2.0 (2020-06-14)](https://github.com/pestphp/pest/compare/v0.1.5...v0.2.0)
-### Adds
-- `--init` option to install Pest on a new blank project ([70b3c7e](https://github.com/pestphp/pest/commit/70b3c7ea1ddb031f3bbfaabdc28d56270608ebbd))
-- pending higher orders tests aka tests without description ([aa1917c](https://github.com/pestphp/pest/commit/aa1917c28d9b69c2bd1d51f986c4f61318ee7e16))
-
-### Fixed
-- `--verbose` and `--colors` options not being used by printers ([#51](https://github.com/pestphp/pest/pull/51))
-- missing support on windows ([#61](https://github.com/pestphp/pest/pull/61))
-
-### Changed
-- `helpers.php` stub provides now namespaced functions
-- functions provided by plugins are now namespaced functions:
-
-```php
-use function Pest\Faker\faker;
-
-it('foo', function () {
-    $name = faker()->name;
-});
-```
-
-## [v0.1.5 (2020-05-24)](https://github.com/pestphp/pest/compare/v0.1.4...v0.1.5)
-### Fixed
-- Missing default decorated output on coverage ([88d2391](https://github.com/pestphp/pest/commit/88d2391d2e6fe9c9416462734b9b523cb418f469))
-
-## [v0.1.4 (2020-05-24)](https://github.com/pestphp/pest/compare/v0.1.3...v0.1.4)
-### Added
-- Support to Lumen on artisan commands ([#18](https://github.com/pestphp/pest/pull/18))
-
-### Fixed
-- Mockery tests without assertions being considered risky ([415f571](https://github.com/pestphp/pest/commit/415f5719101b30c11d87f74810a71686ef2786c6))
-
-## [v0.1.3 (2020-05-21)](https://github.com/pestphp/pest/compare/v0.1.2...v0.1.3)
-### Added
-- `Plugin::uses()` method for making traits globally available ([6c4be01](https://github.com/pestphp/pest/commit/6c4be0190e9493702a976b996bbbf5150cc6bb53))
-
-## [v0.1.2 (2020-05-15)](https://github.com/pestphp/pest/compare/v0.1.1...v0.1.2)
-### Added
-- Support to custom helpers ([#7](https://github.com/pestphp/pest/pull/7))
-
-## [v0.1.1 (2020-05-14)](https://github.com/pestphp/pest/compare/v0.1.0...v0.1.1)
-### Added
-- `test` function without any arguments returns the current test case ([6fc55be](https://github.com/pestphp/pest/commit/6fc55becc8aecff685a958617015be1a4c118b01))
-
-### Fixed
-- "No coverage driver error" now returns proper error on Laravel ([28d8822](https://github.com/pestphp/pest/commit/28d8822de01f4fa92c62d8b8e019313f382b97e9))
-
-## [v0.1.0 (2020-05-09)](https://github.com/pestphp/pest/commit/de2929077b344a099ef9c2ddc2f48abce14e248f)
-### Added
-- First version

CONTRIBUTING.md

@@ -31,6 +31,10 @@ composer lint
 ```
 ## Tests
 
+Update the snapshots:
+```bash
+composer update:snapshots
+```
 Run all tests:
 ```bash
 composer test
@@ -50,3 +54,22 @@ Integration tests:
 ```bash
 composer test:integration
 ```
+
+## Simplified setup using Docker
+
+If you have Docker installed, you can quickly get all dependencies for Pest in place using
+our Docker files. Assuming you have the repository cloned, you may run the following
+commands:
+
+1. `make build` to build the Docker image
+2. `make install` to install Composer dependencies
+3. `make test` to run the project tests and analysis tools
+
+If you want to check things work against a specific version of PHP, you may include
+the `PHP` build argument when building the image:
+
+```bash
+make build ARGS="--build-arg PHP=8.2"
+```
+
+The default PHP version will always be the lowest version of PHP supported by Pest.

Makefile

@@ -0,0 +1,14 @@
+# 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,7 +1,7 @@
 <p align="center">
-    <img src="https://raw.githubusercontent.com/pestphp/art/master/readme.png" width="600" alt="PEST">
+    <img src="https://raw.githubusercontent.com/pestphp/art/master/v2/banner.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/workflow/status/pestphp/pest/Tests/master"></a>
+        <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://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>
@@ -9,22 +9,32 @@
 </p>
 
 ------
-**Pest** is an elegant PHP Testing Framework with a focus on simplicity. It was carefully crafted to bring the joy of testing to PHP.
+**Pest** is an elegant PHP testing Framework with a focus on simplicity, meticulously designed to bring back the joy of testing in PHP.
 
-- Explore the docs: **[pestphp.com »](https://pestphp.com)**
+- Explore our docs at **[pestphp.com »](https://pestphp.com)**
-- Follow us on Twitter: **[@pestphp »](https://twitter.com/pestphp)**
+- Follow us on Twitter at **[@pestphp »](https://twitter.com/pestphp)**
-- Join us on the Discord Server: **[discord.gg/bMAJv82 »](https://discord.gg/bMAJv82)**
+- Join us at **[discord.gg/kaHY6p54JH »](https://discord.gg/kaHY6p54JH)** or **[t.me/+kYH5G4d5MV83ODk0 »](https://t.me/+kYH5G4d5MV83ODk0)**
 
-## Pest Sponsors
+## Sponsors
 
-We would like to extend our thanks to the following sponsors for funding Pest development. If you are interested in becoming a sponsor, please visit the Nuno Maduro's [Sponsors page](https://github.com/sponsors/nunomaduro).
+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
+
+- **[Forge](https://forge.laravel.com)**
+- **[LoadForge](https://loadforge.com)**
+- **[Spatie](https://spatie.be)**
+- **[Worksome](https://www.worksome.com/)**
 
 ### Premium Sponsors
 
-- **[Akaunting](https://akaunting.com)**
+- [Akaunting](https://akaunting.com)
-- **[Codecourse](https://codecourse.com/)**
+- [Codecourse](https://codecourse.com/)
-- **[Meema](https://meema.io/)**
+- [Laracasts](https://laracasts.com/)
-- **[Scout APM](https://scoutapm.com)**
+- [Localazy](https://localazy.com)
-- **[Spatie](https://spatie.be/)**
+- [Hyvor](https://hyvor.com/)
+- [Fathom Analytics](https://usefathom.com/)
+- [Meema](https://meema.io)
+- [Zapiet](https://www.zapiet.com)
 
 Pest is an open-sourced software licensed under the **[MIT license](https://opensource.org/licenses/MIT)**.

RELEASE.md

@@ -2,14 +2,17 @@
 
 When releasing a new version of Pest there are some checks and updates that need to be done:
 
-- Clear your local repository with: `git add . && git reset --hard && git checkout master` 
+> **For Pest v1 you should use the `1.x` branch instead.**
-- On the GitHub repository, check the contents of [github.com/pestphp/pest/compare/{latest_version}...master](https://github.com/pestphp/pest/compare/{latest_version}...master) and update the [changelog](CHANGELOG.md) file with the main changes for this release
+
+- Clear your local repository with: `git add . && git reset --hard && git checkout 2.x`
+- On the GitHub repository, check the contents of [github.com/pestphp/pest/compare/{latest_version}...2.x](https://github.com/pestphp/pest/compare/{latest_version}...master) and update the [changelog](CHANGELOG.md) file with the main changes for this release
 - Update the version number in [src/Pest.php](src/Pest.php)
 - Run the tests locally using: `composer test`
 - Commit the CHANGELOG and Pest file with the message: `git commit -m "release: vX.X.X"`
 - Push the changes to GitHub
 - Check that the CI is passing as expected: [github.com/pestphp/pest/actions](https://github.com/pestphp/pest/actions)
 - Tag and push the tag with `git tag vX.X.X && git push --tags`
+- Publish release here: [github.com/pestphp/pest/releases/new](https://github.com/pestphp/pest/releases/new).
 
 ### Plugins
 

bin/pest

@@ -1,21 +1,60 @@
 #!/usr/bin/env php
 <?php declare(strict_types=1);
 
-use NunoMaduro\Collision\Provider;
+use Pest\Kernel;
-use Pest\Actions\ValidatesEnvironment;
+use Pest\Panic;
-use Pest\Support\Container;
+use Pest\TestCaseFilters\GitDirtyTestCaseFilter;
+use Pest\TestCaseMethodFilters\TodoTestCaseFilter;
 use Pest\TestSuite;
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Console\Output\ConsoleOutput;
-use Symfony\Component\Console\Output\OutputInterface;
 
 (static function () {
+    // Ensures Collision's Printer is registered.
+    $_SERVER['COLLISION_PRINTER'] = 'DefaultPrinter';
+
+    $args = $_SERVER['argv'];
+
+    $dirty = false;
+    $todo = false;
+
+    foreach ($args as $key => $value) {
+        if ($value === '--compact') {
+            $_SERVER['COLLISION_PRINTER_COMPACT'] = 'true';
+            unset($args[$key]);
+        }
+
+        if ($value === '--profile') {
+            $_SERVER['COLLISION_PRINTER_PROFILE'] = 'true';
+            unset($args[$key]);
+        }
+
+        if (str_contains($value, '--test-directory')) {
+            unset($args[$key]);
+        }
+
+        if ($value === '--dirty') {
+            $dirty = true;
+            unset($args[$key]);
+        }
+
+        if ($value === '--todos') {
+            $todo = true;
+            unset($args[$key]);
+        }
+
+        if (str_contains($value, '--teamcity')) {
+            unset($args[$key]);
+            $args[] = '--no-output';
+            unset($_SERVER['COLLISION_PRINTER']);
+        }
+    }
+
     // Used when Pest is required using composer.
-    $vendorPath = dirname(__DIR__, 4) . '/vendor/autoload.php';
+    $vendorPath = dirname(__DIR__, 4).'/vendor/autoload.php';
 
     // Used when Pest maintainers are running Pest tests.
-    $localPath = dirname(__DIR__) . '/vendor/autoload.php';
+    $localPath = dirname(__DIR__).'/vendor/autoload.php';
 
     if (file_exists($vendorPath)) {
         include_once $vendorPath;
@@ -25,39 +64,36 @@ use Symfony\Component\Console\Output\OutputInterface;
         $autoloadPath = $localPath;
     }
 
-    (new Provider())->register();
-
     // Get $rootPath based on $autoloadPath
     $rootPath = dirname($autoloadPath, 2);
-    $argv = new ArgvInput();
+    $input = new ArgvInput();
 
-    $testSuite = TestSuite::getInstance($rootPath, $argv->getParameterOption('--test-directory', 'tests'));
+    $testSuite = TestSuite::getInstance(
+        $rootPath,
+        $input->getParameterOption('--test-directory', 'tests'),
+    );
+
+    if ($dirty) {
+        $testSuite->tests->addTestCaseFilter(new GitDirtyTestCaseFilter($rootPath));
+    }
+
+    if ($todo) {
+        $testSuite->tests->addTestCaseMethodFilter(new TodoTestCaseFilter());
+    }
+
+    $isDecorated = $input->getParameterOption('--colors', 'always') !== 'never';
 
-    $isDecorated = $argv->getParameterOption('--colors', 'always') !== 'never';
     $output = new ConsoleOutput(ConsoleOutput::VERBOSITY_NORMAL, $isDecorated);
 
-    $container = Container::getInstance();
+    try {
-    $container->add(TestSuite::class, $testSuite);
+        $kernel = Kernel::boot($testSuite, $input, $output);
-    $container->add(OutputInterface::class, $output);
 
-    ValidatesEnvironment::in($testSuite);
+        $result = $kernel->handle($args);
 
-    $args = $_SERVER['argv'];
+        $kernel->shutdown();
-
+    } catch (Throwable|Error $e) {
-    // Let's remove any arguments that PHPUnit does not understand
+        Panic::with($e);
-    if ($argv->hasParameterOption('--test-directory')) {
-        foreach ($args as $key => $value) {
-            if (strpos($value, '--test-directory') !== false) {
-                unset($args[$key]);
-            }
-        }
     }
 
-    if (($runInParallel = $argv->hasParameterOption(['--parallel', '-p'])) && !class_exists(\Pest\Parallel\Command::class)) {
+    exit($result);
-        $output->writeln("Parallel support requires the Pest Parallel plugin. Run <fg=yellow;options=bold>`composer require --dev pestphp/pest-plugin-parallel`</> first.");
-        exit(Command::FAILURE);
-    }
-
-    $command = $runInParallel ? \Pest\Parallel\Command::class : \Pest\Console\Command::class;
-    exit($container->get($command)->run($args));
 })();

bin/worker.php

@@ -0,0 +1,100 @@
+<?php
+
+declare(strict_types=1);
+
+use ParaTest\WrapperRunner\ApplicationForWrapperWorker;
+use ParaTest\WrapperRunner\WrapperWorker;
+use Pest\Kernel;
+use Pest\Plugins\Actions\CallsHandleArguments;
+use Pest\TestSuite;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Console\Output\ConsoleOutput;
+use Symfony\Component\Console\Output\OutputInterface;
+
+$bootPest = (static function (): void {
+    $workerArgv = new ArgvInput();
+
+    $rootPath = dirname(PHPUNIT_COMPOSER_INSTALL, 2);
+    $testSuite = TestSuite::getInstance($rootPath, $workerArgv->getParameterOption(
+        '--test-directory',
+        'tests'
+    ));
+
+    $input = new ArgvInput();
+
+    $output = new ConsoleOutput(OutputInterface::VERBOSITY_NORMAL, true);
+
+    Kernel::boot($testSuite, $input, $output);
+});
+
+(static function () use ($bootPest): void {
+    $getopt = getopt('', [
+        'status-file:',
+        'progress-file:',
+        'testresult-file:',
+        'teamcity-file:',
+        'testdox-file:',
+        'testdox-color',
+        'phpunit-argv:',
+    ]);
+
+    $composerAutoloadFiles = [
+        dirname(__DIR__, 3).DIRECTORY_SEPARATOR.'autoload.php',
+        dirname(__DIR__, 2).DIRECTORY_SEPARATOR.'vendor'.DIRECTORY_SEPARATOR.'autoload.php',
+        dirname(__DIR__).DIRECTORY_SEPARATOR.'vendor'.DIRECTORY_SEPARATOR.'autoload.php',
+    ];
+
+    foreach ($composerAutoloadFiles as $file) {
+        if (file_exists($file)) {
+            require_once $file;
+            define('PHPUNIT_COMPOSER_INSTALL', $file);
+
+            break;
+        }
+    }
+
+    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['testresult-file']) && is_string($getopt['testresult-file']));
+    assert(! isset($getopt['teamcity-file']) || is_string($getopt['teamcity-file']));
+    assert(! isset($getopt['testdox-file']) || is_string($getopt['testdox-file']));
+
+    assert(isset($getopt['phpunit-argv']) && is_string($getopt['phpunit-argv']));
+    $phpunitArgv = unserialize($getopt['phpunit-argv'], ['allowed_classes' => false]);
+    assert(is_array($phpunitArgv));
+
+    $bootPest();
+
+    $phpunitArgv = CallsHandleArguments::execute($phpunitArgv);
+
+    $application = new ApplicationForWrapperWorker(
+        $phpunitArgv,
+        $getopt['progress-file'],
+        $getopt['testresult-file'],
+        $getopt['teamcity-file'] ?? null,
+        $getopt['testdox-file'] ?? null,
+        isset($getopt['testdox-color']),
+    );
+
+    while (true) {
+        if (feof(STDIN)) {
+            $application->end();
+            exit;
+        }
+
+        $testPath = fgets(STDIN);
+        if ($testPath === false || $testPath === WrapperWorker::COMMAND_EXIT) {
+            $application->end();
+
+            exit;
+        }
+
+        $exitCode = $application->runTest(trim($testPath));
+
+        fwrite($statusFile, (string) $exitCode);
+        fflush($statusFile);
+    }
+})();

composer.json

@@ -17,10 +17,17 @@
         }
     ],
     "require": {
-        "php": "^7.3 || ^8.0",
+        "php": "^8.1.0",
-        "nunomaduro/collision": "^5.4.0",
+        "brianium/paratest": "^7.1.2",
-        "pestphp/pest-plugin": "^1.0.0",
+        "nunomaduro/collision": "^7.3.2",
-        "phpunit/phpunit": "^9.5.5"
+        "nunomaduro/termwind": "^1.15.1",
+        "pestphp/pest-plugin": "^2.0.0",
+        "pestphp/pest-plugin-arch": "^2.0.1",
+        "phpunit/phpunit": "^10.0.17"
+    },
+    "conflict": {
+        "webmozart/assert": "<1.11.0",
+        "phpunit/phpunit": ">10.0.17"
     },
     "autoload": {
         "psr-4": {
@@ -33,6 +40,7 @@
     },
     "autoload-dev": {
         "psr-4": {
+            "Tests\\Fixtures\\Covers\\": "tests/Fixtures/Covers",
             "Tests\\": "tests/PHPUnit/"
         },
         "files": [
@@ -40,30 +48,33 @@
         ]
     },
     "require-dev": {
-        "illuminate/console": "^8.47.0",
+        "pestphp/pest-dev-tools": "^2.5.0",
-        "illuminate/support": "^8.47.0",
+        "symfony/process": "^6.2.7"
-        "laravel/dusk": "^6.15.0",
-        "pestphp/pest-dev-tools": "dev-master",
-        "pestphp/pest-plugin-parallel": "^1.0"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
-    "prefer-stable": true,
     "config": {
         "sort-packages": true,
-        "preferred-install": "dist"
+        "preferred-install": "dist",
+        "allow-plugins": {
+            "pestphp/pest-plugin": true
+        }
     },
     "bin": [
         "bin/pest"
     ],
     "scripts": {
-        "lint": "php-cs-fixer fix -v",
+        "refacto": "rector",
-        "test:lint": "php-cs-fixer fix -v --dry-run",
+        "lint": "pint",
-        "test:types": "phpstan analyse --ansi --memory-limit=-1",
+        "test:refacto": "rector --dry-run",
-        "test:unit": "php bin/pest --colors=always --exclude-group=integration",
+        "test:lint": "pint --test",
-        "test:parallel": "php bin/pest -p --colors=always --exclude-group=integration",
+        "test:types": "phpstan analyse --ansi --memory-limit=-1 --debug",
+        "test:unit": "php bin/pest --colors=always --exclude-group=integration --compact",
+        "test:inline": "php bin/pest --colors=always --configuration=phpunit.inline.xml",
+        "test:parallel": "php bin/pest --colors=always --exclude-group=integration --parallel --processes=10",
         "test:integration": "php bin/pest --colors=always --group=integration",
         "update:snapshots": "REBUILD_SNAPSHOTS=true php bin/pest --colors=always",
         "test": [
+            "@test:refacto",
             "@test:lint",
             "@test:types",
             "@test:unit",
@@ -72,19 +83,22 @@
         ]
     },
     "extra": {
-        "branch-alias": {
-            "dev-master": "1.x-dev"
-        },
         "pest": {
             "plugins": [
+                "Pest\\Plugins\\Bail",
+                "Pest\\Plugins\\Cache",
                 "Pest\\Plugins\\Coverage",
                 "Pest\\Plugins\\Init",
-                "Pest\\Plugins\\Version"
+                "Pest\\Plugins\\Environment",
-            ]
+                "Pest\\Plugins\\Help",
-        },
+                "Pest\\Plugins\\Memory",
-        "laravel": {
+                "Pest\\Plugins\\Only",
-            "providers": [
+                "Pest\\Plugins\\Printer",
-                "Pest\\Laravel\\PestServiceProvider"
+                "Pest\\Plugins\\ProcessIsolation",
+                "Pest\\Plugins\\Profile",
+                "Pest\\Plugins\\Retry",
+                "Pest\\Plugins\\Version",
+                "Pest\\Plugins\\Parallel"
             ]
         }
     }

docker-compose.yml

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

docker/Dockerfile

@@ -0,0 +1,23 @@
+ARG PHP=8.1
+FROM php:${PHP}-cli-alpine
+
+RUN apk update \
+    && apk add zip libzip-dev icu-dev
+
+RUN docker-php-ext-configure zip
+RUN docker-php-ext-install zip
+RUN docker-php-ext-enable zip
+
+RUN docker-php-ext-configure intl
+RUN docker-php-ext-install intl
+RUN docker-php-ext-enable intl
+
+RUN apk add --no-cache $PHPIZE_DEPS linux-headers
+RUN pecl install xdebug
+RUN docker-php-ext-enable xdebug
+
+COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
+
+WORKDIR /var/www/html
+
+ENTRYPOINT ["php"]

overrides/Runner/Filter/NameFilterIterator.php

@@ -0,0 +1,171 @@
+<?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.
+ */
+
+namespace PHPUnit\Runner\Filter;
+
+use function end;
+use Exception;
+use function implode;
+use Pest\Contracts\HasPrintableTestCaseName;
+use PHPUnit\Framework\SelfDescribing;
+use PHPUnit\Framework\Test;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\TestSuite;
+use function preg_match;
+use RecursiveFilterIterator;
+use RecursiveIterator;
+use function sprintf;
+use function str_replace;
+
+/**
+ * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ */
+final class NameFilterIterator extends RecursiveFilterIterator
+{
+    private ?string $filter = null;
+
+    private ?int $filterMin = null;
+
+    private ?int $filterMax = null;
+
+    /**
+     * @throws Exception
+     */
+    public function __construct(RecursiveIterator $iterator, string $filter)
+    {
+        parent::__construct($iterator);
+
+        $this->setFilter($filter);
+    }
+
+    public function accept(): bool
+    {
+        $test = $this->getInnerIterator()->current();
+
+        if ($test instanceof TestSuite) {
+            return true;
+        }
+
+        $tmp = $this->describe($test);
+
+        if ($tmp[0] !== '') {
+            $name = implode('::', $tmp);
+        } else {
+            $name = $tmp[1];
+        }
+
+        $accepted = @preg_match($this->filter, $name, $matches);
+
+        if ($accepted && isset($this->filterMax)) {
+            $set = end($matches);
+            $accepted = $set >= $this->filterMin && $set <= $this->filterMax;
+        }
+
+        return (bool) $accepted;
+    }
+
+    /**
+     * @throws Exception
+     */
+    private function setFilter(string $filter): void
+    {
+        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]
+                    );
+
+                    $this->filterMin = (int) $matches[2];
+                    $this->filterMax = (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
+                )
+            );
+        }
+
+        $this->filter = $filter;
+    }
+
+    /**
+     * @psalm-return array{0: string, 1: string}
+     */
+    private function describe(Test $test): array
+    {
+        if ($test instanceof HasPrintableTestCaseName) {
+            return [
+                $test::getPrintableTestCaseName(),
+                $test->getPrintableTestCaseMethodName(),
+            ];
+        }
+
+        if ($test instanceof TestCase) {
+            return [$test::class, $test->nameWithDataSet()];
+        }
+
+        if ($test instanceof SelfDescribing) {
+            return ['', $test->toString()];
+        }
+
+        return ['', $test::class];
+    }
+}

overrides/Runner/ResultCache/DefaultResultCache.php

@@ -0,0 +1,195 @@
+<?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 function array_keys;
+use function assert;
+use const DIRECTORY_SEPARATOR;
+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;
+use PHPUnit\Framework\TestStatus\TestStatus;
+use PHPUnit\Runner\DirectoryCannotBeCreatedException;
+use PHPUnit\Runner\Exception;
+use PHPUnit\Util\Filesystem;
+
+/**
+ * @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, TestStatus>
+     */
+    private array $currentDefects = [];
+
+    /**
+     * @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->isFailure() || $status->isError()) {
+            $this->currentDefects[$id] = $status;
+            $this->defects[$id] = $status;
+        }
+    }
+
+    public function status(string $id): TestStatus
+    {
+        return $this->defects[$id] ?? TestStatus::unknown();
+    }
+
+    public function setTime(string $id, float $time): void
+    {
+        if (! isset($this->currentDefects[$id])) {
+            unset($this->defects[$id]);
+        }
+
+        $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;
+        }
+
+        $data = json_decode(
+            file_get_contents($this->cacheFilename),
+            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/TestSuiteLoader.php

@@ -0,0 +1,204 @@
+<?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;
+
+use function array_diff;
+use function array_values;
+use function basename;
+use function class_exists;
+use Exception;
+use function get_declared_classes;
+use Pest\Contracts\HasPrintableTestCaseName;
+use Pest\TestCases\IgnorableTestCase;
+use Pest\TestSuite;
+use PHPUnit\Framework\TestCase;
+use ReflectionClass;
+use ReflectionException;
+use function substr;
+
+/**
+ * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ */
+final class TestSuiteLoader
+{
+    /**
+     * @psalm-var list<class-string>
+     */
+    private static array $loadedClasses = [];
+
+    /**
+     * @psalm-var list<class-string>
+     */
+    private static array $declaredClasses = [];
+
+    public function __construct()
+    {
+        if (empty(self::$declaredClasses)) {
+            self::$declaredClasses = get_declared_classes();
+        }
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function load(string $suiteClassFile): ReflectionClass
+    {
+        $suiteClassName = $this->classNameFromFileName($suiteClassFile);
+
+        (static function () use ($suiteClassFile) {
+            include_once $suiteClassFile;
+
+            TestSuite::getInstance()->tests->makeIfNeeded($suiteClassFile);
+        })();
+
+        $loadedClasses = array_values(
+            array_diff(
+                get_declared_classes(),
+                array_merge(
+                    self::$declaredClasses,
+                    self::$loadedClasses
+                )
+            )
+        );
+
+        self::$loadedClasses = array_merge($loadedClasses, self::$loadedClasses);
+
+        if (empty($loadedClasses)) {
+            return $this->exceptionFor($suiteClassName, $suiteClassFile);
+        }
+
+        $testCaseFound = false;
+        $class = false;
+
+        foreach (array_reverse($loadedClasses) as $loadedClass) {
+            if (
+                is_subclass_of($loadedClass, HasPrintableTestCaseName::class)
+                || is_subclass_of($loadedClass, TestCase::class)) {
+                try {
+                    $class = new ReflectionClass($loadedClass);
+                    // @codeCoverageIgnoreStart
+                } catch (ReflectionException) {
+                    continue;
+                }
+
+                if ($class->isAbstract() || ($class->getFileName() !== $suiteClassFile)) {
+                    if (! str_contains($class->getFileName(), 'TestCaseFactory.php')) {
+                        continue;
+                    }
+                }
+
+                $suiteClassName = $loadedClass;
+                $testCaseFound = true;
+
+                break;
+            }
+        }
+
+        if (! $testCaseFound) {
+            foreach (array_reverse($loadedClasses) as $loadedClass) {
+                $offset = 0 - strlen($suiteClassName);
+
+                if (stripos(substr($loadedClass, $offset - 1), '\\'.$suiteClassName) === 0 ||
+                    stripos(substr($loadedClass, $offset - 1), '_'.$suiteClassName) === 0) {
+                    try {
+                        $class = new ReflectionClass($loadedClass);
+                        // @codeCoverageIgnoreStart
+                    } catch (ReflectionException) {
+                        continue;
+                    }
+
+                    $suiteClassName = $loadedClass;
+                    $testCaseFound = true;
+
+                    break;
+                }
+            }
+        }
+
+        if (! $testCaseFound) {
+            return $this->exceptionFor($suiteClassName, $suiteClassFile);
+        }
+
+        if (! class_exists($suiteClassName, false)) {
+            return $this->exceptionFor($suiteClassName, $suiteClassFile);
+        }
+
+        // @codeCoverageIgnoreEnd
+
+        if ($class->isSubclassOf(TestCase::class) && ! $class->isAbstract()) {
+            return $class;
+        }
+
+        if ($class->hasMethod('suite')) {
+            try {
+                $method = $class->getMethod('suite');
+                // @codeCoverageIgnoreStart
+            } catch (ReflectionException $e) {
+                throw new Exception($e->getMessage(), (int) $e->getCode(), $e);
+            }
+            // @codeCoverageIgnoreEnd
+
+            if (! $method->isAbstract() && $method->isPublic() && $method->isStatic()) {
+                return $class;
+            }
+        }
+
+        return $this->exceptionFor($suiteClassName, $suiteClassFile);
+    }
+
+    public function reload(ReflectionClass $aClass): ReflectionClass
+    {
+        return $aClass;
+    }
+
+    private function classNameFromFileName(string $suiteClassFile): string
+    {
+        $className = basename($suiteClassFile, '.php');
+        $dotPos = strpos($className, '.');
+
+        if ($dotPos !== false) {
+            $className = substr($className, 0, $dotPos);
+        }
+
+        return $className;
+    }
+
+    private function exceptionFor(string $className, string $filename): ReflectionClass
+    {
+        return new ReflectionClass(IgnorableTestCase::class);
+    }
+}

overrides/TextUI/Command/WarmCodeCoverageCacheCommand.php

@@ -0,0 +1,104 @@
+<?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\TextUI\Command;
+
+use PHPUnit\TextUI\Configuration\CodeCoverageFilterRegistry;
+use PHPUnit\TextUI\Configuration\Configuration;
+use PHPUnit\TextUI\Configuration\NoCoverageCacheDirectoryException;
+use SebastianBergmann\CodeCoverage\StaticAnalysis\CacheWarmer;
+use SebastianBergmann\Timer\NoActiveTimerException;
+use SebastianBergmann\Timer\Timer;
+
+/**
+ * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ */
+final class WarmCodeCoverageCacheCommand implements Command
+{
+    private readonly Configuration $configuration;
+
+    private readonly CodeCoverageFilterRegistry $codeCoverageFilterRegistry;
+
+    public function __construct(Configuration $configuration, CodeCoverageFilterRegistry $codeCoverageFilterRegistry)
+    {
+        $this->configuration = $configuration;
+        $this->codeCoverageFilterRegistry = $codeCoverageFilterRegistry;
+    }
+
+    /**
+     * @throws NoActiveTimerException
+     * @throws NoCoverageCacheDirectoryException
+     */
+    public function execute(): Result
+    {
+        if (! $this->configuration->hasCoverageCacheDirectory()) {
+            return Result::from(
+                'Cache for static analysis has not been configured'.PHP_EOL,
+                Result::FAILURE
+            );
+        }
+
+        $this->codeCoverageFilterRegistry->init($this->configuration);
+
+        if (! $this->codeCoverageFilterRegistry->configured()) {
+            return Result::from(
+                'Filter for code coverage has not been configured'.PHP_EOL,
+                Result::FAILURE
+            );
+        }
+
+        $timer = new Timer;
+        $timer->start();
+
+        (new CacheWarmer)->warmCache(
+            $this->configuration->coverageCacheDirectory(),
+            ! $this->configuration->disableCodeCoverageIgnore(),
+            $this->configuration->ignoreDeprecatedCodeUnitsFromCodeCoverage(),
+            $this->codeCoverageFilterRegistry->get()
+        );
+
+        return Result::from();
+    }
+}

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

@@ -0,0 +1,80 @@
+<?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\TextUI\Output\Default\ProgressPrinter;
+
+use PHPUnit\Event\Test\Skipped;
+use PHPUnit\Event\Test\SkippedSubscriber;
+use ReflectionClass;
+
+/**
+ * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ *
+ * This file is overridden to allow Pest Parallel to show todo items in the progress output.
+ */
+final class TestSkippedSubscriber extends Subscriber implements SkippedSubscriber
+{
+    /**
+     * Notifies the printer that a test was skipped.
+     */
+    public function notify(Skipped $event): void
+    {
+        if (str_contains($event->message(), '__TODO__')) {
+            $this->printTodoItem();
+        }
+
+        $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');
+        $printerMirror->invoke($this->printer(), 'T');
+    }
+}

overrides/TextUI/TestSuiteFilterProcessor.php

@@ -0,0 +1,128 @@
+<?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\TextUI;
+
+use function array_map;
+use Pest\Plugins\Only;
+use PHPUnit\Event;
+use PHPUnit\Framework\TestSuite;
+use PHPUnit\Runner\Filter\Factory;
+use PHPUnit\TextUI\Configuration\Configuration;
+use PHPUnit\TextUI\Configuration\FilterNotConfiguredException;
+
+/**
+ * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ */
+final class TestSuiteFilterProcessor
+{
+    private Factory $filterFactory;
+
+    public function __construct(Factory $factory = new Factory)
+    {
+        $this->filterFactory = $factory;
+    }
+
+    /**
+     * @throws Event\RuntimeException
+     * @throws FilterNotConfiguredException
+     */
+    public function process(Configuration $configuration, TestSuite $suite): void
+    {
+        if (! $configuration->hasFilter() &&
+            ! $configuration->hasGroups() &&
+            ! $configuration->hasExcludeGroups() &&
+            ! $configuration->hasTestsCovering() &&
+            ! $configuration->hasTestsUsing() &&
+            ! Only::isEnabled()
+        ) {
+            return;
+        }
+
+        if ($configuration->hasExcludeGroups()) {
+            $this->filterFactory->addExcludeGroupFilter(
+                $configuration->excludeGroups()
+            );
+        }
+
+        if (Only::isEnabled()) {
+            $this->filterFactory->addIncludeGroupFilter(['__pest_only']);
+        } elseif ($configuration->hasGroups()) {
+            $this->filterFactory->addIncludeGroupFilter(
+                $configuration->groups()
+            );
+        }
+
+        if ($configuration->hasTestsCovering()) {
+            $this->filterFactory->addIncludeGroupFilter(
+                array_map(
+                    static fn (string $name): string => '__phpunit_covers_'.$name,
+                    $configuration->testsCovering()
+                )
+            );
+        }
+
+        if ($configuration->hasTestsUsing()) {
+            $this->filterFactory->addIncludeGroupFilter(
+                array_map(
+                    static fn (string $name): string => '__phpunit_uses_'.$name,
+                    $configuration->testsUsing()
+                )
+            );
+        }
+
+        if ($configuration->hasFilter()) {
+            $this->filterFactory->addNameFilter(
+                $configuration->filter()
+            );
+        }
+
+        $suite->injectFilter($this->filterFactory);
+
+        Event\Facade::emitter()->testSuiteFiltered(
+            Event\TestSuite\TestSuiteBuilder::from($suite)
+        );
+    }
+}

phpstan.neon

@@ -9,26 +9,15 @@ parameters:
         - src
 
     checkMissingIterableValueType: true
-    checkGenericClassInNonGenericObjectType: false
     reportUnmatchedIgnoredErrors: true
 
     ignoreErrors:
-        - "#type mixed is not subtype of native#"
+        - "#Language construct isset\\(\\) should not be used.#"
         - "#is not allowed to extend#"
-        - "#Language construct eval#"
+        - "#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.#"
         - "#Method Pest\\\\Support\\\\Reflection::getParameterClassName\\(\\) has a nullable return type declaration.#"
-        -
-            message: '#Call to an undefined method PHPUnit\\Framework\\Test::getName\(\)#'
-            path: src/Logging
-        -
-            message: '#invalid typehint type Pest\\Concerns\\Testable#'
-            path: src/Logging
-        -
-            message: '#is not subtype of native type PHPUnit\\Framework\\Test#'
-            path: src/Logging
-        -
-            message: '#Call to an undefined method PHPUnit\\Framework\\Test::getPrintableTestCaseName\(\)#'
-            path: src/Logging

phpunit.xml

@@ -1,16 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
+         backupGlobals="false"
+         beStrictAboutTestsThatDoNotTestAnything="true"
+         beStrictAboutOutputDuringTests="true"
+         bootstrap="vendor/autoload.php"
          colors="true"
+         failOnRisky="true"
+         failOnWarning="false"
+         processIsolation="false"
+         stopOnError="false"
+         stopOnFailure="false"
+         backupStaticProperties="false"
 >
-    <testsuites>
+  <testsuites>
-        <testsuite name="default">
+    <testsuite name="default">
-            <directory suffix=".php">./tests</directory>
+      <directory suffix=".php">./tests</directory>
-        </testsuite>
+      <exclude>./tests/.snapshots</exclude>
-    </testsuites>
+      <exclude>./tests/.tests</exclude>
-    <coverage processUncoveredFiles="true">
+    </testsuite>
-        <include>
+  </testsuites>
-            <directory suffix=".php">./src</directory>
+  <coverage>
-        </include>
+    <include>
-    </coverage>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </coverage>
 </phpunit>

rector.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
+use Rector\Config\RectorConfig;
+use Rector\Set\ValueObject\LevelSetList;
+use Rector\Set\ValueObject\SetList;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->paths([
+        __DIR__.'/src',
+    ]);
+
+    $rectorConfig->rules([
+        InlineConstructorDefaultToPropertyRector::class,
+    ]);
+
+    $rectorConfig->skip([
+        __DIR__.'/src/Plugins/Parallel/Paratest/WrapperRunner.php',
+    ]);
+
+    $rectorConfig->sets([
+        LevelSetList::UP_TO_PHP_81,
+        SetList::CODE_QUALITY,
+        SetList::DEAD_CODE,
+        SetList::EARLY_RETURN,
+        SetList::TYPE_DECLARATION,
+        SetList::PRIVATIZATION,
+    ]);
+};

resources/views/components/badge.php

@@ -0,0 +1,17 @@
+<?php
+
+/** @var string $type */
+/** @var string $content */
+[$bgBadgeColor, $bgBadgeText] = match ($type) {
+    'INFO' => ['blue', 'INFO'],
+    'ERROR' => ['red', 'ERROR'],
+};
+
+?>
+
+<div class="my-1">
+    <span class="ml-2 px-1 bg-<?php echo $bgBadgeColor ?>-600 font-bold"><?php echo htmlspecialchars($bgBadgeText) ?></span>
+    <span class="ml-1">
+        <?php echo htmlspecialchars($content) ?>
+    </span>
+</div>

resources/views/components/new-line.php

@@ -0,0 +1 @@
+<div></div>

resources/views/components/two-column-detail.php

@@ -0,0 +1,12 @@
+<div class="flex mx-2 max-w-150">
+    <span>
+        <?php echo htmlspecialchars($left) ?>
+    </span>
+    <span class="flex-1 content-repeat-[.] text-gray ml-1"></span>
+    <?php if ($right !== '') { ?>
+        <span class="ml-1 text-gray">
+            <?php echo htmlspecialchars($right) ?>
+        </span>
+    <?php } ?>
+</div>
+

resources/views/usage.php

@@ -0,0 +1,4 @@
+<div class="mx-2">
+    <span class="text-yellow font-bold">USAGE:</span><span class="ml-1">pest</span><span class="ml-1 text-gray"><?php echo htmlspecialchars('<file>') ?> [options]</span>
+</div>
+

resources/views/version.php

@@ -0,0 +1,3 @@
+<div class="my-1 mx-2">
+    <span>Pest Testing Framework</span><span class="ml-1 text-blue font-bold"><?php echo htmlspecialchars($version) ?></span><span>.</span>
+</div>

src/Actions/AddsDefaults.php

@@ -1,46 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Actions;
-
-use NunoMaduro\Collision\Adapters\Phpunit\Printer;
-use Pest\Logging\JUnit;
-use Pest\Logging\TeamCity;
-use PHPUnit\TextUI\DefaultResultPrinter;
-
-/**
- * @internal
- */
-final class AddsDefaults
-{
-    private const PRINTER = 'printer';
-
-    /**
-     * Adds default arguments to the given `arguments` array.
-     *
-     * @param array<string, mixed> $arguments
-     *
-     * @return array<string, mixed>
-     */
-    public static function to(array $arguments): array
-    {
-        if (!array_key_exists(self::PRINTER, $arguments)) {
-            $arguments[self::PRINTER] = new Printer(null, $arguments['verbose'] ?? false, $arguments['colors'] ?? DefaultResultPrinter::COLOR_ALWAYS);
-        }
-
-        if ($arguments[self::PRINTER] === \PHPUnit\Util\Log\TeamCity::class) {
-            $arguments[self::PRINTER] = new TeamCity(null, $arguments['verbose'] ?? false, $arguments['colors'] ?? DefaultResultPrinter::COLOR_ALWAYS);
-        }
-
-        // Load our junit logger instead.
-        if (array_key_exists('junitLogfile', $arguments)) {
-            $arguments['listeners'][] = new JUnit(
-                $arguments['junitLogfile']
-            );
-            unset($arguments['junitLogfile']);
-        }
-
-        return $arguments;
-    }
-}

src/Actions/AddsTests.php

@@ -1,64 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Actions;
-
-use PHPUnit\Framework\TestCase;
-use PHPUnit\Framework\TestSuite;
-use PHPUnit\Framework\WarningTestCase;
-
-/**
- * @internal
- */
-final class AddsTests
-{
-    /**
-     * Adds tests to the given test suite.
-     *
-     * @param TestSuite<\PHPUnit\Framework\TestCase> $testSuite
-     */
-    public static function to(TestSuite $testSuite, \Pest\TestSuite $pestTestSuite): void
-    {
-        self::removeTestClosureWarnings($testSuite);
-
-        $testSuites = [];
-        $pestTestSuite->tests->build($pestTestSuite, function (TestCase $testCase) use (&$testSuites): void {
-            $testCaseClass = get_class($testCase);
-            if (!array_key_exists($testCaseClass, $testSuites)) {
-                $testSuites[$testCaseClass] = [];
-            }
-
-            $testSuites[$testCaseClass][] = $testCase;
-        });
-
-        foreach ($testSuites as $testCaseName => $testCases) {
-            $testTestSuite = new TestSuite($testCaseName);
-            $testTestSuite->setTests([]);
-            foreach ($testCases as $testCase) {
-                $testTestSuite->addTest($testCase, $testCase->getGroups());
-            }
-            $testSuite->addTestSuite($testTestSuite);
-        }
-    }
-
-    /**
-     * @param TestSuite<\PHPUnit\Framework\TestCase> $testSuite
-     */
-    private static function removeTestClosureWarnings(TestSuite $testSuite): void
-    {
-        $tests = $testSuite->tests();
-
-        foreach ($tests as $key => $test) {
-            if ($test instanceof TestSuite) {
-                self::removeTestClosureWarnings($test);
-            }
-
-            if ($test instanceof WarningTestCase) {
-                unset($tests[$key]);
-            }
-        }
-
-        $testSuite->setTests($tests);
-    }
-}

src/Actions/InteractsWithPlugins.php

@@ -1,50 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Actions;
-
-use Pest\Contracts\Plugins\AddsOutput;
-use Pest\Contracts\Plugins\HandlesArguments;
-use Pest\Plugin\Loader;
-
-/**
- * @internal
- */
-final class InteractsWithPlugins
-{
-    /**
-     * Transform the input arguments by passing it to the relevant plugins.
-     *
-     * @param array<int, string> $argv
-     *
-     * @return array<int, string>
-     */
-    public static function handleArguments(array $argv): array
-    {
-        $plugins = Loader::getPlugins(HandlesArguments::class);
-
-        /** @var HandlesArguments $plugin */
-        foreach ($plugins as $plugin) {
-            $argv = $plugin->handleArguments($argv);
-        }
-
-        return $argv;
-    }
-
-    /**
-     * Provides an opportunity for any plugins that want
-     * to provide additional output after test execution.
-     */
-    public static function addOutput(int $result): int
-    {
-        $plugins = Loader::getPlugins(AddsOutput::class);
-
-        /** @var AddsOutput $plugin */
-        foreach ($plugins as $plugin) {
-            $result = $plugin->addOutput($result);
-        }
-
-        return $result;
-    }
-}

src/Actions/LoadStructure.php

@@ -1,63 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Actions;
-
-use Pest\Support\Str;
-use function Pest\testDirectory;
-use PHPUnit\Util\FileLoader;
-use RecursiveDirectoryIterator;
-use RecursiveIteratorIterator;
-
-/**
- * @internal
- */
-final class LoadStructure
-{
-    /**
-     * The Pest convention.
-     *
-     * @var array<int, string>
-     */
-    private const STRUCTURE = [
-        'Expectations.php',
-        'Datasets.php',
-        'Helpers.php',
-        'Pest.php',
-        'Datasets',
-    ];
-
-    /**
-     * Validates the configuration in the given `configuration`.
-     */
-    public static function in(string $rootPath): void
-    {
-        $testsPath = $rootPath . DIRECTORY_SEPARATOR . testDirectory();
-
-        $load = function ($filename): bool {
-            return file_exists($filename) && (bool) FileLoader::checkAndLoad($filename);
-        };
-
-        foreach (self::STRUCTURE as $filename) {
-            $filename = sprintf('%s%s%s', $testsPath, DIRECTORY_SEPARATOR, $filename);
-
-            if (!file_exists($filename)) {
-                continue;
-            }
-
-            if (is_dir($filename)) {
-                $directory = new RecursiveDirectoryIterator($filename);
-                $iterator  = new RecursiveIteratorIterator($directory);
-                foreach ($iterator as $file) {
-                    $filename = $file->__toString();
-                    if (Str::endsWith($filename, '.php') && file_exists($filename)) {
-                        require_once $filename;
-                    }
-                }
-            } else {
-                $load($filename);
-            }
-        }
-    }
-}

src/Actions/ValidatesConfiguration.php

@@ -1,38 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Actions;
-
-use Pest\Exceptions\AttributeNotSupportedYet;
-use Pest\Exceptions\FileOrFolderNotFound;
-use PHPUnit\TextUI\XmlConfiguration\Loader;
-
-/**
- * @internal
- */
-final class ValidatesConfiguration
-{
-    /**
-     * @var string
-     */
-    private const CONFIGURATION_KEY = 'configuration';
-
-    /**
-     * Validates the configuration in the given `configuration`.
-     *
-     * @param array<string, mixed> $arguments
-     */
-    public static function in($arguments): void
-    {
-        if (!array_key_exists(self::CONFIGURATION_KEY, $arguments) || !file_exists($arguments[self::CONFIGURATION_KEY])) {
-            throw new FileOrFolderNotFound('phpunit.xml');
-        }
-
-        $configuration = (new Loader())->load($arguments[self::CONFIGURATION_KEY])->phpunit();
-
-        if ($configuration->processIsolation()) {
-            throw new AttributeNotSupportedYet('processIsolation', 'true');
-        }
-    }
-}

src/Actions/ValidatesEnvironment.php

@@ -1,41 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Actions;
-
-use Pest\Exceptions\FileOrFolderNotFound;
-use Pest\TestSuite;
-
-/**
- * @internal
- */
-final class ValidatesEnvironment
-{
-    /**
-     * The need files on the root path.
-     *
-     * @var array<int, string>
-     */
-    private const NEEDED_FILES = [
-        'composer.json',
-    ];
-
-    /**
-     * Validates the environment.
-     */
-    public static function in(TestSuite $testSuite): void
-    {
-        $rootPath = $testSuite->rootPath;
-
-        $exists = function ($neededFile) use ($rootPath): bool {
-            return file_exists(sprintf('%s%s%s', $rootPath, DIRECTORY_SEPARATOR, $neededFile));
-        };
-
-        foreach (self::NEEDED_FILES as $neededFile) {
-            if (!$exists($neededFile)) {
-                throw new FileOrFolderNotFound($neededFile);
-            }
-        }
-    }
-}

src/Bootstrappers/BootFiles.php

@@ -0,0 +1,88 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Bootstrappers;
+
+use Pest\Contracts\Bootstrapper;
+use Pest\Support\DatasetInfo;
+use Pest\Support\Str;
+use function Pest\testDirectory;
+use Pest\TestSuite;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+use SebastianBergmann\FileIterator\Facade as PhpUnitFileIterator;
+
+/**
+ * @internal
+ */
+final class BootFiles implements Bootstrapper
+{
+    /**
+     * The structure of the tests directory.
+     *
+     * @var array<int, string>
+     */
+    private const STRUCTURE = [
+        'Expectations',
+        'Expectations.php',
+        'Helpers',
+        'Helpers.php',
+        'Pest.php',
+    ];
+
+    /**
+     * Boots the structure of the tests directory.
+     */
+    public function boot(): void
+    {
+        $rootPath = TestSuite::getInstance()->rootPath;
+        $testsPath = $rootPath.DIRECTORY_SEPARATOR.testDirectory();
+
+        foreach (self::STRUCTURE as $filename) {
+            $filename = sprintf('%s%s%s', $testsPath, DIRECTORY_SEPARATOR, $filename);
+
+            if (! file_exists($filename)) {
+                continue;
+            }
+
+            if (is_dir($filename)) {
+                $directory = new RecursiveDirectoryIterator($filename);
+                $iterator = new RecursiveIteratorIterator($directory);
+                /** @var \DirectoryIterator $file */
+                foreach ($iterator as $file) {
+                    $this->load($file->__toString());
+                }
+            } else {
+                $this->load($filename);
+            }
+        }
+
+        $this->bootDatasets($testsPath);
+    }
+
+    /**
+     * Loads, if possible, the given file.
+     */
+    private function load(string $filename): void
+    {
+        if (! Str::endsWith($filename, '.php')) {
+            return;
+        }
+        if (! file_exists($filename)) {
+            return;
+        }
+        include_once $filename;
+    }
+
+    private function bootDatasets(string $testsPath): void
+    {
+        $files = (new PhpUnitFileIterator)->getFilesAsArray($testsPath, '.php');
+
+        foreach ($files as $file) {
+            if (DatasetInfo::isADatasetsFile($file) || DatasetInfo::isInsideADatasetsDirectory($file)) {
+                $this->load($file);
+            }
+        }
+    }
+}

src/Bootstrappers/BootKernelDump.php

@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Bootstrappers;
+
+use Pest\Contracts\Bootstrapper;
+use Pest\KernelDump;
+use Pest\Support\Container;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * @internal
+ */
+final class BootKernelDump implements Bootstrapper
+{
+    /**
+     * Creates a new Boot Kernel Dump instance.
+     */
+    public function __construct(
+        private readonly OutputInterface $output,
+    ) {
+        // ...
+    }
+
+    /**
+     * Boots the kernel dump.
+     */
+    public function boot(): void
+    {
+        Container::getInstance()->add(KernelDump::class, $kernelDump = new KernelDump(
+            $this->output,
+        ));
+
+        $kernelDump->enable();
+    }
+}

src/Bootstrappers/BootOverrides.php

@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Bootstrappers;
+
+use Pest\Contracts\Bootstrapper;
+use Pest\Exceptions\ShouldNotHappen;
+
+/**
+ * @internal
+ */
+final class BootOverrides implements Bootstrapper
+{
+    /**
+     * The list of files to be overridden.
+     *
+     * @var array<int, string>
+     */
+    private const FILES = [
+        'Runner/Filter/NameFilterIterator.php',
+        'Runner/ResultCache/DefaultResultCache.php',
+        'Runner/TestSuiteLoader.php',
+        'TextUI/Command/WarmCodeCoverageCacheCommand.php',
+        'TextUI/Output/Default/ProgressPrinter/TestSkippedSubscriber.php',
+        'TextUI/TestSuiteFilterProcessor.php',
+    ];
+
+    /**
+     * Boots the list of files to be overridden.
+     */
+    public function boot(): void
+    {
+        foreach (self::FILES as $file) {
+            $file = __DIR__."/../../overrides/$file";
+
+            if (! file_exists($file)) {
+                throw ShouldNotHappen::fromMessage(sprintf('File [%s] does not exist.', $file));
+            }
+
+            require_once $file;
+        }
+    }
+}

src/Bootstrappers/BootSubscribers.php

@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Bootstrappers;
+
+use Pest\Contracts\Bootstrapper;
+use Pest\Subscribers;
+use Pest\Support\Container;
+use PHPUnit\Event;
+use PHPUnit\Event\Subscriber;
+
+/**
+ * @internal
+ */
+final class BootSubscribers implements Bootstrapper
+{
+    /**
+     * The list of Subscribers.
+     *
+     * @var array<int, class-string<Subscriber>>
+     */
+    private const SUBSCRIBERS = [
+        Subscribers\EnsureConfigurationIsAvailable::class,
+        Subscribers\EnsureIgnorableTestCasesAreIgnored::class,
+        Subscribers\EnsureKernelDumpIsFlushed::class,
+        Subscribers\EnsureTeamCityEnabled::class,
+    ];
+
+    /**
+     * Creates a new instance of the Boot Subscribers.
+     */
+    public function __construct(
+        private readonly Container $container,
+    ) {
+    }
+
+    /**
+     * Boots the list of Subscribers.
+     */
+    public function boot(): void
+    {
+        foreach (self::SUBSCRIBERS as $subscriber) {
+            $instance = $this->container->get($subscriber);
+
+            assert($instance instanceof Subscriber);
+
+            Event\Facade::instance()->registerSubscriber($instance);
+        }
+    }
+}

src/Bootstrappers/BootView.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Bootstrappers;
+
+use Pest\Contracts\Bootstrapper;
+use Pest\Support\View;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * @internal
+ */
+final class BootView implements Bootstrapper
+{
+    /**
+     * Creates a new instance of the Boot View.
+     */
+    public function __construct(
+        private readonly OutputInterface $output
+    ) {
+        // ..
+    }
+
+    /**
+     * Boots the view renderer.
+     */
+    public function boot(): void
+    {
+        View::renderUsing($this->output);
+    }
+}

src/Concerns/Expectable.php

@@ -14,13 +14,12 @@ trait Expectable
     /**
      * @template TValue
      *
-     * Creates a new expectation.
+     * Creates a new Expectation.
-     *
-     * @param TValue $value
      *
+     * @param  TValue  $value
      * @return Expectation<TValue>
      */
-    public function expect($value): Expectation
+    public function expect(mixed $value): Expectation
     {
         return new Expectation($value);
     }

src/Concerns/Extendable.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Pest\Concerns;
 
-use BadMethodCallException;
 use Closure;
 
 /**
@@ -13,42 +12,25 @@ use Closure;
 trait Extendable
 {
     /**
+     * The list of extends.
+     *
      * @var array<string, Closure>
      */
-    private static $extends = [];
+    private static array $extends = [];
 
     /**
-     * Register a custom extend.
+     * Register a new extend.
      */
-    public static function extend(string $name, Closure $extend): void
+    public function extend(string $name, Closure $extend): void
     {
         static::$extends[$name] = $extend;
     }
 
     /**
-     * Checks if extend is registered.
+     * Checks if given extend name is registered.
      */
     public static function hasExtend(string $name): bool
     {
         return array_key_exists($name, static::$extends);
     }
-
-    /**
-     * Dynamically handle calls to the class.
-     *
-     * @param array<int, mixed> $parameters
-     *
-     * @return mixed
-     */
-    public function __call(string $method, array $parameters)
-    {
-        if (!static::hasExtend($method)) {
-            throw new BadMethodCallException("$method is not a callable method name.");
-        }
-
-        /** @var Closure $extend */
-        $extend = static::$extends[$method]->bindTo($this, static::class);
-
-        return $extend(...$parameters);
-    }
 }

src/Concerns/Logging/WritesToConsole.php

@@ -9,21 +9,33 @@ 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

@@ -0,0 +1,72 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Concerns;
+
+use Closure;
+use Pest\Expectation;
+
+/**
+ * @internal
+ */
+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
+    {
+        if (is_string($filter)) {
+            $filter = fn ($value): bool => $value instanceof $filter;
+        }
+
+        self::$interceptors[$name][] = $handler;
+
+        $this->pipe($name, function ($next, ...$arguments) use ($handler, $filter): void {
+            /* @phpstan-ignore-next-line */
+            if ($filter($this->value, ...$arguments)) {
+                // @phpstan-ignore-next-line
+                $handler->bindTo($this, $this::class)(...$arguments);
+
+                return;
+            }
+
+            $next();
+        });
+    }
+
+    /**
+     * Get th 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] ?? []);
+    }
+}

src/Concerns/Retrievable.php

@@ -7,19 +7,19 @@ namespace Pest\Concerns;
 /**
  * @internal
  */
-trait RetrievesValues
+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
+     * @param  array<string, TRetrievableValue>|object  $value
-     * @param TRetrievableValue|null                  $default
+     * @param  TRetrievableValue|null  $default
-     *
      * @return TRetrievableValue|null
      */
-    private function retrieve(string $key, $value, $default = null)
+    private function retrieve(string $key, mixed $value, mixed $default = null): mixed
     {
         if (is_array($value)) {
             return $value[$key] ?? $default;

src/Concerns/Testable.php

@@ -5,162 +5,133 @@ declare(strict_types=1);
 namespace Pest\Concerns;
 
 use Closure;
+use Pest\Exceptions\DatasetArgsCountMismatch;
 use Pest\Support\ChainableClosure;
 use Pest\Support\ExceptionTrace;
+use Pest\Support\Reflection;
 use Pest\TestSuite;
-use PHPUnit\Framework\ExecutionOrderDependency;
+use PHPUnit\Framework\TestCase;
+use ReflectionException;
+use ReflectionFunction;
 use Throwable;
 
 /**
- * To avoid inheritance conflicts, all the fields related
- * to Pest only will be prefixed by double underscore.
- *
  * @internal
+ *
+ * @mixin TestCase
  */
 trait Testable
 {
     /**
-     * The test case description. Contains the first
+     * Test method description.
-     * argument of global functions like `it` and `test`.
-     *
-     * @var string
      */
-    private $__description;
+    private string $__description;
 
     /**
-     * Holds the test closure function.
+     * Test "latest" method description.
-     *
-     * @var Closure
      */
-    private $__test;
+    private static string $__latestDescription;
 
     /**
-     * Holds a global/shared beforeEach ("set up") closure if one has been
+     * The Test Case "test" closure.
-     * defined.
-     *
-     * @var Closure|null
      */
-    private $beforeEach = null;
+    private Closure $__test;
 
     /**
-     * Holds a global/shared afterEach ("tear down") closure if one has been
+     * The Test Case "setUp" closure.
-     * defined.
-     *
-     * @var Closure|null
      */
-    private $afterEach = null;
+    private ?Closure $__beforeEach = null;
 
     /**
-     * Holds a global/shared beforeAll ("set up before") closure if one has been
+     * The Test Case "tearDown" closure.
-     * defined.
-     *
-     * @var Closure|null
      */
-    private static $beforeAll = null;
+    private ?Closure $__afterEach = null;
 
     /**
-     * Holds a global/shared afterAll ("tear down after") closure if one has
+     * The Test Case "setUpBeforeClass" closure.
-     * been defined.
-     *
-     * @var Closure|null
      */
-    private static $afterAll = null;
+    private static ?Closure $__beforeAll = null;
 
     /**
-     * Creates a new instance of the test case.
+     * The test "tearDownAfterClass" closure.
      */
-    public function __construct(Closure $test, string $description, array $data)
+    private static ?Closure $__afterAll = null;
+
+    /**
+     * Resets the test case static properties.
+     */
+    public static function flush(): void
     {
-        $this->__test        = $test;
+        self::$__beforeAll = null;
-        $this->__description = $description;
+        self::$__afterAll = null;
-        self::$beforeAll     = null;
-        self::$afterAll      = null;
-
-        parent::__construct('__test', $data);
     }
 
     /**
-     * Adds the groups to the current test case.
+     * Creates a new Test Case instance.
      */
-    public function addGroups(array $groups): void
+    public function __construct(string $name)
     {
-        $groups = array_unique(array_merge($this->getGroups(), $groups));
+        parent::__construct($name);
 
-        $this->setGroups($groups);
+        $test = TestSuite::getInstance()->tests->get(self::$__filename);
+
+        if ($test->hasMethod($name)) {
+            $method = $test->getMethod($name);
+            $this->__description = self::$__latestDescription = $method->description;
+            $this->__test = $method->getClosure($this);
+        }
     }
 
     /**
-     * Add dependencies to the test case and map them to instances of ExecutionOrderDependency.
+     * Adds a new "setUpBeforeClass" to the Test Case.
      */
-    public function addDependencies(array $tests): void
+    public function __addBeforeAll(?Closure $hook): void
     {
-        $className = get_class($this);
+        if ($hook === null) {
-
-        $tests = array_map(function (string $test) use ($className): ExecutionOrderDependency {
-            if (strpos($test, '::') === false) {
-                $test = "{$className}::{$test}";
-            }
-
-            return new ExecutionOrderDependency($test, null, '');
-        }, $tests);
-
-        $this->setDependencies($tests);
-    }
-
-    /**
-     * Add a shared/"global" before all test hook that will execute **before**
-     * the test defined `beforeAll` hook(s).
-     */
-    public function addBeforeAll(?Closure $hook): void
-    {
-        if (!$hook) {
             return;
         }
 
-        self::$beforeAll = (self::$beforeAll instanceof Closure)
+        self::$__beforeAll = (self::$__beforeAll instanceof Closure)
-            ? ChainableClosure::fromStatic(self::$beforeAll, $hook)
+            ? ChainableClosure::fromStatic(self::$__beforeAll, $hook)
             : $hook;
     }
 
     /**
-     * Add a shared/"global" after all test hook that will execute **before**
+     * Adds a new "tearDownAfterClass" to the Test Case.
-     * the test defined `afterAll` hook(s).
      */
-    public function addAfterAll(?Closure $hook): void
+    public function __addAfterAll(?Closure $hook): void
     {
-        if (!$hook) {
+        if ($hook === null) {
             return;
         }
 
-        self::$afterAll = (self::$afterAll instanceof Closure)
+        self::$__afterAll = (self::$__afterAll instanceof Closure)
-            ? ChainableClosure::fromStatic(self::$afterAll, $hook)
+            ? ChainableClosure::fromStatic(self::$__afterAll, $hook)
             : $hook;
     }
 
     /**
-     * Add a shared/"global" before each test hook that will execute **before**
+     * Adds a new "setUp" to the Test Case.
-     * the test defined `beforeEach` hook.
      */
-    public function addBeforeEach(?Closure $hook): void
+    public function __addBeforeEach(?Closure $hook): void
     {
-        $this->addHook('beforeEach', $hook);
+        $this->__addHook('__beforeEach', $hook);
     }
 
     /**
-     * Add a shared/"global" after each test hook that will execute **before**
+     * Adds a new "tearDown" to the Test Case.
-     * the test defined `afterEach` hook.
      */
-    public function addAfterEach(?Closure $hook): void
+    public function __addAfterEach(?Closure $hook): void
     {
-        $this->addHook('afterEach', $hook);
+        $this->__addHook('__afterEach', $hook);
     }
 
     /**
-     * Add a shared/global hook and compose them if more than one is passed.
+     * Adds a new "hook" to the Test Case.
      */
-    private function addHook(string $property, ?Closure $hook): void
+    private function __addHook(string $property, ?Closure $hook): void
     {
-        if (!$hook) {
+        if ($hook === null) {
             return;
         }
 
@@ -170,22 +141,7 @@ trait Testable
     }
 
     /**
-     * Returns the test case name. Note that, in Pest
+     * This method is called before the first test of this Test Case is run.
-     * we ignore withDataset argument as the description
-     * already contains the dataset description.
-     */
-    public function getName(bool $withDataSet = true): string
-    {
-        return $this->__description;
-    }
-
-    public static function __getFileName(): string
-    {
-        return self::$__filename;
-    }
-
-    /**
-     * This method is called before the first test of this test class is run.
      */
     public static function setUpBeforeClass(): void
     {
@@ -193,22 +149,22 @@ trait Testable
 
         $beforeAll = TestSuite::getInstance()->beforeAll->get(self::$__filename);
 
-        if (self::$beforeAll instanceof Closure) {
+        if (self::$__beforeAll instanceof Closure) {
-            $beforeAll = ChainableClosure::fromStatic(self::$beforeAll, $beforeAll);
+            $beforeAll = ChainableClosure::fromStatic(self::$__beforeAll, $beforeAll);
         }
 
         call_user_func(Closure::bind($beforeAll, null, self::class));
     }
 
     /**
-     * This method is called after the last test of this test class is run.
+     * 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);
 
-        if (self::$afterAll instanceof Closure) {
+        if (self::$__afterAll instanceof Closure) {
-            $afterAll = ChainableClosure::fromStatic(self::$afterAll, $afterAll);
+            $afterAll = ChainableClosure::fromStatic(self::$__afterAll, $afterAll);
         }
 
         call_user_func(Closure::bind($afterAll, null, self::class));
@@ -217,7 +173,7 @@ trait Testable
     }
 
     /**
-     * Gets executed before the test.
+     * Gets executed before the Test Case.
      */
     protected function setUp(): void
     {
@@ -227,22 +183,22 @@ trait Testable
 
         $beforeEach = TestSuite::getInstance()->beforeEach->get(self::$__filename);
 
-        if ($this->beforeEach instanceof Closure) {
+        if ($this->__beforeEach instanceof Closure) {
-            $beforeEach = ChainableClosure::from($this->beforeEach, $beforeEach);
+            $beforeEach = ChainableClosure::from($this->__beforeEach, $beforeEach);
         }
 
         $this->__callClosure($beforeEach, func_get_args());
     }
 
     /**
-     * Gets executed after the test.
+     * Gets executed after the Test Case.
      */
     protected function tearDown(): void
     {
         $afterEach = TestSuite::getInstance()->afterEach->get(self::$__filename);
 
-        if ($this->afterEach instanceof Closure) {
+        if ($this->__afterEach instanceof Closure) {
-            $afterEach = ChainableClosure::from($this->afterEach, $afterEach);
+            $afterEach = ChainableClosure::from($this->__afterEach, $afterEach);
         }
 
         $this->__callClosure($afterEach, func_get_args());
@@ -253,27 +209,16 @@ trait Testable
     }
 
     /**
-     * Returns the test case as string.
+     * Executes the Test Case current test.
-     */
-    public function toString(): string
-    {
-        return \sprintf(
-            '%s::%s',
-            self::$__filename,
-            $this->__description
-        );
-    }
-
-    /**
-     * Runs the test.
-     *
-     * @return mixed
      *
      * @throws Throwable
      */
-    public function __test()
+    private function __runTest(Closure $closure, ...$args): mixed
     {
-        return $this->__callClosure($this->__test, $this->resolveTestArguments(func_get_args()));
+        $arguments = $this->__resolveTestArguments($args);
+        $this->__ensureDatasetArgumentNumberMatches($arguments);
+
+        return $this->__callClosure($closure, $arguments);
     }
 
     /**
@@ -281,27 +226,103 @@ trait Testable
      *
      * @throws Throwable
      */
-    private function resolveTestArguments(array $arguments): array
+    private function __resolveTestArguments(array $arguments): array
     {
-        return array_map(function ($data) {
+        $method = TestSuite::getInstance()->tests->get(self::$__filename)->getMethod($this->name());
-            return $data instanceof Closure ? $this->__callClosure($data, []) : $data;
+
-        }, $arguments);
+        $this->__description = self::$__latestDescription = $this->dataName() ? $method->description.' with '.$this->dataName() : $method->description;
+
+        $underlyingTest = Reflection::getFunctionVariable($this->__test, 'closure');
+        $testParameterTypes = array_values(Reflection::getFunctionArguments($underlyingTest));
+
+        if (count($arguments) !== 1) {
+            foreach ($arguments as $argumentIndex => $argumentValue) {
+                if (! $argumentValue instanceof Closure) {
+                    continue;
+                }
+
+                if (in_array($testParameterTypes[$argumentIndex], [\Closure::class, 'callable', 'mixed'])) {
+                    continue;
+                }
+
+                $arguments[$argumentIndex] = $this->__callClosure($argumentValue, []);
+            }
+
+            return $arguments;
+        }
+
+        if (! $arguments[0] instanceof Closure) {
+            return $arguments;
+        }
+
+        if (in_array($testParameterTypes[0], [\Closure::class, 'callable'])) {
+            return $arguments;
+        }
+
+        $boundDatasetResult = $this->__callClosure($arguments[0], []);
+        if (count($testParameterTypes) === 1) {
+            return [$boundDatasetResult];
+        }
+        if (! is_array($boundDatasetResult)) {
+            return [$boundDatasetResult];
+        }
+
+        return array_values($boundDatasetResult);
     }
 
     /**
-     * @return mixed
+     * Ensures dataset items count matches underlying test case required parameters
      *
-     * @throws Throwable
+     * @throws ReflectionException
+     * @throws DatasetArgsCountMismatch
      */
-    private function __callClosure(Closure $closure, array $arguments)
+    private function __ensureDatasetArgumentNumberMatches(array $arguments): void
     {
-        return ExceptionTrace::ensure(function () use ($closure, $arguments) {
+        if ($arguments === []) {
-            return call_user_func_array(Closure::bind($closure, $this, get_class($this)), $arguments);
+            return;
-        });
+        }
+
+        $underlyingTest = Reflection::getFunctionVariable($this->__test, 'closure');
+        $testReflection = new ReflectionFunction($underlyingTest);
+        $requiredParametersCount = $testReflection->getNumberOfRequiredParameters();
+        $suppliedParametersCount = count($arguments);
+
+        if ($suppliedParametersCount >= $requiredParametersCount) {
+            return;
+        }
+
+        throw new DatasetArgsCountMismatch($this->dataName(), $requiredParametersCount, $suppliedParametersCount);
     }
 
-    public function getPrintableTestCaseName(): string
+    /**
+     * @throws Throwable
+     */
+    private function __callClosure(Closure $closure, array $arguments): mixed
     {
-        return ltrim(self::class, 'P\\');
+        return ExceptionTrace::ensure(fn (): mixed => call_user_func_array(Closure::bind($closure, $this, $this::class), $arguments));
+    }
+
+    /**
+     * 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;
     }
 }

src/Console/Command.php

@@ -1,132 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Console;
-
-use Pest\Actions\AddsDefaults;
-use Pest\Actions\AddsTests;
-use Pest\Actions\InteractsWithPlugins;
-use Pest\Actions\LoadStructure;
-use Pest\Actions\ValidatesConfiguration;
-use Pest\Plugins\Version;
-use Pest\Support\Container;
-use Pest\TestSuite;
-use PHPUnit\Framework\TestSuite as BaseTestSuite;
-use PHPUnit\TextUI\Command as BaseCommand;
-use PHPUnit\TextUI\TestRunner;
-use SebastianBergmann\FileIterator\Facade as FileIteratorFacade;
-use Symfony\Component\Console\Output\OutputInterface;
-
-/**
- * @internal
- */
-final class Command extends BaseCommand
-{
-    /**
-     * Holds the current testing suite.
-     *
-     * @var TestSuite
-     */
-    private $testSuite;
-
-    /**
-     * Holds the current console output.
-     *
-     * @var OutputInterface
-     */
-    private $output;
-
-    /**
-     * Creates a new instance of the command class.
-     */
-    public function __construct(TestSuite $testSuite, OutputInterface $output)
-    {
-        $this->testSuite = $testSuite;
-        $this->output    = $output;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @phpstan-ignore-next-line
-     *
-     * @param array<int, string> $argv
-     */
-    protected function handleArguments(array $argv): void
-    {
-        $argv = InteractsWithPlugins::handleArguments($argv);
-
-        parent::handleArguments($argv);
-
-        /*
-         * Let's validate the configuration. Making
-         * sure all options are yet supported by Pest.
-         */
-        ValidatesConfiguration::in($this->arguments);
-    }
-
-    /**
-     * Creates a new PHPUnit test runner.
-     */
-    protected function createRunner(): TestRunner
-    {
-        /*
-         * First, let's add the defaults we use on `pest`. Those
-         * are the printer class, and others that may be appear.
-         */
-        $this->arguments = AddsDefaults::to($this->arguments);
-
-        $testRunner = new TestRunner($this->arguments['loader']);
-        $testSuite  = $this->arguments['test'];
-
-        if (is_string($testSuite)) {
-            if (\is_dir($testSuite)) {
-                /** @var string[] $files */
-                $files = (new FileIteratorFacade())->getFilesAsArray(
-                    $testSuite,
-                    $this->arguments['testSuffixes']
-                );
-            } else {
-                $files = [$testSuite];
-            }
-
-            $testSuite = new BaseTestSuite($testSuite);
-
-            $testSuite->addTestFiles($files);
-
-            $this->arguments['test'] = $testSuite;
-        }
-
-        AddsTests::to($testSuite, $this->testSuite);
-
-        return $testRunner;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @phpstan-ignore-next-line
-     *
-     * @param array<int, string> $argv
-     */
-    public function run(array $argv, bool $exit = true): int
-    {
-        LoadStructure::in($this->testSuite->rootPath);
-
-        $result = parent::run($argv, false);
-        $result = InteractsWithPlugins::addOutput($result);
-
-        exit($result);
-    }
-
-    protected function showHelp(): void
-    {
-        /** @var Version $version */
-        $version = Container::getInstance()->get(Version::class);
-        $version->handleArguments(['--version']);
-        parent::showHelp();
-
-        (new Help($this->output))();
-    }
-}

src/Console/Help.php

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

src/Console/Thanks.php

@@ -4,8 +4,11 @@ declare(strict_types=1);
 
 namespace Pest\Console;
 
+use Pest\Bootstrappers\BootView;
+use Pest\Support\View;
 use Symfony\Component\Console\Helper\SymfonyQuestionHelper;
 use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 
@@ -14,38 +17,58 @@ use Symfony\Component\Console\Question\ConfirmationQuestion;
  */
 final class Thanks
 {
-    /** @var array<int, string> */
+    /**
+     * The support options.
+     *
+     * @var array<string, string>
+     */
     private const FUNDING_MESSAGES = [
-        '',
+        'Star the project on GitHub' => 'https://github.com/pestphp/pest',
-        '  - Star or contribute to Pest:',
+        'Tweet about the project' => 'https://twitter.com/pestphp',
-        '    <options=bold>https://github.com/pestphp/pest</>',
+        'Sponsor the project' => 'https://github.com/sponsors/nunomaduro',
-        '  - Tweet something about Pest on Twitter:',
-        '    <options=bold>https://twitter.com/pestphp</>',
-        '  - Sponsor the creator:',
-        '    <options=bold>https://github.com/sponsors/nunomaduro</>',
     ];
 
-    /** @var OutputInterface */
+    /**
-    private $output;
+     * Creates a new Console Command instance.
-
+     */
-    public function __construct(OutputInterface $output)
+    public function __construct(
-    {
+        private readonly InputInterface $input,
-        $this->output = $output;
+        private readonly OutputInterface $output
+    ) {
+        // ..
     }
 
     /**
-     * Asks the user to support Pest.
+     * Executes the Console Command.
      */
     public function __invoke(): void
     {
-        $wantsToSupport = (new SymfonyQuestionHelper())->ask(
+        $bootstrapper = new BootView($this->output);
-            new ArrayInput([]),
+        $bootstrapper->boot();
-            $this->output,
+
-            new ConfirmationQuestion(
+        $wantsToSupport = false;
-                'Can you quickly <options=bold>star our GitHub repository</>? 🙏🏻',
+
-                true,
+        if (getenv('PEST_NO_SUPPORT') !== 'true' && $this->input->isInteractive()) {
-            )
+            $wantsToSupport = (new SymfonyQuestionHelper())->ask(
-        );
+                new ArrayInput([]),
+                $this->output,
+                new ConfirmationQuestion(
+                    ' <options=bold>Wanna show Pest some love by starring it on GitHub?</>',
+                    false,
+                )
+            );
+
+            View::render('components.new-line');
+
+            foreach (self::FUNDING_MESSAGES as $message => $link) {
+                View::render('components.two-column-detail', [
+                    'left' => $message,
+                    'right' => $link,
+                ]);
+            }
+
+            View::render('components.new-line');
+        }
 
         if ($wantsToSupport === true) {
             if (PHP_OS_FAMILY == 'Darwin') {
@@ -58,9 +81,5 @@ final class Thanks
                 exec('xdg-open https://github.com/pestphp/pest');
             }
         }
-
-        foreach (self::FUNDING_MESSAGES as $message) {
-            $this->output->writeln($message);
-        }
     }
 }

src/Contracts/AddsAnnotations.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Contracts;
+
+use Pest\Factories\TestCaseMethodFactory;
+
+/**
+ * @interal
+ */
+interface AddsAnnotations
+{
+    /**
+     * Adds annotations to the given test case method.
+     *
+     * @param  array<int, string>  $annotations
+     * @return array<int, string>
+     */
+    public function __invoke(TestCaseMethodFactory $method, array $annotations): array;
+}

src/Contracts/Bootstrapper.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Contracts;
+
+/**
+ * @internal
+ */
+interface Bootstrapper
+{
+    /**
+     * Boots the bootstrapper.
+     */
+    public function boot(): void;
+}

src/Contracts/HasPrintableTestCaseName.php

@@ -4,18 +4,12 @@ declare(strict_types=1);
 
 namespace Pest\Contracts;
 
-if (interface_exists(\NunoMaduro\Collision\Contracts\Adapters\Phpunit\HasPrintableTestCaseName::class)) {
+use NunoMaduro\Collision\Contracts\Adapters\Phpunit\HasPrintableTestCaseName as BaseHasPrintableTestCaseName;
-    /**
+
-     * @internal
+/**
-     */
+ * @internal
-    interface HasPrintableTestCaseName extends \NunoMaduro\Collision\Contracts\Adapters\Phpunit\HasPrintableTestCaseName
+ */
-    {
+interface HasPrintableTestCaseName extends BaseHasPrintableTestCaseName
-    }
+{
-} else {
+    // ..
-    /**
-     * @internal
-     */
-    interface HasPrintableTestCaseName
-    {
-    }
 }

src/Contracts/Panicable.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Contracts;
+
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * @internal
+ */
+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

@@ -10,7 +10,7 @@ namespace Pest\Contracts\Plugins;
 interface AddsOutput
 {
     /**
-     * Allows to add custom output after the test suite was executed.
+     * Adds output after the Test Suite execution.
      */
-    public function addOutput(int $testReturnCode): int;
+    public function addOutput(int $exitCode): int;
 }

src/Contracts/Plugins/Bootable.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Contracts\Plugins;
+
+/**
+ * @internal
+ */
+interface Bootable
+{
+    /**
+     * Boots the plugin.
+     */
+    public function boot(): void;
+}

src/Contracts/Plugins/HandlesArguments.php

@@ -10,14 +10,10 @@ namespace Pest\Contracts\Plugins;
 interface HandlesArguments
 {
     /**
-     * Allows to handle custom command line arguments.
+     * Adds arguments before of the Test Suite execution.
      *
-     * PLEASE NOTE: it is necessary to remove any custom argument from the array
+     * @param  array<int, string>  $arguments
-     * because otherwise the application will complain about them
+     * @return array<int, string>
-     *
-     * @param array<int, string> $arguments
-     *
-     * @return array<int, string> the updated list of arguments
      */
     public function handleArguments(array $arguments): array;
 }

src/Contracts/Plugins/Shutdownable.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Contracts\Plugins;
+
+/**
+ * @internal
+ */
+interface Shutdownable
+{
+    /**
+     * Shutdowns the plugin.
+     */
+    public function shutdown(): void;
+}

src/Contracts/TestCaseFilter.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Contracts;
+
+interface TestCaseFilter
+{
+    /**
+     * Whether the test case is accepted.
+     */
+    public function accept(string $testCaseFilename): bool;
+}

src/Contracts/TestCaseMethodFilter.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Contracts;
+
+use Pest\Factories\TestCaseMethodFactory;
+
+interface TestCaseMethodFilter
+{
+    /**
+     * Whether the test case method is accepted.
+     */
+    public function accept(TestCaseMethodFactory $factory): bool;
+}

src/Datasets.php

@@ -1,177 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest;
-
-use Closure;
-use Pest\Exceptions\DatasetAlreadyExist;
-use Pest\Exceptions\DatasetDoesNotExist;
-use SebastianBergmann\Exporter\Exporter;
-use Traversable;
-
-/**
- * @internal
- */
-final class Datasets
-{
-    /**
-     * Holds the datasets.
-     *
-     * @var array<int|string, Closure|iterable<int|string, mixed>>
-     */
-    private static $datasets = [];
-
-    /**
-     * Sets the given.
-     *
-     * @param Closure|iterable<int|string, mixed> $data
-     */
-    public static function set(string $name, $data): void
-    {
-        if (array_key_exists($name, self::$datasets)) {
-            throw new DatasetAlreadyExist($name);
-        }
-
-        self::$datasets[$name] = $data;
-    }
-
-    /**
-     * @return Closure|iterable<int|string, mixed>
-     */
-    public static function get(string $name)
-    {
-        if (!array_key_exists($name, self::$datasets)) {
-            throw new DatasetDoesNotExist($name);
-        }
-
-        return self::$datasets[$name];
-    }
-
-    /**
-     * Resolves the current dataset to an array value.
-     *
-     * @param array<Closure|iterable<int|string, mixed>|string> $datasets
-     *
-     * @return array<string, mixed>
-     */
-    public static function resolve(string $description, array $datasets): array
-    {
-        /* @phpstan-ignore-next-line */
-        if (empty($datasets)) {
-            return [$description => []];
-        }
-
-        $datasets = self::processDatasets($datasets);
-
-        $datasetCombinations = self::getDataSetsCombinations($datasets);
-
-        $dataSetDescriptions = [];
-        $dataSetValues       = [];
-
-        foreach ($datasetCombinations as $datasetCombination) {
-            $partialDescriptions = [];
-            $values              = [];
-
-            foreach ($datasetCombination as $dataset_data) {
-                $partialDescriptions[] = $dataset_data['label'];
-                $values                = array_merge($values, $dataset_data['values']);
-            }
-
-            $dataSetDescriptions[] = $description . ' with ' . implode(' / ', $partialDescriptions);
-            $dataSetValues[]       = $values;
-        }
-
-        foreach (array_count_values($dataSetDescriptions) as $descriptionToCheck => $count) {
-            if ($count > 1) {
-                $index = 1;
-                foreach ($dataSetDescriptions as $i => $dataSetDescription) {
-                    if ($dataSetDescription === $descriptionToCheck) {
-                        $dataSetDescriptions[$i] .= sprintf(' #%d', $index++);
-                    }
-                }
-            }
-        }
-
-        $namedData = [];
-        foreach ($dataSetDescriptions as $i => $dataSetDescription) {
-            $namedData[$dataSetDescription] = $dataSetValues[$i];
-        }
-
-        return $namedData;
-    }
-
-    /**
-     * @param array<Closure|iterable<int|string, mixed>|string> $datasets
-     *
-     * @return array<array>
-     */
-    private static function processDatasets(array $datasets): array
-    {
-        $processedDatasets = [];
-
-        foreach ($datasets as $index => $data) {
-            $processedDataset = [];
-
-            if (is_string($data)) {
-                $datasets[$index] = self::get($data);
-            }
-
-            if (is_callable($datasets[$index])) {
-                $datasets[$index] = call_user_func($datasets[$index]);
-            }
-
-            if ($datasets[$index] instanceof Traversable) {
-                $datasets[$index] = iterator_to_array($datasets[$index]);
-            }
-
-            foreach ($datasets[$index] as $key => $values) {
-                $values             = is_array($values) ? $values : [$values];
-                $processedDataset[] = [
-                    'label'  => self::getDataSetDescription($key, $values),
-                    'values' => $values,
-                ];
-            }
-
-            $processedDatasets[] = $processedDataset;
-        }
-
-        return $processedDatasets;
-    }
-
-    /**
-     * @param array<array> $combinations
-     *
-     * @return array<array>
-     */
-    private static function getDataSetsCombinations(array $combinations): array
-    {
-        $result = [[]];
-        foreach ($combinations as $index => $values) {
-            $tmp = [];
-            foreach ($result as $resultItem) {
-                foreach ($values as $value) {
-                    $tmp[] = array_merge($resultItem, [$index => $value]);
-                }
-            }
-            $result = $tmp;
-        }
-
-        return $result;
-    }
-
-    /**
-     * @param int|string        $key
-     * @param array<int, mixed> $data
-     */
-    private static function getDataSetDescription($key, array $data): string
-    {
-        $exporter = new Exporter();
-
-        if (is_int($key)) {
-            return \sprintf('(%s)', $exporter->shortenedRecursiveExport($data));
-        }
-
-        return \sprintf('data set "%s"', $key);
-    }
-}

src/Exceptions/AfterAllAlreadyExist.php

@@ -15,10 +15,10 @@ use Symfony\Component\Console\Exception\ExceptionInterface;
 final class AfterAllAlreadyExist extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
 {
     /**
-     * Creates a new instance of after all already exist exception.
+     * Creates a new Exception instance.
      */
     public function __construct(string $filename)
     {
-        parent::__construct(sprintf('The afterAll already exist in the filename `%s`.', $filename));
+        parent::__construct(sprintf('The afterAll already exists in the filename `%s`.', $filename));
     }
 }

src/Exceptions/AfterEachAlreadyExist.php

@@ -15,10 +15,10 @@ use Symfony\Component\Console\Exception\ExceptionInterface;
 final class AfterEachAlreadyExist extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
 {
     /**
-     * Creates a new instance of after each already exist exception.
+     * Creates a new Exception instance.
      */
     public function __construct(string $filename)
     {
-        parent::__construct(sprintf('The afterEach already exist in the filename `%s`.', $filename));
+        parent::__construct(sprintf('The afterEach already exists in the filename `%s`.', $filename));
     }
 }

src/Exceptions/AttributeNotSupportedYet.php

@@ -1,24 +0,0 @@
-<?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 AttributeNotSupportedYet extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
-{
-    /**
-     * Creates a new instance of attribute not supported yet.
-     */
-    public function __construct(string $attribute, string $value)
-    {
-        parent::__construct(sprintf('The PHPUnit attribute `%s` with value `%s` is not supported yet.', $attribute, $value));
-    }
-}

src/Exceptions/BeforeEachAlreadyExist.php

@@ -15,10 +15,10 @@ use Symfony\Component\Console\Exception\ExceptionInterface;
 final class BeforeEachAlreadyExist extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
 {
     /**
-     * Creates a new instance of before each already exist exception.
+     * Creates a new Exception instance.
      */
     public function __construct(string $filename)
     {
-        parent::__construct(sprintf('The beforeEach already exist in the filename `%s`.', $filename));
+        parent::__construct(sprintf('The beforeEach already exists in the filename `%s`.', $filename));
     }
 }

src/Exceptions/DatasetAlreadyExists.php

@@ -12,13 +12,13 @@ use Symfony\Component\Console\Exception\ExceptionInterface;
 /**
  * @internal
  */
-final class DatasetAlreadyExist extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
+final class DatasetAlreadyExists extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
 {
     /**
-     * Creates a new instance of dataset already exist.
+     * Creates a new Exception instance.
      */
-    public function __construct(string $name)
+    public function __construct(string $name, string $scope)
     {
-        parent::__construct(sprintf('A dataset with the name `%s` already exist.', $name));
+        parent::__construct(sprintf('A dataset with the name `%s` already exists in scope [%s].', $name, $scope));
     }
 }

src/Exceptions/DatasetArgsCountMismatch.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Exceptions;
+
+use Exception;
+
+final class DatasetArgsCountMismatch extends Exception
+{
+    public function __construct(string $dataName, int $requiredCount, int $suppliedCount)
+    {
+        parent::__construct(sprintf('Test expects %d arguments but dataset [%s] only provides %d', $requiredCount, $dataName, $suppliedCount));
+    }
+}

src/Exceptions/DatasetDoesNotExist.php

@@ -15,7 +15,7 @@ use Symfony\Component\Console\Exception\ExceptionInterface;
 final class DatasetDoesNotExist extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
 {
     /**
-     * Creates a new instance of dataset does not exist.
+     * Creates a new Exception instance.
      */
     public function __construct(string $name)
     {

src/Exceptions/DatasetMissing.php

@@ -10,26 +10,22 @@ use NunoMaduro\Collision\Contracts\RenderlessTrace;
 use Symfony\Component\Console\Exception\ExceptionInterface;
 
 /**
- * Creates a new instance of dataset is not present for test that has arguments.
- *
  * @internal
  */
 final class DatasetMissing extends BadFunctionCallException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
 {
     /**
-     * Create new exception instance.
+     * Creates a new Exception instance.
      *
-     * @param array<string, string> $args A map of argument names to their typee
+     * @param  array<string, string>  $arguments
      */
-    public function __construct(string $file, string $name, array $args)
+    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",
             $name,
-            count($args),
+            count($arguments),
-            implode(', ', array_map(static function (string $arg, string $type): string {
+            implode(', ', array_map(static fn (string $arg, string $type): string => sprintf('%s $%s', $type, $arg), array_keys($arguments), $arguments)),
-                return sprintf('%s $%s', $type, $arg);
-            }, array_keys($args), $args)),
             $file,
         ));
     }

src/Exceptions/ExpectationNotFound.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Exceptions;
+
+use Exception;
+
+/**
+ * @internal
+ */
+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.");
+    }
+}

src/Exceptions/FileOrFolderNotFound.php

@@ -15,10 +15,10 @@ use Symfony\Component\Console\Exception\ExceptionInterface;
 final class FileOrFolderNotFound extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
 {
     /**
-     * Creates a new instance of file not found.
+     * Creates a new Exception instance.
      */
     public function __construct(string $filename)
     {
-        parent::__construct(sprintf('The file or folder with the name `%s` not found.', $filename));
+        parent::__construct(sprintf('The file or folder with the name `%s` could not be found.', $filename));
     }
 }

src/Exceptions/InvalidExpectation.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Exceptions;
+
+use LogicException;
+use NunoMaduro\Collision\Contracts\RenderlessEditor;
+use NunoMaduro\Collision\Contracts\RenderlessTrace;
+use Symfony\Component\Console\Exception\ExceptionInterface;
+
+/**
+ * @internal
+ */
+final class InvalidExpectation extends LogicException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
+{
+    /**
+     * @param  array<int, string>  $methods
+     *
+     * @throws self
+     */
+    public static function fromMethods(array $methods): never
+    {
+        throw new self(sprintf('Expectation [%s] is not valid.', implode('->', $methods)));
+    }
+}

src/Exceptions/InvalidExpectationValue.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Exceptions;
+
+use InvalidArgumentException;
+
+/**
+ * @internal
+ */
+final class InvalidExpectationValue extends InvalidArgumentException
+{
+    /**
+     * @throws self
+     */
+    public static function expected(string $type): never
+    {
+        throw new self(sprintf('Invalid expectation value type. Expected [%s].', $type));
+    }
+}

src/Exceptions/InvalidOption.php

@@ -12,10 +12,10 @@ use Symfony\Component\Console\Exception\ExceptionInterface;
 /**
  * @internal
  */
-final class InvalidConsoleArgument extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
+final class InvalidOption extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
 {
     /**
-     * Creates a new instance of should not happen.
+     * Creates a new Exception instance.
      */
     public function __construct(string $message)
     {

src/Exceptions/InvalidPestCommand.php

@@ -15,10 +15,10 @@ use Symfony\Component\Console\Exception\ExceptionInterface;
 final class InvalidPestCommand extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
 {
     /**
-     * Creates a new instance of invalid pest command exception.
+     * Creates a new Exception instance.
      */
     public function __construct()
     {
-        parent::__construct('Please run `./vendor/bin/pest` instead of `/vendor/bin/phpunit`.');
+        parent::__construct('Please run [./vendor/bin/pest] instead.');
     }
 }

src/Exceptions/MissingDependency.php

@@ -15,7 +15,7 @@ use Symfony\Component\Console\Exception\ExceptionInterface;
 final class MissingDependency extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
 {
     /**
-     * Creates a new instance of missing dependency.
+     * Creates a new Exception instance.
      */
     public function __construct(string $feature, string $dependency)
     {

src/Exceptions/NoDirtyTestsFound.php

@@ -0,0 +1,38 @@
+<?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 NoDirtyTestsFound extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace, Panicable
+{
+    /**
+     * Renders the panic on the given output.
+     */
+    public function render(OutputInterface $output): void
+    {
+        $output->writeln([
+            '',
+            '  <fg=white;options=bold;bg=blue> INFO </> No "dirty" tests found.',
+            '',
+        ]);
+    }
+
+    /**
+     * The exit code to be used.
+     */
+    public function exitCode(): int
+    {
+        return 0;
+    }
+}

src/Exceptions/ShouldNotHappen.php

@@ -13,19 +13,18 @@ use RuntimeException;
 final class ShouldNotHappen extends RuntimeException
 {
     /**
-     * Creates a new instance of should not happen.
+     * Creates a new Exception instance.
      */
     public function __construct(Exception $exception)
     {
         $message = $exception->getMessage();
 
-        parent::__construct(sprintf(<<<EOF
+        parent::__construct(sprintf(<<<'EOF'
-
 This should not happen - please create an new issue here: https://github.com/pestphp/pest.
 
-- Issue: %s
+  Issue: %s
-- PHP version: %s
+  PHP version: %s
-- Operating system: %s
+  Operating system: %s
 EOF
             , $message, phpversion(), PHP_OS), 1, $exception);
     }

src/Exceptions/TestAlreadyExist.php

@@ -15,10 +15,10 @@ use Symfony\Component\Console\Exception\ExceptionInterface;
 final class TestAlreadyExist extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
 {
     /**
-     * Creates a new instance of test already exist.
+     * Creates a new Exception instance.
      */
     public function __construct(string $fileName, string $description)
     {
-        parent::__construct(sprintf('A test with the description `%s` already exist in the filename `%s`.', $description, $fileName));
+        parent::__construct(sprintf('A test with the description `%s` already exists in the filename `%s`.', $description, $fileName));
     }
 }

src/Exceptions/TestCaseAlreadyInUse.php

@@ -15,7 +15,7 @@ use Symfony\Component\Console\Exception\ExceptionInterface;
 final class TestCaseAlreadyInUse extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
 {
     /**
-     * Creates a new instance of test case already in use.
+     * Creates a new Exception instance.
      */
     public function __construct(string $inUse, string $newOne, string $folder)
     {

src/Exceptions/TestCaseClassOrTraitNotFound.php

@@ -15,7 +15,7 @@ use Symfony\Component\Console\Exception\ExceptionInterface;
 final class TestCaseClassOrTraitNotFound extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
 {
     /**
-     * Creates a new instance of after each already exist exception.
+     * Creates a new Exception instance.
      */
     public function __construct(string $testCaseClass)
     {

src/Exceptions/TestDescriptionMissing.php

@@ -0,0 +1,24 @@
+<?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 TestDescriptionMissing extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
+{
+    /**
+     * Creates a new Exception instance.
+     */
+    public function __construct(string $fileName)
+    {
+        parent::__construct(sprintf('Test description is missing in the filename `%s`.', $fileName));
+    }
+}

src/Expectations/EachExpectation.php

@@ -2,47 +2,50 @@
 
 declare(strict_types=1);
 
-namespace Pest;
+namespace Pest\Expectations;
+
+use function expect;
+use Pest\Expectation;
 
 /**
  * @internal
  *
- * @mixin Expectation
+ * @template TValue
+ *
+ * @mixin Expectation<TValue>
  */
-final class Each
+final class EachExpectation
 {
-    /**
+    private bool $opposite = false;
-     * @var Expectation
-     */
-    private $original;
-
-    /**
-     * @var bool
-     */
-    private $opposite = false;
 
     /**
      * Creates an expectation on each item of the iterable "value".
+     *
+     * @param  Expectation<TValue>  $original
      */
-    public function __construct(Expectation $original)
+    public function __construct(private readonly Expectation $original)
     {
-        $this->original = $original;
     }
 
     /**
      * Creates a new expectation.
      *
-     * @param mixed $value
+     * @template TAndValue
+     *
+     * @param  TAndValue  $value
+     * @return Expectation<TAndValue>
      */
-    public function and($value): Expectation
+    public function and(mixed $value): Expectation
     {
         return $this->original->and($value);
     }
 
     /**
      * Creates the opposite expectation for the value.
+     *
+     * @return self<TValue>
      */
-    public function not(): Each
+    public function not(): self
     {
         $this->opposite = true;
 
@@ -52,9 +55,10 @@ final class Each
     /**
      * Dynamically calls methods on the class with the given arguments on each item.
      *
-     * @param array<int|string, mixed> $arguments
+     * @param  array<int|string, mixed>  $arguments
+     * @return self<TValue>
      */
-    public function __call(string $name, array $arguments): Each
+    public function __call(string $name, array $arguments): self
     {
         foreach ($this->original->value as $item) {
             /* @phpstan-ignore-next-line */
@@ -68,8 +72,10 @@ final class Each
 
     /**
      * Dynamically calls methods on the class without any arguments on each item.
+     *
+     * @return self<TValue>
      */
-    public function __get(string $name): Each
+    public function __get(string $name): self
     {
         /* @phpstan-ignore-next-line */
         return $this->$name();

src/Expectations/HigherOrderExpectation.php

@@ -0,0 +1,183 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Expectations;
+
+use Closure;
+use Pest\Concerns\Retrievable;
+use Pest\Expectation;
+
+/**
+ * @internal
+ *
+ * @template TOriginalValue
+ * @template TValue
+ *
+ * @mixin Expectation<TOriginalValue>
+ */
+final class HigherOrderExpectation
+{
+    use Retrievable;
+
+    /**
+     * @var Expectation<TValue>|EachExpectation<TValue>
+     */
+    private Expectation|EachExpectation $expectation;
+
+    private bool $opposite = false;
+
+    private bool $shouldReset = false;
+
+    /**
+     * Creates a new higher order expectation.
+     *
+     * @param  Expectation<TOriginalValue>  $original
+     * @param  TValue  $value
+     */
+    public function __construct(private readonly Expectation $original, mixed $value)
+    {
+        $this->expectation = $this->expect($value);
+    }
+
+    /**
+     * Creates the opposite expectation for the value.
+     *
+     * @return self<TOriginalValue, TValue>
+     */
+    public function not(): self
+    {
+        $this->opposite = ! $this->opposite;
+
+        return $this;
+    }
+
+    /**
+     * Creates a new Expectation.
+     *
+     * @template TExpectValue
+     *
+     * @param  TExpectValue  $value
+     * @return Expectation<TExpectValue>
+     */
+    public function expect(mixed $value): Expectation
+    {
+        return new Expectation($value);
+    }
+
+    /**
+     * Creates a new expectation.
+     *
+     * @template TExpectValue
+     *
+     * @param  TExpectValue  $value
+     * @return Expectation<TExpectValue>
+     */
+    public function and(mixed $value): Expectation
+    {
+        return $this->expect($value);
+    }
+
+    /**
+     * Scope an expectation callback to the current value in
+     * the HigherOrderExpectation chain.
+     *
+     * @param  Closure(Expectation<TValue>): void  $expectation
+     * @return HigherOrderExpectation<TOriginalValue, TOriginalValue>
+     */
+    public function scoped(Closure $expectation): self
+    {
+        $expectation->__invoke($this->expectation);
+
+        return new self($this->original, $this->original->value);
+    }
+
+    /**
+     * Creates a new expectation with the decoded JSON value.
+     *
+     * @return self<TOriginalValue, array<string|int, mixed>|bool>
+     */
+    public function json(): self
+    {
+        return new self($this->original, $this->expectation->json()->value);
+    }
+
+    /**
+     * Dynamically calls methods on the class with the given arguments.
+     *
+     * @param  array<int, mixed>  $arguments
+     * @return self<TOriginalValue, mixed>|self<TOriginalValue, TValue>
+     */
+    public function __call(string $name, array $arguments): self
+    {
+        if (! $this->expectationHasMethod($name)) {
+            /* @phpstan-ignore-next-line */
+            return new self($this->original, $this->getValue()->$name(...$arguments));
+        }
+
+        return $this->performAssertion($name, $arguments);
+    }
+
+    /**
+     * Accesses properties in the value or in the expectation.
+     *
+     * @return self<TOriginalValue, mixed>|self<TOriginalValue, TValue>
+     */
+    public function __get(string $name): self
+    {
+        if ($name === 'not') {
+            return $this->not();
+        }
+
+        if (! $this->expectationHasMethod($name)) {
+            /** @var array<string, mixed>|object $value */
+            $value = $this->getValue();
+
+            return new self($this->original, $this->retrieve($name, $value));
+        }
+
+        return $this->performAssertion($name, []);
+    }
+
+    /**
+     * Determines if the original expectation has the given method name.
+     */
+    private function expectationHasMethod(string $name): bool
+    {
+        if (method_exists($this->original, $name)) {
+            return true;
+        }
+        if ($this->original::hasMethod($name)) {
+            return true;
+        }
+
+        return $this->original::hasExtend($name);
+    }
+
+    /**
+     * Retrieve the applicable value based on the current reset condition.
+     *
+     * @return TOriginalValue|TValue
+     */
+    private function getValue(): mixed
+    {
+        return $this->shouldReset ? $this->original->value : $this->expectation->value;
+    }
+
+    /**
+     * Performs the given assertion with the current expectation.
+     *
+     * @param  array<int, mixed>  $arguments
+     * @return self<TOriginalValue, TValue>
+     */
+    private function performAssertion(string $name, array $arguments): self
+    {
+        /* @phpstan-ignore-next-line */
+        $this->expectation = ($this->opposite ? $this->expectation->not() : $this->expectation)->{$name}(...$arguments);
+
+        $this->opposite = false;
+        $this->shouldReset = true;
+
+        return $this;
+    }
+}

src/Expectations/OppositeExpectation.php

@@ -0,0 +1,169 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Expectations;
+
+use Pest\Arch\Contracts\ArchExpectation;
+use Pest\Arch\Expectations\ToBeUsedIn;
+use Pest\Arch\Expectations\ToBeUsedInNothing;
+use Pest\Arch\Expectations\ToUse;
+use Pest\Arch\GroupArchExpectation;
+use Pest\Arch\SingleArchExpectation;
+use Pest\Exceptions\InvalidExpectation;
+use Pest\Expectation;
+use Pest\Support\Arr;
+use Pest\Support\Exporter;
+use PHPUnit\Framework\ExpectationFailedException;
+
+/**
+ * @internal
+ *
+ * @template TValue
+ *
+ * @mixin Expectation<TValue>
+ */
+final class OppositeExpectation
+{
+    /**
+     * Creates a new opposite expectation.
+     *
+     * @param  Expectation<TValue>  $original
+     */
+    public function __construct(private readonly Expectation $original)
+    {
+    }
+
+    /**
+     * Asserts that the value array not has the provided $keys.
+     *
+     * @param  array<int, int|string|array<int-string, mixed>>  $keys
+     * @return Expectation<TValue>
+     */
+    public function toHaveKeys(array $keys): Expectation
+    {
+        foreach ($keys as $k => $key) {
+            try {
+                if (is_array($key)) {
+                    $this->toHaveKeys(array_keys(Arr::dot($key, $k.'.')));
+                } else {
+                    $this->original->toHaveKey($key);
+                }
+            } catch (ExpectationFailedException) {
+                continue;
+            }
+
+            $this->throwExpectationFailedException('toHaveKey', [$key]);
+        }
+
+        return $this->original;
+    }
+
+    /**
+     * Asserts that the given expectation target does not use any of the given dependencies.
+     *
+     * @param  array<int, string>|string  $targets
+     */
+    public function toUse(array|string $targets): ArchExpectation
+    {
+        return GroupArchExpectation::fromExpectations($this->original, array_map(fn (string $target): SingleArchExpectation => ToUse::make($this->original, $target)->opposite(
+            fn () => $this->throwExpectationFailedException('toUse', $target),
+        ), is_string($targets) ? [$targets] : $targets));
+    }
+
+    /**
+     * @param  array<int, string>|string  $targets
+     */
+    public function toOnlyUse(array|string $targets): never
+    {
+        throw InvalidExpectation::fromMethods(['not', 'toOnlyUse']);
+    }
+
+    public function toUseNothing(): never
+    {
+        throw InvalidExpectation::fromMethods(['not', 'toUseNothing']);
+    }
+
+    /**
+     * Asserts that the given expectation dependency is not used.
+     */
+    public function toBeUsed(): ArchExpectation
+    {
+        return ToBeUsedInNothing::make($this->original);
+    }
+
+    /**
+     * Asserts that the given expectation dependency is not used by any of the given targets.
+     *
+     * @param  array<int, string>|string  $targets
+     */
+    public function toBeUsedIn(array|string $targets): ArchExpectation
+    {
+        return GroupArchExpectation::fromExpectations($this->original, array_map(fn (string $target): GroupArchExpectation => ToBeUsedIn::make($this->original, $target)->opposite(
+            fn () => $this->throwExpectationFailedException('toBeUsedIn', $target),
+        ), is_string($targets) ? [$targets] : $targets));
+    }
+
+    public function toOnlyBeUsedIn(): never
+    {
+        throw InvalidExpectation::fromMethods(['not', 'toOnlyBeUsedIn']);
+    }
+
+    /**
+     * Asserts that the given expectation dependency is not used.
+     */
+    public function toBeUsedInNothing(): never
+    {
+        throw InvalidExpectation::fromMethods(['not', 'toBeUsedInNothing']);
+    }
+
+    /**
+     * Handle dynamic method calls into the original expectation.
+     *
+     * @param  array<int, mixed>  $arguments
+     * @return Expectation<TValue>|Expectation<mixed>|never
+     */
+    public function __call(string $name, array $arguments): Expectation
+    {
+        try {
+            /* @phpstan-ignore-next-line */
+            $this->original->{$name}(...$arguments);
+        } catch (ExpectationFailedException) {
+            return $this->original;
+        }
+
+        $this->throwExpectationFailedException($name, $arguments);
+    }
+
+    /**
+     * Handle dynamic properties gets into the original expectation.
+     *
+     * @return Expectation<TValue>|Expectation<mixed>|never
+     */
+    public function __get(string $name): Expectation
+    {
+        try {
+            $this->original->{$name}; // @phpstan-ignore-line
+        } catch (ExpectationFailedException) {  // @phpstan-ignore-line
+            return $this->original;
+        }
+
+        $this->throwExpectationFailedException($name);
+    }
+
+    /**
+     * Creates a new expectation failed exception with a nice readable message.
+     *
+     * @param  array<int, mixed>|string  $arguments
+     */
+    public function throwExpectationFailedException(string $name, array|string $arguments = []): never
+    {
+        $arguments = is_array($arguments) ? $arguments : [$arguments];
+
+        $exporter = Exporter::default();
+
+        $toString = fn ($argument): string => $exporter->shortenedExport($argument);
+
+        throw new ExpectationFailedException(sprintf('Expecting %s not %s %s.', $toString($this->original->value), strtolower((string) preg_replace('/(?<!\ )[A-Z]/', ' $0', $name)), implode(' ', array_map(fn ($argument): string => $toString($argument), $arguments))));
+    }
+}

src/Factories/Annotations/CoversNothing.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Factories\Annotations;
+
+use Pest\Contracts\AddsAnnotations;
+use Pest\Factories\Covers\CoversNothing as CoversNothingFactory;
+use Pest\Factories\TestCaseMethodFactory;
+
+/**
+ * @internal
+ */
+final class CoversNothing implements AddsAnnotations
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function __invoke(TestCaseMethodFactory $method, array $annotations): array
+    {
+        if (($method->covers[0] ?? null) instanceof CoversNothingFactory) {
+            $annotations[] = '@coversNothing';
+        }
+
+        return $annotations;
+    }
+}

src/Factories/Annotations/Depends.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Factories\Annotations;
+
+use Pest\Contracts\AddsAnnotations;
+use Pest\Factories\TestCaseMethodFactory;
+use Pest\Support\Str;
+
+/**
+ * @internal
+ */
+final class Depends implements AddsAnnotations
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function __invoke(TestCaseMethodFactory $method, array $annotations): array
+    {
+        foreach ($method->depends as $depend) {
+            $depend = Str::evaluable($depend);
+
+            $annotations[] = "@depends $depend";
+        }
+
+        return $annotations;
+    }
+}

src/Factories/Annotations/Groups.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Factories\Annotations;
+
+use Pest\Contracts\AddsAnnotations;
+use Pest\Factories\TestCaseMethodFactory;
+
+/**
+ * @internal
+ */
+final class Groups implements AddsAnnotations
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function __invoke(TestCaseMethodFactory $method, array $annotations): array
+    {
+        foreach ($method->groups as $group) {
+            $annotations[] = "@group $group";
+        }
+
+        return $annotations;
+    }
+}

src/Factories/Annotations/TestDox.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Factories\Annotations;
+
+use Pest\Contracts\AddsAnnotations;
+use Pest\Factories\TestCaseMethodFactory;
+
+final class TestDox implements AddsAnnotations
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function __invoke(TestCaseMethodFactory $method, array $annotations): array
+    {
+        $annotations[] = "@testdox $method->description";
+
+        return $annotations;
+    }
+}

src/Factories/Attributes/Attribute.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Factories\Attributes;
+
+use Pest\Factories\TestCaseMethodFactory;
+
+/**
+ * @internal
+ */
+abstract class Attribute
+{
+    /**
+     * Determine if the attribute should be placed above the class instead of above the method.
+     */
+    public static bool $above = false;
+
+    /**
+     * @param  array<int, string>  $attributes
+     * @return array<int, string>
+     */
+    public function __invoke(TestCaseMethodFactory $method, array $attributes): array // @phpstan-ignore-line
+    {
+        return $attributes;
+    }
+}

src/Factories/Attributes/Covers.php

@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Factories\Attributes;
+
+use Pest\Factories\Covers\CoversClass;
+use Pest\Factories\Covers\CoversFunction;
+use Pest\Factories\TestCaseMethodFactory;
+
+/**
+ * @internal
+ */
+final class Covers extends Attribute
+{
+    /**
+     * Determine if the attribute should be placed above the classe instead of above the method.
+     */
+    public static bool $above = true;
+
+    /**
+     * Adds attributes regarding the "covers" feature.
+     *
+     * @param  array<int, string>  $attributes
+     * @return array<int, string>
+     */
+    public function __invoke(TestCaseMethodFactory $method, array $attributes): array
+    {
+        foreach ($method->covers as $covering) {
+            if ($covering instanceof CoversClass) {
+                // Prepend a backslash for FQN classes
+                if (str_contains($covering->class, '\\')) {
+                    $covering->class = '\\'.$covering->class;
+                }
+
+                $attributes[] = "#[\PHPUnit\Framework\Attributes\CoversClass({$covering->class}::class)]";
+            } elseif ($covering instanceof CoversFunction) {
+                $attributes[] = "#[\PHPUnit\Framework\Attributes\CoversFunction('{$covering->function}')]";
+            }
+        }
+
+        return $attributes;
+    }
+}

src/Factories/Concerns/HigherOrderable.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Factories\Concerns;
+
+use Pest\Support\HigherOrderMessageCollection;
+
+trait HigherOrderable
+{
+    /**
+     * The higher order messages that are chainable.
+     */
+    public HigherOrderMessageCollection $chains;
+
+    /**
+     * The higher order messages that are "factory" proxyable.
+     */
+    public HigherOrderMessageCollection $factoryProxies;
+
+    /**
+     * The higher order messages that are proxyable.
+     */
+    public HigherOrderMessageCollection $proxies;
+
+    /**
+     * Boot the higher order properties.
+     */
+    private function bootHigherOrderable(): void
+    {
+        $this->chains = new HigherOrderMessageCollection();
+        $this->factoryProxies = new HigherOrderMessageCollection();
+        $this->proxies = new HigherOrderMessageCollection();
+    }
+}

src/Factories/Covers/CoversClass.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Factories\Covers;
+
+/**
+ * @internal
+ */
+final class CoversClass
+{
+    public function __construct(public string $class)
+    {
+    }
+}

src/Factories/Covers/CoversFunction.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Factories\Covers;
+
+/**
+ * @internal
+ */
+final class CoversFunction
+{
+    public function __construct(public string $function)
+    {
+    }
+}

src/Factories/Covers/CoversNothing.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Factories\Covers;
+
+/**
+ * @internal
+ */
+final class CoversNothing
+{
+}

src/Factories/TestCaseFactory.php

@@ -4,16 +4,18 @@ declare(strict_types=1);
 
 namespace Pest\Factories;
 
-use Closure;
 use ParseError;
 use Pest\Concerns;
+use Pest\Contracts\AddsAnnotations;
 use Pest\Contracts\HasPrintableTestCaseName;
-use Pest\Datasets;
+use Pest\Exceptions\DatasetMissing;
 use Pest\Exceptions\ShouldNotHappen;
-use Pest\Support\HigherOrderMessageCollection;
+use Pest\Exceptions\TestAlreadyExist;
+use Pest\Exceptions\TestDescriptionMissing;
+use Pest\Factories\Concerns\HigherOrderable;
+use Pest\Support\Reflection;
 use Pest\Support\Str;
 use Pest\TestSuite;
-use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
 use RuntimeException;
 
@@ -22,219 +24,246 @@ use RuntimeException;
  */
 final class TestCaseFactory
 {
-    /**
+    use HigherOrderable;
-     * Holds the test filename.
-     *
-     * @readonly
-     *
-     * @var string
-     */
-    public $filename;
 
     /**
-     * Marks this test case as only.
+     * The list of annotations.
      *
-     * @readonly
+     * @var array<int, class-string<AddsAnnotations>>
-     *
-     * @var bool
      */
-    public $only = false;
+    private const ANNOTATIONS = [
+        Annotations\Depends::class,
+        Annotations\Groups::class,
+        Annotations\CoversNothing::class,
+        Annotations\TestDox::class,
+    ];
 
     /**
-     * Holds the test description.
+     * The list of attributes.
      *
-     * If the description is null, means that it
+     * @var array<int, class-string<\Pest\Factories\Attributes\Attribute>>
-     * will be created with the given assertions.
-     *
-     * @var string|null
      */
-    public $description;
+    private const ATTRIBUTES = [
+        Attributes\Covers::class,
+    ];
 
     /**
-     * Holds the test closure.
+     * The FQN of the Test Case class.
      *
-     * @readonly
+     * @var class-string
-     *
-     * @var Closure
      */
-    public $test;
+    public string $class = TestCase::class;
 
     /**
-     * Holds the dataset, if any.
+     * The list of class methods.
      *
-     * @var array<Closure|iterable<int|string, mixed>|string>
+     * @var array<string, TestCaseMethodFactory>
      */
-    public $datasets = [];
+    public array $methods = [];
 
     /**
-     * The FQN of the test case class.
+     * The list of class traits.
      *
-     * @var string
+     * @var array <int, class-string>
      */
-    public $class = TestCase::class;
+    public array $traits = [
-
-    /**
-     * An array of FQN of the class traits.
-     *
-     * @var array <int, string>
-     */
-    public $traits = [
         Concerns\Testable::class,
         Concerns\Expectable::class,
     ];
 
     /**
-     * Holds the higher order messages
+     * Creates a new Factory instance.
-     *  for the factory that are proxyble.
-     *
-     * @var HigherOrderMessageCollection
      */
-    public $factoryProxies;
+    public function __construct(
-
+        public string $filename
-    /**
+    ) {
-     * Holds the higher order
+        $this->bootHigherOrderable();
-     * messages that are proxyble.
-     *
-     * @var HigherOrderMessageCollection
-     */
-    public $proxies;
-
-    /**
-     * Holds the higher order
-     * messages that are chainable.
-     *
-     * @var HigherOrderMessageCollection
-     */
-    public $chains;
-
-    /**
-     * Creates a new anonymous test case pending object.
-     */
-    public function __construct(string $filename, string $description = null, Closure $closure = null)
-    {
-        $this->filename    = $filename;
-        $this->description = $description;
-        $this->test        = $closure ?? function (): void {
-            if (Assert::getCount() === 0) {
-                self::markTestIncomplete(); // @phpstan-ignore-line
-            }
-        };
-
-        $this->factoryProxies = new HigherOrderMessageCollection();
-        $this->proxies        = new HigherOrderMessageCollection();
-        $this->chains         = new HigherOrderMessageCollection();
     }
 
-    /**
+    public function make(): void
-     * Builds the anonymous test case.
-     *
-     * @return array<int, TestCase>
-     */
-    public function build(TestSuite $testSuite): array
     {
-        if ($this->description === null) {
+        $methods = $this->methods;
-            throw ShouldNotHappen::fromMessage('Description can not be empty.');
+
+        if ($methods !== []) {
+            $this->evaluate($this->filename, $methods);
         }
-
-        $chains      = $this->chains;
-        $proxies     = $this->proxies;
-        $factoryTest = $this->test;
-
-        /**
-         * @return mixed
-         */
-        $test = function () use ($chains, $proxies, $factoryTest) {
-            $proxies->proxy($this);
-            $chains->chain($this);
-
-            /* @phpstan-ignore-next-line */
-            return call_user_func(Closure::bind($factoryTest, $this, get_class($this)), ...func_get_args());
-        };
-
-        $className = $this->makeClassFromFilename($this->filename);
-
-        $createTest = function ($description, $data) use ($className, $test) {
-            $testCase = new $className($test, $description, $data);
-            $this->factoryProxies->proxy($testCase);
-
-            return $testCase;
-        };
-
-        $datasets = Datasets::resolve($this->description, $this->datasets);
-
-        return array_map($createTest, array_keys($datasets), $datasets);
     }
 
     /**
-     * Makes a fully qualified class name from the given filename.
+     * Creates a Test Case class using a runtime evaluate.
+     *
+     * @param  array<string, TestCaseMethodFactory>  $methods
      */
-    public function makeClassFromFilename(string $filename): string
+    public function evaluate(string $filename, array $methods): void
     {
         if ('\\' === DIRECTORY_SEPARATOR) {
             // In case Windows, strtolower drive name, like in UsesCall.
-            $filename = (string) preg_replace_callback('~^(?P<drive>[a-z]+:\\\)~i', function ($match): string {
+            $filename = (string) preg_replace_callback('~^(?P<drive>[a-z]+:\\\)~i', static fn ($match): string => strtolower($match['drive']), $filename);
-                return strtolower($match['drive']);
-            }, $filename);
         }
 
-        $filename     = str_replace('\\\\', '\\', addslashes((string) realpath($filename)));
+        $filename = str_replace('\\\\', '\\', addslashes((string) realpath($filename)));
-        $rootPath     = TestSuite::getInstance()->rootPath;
+        $rootPath = TestSuite::getInstance()->rootPath;
-        $relativePath = str_replace($rootPath . DIRECTORY_SEPARATOR, '', $filename);
+        $relativePath = str_replace($rootPath.DIRECTORY_SEPARATOR, '', $filename);
-        $relativePath = dirname(ucfirst($relativePath)) . DIRECTORY_SEPARATOR . basename($relativePath, '.php');
+
+        $relativePath = ltrim($relativePath, DIRECTORY_SEPARATOR);
+
+        $basename = basename($relativePath, '.php');
+
+        $dotPos = strpos($basename, '.');
+
+        if ($dotPos !== false) {
+            $basename = substr($basename, 0, $dotPos);
+        }
+
+        $relativePath = dirname(ucfirst($relativePath)).DIRECTORY_SEPARATOR.$basename;
+
         $relativePath = str_replace(DIRECTORY_SEPARATOR, '\\', $relativePath);
 
         // Strip out any %-encoded octets.
         $relativePath = (string) preg_replace('|%[a-fA-F0-9][a-fA-F0-9]|', '', $relativePath);
         // Remove escaped quote sequences (maintain namespace)
-        $relativePath = str_replace(array_map(function (string $quote): string {
+        $relativePath = str_replace(array_map(fn (string $quote): string => sprintf('\\%s', $quote), ['\'', '"']), '', $relativePath);
-            return sprintf('\\%s', $quote);
-        }, ['\'', '"']), '', $relativePath);
         // Limit to A-Z, a-z, 0-9, '_', '-'.
         $relativePath = (string) preg_replace('/[^A-Za-z0-9\\\\]/', '', $relativePath);
 
-        $classFQN = 'P\\' . $relativePath;
+        $classFQN = 'P\\'.$relativePath;
+
         if (class_exists($classFQN)) {
-            return $classFQN;
+            return;
         }
 
         $hasPrintableTestCaseClassFQN = sprintf('\%s', HasPrintableTestCaseName::class);
-        $traitsCode                   = sprintf('use %s;', implode(', ', array_map(function ($trait): string {
+        $traitsCode = sprintf('use %s;', implode(', ', array_map(
-            return sprintf('\%s', $trait);
+            static fn ($trait): string => sprintf('\%s', $trait), $this->traits))
-        }, $this->traits)));
+        );
 
-        $partsFQN  = explode('\\', $classFQN);
+        $partsFQN = explode('\\', $classFQN);
         $className = array_pop($partsFQN);
         $namespace = implode('\\', $partsFQN);
         $baseClass = sprintf('\%s', $this->class);
 
         if ('' === trim($className)) {
-            $className = 'InvalidTestName' . Str::random();
+            $className = 'InvalidTestName'.Str::random();
-            $classFQN .= $className;
         }
 
+        $classAvailableAttributes = array_filter(self::ATTRIBUTES, fn (string $attribute): bool => $attribute::$above);
+        $methodAvailableAttributes = array_filter(self::ATTRIBUTES, fn (string $attribute): bool => ! $attribute::$above);
+
+        $classAttributes = [];
+
+        foreach ($classAvailableAttributes as $attribute) {
+            $classAttributes = array_reduce(
+                $methods,
+                fn (array $carry, TestCaseMethodFactory $methodFactory): array => (new $attribute())->__invoke($methodFactory, $carry),
+                $classAttributes
+            );
+        }
+
+        $methodsCode = implode('', array_map(
+            fn (TestCaseMethodFactory $methodFactory): string => $methodFactory->buildForEvaluation(
+                self::ANNOTATIONS,
+                $methodAvailableAttributes
+            ),
+            $methods
+        ));
+
+        $classAttributesCode = implode('', array_map(
+            static fn (string $attribute): string => sprintf("\n%s", $attribute),
+            array_unique($classAttributes),
+        ));
+
         try {
-            eval("
+            $classCode = <<<PHP
-                namespace $namespace;
+            namespace $namespace;
 
-                final class $className extends $baseClass implements $hasPrintableTestCaseClassFQN {
+            use Pest\Repositories\DatasetsRepository as __PestDatasets;
-                    $traitsCode
+            use Pest\TestSuite as __PestTestSuite;
 
-                    private static \$__filename = '$filename';
+            /**
-                }
+             * @testdox $filename
-            ");
+             */
+            $classAttributesCode
+            #[\AllowDynamicProperties]
+            final class $className extends $baseClass implements $hasPrintableTestCaseClassFQN {
+                $traitsCode
+
+                private static \$__filename = '$filename';
+
+                $methodsCode
+            }
+            PHP;
+
+            eval($classCode); // @phpstan-ignore-line
         } catch (ParseError $caught) {
-            throw new RuntimeException(sprintf('Unable to create test case for test file at %s', $filename), 1, $caught);
+            throw new RuntimeException(sprintf(
+                "Unable to create test case for test file at %s. \n %s",
+                $filename,
+                $classCode
+            ), 1, $caught);
         }
-
-        return $classFQN;
     }
 
     /**
-     * Determine if the test case will receive argument input from Pest, or not.
+     * Adds the given Method to the Test Case.
      */
-    public function receivesArguments(): bool
+    public function addMethod(TestCaseMethodFactory $method): void
     {
-        return count($this->datasets) > 0
+        if ($method->description === null) {
-            || $this->factoryProxies->count('addDependencies') > 0;
+            throw new TestDescriptionMissing($method->filename);
+        }
+
+        if (array_key_exists($method->description, $this->methods)) {
+            throw new TestAlreadyExist($method->filename, $method->description);
+        }
+
+        if (! $method->receivesArguments()) {
+            if ($method->closure === null) {
+                throw ShouldNotHappen::fromMessage('The test closure may not be empty.');
+            }
+
+            $arguments = Reflection::getFunctionArguments($method->closure);
+
+            if ($arguments !== []) {
+                throw new DatasetMissing($method->filename, $method->description, $arguments);
+            }
+        }
+
+        $this->methods[$method->description] = $method;
+    }
+
+    /**
+     * Checks if a test case has a method.
+     */
+    public function hasMethod(string $methodName): bool
+    {
+        foreach ($this->methods as $method) {
+            if ($method->description === null) {
+                throw ShouldNotHappen::fromMessage('The test description may not be empty.');
+            }
+
+            if (Str::evaluable($method->description) === $methodName) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Gets a Method by the given name.
+     */
+    public function getMethod(string $methodName): TestCaseMethodFactory
+    {
+        foreach ($this->methods as $method) {
+            if ($method->description === null) {
+                throw ShouldNotHappen::fromMessage('The test description may not be empty.');
+            }
+
+            if (Str::evaluable($method->description) === $methodName) {
+                return $method;
+            }
+        }
+
+        throw ShouldNotHappen::fromMessage(sprintf('Method %s not found.', $methodName));
     }
 }

src/Factories/TestCaseMethodFactory.php

@@ -0,0 +1,186 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Factories;
+
+use Closure;
+use Pest\Contracts\AddsAnnotations;
+use Pest\Exceptions\ShouldNotHappen;
+use Pest\Factories\Concerns\HigherOrderable;
+use Pest\Repositories\DatasetsRepository;
+use Pest\Support\Str;
+use Pest\TestSuite;
+use PHPUnit\Framework\Assert;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @internal
+ */
+final class TestCaseMethodFactory
+{
+    use HigherOrderable;
+
+    /**
+     * Determines if the Test Case Method is a "todo".
+     */
+    public bool $todo = false;
+
+    /**
+     * The Test Case Dataset, if any.
+     *
+     * @var array<Closure|iterable<int|string, mixed>|string>
+     */
+    public array $datasets = [];
+
+    /**
+     * The Test Case depends, if any.
+     *
+     * @var array<int, string>
+     */
+    public array $depends = [];
+
+    /**
+     * The Test Case groups, if any.
+     *
+     * @var array<int, string>
+     */
+    public array $groups = [];
+
+    /**
+     * The covered classes and functions, if any.
+     *
+     * @var array<int, \Pest\Factories\Covers\CoversClass|\Pest\Factories\Covers\CoversFunction|\Pest\Factories\Covers\CoversNothing>
+     */
+    public array $covers = [];
+
+    /**
+     * Creates a new Factory instance.
+     */
+    public function __construct(
+        public string $filename,
+        public ?string $description,
+        public ?Closure $closure,
+    ) {
+        $this->closure ??= function (): void {
+            Assert::getCount() > 0 ?: self::markTestIncomplete(); // @phpstan-ignore-line
+        };
+
+        $this->bootHigherOrderable();
+    }
+
+    /**
+     * Makes the Test Case classes.
+     */
+    public function getClosure(TestCase $concrete): Closure
+    {
+        $concrete::flush(); // @phpstan-ignore-line
+
+        if ($this->description === null) {
+            throw ShouldNotHappen::fromMessage('Description can not be empty.');
+        }
+
+        $closure = $this->closure;
+
+        $testCase = TestSuite::getInstance()->tests->get($this->filename);
+
+        $testCase->factoryProxies->proxy($concrete);
+        $this->factoryProxies->proxy($concrete);
+
+        $method = $this;
+
+        return function () use ($testCase, $method, $closure): mixed { // @phpstan-ignore-line
+        /* @var TestCase $this */
+            $testCase->proxies->proxy($this);
+            $method->proxies->proxy($this);
+
+            $testCase->chains->chain($this);
+            $method->chains->chain($this);
+
+            return \Pest\Support\Closure::bind($closure, $this, self::class)(...func_get_args());
+        };
+    }
+
+    /**
+     * Determine if the test case will receive argument input from Pest, or not.
+     */
+    public function receivesArguments(): bool
+    {
+        return $this->datasets !== [] || $this->depends !== [];
+    }
+
+    /**
+     * Creates a PHPUnit method as a string ready for evaluation.
+     *
+     * @param  array<int, class-string<AddsAnnotations>>  $annotationsToUse
+     * @param  array<int, class-string<\Pest\Factories\Attributes\Attribute>>  $attributesToUse
+     */
+    public function buildForEvaluation(array $annotationsToUse, array $attributesToUse): string
+    {
+        if ($this->description === null) {
+            throw ShouldNotHappen::fromMessage('The test description may not be empty.');
+        }
+
+        $methodName = Str::evaluable($this->description);
+
+        $datasetsCode = '';
+        $annotations = ['@test'];
+        $attributes = [];
+
+        foreach ($annotationsToUse as $annotation) {
+            $annotations = (new $annotation())->__invoke($this, $annotations);
+        }
+
+        foreach ($attributesToUse as $attribute) {
+            $attributes = (new $attribute())->__invoke($this, $attributes);
+        }
+
+        if ($this->datasets !== []) {
+            $dataProviderName = $methodName.'_dataset';
+            $annotations[] = "@dataProvider $dataProviderName";
+            $datasetsCode = $this->buildDatasetForEvaluation($methodName, $dataProviderName);
+        }
+
+        $annotations = implode('', array_map(
+            static fn ($annotation): string => sprintf("\n     * %s", $annotation), $annotations,
+        ));
+
+        $attributes = implode('', array_map(
+            static fn ($attribute): string => sprintf("\n        %s", $attribute), $attributes,
+        ));
+
+        return <<<PHP
+
+                /**$annotations
+                 */
+                $attributes
+                public function $methodName()
+                {
+                    \$test = \Pest\TestSuite::getInstance()->tests->get(self::\$__filename)->getMethod(\$this->name())->getClosure(\$this);
+
+                    return \$this->__runTest(
+                        \$test,
+                        ...func_get_args(),
+                    );
+                }
+                $datasetsCode
+            PHP;
+    }
+
+    /**
+     * Creates a PHPUnit Data Provider as a string ready for evaluation.
+     */
+    private function buildDatasetForEvaluation(string $methodName, string $dataProviderName): string
+    {
+        DatasetsRepository::with($this->filename, $methodName, $this->datasets);
+
+        return <<<EOF
+
+                public static function $dataProviderName()
+                {
+                    return __PestDatasets::get(self::\$__filename, "$methodName");
+                }
+
+        EOF;
+    }
+}

src/Functions.php

@@ -2,35 +2,34 @@
 
 declare(strict_types=1);
 
-use Pest\Datasets;
 use Pest\Expectation;
-use Pest\PendingObjects\AfterEachCall;
+use Pest\PendingCalls\AfterEachCall;
-use Pest\PendingObjects\BeforeEachCall;
+use Pest\PendingCalls\BeforeEachCall;
-use Pest\PendingObjects\TestCall;
+use Pest\PendingCalls\TestCall;
-use Pest\PendingObjects\UsesCall;
+use Pest\PendingCalls\UsesCall;
+use Pest\Repositories\DatasetsRepository;
 use Pest\Support\Backtrace;
-use Pest\Support\Extendable;
+use Pest\Support\DatasetInfo;
 use Pest\Support\HigherOrderTapProxy;
 use Pest\TestSuite;
 use PHPUnit\Framework\TestCase;
 
-/**
+if (! function_exists('expect')) {
- * Creates a new expectation.
+    /**
- *
+     * Creates a new expectation.
- * @param mixed $value the Value
+     *
- *
+     * @template TValue
- * @return Expectation|Extendable
+     *
- */
+     * @param  TValue|null  $value
-function expect($value = null)
+     * @return Expectation<TValue|null>
-{
+     */
-    if (func_num_args() === 0) {
+    function expect(mixed $value = null): Expectation
-        return new Extendable(Expectation::class);
+    {
+        return new Expectation($value);
     }
-
-    return new Expectation($value);
 }
 
-if (!function_exists('beforeAll')) {
+if (! function_exists('beforeAll')) {
     /**
      * Runs the given closure before all tests in the current file.
      */
@@ -40,11 +39,11 @@ if (!function_exists('beforeAll')) {
     }
 }
 
-if (!function_exists('beforeEach')) {
+if (! function_exists('beforeEach')) {
     /**
      * Runs the given closure before each test in the current file.
      *
-     * @return BeforeEachCall|TestCase|mixed
+     * @return HigherOrderTapProxy<TestCall|TestCase>|TestCall|mixed
      */
     function beforeEach(Closure $closure = null): BeforeEachCall
     {
@@ -54,32 +53,36 @@ if (!function_exists('beforeEach')) {
     }
 }
 
-if (!function_exists('dataset')) {
+if (! function_exists('dataset')) {
     /**
      * Registers the given dataset.
      *
-     * @param Closure|iterable<int|string, mixed> $dataset
+     * @param  Closure|iterable<int|string, mixed>  $dataset
      */
-    function dataset(string $name, $dataset): void
+    function dataset(string $name, Closure|iterable $dataset): void
     {
-        Datasets::set($name, $dataset);
+        $scope = DatasetInfo::scope(Backtrace::datasetsFile());
+
+        DatasetsRepository::set($name, $dataset, $scope);
     }
 }
 
-if (!function_exists('uses')) {
+if (! function_exists('uses')) {
     /**
      * The uses function binds the given
      * arguments to test closures.
+     *
+     * @param  class-string  ...$classAndTraits
      */
     function uses(string ...$classAndTraits): UsesCall
     {
         $filename = Backtrace::file();
 
-        return new UsesCall($filename, $classAndTraits);
+        return new UsesCall($filename, array_values($classAndTraits));
     }
 }
 
-if (!function_exists('test')) {
+if (! function_exists('test')) {
     /**
      * Adds the given closure as a test. The first argument
      * is the test description; the second argument is
@@ -87,7 +90,7 @@ if (!function_exists('test')) {
      *
      * @return TestCall|TestCase|mixed
      */
-    function test(string $description = null, Closure $closure = null)
+    function test(string $description = null, Closure $closure = null): HigherOrderTapProxy|TestCall
     {
         if ($description === null && TestSuite::getInstance()->test !== null) {
             return new HigherOrderTapProxy(TestSuite::getInstance()->test);
@@ -99,7 +102,7 @@ if (!function_exists('test')) {
     }
 }
 
-if (!function_exists('it')) {
+if (! function_exists('it')) {
     /**
      * Adds the given closure as a test. The first argument
      * is the test description; the second argument is
@@ -111,15 +114,36 @@ if (!function_exists('it')) {
     {
         $description = sprintf('it %s', $description);
 
-        return test($description, $closure);
+        /** @var TestCall $test */
+        $test = test($description, $closure);
+
+        return $test;
     }
 }
 
-if (!function_exists('afterEach')) {
+if (! function_exists('todo')) {
+    /**
+     * Adds the given todo test. Internally, this test
+     * is marked as incomplete. Yet, Collision, Pest's
+     * printer, will display it as a "todo" test.
+     *
+     * @return TestCall|TestCase|mixed
+     */
+    function todo(string $description): TestCall
+    {
+        $test = test($description);
+
+        assert($test instanceof TestCall);
+
+        return $test->todo();
+    }
+}
+
+if (! function_exists('afterEach')) {
     /**
      * Runs the given closure after each test in the current file.
      *
-     * @return AfterEachCall|TestCase|mixed
+     * @return HigherOrderTapProxy<TestCall|TestCase>|TestCall|mixed
      */
     function afterEach(Closure $closure = null): AfterEachCall
     {
@@ -129,7 +153,7 @@ if (!function_exists('afterEach')) {
     }
 }
 
-if (!function_exists('afterAll')) {
+if (! function_exists('afterAll')) {
     /**
      * Runs the given closure after all tests in the current file.
      */