release: v2.5.0

[2.x] Adds `phpunit/phpunit@10.1` support

.github/workflows/integration-tests.yml

@@ -8,6 +8,7 @@ on:
 
 jobs:
   ci:
+    if: github.event_name != 'schedule' || github.repository == 'pestphp/pest'
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:

.github/workflows/static.yml

@@ -8,6 +8,7 @@ on:
 
 jobs:
   static:
+    if: github.event_name != 'schedule' || github.repository == 'pestphp/pest'
     name: Static Tests
 
     runs-on: ubuntu-latest

.github/workflows/tests.yml

@@ -9,6 +9,7 @@ on:
 
 jobs:
   ci:
+    if: github.event_name != 'schedule' || github.repository == 'pestphp/pest'
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -42,4 +43,4 @@ jobs:
 
     - name: Unit Tests in Parallel
       run: composer test:parallel
-      if: startsWith(matrix.os, 'windows') != true
+

CHANGELOG.md

@@ -2,17 +2,46 @@
 
 ## Unreleased
 
+## [v2.5.0 (2023-04-14)](https://github.com/pestphp/pest/compare/v2.4.0...v2.5.0)
+
+### Chore
+- Bumps PHPUnit to `^10.1.0` ([#780](https://github.com/pestphp/pest/pull/780))
+
+## [v2.4.0 (2023-04-03)](https://github.com/pestphp/pest/compare/v2.3.0...v2.4.0)
+
+### Added
+- `skipOnWindows()`, `skipOnMac()`, and `skipOnLinux()` ([#757](https://github.com/pestphp/pest/pull/757))
+- source architecture testing violation ([#1](https://github.com/pestphp/pest-plugin-arch/pull/1))([8e66263](https://github.com/pestphp/pest-plugin-arch/commit/8e66263104304e99e3d6ceda25c7ed679b27fb03))
+- `toHaveProperties` may now also check values ([#760](https://github.com/pestphp/pest/pull/760))
+
+### Fixed
+- Tests on `tests/Helpers` directory not being executed ([#753](https://github.com/pestphp/pest/pull/753))
+- Teamcity count ([#747](https://github.com/pestphp/pest/pull/747))
+- Parallel execution when class extends class with same name ([#748](https://github.com/pestphp/pest/pull/748))
+- Wording on `uses()` hint ([#745](https://github.com/pestphp/pest/pull/745/files))
+
+## [v2.3.0 (2023-03-28)](https://github.com/pestphp/pest/compare/v2.2.3...v2.3.0)
+
+### Added
+- Better error handler about missing uses ([#743](https://github.com/pestphp/pest/pull/743))
+
+### Fixed
+- Inconsistent spelling of `dataset` ([#739](https://github.com/pestphp/pest/pull/739))
+
+### Chore
+- Bumps PHPUnit to `^10.0.19` ([3d7e621](https://github.com/pestphp/pest/commit/3d7e621b7dfc03f0b2d9dcf6eb06c26bc383f502))
+
 ## [v2.2.3 (2023-03-24)](https://github.com/pestphp/pest/compare/v2.2.2...v2.2.3)
 
 ### Fixed
-- Unnecessary dataset on dataset arguments missmatch ([#736](https://github.com/pestphp/pest/pull/736))
+- Unnecessary dataset on dataset arguments mismatch ([#736](https://github.com/pestphp/pest/pull/736))
 - Parallel arguments on plugins order ([#703](https://github.com/pestphp/pest/pull/703))
 - Arch plugin runtime exceptions on bad phpdocs ([2f2b51c](https://github.com/pestphp/pest/commit/2f2b51ce3d1b000be9d6add0e785fd0044931b3b))
 
 ## [v2.2.2 (2023-03-23)](https://github.com/pestphp/pest/compare/v2.2.1...v2.2.2)
 
 ### Fixed
-- Edge case in parallel executation test description ([3ce6408](https://github.com/pestphp/pest/commit/3ce640819541ca6022b250e000f336d87c3e7889))
+- Edge case in parallel execution test description ([3ce6408](https://github.com/pestphp/pest/commit/3ce640819541ca6022b250e000f336d87c3e7889))
 
 ## [v2.2.1 (2023-03-22)](https://github.com/pestphp/pest/compare/v2.2.0...v2.2.1)
 

bin/worker.php

@@ -92,7 +92,7 @@ $bootPest = (static function (): void {
             exit;
         }
 
-        $exitCode = $application->runTest(trim($testPath));
+        $exitCode = $application->runTest(realpath(trim($testPath)));
 
         fwrite($statusFile, (string) $exitCode);
         fflush($statusFile);

composer.json

@@ -18,16 +18,16 @@
     ],
     "require": {
         "php": "^8.1.0",
-        "brianium/paratest": "^7.1.2",
-        "nunomaduro/collision": "^7.3.3",
+        "brianium/paratest": "^7.1.3",
+        "nunomaduro/collision": "^7.4.0",
         "nunomaduro/termwind": "^1.15.1",
         "pestphp/pest-plugin": "^2.0.1",
-        "pestphp/pest-plugin-arch": "^2.0.2",
-        "phpunit/phpunit": "^10.0.18"
+        "pestphp/pest-plugin-arch": "^2.1.1",
+        "phpunit/phpunit": "^10.1.0"
     },
     "conflict": {
         "webmozart/assert": "<1.11.0",
-        "phpunit/phpunit": ">10.0.18"
+        "phpunit/phpunit": ">10.1.0"
     },
     "autoload": {
         "psr-4": {
@@ -41,6 +41,7 @@
     "autoload-dev": {
         "psr-4": {
             "Tests\\Fixtures\\Covers\\": "tests/Fixtures/Covers",
+            "Tests\\Fixtures\\Inheritance\\": "tests/Fixtures/Inheritance",
             "Tests\\": "tests/PHPUnit/"
         },
         "files": [
@@ -48,8 +49,8 @@
         ]
     },
     "require-dev": {
-        "pestphp/pest-dev-tools": "^2.5.0",
-        "symfony/process": "^6.2.7"
+        "pestphp/pest-dev-tools": "^2.6.0",
+        "symfony/process": "^6.2.8"
     },
     "minimum-stability": "stable",
     "config": {

overrides/Event/Value/ThrowableBuilder.php

@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace PHPUnit\Event\Code;
+
+use NunoMaduro\Collision\Contracts\RenderableOnCollisionEditor;
+use PHPUnit\Event\NoPreviousThrowableException;
+use PHPUnit\Framework\Exception;
+use PHPUnit\Util\Filter;
+use PHPUnit\Util\ThrowableToStringMapper;
+
+/**
+ * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ */
+final class ThrowableBuilder
+{
+    /**
+     * @throws Exception
+     * @throws NoPreviousThrowableException
+     */
+    public static function from(\Throwable $t): Throwable
+    {
+        $previous = $t->getPrevious();
+
+        if ($previous !== null) {
+            $previous = self::from($previous);
+        }
+
+        $trace = Filter::getFilteredStacktrace($t);
+
+        if ($t instanceof RenderableOnCollisionEditor && $frame = $t->toCollisionEditor()) {
+            $file = $frame->getFile();
+            $line = $frame->getLine();
+
+            $trace = "$file:$line\n$trace";
+        }
+
+        return new Throwable(
+            $t::class,
+            $t->getMessage(),
+            ThrowableToStringMapper::map($t),
+            $trace,
+            $previous
+        );
+    }
+}

overrides/Runner/Filter/NameFilterIterator.php

@@ -107,7 +107,7 @@ final 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]
                     );
 
@@ -115,7 +115,7 @@ final class NameFilterIterator extends RecursiveFilterIterator
                     $this->filterMax = (int) $matches[3];
                 } else {
                     $filter = sprintf(
-                        '%s.*with data set #%s$',
+                        '%s.*with dataset #%s$',
                         $matches[1],
                         $matches[2]
                     );
@@ -125,7 +125,7 @@ final 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]
                 );

phpunit.xml

@@ -18,11 +18,12 @@
       <directory suffix=".php">./tests</directory>
       <exclude>./tests/.snapshots</exclude>
       <exclude>./tests/.tests</exclude>
+      <exclude>./tests/Fixtures/Inheritance</exclude>
     </testsuite>
   </testsuites>
-  <coverage>
+  <source>
     <include>
       <directory suffix=".php">./src</directory>
     </include>
-  </coverage>
+  </source>
 </phpunit>

src/Bootstrappers/BootOverrides.php

@@ -24,6 +24,7 @@ final class BootOverrides implements Bootstrapper
         'TextUI/Command/WarmCodeCoverageCacheCommand.php',
         'TextUI/Output/Default/ProgressPrinter/TestSkippedSubscriber.php',
         'TextUI/TestSuiteFilterProcessor.php',
+        'Event/Value/ThrowableBuilder.php',
     ];
 
     /**

src/Concerns/Testable.php

@@ -87,7 +87,7 @@ trait Testable
      */
     public function __addBeforeAll(?Closure $hook): void
     {
-        if ($hook === null) {
+        if (! $hook instanceof \Closure) {
             return;
         }
 
@@ -101,7 +101,7 @@ trait Testable
      */
     public function __addAfterAll(?Closure $hook): void
     {
-        if ($hook === null) {
+        if (! $hook instanceof \Closure) {
             return;
         }
 
@@ -131,7 +131,7 @@ trait Testable
      */
     private function __addHook(string $property, ?Closure $hook): void
     {
-        if ($hook === null) {
+        if (! $hook instanceof \Closure) {
             return;
         }
 

src/Contracts/AddsAnnotations.php

@@ -7,7 +7,7 @@ namespace Pest\Contracts;
 use Pest\Factories\TestCaseMethodFactory;
 
 /**
- * @interal
+ * @internal
  */
 interface AddsAnnotations
 {

src/Factories/Attributes/Covers.php

@@ -14,7 +14,7 @@ use Pest\Factories\TestCaseMethodFactory;
 final class Covers extends Attribute
 {
     /**
-     * Determine if the attribute should be placed above the classe instead of above the method.
+     * Determine if the attribute should be placed above the class instead of above the method.
      */
     public static bool $above = true;
 

src/Factories/TestCaseFactory.php

@@ -217,7 +217,7 @@ final class TestCaseFactory
         }
 
         if (! $method->receivesArguments()) {
-            if ($method->closure === null) {
+            if (! $method->closure instanceof \Closure) {
                 throw ShouldNotHappen::fromMessage('The test closure may not be empty.');
             }
 

src/Functions.php

@@ -92,7 +92,7 @@ if (! function_exists('test')) {
      */
     function test(string $description = null, Closure $closure = null): HigherOrderTapProxy|TestCall
     {
-        if ($description === null && TestSuite::getInstance()->test !== null) {
+        if ($description === null && TestSuite::getInstance()->test instanceof \PHPUnit\Framework\TestCase) {
             return new HigherOrderTapProxy(TestSuite::getInstance()->test);
         }
 

src/Logging/TeamCity/Converter.php

@@ -64,7 +64,7 @@ final class Converter
     }
 
     /**
-     * Gets the exception messsage.
+     * Gets the exception message.
      */
     public function getExceptionMessage(Throwable $throwable): string
     {
@@ -166,6 +166,14 @@ final class Converter
         return $this->toRelativePath($path);
     }
 
+    /**
+     * Gets the test suite size.
+     */
+    public function getTestSuiteSize(TestSuite $testSuite): int
+    {
+        return $testSuite->count();
+    }
+
     /**
      * Transforms the given path in relative path.
      */

src/Logging/TeamCity/ServiceMessage.php

@@ -40,6 +40,13 @@ final class ServiceMessage
         ]);
     }
 
+    public static function testSuiteCount(int $count): self
+    {
+        return new self('testCount', [
+            'count' => $count,
+        ]);
+    }
+
     public static function testSuiteFinished(string $name): self
     {
         return new self('testSuiteFinished', [

src/Logging/TeamCity/TeamCityLogger.php

@@ -34,6 +34,7 @@ use PHPUnit\Event\TestSuite\Finished as TestSuiteFinished;
 use PHPUnit\Event\TestSuite\Started as TestSuiteStarted;
 use PHPUnit\Event\UnknownSubscriberTypeException;
 use PHPUnit\TestRunner\TestResult\Facade as TestResultFacade;
+use ReflectionClass;
 use Symfony\Component\Console\Output\ConsoleOutput;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -44,6 +45,8 @@ final class TeamCityLogger
 {
     private ?HRTime $time = null;
 
+    private bool $isSummaryTestCountPrinted = false;
+
     /**
      * @throws EventFacadeIsSealedException
      * @throws UnknownSubscriberTypeException
@@ -66,6 +69,15 @@ final class TeamCityLogger
         );
 
         $this->output($message);
+
+        if (! $this->isSummaryTestCountPrinted) {
+            $this->isSummaryTestCountPrinted = true;
+            $message = ServiceMessage::testSuiteCount(
+                $this->converter->getTestSuiteSize($event->testSuite())
+            );
+
+            $this->output($message);
+        }
     }
 
     public function testSuiteFinished(TestSuiteFinished $event): void
@@ -169,7 +181,7 @@ final class TeamCityLogger
 
     public function testFinished(Finished $event): void
     {
-        if ($this->time === null) {
+        if (! $this->time instanceof \PHPUnit\Event\Telemetry\HRTime) {
             throw ShouldNotHappen::fromMessage('Start time has not been set.');
         }
 
@@ -196,13 +208,17 @@ final class TeamCityLogger
         $style = new Style($this->output);
 
         $telemetry = $event->telemetryInfo();
+
         if ($this->withoutDuration) {
+            $reflector = new ReflectionClass($telemetry);
+
+            $property = $reflector->getProperty('current');
+            $property->setAccessible(true);
+            $snapshot = $property->getValue($telemetry);
+            assert($snapshot instanceof Snapshot);
+
             $telemetry = new Info(
-                new Snapshot(
-                    $telemetry->time(),
-                    $telemetry->memoryUsage(),
-                    $telemetry->peakMemoryUsage(),
-                ),
+                $snapshot,
                 Duration::fromSecondsAndNanoseconds(1, 0),
                 $telemetry->memoryUsageSinceStart(),
                 $telemetry->durationSincePrevious(),

src/Mixins/Expectation.php

@@ -296,8 +296,8 @@ final class Expectation
      */
     public function toHaveProperties(iterable $names, string $message = ''): self
     {
-        foreach ($names as $name) {
-            $this->toHaveProperty($name, message: $message);
+        foreach ($names as $name => $value) {
+            is_int($name) ? $this->toHaveProperty($value, message: $message) : $this->toHaveProperty($name, $value, $message);
         }
 
         return $this;
@@ -900,7 +900,7 @@ final class Expectation
      */
     private function export(mixed $value): string
     {
-        if ($this->exporter === null) {
+        if (! $this->exporter instanceof \Pest\Support\Exporter) {
             $this->exporter = Exporter::default();
         }
 

src/PendingCalls/TestCall.php

@@ -172,6 +172,40 @@ final class TestCall
         return $this;
     }
 
+    /**
+     * Skips the current test if the given test is running on Windows.
+     */
+    public function skipOnWindows(): self
+    {
+        return $this->skipOn('Windows', 'This test is skipped on [Windows].');
+    }
+
+    /**
+     * Skips the current test if the given test is running on Mac OS.
+     */
+    public function skipOnMac(): self
+    {
+        return $this->skipOn('Darwin', 'This test is skipped on [Mac].');
+    }
+
+    /**
+     * Skips the current test if the given test is running on Linux.
+     */
+    public function skipOnLinux(): self
+    {
+        return $this->skipOn('Linux', 'This test is skipped on [Linux].');
+    }
+
+    /**
+     * Skips the current test if the given test is running on the given operating systems.
+     */
+    private function skipOn(string $osFamily, string $message): self
+    {
+        return PHP_OS_FAMILY === $osFamily
+            ? $this->skip($message)
+            : $this;
+    }
+
     /**
      * Sets the test as "todo".
      */

src/Pest.php

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

src/Plugins/Parallel/Support/CompactPrinter.php

@@ -7,6 +7,7 @@ namespace Pest\Plugins\Parallel\Support;
 use NunoMaduro\Collision\Adapters\Phpunit\State;
 use NunoMaduro\Collision\Adapters\Phpunit\Style;
 use ParaTest\Options;
+use PHPUnit\Event\Telemetry\GarbageCollectorStatus;
 use PHPUnit\Event\Telemetry\HRTime;
 use PHPUnit\Event\Telemetry\Info;
 use PHPUnit\Event\Telemetry\MemoryUsage;
@@ -122,11 +123,25 @@ final class CompactPrinter
         $snapshotDuration = HRTime::fromSecondsAndNanoseconds((int) $duration->asSeconds(), $nanoseconds);
         $telemetryDuration = \PHPUnit\Event\Telemetry\Duration::fromSecondsAndNanoseconds((int) $duration->asSeconds(), $nanoseconds);
 
+        $status = gc_status();
+
+        $garbageCollectorStatus = new GarbageCollectorStatus(
+            $status['runs'],
+            $status['collected'],
+            $status['threshold'],
+            $status['roots'],
+            null,
+            null,
+            null,
+            null,
+        );
+
         $telemetry = new Info(
             new Snapshot(
                 $snapshotDuration,
                 MemoryUsage::fromBytes(0),
                 MemoryUsage::fromBytes(0),
+                $garbageCollectorStatus,
             ),
             $telemetryDuration,
             MemoryUsage::fromBytes(0),

src/Repositories/DatasetsRepository.php

@@ -235,6 +235,6 @@ final class DatasetsRepository
             return sprintf('(%s)', $exporter->shortenedRecursiveExport($data));
         }
 
-        return sprintf('data set "%s"', $key);
+        return sprintf('dataset "%s"', $key);
     }
 }

src/Support/Backtrace.php

@@ -30,7 +30,10 @@ final class Backtrace
 
             $traceFile = str_replace(DIRECTORY_SEPARATOR, '/', $trace[self::FILE]);
 
-            if (Str::endsWith($traceFile, 'overrides/Runner/TestSuiteLoader.php')) {
+            if (
+                Str::endsWith($traceFile, 'overrides/Runner/TestSuiteLoader.php') ||
+                Str::endsWith($traceFile, 'src/Bootstrappers/BootFiles.php')
+            ) {
                 break;
             }
 

src/Support/Container.php

@@ -25,7 +25,7 @@ final class Container
      */
     public static function getInstance(): self
     {
-        if (self::$instance === null) {
+        if (! self::$instance instanceof \Pest\Support\Container) {
             self::$instance = new self();
         }
 
@@ -72,7 +72,7 @@ final class Container
         if ($reflectionClass->isInstantiable()) {
             $constructor = $reflectionClass->getConstructor();
 
-            if ($constructor !== null) {
+            if ($constructor instanceof \ReflectionMethod) {
                 $params = array_map(
                     function (ReflectionParameter $param) use ($id): object|string {
                         $candidate = Reflection::getParameterClassName($param);
@@ -80,7 +80,7 @@ final class Container
                         if ($candidate === null) {
                             $type = $param->getType();
                             /* @phpstan-ignore-next-line */
-                            if ($type !== null && $type->isBuiltin()) {
+                            if ($type instanceof \ReflectionType && $type->isBuiltin()) {
                                 $candidate = $param->getName();
                             } else {
                                 throw ShouldNotHappen::fromMessage(sprintf('The type of `$%s` in `%s` cannot be determined.', $id, $param->getName()));

src/Support/ExceptionTrace.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace Pest\Support;
 
 use Closure;
+use PHPUnit\Framework\TestCase;
 use Throwable;
 
 /**
@@ -15,8 +16,7 @@ final class ExceptionTrace
     private const UNDEFINED_METHOD = 'Call to undefined method P\\';
 
     /**
-     * Ensures the given closure reports
-     * the good execution context.
+     * Ensures the given closure reports the good execution context.
      *
      * @return mixed
      *
@@ -28,8 +28,14 @@ final class ExceptionTrace
             return $closure();
         } catch (Throwable $throwable) {
             if (Str::startsWith($message = $throwable->getMessage(), self::UNDEFINED_METHOD)) {
+                $class = preg_match('/^Call to undefined method ([^:]+)::/', $message, $matches) === false ? null : $matches[1];
+
                 $message = str_replace(self::UNDEFINED_METHOD, 'Call to undefined method ', $message);
 
+                if (class_exists($class) && count(class_parents($class)) > 0 && array_values(class_parents($class))[0] === TestCase::class) {
+                    $message .= '. Did you forget to use the [uses()] function? Read more at: https://pestphp.com/docs/configuring-tests';
+                }
+
                 Reflection::setPropertyValue($throwable, 'message', $message);
             }
 

tests/.snapshots/Failure.php.inc

@@ -1,4 +1,5 @@
 ##teamcity[testSuiteStarted name='Tests/tests/Failure' locationHint='file://tests/.tests/Failure.php' flowId='1234']
+##teamcity[testCount count='6' flowId='1234']
 ##teamcity[testStarted name='it can fail with comparison' locationHint='pest_qn://tests/.tests/Failure.php::it can fail with comparison' flowId='1234']
 ##teamcity[testFailed name='it can fail with comparison' message='Failed asserting that true matches expected false.' details='at src/Mixins/Expectation.php:343|nat src/Support/ExpectationPipeline.php:75|nat src/Support/ExpectationPipeline.php:79|nat src/Expectation.php:300|nat tests/.tests/Failure.php:6|nat src/Factories/TestCaseMethodFactory.php:100|nat src/Concerns/Testable.php:302|nat src/Support/ExceptionTrace.php:28|nat src/Concerns/Testable.php:302|nat src/Concerns/Testable.php:221|nat src/Kernel.php:86' type='comparisonFailure' actual='true' expected='false' flowId='1234']
 ##teamcity[testFinished name='it can fail with comparison' duration='100000' flowId='1234']

tests/.snapshots/SuccessOnly.php.inc

@@ -1,4 +1,5 @@
 ##teamcity[testSuiteStarted name='Tests/tests/SuccessOnly' locationHint='file://tests/.tests/SuccessOnly.php' flowId='1234']
+##teamcity[testCount count='2' flowId='1234']
 ##teamcity[testStarted name='it can pass with comparison' locationHint='pest_qn://tests/.tests/SuccessOnly.php::it can pass with comparison' flowId='1234']
 ##teamcity[testFinished name='it can pass with comparison' duration='100000' flowId='1234']
 ##teamcity[testStarted name='can also pass' locationHint='pest_qn://tests/.tests/SuccessOnly.php::can also pass' flowId='1234']

tests/.snapshots/allows-to-run-a-directory.txt

@@ -8,4 +8,10 @@
    PASS  Tests\Fixtures\ExampleTest
   ✓ it example 2
 
-  Tests:    2 skipped, 2 passed (2 assertions)
+   WARN  Tests\Fixtures\Inheritance\Base\ExampleTest
+  - example
+
+   PASS  Tests\Fixtures\Inheritance\ExampleTest
+  ✓ example
+
+  Tests:    3 skipped, 3 passed (3 assertions)

tests/.snapshots/collision-parallel.txt

@@ -1,5 +1,5 @@
 
-  ⨯.
+  .⨯.
   ────────────────────────────────────────────────────────────────────────────  
    FAILED  Tests\Fixtures\CollisionTest > error                     Exception   
   error
@@ -19,4 +19,4 @@
   2   src/Factories/TestCaseMethodFactory.php:100
 
 
-  Tests:    1 failed, 1 passed (1 assertions)
+  Tests:    1 failed, 2 passed (2 assertions)

tests/.snapshots/help-command.txt

@@ -1,5 +1,5 @@
 
-  Pest Testing Framework 2.2.3.  
+  Pest Testing Framework 2.4.0.  
 
   USAGE: pest <file> [options]  
 
@@ -43,17 +43,21 @@
   --enforce-time-limit ................. Enforce time limit based on test size  
   --default-time-limit [sec]  Timeout in seconds for tests that have no declared size  
   --dont-report-useless-tests .. Do not report tests that do not test anything  
-  --stop-on-defect ................. Stop execution upon first not-passed test  
-  --stop-on-error ............................ Stop execution upon first error  
-  --stop-on-failure ............... Stop execution upon first error or failure  
-  --stop-on-warning ........................ Stop execution upon first warning  
-  --stop-on-risky ....................... Stop execution upon first risky test  
-  --stop-on-skipped ................... Stop execution upon first skipped test  
-  --stop-on-incomplete ............. Stop execution upon first incomplete test  
-  --fail-on-incomplete .................... Treat incomplete tests as failures  
-  --fail-on-risky .............................. Treat risky tests as failures  
-  --fail-on-skipped .......................... Treat skipped tests as failures  
-  --fail-on-warning .................... Treat tests with warnings as failures  
+  --stop-on-defect ... Stop after first error, failure, warning, or risky test  
+  --stop-on-error ..................................... Stop after first error  
+  --stop-on-failure ................................. Stop after first failure  
+  --stop-on-warning ................................. Stop after first warning  
+  --stop-on-risky ................................ Stop after first risky test  
+  --stop-on-deprecation ... Stop after first test that triggered a deprecation  
+  --stop-on-notice ............. Stop after first test that triggered a notice  
+  --stop-on-skipped ............................ Stop after first skipped test  
+  --stop-on-incomplete ...................... Stop after first incomplete test  
+  --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-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  
   --cache-result ............................ Write test results to cache file  
   --do-not-cache-result .............. Do not write test results to cache file  
   --order-by [order]  Run tests in order: default|defects|depends|duration|no-depends|random|reverse|size  

tests/.snapshots/success.txt

@@ -60,8 +60,8 @@
   ✓ eager wrapped registered datasets with (1)
   ✓ eager wrapped registered datasets with (2)
   ✓ eager registered wrapped datasets did the job right
-  ✓ named datasets with data set "one"
-  ✓ named datasets with data set "two"
+  ✓ named datasets with dataset "one"
+  ✓ named datasets with dataset "two"
   ✓ named datasets did the job right
   ✓ lazy named datasets with (Bar Object (…))
   ✓ it creates unique test case names with ('Name 1', Pest\Plugin Object (), true) #1
@@ -96,10 +96,10 @@
   ✓ eager wrapped registered multiple datasets with (2) / (1)
   ✓ eager wrapped registered multiple datasets with (2) / (2)
   ✓ eager wrapped registered multiple datasets did the job right
-  ✓ named multiple datasets with data set "one" / data set "three"
-  ✓ named multiple datasets with data set "one" / data set "four"
-  ✓ named multiple datasets with data set "two" / data set "three"
-  ✓ named multiple datasets with data set "two" / data set "four"
+  ✓ named multiple datasets with dataset "one" / dataset "three"
+  ✓ named multiple datasets with dataset "one" / dataset "four"
+  ✓ named multiple datasets with dataset "two" / dataset "three"
+  ✓ named multiple datasets with dataset "two" / dataset "four"
   ✓ named multiple datasets did the job right
   ✓ more than two datasets with (1) / (3) / (5)
   ✓ more than two datasets with (1) / (3) / (6)
@@ -115,8 +115,8 @@
   ✓ eager registered wrapped datasets with Generator functions with (3)
   ✓ eager registered wrapped datasets with Generator functions with (4)
   ✓ eager registered wrapped datasets with Generator functions did the job right
-  ✓ eager registered wrapped datasets with Generator functions display description with data set "taylor"
-  ✓ eager registered wrapped datasets with Generator functions display description with data set "james"
+  ✓ eager registered wrapped datasets with Generator functions display description with dataset "taylor"
+  ✓ eager registered wrapped datasets with Generator functions display description with dataset "james"
   ✓ it can resolve a dataset after the test case is available with (Closure Object (…)) #1
   ✓ it can resolve a dataset after the test case is available with (Closure Object (…)) #2
   ✓ it can resolve a dataset after the test case is available with multiple datasets with (Closure Object (…)) / (Closure Object (…)) #1
@@ -153,7 +153,7 @@
 
    DEPR  Tests\Features\Deprecated
   ! deprecated → str_contains(): Passing null to parameter #2 ($needle) of type string is deprecated // tests/Features/Deprecated.php:6
-  ! user deprecated → Since foo 1.0: This is a deprecation description // vendor/symfony/deprecation-contracts/function.php:25
+  ✓ user deprecated
 
    PASS  Tests\Features\Exceptions
   ✓ it gives access the the underlying expectException
@@ -332,14 +332,14 @@
   ✓ failures with custom message
   ✓ not failures
 
-   PASS  Tests\Features\Expect\toBeGreatherThan
+   PASS  Tests\Features\Expect\toBeGreaterThan
   ✓ passes
   ✓ passes with DateTime and DateTimeImmutable
   ✓ failures
   ✓ failures with custom message
   ✓ not failures
 
-   PASS  Tests\Features\Expect\toBeGreatherThanOrEqual
+   PASS  Tests\Features\Expect\toBeGreaterThanOrEqual
   ✓ passes
   ✓ passes with DateTime and DateTimeImmutable
   ✓ failures
@@ -673,6 +673,7 @@
   ✓ it throws error if method do not exist
   ✓ it can forward unexpected calls to any global function
   ✓ it can use helpers from helpers file
+  ✓ it can use helpers from helpers directory
 
    PASS  Tests\Features\HigherOrderTests
   ✓ it proxies calls to object
@@ -789,6 +790,9 @@
    PASS  Tests\Fixtures\ExampleTest
   ✓ it example 2
 
+   PASS  Tests\Helpers\TestInHelpers
+  ✓ it executes tests in the Helpers directory
+
    PASS  Tests\Hooks\AfterAllTest
   ✓ global afterAll execution order
   ✓ it only gets called once per file
@@ -864,6 +868,9 @@
   ✓ it throw expectation failed exception with string argument
   ✓ it throw expectation failed exception with array argument
 
+   PASS  Tests\Unit\Overrides\ThrowableBuilder
+  ✓ collision editor can be added to the stack trace
+
    PASS  Tests\Unit\Plugins\Environment
   ✓ environment is set to CI when --ci option is used
   ✓ environment is set to Local when --ci option is not used
@@ -903,6 +910,10 @@
   ✓ 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
+
    PASS  Tests\Unit\Support\Reflection
   ✓ it gets file name from closure
   ✓ it gets property values
@@ -984,6 +995,7 @@
 
    PASS  Tests\Visual\Parallel
   ✓ parallel
+  ✓ a parallel test can extend another test with same name
 
    PASS  Tests\Visual\SingleTestOrDirectory
   ✓ allows to run a single test
@@ -1004,4 +1016,4 @@
    PASS  Tests\Visual\Version
   ✓ visual snapshot of help command output
 
-  Tests:    2 deprecated, 3 warnings, 4 incomplete, 1 notice, 4 todos, 14 skipped, 703 passed (1702 assertions)
+  Tests:    1 deprecated, 3 warnings, 4 incomplete, 1 notice, 4 todos, 14 skipped, 710 passed (1717 assertions)

tests/.snapshots/version-command.txt

@@ -1,3 +1,3 @@
 
-  Pest Testing Framework 2.2.3.  
+  Pest Testing Framework 2.4.0.  
 

tests/Features/Expect/toHaveProperties.php

@@ -4,30 +4,49 @@ use PHPUnit\Framework\ExpectationFailedException;
 
 test('pass', function () {
     $object = new stdClass();
-    $object->name = 'Jhon';
+    $object->name = 'John';
     $object->age = 21;
 
-    expect($object)->toHaveProperties(['name', 'age']);
+    expect($object)
+        ->toHaveProperties(['name', 'age'])
+        ->toHaveProperties([
+            'name' => 'John',
+            'age' => 21,
+        ]);
 });
 
 test('failures', function () {
     $object = new stdClass();
-    $object->name = 'Jhon';
+    $object->name = 'John';
 
-    expect($object)->toHaveProperties(['name', 'age']);
+    expect($object)
+        ->toHaveProperties(['name', 'age'])
+        ->toHaveProperties([
+            'name' => 'John',
+            'age' => 21,
+        ]);
 })->throws(ExpectationFailedException::class);
 
 test('failures with custom message', function () {
     $object = new stdClass();
-    $object->name = 'Jhon';
+    $object->name = 'John';
 
-    expect($object)->toHaveProperties(['name', 'age'], 'oh no!');
+    expect($object)
+        ->toHaveProperties(['name', 'age'], 'oh no!')
+        ->toHaveProperties([
+            'name' => 'John',
+            'age' => 21,
+        ], 'oh no!');
 })->throws(ExpectationFailedException::class, 'oh no!');
 
 test('not failures', function () {
     $object = new stdClass();
-    $object->name = 'Jhon';
+    $object->name = 'John';
     $object->age = 21;
 
-    expect($object)->not->toHaveProperties(['name', 'age']);
+    expect($object)->not->toHaveProperties(['name', 'age'])
+        ->not->toHaveProperties([
+            'name' => 'John',
+            'age' => 21,
+        ]);
 })->throws(ExpectationFailedException::class);

tests/Features/Helpers.php

@@ -44,3 +44,5 @@ it('throws error if method do not exist', function () {
 it('can forward unexpected calls to any global function')->_assertThat();
 
 it('can use helpers from helpers file')->myAssertTrue(true);
+
+it('can use helpers from helpers directory')->myDirectoryAssertTrue(true);

tests/Fixtures/Inheritance/Base/ExampleTest.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Tests\Fixtures\Inheritance\Base;
+
+use PHPUnit\Framework\TestCase;
+
+class ExampleTest extends TestCase
+{
+    public function testExample()
+    {
+        $this->markTestSkipped();
+    }
+}

tests/Fixtures/Inheritance/ExampleTest.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Tests\Fixtures\Inheritance;
+
+class ExampleTest extends Base\ExampleTest
+{
+    public function testExample()
+    {
+        $this->assertTrue(true);
+    }
+}

tests/Helpers/Helper.php

@@ -0,0 +1,6 @@
+<?php
+
+function myDirectoryAssertTrue($value)
+{
+    test()->assertTrue($value);
+}

tests/Helpers/TestInHelpers.php

@@ -0,0 +1,5 @@
+<?php
+
+it('executes tests in the Helpers directory', function () {
+    expect(true)->toBeTrue();
+});

tests/Unit/DatasetsTests.php

@@ -10,8 +10,8 @@ it('show only the names of named datasets in their description', function () {
         ],
     ], __FILE__));
 
-    expect($descriptions[0])->toBe('data set "one"')
-        ->and($descriptions[1])->toBe('data set "two"');
+    expect($descriptions[0])->toBe('dataset "one"')
+        ->and($descriptions[1])->toBe('dataset "two"');
 });
 
 it('show the actual dataset of non-named datasets in their description', function () {
@@ -38,10 +38,10 @@ it('show only the names of multiple named datasets in their description', functi
         ],
     ], __FILE__));
 
-    expect($descriptions[0])->toBe('data set "one" / data set "three"');
-    expect($descriptions[1])->toBe('data set "one" / data set "four"');
-    expect($descriptions[2])->toBe('data set "two" / data set "three"');
-    expect($descriptions[3])->toBe('data set "two" / data set "four"');
+    expect($descriptions[0])->toBe('dataset "one" / dataset "three"');
+    expect($descriptions[1])->toBe('dataset "one" / dataset "four"');
+    expect($descriptions[2])->toBe('dataset "two" / dataset "three"');
+    expect($descriptions[3])->toBe('dataset "two" / dataset "four"');
 });
 
 it('show the actual dataset of multiple non-named datasets in their description', function () {
@@ -74,10 +74,10 @@ it('show the correct description for mixed named and not-named datasets', functi
         ],
     ], __FILE__));
 
-    expect($descriptions[0])->toBe('data set "one" / (3)');
-    expect($descriptions[1])->toBe('data set "one" / data set "four"');
+    expect($descriptions[0])->toBe('dataset "one" / (3)');
+    expect($descriptions[1])->toBe('dataset "one" / dataset "four"');
     expect($descriptions[2])->toBe('([2]) / (3)');
-    expect($descriptions[3])->toBe('([2]) / data set "four"');
+    expect($descriptions[3])->toBe('([2]) / dataset "four"');
 });
 
 it('shows the correct description for long texts with newlines', function () {

tests/Unit/Overrides/ThrowableBuilder.php

@@ -0,0 +1,28 @@
+<?php
+
+use NunoMaduro\Collision\Contracts\RenderableOnCollisionEditor;
+use PHPUnit\Event\Code\ThrowableBuilder;
+use Whoops\Exception\Frame;
+
+test('collision editor can be added to the stack trace', function () {
+    $exception = new class extends Exception implements RenderableOnCollisionEditor
+    {
+        public function __construct()
+        {
+            parent::__construct('test exception');
+        }
+
+        public function toCollisionEditor(): Frame
+        {
+            return new Frame([
+                'file' => __DIR__.'/../../Pest.php',
+                'line' => 5,
+            ]);
+        }
+    };
+
+    expect(str_replace(DIRECTORY_SEPARATOR, '/', ThrowableBuilder::from($exception)->stackTrace()))
+        ->toContain('tests/Unit/Overrides/../../Pest.php:5')
+        ->and(str_replace(DIRECTORY_SEPARATOR, '/', ThrowableBuilder::from(new Exception('test'))->stackTrace()))
+        ->toContain('tests/Unit/Overrides/ThrowableBuilder.php:26');
+});

tests/Unit/Support/ExceptionTrace.php

@@ -0,0 +1,21 @@
+<?php
+
+use Pest\Support\ExceptionTrace;
+
+it('ensures the given closures reports the correct class name', function () {
+    $closure = function () {
+        throw new Exception('Call to undefined method P\Tests\IntentionallyNotExisting::testBasic().');
+    };
+
+    ExceptionTrace::ensure($closure);
+})->throws(
+    Exception::class,
+    'Call to undefined method Tests\IntentionallyNotExisting::testBasic().',
+);
+
+it('ensures the given closures reports the correct class name and suggests the [uses()] function', function () {
+    $this->get();
+})->throws(
+    Error::class,
+    'Call to undefined method Tests\Unit\Support\ExceptionTrace::get(). Did you forget to use the [uses()] function? Read more at: https://pestphp.com/docs/configuring-tests',
+);

tests/Visual/Collision.php

@@ -39,4 +39,4 @@ test('collision', function (array $arguments) {
 })->with([
     [['']],
     [['--parallel']],
-])->skip(PHP_OS_FAMILY === 'Windows');
+])->skipOnWindows();

tests/Visual/Help.php

@@ -18,4 +18,4 @@ test('visual snapshot of help command output', function () {
     }
 
     expect($output())->toContain(file_get_contents($snapshot));
-})->skip(PHP_OS_FAMILY === 'Windows');
+})->skipOnWindows();

tests/Visual/Parallel.php

@@ -3,7 +3,9 @@
 use Symfony\Component\Process\Process;
 
 $run = function () {
-    $process = new Process(['php', 'bin/pest', '--parallel', '--processes=3', '--exclude-group=integration'], dirname(__DIR__, 2),
+    $process = new Process(
+        array_merge(['php', 'bin/pest', '--parallel', '--processes=3'], func_get_args()),
+        dirname(__DIR__, 2),
         ['COLLISION_PRINTER' => 'DefaultPrinter', 'COLLISION_IGNORE_DURATION' => 'true'],
     );
 
@@ -15,6 +17,11 @@ $run = function () {
 };
 
 test('parallel', function () use ($run) {
-    expect($run())->toContain('Tests:    2 deprecated, 3 warnings, 4 incomplete, 1 notice, 4 todos, 11 skipped, 692 passed (1688 assertions)')
+    expect($run('--exclude-group=integration'))
+        ->toContain('Tests:    1 deprecated, 3 warnings, 4 incomplete, 1 notice, 4 todos, 11 skipped, 698 passed (1702 assertions)')
         ->toContain('Parallel: 3 processes');
-})->skip(PHP_OS_FAMILY === 'Windows');
+})->skipOnWindows();
+
+test('a parallel test can extend another test with same name', function () use ($run) {
+    expect($run('tests/Fixtures/Inheritance'))->toContain('Tests:    1 skipped, 2 passed (2 assertions)');
+});

tests/Visual/SingleTestOrDirectory.php

@@ -24,11 +24,11 @@ $snapshot = function ($name) {
 
 test('allows to run a single test', function () use ($run, $snapshot) {
     expect($run('tests/Fixtures/DirectoryWithTests/ExampleTest.php'))->toContain($snapshot('allows-to-run-a-single-test'));
-})->skip(PHP_OS_FAMILY === 'Windows');
+})->skipOnWindows();
 
 test('allows to run a directory', function () use ($run, $snapshot) {
     expect($run('tests/Fixtures'))->toContain($snapshot('allows-to-run-a-directory'));
-})->skip(PHP_OS_FAMILY === 'Windows');
+})->skipOnWindows();
 
 it('disable decorating printer when colors is set to never', function () use ($snapshot) {
     $process = new Process([
@@ -40,4 +40,4 @@ it('disable decorating printer when colors is set to never', function () use ($s
     $process->run();
     $output = $process->getOutput();
     expect($output)->toContain($snapshot('disable-decorating-printer'));
-})->skip(PHP_OS_FAMILY === 'Windows');
+})->skipOnWindows();

tests/Visual/Success.php

@@ -41,4 +41,4 @@ test('visual snapshot of test suite on success', function () {
         expect(implode("\n", $output))->toContain(file_get_contents($snapshot));
     }
 })->skip(! getenv('REBUILD_SNAPSHOTS') && getenv('EXCLUDE'))
-    ->skip(PHP_OS_FAMILY === 'Windows');
+    ->skipOnWindows();

tests/Visual/Todo.php

@@ -26,8 +26,8 @@ $snapshot = function ($name) {
 
 test('todo', function () use ($run, $snapshot) {
     expect($run('--todos', false))->toContain($snapshot('todo'));
-})->skip(PHP_OS_FAMILY === 'Windows');
+})->skipOnWindows();
 
 test('todo in parallel', function () use ($run, $snapshot) {
     expect($run('--todos', true))->toContain($snapshot('todo'));
-})->skip(PHP_OS_FAMILY === 'Windows');
+})->skipOnWindows();

tests/Visual/Version.php

@@ -18,4 +18,4 @@ test('visual snapshot of help command output', function () {
     }
 
     expect($output())->toContain(file_get_contents($snapshot));
-})->skip(PHP_OS_FAMILY === 'Windows');
+})->skipOnWindows();