docs: updates changelog

chore: keeps phpunit 9.2 for pest 0.2
2026-03-06 15:57:21 +01:00 · 2020-08-06 21:18:26 +01:00 · 2020-08-06 21:15:46 +01:00
205 changed files with 2799 additions and 8445 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -14,5 +14,5 @@ trim_trailing_whitespace = true
 [*.md]
 trim_trailing_whitespace = false

-[*.{yml,yaml}]
+[*.yml]
 indent_size = 2
--- a/.gitattributes
+++ b/.gitattributes
@ -1,14 +1,16 @@
-/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
-/phpunit.xml             export-ignore
-CHANGELOG.md             export-ignore
-CONTRIBUTING.md          export-ignore
-README.md                export-ignore
+/art               export-ignore
+/docs              export-ignore
+/tests             export-ignore
+/scripts           export-ignore
+/.github           export-ignore
+/.php_cs           export-ignore
+.editorconfig      export-ignore
+.gitattributes     export-ignore
+.gitignore         export-ignore
+.travis.yml        export-ignore
+phpstan.neon       export-ignore
+rector.yaml        export-ignore
+phpunit.xml        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,5 @@
 # These are supported funding model platforms

-github: [nunomaduro,owenvoke,olivernybroe,octoper,lukeraymonddowning]
+github: nunomaduro
 patreon: nunomaduro
+custom: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66BYDWAT92N6L
--- a/.github/workflows/changelog.yml
+++ b/.github/workflows/changelog.yml
@ -5,7 +5,6 @@ on:
    branches: [ master ]
    paths:
      - CHANGELOG.md
-      - .github/workflows/changelog.yml
  pull_request:
    branches: [ master ]
    paths:
@ -14,25 +13,19 @@ 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
-
+        repository: pestphp/website
+        path: pestphp-website
    - 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:
@ -41,23 +34,21 @@ jobs:
          ---
          title: Changelog
          description: Changelog
+          extends: _layouts.documentation
+          section: content
          ---
          ${{ 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
-
+      run: cp CHANGELOG.md pestphp-website/source/docs/changelog.md
    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v3
+      uses: peter-evans/create-pull-request@v2
      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
+        path: ./pestphp-website
--- a/.github/workflows/formats.yml
+++ b/.github/workflows/formats.yml
@ -0,0 +1,46 @@
+name: Formats
+
+on: ['push', 'pull_request']
+
+jobs:
+  ci:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: true
+      matrix:
+        os: [ubuntu-latest]
+        php: [7.4]
+        dependency-version: [prefer-lowest, prefer-stable]
+
+    name: Formats P${{ matrix.php }} - ${{ matrix.os }} - ${{ matrix.dependency-version }}
+
+    steps:
+
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Cache dependencies
+      uses: actions/cache@v1
+      with:
+        path: ~/.composer/cache/files
+        key: dependencies-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php }}
+        extensions: dom, mbstring, zip
+        tools: prestissimo
+        coverage: pcov
+
+    - name: Install Composer dependencies
+      run: composer update --${{ matrix.dependency-version }} --no-interaction --prefer-dist
+
+    - name: Coding Style Checks
+      run: |
+           vendor/bin/rector process src --dry-run
+           vendor/bin/php-cs-fixer fix -v --dry-run
+
+    - name: Type Checks
+      run: vendor/bin/phpstan analyse --ansi
--- a/.github/workflows/static.yml
+++ b/.github/workflows/static.yml
@ -1,51 +0,0 @@
-name: Static Analysis
-
-on: ['push', 'pull_request']
-
-jobs:
-  cs:
-    runs-on: ubuntu-latest
-
-    name: Code Style
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: 8.0
-        tools: composer:v2
-        coverage: none
-
-    - name: Install Dependencies
-      run: composer update --no-interaction --no-progress
-
-    - name: Run PHP-CS-Fixer
-      run: vendor/bin/php-cs-fixer fix -v --allow-risky=yes --dry-run
-
-  phpstan:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        dependency-version: [prefer-lowest, prefer-stable]
-
-    name: PHPStan ${{ matrix.dependency-version }}
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - 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
@ -6,40 +6,43 @@ jobs:
  ci:
    runs-on: ${{ matrix.os }}
    strategy:
+      fail-fast: true
      matrix:
        os: [ubuntu-latest, macos-latest, windows-latest]
-        php: ['7.3', '7.4', '8.0', '8.1']
+        php: [7.3, 7.4]
        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 }} - ${{ matrix.parallel }}
+    name: Tests P${{ matrix.php }} - ${{ matrix.os }} - ${{ matrix.dependency-version }}

    steps:
+
    - name: Checkout
      uses: actions/checkout@v2

+    - name: Cache dependencies
+      uses: actions/cache@v1
+      with:
+        path: ~/.composer/cache/files
+        key: dependencies-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
+
    - name: Setup PHP
      uses: shivammathur/setup-php@v2
      with:
        php-version: ${{ matrix.php }}
-        tools: composer:v2
+        extensions: dom, mbstring, zip
        coverage: none

-    - name: Setup Problem Matches
-      run: |
-        echo "::add-matcher::${{ runner.tool_cache }}/php.json"
-        echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
-
-    - name: Install PHP dependencies
-      run: composer update --${{ matrix.dependency-version }} --no-interaction --no-progress
+    - name: Install Composer dependencies
+      run: composer update --${{ matrix.dependency-version }} --no-interaction --prefer-dist

    - name: Unit Tests
-      run: php bin/pest --colors=always --exclude-group=integration ${{ matrix.parallel }}
+      run: php bin/pest --colors=always --exclude-group=integration

    - name: Integration Tests
      run: php bin/pest --colors=always --group=integration
+
+    - name: Setup problem matchers for PHP
+      run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+
+    - name: Setup problem matchers for Pest
+      run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
--- a/.gitignore
+++ b/.gitignore
@ -4,9 +4,8 @@ composer.lock
 /vendor/
 coverage.xml
 .phpunit.result.cache
-/.php-cs-fixer.php
-.php-cs-fixer.cache
+.php_cs.cache
 .temp/coverage.php
 *.swp
 *.swo
-.vscode/
+.vscode/
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@ -3,9 +3,11 @@
 $finder = PhpCsFixer\Finder::create()
    ->in(__DIR__ . DIRECTORY_SEPARATOR . 'tests')
    ->in(__DIR__ . DIRECTORY_SEPARATOR . 'bin')
+    ->in(__DIR__ . DIRECTORY_SEPARATOR . 'compiled')
+    ->in(__DIR__ . DIRECTORY_SEPARATOR . 'scripts')
    ->in(__DIR__ . DIRECTORY_SEPARATOR . 'stubs')
    ->in(__DIR__ . DIRECTORY_SEPARATOR . 'src')
-    ->append(['.php-cs-fixer.dist.php']);
+    ->append(['.php_cs']);

 $rules = [
    '@Symfony'               => true,
@ -24,7 +26,7 @@ $rules = [

 $rules['increment_style'] = ['style' => 'post'];

-return (new PhpCsFixer\Config())
+return PhpCsFixer\Config::create()
    ->setUsingCache(true)
    ->setRules($rules)
    ->setFinder($finder);
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,275 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).

-## [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
- `sequence` with more expectations than iterable elements ([#399](https://github.com/pestphp/pest/pull/399))
-
-## [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
- `skip` with false condition marking test as skipped ([22b822c](https://github.com/pestphp/pest/commit/22b822ce87a3d19d84960fa5c93eb286820b525d))
-
-## [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))
-
-### 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))
+## [Unreleased]

+## [v0.2.4 (2020-08-06)](https://github.com/pestphp/pest/compare/v0.2.3...v0.2.4)
 ### 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))
+- uses `"phpunit/phpunit": "~9.2.0"` as dependency ([d0eb2f1](https://github.com/pestphp/pest/commit/d0eb2f15cd44b558ebb47002a7ff5b7af6fbbc07))

 ## [v0.2.3 (2020-07-01)](https://github.com/pestphp/pest/compare/v0.2.2...v0.2.3)
 ### Added
@ -284,7 +20,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - `depends` phpunit feature ([#103](https://github.com/pestphp/pest/pull/103))

 ### Fixes
- datasets name conflict ([#101](https://github.com/pestphp/pest/pull/101))
+- datasets name conflit ([#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
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -31,10 +31,6 @@ composer lint
 ```
 ## Tests

-Update the snapshots:
-```bash
-composer update:snapshots
-```
 Run all tests:
 ```bash
 composer test
--- a/README.md
+++ b/README.md
@ -1,7 +1,7 @@
 <p align="center">
    <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/workflow/status/pestphp/pest/Tests/master"></a>
+        <a href="https://github.com/pestphp/pest/actions"><img alt="GitHub Workflow Status (master)" src="https://img.shields.io/github/workflow/status/pestphp/pest/Continuous Integration/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>
@ -15,22 +15,4 @@
 - Follow us on Twitter: **[@pestphp »](https://twitter.com/pestphp)**
 - Join us on the Discord Server: **[discord.gg/bMAJv82 »](https://discord.gg/bMAJv82)**

-## Pest Sponsors
-
-We would like to extend our thanks to the following sponsors for funding Pest development. If you are interested in becoming a sponsor, please visit the Nuno Maduro's [Sponsors page](https://github.com/sponsors/nunomaduro).
-
-### Platinum Sponsors
-
- **[Spatie](https://spatie.be)**
- **[Worksome](https://www.worksome.com/)**
-
-### Premium Sponsors
-
- [Akaunting](https://akaunting.com)
- [Auth0](https://auth0.com)
- [Codecourse](https://codecourse.com/)
- [Fathom Analytics](https://usefathom.com/)
- [Meema](https://meema.io)
- [Scout APM](https://scoutapm.com)
-
-Pest is an open-sourced software licensed under the **[MIT license](https://opensource.org/licenses/MIT)**.
+Pest was created by **[Nuno Maduro](https://twitter.com/enunomaduro)** under the **[Sponsorware license](https://github.com/sponsorware/docs)**. It got open-sourced and is now licensed under the **[MIT license](https://opensource.org/licenses/MIT)**.
--- a/RELEASE.md
+++ b/RELEASE.md
@ -1,17 +0,0 @@
-# Release process
-
-When releasing a new version of Pest there are some checks and updates that need to be done:
-
- Clear your local repository with: `git add . && git reset --hard && git checkout master` 
- On the GitHub repository, check the contents of [github.com/pestphp/pest/compare/{latest_version}...master](https://github.com/pestphp/pest/compare/{latest_version}...master) and update the [changelog](CHANGELOG.md) file with the main changes for this release
- Update the version number in [src/Pest.php](src/Pest.php)
- Run the tests locally using: `composer test`
- Commit the CHANGELOG and Pest file with the message: `git commit -m "release: vX.X.X"`
- Push the changes to GitHub
- Check that the CI is passing as expected: [github.com/pestphp/pest/actions](https://github.com/pestphp/pest/actions)
- Tag and push the tag with `git tag vX.X.X && git push --tags`
- Publish release here: [github.com/pestphp/pest/releases/new](https://github.com/pestphp/pest/releases/new).
-
-### Plugins
-
-Plugins should be versioned using the same major (or minor for `0.x` releases) version as Pest core.
--- a/bin/pest
+++ b/bin/pest
@ -3,10 +3,9 @@

 use NunoMaduro\Collision\Provider;
 use Pest\Actions\ValidatesEnvironment;
+use Pest\Console\Command;
 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;

@ -19,22 +18,16 @@ use Symfony\Component\Console\Output\OutputInterface;

    if (file_exists($vendorPath)) {
        include_once $vendorPath;
-        $autoloadPath = $vendorPath;
    } else {
        include_once $localPath;
-        $autoloadPath = $localPath;
    }

    (new Provider())->register();

-    // Get $rootPath based on $autoloadPath
-    $rootPath = dirname($autoloadPath, 2);
-    $argv = new ArgvInput();
+    $rootPath = getcwd();

-    $testSuite = TestSuite::getInstance($rootPath, $argv->getParameterOption('--test-directory', 'tests'));
-
-    $isDecorated = $argv->getParameterOption('--colors', 'always') !== 'never';
-    $output = new ConsoleOutput(ConsoleOutput::VERBOSITY_NORMAL, $isDecorated);
+    $testSuite = TestSuite::getInstance($rootPath);
+    $output = new ConsoleOutput(ConsoleOutput::VERBOSITY_NORMAL, true);

    $container = Container::getInstance();
    $container->add(TestSuite::class, $testSuite);
@ -42,22 +35,5 @@ use Symfony\Component\Console\Output\OutputInterface;

    ValidatesEnvironment::in($testSuite);

-    $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]);
-            }
-        }
-    }
-
-    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));
+    exit($container->get(Command::class)->run($_SERVER['argv']));
 })();
--- a/tests/Visual/junit.html
+++ b/tests/Visual/junit.html
--- a/compiled/globals.php
+++ b/compiled/globals.php
--- a/composer.json
+++ b/composer.json
@ -17,18 +17,22 @@
        }
    ],
    "require": {
-        "php": "^7.3 || ^8.0",
-        "nunomaduro/collision": "^5.4.0|^6.0",
-        "pestphp/pest-plugin": "^1.0.0",
-        "phpunit/phpunit": "^9.5.5"
+        "php": "^7.3",
+        "nunomaduro/collision": "^5.0.0-BETA3",
+        "pestphp/pest-plugin": "^0.2",
+        "pestphp/pest-plugin-coverage": "^0.2",
+        "pestphp/pest-plugin-init": "^0.2",
+        "phpunit/phpunit": "~9.2.0",
+        "sebastian/environment": "^5.1"
    },
    "autoload": {
        "psr-4": {
            "Pest\\": "src/"
        },
        "files": [
-            "src/Functions.php",
-            "src/Pest.php"
+            "src/globals.php",
+            "src/Pest.php",
+            "compiled/globals.php"
        ]
    },
    "autoload-dev": {
@ -40,11 +44,16 @@
        ]
    },
    "require-dev": {
-        "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"
+        "ergebnis/phpstan-rules": "^0.15.0",
+        "friendsofphp/php-cs-fixer": "^2.16.3",
+        "illuminate/console": "^7.16.1",
+        "illuminate/support": "^7.16.1",
+        "mockery/mockery": "^1.4.0",
+        "phpstan/phpstan": "^0.12.30",
+        "phpstan/phpstan-strict-rules": "^0.12.2",
+        "rector/rector": "^0.7.37",
+        "symfony/var-dumper": "^5.1.2",
+        "thecodingmachine/phpstan-strict-rules": "^0.12.0"
    },
    "minimum-stability": "dev",
    "prefer-stable": true,
@ -56,31 +65,27 @@
        "bin/pest"
    ],
    "scripts": {
-        "lint": "php-cs-fixer fix -v",
-        "test:lint": "php-cs-fixer fix -v --dry-run",
-        "test:types": "phpstan analyse --ansi --memory-limit=-1",
+        "compile": "@php ./scripts/compile.php",
+        "lint": "rector process src && php-cs-fixer fix -v",
+        "test:lint": "php-cs-fixer fix -v --dry-run && rector process src --dry-run",
+        "test:types": "phpstan analyse --ansi --memory-limit=0",
        "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:lint",
            "@test:types",
            "@test:unit",
-            "@test:parallel",
            "@test:integration"
        ]
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.x-dev"
+            "dev-master": "0.2.x-dev"
        },
        "pest": {
            "plugins": [
-                "Pest\\Plugins\\Coverage",
-                "Pest\\Plugins\\Init",
-                "Pest\\Plugins\\Version",
-                "Pest\\Plugins\\Environment"
+                "Pest\\Plugins\\Version"
            ]
        },
        "laravel": {
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@ -1,292 +0,0 @@
-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 \\#1 \\$value of method Pest\\\\Expectation\\<TValue\\>\\:\\:and\\(\\) expects TValue, 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,31 +2,22 @@ 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
    paths:
        - src
+    excludes_analyse:
+        - src/globals.php

    checkMissingIterableValueType: true
    checkGenericClassInNonGenericObjectType: false
    reportUnmatchedIgnoredErrors: true

    ignoreErrors:
-        - "#type mixed is not subtype of native#"
+        - "#Undefined variable: \\$this#"
        - "#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
@ -8,9 +8,9 @@
            <directory suffix=".php">./tests</directory>
        </testsuite>
    </testsuites>
-    <coverage processUncoveredFiles="true">
-        <include>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
            <directory suffix=".php">./src</directory>
-        </include>
-    </coverage>
+        </whitelist>
+    </filter>
 </phpunit>
--- a/rector.yaml
+++ b/rector.yaml
@ -0,0 +1,16 @@
+# rector.yaml
+parameters:
+    sets:
+        - 'action-injection-to-constructor-injection'
+        - 'array-str-functions-to-static-call'
+        - 'celebrity'
+        - 'doctrine'
+        - 'phpstan'
+        - 'phpunit-code-quality'
+        - 'solid'
+        - 'early-return'
+        - 'doctrine-code-quality'
+        - 'code-quality'
+        - 'php71'
+        - 'php72'
+        - 'php73'
--- a/scripts/compile.php
+++ b/scripts/compile.php
@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+$globalsFilePath = implode(DIRECTORY_SEPARATOR, [
+    dirname(__DIR__),
+    'vendor',
+    'phpunit',
+    'phpunit',
+    'src',
+    'Framework',
+    'Assert',
+    'Functions.php',
+]);
+
+$compiledFilePath = implode(DIRECTORY_SEPARATOR, [dirname(__DIR__), 'compiled', 'globals.php']);
+
+@unlink($compiledFilePath);
+
+$replace = function ($contents, $string, $by) {
+    return str_replace($string, $by, $contents);
+};
+
+$remove = function ($contents, $string) {
+    return str_replace($string, '', $contents);
+};
+
+$contents = file_get_contents($globalsFilePath);
+$contents = $replace($contents, 'namespace PHPUnit\Framework;', 'use PHPUnit\Framework\Assert;');
+$contents = $remove($contents, 'use ArrayAccess;');
+$contents = $remove($contents, 'use Countable;');
+$contents = $remove($contents, 'use DOMDocument;');
+$contents = $remove($contents, 'use DOMElement;');
+$contents = $remove($contents, 'use Throwable;');
+
+file_put_contents(implode(DIRECTORY_SEPARATOR, [dirname(__DIR__), 'compiled', 'globals.php']), $contents);
--- a/src/Actions/AddsDefaults.php
+++ b/src/Actions/AddsDefaults.php
@ -5,17 +5,12 @@ 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.
     *
@ -25,20 +20,8 @@ final class AddsDefaults
     */
    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']);
+        if (!array_key_exists('printer', $arguments)) {
+            $arguments['printer'] = new Printer(null, $arguments['verbose'] ?? false, $arguments['colors'] ?? 'always');
        }

        return $arguments;
--- a/src/Actions/AddsTests.php
+++ b/src/Actions/AddsTests.php
@ -22,6 +22,8 @@ final class AddsTests
    {
        self::removeTestClosureWarnings($testSuite);

+        // @todo refactor this...
+
        $testSuites = [];
        $pestTestSuite->tests->build($pestTestSuite, function (TestCase $testCase) use (&$testSuites): void {
            $testCaseClass = get_class($testCase);
--- a/src/Actions/InteractsWithPlugins.php
+++ b/src/Actions/InteractsWithPlugins.php
@ -1,50 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Actions;
-
-use Pest\Contracts\Plugins\AddsOutput;
-use Pest\Contracts\Plugins\HandlesArguments;
-use Pest\Plugin\Loader;
-
-/**
- * @internal
- */
-final class InteractsWithPlugins
-{
-    /**
-     * Transform the input arguments by passing it to the relevant plugins.
-     *
-     * @param array<int, string> $argv
-     *
-     * @return array<int, string>
-     */
-    public static function handleArguments(array $argv): array
-    {
-        $plugins = Loader::getPlugins(HandlesArguments::class);
-
-        /** @var HandlesArguments $plugin */
-        foreach ($plugins as $plugin) {
-            $argv = $plugin->handleArguments($argv);
-        }
-
-        return $argv;
-    }
-
-    /**
-     * Provides an opportunity for any plugins that want
-     * to provide additional output after test execution.
-     */
-    public static function addOutput(int $result): int
-    {
-        $plugins = Loader::getPlugins(AddsOutput::class);
-
-        /** @var AddsOutput $plugin */
-        foreach ($plugins as $plugin) {
-            $result = $plugin->addOutput($result);
-        }
-
-        return $result;
-    }
-}
--- a/src/Actions/LoadStructure.php
+++ b/src/Actions/LoadStructure.php
@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Pest\Actions;

 use Pest\Support\Str;
-use function Pest\testDirectory;
+use PHPUnit\TextUI\Configuration\Configuration;
 use PHPUnit\Util\FileLoader;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
@ -21,7 +21,6 @@ final class LoadStructure
     * @var array<int, string>
     */
    private const STRUCTURE = [
-        'Expectations.php',
        'Datasets.php',
        'Helpers.php',
        'Pest.php',
@ -33,7 +32,7 @@ final class LoadStructure
     */
    public static function in(string $rootPath): void
    {
-        $testsPath = $rootPath . DIRECTORY_SEPARATOR . testDirectory();
+        $testsPath = $rootPath . DIRECTORY_SEPARATOR . 'tests';

        $load = function ($filename): bool {
            return file_exists($filename) && (bool) FileLoader::checkAndLoad($filename);
--- a/src/Actions/ValidatesConfiguration.php
+++ b/src/Actions/ValidatesConfiguration.php
@ -6,7 +6,8 @@ namespace Pest\Actions;

 use Pest\Exceptions\AttributeNotSupportedYet;
 use Pest\Exceptions\FileOrFolderNotFound;
-use PHPUnit\TextUI\XmlConfiguration\Loader;
+use PHPUnit\TextUI\Configuration\Configuration;
+use PHPUnit\TextUI\Configuration\Registry;

 /**
 * @internal
@ -29,7 +30,9 @@ final class ValidatesConfiguration
            throw new FileOrFolderNotFound('phpunit.xml');
        }

-        $configuration = (new Loader())->load($arguments[self::CONFIGURATION_KEY])->phpunit();
+        $configuration = Registry::getInstance()
+            ->get($arguments[self::CONFIGURATION_KEY])
+            ->phpunit();

        if ($configuration->processIsolation()) {
            throw new AttributeNotSupportedYet('processIsolation', 'true');
--- a/src/Concerns/Expectable.php
+++ b/src/Concerns/Expectable.php
@ -1,27 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Concerns;
-
-use Pest\Expectation;
-
-/**
- * @internal
- */
-trait Expectable
-{
-    /**
-     * @template TValue
-     *
-     * Creates a new expectation.
-     *
-     * @param TValue $value
-     *
-     * @return Expectation<TValue>
-     */
-    public function expect($value): Expectation
-    {
-        return new Expectation($value);
-    }
-}
--- a/src/Concerns/Extendable.php
+++ b/src/Concerns/Extendable.php
@ -1,54 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Concerns;
-
-use BadMethodCallException;
-use Closure;
-
-/**
- * @internal
- */
-trait Extendable
-{
-    /**
-     * @var array<string, Closure>
-     */
-    private static $extends = [];
-
-    /**
-     * Register a custom extend.
-     */
-    public static function extend(string $name, Closure $extend): void
-    {
-        static::$extends[$name] = $extend;
-    }
-
-    /**
-     * 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
@ -1,33 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Concerns\Logging;
-
-/**
- * @internal
- */
-trait WritesToConsole
-{
-    private function writeSuccess(string $message): void
-    {
-        $this->writePestTestOutput($message, 'fg-green, bold', '✓');
-    }
-
-    private function writeError(string $message): void
-    {
-        $this->writePestTestOutput($message, 'fg-red, bold', '⨯');
-    }
-
-    private function writeWarning(string $message): void
-    {
-        $this->writePestTestOutput($message, 'fg-yellow, bold', '-');
-    }
-
-    private function writePestTestOutput(string $message, string $color, string $symbol): void
-    {
-        $this->writeWithColor($color, "$symbol ", false);
-        $this->write($message);
-        $this->writeNewLine();
-    }
-}
--- a/src/Concerns/RetrievesValues.php
+++ b/src/Concerns/RetrievesValues.php
@ -1,31 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Concerns;
-
-/**
- * @internal
- */
-trait RetrievesValues
-{
-    /**
-     * @template TRetrievableValue
-     *
-     * Safely retrieve the value at the given key from an object or array.
-     *
-     * @param array<string, TRetrievableValue>|object $value
-     * @param TRetrievableValue|null                  $default
-     *
-     * @return TRetrievableValue|null
-     */
-    private function retrieve(string $key, $value, $default = null)
-    {
-        if (is_array($value)) {
-            return $value[$key] ?? $default;
-        }
-
-        // @phpstan-ignore-next-line
-        return $value->$key ?? $default;
-    }
-}
--- a/src/Concerns/TestCase.php
+++ b/src/Concerns/TestCase.php
@ -0,0 +1,158 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Concerns;
+
+use Closure;
+use Pest\Support\ExceptionTrace;
+use Pest\TestSuite;
+use PHPUnit\Util\Test;
+
+/**
+ * To avoid inheritance conflicts, all the fields related
+ * to Pest only will be prefixed by double underscore.
+ *
+ * @internal
+ */
+trait TestCase
+{
+    /**
+     * The test case description. Contains the first
+     * argument of global functions like `it` and `test`.
+     *
+     * @var string
+     */
+    private $__description;
+
+    /**
+     * Holds the test closure function.
+     *
+     * @var Closure
+     */
+    private $__test;
+
+    /**
+     * Creates a new instance of the test case.
+     */
+    public function __construct(Closure $test, string $description, array $data)
+    {
+        $this->__test        = $test;
+        $this->__description = $description;
+
+        parent::__construct('__test', $data);
+    }
+
+    /**
+     * Adds the groups to the current test case.
+     */
+    public function addGroups(array $groups): void
+    {
+        $groups = array_unique(array_merge($this->getGroups(), $groups));
+
+        $this->setGroups($groups);
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * This method is called before the first test of this test class is run.
+     */
+    public static function setUpBeforeClass(): void
+    {
+        parent::setUpBeforeClass();
+
+        $beforeAll = TestSuite::getInstance()->beforeAll->get(self::$__filename);
+
+        call_user_func(Closure::bind($beforeAll, null, self::class));
+    }
+
+    /**
+     * 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);
+
+        call_user_func(Closure::bind($afterAll, null, self::class));
+
+        parent::tearDownAfterClass();
+    }
+
+    /**
+     * Gets executed before the test.
+     */
+    protected function setUp(): void
+    {
+        TestSuite::getInstance()->test = $this;
+
+        parent::setUp();
+
+        $beforeEach = TestSuite::getInstance()->beforeEach->get(self::$__filename);
+
+        $this->__callClosure($beforeEach, func_get_args());
+    }
+
+    /**
+     * Gets executed after the test.
+     */
+    protected function tearDown(): void
+    {
+        $afterEach = TestSuite::getInstance()->afterEach->get(self::$__filename);
+
+        $this->__callClosure($afterEach, func_get_args());
+
+        parent::tearDown();
+
+        TestSuite::getInstance()->test = null;
+    }
+
+    /**
+     * 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
+     */
+    public function __test()
+    {
+        return $this->__callClosure($this->__test, func_get_args());
+    }
+
+    /**
+     * @return mixed
+     *
+     * @throws \Throwable
+     */
+    private function __callClosure(Closure $closure, array $arguments)
+    {
+        return ExceptionTrace::ensure(function () use ($closure, $arguments) {
+            return call_user_func_array(Closure::bind($closure, $this, get_class($this)), $arguments);
+        });
+    }
+
+    public function getPrintableTestCaseName(): string
+    {
+        return ltrim(self::class, 'P\\');
+    }
+}
--- a/src/Concerns/Testable.php
+++ b/src/Concerns/Testable.php
@ -1,307 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Concerns;
-
-use Closure;
-use Pest\Support\ChainableClosure;
-use Pest\Support\ExceptionTrace;
-use Pest\TestSuite;
-use PHPUnit\Framework\ExecutionOrderDependency;
-use Throwable;
-
-/**
- * To avoid inheritance conflicts, all the fields related
- * to Pest only will be prefixed by double underscore.
- *
- * @internal
- */
-trait Testable
-{
-    /**
-     * The test case description. Contains the first
-     * argument of global functions like `it` and `test`.
-     *
-     * @var string
-     */
-    private $__description;
-
-    /**
-     * Holds the test closure function.
-     *
-     * @var Closure
-     */
-    private $__test;
-
-    /**
-     * Holds a global/shared beforeEach ("set up") closure if one has been
-     * defined.
-     *
-     * @var Closure|null
-     */
-    private $beforeEach = null;
-
-    /**
-     * Holds a global/shared afterEach ("tear down") closure if one has been
-     * defined.
-     *
-     * @var Closure|null
-     */
-    private $afterEach = null;
-
-    /**
-     * Holds a global/shared beforeAll ("set up before") closure if one has been
-     * defined.
-     *
-     * @var Closure|null
-     */
-    private static $beforeAll = null;
-
-    /**
-     * Holds a global/shared afterAll ("tear down after") closure if one has
-     * been defined.
-     *
-     * @var Closure|null
-     */
-    private static $afterAll = null;
-
-    /**
-     * Creates a new instance of the test case.
-     */
-    public function __construct(Closure $test, string $description, array $data)
-    {
-        $this->__test        = $test;
-        $this->__description = $description;
-        self::$beforeAll     = null;
-        self::$afterAll      = null;
-
-        parent::__construct('__test', $data);
-    }
-
-    /**
-     * Adds the groups to the current test case.
-     */
-    public function addGroups(array $groups): void
-    {
-        $groups = array_unique(array_merge($this->getGroups(), $groups));
-
-        $this->setGroups($groups);
-    }
-
-    /**
-     * Add dependencies to the test case and map them to instances of ExecutionOrderDependency.
-     */
-    public function addDependencies(array $tests): void
-    {
-        $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)
-            : $hook;
-    }
-
-    /**
-     * Add a shared/"global" after all test hook that will execute **before**
-     * the test defined `afterAll` hook(s).
-     */
-    public function addAfterAll(?Closure $hook): void
-    {
-        if (!$hook) {
-            return;
-        }
-
-        self::$afterAll = (self::$afterAll instanceof Closure)
-            ? ChainableClosure::fromStatic(self::$afterAll, $hook)
-            : $hook;
-    }
-
-    /**
-     * Add a shared/"global" before each test hook that will execute **before**
-     * the test defined `beforeEach` hook.
-     */
-    public function addBeforeEach(?Closure $hook): void
-    {
-        $this->addHook('beforeEach', $hook);
-    }
-
-    /**
-     * Add a shared/"global" after each test hook that will execute **before**
-     * the test defined `afterEach` hook.
-     */
-    public function addAfterEach(?Closure $hook): void
-    {
-        $this->addHook('afterEach', $hook);
-    }
-
-    /**
-     * Add a shared/global hook and compose them if more than one is passed.
-     */
-    private function addHook(string $property, ?Closure $hook): void
-    {
-        if (!$hook) {
-            return;
-        }
-
-        $this->{$property} = ($this->{$property} instanceof Closure)
-            ? ChainableClosure::from($this->{$property}, $hook)
-            : $hook;
-    }
-
-    /**
-     * 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
-    {
-        parent::setUpBeforeClass();
-
-        $beforeAll = TestSuite::getInstance()->beforeAll->get(self::$__filename);
-
-        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 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);
-        }
-
-        call_user_func(Closure::bind($afterAll, null, self::class));
-
-        parent::tearDownAfterClass();
-    }
-
-    /**
-     * Gets executed before the test.
-     */
-    protected function setUp(): void
-    {
-        TestSuite::getInstance()->test = $this;
-
-        parent::setUp();
-
-        $beforeEach = TestSuite::getInstance()->beforeEach->get(self::$__filename);
-
-        if ($this->beforeEach instanceof Closure) {
-            $beforeEach = ChainableClosure::from($this->beforeEach, $beforeEach);
-        }
-
-        $this->__callClosure($beforeEach, func_get_args());
-    }
-
-    /**
-     * 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);
-        }
-
-        $this->__callClosure($afterEach, func_get_args());
-
-        parent::tearDown();
-
-        TestSuite::getInstance()->test = null;
-    }
-
-    /**
-     * 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
-     */
-    public function __test()
-    {
-        return $this->__callClosure($this->__test, $this->resolveTestArguments(func_get_args()));
-    }
-
-    /**
-     * Resolve the passed arguments. Any Closures will be bound to the testcase and resolved.
-     *
-     * @throws Throwable
-     */
-    private function resolveTestArguments(array $arguments): array
-    {
-        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)
-    {
-        return ExceptionTrace::ensure(function () use ($closure, $arguments) {
-            return call_user_func_array(Closure::bind($closure, $this, get_class($this)), $arguments);
-        });
-    }
-
-    public function getPrintableTestCaseName(): string
-    {
-        return ltrim(self::class, 'P\\');
-    }
-}
--- a/src/Console/Command.php
+++ b/src/Console/Command.php
@ -6,11 +6,11 @@ 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\Contracts\Plugins\AddsOutput;
+use Pest\Contracts\Plugins\HandlesArguments;
+use Pest\Plugin\Loader;
 use Pest\TestSuite;
 use PHPUnit\Framework\TestSuite as BaseTestSuite;
 use PHPUnit\TextUI\Command as BaseCommand;
@ -55,12 +55,23 @@ final class Command extends BaseCommand
     */
    protected function handleArguments(array $argv): void
    {
-        $argv = InteractsWithPlugins::handleArguments($argv);
+        /*
+         * First, let's call all plugins that want to handle arguments
+         */
+        $plugins = Loader::getPlugins(HandlesArguments::class);

+        /** @var HandlesArguments $plugin */
+        foreach ($plugins as $plugin) {
+            $argv = $plugin->handleArguments($argv);
+        }
+
+        /*
+         * Next, as usual, let's send the console arguments to PHPUnit.
+         */
        parent::handleArguments($argv);

        /*
-         * Let's validate the configuration. Making
+         * Finally, let's validate the configuration. Making
         * sure all options are yet supported by Pest.
         */
        ValidatesConfiguration::in($this->arguments);
@ -77,6 +88,8 @@ final class Command extends BaseCommand
         */
        $this->arguments = AddsDefaults::to($this->arguments);

+        LoadStructure::in($this->testSuite->rootPath);
+
        $testRunner = new TestRunner($this->arguments['loader']);
        $testSuite  = $this->arguments['test'];

@ -112,21 +125,18 @@ final class Command extends BaseCommand
     */
    public function run(array $argv, bool $exit = true): int
    {
-        LoadStructure::in($this->testSuite->rootPath);
-
        $result = parent::run($argv, false);
-        $result = InteractsWithPlugins::addOutput($result);
+
+        /*
+         * Let's call all plugins that want to add output after test execution
+         */
+        $plugins = Loader::getPlugins(AddsOutput::class);
+
+        /** @var AddsOutput $plugin */
+        foreach ($plugins as $plugin) {
+            $result = $plugin->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
@ -1,37 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Console;
-
-use Symfony\Component\Console\Output\OutputInterface;
-
-/**
- * @internal
- */
-final class Help
-{
-    /** @var array<int, string> */
-    private const HELP_MESSAGES = [
-        '<comment>Pest Options:</comment>',
-        '  <info>--init</info>                      Initialise a standard Pest configuration',
-        '  <info>--coverage</info>                  Enable coverage and output to standard output',
-        '  <info>--min=<fg=cyan><N></></info>                   Set the minimum required coverage percentage (<N>), and fail if not met',
-        '  <info>--group=<fg=cyan><name></></info>              Only runs tests from the specified group(s)',
-    ];
-
-    /** @var OutputInterface */
-    private $output;
-
-    public function __construct(OutputInterface $output)
-    {
-        $this->output = $output;
-    }
-
-    public function __invoke(): void
-    {
-        foreach (self::HELP_MESSAGES as $message) {
-            $this->output->writeln($message);
-        }
-    }
-}
--- a/src/Contracts/Plugins/HandlesArguments.php
+++ b/src/Contracts/Plugins/HandlesArguments.php
@ -12,6 +12,9 @@ interface HandlesArguments
    /**
     * Allows to handle custom command line arguments.
     *
+     * PLEASE NOTE: it is necessary to remove any custom argument from the array
+     * because otherwise the application will complain about them
+     *
     * @param array<int, string> $arguments
     *
     * @return array<int, string> the updated list of arguments
--- a/src/Datasets.php
+++ b/src/Datasets.php
@ -18,14 +18,14 @@ final class Datasets
    /**
     * Holds the datasets.
     *
-     * @var array<int|string, Closure|iterable<int|string, mixed>>
+     * @var array<string, \Closure|iterable<int, mixed>>
     */
    private static $datasets = [];

    /**
     * Sets the given.
     *
-     * @param Closure|iterable<int|string, mixed> $data
+     * @param Closure|iterable<int, mixed> $data
     */
    public static function set(string $name, $data): void
    {
@ -37,7 +37,7 @@ final class Datasets
    }

    /**
-     * @return Closure|iterable<int|string, mixed>
+     * @return Closure|iterable<int, mixed>
     */
    public static function get(string $name)
    {
@ -51,34 +51,36 @@ final class Datasets
    /**
     * Resolves the current dataset to an array value.
     *
-     * @param array<Closure|iterable<int|string, mixed>|string> $datasets
+     * @param Traversable<int, mixed>|Closure|iterable<int, mixed>|string|null $data
     *
     * @return array<string, mixed>
     */
-    public static function resolve(string $description, array $datasets): array
+    public static function resolve(string $description, $data): array
    {
        /* @phpstan-ignore-next-line */
-        if (empty($datasets)) {
+        if (is_null($data) || empty($data)) {
            return [$description => []];
        }

-        $datasets = self::processDatasets($datasets);
+        if (is_string($data)) {
+            $data = self::get($data);
+        }

-        $datasetCombinations = self::getDataSetsCombinations($datasets);
+        if (is_callable($data)) {
+            $data = call_user_func($data);
+        }
+
+        if ($data instanceof Traversable) {
+            $data = iterator_to_array($data);
+        }

        $dataSetDescriptions = [];
        $dataSetValues       = [];

-        foreach ($datasetCombinations as $datasetCombination) {
-            $partialDescriptions = [];
-            $values              = [];
+        foreach ($data as $values) {
+            $values = is_array($values) ? $values : [$values];

-            foreach ($datasetCombination as $dataset_data) {
-                $partialDescriptions[] = $dataset_data['label'];
-                $values                = array_merge($values, $dataset_data['values']);
-            }
-
-            $dataSetDescriptions[] = $description . ' with ' . implode(' / ', $partialDescriptions);
+            $dataSetDescriptions[] = $description . self::getDataSetDescription($values);
            $dataSetValues[]       = $values;
        }

@ -102,76 +104,12 @@ final class Datasets
    }

    /**
-     * @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
+    private static function getDataSetDescription(array $data): string
    {
        $exporter = new Exporter();

-        if (is_int($key)) {
-            return \sprintf('(%s)', $exporter->shortenedRecursiveExport($data));
-        }
-
-        return \sprintf('data set "%s"', $key);
+        return \sprintf(' with (%s)', $exporter->shortenedRecursiveExport($data));
    }
 }
--- a/src/Each.php
+++ b/src/Each.php
@ -1,77 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest;
-
-/**
- * @internal
- *
- * @mixin Expectation
- */
-final class Each
-{
-    /**
-     * @var Expectation
-     */
-    private $original;
-
-    /**
-     * @var bool
-     */
-    private $opposite = false;
-
-    /**
-     * Creates an expectation on each item of the iterable "value".
-     */
-    public function __construct(Expectation $original)
-    {
-        $this->original = $original;
-    }
-
-    /**
-     * Creates a new expectation.
-     *
-     * @param mixed $value
-     */
-    public function and($value): Expectation
-    {
-        return $this->original->and($value);
-    }
-
-    /**
-     * Creates the opposite expectation for the value.
-     */
-    public function not(): Each
-    {
-        $this->opposite = true;
-
-        return $this;
-    }
-
-    /**
-     * Dynamically calls methods on the class with the given arguments on each item.
-     *
-     * @param array<int|string, mixed> $arguments
-     */
-    public function __call(string $name, array $arguments): Each
-    {
-        foreach ($this->original->value as $item) {
-            /* @phpstan-ignore-next-line */
-            $this->opposite ? expect($item)->not()->$name(...$arguments) : expect($item)->$name(...$arguments);
-        }
-
-        $this->opposite = false;
-
-        return $this;
-    }
-
-    /**
-     * Dynamically calls methods on the class without any arguments on each item.
-     */
-    public function __get(string $name): Each
-    {
-        /* @phpstan-ignore-next-line */
-        return $this->$name();
-    }
-}
--- a/src/Exceptions/DatasetMissing.php
+++ b/src/Exceptions/DatasetMissing.php
@ -1,36 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Exceptions;
-
-use BadFunctionCallException;
-use NunoMaduro\Collision\Contracts\RenderlessEditor;
-use NunoMaduro\Collision\Contracts\RenderlessTrace;
-use Symfony\Component\Console\Exception\ExceptionInterface;
-
-/**
- * Creates a new instance of dataset is not present for test that has arguments.
- *
- * @internal
- */
-final class DatasetMissing extends BadFunctionCallException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
-{
-    /**
-     * Create new exception instance.
-     *
-     * @param array<string, string> $args A map of argument names to their typee
-     */
-    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($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/InvalidUsesPath.php
+++ b/src/Exceptions/InvalidUsesPath.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 InvalidUsesPath extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
+{
+    /**
+     * Creates a new instance of invalid uses path.
+     */
+    public function __construct(string $target)
+    {
+        parent::__construct(sprintf('The path `%s` is not valid.', $target));
+    }
+}
--- a/src/Exceptions/MissingDependency.php
+++ b/src/Exceptions/MissingDependency.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 MissingDependency extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
-{
-    /**
-     * Creates a new instance of missing dependency.
-     */
-    public function __construct(string $feature, string $dependency)
-    {
-        parent::__construct(sprintf('The feature "%s" requires "%s".', $feature, $dependency));
-    }
-}
--- a/src/Expectation.php
+++ b/src/Expectation.php
@ -1,985 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest;
-
-use BadMethodCallException;
-use Closure;
-use InvalidArgumentException;
-use Pest\Concerns\Extendable;
-use Pest\Concerns\RetrievesValues;
-use Pest\Support\Arr;
-use Pest\Support\NullClosure;
-use PHPUnit\Framework\Assert;
-use PHPUnit\Framework\Constraint\Constraint;
-use PHPUnit\Framework\ExpectationFailedException;
-use ReflectionFunction;
-use ReflectionNamedType;
-use SebastianBergmann\Exporter\Exporter;
-use Throwable;
-
-/**
- * @internal
- *
- * @template TValue
- *
- * @property Expectation $not  Creates the opposite expectation.
- * @property Each        $each Creates an expectation on each element on the traversable value.
- */
-final class Expectation
-{
-    use Extendable {
-        __call as __extendsCall;
-    }
-    use RetrievesValues;
-
-    /**
-     * The expectation value.
-     *
-     * @readonly
-     *
-     * @var mixed
-     */
-    public $value;
-
-    /**
-     * The exporter instance, if any.
-     *
-     * @readonly
-     *
-     * @var Exporter|null
-     */
-    private $exporter;
-
-    /**
-     * Creates a new expectation.
-     *
-     * @param TValue $value
-     */
-    public function __construct($value)
-    {
-        $this->value = $value;
-    }
-
-    /**
-     * Creates a new expectation.
-     *
-     * @param TValue $value
-     *
-     * @return Expectation<TValue>
-     */
-    public function and($value): Expectation
-    {
-        return new self($value);
-    }
-
-    /**
-     * Creates a new expectation with the decoded JSON value.
-     */
-    public function json(): Expectation
-    {
-        return $this->toBeJson()->and(json_decode($this->value, true));
-    }
-
-    /**
-     * Dump the expectation value and end the script.
-     *
-     * @param mixed $arguments
-     *
-     * @return never
-     */
-    public function dd(...$arguments): void
-    {
-        if (function_exists('dd')) {
-            dd($this->value, ...$arguments);
-        }
-
-        var_dump($this->value);
-
-        exit(1);
-    }
-
-    /**
-     * Send the expectation value to Ray along with all given arguments.
-     *
-     * @param mixed $arguments
-     */
-    public function ray(...$arguments): self
-    {
-        if (function_exists('ray')) {
-            ray($this->value, ...$arguments);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Creates the opposite expectation for the value.
-     */
-    public function not(): OppositeExpectation
-    {
-        return new OppositeExpectation($this);
-    }
-
-    /**
-     * Creates an expectation on each item of the iterable "value".
-     */
-    public function each(callable $callback = null): Each
-    {
-        if (!is_iterable($this->value)) {
-            throw new BadMethodCallException('Expectation value is not iterable.');
-        }
-
-        if (is_callable($callback)) {
-            foreach ($this->value as $item) {
-                $callback(new self($item));
-            }
-        }
-
-        return new Each($this);
-    }
-
-    /**
-     * Allows you to specify a sequential set of expectations for each item in a iterable "value".
-     *
-     * @template TSequenceValue
-     *
-     * @param callable(self, self): void|TSequenceValue ...$callbacks
-     */
-    public function sequence(...$callbacks): Expectation
-    {
-        if (!is_iterable($this->value)) {
-            throw new BadMethodCallException('Expectation value is not iterable.');
-        }
-
-        $value          = is_array($this->value) ? $this->value : iterator_to_array($this->value);
-        $keys           = array_keys($value);
-        $values         = array_values($value);
-        $callbacksCount = count($callbacks);
-
-        $index = 0;
-
-        while (count($callbacks) < count($values)) {
-            $callbacks[] = $callbacks[$index];
-            $index       = $index < count($values) - 1 ? $index + 1 : 0;
-        }
-
-        if ($callbacksCount > count($values)) {
-            Assert::assertLessThanOrEqual(count($value), count($callbacks));
-        }
-
-        foreach ($values as $key => $item) {
-            if (is_callable($callbacks[$key])) {
-                call_user_func($callbacks[$key], new self($item), new self($keys[$key]));
-                continue;
-            }
-
-            (new self($item))->toEqual($callbacks[$key]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * If the subject matches one of the given "expressions", the expression callback will run.
-     *
-     * @template TMatchSubject of array-key
-     *
-     * @param callable(): TMatchSubject|TMatchSubject $subject
-     * @param array<TMatchSubject, (callable(Expectation<TValue>): mixed)|TValue> $expressions
-     */
-    public function match($subject, array $expressions): Expectation
-    {
-        $subject = is_callable($subject)
-            ? $subject
-            : function () use ($subject) {
-                return $subject;
-            };
-
-        $subject   = $subject();
-
-        $matched = false;
-
-        foreach ($expressions as $key => $callback) {
-            if ($subject != $key) {
-                continue;
-            }
-
-            $matched = true;
-
-            if (is_callable($callback)) {
-                $callback(new self($this->value));
-                continue;
-            }
-
-            $this->and($this->value)->toEqual($callback);
-
-            break;
-        }
-
-        if ($matched === false) {
-            throw new ExpectationFailedException('Unhandled match value.');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Apply the callback if the given "condition" is falsy.
-     *
-     * @param  (callable(): bool)|bool $condition
-     * @param callable(Expectation<TValue>): mixed $callback
-     */
-    public function unless($condition, callable $callback): Expectation
-    {
-        $condition = is_callable($condition)
-            ? $condition
-            : static function () use ($condition): bool {
-                return (bool) $condition; // @phpstan-ignore-line
-            };
-
-        return $this->when(!$condition(), $callback);
-    }
-
-    /**
-     * Apply the callback if the given "condition" is truthy.
-     *
-     * @param  (callable(): bool)|bool $condition
-     * @param callable(Expectation<TValue>): mixed $callback
-     */
-    public function when($condition, callable $callback): Expectation
-    {
-        $condition = is_callable($condition)
-            ? $condition
-            : static function () use ($condition): bool {
-                return (bool) $condition; // @phpstan-ignore-line
-            };
-
-        if ($condition()) {
-            $callback($this->and($this->value));
-        }
-
-        return $this;
-    }
-
-    /**
-     * Asserts that two variables have the same type and
-     * value. Used on objects, it asserts that two
-     * variables reference the same object.
-     *
-     * @param mixed $expected
-     */
-    public function toBe($expected): Expectation
-    {
-        Assert::assertSame($expected, $this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is empty.
-     */
-    public function toBeEmpty(): Expectation
-    {
-        Assert::assertEmpty($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is true.
-     */
-    public function toBeTrue(): Expectation
-    {
-        Assert::assertTrue($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is truthy.
-     */
-    public function toBeTruthy(): Expectation
-    {
-        Assert::assertTrue((bool) $this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is false.
-     */
-    public function toBeFalse(): Expectation
-    {
-        Assert::assertFalse($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is falsy.
-     */
-    public function toBeFalsy(): Expectation
-    {
-        Assert::assertFalse((bool) $this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is greater than $expected.
-     *
-     * @param int|float $expected
-     */
-    public function toBeGreaterThan($expected): Expectation
-    {
-        Assert::assertGreaterThan($expected, $this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is greater than or equal to $expected.
-     *
-     * @param int|float $expected
-     */
-    public function toBeGreaterThanOrEqual($expected): Expectation
-    {
-        Assert::assertGreaterThanOrEqual($expected, $this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is less than or equal to $expected.
-     *
-     * @param int|float $expected
-     */
-    public function toBeLessThan($expected): Expectation
-    {
-        Assert::assertLessThan($expected, $this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is less than $expected.
-     *
-     * @param int|float $expected
-     */
-    public function toBeLessThanOrEqual($expected): Expectation
-    {
-        Assert::assertLessThanOrEqual($expected, $this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that $needle is an element of the value.
-     *
-     * @param mixed $needles
-     */
-    public function toContain(...$needles): Expectation
-    {
-        foreach ($needles as $needle) {
-            if (is_string($this->value)) {
-                Assert::assertStringContainsString($needle, $this->value);
-            } else {
-                Assert::assertContains($needle, $this->value);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value starts with $expected.
-     */
-    public function toStartWith(string $expected): Expectation
-    {
-        Assert::assertStringStartsWith($expected, $this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value ends with $expected.
-     */
-    public function toEndWith(string $expected): Expectation
-    {
-        Assert::assertStringEndsWith($expected, $this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that $number matches value's Length.
-     */
-    public function toHaveLength(int $number): Expectation
-    {
-        if (is_string($this->value)) {
-            Assert::assertEquals($number, mb_strlen($this->value));
-
-            return $this;
-        }
-
-        if (is_iterable($this->value)) {
-            return $this->toHaveCount($number);
-        }
-
-        if (is_object($this->value)) {
-            if (method_exists($this->value, 'toArray')) {
-                $array = $this->value->toArray();
-            } else {
-                $array = (array) $this->value;
-            }
-
-            Assert::assertCount($number, $array);
-
-            return $this;
-        }
-
-        throw new BadMethodCallException('Expectation value length is not countable.');
-    }
-
-    /**
-     * Asserts that $count matches the number of elements of the value.
-     */
-    public function toHaveCount(int $count): Expectation
-    {
-        Assert::assertCount($count, $this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value contains the property $name.
-     *
-     * @param mixed $value
-     */
-    public function toHaveProperty(string $name, $value = null): Expectation
-    {
-        $this->toBeObject();
-
-        Assert::assertTrue(property_exists($this->value, $name));
-
-        if (func_num_args() > 1) {
-            /* @phpstan-ignore-next-line */
-            Assert::assertEquals($value, $this->value->{$name});
-        }
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value contains the provided properties $names.
-     *
-     * @param iterable<array-key, string> $names
-     */
-    public function toHaveProperties(iterable $names): Expectation
-    {
-        foreach ($names as $name) {
-            $this->toHaveProperty($name);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Asserts that two variables have the same value.
-     *
-     * @param mixed $expected
-     */
-    public function toEqual($expected): Expectation
-    {
-        Assert::assertEquals($expected, $this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that two variables have the same value.
-     * The contents of $expected and the $this->value are
-     * canonicalized before they are compared. For instance, when the two
-     * variables $expected and $this->value are arrays, then these arrays
-     * are sorted before they are compared. When $expected and $this->value
-     * are objects, each object is converted to an array containing all
-     * private, protected and public attributes.
-     *
-     * @param mixed $expected
-     */
-    public function toEqualCanonicalizing($expected): Expectation
-    {
-        Assert::assertEqualsCanonicalizing($expected, $this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the absolute difference between the value and $expected
-     * is lower than $delta.
-     *
-     * @param mixed $expected
-     */
-    public function toEqualWithDelta($expected, float $delta): Expectation
-    {
-        Assert::assertEqualsWithDelta($expected, $this->value, $delta);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is one of the given values.
-     *
-     * @param iterable<int|string, mixed> $values
-     */
-    public function toBeIn(iterable $values): Expectation
-    {
-        Assert::assertContains($this->value, $values);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is infinite.
-     */
-    public function toBeInfinite(): Expectation
-    {
-        Assert::assertInfinite($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is an instance of $class.
-     *
-     * @param string $class
-     */
-    public function toBeInstanceOf($class): Expectation
-    {
-        /* @phpstan-ignore-next-line */
-        Assert::assertInstanceOf($class, $this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is an array.
-     */
-    public function toBeArray(): Expectation
-    {
-        Assert::assertIsArray($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is of type bool.
-     */
-    public function toBeBool(): Expectation
-    {
-        Assert::assertIsBool($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is of type callable.
-     */
-    public function toBeCallable(): Expectation
-    {
-        Assert::assertIsCallable($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is of type float.
-     */
-    public function toBeFloat(): Expectation
-    {
-        Assert::assertIsFloat($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is of type int.
-     */
-    public function toBeInt(): Expectation
-    {
-        Assert::assertIsInt($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is of type iterable.
-     */
-    public function toBeIterable(): Expectation
-    {
-        Assert::assertIsIterable($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is of type numeric.
-     */
-    public function toBeNumeric(): Expectation
-    {
-        Assert::assertIsNumeric($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is of type object.
-     */
-    public function toBeObject(): Expectation
-    {
-        Assert::assertIsObject($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is of type resource.
-     */
-    public function toBeResource(): Expectation
-    {
-        Assert::assertIsResource($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is of type scalar.
-     */
-    public function toBeScalar(): Expectation
-    {
-        Assert::assertIsScalar($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is of type string.
-     */
-    public function toBeString(): Expectation
-    {
-        Assert::assertIsString($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is a JSON string.
-     */
-    public function toBeJson(): Expectation
-    {
-        Assert::assertIsString($this->value);
-        Assert::assertJson($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is NAN.
-     */
-    public function toBeNan(): Expectation
-    {
-        Assert::assertNan($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is null.
-     */
-    public function toBeNull(): Expectation
-    {
-        Assert::assertNull($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value array has the provided $key.
-     *
-     * @param string|int $key
-     * @param mixed      $value
-     */
-    public function toHaveKey($key, $value = null): Expectation
-    {
-        if (is_object($this->value) && method_exists($this->value, 'toArray')) {
-            $array = $this->value->toArray();
-        } else {
-            $array = (array) $this->value;
-        }
-
-        try {
-            Assert::assertTrue(Arr::has($array, $key));
-
-            /* @phpstan-ignore-next-line  */
-        } catch (ExpectationFailedException $exception) {
-            throw new ExpectationFailedException("Failed asserting that an array has the key '$key'", $exception->getComparisonFailure());
-        }
-
-        if (func_num_args() > 1) {
-            Assert::assertEquals($value, Arr::get($array, $key));
-        }
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value array has the provided $keys.
-     *
-     * @param array<int, int|string> $keys
-     */
-    public function toHaveKeys(array $keys): Expectation
-    {
-        foreach ($keys as $key) {
-            $this->toHaveKey($key);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is a directory.
-     */
-    public function toBeDirectory(): Expectation
-    {
-        Assert::assertDirectoryExists($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is a directory and is readable.
-     */
-    public function toBeReadableDirectory(): Expectation
-    {
-        Assert::assertDirectoryIsReadable($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is a directory and is writable.
-     */
-    public function toBeWritableDirectory(): Expectation
-    {
-        Assert::assertDirectoryIsWritable($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is a file.
-     */
-    public function toBeFile(): Expectation
-    {
-        Assert::assertFileExists($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is a file and is readable.
-     */
-    public function toBeReadableFile(): Expectation
-    {
-        Assert::assertFileIsReadable($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value is a file and is writable.
-     */
-    public function toBeWritableFile(): Expectation
-    {
-        Assert::assertFileIsWritable($this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value array matches the given array subset.
-     *
-     * @param array<int|string, mixed> $array
-     */
-    public function toMatchArray($array): Expectation
-    {
-        if (is_object($this->value) && method_exists($this->value, 'toArray')) {
-            $valueAsArray = $this->value->toArray();
-        } else {
-            $valueAsArray = (array) $this->value;
-        }
-
-        foreach ($array as $key => $value) {
-            Assert::assertArrayHasKey($key, $valueAsArray);
-
-            Assert::assertEquals(
-                $value,
-                $valueAsArray[$key],
-                sprintf(
-                    'Failed asserting that an array has a key %s with the value %s.',
-                    $this->export($key),
-                    $this->export($valueAsArray[$key]),
-                ),
-            );
-        }
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value object matches a subset
-     * of the properties of an given object.
-     *
-     * @param array<string, mixed>|object $object
-     */
-    public function toMatchObject($object): Expectation
-    {
-        foreach ((array) $object as $property => $value) {
-            Assert::assertTrue(property_exists($this->value, $property));
-
-            /* @phpstan-ignore-next-line */
-            $propertyValue = $this->value->{$property};
-            Assert::assertEquals(
-                $value,
-                $propertyValue,
-                sprintf(
-                    'Failed asserting that an object has a property %s with the value %s.',
-                    $this->export($property),
-                    $this->export($propertyValue),
-                ),
-            );
-        }
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value matches a regular expression.
-     */
-    public function toMatch(string $expression): Expectation
-    {
-        Assert::assertMatchesRegularExpression($expression, $this->value);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that the value matches a constraint.
-     */
-    public function toMatchConstraint(Constraint $constraint): Expectation
-    {
-        Assert::assertThat($this->value, $constraint);
-
-        return $this;
-    }
-
-    /**
-     * Asserts that executing value throws an exception.
-     *
-     * @param (Closure(Throwable): mixed)|string $exception
-     */
-    public function toThrow($exception, string $exceptionMessage = null): Expectation
-    {
-        $callback = NullClosure::create();
-
-        if ($exception instanceof Closure) {
-            $callback   = $exception;
-            $parameters = (new ReflectionFunction($exception))->getParameters();
-
-            if (1 !== count($parameters)) {
-                throw new InvalidArgumentException('The given closure must have a single parameter type-hinted as the class string.');
-            }
-
-            if (!($type = $parameters[0]->getType()) instanceof ReflectionNamedType) {
-                throw new InvalidArgumentException('The given closure\'s parameter must be type-hinted as the class string.');
-            }
-
-            $exception = $type->getName();
-        }
-
-        try {
-            ($this->value)();
-        } catch (Throwable $e) { // @phpstan-ignore-line
-            if (!class_exists($exception)) {
-                Assert::assertStringContainsString($exception, $e->getMessage());
-
-                return $this;
-            }
-
-            if ($exceptionMessage !== null) {
-                Assert::assertStringContainsString($exceptionMessage, $e->getMessage());
-            }
-
-            Assert::assertInstanceOf($exception, $e);
-            $callback($e);
-
-            return $this;
-        }
-
-        if (!class_exists($exception)) {
-            throw new ExpectationFailedException("Exception with message \"{$exception}\" not thrown.");
-        }
-
-        throw new ExpectationFailedException("Exception \"{$exception}\" not thrown.");
-    }
-
-    /**
-     * Exports the given value.
-     *
-     * @param mixed $value
-     */
-    private function export($value): string
-    {
-        if ($this->exporter === null) {
-            $this->exporter = new Exporter();
-        }
-
-        return $this->exporter->export($value);
-    }
-
-    /**
-     * Dynamically handle calls to the class or
-     * creates a new higher order expectation.
-     *
-     * @param array<int, mixed> $parameters
-     *
-     * @return HigherOrderExpectation|mixed
-     */
-    public function __call(string $method, array $parameters)
-    {
-        if (!static::hasExtend($method)) {
-            /* @phpstan-ignore-next-line */
-            return new HigherOrderExpectation($this, $this->value->$method(...$parameters));
-        }
-
-        return $this->__extendsCall($method, $parameters);
-    }
-
-    /**
-     * Dynamically calls methods on the class without any arguments
-     * or creates a new higher order expectation.
-     *
-     * @return Expectation|HigherOrderExpectation
-     */
-    public function __get(string $name)
-    {
-        if (!method_exists($this, $name) && !static::hasExtend($name)) {
-            return new HigherOrderExpectation($this, $this->retrieve($name, $this->value));
-        }
-
-        /* @phpstan-ignore-next-line */
-        return $this->{$name}();
-    }
-}
--- a/src/Factories/TestCaseFactory.php
+++ b/src/Factories/TestCaseFactory.php
@ -5,17 +5,14 @@ declare(strict_types=1);
 namespace Pest\Factories;

 use Closure;
-use ParseError;
 use Pest\Concerns;
 use Pest\Contracts\HasPrintableTestCaseName;
 use Pest\Datasets;
 use Pest\Exceptions\ShouldNotHappen;
 use Pest\Support\HigherOrderMessageCollection;
-use Pest\Support\Str;
+use Pest\Support\NullClosure;
 use Pest\TestSuite;
-use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
-use RuntimeException;

 /**
 * @internal
@ -62,9 +59,9 @@ final class TestCaseFactory
    /**
     * Holds the dataset, if any.
     *
-     * @var array<Closure|iterable<int|string, mixed>|string>
+     * @var Closure|iterable<int, mixed>|string|null
     */
-    public $datasets = [];
+    public $dataset;

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

    /**
@ -114,11 +110,7 @@ final class TestCaseFactory
    {
        $this->filename    = $filename;
        $this->description = $description;
-        $this->test        = $closure ?? function (): void {
-            if (Assert::getCount() === 0) {
-                self::markTestIncomplete(); // @phpstan-ignore-line
-            }
-        };
+        $this->test        = $closure ?? NullClosure::create();

        $this->factoryProxies = new HigherOrderMessageCollection();
        $this->proxies        = new HigherOrderMessageCollection();
@ -147,7 +139,6 @@ final class TestCaseFactory
            $proxies->proxy($this);
            $chains->chain($this);

-            /* @phpstan-ignore-next-line */
            return call_user_func(Closure::bind($factoryTest, $this, get_class($this)), ...func_get_args());
        };

@ -160,13 +151,14 @@ final class TestCaseFactory
            return $testCase;
        };

-        $datasets = Datasets::resolve($this->description, $this->datasets);
+        $datasets = Datasets::resolve($this->description, $this->dataset);

        return array_map($createTest, array_keys($datasets), $datasets);
    }

    /**
-     * Makes a fully qualified class name from the given filename.
+     * Makes a fully qualified class name
+     * from the given filename.
     */
    public function makeClassFromFilename(string $filename): string
    {
@ -177,7 +169,7 @@ final class TestCaseFactory
            }, $filename);
        }

-        $filename     = str_replace('\\\\', '\\', addslashes((string) realpath($filename)));
+        $filename     = (string) realpath($filename);
        $rootPath     = TestSuite::getInstance()->rootPath;
        $relativePath = str_replace($rootPath . DIRECTORY_SEPARATOR, '', $filename);
        $relativePath = dirname(ucfirst($relativePath)) . DIRECTORY_SEPARATOR . basename($relativePath, '.php');
@ -185,12 +177,8 @@ final class TestCaseFactory

        // Strip out any %-encoded octets.
        $relativePath = (string) preg_replace('|%[a-fA-F0-9][a-fA-F0-9]|', '', $relativePath);
-        // Remove escaped quote sequences (maintain namespace)
-        $relativePath = str_replace(array_map(function (string $quote): string {
-            return sprintf('\\%s', $quote);
-        }, ['\'', '"']), '', $relativePath);
        // Limit to A-Z, a-z, 0-9, '_', '-'.
-        $relativePath = (string) preg_replace('/[^A-Za-z0-9\\\\]/', '', $relativePath);
+        $relativePath = (string) preg_replace('/[^A-Za-z0-9.\\\]/', '', $relativePath);

        $classFQN = 'P\\' . $relativePath;
        if (class_exists($classFQN)) {
@ -207,34 +195,16 @@ final class TestCaseFactory
        $namespace = implode('\\', $partsFQN);
        $baseClass = sprintf('\%s', $this->class);

-        if ('' === trim($className)) {
-            $className = 'InvalidTestName' . Str::random();
-            $classFQN .= $className;
-        }
+        eval("
+            namespace $namespace;

-        try {
-            eval("
-                namespace $namespace;
+            final class $className extends $baseClass implements $hasPrintableTestCaseClassFQN {
+                $traitsCode

-                final class $className extends $baseClass implements $hasPrintableTestCaseClassFQN {
-                    $traitsCode
-
-                    private static \$__filename = '$filename';
-                }
-            ");
-        } catch (ParseError $caught) {
-            throw new RuntimeException(sprintf('Unable to create test case for test file at %s', $filename), 1, $caught);
-        }
+                private static \$__filename = '$filename';
+            }
+        ");

        return $classFQN;
    }
-
-    /**
-     * Determine if the test case will receive argument input from Pest, or not.
-     */
-    public function receivesArguments(): bool
-    {
-        return count($this->datasets) > 0
-            || $this->factoryProxies->count('addDependencies') > 0;
-    }
 }
--- a/src/Functions.php
+++ b/src/Functions.php
@ -1,140 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Pest\Datasets;
-use Pest\Expectation;
-use Pest\PendingObjects\AfterEachCall;
-use Pest\PendingObjects\BeforeEachCall;
-use Pest\PendingObjects\TestCall;
-use Pest\PendingObjects\UsesCall;
-use Pest\Support\Backtrace;
-use Pest\Support\Extendable;
-use Pest\Support\HigherOrderTapProxy;
-use Pest\TestSuite;
-use PHPUnit\Framework\TestCase;
-
-/**
- * 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')) {
-    /**
-     * Runs the given closure before all tests in the current file.
-     */
-    function beforeAll(Closure $closure): void
-    {
-        TestSuite::getInstance()->beforeAll->set($closure);
-    }
-}
-
-if (!function_exists('beforeEach')) {
-    /**
-     * Runs the given closure before each test in the current file.
-     *
-     * @return BeforeEachCall|TestCase|mixed
-     */
-    function beforeEach(Closure $closure = null): BeforeEachCall
-    {
-        $filename = Backtrace::file();
-
-        return new BeforeEachCall(TestSuite::getInstance(), $filename, $closure);
-    }
-}
-
-if (!function_exists('dataset')) {
-    /**
-     * Registers the given dataset.
-     *
-     * @param Closure|iterable<int|string, mixed> $dataset
-     */
-    function dataset(string $name, $dataset): void
-    {
-        Datasets::set($name, $dataset);
-    }
-}
-
-if (!function_exists('uses')) {
-    /**
-     * The uses function binds the given
-     * arguments to test closures.
-     */
-    function uses(string ...$classAndTraits): UsesCall
-    {
-        $filename = Backtrace::file();
-
-        return new UsesCall($filename, $classAndTraits);
-    }
-}
-
-if (!function_exists('test')) {
-    /**
-     * Adds the given closure as a test. The first argument
-     * is the test description; the second argument is
-     * a closure that contains the test expectations.
-     *
-     * @return TestCall|TestCase|mixed
-     */
-    function test(string $description = null, Closure $closure = null)
-    {
-        if ($description === null && TestSuite::getInstance()->test !== null) {
-            return new HigherOrderTapProxy(TestSuite::getInstance()->test);
-        }
-
-        $filename = Backtrace::testFile();
-
-        return new TestCall(TestSuite::getInstance(), $filename, $description, $closure);
-    }
-}
-
-if (!function_exists('it')) {
-    /**
-     * Adds the given closure as a test. The first argument
-     * is the test description; the second argument is
-     * a closure that contains the test expectations.
-     *
-     * @return TestCall|TestCase|mixed
-     */
-    function it(string $description, Closure $closure = null): TestCall
-    {
-        $description = sprintf('it %s', $description);
-
-        return test($description, $closure);
-    }
-}
-
-if (!function_exists('afterEach')) {
-    /**
-     * Runs the given closure after each test in the current file.
-     *
-     * @return AfterEachCall|TestCase|mixed
-     */
-    function afterEach(Closure $closure = null): AfterEachCall
-    {
-        $filename = Backtrace::file();
-
-        return new AfterEachCall(TestSuite::getInstance(), $filename, $closure);
-    }
-}
-
-if (!function_exists('afterAll')) {
-    /**
-     * Runs the given closure after all tests in the current file.
-     */
-    function afterAll(Closure $closure): void
-    {
-        TestSuite::getInstance()->afterAll->set($closure);
-    }
-}
--- a/src/HigherOrderExpectation.php
+++ b/src/HigherOrderExpectation.php
@ -1,144 +0,0 @@
-<?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/src/Laravel/Commands/PestDatasetCommand.php
+++ b/src/Laravel/Commands/PestDatasetCommand.php
@ -8,8 +8,6 @@ use Illuminate\Console\Command;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Str;
 use Pest\Exceptions\InvalidConsoleArgument;
-use function Pest\testDirectory;
-use Pest\TestSuite;

 /**
 * @internal
@ -21,8 +19,7 @@ final class PestDatasetCommand extends Command
     *
     * @var string
     */
-    protected $signature = 'pest:dataset {name : The name of the dataset}
-                                         {--test-directory=tests : The name of the tests directory}';
+    protected $signature = 'pest:dataset {name : The name of the dataset}';

    /**
     * The console command description.
@ -36,13 +33,10 @@ final class PestDatasetCommand extends Command
     */
    public function handle(): void
    {
-        /* @phpstan-ignore-next-line */
-        TestSuite::getInstance(base_path(), $this->option('test-directory'));
-
        /** @var string $name */
        $name = $this->argument('name');

-        $relativePath   = sprintf(testDirectory('Datasets/%s.php'), ucfirst($name));
+        $relativePath   = sprintf('tests/Datasets/%s.php', ucfirst($name));

        /* @phpstan-ignore-next-line */
        $target         = base_path($relativePath);
@ -67,8 +61,7 @@ final class PestDatasetCommand extends Command
        $element  = Str::singular($name);
        $contents = str_replace('{dataset_element}', $element, $contents);
        File::put($target, str_replace('{dataset_name}', $name, $contents));
-        $message = sprintf('`%s` created successfully.', $relativePath);

-        $this->output->success($message);
+        $this->output->success(sprintf('`%s` created successfully.', $relativePath));
    }
 }
--- a/src/Laravel/Commands/PestDuskCommand.php
+++ b/src/Laravel/Commands/PestDuskCommand.php
@ -1,43 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Laravel\Commands;
-
-use Laravel\Dusk\Console\DuskCommand;
-
-/**
- * @internal
- */
-final class PestDuskCommand extends DuskCommand
-{
-    /**
-     * The console command name.
-     *
-     * @var string
-     */
-    protected $signature = 'pest:dusk
-                {--browse : Open a browser instead of using headless mode}
-                {--without-tty : Disable output to TTY}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Run the Dusk tests for the application with Pest';
-
-    /**
-     * Get the PHP binary to execute.
-     *
-     * @return array<string>
-     */
-    protected function binary()
-    {
-        if ('phpdbg' === PHP_SAPI) {
-            return [PHP_BINARY, '-qrr', 'vendor/pestphp/pest/bin/pest'];
-        }
-
-        return [PHP_BINARY, 'vendor/pestphp/pest/bin/pest'];
-    }
-}
--- a/src/Laravel/Commands/PestInstallCommand.php
+++ b/src/Laravel/Commands/PestInstallCommand.php
@ -6,10 +6,8 @@ namespace Pest\Laravel\Commands;

 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\File;
-use Pest\Console\Thanks;
 use Pest\Exceptions\InvalidConsoleArgument;
-use function Pest\testDirectory;
-use Pest\TestSuite;
+use Pest\Support\Str;

 /**
 * @internal
@ -21,7 +19,7 @@ final class PestInstallCommand extends Command
     *
     * @var string
     */
-    protected $signature = 'pest:install {--test-directory=tests : The name of the tests directory}';
+    protected $signature = 'pest:install';

    /**
     * The console command description.
@ -36,14 +34,15 @@ final class PestInstallCommand extends Command
    public function handle(): void
    {
        /* @phpstan-ignore-next-line */
-        TestSuite::getInstance(base_path(), $this->option('test-directory'));
-
+        $pest    = base_path('tests/Pest.php');
        /* @phpstan-ignore-next-line */
-        $pest    = base_path(testDirectory('Pest.php'));
-        $stubs   = 'stubs/Laravel';
+        $helpers = base_path('tests/Helpers.php');
+        $stubs   = $this->isLumen() ? 'stubs/Lumen' : 'stubs/Laravel';

-        if (File::exists($pest)) {
-            throw new InvalidConsoleArgument(sprintf('%s already exist', $pest));
+        foreach ([$pest, $helpers] as $file) {
+            if (File::exists($file)) {
+                throw new InvalidConsoleArgument(sprintf('%s already exist', $file));
+            }
        }

        File::copy(implode(DIRECTORY_SEPARATOR, [
@ -52,10 +51,24 @@ final class PestInstallCommand extends Command
            'Pest.php',
        ]), $pest);

-        $this->output->success('`tests/Pest.php` created successfully.');
+        File::copy(implode(DIRECTORY_SEPARATOR, [
+            dirname(__DIR__, 3),
+            $stubs,
+            'Helpers.php',
+        ]), $helpers);

-        if (!(bool) $this->option('no-interaction')) {
-            (new Thanks($this->output))();
-        }
+        $this->output->success('`tests/Pest.php` created successfully.');
+        $this->output->success('`tests/Helpers.php` created successfully.');
+
+        (new \Pest\Console\Thanks($this->output))();
+    }
+
+    /**
+     * Determine if this is a Lumen application.
+     */
+    private function isLumen(): bool
+    {
+        /* @phpstan-ignore-next-line */
+        return Str::startsWith(app()->version(), 'Lumen');
    }
 }
--- a/src/Laravel/Commands/PestTestCommand.php
+++ b/src/Laravel/Commands/PestTestCommand.php
@ -8,8 +8,6 @@ use Illuminate\Console\Command;
 use Illuminate\Support\Facades\File;
 use Pest\Exceptions\InvalidConsoleArgument;
 use Pest\Support\Str;
-use function Pest\testDirectory;
-use Pest\TestSuite;

 /**
 * @internal
@ -21,7 +19,7 @@ final class PestTestCommand extends Command
     *
     * @var string
     */
-    protected $signature = 'pest:test {name : The name of the file} {--unit : Create a unit test} {--dusk : Create a Dusk test} {--test-directory=tests : The name of the tests directory} {--force : Overwrite the existing test file with the same name}';
+    protected $signature = 'pest:test {name : The name of the file} {--unit : Create a unit test}';

    /**
     * The console command description.
@ -35,16 +33,12 @@ final class PestTestCommand extends Command
     */
    public function handle(): void
    {
-        /* @phpstan-ignore-next-line */
-        TestSuite::getInstance(base_path(), $this->option('test-directory'));
-
        /** @var string $name */
        $name = $this->argument('name');

-        $type = ((bool) $this->option('unit')) ? 'Unit' : (((bool) $this->option('dusk')) ? 'Browser' : 'Feature');
+        $type = ((bool) $this->option('unit')) ? 'Unit' : 'Feature';

-        $relativePath = sprintf(
-            testDirectory('%s/%s.php'),
+        $relativePath = sprintf('tests/%s/%s.php',
            $type,
            ucfirst($name)
        );
@ -56,7 +50,7 @@ final class PestTestCommand extends Command
            File::makeDirectory(dirname($target), 0777, true, true);
        }

-        if (File::exists($target) && !(bool) $this->option('force')) {
+        if (File::exists($target)) {
            throw new InvalidConsoleArgument(sprintf('%s already exist', $target));
        }

@ -70,8 +64,7 @@ final class PestTestCommand extends Command
        $name = Str::endsWith($name, 'test') ? mb_substr($name, 0, -4) : $name;

        File::put($target, str_replace('{name}', $name, $contents));
-        $message = sprintf('`%s` created successfully.', $relativePath);

-        $this->output->success($message);
+        $this->output->success(sprintf('`%s` created successfully.', $relativePath));
    }
 }
--- a/src/Laravel/PestServiceProvider.php
+++ b/src/Laravel/PestServiceProvider.php
@ -5,9 +5,7 @@ declare(strict_types=1);
 namespace Pest\Laravel;

 use Illuminate\Support\ServiceProvider;
-use Laravel\Dusk\Console\DuskCommand;
 use Pest\Laravel\Commands\PestDatasetCommand;
-use Pest\Laravel\Commands\PestDuskCommand;
 use Pest\Laravel\Commands\PestInstallCommand;
 use Pest\Laravel\Commands\PestTestCommand;

@ -24,12 +22,6 @@ final class PestServiceProvider extends ServiceProvider
                PestTestCommand::class,
                PestDatasetCommand::class,
            ]);
-
-            if (class_exists(DuskCommand::class)) {
-                $this->commands([
-                    PestDuskCommand::class,
-                ]);
-            }
        }
    }
 }
--- a/src/Logging/JUnit.php
+++ b/src/Logging/JUnit.php
@ -1,429 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Pest\Logging;
-
-use function class_exists;
-use DOMDocument;
-use DOMElement;
-use Exception;
-use function get_class;
-use function method_exists;
-use Pest\Concerns\Testable;
-use PHPUnit\Framework\AssertionFailedError;
-use PHPUnit\Framework\ExceptionWrapper;
-use PHPUnit\Framework\SelfDescribing;
-use PHPUnit\Framework\Test;
-use PHPUnit\Framework\TestFailure;
-use PHPUnit\Framework\TestListener;
-use PHPUnit\Framework\TestSuite;
-use PHPUnit\Framework\Warning;
-use PHPUnit\Util\Filter;
-use PHPUnit\Util\Printer;
-use PHPUnit\Util\Xml;
-use ReflectionClass;
-use ReflectionException;
-use function sprintf;
-use function str_replace;
-use Throwable;
-use function trim;
-
-/**
- * @internal This class is not covered by the backward compatibility promise for PHPUnit
- */
-final class JUnit extends Printer implements TestListener
-{
-    /**
-     * @var DOMDocument
-     */
-    private $document;
-
-    /**
-     * @var DOMElement
-     */
-    private $root;
-
-    /**
-     * @var DOMElement[]
-     */
-    private $testSuites = [];
-
-    /**
-     * @var int[]
-     */
-    private $testSuiteTests = [0];
-
-    /**
-     * @var int[]
-     */
-    private $testSuiteAssertions = [0];
-
-    /**
-     * @var int[]
-     */
-    private $testSuiteErrors = [0];
-
-    /**
-     * @var int[]
-     */
-    private $testSuiteWarnings = [0];
-
-    /**
-     * @var int[]
-     */
-    private $testSuiteFailures = [0];
-
-    /**
-     * @var int[]
-     */
-    private $testSuiteSkipped = [0];
-
-    /**
-     * @var int[]|float[]
-     */
-    private $testSuiteTimes = [0];
-
-    /**
-     * @var int
-     */
-    private $testSuiteLevel = 0;
-
-    /**
-     * @var DOMElement|null
-     */
-    private $currentTestCase;
-
-    public function __construct(string $out)
-    {
-        $this->document               = new DOMDocument('1.0', 'UTF-8');
-        $this->document->formatOutput = true;
-
-        $this->root = $this->document->createElement('testsuites');
-        $this->document->appendChild($this->root);
-
-        parent::__construct($out);
-    }
-
-    /**
-     * Flush buffer and close output.
-     */
-    public function flush(): void
-    {
-        $this->write($this->getXML());
-
-        parent::flush();
-    }
-
-    /**
-     * An error occurred.
-     */
-    public function addError(Test $test, Throwable $t, float $time): void
-    {
-        $this->doAddFault($test, $t, 'error');
-        $this->testSuiteErrors[$this->testSuiteLevel]++;
-    }
-
-    /**
-     * A warning occurred.
-     */
-    public function addWarning(Test $test, Warning $e, float $time): void
-    {
-        $this->doAddFault($test, $e, 'warning');
-        $this->testSuiteWarnings[$this->testSuiteLevel]++;
-    }
-
-    /**
-     * A failure occurred.
-     */
-    public function addFailure(Test $test, AssertionFailedError $e, float $time): void
-    {
-        $this->doAddFault($test, $e, 'failure');
-        $this->testSuiteFailures[$this->testSuiteLevel]++;
-    }
-
-    /**
-     * Incomplete test.
-     */
-    public function addIncompleteTest(Test $test, Throwable $t, float $time): void
-    {
-        $this->doAddSkipped();
-    }
-
-    /**
-     * Risky test.
-     */
-    public function addRiskyTest(Test $test, Throwable $t, float $time): void
-    {
-    }
-
-    /**
-     * Skipped test.
-     */
-    public function addSkippedTest(Test $test, Throwable $t, float $time): void
-    {
-        $this->doAddSkipped();
-    }
-
-    /** @phpstan-ignore-next-line */
-    public function startTestSuite(TestSuite $suite): void
-    {
-        $testSuite = $this->document->createElement('testsuite');
-        $testSuite->setAttribute('name', $suite->getName());
-
-        if (class_exists($suite->getName(), false)) {
-            try {
-                $class = new ReflectionClass($suite->getName());
-
-                if ($class->hasMethod('__getFileName')) {
-                    $fileName = $class->getMethod('__getFileName')->invoke(null);
-                } else {
-                    $fileName = $class->getFileName();
-                }
-
-                $testSuite->setAttribute('file', $fileName);
-            } catch (ReflectionException $e) {
-                // @ignoreException
-            }
-        }
-
-        if ($this->testSuiteLevel > 0) {
-            $this->testSuites[$this->testSuiteLevel]->appendChild($testSuite);
-        } else {
-            $this->root->appendChild($testSuite);
-        }
-
-        $this->testSuiteLevel++;
-        $this->testSuites[$this->testSuiteLevel]          = $testSuite;
-        $this->testSuiteTests[$this->testSuiteLevel]      = 0;
-        $this->testSuiteAssertions[$this->testSuiteLevel] = 0;
-        $this->testSuiteErrors[$this->testSuiteLevel]     = 0;
-        $this->testSuiteWarnings[$this->testSuiteLevel]   = 0;
-        $this->testSuiteFailures[$this->testSuiteLevel]   = 0;
-        $this->testSuiteSkipped[$this->testSuiteLevel]    = 0;
-        $this->testSuiteTimes[$this->testSuiteLevel]      = 0;
-    }
-
-    /** @phpstan-ignore-next-line */
-    public function endTestSuite(TestSuite $suite): void
-    {
-        $this->testSuites[$this->testSuiteLevel]->setAttribute(
-            'tests',
-            (string) $this->testSuiteTests[$this->testSuiteLevel]
-        );
-
-        $this->testSuites[$this->testSuiteLevel]->setAttribute(
-            'assertions',
-            (string) $this->testSuiteAssertions[$this->testSuiteLevel]
-        );
-
-        $this->testSuites[$this->testSuiteLevel]->setAttribute(
-            'errors',
-            (string) $this->testSuiteErrors[$this->testSuiteLevel]
-        );
-
-        $this->testSuites[$this->testSuiteLevel]->setAttribute(
-            'warnings',
-            (string) $this->testSuiteWarnings[$this->testSuiteLevel]
-        );
-
-        $this->testSuites[$this->testSuiteLevel]->setAttribute(
-            'failures',
-            (string) $this->testSuiteFailures[$this->testSuiteLevel]
-        );
-
-        $this->testSuites[$this->testSuiteLevel]->setAttribute(
-            'skipped',
-            (string) $this->testSuiteSkipped[$this->testSuiteLevel]
-        );
-
-        $this->testSuites[$this->testSuiteLevel]->setAttribute(
-            'time',
-            sprintf('%F', $this->testSuiteTimes[$this->testSuiteLevel])
-        );
-
-        if ($this->testSuiteLevel > 1) {
-            $this->testSuiteTests[$this->testSuiteLevel - 1] += $this->testSuiteTests[$this->testSuiteLevel];
-            $this->testSuiteAssertions[$this->testSuiteLevel - 1] += $this->testSuiteAssertions[$this->testSuiteLevel];
-            $this->testSuiteErrors[$this->testSuiteLevel - 1] += $this->testSuiteErrors[$this->testSuiteLevel];
-            $this->testSuiteWarnings[$this->testSuiteLevel - 1] += $this->testSuiteWarnings[$this->testSuiteLevel];
-            $this->testSuiteFailures[$this->testSuiteLevel - 1] += $this->testSuiteFailures[$this->testSuiteLevel];
-            $this->testSuiteSkipped[$this->testSuiteLevel - 1] += $this->testSuiteSkipped[$this->testSuiteLevel];
-            $this->testSuiteTimes[$this->testSuiteLevel - 1] += $this->testSuiteTimes[$this->testSuiteLevel];
-        }
-
-        $this->testSuiteLevel--;
-    }
-
-    /**
-     * A test started.
-     *
-     * @param Test|Testable $test
-     */
-    public function startTest(Test $test): void
-    {
-        $usesDataprovider = false;
-
-        if (method_exists($test, 'usesDataProvider')) {
-            $usesDataprovider = $test->usesDataProvider();
-        }
-
-        $testCase = $this->document->createElement('testcase');
-        $testCase->setAttribute('name', $test->getName());
-
-        try {
-            $class = new ReflectionClass($test);
-            // @codeCoverageIgnoreStart
-        } catch (ReflectionException $e) {
-            throw new Exception($e->getMessage(), (int) $e->getCode(), $e);
-        }
-        // @codeCoverageIgnoreEnd
-
-        $methodName = $test->getName(!$usesDataprovider);
-
-        if ($class->hasMethod($methodName)) {
-            try {
-                $method = $class->getMethod($methodName);
-                // @codeCoverageIgnoreStart
-            } catch (ReflectionException $e) {
-                // @phpstan-ignore-next-line
-                throw new Exception($e->getMessage(), (int) $e->getCode(), $e);
-            }
-            // @codeCoverageIgnoreEnd
-
-            $testCase->setAttribute('class', $class->getName());
-            $testCase->setAttribute('classname', str_replace('\\', '.', $class->getName()));
-            $fileName = $class->getFileName();
-            if ($fileName !== false) {
-                $testCase->setAttribute('file', $fileName);
-            }
-            $testCase->setAttribute('line', (string) $method->getStartLine());
-        }
-
-        if (TeamCity::isPestTest($test)) {
-            $testCase->setAttribute('class', $test->getPrintableTestCaseName());
-            $testCase->setAttribute('classname', str_replace('\\', '.', $test->getPrintableTestCaseName()));
-            // @phpstan-ignore-next-line
-            $testCase->setAttribute('file', $test->__getFileName());
-        }
-
-        $this->currentTestCase = $testCase;
-    }
-
-    /**
-     * A test ended.
-     */
-    public function endTest(Test $test, float $time): void
-    {
-        $numAssertions = 0;
-
-        if (method_exists($test, 'getNumAssertions')) {
-            $numAssertions = $test->getNumAssertions();
-        }
-
-        $this->testSuiteAssertions[$this->testSuiteLevel] += $numAssertions;
-
-        if ($this->currentTestCase !== null) {
-            $this->currentTestCase->setAttribute(
-                'assertions',
-                (string) $numAssertions
-            );
-
-            $this->currentTestCase->setAttribute(
-                'time',
-                sprintf('%F', $time)
-            );
-
-            $this->testSuites[$this->testSuiteLevel]->appendChild(
-                $this->currentTestCase
-            );
-        }
-
-        $this->testSuiteTests[$this->testSuiteLevel]++;
-        $this->testSuiteTimes[$this->testSuiteLevel] += $time;
-
-        $testOutput = '';
-
-        if (method_exists($test, 'hasOutput') && method_exists($test, 'getActualOutput')) {
-            $testOutput = $test->hasOutput() ? $test->getActualOutput() : '';
-        }
-
-        if ($testOutput !== '') {
-            $systemOut = $this->document->createElement(
-                'system-out',
-                Xml::prepareString($testOutput)
-            );
-
-            if ($this->currentTestCase !== null) {
-                $this->currentTestCase->appendChild($systemOut);
-            }
-        }
-
-        $this->currentTestCase = null;
-    }
-
-    /**
-     * Returns the XML as a string.
-     */
-    public function getXML(): string
-    {
-        $xml = $this->document->saveXML();
-        if ($xml === false) {
-            return '';
-        }
-
-        return $xml;
-    }
-
-    private function doAddFault(Test $test, Throwable $t, string $type): void
-    {
-        if ($this->currentTestCase === null) {
-            return;
-        }
-
-        if ($test instanceof SelfDescribing) {
-            $buffer = $test->toString() . "\n";
-        } else {
-            $buffer = '';
-        }
-
-        $buffer .= trim(
-            TestFailure::exceptionToString($t) . "\n" .
-            Filter::getFilteredStacktrace($t)
-        );
-
-        $fault = $this->document->createElement(
-            $type,
-            Xml::prepareString($buffer)
-        );
-
-        if ($t instanceof ExceptionWrapper) {
-            $fault->setAttribute('type', $t->getClassName());
-        } else {
-            $fault->setAttribute('type', get_class($t));
-        }
-
-        $this->currentTestCase->appendChild($fault);
-    }
-
-    private function doAddSkipped(): void
-    {
-        if ($this->currentTestCase === null) {
-            return;
-        }
-
-        $skipped = $this->document->createElement('skipped');
-
-        $this->currentTestCase->appendChild($skipped);
-
-        $this->testSuiteSkipped[$this->testSuiteLevel]++;
-    }
-}
--- a/src/Logging/TeamCity.php
+++ b/src/Logging/TeamCity.php
@ -1,297 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Logging;
-
-use function getmypid;
-use Pest\Concerns\Logging\WritesToConsole;
-use Pest\Concerns\Testable;
-use Pest\Support\ExceptionTrace;
-use function Pest\version;
-use PHPUnit\Framework\AssertionFailedError;
-use PHPUnit\Framework\Test;
-use PHPUnit\Framework\TestCase;
-use PHPUnit\Framework\TestResult;
-use PHPUnit\Framework\TestSuite;
-use PHPUnit\Framework\Warning;
-use PHPUnit\TextUI\DefaultResultPrinter;
-use function round;
-use function str_replace;
-use function strlen;
-use Throwable;
-
-final class TeamCity extends DefaultResultPrinter
-{
-    use WritesToConsole;
-    private const PROTOCOL            = 'pest_qn://';
-    private const NAME                = 'name';
-    private const LOCATION_HINT       = 'locationHint';
-    private const DURATION            = 'duration';
-    private const TEST_SUITE_STARTED  = 'testSuiteStarted';
-    private const TEST_SUITE_FINISHED = 'testSuiteFinished';
-    private const TEST_COUNT          = 'testCount';
-    private const TEST_STARTED        = 'testStarted';
-    private const TEST_FINISHED       = 'testFinished';
-
-    /** @var int */
-    private $flowId;
-
-    /** @var bool */
-    private $isSummaryTestCountPrinted = false;
-
-    /** @var \PHPUnit\Util\Log\TeamCity */
-    private $phpunitTeamCity;
-
-    /**
-     * @param resource|string|null $out
-     */
-    public function __construct($out, bool $verbose, string $colors)
-    {
-        parent::__construct($out, $verbose, $colors);
-        $this->phpunitTeamCity = new \PHPUnit\Util\Log\TeamCity($out, $verbose, $colors);
-
-        $this->logo();
-    }
-
-    private function logo(): void
-    {
-        $this->writeNewLine();
-        $this->write('Pest ' . version());
-        $this->writeNewLine();
-    }
-
-    public function printResult(TestResult $result): void
-    {
-        $this->write('Tests:  ');
-
-        $results = [
-            'failed'     => ['count' => $result->errorCount() + $result->failureCount(), 'color' => 'fg-red'],
-            'skipped'    => ['count' => $result->skippedCount(), 'color' => 'fg-yellow'],
-            'warned'     => ['count' => $result->warningCount(), 'color' => 'fg-yellow'],
-            'risked'     => ['count' => $result->riskyCount(), 'color' => 'fg-yellow'],
-            'incomplete' => ['count' => $result->notImplementedCount(), 'color' => 'fg-yellow'],
-            'passed'     => ['count' => $this->successfulTestCount($result), 'color' => 'fg-green'],
-        ];
-
-        $filteredResults = array_filter($results, function ($item): bool {
-            return $item['count'] > 0;
-        });
-
-        foreach ($filteredResults as $key => $info) {
-            $this->writeWithColor($info['color'], $info['count'] . " $key", false);
-
-            if ($key !== array_reverse(array_keys($filteredResults))[0]) {
-                $this->write(', ');
-            }
-        }
-
-        $this->writeNewLine();
-        $this->write("Assertions:  $this->numAssertions");
-
-        $this->writeNewLine();
-        $this->write("Time:  {$result->time()}s");
-
-        $this->writeNewLine();
-    }
-
-    private function successfulTestCount(TestResult $result): int
-    {
-        return $result->count()
-            - $result->failureCount()
-            - $result->errorCount()
-            - $result->skippedCount()
-            - $result->warningCount()
-            - $result->notImplementedCount()
-            - $result->riskyCount();
-    }
-
-    /** @phpstan-ignore-next-line */
-    public function startTestSuite(TestSuite $suite): void
-    {
-        $suiteName = $suite->getName();
-
-        if (static::isCompoundTestSuite($suite)) {
-            $this->writeWithColor('bold', '  ' . $suiteName);
-        } elseif (static::isPestTestSuite($suite)) {
-            $this->writeWithColor('fg-white, bold', '  ' . substr_replace($suiteName, '', 0, 2) . ' ');
-        } else {
-            $this->writeWithColor('fg-white, bold', '  ' . $suiteName);
-        }
-
-        $this->writeNewLine();
-
-        $this->flowId = (int) getmypid();
-
-        if (!$this->isSummaryTestCountPrinted) {
-            $this->printEvent(self::TEST_COUNT, [
-                'count' => $suite->count(),
-            ]);
-            $this->isSummaryTestCountPrinted = true;
-        }
-
-        $this->printEvent(self::TEST_SUITE_STARTED, [
-            self::NAME          => static::isCompoundTestSuite($suite) ? $suiteName : substr($suiteName, 2),
-            self::LOCATION_HINT => self::PROTOCOL . (static::isCompoundTestSuite($suite) ? $suiteName : $suiteName::__getFileName()),
-        ]);
-    }
-
-    /**
-     * @param array<string, string|int> $params
-     */
-    private function printEvent(string $eventName, array $params = []): void
-    {
-        $this->write("##teamcity[{$eventName}");
-
-        if ($this->flowId !== 0) {
-            $params['flowId'] = $this->flowId;
-        }
-
-        foreach ($params as $key => $value) {
-            $escapedValue = self::escapeValue((string) $value);
-            $this->write(" {$key}='{$escapedValue}'");
-        }
-
-        $this->write("]\n");
-    }
-
-    private static function escapeValue(string $text): string
-    {
-        return str_replace(
-            ['|', "'", "\n", "\r", ']', '['],
-            ['||', "|'", '|n', '|r', '|]', '|['],
-            $text
-        );
-    }
-
-    /** @phpstan-ignore-next-line */
-    public function endTestSuite(TestSuite $suite): void
-    {
-        $suiteName = $suite->getName();
-
-        $this->writeNewLine();
-        $this->writeNewLine();
-
-        $this->printEvent(self::TEST_SUITE_FINISHED, [
-            self::NAME          => static::isCompoundTestSuite($suite) ? $suiteName : substr($suiteName, 2),
-            self::LOCATION_HINT => self::PROTOCOL . (static::isCompoundTestSuite($suite) ? $suiteName : $suiteName::__getFileName()),
-        ]);
-    }
-
-    /**
-     * @param Test|Testable $test
-     */
-    public function startTest(Test $test): void
-    {
-        if (!TeamCity::isPestTest($test)) {
-            $this->phpunitTeamCity->startTest($test);
-
-            return;
-        }
-
-        $this->printEvent(self::TEST_STARTED, [
-            self::NAME => $test->getName(),
-            // @phpstan-ignore-next-line
-            self::LOCATION_HINT => self::PROTOCOL . $test->toString(),
-        ]);
-    }
-
-    /**
-     * Verify that the given test suite is a valid Pest suite.
-     *
-     * @param TestSuite<Test> $suite
-     */
-    private static function isPestTestSuite(TestSuite $suite): bool
-    {
-        return strncmp($suite->getName(), 'P\\', strlen('P\\')) === 0;
-    }
-
-    /**
-     * Determine if the test suite is made up of multiple smaller test suites.
-     *
-     * @param TestSuite<Test> $suite
-     */
-    private static function isCompoundTestSuite(TestSuite $suite): bool
-    {
-        return file_exists($suite->getName()) || !method_exists($suite->getName(), '__getFileName');
-    }
-
-    public static function isPestTest(Test $test): bool
-    {
-        /** @var array<string, string> $uses */
-        $uses = class_uses($test);
-
-        return in_array(Testable::class, $uses, true);
-    }
-
-    /**
-     * @param Test|Testable $test
-     */
-    public function endTest(Test $test, float $time): void
-    {
-        $this->printEvent(self::TEST_FINISHED, [
-            self::NAME     => $test->getName(),
-            self::DURATION => self::toMilliseconds($time),
-        ]);
-
-        if (!$this->lastTestFailed) {
-            $this->writeSuccess($test->getName());
-        }
-
-        $this->numAssertions += $test instanceof TestCase ? $test->getNumAssertions() : 1;
-        $this->lastTestFailed = false;
-    }
-
-    private static function toMilliseconds(float $time): int
-    {
-        return (int) round($time * 1000);
-    }
-
-    public function addError(Test $test, Throwable $t, float $time): void
-    {
-        $this->markAsFailure($t);
-        $this->writeError($test->getName());
-        $this->phpunitTeamCity->addError($test, $t, $time);
-    }
-
-    public function addFailure(Test $test, AssertionFailedError $e, float $time): void
-    {
-        $this->markAsFailure($e);
-        $this->writeError($test->getName());
-        $this->phpunitTeamCity->addFailure($test, $e, $time);
-    }
-
-    public function addWarning(Test $test, Warning $e, float $time): void
-    {
-        $this->markAsFailure($e);
-        $this->writeWarning($test->getName());
-        $this->phpunitTeamCity->addWarning($test, $e, $time);
-    }
-
-    public function addIncompleteTest(Test $test, Throwable $t, float $time): void
-    {
-        $this->markAsFailure($t);
-        $this->writeWarning($test->getName());
-        $this->phpunitTeamCity->addIncompleteTest($test, $t, $time);
-    }
-
-    public function addRiskyTest(Test $test, Throwable $t, float $time): void
-    {
-        $this->markAsFailure($t);
-        $this->writeWarning($test->getName());
-        $this->phpunitTeamCity->addRiskyTest($test, $t, $time);
-    }
-
-    public function addSkippedTest(Test $test, Throwable $t, float $time): void
-    {
-        $this->markAsFailure($t);
-        $this->writeWarning($test->getName());
-        $this->phpunitTeamCity->printIgnoredTest($test->getName(), $t, $time);
-    }
-
-    private function markAsFailure(Throwable $t): void
-    {
-        $this->lastTestFailed = true;
-        ExceptionTrace::removePestReferences($t);
-    }
-}
--- a/src/OppositeExpectation.php
+++ b/src/OppositeExpectation.php
@ -1,103 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest;
-
-use PHPUnit\Framework\ExpectationFailedException;
-use SebastianBergmann\Exporter\Exporter;
-
-/**
- * @internal
- *
- * @mixin Expectation
- */
-final class OppositeExpectation
-{
-    /**
-     * @var Expectation
-     */
-    private $original;
-
-    /**
-     * Creates a new opposite expectation.
-     */
-    public function __construct(Expectation $original)
-    {
-        $this->original = $original;
-    }
-
-    /**
-     * Asserts that the value array not has the provided $keys.
-     *
-     * @param array<int, int|string> $keys
-     */
-    public function toHaveKeys(array $keys): Expectation
-    {
-        foreach ($keys as $key) {
-            try {
-                $this->original->toHaveKey($key);
-            } catch (ExpectationFailedException $e) {
-                continue;
-            }
-
-            $this->throwExpectationFailedException('toHaveKey', [$key]);
-        }
-
-        return $this->original;
-    }
-
-    /**
-     * Handle dynamic method calls into the original expectation.
-     *
-     * @param array<int, mixed> $arguments
-     *
-     * @return Expectation|never
-     */
-    public function __call(string $name, array $arguments): Expectation
-    {
-        try {
-            /* @phpstan-ignore-next-line */
-            $this->original->{$name}(...$arguments);
-        } catch (ExpectationFailedException $e) {
-            return $this->original;
-        }
-
-        $this->throwExpectationFailedException($name, $arguments);
-    }
-
-    /**
-     * Handle dynamic properties gets into the original expectation.
-     *
-     * @return Expectation|never
-     */
-    public function __get(string $name): Expectation
-    {
-        try {
-            /* @phpstan-ignore-next-line */
-            $this->original->{$name};
-        } catch (ExpectationFailedException $e) {
-            return $this->original;
-        }
-
-        $this->throwExpectationFailedException($name);
-    }
-
-    /**
-     * Creates a new expectation failed exception with a nice readable message.
-     *
-     * @param array<int, mixed> $arguments
-     *
-     * @return never
-     */
-    private function throwExpectationFailedException(string $name, array $arguments = []): void
-    {
-        $exporter = new Exporter();
-
-        $toString = function ($argument) use ($exporter): string {
-            return $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(function ($argument) use ($toString): string { return $toString($argument); }, $arguments))));
-    }
-}
--- a/src/PendingObjects/TestCall.php
+++ b/src/PendingObjects/TestCall.php
@ -7,15 +7,12 @@ namespace Pest\PendingObjects;
 use Closure;
 use Pest\Factories\TestCaseFactory;
 use Pest\Support\Backtrace;
-use Pest\Support\HigherOrderCallables;
 use Pest\Support\NullClosure;
 use Pest\TestSuite;
 use SebastianBergmann\Exporter\Exporter;

 /**
 * @internal
- *
- * @mixin HigherOrderCallables
 */
 final class TestCall
 {
@ -59,15 +56,11 @@ final class TestCall
    /**
     * Asserts that the test throws the given `$exceptionClass` when called.
     */
-    public function throws(string $exception, string $exceptionMessage = null): TestCall
+    public function throws(string $exceptionClass, string $exceptionMessage = null): TestCall
    {
-        if (class_exists($exception)) {
-            $this->testCaseFactory
-                ->proxies
-                ->add(Backtrace::file(), Backtrace::line(), 'expectException', [$exception]);
-        } else {
-            $exceptionMessage = $exception;
-        }
+        $this->testCaseFactory
+            ->proxies
+            ->add(Backtrace::file(), Backtrace::line(), 'expectException', [$exceptionClass]);

        if (is_string($exceptionMessage)) {
            $this->testCaseFactory
@ -78,37 +71,15 @@ final class TestCall
        return $this;
    }

-    /**
-     * Asserts that the test throws the given `$exceptionClass` when called if the given condition is true.
-     *
-     * @param (callable(): bool)|bool $condition
-     */
-    public function throwsIf($condition, string $exception, string $exceptionMessage = null): TestCall
-    {
-        $condition = is_callable($condition)
-            ? $condition
-            : static function () use ($condition): bool {
-                return (bool) $condition; // @phpstan-ignore-line
-            };
-
-        if ($condition()) {
-            return $this->throws($exception, $exceptionMessage);
-        }
-
-        return $this;
-    }
-
    /**
     * Runs the current test multiple times with
     * each item of the given `iterable`.
     *
-     * @param array<\Closure|iterable<int|string, mixed>|string> $data
+     * @param \Closure|iterable<int, mixed>|string $data
     */
-    public function with(...$data): TestCall
+    public function with($data): TestCall
    {
-        foreach ($data as $dataset) {
-            $this->testCaseFactory->datasets[] = $dataset;
-        }
+        $this->testCaseFactory->dataset = $data;

        return $this;
    }
@ -120,7 +91,7 @@ final class TestCall
    {
        $this->testCaseFactory
            ->factoryProxies
-            ->add(Backtrace::file(), Backtrace::line(), 'addDependencies', [$tests]);
+            ->add(Backtrace::file(), Backtrace::line(), 'setDependencies', [$tests]);

        return $this;
    }
@ -160,7 +131,7 @@ final class TestCall

        $condition = is_callable($condition)
            ? $condition
-            : function () use ($condition) {
+            : function () use ($condition) { /* @phpstan-ignore-line */
                return $condition;
            };

@ -168,40 +139,21 @@ final class TestCall
            ? $conditionOrMessage
            : $message;

-        /** @var callable(): bool $condition */
-        $condition = $condition->bindTo(null);
-
-        $this->testCaseFactory
-            ->chains
-            ->addWhen($condition, Backtrace::file(), Backtrace::line(), 'markTestSkipped', [$message]);
+        if ($condition() !== false) {
+            $this->testCaseFactory
+                ->chains
+                ->add(Backtrace::file(), Backtrace::line(), 'markTestSkipped', [$message]);
+        }

        return $this;
    }

-    /**
-     * Saves the property accessors to be used on the target.
-     */
-    public function __get(string $name): self
-    {
-        return $this->addChain($name);
-    }
-
    /**
     * Saves the calls to be used on the target.
     *
     * @param array<int, mixed> $arguments
     */
    public function __call(string $name, array $arguments): self
-    {
-        return $this->addChain($name, $arguments);
-    }
-
-    /**
-     * Add a chain to the test case factory. Omitting the arguments will treat it as a property accessor.
-     *
-     * @param array<int, mixed>|null $arguments
-     */
-    private function addChain(string $name, array $arguments = null): self
    {
        $this->testCaseFactory
            ->chains
@ -212,9 +164,7 @@ final class TestCall
            if ($this->testCaseFactory->description !== null) {
                $this->testCaseFactory->description .= ' → ';
            }
-            $this->testCaseFactory->description .= $arguments === null
-                ? $name
-                : sprintf('%s %s', $name, $exporter->shortenedRecursiveExport($arguments));
+            $this->testCaseFactory->description .= sprintf('%s %s', $name, $exporter->shortenedRecursiveExport($arguments));
        }

        return $this;
--- a/src/PendingObjects/UsesCall.php
+++ b/src/PendingObjects/UsesCall.php
@ -4,7 +4,7 @@ declare(strict_types=1);

 namespace Pest\PendingObjects;

-use Closure;
+use Pest\Exceptions\InvalidUsesPath;
 use Pest\TestSuite;

 /**
@ -12,20 +12,6 @@ use Pest\TestSuite;
 */
 final class UsesCall
 {
-    /**
-     * Contains a global before each hook closure to be executed.
-     *
-     * Array indices here matter. They are mapped as follows:
-     *
-     * - `0` => `beforeAll`
-     * - `1` => `beforeEach`
-     * - `2` => `afterEach`
-     * - `3` => `afterAll`
-     *
-     * @var array<int, Closure>
-     */
-    private $hooks = [];
-
    /**
     * Holds the class and traits.
     *
@ -68,7 +54,7 @@ final class UsesCall

    /**
     * The directories or file where the
-     * class or traits should be used.
+     * class or trais should be used.
     */
    public function in(string ...$targets): void
    {
@ -91,13 +77,14 @@ final class UsesCall
                ]);
        }, $targets);

-        $this->targets = array_reduce($targets, function (array $accumulator, string $target): array {
-            if (is_dir($target) || file_exists($target)) {
-                $accumulator[] = (string) realpath($target);
+        $this->targets = array_map(function ($target): string {
+            $isValid = is_dir($target) || file_exists($target);
+            if (!$isValid) {
+                throw new InvalidUsesPath($target);
            }

-            return $accumulator;
-        }, []);
+            return (string) realpath($target);
+        }, $targets);
    }

    /**
@ -110,56 +97,11 @@ final class UsesCall
        return $this;
    }

-    /**
-     * Sets the global beforeAll test hook.
-     */
-    public function beforeAll(Closure $hook): UsesCall
-    {
-        $this->hooks[0] = $hook;
-
-        return $this;
-    }
-
-    /**
-     * Sets the global beforeEach test hook.
-     */
-    public function beforeEach(Closure $hook): UsesCall
-    {
-        $this->hooks[1] = $hook;
-
-        return $this;
-    }
-
-    /**
-     * Sets the global afterEach test hook.
-     */
-    public function afterEach(Closure $hook): UsesCall
-    {
-        $this->hooks[2] = $hook;
-
-        return $this;
-    }
-
-    /**
-     * Sets the global afterAll test hook.
-     */
-    public function afterAll(Closure $hook): UsesCall
-    {
-        $this->hooks[3] = $hook;
-
-        return $this;
-    }
-
    /**
     * Dispatch the creation of uses.
     */
    public function __destruct()
    {
-        TestSuite::getInstance()->tests->use(
-            $this->classAndTraits,
-            $this->groups,
-            $this->targets,
-            $this->hooks,
-        );
+        TestSuite::getInstance()->tests->use($this->classAndTraits, $this->groups, $this->targets);
    }
 }
--- a/src/Pest.php
+++ b/src/Pest.php
@ -6,10 +6,5 @@ namespace Pest;

 function version(): string
 {
-    return '1.21.0';
-}
-
-function testDirectory(string $file = ''): string
-{
-    return TestSuite::getInstance()->testPath . '/' . $file;
+    return '0.2.2';
 }
--- a/src/Plugin.php
+++ b/src/Plugin.php
@ -22,7 +22,7 @@ final class Plugin
    public static function uses(string ...$traits): void
    {
        self::$callables[] = function () use ($traits): void {
-            uses(...$traits)->in(TestSuite::getInstance()->rootPath . DIRECTORY_SEPARATOR . testDirectory());
+            uses(...$traits)->in(TestSuite::getInstance()->rootPath . DIRECTORY_SEPARATOR . 'tests');
        };
    }
 }
--- a/src/Plugins/Coverage.php
+++ b/src/Plugins/Coverage.php
@ -1,118 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Plugins;
-
-use Pest\Contracts\Plugins\AddsOutput;
-use Pest\Contracts\Plugins\HandlesArguments;
-use Pest\Support\Str;
-use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Console\Input\InputDefinition;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-
-/**
- * @internal
- */
-final class Coverage implements AddsOutput, HandlesArguments
-{
-    /**
-     * @var string
-     */
-    private const COVERAGE_OPTION = 'coverage';
-
-    /**
-     * @var string
-     */
-    private const MIN_OPTION = 'min';
-
-    /**
-     * Whether should show the coverage or not.
-     *
-     * @var bool
-     */
-    public $coverage = false;
-
-    /**
-     * The minimum coverage.
-     *
-     * @var float
-     */
-    public $coverageMin = 0.0;
-
-    /**
-     * @var OutputInterface
-     */
-    private $output;
-
-    public function __construct(OutputInterface $output)
-    {
-        $this->output = $output;
-    }
-
-    public function handleArguments(array $originals): array
-    {
-        $arguments = array_merge([''], array_values(array_filter($originals, function ($original): bool {
-            foreach ([self::COVERAGE_OPTION, self::MIN_OPTION] as $option) {
-                if ($original === sprintf('--%s', $option) || Str::startsWith($original, sprintf('--%s=', $option))) {
-                    return true;
-                }
-            }
-
-            return false;
-        })));
-
-        $originals = array_flip($originals);
-        foreach ($arguments as $argument) {
-            unset($originals[$argument]);
-        }
-        $originals = array_flip($originals);
-
-        $inputs   = [];
-        $inputs[] = new InputOption(self::COVERAGE_OPTION, null, InputOption::VALUE_NONE);
-        $inputs[] = new InputOption(self::MIN_OPTION, null, InputOption::VALUE_REQUIRED);
-
-        $input = new ArgvInput($arguments, new InputDefinition($inputs));
-        if ((bool) $input->getOption(self::COVERAGE_OPTION)) {
-            $this->coverage      = true;
-            $originals[]         = '--coverage-php';
-            $originals[]         = \Pest\Support\Coverage::getPath();
-        }
-
-        if ($input->getOption(self::MIN_OPTION) !== null) {
-            $this->coverageMin = (float) $input->getOption(self::MIN_OPTION);
-        }
-
-        return $originals;
-    }
-
-    /**
-     * Allows to add custom output after the test suite was executed.
-     */
-    public function addOutput(int $result): int
-    {
-        if ($result === 0 && $this->coverage) {
-            if (!\Pest\Support\Coverage::isAvailable()) {
-                $this->output->writeln(
-                    "\n  <fg=white;bg=red;options=bold> ERROR </> No code coverage driver is available.</>",
-                );
-                exit(1);
-            }
-
-            $coverage = \Pest\Support\Coverage::report($this->output);
-
-            $result = (int) ($coverage < $this->coverageMin);
-
-            if ($result === 1) {
-                $this->output->writeln(sprintf(
-                    "\n  <fg=white;bg=red;options=bold> FAIL </> Code coverage below expected:<fg=red;options=bold> %s %%</>. Minimum:<fg=white;options=bold> %s %%</>.",
-                    number_format($coverage, 1),
-                    number_format($this->coverageMin, 1)
-                ));
-            }
-        }
-
-        return $result;
-    }
-}
--- a/src/Plugins/Environment.php
+++ b/src/Plugins/Environment.php
@ -1,67 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Plugins;
-
-use Pest\Contracts\Plugins\HandlesArguments;
-
-/**
- * @internal
- */
-final class Environment implements HandlesArguments
-{
-    /**
-     * The continuous integration environment.
-     */
-    public const CI    = 'ci';
-
-    /**
-     * The local environment.
-     */
-    public const LOCAL = 'local';
-
-    /**
-     * @var \Pest\Plugins\Environment|null
-     */
-    private static $instance;
-
-    /**
-     * The current environment.
-     *
-     * @var string|null
-     */
-    private static $name;
-
-    /**
-     * Allows to handle custom command line arguments.
-     *
-     * @param array<int, string> $arguments
-     *
-     * @return array<int, string> the updated list of arguments
-     */
-    public function handleArguments(array $arguments): array
-    {
-        foreach ($arguments as $index => $argument) {
-            if ($argument === '--ci') {
-                unset($arguments[$index]);
-
-                self::$name = self::CI;
-            }
-        }
-
-        return array_values($arguments);
-    }
-
-    /**
-     * Gets the environment name.
-     */
-    public static function name(string $name = null): string
-    {
-        if (is_string($name)) {
-            self::$name = $name;
-        }
-
-        return self::$name ?? self::LOCAL;
-    }
-}
--- a/src/Plugins/Init.php
+++ b/src/Plugins/Init.php
@ -1,128 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Plugins;
-
-use Pest\Console\Thanks;
-use Pest\Contracts\Plugins\HandlesArguments;
-use Pest\TestSuite;
-use Symfony\Component\Console\Output\OutputInterface;
-
-/**
- * @internal
- */
-final class Init implements HandlesArguments
-{
-    /**
-     * The option the triggers the init job.
-     */
-    private const INIT_OPTION = '--init';
-
-    /**
-     * The files that will be created.
-     */
-    private const STUBS = [
-        'phpunit.xml'     => 'phpunit.xml',
-        'Pest.php'        => 'tests/Pest.php',
-        'ExampleTest.php' => 'tests/ExampleTest.php',
-    ];
-
-    /**
-     * @var OutputInterface
-     */
-    private $output;
-
-    /**
-     * @var TestSuite
-     */
-    private $testSuite;
-
-    /**
-     * Creates a new Plugin instance.
-     */
-    public function __construct(TestSuite $testSuite, OutputInterface $output)
-    {
-        $this->testSuite = $testSuite;
-        $this->output    = $output;
-    }
-
-    public function handleArguments(array $arguments): array
-    {
-        if (!array_key_exists(1, $arguments) || $arguments[1] !== self::INIT_OPTION) {
-            return $arguments;
-        }
-
-        unset($arguments[1]);
-
-        $this->init();
-
-        return array_values($arguments);
-    }
-
-    private function init(): void
-    {
-        $testsBaseDir = "{$this->testSuite->rootPath}/tests";
-
-        if (!is_dir($testsBaseDir)) {
-            if (!mkdir($testsBaseDir) && !is_dir($testsBaseDir)) {
-                $this->output->writeln(sprintf(
-                    "\n  <fg=white;bg=red;options=bold> ERROR </> Directory `%s` was not created.</>",
-                    $testsBaseDir
-                ));
-
-                return;
-            }
-
-            $this->output->writeln(
-                '  <fg=black;bg=green;options=bold> DONE </> Created `tests` directory.</>',
-            );
-        }
-
-        foreach (self::STUBS as $from => $to) {
-            $fromPath = __DIR__ . "/../../stubs/init/{$from}";
-            $toPath   = "{$this->testSuite->rootPath}/{$to}";
-
-            if (file_exists($toPath)) {
-                $this->output->writeln(sprintf(
-                    '  <fg=black;bg=yellow;options=bold> INFO </> File `%s` already exists, skipped.</>',
-                    $to
-                ));
-
-                continue;
-            }
-
-            if ($from === 'phpunit.xml' && file_exists($toPath . '.dist')) {
-                $this->output->writeln(sprintf(
-                    '  <fg=black;bg=yellow;options=bold> INFO </> File `%s` already exists, skipped.</>',
-                    $to . '.dist'
-                ));
-
-                continue;
-            }
-
-            if (!copy($fromPath, $toPath)) {
-                $this->output->writeln(sprintf(
-                    '<fg=black;bg=red>[WARNING] Failed to copy stub `%s` to `%s`</>',
-                    $from,
-                    $toPath
-                ));
-
-                continue;
-            }
-
-            $this->output->writeln(sprintf(
-                '  <fg=black;bg=green;options=bold> DONE </> Created `%s` file.</>',
-                $to
-            ));
-        }
-
-        $this->output->writeln(
-            "\n  <fg=black;bg=green;options=bold> DONE </> Pest initialised.</>\n",
-        );
-
-        (new Thanks($this->output))();
-
-        exit(0);
-    }
-}
--- a/src/Repositories/AfterEachRepository.php
+++ b/src/Repositories/AfterEachRepository.php
@ -41,6 +41,7 @@ final class AfterEachRepository

        return ChainableClosure::from(function (): void {
            if (class_exists(Mockery::class)) {
+                /* @phpstan-ignore-next-line */
                if ($container = Mockery::getContainer()) {
                    /* @phpstan-ignore-next-line */
                    $this->addToAssertionCount($container->mockery_getExpectationCount());
--- a/src/Repositories/TestRepository.php
+++ b/src/Repositories/TestRepository.php
@ -4,36 +4,26 @@ declare(strict_types=1);

 namespace Pest\Repositories;

-use Closure;
-use Pest\Exceptions\DatasetMissing;
 use Pest\Exceptions\ShouldNotHappen;
 use Pest\Exceptions\TestAlreadyExist;
 use Pest\Exceptions\TestCaseAlreadyInUse;
 use Pest\Exceptions\TestCaseClassOrTraitNotFound;
 use Pest\Factories\TestCaseFactory;
-use Pest\Plugins\Environment;
-use Pest\Support\Reflection;
 use Pest\Support\Str;
 use Pest\TestSuite;
-use PHPUnit\Framework\TestCase;

 /**
 * @internal
 */
 final class TestRepository
 {
-    /**
-     * @var non-empty-string
-     */
-    private const SEPARATOR = '>>>';
-
    /**
     * @var array<string, TestCaseFactory>
     */
    private $state = [];

    /**
-     * @var array<string, array<int, array<int, string|Closure>>>
+     * @var array<string, array<int, array<int, string>>>
     */
    private $uses = [];

@ -45,20 +35,6 @@ final class TestRepository
        return count($this->state);
    }

-    /**
-     * Returns the filename of each test that should be executed in the suite.
-     *
-     * @return array<int, string>
-     */
-    public function getFilenames(): array
-    {
-        $testsWithOnly = $this->testsUsingOnly();
-
-        return array_values(array_map(function (TestCaseFactory $factory): string {
-            return $factory->filename;
-        }, count($testsWithOnly) > 0 ? $testsWithOnly : $this->state));
-    }
-
    /**
     * Calls the given callable foreach test case.
     */
@ -69,15 +45,14 @@ final class TestRepository
        };

        foreach ($this->uses as $path => $uses) {
-            [$classOrTraits, $groups, $hooks] = $uses;
-
-            $setClassName = function (TestCaseFactory $testCase, string $key) use ($path, $classOrTraits, $groups, $startsWith, $hooks): void {
-                [$filename] = explode(self::SEPARATOR, $key);
+            [$classOrTraits, $groups] = $uses;
+            $setClassName             = function (TestCaseFactory $testCase, string $key) use ($path, $classOrTraits, $groups, $startsWith): void {
+                [$filename] = explode('@', $key);

                if ((!is_dir($path) && $filename === $path) || (is_dir($path) && $startsWith($filename, $path))) {
-                    foreach ($classOrTraits as $class) { /** @var string $class */
+                    foreach ($classOrTraits as $class) {
                        if (class_exists($class)) {
-                            if ($testCase->class !== TestCase::class) {
+                            if ($testCase->class !== \PHPUnit\Framework\TestCase::class) {
                                throw new TestCaseAlreadyInUse($testCase->class, $class, $filename);
                            }
                            $testCase->class = $class;
@ -86,12 +61,10 @@ final class TestRepository
                        }
                    }

-                    // IDEA: Consider set the real lines on these.
-                    $testCase->factoryProxies->add($filename, 0, 'addGroups', [$groups]);
-                    $testCase->factoryProxies->add($filename, 0, 'addBeforeAll', [$hooks[0] ?? null]);
-                    $testCase->factoryProxies->add($filename, 0, 'addBeforeEach', [$hooks[1] ?? null]);
-                    $testCase->factoryProxies->add($filename, 0, 'addAfterEach', [$hooks[2] ?? null]);
-                    $testCase->factoryProxies->add($filename, 0, 'addAfterAll', [$hooks[3] ?? null]);
+                    $testCase
+                        ->factoryProxies
+                        // Consider set the real line here.
+                        ->add($filename, 0, 'addGroups', [$groups]);
                }
            };

@ -100,12 +73,14 @@ final class TestRepository
            }
        }

-        $onlyState = $this->testsUsingOnly();
+        $onlyState = array_filter($this->state, function ($testFactory): bool {
+            return $testFactory->only;
+        });

        $state = count($onlyState) > 0 ? $onlyState : $this->state;

        foreach ($state as $testFactory) {
-            /** @var TestCaseFactory $testFactory */
+            /* @var TestCaseFactory $testFactory */
            $tests = $testFactory->build($testSuite);
            foreach ($tests as $test) {
                $each($test);
@ -113,31 +88,14 @@ final class TestRepository
        }
    }

-    /**
-     * Return all tests that have called the only method.
-     *
-     * @return array<TestCaseFactory>
-     */
-    private function testsUsingOnly(): array
-    {
-        if (Environment::name() === Environment::CI) {
-            return [];
-        }
-
-        return array_filter($this->state, function ($testFactory): bool {
-            return $testFactory->only;
-        });
-    }
-
    /**
     * Uses the given `$testCaseClass` on the given `$paths`.
     *
-     * @param array<int, string>  $classOrTraits
-     * @param array<int, string>  $groups
-     * @param array<int, string>  $paths
-     * @param array<int, Closure> $hooks
+     * @param array<int, string> $classOrTraits
+     * @param array<int, string> $groups
+     * @param array<int, string> $paths
     */
-    public function use(array $classOrTraits, array $groups, array $paths, array $hooks): void
+    public function use(array $classOrTraits, array $groups, array $paths): void
    {
        foreach ($classOrTraits as $classOrTrait) {
            if (!class_exists($classOrTrait) && !trait_exists($classOrTrait)) {
@ -150,10 +108,9 @@ final class TestRepository
                $this->uses[$path] = [
                    array_merge($this->uses[$path][0], $classOrTraits),
                    array_merge($this->uses[$path][1], $groups),
-                    $this->uses[$path][2] + $hooks, // NOTE: array_merge will destroy numeric indices
                ];
            } else {
-                $this->uses[$path] = [$classOrTraits, $groups, $hooks];
+                $this->uses[$path] = [$classOrTraits, $groups];
            }
        }
    }
@ -167,18 +124,10 @@ final class TestRepository
            throw ShouldNotHappen::fromMessage('Trying to create a test without description.');
        }

-        if (array_key_exists(sprintf('%s%s%s', $test->filename, self::SEPARATOR, $test->description), $this->state)) {
+        if (array_key_exists(sprintf('%s@%s', $test->filename, $test->description), $this->state)) {
            throw new TestAlreadyExist($test->filename, $test->description);
        }

-        if (!$test->receivesArguments()) {
-            $arguments = Reflection::getFunctionArguments($test->test);
-
-            if (count($arguments) > 0) {
-                throw new DatasetMissing($test->filename, $test->description, $arguments);
-            }
-        }
-
-        $this->state[sprintf('%s%s%s', $test->filename, self::SEPARATOR, $test->description)] = $test;
+        $this->state[sprintf('%s@%s', $test->filename, $test->description)] = $test;
    }
 }
--- a/src/Support/Arr.php
+++ b/src/Support/Arr.php
@ -1,68 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Support;
-
-/**
- * Credits: most of this class methods and implementations
- * belongs to the Arr helper of laravel/framework project
- * (https://github.com/laravel/framework).
- *
- * @internal
- */
-final class Arr
-{
-    /**
-     * @param array<mixed> $array
-     * @param string|int   $key
-     */
-    public static function has(array $array, $key): bool
-    {
-        $key = (string) $key;
-
-        if (array_key_exists($key, $array)) {
-            return true;
-        }
-
-        foreach (explode('.', $key) as $segment) {
-            if (is_array($array) && array_key_exists($segment, $array)) {
-                $array = $array[$segment];
-            } else {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * @param array<mixed> $array
-     * @param string|int   $key
-     * @param null         $default
-     *
-     * @return array|mixed|null
-     */
-    public static function get(array $array, $key, $default = null)
-    {
-        $key = (string) $key;
-
-        if (array_key_exists($key, $array)) {
-            return $array[$key];
-        }
-
-        if (strpos($key, '.') === false) {
-            return $array[$key] ?? $default;
-        }
-
-        foreach (explode('.', $key) as $segment) {
-            if (is_array($array) && array_key_exists($segment, $array)) {
-                $array = $array[$segment];
-            } else {
-                return $default;
-            }
-        }
-
-        return $array;
-    }
-}
--- a/src/Support/ChainableClosure.php
+++ b/src/Support/ChainableClosure.php
@ -12,28 +12,13 @@ use Closure;
 final class ChainableClosure
 {
    /**
-     * Calls the given `$closure` and chains the `$next` closure.
+     * Calls the given `$closure` and chains the the `$next` closure.
     */
    public static function from(Closure $closure, Closure $next): Closure
    {
        return function () use ($closure, $next): void {
-            /* @phpstan-ignore-next-line */
            call_user_func_array(Closure::bind($closure, $this, get_class($this)), func_get_args());
-            /* @phpstan-ignore-next-line */
            call_user_func_array(Closure::bind($next, $this, get_class($this)), func_get_args());
        };
    }
-
-    /**
-     * Call the given static `$closure` and chains the `$next` closure.
-     */
-    public static function fromStatic(Closure $closure, Closure $next): Closure
-    {
-        return static function () use ($closure, $next): void {
-            /* @phpstan-ignore-next-line */
-            call_user_func_array(Closure::bind($closure, null, self::class), func_get_args());
-            /* @phpstan-ignore-next-line */
-            call_user_func_array(Closure::bind($next, null, self::class), func_get_args());
-        };
-    }
 }
--- a/src/Support/Container.php
+++ b/src/Support/Container.php
@ -75,16 +75,14 @@ final class Container
            if ($constructor !== null) {
                $params = array_map(
                    function (ReflectionParameter $param) use ($id) {
-                        $candidate = Reflection::getParameterClassName($param);
+                        $candidate = null;

-                        if ($candidate === null) {
-                            $type = $param->getType();
-                            /* @phpstan-ignore-next-line */
-                            if ($type !== null && $type->isBuiltin()) {
-                                $candidate = $param->getName();
-                            } else {
-                                throw ShouldNotHappen::fromMessage(sprintf('The type of `$%s` in `%s` cannot be determined.', $id, $param->getName()));
-                            }
+                        if ($param->getType() !== null && $param->getType()->isBuiltin()) {
+                            $candidate = $param->getName();
+                        } elseif ($param->getClass() !== null) {
+                            $candidate = $param->getClass()->getName();
+                        } else {
+                            throw ShouldNotHappen::fromMessage(sprintf('The type of `$%s` in `%s` cannot be determined.', $id, $param->getName()));
                        }

                        return $this->get($candidate);
--- a/src/Support/Coverage.php
+++ b/src/Support/Coverage.php
@ -1,184 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Support;
-
-use Pest\Exceptions\ShouldNotHappen;
-use SebastianBergmann\CodeCoverage\CodeCoverage;
-use SebastianBergmann\CodeCoverage\Node\Directory;
-use SebastianBergmann\CodeCoverage\Node\File;
-use SebastianBergmann\Environment\Runtime;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Terminal;
-
-/**
- * @internal
- */
-final class Coverage
-{
-    /**
-     * Returns the coverage path.
-     */
-    public static function getPath(): string
-    {
-        return implode(DIRECTORY_SEPARATOR, [
-            dirname(__DIR__, 2),
-            '.temp',
-            'coverage.php',
-        ]);
-    }
-
-    /**
-     * Runs true there is any code coverage driver available.
-     */
-    public static function isAvailable(): bool
-    {
-        return (new Runtime())->canCollectCodeCoverage();
-    }
-
-    /**
-     * If the user is using Xdebug.
-     */
-    public static function usingXdebug(): bool
-    {
-        return (new Runtime())->hasXdebug();
-    }
-
-    /**
-     * Reports the code coverage report to the
-     * console and returns the result in float.
-     */
-    public static function report(OutputInterface $output): float
-    {
-        if (!file_exists($reportPath = self::getPath())) {
-            if (self::usingXdebug()) {
-                $output->writeln(
-                    "  <fg=black;bg=yellow;options=bold> WARN </> Unable to get coverage using Xdebug. Did you set <href=https://xdebug.org/docs/code_coverage#mode>Xdebug's coverage mode</>?</>",
-                );
-
-                return 0.0;
-            }
-
-            throw ShouldNotHappen::fromMessage(sprintf('Coverage not found in path: %s.', $reportPath));
-        }
-
-        /** @var CodeCoverage $codeCoverage */
-        $codeCoverage = require $reportPath;
-        unlink($reportPath);
-
-        $totalWidth = (new Terminal())->getWidth();
-
-        $dottedLineLength = $totalWidth <= 70 ? $totalWidth : 70;
-
-        $totalCoverage = $codeCoverage->getReport()->percentageOfExecutedLines();
-
-        $output->writeln(
-            sprintf(
-                '  <fg=white;options=bold>Cov:    </><fg=default>%s</>',
-                $totalCoverage->asString()
-            )
-        );
-
-        $output->writeln('');
-
-        /** @var Directory<File|Directory> $report */
-        $report = $codeCoverage->getReport();
-
-        foreach ($report->getIterator() as $file) {
-            if (!$file instanceof File) {
-                continue;
-            }
-            $dirname  = dirname($file->id());
-            $basename = basename($file->id(), '.php');
-
-            $name = $dirname === '.' ? $basename : implode(DIRECTORY_SEPARATOR, [
-                $dirname,
-                $basename,
-            ]);
-            $rawName = $dirname === '.' ? $basename : implode(DIRECTORY_SEPARATOR, [
-                $dirname,
-                $basename,
-            ]);
-
-            $linesExecutedTakenSize = 0;
-
-            if ($file->percentageOfExecutedLines()->asString() != '0.00%') {
-                $linesExecutedTakenSize = strlen($uncoveredLines = trim(implode(', ', self::getMissingCoverage($file)))) + 1;
-                $name .= sprintf(' <fg=red>%s</>', $uncoveredLines);
-            }
-
-            $percentage = $file->numberOfExecutableLines() === 0
-                ? '100.0'
-                : number_format($file->percentageOfExecutedLines()->asFloat(), 1, '.', '');
-
-            $takenSize = strlen($rawName . $percentage) + 4 + $linesExecutedTakenSize; // adding 3 space and percent sign
-
-            $percentage = sprintf(
-                '<fg=%s>%s</>',
-                $percentage === '100.0' ? 'green' : ($percentage === '0.0' ? 'red' : 'yellow'),
-                $percentage
-            );
-
-            $output->writeln(sprintf(
-                '  %s %s %s %%',
-                $name,
-                str_repeat('.', max($dottedLineLength - $takenSize, 1)),
-                $percentage
-            ));
-        }
-
-        return $totalCoverage->asFloat();
-    }
-
-    /**
-     * Generates an array of missing coverage on the following format:.
-     *
-     * ```
-     * ['11', '20..25', '50', '60..80'];
-     * ```
-     *
-     * @param File $file
-     *
-     * @return array<int, string>
-     */
-    public static function getMissingCoverage($file): array
-    {
-        $shouldBeNewLine = true;
-
-        $eachLine = function (array $array, array $tests, int $line) use (&$shouldBeNewLine): array {
-            if (count($tests) > 0) {
-                $shouldBeNewLine = true;
-
-                return $array;
-            }
-
-            if ($shouldBeNewLine) {
-                $array[]         = (string) $line;
-                $shouldBeNewLine = false;
-
-                return $array;
-            }
-
-            $lastKey = count($array) - 1;
-
-            if (array_key_exists($lastKey, $array) && strpos($array[$lastKey], '..') !== false) {
-                [$from]          = explode('..', $array[$lastKey]);
-                $array[$lastKey] = $line > $from ? sprintf('%s..%s', $from, $line) : sprintf('%s..%s', $line, $from);
-
-                return $array;
-            }
-
-            $array[$lastKey] = sprintf('%s..%s', $array[$lastKey], $line);
-
-            return $array;
-        };
-
-        $array = [];
-        foreach (array_filter($file->lineCoverageData(), 'is_array') as $line => $tests) {
-            $array = $eachLine($array, $tests, $line);
-        }
-
-        return $array;
-    }
-}
--- a/src/Support/ExceptionTrace.php
+++ b/src/Support/ExceptionTrace.php
@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace Pest\Support;

 use Closure;
-use ReflectionProperty;
 use Throwable;

 /**
@ -21,7 +20,7 @@ final class ExceptionTrace
     *
     * @return mixed
     *
-     * @throws Throwable
+     * @throws \Throwable
     */
    public static function ensure(Closure $closure)
    {
@ -37,30 +36,4 @@ final class ExceptionTrace
            throw $throwable;
        }
    }
-
-    /**
-     * Removes any item from the stack trace referencing Pest so as not to
-     * crowd the error log for the end user.
-     */
-    public static function removePestReferences(Throwable $t): void
-    {
-        if (!property_exists($t, 'serializableTrace')) {
-            return;
-        }
-
-        $property = new ReflectionProperty($t, 'serializableTrace');
-        $property->setAccessible(true);
-        $trace = $property->getValue($t);
-
-        $cleanedTrace = [];
-        foreach ($trace as $item) {
-            if (key_exists('file', $item) && mb_strpos($item['file'], 'vendor/pestphp/pest/') > 0) {
-                continue;
-            }
-
-            $cleanedTrace[] = $item;
-        }
-
-        $property->setValue($t, $cleanedTrace);
-    }
 }
--- a/src/Support/Extendable.php
+++ b/src/Support/Extendable.php
@ -1,33 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Support;
-
-use Closure;
-
-final class Extendable
-{
-    /**
-     * The extendable class.
-     *
-     * @var string
-     */
-    private $extendableClass;
-
-    /**
-     * Creates a new extendable instance.
-     */
-    public function __construct(string $extendableClass)
-    {
-        $this->extendableClass = $extendableClass;
-    }
-
-    /**
-     * Register a custom extend.
-     */
-    public function extend(string $name, Closure $extend): void
-    {
-        $this->extendableClass::extend($name, $extend);
-    }
-}
--- a/src/Support/HigherOrderCallables.php
+++ b/src/Support/HigherOrderCallables.php
@ -1,66 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Support;
-
-use Closure;
-use Pest\Expectation;
-use Pest\PendingObjects\TestCall;
-use PHPUnit\Framework\TestCase;
-
-/**
- * @internal
- */
-final class HigherOrderCallables
-{
-    /**
-     * @var object
-     */
-    private $target;
-
-    public function __construct(object $target)
-    {
-        $this->target = $target;
-    }
-
-    /**
-     * @template TValue
-     *
-     * Create a new expectation. Callable values will be executed prior to returning the new expectation.
-     *
-     * @param callable|TValue $value
-     *
-     * @return Expectation<TValue>
-     */
-    public function expect($value)
-    {
-        return new Expectation($value instanceof Closure ? Reflection::bindCallableWithData($value) : $value);
-    }
-
-    /**
-     * @template TValue
-     *
-     * Create a new expectation. Callable values will be executed prior to returning the new expectation.
-     *
-     * @param callable|TValue $value
-     *
-     * @return Expectation<TValue>
-     */
-    public function and($value)
-    {
-        return $this->expect($value);
-    }
-
-    /**
-     * Tap into the test case to perform an action and return the test case.
-     *
-     * @return TestCall|TestCase|object
-     */
-    public function tap(callable $callable)
-    {
-        Reflection::bindCallableWithData($callable);
-
-        return $this->target;
-    }
-}
--- a/src/Support/HigherOrderMessage.php
+++ b/src/Support/HigherOrderMessage.php
@ -4,7 +4,6 @@ declare(strict_types=1);

 namespace Pest\Support;

-use Closure;
 use ReflectionClass;
 use Throwable;

@ -34,40 +33,33 @@ final class HigherOrderMessage
    public $line;

    /**
-     * The method or property name to access.
+     * The method name.
     *
     * @readonly
     *
     * @var string
     */
-    public $name;
+    public $methodName;

    /**
     * The arguments.
     *
-     * @var array<int, mixed>|null
+     * @var array<int, mixed>
     *
     * @readonly
     */
    public $arguments;

-    /**
-     * An optional condition that will determine if the message will be executed.
-     *
-     * @var callable(): bool|null
-     */
-    public $condition = null;
-
    /**
     * Creates a new higher order message.
     *
-     * @param array<int, mixed>|null $arguments
+     * @param array<int, mixed> $arguments
     */
-    public function __construct(string $filename, int $line, string $methodName, $arguments)
+    public function __construct(string $filename, int $line, string $methodName, array $arguments)
    {
        $this->filename   = $filename;
        $this->line       = $line;
-        $this->name       = $methodName;
+        $this->methodName = $methodName;
        $this->arguments  = $arguments;
    }

@ -78,64 +70,21 @@ final class HigherOrderMessage
     */
    public function call(object $target)
    {
-        /* @phpstan-ignore-next-line */
-        if (is_callable($this->condition) && call_user_func(Closure::bind($this->condition, $target)) === false) {
-            return $target;
-        }
-
-        if ($this->hasHigherOrderCallable()) {
-            /* @phpstan-ignore-next-line */
-            return (new HigherOrderCallables($target))->{$this->name}(...$this->arguments);
-        }
-
        try {
-            return is_array($this->arguments)
-                ? Reflection::call($target, $this->name, $this->arguments)
-                : $target->{$this->name}; /* @phpstan-ignore-line */
+            return Reflection::call($target, $this->methodName, $this->arguments);
        } catch (Throwable $throwable) {
            Reflection::setPropertyValue($throwable, 'file', $this->filename);
            Reflection::setPropertyValue($throwable, 'line', $this->line);

-            if ($throwable->getMessage() === self::getUndefinedMethodMessage($target, $this->name)) {
-                /** @var ReflectionClass $reflection */
+            if ($throwable->getMessage() === sprintf(self::UNDEFINED_METHOD, $this->methodName)) {
+                /** @var \ReflectionClass $reflection */
                $reflection = new ReflectionClass($target);
                /* @phpstan-ignore-next-line */
                $reflection = $reflection->getParentClass() ?: $reflection;
-                Reflection::setPropertyValue($throwable, 'message', sprintf('Call to undefined method %s::%s()', $reflection->getName(), $this->name));
+                Reflection::setPropertyValue($throwable, 'message', sprintf('Call to undefined method %s::%s()', $reflection->getName(), $this->methodName));
            }

            throw $throwable;
        }
    }
-
-    /**
-     * Indicates that this message should only be called when the given condition is true.
-     *
-     * @param callable(): bool $condition
-     */
-    public function when(callable $condition): self
-    {
-        $this->condition = $condition;
-
-        return $this;
-    }
-
-    /**
-     * Determines whether or not there exists a higher order callable with the message name.
-     *
-     * @return bool
-     */
-    private function hasHigherOrderCallable()
-    {
-        return in_array($this->name, get_class_methods(HigherOrderCallables::class), true);
-    }
-
-    private static function getUndefinedMethodMessage(object $target, string $methodName): string
-    {
-        if (\PHP_MAJOR_VERSION >= 8) {
-            return sprintf(sprintf(self::UNDEFINED_METHOD, sprintf('%s::%s()', get_class($target), $methodName)));
-        }
-
-        return sprintf(self::UNDEFINED_METHOD, $methodName);
-    }
 }
--- a/src/Support/HigherOrderMessageCollection.php
+++ b/src/Support/HigherOrderMessageCollection.php
@ -17,21 +17,11 @@ final class HigherOrderMessageCollection
    /**
     * Adds a new higher order message to the collection.
     *
-     * @param array<int, mixed>|null $arguments
+     * @param array<int, mixed> $arguments
     */
-    public function add(string $filename, int $line, string $name, array $arguments = null): void
+    public function add(string $filename, int $line, string $methodName, array $arguments): void
    {
-        $this->messages[] = new HigherOrderMessage($filename, $line, $name, $arguments);
-    }
-
-    /**
-     * Adds a new higher order message to the collection if the callable condition is does not return false.
-     *
-     * @param array<int, mixed>|null $arguments
-     */
-    public function addWhen(callable $condition, string $filename, int $line, string $name, array $arguments = null): void
-    {
-        $this->messages[] = (new HigherOrderMessage($filename, $line, $name, $arguments))->when($condition);
+        $this->messages[] = new HigherOrderMessage($filename, $line, $methodName, $arguments);
    }

    /**
@ -40,7 +30,7 @@ final class HigherOrderMessageCollection
    public function chain(object $target): void
    {
        foreach ($this->messages as $message) {
-            $target = $message->call($target) ?? $target;
+            $target = $message->call($target);
        }
    }

@ -53,20 +43,4 @@ final class HigherOrderMessageCollection
            $message->call($target);
        }
    }
-
-    /**
-     * Count the number of messages with the given name.
-     *
-     * @param string $name A higher order message name (usually a method name)
-     */
-    public function count(string $name): int
-    {
-        return array_reduce(
-            $this->messages,
-            static function (int $total, HigherOrderMessage $message) use ($name): int {
-                return $total + (int) ($name === $message->name);
-            },
-            0,
-        );
-    }
 }
--- a/src/Support/HigherOrderTapProxy.php
+++ b/src/Support/HigherOrderTapProxy.php
@ -4,9 +4,7 @@ declare(strict_types=1);

 namespace Pest\Support;

-use PHPUnit\Framework\TestCase;
 use ReflectionClass;
-use Throwable;

 /**
 * @internal
@ -18,14 +16,16 @@ final class HigherOrderTapProxy
    /**
     * The target being tapped.
     *
-     * @var TestCase
+     * @var mixed
     */
    public $target;

    /**
     * Create a new tap proxy instance.
+     *
+     * @param mixed $target
     */
-    public function __construct(TestCase $target)
+    public function __construct($target)
    {
        $this->target = $target;
    }
@ -51,12 +51,12 @@ final class HigherOrderTapProxy
        try {
            // @phpstan-ignore-next-line
            return $this->target->{$property};
-        } catch (Throwable $throwable) {
+        } catch (\Throwable $throwable) {
            Reflection::setPropertyValue($throwable, 'file', Backtrace::file());
            Reflection::setPropertyValue($throwable, 'line', Backtrace::line());

            if (Str::startsWith($message = $throwable->getMessage(), self::UNDEFINED_PROPERTY)) {
-                /** @var ReflectionClass $reflection */
+                /** @var \ReflectionClass $reflection */
                $reflection = (new ReflectionClass($this->target))->getParentClass();
                Reflection::setPropertyValue($throwable, 'message', sprintf('Undefined property %s::$%s', $reflection->getName(), $property));
            }
--- a/src/Support/Reflection.php
+++ b/src/Support/Reflection.php
@ -6,13 +6,10 @@ namespace Pest\Support;

 use Closure;
 use Pest\Exceptions\ShouldNotHappen;
-use Pest\TestSuite;
 use ReflectionClass;
 use ReflectionException;
 use ReflectionFunction;
-use ReflectionNamedType;
-use ReflectionParameter;
-use ReflectionUnionType;
+use ReflectionProperty;

 /**
 * @internal
@ -41,41 +38,10 @@ final class Reflection
                return $object->__call($method, $args);
            }

-            if (is_callable($method)) {
-                return static::bindCallable($method, $args);
-            }
-
            throw $exception;
        }
    }

-    /**
-     * Bind a callable to the TestCase and return the result.
-     *
-     * @param array<int, mixed> $args
-     *
-     * @return mixed
-     */
-    public static function bindCallable(callable $callable, array $args = [])
-    {
-        return Closure::fromCallable($callable)->bindTo(TestSuite::getInstance()->test)(...$args);
-    }
-
-    /**
-     * Bind a callable to the TestCase and return the result,
-     * passing in the current dataset values as arguments.
-     *
-     * @return mixed
-     */
-    public static function bindCallableWithData(callable $callable)
-    {
-        $test = TestSuite::getInstance()->test;
-
-        return $test === null
-            ? static::bindCallable($callable)
-            : Closure::fromCallable($callable)->bindTo($test)(...$test->getProvidedData());
-    }
-
    /**
     * Infers the file name from the given closure.
     */
@ -110,6 +76,10 @@ final class Reflection
            }
        }

+        if ($reflectionProperty === null) {
+            throw ShouldNotHappen::fromMessage('Reflection property not found.');
+        }
+
        $reflectionProperty->setAccessible(true);

        return $reflectionProperty->getValue($object);
@ -140,68 +110,11 @@ final class Reflection
            }
        }

+        if ($reflectionProperty === null) {
+            throw ShouldNotHappen::fromMessage('Reflection property not found.');
+        }
+
        $reflectionProperty->setAccessible(true);
        $reflectionProperty->setValue($object, $value);
    }
-
-    /**
-     * Get the class name of the given parameter's type, if possible.
-     *
-     * @see https://github.com/laravel/framework/blob/v6.18.25/src/Illuminate/Support/Reflector.php
-     */
-    public static function getParameterClassName(ReflectionParameter $parameter): ?string
-    {
-        $type = $parameter->getType();
-
-        if (!$type instanceof ReflectionNamedType || $type->isBuiltin()) {
-            return null;
-        }
-
-        $name = $type->getName();
-
-        if (($class = $parameter->getDeclaringClass()) instanceof ReflectionClass) {
-            if ($name === 'self') {
-                return $class->getName();
-            }
-
-            if ($name === 'parent' && ($parent = $class->getParentClass()) instanceof ReflectionClass) {
-                return $parent->getName();
-            }
-        }
-
-        return $name;
-    }
-
-    /**
-     * Receive a map of function argument names to their types.
-     *
-     * @return array<string, string>
-     */
-    public static function getFunctionArguments(Closure $function): array
-    {
-        $parameters = (new ReflectionFunction($function))->getParameters();
-        $arguments  = [];
-
-        foreach ($parameters as $parameter) {
-            /** @var ReflectionNamedType|ReflectionUnionType|null $types */
-            $types = ($parameter->hasType()) ? $parameter->getType() : null;
-
-            if (is_null($types)) {
-                $arguments[$parameter->getName()] = 'mixed';
-
-                continue;
-            }
-
-            $arguments[$parameter->getName()] = implode('|', array_map(
-                static function (ReflectionNamedType $type): string {
-                    return $type->getName();
-                },
-                ($types instanceof ReflectionNamedType)
-                    ? [$types] // NOTE: normalize as list of to handle unions
-                    : $types->getTypes(),
-            ));
-        }
-
-        return $arguments;
-    }
 }
--- a/src/Support/Str.php
+++ b/src/Support/Str.php
@ -9,25 +9,6 @@ namespace Pest\Support;
 */
 final class Str
 {
-    /**
-     * Pool of alpha-numeric characters for generating (unsafe) random strings
-     * from.
-     */
-    private const POOL = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
-
-    /**
-     * Create a (unsecure & non-cryptographically safe) random alpha-numeric
-     * string value.
-     *
-     * @param int $length the length of the resulting randomized string
-     *
-     * @see https://github.com/laravel/framework/blob/4.2/src/Illuminate/Support/Str.php#L240-L242
-     */
-    public static function random(int $length = 16): string
-    {
-        return substr(str_shuffle(str_repeat(self::POOL, 5)), 0, $length);
-    }
-
    /**
     * Checks if the given `$target` starts with the given `$search`.
     */
--- a/src/TestSuite.php
+++ b/src/TestSuite.php
@ -10,7 +10,6 @@ use Pest\Repositories\AfterEachRepository;
 use Pest\Repositories\BeforeAllRepository;
 use Pest\Repositories\BeforeEachRepository;
 use Pest\Repositories\TestRepository;
-use PHPUnit\Framework\TestCase;

 /**
 * @internal
@ -20,7 +19,7 @@ final class TestSuite
    /**
     * Holds the current test case.
     *
-     * @var TestCase|null
+     * @var \PHPUnit\Framework\TestCase|null
     */
    public $test;

@ -66,13 +65,6 @@ final class TestSuite
     */
    public $rootPath;

-    /**
-     * Holds the test path.
-     *
-     * @var string
-     */
-    public $testPath;
-
    /**
     * Holds an instance of the test suite.
     *
@ -83,7 +75,7 @@ final class TestSuite
    /**
     * Creates a new instance of the test suite.
     */
-    public function __construct(string $rootPath, string $testPath)
+    public function __construct(string $rootPath)
    {
        $this->beforeAll  = new BeforeAllRepository();
        $this->beforeEach = new BeforeEachRepository();
@ -91,17 +83,16 @@ final class TestSuite
        $this->afterEach  = new AfterEachRepository();
        $this->afterAll   = new AfterAllRepository();

-        $this->rootPath   = (string) realpath($rootPath);
-        $this->testPath   = $testPath;
+        $this->rootPath = (string) realpath($rootPath);
    }

    /**
     * Returns the current instance of the test suite.
     */
-    public static function getInstance(string $rootPath = null, string $testPath = null): TestSuite
+    public static function getInstance(string $rootPath = null): TestSuite
    {
-        if (is_string($rootPath) && is_string($testPath)) {
-            self::$instance = new TestSuite($rootPath, $testPath);
+        if (is_string($rootPath)) {
+            self::$instance = new TestSuite($rootPath);

            foreach (Plugin::$callables as $callable) {
                $callable();
--- a/src/globals.php
+++ b/src/globals.php
@ -0,0 +1,106 @@
+<?php
+
+declare(strict_types=1);
+
+use Pest\Datasets;
+use Pest\PendingObjects\AfterEachCall;
+use Pest\PendingObjects\BeforeEachCall;
+use Pest\PendingObjects\TestCall;
+use Pest\PendingObjects\UsesCall;
+use Pest\Support\Backtrace;
+use Pest\Support\HigherOrderTapProxy;
+use Pest\TestSuite;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Runs the given closure before all tests in the current file.
+ */
+function beforeAll(Closure $closure): void
+{
+    TestSuite::getInstance()->beforeAll->set($closure);
+}
+
+/**
+ * Runs the given closure before each test in the current file.
+ *
+ * @return BeforeEachCall|TestCase|mixed
+ */
+function beforeEach(Closure $closure = null): BeforeEachCall
+{
+    $filename = Backtrace::file();
+
+    return new BeforeEachCall(TestSuite::getInstance(), $filename, $closure);
+}
+
+/**
+ * Registers the given dataset.
+ *
+ * @param Closure|iterable $dataset
+ */
+function dataset(string $name, $dataset): void
+{
+    Datasets::set($name, $dataset);
+}
+
+/**
+ * The uses function adds the binds the
+ * given arguments to test closures.
+ */
+function uses(string ...$classAndTraits): UsesCall
+{
+    $filename = Backtrace::file();
+
+    return new UsesCall($filename, $classAndTraits);
+}
+
+/**
+ * Adds the given closure as a test. The first argument
+ * is the test description; the second argument is
+ * a closure that contains the test expectations.
+ *
+ * @return TestCall|TestCase|mixed
+ */
+function test(string $description = null, Closure $closure = null)
+{
+    if ($description === null && TestSuite::getInstance()->test) {
+        return new HigherOrderTapProxy(TestSuite::getInstance()->test);
+    }
+
+    $filename = Backtrace::testFile();
+
+    return new TestCall(TestSuite::getInstance(), $filename, $description, $closure);
+}
+
+/**
+ * Adds the given closure as a test. The first argument
+ * is the test description; the second argument is
+ * a closure that contains the test expectations.
+ *
+ * @return TestCall|TestCase|mixed
+ */
+function it(string $description, Closure $closure = null): TestCall
+{
+    $description = sprintf('it %s', $description);
+
+    return test($description, $closure);
+}
+
+/**
+ * Runs the given closure after each test in the current file.
+ *
+ * @return AfterEachCall|TestCase|mixed
+ */
+function afterEach(Closure $closure = null): AfterEachCall
+{
+    $filename = Backtrace::file();
+
+    return new AfterEachCall(TestSuite::getInstance(), $filename, $closure);
+}
+
+/**
+ * Runs the given closure after all tests in the current file.
+ */
+function afterAll(Closure $closure = null): void
+{
+    TestSuite::getInstance()->afterAll->set($closure);
+}
--- a/stubs/Browser.php
+++ b/stubs/Browser.php
@ -1,10 +0,0 @@
-<?php
-
-use Laravel\Dusk\Browser;
-
-it('has {name} page', function () {
-    $this->browse(function (Browser $browser) {
-        $browser->visit('/{name}')
-            ->assertSee('{name}');
-    });
-});
--- a/stubs/Laravel/Helpers.php
+++ b/stubs/Laravel/Helpers.php
@ -0,0 +1,11 @@
+<?php
+
+namespace Tests;
+
+/**
+ * A basic assert example.
+ */
+function assertExample(): void
+{
+    test()->assertTrue(true);
+}
--- a/stubs/Laravel/Pest.php
+++ b/stubs/Laravel/Pest.php
@ -1,45 +1,3 @@
 <?php

-/*
-|--------------------------------------------------------------------------
-| Test Case
-|--------------------------------------------------------------------------
-|
-| The closure you provide to your test functions is always bound to a specific PHPUnit test
-| case class. By default, that class is "PHPUnit\Framework\TestCase". Of course, you may
-| need to change it using the "uses()" function to bind a different classes or traits.
-|
-*/
-
 uses(Tests\TestCase::class)->in('Feature');
-
-/*
-|--------------------------------------------------------------------------
-| Expectations
-|--------------------------------------------------------------------------
-|
-| When you're writing tests, you often need to check that values meet certain conditions. The
-| "expect()" function gives you access to a set of "expectations" methods that you can use
-| to assert different things. Of course, you may extend the Expectation API at any time.
-|
-*/
-
-expect()->extend('toBeOne', function () {
-    return $this->toBe(1);
-});
-
-/*
-|--------------------------------------------------------------------------
-| Functions
-|--------------------------------------------------------------------------
-|
-| While Pest is very powerful out-of-the-box, you may have some testing code specific to your
-| project that you don't want to repeat in every file. Here you can also expose helpers as
-| global functions to help you to reduce the number of lines of code in your test files.
-|
-*/
-
-function something()
-{
-    // ..
-}
--- a/stubs/Laravel/phpunit.xml
+++ b/stubs/Laravel/phpunit.xml
@ -12,10 +12,10 @@
            <directory suffix="Test.php">./tests/Feature</directory>
        </testsuite>
    </testsuites>
-    <coverage processUncoveredFiles="true">
-        <include>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
            <directory suffix=".php">./app</directory>
            <directory suffix=".php">./src</directory>
-        </include>
-    </coverage>
+        </whitelist>
+    </filter>
 </phpunit>
--- a/stubs/Lumen/Helpers.php
+++ b/stubs/Lumen/Helpers.php
@ -0,0 +1,11 @@
+<?php
+
+namespace Tests;
+
+/**
+ * A basic assert example.
+ */
+function assertExample(): void
+{
+    test()->assertTrue(true);
+}
--- a/stubs/Lumen/Pest.php
+++ b/stubs/Lumen/Pest.php
@ -0,0 +1,3 @@
+<?php
+
+uses(TestCase::class)->in(__DIR__);
--- a/stubs/Lumen/phpunit.xml
+++ b/stubs/Lumen/phpunit.xml
@ -5,14 +5,13 @@
         colors="true"
 >
    <testsuites>
-        <testsuite name="Test Suite">
+        <testsuite name="Application Test Suite">
            <directory suffix="Test.php">./tests</directory>
        </testsuite>
    </testsuites>
-    <coverage processUncoveredFiles="true">
-        <include>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
            <directory suffix=".php">./app</directory>
-            <directory suffix=".php">./src</directory>
-        </include>
-    </coverage>
+        </whitelist>
+    </filter>
 </phpunit>
--- a/stubs/Unit.php
+++ b/stubs/Unit.php
@ -1,5 +1,5 @@
 <?php

 test('{name}', function () {
-    expect(true)->toBeTrue();
+    assertTrue(true);
 });
--- a/stubs/init/ExampleTest.php
+++ b/stubs/init/ExampleTest.php
@ -1,5 +0,0 @@
-<?php
-
-test('example', function () {
-    expect(true)->toBeTrue();
-});
--- a/stubs/init/Pest.php
+++ b/stubs/init/Pest.php
@ -1,45 +0,0 @@
-<?php
-
-/*
-|--------------------------------------------------------------------------
-| Test Case
-|--------------------------------------------------------------------------
-|
-| The closure you provide to your test functions is always bound to a specific PHPUnit test
-| case class. By default, that class is "PHPUnit\Framework\TestCase". Of course, you may
-| need to change it using the "uses()" function to bind a different classes or traits.
-|
-*/
-
-// uses(Tests\TestCase::class)->in('Feature');
-
-/*
-|--------------------------------------------------------------------------
-| Expectations
-|--------------------------------------------------------------------------
-|
-| When you're writing tests, you often need to check that values meet certain conditions. The
-| "expect()" function gives you access to a set of "expectations" methods that you can use
-| to assert different things. Of course, you may extend the Expectation API at any time.
-|
-*/
-
-expect()->extend('toBeOne', function () {
-    return $this->toBe(1);
-});
-
-/*
-|--------------------------------------------------------------------------
-| Functions
-|--------------------------------------------------------------------------
-|
-| While Pest is very powerful out-of-the-box, you may have some testing code specific to your
-| project that you don't want to repeat in every file. Here you can also expose helpers as
-| global functions to help you to reduce the number of lines of code in your test files.
-|
-*/
-
-function something()
-{
-    // ..
-}
--- a/tests/.snapshots/help-command.txt
+++ b/tests/.snapshots/help-command.txt
@ -1,5 +0,0 @@
-Pest Options:
-  --init                      Initialise a standard Pest configuration
-  --coverage                  Enable coverage and output to standard output
-  --min=<N>                   Set the minimum required coverage percentage (<N>), and fail if not met
-  --group=<name>              Only runs tests from the specified group(s)
--- a/tests/.snapshots/success.txt
+++ b/tests/.snapshots/success.txt
@ -17,12 +17,6 @@
  ✓ it gets executed before each test
  ✓ it gets executed before each test once again

-   PASS  Tests\Features\Coverage
-  ✓ it has plugin
-  ✓ it adds coverage if --coverage exist
-  ✓ it adds coverage if --min exist
-  ✓ it generates coverage based on file input
-
   PASS  Tests\Features\Datasets
  ✓ it throws exception if dataset does not exist
  ✓ it throws exception if dataset already exist
@ -46,9 +40,6 @@
  ✓ eager wrapped registered datasets with (1)
  ✓ eager wrapped registered datasets with (2)
  ✓ eager registered wrapped datasets did the job right
-  ✓ named datasets with data set "one"
-  ✓ named datasets with data set "two"
-  ✓ named datasets did the job right
  ✓ lazy named datasets with (Bar Object (...))
  ✓ it creates unique test case names with ('Name 1', Pest\Plugin Object (), true) #1
  ✓ it creates unique test case names with ('Name 1', Pest\Plugin Object (), true) #2
@ -57,491 +48,28 @@
  ✓ it creates unique test case names with ('Name 2', Pest\Plugin Object (), true)
  ✓ it creates unique test case names with ('Name 1', Pest\Plugin Object (), true) #3
  ✓ it creates unique test case names - count
-  ✓ lazy multiple datasets with (1) / (3)
-  ✓ lazy multiple datasets with (1) / (4)
-  ✓ lazy multiple datasets with (2) / (3)
-  ✓ lazy multiple datasets with (2) / (4)
-  ✓ lazy multiple datasets did the job right
-  ✓ eager multiple datasets with (1) / (3)
-  ✓ eager multiple datasets with (1) / (4)
-  ✓ eager multiple datasets with (2) / (3)
-  ✓ eager multiple datasets with (2) / (4)
-  ✓ eager multiple datasets did the job right
-  ✓ lazy registered multiple datasets with (1) / (1)
-  ✓ lazy registered multiple datasets with (1) / (2)
-  ✓ lazy registered multiple datasets with (2) / (1)
-  ✓ lazy registered multiple datasets with (2) / (2)
-  ✓ lazy registered multiple datasets did the job right
-  ✓ eager registered multiple datasets with (1) / (1)
-  ✓ eager registered multiple datasets with (1) / (2)
-  ✓ eager registered multiple datasets with (2) / (1)
-  ✓ eager registered multiple datasets with (2) / (2)
-  ✓ eager registered multiple datasets did the job right
-  ✓ eager wrapped registered multiple datasets with (1) / (1)
-  ✓ eager wrapped registered multiple datasets with (1) / (2)
-  ✓ eager wrapped registered multiple datasets with (2) / (1)
-  ✓ eager wrapped registered multiple datasets with (2) / (2)
-  ✓ eager wrapped registered multiple datasets did the job right
-  ✓ named multiple datasets with data set "one" / data set "three"
-  ✓ named multiple datasets with data set "one" / data set "four"
-  ✓ named multiple datasets with data set "two" / data set "three"
-  ✓ named multiple datasets with data set "two" / data set "four"
-  ✓ named multiple datasets did the job right
-  ✓ more than two datasets with (1) / (3) / (5)
-  ✓ more than two datasets with (1) / (3) / (6)
-  ✓ more than two datasets with (1) / (4) / (5)
-  ✓ more than two datasets with (1) / (4) / (6)
-  ✓ more than two datasets with (2) / (3) / (5)
-  ✓ more than two datasets with (2) / (3) / (6)
-  ✓ more than two datasets with (2) / (4) / (5)
-  ✓ more than two datasets with (2) / (4) / (6)
-  ✓ more than two datasets did the job right
-  ✓ it can resolve a dataset after the test case is available with (Closure Object (...))
-  ✓ it can resolve a dataset after the test case is available with shared yield sets with (Closure Object (...)) #1
-  ✓ it can resolve a dataset after the test case is available with shared yield sets with (Closure Object (...)) #2
-  ✓ it can resolve a dataset after the test case is available with shared array sets with (Closure Object (...)) #1
-  ✓ it can resolve a dataset after the test case is available with shared array sets with (Closure Object (...)) #2
+
+   PASS  Tests\Features\Depends
+  ✓ first
+  ✓ second
+  ✓ depends
+  ✓ depends with ...params
+  ✓ depends with defined arguments
+  ✓ depends run test only once

   PASS  Tests\Features\Exceptions
  ✓ it gives access the the underlying expectException
  ✓ it catch exceptions
  ✓ it catch exceptions and messages
-  ✓ it can just define the message
-  ✓ it not catch exceptions if given condition is false
-  ✓ it catch exceptions if given condition is true
-  ✓ it catch exceptions and messages if given condition is true
-  ✓ it can just define the message if given condition is true
-  ✓ it can just define the message if given condition is 1
-
-   PASS  Tests\Features\Expect\HigherOrder\methods
-  ✓ it can access methods
-  ✓ it can access multiple methods
-  ✓ it works with not
-  ✓ it can accept arguments
-  ✓ it works with each
-  ✓ it works inside of each
-  ✓ it works with sequence
-  ✓ it can compose complex expectations
-  ✓ it can handle nested method calls
-  ✓ it works with higher order tests
-
-   PASS  Tests\Features\Expect\HigherOrder\methodsAndProperties
-  ✓ it can access methods and properties
-  ✓ it can handle nested methods and properties
-  ✓ it works with higher order tests
-  ✓ it can start a new higher order expectation using the and syntax
-  ✓ it can start a new higher order expectation using the and syntax in higher order tests
-
-   PASS  Tests\Features\Expect\HigherOrder\properties
-  ✓ it allows properties to be accessed from the value
-  ✓ it can access multiple properties from the value
-  ✓ it works with not
-  ✓ it works with each
-  ✓ it works inside of each
-  ✓ it works with sequence
-  ✓ it can compose complex expectations
-  ✓ it works with objects
-  ✓ it works with nested properties
-  ✓ it works with higher order tests
-
-   PASS  Tests\Features\Expect\each
-  ✓ an exception is thrown if the the type is not iterable
-  ✓ it expects on each item
-  ✓ it chains expectations on each item
-  ✓ opposite expectations on each item
-  ✓ chained opposite and non-opposite expectations
-  ✓ it can add expectations via "and"
-  ✓ it accepts callables
-
-   PASS  Tests\Features\Expect\extend
-  ✓ it macros true is true
-  ✓ it macros false is not true
-  ✓ it macros true is true with argument
-  ✓ it macros false is not true with argument
-
-   PASS  Tests\Features\Expect\json
-  ✓ it properly parses json string
-  ✓ fails with broken json string
-
-   PASS  Tests\Features\Expect\matchExpectation
-  ✓ it pass
-  ✓ it failures
-  ✓ it runs with truthy
-  ✓ it runs with falsy
-  ✓ it runs with truthy closure condition
-  ✓ it runs with falsy closure condition
-  ✓ it can be passed non-callable values
-  ✓ it fails with unhandled match
-  ✓ it can be used in higher order tests
-
-   PASS  Tests\Features\Expect\not
-  ✓ not property calls
-
-   PASS  Tests\Features\Expect\ray
-  ✓ ray calls do not fail when ray is not installed
-
-   PASS  Tests\Features\Expect\sequence
-  ✓ an exception is thrown if the the type is not iterable
-  ✓ allows for sequences of checks to be run on iterable data
-  ✓ loops back to the start if it runs out of sequence items
-  ✓ fails if the number of iterable items is greater than the number of expectations
-  ✓ it works with associative arrays
-  ✓ it can be passed non-callable values
-  ✓ it can be passed a mixture of value types
-
-   PASS  Tests\Features\Expect\toBe
-  ✓ strict comparisons
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeArray
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeBool
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeCallable
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeDirectory
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeEmpty
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeFalse
-  ✓ strict comparisons
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeFalsy
-  ✓ passes as falsy with (false)
-  ✓ passes as falsy with ('')
-  ✓ passes as falsy with (null)
-  ✓ passes as falsy with (0)
-  ✓ passes as falsy with ('0')
-  ✓ passes as not falsy with (true)
-  ✓ passes as not falsy with (1) #1
-  ✓ passes as not falsy with ('false')
-  ✓ passes as not falsy with (1) #2
-  ✓ passes as not falsy with (-1)
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeFile
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeFloat
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeGreatherThan
-  ✓ passes
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeGreatherThanOrEqual
-  ✓ passes
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeIn
-  ✓ passes
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeInfinite
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeInstanceOf
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeInt
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeIterable
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeJson
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeLessThan
-  ✓ passes
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeLessThanOrEqual
-  ✓ passes
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeNAN
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeNull
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeNumeric
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeObject
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeReadableDirectory
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeReadableFile
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeResource
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeScalar
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeString
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeTrue
-  ✓ strict comparisons
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeTruthy
-  ✓ passes as truthy with (true)
-  ✓ passes as truthy with (1) #1
-  ✓ passes as truthy with ('false')
-  ✓ passes as truthy with (1) #2
-  ✓ passes as truthy with (-1)
-  ✓ passes as not truthy with (false)
-  ✓ passes as not truthy with ('')
-  ✓ passes as not truthy with (null)
-  ✓ passes as not truthy with (0)
-  ✓ passes as not truthy with ('0')
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeWritableDirectory
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toBeWritableFile
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toContain
-  ✓ passes strings
-  ✓ passes strings with multiple needles
-  ✓ passes arrays
-  ✓ passes arrays with multiple needles
-  ✓ passes with array needles
-  ✓ failures
-  ✓ failures with multiple needles (all failing)
-  ✓ failures with multiple needles (some failing)
-  ✓ not failures
-  ✓ not failures with multiple needles (all failing)
-  ✓ not failures with multiple needles (some failing)
-
-   PASS  Tests\Features\Expect\toEndWith
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toEqual
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toEqualCanonicalizing
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toEqualWithDelta
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toHaveCount
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toHaveKey
-  ✓ pass
-  ✓ pass with nested key
-  ✓ pass with plain key with dots
-  ✓ pass with value check
-  ✓ pass with value check and nested key
-  ✓ pass with value check and plain key with dots
-  ✓ failures
-  ✓ failures with nested key
-  ✓ failures with plain key with dots
-  ✓ fails with wrong value
-  ✓ fails with wrong value and nested key
-  ✓ fails with wrong value and plain key with dots
-  ✓ not failures
-  ✓ not failures with nested key
-  ✓ not failures with plain key with dots
-  ✓ not failures with correct value
-  ✓ not failures with correct value and  with nested key
-  ✓ not failures with correct value and  with plain key with dots
-
-   PASS  Tests\Features\Expect\toHaveKeys
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toHaveLength
-  ✓ it passes with ('Fortaleza')
-  ✓ it passes with ('Sollefteå')
-  ✓ it passes with ('Ιεράπετρα')
-  ✓ it passes with (stdClass Object (...))
-  ✓ it passes with (Illuminate\Support\Collection Object (...))
-  ✓ it passes with array
-  ✓ it passes with *not*
-  ✓ it properly fails with *not*
-  ✓ it fails with (1)
-  ✓ it fails with (1.5)
-  ✓ it fails with (true)
-  ✓ it fails with (null)
-
-   PASS  Tests\Features\Expect\toHaveProperties
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toHaveProperty
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toMatch
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toMatchArray
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toMatchConstraint
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toMatchObject
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toStartWith
-  ✓ pass
-  ✓ failures
-  ✓ not failures
-
-   PASS  Tests\Features\Expect\toThrow
-  ✓ passes
-  ✓ failures 1
-  ✓ failures 2
-  ✓ failures 3
-  ✓ failures 4
-  ✓ failures 5
-  ✓ failures 6
-  ✓ failures 7
-  ✓ not failures
-  ✓ closure missing parameter
-  ✓ closure missing type-hint
-
-   PASS  Tests\Features\Expect\unless
-  ✓ it pass
-  ✓ it failures
-  ✓ it runs with truthy
-  ✓ it skips with falsy
-  ✓ it runs with truthy closure condition
-  ✓ it skips with falsy closure condition
-  ✓ it can be used in higher order tests
-
-   PASS  Tests\Features\Expect\when
-  ✓ it pass
-  ✓ it failures
-  ✓ it runs with truthy
-  ✓ it skips with falsy
-  ✓ it runs with truthy closure condition
-  ✓ it skips with falsy closure condition
-  ✓ it can be used in higher order tests

   PASS  Tests\Features\Helpers
  ✓ it can set/get properties on $this
  ✓ it throws error if property do not exist
  ✓ it allows to call underlying protected/private methods
  ✓ it throws error if method do not exist
-  ✓ it can forward unexpected calls to any global function
-  ✓ it can use helpers from helpers file

   PASS  Tests\Features\HigherOrderTests
  ✓ it proxies calls to object
-  ✓ it is capable doing multiple assertions
-  ✓ it resolves expect callables correctly
-  ✓ does not treat method names as callables
-  ✓ it can tap into the test
-  ✓ it can pass datasets into the expect callables with (1, 2, 3)
-  ✓ it can pass datasets into the tap callable with (1, 2, 3)
-  ✓ it can pass shared datasets into callables with (1)
-  ✓ it can pass shared datasets into callables with (2)
-
-   WARN  Tests\Features\Incompleted
-  … incompleted
-  … it is incompleted
-  … it is incompleted even with method calls like skip
-  … it is incompleted even with method calls like group
-  ✓ it is not incompleted because of expect
-  ✓ it is not incompleted because of assert
-  ✓ it is not incompleted because of test with assertions

   PASS  Tests\Features\It
  ✓ it is a test
@ -551,10 +79,12 @@
  ✓ it can call chained macro method
  ✓ it will throw exception from call if no macro exists

+   PASS  Tests\Features\Mocks
+  ✓ it has bar
+
   PASS  Tests\Features\PendingHigherOrderTests
-  ✓ get 'foo'
-  ✓ get 'foo' → get 'bar' → expect true → toBeTrue 
-  ✓ get 'foo' → expect true → toBeTrue 
+  ✓ get 'foo' → get 'bar' → assertTrue true
+  ✓ get 'foo' → assertTrue true

   WARN  Tests\Features\Skip
  ✓ it do not skips
@ -564,9 +94,6 @@
  - it skips with truthy closure condition
  ✓ it do not skips with falsy closure condition
  - it skips with condition and message → skipped because foo
-  - it skips when skip after assertion
-  - it can use something in the test case as a condition → This test was skipped
-  - it can user higher order callables and skip

   PASS  Tests\Features\Test
  ✓ a test
@ -578,45 +105,6 @@
   PASS  Tests\Fixtures\ExampleTest
  ✓ it example 2

-   PASS  Tests\Hooks\AfterAllTest
-  ✓ global afterAll execution order
-  ✓ it only gets called once per file
-
-   PASS  Tests\Hooks\AfterEachTest
-  ✓ global afterEach execution order
-
-   PASS  Tests\Hooks\BeforeAllTest
-  ✓ global beforeAll execution order
-  ✓ it only gets called once per file
-
-   PASS  Tests\Hooks\BeforeEachTest
-  ✓ global beforeEach execution order
-
-   PASS  Tests\PHPUnit\CustomAffixes\InvalidTestName
-  ✓ it runs file names like `@#$%^&()-_=+.php`
-
-   PASS  Tests\PHPUnit\CustomAffixes\ATestWithSpaces
-  ✓ it runs file names like `A Test With Spaces.php`
-
-   PASS  Tests\PHPUnit\CustomAffixes\AdditionalFileExtensionspec
-  ✓ it runs file names like `AdditionalFileExtension.spec.php`
-
-   PASS  Tests\PHPUnit\CustomAffixes\FolderWithAn\ExampleTest
-  ✓ custom traits can be used
-  ✓ trait applied in this file
-
-   PASS  Tests\PHPUnit\CustomAffixes\ManyExtensionsclasstest
-  ✓ it runs file names like `ManyExtensions.class.test.php`
-
-   PASS  Tests\PHPUnit\CustomAffixes\TestCaseWithQuotes
-  ✓ it runs file names like `Test 'Case' With Quotes.php`
-
-   PASS  Tests\PHPUnit\CustomAffixes\kebabcasespec
-  ✓ it runs file names like `kebab-case-spec.php`
-
-   PASS  Tests\PHPUnit\CustomAffixes\snakecasespec
-  ✓ it runs file names like `snake_case_spec.php`
-
   PASS  Tests\PHPUnit\CustomTestCase\UsesPerDirectory
  ✓ closure was bound to CustomTestCase

@ -647,20 +135,6 @@
  ✓ it throws exception when `process isolation` is true
  ✓ it do not throws exception when `process isolation` is false

-   PASS  Tests\Unit\Console\Help
-  ✓ it outputs the help information when --help is used
-
-   PASS  Tests\Unit\Datasets
-  ✓ it show only the names of named datasets in their description
-  ✓ it show the actual dataset of non-named datasets in their description
-  ✓ it show only the names of multiple named datasets in their description
-  ✓ it show the actual dataset of multiple non-named datasets in their description
-  ✓ it show the correct description for mixed named and not-named datasets
-
-   PASS  Tests\Unit\Plugins\Environment
-  ✓ environment is set to CI when --ci option is used
-  ✓ environment is set to Local when --ci option is not used
-
   PASS  Tests\Unit\Plugins\Version
  ✓ it outputs the version when --version is used
  ✓ it do not outputs version when --version is not used
@ -683,16 +157,6 @@

   PASS  Tests\Unit\TestSuite
  ✓ it does not allow to add the same test description twice
-  ✓ it alerts users about tests with arguments but no input
-  ✓ it can return an array of all test suite filenames
-  ✓ it can filter the test suite filenames to those with the only method
-  ✓ it does not filter the test suite filenames to those with the only method when working in CI pipeline
-
-   PASS  Tests\Visual\Help
-  ✓ visual snapshot of help command output
-
-   PASS  Tests\Visual\JUnit
-  ✓ it is can successfully call all public methods

   PASS  Tests\Visual\SingleTestOrDirectory
  ✓ allows to run a single test
@ -703,22 +167,5 @@
   WARN  Tests\Visual\Success
  - visual snapshot of test suite on success

-   PASS  Tests\Visual\TeamCity
-  ✓ it is can successfully call all public methods
-
-   PASS  Tests\Features\Depends
-  ✓ first
-  ✓ second
-  ✓ it asserts true is true
-  ✓ depends
-  ✓ depends with ...params
-  ✓ depends with defined arguments
-  ✓ depends run test only once
-  ✓ depends works with the correct test name
-
-   PASS  Tests\Features\DependsInheritance
-  ✓ it is a test
-  ✓ it uses correct parent class
-
-  Tests:  4 incompleted, 9 skipped, 478 passed
-  
+  Tests:  6 skipped, 96 passed
+  Time:   3.43s
--- a/tests/Autoload.php
+++ b/tests/Autoload.php
@ -8,7 +8,7 @@ trait PluginTrait
 {
    public function assertPluginTraitGotRegistered(): void
    {
-        $this->assertTrue(true);
+        assertTrue(true);
    }
 }

@ -16,14 +16,9 @@ trait SecondPluginTrait
 {
    public function assertSecondPluginTraitGotRegistered(): void
    {
-        $this->assertTrue(true);
+        assertTrue(true);
    }
 }

 Pest\Plugin::uses(PluginTrait::class);
 Pest\Plugin::uses(SecondPluginTrait::class);
-
-function _assertThat()
-{
-    expect(true)->toBeTrue();
-}
--- a/tests/Datasets/Bound.php
+++ b/tests/Datasets/Bound.php
@ -1,11 +0,0 @@
-<?php
-
-dataset('bound.closure', function () {
-    yield function () { return 1; };
-    yield function () { return 2; };
-});
-
-dataset('bound.array', [
-    function () { return 1; },
-    function () { return 2; },
-]);
--- a/tests/Features/AfterAll.php
+++ b/tests/Features/AfterAll.php
@ -8,8 +8,8 @@ afterAll(function () use ($file) {

 test('deletes file after all', function () use ($file) {
    file_put_contents($file, 'foo');
-    $this->assertFileExists($file);
+    assertFileExists($file);
    register_shutdown_function(function () use ($file) {
-        $this->assertFileNotExists($file);
+        assertFileNotExists($file);
    });
 });
--- a/tests/Features/AfterEach.php
+++ b/tests/Features/AfterEach.php
@ -6,15 +6,15 @@ beforeEach(function () use ($state) {
    $this->state = $state;
 });

-afterEach(function () {
+afterEach(function () use ($state) {
    $this->state->bar = 2;
 });

 it('does not get executed before the test', function () {
-    expect($this->state)->not->toHaveProperty('bar');
+    assertFalse(property_exists($this->state, 'bar'));
 });

 it('gets executed after the test', function () {
-    expect($this->state)->toHaveProperty('bar');
-    expect($this->state->bar)->toBe(2);
+    assertTrue(property_exists($this->state, 'bar'));
+    assertEquals(2, $this->state->bar);
 });
--- a/tests/Features/BeforeAll.php
+++ b/tests/Features/BeforeAll.php
@ -8,11 +8,11 @@ beforeAll(function () use ($foo) {
 });

 it('gets executed before tests', function () use ($foo) {
-    expect($foo)->bar->toBe(1);
+    assertEquals($foo->bar, 1);

    $foo->bar = 'changed';
 });

 it('do not get executed before each test', function () use ($foo) {
-    expect($foo)->bar->toBe('changed');
+    assertEquals($foo->bar, 'changed');
 });
--- a/tests/Features/BeforeEach.php
+++ b/tests/Features/BeforeEach.php
@ -5,11 +5,11 @@ beforeEach(function () {
 });

 it('gets executed before each test', function () {
-    expect($this->bar)->toBe(2);
+    assertEquals($this->bar, 2);

    $this->bar = 'changed';
 });

 it('gets executed before each test once again', function () {
-    expect($this->bar)->toBe(2);
+    assertEquals($this->bar, 2);
 });
--- a/tests/Features/Coverage.php
+++ b/tests/Features/Coverage.php
@ -1,58 +0,0 @@
-<?php
-
-use Pest\Plugins\Coverage as CoveragePlugin;
-use Pest\Support\Coverage;
-use Pest\TestSuite;
-use Symfony\Component\Console\Output\ConsoleOutput;
-
-it('has plugin')->assertTrue(class_exists(CoveragePlugin::class));
-
-it('adds coverage if --coverage exist', function () {
-    $plugin = new CoveragePlugin(new ConsoleOutput());
-    $testSuite = TestSuite::getInstance();
-
-    expect($plugin->coverage)->toBeFalse();
-    $arguments = $plugin->handleArguments([]);
-    expect($arguments)->toEqual([]);
-    expect($plugin->coverage)->toBeFalse();
-
-    $arguments = $plugin->handleArguments(['--coverage']);
-    expect($arguments)->toEqual(['--coverage-php', Coverage::getPath()]);
-    expect($plugin->coverage)->toBeTrue();
-});
-
-it('adds coverage if --min exist', function () {
-    $plugin = new CoveragePlugin(new ConsoleOutput());
-    expect($plugin->coverageMin)->toEqual(0.0);
-
-    expect($plugin->coverage)->toBeFalse();
-    $plugin->handleArguments([]);
-    expect($plugin->coverageMin)->toEqual(0.0);
-
-    $plugin->handleArguments(['--min=2']);
-    expect($plugin->coverageMin)->toEqual(2.0);
-
-    $plugin->handleArguments(['--min=2.4']);
-    expect($plugin->coverageMin)->toEqual(2.4);
-});
-
-it('generates coverage based on file input', function () {
-    expect(Coverage::getMissingCoverage(new class() {
-        public function lineCoverageData(): array
-        {
-            return [
-                1   => ['foo'],
-                2   => ['bar'],
-                4   => [],
-                5   => [],
-                6   => [],
-                7   => null,
-                100 => null,
-                101 => ['foo'],
-                102 => [],
-            ];
-        }
-    }))->toEqual([
-        '4..6', '102',
-    ]);
-});
--- a/tests/Features/Datasets.php
+++ b/tests/Features/Datasets.php
@ -5,10 +5,6 @@ use Pest\Exceptions\DatasetAlreadyExist;
 use Pest\Exceptions\DatasetDoesNotExist;
 use Pest\Plugin;

-beforeEach(function () {
-    $this->foo = 'bar';
-});
-
 it('throws exception if dataset does not exist', function () {
    $this->expectException(DatasetDoesNotExist::class);
    $this->expectExceptionMessage("A dataset with the name `first` does not exist. You can create it using `dataset('first', ['a', 'b']);`.");
@ -27,13 +23,13 @@ it('sets closures', function () {
        yield [1];
    });

-    expect(iterator_to_array(Datasets::get('foo')()))->toBe([[1]]);
+    assertEquals([[1]], iterator_to_array(Datasets::get('foo')()));
 });

 it('sets arrays', function () {
    Datasets::set('bar', [[2]]);

-    expect(Datasets::get('bar'))->toBe([[2]]);
+    assertEquals([[2]], Datasets::get('bar'));
 });

 it('gets bound to test case object', function () {
@ -41,7 +37,7 @@ it('gets bound to test case object', function () {
 })->with([['a'], ['b']]);

 test('it truncates the description', function () {
-    expect(true)->toBe(true);
+    assertTrue(true);
    // it gets tested by the integration test
 })->with([str_repeat('Fooo', 10000000)]);

@ -52,63 +48,51 @@ $datasets = [[1], [2]];

 test('lazy datasets', function ($text) use ($state, $datasets) {
    $state->text .= $text;
-    expect(in_array([$text], $datasets))->toBe(true);
+    assertTrue(in_array([$text], $datasets));
 })->with($datasets);

 test('lazy datasets did the job right', function () use ($state) {
-    expect($state->text)->toBe('12');
+    assertEquals('12', $state->text);
 });

 $state->text = '';

 test('eager datasets', function ($text) use ($state, $datasets) {
    $state->text .= $text;
-    expect($datasets)->toContain([$text]);
+    assertTrue(in_array([$text], $datasets));
 })->with(function () use ($datasets) {
    return $datasets;
 });

 test('eager datasets did the job right', function () use ($state) {
-    expect($state->text)->toBe('1212');
+    assertEquals('1212', $state->text);
 });

 test('lazy registered datasets', function ($text) use ($state, $datasets) {
    $state->text .= $text;
-    expect($datasets)->toContain([$text]);
+    assertTrue(in_array([$text], $datasets));
 })->with('numbers.array');

 test('lazy registered datasets did the job right', function () use ($state) {
-    expect($state->text)->toBe('121212');
+    assertEquals('121212', $state->text);
 });

 test('eager registered datasets', function ($text) use ($state, $datasets) {
    $state->text .= $text;
-    expect($datasets)->toContain([$text]);
+    assertTrue(in_array([$text], $datasets));
 })->with('numbers.closure');

 test('eager registered datasets did the job right', function () use ($state) {
-    expect($state->text)->toBe('12121212');
+    assertEquals('12121212', $state->text);
 });

 test('eager wrapped registered datasets', function ($text) use ($state, $datasets) {
    $state->text .= $text;
-    expect($datasets)->toContain([$text]);
+    assertTrue(in_array([$text], $datasets));
 })->with('numbers.closure.wrapped');

 test('eager registered wrapped datasets did the job right', function () use ($state) {
-    expect($state->text)->toBe('1212121212');
-});
-
-test('named datasets', function ($text) use ($state, $datasets) {
-    $state->text .= $text;
-    expect($datasets)->toContain([$text]);
-})->with([
-    'one' => [1],
-    'two' => [2],
-]);
-
-test('named datasets did the job right', function () use ($state) {
-    expect($state->text)->toBe('121212121212');
+    assertEquals('1212121212', $state->text);
 });

 class Bar
@ -120,14 +104,14 @@ $namedDatasets = [
    new Bar(),
 ];

-test('lazy named datasets', function ($text) {
-    expect(true)->toBeTrue();
+test('lazy named datasets', function ($text) use ($state, $datasets) {
+    assertTrue(true);
 })->with($namedDatasets);

 $counter = 0;

 it('creates unique test case names', function (string $name, Plugin $plugin, bool $bool) use (&$counter) {
-    expect(true)->toBeTrue();
+    assertTrue(true);
    $counter++;
 })->with([
    ['Name 1', new Plugin(), true],
@ -139,105 +123,5 @@ it('creates unique test case names', function (string $name, Plugin $plugin, boo
 ]);

 it('creates unique test case names - count', function () use (&$counter) {
-    expect($counter)->toBe(6);
+    assertEquals(6, $counter);
 });
-
-$datasets_a = [[1], [2]];
-$datasets_b = [[3], [4]];
-
-test('lazy multiple datasets', function ($text_a, $text_b) use ($state, $datasets_a, $datasets_b) {
-    $state->text .= $text_a . $text_b;
-    expect($datasets_a)->toContain([$text_a]);
-    expect($datasets_b)->toContain([$text_b]);
-})->with($datasets_a, $datasets_b);
-
-test('lazy multiple datasets did the job right', function () use ($state) {
-    expect($state->text)->toBe('12121212121213142324');
-});
-
-$state->text = '';
-
-test('eager multiple datasets', function ($text_a, $text_b) use ($state, $datasets_a, $datasets_b) {
-    $state->text .= $text_a . $text_b;
-    expect($datasets_a)->toContain([$text_a]);
-    expect($datasets_b)->toContain([$text_b]);
-})->with(function () use ($datasets_a) {
-    return $datasets_a;
-})->with(function () use ($datasets_b) {
-    return $datasets_b;
-});
-
-test('eager multiple datasets did the job right', function () use ($state) {
-    expect($state->text)->toBe('1212121212121314232413142324');
-});
-
-test('lazy registered multiple datasets', function ($text_a, $text_b) use ($state, $datasets) {
-    $state->text .= $text_a . $text_b;
-    expect($datasets)->toContain([$text_a]);
-    expect($datasets)->toContain([$text_b]);
-})->with('numbers.array')->with('numbers.array');
-
-test('lazy registered multiple datasets did the job right', function () use ($state) {
-    expect($state->text)->toBe('121212121212131423241314232411122122');
-});
-
-test('eager registered multiple datasets', function ($text_a, $text_b) use ($state, $datasets) {
-    $state->text .= $text_a . $text_b;
-    expect($datasets)->toContain([$text_a]);
-    expect($datasets)->toContain([$text_b]);
-})->with('numbers.array')->with('numbers.closure');
-
-test('eager registered multiple datasets did the job right', function () use ($state) {
-    expect($state->text)->toBe('12121212121213142324131423241112212211122122');
-});
-
-test('eager wrapped registered multiple datasets', function ($text_a, $text_b) use ($state, $datasets) {
-    $state->text .= $text_a . $text_b;
-    expect($datasets)->toContain([$text_a]);
-    expect($datasets)->toContain([$text_b]);
-})->with('numbers.closure.wrapped')->with('numbers.closure');
-
-test('eager wrapped registered multiple datasets did the job right', function () use ($state) {
-    expect($state->text)->toBe('1212121212121314232413142324111221221112212211122122');
-});
-
-test('named multiple datasets', function ($text_a, $text_b) use ($state, $datasets_a, $datasets_b) {
-    $state->text .= $text_a . $text_b;
-    expect($datasets_a)->toContain([$text_a]);
-    expect($datasets_b)->toContain([$text_b]);
-})->with([
-    'one' => [1],
-    'two' => [2],
-])->with([
-    'three' => [3],
-    'four'  => [4],
-]);
-
-test('named multiple datasets did the job right', function () use ($state) {
-    expect($state->text)->toBe('121212121212131423241314232411122122111221221112212213142324');
-});
-
-test('more than two datasets', function ($text_a, $text_b, $text_c) use ($state, $datasets_a, $datasets_b) {
-    $state->text .= $text_a . $text_b . $text_c;
-    expect($datasets_a)->toContain([$text_a]);
-    expect($datasets_b)->toContain([$text_b]);
-    expect([5, 6])->toContain($text_c);
-})->with($datasets_a, $datasets_b)->with([5, 6]);
-
-test('more than two datasets did the job right', function () use ($state) {
-    expect($state->text)->toBe('121212121212131423241314232411122122111221221112212213142324135136145146235236245246');
-});
-
-it('can resolve a dataset after the test case is available', function ($result) {
-    expect($result)->toBe('bar');
-})->with([
-    function () { return $this->foo; },
-]);
-
-it('can resolve a dataset after the test case is available with shared yield sets', function ($result) {
-    expect($result)->toBeInt()->toBeLessThan(3);
-})->with('bound.closure');
-
-it('can resolve a dataset after the test case is available with shared array sets', function ($result) {
-    expect($result)->toBeInt()->toBeLessThan(3);
-})->with('bound.array');
--- a/tests/Features/Depends.php
+++ b/tests/Features/Depends.php
@ -3,36 +3,38 @@
 $runCounter = 0;

 test('first', function () use (&$runCounter) {
-    expect(true)->toBeTrue();
+    assertTrue(true);
    $runCounter++;

    return 'first';
 });

 test('second', function () use (&$runCounter) {
-    expect(true)->toBeTrue();
+    assertTrue(true);
    $runCounter++;

    return 'second';
 });

 test('depends', function () {
-    expect(func_get_args())->toBe(['first', 'second']);
+    assertEquals(
+        ['first', 'second'],
+        func_get_args()
+    );
 })->depends('first', 'second');

 test('depends with ...params', function (string ...$params) {
-    expect(func_get_args())->toBe($params);
+    assertEquals(
+        ['first', 'second'],
+        $params
+    );
 })->depends('first', 'second');

 test('depends with defined arguments', function (string $first, string $second) {
-    expect($first)->toBe('first');
-    expect($second)->toBe('second');
+    assertEquals('first', $first);
+    assertEquals('second', $second);
 })->depends('first', 'second');

 test('depends run test only once', function () use (&$runCounter) {
-    expect($runCounter)->toBe(2);
+    assertEquals(2, $runCounter);
 })->depends('first', 'second');
-
-// Regression tests. See https://github.com/pestphp/pest/pull/216
-it('asserts true is true')->assertTrue(true);
-test('depends works with the correct test name')->assertTrue(true)->depends('it asserts true is true');
--- a/tests/Features/DependsInheritance.php
+++ b/tests/Features/DependsInheritance.php
@ -1,22 +0,0 @@
-<?php
-
-use PHPUnit\Framework\TestCase;
-
-class InheritanceTest extends TestCase
-{
-    public function foo()
-    {
-        return 'bar';
-    }
-}
-
-uses(InheritanceTest::class);
-
-it('is a test', function () {
-    expect(true)->toBeTrue();
-});
-
-it('uses correct parent class', function () {
-    expect(get_parent_class($this))->toEqual(InheritanceTest::class);
-    expect($this->foo())->toEqual('bar');
-})->depends('it is a test');
--- a/tests/Features/Exceptions.php
+++ b/tests/Features/Exceptions.php
@ -13,27 +13,3 @@ it('catch exceptions', function () {
 it('catch exceptions and messages', function () {
    throw new Exception('Something bad happened');
 })->throws(Exception::class, 'Something bad happened');
-
-it('can just define the message', function () {
-    throw new Exception('Something bad happened');
-})->throws('Something bad happened');
-
-it('not catch exceptions if given condition is false', function () {
-    $this->assertTrue(true);
-})->throwsIf(false, Exception::class);
-
-it('catch exceptions if given condition is true', function () {
-    throw new Exception('Something bad happened');
-})->throwsIf(function () { return true; }, Exception::class);
-
-it('catch exceptions and messages if given condition is true', function () {
-    throw new Exception('Something bad happened');
-})->throwsIf(true, Exception::class, 'Something bad happened');
-
-it('can just define the message if given condition is true', function () {
-    throw new Exception('Something bad happened');
-})->throwsIf(true, 'Something bad happened');
-
-it('can just define the message if given condition is 1', function () {
-    throw new Exception('Something bad happened');
-})->throwsIf(1, 'Something bad happened');
--- a/tests/Features/Expect/HigherOrder/methods.php
+++ b/tests/Features/Expect/HigherOrder/methods.php
@ -1,120 +0,0 @@
-<?php
-
-it('can access methods', function () {
-    expect(new HasMethods())
-        ->name()->toBeString()->toEqual('Has Methods');
-});
-
-it('can access multiple methods', function () {
-    expect(new HasMethods())
-        ->name()->toBeString()->toEqual('Has Methods')
-        ->quantity()->toBeInt()->toEqual(20);
-});
-
-it('works with not', function () {
-    expect(new HasMethods())
-        ->name()->not->toEqual('world')->toEqual('Has Methods')
-        ->quantity()->toEqual(20)->not()->toEqual('bar')->not->toBeNull;
-});
-
-it('can accept arguments', function () {
-    expect(new HasMethods())
-        ->multiply(5, 4)->toBeInt->toEqual(20);
-});
-
-it('works with each', function () {
-    expect(new HasMethods())
-        ->attributes()->toBeArray->each->not()->toBeNull
-        ->attributes()->each(function ($attribute) {
-            $attribute->not->toBeNull();
-        });
-});
-
-it('works inside of each', function () {
-    expect(new HasMethods())
-        ->books()->each(function ($book) {
-            $book->title->not->toBeNull->cost->toBeGreaterThan(19);
-        });
-});
-
-it('works with sequence', function () {
-    expect(new HasMethods())
-        ->books()->sequence(
-            function ($book) { $book->title->toEqual('Foo')->cost->toEqual(20); },
-            function ($book) { $book->title->toEqual('Bar')->cost->toEqual(30); },
-        );
-});
-
-it('can compose complex expectations', function () {
-    expect(new HasMethods())
-        ->toBeObject()
-        ->name()->toEqual('Has Methods')->not()->toEqual('bar')
-        ->quantity()->not->toEqual('world')->toEqual(20)->toBeInt
-        ->multiply(3, 4)->not->toBeString->toEqual(12)
-        ->attributes()->toBeArray()
-        ->books()->toBeArray->each->not->toBeEmpty
-        ->books()->sequence(
-            function ($book) { $book->title->toEqual('Foo')->cost->toEqual(20); },
-            function ($book) { $book->title->toEqual('Bar')->cost->toEqual(30); },
-        );
-});
-
-it('can handle nested method calls', function () {
-    expect(new HasMethods())
-        ->newInstance()->newInstance()->name()->toEqual('Has Methods')->toBeString()
-        ->newInstance()->name()->toEqual('Has Methods')->not->toBeInt
-        ->name()->toEqual('Has Methods')
-        ->books()->each->toBeArray();
-});
-
-it('works with higher order tests')
-    ->expect(new HasMethods())
-    ->newInstance()->newInstance()->name()->toEqual('Has Methods')->toBeString()
-    ->newInstance()->name()->toEqual('Has Methods')->not->toBeArray
-    ->name()->toEqual('Has Methods')
-    ->books()->each->toBeArray;
-
-class HasMethods
-{
-    public function name()
-    {
-        return 'Has Methods';
-    }
-
-    public function quantity()
-    {
-        return 20;
-    }
-
-    public function multiply($x, $y)
-    {
-        return $x * $y;
-    }
-
-    public function attributes()
-    {
-        return [
-            'name'     => $this->name(),
-            'quantity' => $this->quantity(),
-        ];
-    }
-
-    public function books()
-    {
-        return [
-            [
-                'title' => 'Foo',
-                'cost'  => 20,
-            ],
-            [
-                'title' => 'Bar',
-                'cost'  => 30,
-            ],
-        ];
-    }
-
-    public function newInstance()
-    {
-        return new static();
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Nuno Maduro	27fbe3efcc	docs: updates changelog	2020-08-06 21:18:26 +01:00
Nuno Maduro	d0eb2f15cd	chore: keeps phpunit 9.2 for pest 0.2	2020-08-06 21:15:46 +01:00