chore: requires latest versions of collision and termwind

[Bug] Always call parent teardown even if an exception is thrown

.github/workflows/tests.yml

@@ -14,7 +14,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
         symfony: ['6.4', '7.0']
-        php: ['8.1', '8.2', '8.3']
+        php: ['8.1', '8.2', '8.3', '8.4']
         dependency_version: [prefer-lowest, prefer-stable]
         exclude:
           - php: '8.1'

README.md

@@ -31,8 +31,10 @@ We cannot thank our sponsors enough for their incredible support in funding Pest
 
 - [Akaunting](https://akaunting.com/?ref=pestphp)
 - [Codecourse](https://codecourse.com/?ref=pestphp)
+- [DocuWriter.ai](https://www.docuwriter.ai/?ref=pestphp)
 - [Laracasts](https://laracasts.com/?ref=pestphp)
 - [Localazy](https://localazy.com/?ref=pestphp)
+- [Route4Me](https://www.route4me.com/?ref=pestphp)
 - [Zapiet](https://www.zapiet.com/?ref=pestphp)
 
 Pest is an open-sourced software licensed under the **[MIT license](https://opensource.org/licenses/MIT)**.

composer.json

@@ -19,14 +19,15 @@
     "require": {
         "php": "^8.1.0",
         "brianium/paratest": "^7.3.1",
-        "nunomaduro/collision": "^7.10.0|^8.3.0",
-        "nunomaduro/termwind": "^1.15.1|^2.0.1",
+        "nunomaduro/collision": "^7.11.0|^8.4.0",
+        "nunomaduro/termwind": "^1.16.0|^2.1.0",
         "pestphp/pest-plugin": "^2.1.1",
         "pestphp/pest-plugin-arch": "^2.7.0",
-        "phpunit/phpunit": "^10.5.17"
+        "phpunit/phpunit": "^10.5.36"
     },
     "conflict": {
-        "phpunit/phpunit": ">10.5.17",
+        "filp/whoops": "<2.16.0",
+        "phpunit/phpunit": ">10.5.36",
         "sebastian/exporter": "<5.1.0",
         "webmozart/assert": "<1.11.0"
     },
@@ -51,9 +52,9 @@
         ]
     },
     "require-dev": {
-        "pestphp/pest-dev-tools": "^2.16.0",
-        "pestphp/pest-plugin-type-coverage": "^2.8.5",
-        "symfony/process": "^6.4.0|^7.1.3"
+        "pestphp/pest-dev-tools": "^2.17.0",
+        "pestphp/pest-plugin-type-coverage": "^2.8.7",
+        "symfony/process": "^6.4.0|^7.1.5"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
@@ -73,7 +74,7 @@
         "test:refacto": "rector --dry-run",
         "test:lint": "pint --test",
         "test:type:check": "phpstan analyse --ansi --memory-limit=-1 --debug",
-        "test:type:coverage": "php bin/pest --type-coverage --min=100",
+        "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",

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.#"

src/Concerns/Testable.php

@@ -234,11 +234,13 @@ trait Testable
             $afterEach = ChainableClosure::bound($this->__afterEach, $afterEach);
         }
 
-        $this->__callClosure($afterEach, func_get_args());
+        try {
+            $this->__callClosure($afterEach, func_get_args());
+        } finally {
+            parent::tearDown();
 
-        parent::tearDown();
-
-        TestSuite::getInstance()->test = null;
+            TestSuite::getInstance()->test = null;
+        }
     }
 
     /**

src/Exceptions/TestClosureMustNotBeStatic.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Pest\Exceptions;
+
+use InvalidArgumentException;
+use NunoMaduro\Collision\Contracts\RenderlessEditor;
+use NunoMaduro\Collision\Contracts\RenderlessTrace;
+use Pest\Factories\TestCaseMethodFactory;
+use Symfony\Component\Console\Exception\ExceptionInterface;
+
+/**
+ * @internal
+ */
+final class TestClosureMustNotBeStatic extends InvalidArgumentException implements ExceptionInterface, RenderlessEditor, RenderlessTrace
+{
+    /**
+     * Creates a new Exception instance.
+     */
+    public function __construct(TestCaseMethodFactory $method)
+    {
+        parent::__construct(
+            sprintf(
+                'Test closure must not be static. Please remove the `static` keyword from the `%s` method in `%s`.',
+                $method->description,
+                $method->filename
+            )
+        );
+    }
+}

src/Expectation.php

@@ -441,7 +441,7 @@ final class Expectation
     {
         return Targeted::make(
             $this,
-            fn (ObjectDescription $object): bool => str_contains((string) file_get_contents($object->path), 'declare(strict_types=1);'),
+            fn (ObjectDescription $object): bool => (bool) preg_match('/^<\?php\s+declare\(.*?strict_types\s?=\s?1.*?\);/', (string) file_get_contents($object->path)),
             'to use strict types',
             FileLineFinder::where(fn (string $line): bool => str_contains($line, '<?php')),
         );

src/Expectations/OppositeExpectation.php

@@ -82,7 +82,7 @@ final class OppositeExpectation
     {
         return Targeted::make(
             $this->original,
-            fn (ObjectDescription $object): bool => ! str_contains((string) file_get_contents($object->path), 'declare(strict_types=1);'),
+            fn (ObjectDescription $object): bool => ! (bool) preg_match('/^<\?php\s+declare\(.*?strict_types\s?=\s?1.*?\);/', (string) file_get_contents($object->path)),
             'not to use strict types',
             FileLineFinder::where(fn (string $line): bool => str_contains($line, '<?php')),
         );

src/Factories/Attributes/Attribute.php

@@ -20,7 +20,7 @@ abstract class Attribute
      * @param  array<int, string>  $attributes
      * @return array<int, string>
      */
-    public function __invoke(TestCaseMethodFactory $method, array $attributes): array  // @phpstan-ignore-line
+    public function __invoke(TestCaseMethodFactory $method, array $attributes): array
     {
         return $attributes;
     }

src/Factories/TestCaseFactory.php

@@ -11,6 +11,7 @@ use Pest\Contracts\HasPrintableTestCaseName;
 use Pest\Exceptions\DatasetMissing;
 use Pest\Exceptions\ShouldNotHappen;
 use Pest\Exceptions\TestAlreadyExist;
+use Pest\Exceptions\TestClosureMustNotBeStatic;
 use Pest\Exceptions\TestDescriptionMissing;
 use Pest\Factories\Concerns\HigherOrderable;
 use Pest\Support\Reflection;
@@ -193,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",
@@ -216,6 +217,14 @@ final class TestCaseFactory
             throw new TestAlreadyExist($method->filename, $method->description);
         }
 
+        if (
+            $method->closure instanceof \Closure &&
+            (new \ReflectionFunction($method->closure))->isStatic()
+        ) {
+
+            throw new TestClosureMustNotBeStatic($method);
+        }
+
         if (! $method->receivesArguments()) {
             if (! $method->closure instanceof \Closure) {
                 throw ShouldNotHappen::fromMessage('The test closure may not be empty.');

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/Pest.php

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

src/Result.php

@@ -40,9 +40,20 @@ final class Result
      */
     public static function exitCode(Configuration $configuration, TestResult $result): int
     {
-        if ($result->wasSuccessfulIgnoringPhpunitWarnings()
-            && ! $result->hasTestTriggeredPhpunitWarningEvents()) {
-            return self::SUCCESS_EXIT;
+        if ($result->wasSuccessfulIgnoringPhpunitWarnings()) {
+            if ($configuration->failOnWarning()) {
+                $warnings = $result->numberOfTestsWithTestTriggeredPhpunitWarningEvents()
+                    + count($result->warnings())
+                    + count($result->phpWarnings());
+
+                if ($warnings > 0) {
+                    return self::FAILURE_EXIT;
+                }
+            }
+
+            if (! $result->hasTestTriggeredPhpunitWarningEvents()) {
+                return self::SUCCESS_EXIT;
+            }
         }
 
         if ($configuration->failOnEmptyTestSuite() && ResultReflection::numberOfTests($result) === 0) {
@@ -54,14 +65,6 @@ final class Result
                 $returnCode = self::FAILURE_EXIT;
             }
 
-            $warnings = $result->numberOfTestsWithTestTriggeredPhpunitWarningEvents()
-                + count($result->warnings())
-                + count($result->phpWarnings());
-
-            if ($configuration->failOnWarning() && $warnings > 0) {
-                $returnCode = self::FAILURE_EXIT;
-            }
-
             if ($configuration->failOnIncomplete() && $result->hasTestMarkedIncompleteEvents()) {
                 $returnCode = self::FAILURE_EXIT;
             }

tests/.pest/snapshots/Visual/Help/visual_snapshot_of_help_command_output.snap

@@ -1,5 +1,5 @@
 
-  Pest Testing Framework 2.35.0.  
+  Pest Testing Framework 2.36.0.  
 
   USAGE: pest <file> [options]  
 
@@ -59,6 +59,7 @@
   --fail-on-warning  Signal failure using shell exit code when a warning was triggered  
   --fail-on-risky  Signal failure using shell exit code when a test was considered risky  
   --fail-on-deprecation  Signal failure using shell exit code when a deprecation was triggered  
+  --fail-on-phpunit-deprecation  Signal failure using shell exit code when a PHPUnit deprecation was triggered  
   --fail-on-notice  Signal failure using shell exit code when a notice was triggered  
   --fail-on-skipped  Signal failure using shell exit code when a test was skipped  
   --fail-on-incomplete  Signal failure using shell exit code when a test was marked incomplete  
@@ -78,6 +79,7 @@
   --display-incomplete .................. Display details for incomplete tests  
   --display-skipped ........................ Display details for skipped tests  
   --display-deprecations . Display details for deprecations triggered by tests  
+  --display-phpunit-deprecations .... Display details for PHPUnit deprecations  
   --display-errors ............. Display details for errors triggered by tests  
   --display-notices ........... Display details for notices triggered by tests  
   --display-warnings ......... Display details for warnings triggered by tests  
@@ -105,6 +107,8 @@
   --coverage-html [dir]  Write code coverage report in HTML format to directory  
   --coverage-php [file] .......... Write serialized code coverage data to file  
   --coverage-text=[file]  Write code coverage report in text format to file [default: standard output]  
+  --only-summary-for-coverage-text  Option for code coverage report in text format: only show summary  
+  --show-uncovered-for-coverage-text  Option for code coverage report in text format: show uncovered files  
   --coverage-xml [dir] . Write code coverage report in XML format to directory  
   --warm-coverage-cache ........................... Warm static analysis cache  
   --coverage-filter [dir] ........... Include [dir] in code coverage reporting  

tests/.pest/snapshots/Visual/Version/visual_snapshot_of_help_command_output.snap

@@ -1,3 +1,3 @@
 
-  Pest Testing Framework 2.35.0.  
+  Pest Testing Framework 2.36.0.  
 

tests/.snapshots/success.txt

@@ -1173,16 +1173,6 @@
    PASS  Tests\Hooks\BeforeEachTest
   ✓ global beforeEach execution order
 
-   PASS  Tests\Overrides\VersionsTest
-  ✓ versions with dataset "Runner/Filter/NameFilterIterator.php"
-  ✓ versions with dataset "Runner/ResultCache/DefaultResultCache.php"
-  ✓ versions with dataset "Runner/TestSuiteLoader.php"
-  ✓ versions with dataset "TextUI/Command/Commands/WarmCodeCoverageCacheCommand.php"
-  ✓ versions with dataset "TextUI/Output/Default/ProgressPrinter/Subscriber/TestSkippedSubscriber.php"
-  ✓ versions with dataset "TextUI/TestSuiteFilterProcessor.php"
-  ✓ versions with dataset "Event/Value/ThrowableBuilder.php"
-  ✓ versions with dataset "Logging/JUnit/JunitXmlLogger.php"
-
    PASS  Tests\PHPUnit\CustomAffixes\InvalidTestName
   ✓ it runs file names like @#$%^&()-_=+.php
 
@@ -1287,26 +1277,6 @@
   ✓ it can resolve builtin value types
   ✓ it cannot resolve a parameter without type
 
-   PASS  Tests\Unit\Support\DatasetInfo
-  ✓ it can check if dataset is defined inside a Datasets directory with ('/var/www/project/tests/Datase…rs.php', true)
-  ✓ it can check if dataset is defined inside a Datasets directory with ('/var/www/project/tests/Datasets.php', false)
-  ✓ it can check if dataset is defined inside a Datasets directory with ('/var/www/project/tests/Featur…rs.php', true)
-  ✓ it can check if dataset is defined inside a Datasets directory with ('/var/www/project/tests/Featur…rs.php', false)
-  ✓ it can check if dataset is defined inside a Datasets directory with ('/var/www/project/tests/Featur…ts.php', false)
-  ✓ it can check if dataset is defined inside a Datasets.php file with ('/var/www/project/tests/Datase…rs.php', false)
-  ✓ it can check if dataset is defined inside a Datasets.php file with ('/var/www/project/tests/Datasets.php', true)
-  ✓ it can check if dataset is defined inside a Datasets.php file with ('/var/www/project/tests/Featur…rs.php', false) #1
-  ✓ it can check if dataset is defined inside a Datasets.php file with ('/var/www/project/tests/Featur…rs.php', false) #2
-  ✓ it can check if dataset is defined inside a Datasets.php file with ('/var/www/project/tests/Featur…ts.php', true)
-  ✓ it computes the dataset scope with ('/var/www/project/tests/Datase…rs.php', '/var/www/project/tests')
-  ✓ it computes the dataset scope with ('/var/www/project/tests/Datasets.php', '/var/www/project/tests')
-  ✓ it computes the dataset scope with ('/var/www/project/tests/Featur…rs.php', '/var/www/project/tests/Features')
-  ✓ it computes the dataset scope with ('/var/www/project/tests/Featur…rs.php', '/var/www/project/tests/Featur…rs.php') #1
-  ✓ it computes the dataset scope with ('/var/www/project/tests/Featur…ts.php', '/var/www/project/tests/Features')
-  ✓ it computes the dataset scope with ('/var/www/project/tests/Featur…rs.php', '/var/www/project/tests/Featur…ollers')
-  ✓ it computes the dataset scope with ('/var/www/project/tests/Featur…rs.php', '/var/www/project/tests/Featur…rs.php') #2
-  ✓ it computes the dataset scope with ('/var/www/project/tests/Featur…ts.php', '/var/www/project/tests/Featur…ollers')
-
    PASS  Tests\Unit\Support\ExceptionTrace
   ✓ it ensures the given closures reports the correct class name
   ✓ it ensures the given closures reports the correct class name and suggests the [uses()] function
@@ -1381,6 +1351,7 @@
 
    PASS  Tests\Unit\TestSuite
   ✓ it does not allow to add the same test description twice
+  ✓ it does not allow static closures
   ✓ it alerts users about tests with arguments but no input
   ✓ it can return an array of all test suite filenames
 
@@ -1424,4 +1395,4 @@
    WARN  Tests\Visual\Version
   - visual snapshot of help command output
 
-  Tests:    2 deprecated, 4 warnings, 5 incomplete, 2 notices, 13 todos, 20 skipped, 1013 passed (2405 assertions)
+  Tests:    2 deprecated, 4 warnings, 5 incomplete, 2 notices, 13 todos, 20 skipped, 988 passed (2381 assertions)

tests/Overrides/VersionsTest.php

@@ -1,18 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Pest\Bootstrappers\BootOverrides;
-
-test('versions', function (string $vendorPath, string $expectedHash) {
-    expect(hash_file('sha256', $vendorPath))->toBe($expectedHash);
-})->with(function () {
-    foreach (BootOverrides::FILES as $hash => $file) {
-        $path = implode(DIRECTORY_SEPARATOR, [
-            dirname(__DIR__, 2),
-            'vendor/phpunit/phpunit/src',
-            $file,
-        ]);
-        yield $file => [$path, $hash];
-    }
-});

tests/Unit/Support/DatasetInfo.php

@@ -1,36 +0,0 @@
-<?php
-
-use Pest\Support\DatasetInfo;
-
-it('can check if dataset is defined inside a Datasets directory', function (string $file, bool $inside) {
-    expect(DatasetInfo::isInsideADatasetsDirectory($file))->toBe($inside);
-})->with([
-    ['file' => '/var/www/project/tests/Datasets/Numbers.php', 'inside' => true],
-    ['file' => '/var/www/project/tests/Datasets.php', 'inside' => false],
-    ['file' => '/var/www/project/tests/Features/Datasets/Numbers.php', 'inside' => true],
-    ['file' => '/var/www/project/tests/Features/Numbers.php', 'inside' => false],
-    ['file' => '/var/www/project/tests/Features/Datasets.php', 'inside' => false],
-]);
-
-it('can check if dataset is defined inside a Datasets.php file', function (string $path, bool $inside) {
-    expect(DatasetInfo::isADatasetsFile($path))->toBe($inside);
-})->with([
-    ['file' => '/var/www/project/tests/Datasets/Numbers.php', 'inside' => false],
-    ['file' => '/var/www/project/tests/Datasets.php', 'inside' => true],
-    ['file' => '/var/www/project/tests/Features/Datasets/Numbers.php', 'inside' => false],
-    ['file' => '/var/www/project/tests/Features/Numbers.php', 'inside' => false],
-    ['file' => '/var/www/project/tests/Features/Datasets.php', 'inside' => true],
-]);
-
-it('computes the dataset scope', function (string $file, string $scope) {
-    expect(DatasetInfo::scope($file))->toBe($scope);
-})->with([
-    ['file' => '/var/www/project/tests/Datasets/Numbers.php', 'scope' => '/var/www/project/tests'],
-    ['file' => '/var/www/project/tests/Datasets.php', 'scope' => '/var/www/project/tests'],
-    ['file' => '/var/www/project/tests/Features/Datasets/Numbers.php', 'scope' => '/var/www/project/tests/Features'],
-    ['file' => '/var/www/project/tests/Features/Numbers.php', 'scope' => '/var/www/project/tests/Features/Numbers.php'],
-    ['file' => '/var/www/project/tests/Features/Datasets.php', 'scope' => '/var/www/project/tests/Features'],
-    ['file' => '/var/www/project/tests/Features/Controllers/Datasets/Numbers.php', 'scope' => '/var/www/project/tests/Features/Controllers'],
-    ['file' => '/var/www/project/tests/Features/Controllers/Numbers.php', 'scope' => '/var/www/project/tests/Features/Controllers/Numbers.php'],
-    ['file' => '/var/www/project/tests/Features/Controllers/Datasets.php', 'scope' => '/var/www/project/tests/Features/Controllers'],
-]);

tests/Unit/TestSuite.php

@@ -2,6 +2,7 @@
 
 use Pest\Exceptions\DatasetMissing;
 use Pest\Exceptions\TestAlreadyExist;
+use Pest\Exceptions\TestClosureMustNotBeStatic;
 use Pest\Factories\TestCaseMethodFactory;
 use Pest\TestSuite;
 
@@ -16,6 +17,16 @@ it('does not allow to add the same test description twice', function () {
     sprintf('A test with the description `%s` already exists in the filename `%s`.', 'bar', 'foo'),
 );
 
+it('does not allow static closures', function () {
+    $testSuite = new TestSuite(getcwd(), 'tests');
+    $method = new TestCaseMethodFactory('foo', 'bar', static function () {});
+
+    $testSuite->tests->set($method);
+})->throws(
+    TestClosureMustNotBeStatic::class,
+    'Test closure must not be static. Please remove the `static` keyword from the `bar` method in `foo`.',
+);
+
 it('alerts users about tests with arguments but no input', function () {
     $testSuite = new TestSuite(getcwd(), 'tests');
 

tests/Visual/Parallel.php

@@ -16,7 +16,7 @@ $run = function () {
 
 test('parallel', function () use ($run) {
     expect($run('--exclude-group=integration'))
-        ->toContain('Tests:    1 deprecated, 4 warnings, 5 incomplete, 2 notices, 13 todos, 16 skipped, 998 passed (2358 assertions)')
+        ->toContain('Tests:    1 deprecated, 4 warnings, 5 incomplete, 2 notices, 13 todos, 16 skipped, 973 passed (2334 assertions)')
         ->toContain('Parallel: 3 processes');
 })->skipOnWindows();