release: 2.36.1

.github/workflows/static.yml

@@ -1,44 +0,0 @@
-name: Static Analysis
-
-on:
-  push:
-  pull_request:
-  schedule:
-    - cron: '0 0 * * *'
-
-jobs:
-  static:
-    if: github.event_name != 'schedule' || github.repository == 'pestphp/pest'
-    name: Static Tests
-
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-      matrix:
-        dependency-version: [prefer-lowest, prefer-stable]
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: 8.2
-        tools: composer:v2
-        coverage: none
-
-    - name: Install Dependencies
-      run: composer update --prefer-stable --no-interaction --no-progress --ansi
-
-  # - name: Type Check
-  #   run: composer test:type:check
-
-    - name: Type Coverage
-      run: composer test:type:coverage
-
-    - name: Refacto
-      run: composer test:refacto
-
-    - name: Style
-      run: composer test:lint

.github/workflows/tests.yml

@@ -13,9 +13,9 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        symfony: ['7.1']
+        symfony: ['6.4', '7.0']
         php: ['8.2', '8.3', '8.4']
-        dependency_version: [prefer-lowest, prefer-stable]
+        dependency_version: [prefer-stable]
 
     name: PHP ${{ matrix.php }} - Symfony ^${{ matrix.symfony }} - ${{ matrix.os }} - ${{ matrix.dependency_version }}
 
@@ -36,13 +36,7 @@ jobs:
         echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
     - name: Install PHP dependencies
-      shell: bash
+      run: composer update --${{ matrix.dependency_version }} --no-interaction --no-progress --ansi --with="symfony/console:~${{ matrix.symfony }}"
-      run: |
-        if [[ "${{ matrix.php }}" == "8.4" ]]; then
-          composer update --${{ matrix.dependency_version }} --no-interaction --no-progress --ansi --with="symfony/console:^${{ matrix.symfony }}" --ignore-platform-req=php
-        else
-          composer update --${{ matrix.dependency_version }} --no-interaction --no-progress --ansi --with="symfony/console:^${{ matrix.symfony }}"
-        fi
 
     - name: Unit Tests
       run: composer test:unit
@@ -51,5 +45,4 @@ jobs:
       run: composer test:parallel
 
     - name: Integration Tests
-      if: ${{ matrix.php != '8.4' }}
       run: composer test:integration

CONTRIBUTING.md

@@ -69,7 +69,7 @@ If you want to check things work against a specific version of PHP, you may incl
 the `PHP` build argument when building the image:
 
 ```bash
-make build ARGS="--build-arg PHP=8.3"
+make build ARGS="--build-arg PHP=8.2"
 ```
 
 The default PHP version will always be the lowest version of PHP supported by Pest.

README.md

@@ -1,5 +1,5 @@
 <p align="center">
-    <img src="https://raw.githubusercontent.com/pestphp/art/master/v3/banner.png" width="600" alt="PEST">
+    <img src="https://raw.githubusercontent.com/pestphp/art/master/v2/banner.png" width="600" alt="PEST">
     <p align="center">
         <a href="https://github.com/pestphp/pest/actions"><img alt="GitHub Workflow Status (master)" src="https://img.shields.io/github/actions/workflow/status/pestphp/pest/tests.yml?branch=2.x&label=Tests%202.x"></a>
         <a href="https://packagist.org/packages/pestphp/pest"><img alt="Total Downloads" src="https://img.shields.io/packagist/dt/pestphp/pest"></a>
@@ -9,9 +9,6 @@
 </p>
 
 ------
-
-> Pest v3 Now Available: **[Read the announcement »](https://pestphp.com/docs/pest3-now-available)**.
-
 **Pest** is an elegant PHP testing Framework with a focus on simplicity, meticulously designed to bring back the joy of testing in PHP.
 
 - Explore our docs at **[pestphp.com »](https://pestphp.com)**

RELEASE.md

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

bin/pest

@@ -4,10 +4,6 @@
 use Pest\Kernel;
 use Pest\Panic;
 use Pest\TestCaseFilters\GitDirtyTestCaseFilter;
-use Pest\TestCaseMethodFilters\AssigneeTestCaseFilter;
-use Pest\TestCaseMethodFilters\IssueTestCaseFilter;
-use Pest\TestCaseMethodFilters\NotesTestCaseFilter;
-use Pest\TestCaseMethodFilters\PrTestCaseFilter;
 use Pest\TestCaseMethodFilters\TodoTestCaseFilter;
 use Pest\TestSuite;
 use Symfony\Component\Console\Input\ArgvInput;
@@ -21,10 +17,8 @@ use Symfony\Component\Console\Output\ConsoleOutput;
 
     $dirty = false;
     $todo = false;
-    $notes = false;
 
     foreach ($arguments as $key => $value) {
-
         if ($value === '--compact') {
             $_SERVER['COLLISION_PRINTER_COMPACT'] = 'true';
             unset($arguments[$key]);
@@ -35,14 +29,8 @@ use Symfony\Component\Console\Output\ConsoleOutput;
             unset($arguments[$key]);
         }
 
-        if (str_contains($value, '--test-directory=')) {
+        if (str_contains($value, '--test-directory')) {
             unset($arguments[$key]);
-        } else if ($value === '--test-directory') {
-            unset($arguments[$key]);
-
-            if (isset($arguments[$key + 1])) {
-                unset($arguments[$key + 1]);
-            }
         }
 
         if ($value === '--dirty') {
@@ -55,61 +43,6 @@ use Symfony\Component\Console\Output\ConsoleOutput;
             unset($arguments[$key]);
         }
 
-        if ($value === '--notes') {
-            $notes = true;
-            unset($arguments[$key]);
-        }
-
-        if (str_contains($value, '--assignee=')) {
-            unset($arguments[$key]);
-        } else if ($value === '--assignee') {
-            unset($arguments[$key]);
-
-            if (isset($arguments[$key + 1])) {
-                unset($arguments[$key + 1]);
-            }
-        }
-
-        if (str_contains($value, '--issue=')) {
-            unset($arguments[$key]);
-        } else if ($value === '--issue') {
-            unset($arguments[$key]);
-
-            if (isset($arguments[$key + 1])) {
-                unset($arguments[$key + 1]);
-            }
-        }
-
-        if (str_contains($value, '--ticket=')) {
-            unset($arguments[$key]);
-        } else if ($value === '--ticket') {
-            unset($arguments[$key]);
-
-            if (isset($arguments[$key + 1])) {
-                unset($arguments[$key + 1]);
-            }
-        }
-
-        if (str_contains($value, '--pr=')) {
-            unset($arguments[$key]);
-        } else if ($value === '--pr') {
-            unset($arguments[$key]);
-
-            if (isset($arguments[$key + 1])) {
-                unset($arguments[$key + 1]);
-            }
-        }
-
-        if (str_contains($value, '--pull-request=')) {
-            unset($arguments[$key]);
-        } else if ($value === '--pull-request') {
-            unset($arguments[$key]);
-
-            if (isset($arguments[$key + 1])) {
-                unset($arguments[$key + 1]);
-            }
-        }
-
         if (str_contains($value, '--teamcity')) {
             unset($arguments[$key]);
             $arguments[] = '--no-output';
@@ -117,7 +50,6 @@ use Symfony\Component\Console\Output\ConsoleOutput;
         }
     }
 
-
     // Used when Pest is required using composer.
     $vendorPath = dirname(__DIR__, 4).'/vendor/autoload.php';
 
@@ -149,30 +81,6 @@ use Symfony\Component\Console\Output\ConsoleOutput;
         $testSuite->tests->addTestCaseMethodFilter(new TodoTestCaseFilter());
     }
 
-    if ($notes) {
-        $testSuite->tests->addTestCaseMethodFilter(new NotesTestCaseFilter());
-    }
-
-    if ($assignee = $input->getParameterOption('--assignee')) {
-        $testSuite->tests->addTestCaseMethodFilter(new AssigneeTestCaseFilter((string) $assignee));
-    }
-
-    if ($issue = $input->getParameterOption('--issue')) {
-        $testSuite->tests->addTestCaseMethodFilter(new IssueTestCaseFilter((int) $issue));
-    }
-
-    if ($issue = $input->getParameterOption('--ticket')) {
-        $testSuite->tests->addTestCaseMethodFilter(new IssueTestCaseFilter((int) $issue));
-    }
-
-    if ($pr = $input->getParameterOption('--pr')) {
-        $testSuite->tests->addTestCaseMethodFilter(new PrTestCaseFilter((int) $pr));
-    }
-
-    if ($pr = $input->getParameterOption('--pull-request')) {
-        $testSuite->tests->addTestCaseMethodFilter(new PrTestCaseFilter((int) $pr));
-    }
-
     $isDecorated = $input->getParameterOption('--colors', 'always') !== 'never';
 
     $output = new ConsoleOutput(ConsoleOutput::VERBOSITY_NORMAL, $isDecorated);

composer.json

@@ -18,17 +18,17 @@
     ],
     "require": {
         "php": "^8.2.0",
-        "brianium/paratest": "^7.5.5",
+        "brianium/paratest": "^7.4.9",
-        "nunomaduro/collision": "^8.4.0",
+        "nunomaduro/collision": "^7.11.0|^8.5.0",
-        "nunomaduro/termwind": "^2.1.0",
+        "nunomaduro/termwind": "^1.16.0|^2.3.3",
-        "pestphp/pest-plugin": "^3.0.0",
+        "pestphp/pest-plugin": "^2.1.1",
-        "pestphp/pest-plugin-arch": "^3.0.0",
+        "pestphp/pest-plugin-arch": "^2.7.0",
-        "pestphp/pest-plugin-mutate": "^3.0.5",
+        "phpunit/phpunit": "^10.5.63"
-        "phpunit/phpunit": "^11.3.6"
     },
     "conflict": {
-        "phpunit/phpunit": ">11.3.6",
+        "filp/whoops": "<2.16.0",
-        "sebastian/exporter": "<6.0.0",
+        "phpunit/phpunit": ">10.5.63",
+        "sebastian/exporter": "<5.1.0",
         "webmozart/assert": "<1.11.0"
     },
     "autoload": {
@@ -52,9 +52,9 @@
         ]
     },
     "require-dev": {
-        "pestphp/pest-dev-tools": "^3.0.0",
+        "pestphp/pest-dev-tools": "^2.17.0",
-        "pestphp/pest-plugin-type-coverage": "^3.0.0",
+        "pestphp/pest-plugin-type-coverage": "^2.8.7",
-        "symfony/process": "^7.1.5"
+        "symfony/process": "^6.4.0|^7.4.4"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
@@ -69,22 +69,12 @@
         "bin/pest"
     ],
     "scripts": {
-        "refacto": "rector",
-        "lint": "pint",
-        "test:refacto": "rector --dry-run",
-        "test:lint": "pint --test",
-        "test:type:check": "phpstan analyse --ansi --memory-limit=-1 --debug",
-        "test:type:coverage": "php -d memory_limit=-1  bin/pest --type-coverage --min=100",
         "test:unit": "php bin/pest --colors=always --exclude-group=integration --compact",
         "test:inline": "php bin/pest --colors=always --configuration=phpunit.inline.xml",
         "test:parallel": "php bin/pest --colors=always --exclude-group=integration --parallel --processes=3",
-        "test:integration": "php bin/pest --colors=always --group=integration -v",
+        "test:integration": "php bin/pest --colors=always --group=integration",
         "update:snapshots": "REBUILD_SNAPSHOTS=true php bin/pest --colors=always --update-snapshots",
         "test": [
-            "@test:refacto",
-            "@test:lint",
-            "@test:type:check",
-            "@test:type:coverage",
             "@test:unit",
             "@test:parallel",
             "@test:integration"
@@ -93,8 +83,6 @@
     "extra": {
         "pest": {
             "plugins": [
-                "Pest\\Mutate\\Plugins\\Mutate",
-                "Pest\\Plugins\\Configuration",
                 "Pest\\Plugins\\Bail",
                 "Pest\\Plugins\\Cache",
                 "Pest\\Plugins\\Coverage",

overrides/Event/Value/ThrowableBuilder.php

@@ -1,37 +1,5 @@
 <?php
 
-/*
- * BSD 3-Clause License
- *
- * Copyright (c) 2001-2023, Sebastian Bergmann
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived from
- *    this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
 declare(strict_types=1);
 
 /*
@@ -54,7 +22,7 @@ use PHPUnit\Util\ThrowableToStringMapper;
 /**
  * @internal This class is not covered by the backward compatibility promise for PHPUnit
  */
-final readonly class ThrowableBuilder
+final class ThrowableBuilder
 {
     /**
      * @throws Exception

overrides/Logging/JUnit/JunitXmlLogger.php

@@ -308,6 +308,7 @@ final class JunitXmlLogger
             new TestFinishedSubscriber($this),
             new TestErroredSubscriber($this),
             new TestFailedSubscriber($this),
+            new TestMarkedIncompleteSubscriber($this),
             new TestSkippedSubscriber($this),
             new TestRunnerExecutionFinishedSubscriber($this),
         );

overrides/Runner/Filter/NameFilterIterator.php

@@ -32,27 +32,19 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-declare(strict_types=1);
-
-/*
- * This file is part of PHPUnit.
- *
- * (c) Sebastian Bergmann <sebastian@phpunit.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 namespace PHPUnit\Runner\Filter;
 
+use Exception;
 use Pest\Contracts\HasPrintableTestCaseName;
+use PHPUnit\Framework\SelfDescribing;
 use PHPUnit\Framework\Test;
+use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\TestSuite;
-use PHPUnit\Runner\PhptTestCase;
 use RecursiveFilterIterator;
 use RecursiveIterator;
 
 use function end;
+use function implode;
 use function preg_match;
 use function sprintf;
 use function str_replace;
@@ -60,30 +52,22 @@ use function str_replace;
 /**
  * @internal This class is not covered by the backward compatibility promise for PHPUnit
  */
-abstract class NameFilterIterator extends RecursiveFilterIterator
+final class NameFilterIterator extends RecursiveFilterIterator
 {
-    /**
+    private ?string $filter = null;
-     * @psalm-var non-empty-string
-     */
-    private readonly string $regularExpression;
 
-    private readonly ?int $dataSetMinimum;
+    private ?int $filterMin = null;
 
-    private readonly ?int $dataSetMaximum;
+    private ?int $filterMax = null;
 
     /**
-     * @psalm-param RecursiveIterator<int, Test> $iterator
+     * @throws Exception
-     * @psalm-param non-empty-string $filter
      */
     public function __construct(RecursiveIterator $iterator, string $filter)
     {
         parent::__construct($iterator);
 
-        $preparedFilter = $this->prepareFilter($filter);
+        $this->setFilter($filter);
-
-        $this->regularExpression = $preparedFilter['regularExpression'];
-        $this->dataSetMinimum = $preparedFilter['dataSetMinimum'];
-        $this->dataSetMaximum = $preparedFilter['dataSetMaximum'];
     }
 
     public function accept(): bool
@@ -94,38 +78,29 @@ abstract class NameFilterIterator extends RecursiveFilterIterator
             return true;
         }
 
-        if ($test instanceof PhptTestCase) {
+        $tmp = $this->describe($test);
-            return false;
-        }
 
-        if ($test instanceof HasPrintableTestCaseName) {
+        if ($tmp[0] !== '') {
-            $name = $test::getPrintableTestCaseName().'::'.$test->getPrintableTestCaseMethodName();
+            $name = implode('::', $tmp);
         } else {
-            $name = $test::class.'::'.$test->nameWithDataSet();
+            $name = $tmp[1];
         }
 
-        $accepted = @preg_match($this->regularExpression, $name, $matches) === 1;
+        $accepted = @preg_match($this->filter, $name, $matches);
 
-        if ($accepted && isset($this->dataSetMaximum)) {
+        if ($accepted && isset($this->filterMax)) {
             $set = end($matches);
-            $accepted = $set >= $this->dataSetMinimum && $set <= $this->dataSetMaximum;
+            $accepted = $set >= $this->filterMin && $set <= $this->filterMax;
         }
 
-        return $this->doAccept($accepted);
+        return (bool) $accepted;
     }
 
-    abstract protected function doAccept(bool $result): bool;
-
     /**
-     * @psalm-param non-empty-string $filter
+     * @throws Exception
-     *
-     * @psalm-return array{regularExpression: non-empty-string, dataSetMinimum: ?int, dataSetMaximum: ?int}
      */
-    private function prepareFilter(string $filter): array
+    private function setFilter(string $filter): void
     {
-        $dataSetMinimum = null;
-        $dataSetMaximum = null;
-
         if (@preg_match($filter, '') === false) {
             // Handles:
             //  * testAssertEqualsSucceeds#4
@@ -133,17 +108,17 @@ abstract class NameFilterIterator extends RecursiveFilterIterator
             if (preg_match('/^(.*?)#(\d+)(?:-(\d+))?$/', $filter, $matches)) {
                 if (isset($matches[3]) && $matches[2] < $matches[3]) {
                     $filter = sprintf(
-                        '%s.*with data set #(\d+)$',
+                        '%s.*with dataset #(\d+)$',
-                        $matches[1],
+                        $matches[1]
                     );
 
-                    $dataSetMinimum = (int) $matches[2];
+                    $this->filterMin = (int) $matches[2];
-                    $dataSetMaximum = (int) $matches[3];
+                    $this->filterMax = (int) $matches[3];
                 } else {
                     $filter = sprintf(
-                        '%s.*with data set #%s$',
+                        '%s.*with dataset #%s$',
                         $matches[1],
-                        $matches[2],
+                        $matches[2]
                     );
                 }
             } // Handles:
@@ -151,9 +126,9 @@ abstract class NameFilterIterator extends RecursiveFilterIterator
             //  * testDetermineJsonError@JSON.*
             elseif (preg_match('/^(.*?)@(.+)$/', $filter, $matches)) {
                 $filter = sprintf(
-                    '%s.*with data set "%s"$',
+                    '%s.*with dataset "%s"$',
                     $matches[1],
-                    $matches[2],
+                    $matches[2]
                 );
             }
 
@@ -164,15 +139,34 @@ abstract class NameFilterIterator extends RecursiveFilterIterator
                 str_replace(
                     '/',
                     '\\/',
-                    $filter,
+                    $filter
-                ),
+                )
             );
         }
 
-        return [
+        $this->filter = $filter;
-            'regularExpression' => $filter,
+    }
-            'dataSetMinimum' => $dataSetMinimum,
+
-            'dataSetMaximum' => $dataSetMaximum,
+    /**
-        ];
+     * @psalm-return array{0: string, 1: string}
+     */
+    private function describe(Test $test): array
+    {
+        if ($test instanceof HasPrintableTestCaseName) {
+            return [
+                $test::getPrintableTestCaseName(),
+                $test->getPrintableTestCaseMethodName(),
+            ];
+        }
+
+        if ($test instanceof TestCase) {
+            return [$test::class, $test->nameWithDataSet()];
+        }
+
+        if ($test instanceof SelfDescribing) {
+            return ['', $test->toString()];
+        }
+
+        return ['', $test::class];
     }
 }

overrides/Runner/ResultCache/DefaultResultCache.php

@@ -59,7 +59,6 @@ use function file_get_contents;
 use function file_put_contents;
 use function is_array;
 use function is_dir;
-use function is_file;
 use function json_decode;
 use function json_encode;
 use function Pest\version;
@@ -81,6 +80,11 @@ final class DefaultResultCache implements ResultCache
      */
     private array $defects = [];
 
+    /**
+     * @psalm-var array<string, TestStatus>
+     */
+    private array $currentDefects = [];
+
     /**
      * @psalm-var array<string, float>
      */
@@ -97,11 +101,10 @@ final class DefaultResultCache implements ResultCache
 
     public function setStatus(string $id, TestStatus $status): void
     {
-        if ($status->isSuccess()) {
+        if ($status->isFailure() || $status->isError()) {
-            return;
+            $this->currentDefects[$id] = $status;
+            $this->defects[$id] = $status;
         }
-
-        $this->defects[$id] = $status;
     }
 
     public function status(string $id): TestStatus
@@ -111,6 +114,10 @@ final class DefaultResultCache implements ResultCache
 
     public function setTime(string $id, float $time): void
     {
+        if (! isset($this->currentDefects[$id])) {
+            unset($this->defects[$id]);
+        }
+
         $this->times[$id] = $time;
     }
 
@@ -121,11 +128,7 @@ final class DefaultResultCache implements ResultCache
 
     public function load(): void
     {
-        if (! is_file($this->cacheFilename)) {
+        $contents = @file_get_contents($this->cacheFilename);
-            return;
-        }
-
-        $contents = file_get_contents($this->cacheFilename);
 
         if ($contents === false) {
             return;
@@ -181,7 +184,7 @@ final class DefaultResultCache implements ResultCache
         file_put_contents(
             $this->cacheFilename,
             json_encode($data),
-            LOCK_EX,
+            LOCK_EX
         );
     }
 

overrides/Runner/TestSuiteLoader.php

@@ -38,13 +38,11 @@ namespace PHPUnit\Runner;
 
 use Exception;
 use Pest\Contracts\HasPrintableTestCaseName;
-use Pest\Panic;
 use Pest\TestCases\IgnorableTestCase;
 use Pest\TestSuite;
 use PHPUnit\Framework\TestCase;
 use ReflectionClass;
 use ReflectionException;
-use Throwable;
 
 use function array_diff;
 use function array_values;
@@ -88,11 +86,7 @@ final class TestSuiteLoader
         $suiteClassName = $this->classNameFromFileName($suiteClassFile);
 
         (static function () use ($suiteClassFile) {
-            try {
+            include_once $suiteClassFile;
-                include_once $suiteClassFile;
-            } catch (Throwable $e) {
-                Panic::with($e);
-            }
 
             TestSuite::getInstance()->tests->makeIfNeeded($suiteClassFile);
         })();

overrides/TextUI/Command/Commands/WarmCodeCoverageCacheCommand.php

@@ -45,8 +45,6 @@ declare(strict_types=1);
 
 namespace PHPUnit\TextUI\Command;
 
-use const PHP_EOL;
-
 use PHPUnit\TextUI\Configuration\CodeCoverageFilterRegistry;
 use PHPUnit\TextUI\Configuration\Configuration;
 use PHPUnit\TextUI\Configuration\NoCoverageCacheDirectoryException;
@@ -57,11 +55,11 @@ use SebastianBergmann\Timer\Timer;
 /**
  * @internal This class is not covered by the backward compatibility promise for PHPUnit
  */
-final readonly class WarmCodeCoverageCacheCommand implements Command
+final class WarmCodeCoverageCacheCommand implements Command
 {
-    private Configuration $configuration;
+    private readonly Configuration $configuration;
 
-    private CodeCoverageFilterRegistry $codeCoverageFilterRegistry;
+    private readonly CodeCoverageFilterRegistry $codeCoverageFilterRegistry;
 
     public function __construct(Configuration $configuration, CodeCoverageFilterRegistry $codeCoverageFilterRegistry)
     {
@@ -78,16 +76,16 @@ final readonly class WarmCodeCoverageCacheCommand implements Command
         if (! $this->configuration->hasCoverageCacheDirectory()) {
             return Result::from(
                 'Cache for static analysis has not been configured'.PHP_EOL,
-                Result::FAILURE,
+                Result::FAILURE
             );
         }
 
-        $this->codeCoverageFilterRegistry->init($this->configuration, true);
+        $this->codeCoverageFilterRegistry->init($this->configuration);
 
         if (! $this->codeCoverageFilterRegistry->configured()) {
             return Result::from(
                 'Filter for code coverage has not been configured'.PHP_EOL,
-                Result::FAILURE,
+                Result::FAILURE
             );
         }
 
@@ -98,7 +96,7 @@ final readonly class WarmCodeCoverageCacheCommand implements Command
             $this->configuration->coverageCacheDirectory(),
             ! $this->configuration->disableCodeCoverageIgnore(),
             $this->configuration->ignoreDeprecatedCodeUnitsFromCodeCoverage(),
-            $this->codeCoverageFilterRegistry->get(),
+            $this->codeCoverageFilterRegistry->get()
         );
 
         return Result::from();

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

@@ -43,7 +43,7 @@ declare(strict_types=1);
  * file that was distributed with this source code.
  */
 
-namespace Pest\Logging\TeamCity\Subscriber;
+namespace PHPUnit\TextUI\Output\Default\ProgressPrinter;
 
 use PHPUnit\Event\Test\Skipped;
 use PHPUnit\Event\Test\SkippedSubscriber;
@@ -51,16 +51,21 @@ use ReflectionClass;
 
 /**
  * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ *
+ * This file is overridden to allow Pest Parallel to show todo items in the progress output.
  */
 final class TestSkippedSubscriber extends Subscriber implements SkippedSubscriber
 {
+    /**
+     * Notifies the printer that a test was skipped.
+     */
     public function notify(Skipped $event): void
     {
         if (str_contains($event->message(), '__TODO__')) {
             $this->printTodoItem();
         }
 
-        $this->logger()->testSkipped($event);
+        $this->printer()->testSkipped();
     }
 
     /**

overrides/TextUI/TestSuiteFilterProcessor.php

@@ -33,6 +33,7 @@
  */
 
 declare(strict_types=1);
+
 /*
  * This file is part of PHPUnit.
  *
@@ -56,7 +57,7 @@ use function array_map;
 /**
  * @internal This class is not covered by the backward compatibility promise for PHPUnit
  */
-final readonly class TestSuiteFilterProcessor
+final class TestSuiteFilterProcessor
 {
     /**
      * @throws Event\RuntimeException
@@ -69,24 +70,24 @@ final readonly class TestSuiteFilterProcessor
         if (! $configuration->hasFilter() &&
             ! $configuration->hasGroups() &&
             ! $configuration->hasExcludeGroups() &&
-            ! $configuration->hasExcludeFilter() &&
             ! $configuration->hasTestsCovering() &&
             ! $configuration->hasTestsUsing() &&
-            ! Only::isEnabled()) {
+            ! Only::isEnabled()
+        ) {
             return;
         }
 
         if ($configuration->hasExcludeGroups()) {
             $factory->addExcludeGroupFilter(
-                $configuration->excludeGroups(),
+                $configuration->excludeGroups()
             );
         }
 
         if (Only::isEnabled()) {
-            $factory->addIncludeGroupFilter([Only::group()]);
+            $factory->addIncludeGroupFilter(['__pest_only']);
         } elseif ($configuration->hasGroups()) {
             $factory->addIncludeGroupFilter(
-                $configuration->groups(),
+                $configuration->groups()
             );
         }
 
@@ -94,8 +95,8 @@ final readonly class TestSuiteFilterProcessor
             $factory->addIncludeGroupFilter(
                 array_map(
                     static fn (string $name): string => '__phpunit_covers_'.$name,
-                    $configuration->testsCovering(),
+                    $configuration->testsCovering()
-                ),
+                )
             );
         }
 
@@ -103,27 +104,21 @@ final readonly class TestSuiteFilterProcessor
             $factory->addIncludeGroupFilter(
                 array_map(
                     static fn (string $name): string => '__phpunit_uses_'.$name,
-                    $configuration->testsUsing(),
+                    $configuration->testsUsing()
-                ),
+                )
-            );
-        }
-
-        if ($configuration->hasExcludeFilter()) {
-            $factory->addExcludeNameFilter(
-                $configuration->excludeFilter(),
             );
         }
 
         if ($configuration->hasFilter()) {
-            $factory->addIncludeNameFilter(
+            $factory->addNameFilter(
-                $configuration->filter(),
+                $configuration->filter()
             );
         }
 
         $suite->injectFilter($factory);
 
         Event\Facade::emitter()->testSuiteFiltered(
-            Event\TestSuite\TestSuiteBuilder::from($suite),
+            Event\TestSuite\TestSuiteBuilder::from($suite)
         );
     }
 }

phpstan.neon

@@ -1,6 +1,5 @@
 includes:
     - vendor/phpstan/phpstan-strict-rules/rules.neon
-    - vendor/ergebnis/phpstan-rules/rules.neon
     - vendor/thecodingmachine/phpstan-strict-rules/phpstan-strict-rules.neon
 
 parameters:
@@ -12,12 +11,4 @@ parameters:
     reportUnmatchedIgnoredErrors: true
 
     ignoreErrors:
-        - "#has a nullable return type declaration.#"
-        - "#Language construct isset\\(\\) should not be used.#"
-        - "#is not allowed to extend#"
-        - "#is concrete, but does not have a Test suffix#"
-        - "#with a nullable type declaration#"
         - "#type mixed is not subtype of native#"
-        - "# with null as default value#"
-        - "#has parameter \\$closure with default value.#"
-        - "#has parameter \\$description with default value.#"

rector.php

@@ -2,22 +2,30 @@
 
 declare(strict_types=1);
 
+use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
 use Rector\Config\RectorConfig;
-use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector;
+use Rector\Set\ValueObject\LevelSetList;
+use Rector\Set\ValueObject\SetList;
 
-return RectorConfig::configure()
+return static function (RectorConfig $rectorConfig): void {
-    ->withPaths([
+    $rectorConfig->paths([
         __DIR__.'/src',
-    ])
+    ]);
-    ->withSkip([
+
+    $rectorConfig->rules([
+        InlineConstructorDefaultToPropertyRector::class,
+    ]);
+
+    $rectorConfig->skip([
         __DIR__.'/src/Plugins/Parallel/Paratest/WrapperRunner.php',
-        ReturnNeverTypeRector::class,
+    ]);
-    ])
+
-    ->withPreparedSets(
+    $rectorConfig->sets([
-        deadCode: true,
+        LevelSetList::UP_TO_PHP_81,
-        codeQuality: true,
+        SetList::CODE_QUALITY,
-        typeDeclarations: true,
+        SetList::DEAD_CODE,
-        privatization: true,
+        SetList::EARLY_RETURN,
-        earlyReturn: true,
+        SetList::TYPE_DECLARATION,
-    )
+        SetList::PRIVATIZATION,
-    ->withPhpSets();
+    ]);
+};

resources/base-phpunit.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
-         colors="true"
->
-    <testsuites>
-        <testsuite name="Default">
-            <directory>tests/</directory>
-        </testsuite>
-    </testsuites>
-    <source>
-        <include>
-            <directory>app</directory>
-            <directory>src</directory>
-        </include>
-    </source>
-    <php>
-        <env name="APP_ENV" value="testing"/>
-        <env name="APP_MAINTENANCE_DRIVER" value="file"/>
-        <env name="BCRYPT_ROUNDS" value="4"/>
-        <env name="CACHE_STORE" value="array"/>
-        <!-- <env name="DB_CONNECTION" value="sqlite"/> -->
-        <!-- <env name="DB_DATABASE" value=":memory:"/> -->
-        <env name="MAIL_MAILER" value="array"/>
-        <env name="PULSE_ENABLED" value="false"/>
-        <env name="QUEUE_CONNECTION" value="sync"/>
-        <env name="SESSION_DRIVER" value="array"/>
-        <env name="TELESCOPE_ENABLED" value="false"/>
-    </php>
-</phpunit>

src/ArchPresets/AbstractPreset.php

@@ -1,74 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\ArchPresets;
-
-use Pest\Arch\Contracts\ArchExpectation;
-use Pest\Expectation;
-
-/**
- * @internal
- */
-abstract class AbstractPreset // @pest-arch-ignore-line
-{
-    /**
-     * The expectations.
-     *
-     * @var array<int, Expectation<mixed>|ArchExpectation>
-     */
-    protected array $expectations = [];
-
-    /**
-     * Creates a new preset instance.
-     *
-     * @param  array<int, string>  $userNamespaces
-     */
-    public function __construct(
-        private readonly array $userNamespaces,
-    ) {
-        //
-    }
-
-    /**
-     * Executes the arch preset.
-     *
-     * @internal
-     */
-    abstract public function execute(): void;
-
-    /**
-     * Ignores the given "targets" or "dependencies".
-     *
-     * @param  array<int, string>|string  $targetsOrDependencies
-     */
-    final public function ignoring(array|string $targetsOrDependencies): void
-    {
-        $this->expectations = array_map(
-            fn (ArchExpectation|Expectation $expectation): Expectation|ArchExpectation => $expectation instanceof ArchExpectation ? $expectation->ignoring($targetsOrDependencies) : $expectation,
-            $this->expectations,
-        );
-    }
-
-    /**
-     * Runs the given callback for each namespace.
-     *
-     * @param  callable(Expectation<string|null>): ArchExpectation  ...$callbacks
-     */
-    final public function eachUserNamespace(callable ...$callbacks): void
-    {
-        foreach ($this->userNamespaces as $namespace) {
-            foreach ($callbacks as $callback) {
-                $this->expectations[] = $callback(expect($namespace));
-            }
-        }
-    }
-
-    /**
-     * Flushes the expectations.
-     */
-    final public function flush(): void
-    {
-        $this->expectations = [];
-    }
-}

src/ArchPresets/Custom.php

@@ -1,45 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\ArchPresets;
-
-use Closure;
-use Pest\Arch\Contracts\ArchExpectation;
-use Pest\Expectation;
-
-/**
- * @internal
- */
-final class Custom extends AbstractPreset
-{
-    /**
-     * Creates a new preset instance.
-     *
-     * @param  array<int, string>  $userNamespaces
-     * @param  Closure(array<int, string>): array<Expectation<mixed>|ArchExpectation>  $execute
-     */
-    public function __construct(
-        private readonly array $userNamespaces,
-        private readonly string $name,
-        private readonly Closure $execute,
-    ) {
-        parent::__construct($userNamespaces);
-    }
-
-    /**
-     * Returns the name of the preset.
-     */
-    public function name(): string
-    {
-        return $this->name;
-    }
-
-    /**
-     * Executes the arch preset.
-     */
-    public function execute(): void
-    {
-        $this->expectations = ($this->execute)($this->userNamespaces);
-    }
-}

src/ArchPresets/Laravel.php

@@ -1,163 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\ArchPresets;
-
-use Throwable;
-
-/**
- * @internal
- */
-final class Laravel extends AbstractPreset
-{
-    /**
-     * Executes the arch preset.
-     */
-    public function execute(): void
-    {
-        $this->expectations[] = expect('App\Traits')
-            ->toBeTraits();
-
-        $this->expectations[] = expect('App\Concerns')
-            ->toBeTraits();
-
-        $this->expectations[] = expect('App')
-            ->not->toBeEnums()
-            ->ignoring('App\Enums');
-
-        $this->expectations[] = expect('App\Enums')
-            ->toBeEnums();
-
-        $this->expectations[] = expect('App\Features')
-            ->toBeClasses();
-
-        $this->expectations[] = expect('App\Features')
-            ->toHaveMethod('resolve');
-
-        $this->expectations[] = expect('App\Exceptions')
-            ->classes()
-            ->toImplement('Throwable');
-
-        $this->expectations[] = expect('App')
-            ->not->toImplement(Throwable::class)
-            ->ignoring('App\Exceptions');
-
-        $this->expectations[] = expect('App\Http\Middleware')
-            ->classes()
-            ->toHaveMethod('handle');
-
-        $this->expectations[] = expect('App\Models')
-            ->classes()
-            ->toExtend('Illuminate\Database\Eloquent\Model')
-            ->ignoring('App\Models\Scopes');
-
-        $this->expectations[] = expect('App\Models')
-            ->classes()
-            ->not->toHaveSuffix('Model');
-
-        $this->expectations[] = expect('App')
-            ->not->toExtend('Illuminate\Database\Eloquent\Model')
-            ->ignoring('App\Models');
-
-        $this->expectations[] = expect('App\Http\Requests')
-            ->classes()
-            ->toHaveSuffix('Request');
-
-        $this->expectations[] = expect('App\Http\Requests')
-            ->toExtend('Illuminate\Foundation\Http\FormRequest');
-
-        $this->expectations[] = expect('App\Http\Requests')
-            ->toHaveMethod('rules');
-
-        $this->expectations[] = expect('App')
-            ->not->toExtend('Illuminate\Foundation\Http\FormRequest')
-            ->ignoring('App\Http\Requests');
-
-        $this->expectations[] = expect('App\Console\Commands')
-            ->classes()
-            ->toHaveSuffix('Command');
-
-        $this->expectations[] = expect('App\Console\Commands')
-            ->classes()
-            ->toExtend('Illuminate\Console\Command');
-
-        $this->expectations[] = expect('App\Console\Commands')
-            ->classes()
-            ->toHaveMethod('handle');
-
-        $this->expectations[] = expect('App')
-            ->not->toExtend('Illuminate\Console\Command')
-            ->ignoring('App\Console\Commands');
-
-        $this->expectations[] = expect('App\Mail')
-            ->classes()
-            ->toExtend('Illuminate\Mail\Mailable');
-
-        $this->expectations[] = expect('App\Mail')
-            ->classes()
-            ->toImplement('Illuminate\Contracts\Queue\ShouldQueue');
-
-        $this->expectations[] = expect('App')
-            ->not->toExtend('Illuminate\Mail\Mailable')
-            ->ignoring('App\Mail');
-
-        $this->expectations[] = expect('App\Jobs')
-            ->classes()
-            ->toImplement('Illuminate\Contracts\Queue\ShouldQueue');
-
-        $this->expectations[] = expect('App\Jobs')
-            ->classes()
-            ->toHaveMethod('handle');
-
-        $this->expectations[] = expect('App\Listeners')
-            ->toHaveMethod('handle');
-
-        $this->expectations[] = expect('App\Notifications')
-            ->toExtend('Illuminate\Notifications\Notification');
-
-        $this->expectations[] = expect('App')
-            ->not->toExtend('Illuminate\Notifications\Notification')
-            ->ignoring('App\Notifications');
-
-        $this->expectations[] = expect('App\Providers')
-            ->toHaveSuffix('ServiceProvider');
-
-        $this->expectations[] = expect('App\Providers')
-            ->toExtend('Illuminate\Support\ServiceProvider');
-
-        $this->expectations[] = expect('App\Providers')
-            ->not->toBeUsed();
-
-        $this->expectations[] = expect('App')
-            ->not->toExtend('Illuminate\Support\ServiceProvider')
-            ->ignoring('App\Providers');
-
-        $this->expectations[] = expect('App')
-            ->not->toHaveSuffix('ServiceProvider')
-            ->ignoring('App\Providers');
-
-        $this->expectations[] = expect('App')
-            ->not->toHaveSuffix('Controller')
-            ->ignoring('App\Http\Controllers');
-
-        $this->expectations[] = expect('App\Http\Controllers')
-            ->classes()
-            ->toHaveSuffix('Controller');
-
-        $this->expectations[] = expect('App\Http')
-            ->toOnlyBeUsedIn('App\Http');
-
-        $this->expectations[] = expect('App\Http\Controllers')
-            ->not->toHavePublicMethodsBesides(['__construct', '__invoke', 'index', 'show', 'create', 'store', 'edit', 'update', 'destroy']);
-
-        $this->expectations[] = expect([
-            'dd',
-            'ddd',
-            'dump',
-            'env',
-            'exit',
-            'ray',
-        ])->not->toBeUsed();
-    }
-}

src/ArchPresets/Php.php

@@ -1,93 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\ArchPresets;
-
-/**
- * @internal
- */
-final class Php extends AbstractPreset
-{
-    /**
-     * Executes the arch preset.
-     */
-    public function execute(): void
-    {
-        $this->expectations[] = expect([
-            'debug_zval_dump',
-            'debug_backtrace',
-            'debug_print_backtrace',
-            'dump',
-            'ray',
-            'ds',
-            'die',
-            'goto',
-            'global',
-            'var_dump',
-            'phpinfo',
-            'echo',
-            'ereg',
-            'eregi',
-            'mysql_connect',
-            'mysql_pconnect',
-            'mysql_query',
-            'mysql_select_db',
-            'mysql_fetch_array',
-            'mysql_fetch_assoc',
-            'mysql_fetch_object',
-            'mysql_fetch_row',
-            'mysql_num_rows',
-            'mysql_affected_rows',
-            'mysql_free_result',
-            'mysql_insert_id',
-            'mysql_error',
-            'mysql_real_escape_string',
-            'print',
-            'print_r',
-            'var_export',
-            'xdebug_break',
-            'xdebug_call_class',
-            'xdebug_call_file',
-            'xdebug_call_int',
-            'xdebug_call_line',
-            'xdebug_code_coverage_started',
-            'xdebug_connect_to_client',
-            'xdebug_debug_zval',
-            'xdebug_debug_zval_stdout',
-            'xdebug_dump_superglobals',
-            'xdebug_get_code_coverage',
-            'xdebug_get_collected_errors',
-            'xdebug_get_function_count',
-            'xdebug_get_function_stack',
-            'xdebug_get_gc_run_count',
-            'xdebug_get_gc_total_collected_roots',
-            'xdebug_get_gcstats_filename',
-            'xdebug_get_headers',
-            'xdebug_get_monitored_functions',
-            'xdebug_get_profiler_filename',
-            'xdebug_get_stack_depth',
-            'xdebug_get_tracefile_name',
-            'xdebug_info',
-            'xdebug_is_debugger_active',
-            'xdebug_memory_usage',
-            'xdebug_notify',
-            'xdebug_peak_memory_usage',
-            'xdebug_print_function_stack',
-            'xdebug_set_filter',
-            'xdebug_start_code_coverage',
-            'xdebug_start_error_collection',
-            'xdebug_start_function_monitor',
-            'xdebug_start_gcstats',
-            'xdebug_start_trace',
-            'xdebug_stop_code_coverage',
-            'xdebug_stop_error_collection',
-            'xdebug_stop_function_monitor',
-            'xdebug_stop_gcstats',
-            'xdebug_stop_trace',
-            'xdebug_time_index',
-            'xdebug_var_dump',
-            'trap',
-        ])->not->toBeUsed();
-    }
-}

src/ArchPresets/Relaxed.php

@@ -1,26 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\ArchPresets;
-
-use Pest\Arch\Contracts\ArchExpectation;
-use Pest\Expectation;
-
-/**
- * @internal
- */
-final class Relaxed extends AbstractPreset
-{
-    /**
-     * Executes the arch preset.
-     */
-    public function execute(): void
-    {
-        $this->eachUserNamespace(
-            fn (Expectation $namespace): ArchExpectation => $namespace->not->toUseStrictTypes(),
-            fn (Expectation $namespace): ArchExpectation => $namespace->classes()->not->toBeFinal(),
-            fn (Expectation $namespace): ArchExpectation => $namespace->classes()->not->toHavePrivateMethods(),
-        );
-    }
-}

src/ArchPresets/Security.php

@@ -1,41 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\ArchPresets;
-
-/**
- * @internal
- */
-final class Security extends AbstractPreset
-{
-    /**
-     * Executes the arch preset.
-     */
-    public function execute(): void
-    {
-        $this->expectations[] = expect([
-            'md5',
-            'sha1',
-            'uniqid',
-            'rand',
-            'mt_rand',
-            'tempnam',
-            'str_shuffle',
-            'shuffle',
-            'array_rand',
-            'eval',
-            'exec',
-            'shell_exec',
-            'system',
-            'passthru',
-            'create_function',
-            'unserialize',
-            'extract',
-            'parse_str',
-            'mb_parse_str',
-            'dl',
-            'assert',
-        ])->not->toBeUsed();
-    }
-}

src/ArchPresets/Strict.php

@@ -1,33 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\ArchPresets;
-
-use Pest\Arch\Contracts\ArchExpectation;
-use Pest\Expectation;
-
-/**
- * @internal
- */
-final class Strict extends AbstractPreset
-{
-    /**
-     * Executes the arch preset.
-     */
-    public function execute(): void
-    {
-        $this->eachUserNamespace(
-            fn (Expectation $namespace): ArchExpectation => $namespace->classes()->not->toHaveProtectedMethods(),
-            fn (Expectation $namespace): ArchExpectation => $namespace->classes()->not->toBeAbstract(),
-            fn (Expectation $namespace): ArchExpectation => $namespace->toUseStrictTypes(),
-            fn (Expectation $namespace): ArchExpectation => $namespace->toUseStrictEquality(),
-            fn (Expectation $namespace): ArchExpectation => $namespace->classes()->toBeFinal(),
-        );
-
-        $this->expectations[] = expect([
-            'sleep',
-            'usleep',
-        ])->not->toBeUsed();
-    }
-}

src/Bootstrappers/BootKernelDump.php

@@ -12,13 +12,13 @@ use Symfony\Component\Console\Output\OutputInterface;
 /**
  * @internal
  */
-final readonly class BootKernelDump implements Bootstrapper
+final class BootKernelDump implements Bootstrapper
 {
     /**
      * Creates a new Boot Kernel Dump instance.
      */
     public function __construct(
-        private OutputInterface $output,
+        private readonly OutputInterface $output,
     ) {
         // ...
     }

src/Bootstrappers/BootOverrides.php

@@ -18,14 +18,14 @@ final class BootOverrides implements Bootstrapper
      * @var array<string, string>
      */
     public const FILES = [
-        'c96b1cb57d7fc8e649f4c13a8abe418c2541bcfab194fb6702b99f777f52ee84' => 'Runner/Filter/NameFilterIterator.php',
+        'c7b9c8a96006dea314204a8f09a8764e51ce0b9b79aadd58da52e8c328db4870' => 'Runner/Filter/NameFilterIterator.php',
-        'a4a43de01f641c6944ee83d963795a46d32b5206b5ab3bbc6cce76e67190acbf' => 'Runner/ResultCache/DefaultResultCache.php',
+        'c7c09ab7c9378710b27f761a4b2948196cbbdf2a73e4389bcdca1e7c94fa9c21' => 'Runner/ResultCache/DefaultResultCache.php',
-        'd0e81317889ad88c707db4b08a94cadee4c9010d05ff0a759f04e71af5efed89' => 'Runner/TestSuiteLoader.php',
+        'bc8718c89264f65800beabc23e51c6d3bcff87dfc764a12179ef5dbfde272c8b' => 'Runner/TestSuiteLoader.php',
-        '3bb609b0d3bf6dee8df8d6cd62a3c8ece823c4bb941eaaae39e3cb267171b9d2' => 'TextUI/Command/Commands/WarmCodeCoverageCacheCommand.php',
+        'f41e48d6cb546772a7de4f8e66b6b7ce894a5318d063eb52e354d206e96c701c' => 'TextUI/Command/Commands/WarmCodeCoverageCacheCommand.php',
-        '8abdad6413329c6fe0d7d44a8b9926e390af32c0b3123f3720bb9c5bbc6fbb7e' => 'TextUI/Output/Default/ProgressPrinter/Subscriber/TestSkippedSubscriber.php',
+        'cb7519f2d82893640b694492cf7ec9528da80773cc1d259634181b5d393528b5' => 'TextUI/Output/Default/ProgressPrinter/Subscriber/TestSkippedSubscriber.php',
-        '43883b7e5811886cf3731c8ed6304d5a77078d9731e1e505abc2da36bde19f3e' => 'TextUI/TestSuiteFilterProcessor.php',
+        '2f06e4b1a9f3a24145bfc7ea25df4f124117f940a2cde30a04d04d5678006bff' => 'TextUI/TestSuiteFilterProcessor.php',
-        '357d5cd7007f8559b26e1b8cdf43bb6fb15b51b79db981779da6f31b7ec39dad' => 'Event/Value/ThrowableBuilder.php',
+        'ef64a657ed9c0067791483784944107827bf227c7e3200f212b6751876b99e25' => 'Event/Value/ThrowableBuilder.php',
-        '676273f1fe483877cf2d95c5aedbf9ae5d6a8e2f4c12d6ce716df6591e6db023' => 'Logging/JUnit/JunitXmlLogger.php',
+        'c78f96e34b98ed01dd8106539d59b8aa8d67f733274118b827c01c5c4111c033' => 'Logging/JUnit/JunitXmlLogger.php',
     ];
 
     /**

src/Bootstrappers/BootSubscribers.php

@@ -13,7 +13,7 @@ use PHPUnit\Event\Subscriber;
 /**
  * @internal
  */
-final readonly class BootSubscribers implements Bootstrapper
+final class BootSubscribers implements Bootstrapper
 {
     /**
      * The list of Subscribers.
@@ -31,7 +31,7 @@ final readonly class BootSubscribers implements Bootstrapper
      * Creates a new instance of the Boot Subscribers.
      */
     public function __construct(
-        private Container $container,
+        private readonly Container $container,
     ) {}
 
     /**

src/Bootstrappers/BootView.php

@@ -11,13 +11,13 @@ use Symfony\Component\Console\Output\OutputInterface;
 /**
  * @internal
  */
-final readonly class BootView implements Bootstrapper
+final class BootView implements Bootstrapper
 {
     /**
      * Creates a new instance of the Boot View.
      */
     public function __construct(
-        private OutputInterface $output
+        private readonly OutputInterface $output
     ) {
         // ..
     }

src/Collision/Events.php

@@ -1,100 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Collision;
-
-use NunoMaduro\Collision\Adapters\Phpunit\TestResult;
-use Pest\Configuration\Project;
-use Symfony\Component\Console\Output\OutputInterface;
-
-use function Termwind\render;
-use function Termwind\renderUsing;
-
-/**
- * @internal
- */
-final class Events
-{
-    /**
-     * Sets the output.
-     */
-    private static ?OutputInterface $output = null;
-
-    /**
-     * Sets the output.
-     */
-    public static function setOutput(OutputInterface $output): void
-    {
-        self::$output = $output;
-    }
-
-    /**
-     * Fires before the test method description is printed.
-     */
-    public static function beforeTestMethodDescription(TestResult $result, string $description): string
-    {
-        if (($context = $result->context) === []) {
-            return $description;
-        }
-
-        renderUsing(self::$output);
-
-        [
-            'assignees' => $assignees,
-            'issues' => $issues,
-            'prs' => $prs,
-        ] = $context;
-
-        if (($link = Project::getInstance()->issues) !== '') {
-            $issuesDescription = array_map(fn (int $issue): string => sprintf('<a href="%s">#%s</a>', sprintf($link, $issue), $issue), $issues);
-        }
-
-        if (($link = Project::getInstance()->prs) !== '') {
-            $prsDescription = array_map(fn (int $pr): string => sprintf('<a href="%s">#%s</a>', sprintf($link, $pr), $pr), $prs);
-        }
-
-        if (($link = Project::getInstance()->assignees) !== '' && count($assignees) > 0) {
-            $assigneesDescription = array_map(fn (string $assignee): string => sprintf(
-                '<a href="%s">@%s</a>',
-                sprintf($link, $assignee),
-                $assignee,
-            ), $assignees);
-        }
-
-        if (count($assignees) > 0 || count($issues) > 0 || count($prs) > 0) {
-            $description .= ' '.implode(', ', array_merge(
-                $issuesDescription ?? [],
-                $prsDescription ?? [],
-                isset($assigneesDescription) ? ['['.implode(', ', $assigneesDescription).']'] : [],
-            ));
-        }
-
-        return $description;
-    }
-
-    /**
-     * Fires after the test method description is printed.
-     */
-    public static function afterTestMethodDescription(TestResult $result): void
-    {
-        if (($context = $result->context) === []) {
-            return;
-        }
-
-        renderUsing(self::$output);
-
-        [
-            'notes' => $notes,
-        ] = $context;
-
-        foreach ($notes as $note) {
-            render(sprintf(<<<'HTML'
-                <div class="ml-2">
-                    <span class="text-gray"> // %s</span>
-                </div>
-                HTML, $note,
-            ));
-        }
-    }
-}

src/Concerns/Testable.php

@@ -5,17 +5,14 @@ declare(strict_types=1);
 namespace Pest\Concerns;
 
 use Closure;
-use Pest\Exceptions\DatasetArgumentsMismatch;
+use Pest\Exceptions\DatasetArgsCountMismatch;
-use Pest\Preset;
 use Pest\Support\ChainableClosure;
 use Pest\Support\ExceptionTrace;
 use Pest\Support\Reflection;
 use Pest\TestSuite;
-use PHPUnit\Framework\Attributes\PostCondition;
 use PHPUnit\Framework\TestCase;
 use ReflectionException;
 use ReflectionFunction;
-use ReflectionParameter;
 use Throwable;
 
 /**
@@ -35,40 +32,11 @@ trait Testable
      */
     private static string $__latestDescription;
 
-    /**
-     * The test's assignees.
-     */
-    private static array $__latestAssignees = [];
-
-    /**
-     * The test's notes.
-     */
-    private static array $__latestNotes = [];
-
-    /**
-     * The test's issues.
-     *
-     * @var array<int, int>
-     */
-    private static array $__latestIssues = [];
-
-    /**
-     * The test's PRs.
-     *
-     * @var array<int, int>
-     */
-    private static array $__latestPrs = [];
-
     /**
      * The test's describing, if any.
      */
     public ?string $__describing = null;
 
-    /**
-     * Whether the test has ran or not.
-     */
-    public bool $__ran = false;
-
     /**
      * The test's test closure.
      */
@@ -99,6 +67,15 @@ trait Testable
      */
     private array $__snapshotChanges = [];
 
+    /**
+     * Resets the test case static properties.
+     */
+    public static function flush(): void
+    {
+        self::$__beforeAll = null;
+        self::$__afterAll = null;
+    }
+
     /**
      * Creates a new Test Case instance.
      */
@@ -111,36 +88,11 @@ trait Testable
         if ($test->hasMethod($name)) {
             $method = $test->getMethod($name);
             $this->__description = self::$__latestDescription = $method->description;
-            self::$__latestAssignees = $method->assignees;
-            self::$__latestNotes = $method->notes;
-            self::$__latestIssues = $method->issues;
-            self::$__latestPrs = $method->prs;
             $this->__describing = $method->describing;
-            $this->__test = $method->getClosure();
+            $this->__test = $method->getClosure($this);
         }
     }
 
-    /**
-     * Resets the test case static properties.
-     */
-    public static function flush(): void
-    {
-        self::$__beforeAll = null;
-        self::$__afterAll = null;
-    }
-
-    /**
-     * Adds a new "note" to the Test Case.
-     */
-    public function note(array|string $note): self
-    {
-        $note = is_array($note) ? $note : [$note];
-
-        self::$__latestNotes = array_merge(self::$__latestNotes, $note);
-
-        return $this;
-    }
-
     /**
      * Adds a new "setUpBeforeClass" to the Test Case.
      */
@@ -234,22 +186,14 @@ trait Testable
     /**
      * Gets executed before the Test Case.
      */
-    protected function setUp(...$arguments): void
+    protected function setUp(): void
     {
         TestSuite::getInstance()->test = $this;
 
         $method = TestSuite::getInstance()->tests->get(self::$__filename)->getMethod($this->name());
 
-        $method->setUp($this);
+        $description = $this->dataName() ? $method->description.' with '.$this->dataName() : $method->description;
-
+        $description = htmlspecialchars(html_entity_decode($description), ENT_NOQUOTES);
-        $description = $method->description;
-        if ($this->dataName()) {
-            $description = str_contains((string) $description, ':dataset')
-                ? str_replace(':dataset', str_replace('dataset ', '', $this->dataName()), (string) $description)
-                : $description.' with '.$this->dataName();
-        }
-
-        $description = htmlspecialchars(html_entity_decode((string) $description), ENT_NOQUOTES);
 
         if ($method->repetitions > 1) {
             $matches = [];
@@ -267,10 +211,6 @@ trait Testable
         }
 
         $this->__description = self::$__latestDescription = $description;
-        self::$__latestAssignees = $method->assignees;
-        self::$__latestNotes = $method->notes;
-        self::$__latestIssues = $method->issues;
-        self::$__latestPrs = $method->prs;
 
         parent::setUp();
 
@@ -280,13 +220,13 @@ trait Testable
             $beforeEach = ChainableClosure::bound($this->__beforeEach, $beforeEach);
         }
 
-        $this->__callClosure($beforeEach, $arguments);
+        $this->__callClosure($beforeEach, func_get_args());
     }
 
     /**
      * Gets executed after the Test Case.
      */
-    protected function tearDown(...$arguments): void
+    protected function tearDown(): void
     {
         $afterEach = TestSuite::getInstance()->afterEach->get(self::$__filename);
 
@@ -300,9 +240,6 @@ trait Testable
             parent::tearDown();
 
             TestSuite::getInstance()->test = null;
-
-            $method = TestSuite::getInstance()->tests->get(self::$__filename)->getMethod($this->name());
-            $method->tearDown($this);
         }
     }
 
@@ -314,7 +251,7 @@ trait Testable
     private function __runTest(Closure $closure, ...$args): mixed
     {
         $arguments = $this->__resolveTestArguments($args);
-        $this->__ensureDatasetArgumentNameAndNumberMatches($arguments);
+        $this->__ensureDatasetArgumentNumberMatches($arguments);
 
         return $this->__callClosure($closure, $arguments);
     }
@@ -329,12 +266,7 @@ trait Testable
         $method = TestSuite::getInstance()->tests->get(self::$__filename)->getMethod($this->name());
 
         if ($method->repetitions > 1) {
-            // If the test is repeated, the first argument is the iteration number
+            array_shift($arguments);
-            // we need to move it to the end of the arguments list
-            // so that the datasets are the first n arguments
-            // and the iteration number is the last argument
-            $firstArgument = array_shift($arguments);
-            $arguments[] = $firstArgument;
         }
 
         $underlyingTest = Reflection::getFunctionVariable($this->__test, 'closure');
@@ -356,7 +288,7 @@ trait Testable
             return $arguments;
         }
 
-        if (! isset($arguments[0]) || ! $arguments[0] instanceof Closure) {
+        if (! $arguments[0] instanceof Closure) {
             return $arguments;
         }
 
@@ -379,9 +311,9 @@ trait Testable
      * Ensures dataset items count matches underlying test case required parameters
      *
      * @throws ReflectionException
-     * @throws DatasetArgumentsMismatch
+     * @throws DatasetArgsCountMismatch
      */
-    private function __ensureDatasetArgumentNameAndNumberMatches(array $arguments): void
+    private function __ensureDatasetArgumentNumberMatches(array $arguments): void
     {
         if ($arguments === []) {
             return;
@@ -392,21 +324,11 @@ trait Testable
         $requiredParametersCount = $testReflection->getNumberOfRequiredParameters();
         $suppliedParametersCount = count($arguments);
 
-        $datasetParameterNames = array_keys($arguments);
+        if ($suppliedParametersCount >= $requiredParametersCount) {
-        $testParameterNames = array_map(
-            fn (ReflectionParameter $reflectionParameter): string => $reflectionParameter->getName(),
-            array_filter($testReflection->getParameters(), fn (ReflectionParameter $reflectionParameter): bool => ! $reflectionParameter->isOptional()),
-        );
-
-        if (array_diff($testParameterNames, $datasetParameterNames) === []) {
             return;
         }
 
-        if (isset($testParameterNames[0]) && $suppliedParametersCount >= $requiredParametersCount) {
+        throw new DatasetArgsCountMismatch($requiredParametersCount, $suppliedParametersCount);
-            return;
-        }
-
-        throw new DatasetArgumentsMismatch($requiredParametersCount, $suppliedParametersCount);
     }
 
     /**
@@ -417,15 +339,7 @@ trait Testable
         return ExceptionTrace::ensure(fn (): mixed => call_user_func_array(Closure::bind($closure, $this, $this::class), $arguments));
     }
 
-    /**
+    /** @postCondition */
-     * Uses the given preset on the test.
-     */
-    public function preset(): Preset
-    {
-        return new Preset;
-    }
-
-    #[PostCondition]
     protected function __MarkTestIncompleteIfSnapshotHaveChanged(): void
     {
         if (count($this->__snapshotChanges) === 0) {
@@ -466,17 +380,4 @@ trait Testable
     {
         return self::$__latestDescription;
     }
-
-    /**
-     * The printable test case method context.
-     */
-    public static function getPrintableContext(): array
-    {
-        return [
-            'assignees' => self::$__latestAssignees,
-            'issues' => self::$__latestIssues,
-            'prs' => self::$__latestPrs,
-            'notes' => self::$__latestNotes,
-        ];
-    }
 }

src/Configuration.php

@@ -1,114 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest;
-
-use Pest\PendingCalls\UsesCall;
-
-/**
- * @internal
- *
- * @mixin UsesCall
- */
-final readonly class Configuration
-{
-    /**
-     * The filename of the configuration.
-     */
-    private string $filename;
-
-    /**
-     * Creates a new configuration instance.
-     */
-    public function __construct(
-        string $filename,
-    ) {
-        $this->filename = str_ends_with($filename, DIRECTORY_SEPARATOR.'Pest.php') ? dirname($filename) : $filename;
-    }
-
-    /**
-     * Use the given classes and traits in the given targets.
-     */
-    public function in(string ...$targets): UsesCall
-    {
-        return (new UsesCall($this->filename, []))->in(...$targets);
-    }
-
-    /**
-     * Depending on where is called, it will extend the given classes and traits globally or locally.
-     */
-    public function extend(string ...$classAndTraits): UsesCall
-    {
-        return new UsesCall(
-            $this->filename,
-            array_values($classAndTraits)
-        );
-    }
-
-    /**
-     * Depending on where is called, it will extend the given classes and traits globally or locally.
-     */
-    public function extends(string ...$classAndTraits): UsesCall
-    {
-        return $this->extend(...$classAndTraits);
-    }
-
-    /**
-     * Depending on where is called, it will add the given groups globally or locally.
-     */
-    public function group(string ...$groups): UsesCall
-    {
-        return (new UsesCall($this->filename, []))->group(...$groups);
-    }
-
-    /**
-     * Depending on where is called, it will extend the given classes and traits globally or locally.
-     */
-    public function use(string ...$classAndTraits): UsesCall
-    {
-        return $this->extend(...$classAndTraits);
-    }
-
-    /**
-     * Depending on where is called, it will extend the given classes and traits globally or locally.
-     */
-    public function uses(string ...$classAndTraits): UsesCall
-    {
-        return $this->extends(...$classAndTraits);
-    }
-
-    /**
-     * Gets the printer configuration.
-     */
-    public function printer(): Configuration\Printer
-    {
-        return new Configuration\Printer;
-    }
-
-    /**
-     * Gets the presets configuration.
-     */
-    public function presets(): Configuration\Presets
-    {
-        return new Configuration\Presets;
-    }
-
-    /**
-     * Gets the project configuration.
-     */
-    public function project(): Configuration\Project
-    {
-        return Configuration\Project::getInstance();
-    }
-
-    /**
-     * Proxies calls to the uses method.
-     *
-     * @param  array<array-key, mixed>  $arguments
-     */
-    public function __call(string $name, array $arguments): mixed
-    {
-        return $this->uses()->$name(...$arguments); // @phpstan-ignore-line
-    }
-}

src/Configuration/Presets.php

@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Configuration;
-
-use Closure;
-use Pest\Preset;
-
-final class Presets
-{
-    /**
-     * Creates a custom preset instance, and adds it to the list of presets.
-     */
-    public function custom(string $name, Closure $execute): void
-    {
-        Preset::custom($name, $execute);
-    }
-}

src/Configuration/Printer.php

@@ -1,23 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Configuration;
-
-use NunoMaduro\Collision\Adapters\Phpunit\Printers\DefaultPrinter;
-
-/**
- * @internal
- */
-final readonly class Printer
-{
-    /**
-     * Sets the theme to compact.
-     */
-    public function compact(): self
-    {
-        DefaultPrinter::compact(true);
-
-        return $this;
-    }
-}

src/Configuration/Project.php

@@ -1,109 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Configuration;
-
-/**
- * @internal
- */
-final class Project
-{
-    /**
-     * The assignees link.
-     *
-     * @internal
-     */
-    public string $assignees = '';
-
-    /**
-     * The issues link.
-     *
-     * @internal
-     */
-    public string $issues = '';
-
-    /**
-     * The PRs link.
-     *
-     * @internal
-     */
-    public string $prs = '';
-
-    /**
-     * The singleton instance.
-     */
-    private static ?self $instance = null;
-
-    /**
-     * Creates a new instance of the project.
-     */
-    public static function getInstance(): self
-    {
-        return self::$instance ??= new self;
-    }
-
-    /**
-     * Sets the test project to GitHub.
-     */
-    public function github(string $project): self
-    {
-        $this->issues = "https://github.com/{$project}/issues/%s";
-        $this->prs = "https://github.com/{$project}/pull/%s";
-
-        $this->assignees = 'https://github.com/%s';
-
-        return $this;
-    }
-
-    /**
-     * Sets the test project to GitLab.
-     */
-    public function gitlab(string $project): self
-    {
-        $this->issues = "https://gitlab.com/{$project}/issues/%s";
-        $this->prs = "https://gitlab.com/{$project}/merge_requests/%s";
-
-        $this->assignees = 'https://gitlab.com/%s';
-
-        return $this;
-    }
-
-    /**
-     * Sets the test project to Bitbucket.
-     */
-    public function bitbucket(string $project): self
-    {
-        $this->issues = "https://bitbucket.org/{$project}/issues/%s";
-        $this->prs = "https://bitbucket.org/{$project}/pull-requests/%s";
-
-        $this->assignees = 'https://bitbucket.org/%s';
-
-        return $this;
-    }
-
-    /**
-     * Sets the test project to Jira.
-     */
-    public function jira(string $namespace, string $project): self
-    {
-        $this->issues = "https://{$namespace}.atlassian.net/browse/{$project}-%s";
-
-        $this->assignees = "https://{$namespace}.atlassian.net/secure/ViewProfile.jspa?name=%s";
-
-        return $this;
-    }
-
-    /**
-     * Sets the test project to custom.
-     */
-    public function custom(string $issues, string $prs, string $assignees): self
-    {
-        $this->issues = $issues;
-        $this->prs = $prs;
-
-        $this->assignees = $assignees;
-
-        return $this;
-    }
-}

src/Console/Help.php

@@ -9,7 +9,7 @@ use Symfony\Component\Console\Output\OutputInterface;
 /**
  * @internal
  */
-final readonly class Help
+final class Help
 {
     /**
      * The Command messages.
@@ -27,7 +27,7 @@ final readonly class Help
     /**
      * Creates a new Console Command instance.
      */
-    public function __construct(private OutputInterface $output)
+    public function __construct(private readonly OutputInterface $output)
     {
         // ..
     }

src/Console/Thanks.php

@@ -15,7 +15,7 @@ use Symfony\Component\Console\Question\ConfirmationQuestion;
 /**
  * @internal
  */
-final readonly class Thanks
+final class Thanks
 {
     /**
      * The support options.
@@ -33,8 +33,8 @@ final readonly class Thanks
      * Creates a new Console Command instance.
      */
     public function __construct(
-        private InputInterface $input,
+        private readonly InputInterface $input,
-        private OutputInterface $output
+        private readonly OutputInterface $output
     ) {
         // ..
     }
@@ -72,13 +72,13 @@ final readonly class Thanks
         }
 
         if ($wantsToSupport === true) {
-            if (PHP_OS_FAMILY === 'Darwin') {
+            if (PHP_OS_FAMILY == 'Darwin') {
                 exec('open https://github.com/pestphp/pest');
             }
-            if (PHP_OS_FAMILY === 'Windows') {
+            if (PHP_OS_FAMILY == 'Windows') {
                 exec('start https://github.com/pestphp/pest');
             }
-            if (PHP_OS_FAMILY === 'Linux') {
+            if (PHP_OS_FAMILY == 'Linux') {
                 exec('xdg-open https://github.com/pestphp/pest');
             }
         }

src/Contracts/AddsAnnotations.php

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

src/Contracts/ArchPreset.php

@@ -1,10 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Contracts;
-
-/**
- * @internal
- */
-interface ArchPreset {}

src/Evaluators/Attributes.php

@@ -1,33 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Evaluators;
-
-use Pest\Factories\Attribute;
-
-/**
- * @internal
- */
-final class Attributes
-{
-    /**
-     * Evaluates the given attributes and returns the code.
-     *
-     * @param  iterable<int, Attribute>  $attributes
-     */
-    public static function code(iterable $attributes): string
-    {
-        return implode(PHP_EOL, array_map(function (Attribute $attribute): string {
-            $name = $attribute->name;
-
-            if ($attribute->arguments === []) {
-                return "    #[\\{$name}]";
-            }
-
-            $arguments = array_map(fn (string $argument): string => var_export($argument, true), iterator_to_array($attribute->arguments));
-
-            return sprintf('    #[\\%s(%s)]', $name, implode(', ', $arguments));
-        }, iterator_to_array($attributes)));
-    }
-}

src/Exceptions/AfterBeforeTestFunction.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 AfterBeforeTestFunction extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
-{
-    /**
-     * Creates a new Exception instance.
-     */
-    public function __construct(string $filename)
-    {
-        parent::__construct('After method cannot be used with before the [test|it] functions in the filename `['.$filename.']`.');
-    }
-}

src/Exceptions/DatasetArgsCountMismatch.php

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

src/Exceptions/DatasetArgumentsMismatch.php

@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Exceptions;
-
-use Exception;
-
-final class DatasetArgumentsMismatch extends Exception
-{
-    public function __construct(int $requiredCount, int $suppliedCount)
-    {
-        if ($requiredCount <= $suppliedCount) {
-            parent::__construct('Test argument names and dataset keys do not match');
-        } else {
-            parent::__construct(sprintf('Test expects %d arguments but dataset only provides %d', $requiredCount, $suppliedCount));
-        }
-    }
-
-    //
-}

src/Expectation.php

@@ -30,12 +30,9 @@ use Pest\Expectations\HigherOrderExpectation;
 use Pest\Expectations\OppositeExpectation;
 use Pest\Matchers\Any;
 use Pest\Support\ExpectationPipeline;
-use Pest\Support\Reflection;
 use PHPUnit\Architecture\Elements\ObjectDescription;
 use PHPUnit\Framework\ExpectationFailedException;
 use ReflectionEnum;
-use ReflectionMethod;
-use ReflectionProperty;
 
 /**
  * @template TValue
@@ -223,7 +220,7 @@ final class Expectation
             throw new BadMethodCallException('Expectation value is not iterable.');
         }
 
-        if ($callbacks === []) {
+        if (count($callbacks) == 0) {
             throw new InvalidArgumentException('No sequence expectations defined.');
         }
 
@@ -264,7 +261,7 @@ final class Expectation
         $matched = false;
 
         foreach ($expressions as $key => $callback) {
-            if ($subject != $key) { // @pest-arch-ignore-line
+            if ($subject != $key) {
                 continue;
             }
 
@@ -380,7 +377,7 @@ final class Expectation
         if (self::hasExtend($name)) {
             $extend = self::$extends[$name]->bindTo($this, Expectation::class);
 
-            if ($extend != false) { // @pest-arch-ignore-line
+            if ($extend != false) {
                 return $extend;
             }
         }
@@ -437,71 +434,6 @@ final class Expectation
         return ToUse::make($this, $targets);
     }
 
-    /**
-     * Asserts that the given expectation target does have the given permissions
-     */
-    public function toHaveFileSystemPermissions(string $permissions): ArchExpectation
-    {
-        return Targeted::make(
-            $this,
-            fn (ObjectDescription $object): bool => substr(sprintf('%o', fileperms($object->path)), -4) === $permissions,
-            sprintf('permissions to be [%s]', $permissions),
-            FileLineFinder::where(fn (string $line): bool => str_contains($line, '<?php')),
-        );
-    }
-
-    /**
-     * Asserts that the given expectation target to have line count less than the given number.
-     */
-    public function toHaveLineCountLessThan(int $lines): ArchExpectation
-    {
-        return Targeted::make(
-            $this,
-            fn (ObjectDescription $object): bool => count(file($object->path)) < $lines, // @phpstan-ignore-line
-            sprintf('to have less than %d lines of code', $lines),
-            FileLineFinder::where(fn (string $line): bool => str_contains($line, '<?php')),
-        );
-    }
-
-    /**
-     * Asserts that the given expectation target have all methods documented.
-     */
-    public function toHaveMethodsDocumented(): ArchExpectation
-    {
-        return Targeted::make(
-            $this,
-            fn (ObjectDescription $object): bool => isset($object->reflectionClass) === false
-                || array_filter(
-                    Reflection::getMethodsFromReflectionClass($object->reflectionClass),
-                    fn (ReflectionMethod $method): bool => (enum_exists($object->name) === false || in_array($method->name, ['from', 'tryFrom', 'cases'], true) === false)
-                        && realpath($method->getFileName() ?: '/') === realpath($object->path) // @phpstan-ignore-line
-                        && $method->getDocComment() === false,
-                ) === [],
-            'to have methods with documentation / annotations',
-            FileLineFinder::where(fn (string $line): bool => str_contains($line, 'class'))
-        );
-    }
-
-    /**
-     * Asserts that the given expectation target have all properties documented.
-     */
-    public function toHavePropertiesDocumented(): ArchExpectation
-    {
-        return Targeted::make(
-            $this,
-            fn (ObjectDescription $object): bool => isset($object->reflectionClass) === false
-                || array_filter(
-                    Reflection::getPropertiesFromReflectionClass($object->reflectionClass),
-                    fn (ReflectionProperty $property): bool => (enum_exists($object->name) === false || in_array($property->name, ['value', 'name'], true) === false)
-                        && realpath($property->getDeclaringClass()->getFileName() ?: '/') === realpath($object->path) // @phpstan-ignore-line
-                        && $property->isPromoted() === false
-                        && $property->getDocComment() === false,
-                ) === [],
-            'to have properties with documentation / annotations',
-            FileLineFinder::where(fn (string $line): bool => str_contains($line, 'class'))
-        );
-    }
-
     /**
      * Asserts that the given expectation target use the "declare(strict_types=1)" declaration.
      */
@@ -515,19 +447,6 @@ final class Expectation
         );
     }
 
-    /**
-     * Asserts that the given expectation target uses strict equality.
-     */
-    public function toUseStrictEquality(): ArchExpectation
-    {
-        return Targeted::make(
-            $this,
-            fn (ObjectDescription $object): bool => ! str_contains((string) file_get_contents($object->path), ' == ') && ! str_contains((string) file_get_contents($object->path), ' != '),
-            'to use strict equality',
-            FileLineFinder::where(fn (string $line): bool => str_contains($line, ' == ') || str_contains($line, ' != ')),
-        );
-    }
-
     /**
      * Asserts that the given expectation target is final.
      */
@@ -590,79 +509,17 @@ final class Expectation
 
     /**
      * Asserts that the given expectation target has a specific method.
-     *
-     * @param  array<int, string>|string  $method
      */
-    public function toHaveMethod(array|string $method): ArchExpectation
+    public function toHaveMethod(string $method): ArchExpectation
     {
-        $methods = is_array($method) ? $method : [$method];
-
         return Targeted::make(
             $this,
-            fn (ObjectDescription $object): bool => count(array_filter($methods, fn (string $method): bool => $object->reflectionClass->hasMethod($method))) === count($methods),
+            fn (ObjectDescription $object): bool => $object->reflectionClass->hasMethod($method),
-            sprintf("to have method '%s'", implode("', '", $methods)),
+            sprintf("to have method '%s'", $method),
             FileLineFinder::where(fn (string $line): bool => str_contains($line, 'class')),
         );
     }
 
-    /**
-     * Asserts that the given expectation target has a specific methods.
-     *
-     * @param  array<int, string>  $methods
-     */
-    public function toHaveMethods(array $methods): ArchExpectation
-    {
-        return $this->toHaveMethod($methods);
-    }
-
-    /**
-     * Not supported.
-     */
-    public function toHavePublicMethodsBesides(): void
-    {
-        throw InvalidExpectation::fromMethods(['toHavePublicMethodsBesides']);
-    }
-
-    /**
-     * Not supported.
-     */
-    public function toHavePublicMethods(): void
-    {
-        throw InvalidExpectation::fromMethods(['toHavePublicMethods']);
-    }
-
-    /**
-     * Not supported.
-     */
-    public function toHaveProtectedMethodsBesides(): void
-    {
-        throw InvalidExpectation::fromMethods(['toHaveProtectedMethodsBesides']);
-    }
-
-    /**
-     * Not supported.
-     */
-    public function toHaveProtectedMethods(): void
-    {
-        throw InvalidExpectation::fromMethods(['toHaveProtectedMethods']);
-    }
-
-    /**
-     * Not supported.
-     */
-    public function toHavePrivateMethodsBesides(): void
-    {
-        throw InvalidExpectation::fromMethods(['toHavePrivateMethodsBesides']);
-    }
-
-    /**
-     * Not supported.
-     */
-    public function toHavePrivateMethods(): void
-    {
-        throw InvalidExpectation::fromMethods(['toHavePrivateMethods']);
-    }
-
     /**
      * Asserts that the given expectation target is enum.
      */
@@ -728,6 +585,8 @@ final class Expectation
 
     /**
      * Asserts that the given expectation target to be subclass of the given class.
+     *
+     * @param  class-string  $class
      */
     public function toExtend(string $class): ArchExpectation
     {
@@ -752,39 +611,6 @@ final class Expectation
         );
     }
 
-    /**
-     * Asserts that the given expectation target to use the given trait.
-     */
-    public function toUseTrait(string $trait): ArchExpectation
-    {
-        return $this->toUseTraits($trait);
-    }
-
-    /**
-     * Asserts that the given expectation target to use the given traits.
-     *
-     * @param  array<int, string>|string  $traits
-     */
-    public function toUseTraits(array|string $traits): ArchExpectation
-    {
-        $traits = is_array($traits) ? $traits : [$traits];
-
-        return Targeted::make(
-            $this,
-            function (ObjectDescription $object) use ($traits): bool {
-                foreach ($traits as $trait) {
-                    if (! in_array($trait, $object->reflectionClass->getTraitNames(), true)) {
-                        return false;
-                    }
-                }
-
-                return true;
-            },
-            "to use traits '".implode("', '", $traits)."'",
-            FileLineFinder::where(fn (string $line): bool => str_contains($line, 'class')),
-        );
-    }
-
     /**
      * Asserts that the given expectation target to not implement any interfaces.
      */
@@ -801,7 +627,7 @@ final class Expectation
     /**
      * Asserts that the given expectation target to only implement the given interfaces.
      *
-     * @param  array<int, string>|string  $interfaces
+     * @param  array<int, class-string>|class-string  $interfaces
      */
     public function toOnlyImplement(array|string $interfaces): ArchExpectation
     {
@@ -845,7 +671,7 @@ final class Expectation
     /**
      * Asserts that the given expectation target to implement the given interfaces.
      *
-     * @param  array<int, string>|string  $interfaces
+     * @param  array<int, class-string>|class-string  $interfaces
      */
     public function toImplement(array|string $interfaces): ArchExpectation
     {
@@ -885,10 +711,7 @@ final class Expectation
         return ToUseNothing::make($this);
     }
 
-    /**
+    public function toBeUsed(): never
-     * Not supported.
-     */
-    public function toBeUsed(): void
     {
         throw InvalidExpectation::fromMethods(['toBeUsed']);
     }
@@ -1032,6 +855,8 @@ final class Expectation
 
     /**
      * Asserts that the given expectation target to have the given attribute.
+     *
+     * @param  class-string<Attribute>  $attribute
      */
     public function toHaveAttribute(string $attribute): ArchExpectation
     {

src/Expectations/EachExpectation.php

@@ -17,9 +17,6 @@ use function expect;
  */
 final class EachExpectation
 {
-    /**
-     * Indicates if the expectation is the opposite.
-     */
     private bool $opposite = false;
 
     /**

src/Expectations/HigherOrderExpectation.php

@@ -25,14 +25,8 @@ final class HigherOrderExpectation
      */
     private Expectation|EachExpectation $expectation;
 
-    /**
-     * Indicates if the expectation is the opposite.
-     */
     private bool $opposite = false;
 
-    /**
-     * Indicates if the expectation should reset the value.
-     */
     private bool $shouldReset = false;
 
     /**

src/Expectations/OppositeExpectation.php

@@ -18,13 +18,9 @@ use Pest\Exceptions\InvalidExpectation;
 use Pest\Expectation;
 use Pest\Support\Arr;
 use Pest\Support\Exporter;
-use Pest\Support\Reflection;
 use PHPUnit\Architecture\Elements\ObjectDescription;
 use PHPUnit\Framework\AssertionFailedError;
 use PHPUnit\Framework\ExpectationFailedException;
-use ReflectionMethod;
-use ReflectionProperty;
-use stdClass;
 
 /**
  * @internal
@@ -33,14 +29,14 @@ use stdClass;
  *
  * @mixin Expectation<TValue>
  */
-final readonly class OppositeExpectation
+final class OppositeExpectation
 {
     /**
      * Creates a new opposite expectation.
      *
      * @param  Expectation<TValue>  $original
      */
-    public function __construct(private Expectation $original) {}
+    public function __construct(private readonly Expectation $original) {}
 
     /**
      * Asserts that the value array not has the provided $keys.
@@ -79,66 +75,6 @@ final readonly class OppositeExpectation
         ), is_string($targets) ? [$targets] : $targets));
     }
 
-    /**
-     * Asserts that the given expectation target does not have the given permissions
-     */
-    public function toHaveFileSystemPermissions(string $permissions): ArchExpectation
-    {
-        return Targeted::make(
-            $this->original,
-            fn (ObjectDescription $object): bool => substr(sprintf('%o', fileperms($object->path)), -4) !== $permissions,
-            sprintf('permissions not to be [%s]', $permissions),
-            FileLineFinder::where(fn (string $line): bool => str_contains($line, '<?php')),
-        );
-    }
-
-    /**
-     * Not supported.
-     */
-    public function toHaveLineCountLessThan(): ArchExpectation
-    {
-        throw InvalidExpectation::fromMethods(['not', 'toHaveLineCountLessThan']);
-    }
-
-    /**
-     * Not supported.
-     */
-    public function toHaveMethodsDocumented(): ArchExpectation
-    {
-        return Targeted::make(
-            $this->original,
-            fn (ObjectDescription $object): bool => isset($object->reflectionClass) === false
-                || array_filter(
-                    Reflection::getMethodsFromReflectionClass($object->reflectionClass),
-                    fn (ReflectionMethod $method): bool => (enum_exists($object->name) === false || in_array($method->name, ['from', 'tryFrom', 'cases'], true) === false)
-                        && realpath($method->getFileName() ?: '/') === realpath($object->path) // @phpstan-ignore-line
-                        && $method->getDocComment() !== false,
-                ) === [],
-            'to have methods without documentation / annotations',
-            FileLineFinder::where(fn (string $line): bool => str_contains($line, 'class'))
-        );
-    }
-
-    /**
-     * Not supported.
-     */
-    public function toHavePropertiesDocumented(): ArchExpectation
-    {
-        return Targeted::make(
-            $this->original,
-            fn (ObjectDescription $object): bool => isset($object->reflectionClass) === false
-                || array_filter(
-                    Reflection::getPropertiesFromReflectionClass($object->reflectionClass),
-                    fn (ReflectionProperty $property): bool => (enum_exists($object->name) === false || in_array($property->name, ['value', 'name'], true) === false)
-                        && realpath($property->getDeclaringClass()->getFileName() ?: '/') === realpath($object->path) // @phpstan-ignore-line
-                        && $property->isPromoted() === false
-                        && $property->getDocComment() !== false,
-                ) === [],
-            'to have properties without documentation / annotations',
-            FileLineFinder::where(fn (string $line): bool => str_contains($line, 'class'))
-        );
-    }
-
     /**
      * Asserts that the given expectation target does not use the "declare(strict_types=1)" declaration.
      */
@@ -152,19 +88,6 @@ final readonly class OppositeExpectation
         );
     }
 
-    /**
-     * Asserts that the given expectation target does not use the strict equality operator.
-     */
-    public function toUseStrictEquality(): ArchExpectation
-    {
-        return Targeted::make(
-            $this->original,
-            fn (ObjectDescription $object): bool => ! str_contains((string) file_get_contents($object->path), ' === ') && ! str_contains((string) file_get_contents($object->path), ' !== '),
-            'to use strict equality',
-            FileLineFinder::where(fn (string $line): bool => str_contains($line, ' === ') || str_contains($line, ' !== ')),
-        );
-    }
-
     /**
      * Asserts that the given expectation target is not final.
      */
@@ -227,163 +150,17 @@ final readonly class OppositeExpectation
 
     /**
      * Asserts that the given expectation target does not have a specific method.
-     *
-     * @param  array<int, string>|string  $method
      */
-    public function toHaveMethod(array|string $method): ArchExpectation
+    public function toHaveMethod(string $method): ArchExpectation
     {
-        $methods = is_array($method) ? $method : [$method];
-
         return Targeted::make(
             $this->original,
-            fn (ObjectDescription $object): bool => array_filter(
+            fn (ObjectDescription $object): bool => ! $object->reflectionClass->hasMethod($method),
-                $methods,
+            'to not have method',
-                fn (string $method): bool => $object->reflectionClass->hasMethod($method),
-            ) === [],
-            'to not have methods: '.implode(', ', $methods),
             FileLineFinder::where(fn (string $line): bool => str_contains($line, 'class')),
         );
     }
 
-    /**
-     * Asserts that the given expectation target does not have the given methods.
-     *
-     * @param  array<int, string>  $methods
-     */
-    public function toHaveMethods(array $methods): ArchExpectation
-    {
-        return $this->toHaveMethod($methods);
-    }
-
-    /**
-     * Asserts that the given expectation target not to have the public methods besides the given methods.
-     *
-     * @param  array<int, string>|string  $methods
-     */
-    public function toHavePublicMethodsBesides(array|string $methods): ArchExpectation
-    {
-        $methods = is_array($methods) ? $methods : [$methods];
-
-        $state = new stdClass;
-
-        return Targeted::make(
-            $this->original,
-            function (ObjectDescription $object) use ($methods, &$state): bool {
-                $reflectionMethods = isset($object->reflectionClass)
-                    ? Reflection::getMethodsFromReflectionClass($object->reflectionClass, ReflectionMethod::IS_PUBLIC)
-                    : [];
-
-                foreach ($reflectionMethods as $reflectionMethod) {
-                    if (! in_array($reflectionMethod->name, $methods, true)) {
-                        $state->contains = 'public function '.$reflectionMethod->name;
-
-                        return false;
-                    }
-                }
-
-                return true;
-            },
-            $methods === []
-                ? 'not to have public methods'
-                : sprintf("not to have public methods besides '%s'", implode("', '", $methods)),
-            FileLineFinder::where(fn (string $line): bool => str_contains($line, $state->contains)),
-        );
-    }
-
-    /**
-     * Asserts that the given expectation target not to have the public methods.
-     */
-    public function toHavePublicMethods(): ArchExpectation
-    {
-        return $this->toHavePublicMethodsBesides([]);
-    }
-
-    /**
-     * Asserts that the given expectation target not to have the protected methods besides the given methods.
-     *
-     * @param  array<int, string>|string  $methods
-     */
-    public function toHaveProtectedMethodsBesides(array|string $methods): ArchExpectation
-    {
-        $methods = is_array($methods) ? $methods : [$methods];
-
-        $state = new stdClass;
-
-        return Targeted::make(
-            $this->original,
-            function (ObjectDescription $object) use ($methods, &$state): bool {
-                $reflectionMethods = isset($object->reflectionClass)
-                    ? Reflection::getMethodsFromReflectionClass($object->reflectionClass, ReflectionMethod::IS_PROTECTED)
-                    : [];
-
-                foreach ($reflectionMethods as $reflectionMethod) {
-                    if (! in_array($reflectionMethod->name, $methods, true)) {
-                        $state->contains = 'protected function '.$reflectionMethod->name;
-
-                        return false;
-                    }
-                }
-
-                return true;
-            },
-            $methods === []
-                ? 'not to have protected methods'
-                : sprintf("not to have protected methods besides '%s'", implode("', '", $methods)),
-            FileLineFinder::where(fn (string $line): bool => str_contains($line, $state->contains)),
-        );
-    }
-
-    /**
-     * Asserts that the given expectation target not to have the protected methods.
-     */
-    public function toHaveProtectedMethods(): ArchExpectation
-    {
-        return $this->toHaveProtectedMethodsBesides([]);
-    }
-
-    /**
-     * Asserts that the given expectation target not to have the private methods besides the given methods.
-     *
-     * @param  array<int, string>|string  $methods
-     */
-    public function toHavePrivateMethodsBesides(array|string $methods): ArchExpectation
-    {
-        $methods = is_array($methods) ? $methods : [$methods];
-
-        $state = new stdClass;
-
-        return Targeted::make(
-            $this->original,
-            function (ObjectDescription $object) use ($methods, &$state): bool {
-                $reflectionMethods = isset($object->reflectionClass)
-                    ? Reflection::getMethodsFromReflectionClass($object->reflectionClass, ReflectionMethod::IS_PRIVATE)
-                    : [];
-
-                foreach ($reflectionMethods as $reflectionMethod) {
-                    if (! in_array($reflectionMethod->name, $methods, true)) {
-                        $state->contains = 'private function '.$reflectionMethod->name;
-
-                        return false;
-                    }
-                }
-
-                return true;
-            },
-            $methods === []
-                ? 'not to have private methods'
-                : sprintf("not to have private methods besides '%s'", implode("', '", $methods)),
-            FileLineFinder::where(fn (string $line): bool => str_contains($line, $state->contains)),
-        );
-    }
-
-    /**
-     * Asserts that the given expectation target not to have the private methods.
-     */
-    public function toHavePrivateMethods(): ArchExpectation
-    {
-        return $this->toHavePrivateMethodsBesides([]);
-    }
-
     /**
      * Asserts that the given expectation target is not enum.
      */
@@ -449,6 +226,8 @@ final readonly class OppositeExpectation
 
     /**
      * Asserts that the given expectation target to be not subclass of the given class.
+     *
+     * @param  class-string  $class
      */
     public function toExtend(string $class): ArchExpectation
     {
@@ -473,43 +252,10 @@ final readonly class OppositeExpectation
         );
     }
 
-    /**
-     * Asserts that the given expectation target not to use the given trait.
-     */
-    public function toUseTrait(string $trait): ArchExpectation
-    {
-        return $this->toUseTraits($trait);
-    }
-
-    /**
-     * Asserts that the given expectation target not to use the given traits.
-     *
-     * @param  array<int, string>|string  $traits
-     */
-    public function toUseTraits(array|string $traits): ArchExpectation
-    {
-        $traits = is_array($traits) ? $traits : [$traits];
-
-        return Targeted::make(
-            $this->original,
-            function (ObjectDescription $object) use ($traits): bool {
-                foreach ($traits as $trait) {
-                    if (in_array($trait, $object->reflectionClass->getTraitNames(), true)) {
-                        return false;
-                    }
-                }
-
-                return true;
-            },
-            "not to use traits '".implode("', '", $traits)."'",
-            FileLineFinder::where(fn (string $line): bool => str_contains($line, 'class')),
-        );
-    }
-
     /**
      * Asserts that the given expectation target not to implement the given interfaces.
      *
-     * @param  array<int, string>|string  $interfaces
+     * @param  array<int, class-string>|string  $interfaces
      */
     public function toImplement(array|string $interfaces): ArchExpectation
     {
@@ -546,8 +292,10 @@ final readonly class OppositeExpectation
 
     /**
      * Not supported.
+     *
+     * @param  array<int, class-string>|string  $interfaces
      */
-    public function toOnlyImplement(): void
+    public function toOnlyImplement(array|string $interfaces): never
     {
         throw InvalidExpectation::fromMethods(['not', 'toOnlyImplement']);
     }
@@ -580,8 +328,10 @@ final readonly class OppositeExpectation
 
     /**
      * Not supported.
+     *
+     * @param  array<int, string>|string  $targets
      */
-    public function toOnlyUse(): void
+    public function toOnlyUse(array|string $targets): never
     {
         throw InvalidExpectation::fromMethods(['not', 'toOnlyUse']);
     }
@@ -589,7 +339,7 @@ final readonly class OppositeExpectation
     /**
      * Not supported.
      */
-    public function toUseNothing(): void
+    public function toUseNothing(): never
     {
         throw InvalidExpectation::fromMethods(['not', 'toUseNothing']);
     }
@@ -614,7 +364,7 @@ final readonly class OppositeExpectation
         ), is_string($targets) ? [$targets] : $targets));
     }
 
-    public function toOnlyBeUsedIn(): void
+    public function toOnlyBeUsedIn(): never
     {
         throw InvalidExpectation::fromMethods(['not', 'toOnlyBeUsedIn']);
     }
@@ -622,7 +372,7 @@ final readonly class OppositeExpectation
     /**
      * Asserts that the given expectation dependency is not used.
      */
-    public function toBeUsedInNothing(): void
+    public function toBeUsedInNothing(): never
     {
         throw InvalidExpectation::fromMethods(['not', 'toBeUsedInNothing']);
     }
@@ -642,6 +392,8 @@ final readonly class OppositeExpectation
 
     /**
      * Asserts that the given expectation target not to have the given attribute.
+     *
+     * @param  class-string<Attribute>  $attribute
      */
     public function toHaveAttribute(string $attribute): ArchExpectation
     {

src/Factories/Annotations/CoversNothing.php

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

src/Factories/Annotations/Depends.php

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

src/Factories/Annotations/Groups.php

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

src/Factories/Annotations/TestDox.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Factories\Annotations;
+
+use Pest\Contracts\AddsAnnotations;
+use Pest\Factories\TestCaseMethodFactory;
+
+final class TestDox implements AddsAnnotations
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function __invoke(TestCaseMethodFactory $method, array $annotations): array
+    {
+        /*
+         * Escapes docblock according to
+         * https://manual.phpdoc.org/HTMLframesConverter/default/phpDocumentor/tutorial_phpDocumentor.howto.pkg.html#basics.desc
+         *
+         * Note: '@' escaping is not needed as it cannot be the first character of the line (it always starts with @testdox).
+         */
+        assert($method->description !== null);
+        $methodDescription = str_replace('*/', '{@*}', $method->description);
+
+        $annotations[] = "@testdox $methodDescription";
+
+        return $annotations;
+    }
+}

src/Factories/Attribute.php

@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Factories;
-
-/**
- * @internal
- */
-final class Attribute
-{
-    /**
-     * @param  iterable<int, string>  $arguments
-     */
-    public function __construct(public string $name, public iterable $arguments)
-    {
-        //
-    }
-}

src/Factories/Attributes/Attribute.php

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

src/Factories/Attributes/Covers.php

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

src/Factories/TestCaseFactory.php

@@ -6,8 +6,8 @@ namespace Pest\Factories;
 
 use ParseError;
 use Pest\Concerns;
+use Pest\Contracts\AddsAnnotations;
 use Pest\Contracts\HasPrintableTestCaseName;
-use Pest\Evaluators\Attributes;
 use Pest\Exceptions\DatasetMissing;
 use Pest\Exceptions\ShouldNotHappen;
 use Pest\Exceptions\TestAlreadyExist;
@@ -27,12 +27,26 @@ final class TestCaseFactory
 {
     use HigherOrderable;
 
+    /**
+     * The list of annotations.
+     *
+     * @var array<int, class-string<AddsAnnotations>>
+     */
+    private const ANNOTATIONS = [
+        Annotations\Depends::class,
+        Annotations\Groups::class,
+        Annotations\CoversNothing::class,
+        Annotations\TestDox::class,
+    ];
+
     /**
      * The list of attributes.
      *
-     * @var array<int, Attribute>
+     * @var array<int, class-string<\Pest\Factories\Attributes\Attribute>>
      */
-    public array $attributes = [];
+    private const ATTRIBUTES = [
+        Attributes\Covers::class,
+    ];
 
     /**
      * The FQN of the Test Case class.
@@ -133,21 +147,32 @@ final class TestCaseFactory
             $className = 'InvalidTestName'.Str::random();
         }
 
-        $this->attributes = [
+        $classAvailableAttributes = array_filter(self::ATTRIBUTES, fn (string $attribute): bool => $attribute::$above);
-            new Attribute(
+        $methodAvailableAttributes = array_filter(self::ATTRIBUTES, fn (string $attribute): bool => ! $attribute::$above);
-                \PHPUnit\Framework\Attributes\TestDox::class,
-                [$this->filename],
-            ),
-            ...$this->attributes,
-        ];
 
-        $attributesCode = Attributes::code($this->attributes);
+        $classAttributes = [];
+
+        foreach ($classAvailableAttributes as $attribute) {
+            $classAttributes = array_reduce(
+                $methods,
+                fn (array $carry, TestCaseMethodFactory $methodFactory): array => (new $attribute)->__invoke($methodFactory, $carry),
+                $classAttributes
+            );
+        }
 
         $methodsCode = implode('', array_map(
-            fn (TestCaseMethodFactory $methodFactory): string => $methodFactory->buildForEvaluation(),
+            fn (TestCaseMethodFactory $methodFactory): string => $methodFactory->buildForEvaluation(
+                self::ANNOTATIONS,
+                $methodAvailableAttributes
+            ),
             $methods
         ));
 
+        $classAttributesCode = implode('', array_map(
+            static fn (string $attribute): string => sprintf("\n%s", $attribute),
+            array_unique($classAttributes),
+        ));
+
         try {
             $classCode = <<<PHP
             namespace $namespace;
@@ -155,7 +180,10 @@ final class TestCaseFactory
             use Pest\Repositories\DatasetsRepository as __PestDatasets;
             use Pest\TestSuite as __PestTestSuite;
 
-            $attributesCode
+            /**
+             * @testdox $filename
+             */
+            $classAttributesCode
             #[\AllowDynamicProperties]
             final class $className extends $baseClass implements $hasPrintableTestCaseClassFQN {
                 $traitsCode
@@ -166,7 +194,7 @@ final class TestCaseFactory
             }
             PHP;
 
-            eval($classCode); // @phpstan-ignore-line
+            eval($classCode);
         } catch (ParseError $caught) {
             throw new RuntimeException(sprintf(
                 "Unable to create test case for test file at %s. \n %s",

src/Factories/TestCaseMethodFactory.php

@@ -5,14 +5,13 @@ declare(strict_types=1);
 namespace Pest\Factories;
 
 use Closure;
-use Pest\Evaluators\Attributes;
+use Pest\Contracts\AddsAnnotations;
 use Pest\Exceptions\ShouldNotHappen;
 use Pest\Factories\Concerns\HigherOrderable;
 use Pest\Repositories\DatasetsRepository;
 use Pest\Support\Str;
 use Pest\TestSuite;
 use PHPUnit\Framework\Assert;
-use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -22,23 +21,11 @@ final class TestCaseMethodFactory
 {
     use HigherOrderable;
 
-    /**
-     * The list of attributes.
-     *
-     * @var array<int, Attribute>
-     */
-    public array $attributes = [];
-
     /**
      * The test's describing, if any.
      */
     public ?string $describing = null;
 
-    /**
-     * The test's description, if any.
-     */
-    public ?string $description = null;
-
     /**
      * The test's number of repetitions.
      */
@@ -49,34 +36,6 @@ final class TestCaseMethodFactory
      */
     public bool $todo = false;
 
-    /**
-     * The associated issue numbers.
-     *
-     * @var array<int, int>
-     */
-    public array $issues = [];
-
-    /**
-     * The test assignees.
-     *
-     * @var array<int, string>
-     */
-    public array $assignees = [];
-
-    /**
-     * The associated PRs numbers.
-     *
-     * @var array<int, int>
-     */
-    public array $prs = [];
-
-    /**
-     * The test's notes.
-     *
-     * @var array<int, string>
-     */
-    public array $notes = [];
-
     /**
      * The test's datasets.
      *
@@ -99,15 +58,18 @@ final class TestCaseMethodFactory
     public array $groups = [];
 
     /**
-     * @see This property is not actually used in the codebase, it's only here to make Rector happy.
+     * The covered classes and functions.
+     *
+     * @var array<int, \Pest\Factories\Covers\CoversClass|\Pest\Factories\Covers\CoversFunction|\Pest\Factories\Covers\CoversNothing>
      */
-    public bool $__ran = false;
+    public array $covers = [];
 
     /**
      * Creates a new test case method factory instance.
      */
     public function __construct(
         public string $filename,
+        public ?string $description,
         public ?Closure $closure,
     ) {
         $this->closure ??= function (): void {
@@ -118,9 +80,9 @@ final class TestCaseMethodFactory
     }
 
     /**
-     * Sets the test's hooks, and runs any proxy to the test case.
+     * Creates the test's closure.
      */
-    public function setUp(TestCase $concrete): void
+    public function getClosure(TestCase $concrete): Closure
     {
         $concrete::flush(); // @phpstan-ignore-line
 
@@ -128,32 +90,16 @@ final class TestCaseMethodFactory
             throw ShouldNotHappen::fromMessage('Description can not be empty.');
         }
 
+        $closure = $this->closure;
+
         $testCase = TestSuite::getInstance()->tests->get($this->filename);
 
-        assert($testCase instanceof TestCaseFactory);
         $testCase->factoryProxies->proxy($concrete);
         $this->factoryProxies->proxy($concrete);
-    }
 
-    /**
-     * Flushes the test case.
-     */
-    public function tearDown(TestCase $concrete): void
-    {
-        $concrete::flush(); // @phpstan-ignore-line
-    }
-
-    /**
-     * Creates the test's closure.
-     */
-    public function getClosure(): Closure
-    {
-        $closure = $this->closure;
-        $testCase = TestSuite::getInstance()->tests->get($this->filename);
-        assert($testCase instanceof TestCaseFactory);
         $method = $this;
 
-        return function (...$arguments) use ($testCase, $method, $closure): mixed { // @phpstan-ignore-line
+        return function () use ($testCase, $method, $closure): mixed { // @phpstan-ignore-line
             /* @var TestCase $this */
             $testCase->proxies->proxy($this);
             $method->proxies->proxy($this);
@@ -161,9 +107,7 @@ final class TestCaseMethodFactory
             $testCase->chains->chain($this);
             $method->chains->chain($this);
 
-            $this->__ran = true;
+            return \Pest\Support\Closure::bind($closure, $this, self::class)(...func_get_args());
-
-            return \Pest\Support\Closure::bind($closure, $this, self::class)(...$arguments);
         };
     }
 
@@ -172,13 +116,16 @@ final class TestCaseMethodFactory
      */
     public function receivesArguments(): bool
     {
-        return $this->datasets !== [] || $this->depends !== [] || $this->repetitions > 1;
+        return $this->datasets !== [] || $this->depends !== [];
     }
 
     /**
      * Creates a PHPUnit method as a string ready for evaluation.
+     *
+     * @param  array<int, class-string<AddsAnnotations>>  $annotationsToUse
+     * @param  array<int, class-string<\Pest\Factories\Attributes\Attribute>>  $attributesToUse
      */
-    public function buildForEvaluation(): string
+    public function buildForEvaluation(array $annotationsToUse, array $attributesToUse): string
     {
         if ($this->description === null) {
             throw ShouldNotHappen::fromMessage('The test description may not be empty.');
@@ -187,49 +134,46 @@ final class TestCaseMethodFactory
         $methodName = Str::evaluable($this->description);
 
         $datasetsCode = '';
+        $annotations = ['@test'];
+        $attributes = [];
 
-        $this->attributes = [
+        foreach ($annotationsToUse as $annotation) {
-            new Attribute(
+            $annotations = (new $annotation)->__invoke($this, $annotations);
-                \PHPUnit\Framework\Attributes\Test::class,
+        }
-                [],
-            ),
-            new Attribute(
-                \PHPUnit\Framework\Attributes\TestDox::class,
-                [str_replace('*/', '{@*}', $this->description)],
-            ),
-            ...$this->attributes,
-        ];
 
-        foreach ($this->depends as $depend) {
+        foreach ($attributesToUse as $attribute) {
-            $depend = Str::evaluable($this->describing !== null ? Str::describe($this->describing, $depend) : $depend);
+            $attributes = (new $attribute)->__invoke($this, $attributes);
-
-            $this->attributes[] = new Attribute(
-                \PHPUnit\Framework\Attributes\Depends::class,
-                [$depend],
-            );
         }
 
         if ($this->datasets !== [] || $this->repetitions > 1) {
             $dataProviderName = $methodName.'_dataset';
-            $this->attributes[] = new Attribute(
+            $annotations[] = "@dataProvider $dataProviderName";
-                DataProvider::class,
-                [$dataProviderName],
-            );
             $datasetsCode = $this->buildDatasetForEvaluation($methodName, $dataProviderName);
         }
 
-        $attributesCode = Attributes::code($this->attributes);
+        $annotations = implode('', array_map(
+            static fn (string $annotation): string => sprintf("\n     * %s", $annotation), $annotations,
+        ));
+
+        $attributes = implode('', array_map(
+            static fn (string $attribute): string => sprintf("\n        %s", $attribute), $attributes,
+        ));
 
         return <<<PHP
-            $attributesCode
+
-                public function $methodName(...\$arguments)
+                /**$annotations
+                 */
+                $attributes
+                public function $methodName()
                 {
+                    \$test = \Pest\TestSuite::getInstance()->tests->get(self::\$__filename)->getMethod(\$this->name())->getClosure(\$this);
+
                     return \$this->__runTest(
-                        \$this->__test,
+                        \$test,
-                        ...\$arguments,
+                        ...func_get_args(),
                     );
                 }
-            $datasetsCode
+                $datasetsCode
             PHP;
     }
 

src/Functions.php

@@ -3,12 +3,9 @@
 declare(strict_types=1);
 
 use Pest\Concerns\Expectable;
-use Pest\Configuration;
 use Pest\Exceptions\AfterAllWithinDescribe;
 use Pest\Exceptions\BeforeAllWithinDescribe;
 use Pest\Expectation;
-use Pest\Mutate\Contracts\MutationTestRunner;
-use Pest\Mutate\Repositories\ConfigurationRepository;
 use Pest\PendingCalls\AfterEachCall;
 use Pest\PendingCalls\BeforeEachCall;
 use Pest\PendingCalls\DescribeCall;
@@ -16,7 +13,6 @@ use Pest\PendingCalls\TestCall;
 use Pest\PendingCalls\UsesCall;
 use Pest\Repositories\DatasetsRepository;
 use Pest\Support\Backtrace;
-use Pest\Support\Container;
 use Pest\Support\DatasetInfo;
 use Pest\Support\HigherOrderTapProxy;
 use Pest\TestSuite;
@@ -57,8 +53,6 @@ if (! function_exists('beforeEach')) {
     /**
      * Runs the given closure before each test in the current file.
      *
-     * @param-closure-this TestCase  $closure
-     *
      * @return HigherOrderTapProxy<Expectable|TestCall|TestCase>|Expectable|TestCall|TestCase|mixed
      */
     function beforeEach(?Closure $closure = null): BeforeEachCall
@@ -114,24 +108,12 @@ if (! function_exists('uses')) {
     }
 }
 
-if (! function_exists('pest')) {
-    /**
-     * Creates a new Pest configuration instance.
-     */
-    function pest(): Configuration
-    {
-        return new Configuration(Backtrace::file());
-    }
-}
-
 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.
      *
-     * @param-closure-this TestCase  $closure
-     *
      * @return Expectable|TestCall|TestCase|mixed
      */
     function test(?string $description = null, ?Closure $closure = null): HigherOrderTapProxy|TestCall
@@ -152,8 +134,6 @@ if (! function_exists('it')) {
      * is the test description; the second argument is
      * a closure that contains the test expectations.
      *
-     * @param-closure-this TestCase  $closure
-     *
      * @return Expectable|TestCall|TestCase|mixed
      */
     function it(string $description, ?Closure $closure = null): TestCall
@@ -169,7 +149,9 @@ if (! function_exists('it')) {
 
 if (! function_exists('todo')) {
     /**
-     * Creates a new test that is marked as "todo".
+     * Adds the given todo test. Internally, this test
+     * is marked as incomplete. Yet, Collision, Pest's
+     * printer, will display it as a "todo" test.
      *
      * @return Expectable|TestCall|TestCase|mixed
      */
@@ -187,8 +169,6 @@ if (! function_exists('afterEach')) {
     /**
      * Runs the given closure after each test in the current file.
      *
-     * @param-closure-this TestCase  $closure
-     *
      * @return Expectable|HigherOrderTapProxy<Expectable|TestCall|TestCase>|TestCall|mixed
      */
     function afterEach(?Closure $closure = null): AfterEachCall
@@ -214,67 +194,3 @@ if (! function_exists('afterAll')) {
         TestSuite::getInstance()->afterAll->set($closure);
     }
 }
-
-if (! function_exists('covers')) {
-    /**
-     * Specifies which classes, or functions, a test case covers.
-     *
-     * @param  array<int, string>|string  $classesOrFunctions
-     */
-    function covers(array|string ...$classesOrFunctions): void
-    {
-        $filename = Backtrace::file();
-
-        $beforeEachCall = (new BeforeEachCall(TestSuite::getInstance(), $filename));
-
-        $beforeEachCall->covers(...$classesOrFunctions);
-        $beforeEachCall->group('__pest_mutate_only');
-
-        /** @var MutationTestRunner $runner */
-        $runner = Container::getInstance()->get(MutationTestRunner::class);
-        /** @var \Pest\Mutate\Repositories\ConfigurationRepository $configurationRepository */
-        $configurationRepository = Container::getInstance()->get(ConfigurationRepository::class);
-        $everything = $configurationRepository->cliConfiguration->toArray()['everything'] ?? false;
-        $classes = $configurationRepository->cliConfiguration->toArray()['classes'] ?? false;
-        $paths = $configurationRepository->cliConfiguration->toArray()['paths'] ?? false;
-
-        if ($runner->isEnabled() && ! $everything && ! is_array($classes) && ! is_array($paths)) {
-            $beforeEachCall->only('__pest_mutate_only');
-        }
-    }
-}
-
-if (! function_exists('mutates')) {
-    /**
-     * Specifies which classes, enums, or traits a test case mutates.
-     *
-     * @param  array<int, string>|string  $targets
-     */
-    function mutates(array|string ...$targets): void
-    {
-        $filename = Backtrace::file();
-
-        $beforeEachCall = (new BeforeEachCall(TestSuite::getInstance(), $filename));
-        $beforeEachCall->group('__pest_mutate_only');
-
-        /** @var MutationTestRunner $runner */
-        $runner = Container::getInstance()->get(MutationTestRunner::class);
-        /** @var \Pest\Mutate\Repositories\ConfigurationRepository $configurationRepository */
-        $configurationRepository = Container::getInstance()->get(ConfigurationRepository::class);
-        $everything = $configurationRepository->cliConfiguration->toArray()['everything'] ?? false;
-        $classes = $configurationRepository->cliConfiguration->toArray()['classes'] ?? false;
-        $paths = $configurationRepository->cliConfiguration->toArray()['paths'] ?? false;
-
-        if ($runner->isEnabled() && ! $everything && ! is_array($classes) && ! is_array($paths)) {
-            $beforeEachCall->only('__pest_mutate_only');
-        }
-
-        /** @var ConfigurationRepository $configurationRepository */
-        $configurationRepository = Container::getInstance()->get(ConfigurationRepository::class);
-        $paths = $configurationRepository->cliConfiguration->toArray()['paths'] ?? false;
-
-        if (! is_array($paths)) {
-            $configurationRepository->globalConfiguration('default')->class(...$targets); // @phpstan-ignore-line
-        }
-    }
-}

src/Kernel.php

@@ -27,7 +27,7 @@ use Whoops\Exception\Inspector;
 /**
  * @internal
  */
-final readonly class Kernel
+final class Kernel
 {
     /**
      * The Kernel bootstrappers.
@@ -47,8 +47,8 @@ final readonly class Kernel
      * Creates a new Kernel instance.
      */
     public function __construct(
-        private Application $application,
+        private readonly Application $application,
-        private OutputInterface $output,
+        private readonly OutputInterface $output,
     ) {
         //
     }

src/KernelDump.php

@@ -40,7 +40,7 @@ final class KernelDump
      */
     public function disable(): void
     {
-        @ob_clean(); // @phpstan-ignore-line
+        @ob_clean();
 
         if ($this->buffer !== '') {
             $this->flush();

src/Logging/Converter.php

@@ -18,30 +18,23 @@ use PHPUnit\Event\Test\Failed;
 use PHPUnit\Event\Test\MarkedIncomplete;
 use PHPUnit\Event\Test\Skipped;
 use PHPUnit\Event\TestSuite\TestSuite;
-use PHPUnit\Event\TestSuite\TestSuiteForTestMethodWithDataProvider;
 use PHPUnit\Framework\Exception as FrameworkException;
 use PHPUnit\TestRunner\TestResult\TestResult as PhpUnitTestResult;
 
 /**
  * @internal
  */
-final readonly class Converter
+final class Converter
 {
-    /**
-     * The prefix for the test suite name.
-     */
     private const PREFIX = 'P\\';
 
-    /**
+    private readonly StateGenerator $stateGenerator;
-     *  The state generator.
-     */
-    private StateGenerator $stateGenerator;
 
     /**
      * Creates a new instance of the Converter.
      */
     public function __construct(
-        private string $rootPath,
+        private readonly string $rootPath,
     ) {
         $this->stateGenerator = new StateGenerator;
     }
@@ -136,7 +129,7 @@ final readonly class Converter
 
         // Format stacktrace as `at <path>`
         $frames = array_map(
-            fn (string $frame): string => "at $frame",
+            fn (string $frame) => "at $frame",
             $frames
         );
 
@@ -148,13 +141,6 @@ final readonly class Converter
      */
     public function getTestSuiteName(TestSuite $testSuite): string
     {
-        if ($testSuite instanceof TestSuiteForTestMethodWithDataProvider) {
-            $firstTest = $this->getFirstTest($testSuite);
-            if ($firstTest instanceof \PHPUnit\Event\Code\TestMethod) {
-                return $this->getTestMethodNameWithoutDatasetSuffix($firstTest);
-            }
-        }
-
         $name = $testSuite->name();
 
         if (! str_starts_with($name, self::PREFIX)) {
@@ -176,35 +162,6 @@ final readonly class Converter
      * Gets the test suite location.
      */
     public function getTestSuiteLocation(TestSuite $testSuite): ?string
-    {
-        $firstTest = $this->getFirstTest($testSuite);
-        if (! $firstTest instanceof \PHPUnit\Event\Code\TestMethod) {
-            return null;
-        }
-        $path = $firstTest->testDox()->prettifiedClassName();
-        $classRelativePath = $this->toRelativePath($path);
-
-        if ($testSuite instanceof TestSuiteForTestMethodWithDataProvider) {
-            $methodName = $this->getTestMethodNameWithoutDatasetSuffix($firstTest);
-
-            return "$classRelativePath::$methodName";
-        }
-
-        return $classRelativePath;
-    }
-
-    /**
-     * Gets the prettified test method name without dataset-related suffix.
-     */
-    private function getTestMethodNameWithoutDatasetSuffix(TestMethod $testMethod): string
-    {
-        return Str::beforeLast($testMethod->testDox()->prettifiedMethodName(), ' with data set ');
-    }
-
-    /**
-     * Gets the first test from the test suite.
-     */
-    private function getFirstTest(TestSuite $testSuite): ?TestMethod
     {
         $tests = $testSuite->tests()->asArray();
 
@@ -218,7 +175,9 @@ final readonly class Converter
             throw ShouldNotHappen::fromMessage('Not an instance of TestMethod');
         }
 
-        return $firstTest;
+        $path = $firstTest->testDox()->prettifiedClassName();
+
+        return $this->toRelativePath($path);
     }
 
     /**

src/Logging/TeamCity/ServiceMessage.php

@@ -9,9 +9,6 @@ namespace Pest\Logging\TeamCity;
  */
 final class ServiceMessage
 {
-    /**
-     * The flow ID.
-     */
     private static ?int $flowId = null;
 
     /**
@@ -38,7 +35,7 @@ final class ServiceMessage
     {
         return new self('testSuiteStarted', [
             'name' => $name,
-            'locationHint' => $location === null ? null : "pest_qn://$location",
+            'locationHint' => $location === null ? null : "file://$location",
         ]);
     }
 

src/Logging/TeamCity/Subscriber/Subscriber.php

@@ -9,7 +9,7 @@ use Pest\Logging\TeamCity\TeamCityLogger;
 /**
  * @internal
  */
-abstract class Subscriber // @pest-arch-ignore-line
+abstract class Subscriber
 {
     /**
      * Creates a new Subscriber instance.
@@ -19,7 +19,7 @@ abstract class Subscriber // @pest-arch-ignore-line
     /**
      * Creates a new TeamCityLogger instance.
      */
-    final protected function logger(): TeamCityLogger // @pest-arch-ignore-line
+    final protected function logger(): TeamCityLogger
     {
         return $this->logger;
     }

src/Logging/TeamCity/Subscriber/TestMarkedIncompleteSubscriber.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Logging\TeamCity\Subscriber;
+
+use PHPUnit\Event\Test\MarkedIncomplete;
+use PHPUnit\Event\Test\MarkedIncompleteSubscriber;
+
+/**
+ * @internal
+ */
+final class TestMarkedIncompleteSubscriber extends Subscriber implements MarkedIncompleteSubscriber
+{
+    public function notify(MarkedIncomplete $event): void
+    {
+        $this->logger()->testMarkedIncomplete($event);
+    }
+}

src/Logging/TeamCity/TeamCityLogger.php

@@ -12,6 +12,7 @@ use Pest\Logging\TeamCity\Subscriber\TestErroredSubscriber;
 use Pest\Logging\TeamCity\Subscriber\TestExecutionFinishedSubscriber;
 use Pest\Logging\TeamCity\Subscriber\TestFailedSubscriber;
 use Pest\Logging\TeamCity\Subscriber\TestFinishedSubscriber;
+use Pest\Logging\TeamCity\Subscriber\TestMarkedIncompleteSubscriber;
 use Pest\Logging\TeamCity\Subscriber\TestPreparedSubscriber;
 use Pest\Logging\TeamCity\Subscriber\TestSkippedSubscriber;
 use Pest\Logging\TeamCity\Subscriber\TestSuiteFinishedSubscriber;
@@ -27,6 +28,7 @@ use PHPUnit\Event\Test\ConsideredRisky;
 use PHPUnit\Event\Test\Errored;
 use PHPUnit\Event\Test\Failed;
 use PHPUnit\Event\Test\Finished;
+use PHPUnit\Event\Test\MarkedIncomplete;
 use PHPUnit\Event\Test\Prepared;
 use PHPUnit\Event\Test\Skipped;
 use PHPUnit\Event\TestRunner\ExecutionFinished;
@@ -43,14 +45,8 @@ use Symfony\Component\Console\Output\OutputInterface;
  */
 final class TeamCityLogger
 {
-    /**
-     * The current time.
-     */
     private ?HRTime $time = null;
 
-    /**
-     * Indicates if the summary test count has been printed.
-     */
     private bool $isSummaryTestCountPrinted = false;
 
     /**
@@ -112,7 +108,7 @@ final class TeamCityLogger
         $this->time = $event->telemetryInfo()->time();
     }
 
-    public function testMarkedIncomplete(): never
+    public function testMarkedIncomplete(MarkedIncomplete $event): never
     {
         throw ShouldNotHappen::fromMessage('testMarkedIncomplete not implemented.');
     }
@@ -266,6 +262,7 @@ final class TeamCityLogger
             new TestFinishedSubscriber($this),
             new TestErroredSubscriber($this),
             new TestFailedSubscriber($this),
+            new TestMarkedIncompleteSubscriber($this),
             new TestSkippedSubscriber($this),
             new TestConsideredRiskySubscriber($this),
             new TestExecutionFinishedSubscriber($this),

src/Mixins/Expectation.php

@@ -344,6 +344,36 @@ final class Expectation
         return $this;
     }
 
+    /**
+     * Asserts that the value has the method $name.
+     *
+     * @return self<TValue>
+     */
+    public function toHaveMethod(string $name, string $message = ''): self
+    {
+        $this->toBeObject();
+
+        // @phpstan-ignore-next-line
+        Assert::assertTrue(method_exists($this->value, $name), $message);
+
+        return $this;
+    }
+
+    /**
+     * Asserts that the value has the provided methods $names.
+     *
+     * @param  iterable<array-key, string>  $names
+     * @return self<TValue>
+     */
+    public function toHaveMethods(iterable $names, string $message = ''): self
+    {
+        foreach ($names as $name) {
+            $this->toHaveMethod($name, message: $message);
+        }
+
+        return $this;
+    }
+
     /**
      * Asserts that two variables have the same value.
      *

src/Panic.php

@@ -5,20 +5,19 @@ declare(strict_types=1);
 namespace Pest;
 
 use NunoMaduro\Collision\Writer;
-use Pest\Exceptions\TestDescriptionMissing;
 use Pest\Support\Container;
 use Symfony\Component\Console\Output\ConsoleOutput;
 use Symfony\Component\Console\Output\OutputInterface;
 use Throwable;
 use Whoops\Exception\Inspector;
 
-final readonly class Panic
+final class Panic
 {
     /**
      * Creates a new Panic instance.
      */
     private function __construct(
-        private Throwable $throwable
+        private readonly Throwable $throwable
     ) {
         // ...
     }
@@ -28,10 +27,6 @@ final readonly class Panic
      */
     public static function with(Throwable $throwable): never
     {
-        if ($throwable instanceof TestDescriptionMissing && ! is_null($previous = $throwable->getPrevious())) {
-            $throwable = $previous;
-        }
-
         $panic = new self($throwable);
 
         $panic->handle();

src/PendingCalls/AfterEachCall.php

@@ -54,7 +54,7 @@ final class AfterEachCall
         $proxies = $this->proxies;
 
         $afterEachTestCase = ChainableClosure::boundWhen(
-            fn (): bool => is_null($describing) || $this->__describing === $describing,
+            fn (): bool => is_null($describing) || $this->__describing === $describing, // @phpstan-ignore-line
             ChainableClosure::bound(fn () => $proxies->chain($this), $this->closure)->bindTo($this, self::class), // @phpstan-ignore-line
         )->bindTo($this, self::class);
 
@@ -65,6 +65,7 @@ final class AfterEachCall
             $this,
             $afterEachTestCase,
         );
+
     }
 
     /**

src/PendingCalls/BeforeEachCall.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace Pest\PendingCalls;
 
 use Closure;
-use Pest\Exceptions\AfterBeforeTestFunction;
 use Pest\PendingCalls\Concerns\Describable;
 use Pest\Support\Backtrace;
 use Pest\Support\ChainableClosure;
@@ -15,8 +14,6 @@ use Pest\TestSuite;
 
 /**
  * @internal
- *
- * @mixin TestCall
  */
 final class BeforeEachCall
 {
@@ -62,22 +59,17 @@ final class BeforeEachCall
         $testCaseProxies = $this->testCaseProxies;
 
         $beforeEachTestCall = function (TestCall $testCall) use ($describing): void {
-
+            if ($describing !== $this->describing) {
-            if ($this->describing !== null) {
+                return;
-                if ($describing !== $this->describing) {
+            }
-                    return;
+            if ($describing !== $testCall->describing) {
-                }
+                return;
-
-                if ($describing !== $testCall->describing) {
-                    return;
-                }
             }
-
             $this->testCallProxies->chain($testCall);
         };
 
         $beforeEachTestCase = ChainableClosure::boundWhen(
-            fn (): bool => is_null($describing) || $this->__describing === $describing,
+            fn (): bool => is_null($describing) || $this->__describing === $describing,  // @phpstan-ignore-line
             ChainableClosure::bound(fn () => $testCaseProxies->chain($this), $this->closure)->bindTo($this, self::class), // @phpstan-ignore-line
         )->bindTo($this, self::class);
 
@@ -91,18 +83,6 @@ final class BeforeEachCall
         );
     }
 
-    /**
-     * Runs the given closure after the test.
-     */
-    public function after(Closure $closure): self
-    {
-        if ($this->describing === null) {
-            throw new AfterBeforeTestFunction($this->filename);
-        }
-
-        return $this->__call('after', [$closure]);
-    }
-
     /**
      * Saves the calls to be used on the target.
      *
@@ -111,8 +91,7 @@ final class BeforeEachCall
     public function __call(string $name, array $arguments): self
     {
         if (method_exists(TestCall::class, $name)) {
-            $this->testCallProxies
+            $this->testCallProxies->add(Backtrace::file(), Backtrace::line(), $name, $arguments);
-                ->add(Backtrace::file(), Backtrace::line(), $name, $arguments);
 
             return $this;
         }

src/PendingCalls/Concerns/Describable.php

@@ -9,13 +9,5 @@ namespace Pest\PendingCalls\Concerns;
  */
 trait Describable
 {
-    /**
-     * Note: this is property is not used; however, it gets added automatically by rector php.
-     */
-    public string $__describing;
-
-    /**
-     * The describing of the test case.
-     */
     public ?string $describing = null;
 }

src/PendingCalls/DescribeCall.php

@@ -18,11 +18,6 @@ final class DescribeCall
      */
     private static ?string $describing = null;
 
-    /**
-     * The describe "before each" call.
-     */
-    private ?BeforeEachCall $currentBeforeEachCall = null;
-
     /**
      * Creates a new Pending Call.
      */
@@ -48,8 +43,6 @@ final class DescribeCall
      */
     public function __destruct()
     {
-        unset($this->currentBeforeEachCall);
-
         self::$describing = $this->description;
 
         try {
@@ -64,18 +57,14 @@ final class DescribeCall
      *
      * @param  array<int, mixed>  $arguments
      */
-    public function __call(string $name, array $arguments): self
+    public function __call(string $name, array $arguments): BeforeEachCall
     {
         $filename = Backtrace::file();
 
-        if (! $this->currentBeforeEachCall instanceof \Pest\PendingCalls\BeforeEachCall) {
+        $beforeEachCall = new BeforeEachCall(TestSuite::getInstance(), $filename);
-            $this->currentBeforeEachCall = new BeforeEachCall(TestSuite::getInstance(), $filename);
 
-            $this->currentBeforeEachCall->describing = $this->description;
+        $beforeEachCall->describing = $this->description;
-        }
 
-        $this->currentBeforeEachCall->{$name}(...$arguments); // @phpstan-ignore-line
+        return $beforeEachCall->{$name}(...$arguments); // @phpstan-ignore-line
-
-        return $this;
     }
 }

src/PendingCalls/TestCall.php

@@ -6,14 +6,13 @@ namespace Pest\PendingCalls;
 
 use Closure;
 use Pest\Exceptions\InvalidArgumentException;
-use Pest\Exceptions\TestDescriptionMissing;
+use Pest\Factories\Covers\CoversClass;
-use Pest\Factories\Attribute;
+use Pest\Factories\Covers\CoversFunction;
+use Pest\Factories\Covers\CoversNothing;
 use Pest\Factories\TestCaseMethodFactory;
-use Pest\Mutate\Repositories\ConfigurationRepository;
 use Pest\PendingCalls\Concerns\Describable;
 use Pest\Plugins\Only;
 use Pest\Support\Backtrace;
-use Pest\Support\Container;
 use Pest\Support\Exporter;
 use Pest\Support\HigherOrderCallables;
 use Pest\Support\NullClosure;
@@ -31,13 +30,6 @@ final class TestCall
 {
     use Describable;
 
-    /**
-     * The list of test case factory attributes.
-     *
-     * @var array<int, Attribute>
-     */
-    private array $testCaseFactoryAttributes = [];
-
     /**
      * The Test Case Factory.
      */
@@ -54,10 +46,10 @@ final class TestCall
     public function __construct(
         private readonly TestSuite $testSuite,
         private readonly string $filename,
-        private ?string $description = null,
+        ?string $description = null,
         ?Closure $closure = null
     ) {
-        $this->testCaseMethod = new TestCaseMethodFactory($filename, $closure);
+        $this->testCaseMethod = new TestCaseMethodFactory($filename, $description, $closure);
 
         $this->descriptionLess = $description === null;
 
@@ -66,42 +58,6 @@ final class TestCall
         $this->testSuite->beforeEach->get($this->filename)[0]($this);
     }
 
-    /**
-     * Runs the given closure after the test.
-     */
-    public function after(Closure $closure): self
-    {
-        if ($this->description === null) {
-            throw new TestDescriptionMissing($this->filename);
-        }
-
-        $description = is_null($this->describing)
-            ? $this->description
-            : Str::describe($this->describing, $this->description);
-
-        $filename = $this->filename;
-
-        $when = function () use ($closure, $filename, $description): void {
-            if ($this::$__filename !== $filename) { // @phpstan-ignore-line
-                return;
-            }
-
-            if ($this->__description !== $description) { // @phpstan-ignore-line
-                return;
-            }
-
-            if ($this->__ran !== true) { // @phpstan-ignore-line
-                return;
-            }
-
-            $closure->call($this);
-        };
-
-        new AfterEachCall($this->testSuite, $this->filename, $when->bindTo(new \stdClass));
-
-        return $this;
-    }
-
     /**
      * Asserts that the test fails with the given message.
      */
@@ -209,10 +165,7 @@ final class TestCall
     public function group(string ...$groups): self
     {
         foreach ($groups as $group) {
-            $this->testCaseMethod->attributes[] = new Attribute(
+            $this->testCaseMethod->groups[] = $group;
-                \PHPUnit\Framework\Attributes\Group::class,
-                [$group],
-            );
         }
 
         return $this;
@@ -223,7 +176,7 @@ final class TestCall
      */
     public function only(): self
     {
-        Only::enable($this, ...func_get_args()); // @phpstan-ignore-line
+        Only::enable($this);
 
         return $this;
     }
@@ -353,186 +306,32 @@ final class TestCall
     }
 
     /**
-     * Marks the test as "todo".
+     * Sets the test as "todo".
      */
-    public function todo(// @phpstan-ignore-line
+    public function todo(): self
-        array|string|null $note = null,
+    {
-        array|string|null $assignee = null,
-        array|string|int|null $issue = null,
-        array|string|int|null $pr = null,
-    ): self {
         $this->skip('__TODO__');
 
         $this->testCaseMethod->todo = true;
 
-        if ($issue !== null) {
-            $this->issue($issue);
-        }
-
-        if ($pr !== null) {
-            $this->pr($pr);
-        }
-
-        if ($assignee !== null) {
-            $this->assignee($assignee);
-        }
-
-        if ($note !== null) {
-            $this->note($note);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Sets the test as "work in progress".
-     */
-    public function wip(// @phpstan-ignore-line
-        array|string|null $note = null,
-        array|string|null $assignee = null,
-        array|string|int|null $issue = null,
-        array|string|int|null $pr = null,
-    ): self {
-        if ($issue !== null) {
-            $this->issue($issue);
-        }
-
-        if ($pr !== null) {
-            $this->pr($pr);
-        }
-
-        if ($assignee !== null) {
-            $this->assignee($assignee);
-        }
-
-        if ($note !== null) {
-            $this->note($note);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Sets the test as "done".
-     */
-    public function done(// @phpstan-ignore-line
-        array|string|null $note = null,
-        array|string|null $assignee = null,
-        array|string|int|null $issue = null,
-        array|string|int|null $pr = null,
-    ): self {
-        if ($issue !== null) {
-            $this->issue($issue);
-        }
-
-        if ($pr !== null) {
-            $this->pr($pr);
-        }
-
-        if ($assignee !== null) {
-            $this->assignee($assignee);
-        }
-
-        if ($note !== null) {
-            $this->note($note);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Associates the test with the given issue(s).
-     *
-     * @param  array<int, string|int>|string|int  $number
-     */
-    public function issue(array|string|int $number): self
-    {
-        $number = is_array($number) ? $number : [$number];
-
-        $number = array_map(fn (string|int $number): int => (int) ltrim((string) $number, '#'), $number);
-
-        $this->testCaseMethod->issues = array_merge($this->testCaseMethod->issues, $number);
-
-        return $this;
-    }
-
-    /**
-     * Associates the test with the given ticket(s). (Alias for `issue`)
-     *
-     * @param  array<int, string|int>|string|int  $number
-     */
-    public function ticket(array|string|int $number): self
-    {
-        return $this->issue($number);
-    }
-
-    /**
-     * Sets the test assignee(s).
-     *
-     * @param  array<int, string>|string  $assignee
-     */
-    public function assignee(array|string $assignee): self
-    {
-        $assignees = is_array($assignee) ? $assignee : [$assignee];
-
-        $this->testCaseMethod->assignees = array_unique(array_merge($this->testCaseMethod->assignees, $assignees));
-
-        return $this;
-    }
-
-    /**
-     * Associates the test with the given pull request(s).
-     *
-     * @param  array<int, string|int>|string|int  $number
-     */
-    public function pr(array|string|int $number): self
-    {
-        $number = is_array($number) ? $number : [$number];
-
-        $number = array_map(fn (string|int $number): int => (int) ltrim((string) $number, '#'), $number);
-
-        $this->testCaseMethod->prs = array_unique(array_merge($this->testCaseMethod->prs, $number));
-
-        return $this;
-    }
-
-    /**
-     * Adds a note to the test.
-     *
-     * @param  array<int, string>|string  $note
-     */
-    public function note(array|string $note): self
-    {
-        $notes = is_array($note) ? $note : [$note];
-
-        $this->testCaseMethod->notes = array_unique(array_merge($this->testCaseMethod->notes, $notes));
-
         return $this;
     }
 
     /**
      * Sets the covered classes or methods.
-     *
-     * @param  array<int, string>|string  $classesOrFunctions
      */
-    public function covers(array|string ...$classesOrFunctions): self
+    public function covers(string ...$classesOrFunctions): self
     {
-        /** @var array<int, string> $classesOrFunctions */
-        $classesOrFunctions = array_reduce($classesOrFunctions, fn ($carry, $item): array => is_array($item) ? array_merge($carry, $item) : array_merge($carry, [$item]), []); // @pest-ignore-type
-
         foreach ($classesOrFunctions as $classOrFunction) {
-            $isClass = class_exists($classOrFunction) || interface_exists($classOrFunction) || enum_exists($classOrFunction);
+            $isClass = class_exists($classOrFunction) || trait_exists($classOrFunction);
-            $isTrait = trait_exists($classOrFunction);
+            $isMethod = function_exists($classOrFunction);
-            $isFunction = function_exists($classOrFunction);
 
-            if (! $isClass && ! $isTrait && ! $isFunction) {
+            if (! $isClass && ! $isMethod) {
-                throw new InvalidArgumentException(sprintf('No class, trait or method named "%s" has been found.', $classOrFunction));
+                throw new InvalidArgumentException(sprintf('No class or method named "%s" has been found.', $classOrFunction));
             }
 
             if ($isClass) {
                 $this->coversClass($classOrFunction);
-            } elseif ($isTrait) {
-                $this->coversTrait($classOrFunction);
             } else {
                 $this->coversFunction($classOrFunction);
             }
@@ -547,41 +346,7 @@ final class TestCall
     public function coversClass(string ...$classes): self
     {
         foreach ($classes as $class) {
-            $this->testCaseFactoryAttributes[] = new Attribute(
+            $this->testCaseMethod->covers[] = new CoversClass($class);
-                \PHPUnit\Framework\Attributes\CoversClass::class,
-                [$class],
-            );
-        }
-
-        /** @var ConfigurationRepository $configurationRepository */
-        $configurationRepository = Container::getInstance()->get(ConfigurationRepository::class);
-        $paths = $configurationRepository->cliConfiguration->toArray()['paths'] ?? false;
-
-        if (! is_array($paths)) {
-            $configurationRepository->globalConfiguration('default')->class(...$classes); // @phpstan-ignore-line
-        }
-
-        return $this;
-    }
-
-    /**
-     * Sets the covered classes.
-     */
-    public function coversTrait(string ...$traits): self
-    {
-        foreach ($traits as $trait) {
-            $this->testCaseFactoryAttributes[] = new Attribute(
-                \PHPUnit\Framework\Attributes\CoversTrait::class,
-                [$trait],
-            );
-        }
-
-        /** @var ConfigurationRepository $configurationRepository */
-        $configurationRepository = Container::getInstance()->get(ConfigurationRepository::class);
-        $paths = $configurationRepository->cliConfiguration->toArray()['paths'] ?? false;
-
-        if (! is_array($paths)) {
-            $configurationRepository->globalConfiguration('default')->class(...$traits); // @phpstan-ignore-line
         }
 
         return $this;
@@ -593,10 +358,7 @@ final class TestCall
     public function coversFunction(string ...$functions): self
     {
         foreach ($functions as $function) {
-            $this->testCaseFactoryAttributes[] = new Attribute(
+            $this->testCaseMethod->covers[] = new CoversFunction($function);
-                \PHPUnit\Framework\Attributes\CoversFunction::class,
-                [$function],
-            );
         }
 
         return $this;
@@ -607,10 +369,7 @@ final class TestCall
      */
     public function coversNothing(): self
     {
-        $this->testCaseMethod->attributes[] = new Attribute(
+        $this->testCaseMethod->covers = [new CoversNothing];
-            \PHPUnit\Framework\Attributes\CoversNothing::class,
-            [],
-        );
 
         return $this;
     }
@@ -661,11 +420,10 @@ final class TestCall
         if ($this->descriptionLess) {
             Exporter::default();
 
-            if ($this->description !== null) {
+            if ($this->testCaseMethod->description !== null) {
-                $this->description .= ' → ';
+                $this->testCaseMethod->description .= ' → ';
             }
-
+            $this->testCaseMethod->description .= $arguments === null
-            $this->description .= $arguments === null
                 ? $name
                 : sprintf('%s %s', $name, $exporter->shortenedRecursiveExport($arguments));
         }
@@ -678,21 +436,11 @@ final class TestCall
      */
     public function __destruct()
     {
-        if ($this->description === null) {
-            throw new TestDescriptionMissing($this->filename);
-        }
-
         if (! is_null($this->describing)) {
             $this->testCaseMethod->describing = $this->describing;
-            $this->testCaseMethod->description = Str::describe($this->describing, $this->description);
+            $this->testCaseMethod->description = Str::describe($this->describing, $this->testCaseMethod->description); // @phpstan-ignore-line
-        } else {
-            $this->testCaseMethod->description = $this->description;
         }
 
         $this->testSuite->tests->set($this->testCaseMethod);
-
-        if (! is_null($testCase = $this->testSuite->tests->get($this->filename))) {
-            $testCase->attributes = array_merge($testCase->attributes, $this->testCaseFactoryAttributes);
-        }
     }
 }

src/PendingCalls/UsesCall.php

@@ -48,14 +48,11 @@ final class UsesCall
      */
     public function __construct(
         private readonly string $filename,
-        private array $classAndTraits
+        private readonly array $classAndTraits
     ) {
         $this->targets = [$filename];
     }
 
-    /**
-     * @deprecated Use `pest()->printer()->compact()` instead.
-     */
     public function compact(): self
     {
         DefaultPrinter::compact(true);
@@ -64,29 +61,10 @@ final class UsesCall
     }
 
     /**
-     * Specifies the class or traits to use.
+     * The directories or file where the
-     *
+     * class or traits should be used.
-     * @alias extend
      */
-    public function use(string ...$classAndTraits): self
+    public function in(string ...$targets): void
-    {
-        return $this->extend(...$classAndTraits);
-    }
-
-    /**
-     * Specifies the class or traits to use.
-     */
-    public function extend(string ...$classAndTraits): self
-    {
-        $this->classAndTraits = array_merge($this->classAndTraits, array_values($classAndTraits));
-
-        return $this;
-    }
-
-    /**
-     * The directories or file where the class or traits should be used.
-     */
-    public function in(string ...$targets): self
     {
         $targets = array_map(function (string $path): string {
             $startChar = DIRECTORY_SEPARATOR;
@@ -100,7 +78,7 @@ final class UsesCall
             return str_starts_with($path, $startChar)
                 ? $path
                 : implode(DIRECTORY_SEPARATOR, [
-                    is_dir($this->filename) ? $this->filename : dirname($this->filename),
+                    dirname($this->filename),
                     $path,
                 ]);
         }, $targets);
@@ -114,8 +92,6 @@ final class UsesCall
 
             return $accumulator;
         }, []);
-
-        return $this;
     }
 
     /**

src/Pest.php

@@ -6,7 +6,7 @@ namespace Pest;
 
 function version(): string
 {
-    return '3.2.1';
+    return '2.36.1';
 }
 
 function testDirectory(string $file = ''): string

src/Plugins/Concerns/HandleArguments.php

@@ -21,7 +21,7 @@ trait HandleArguments
                 return true;
             }
 
-            if (str_starts_with((string) $arg, "$argument=")) { // @phpstan-ignore-line
+            if (str_starts_with($arg, "$argument=")) {
                 return true;
             }
         }

src/Plugins/Configuration.php

@@ -1,96 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\Plugins;
-
-use DOMDocument;
-use Pest\Contracts\Plugins\HandlesArguments;
-use Pest\Contracts\Plugins\Terminable;
-use Pest\Plugins\Concerns\HandleArguments;
-use PHPUnit\TextUI\CliArguments\Builder as CliConfigurationBuilder;
-use PHPUnit\TextUI\CliArguments\XmlConfigurationFileFinder;
-
-/**
- * @internal
- */
-final class Configuration implements HandlesArguments, Terminable
-{
-    use HandleArguments;
-
-    /**
-     * The base PHPUnit file.
-     */
-    public const BASE_PHPUNIT_FILE = __DIR__
-        .DIRECTORY_SEPARATOR
-        .'..'
-        .DIRECTORY_SEPARATOR
-        .'..'
-        .DIRECTORY_SEPARATOR
-        .'resources/base-phpunit.xml';
-
-    /**
-     * Handles the arguments, adding the cache directory and the cache result arguments.
-     */
-    public function handleArguments(array $arguments): array
-    {
-        if ($this->hasArgument('--configuration', $arguments) || $this->hasCustomConfigurationFile()) {
-            return $arguments;
-        }
-
-        $arguments = $this->pushArgument('--configuration', $arguments);
-
-        return $this->pushArgument((string) realpath($this->fromGeneratedConfigurationFile()), $arguments);
-    }
-
-    /**
-     * Get the configuration file from the generated configuration file.
-     */
-    private function fromGeneratedConfigurationFile(): string
-    {
-        $path = $this->getTempPhpunitXmlPath();
-        if (file_exists($path)) {
-            unlink($path);
-        }
-
-        $doc = new DOMDocument;
-        $doc->load(self::BASE_PHPUNIT_FILE);
-
-        $contents = $doc->saveXML();
-
-        assert(is_int(file_put_contents($path, $contents)));
-
-        return $path;
-    }
-
-    /**
-     * Check if the configuration file is custom.
-     */
-    private function hasCustomConfigurationFile(): bool
-    {
-        $cliConfiguration = (new CliConfigurationBuilder)->fromParameters([]);
-        $configurationFile = (new XmlConfigurationFileFinder)->find($cliConfiguration);
-
-        return is_string($configurationFile);
-    }
-
-    /**
-     * Get the temporary phpunit.xml path.
-     */
-    private function getTempPhpunitXmlPath(): string
-    {
-        return getcwd().'/.pest.xml';
-    }
-
-    /**
-     * Terminates the plugin.
-     */
-    public function terminate(): void
-    {
-        $path = $this->getTempPhpunitXmlPath();
-
-        if (file_exists($path)) {
-            unlink($path);
-        }
-    }
-}

src/Plugins/Coverage.php

@@ -114,10 +114,6 @@ final class Coverage implements AddsOutput, HandlesArguments
      */
     public function addOutput(int $exitCode): int
     {
-        if (Parallel::isWorker()) {
-            return $exitCode;
-        }
-
         if ($exitCode === 0 && $this->coverage) {
             if (! \Pest\Support\Coverage::isAvailable()) {
                 $this->output->writeln(
@@ -134,7 +130,7 @@ final class Coverage implements AddsOutput, HandlesArguments
                 $this->output->writeln(sprintf(
                     "\n  <fg=white;bg=red;options=bold> FAIL </> Code coverage below expected <fg=white;options=bold> %s %%</>, currently <fg=red;options=bold> %s %%</>.",
                     number_format($this->coverageMin, 1),
-                    number_format(floor($coverage * 10) / 10, 1)
+                    number_format($coverage, 1)
                 ));
             }
 

src/Plugins/Help.php

@@ -14,7 +14,7 @@ use function Pest\version;
 /**
  * @internal
  */
-final readonly class Help implements HandlesArguments
+final class Help implements HandlesArguments
 {
     use Concerns\HandleArguments;
 
@@ -22,7 +22,7 @@ final readonly class Help implements HandlesArguments
      * Creates a new Plugin instance.
      */
     public function __construct(
-        private OutputInterface $output
+        private readonly OutputInterface $output
     ) {
         // ..
     }
@@ -123,21 +123,6 @@ final readonly class Help implements HandlesArguments
         ], [
             'arg' => '--todos',
             'desc' => 'Output to standard output the list of todos',
-        ], [
-            'arg' => '--notes',
-            'desc' => 'Output to standard output tests with notes',
-        ], [
-        ], [
-            'arg' => '--issue',
-            'desc' => 'Output to standard output tests with the given issue number',
-        ], [
-        ], [
-            'arg' => '--pr',
-            'desc' => 'Output to standard output tests with the given pull request number',
-        ], [
-        ], [
-            'arg' => '--pull-request',
-            'desc' => 'Output to standard output tests with the given pull request number (alias for --pr)',
         ], [
             'arg' => '--retry',
             'desc' => 'Run non-passing tests first and stop execution upon first error or failure',
@@ -158,59 +143,6 @@ final readonly class Help implements HandlesArguments
             'desc' => 'Set the minimum required coverage percentage, and fail if not met',
         ], ...$content['Code Coverage']];
 
-        $content['Mutation Testing'] = [[
-            'arg' => '--mutate ',
-            'desc' => 'Runs mutation testing, to understand the quality of your tests',
-        ], [
-            'arg' => '--mutate --parallel',
-            'desc' => 'Runs mutation testing in parallel',
-        ], [
-            'arg' => '--mutate --min',
-            'desc' => 'Set the minimum required mutation score, and fail if not met',
-        ], [
-            'arg' => '--mutate --id',
-            'desc' => 'Run only the mutation with the given ID. But E.g. --id=ecb35ab30ffd3491. Note, you need to provide the same options as the original run',
-        ], [
-            'arg' => '--mutate --covered-only',
-            'desc' => 'Only generate mutations for classes that are covered by tests',
-        ], [
-            'arg' => '--mutate --bail',
-            'desc' => 'Stop mutation testing execution upon first untested or uncovered mutation',
-        ], [
-            'arg' => '--mutate --class',
-            'desc' => 'Generate mutations for the given class(es). E.g. --class=App\\\\Models',
-        ], [
-            'arg' => '--mutate --ignore',
-            'desc' => 'Ignore the given class(es) when generating mutations. E.g. --ignore=App\\\\Http\\\\Requests',
-        ], [
-            'arg' => '--mutate --clear-cache',
-            'desc' => 'Clear the mutation cache',
-        ], [
-            'arg' => '--mutate --no-cache',
-            'desc' => 'Clear the mutation cache',
-        ], [
-            'arg' => '--mutate --ignore-min-score-on-zero-mutations',
-            'desc' => 'Ignore the minimum score requirement when there are no mutations',
-        ], [
-            'arg' => '--mutate --covered-only',
-            'desc' => 'Only generate mutations for classes that are covered by tests',
-        ], [
-            'arg' => '--mutate --everything',
-            'desc' => 'Generate mutations for all classes, even if they are not covered by tests',
-        ], [
-            'arg' => '--mutate --profile',
-            'desc' => 'Output to standard output the top ten slowest mutations',
-        ], [
-            'arg' => '--mutate --retry',
-            'desc' => 'Run untested or uncovered mutations first and stop execution upon first error or failure',
-        ], [
-            'arg' => '--mutate --stop-on-uncovered',
-            'desc' => 'Stop mutation testing execution upon first untested mutation',
-        ], [
-            'arg' => '--mutate --stop-on-untested',
-            'desc' => 'Stop mutation testing execution upon first untested mutation',
-        ]];
-
         $content['Profiling'] = [
             [
                 'arg' => '--profile ',

src/Plugins/Init.php

@@ -15,7 +15,7 @@ use Symfony\Component\Console\Output\OutputInterface;
 /**
  * @internal
  */
-final readonly class Init implements HandlesArguments
+final class Init implements HandlesArguments
 {
     /**
      * The option the triggers the init job.
@@ -37,9 +37,9 @@ final readonly class Init implements HandlesArguments
      * Creates a new Plugin instance.
      */
     public function __construct(
-        private TestSuite $testSuite,
+        private readonly TestSuite $testSuite,
-        private InputInterface $input,
+        private readonly InputInterface $input,
-        private OutputInterface $output
+        private readonly OutputInterface $output
     ) {
         // ..
     }

src/Plugins/Only.php

@@ -28,10 +28,6 @@ final class Only implements Terminable
      */
     public function terminate(): void
     {
-        if (Parallel::isWorker()) {
-            return;
-        }
-
         $lockFile = self::TEMPORARY_FOLDER.DIRECTORY_SEPARATOR.'only.lock';
 
         if (file_exists($lockFile)) {
@@ -42,26 +38,18 @@ final class Only implements Terminable
     /**
      * Creates the lock file.
      */
-    public static function enable(TestCall $testCall, string $group = '__pest_only'): void
+    public static function enable(TestCall $testCall): void
     {
-        $testCall->group($group);
+        if (Environment::name() == Environment::CI) {
-
-        if (Environment::name() === Environment::CI || Parallel::isWorker()) {
             return;
         }
 
+        $testCall->group('__pest_only');
+
         $lockFile = self::TEMPORARY_FOLDER.DIRECTORY_SEPARATOR.'only.lock';
 
-        if (file_exists($lockFile) && $group === '__pest_only') {
-            file_put_contents($lockFile, $group);
-
-            return;
-        }
-
         if (! file_exists($lockFile)) {
             touch($lockFile);
-
-            file_put_contents($lockFile, $group);
         }
     }
 
@@ -74,18 +62,4 @@ final class Only implements Terminable
 
         return file_exists($lockFile);
     }
-
-    /**
-     * Returns the group name.
-     */
-    public static function group(): string
-    {
-        $lockFile = self::TEMPORARY_FOLDER.DIRECTORY_SEPARATOR.'only.lock';
-
-        if (! file_exists($lockFile)) {
-            return '__pest_only';
-        }
-
-        return file_get_contents($lockFile) ?: '__pest_only'; // @phpstan-ignore-line
-    }
 }

src/Plugins/Parallel.php

@@ -34,7 +34,7 @@ final class Parallel implements HandlesArguments
     /**
      * @var string[]
      */
-    private const UNSUPPORTED_ARGUMENTS = ['--todo', '--todos', '--retry', '--notes', '--issue', '--pr', '--pull-request'];
+    private const UNSUPPORTED_ARGUMENTS = ['--todo', '--todos', '--retry'];
 
     /**
      * Whether the given command line arguments indicate that the test suite should be run in parallel.
@@ -42,7 +42,6 @@ final class Parallel implements HandlesArguments
     public static function isEnabled(): bool
     {
         $argv = new ArgvInput;
-
         if ($argv->hasParameterOption('--parallel')) {
             return true;
         }

src/Plugins/Parallel/Handlers/Laravel.php

@@ -26,7 +26,7 @@ final class Laravel implements HandlesArguments
      */
     public function handleArguments(array $arguments): array
     {
-        return $this->whenUsingLaravel($arguments, function (array $arguments): array {
+        return self::whenUsingLaravel($arguments, function (array $arguments): array {
             $this->ensureRunnerIsResolvable();
 
             $arguments = $this->ensureEnvironmentVariables($arguments);
@@ -42,7 +42,7 @@ final class Laravel implements HandlesArguments
      * @param  CLosure(array<int, string>): array<int, string>  $closure
      * @return array<int, string>
      */
-    private function whenUsingLaravel(array $arguments, Closure $closure): array
+    private static function whenUsingLaravel(array $arguments, Closure $closure): array
     {
         $isLaravelApplication = InstalledVersions::isInstalled('laravel/framework', false);
         $isLaravelPackage = class_exists(\Orchestra\Testbench\TestCase::class);

src/Plugins/Parallel/Paratest/CleanConsoleOutput.php

@@ -11,7 +11,7 @@ final class CleanConsoleOutput extends ConsoleOutput
     /**
      * {@inheritdoc}
      */
-    protected function doWrite(string $message, bool $newline): void // @pest-arch-ignore-line
+    protected function doWrite(string $message, bool $newline): void
     {
         if ($this->isOpeningHeadline($message)) {
             return;

src/Plugins/Parallel/Paratest/WrapperRunner.php

@@ -46,27 +46,15 @@ use function usleep;
  */
 final class WrapperRunner implements RunnerInterface
 {
-    /**
-     * The time to sleep between cycles.
-     */
     private const CYCLE_SLEEP = 10000;
 
-    /**
-     * The result printer.
-     */
     private readonly ResultPrinter $printer;
 
-    /**
-     * The timer.
-     */
     private readonly Timer $timer;
 
     /** @var list<non-empty-string> */
     private array $pending = [];
 
-    /**
-     * The exit code.
-     */
     private int $exitcode = -1;
 
     /** @var array<positive-int,WrapperWorker> */
@@ -96,9 +84,6 @@ final class WrapperRunner implements RunnerInterface
     /** @var non-empty-string[] */
     private readonly array $parameters;
 
-    /**
-     * The code coverage filter registry.
-     */
     private CodeCoverageFilterRegistry $codeCoverageFilterRegistry;
 
     public function __construct(
@@ -122,9 +107,6 @@ final class WrapperRunner implements RunnerInterface
             $parameters = array_merge($parameters, $options->passthruPhp);
         }
 
-        /** @var array<int, non-empty-string> $parameters */
-        $parameters = $this->handleLaravelHerd($parameters);
-
         $parameters[] = $wrapper;
 
         $this->parameters = $parameters;
@@ -156,21 +138,6 @@ final class WrapperRunner implements RunnerInterface
         return $this->complete($result);
     }
 
-    /**
-     * Handles Laravel Herd's debug and coverage modes.
-     *
-     * @param  array<string>  $parameters
-     * @return array<string>
-     */
-    private function handleLaravelHerd(array $parameters): array
-    {
-        if (isset($_ENV['HERD_DEBUG_INI'])) {
-            return array_merge($parameters, ['-c', $_ENV['HERD_DEBUG_INI']]);
-        }
-
-        return $parameters;
-    }
-
     private function startWorkers(): void
     {
         for ($token = 1; $token <= $this->options->processes; $token++) {
@@ -423,7 +390,6 @@ final class WrapperRunner implements RunnerInterface
         }
 
         $testSuite = (new LogMerger)->merge($this->junitFiles);
-        assert($testSuite instanceof \ParaTest\JUnit\TestSuite);
         (new Writer)->write(
             $testSuite,
             $this->options->configuration->logfileJunit(),

src/Preset.php

@@ -1,156 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest;
-
-use Closure;
-use Pest\Arch\Support\Composer;
-use Pest\ArchPresets\AbstractPreset;
-use Pest\ArchPresets\Custom;
-use Pest\ArchPresets\Laravel;
-use Pest\ArchPresets\Php;
-use Pest\ArchPresets\Relaxed;
-use Pest\ArchPresets\Security;
-use Pest\ArchPresets\Strict;
-use Pest\Exceptions\InvalidArgumentException;
-use Pest\PendingCalls\TestCall;
-use stdClass;
-
-/**
- * @internal
- */
-final class Preset
-{
-    /**
-     * The application / package base namespaces.
-     *
-     * @var ?array<int, string>
-     */
-    private static ?array $baseNamespaces = null;
-
-    /**
-     * The custom presets.
-     *
-     * @var array<string, Closure>
-     */
-    private static array $customPresets = [];
-
-    /**
-     * Creates a new preset instance.
-     */
-    public function __construct()
-    {
-        //
-    }
-
-    /**
-     * Uses the Pest php preset and returns the test call instance.
-     */
-    public function php(): Php
-    {
-        return $this->executePreset(new Php($this->baseNamespaces()));
-    }
-
-    /**
-     * Uses the Pest laravel preset and returns the test call instance.
-     */
-    public function laravel(): Laravel
-    {
-        return $this->executePreset(new Laravel($this->baseNamespaces()));
-    }
-
-    /**
-     * Uses the Pest strict preset and returns the test call instance.
-     */
-    public function strict(): Strict
-    {
-        return $this->executePreset(new Strict($this->baseNamespaces()));
-    }
-
-    /**
-     * Uses the Pest security preset and returns the test call instance.
-     */
-    public function security(): AbstractPreset
-    {
-        return $this->executePreset(new Security($this->baseNamespaces()));
-    }
-
-    /**
-     * Uses the Pest relaxed preset and returns the test call instance.
-     */
-    public function relaxed(): AbstractPreset
-    {
-        return $this->executePreset(new Relaxed($this->baseNamespaces()));
-    }
-
-    /**
-     * Uses the Pest custom preset and returns the test call instance.
-     *
-     * @internal
-     */
-    public static function custom(string $name, Closure $execute): void
-    {
-        if (preg_match('/^[a-zA-Z]+$/', $name) === false) {
-            throw new InvalidArgumentException('The preset name must only contain words from a-z or A-Z.');
-        }
-
-        self::$customPresets[$name] = $execute;
-    }
-
-    /**
-     * Dynamically handle calls to the class.
-     *
-     * @param  array<int, mixed>  $arguments
-     *
-     * @throws InvalidArgumentException
-     */
-    public function __call(string $name, array $arguments): AbstractPreset
-    {
-        if (! array_key_exists($name, self::$customPresets)) {
-            $availablePresets = [
-                ...['php', 'laravel', 'strict', 'security', 'relaxed'],
-                ...array_keys(self::$customPresets),
-            ];
-
-            throw new InvalidArgumentException(sprintf('The preset [%s] does not exist. The available presets are [%s].', $name, implode(', ', $availablePresets)));
-        }
-
-        return $this->executePreset(new Custom($this->baseNamespaces(), $name, self::$customPresets[$name]));
-    }
-
-    /**
-     * Executes the given preset.
-     *
-     * @template TPreset of AbstractPreset
-     *
-     * @param  TPreset  $preset
-     * @return TPreset
-     */
-    private function executePreset(AbstractPreset $preset): AbstractPreset
-    {
-        $this->baseNamespaces();
-
-        $preset->execute();
-
-        // $this->testCall->testCaseMethod->closure = (function () use ($preset): void {
-        //    $preset->flush();
-        // })->bindTo(new stdClass);
-
-        return $preset;
-    }
-
-    /**
-     * Get the base namespaces for the application / package.
-     *
-     * @return array<int, string>
-     */
-    private function baseNamespaces(): array
-    {
-        if (self::$baseNamespaces === null) {
-            self::$baseNamespaces = Composer::userNamespaces();
-        }
-
-        return self::$baseNamespaces;
-    }
-}

src/Repositories/TestRepository.php

@@ -9,11 +9,9 @@ use Pest\Contracts\TestCaseFilter;
 use Pest\Contracts\TestCaseMethodFilter;
 use Pest\Exceptions\TestCaseAlreadyInUse;
 use Pest\Exceptions\TestCaseClassOrTraitNotFound;
-use Pest\Factories\Attribute;
 use Pest\Factories\TestCaseFactory;
 use Pest\Factories\TestCaseMethodFactory;
 use Pest\Support\Str;
-use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -116,9 +114,9 @@ final class TestRepository
     /**
      * Gets the test case factory from the given filename.
      */
-    public function get(string $filename): ?TestCaseFactory
+    public function get(string $filename): TestCaseFactory
     {
-        return $this->testCases[$filename] ?? null;
+        return $this->testCases[$filename];
     }
 
     /**
@@ -188,10 +186,7 @@ final class TestRepository
 
                 foreach ($testCase->methods as $method) {
                     foreach ($groups as $group) {
-                        $method->attributes[] = new Attribute(
+                        $method->groups[] = $group;
-                            Group::class,
-                            [$group],
-                        );
                     }
                 }
 

src/Result.php

@@ -40,7 +40,7 @@ final class Result
      */
     public static function exitCode(Configuration $configuration, TestResult $result): int
     {
-        if ($result->wasSuccessfulIgnoringPhpunitWarnings()) {
+        if ($result->wasSuccessful()) {
             if ($configuration->failOnWarning()) {
                 $warnings = $result->numberOfTestsWithTestTriggeredPhpunitWarningEvents()
                     + count($result->warnings())
@@ -60,7 +60,7 @@ final class Result
             return self::FAILURE_EXIT;
         }
 
-        if ($result->wasSuccessfulIgnoringPhpunitWarnings()) {
+        if ($result->wasSuccessful()) {
             if ($configuration->failOnRisky() && $result->hasTestConsideredRiskyEvents()) {
                 $returnCode = self::FAILURE_EXIT;
             }

src/Subscribers/EnsureTeamCityEnabled.php

@@ -15,15 +15,15 @@ use Symfony\Component\Console\Output\OutputInterface;
 /**
  * @internal
  */
-final readonly class EnsureTeamCityEnabled implements ConfiguredSubscriber
+final class EnsureTeamCityEnabled implements ConfiguredSubscriber
 {
     /**
      * Creates a new Configured Subscriber instance.
      */
     public function __construct(
-        private InputInterface $input,
+        private readonly InputInterface $input,
-        private OutputInterface $output,
+        private readonly OutputInterface $output,
-        private TestSuite $testSuite,
+        private readonly TestSuite $testSuite,
     ) {}
 
     /**

src/Support/ChainableClosure.php

@@ -17,13 +17,13 @@ final class ChainableClosure
      */
     public static function boundWhen(Closure $condition, Closure $next): Closure
     {
-        return function (...$arguments) use ($condition, $next): void {
+        return function () use ($condition, $next): void {
             if (! is_object($this)) { // @phpstan-ignore-line
                 throw ShouldNotHappen::fromMessage('$this not bound to chainable closure.');
             }
 
-            if (\Pest\Support\Closure::bind($condition, $this, self::class)(...$arguments)) {
+            if (\Pest\Support\Closure::bind($condition, $this, self::class)(...func_get_args())) {
-                \Pest\Support\Closure::bind($next, $this, self::class)(...$arguments);
+                \Pest\Support\Closure::bind($next, $this, self::class)(...func_get_args());
             }
         };
     }
@@ -33,13 +33,13 @@ final class ChainableClosure
      */
     public static function bound(Closure $closure, Closure $next): Closure
     {
-        return function (...$arguments) use ($closure, $next): void {
+        return function () use ($closure, $next): void {
             if (! is_object($this)) { // @phpstan-ignore-line
                 throw ShouldNotHappen::fromMessage('$this not bound to chainable closure.');
             }
 
-            \Pest\Support\Closure::bind($closure, $this, self::class)(...$arguments);
+            \Pest\Support\Closure::bind($closure, $this, self::class)(...func_get_args());
-            \Pest\Support\Closure::bind($next, $this, self::class)(...$arguments);
+            \Pest\Support\Closure::bind($next, $this, self::class)(...func_get_args());
         };
     }
 
@@ -48,9 +48,9 @@ final class ChainableClosure
      */
     public static function unbound(Closure $closure, Closure $next): Closure
     {
-        return function (...$arguments) use ($closure, $next): void {
+        return function () use ($closure, $next): void {
-            $closure(...$arguments);
+            $closure(...func_get_args());
-            $next(...$arguments);
+            $next(...func_get_args());
         };
     }
 
@@ -59,9 +59,9 @@ final class ChainableClosure
      */
     public static function boundStatically(Closure $closure, Closure $next): Closure
     {
-        return static function (...$arguments) use ($closure, $next): void {
+        return static function () use ($closure, $next): void {
-            \Pest\Support\Closure::bind($closure, null, self::class)(...$arguments);
+            \Pest\Support\Closure::bind($closure, null, self::class)(...func_get_args());
-            \Pest\Support\Closure::bind($next, null, self::class)(...$arguments);
+            \Pest\Support\Closure::bind($next, null, self::class)(...func_get_args());
         };
     }
 }

src/Support/Closure.php

@@ -20,13 +20,13 @@ final class Closure
      */
     public static function bind(?BaseClosure $closure, ?object $newThis, object|string|null $newScope = 'static'): BaseClosure
     {
-        if (! $closure instanceof \Closure) {
+        if ($closure == null) {
             throw ShouldNotHappen::fromMessage('Could not bind null closure.');
         }
 
         $closure = BaseClosure::bind($closure, $newThis, $newScope);
 
-        if (! $closure instanceof \Closure) {
+        if ($closure == false) {
             throw ShouldNotHappen::fromMessage('Could not bind closure.');
         }
 

src/Support/Container.php

@@ -13,9 +13,6 @@ use ReflectionParameter;
  */
 final class Container
 {
-    /**
-     * The instance of the container.
-     */
     private static ?Container $instance = null;
 
     /**

src/Support/Coverage.php

@@ -138,7 +138,7 @@ final class Coverage
 
         $totalCoverageAsString = $totalCoverage->asFloat() === 0.0
             ? '0.0'
-            : number_format(floor($totalCoverage->asFloat() * 10) / 10, 1, '.', '');
+            : number_format($totalCoverage->asFloat(), 1, '.', '');
 
         renderUsing($output);
         render(<<<HTML
@@ -197,7 +197,7 @@ final class Coverage
         };
 
         $array = [];
-        foreach (array_filter($file->lineCoverageData(), is_array(...)) as $line => $tests) {
+        foreach (array_filter($file->lineCoverageData(), 'is_array') as $line => $tests) {
             $array = $eachLine($array, $tests, $line);
         }
 

src/Support/ExceptionTrace.php

@@ -31,7 +31,7 @@ final class ExceptionTrace
                 $message = str_replace(self::UNDEFINED_METHOD, 'Call to undefined method ', $message);
 
                 if (class_exists((string) $class) && (is_countable(class_parents($class)) ? count(class_parents($class)) : 0) > 0 && array_values(class_parents($class))[0] === TestCase::class) { // @phpstan-ignore-line
-                    $message .= '. Did you forget to use the [pest()->extend()] function? Read more at: https://pestphp.com/docs/configuring-tests';
+                    $message .= '. Did you forget to use the [uses()] function? Read more at: https://pestphp.com/docs/configuring-tests';
                 }
 
                 Reflection::setPropertyValue($throwable, 'message', $message);

src/Support/Exporter.php

@@ -10,7 +10,7 @@ use SebastianBergmann\RecursionContext\Context;
 /**
  * @internal
  */
-final readonly class Exporter
+final class Exporter
 {
     /**
      * The maximum number of items in an array to export.
@@ -21,7 +21,7 @@ final readonly class Exporter
      * Creates a new Exporter instance.
      */
     public function __construct(
-        private BaseExporter $exporter,
+        private readonly BaseExporter $exporter,
     ) {
         // ...
     }
@@ -64,6 +64,8 @@ final readonly class Exporter
                 continue;
             }
 
+            assert(is_array($data));
+
             $result[] = $context->contains($data[$key]) !== false
                 ? '*RECURSION*'
                 : sprintf('[%s]', $this->shortenedRecursiveExport($data[$key], $context));

src/Support/HigherOrderCallables.php

@@ -10,12 +10,12 @@ use Pest\Expectation;
 /**
  * @internal
  */
-final readonly class HigherOrderCallables
+final class HigherOrderCallables
 {
     /**
      * Creates a new Higher Order Callables instances.
      */
-    public function __construct(private object $target)
+    public function __construct(private readonly object $target)
     {
         // ..
     }
@@ -49,6 +49,16 @@ final readonly class HigherOrderCallables
         return $this->expect($value);
     }
 
+    /**
+     * Execute the given callable after the test has executed the setup method.
+     *
+     * @deprecated This method is deprecated. Please use `defer` instead.
+     */
+    public function tap(callable $callable): object
+    {
+        return $this->defer($callable);
+    }
+
     /**
      * Execute the given callable after the test has executed the setup method.
      */

src/Support/Reflection.php

@@ -11,7 +11,6 @@ use Pest\TestSuite;
 use ReflectionClass;
 use ReflectionException;
 use ReflectionFunction;
-use ReflectionMethod;
 use ReflectionNamedType;
 use ReflectionParameter;
 use ReflectionProperty;
@@ -214,74 +213,4 @@ final class Reflection
     {
         return (new ReflectionFunction($function))->getStaticVariables()[$key] ?? null;
     }
-
-    /**
-     * Get the properties from the given reflection class.
-     *
-     * Used by `expect()->toHavePropertiesDocumented()`.
-     *
-     * @param  ReflectionClass<object>  $reflectionClass
-     * @return array<int, ReflectionProperty>
-     */
-    public static function getPropertiesFromReflectionClass(ReflectionClass $reflectionClass): array
-    {
-        $getProperties = fn (ReflectionClass $reflectionClass): array => array_filter(
-            array_map(
-                fn (ReflectionProperty $property): \ReflectionProperty => $property,
-                $reflectionClass->getProperties(),
-            ), fn (ReflectionProperty $property): bool => $property->getDeclaringClass()->getName() === $reflectionClass->getName(),
-        );
-
-        $propertiesFromTraits = [];
-        foreach ($reflectionClass->getTraits() as $trait) {
-            $propertiesFromTraits = array_merge($propertiesFromTraits, $getProperties($trait));
-        }
-
-        $propertiesFromTraits = array_map(
-            fn (ReflectionProperty $property): string => $property->getName(),
-            $propertiesFromTraits,
-        );
-
-        return array_values(
-            array_filter(
-                $getProperties($reflectionClass),
-                fn (ReflectionProperty $property): bool => ! in_array($property->getName(), $propertiesFromTraits, true),
-            ),
-        );
-    }
-
-    /**
-     * Get the methods from the given reflection class.
-     *
-     * Used by `expect()->toHaveMethodsDocumented()`.
-     *
-     * @param  ReflectionClass<object>  $reflectionClass
-     * @return array<int, ReflectionMethod>
-     */
-    public static function getMethodsFromReflectionClass(ReflectionClass $reflectionClass, int $filter = ReflectionMethod::IS_PUBLIC | ReflectionMethod::IS_PROTECTED | ReflectionMethod::IS_PRIVATE): array
-    {
-        $getMethods = fn (ReflectionClass $reflectionClass): array => array_filter(
-            array_map(
-                fn (ReflectionMethod $method): \ReflectionMethod => $method,
-                $reflectionClass->getMethods($filter),
-            ), fn (ReflectionMethod $method): bool => $method->getDeclaringClass()->getName() === $reflectionClass->getName(),
-        );
-
-        $methodsFromTraits = [];
-        foreach ($reflectionClass->getTraits() as $trait) {
-            $methodsFromTraits = array_merge($methodsFromTraits, $getMethods($trait));
-        }
-
-        $methodsFromTraits = array_map(
-            fn (ReflectionMethod $method): string => $method->getName(),
-            $methodsFromTraits,
-        );
-
-        return array_values(
-            array_filter(
-                $getMethods($reflectionClass),
-                fn (ReflectionMethod $method): bool => ! in_array($method->getName(), $methodsFromTraits, true),
-            ),
-        );
-    }
 }

src/TestCaseFilters/GitDirtyTestCaseFilter.php

@@ -14,21 +14,15 @@ use Symfony\Component\Process\Process;
 final class GitDirtyTestCaseFilter implements TestCaseFilter
 {
     /**
-     * @var array<int, string>|null
+     * @var string[]|null
      */
     private ?array $changedFiles = null;
 
-    /**
-     * Creates a new instance of the filter.
-     */
     public function __construct(private readonly string $projectRoot)
     {
         // ...
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function accept(string $testCaseFilename): bool
     {
         if ($this->changedFiles === null) {
@@ -47,9 +41,6 @@ final class GitDirtyTestCaseFilter implements TestCaseFilter
         return in_array($relativePath, $this->changedFiles, true);
     }
 
-    /**
-     * Loads the changed files.
-     */
     private function loadChangedFiles(): void
     {
         $process = new Process(['git', 'status', '--short', '--', '*.php']);

src/TestCaseMethodFilters/AssigneeTestCaseFilter.php

@@ -1,27 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\TestCaseMethodFilters;
-
-use Pest\Contracts\TestCaseMethodFilter;
-use Pest\Factories\TestCaseMethodFactory;
-
-final readonly class AssigneeTestCaseFilter implements TestCaseMethodFilter
-{
-    /**
-     * Create a new filter instance.
-     */
-    public function __construct(private string $assignee)
-    {
-        //
-    }
-
-    /**
-     * Filter the test case methods.
-     */
-    public function accept(TestCaseMethodFactory $factory): bool
-    {
-        return array_filter($factory->assignees, fn (string $assignee): bool => str_starts_with($assignee, $this->assignee)) !== [];
-    }
-}

src/TestCaseMethodFilters/IssueTestCaseFilter.php

@@ -1,27 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\TestCaseMethodFilters;
-
-use Pest\Contracts\TestCaseMethodFilter;
-use Pest\Factories\TestCaseMethodFactory;
-
-final readonly class IssueTestCaseFilter implements TestCaseMethodFilter
-{
-    /**
-     * Create a new filter instance.
-     */
-    public function __construct(private int $number)
-    {
-        //
-    }
-
-    /**
-     * Filter the test case methods.
-     */
-    public function accept(TestCaseMethodFactory $factory): bool
-    {
-        return in_array($this->number, $factory->issues, true);
-    }
-}

src/TestCaseMethodFilters/NotesTestCaseFilter.php

@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\TestCaseMethodFilters;
-
-use Pest\Contracts\TestCaseMethodFilter;
-use Pest\Factories\TestCaseMethodFactory;
-
-final readonly class NotesTestCaseFilter implements TestCaseMethodFilter
-{
-    /**
-     * Filter the test case methods.
-     */
-    public function accept(TestCaseMethodFactory $factory): bool
-    {
-        return $factory->notes !== [];
-    }
-}

src/TestCaseMethodFilters/PrTestCaseFilter.php

@@ -1,27 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Pest\TestCaseMethodFilters;
-
-use Pest\Contracts\TestCaseMethodFilter;
-use Pest\Factories\TestCaseMethodFactory;
-
-final readonly class PrTestCaseFilter implements TestCaseMethodFilter
-{
-    /**
-     * Create a new filter instance.
-     */
-    public function __construct(private int $number)
-    {
-        //
-    }
-
-    /**
-     * Filter the test case methods.
-     */
-    public function accept(TestCaseMethodFactory $factory): bool
-    {
-        return in_array($this->number, $factory->prs, true);
-    }
-}