[6.x] Pest

.github/workflows/tests.yml

@@ -23,18 +23,39 @@
       contents: read
 
     strategy:
+      fail-fast: false
       matrix:
         php: [8.3, 8.4, 8.5]
         laravel: [12.*, 13.*]
         stability: [prefer-lowest, prefer-stable]
         os: [ubuntu-latest]
+        shard: [1, 2, 3, 4]
+        # An include entry that overrides an existing matrix key (os) creates a standalone
+        # combination rather than merging, so it wouldn't inherit the shard dimension.
+        # Windows is the slowest job, so each shard has to be listed explicitly.
         include:
           - os: windows-latest
             php: 8.5
             laravel: 12.*
             stability: prefer-stable
+            shard: 1
+          - os: windows-latest
+            php: 8.5
+            laravel: 12.*
+            stability: prefer-stable
+            shard: 2
+          - os: windows-latest
+            php: 8.5
+            laravel: 12.*
+            stability: prefer-stable
+            shard: 3
+          - os: windows-latest
+            php: 8.5
+            laravel: 12.*
+            stability: prefer-stable
+            shard: 4
 
-    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
+    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} - shard ${{ matrix.shard }}/4
 
     steps:
       - name: Checkout code
@@ -101,7 +122,19 @@
 
       - name: Execute tests
         if: steps.should-run-tests.outputs.result == 'true'
-        run: vendor/bin/phpunit
+        run: vendor/bin/pest --shard=${{ matrix.shard }}/4 --ci
+
+  php-tests-result:
+    name: PHP tests
+    runs-on: ubuntu-latest
+    needs: [php-tests]
+    if: always()
+    permissions: {}
+
+    steps:
+      - name: Fail if any shard failed
+        if: needs.php-tests.result != 'success' && needs.php-tests.result != 'skipped'
+        run: exit 1
 
   js-tests:
     runs-on: ubuntu-latest
@@ -159,7 +192,7 @@
   slack:
     name: Slack Notification
     runs-on: ubuntu-latest
-    needs: [php-tests, js-tests]
+    needs: [php-tests-result, js-tests]
     permissions:
       actions: read # required by workflow-conclusion-action to determine overall workflow status
     if: always()

composer.json

@@ -52,6 +52,7 @@
         "laravel/socialite": "^5.28",
         "mockery/mockery": "^1.6.10",
         "orchestra/testbench": "^10.8 || ^11.0",
+        "pestphp/pest": "^4.7",
         "phpstan/phpstan": "^2.2",
         "phpunit/phpunit": "^12.5.23",
         "spatie/laravel-ray": "^1.43.6"
@@ -67,7 +68,8 @@
         "preferred-install": "dist",
         "sort-packages": true,
         "allow-plugins": {
-            "composer/package-versions-deprecated": true
+            "composer/package-versions-deprecated": true,
+            "pestphp/pest-plugin": true
         }
     },
     "extra": {

src/CP/Navigation/Nav.php

@@ -26,7 +26,9 @@ public function extend(Closure $callback)
      */
     public function create($name)
     {
-        $item = (new NavItem)->display($name);
+        $item = new NavItem;
+
+        $item->display($name);
 
         $this->items[] = $item;
 

src/Fieldtypes/TemplateFolder.php

@@ -4,8 +4,8 @@
 
 use FilesystemIterator;
 use RecursiveCallbackFilterIterator;
-use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
+use Statamic\Filesystem\RecursiveDirectoryIterator;
 use Statamic\Support\Str;
 
 class TemplateFolder extends Relationship

src/Filesystem/RecursiveDirectoryIterator.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Statamic\Filesystem;
+
+class RecursiveDirectoryIterator extends \RecursiveDirectoryIterator
+{
+    public function hasChildren(bool $allowLinks = false): bool
+    {
+        if (parent::hasChildren($allowLinks)) {
+            return true;
+        }
+
+        if (DIRECTORY_SEPARATOR !== '\\') {
+            return false;
+        }
+
+        // A Windows junction reports an lstat mode that is neither a link nor a
+        // directory, so the parent treats it as a leaf and FOLLOW_SYMLINKS never
+        // gets a look in. The parent has just lstat'd the path, and is_dir() would
+        // reuse that cached result, so the cache needs clearing before asking.
+        clearstatcache(true, $path = $this->getPathname());
+
+        return is_dir($path);
+    }
+}

src/Forms/Form.php

@@ -75,7 +75,12 @@ public function handle($handle = null)
      */
     public function title($title = null)
     {
-        return $this->fluentlyGetOrSet('title')->args(func_get_args());
+        return $this
+            ->fluentlyGetOrSet('title')
+            ->getter(function ($title) {
+                return $title ?? ucfirst($this->handle);
+            })
+            ->args(func_get_args());
     }
 
     /**

src/Http/Controllers/CP/API/TemplatesController.php

@@ -3,8 +3,8 @@
 namespace Statamic\Http\Controllers\CP\API;
 
 use RecursiveCallbackFilterIterator;
-use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
+use Statamic\Filesystem\RecursiveDirectoryIterator;
 use Statamic\Http\Controllers\CP\CpController;
 use Statamic\Support\Str;
 

testbench.yaml

@@ -0,0 +1,44 @@
+# Everything the test suite is known to write into the testbench skeleton
+# (vendor/orchestra/testbench-core/laravel). Tests/TestCase clears these once per
+# process before snapshotting the skeleton, so a suite run never inherits leftovers
+# from a previous one. It's also what `vendor/bin/testbench package:purge-skeleton`
+# removes.
+purge:
+    directories:
+        - addons
+        - app/Actions
+        - app/Dictionaries
+        - app/Fieldtypes
+        - app/Modifiers
+        - app/Scopes
+        - app/Tags
+        - app/Widgets
+        - config/statamic
+        - public/diskimgroot
+        - public/glide
+        - public/imgcache
+        - public/static
+        - public/testimages
+        - public/vendor
+        - resources/addons
+        - resources/blueprints
+        - resources/content
+        - resources/css
+        - resources/dictionaries
+        - resources/fieldsets
+        - resources/forms
+        - resources/js
+        - resources/users
+        - storage/framework/testing/disks
+        - storage/statamic
+    files:
+        - app/Providers/AppServiceProvider.php
+        - composer.json.bak
+        - composer.lock
+        - package.json
+        - public/*.jpg
+        - resources/*.svg
+        - resources/preferences.yaml
+        - resources/sites.yaml
+        - storage/logs/*.log
+        - vite-cp.config.js