release: v2.12.2

TestSuiteLoader will always consider classes from the current file

CHANGELOG.md

@@ -2,6 +2,28 @@
 
 ## Unreleased
 
+## [v2.12.2 (2023-08-07)](https://github.com/pestphp/pest/compare/v2.12.0...v2.12.2)
+
+### Fixed
+
+- Running tests from `uses` parent class ([#898](https://github.com/pestphp/pest/pull/898))
+
+## [v2.12.0 (2023-08-02)](https://github.com/pestphp/pest/compare/v2.11.0...v2.12.0)
+
+### Added
+
+- Allows multiple `toMatchSnapshot` per test ([#881](https://github.com/pestphp/pest/pull/881))
+
+### Changed
+
+- Bumps PHPUnit to `^10.2.7` ([43107c1](https://github.com/pestphp/pest/commit/43107c17436e41e23018ae31705c688168c14784))
+
+## [v2.11.0 (2023-08-01)](https://github.com/pestphp/pest/compare/v2.10.1...v2.11.0)
+
+### Added
+
+- `toBeInvokable`expectation ([#891](https://github.com/pestphp/pest/pull/891))
+
 ## [v2.10.1 (2023-07-31)](https://github.com/pestphp/pest/compare/v2.10.0...v2.10.1)
 
 ### Fixed

bin/worker.php

@@ -46,6 +46,7 @@ $bootPest = (static function (): void {
     ];
 
     foreach ($composerAutoloadFiles as $file) {
+
         if (file_exists($file)) {
             require_once $file;
             define('PHPUNIT_COMPOSER_INSTALL', $file);

composer.json

@@ -18,16 +18,16 @@
     ],
     "require": {
         "php": "^8.1.0",
-        "brianium/paratest": "^7.2.3",
+        "brianium/paratest": "^7.2.4",
-        "nunomaduro/collision": "^7.7.0",
+        "nunomaduro/collision": "^7.8.1",
         "nunomaduro/termwind": "^1.15.1",
         "pestphp/pest-plugin": "^2.0.1",
         "pestphp/pest-plugin-arch": "^2.2.3",
-        "phpunit/phpunit": "^10.2.6"
+        "phpunit/phpunit": "^10.3.1"
     },
     "conflict": {
         "webmozart/assert": "<1.11.0",
-        "phpunit/phpunit": ">10.2.6"
+        "phpunit/phpunit": ">10.3.1"
     },
     "autoload": {
         "psr-4": {
@@ -50,7 +50,7 @@
         ]
     },
     "require-dev": {
-        "pestphp/pest-dev-tools": "^2.12.0",
+        "pestphp/pest-dev-tools": "^2.14.0",
         "pestphp/pest-plugin-type-coverage": "^2.0.0",
         "symfony/process": "^6.3.2"
     },

overrides/Runner/TestSuiteLoader.php

@@ -60,6 +60,11 @@ final class TestSuiteLoader
      */
     private static array $loadedClasses = [];
 
+    /**
+     * @psalm-var array<string, array<class-string>>
+     */
+    private static array $loadedClassesByFilename = [];
+
     /**
      * @psalm-var list<class-string>
      */
@@ -97,6 +102,17 @@ final class TestSuiteLoader
 
         self::$loadedClasses = array_merge($loadedClasses, self::$loadedClasses);
 
+        foreach ($loadedClasses as $loadedClass) {
+            $reflection = new ReflectionClass($loadedClass);
+            $filename = $reflection->getFileName();
+            self::$loadedClassesByFilename[$filename] = [
+                $loadedClass,
+                ...self::$loadedClassesByFilename[$filename] ?? [],
+            ];
+        }
+
+        $loadedClasses = array_merge(self::$loadedClassesByFilename[$suiteClassFile] ?? [], $loadedClasses);
+
         if (empty($loadedClasses)) {
             return $this->exceptionFor($suiteClassName, $suiteClassFile);
         }

src/Concerns/Testable.php

@@ -62,6 +62,11 @@ trait Testable
      */
     private static ?Closure $__afterAll = null;
 
+    /**
+     * The list of snapshot changes, if any.
+     */
+    private array $__snapshotChanges = [];
+
     /**
      * Resets the test case static properties.
      */
@@ -331,6 +336,24 @@ trait Testable
         return ExceptionTrace::ensure(fn (): mixed => call_user_func_array(Closure::bind($closure, $this, $this::class), $arguments));
     }
 
+    /** @postCondition */
+    protected function __MarkTestIncompleteIfSnapshotHaveChanged(): void
+    {
+        if (count($this->__snapshotChanges) === 0) {
+            return;
+        }
+
+        if (count($this->__snapshotChanges) === 1) {
+            $this->markTestIncomplete($this->__snapshotChanges[0]);
+
+            return;
+        }
+
+        $messages = implode(PHP_EOL, array_map(static fn (string $message): string => '- $message', $this->__snapshotChanges));
+
+        $this->markTestIncomplete($messages);
+    }
+
     /**
      * The printable test case name.
      */

src/Expectation.php

@@ -593,7 +593,7 @@ final class Expectation
     }
 
     /**
-     * Asserts that the given expectation target to have the given suffix.
+     * Asserts that the given expectation target to have the given prefix.
      */
     public function toHavePrefix(string $prefix): ArchExpectation
     {
@@ -693,4 +693,17 @@ final class Expectation
     {
         return ToBeUsedInNothing::make($this);
     }
+
+    /**
+     * Asserts that the given expectation dependency is an invokable class.
+     */
+    public function toBeInvokable(): ArchExpectation
+    {
+        return Targeted::make(
+            $this,
+            fn (ObjectDescription $object): bool => $object->reflectionClass->hasMethod('__invoke'),
+            'to be invokable',
+            FileLineFinder::where(fn (string $line): bool => str_contains($line, 'class'))
+        );
+    }
 }

src/Expectations/OppositeExpectation.php

@@ -289,7 +289,7 @@ final class OppositeExpectation
     }
 
     /**
-     * Not supported.
+     * Asserts that the given expectation target to not have the given prefix.
      */
     public function toHavePrefix(string $prefix): ArchExpectation
     {
@@ -302,7 +302,7 @@ final class OppositeExpectation
     }
 
     /**
-     * Not supported.
+     * Asserts that the given expectation target to not have the given suffix.
      */
     public function toHaveSuffix(string $suffix): ArchExpectation
     {
@@ -365,6 +365,19 @@ final class OppositeExpectation
         throw InvalidExpectation::fromMethods(['not', 'toBeUsedInNothing']);
     }
 
+    /**
+     * Asserts that the given expectation dependency is not an invokable class.
+     */
+    public function toBeInvokable(): ArchExpectation
+    {
+        return Targeted::make(
+            $this->original,
+            fn (ObjectDescription $object): bool => ! $object->reflectionClass->hasMethod('__invoke'),
+            'to not be invokable',
+            FileLineFinder::where(fn (string $line): bool => str_contains($line, 'class'))
+        );
+    }
+
     /**
      * Handle dynamic method calls into the original expectation.
      *

src/Mixins/Expectation.php

@@ -805,6 +805,12 @@ final class Expectation
      */
     public function toMatchSnapshot(string $message = ''): self
     {
+        $snapshots = TestSuite::getInstance()->snapshots;
+        $snapshots->startNewExpectation();
+
+        $testCase = TestSuite::getInstance()->test;
+        assert($testCase instanceof TestCase);
+
         $string = match (true) {
             is_string($this->value) => $this->value,
             is_object($this->value) && method_exists($this->value, '__toString') => $this->value->__toString(),
@@ -817,22 +823,18 @@ final class Expectation
             default => InvalidExpectationValue::expected('array|object|string'),
         };
 
-        $testCase = TestSuite::getInstance()->test;
+        if ($snapshots->has()) {
-        assert($testCase instanceof TestCase);
+            [$filename, $content] = $snapshots->get();
-        $snapshots = TestSuite::getInstance()->snapshots;
-
-        if ($snapshots->has($testCase, $string)) {
-            [$filename, $content] = $snapshots->get($testCase, $string);
 
             Assert::assertSame(
-                $content,
+                strtr($content, ["\r\n" => "\n", "\r" => "\n"]),
-                $string,
+                strtr($string, ["\r\n" => "\n", "\r" => "\n"]),
                 $message === '' ? "Failed asserting that the string value matches its snapshot ($filename)." : $message
             );
         } else {
-            $filename = $snapshots->save($testCase, $string);
+            $filename = $snapshots->save($string);
 
-            $testCase::markTestIncomplete('Snapshot created at ['.$filename.'].');
+            TestSuite::getInstance()->registerSnapshotChange("Snapshot created at [$filename]");
         }
 
         return $this;

src/Pest.php

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

src/Plugins/Parallel/Paratest/WrapperRunner.php

@@ -13,6 +13,7 @@ use const DIRECTORY_SEPARATOR;
 use function dirname;
 use function file_get_contents;
 use function max;
+use NunoMaduro\Collision\Adapters\Phpunit\Support\ResultReflection;
 use ParaTest\Coverage\CoverageMerger;
 use ParaTest\JUnit\LogMerger;
 use ParaTest\JUnit\Writer;
@@ -273,7 +274,7 @@ final class WrapperRunner implements RunnerInterface
             assert($testResult instanceof TestResult);
 
             $testResultSum = new TestResult(
-                $testResultSum->numberOfTests() + $testResult->numberOfTests(),
+                (int) $testResultSum->hasTests() + (int) $testResult->hasTests(),
                 $testResultSum->numberOfTestsRun() + $testResult->numberOfTestsRun(),
                 $testResultSum->numberOfAssertions() + $testResult->numberOfAssertions(),
                 array_merge_recursive($testResultSum->testErroredEvents(), $testResult->testErroredEvents()),
@@ -282,23 +283,23 @@ final class WrapperRunner implements RunnerInterface
                 array_merge_recursive($testResultSum->testSuiteSkippedEvents(), $testResult->testSuiteSkippedEvents()),
                 array_merge_recursive($testResultSum->testSkippedEvents(), $testResult->testSkippedEvents()),
                 array_merge_recursive($testResultSum->testMarkedIncompleteEvents(), $testResult->testMarkedIncompleteEvents()),
-                array_merge_recursive($testResultSum->testTriggeredDeprecationEvents(), $testResult->testTriggeredDeprecationEvents()),
-                array_merge_recursive($testResultSum->testTriggeredPhpDeprecationEvents(), $testResult->testTriggeredPhpDeprecationEvents()),
                 array_merge_recursive($testResultSum->testTriggeredPhpunitDeprecationEvents(), $testResult->testTriggeredPhpunitDeprecationEvents()),
-                array_merge_recursive($testResultSum->testTriggeredErrorEvents(), $testResult->testTriggeredErrorEvents()),
-                array_merge_recursive($testResultSum->testTriggeredNoticeEvents(), $testResult->testTriggeredNoticeEvents()),
-                array_merge_recursive($testResultSum->testTriggeredPhpNoticeEvents(), $testResult->testTriggeredPhpNoticeEvents()),
-                array_merge_recursive($testResultSum->testTriggeredWarningEvents(), $testResult->testTriggeredWarningEvents()),
-                array_merge_recursive($testResultSum->testTriggeredPhpWarningEvents(), $testResult->testTriggeredPhpWarningEvents()),
                 array_merge_recursive($testResultSum->testTriggeredPhpunitErrorEvents(), $testResult->testTriggeredPhpunitErrorEvents()),
                 array_merge_recursive($testResultSum->testTriggeredPhpunitWarningEvents(), $testResult->testTriggeredPhpunitWarningEvents()),
                 array_merge_recursive($testResultSum->testRunnerTriggeredDeprecationEvents(), $testResult->testRunnerTriggeredDeprecationEvents()),
                 array_merge_recursive($testResultSum->testRunnerTriggeredWarningEvents(), $testResult->testRunnerTriggeredWarningEvents()),
+                array_merge_recursive($testResultSum->errors(), $testResult->errors()),
+                array_merge_recursive($testResultSum->deprecations(), $testResult->deprecations()),
+                array_merge_recursive($testResultSum->notices(), $testResult->notices()),
+                array_merge_recursive($testResultSum->warnings(), $testResult->warnings()),
+                array_merge_recursive($testResultSum->phpDeprecations(), $testResult->phpDeprecations()),
+                array_merge_recursive($testResultSum->phpNotices(), $testResult->phpNotices()),
+                array_merge_recursive($testResultSum->phpWarnings(), $testResult->phpWarnings()),
             );
         }
 
         $testResultSum = new TestResult(
-            $testResultSum->numberOfTests(),
+            ResultReflection::numberOfTests($testResultSum),
             $testResultSum->numberOfTestsRun(),
             $testResultSum->numberOfAssertions(),
             $testResultSum->testErroredEvents(),
@@ -307,14 +308,7 @@ final class WrapperRunner implements RunnerInterface
             $testResultSum->testSuiteSkippedEvents(),
             $testResultSum->testSkippedEvents(),
             $testResultSum->testMarkedIncompleteEvents(),
-            $testResultSum->testTriggeredDeprecationEvents(),
-            $testResultSum->testTriggeredPhpDeprecationEvents(),
             $testResultSum->testTriggeredPhpunitDeprecationEvents(),
-            $testResultSum->testTriggeredErrorEvents(),
-            $testResultSum->testTriggeredNoticeEvents(),
-            $testResultSum->testTriggeredPhpNoticeEvents(),
-            $testResultSum->testTriggeredWarningEvents(),
-            $testResultSum->testTriggeredPhpWarningEvents(),
             $testResultSum->testTriggeredPhpunitErrorEvents(),
             $testResultSum->testTriggeredPhpunitWarningEvents(),
             $testResultSum->testRunnerTriggeredDeprecationEvents(),
@@ -322,6 +316,13 @@ final class WrapperRunner implements RunnerInterface
                 $testResultSum->testRunnerTriggeredWarningEvents(),
                 fn (WarningTriggered $event): bool => ! str_contains($event->message(), 'No tests found')
             )),
+            $testResultSum->errors(),
+            $testResultSum->deprecations(),
+            $testResultSum->notices(),
+            $testResultSum->warnings(),
+            $testResultSum->phpDeprecations(),
+            $testResultSum->phpNotices(),
+            $testResultSum->phpWarnings(),
         );
 
         $this->printer->printResults(

src/Plugins/Parallel/Support/CompactPrinter.php

@@ -134,6 +134,10 @@ final class CompactPrinter
             null,
             null,
             null,
+            null,
+            null,
+            null,
+            null,
         );
 
         $telemetry = new Info(

src/Repositories/SnapshotRepository.php

@@ -5,14 +5,16 @@ declare(strict_types=1);
 namespace Pest\Repositories;
 
 use Pest\Exceptions\ShouldNotHappen;
-use Pest\Support\Str;
+use Pest\TestSuite;
-use PHPUnit\Framework\TestCase;
 
 /**
  * @internal
  */
 final class SnapshotRepository
 {
+    /** @var array<string, int> */
+    private static array $expectationsCounter = [];
+
     /**
      * Creates a snapshot repository instance.
      */
@@ -25,11 +27,9 @@ final class SnapshotRepository
     /**
      * Checks if the snapshot exists.
      */
-    public function has(TestCase $testCase, string $description): bool
+    public function has(): bool
     {
-        [$filename, $description] = $this->getFilenameAndDescription($testCase);
+        return file_exists($this->getSnapshotFilename());
-
-        return file_exists($this->getSnapshotFilename($filename, $description));
     }
 
     /**
@@ -39,11 +39,9 @@ final class SnapshotRepository
      *
      * @throws ShouldNotHappen
      */
-    public function get(TestCase $testCase, string $description): array
+    public function get(): array
     {
-        [$filename, $description] = $this->getFilenameAndDescription($testCase);
+        $contents = file_get_contents($snapshotFilename = $this->getSnapshotFilename());
-
-        $contents = file_get_contents($snapshotFilename = $this->getSnapshotFilename($filename, $description));
 
         if ($contents === false) {
             throw ShouldNotHappen::fromMessage('Snapshot file could not be read.');
@@ -57,11 +55,9 @@ final class SnapshotRepository
     /**
      * Saves the given snapshot for the given test case.
      */
-    public function save(TestCase $testCase, string $snapshot): string
+    public function save(string $snapshot): string
     {
-        [$filename, $description] = $this->getFilenameAndDescription($testCase);
+        $snapshotFilename = $this->getSnapshotFilename();
-
-        $snapshotFilename = $this->getSnapshotFilename($filename, $description);
 
         if (! file_exists(dirname($snapshotFilename))) {
             mkdir(dirname($snapshotFilename), 0755, true);
@@ -103,33 +99,43 @@ final class SnapshotRepository
         }
     }
 
-    /**
-     * Gets the snapshot's "filename" and "description".
-     *
-     * @return array{0: string, 1: string}
-     */
-    private function getFilenameAndDescription(TestCase $testCase): array
-    {
-        $filename = (fn () => self::$__filename)->call($testCase, $testCase::class); // @phpstan-ignore-line
-
-        $description = str_replace('__pest_evaluable_', '', $testCase->name());
-        $datasetAsString = str_replace('__pest_evaluable_', '', Str::evaluable($testCase->dataSetAsStringWithData()));
-
-        $description = str_replace(' ', '_', $description.$datasetAsString);
-
-        return [$filename, $description];
-    }
-
     /**
      * Gets the snapshot's "filename".
      */
-    private function getSnapshotFilename(string $filename, string $description): string
+    private function getSnapshotFilename(): string
     {
-        $relativePath = str_replace($this->testsPath, '', $filename);
+        $relativePath = str_replace($this->testsPath, '', TestSuite::getInstance()->getFilename());
 
         // remove extension from filename
         $relativePath = substr($relativePath, 0, (int) strrpos($relativePath, '.'));
 
+        $description = TestSuite::getInstance()->getDescription();
+
+        if ($this->getCurrentSnapshotCounter() > 1) {
+            $description .= '__'.$this->getCurrentSnapshotCounter();
+        }
+
         return sprintf('%s/%s.snap', $this->testsPath.'/'.$this->snapshotsPath.$relativePath, $description);
     }
+
+    private function getCurrentSnapshotKey(): string
+    {
+        return TestSuite::getInstance()->getFilename().'###'.TestSuite::getInstance()->getDescription();
+    }
+
+    private function getCurrentSnapshotCounter(): int
+    {
+        return self::$expectationsCounter[$this->getCurrentSnapshotKey()] ?? 0;
+    }
+
+    public function startNewExpectation(): void
+    {
+        $key = $this->getCurrentSnapshotKey();
+
+        if (! isset(self::$expectationsCounter[$key])) {
+            self::$expectationsCounter[$key] = 0;
+        }
+
+        self::$expectationsCounter[$key]++;
+    }
 }

src/Result.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Pest;
 
+use NunoMaduro\Collision\Adapters\Phpunit\Support\ResultReflection;
 use PHPUnit\TestRunner\TestResult\TestResult;
 use PHPUnit\TextUI\Configuration\Configuration;
 
@@ -44,7 +45,7 @@ final class Result
             return self::SUCCESS_EXIT;
         }
 
-        if ($configuration->failOnEmptyTestSuite() && $result->numberOfTests() === 0) {
+        if ($configuration->failOnEmptyTestSuite() && ResultReflection::numberOfTests($result) === 0) {
             return self::FAILURE_EXIT;
         }
 
@@ -53,9 +54,9 @@ final class Result
                 $returnCode = self::FAILURE_EXIT;
             }
 
-            $warnings = $result->numberOfTestsWithTestTriggeredPhpunitWarningEvents()
+            $warnings = $result->numberOfTestsWithTestTriggeredPhpunitWarningEvents() +
-                + $result->numberOfTestsWithTestTriggeredWarningEvents()
+                +count($result->warnings())
-                + $result->numberOfTestsWithTestTriggeredPhpWarningEvents();
+                + count($result->phpWarnings());
 
             if ($configuration->failOnWarning() && $warnings > 0) {
                 $returnCode = self::FAILURE_EXIT;

src/Support/StateGenerator.php

@@ -74,64 +74,76 @@ final class StateGenerator
             ));
         }
 
-        foreach ($testResult->testTriggeredDeprecationEvents() as $testResultEvent) {
+        foreach ($testResult->deprecations() as $testResultEvent) {
-            $testResultEvent = $testResultEvent[0];
+            foreach ($testResultEvent->triggeringTests() as $triggeringTest) {
+                ['test' => $test] = $triggeringTest;
 
-            $state->add(TestResult::fromPestParallelTestCase(
+                $state->add(TestResult::fromPestParallelTestCase(
-                $testResultEvent->test(),
+                    $test,
-                TestResult::DEPRECATED,
+                    TestResult::DEPRECATED,
-                ThrowableBuilder::from(new TestOutcome($testResultEvent->message()))
+                    ThrowableBuilder::from(new TestOutcome($testResultEvent->description()))
-            ));
+                ));
+            }
         }
 
-        foreach ($testResult->testTriggeredPhpDeprecationEvents() as $testResultEvent) {
+        foreach ($testResult->phpDeprecations() as $testResultEvent) {
-            $testResultEvent = $testResultEvent[0];
+            foreach ($testResultEvent->triggeringTests() as $triggeringTest) {
+                ['test' => $test] = $triggeringTest;
 
-            $state->add(TestResult::fromPestParallelTestCase(
+                $state->add(TestResult::fromPestParallelTestCase(
-                $testResultEvent->test(),
+                    $test,
-                TestResult::DEPRECATED,
+                    TestResult::DEPRECATED,
-                ThrowableBuilder::from(new TestOutcome($testResultEvent->message()))
+                    ThrowableBuilder::from(new TestOutcome($testResultEvent->description()))
-            ));
+                ));
+            }
         }
 
-        foreach ($testResult->testTriggeredNoticeEvents() as $testResultEvent) {
+        foreach ($testResult->notices() as $testResultEvent) {
-            $testResultEvent = $testResultEvent[0];
+            foreach ($testResultEvent->triggeringTests() as $triggeringTest) {
+                ['test' => $test] = $triggeringTest;
 
-            $state->add(TestResult::fromPestParallelTestCase(
+                $state->add(TestResult::fromPestParallelTestCase(
-                $testResultEvent->test(),
+                    $test,
-                TestResult::NOTICE,
+                    TestResult::NOTICE,
-                ThrowableBuilder::from(new TestOutcome($testResultEvent->message()))
+                    ThrowableBuilder::from(new TestOutcome($testResultEvent->description()))
-            ));
+                ));
+            }
         }
 
-        foreach ($testResult->testTriggeredPhpNoticeEvents() as $testResultEvent) {
+        foreach ($testResult->phpNotices() as $testResultEvent) {
-            $testResultEvent = $testResultEvent[0];
+            foreach ($testResultEvent->triggeringTests() as $triggeringTest) {
+                ['test' => $test] = $triggeringTest;
 
-            $state->add(TestResult::fromPestParallelTestCase(
+                $state->add(TestResult::fromPestParallelTestCase(
-                $testResultEvent->test(),
+                    $test,
-                TestResult::NOTICE,
+                    TestResult::NOTICE,
-                ThrowableBuilder::from(new TestOutcome($testResultEvent->message()))
+                    ThrowableBuilder::from(new TestOutcome($testResultEvent->description()))
-            ));
+                ));
+            }
         }
 
-        foreach ($testResult->testTriggeredWarningEvents() as $testResultEvent) {
+        foreach ($testResult->warnings() as $testResultEvent) {
-            $testResultEvent = $testResultEvent[0];
+            foreach ($testResultEvent->triggeringTests() as $triggeringTest) {
+                ['test' => $test] = $triggeringTest;
 
-            $state->add(TestResult::fromPestParallelTestCase(
+                $state->add(TestResult::fromPestParallelTestCase(
-                $testResultEvent->test(),
+                    $test,
-                TestResult::WARN,
+                    TestResult::WARN,
-                ThrowableBuilder::from(new TestOutcome($testResultEvent->message()))
+                    ThrowableBuilder::from(new TestOutcome($testResultEvent->description()))
-            ));
+                ));
+            }
         }
 
-        foreach ($testResult->testTriggeredPhpWarningEvents() as $testResultEvent) {
+        foreach ($testResult->phpWarnings() as $testResultEvent) {
-            $testResultEvent = $testResultEvent[0];
+            foreach ($testResultEvent->triggeringTests() as $triggeringTest) {
+                ['test' => $test] = $triggeringTest;
 
-            $state->add(TestResult::fromPestParallelTestCase(
+                $state->add(TestResult::fromPestParallelTestCase(
-                $testResultEvent->test(),
+                    $test,
-                TestResult::WARN,
+                    TestResult::WARN,
-                ThrowableBuilder::from(new TestOutcome($testResultEvent->message()))
+                    ThrowableBuilder::from(new TestOutcome($testResultEvent->description()))
-            ));
+                ));
+            }
         }
 
         // for each test that passed, we need to add it to the state
@@ -140,7 +152,7 @@ final class StateGenerator
                 new TestMethod(
                     "$i", // @phpstan-ignore-line
                     '', // @phpstan-ignore-line
-                    '',
+                    '', // @phpstan-ignore-line
                     1,
                     TestDoxBuilder::fromClassNameAndMethodName('', ''), // @phpstan-ignore-line
                     MetadataCollection::fromArray([]),

src/TestSuite.php

@@ -11,6 +11,7 @@ use Pest\Repositories\BeforeAllRepository;
 use Pest\Repositories\BeforeEachRepository;
 use Pest\Repositories\SnapshotRepository;
 use Pest\Repositories\TestRepository;
+use Pest\Support\Str;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -105,4 +106,28 @@ final class TestSuite
 
         return self::$instance;
     }
+
+    public function getFilename(): string
+    {
+        assert($this->test instanceof TestCase);
+
+        return (fn () => self::$__filename)->call($this->test, $this->test::class); // @phpstan-ignore-line
+    }
+
+    public function getDescription(): string
+    {
+        assert($this->test instanceof TestCase);
+
+        $description = str_replace('__pest_evaluable_', '', $this->test->name());
+        $datasetAsString = str_replace('__pest_evaluable_', '', Str::evaluable($this->test->dataSetAsStringWithData()));
+
+        return str_replace(' ', '_', $description.$datasetAsString);
+    }
+
+    public function registerSnapshotChange(string $message): void
+    {
+        assert($this->test instanceof TestCase);
+
+        (fn (): string => $this->__snapshotChanges[] = $message)->call($this->test, $this->test::class); // @phpstan-ignore-line
+    }
 }

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/_describable__→_multiple_snapshot_expectations_with_describe.snap

@@ -0,0 +1 @@
+foo bar 1

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/_describable__→_multiple_snapshot_expectations_with_describe__2.snap

@@ -0,0 +1 @@
+foo bar 2

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/multiple_snapshot_expectations.snap

@@ -0,0 +1 @@
+foo bar 1

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/multiple_snapshot_expectations__2.snap

@@ -0,0 +1 @@
+foo bar 2

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/multiple_snapshot_expectations_with_datasets_with_data_set___1____1_.snap

@@ -0,0 +1 @@
+foo bar 1

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/multiple_snapshot_expectations_with_datasets_with_data_set___1____1___2.snap

@@ -0,0 +1 @@
+foo bar 2

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/multiple_snapshot_expectations_with_datasets_with_data_set____bar______bar__.snap

@@ -0,0 +1 @@
+foo bar 1

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/multiple_snapshot_expectations_with_datasets_with_data_set____bar______bar____2.snap

@@ -0,0 +1 @@
+foo bar 2

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/multiple_snapshot_expectations_with_datasets_with_data_set____baz______baz__.snap

@@ -0,0 +1 @@
+foo bar 1

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/multiple_snapshot_expectations_with_datasets_with_data_set____baz______baz____2.snap

@@ -0,0 +1 @@
+foo bar 2

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/multiple_snapshot_expectations_with_datasets_with_data_set____foo______foo__.snap

@@ -0,0 +1 @@
+foo bar 1

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/multiple_snapshot_expectations_with_datasets_with_data_set____foo______foo____2.snap

@@ -0,0 +1 @@
+foo bar 2

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/multiple_snapshot_expectations_with_repeat_with_data_set___10____10_.snap

@@ -0,0 +1 @@
+foo bar 1

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/multiple_snapshot_expectations_with_repeat_with_data_set___10____10___2.snap

@@ -0,0 +1 @@
+foo bar 2

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/multiple_snapshot_expectations_with_repeat_with_data_set___1____1_.snap

@@ -0,0 +1 @@
+foo bar 1

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/multiple_snapshot_expectations_with_repeat_with_data_set___1____1___2.snap

@@ -0,0 +1 @@
+foo bar 2

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/multiple_snapshot_expectations_with_repeat_with_data_set___2____2_.snap

@@ -0,0 +1 @@
+foo bar 1

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/multiple_snapshot_expectations_with_repeat_with_data_set___2____2___2.snap

@@ -0,0 +1 @@
+foo bar 2

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/multiple_snapshot_expectations_with_repeat_with_data_set___3____3_.snap

@@ -0,0 +1 @@
+foo bar 1

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/multiple_snapshot_expectations_with_repeat_with_data_set___3____3___2.snap

@@ -0,0 +1 @@
+foo bar 2

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/multiple_snapshot_expectations_with_repeat_with_data_set___4____4_.snap

@@ -0,0 +1 @@
+foo bar 1

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/multiple_snapshot_expectations_with_repeat_with_data_set___4____4___2.snap

@@ -0,0 +1 @@
+foo bar 2

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/multiple_snapshot_expectations_with_repeat_with_data_set___5____5_.snap

@@ -0,0 +1 @@
+foo bar 1

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/multiple_snapshot_expectations_with_repeat_with_data_set___5____5___2.snap

@@ -0,0 +1 @@
+foo bar 2

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/multiple_snapshot_expectations_with_repeat_with_data_set___6____6_.snap

@@ -0,0 +1 @@
+foo bar 1

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/multiple_snapshot_expectations_with_repeat_with_data_set___6____6___2.snap

@@ -0,0 +1 @@
+foo bar 2

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/multiple_snapshot_expectations_with_repeat_with_data_set___7____7_.snap

@@ -0,0 +1 @@
+foo bar 1

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/multiple_snapshot_expectations_with_repeat_with_data_set___7____7___2.snap

@@ -0,0 +1 @@
+foo bar 2

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/multiple_snapshot_expectations_with_repeat_with_data_set___8____8_.snap

@@ -0,0 +1 @@
+foo bar 1

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/multiple_snapshot_expectations_with_repeat_with_data_set___8____8___2.snap

@@ -0,0 +1 @@
+foo bar 2

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/multiple_snapshot_expectations_with_repeat_with_data_set___9____9_.snap

@@ -0,0 +1 @@
+foo bar 1

tests/.pest/snapshots/Features/Expect/toMatchSnapshot/multiple_snapshot_expectations_with_repeat_with_data_set___9____9___2.snap

@@ -0,0 +1 @@
+foo bar 2

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

@@ -1,5 +1,5 @@
 
-  Pest Testing Framework 2.10.1.  
+  Pest Testing Framework 2.12.2.  
 
   USAGE: pest <file> [options]  
 

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

@@ -1,3 +1,3 @@
 
-  Pest Testing Framework 2.10.1.  
+  Pest Testing Framework 2.12.2.  
 

tests/.snapshots/success.txt

@@ -411,6 +411,14 @@
   ✓ failures with custom message
   ✓ not failures
 
+   PASS  Tests\Features\Expect\toBeInvokable
+  ✓ class is invokable
+  ✓ opposite class is invokable
+  ✓ class is invokable via a parent class
+  ✓ class is invokable via a trait
+  ✓ failure when the class is not invokable
+  ✓ class is not invokable
+
    PASS  Tests\Features\Expect\toBeIterable
   ✓ pass
   ✓ failures
@@ -690,6 +698,22 @@
   ✓ failures
   ✓ failures with custom message
   ✓ not failures
+  ✓ multiple snapshot expectations
+  ✓ multiple snapshot expectations with datasets with (1)
+  ✓ multiple snapshot expectations with datasets with ('foo')
+  ✓ multiple snapshot expectations with datasets with ('bar')
+  ✓ multiple snapshot expectations with datasets with ('baz')
+  ✓ describable → multiple snapshot expectations with describe
+  ✓ multiple snapshot expectations with repeat @ repetition 1 of 10
+  ✓ multiple snapshot expectations with repeat @ repetition 2 of 10
+  ✓ multiple snapshot expectations with repeat @ repetition 3 of 10
+  ✓ multiple snapshot expectations with repeat @ repetition 4 of 10
+  ✓ multiple snapshot expectations with repeat @ repetition 5 of 10
+  ✓ multiple snapshot expectations with repeat @ repetition 6 of 10
+  ✓ multiple snapshot expectations with repeat @ repetition 7 of 10
+  ✓ multiple snapshot expectations with repeat @ repetition 8 of 10
+  ✓ multiple snapshot expectations with repeat @ repetition 9 of 10
+  ✓ multiple snapshot expectations with repeat @ repetition 10 of 10
 
    PASS  Tests\Features\Expect\toStartWith
   ✓ pass
@@ -991,9 +1015,15 @@
    PASS  Tests\PHPUnit\CustomAffixes\snakecasespec
   ✓ it runs file names like snake_case_spec.php
 
+   PASS  Tests\CustomTestCase\ChildTest
+  ✓ override method
+
    PASS  Tests\CustomTestCase\ExecutedTest
   ✓ that gets executed
 
+   PASS  Tests\CustomTestCase\ParentTest
+  ✓ override method
+
    PASS  Tests\PHPUnit\CustomTestCase\UsesPerDirectory
   ✓ closure was bound to CustomTestCase
 
@@ -1186,4 +1216,4 @@
    WARN  Tests\Visual\Version
   - visual snapshot of help command output
 
-  Tests:    2 deprecated, 4 warnings, 5 incomplete, 2 notices, 13 todos, 19 skipped, 838 passed (1939 assertions)
+  Tests:    2 deprecated, 4 warnings, 5 incomplete, 2 notices, 13 todos, 19 skipped, 862 passed (1977 assertions)

tests/.snapshots/todo.txt

@@ -19,7 +19,13 @@
   ↓ something todo later chained
   ↓ something todo later chained and with function body
 
+   PASS  Tests\CustomTestCase\ChildTest
+  ✓ override method
+
    PASS  Tests\CustomTestCase\ExecutedTest
   ✓ that gets executed
 
-  Tests:    13 todos, 1 passed (1 assertions)
+   PASS  Tests\CustomTestCase\ParentTest
+  ✓ override method
+
+  Tests:    13 todos, 3 passed (3 assertions)

tests/Features/Expect/toBeInvokable.php

@@ -0,0 +1,29 @@
+<?php
+
+use Pest\Arch\Exceptions\ArchExpectationFailedException;
+
+test('class is invokable')
+    ->expect('Tests\\Fixtures\\Arch\\ToBeInvokable\\IsInvokable\\InvokableClass')
+    ->toBeInvokable();
+
+test('opposite class is invokable')
+    ->throws(ArchExpectationFailedException::class)
+    ->expect('Tests\\Fixtures\\Arch\\ToBeInvokable\\IsInvokable\\InvokableClass')
+    ->not->toBeInvokable();
+
+test('class is invokable via a parent class')
+    ->expect('Tests\\Fixtures\\Arch\\ToBeInvokable\\IsInvokable\\InvokableClassViaParent')
+    ->toBeInvokable();
+
+test('class is invokable via a trait')
+    ->expect('Tests\\Fixtures\\Arch\\ToBeInvokable\\IsInvokable\\InvokableClassViaTrait')
+    ->toBeInvokable();
+
+test('failure when the class is not invokable')
+    ->throws(ArchExpectationFailedException::class)
+    ->expect('Tests\\Fixtures\\Arch\\ToBeInvokable\\IsNotInvokable\\IsNotInvokableClass')
+    ->toBeInvokable();
+
+test('class is not invokable')
+    ->expect('Tests\\Fixtures\\Arch\\ToBeInvokable\\IsNotInvokable\\IsNotInvokableClass')
+    ->not->toBeInvokable();

tests/Features/Expect/toMatchSnapshot.php

@@ -16,13 +16,13 @@ beforeEach(function () {
 });
 
 test('pass', function () {
-    TestSuite::getInstance()->snapshots->save($this, $this->snapshotable);
+    TestSuite::getInstance()->snapshots->save($this->snapshotable);
 
     expect($this->snapshotable)->toMatchSnapshot();
 });
 
 test('pass with `__toString`', function () {
-    TestSuite::getInstance()->snapshots->save($this, $this->snapshotable);
+    TestSuite::getInstance()->snapshots->save($this->snapshotable);
 
     $object = new class($this->snapshotable)
     {
@@ -36,11 +36,11 @@ test('pass with `__toString`', function () {
         }
     };
 
-    expect($object)->toMatchSnapshot()->toMatchSnapshot();
+    expect($object)->toMatchSnapshot();
 });
 
 test('pass with `toString`', function () {
-    TestSuite::getInstance()->snapshots->save($this, $this->snapshotable);
+    TestSuite::getInstance()->snapshots->save($this->snapshotable);
 
     $object = new class($this->snapshotable)
     {
@@ -54,12 +54,12 @@ test('pass with `toString`', function () {
         }
     };
 
-    expect($object)->toMatchSnapshot()->toMatchSnapshot();
+    expect($object)->toMatchSnapshot();
 });
 
 test('pass with dataset', function ($data) {
-    TestSuite::getInstance()->snapshots->save($this, $this->snapshotable);
+    TestSuite::getInstance()->snapshots->save($this->snapshotable);
-    [$filename] = TestSuite::getInstance()->snapshots->get($this, $this->snapshotable);
+    [$filename] = TestSuite::getInstance()->snapshots->get();
 
     expect($filename)->toEndWith('pass_with_dataset_with_data_set____my_datas_set_value______my_datas_set_value__.snap')
         ->and($this->snapshotable)->toMatchSnapshot();
@@ -67,8 +67,8 @@ test('pass with dataset', function ($data) {
 
 describe('within describe', function () {
     test('pass with dataset', function ($data) {
-        TestSuite::getInstance()->snapshots->save($this, $this->snapshotable);
+        TestSuite::getInstance()->snapshots->save($this->snapshotable);
-        [$filename] = TestSuite::getInstance()->snapshots->get($this, $this->snapshotable);
+        [$filename] = TestSuite::getInstance()->snapshots->get();
 
         expect($filename)->toEndWith('pass_with_dataset_with_data_set____my_datas_set_value______my_datas_set_value__.snap')
             ->and($this->snapshotable)->toMatchSnapshot();
@@ -76,7 +76,7 @@ describe('within describe', function () {
 })->with(['my-datas-set-value']);
 
 test('pass with `toArray`', function () {
-    TestSuite::getInstance()->snapshots->save($this, json_encode(['key' => $this->snapshotable], JSON_PRETTY_PRINT));
+    TestSuite::getInstance()->snapshots->save(json_encode(['key' => $this->snapshotable], JSON_PRETTY_PRINT));
 
     $object = new class($this->snapshotable)
     {
@@ -92,31 +92,57 @@ test('pass with `toArray`', function () {
         }
     };
 
-    expect($object)->toMatchSnapshot()->toMatchSnapshot();
+    expect($object)->toMatchSnapshot();
 });
 
 test('pass with array', function () {
-    TestSuite::getInstance()->snapshots->save($this, json_encode(['key' => $this->snapshotable], JSON_PRETTY_PRINT));
+    TestSuite::getInstance()->snapshots->save(json_encode(['key' => $this->snapshotable], JSON_PRETTY_PRINT));
 
     expect([
         'key' => $this->snapshotable,
-    ])->toMatchSnapshot()->toMatchSnapshot();
+    ])->toMatchSnapshot();
 });
 
 test('failures', function () {
-    TestSuite::getInstance()->snapshots->save($this, $this->snapshotable);
+    TestSuite::getInstance()->snapshots->save($this->snapshotable);
 
     expect('contain that does not match snapshot')->toMatchSnapshot();
 })->throws(ExpectationFailedException::class, 'Failed asserting that two strings are identical.');
 
 test('failures with custom message', function () {
-    TestSuite::getInstance()->snapshots->save($this, $this->snapshotable);
+    TestSuite::getInstance()->snapshots->save($this->snapshotable);
 
     expect('contain that does not match snapshot')->toMatchSnapshot('oh no');
 })->throws(ExpectationFailedException::class, 'oh no');
 
 test('not failures', function () {
-    TestSuite::getInstance()->snapshots->save($this, $this->snapshotable);
+    TestSuite::getInstance()->snapshots->save($this->snapshotable);
 
     expect($this->snapshotable)->not->toMatchSnapshot();
 })->throws(ExpectationFailedException::class);
+
+test('multiple snapshot expectations', function () {
+    expect('foo bar 1')->toMatchSnapshot();
+
+    expect('foo bar 2')->toMatchSnapshot();
+});
+
+test('multiple snapshot expectations with datasets', function () {
+    expect('foo bar 1')->toMatchSnapshot();
+
+    expect('foo bar 2')->toMatchSnapshot();
+})->with([1, 'foo', 'bar', 'baz']);
+
+describe('describable', function () {
+    test('multiple snapshot expectations with describe', function () {
+        expect('foo bar 1')->toMatchSnapshot();
+
+        expect('foo bar 2')->toMatchSnapshot();
+    });
+});
+
+test('multiple snapshot expectations with repeat', function () {
+    expect('foo bar 1')->toMatchSnapshot();
+
+    expect('foo bar 2')->toMatchSnapshot();
+})->repeat(10);

tests/Fixtures/Arch/ToBeInvokable/IsInvokable/InvokableClass.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Fixtures\Arch\ToBeInvokable\IsInvokable;
+
+class InvokableClass
+{
+    public function __invoke(): void
+    {
+
+    }
+}

tests/Fixtures/Arch/ToBeInvokable/IsInvokable/InvokableClassViaParent.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Fixtures\Arch\ToBeInvokable\IsInvokable;
+
+class InvokableClassViaParent extends ParentInvokableClass
+{
+    //
+}

tests/Fixtures/Arch/ToBeInvokable/IsInvokable/InvokableClassViaTrait.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Fixtures\Arch\ToBeInvokable\IsInvokable;
+
+class InvokableClassViaTrait
+{
+    use InvokableTrait;
+}

tests/Fixtures/Arch/ToBeInvokable/IsInvokable/InvokableTrait.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Fixtures\Arch\ToBeInvokable\IsInvokable;
+
+trait InvokableTrait
+{
+    public function __invoke(): void
+    {
+        //
+    }
+}

tests/Fixtures/Arch/ToBeInvokable/IsInvokable/ParentInvokableClass.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Fixtures\Arch\ToBeInvokable\IsInvokable;
+
+class ParentInvokableClass
+{
+    public function __invoke(): void
+    {
+
+    }
+}

tests/Fixtures/Arch/ToBeInvokable/IsNotInvokable/IsNotInvokableClass.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Fixtures\Arch\ToBeInvokable\IsNotInvokable;
+
+class IsNotInvokableClass
+{
+    public function handle(): void
+    {
+
+    }
+}

tests/PHPUnit/CustomTestCase/ChildTest.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\CustomTestCase;
+
+class ChildTest extends ParentTest
+{
+    private function getEntity(): bool
+    {
+        return true;
+    }
+}

tests/PHPUnit/CustomTestCase/ParentTest.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\CustomTestCase;
+
+use function PHPUnit\Framework\assertTrue;
+use PHPUnit\Framework\TestCase;
+
+class ParentTest extends TestCase
+{
+    private function getEntity(): bool
+    {
+        return false;
+    }
+
+    /** @test */
+    public function testOverrideMethod(): void
+    {
+        assertTrue($this->getEntity() || true);
+    }
+}

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, 15 skipped, 827 passed (1924 assertions)')
+        ->toContain('Tests:    1 deprecated, 4 warnings, 5 incomplete, 2 notices, 13 todos, 15 skipped, 851 passed (1962 assertions)')
         ->toContain('Parallel: 3 processes');
 })->skipOnWindows();