Merge branch '2.x' into 3.x

src/Concerns/Testable.php

@@ -291,11 +291,13 @@ trait Testable
             $afterEach = ChainableClosure::bound($this->__afterEach, $afterEach);
         }
 
-        $this->__callClosure($afterEach, $arguments);
+        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

@@ -509,7 +509,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

@@ -146,7 +146,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/TestCaseFactory.php

@@ -11,6 +11,7 @@ use Pest\Evaluators\Attributes;
 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;
@@ -188,6 +189,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/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;
             }