ci: speed up ci

fix: replace `substr` with `mb_substr` in Str::beforeLast to ensure multibyte string compatibility and correct TeamCity test names for datasets in "describe" blocks

.github/workflows/static.yml

@@ -2,10 +2,15 @@ name: Static Analysis
 
 on:
   push:
+    branches: [4.x]
   pull_request:
   schedule:
     - cron: '0 0 * * *'
 
+concurrency:
+  group: static-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   static:
     if: github.event_name != 'schedule' || github.repository == 'pestphp/pest'
@@ -19,7 +24,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -29,8 +34,22 @@ jobs:
         coverage: none
         extensions: sockets
 
+    - name: Get Composer cache directory
+      id: composer-cache
+      shell: bash
+      run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+    - name: Cache Composer dependencies
+      uses: actions/cache@v4
+      with:
+        path: ${{ steps.composer-cache.outputs.dir }}
+        key: static-php-8.3-${{ matrix.dependency-version }}-composer-${{ hashFiles('**/composer.json') }}
+        restore-keys: |
+          static-php-8.3-${{ matrix.dependency-version }}-composer-
+          static-php-8.3-composer-
+
     - name: Install Dependencies
-      run: composer update --prefer-stable --no-interaction --no-progress --ansi
+      run: composer update --${{ matrix.dependency-version }} --no-interaction --no-progress --ansi
 
     - name: Profanity Check
       run: composer test:profanity

.github/workflows/tests.yml

@@ -2,8 +2,13 @@ name: Tests
 
 on:
   push:
+    branches: [4.x]
   pull_request:
 
+concurrency:
+  group: tests-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   tests:
     if: github.event_name != 'schedule' || github.repository == 'pestphp/pest'
@@ -13,15 +18,18 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, macos-latest] # windows-latest
-        symfony: ['7.3']
+        symfony: ['7.4', '8.0']
         php: ['8.3', '8.4', '8.5']
         dependency_version: [prefer-stable]
+        exclude:
+          - php: '8.3'
+            symfony: '8.0'
 
     name: PHP ${{ matrix.php }} - Symfony ^${{ matrix.symfony }} - ${{ matrix.os }} - ${{ matrix.dependency_version }}
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -31,6 +39,20 @@ jobs:
         coverage: none
         extensions: sockets
 
+    - name: Get Composer cache directory
+      id: composer-cache
+      shell: bash
+      run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+    - name: Cache Composer dependencies
+      uses: actions/cache@v4
+      with:
+        path: ${{ steps.composer-cache.outputs.dir }}
+        key: ${{ matrix.os }}-php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-composer-${{ hashFiles('**/composer.json') }}
+        restore-keys: |
+          ${{ matrix.os }}-php-${{ matrix.php }}-symfony-${{ matrix.symfony }}-composer-
+          ${{ matrix.os }}-php-${{ matrix.php }}-composer-
+
     - name: Setup Problem Matches
       run: |
         echo "::add-matcher::${{ runner.tool_cache }}/php.json"

README.md

@@ -5,6 +5,7 @@
         <a href="https://packagist.org/packages/pestphp/pest"><img alt="Total Downloads" src="https://img.shields.io/packagist/dt/pestphp/pest"></a>
         <a href="https://packagist.org/packages/pestphp/pest"><img alt="Latest Version" src="https://img.shields.io/packagist/v/pestphp/pest"></a>
         <a href="https://packagist.org/packages/pestphp/pest"><img alt="License" src="https://img.shields.io/packagist/l/pestphp/pest"></a>
+        <a href="https://whyphp.dev"><img src="https://img.shields.io/badge/Why_PHP-in_2026-7A86E8?style=flat-square&labelColor=18181b" alt="Why PHP in 2026"></a>
     </p>
 </p>
 
@@ -30,25 +31,23 @@ We cannot thank our sponsors enough for their incredible support in funding Pest
 
 ### Platinum Sponsors
 
-- **[Laracasts](https://laracasts.com/?ref=pestphp)**
+- **[CodeRabbit](https://coderabbit.ai/?ref=pestphp)**
-- **[NativePHP](https://nativephp.com/mobile?ref=pestphp.com)**
+- **[Devin](https://devin.ai/?ref=nunomaduro)**
+- **[Mailtrap](https://l.rw.rw/pestphp)**
+- **[Tighten](https://tighten.com/?ref=nunomaduro)**
+- **[Redberry](https://redberry.international/laravel-development/?utm_source=pest&utm_medium=banner&utm_campaign=pest_sponsorship)**
 
 ### Gold Sponsors
 
-- **[CodeRabbit](https://coderabbit.ai/?ref=pestphp)**
 - **[CMS Max](https://cmsmax.com/?ref=pestphp)**
 
 ### Premium Sponsors
 
-- [Forge](https://forge.laravel.com/?ref=pestphp)
+- [Zapiet](https://zapiet.com/?ref=pestphp)
-- [Zapiet](https://www.zapiet.com/?ref=pestphp)
-- [Localazy](https://localazy.com/?ref=pestphp)
 - [Load Forge](https://loadforge.com/?ref=pestphp)
-- [DocuWriter.ai](https://www.docuwriter.ai/?ref=pestphp)
+- [Route4Me](https://route4me.com/pt?ref=pestphp)
-- [Route4Me](https://www.route4me.com/?ref=pestphp)
+- [Nerdify](https://getnerdify.com/?ref=pestphp)
-- [Devtools for Livewire](https://devtools-for-livewire.com/?ref=pestphp)
-- [Nerdify](https://www.getnerdify.com/?ref=pestphp)
 - [Akaunting](https://akaunting.com/?ref=pestphp)
-- [LambdaTest](https://lambdatest.com/?ref=pestphp)
+- [TestMu AI](https://www.testmuai.com/?utm_medium=sponsor&utm_source=pest)
 
 Pest is an open-sourced software licensed under the **[MIT license](https://opensource.org/licenses/MIT)**.

composer.json

@@ -18,19 +18,19 @@
     ],
     "require": {
         "php": "^8.3.0",
-        "brianium/paratest": "^7.14.2",
+        "brianium/paratest": "^7.19.0",
-        "nunomaduro/collision": "^8.8.3",
+        "nunomaduro/collision": "^8.9.0",
-        "nunomaduro/termwind": "^2.3.3",
+        "nunomaduro/termwind": "^2.4.0",
         "pestphp/pest-plugin": "^4.0.0",
         "pestphp/pest-plugin-arch": "^4.0.0",
         "pestphp/pest-plugin-mutate": "^4.0.1",
-        "pestphp/pest-plugin-profanity": "^4.2.0",
+        "pestphp/pest-plugin-profanity": "^4.2.1",
-        "phpunit/phpunit": "^12.4.4",
+        "phpunit/phpunit": "^12.5.12",
-        "symfony/process": "^7.3.4"
+        "symfony/process": "^7.4.5|^8.0.5"
     },
     "conflict": {
         "filp/whoops": "<2.18.3",
-        "phpunit/phpunit": ">12.4.4",
+        "phpunit/phpunit": ">12.5.12",
         "sebastian/exporter": "<7.0.0",
         "webmozart/assert": "<1.11.0"
     },
@@ -55,10 +55,10 @@
         ]
     },
     "require-dev": {
-        "pestphp/pest-dev-tools": "^4.0.0",
+        "pestphp/pest-dev-tools": "^4.1.0",
-        "pestphp/pest-plugin-browser": "^4.1.1",
+        "pestphp/pest-plugin-browser": "^4.3.0",
         "pestphp/pest-plugin-type-coverage": "^4.0.3",
-        "psy/psysh": "^0.12.14"
+        "psy/psysh": "^0.12.20"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,

rector.php

@@ -2,8 +2,9 @@
 
 declare(strict_types=1);
 
-use Rector\CodingStyle\Rector\FunctionLike\FunctionLikeToFirstClassCallableRector;
+use Rector\CodingStyle\Rector\ArrowFunction\ArrowFunctionDelegatingCallToFirstClassCallableRector;
 use Rector\Config\RectorConfig;
+use Rector\DeadCode\Rector\ClassMethod\RemoveParentDelegatingConstructorRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\NarrowObjectReturnTypeRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector;
 
@@ -14,8 +15,9 @@ return RectorConfig::configure()
     ->withSkip([
         __DIR__.'/src/Plugins/Parallel/Paratest/WrapperRunner.php',
         ReturnNeverTypeRector::class,
-        FunctionLikeToFirstClassCallableRector::class,
+        ArrowFunctionDelegatingCallToFirstClassCallableRector::class,
         NarrowObjectReturnTypeRector::class,
+        RemoveParentDelegatingConstructorRector::class,
     ])
     ->withPreparedSets(
         deadCode: true,

src/ArchPresets/Php.php

@@ -4,9 +4,6 @@ declare(strict_types=1);
 
 namespace Pest\ArchPresets;
 
-use Pest\Arch\Contracts\ArchExpectation;
-use Pest\Expectation;
-
 /**
  * @internal
  */
@@ -92,9 +89,5 @@ final class Php extends AbstractPreset
             'xdebug_var_dump',
             'trap',
         ])->not->toBeUsed();
-
-        $this->eachUserNamespace(
-            fn (Expectation $namespace): ArchExpectation => $namespace->not->toHaveSuspiciousCharacters(),
-        );
     }
 }

src/Concerns/Extendable.php

@@ -8,6 +8,8 @@ use Closure;
 
 /**
  * @internal
+ *
+ * @template T of object
  */
 trait Extendable
 {
@@ -20,6 +22,8 @@ trait Extendable
 
     /**
      * Register a new extend.
+     *
+     * @param-closure-this T $extend
      */
     public function extend(string $name, Closure $extend): void
     {

src/Configuration.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Pest;
 
+use Pest\PendingCalls\BeforeEachCall;
 use Pest\PendingCalls\UsesCall;
 
 /**
@@ -62,6 +63,14 @@ final readonly class Configuration
         return (new UsesCall($this->filename, []))->group(...$groups);
     }
 
+    /**
+     * Marks all tests in the current file to be run exclusively.
+     */
+    public function only(): void
+    {
+        (new BeforeEachCall(TestSuite::getInstance(), $this->filename))->only();
+    }
+
     /**
      * Depending on where is called, it will extend the given classes and traits globally or locally.
      */

src/Expectation.php

@@ -52,7 +52,9 @@ use ReflectionProperty;
  */
 final class Expectation
 {
+    /** @use Extendable<self<TValue>> */
     use Extendable;
+
     use Pipeable;
     use Retrievable;
 

src/Expectations/OppositeExpectation.php

@@ -15,6 +15,7 @@ use Pest\Arch\PendingArchExpectation;
 use Pest\Arch\SingleArchExpectation;
 use Pest\Arch\Support\FileLineFinder;
 use Pest\Exceptions\InvalidExpectation;
+use Pest\Exceptions\MissingDependency;
 use Pest\Expectation;
 use Pest\Support\Arr;
 use Pest\Support\Exporter;
@@ -284,6 +285,10 @@ final readonly class OppositeExpectation
      */
     public function toHaveSuspiciousCharacters(): ArchExpectation
     {
+        if (! class_exists(Spoofchecker::class)) {
+            throw new MissingDependency(__FUNCTION__, 'ext-intl >= 2.0');
+        }
+
         $checker = new Spoofchecker;
 
         /** @var Expectation<array<int, string>|string> $original */

src/Pest.php

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

src/Plugins/Help.php

@@ -99,6 +99,7 @@ final readonly class Help implements HandlesArguments
     {
         $helpReflection = new PHPUnitHelp;
 
+        // @phpstan-ignore-next-line
         $content = (fn (): array => $this->elements())->call($helpReflection);
 
         $content['Configuration'] = [...[[
@@ -141,6 +142,9 @@ final readonly class Help implements HandlesArguments
         ], [
             'arg' => '--retry',
             'desc' => 'Run non-passing tests first and stop execution upon first error or failure',
+        ], [
+            'arg' => '--dirty',
+            'desc' => 'Only run tests that have uncommitted changes according to Git',
         ], ...$content['Selection']];
 
         $content['Reporting'] = [...$content['Reporting'], ...[

src/Support/HigherOrderCallables.php

@@ -46,6 +46,7 @@ final readonly class HigherOrderCallables
      */
     public function and(mixed $value): Expectation
     {
+        // @phpstan-ignore-next-line
         return $this->expect($value);
     }
 

src/Support/Str.php

@@ -79,7 +79,7 @@ final class Str
             return $subject;
         }
 
-        return substr($subject, 0, $pos);
+        return mb_substr($subject, 0, $pos);
     }
 
     /**

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

@@ -1,5 +1,5 @@
 
-  Pest Testing Framework 4.1.5.  
+  Pest Testing Framework 4.3.2.  
 
   USAGE: pest <file> [options]  
 
@@ -27,6 +27,8 @@
   --pr .... Output to standard output tests with the given pull request number  
   --pull-request  Output to standard output tests with the given pull request number (alias for --pr)  
   --retry  Run non-passing tests first and stop execution upon first error or failure  
+  --dirty ...... Only run tests that have uncommitted changes according to Git  
+  --all .................... Ignore test selection from XML configuration file  
   --list-suites ................................... List available test suites  
   --testsuite [name] ......... Only run tests from the specified test suite(s)  
   --exclude-testsuite [name] .. Exclude tests from the specified test suite(s)  
@@ -138,6 +140,7 @@
   --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  
+  --exclude-source-from-xml-coverage  Exclude [source] element from code coverage report in XML format  
   --warm-coverage-cache ........................... Warm static analysis cache  
   --coverage-filter [dir] ........... Include [dir] in code coverage reporting  
   --path-coverage .......... Report path coverage in addition to line coverage  

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

@@ -1,3 +1,3 @@
 
-  Pest Testing Framework 4.1.5.  
+  Pest Testing Framework 4.3.2.  
 

tests/.snapshots/SuccessOnly.php.inc

@@ -1,5 +1,5 @@
 ##teamcity[testSuiteStarted name='Tests/tests/SuccessOnly' locationHint='pest_qn://tests/.tests/SuccessOnly.php' flowId='1234']
-##teamcity[testCount count='3' flowId='1234']
+##teamcity[testCount count='4' 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']
@@ -8,8 +8,12 @@
 ##teamcity[testStarted name='can pass with dataset with data set "(true)"' locationHint='pest_qn://tests/.tests/SuccessOnly.php::can pass with dataset with data set "(true)"' flowId='1234']
 ##teamcity[testFinished name='can pass with dataset with data set "(true)"' duration='100000' flowId='1234']
 ##teamcity[testSuiteFinished name='can pass with dataset' flowId='1234']
+##teamcity[testSuiteStarted name='`block` → can pass with dataset in describe block' locationHint='pest_qn://tests/.tests/SuccessOnly.php::`block` → can pass with dataset in describe block' flowId='1234']
+##teamcity[testStarted name='`block` → can pass with dataset in describe block with data set "(1)"' locationHint='pest_qn://tests/.tests/SuccessOnly.php::`block` → can pass with dataset in describe block with data set "(1)"' flowId='1234']
+##teamcity[testFinished name='`block` → can pass with dataset in describe block with data set "(1)"' duration='100000' flowId='1234']
+##teamcity[testSuiteFinished name='`block` → can pass with dataset in describe block' flowId='1234']
 ##teamcity[testSuiteFinished name='Tests/tests/SuccessOnly' flowId='1234']
 
-  Tests:    3 passed (3 assertions)
+  Tests:    4 passed (4 assertions)
   Duration: 1.00s
 

tests/.snapshots/success.txt

@@ -1782,4 +1782,4 @@
   ✓ pass with dataset with ('my-datas-set-value')
   ✓ within describe → pass with dataset with ('my-datas-set-value')
 
-  Tests:    2 deprecated, 4 warnings, 5 incomplete, 2 notices, 39 todos, 35 skipped, 1188 passed (2814 assertions)
+  Tests:    2 deprecated, 4 warnings, 5 incomplete, 2 notices, 39 todos, 35 skipped, 1188 passed (2813 assertions)

tests/.tests/SuccessOnly.php

@@ -13,3 +13,9 @@ test('can also pass', function () {
 test('can pass with dataset', function ($value) {
     expect($value)->toEqual(true);
 })->with([true]);
+
+describe('block', function () {
+    test('can pass with dataset in describe block', function ($number) {
+        expect($number)->toBeInt();
+    })->with([1]);
+});

tests/Visual/JUnit.php

@@ -36,8 +36,8 @@ test('junit output', function () use ($normalizedPath, $run) {
     expect($result['testsuite']['@attributes'])
         ->name->toBe('Tests\tests\SuccessOnly')
         ->file->toBe($normalizedPath('tests/.tests/SuccessOnly.php'))
-        ->tests->toBe('3')
+        ->tests->toBe('4')
-        ->assertions->toBe('3')
+        ->assertions->toBe('4')
         ->errors->toBe('0')
         ->failures->toBe('0')
         ->skipped->toBe('0');

tests/Visual/Parallel.php

@@ -16,7 +16,7 @@ $run = function () {
 
 test('parallel', function () use ($run) {
     expect($run('--exclude-group=integration'))
-        ->toContain('Tests:    2 deprecated, 4 warnings, 5 incomplete, 2 notices, 39 todos, 26 skipped, 1178 passed (2790 assertions)')
+        ->toContain('Tests:    2 deprecated, 4 warnings, 5 incomplete, 2 notices, 39 todos, 26 skipped, 1177 passed (2789 assertions)')
         ->toContain('Parallel: 3 processes');
 })->skipOnWindows();