release: 1.21.3

docs: updates release
chore: cs
2026-03-06 15:57:21 +01:00 · 2022-05-12 20:10:25 +01:00 · 2022-05-12 20:06:47 +01:00 · 2022-05-12 20:03:22 +01:00 · 2022-05-12 20:03:11 +01:00 · 2022-03-16 09:24:51 +00:00
337 changed files with 5633 additions and 11449 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1,18 +1,14 @@
-/docker                  export-ignore
+/art                     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
-/CONTRIBUTING.md         export-ignore
-/docker-compose.yml      export-ignore
-/Makefile                export-ignore
-/rector.php              export-ignore
-/README.md               export-ignore
-/RELEASE.md              export-ignore
-
+CHANGELOG.md             export-ignore
+CONTRIBUTING.md          export-ignore
+README.md                export-ignore
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -1,4 +1,4 @@
 # These are supported funding model platforms

-github: [nunomaduro]
-custom: https://www.paypal.com/paypalme/enunomaduro
+github: [nunomaduro,owenvoke,olivernybroe,octoper,lukeraymonddowning]
+patreon: nunomaduro
--- a/.github/workflows/changelog.yml
+++ b/.github/workflows/changelog.yml
@ -0,0 +1,63 @@
+name: Changelog
+
+on:
+  push:
+    branches: [ 1.x ]
+    paths:
+      - CHANGELOG.md
+      - .github/workflows/changelog.yml
+  pull_request:
+    branches: [ 1.x ]
+    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
--- a/.github/workflows/static.yml
+++ b/.github/workflows/static.yml
@ -1,19 +1,12 @@
 name: Static Analysis

-on:
-  push:
-  pull_request:
-  schedule:
-    - cron: '0 0 * * *'
+on: ['push', 'pull_request']

 jobs:
-  static:
-    name: Static Tests
-
+  cs:
    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        dependency-version: [prefer-lowest, prefer-stable]
+
+    name: Code Style

    steps:
    - name: Checkout
@ -22,18 +15,37 @@ jobs:
    - name: Setup PHP
      uses: shivammathur/setup-php@v2
      with:
-        php-version: 8.1
+        php-version: 8.0
        tools: composer:v2
        coverage: none

    - name: Install Dependencies
-      run: composer update --prefer-stable --no-interaction --no-progress --ansi
+      run: composer update --no-interaction --no-progress

-    - name: Types
-      run: composer test:types
+    - name: Run PHP-CS-Fixer
+      run: vendor/bin/php-cs-fixer fix -v --allow-risky=yes --dry-run

-    - name: Refacto
-      run: composer test:refacto
+  phpstan:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        dependency-version: [prefer-lowest, prefer-stable]

-    - name: Style
-      run: composer test:lint
+    name: PHPStan ${{ matrix.dependency-version }}
+
+    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 --prefer-stable --no-interaction --no-progress
+
+    - name: Run PHPStan
+      run: vendor/bin/phpstan analyse --no-progress
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@ -1,11 +1,6 @@
 name: Tests

-on:
-  push:
-  pull_request:
-  schedule:
-    - cron: '0 0 * * *'
-
+on: ['push', 'pull_request']

 jobs:
  ci:
@ -13,10 +8,16 @@ jobs:
    strategy:
      matrix:
        os: [ubuntu-latest, macos-latest, windows-latest]
-        php: ['8.1', '8.2']
+        php: ['7.3', '7.4', '8.0', '8.1']
        dependency-version: [prefer-lowest, prefer-stable]
+        parallel: ['', '--parallel']
+        exclude:
+          - php: 8.1
+            os: macos-latest
+          - php: 8.1
+            os: windows-latest

-    name: PHP ${{ matrix.php }} - ${{ matrix.os }} - ${{ matrix.dependency-version }}
+    name: PHP ${{ matrix.php }} - ${{ matrix.os }} - ${{ matrix.dependency-version }} - ${{ matrix.parallel }}

    steps:
    - name: Checkout
@ -35,14 +36,10 @@ jobs:
        echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"

    - name: Install PHP dependencies
-      run: composer update --${{ matrix.dependency-version }} --no-interaction --no-progress --ansi
+      run: composer update --${{ matrix.dependency-version }} --no-interaction --no-progress

    - name: Unit Tests
-      run: composer test:unit
-
-    - name: Unit Tests in Parallel
-      run: composer test:parallel
-      if: startsWith(matrix.os, 'windows') != true
+      run: php bin/pest --colors=always --exclude-group=integration ${{ matrix.parallel }}

    - name: Integration Tests
-      run: composer test:integration
+      run: php bin/pest --colors=always --group=integration
--- a/.gitignore
+++ b/.gitignore
@ -1,11 +1,9 @@
 .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
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@ -0,0 +1,30 @@
+<?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);
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,17 +1,354 @@
-# Release Notes for 2.x
+# Changelog
+All notable changes to this project will be documented in this file.

-## Unreleased
+The format is based on [Keep a Changelog](http://keepachangelog.com/)
+and this project adheres to [Semantic Versioning](http://semver.org/).

-## [v2.0.2 (2023-03-20)](https://github.com/pestphp/pest/compare/v2.0.1...v2.0.2)
+## [v1.21.3 (2022-05-12)](https://github.com/pestphp/pest/compare/v1.21.2...v1.21.3)
+### Fixed
+- Debug of high order tests ([c1b32b9](https://github.com/pestphp/pest/commit/c1b32b9ffb5134803c490592454b11b8c05ea27d))
+
+## [v1.21.2 (2022-03-05)](https://github.com/pestphp/pest/compare/v1.21.1...v1.21.2)
+### Fixed
+- `toThrow` expectation when exception does not exist ([#487](https://github.com/pestphp/pest/pull/487))
+
+## [v1.21.1 (2021-11-25)](https://github.com/pestphp/pest/compare/v1.21.0...v1.21.1)
+### Fixed
+- sequence callables causing problems ([#442](https://github.com/pestphp/pest/pull/442))
+
+## [v1.21.0 (2021-11-17)](https://github.com/pestphp/pest/compare/v1.20.0...v1.21.0)
+### Added
+- warn about xdebug modes ([1e011c](https://github.com/pestphp/pest/commit/1e011c7b4074d08f5dabab1f927d45383c85d210))
+
+## [v1.20.0 (2021-09-25)](https://github.com/pestphp/pest/compare/v1.19.0...v1.20.0)
+### Added
+- `throwsIf` test call ([#371](https://github.com/pestphp/pest/pull/371))
+- `--ci` CLI option to ignore development options like `->local()` ([#405](https://github.com/pestphp/pest/pull/405))
+- `when` conditional expectation ([#406](https://github.com/pestphp/pest/pull/406))
+- `unless` conditional expectation ([b43a598](https://github.com/pestphp/pest/commit/b43a59868d5b790a28cbb29c6110c9f068b0b812))
+- `match` conditional expectation ([#407](https://github.com/pestphp/pest/pull/407))

 ### Fixed
- `Pest.php` not being loaded in certain scenarios ([b887116](https://github.com/pestphp/pest/commit/b887116e5ce9a69403ad620cad20f0a029474eb5))
+- `sequence` with more expectations than iterable elements ([#399](https://github.com/pestphp/pest/pull/399))

-## [v2.0.1 (2023-03-20)](https://github.com/pestphp/pest/compare/v2.0.0...v2.0.1)
+## [v1.19.0 (2021-09-20)](https://github.com/pestphp/pest/compare/v1.18.0...v1.19.0)
+### Added
+- PHP 8.1 support ([e6c7d68](https://github.com/pestphp/pest/commit/e6c7d68defaec8efe01e71e15dd8d8c45b0cf60f))
+- `toHaveProperties` expectation ([#391](https://github.com/pestphp/pest/pull/391))
+
+## [v1.18.0 (2021-08-30)](https://github.com/pestphp/pest/compare/v1.17.0...v1.18.0)
+### Added
+- `toHaveLength` expectation ([#386](https://github.com/pestphp/pest/pull/386))
+- `nunomaduro/collision:^6.0` support ([4ae482c](https://github.com/pestphp/pest/commit/4ae482c7073fb77782b8a4b5738ef1fcea0f82ab))
+
+## [v1.17.0 (2021-08-26)](https://github.com/pestphp/pest/compare/v1.16.0...v1.17.0)
+### Added
+- `toThrow` expectation ([#361](https://github.com/pestphp/pest/pull/361))
+
+## [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))
+
+## [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
- Wrong `version` configuration key on `composer.json` ([8f91f40](https://github.com/pestphp/pest/commit/8f91f40e8ea8b35e04b7989bed6a8f9439e2a2d6))
+- `skip` with false condition marking test as skipped ([22b822c](https://github.com/pestphp/pest/commit/22b822ce87a3d19d84960fa5c93eb286820b525d))

-## [v2.0.0 (2023-03-20)](https://github.com/pestphp/pest/compare/v1.22.6...v2.0.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))
+- Support for PHPUnit `^9.3.7` ([ca9d783](https://github.com/pestphp/pest/commit/ca9d783cf942a2caabc85ff7a728c7f28350c67a))

-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.
+### Fixed
+- `beforeAll` and `afterAll` behind called multiple times per test ([#357](https://github.com/pestphp/pest/pull/357))
+
+## [v1.11.0 (2021-07-21)](https://github.com/pestphp/pest/compare/v1.10.0...v1.11.0)
+### 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))
+
+## [v1.10.0 (2021-07-12)](https://github.com/pestphp/pest/compare/v1.9.1...v1.10.0)
+### 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))
+
+## [v1.2.1 (2021-05-14)](https://github.com/pestphp/pest/compare/v1.2.0...v1.2.1)
+### 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)
+### 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
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -54,22 +54,3 @@ 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.
--- a/14
+++ b/14
@ -1,14 +0,0 @@
-# Well documented Makefiles
-DEFAULT_GOAL := help
-help:
-	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z0-9_-]+:.*?##/ { printf "  \033[36m%-40s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
-
-build: ## Build all docker images. Specify the command e.g. via make build ARGS="--build-arg PHP=8.2"
-	docker compose build $(ARGS)
-
-##@ [Application]
-install: ## Install the composer dependencies
-	docker compose run --rm composer install
-
-test: ## Run the tests
-	docker compose run --rm composer test
--- a/README.md
+++ b/README.md
@ -1,7 +1,7 @@
 <p align="center">
-    <img src="https://raw.githubusercontent.com/pestphp/art/master/v2/banner.png" width="600" alt="PEST">
+    <img src="https://raw.githubusercontent.com/pestphp/art/master/readme.png" width="600" alt="PEST">
    <p align="center">
-        <a href="https://github.com/pestphp/pest/actions"><img alt="GitHub Workflow Status (master)" src="https://img.shields.io/github/actions/workflow/status/pestphp/pest/tests.yml?branch=2.x&label=Tests%202.x"></a>
+        <a href="https://github.com/pestphp/pest/actions"><img alt="GitHub Workflow Status (master)" src="https://img.shields.io/github/workflow/status/pestphp/pest/Tests/master"></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,32 +9,28 @@
 </p>

 ------
-**Pest** is an elegant PHP testing Framework with a focus on simplicity, meticulously designed to bring back the joy of testing in PHP.
+**Pest** is an elegant PHP Testing Framework with a focus on simplicity. It was carefully crafted to bring the joy of testing to PHP.

- Explore our docs at **[pestphp.com »](https://pestphp.com)**
- Follow us on Twitter at **[@pestphp »](https://twitter.com/pestphp)**
- Join us at **[discord.gg/kaHY6p54JH »](https://discord.gg/kaHY6p54JH)** or **[t.me/+kYH5G4d5MV83ODk0 »](https://t.me/+kYH5G4d5MV83ODk0)**
+- Explore the docs: **[pestphp.com »](https://pestphp.com)**
+- Follow us on Twitter: **[@pestphp »](https://twitter.com/pestphp)**
+- Join us on the Discord Server: **[discord.gg/bMAJv82 »](https://discord.gg/bMAJv82)**

-## Sponsors
+## Pest Sponsors

-We cannot thank our sponsors enough for their incredible support in funding Pest's development. Their contributions have been instrumental in making Pest the best it can be. For those who are interested in becoming a sponsor, please visit Nuno Maduro's Sponsor page at **[github.com/sponsors/nunomaduro](https://github.com/sponsors/nunomaduro)**.
+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).

 ### 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)
+- [Auth0](https://auth0.com)
 - [Codecourse](https://codecourse.com/)
- [Laracasts](https://laracasts.com/)
- [Localazy](https://localazy.com)
- [Hyvor](https://hyvor.com/)
 - [Fathom Analytics](https://usefathom.com/)
 - [Meema](https://meema.io)
- [Zapiet](https://www.zapiet.com)
+- [Scout APM](https://scoutapm.com)

 Pest is an open-sourced software licensed under the **[MIT license](https://opensource.org/licenses/MIT)**.
--- a/RELEASE.md
+++ b/RELEASE.md
@ -2,10 +2,8 @@

 When releasing a new version of Pest there are some checks and updates that need to be done:

-> **For Pest v1 you should use the `1.x` branch instead.**
-
- 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
+- Clear your local repository with: `git add . && git reset --hard && git checkout 1.x` 
+- On the GitHub repository, check the contents of [github.com/pestphp/pest/compare/{latest_version}...1.x](https://github.com/pestphp/pest/compare/{latest_version}...1.x) 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"`
--- a/bin/pest
+++ b/bin/pest
@ -1,60 +1,21 @@
 #!/usr/bin/env php
 <?php declare(strict_types=1);

-use Pest\Kernel;
-use Pest\Panic;
-use Pest\TestCaseFilters\GitDirtyTestCaseFilter;
-use Pest\TestCaseMethodFilters\TodoTestCaseFilter;
+use NunoMaduro\Collision\Provider;
+use Pest\Actions\ValidatesEnvironment;
+use Pest\Support\Container;
 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;
@ -64,36 +25,39 @@ use Symfony\Component\Console\Output\ConsoleOutput;
        $autoloadPath = $localPath;
    }

+    (new Provider())->register();
+
    // Get $rootPath based on $autoloadPath
    $rootPath = dirname($autoloadPath, 2);
-    $input = new ArgvInput();
+    $argv = new ArgvInput();

-    $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';
+    $testSuite = TestSuite::getInstance($rootPath, $argv->getParameterOption('--test-directory', 'tests'));

+    $isDecorated = $argv->getParameterOption('--colors', 'always') !== 'never';
    $output = new ConsoleOutput(ConsoleOutput::VERBOSITY_NORMAL, $isDecorated);

-    try {
-        $kernel = Kernel::boot($testSuite, $input, $output);
+    $container = Container::getInstance();
+    $container->add(TestSuite::class, $testSuite);
+    $container->add(OutputInterface::class, $output);

-        $result = $kernel->handle($args);
+    ValidatesEnvironment::in($testSuite);

-        $kernel->shutdown();
-    } catch (Throwable|Error $e) {
-        Panic::with($e);
+    $args = $_SERVER['argv'];
+
+    // Let's remove any arguments that PHPUnit does not understand
+    if ($argv->hasParameterOption('--test-directory')) {
+        foreach ($args as $key => $value) {
+            if (strpos($value, '--test-directory') !== false) {
+                unset($args[$key]);
+            }
+        }
    }

-    exit($result);
+    if (($runInParallel = $argv->hasParameterOption(['--parallel', '-p'])) && !class_exists(\Pest\Parallel\Command::class)) {
+        $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));
 })();
--- a/bin/worker.php
+++ b/bin/worker.php
@ -1,100 +0,0 @@
-<?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);
-    }
-})();
--- a/composer.json
+++ b/composer.json
@ -17,17 +17,10 @@
        }
    ],
    "require": {
-        "php": "^8.1.0",
-        "brianium/paratest": "^7.1.2",
-        "nunomaduro/collision": "^7.2.0",
-        "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"
+        "php": "^7.3 || ^8.0",
+        "nunomaduro/collision": "^5.10.0|^6.0",
+        "pestphp/pest-plugin": "^1.0.0",
+        "phpunit/phpunit": "^9.5.5"
    },
    "autoload": {
        "psr-4": {
@ -40,7 +33,6 @@
    },
    "autoload-dev": {
        "psr-4": {
-            "Tests\\Fixtures\\Covers\\": "tests/Fixtures/Covers",
            "Tests\\": "tests/PHPUnit/"
        },
        "files": [
@ -48,10 +40,14 @@
        ]
    },
    "require-dev": {
-        "pestphp/pest-dev-tools": "^2.5.0",
-        "symfony/process": "^6.2.7"
+        "illuminate/console": "^8.47.0",
+        "illuminate/support": "^8.47.0",
+        "laravel/dusk": "^6.15.0",
+        "pestphp/pest-dev-tools": "dev-master",
+        "pestphp/pest-plugin-parallel": "^1.0"
    },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
+    "prefer-stable": true,
    "config": {
        "sort-packages": true,
        "preferred-install": "dist",
@ -63,18 +59,14 @@
        "bin/pest"
    ],
    "scripts": {
-        "refacto": "rector",
-        "lint": "pint",
-        "test:refacto": "rector --dry-run",
-        "test:lint": "pint --test",
-        "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 -v",
+        "lint": "php-cs-fixer fix -v",
+        "test:lint": "php-cs-fixer fix -v --dry-run",
+        "test:types": "phpstan analyse --ansi --memory-limit=-1",
+        "test:unit": "php bin/pest --colors=always --exclude-group=integration",
+        "test:parallel": "php bin/pest -p --colors=always --exclude-group=integration",
+        "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",
@ -83,21 +75,20 @@
        ]
    },
    "extra": {
+        "branch-alias": {
+            "dev-1.x": "1.x-dev"
+        },
        "pest": {
            "plugins": [
-                "Pest\\Plugins\\Bail",
-                "Pest\\Plugins\\Cache",
                "Pest\\Plugins\\Coverage",
                "Pest\\Plugins\\Init",
-                "Pest\\Plugins\\Environment",
-                "Pest\\Plugins\\Help",
-                "Pest\\Plugins\\Memory",
-                "Pest\\Plugins\\Printer",
-                "Pest\\Plugins\\ProcessIsolation",
-                "Pest\\Plugins\\Profile",
-                "Pest\\Plugins\\Retry",
                "Pest\\Plugins\\Version",
-                "Pest\\Plugins\\Parallel"
+                "Pest\\Plugins\\Environment"
+            ]
+        },
+        "laravel": {
+            "providers": [
+                "Pest\\Laravel\\PestServiceProvider"
            ]
        }
    }
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,14 +0,0 @@
-version: "3.8"
-
-services:
-  php:
-    build:
-      context: ./docker
-    volumes:
-      - .:/var/www/html
-  composer:
-    build:
-      context: ./docker
-    volumes:
-      - .:/var/www/html
-    entrypoint: ["composer"]
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@ -1,23 +0,0 @@
-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"]
--- a/overrides/Runner/Filter/NameFilterIterator.php
+++ b/overrides/Runner/Filter/NameFilterIterator.php
@ -1,171 +0,0 @@
-<?php
-
-/*
- * BSD 3-Clause License
- *
- * Copyright (c) 2001-2023, Sebastian Bergmann
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-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];
-    }
-}
--- a/overrides/Runner/ResultCache/DefaultResultCache.php
+++ b/overrides/Runner/ResultCache/DefaultResultCache.php
@ -1,195 +0,0 @@
-<?php
-
-/*
- * BSD 3-Clause License
- *
- * Copyright (c) 2001-2023, Sebastian Bergmann
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-declare(strict_types=1);
-
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace PHPUnit\Runner\ResultCache;
-
-use 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();
-    }
-}
--- a/overrides/Runner/TestSuiteLoader.php
+++ b/overrides/Runner/TestSuiteLoader.php
@ -1,204 +0,0 @@
-<?php
-
-/*
- * BSD 3-Clause License
- *
- * Copyright (c) 2001-2023, Sebastian Bergmann
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-declare(strict_types=1);
-
-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);
-    }
-}
--- a/overrides/TextUI/Command/WarmCodeCoverageCacheCommand.php
+++ b/overrides/TextUI/Command/WarmCodeCoverageCacheCommand.php
@ -1,104 +0,0 @@
-<?php
-
-/*
- * BSD 3-Clause License
- *
- * Copyright (c) 2001-2023, Sebastian Bergmann
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-declare(strict_types=1);
-
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace PHPUnit\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();
-    }
-}
--- a/overrides/TextUI/Output/Default/ProgressPrinter/TestSkippedSubscriber.php
+++ b/overrides/TextUI/Output/Default/ProgressPrinter/TestSkippedSubscriber.php
@ -1,80 +0,0 @@
-<?php
-
-/*
- * BSD 3-Clause License
- *
- * Copyright (c) 2001-2023, Sebastian Bergmann
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-declare(strict_types=1);
-
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace PHPUnit\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');
-    }
-}
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@ -0,0 +1,287 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Cannot access an offset on mixed\\.$#"
+			count: 1
+			path: src/Actions/AddsDefaults.php
+
+		-
+			message: "#^Parameter \\#1 \\$out of class Pest\\\\Logging\\\\JUnit constructor expects string, mixed given\\.$#"
+			count: 1
+			path: src/Actions/AddsDefaults.php
+
+		-
+			message: "#^Parameter \\#2 \\$verbose of class NunoMaduro\\\\Collision\\\\Adapters\\\\Phpunit\\\\Printer constructor expects bool, mixed given\\.$#"
+			count: 1
+			path: src/Actions/AddsDefaults.php
+
+		-
+			message: "#^Parameter \\#2 \\$verbose of class Pest\\\\Logging\\\\TeamCity constructor expects bool, mixed given\\.$#"
+			count: 1
+			path: src/Actions/AddsDefaults.php
+
+		-
+			message: "#^Parameter \\#3 \\$colors of class NunoMaduro\\\\Collision\\\\Adapters\\\\Phpunit\\\\Printer constructor expects string, mixed given\\.$#"
+			count: 1
+			path: src/Actions/AddsDefaults.php
+
+		-
+			message: "#^Parameter \\#3 \\$colors of class Pest\\\\Logging\\\\TeamCity constructor expects string, mixed given\\.$#"
+			count: 1
+			path: src/Actions/AddsDefaults.php
+
+		-
+			message: "#^Parameter \\#1 \\$filename of function file_exists expects string, mixed given\\.$#"
+			count: 1
+			path: src/Actions/ValidatesConfiguration.php
+
+		-
+			message: "#^Parameter \\#1 \\$filename of method PHPUnit\\\\TextUI\\\\XmlConfiguration\\\\Loader\\:\\:load\\(\\) expects string, mixed given\\.$#"
+			count: 1
+			path: src/Actions/ValidatesConfiguration.php
+
+		-
+			message: "#^Parameter \\#1 \\$loader of class PHPUnit\\\\TextUI\\\\TestRunner constructor expects PHPUnit\\\\Runner\\\\TestSuiteLoader\\|null, mixed given\\.$#"
+			count: 1
+			path: src/Console/Command.php
+
+		-
+			message: "#^Parameter \\#1 \\$testSuite of static method Pest\\\\Actions\\\\AddsTests\\:\\:to\\(\\) expects iterable\\<PHPUnit\\\\Framework\\\\TestCase\\>&PHPUnit\\\\Framework\\\\TestSuite, mixed given\\.$#"
+			count: 1
+			path: src/Console/Command.php
+
+		-
+			message: "#^Parameter \\#2 \\$suffixes of method SebastianBergmann\\\\FileIterator\\\\Facade\\:\\:getFilesAsArray\\(\\) expects array\\|string, mixed given\\.$#"
+			count: 1
+			path: src/Console/Command.php
+
+		-
+			message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
+			count: 1
+			path: src/Datasets.php
+
+		-
+			message: "#^Method Pest\\\\Datasets\\:\\:getDataSetsCombinations\\(\\) has parameter \\$combinations with no value type specified in iterable type array\\.$#"
+			count: 1
+			path: src/Datasets.php
+
+		-
+			message: "#^Method Pest\\\\Datasets\\:\\:getDataSetsCombinations\\(\\) return type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: src/Datasets.php
+
+		-
+			message: "#^Method Pest\\\\Datasets\\:\\:processDatasets\\(\\) return type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: src/Datasets.php
+
+		-
+			message: "#^Parameter \\#1 \\$key of static method Pest\\\\Datasets\\:\\:getDataSetDescription\\(\\) expects int\\|string, mixed given\\.$#"
+			count: 1
+			path: src/Datasets.php
+
+		-
+			message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
+			count: 1
+			path: src/Each.php
+
+		-
+			message: "#^Parameter \\#1 \\$ of callable callable\\(Pest\\\\Expectation\\<TValue\\>\\)\\: mixed expects Pest\\\\Expectation\\<TValue\\>, Pest\\\\Expectation\\<mixed\\> given\\.$#"
+			count: 1
+			path: src/Expectation.php
+
+		-
+			message: "#^Parameter \\#1 \\$actualJson of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertJson\\(\\) expects string, mixed given\\.$#"
+			count: 1
+			path: src/Expectation.php
+
+		-
+			message: "#^Parameter \\#1 \\$directory of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertDirectoryExists\\(\\) expects string, mixed given\\.$#"
+			count: 1
+			path: src/Expectation.php
+
+		-
+			message: "#^Parameter \\#1 \\$directory of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertDirectoryIsReadable\\(\\) expects string, mixed given\\.$#"
+			count: 1
+			path: src/Expectation.php
+
+		-
+			message: "#^Parameter \\#1 \\$directory of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertDirectoryIsWritable\\(\\) expects string, mixed given\\.$#"
+			count: 1
+			path: src/Expectation.php
+
+		-
+			message: "#^Parameter \\#1 \\$file of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertFileIsReadable\\(\\) expects string, mixed given\\.$#"
+			count: 1
+			path: src/Expectation.php
+
+		-
+			message: "#^Parameter \\#1 \\$file of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertFileIsWritable\\(\\) expects string, mixed given\\.$#"
+			count: 1
+			path: src/Expectation.php
+
+		-
+			message: "#^Parameter \\#1 \\$filename of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertFileExists\\(\\) expects string, mixed given\\.$#"
+			count: 1
+			path: src/Expectation.php
+
+		-
+			message: "#^Parameter \\#1 \\$json of function json_decode expects string, mixed given\\.$#"
+			count: 1
+			path: src/Expectation.php
+
+		-
+			message: "#^Parameter \\#1 \\$needle of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, mixed given\\.$#"
+			count: 1
+			path: src/Expectation.php
+
+		-
+			message: "#^Parameter \\#1 \\$object_or_class of function property_exists expects object\\|string, mixed given\\.$#"
+			count: 2
+			path: src/Expectation.php
+
+		-
+			message: "#^Parameter \\#2 \\$haystack of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertContains\\(\\) expects iterable, mixed given\\.$#"
+			count: 1
+			path: src/Expectation.php
+
+		-
+			message: "#^Parameter \\#2 \\$haystack of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertCount\\(\\) expects Countable\\|iterable, mixed given\\.$#"
+			count: 1
+			path: src/Expectation.php
+
+		-
+			message: "#^Parameter \\#2 \\$string of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertMatchesRegularExpression\\(\\) expects string, mixed given\\.$#"
+			count: 1
+			path: src/Expectation.php
+
+		-
+			message: "#^Parameter \\#2 \\$string of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringEndsWith\\(\\) expects string, mixed given\\.$#"
+			count: 1
+			path: src/Expectation.php
+
+		-
+			message: "#^Parameter \\#2 \\$string of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringStartsWith\\(\\) expects string, mixed given\\.$#"
+			count: 1
+			path: src/Expectation.php
+
+		-
+			message: "#^Parameter \\#2 \\$value of method Pest\\\\Expectation\\<TValue\\>\\:\\:retrieve\\(\\) expects array\\<string, null\\>\\|object, mixed given\\.$#"
+			count: 1
+			path: src/Expectation.php
+
+		-
+			message: "#^Trying to invoke mixed but it's not a callable\\.$#"
+			count: 1
+			path: src/Expectation.php
+
+		-
+			message: "#^Method Pest\\\\Factories\\\\TestCaseFactory\\:\\:build\\(\\) should return array\\<int, PHPUnit\\\\Framework\\\\TestCase\\> but returns array\\<int, object\\>\\.$#"
+			count: 1
+			path: src/Factories/TestCaseFactory.php
+
+		-
+			message: "#^Function it\\(\\) should return Pest\\\\PendingObjects\\\\TestCall but returns mixed\\.$#"
+			count: 1
+			path: src/Functions.php
+
+		-
+			message: "#^Parameter \\#2 \\$classAndTraits of class Pest\\\\PendingObjects\\\\UsesCall constructor expects array\\<int, string\\>, array\\<int\\|string, string\\> given\\.$#"
+			count: 1
+			path: src/Functions.php
+
+		-
+			message: "#^Parameter \\#2 \\$value of method Pest\\\\HigherOrderExpectation\\:\\:retrieve\\(\\) expects array\\<string, null\\>\\|object, mixed given\\.$#"
+			count: 1
+			path: src/HigherOrderExpectation.php
+
+		-
+			message: "#^Dead catch \\- ReflectionException is never thrown in the try block\\.$#"
+			count: 1
+			path: src/Logging/JUnit.php
+
+		-
+			message: "#^Parameter \\#2 \\$value of method DOMElement\\:\\:setAttribute\\(\\) expects string, mixed given\\.$#"
+			count: 1
+			path: src/Logging/JUnit.php
+
+		-
+			message: "#^Parameter \\$test of method Pest\\\\Logging\\\\JUnit\\:\\:startTest\\(\\) has invalid type Pest\\\\Concerns\\\\Testable\\.$#"
+			count: 1
+			path: src/Logging/JUnit.php
+
+		-
+			message: "#^Parameter \\$test of method Pest\\\\Logging\\\\TeamCity\\:\\:endTest\\(\\) has invalid type Pest\\\\Concerns\\\\Testable\\.$#"
+			count: 1
+			path: src/Logging/TeamCity.php
+
+		-
+			message: "#^Parameter \\$test of method Pest\\\\Logging\\\\TeamCity\\:\\:startTest\\(\\) has invalid type Pest\\\\Concerns\\\\Testable\\.$#"
+			count: 1
+			path: src/Logging/TeamCity.php
+
+		-
+			message: "#^Dead catch \\- PHPUnit\\\\Framework\\\\ExpectationFailedException is never thrown in the try block\\.$#"
+			count: 1
+			path: src/OppositeExpectation.php
+
+		-
+			message: "#^Property Pest\\\\PendingObjects\\\\UsesCall\\:\\:\\$groups \\(array\\<int, string\\>\\) does not accept array\\<int\\|string, string\\>\\.$#"
+			count: 1
+			path: src/PendingObjects/UsesCall.php
+
+		-
+			message: "#^Cannot cast mixed to float\\.$#"
+			count: 1
+			path: src/Plugins/Coverage.php
+
+		-
+			message: "#^Static property Pest\\\\Plugins\\\\Environment\\:\\:\\$instance is unused\\.$#"
+			count: 1
+			path: src/Plugins/Environment.php
+
+		-
+			message: "#^Method Pest\\\\Support\\\\Container\\:\\:get\\(\\) should return object but returns mixed\\.$#"
+			count: 1
+			path: src/Support/Container.php
+
+		-
+			message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
+			count: 1
+			path: src/Support/ExceptionTrace.php
+
+		-
+			message: "#^Cannot access offset 'file' on mixed\\.$#"
+			count: 1
+			path: src/Support/ExceptionTrace.php
+
+		-
+			message: "#^Parameter \\#1 \\$haystack of function mb_strpos expects string, mixed given\\.$#"
+			count: 1
+			path: src/Support/ExceptionTrace.php
+
+		-
+			message: "#^Parameter \\#2 \\$array of function key_exists expects array, mixed given\\.$#"
+			count: 1
+			path: src/Support/ExceptionTrace.php
+
+		-
+			message: "#^Method Pest\\\\Support\\\\HigherOrderCallables\\:\\:expect\\(\\) should return Pest\\\\Expectation\\<TValue\\> but returns Pest\\\\Expectation\\<mixed\\>\\.$#"
+			count: 1
+			path: src/Support/HigherOrderCallables.php
+
+		-
+			message: "#^Parameter \\#1 \\$target of method Pest\\\\Support\\\\HigherOrderMessage\\:\\:call\\(\\) expects object, mixed given\\.$#"
+			count: 1
+			path: src/Support/HigherOrderMessageCollection.php
+
+		-
+			message: "#^Constant Pest\\\\Support\\\\HigherOrderTapProxy\\:\\:UNDEFINED_PROPERTY is unused\\.$#"
+			count: 1
+			path: src/Support/HigherOrderTapProxy.php
+
+		-
+			message: "#^Dead catch \\- Throwable is never thrown in the try block\\.$#"
+			count: 1
+			path: src/Support/HigherOrderTapProxy.php
+
--- a/phpstan.neon
+++ b/phpstan.neon
@ -2,6 +2,7 @@ includes:
    - vendor/phpstan/phpstan-strict-rules/rules.neon
    - vendor/ergebnis/phpstan-rules/rules.neon
    - vendor/thecodingmachine/phpstan-strict-rules/phpstan-strict-rules.neon
+    - phpstan-baseline.neon

 parameters:
    level: max
@ -9,15 +10,23 @@ parameters:
        - src

    checkMissingIterableValueType: true
+    checkGenericClassInNonGenericObjectType: false
    reportUnmatchedIgnoredErrors: true

    ignoreErrors:
-        - "#Language construct isset\\(\\) should not be used.#"
-        - "#is not allowed to extend#"
-        - "#is concrete, but does not have a Test suffix#"
-        - "#with a nullable type declaration#"
        - "#type mixed is not subtype of native#"
+        - "#is not allowed to extend#"
+        - "#Language construct eval#"
        - "# 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: '#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
--- a/phpunit.xml
+++ b/phpunit.xml
@ -1,28 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
-         backupGlobals="false"
-         beStrictAboutTestsThatDoNotTestAnything="true"
-         beStrictAboutOutputDuringTests="true"
-         bootstrap="vendor/autoload.php"
+         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
         colors="true"
-         failOnRisky="true"
-         failOnWarning="false"
-         processIsolation="false"
-         stopOnError="false"
-         stopOnFailure="false"
-         backupStaticProperties="false"
 >
-  <testsuites>
-    <testsuite name="default">
-      <directory suffix=".php">./tests</directory>
-      <exclude>./tests/.snapshots</exclude>
-      <exclude>./tests/.tests</exclude>
-    </testsuite>
-  </testsuites>
-  <coverage>
-    <include>
-      <directory suffix=".php">./src</directory>
-    </include>
-  </coverage>
+    <testsuites>
+        <testsuite name="default">
+            <directory suffix=".php">./tests</directory>
+        </testsuite>
+    </testsuites>
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+    </coverage>
 </phpunit>
--- a/rector.php
+++ b/rector.php
@ -1,31 +0,0 @@
-<?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,
-    ]);
-};
--- a/resources/views/components/badge.php
+++ b/resources/views/components/badge.php
@ -1,17 +0,0 @@
-<?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>
--- a/resources/views/components/new-line.php
+++ b/resources/views/components/new-line.php
@ -1 +0,0 @@
-<div></div>
--- a/resources/views/components/two-column-detail.php
+++ b/resources/views/components/two-column-detail.php
@ -1,12 +0,0 @@
-<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>
-
--- a/resources/views/usage.php
+++ b/resources/views/usage.php
@ -1,4 +0,0 @@
-<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>
-
--- a/resources/views/version.php
+++ b/resources/views/version.php
@ -1,3 +0,0 @@
-<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>
--- a/src/Actions/AddsDefaults.php
+++ b/src/Actions/AddsDefaults.php
@ -0,0 +1,46 @@
+<?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;
+    }
+}
--- a/src/Actions/AddsTests.php
+++ b/src/Actions/AddsTests.php
@ -0,0 +1,64 @@
+<?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);
+    }
+}
--- a/src/Actions/InteractsWithPlugins.php
+++ b/src/Actions/InteractsWithPlugins.php
@ -0,0 +1,50 @@
+<?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;
+    }
+}
--- a/src/Actions/LoadStructure.php
+++ b/src/Actions/LoadStructure.php
@ -0,0 +1,64 @@
+<?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) {
+                    /* @phpstan-ignore-next-line */
+                    $filename = $file->__toString();
+                    if (Str::endsWith($filename, '.php') && file_exists($filename)) {
+                        require_once $filename;
+                    }
+                }
+            } else {
+                $load($filename);
+            }
+        }
+    }
+}
--- a/src/Actions/ValidatesConfiguration.php
+++ b/src/Actions/ValidatesConfiguration.php
@ -0,0 +1,38 @@
+<?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');
+        }
+    }
+}
--- a/src/Actions/ValidatesEnvironment.php
+++ b/src/Actions/ValidatesEnvironment.php
@ -0,0 +1,41 @@
+<?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);
+            }
+        }
+    }
+}
--- a/src/Bootstrappers/BootFiles.php
+++ b/src/Bootstrappers/BootFiles.php
@ -1,88 +0,0 @@
-<?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);
-            }
-        }
-    }
-}
--- a/src/Bootstrappers/BootKernelDump.php
+++ b/src/Bootstrappers/BootKernelDump.php
@ -1,37 +0,0 @@
-<?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();
-    }
-}
--- a/src/Bootstrappers/BootOverrides.php
+++ b/src/Bootstrappers/BootOverrides.php
@ -1,43 +0,0 @@
-<?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',
-    ];
-
-    /**
-     * 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;
-        }
-    }
-}
--- a/src/Bootstrappers/BootSubscribers.php
+++ b/src/Bootstrappers/BootSubscribers.php
@ -1,51 +0,0 @@
-<?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);
-        }
-    }
-}
--- a/src/Bootstrappers/BootView.php
+++ b/src/Bootstrappers/BootView.php
@ -1,32 +0,0 @@
-<?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);
-    }
-}
--- a/src/Concerns/Expectable.php
+++ b/src/Concerns/Expectable.php
@ -14,12 +14,13 @@ trait Expectable
    /**
     * @template TValue
     *
-     * Creates a new Expectation.
+     * Creates a new expectation.
+     *
+     * @param TValue $value
     *
-     * @param  TValue  $value
     * @return Expectation<TValue>
     */
-    public function expect(mixed $value): Expectation
+    public function expect($value): Expectation
    {
        return new Expectation($value);
    }
--- a/src/Concerns/Extendable.php
+++ b/src/Concerns/Extendable.php
@ -4,6 +4,7 @@ declare(strict_types=1);

 namespace Pest\Concerns;

+use BadMethodCallException;
 use Closure;

 /**
@ -12,25 +13,42 @@ use Closure;
 trait Extendable
 {
    /**
-     * The list of extends.
-     *
     * @var array<string, Closure>
     */
-    private static array $extends = [];
+    private static $extends = [];

    /**
-     * Register a new extend.
+     * Register a custom extend.
     */
-    public function extend(string $name, Closure $extend): void
+    public static function extend(string $name, Closure $extend): void
    {
        static::$extends[$name] = $extend;
    }

    /**
-     * Checks if given extend name is registered.
+     * Checks if extend 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);
+    }
 }
--- a/src/Concerns/Logging/WritesToConsole.php
+++ b/src/Concerns/Logging/WritesToConsole.php
@ -9,33 +9,21 @@ namespace Pest\Concerns\Logging;
 */
 trait WritesToConsole
 {
-    /**
-     * Writes the given success message to the console.
-     */
    private function writeSuccess(string $message): void
    {
        $this->writePestTestOutput($message, 'fg-green, bold', '✓');
    }

-    /**
-     * Writes the given error message to the console.
-     */
    private function writeError(string $message): void
    {
        $this->writePestTestOutput($message, 'fg-red, bold', '⨯');
    }

-    /**
-     * Writes the given warning message to the console.
-     */
    private function writeWarning(string $message): void
    {
        $this->writePestTestOutput($message, 'fg-yellow, bold', '-');
    }

-    /**
-     * Writes the give message to the console.
-     */
    private function writePestTestOutput(string $message, string $color, string $symbol): void
    {
        $this->writeWithColor($color, "$symbol ", false);
--- a/src/Concerns/Pipeable.php
+++ b/src/Concerns/Pipeable.php
@ -1,72 +0,0 @@
-<?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] ?? []);
-    }
-}
--- a/src/Concerns/RetrievesValues.php
+++ b/src/Concerns/RetrievesValues.php
@ -7,19 +7,19 @@ namespace Pest\Concerns;
 /**
 * @internal
 */
-trait Retrievable
+trait RetrievesValues
 {
    /**
     * @template TRetrievableValue
     *
     * Safely retrieve the value at the given key from an object or array.
-     * @template TRetrievableValue
     *
-     * @param  array<string, TRetrievableValue>|object  $value
-     * @param  TRetrievableValue|null  $default
+     * @param array<string, TRetrievableValue>|object $value
+     * @param TRetrievableValue|null                  $default
+     *
     * @return TRetrievableValue|null
     */
-    private function retrieve(string $key, mixed $value, mixed $default = null): mixed
+    private function retrieve(string $key, $value, $default = null)
    {
        if (is_array($value)) {
            return $value[$key] ?? $default;
--- a/src/Concerns/Testable.php
+++ b/src/Concerns/Testable.php
@ -7,128 +7,160 @@ namespace Pest\Concerns;
 use Closure;
 use Pest\Support\ChainableClosure;
 use Pest\Support\ExceptionTrace;
-use Pest\Support\Reflection;
 use Pest\TestSuite;
-use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\ExecutionOrderDependency;
 use Throwable;

 /**
- * @internal
+ * To avoid inheritance conflicts, all the fields related
+ * to Pest only will be prefixed by double underscore.
 *
- * @mixin TestCase
+ * @internal
 */
 trait Testable
 {
    /**
-     * Test method description.
+     * The test case description. Contains the first
+     * argument of global functions like `it` and `test`.
+     *
+     * @var string
     */
-    private string $__description;
+    private $__description;

    /**
-     * Test "latest" method description.
+     * Holds the test closure function.
+     *
+     * @var Closure
     */
-    private static string $__latestDescription;
+    private $__test;

    /**
-     * The Test Case "test" closure.
+     * Holds a global/shared beforeEach ("set up") closure if one has been
+     * defined.
+     *
+     * @var Closure|null
     */
-    private Closure $__test;
+    private $beforeEach = null;

    /**
-     * The Test Case "setUp" closure.
+     * Holds a global/shared afterEach ("tear down") closure if one has been
+     * defined.
+     *
+     * @var Closure|null
     */
-    private ?Closure $__beforeEach = null;
+    private $afterEach = null;

    /**
-     * The Test Case "tearDown" closure.
+     * Holds a global/shared beforeAll ("set up before") closure if one has been
+     * defined.
+     *
+     * @var Closure|null
     */
-    private ?Closure $__afterEach = null;
+    private static $beforeAll = null;

    /**
-     * The Test Case "setUpBeforeClass" closure.
+     * Holds a global/shared afterAll ("tear down after") closure if one has
+     * been defined.
+     *
+     * @var Closure|null
     */
-    private static ?Closure $__beforeAll = null;
+    private static $afterAll = null;

    /**
-     * The test "tearDownAfterClass" closure.
+     * Creates a new instance of the test case.
     */
-    private static ?Closure $__afterAll = null;
-
-    /**
-     * Resets the test case static properties.
-     */
-    public static function flush(): void
+    public function __construct(Closure $test, string $description, array $data)
    {
-        self::$__beforeAll = null;
-        self::$__afterAll = null;
+        $this->__test        = $test;
+        $this->__description = $description;
+        self::$beforeAll     = null;
+        self::$afterAll      = null;
+
+        parent::__construct('__test', $data);
    }

    /**
-     * Creates a new Test Case instance.
+     * Adds the groups to the current test case.
     */
-    public function __construct(string $name)
+    public function addGroups(array $groups): void
    {
-        parent::__construct($name);
+        $groups = array_unique(array_merge($this->getGroups(), $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);
-        }
+        $this->setGroups($groups);
    }

    /**
-     * Adds a new "setUpBeforeClass" to the Test Case.
+     * Add dependencies to the test case and map them to instances of ExecutionOrderDependency.
     */
-    public function __addBeforeAll(?Closure $hook): void
+    public function addDependencies(array $tests): void
    {
-        if ($hook === null) {
+        $className = get_class($this);
+
+        $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)
-            ? ChainableClosure::fromStatic(self::$__beforeAll, $hook)
+        self::$beforeAll = (self::$beforeAll instanceof Closure)
+            ? ChainableClosure::fromStatic(self::$beforeAll, $hook)
            : $hook;
    }

    /**
-     * Adds a new "tearDownAfterClass" to the Test Case.
+     * Add a shared/"global" after all test hook that will execute **before**
+     * the test defined `afterAll` hook(s).
     */
-    public function __addAfterAll(?Closure $hook): void
+    public function addAfterAll(?Closure $hook): void
    {
-        if ($hook === null) {
+        if (!$hook) {
            return;
        }

-        self::$__afterAll = (self::$__afterAll instanceof Closure)
-            ? ChainableClosure::fromStatic(self::$__afterAll, $hook)
+        self::$afterAll = (self::$afterAll instanceof Closure)
+            ? ChainableClosure::fromStatic(self::$afterAll, $hook)
            : $hook;
    }

    /**
-     * Adds a new "setUp" to the Test Case.
+     * Add a shared/"global" before each test hook that will execute **before**
+     * 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);
    }

    /**
-     * Adds a new "tearDown" to the Test Case.
+     * Add a shared/"global" after each test hook that will execute **before**
+     * 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);
    }

    /**
-     * Adds a new "hook" to the Test Case.
+     * Add a shared/global hook and compose them if more than one is passed.
     */
-    private function __addHook(string $property, ?Closure $hook): void
+    private function addHook(string $property, ?Closure $hook): void
    {
-        if ($hook === null) {
+        if (!$hook) {
            return;
        }

@ -138,7 +170,22 @@ trait Testable
    }

    /**
-     * This method is called before the first test of this Test Case is run.
+     * Returns the test case name. Note that, in Pest
+     * 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
    {
@ -146,22 +193,22 @@ trait Testable

        $beforeAll = TestSuite::getInstance()->beforeAll->get(self::$__filename);

-        if (self::$__beforeAll instanceof Closure) {
-            $beforeAll = ChainableClosure::fromStatic(self::$__beforeAll, $beforeAll);
+        if (self::$beforeAll instanceof Closure) {
+            $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 Case is run.
+     * This method is called after the last test of this test class is run.
     */
    public static function tearDownAfterClass(): void
    {
        $afterAll = TestSuite::getInstance()->afterAll->get(self::$__filename);

-        if (self::$__afterAll instanceof Closure) {
-            $afterAll = ChainableClosure::fromStatic(self::$__afterAll, $afterAll);
+        if (self::$afterAll instanceof Closure) {
+            $afterAll = ChainableClosure::fromStatic(self::$afterAll, $afterAll);
        }

        call_user_func(Closure::bind($afterAll, null, self::class));
@ -170,7 +217,7 @@ trait Testable
    }

    /**
-     * Gets executed before the Test Case.
+     * Gets executed before the test.
     */
    protected function setUp(): void
    {
@ -180,22 +227,22 @@ trait Testable

        $beforeEach = TestSuite::getInstance()->beforeEach->get(self::$__filename);

-        if ($this->__beforeEach instanceof Closure) {
-            $beforeEach = ChainableClosure::from($this->__beforeEach, $beforeEach);
+        if ($this->beforeEach instanceof Closure) {
+            $beforeEach = ChainableClosure::from($this->beforeEach, $beforeEach);
        }

        $this->__callClosure($beforeEach, func_get_args());
    }

    /**
-     * Gets executed after the Test Case.
+     * Gets executed after the test.
     */
    protected function tearDown(): void
    {
        $afterEach = TestSuite::getInstance()->afterEach->get(self::$__filename);

-        if ($this->__afterEach instanceof Closure) {
-            $afterEach = ChainableClosure::from($this->__afterEach, $afterEach);
+        if ($this->afterEach instanceof Closure) {
+            $afterEach = ChainableClosure::from($this->afterEach, $afterEach);
        }

        $this->__callClosure($afterEach, func_get_args());
@ -206,13 +253,27 @@ trait Testable
    }

    /**
-     * Executes the Test Case current test.
+     * Returns the test case as string.
+     */
+    public function toString(): string
+    {
+        return \sprintf(
+            '%s::%s',
+            self::$__filename,
+            $this->__description
+        );
+    }
+
+    /**
+     * Runs the test.
+     *
+     * @return mixed
     *
     * @throws Throwable
     */
-    private function __runTest(Closure $closure, ...$args): mixed
+    public function __test()
    {
-        return $this->__callClosure($closure, $this->__resolveTestArguments($args));
+        return $this->__callClosure($this->__test, $this->resolveTestArguments(func_get_args()));
    }

    /**
@ -220,79 +281,27 @@ trait Testable
     *
     * @throws Throwable
     */
-    private function __resolveTestArguments(array $arguments): array
+    private function resolveTestArguments(array $arguments): array
    {
-        $method = TestSuite::getInstance()->tests->get(self::$__filename)->getMethod($this->name());
-
-        $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 array_map(function ($data) {
+            return $data instanceof Closure ? $this->__callClosure($data, []) : $data;
+        }, $arguments);
    }

    /**
+     * @return mixed
+     *
     * @throws Throwable
     */
-    private function __callClosure(Closure $closure, array $arguments): mixed
+    private function __callClosure(Closure $closure, array $arguments)
    {
-        return ExceptionTrace::ensure(fn (): mixed => call_user_func_array(Closure::bind($closure, $this, $this::class), $arguments));
+        return ExceptionTrace::ensure(function () use ($closure, $arguments) {
+            return call_user_func_array(Closure::bind($closure, $this, get_class($this)), $arguments);
+        });
    }

-    /**
-     * The printable test case name.
-     */
-    public static function getPrintableTestCaseName(): string
+    public function getPrintableTestCaseName(): string
    {
-        return preg_replace('/P\\\/', '', self::class, 1);
-    }
-
-    /**
-     * The printable test case method name.
-     */
-    public function getPrintableTestCaseMethodName(): string
-    {
-        return $this->__description;
-    }
-
-    /**
-     * The latest printable test case method name.
-     */
-    public static function getLatestPrintableTestCaseMethodName(): string
-    {
-        return self::$__latestDescription;
+        return ltrim(self::class, 'P\\');
    }
 }
--- a/src/Console/Command.php
+++ b/src/Console/Command.php
@ -0,0 +1,132 @@
+<?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))();
+    }
+}
--- a/src/Console/Help.php
+++ b/src/Console/Help.php
@ -11,11 +11,7 @@ use Symfony\Component\Console\Output\OutputInterface;
 */
 final class Help
 {
-    /**
-     * The Command messages.
-     *
-     * @var array<int, string>
-     */
+    /** @var array<int, string> */
    private const HELP_MESSAGES = [
        '<comment>Pest Options:</comment>',
        '  <info>--init</info>                      Initialise a standard Pest configuration',
@ -24,17 +20,14 @@ final class Help
        '  <info>--group=<fg=cyan><name></></info>              Only runs tests from the specified group(s)',
    ];

-    /**
-     * Creates a new Console Command instance.
-     */
-    public function __construct(private readonly OutputInterface $output)
+    /** @var OutputInterface */
+    private $output;
+
+    public function __construct(OutputInterface $output)
    {
-        // ..
+        $this->output = $output;
    }

-    /**
-     * Executes the Console Command.
-     */
    public function __invoke(): void
    {
        foreach (self::HELP_MESSAGES as $message) {
--- a/src/Console/Thanks.php
+++ b/src/Console/Thanks.php
@ -4,11 +4,8 @@ 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;

@ -17,58 +14,38 @@ use Symfony\Component\Console\Question\ConfirmationQuestion;
 */
 final class Thanks
 {
-    /**
-     * The support options.
-     *
-     * @var array<string, string>
-     */
+    /** @var array<int, string> */
    private const FUNDING_MESSAGES = [
-        'Star the project on GitHub' => 'https://github.com/pestphp/pest',
-        'Tweet about the project' => 'https://twitter.com/pestphp',
-        'Sponsor the project' => 'https://github.com/sponsors/nunomaduro',
+        '',
+        '  - Star or contribute to Pest:',
+        '    <options=bold>https://github.com/pestphp/pest</>',
+        '  - Tweet something about Pest on Twitter:',
+        '    <options=bold>https://twitter.com/pestphp</>',
+        '  - Sponsor the creator:',
+        '    <options=bold>https://github.com/sponsors/nunomaduro</>',
    ];

-    /**
-     * Creates a new Console Command instance.
-     */
-    public function __construct(
-        private readonly InputInterface $input,
-        private readonly OutputInterface $output
-    ) {
-        // ..
+    /** @var OutputInterface */
+    private $output;
+
+    public function __construct(OutputInterface $output)
+    {
+        $this->output = $output;
    }

    /**
-     * Executes the Console Command.
+     * Asks the user to support Pest.
     */
    public function __invoke(): void
    {
-        $bootstrapper = new BootView($this->output);
-        $bootstrapper->boot();
-
-        $wantsToSupport = false;
-
-        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');
-        }
+        $wantsToSupport = (new SymfonyQuestionHelper())->ask(
+            new ArrayInput([]),
+            $this->output,
+            new ConfirmationQuestion(
+                'Can you quickly <options=bold>star our GitHub repository</>? 🙏🏻',
+                true,
+            )
+        );

        if ($wantsToSupport === true) {
            if (PHP_OS_FAMILY == 'Darwin') {
@ -81,5 +58,9 @@ final class Thanks
                exec('xdg-open https://github.com/pestphp/pest');
            }
        }
+
+        foreach (self::FUNDING_MESSAGES as $message) {
+            $this->output->writeln($message);
+        }
    }
 }
--- a/src/Contracts/AddsAnnotations.php
+++ b/src/Contracts/AddsAnnotations.php
@ -1,21 +0,0 @@
-<?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;
-}
--- a/src/Contracts/Bootstrapper.php
+++ b/src/Contracts/Bootstrapper.php
@ -1,16 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Contracts;
-
-/**
- * @internal
- */
-interface Bootstrapper
-{
-    /**
-     * Boots the bootstrapper.
-     */
-    public function boot(): void;
-}
--- a/src/Contracts/HasPrintableTestCaseName.php
+++ b/src/Contracts/HasPrintableTestCaseName.php
@ -4,12 +4,18 @@ declare(strict_types=1);

 namespace Pest\Contracts;

-use NunoMaduro\Collision\Contracts\Adapters\Phpunit\HasPrintableTestCaseName as BaseHasPrintableTestCaseName;
-
-/**
- * @internal
- */
-interface HasPrintableTestCaseName extends BaseHasPrintableTestCaseName
-{
-    // ..
+if (interface_exists(\NunoMaduro\Collision\Contracts\Adapters\Phpunit\HasPrintableTestCaseName::class)) {
+    /**
+     * @internal
+     */
+    interface HasPrintableTestCaseName extends \NunoMaduro\Collision\Contracts\Adapters\Phpunit\HasPrintableTestCaseName
+    {
+    }
+} else {
+    /**
+     * @internal
+     */
+    interface HasPrintableTestCaseName
+    {
+    }
 }
--- a/src/Contracts/Panicable.php
+++ b/src/Contracts/Panicable.php
@ -1,23 +0,0 @@
-<?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;
-}
--- a/src/Contracts/Plugins/AddsOutput.php
+++ b/src/Contracts/Plugins/AddsOutput.php
@ -10,7 +10,7 @@ namespace Pest\Contracts\Plugins;
 interface AddsOutput
 {
    /**
-     * Adds output after the Test Suite execution.
+     * Allows to add custom output after the test suite was executed.
     */
-    public function addOutput(int $exitCode): int;
+    public function addOutput(int $testReturnCode): int;
 }
--- a/src/Contracts/Plugins/Bootable.php
+++ b/src/Contracts/Plugins/Bootable.php
@ -1,16 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Contracts\Plugins;
-
-/**
- * @internal
- */
-interface Bootable
-{
-    /**
-     * Boots the plugin.
-     */
-    public function boot(): void;
-}
--- a/src/Contracts/Plugins/HandlesArguments.php
+++ b/src/Contracts/Plugins/HandlesArguments.php
@ -10,10 +10,11 @@ namespace Pest\Contracts\Plugins;
 interface HandlesArguments
 {
    /**
-     * Adds arguments before of the Test Suite execution.
+     * Allows to handle custom command line arguments.
     *
-     * @param  array<int, string>  $arguments
-     * @return array<int, string>
+     * @param array<int, string> $arguments
+     *
+     * @return array<int, string> the updated list of arguments
     */
    public function handleArguments(array $arguments): array;
 }
--- a/src/Contracts/Plugins/Shutdownable.php
+++ b/src/Contracts/Plugins/Shutdownable.php
@ -1,16 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Contracts\Plugins;
-
-/**
- * @internal
- */
-interface Shutdownable
-{
-    /**
-     * Shutdowns the plugin.
-     */
-    public function shutdown(): void;
-}
--- a/src/Contracts/TestCaseFilter.php
+++ b/src/Contracts/TestCaseFilter.php
@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Contracts;
-
-interface TestCaseFilter
-{
-    /**
-     * Whether the test case is accepted.
-     */
-    public function accept(string $testCaseFilename): bool;
-}
--- a/src/Contracts/TestCaseMethodFilter.php
+++ b/src/Contracts/TestCaseMethodFilter.php
@ -1,15 +0,0 @@
-<?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;
-}
--- a/src/Datasets.php
+++ b/src/Datasets.php
@ -0,0 +1,177 @@
+<?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);
+    }
+}
--- a/src/Expectations/EachExpectation.php
+++ b/src/Expectations/EachExpectation.php
@ -2,50 +2,47 @@

 declare(strict_types=1);

-namespace Pest\Expectations;
-
-use function expect;
-use Pest\Expectation;
+namespace Pest;

 /**
 * @internal
 *
- * @template TValue
- *
- * @mixin Expectation<TValue>
+ * @mixin Expectation
 */
-final class EachExpectation
+final class Each
 {
-    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(private readonly Expectation $original)
+    public function __construct(Expectation $original)
    {
+        $this->original = $original;
    }

    /**
     * Creates a new expectation.
     *
-     * @template TAndValue
-     *
-     * @param  TAndValue  $value
-     * @return Expectation<TAndValue>
+     * @param mixed $value
     */
-    public function and(mixed $value): Expectation
+    public function and($value): Expectation
    {
        return $this->original->and($value);
    }

    /**
     * Creates the opposite expectation for the value.
-     *
-     * @return self<TValue>
     */
-    public function not(): self
+    public function not(): Each
    {
        $this->opposite = true;

@ -55,10 +52,9 @@ final class EachExpectation
    /**
     * Dynamically calls methods on the class with the given arguments on each item.
     *
-     * @param  array<int|string, mixed>  $arguments
-     * @return self<TValue>
+     * @param array<int|string, mixed> $arguments
     */
-    public function __call(string $name, array $arguments): self
+    public function __call(string $name, array $arguments): Each
    {
        foreach ($this->original->value as $item) {
            /* @phpstan-ignore-next-line */
@ -72,10 +68,8 @@ final class EachExpectation

    /**
     * Dynamically calls methods on the class without any arguments on each item.
-     *
-     * @return self<TValue>
     */
-    public function __get(string $name): self
+    public function __get(string $name): Each
    {
        /* @phpstan-ignore-next-line */
        return $this->$name();
--- a/src/Exceptions/AfterAllAlreadyExist.php
+++ b/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 Exception instance.
+     * Creates a new instance of after all already exist exception.
     */
    public function __construct(string $filename)
    {
-        parent::__construct(sprintf('The afterAll already exists in the filename `%s`.', $filename));
+        parent::__construct(sprintf('The afterAll already exist in the filename `%s`.', $filename));
    }
 }
--- a/src/Exceptions/AfterEachAlreadyExist.php
+++ b/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 Exception instance.
+     * Creates a new instance of after each already exist exception.
     */
    public function __construct(string $filename)
    {
-        parent::__construct(sprintf('The afterEach already exists in the filename `%s`.', $filename));
+        parent::__construct(sprintf('The afterEach already exist in the filename `%s`.', $filename));
    }
 }
--- a/src/Exceptions/AttributeNotSupportedYet.php
+++ b/src/Exceptions/AttributeNotSupportedYet.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 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));
+    }
+}
--- a/src/Exceptions/BeforeEachAlreadyExist.php
+++ b/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 Exception instance.
+     * Creates a new instance of before each already exist exception.
     */
    public function __construct(string $filename)
    {
-        parent::__construct(sprintf('The beforeEach already exists in the filename `%s`.', $filename));
+        parent::__construct(sprintf('The beforeEach already exist in the filename `%s`.', $filename));
    }
 }
--- a/src/Exceptions/DatasetAlreadyExists.php
+++ b/src/Exceptions/DatasetAlreadyExists.php
@ -12,13 +12,13 @@ use Symfony\Component\Console\Exception\ExceptionInterface;
 /**
 * @internal
 */
-final class DatasetAlreadyExists extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
+final class DatasetAlreadyExist extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
 {
    /**
-     * Creates a new Exception instance.
+     * Creates a new instance of dataset already exist.
     */
-    public function __construct(string $name, string $scope)
+    public function __construct(string $name)
    {
-        parent::__construct(sprintf('A dataset with the name `%s` already exists in scope [%s].', $name, $scope));
+        parent::__construct(sprintf('A dataset with the name `%s` already exist.', $name));
    }
 }
--- a/src/Exceptions/DatasetDoesNotExist.php
+++ b/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 Exception instance.
+     * Creates a new instance of dataset does not exist.
     */
    public function __construct(string $name)
    {
--- a/src/Exceptions/DatasetMissing.php
+++ b/src/Exceptions/DatasetMissing.php
@ -10,22 +10,26 @@ 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
 {
    /**
-     * Creates a new Exception instance.
+     * Create new exception instance.
     *
-     * @param  array<string, string>  $arguments
+     * @param array<string, string> $args A map of argument names to their typee
     */
-    public function __construct(string $file, string $name, array $arguments)
+    public function __construct(string $file, string $name, array $args)
    {
        parent::__construct(sprintf(
            "A test with the description '%s' has %d argument(s) ([%s]) and no dataset(s) provided in %s",
            $name,
-            count($arguments),
-            implode(', ', array_map(static fn (string $arg, string $type): string => sprintf('%s $%s', $type, $arg), array_keys($arguments), $arguments)),
+            count($args),
+            implode(', ', array_map(static function (string $arg, string $type): string {
+                return sprintf('%s $%s', $type, $arg);
+            }, array_keys($args), $args)),
            $file,
        ));
    }
--- a/src/Exceptions/ExpectationNotFound.php
+++ b/src/Exceptions/ExpectationNotFound.php
@ -1,21 +0,0 @@
-<?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.");
-    }
-}
--- a/src/Exceptions/FileOrFolderNotFound.php
+++ b/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 Exception instance.
+     * Creates a new instance of file not found.
     */
    public function __construct(string $filename)
    {
-        parent::__construct(sprintf('The file or folder with the name `%s` could not be found.', $filename));
+        parent::__construct(sprintf('The file or folder with the name `%s` not found.', $filename));
    }
 }
--- a/src/Exceptions/InvalidConsoleArgument.php
+++ b/src/Exceptions/InvalidConsoleArgument.php
@ -12,10 +12,10 @@ use Symfony\Component\Console\Exception\ExceptionInterface;
 /**
 * @internal
 */
-final class InvalidOption extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
+final class InvalidConsoleArgument extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
 {
    /**
-     * Creates a new Exception instance.
+     * Creates a new instance of should not happen.
     */
    public function __construct(string $message)
    {
--- a/src/Exceptions/InvalidExpectation.php
+++ b/src/Exceptions/InvalidExpectation.php
@ -1,26 +0,0 @@
-<?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)));
-    }
-}
--- a/src/Exceptions/InvalidExpectationValue.php
+++ b/src/Exceptions/InvalidExpectationValue.php
@ -1,21 +0,0 @@
-<?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));
-    }
-}
--- a/src/Exceptions/InvalidPestCommand.php
+++ b/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 Exception instance.
+     * Creates a new instance of invalid pest command exception.
     */
    public function __construct()
    {
-        parent::__construct('Please run [./vendor/bin/pest] instead.');
+        parent::__construct('Please run `./vendor/bin/pest` instead of `/vendor/bin/phpunit`.');
    }
 }
--- a/src/Exceptions/MissingDependency.php
+++ b/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 Exception instance.
+     * Creates a new instance of missing dependency.
     */
    public function __construct(string $feature, string $dependency)
    {
--- a/src/Exceptions/NoDirtyTestsFound.php
+++ b/src/Exceptions/NoDirtyTestsFound.php
@ -1,38 +0,0 @@
-<?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;
-    }
-}
--- a/src/Exceptions/ShouldNotHappen.php
+++ b/src/Exceptions/ShouldNotHappen.php
@ -13,18 +13,19 @@ use RuntimeException;
 final class ShouldNotHappen extends RuntimeException
 {
    /**
-     * Creates a new Exception instance.
+     * Creates a new instance of should not happen.
     */
    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
-  PHP version: %s
-  Operating system: %s
+- Issue: %s
+- PHP version: %s
+- Operating system: %s
 EOF
            , $message, phpversion(), PHP_OS), 1, $exception);
    }
--- a/src/Exceptions/TestAlreadyExist.php
+++ b/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 Exception instance.
+     * Creates a new instance of test already exist.
     */
    public function __construct(string $fileName, string $description)
    {
-        parent::__construct(sprintf('A test with the description `%s` already exists in the filename `%s`.', $description, $fileName));
+        parent::__construct(sprintf('A test with the description `%s` already exist in the filename `%s`.', $description, $fileName));
    }
 }
--- a/src/Exceptions/TestCaseAlreadyInUse.php
+++ b/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 Exception instance.
+     * Creates a new instance of test case already in use.
     */
    public function __construct(string $inUse, string $newOne, string $folder)
    {
--- a/src/Exceptions/TestCaseClassOrTraitNotFound.php
+++ b/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 Exception instance.
+     * Creates a new instance of after each already exist exception.
     */
    public function __construct(string $testCaseClass)
    {
--- a/src/Exceptions/TestDescriptionMissing.php
+++ b/src/Exceptions/TestDescriptionMissing.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 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));
-    }
-}
--- a/src/Expectation.php
+++ b/src/Expectation.php
--- a/src/Expectations/HigherOrderExpectation.php
+++ b/src/Expectations/HigherOrderExpectation.php
@ -1,183 +0,0 @@
-<?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;
-    }
-}
--- a/src/Expectations/OppositeExpectation.php
+++ b/src/Expectations/OppositeExpectation.php
@ -1,169 +0,0 @@
-<?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))));
-    }
-}
--- a/src/Factories/Annotations/CoversNothing.php
+++ b/src/Factories/Annotations/CoversNothing.php
@ -1,27 +0,0 @@
-<?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;
-    }
-}
--- a/src/Factories/Annotations/Depends.php
+++ b/src/Factories/Annotations/Depends.php
@ -1,29 +0,0 @@
-<?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;
-    }
-}
--- a/src/Factories/Annotations/Groups.php
+++ b/src/Factories/Annotations/Groups.php
@ -1,26 +0,0 @@
-<?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;
-    }
-}
--- a/src/Factories/Annotations/TestDox.php
+++ b/src/Factories/Annotations/TestDox.php
@ -1,21 +0,0 @@
-<?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;
-    }
-}
--- a/src/Factories/Attributes/Attribute.php
+++ b/src/Factories/Attributes/Attribute.php
@ -1,27 +0,0 @@
-<?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;
-    }
-}
--- a/src/Factories/Attributes/Covers.php
+++ b/src/Factories/Attributes/Covers.php
@ -1,44 +0,0 @@
-<?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;
-    }
-}
--- a/src/Factories/Concerns/HigherOrderable.php
+++ b/src/Factories/Concerns/HigherOrderable.php
@ -1,35 +0,0 @@
-<?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();
-    }
-}
--- a/src/Factories/Covers/CoversClass.php
+++ b/src/Factories/Covers/CoversClass.php
@ -1,15 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Factories\Covers;
-
-/**
- * @internal
- */
-final class CoversClass
-{
-    public function __construct(public string $class)
-    {
-    }
-}
--- a/src/Factories/Covers/CoversFunction.php
+++ b/src/Factories/Covers/CoversFunction.php
@ -1,15 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Factories\Covers;
-
-/**
- * @internal
- */
-final class CoversFunction
-{
-    public function __construct(public string $function)
-    {
-    }
-}
--- a/src/Factories/Covers/CoversNothing.php
+++ b/src/Factories/Covers/CoversNothing.php
@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Factories\Covers;
-
-/**
- * @internal
- */
-final class CoversNothing
-{
-}
--- a/src/Factories/TestCaseFactory.php
+++ b/src/Factories/TestCaseFactory.php
@ -4,18 +4,16 @@ declare(strict_types=1);

 namespace Pest\Factories;

+use Closure;
 use ParseError;
 use Pest\Concerns;
-use Pest\Contracts\AddsAnnotations;
 use Pest\Contracts\HasPrintableTestCaseName;
-use Pest\Exceptions\DatasetMissing;
+use Pest\Datasets;
 use Pest\Exceptions\ShouldNotHappen;
-use Pest\Exceptions\TestAlreadyExist;
-use Pest\Exceptions\TestDescriptionMissing;
-use Pest\Factories\Concerns\HigherOrderable;
-use Pest\Support\Reflection;
+use Pest\Support\HigherOrderMessageCollection;
 use Pest\Support\Str;
 use Pest\TestSuite;
+use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
 use RuntimeException;

@ -24,246 +22,219 @@ use RuntimeException;
 */
 final class TestCaseFactory
 {
-    use HigherOrderable;
+    /**
+     * Holds the test filename.
+     *
+     * @readonly
+     *
+     * @var string
+     */
+    public $filename;

    /**
-     * The list of annotations.
+     * Marks this test case as only.
     *
-     * @var array<int, class-string<AddsAnnotations>>
+     * @readonly
+     *
+     * @var bool
     */
-    private const ANNOTATIONS = [
-        Annotations\Depends::class,
-        Annotations\Groups::class,
-        Annotations\CoversNothing::class,
-        Annotations\TestDox::class,
-    ];
+    public $only = false;

    /**
-     * The list of attributes.
+     * Holds the test description.
     *
-     * @var array<int, class-string<\Pest\Factories\Attributes\Attribute>>
+     * If the description is null, means that it
+     * will be created with the given assertions.
+     *
+     * @var string|null
     */
-    private const ATTRIBUTES = [
-        Attributes\Covers::class,
-    ];
+    public $description;

    /**
-     * The FQN of the Test Case class.
+     * Holds the test closure.
     *
-     * @var class-string
+     * @readonly
+     *
+     * @var Closure
     */
-    public string $class = TestCase::class;
+    public $test;

    /**
-     * The list of class methods.
+     * Holds the dataset, if any.
     *
-     * @var array<string, TestCaseMethodFactory>
+     * @var array<Closure|iterable<int|string, mixed>|string>
     */
-    public array $methods = [];
+    public $datasets = [];

    /**
-     * The list of class traits.
+     * The FQN of the test case class.
     *
-     * @var array <int, class-string>
+     * @var string
     */
-    public array $traits = [
+    public $class = TestCase::class;
+
+    /**
+     * An array of FQN of the class traits.
+     *
+     * @var array <int, string>
+     */
+    public $traits = [
        Concerns\Testable::class,
        Concerns\Expectable::class,
    ];

    /**
-     * Creates a new Factory instance.
+     * Holds the higher order messages
+     *  for the factory that are proxyble.
+     *
+     * @var HigherOrderMessageCollection
     */
-    public function __construct(
-        public string $filename
-    ) {
-        $this->bootHigherOrderable();
-    }
+    public $factoryProxies;

-    public function make(): void
+    /**
+     * Holds the higher order
+     * 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)
    {
-        $methods = $this->methods;
+        $this->filename    = $filename;
+        $this->description = $description;
+        $this->test        = $closure ?? function (): void {
+            if (Assert::getCount() === 0) {
+                self::markTestIncomplete(); // @phpstan-ignore-line
+            }
+        };

-        if ($methods !== []) {
-            $this->evaluate($this->filename, $methods);
-        }
+        $this->factoryProxies = new HigherOrderMessageCollection();
+        $this->proxies        = new HigherOrderMessageCollection();
+        $this->chains         = new HigherOrderMessageCollection();
    }

    /**
-     * Creates a Test Case class using a runtime evaluate.
+     * Builds the anonymous test case.
     *
-     * @param  array<string, TestCaseMethodFactory>  $methods
+     * @return array<int, TestCase>
     */
-    public function evaluate(string $filename, array $methods): void
+    public function build(TestSuite $testSuite): array
+    {
+        if ($this->description === null) {
+            throw ShouldNotHappen::fromMessage('Description can not be empty.');
+        }
+
+        $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.
+     */
+    public function makeClassFromFilename(string $filename): string
    {
        if ('\\' === DIRECTORY_SEPARATOR) {
            // In case Windows, strtolower drive name, like in UsesCall.
-            $filename = (string) preg_replace_callback('~^(?P<drive>[a-z]+:\\\)~i', static fn ($match): string => strtolower($match['drive']), $filename);
+            $filename = (string) preg_replace_callback('~^(?P<drive>[a-z]+:\\\)~i', function ($match): string {
+                return strtolower($match['drive']);
+            }, $filename);
        }

-        $filename = str_replace('\\\\', '\\', addslashes((string) realpath($filename)));
-        $rootPath = TestSuite::getInstance()->rootPath;
-        $relativePath = str_replace($rootPath.DIRECTORY_SEPARATOR, '', $filename);
-
-        $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;
-
+        $filename     = str_replace('\\\\', '\\', addslashes((string) realpath($filename)));
+        $rootPath     = TestSuite::getInstance()->rootPath;
+        $relativePath = str_replace($rootPath . DIRECTORY_SEPARATOR, '', $filename);
+        $relativePath = dirname(ucfirst($relativePath)) . DIRECTORY_SEPARATOR . basename($relativePath, '.php');
        $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(fn (string $quote): string => sprintf('\\%s', $quote), ['\'', '"']), '', $relativePath);
+        $relativePath = str_replace(array_map(function (string $quote): string {
+            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;
+            return $classFQN;
        }

        $hasPrintableTestCaseClassFQN = sprintf('\%s', HasPrintableTestCaseName::class);
-        $traitsCode = sprintf('use %s;', implode(', ', array_map(
-            static fn ($trait): string => sprintf('\%s', $trait), $this->traits))
-        );
+        $traitsCode                   = sprintf('use %s;', implode(', ', array_map(function ($trait): string {
+            return sprintf('\%s', $trait);
+        }, $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 {
-            $classCode = <<<PHP
-            namespace $namespace;
+            eval("
+                namespace $namespace;

-            use Pest\Repositories\DatasetsRepository as __PestDatasets;
-            use Pest\TestSuite as __PestTestSuite;
+                final class $className extends $baseClass implements $hasPrintableTestCaseClassFQN {
+                    $traitsCode

-            /**
-             * @testdox $filename
-             */
-            $classAttributesCode
-            #[\AllowDynamicProperties]
-            final class $className extends $baseClass implements $hasPrintableTestCaseClassFQN {
-                $traitsCode
-
-                private static \$__filename = '$filename';
-
-                $methodsCode
-            }
-            PHP;
-
-            eval($classCode); // @phpstan-ignore-line
+                    private static \$__filename = '$filename';
+                }
+            ");
        } catch (ParseError $caught) {
-            throw new RuntimeException(sprintf(
-                "Unable to create test case for test file at %s. \n %s",
-                $filename,
-                $classCode
-            ), 1, $caught);
+            throw new RuntimeException(sprintf('Unable to create test case for test file at %s', $filename), 1, $caught);
        }
+
+        return $classFQN;
    }

    /**
-     * Adds the given Method to the Test Case.
+     * Determine if the test case will receive argument input from Pest, or not.
     */
-    public function addMethod(TestCaseMethodFactory $method): void
+    public function receivesArguments(): bool
    {
-        if ($method->description === null) {
-            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));
+        return count($this->datasets) > 0
+            || $this->factoryProxies->count('addDependencies') > 0;
    }
 }
--- a/src/Factories/TestCaseMethodFactory.php
+++ b/src/Factories/TestCaseMethodFactory.php
@ -1,186 +0,0 @@
-<?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;
-    }
-}
--- a/src/Functions.php
+++ b/src/Functions.php
@ -2,34 +2,35 @@

 declare(strict_types=1);

+use Pest\Datasets;
 use Pest\Expectation;
-use Pest\PendingCalls\AfterEachCall;
-use Pest\PendingCalls\BeforeEachCall;
-use Pest\PendingCalls\TestCall;
-use Pest\PendingCalls\UsesCall;
-use Pest\Repositories\DatasetsRepository;
+use Pest\PendingObjects\AfterEachCall;
+use Pest\PendingObjects\BeforeEachCall;
+use Pest\PendingObjects\TestCall;
+use Pest\PendingObjects\UsesCall;
 use Pest\Support\Backtrace;
-use Pest\Support\DatasetInfo;
+use Pest\Support\Extendable;
 use Pest\Support\HigherOrderTapProxy;
 use Pest\TestSuite;
 use PHPUnit\Framework\TestCase;

-if (! function_exists('expect')) {
-    /**
-     * Creates a new expectation.
-     *
-     * @template TValue
-     *
-     * @param  TValue|null  $value
-     * @return Expectation<TValue|null>
-     */
-    function expect(mixed $value = null): Expectation
-    {
-        return new Expectation($value);
+/**
+ * Creates a new expectation.
+ *
+ * @param mixed $value the Value
+ *
+ * @return Expectation|Extendable
+ */
+function expect($value = null)
+{
+    if (func_num_args() === 0) {
+        return new Extendable(Expectation::class);
    }
+
+    return new Expectation($value);
 }

-if (! function_exists('beforeAll')) {
+if (!function_exists('beforeAll')) {
    /**
     * Runs the given closure before all tests in the current file.
     */
@ -39,11 +40,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 HigherOrderTapProxy<TestCall|TestCase>|TestCall|mixed
+     * @return BeforeEachCall|TestCase|mixed
     */
    function beforeEach(Closure $closure = null): BeforeEachCall
    {
@ -53,36 +54,32 @@ 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, Closure|iterable $dataset): void
+    function dataset(string $name, $dataset): void
    {
-        $scope = DatasetInfo::scope(Backtrace::datasetsFile());
-
-        DatasetsRepository::set($name, $dataset, $scope);
+        Datasets::set($name, $dataset);
    }
 }

-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, array_values($classAndTraits));
+        return new UsesCall($filename, $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
@ -90,7 +87,7 @@ if (! function_exists('test')) {
     *
     * @return TestCall|TestCase|mixed
     */
-    function test(string $description = null, Closure $closure = null): HigherOrderTapProxy|TestCall
+    function test(string $description = null, Closure $closure = null)
    {
        if ($description === null && TestSuite::getInstance()->test !== null) {
            return new HigherOrderTapProxy(TestSuite::getInstance()->test);
@ -102,7 +99,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
@ -114,36 +111,15 @@ if (! function_exists('it')) {
    {
        $description = sprintf('it %s', $description);

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

-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')) {
+if (!function_exists('afterEach')) {
    /**
     * Runs the given closure after each test in the current file.
     *
-     * @return HigherOrderTapProxy<TestCall|TestCase>|TestCall|mixed
+     * @return AfterEachCall|TestCase|mixed
     */
    function afterEach(Closure $closure = null): AfterEachCall
    {
@ -153,7 +129,7 @@ if (! function_exists('afterEach')) {
    }
 }

-if (! function_exists('afterAll')) {
+if (!function_exists('afterAll')) {
    /**
     * Runs the given closure after all tests in the current file.
     */
--- a/src/HigherOrderExpectation.php
+++ b/src/HigherOrderExpectation.php
@ -0,0 +1,144 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest;
+
+use Pest\Concerns\Expectable;
+use Pest\Concerns\RetrievesValues;
+
+/**
+ * @internal
+ *
+ * @mixin Expectation
+ */
+final class HigherOrderExpectation
+{
+    use Expectable;
+    use RetrievesValues;
+
+    /**
+     * @var Expectation
+     */
+    private $original;
+
+    /**
+     * @var Expectation|Each
+     */
+    private $expectation;
+
+    /**
+     * @var bool
+     */
+    private $opposite = false;
+
+    /**
+     * @var bool
+     */
+    private $shouldReset = false;
+
+    /**
+     * @var string
+     */
+    private $name;
+
+    /**
+     * Creates a new higher order expectation.
+     *
+     * @param mixed $value
+     */
+    public function __construct(Expectation $original, $value)
+    {
+        $this->original     = $original;
+        $this->expectation  = $this->expect($value);
+    }
+
+    /**
+     * Creates the opposite expectation for the value.
+     */
+    public function not(): HigherOrderExpectation
+    {
+        $this->opposite = !$this->opposite;
+
+        return $this;
+    }
+
+    /**
+     * Creates a new expectation.
+     *
+     * @template TValue
+     *
+     * @param TValue $value
+     *
+     * @return Expectation<TValue>
+     */
+    public function and($value): Expectation
+    {
+        return $this->expect($value);
+    }
+
+    /**
+     * Dynamically calls methods on the class with the given arguments.
+     *
+     * @param array<int, mixed> $arguments
+     */
+    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.
+     */
+    public function __get(string $name): self
+    {
+        if ($name === 'not') {
+            return $this->not();
+        }
+
+        if (!$this->expectationHasMethod($name)) {
+            return new self($this->original, $this->retrieve($name, $this->getValue()));
+        }
+
+        return $this->performAssertion($name, []);
+    }
+
+    /**
+     * Determines if the original expectation has the given method name.
+     */
+    private function expectationHasMethod(string $name): bool
+    {
+        return method_exists($this->original, $name) || $this->original::hasExtend($name);
+    }
+
+    /**
+     * Retrieve the applicable value based on the current reset condition.
+     *
+     * @return mixed
+     */
+    private function getValue()
+    {
+        return $this->shouldReset ? $this->original->value : $this->expectation->value;
+    }
+
+    /**
+     * Performs the given assertion with the current expectation.
+     *
+     * @param array<int, mixed> $arguments
+     */
+    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;
+    }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Nuno Maduro	66f69617f1	release: 1.21.3	2022-05-12 20:10:25 +01:00
Nuno Maduro	5721e8c29a	docs: updates release	2022-05-12 20:06:47 +01:00
Nuno Maduro	546d19fd84	chore: cs	2022-05-12 20:03:22 +01:00
Nuno Maduro	c1b32b9ffb	fix: debug in high order tests	2022-05-12 20:03:11 +01:00
Owen Voke	298b1e6784	fix: update branch alias for 1.x branch	2022-03-16 09:24:51 +00:00
Nuno Maduro	63f009fadf	release: v1.21.2	2022-03-05 19:34:40 +00:00
Nuno Maduro	1066c2270d	Merge pull request #487 from fabio-ivona/fix-throws-missing-exception Fix throws missing exception	2022-03-04 08:57:50 +00:00
Fabio Ivona	984f237a92	phpstan	2022-03-03 15:45:41 +01:00
Fabio Ivona	dccd8239dd	handles toThrow exception with a "class not found" error	2022-02-18 18:01:09 +01:00
Fabio Ivona	e103623ecb	adds failing test	2022-02-18 18:00:55 +01:00
Nuno Maduro	542fc046d2	Merge pull request #462 from pestphp/revert-461-json_fix Revert "Fixes `json` in Higher Order Expectations"	2022-01-21 16:48:35 +00:00
Nuno Maduro	4720e0655b	Revert "Fixes `json` in Higher Order Expectations"	2022-01-21 16:48:26 +00:00
Nuno Maduro	a533772fe2	Merge pull request #461 from pestphp/json_fix Fixes `json` in Higher Order Expectations	2022-01-21 16:46:30 +00:00
Luke Downing	2218a0c137	Tweaks	2022-01-21 16:39:10 +00:00
Luke Downing	2831629f1b	Fixes bug with `json` method call in Higher Order Expectations.	2022-01-21 16:35:21 +00:00
Owen Voke	1b7f1dc5b3	chore(deps): update nunomaduro/collision to ^5.10 This ensures that the minimum dependencies work with PHP 8.1	2021-12-13 20:57:27 +00:00
Luke Downing	92b8d32ef7	release: v1.21.1	2021-11-25 16:44:17 +00:00
Nuno Maduro	2969c7a5e3	Merge pull request #442 from pestphp/fix_for_sequence [1.x] Fix for sequence	2021-11-25 16:40:08 +00:00
Luke Downing	63c1faa9f4	Prevents issues with callables in sequence	2021-11-25 16:37:23 +00:00
Nuno Maduro	b5b14ef280	chore: updates changelog branch to `1.x`	2021-11-17 11:03:56 +00:00
Nuno Maduro	11eb1903c2	release: v1.21.0	2021-11-17 10:54:00 +00:00
Nuno Maduro	a110848f9b	docs: updates changelog	2021-11-17 10:47:28 +00:00