From 5b1fded0b43d7fe733c4aa0a37c4be361c6b6f89 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Wed, 10 Jan 2024 19:02:26 +0000
Subject: [PATCH 001/149] [4.x] Fix Bard's sticky toolbar in Live Preview
 (#9301)

Fix Bard's sticky toolbar in Live Preview
---
 resources/css/components/fieldtypes/bard.css | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/resources/css/components/fieldtypes/bard.css b/resources/css/components/fieldtypes/bard.css
index b3886b5d60..9a4291b95d 100644
--- a/resources/css/components/fieldtypes/bard.css
+++ b/resources/css/components/fieldtypes/bard.css
@@ -73,7 +73,8 @@
 }
 
 /* Only top-level Bard fields should have a sticky header */
-.workspace .publish-fields:not(.replicator-set-body) > .bard-fieldtype .bard-fixed-toolbar {
+.workspace .publish-fields:not(.replicator-set-body) > .bard-fieldtype .bard-fixed-toolbar,
+.live-preview .publish-fields:not(.replicator-set-body) > .bard-fieldtype .bard-fixed-toolbar {
     @apply sticky;
 }
 
@@ -109,6 +110,9 @@
 
     /*  Fixed toolbar inside a stack */
     .stack-content .bard-fieldtype .bard-fieldtype .bard-fixed-toolbar { top: 16px; }
+
+    /* We don't need the `top` when in Live Preview */
+    .live-preview .bard-fixed-toolbar { top: 0; }
 }
 
 .bard-floating-toolbar {

From c9694ae72ac19c4cc5c953baf838e7057879bf34 Mon Sep 17 00:00:00 2001
From: Robin van der Vleuten <robin@webstronauts.com>
Date: Wed, 10 Jan 2024 20:05:50 +0100
Subject: [PATCH 002/149] [4.x] Use correct set_time_limit no limit value
 (#9297)

Use correct set_time_limit no limit value
---
 config/system.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/system.php b/config/system.php
index 293191c200..05ffa7e48f 100644
--- a/config/system.php
+++ b/config/system.php
@@ -108,7 +108,7 @@
     */
 
     'php_memory_limit' => '-1',
-    'php_max_execution_time' => '-1',
+    'php_max_execution_time' => '0',
     'ajax_timeout' => '600000',
     'pcre_backtrack_limit' => '-1',
 

From 3e2f68d115b22e82b7afa4b58fc54841184e779c Mon Sep 17 00:00:00 2001
From: Tin <31577031+modrictin@users.noreply.github.com>
Date: Wed, 10 Jan 2024 20:17:09 +0100
Subject: [PATCH 003/149] [4.x] Fix Asset browser firing 2 requests on initial
 Assets page load (#8981)

Update Browser.vue
---
 resources/js/components/assets/Browser/Browser.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/assets/Browser/Browser.vue b/resources/js/components/assets/Browser/Browser.vue
index ea5930ac63..f26158c5dc 100644
--- a/resources/js/components/assets/Browser/Browser.vue
+++ b/resources/js/components/assets/Browser/Browser.vue
@@ -453,6 +453,7 @@ export default {
         },
 
         container(container) {
+            this.initializing = true;
             this.preferencesPrefix = `assets.${container.id}`;
             this.mode = this.getPreference('mode') || 'table';
             this.setInitialPerPage();
@@ -464,7 +465,7 @@ export default {
         },
 
         parameters(after, before) {
-            if (JSON.stringify(before) === JSON.stringify(after)) return;
+            if (this.initializing || JSON.stringify(before) === JSON.stringify(after)) return;
             this.loadAssets();
         },
 

From a4364638ee4b4da821d523abe0817b1716905830 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Thu, 11 Jan 2024 15:39:43 +0000
Subject: [PATCH 004/149] [4.x] Fix spacing around fullscreen button on Stacked
 Grid (#9307)

Fix spacing around fullscreen button on Stacked Grid
---
 resources/js/components/fieldtypes/grid/Grid.vue    |  1 +
 resources/js/components/fieldtypes/grid/Stacked.vue | 11 +++++++++--
 resources/js/components/fieldtypes/grid/View.vue    |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/fieldtypes/grid/Grid.vue b/resources/js/components/fieldtypes/grid/Grid.vue
index e1ac28b9c3..868a163a0b 100644
--- a/resources/js/components/fieldtypes/grid/Grid.vue
+++ b/resources/js/components/fieldtypes/grid/Grid.vue
@@ -28,6 +28,7 @@
                 :can-delete-rows="canDeleteRows"
                 :can-add-rows="canAddRows"
                 :allow-fullscreen="config.fullscreen"
+                :hide-display="config.hide_display"
                 @updated="updated"
                 @meta-updated="updateRowMeta"
                 @removed="removed"
diff --git a/resources/js/components/fieldtypes/grid/Stacked.vue b/resources/js/components/fieldtypes/grid/Stacked.vue
index 00ca0e36ea..d7024d62fc 100644
--- a/resources/js/components/fieldtypes/grid/Stacked.vue
+++ b/resources/js/components/fieldtypes/grid/Stacked.vue
@@ -18,7 +18,14 @@
         @dragend="$emit('blur')"
         @input="(rows) => $emit('sorted', rows)"
     >
-        <div class="grid-stacked" slot-scope="{}">
+        <div
+            class="grid-stacked"
+            :class="{
+                'mt-12': !grid.fullScreenMode && hideDisplay,
+                'mt-6': !grid.fullScreenMode && !hideDisplay,
+            }"
+            slot-scope="{}"
+        >
             <stacked-row
                 v-for="(row, index) in rows"
                 :key="`row-${row._id}`"
@@ -54,7 +61,7 @@ export default {
     components: {
         StackedRow,
         SortableList
-    }
+    },
 
 }
 </script>
diff --git a/resources/js/components/fieldtypes/grid/View.vue b/resources/js/components/fieldtypes/grid/View.vue
index 515afd072b..38f830c90b 100644
--- a/resources/js/components/fieldtypes/grid/View.vue
+++ b/resources/js/components/fieldtypes/grid/View.vue
@@ -1,7 +1,7 @@
 <script>
 export default {
 
-    props: ['fields', 'rows', 'meta', 'name', 'canDeleteRows', 'canAddRows', 'allowFullscreen'],
+    props: ['fields', 'rows', 'meta', 'name', 'canDeleteRows', 'canAddRows', 'allowFullscreen', 'hideDisplay'],
 
     inject: ['grid'],
 

From 14961c56525f3777eb705dcdb50f3318139c5af7 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Thu, 11 Jan 2024 16:22:39 +0000
Subject: [PATCH 005/149] [4.x] Entries Fieldtype: Fix missing checkbox on Tree
 Mode (#9308)

Fix missing checkbox on Entries Fieldtype Tree mode
---
 resources/js/components/structures/Branch.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/js/components/structures/Branch.vue b/resources/js/components/structures/Branch.vue
index ad4efdde20..ee0c228f94 100644
--- a/resources/js/components/structures/Branch.vue
+++ b/resources/js/components/structures/Branch.vue
@@ -1,8 +1,8 @@
 <template>
 
     <div class="flex">
-        <slot name="branch-action" :branch="page" v-if="editable">
-            <div class="page-move w-6" />
+        <slot name="branch-action" :branch="page">
+            <div v-if="editable" class="page-move w-6" />
         </slot>
         <div class="flex items-center flex-1 p-2 ml-2 text-xs leading-normal">
             <div class="flex items-center flex-1" @click="$emit('branch-clicked', page)">

From 94348afde7d94e2f3b614c12aa558cbec9b48d54 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Thu, 11 Jan 2024 18:59:49 +0000
Subject: [PATCH 006/149] [4.x] Support custom blueprint namespaces (#8516)

---
 .../js/components/blueprints/Builder.vue      |  3 +-
 resources/views/blueprints/edit.blade.php     | 23 +++++
 resources/views/blueprints/index.blade.php    | 18 ++++
 routes/cp.php                                 |  2 +
 src/Fields/Blueprint.php                      | 20 ++++-
 src/Fields/BlueprintRepository.php            | 81 ++++++++++++++---
 .../CP/Fields/BlueprintController.php         | 60 ++++++++++++-
 tests/Data/Entries/CollectionTest.php         |  1 +
 tests/Data/Taxonomies/TaxonomyTest.php        |  1 +
 .../Blueprints/EditCustomBlueprintTest.php    | 62 +++++++++++++
 .../Blueprints/StoreCustomBlueprintTest.php   | 88 +++++++++++++++++++
 .../Blueprints/ViewBlueprintListingTest.php   | 18 ++++
 tests/Fields/BlueprintRepositoryTest.php      | 63 +++++++++++++
 13 files changed, 426 insertions(+), 14 deletions(-)
 create mode 100644 resources/views/blueprints/edit.blade.php
 create mode 100644 tests/Feature/Blueprints/EditCustomBlueprintTest.php
 create mode 100644 tests/Feature/Blueprints/StoreCustomBlueprintTest.php

diff --git a/resources/js/components/blueprints/Builder.vue b/resources/js/components/blueprints/Builder.vue
index fb556c0b1f..9a17fb73c3 100644
--- a/resources/js/components/blueprints/Builder.vue
+++ b/resources/js/components/blueprints/Builder.vue
@@ -24,7 +24,7 @@
                     </div>
                 </div>
 
-                <div class="form-group config-field">
+                <div class="form-group config-field" v-if="showHidden">
                     <div class="field-inner">
                         <label class="block">{{ __('Hidden') }}</label>
                         <p class="help-block">{{ __('messages.blueprints_hidden_instructions') }}</p>
@@ -68,6 +68,7 @@ export default {
         showTitle: Boolean,
         useTabs: { type: Boolean, default: true },
         isFormBlueprint: { type: Boolean, default: false },
+        showHidden: { type: Boolean, default: true },
     },
 
     data() {
diff --git a/resources/views/blueprints/edit.blade.php b/resources/views/blueprints/edit.blade.php
new file mode 100644
index 0000000000..c5039088c0
--- /dev/null
+++ b/resources/views/blueprints/edit.blade.php
@@ -0,0 +1,23 @@
+@extends('statamic::layout')
+@section('title', __('Edit Blueprint'))
+
+@section('content')
+
+    @include('statamic::partials.breadcrumb', [
+        'url' => cp_route('blueprints.index'),
+        'title' => __('Blueprints')
+    ])
+
+    <blueprint-builder
+        show-title
+        action="{{ cp_route('blueprints.update', [$blueprint->namespace(), $blueprint->handle()]) }}"
+        :initial-blueprint="{{ json_encode($blueprintVueObject) }}"
+        :show-hidden="false"
+    ></blueprint-builder>
+
+    @include('statamic::partials.docs-callout', [
+        'topic' => __('Blueprints'),
+        'url' => Statamic::docsUrl('blueprints')
+    ])
+
+@endsection
diff --git a/resources/views/blueprints/index.blade.php b/resources/views/blueprints/index.blade.php
index 477fa17306..b8e0cee8e1 100644
--- a/resources/views/blueprints/index.blade.php
+++ b/resources/views/blueprints/index.blade.php
@@ -179,6 +179,24 @@
         </table>
     </div>
 
+    @foreach ($additional as $namespace)
+    <h3 class="little-heading pl-0 mb-2">{{ $namespace['title'] }}</h3>
+    <div class="card p-0 mb-4">
+        <table class="data-table">
+        @foreach ($namespace['blueprints'] as $blueprint)
+            <tr>
+                <td>
+                    <div class="flex items-center">
+                        <div class="w-4 h-4 mr-4">@cp_svg('icons/light/blueprint')</div>
+                        <a href="{{ cp_route('blueprints.edit', [$blueprint['namespace'], $blueprint['handle']]) }}">{{ $blueprint['title'] }}</a>
+                    </div>
+                </td>
+            </tr>
+        @endforeach
+        </table>
+    </div>
+    @endforeach
+
     @include('statamic::partials.docs-callout', [
         'topic' => __('Blueprints'),
         'url' => Statamic::docsUrl('blueprints')
diff --git a/routes/cp.php b/routes/cp.php
index 7f3f48a51e..4be0638541 100644
--- a/routes/cp.php
+++ b/routes/cp.php
@@ -239,6 +239,8 @@
         Route::get('field-meta', [MetaController::class, 'show']);
         Route::resource('fieldsets', FieldsetController::class)->except(['show']);
         Route::get('blueprints', [BlueprintController::class, 'index'])->name('blueprints.index');
+        Route::get('blueprints/{namespace}/{handle}', [BlueprintController::class, 'edit'])->name('blueprints.edit');
+        Route::patch('blueprints/{namespace}/{handle}', [BlueprintController::class, 'update'])->name('blueprints.update');
         Route::get('fieldtypes', [FieldtypesController::class, 'index']);
     });
 
diff --git a/src/Fields/Blueprint.php b/src/Fields/Blueprint.php
index 1d3d5dbe89..6d0f777f61 100644
--- a/src/Fields/Blueprint.php
+++ b/src/Fields/Blueprint.php
@@ -113,9 +113,15 @@ public function initialPath()
 
     public function path()
     {
+        $namespace = str_replace('.', '/', (string) $this->namespace());
+
+        if ($this->isNamespaced()) {
+            $namespace = 'vendor/'.$namespace;
+        }
+
         return Path::tidy(vsprintf('%s/%s/%s.yaml', [
             Facades\Blueprint::directory(),
-            str_replace('.', '/', (string) $this->namespace()),
+            $namespace,
             $this->handle(),
         ]));
     }
@@ -392,7 +398,17 @@ public function isEmpty(): bool
 
     public function title()
     {
-        return array_get($this->contents, 'title', Str::humanize($this->handle));
+        return array_get($this->contents, 'title', Str::humanize(Str::of($this->handle)->after('::')->afterLast('.')));
+    }
+
+    public function isNamespaced(): bool
+    {
+        return Facades\Blueprint::getAdditionalNamespaces()->has($this->namespace);
+    }
+
+    public function isDeletable()
+    {
+        return ! $this->isNamespaced();
     }
 
     public function toPublishArray()
diff --git a/src/Fields/BlueprintRepository.php b/src/Fields/BlueprintRepository.php
index d7a01854d9..3e7f9df74c 100644
--- a/src/Fields/BlueprintRepository.php
+++ b/src/Fields/BlueprintRepository.php
@@ -18,6 +18,7 @@ class BlueprintRepository
 
     protected $directory;
     protected $fallbacks = [];
+    protected $additionalNamespaces = [];
 
     public function setDirectory(string $directory)
     {
@@ -38,14 +39,46 @@ public function find($blueprint): ?Blueprint
                 return null;
             }
 
-            $path = $this->directory.'/'.str_replace('.', '/', $blueprint).'.yaml';
+            $parts = explode('::', $blueprint);
 
-            return File::exists($path)
-                ? $this->makeBlueprintFromFile($path)
+            $path = count($parts) > 1
+                ? $this->findNamespacedBlueprintPath($blueprint)
+                : $this->findStandardBlueprintPath($blueprint);
+
+            return $path !== null && File::exists($path)
+                ? $this->makeBlueprintFromFile($path, count($parts) > 1 ? $parts[0] : null)
                 : $this->findFallback($blueprint);
         });
     }
 
+    public function findStandardBlueprintPath($handle)
+    {
+        if (Str::startsWith($handle, 'vendor.')) {
+            return null;
+        }
+
+        return $this->directory.'/'.str_replace('.', '/', $handle).'.yaml';
+    }
+
+    public function findNamespacedBlueprintPath($handle)
+    {
+        [$namespace, $handle] = explode('::', $handle);
+        $handle = str_replace('/', '.', $handle);
+        $path = str_replace('.', '/', $handle);
+
+        $overridePath = "{$this->directory}/vendor/{$namespace}/{$path}.yaml";
+
+        if (File::exists($overridePath)) {
+            return $overridePath;
+        }
+
+        if (! isset($this->additionalNamespaces[$namespace])) {
+            return null;
+        }
+
+        return "{$this->additionalNamespaces[$namespace]}/{$path}.yaml";
+    }
+
     public function setFallback($handle, Closure $blueprint)
     {
         $handle = str_replace('/', '.', $handle);
@@ -75,6 +108,10 @@ public function save(Blueprint $blueprint)
 
     public function delete(Blueprint $blueprint)
     {
+        if ($blueprint->isNamespaced()) {
+            throw new \Exception('Namespaced blueprints cannot be deleted');
+        }
+
         $this->clearBlinkCaches();
 
         $blueprint->deleteFile();
@@ -136,8 +173,8 @@ public function in(string $namespace)
     {
         return $this
             ->filesIn($namespace)
-            ->map(function ($file) {
-                return $this->makeBlueprintFromFile($file);
+            ->map(function ($file) use ($namespace) {
+                return $this->makeBlueprintFromFile($file, $namespace);
             })
             ->sort(function ($a, $b) {
                 $orderA = $a->order() ?? 99999;
@@ -150,6 +187,16 @@ public function in(string $namespace)
             ->keyBy->handle();
     }
 
+    public function addNamespace(string $namespace, string $directory): void
+    {
+        $this->additionalNamespaces[$namespace] = $directory;
+    }
+
+    public function getAdditionalNamespaces()
+    {
+        return collect($this->additionalNamespaces);
+    }
+
     protected function filesIn($namespace)
     {
         return Blink::store(self::BLINK_NAMESPACE_PATHS)->once($namespace, function () use ($namespace) {
@@ -157,6 +204,16 @@ protected function filesIn($namespace)
             $namespaceDir = str_replace('.', '/', $namespace);
             $directory = $this->directory.'/'.$namespaceDir;
 
+            if (isset($this->additionalNamespaces[$namespace])) {
+                $directory = $this->additionalNamespaces[$namespace];
+
+                $overridePath = "{$this->directory}/vendor/{$namespace}";
+
+                if (File::exists($overridePath)) {
+                    $directory = $overridePath;
+                }
+            }
+
             if (! File::exists(Str::removeRight($directory, '/'))) {
                 return collect();
             }
@@ -165,12 +222,16 @@ protected function filesIn($namespace)
         });
     }
 
-    protected function makeBlueprintFromFile($path)
+    protected function makeBlueprintFromFile($path, $namespace = null)
     {
-        return Blink::store(self::BLINK_FROM_FILE)->once($path, function () use ($path) {
-            [$namespace, $handle] = $this->getNamespaceAndHandle(
-                Str::after(Str::before($path, '.yaml'), $this->directory.'/')
-            );
+        return Blink::store(self::BLINK_FROM_FILE)->once($path, function () use ($path, $namespace) {
+            if (! $namespace || ! isset($this->additionalNamespaces[$namespace])) {
+                [$namespace, $handle] = $this->getNamespaceAndHandle(
+                    Str::after(Str::before($path, '.yaml'), $this->directory.'/')
+                );
+            } else {
+                $handle = Str::of($path)->afterLast('/')->before('.');
+            }
 
             $contents = YAML::file($path)->parse();
 
diff --git a/src/Http/Controllers/CP/Fields/BlueprintController.php b/src/Http/Controllers/CP/Fields/BlueprintController.php
index ce2678b197..336cc4bcf5 100644
--- a/src/Http/Controllers/CP/Fields/BlueprintController.php
+++ b/src/Http/Controllers/CP/Fields/BlueprintController.php
@@ -2,10 +2,16 @@
 
 namespace Statamic\Http\Controllers\CP\Fields;
 
+use Illuminate\Http\Request;
+use Statamic\Exceptions\NotFoundHttpException;
+use Statamic\Facades\Blueprint;
 use Statamic\Http\Controllers\CP\CpController;
+use Statamic\Support\Str;
 
 class BlueprintController extends CpController
 {
+    use ManagesBlueprints;
+
     public function __construct()
     {
         $this->middleware(\Illuminate\Auth\Middleware\Authorize::class.':configure fields');
@@ -13,6 +19,58 @@ public function __construct()
 
     public function index()
     {
-        return view('statamic::blueprints.index');
+        $additional = Blueprint::getAdditionalNamespaces()
+            ->map(function ($path, $key) {
+                return [
+                    'title' => Str::humanize($key),
+                    'blueprints' => Blueprint::in($key)
+                        ->map(function ($blueprint) {
+                            return [
+                                'handle' => $blueprint->handle(),
+                                'namespace' => $blueprint->namespace(),
+                                'title' => $blueprint->title(),
+                            ];
+                        })
+                        ->sortBy('title')
+                        ->values(),
+                ];
+            })
+            ->sortBy('title');
+
+        return view('statamic::blueprints.index', [
+            'additional' => $additional,
+        ]);
+    }
+
+    public function edit($namespace, $handle)
+    {
+        $blueprint = Blueprint::find($namespace.'::'.$handle);
+
+        if (! $blueprint) {
+            throw new NotFoundHttpException;
+        }
+
+        return view('statamic::blueprints.edit', [
+            'blueprint' => $blueprint,
+            'blueprintVueObject' => $this->toVueObject($blueprint),
+        ]);
+    }
+
+    public function update(Request $request, $namespace, $handle)
+    {
+        $blueprint = Blueprint::find($namespace.'::'.$handle);
+
+        if (! $blueprint) {
+            throw new NotFoundHttpException;
+        }
+
+        $request->merge(['hidden' => false]); // we dont support hidden here
+
+        $request->validate([
+            'title' => 'required',
+            'tabs' => 'array',
+        ]);
+
+        $this->updateBlueprint($request, $blueprint);
     }
 }
diff --git a/tests/Data/Entries/CollectionTest.php b/tests/Data/Entries/CollectionTest.php
index c068438712..45a1b25fc8 100644
--- a/tests/Data/Entries/CollectionTest.php
+++ b/tests/Data/Entries/CollectionTest.php
@@ -366,6 +366,7 @@ public function no_existing_blueprints_will_fall_back_to_a_default_named_after_t
                 ->setNamespace('this.will.change')
                 ->setContents(['title' => 'This will change'])
         );
+        BlueprintRepository::shouldReceive('getAdditionalNamespaces')->andReturn(collect());
 
         $blueprint = $collection->entryBlueprint();
         $this->assertNotEquals($default, $blueprint);
diff --git a/tests/Data/Taxonomies/TaxonomyTest.php b/tests/Data/Taxonomies/TaxonomyTest.php
index d7f1b026f5..dd747430bc 100644
--- a/tests/Data/Taxonomies/TaxonomyTest.php
+++ b/tests/Data/Taxonomies/TaxonomyTest.php
@@ -103,6 +103,7 @@ public function no_existing_blueprints_will_fall_back_to_a_default_named_after_t
                 ->setNamespace('this.will.change')
                 ->setContents(['title' => 'This will change'])
         );
+        BlueprintRepository::shouldReceive('getAdditionalNamespaces')->andReturn(collect());
 
         $blueprint = $taxonomy->termBlueprint();
         $this->assertNotEquals($default, $blueprint);
diff --git a/tests/Feature/Blueprints/EditCustomBlueprintTest.php b/tests/Feature/Blueprints/EditCustomBlueprintTest.php
new file mode 100644
index 0000000000..eeddeb3f74
--- /dev/null
+++ b/tests/Feature/Blueprints/EditCustomBlueprintTest.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Tests\Feature\Blueprints;
+
+use Statamic\Facades;
+use Statamic\Fields\Blueprint;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class EditCustomBlueprintTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+
+    /** @test */
+    public function it_denies_access_if_you_dont_have_permission()
+    {
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+
+        $namespace = 'foo';
+        $handle = 'bar';
+
+        Facades\Blueprint::addNamespace($namespace, 'resources/content/'.$namespace);
+
+        $blueprint = $this->createBlueprint($namespace, $handle);
+        $blueprint->save();
+
+        $this
+            ->actingAs($user)
+            ->get(cp_route('blueprints.edit', [$namespace, $handle]))
+            ->assertRedirect('/cp')
+            ->assertSessionHas('error');
+    }
+
+    /** @test */
+    public function it_lets_you_edit_a_custom_namespace_blueprint()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'configure fields']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+
+        $namespace = 'foo';
+        $handle = 'bar';
+
+        Facades\Blueprint::addNamespace($namespace, 'resources/content/'.$namespace);
+
+        $blueprint = $this->createBlueprint($namespace, $handle);
+        $blueprint->save();
+
+        $this
+            ->actingAs($user)
+            ->get(cp_route('blueprints.edit', [$namespace, $handle]))
+            ->assertOk()
+            ->assertViewIs('statamic::blueprints.edit');
+    }
+
+    private function createBlueprint($namespace, $handle)
+    {
+        return tap(new Blueprint)->setHandle($handle)->setNamespace($namespace);
+    }
+}
diff --git a/tests/Feature/Blueprints/StoreCustomBlueprintTest.php b/tests/Feature/Blueprints/StoreCustomBlueprintTest.php
new file mode 100644
index 0000000000..ccaaf70783
--- /dev/null
+++ b/tests/Feature/Blueprints/StoreCustomBlueprintTest.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace Tests\Feature\Blueprints;
+
+use Statamic\Facades;
+use Statamic\Fields\Blueprint;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class StoreCustomBlueprintTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+
+    /** @test */
+    public function it_denies_access_if_you_dont_have_permission()
+    {
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+
+        $namespace = 'foo';
+        $handle = 'bar';
+
+        Facades\Blueprint::addNamespace($namespace, 'resources/content/'.$namespace);
+
+        $blueprint = $this->createBlueprint($namespace, $handle);
+        $blueprint->save();
+
+        $this
+            ->actingAs($user)
+            ->submit($namespace, $handle, [
+                'title' => 'test',
+                'handle' => 'bar',
+            ])
+            ->assertRedirect('/cp')
+            ->assertSessionHas('error');
+    }
+
+    /** @test */
+    public function it_lets_you_update_a_custom_namespace_blueprint()
+    {
+        $this->withoutExceptionHandling();
+
+        $this->setTestRoles(['test' => ['access cp', 'configure fields']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+
+        $namespace = 'foo';
+        $handle = 'bar';
+
+        Facades\Blueprint::addNamespace($namespace, 'resources/content/'.$namespace);
+
+        $blueprint = $this->createBlueprint($namespace, $handle);
+        $blueprint->save();
+
+        $this
+            ->actingAs($user)
+            ->submit($namespace, $handle, [
+                'title' => 'test',
+                'handle' => 'bar',
+            ])
+            ->assertOk();
+    }
+
+    private function createBlueprint($namespace, $handle)
+    {
+        $blueprint = tap(new Blueprint)->setHandle($handle)->setNamespace($namespace);
+        $blueprint->save();
+
+        return $blueprint;
+    }
+
+    private function submit($namespace, $blueprint, $params = [])
+    {
+        return $this->patch(
+            cp_route('blueprints.update', [$namespace, $blueprint]),
+            $this->validParams($params)
+        );
+    }
+
+    private function validParams($overrides = [])
+    {
+        return array_merge([
+            'title' => 'Updated',
+            'tabs' => [],
+        ], $overrides);
+    }
+}
diff --git a/tests/Feature/Blueprints/ViewBlueprintListingTest.php b/tests/Feature/Blueprints/ViewBlueprintListingTest.php
index 44203fa0db..eef9f0ff46 100644
--- a/tests/Feature/Blueprints/ViewBlueprintListingTest.php
+++ b/tests/Feature/Blueprints/ViewBlueprintListingTest.php
@@ -39,6 +39,24 @@ public function it_denies_access_if_you_dont_have_permission()
             ->assertRedirect('/cp/original');
     }
 
+    /** @test */
+    public function it_lets_you_edit_a_custom_namespace_blueprint()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'configure fields']]);
+        $user = tap(Facades\User::make()->assignRole('test'))->save();
+
+        $namespace = 'foo';
+        $handle = 'bar';
+
+        Facades\Blueprint::addNamespace($namespace, 'resources/content/'.$namespace);
+
+        $this
+            ->actingAs($user)
+            ->get(cp_route('blueprints.edit', [$namespace, $handle]))
+            ->assertOk()
+            ->assertViewIs('statamic::blueprints.edit');
+    }
+
     private function createBlueprint($handle)
     {
         return tap(new Blueprint)->setHandle($handle);
diff --git a/tests/Fields/BlueprintRepositoryTest.php b/tests/Fields/BlueprintRepositoryTest.php
index 74e6813004..d5ab307d03 100644
--- a/tests/Fields/BlueprintRepositoryTest.php
+++ b/tests/Fields/BlueprintRepositoryTest.php
@@ -82,6 +82,69 @@ public function it_gets_a_blueprint_in_a_namespace()
         ], $blueprint->contents());
     }
 
+    /** @test */
+    public function it_gets_a_blueprint_in_a_custom_namespace()
+    {
+        $contents = <<<'EOT'
+title: Test
+tabs:
+  main:
+    fields:
+      - one
+      - two
+EOT;
+        File::shouldReceive('exists')->with('/path/to/resources/blueprints/foo/baz.yaml')->once()->andReturnTrue();
+        File::shouldReceive('exists')->with('/path/to/resources/blueprints/vendor/foo/baz.yaml')->once()->andReturnFalse();
+        File::shouldReceive('get')->with('/path/to/resources/blueprints/foo/baz.yaml')->once()->andReturn($contents);
+
+        Facades\Blueprint::addNamespace('foo', '/path/to/resources/blueprints/foo');
+
+        $blueprint = $this->repo->find('foo::baz');
+
+        $this->assertInstanceOf(Blueprint::class, $blueprint);
+        $this->assertEquals('baz', $blueprint->handle());
+        $this->assertEquals('foo', $blueprint->namespace());
+        $this->assertEquals([
+            'title' => 'Test',
+            'tabs' => [
+                'main' => [
+                    'fields' => ['one', 'two'],
+                ],
+            ],
+        ], $blueprint->contents());
+    }
+
+    /** @test */
+    public function it_gets_an_overidden_blueprint_in_a_custom_namespace()
+    {
+        $contents = <<<'EOT'
+title: Test
+tabs:
+  main:
+    fields:
+      - one
+      - two
+EOT;
+        File::shouldReceive('exists')->with('/path/to/resources/blueprints/vendor/foo/baz.yaml')->andReturnTrue();
+        File::shouldReceive('get')->with('/path/to/resources/blueprints/vendor/foo/baz.yaml')->once()->andReturn($contents);
+
+        Facades\Blueprint::addNamespace('foo', '/path/to/resources/blueprints/foo');
+
+        $blueprint = $this->repo->find('foo::baz');
+
+        $this->assertInstanceOf(Blueprint::class, $blueprint);
+        $this->assertEquals('baz', $blueprint->handle());
+        $this->assertEquals('foo', $blueprint->namespace());
+        $this->assertEquals([
+            'title' => 'Test',
+            'tabs' => [
+                'main' => [
+                    'fields' => ['one', 'two'],
+                ],
+            ],
+        ], $blueprint->contents());
+    }
+
     /** @test */
     public function it_returns_null_if_blueprint_doesnt_exist()
     {

From 801e954a054c0731e9890bb44be92970503cb6f9 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 11 Jan 2024 14:06:30 -0500
Subject: [PATCH 007/149] changelog

---
 CHANGELOG.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57a9c308f9..cdbcfbd299 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Release Notes
 
+## 4.44.0 (2024-01-11)
+
+### What's new
+- Support custom blueprint namespaces. [#8516](https://github.com/statamic/cms/issues/8516) by @ryanmitchell
+
+### What's improved
+- German translations. [#9295](https://github.com/statamic/cms/issues/9295) by @helloDanuk
+
+### What's fixed
+- Fix missing checkbox on tree view in the entries field type. [#9308](https://github.com/statamic/cms/issues/9308) by @duncanmcclean
+- Fix spacing around fullscreen button on Stacked Grid. [#9307](https://github.com/statamic/cms/issues/9307) by @duncanmcclean
+- Fix Asset browser firing 2 requests on initial Assets page load. [#8981](https://github.com/statamic/cms/issues/8981) by @modrictin
+- Use correct set_time_limit no limit value. [#9297](https://github.com/statamic/cms/issues/9297) by @robinvdvleuten
+- Fix Bard's sticky toolbar in Live Preview. [#9301](https://github.com/statamic/cms/issues/9301) by @duncanmcclean
+- Fix asset meta file not being deleted with asset. [#9300](https://github.com/statamic/cms/issues/9300) by @duncanmcclean
+- Fix creating entries with `JsonResource::withoutWrapping()`. [#9296](https://github.com/statamic/cms/issues/9296) by @duncanmcclean
+
+
+
 ## 4.43.0 (2024-01-09)
 
 ### What's new

From 4445c177b5078d3311463a98ddf97d5dcf36fde4 Mon Sep 17 00:00:00 2001
From: Michael Aerni <hello@michaelaerni.ch>
Date: Mon, 15 Jan 2024 10:14:29 -0500
Subject: [PATCH 008/149] [4.x] Fix too many redirects on collection (#9318)

---
 src/Http/Controllers/CP/Collections/CollectionsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Http/Controllers/CP/Collections/CollectionsController.php b/src/Http/Controllers/CP/Collections/CollectionsController.php
index 6d76e81e23..1a6919fe06 100644
--- a/src/Http/Controllers/CP/Collections/CollectionsController.php
+++ b/src/Http/Controllers/CP/Collections/CollectionsController.php
@@ -574,7 +574,7 @@ protected function getAuthorizedSitesForCollection($collection)
     protected function ensureCollectionIsAvailableOnSite($collection, $site)
     {
         if (Site::hasMultiple() && ! $collection->sites()->contains($site->handle())) {
-            return redirect()->back()->with('error', __('Collection is not available on site ":handle".', ['handle' => $site->handle]));
+            return redirect(cp_route('collections.index'))->with('error', __('Collection is not available on site ":handle".', ['handle' => $site->handle]));
         }
     }
 }

From f4544249f34a5e933f59c508c6d18401b27845cd Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Tue, 16 Jan 2024 20:53:26 +0000
Subject: [PATCH 009/149] [4.x] Fix Bard sets being inserted too early (#9216)

---
 .../js/components/fieldtypes/bard/BardFieldtype.vue      | 9 ++++++++-
 src/Facades/Endpoint/Pattern.php                         | 2 +-
 src/Modifiers/CoreModifiers.php                          | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/resources/js/components/fieldtypes/bard/BardFieldtype.vue b/resources/js/components/fieldtypes/bard/BardFieldtype.vue
index 7727b2486b..ad4e7a416a 100644
--- a/resources/js/components/fieldtypes/bard/BardFieldtype.vue
+++ b/resources/js/components/fieldtypes/bard/BardFieldtype.vue
@@ -434,9 +434,16 @@ export default {
 
             this.updateSetMeta(id, this.meta.new[handle]);
 
+            const { $head } = this.editor.view.state.selection;
+            const { nodeBefore } = $head;
+
             // Perform this in nextTick because the meta data won't be ready until then.
             this.$nextTick(() => {
-                this.editor.commands.set({ id, values });
+                if (nodeBefore) {
+                    this.editor.commands.setAt({ attrs: { id, values }, pos: $head.pos });
+                } else {
+                    this.editor.commands.set({ id, values });
+                }
             });
         },
 
diff --git a/src/Facades/Endpoint/Pattern.php b/src/Facades/Endpoint/Pattern.php
index 3697c67fb6..94994c51ae 100644
--- a/src/Facades/Endpoint/Pattern.php
+++ b/src/Facades/Endpoint/Pattern.php
@@ -122,7 +122,7 @@ public function sqlLikeQuote(string $like): string
     /**
      * Converts SQL LIKE syntax to a regular expression.
      *
-     * @return string  The regular expression without delimiters.
+     * @return string The regular expression without delimiters.
      */
     public function sqlLikeToRegex(string $like): string
     {
diff --git a/src/Modifiers/CoreModifiers.php b/src/Modifiers/CoreModifiers.php
index b4910d4f8c..1bdf818646 100644
--- a/src/Modifiers/CoreModifiers.php
+++ b/src/Modifiers/CoreModifiers.php
@@ -1006,7 +1006,7 @@ public function joinplode($value, $params)
     /**
      * Check if an item exists in an array using "dot" notation.
      *
-     * @param $value
+     * @param  $value
      * @return bool
      */
     public function inArray($haystack, $params, $context)
@@ -1493,7 +1493,7 @@ public function merge($value, $params, $context)
     /**
      * Generate an md5 hash of a value.
      *
-     * @param $params
+     * @param  $params
      * @return string
      */
     public function md5($value)

From 6944eb3be5241d90cb8a6c0415a6ca59470ce3e8 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Wed, 17 Jan 2024 14:53:30 +0000
Subject: [PATCH 010/149] [4.x] Updating an add-on blueprint shouldnt remove it
 from the vendor folder (#9326)

---
 src/Fields/Blueprint.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Fields/Blueprint.php b/src/Fields/Blueprint.php
index 6d0f777f61..e1278480f9 100644
--- a/src/Fields/Blueprint.php
+++ b/src/Fields/Blueprint.php
@@ -22,6 +22,7 @@
 use Statamic\Exceptions\DuplicateFieldException;
 use Statamic\Facades;
 use Statamic\Facades\Blink;
+use Statamic\Facades\File;
 use Statamic\Facades\Path;
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
@@ -692,4 +693,9 @@ public function toQueryableValue()
     {
         return $this->handle();
     }
+
+    public function writeFile($path = null)
+    {
+        File::put($path ?? $this->buildPath(), $this->fileContents());
+    }
 }

From 85665fa0cb5b037ca31e82f7b2900311210b4a16 Mon Sep 17 00:00:00 2001
From: Daniel Weaver <godismyjudge95@gmail.com>
Date: Wed, 17 Jan 2024 09:55:56 -0500
Subject: [PATCH 011/149] [4.x] Add CC and BCC fields to form emails (#9336)

---
 resources/lang/en/messages.php                 |  4 +++-
 .../Controllers/CP/Forms/FormsController.php   | 18 +++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php
index 80753238fa..98969ff62c 100644
--- a/resources/lang/en/messages.php
+++ b/resources/lang/en/messages.php
@@ -112,7 +112,9 @@
     'form_configure_email_reply_to_instructions' => 'Leave blank to fall back to sender.',
     'form_configure_email_subject_instructions' => 'Email subject line.',
     'form_configure_email_text_instructions' => 'The view for the text version of this email.',
-    'form_configure_email_to_instructions' => 'Email address of the recipient.',
+    'form_configure_email_to_instructions' => 'Email address of the recipient(s) - comma separated.',
+    'form_configure_email_cc_instructions' => 'Email address of the CC recipient(s) - comma separated.',
+    'form_configure_email_bcc_instructions' => 'Email address of the BCC recipient(s) - comma separated.',
     'form_configure_handle_instructions' => 'Used to reference this form on the frontend. It\'s non-trivial to change later.',
     'form_configure_honeypot_instructions' => 'Field name to use as a honeypot. Honeypots are special fields used to reduce botspam.',
     'form_configure_intro' => 'Forms are used to collect information from visitors and dispatch events and notifications when there are new submissions.',
diff --git a/src/Http/Controllers/CP/Forms/FormsController.php b/src/Http/Controllers/CP/Forms/FormsController.php
index 2743fe7220..6fc27b5fac 100644
--- a/src/Http/Controllers/CP/Forms/FormsController.php
+++ b/src/Http/Controllers/CP/Forms/FormsController.php
@@ -241,13 +241,29 @@ protected function editFormBlueprint($form)
                                 'handle' => 'to',
                                 'field' => [
                                     'type' => 'text',
-                                    'display' => __('Recipient'),
+                                    'display' => __('Recipient(s)'),
                                     'validate' => [
                                         'required',
                                     ],
                                     'instructions' => __('statamic::messages.form_configure_email_to_instructions'),
                                 ],
                             ],
+                            [
+                                'handle' => 'cc',
+                                'field' => [
+                                    'type' => 'text',
+                                    'display' => __('CC Recipient(s)'),
+                                    'instructions' => __('statamic::messages.form_configure_email_cc_instructions'),
+                                ],
+                            ],
+                            [
+                                'handle' => 'bcc',
+                                'field' => [
+                                    'type' => 'text',
+                                    'display' => __('BCC Recipient(s)'),
+                                    'instructions' => __('statamic::messages.form_configure_email_bcc_instructions'),
+                                ],
+                            ],
                             [
                                 'handle' => 'from',
                                 'field' => [

From e90c4b0bd405a1794474508061c69a354bfd065a Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Wed, 17 Jan 2024 16:56:06 +0000
Subject: [PATCH 012/149] [4.x] Prevent Bard causing dirty state issues (#9344)

---
 resources/js/components/fieldtypes/bard/BardFieldtype.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/fieldtypes/bard/BardFieldtype.vue b/resources/js/components/fieldtypes/bard/BardFieldtype.vue
index ad4e7a416a..5f2784d0c5 100644
--- a/resources/js/components/fieldtypes/bard/BardFieldtype.vue
+++ b/resources/js/components/fieldtypes/bard/BardFieldtype.vue
@@ -367,13 +367,17 @@ export default {
         json(json) {
             if (!this.mounted) return;
 
+            let jsonValue = JSON.stringify(json);
+
+            if (jsonValue === this.value) return;
+
             // Prosemirror's JSON will include spaces between tags.
             // For example (this is not the actual json)...
             // "<p>One <b>two</b> three</p>" becomes ['OneSPACE', '<b>two</b>', 'SPACEthree']
             // But, Laravel's TrimStrings middleware would remove them.
             // Those spaces need to be there, otherwise it would be rendered as <p>One<b>two</b>three</p>
             // To combat this, we submit the JSON string instead of an object.
-            this.updateDebounced(JSON.stringify(json));
+            this.updateDebounced(jsonValue);
         },
 
         value(value, oldValue) {

From af820009486a3e6eca729895c3a539d40247508c Mon Sep 17 00:00:00 2001
From: Jeroen Peters <mail@jeroenpeters.com>
Date: Wed, 17 Jan 2024 21:59:18 +0100
Subject: [PATCH 013/149] [4.x] Dutch translations (#9347)

---
 resources/lang/nl.json           | 20 +++++++++++++++-----
 resources/lang/nl/fieldtypes.php |  3 +++
 resources/lang/nl/messages.php   |  6 ++++--
 resources/lang/nl/validation.php |  1 +
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/resources/lang/nl.json b/resources/lang/nl.json
index c88108b41a..4617d1d8a5 100644
--- a/resources/lang/nl.json
+++ b/resources/lang/nl.json
@@ -13,6 +13,10 @@
     ":title Field": ":title Veld",
     "A blueprint with that name already exists.": "Een blueprint met die naam bestaat al.",
     "A fieldset with that name already exists.": "Een fieldset met die naam bestaat al.",
+    "A Global Set with that handle already exists.": "Een Global set met die naam bestaat al.",
+    "A navigation with that handle already exists.": "Een Navigatie met die naam bestaat al.",
+    "A Role with that handle already exists.": "Een rol met die naam bestaat al.",
+    "A User Group with that handle already exists.": "Een gebruikersgroep met die naam bestaat al.",
     "A valid blueprint is required.": "Een geldige blueprint is vereist.",
     "Above": "Boven",
     "Action completed": "Actie voltooid",
@@ -135,6 +139,7 @@
     "Available Columns": "Beschikbare kolommen",
     "Back to Users": "Terug naar Users",
     "Before": "Voor",
+    "Before you can delete this fieldset, you need to remove references to it in blueprints and fieldsets:": "Voordat je deze fieldset kunt verwijderen moet je eerst verwijzingen hiernaar verwijderen uit blueprints en fieldsets:",
     "Behavior": "Gedrag",
     "Below": "Onder",
     "Between": "Tussen",
@@ -160,7 +165,7 @@
     "Cast Booleans": "Cast booleans",
     "Change Password": "Wachtwoord wijzigen",
     "Change successful.": "Wijziging succesvol.",
-    "Changes to this field will stay in sync.": "Wijzigingen aan dit veld blijven in sync.",
+    "Changes to this field in the fieldset will stay in sync.": "Wijzigingen aan dit veld in de fieldset blijven in sync.",
     "Changes to this fieldset will stay in sync.": "Wijzigingen aan deze fieldset blijven in sync.",
     "Character Limit": "Karakterlimiet",
     "Characters": "Karakters",
@@ -184,6 +189,7 @@
     "Collection already exists": "Collectie bestaat al",
     "Collection created": "Collectie aangemaakt",
     "Collection deleted": "Collectie verwijderd",
+    "Collection is not available on site \":handle\".": "Collectie is niet beschikbaar op site \":handle\".",
     "Collection saved": "Collectie opgeslagen",
     "Collection tree deleted": "Collectieboom verwijderd",
     "Collection tree saved": "Collectieboom opgeslagen",
@@ -223,6 +229,8 @@
     "Copy password reset email for this user?": "Kopieer wachtwoordresetmail voor deze gebruiker",
     "Copy Password Reset Link": "Kopieer wachtwoordresetlink",
     "Copy URL": "Kopieer URL",
+    "Couldn't save entry": "Kon de entry niet opslaan",
+    "Couldn't save term": "Kon de term niet opslaan",
     "CP Nav": "CP Nav",
     "CP Nav Preferences": "CP Nav Instellingen",
     "Create": "Aanmaken",
@@ -419,7 +427,6 @@
     "Filter preset updated": "Filter preset aangepast",
     "Finish": "Klaar",
     "First Child": "Eerste subitem (first child)",
-    "First Name": "Voornaam",
     "Fixed": "Vastgezet",
     "Floating": "Floating",
     "Focal Point": "Focuspunt",
@@ -508,7 +515,8 @@
     "Instructions": "Instructies",
     "Instructions Position": "Instructiepositie",
     "Intelligently Warm Presets": "Intelligent Presets Opwarmen",
-    "Invalid content": "Ongeldige content",
+    "Invalid content, :type button\/extension is not enabled": "Ongeldige inhoud, :type button\/extensie is niet ingeschakeld",
+    "Invalid content, nodes and marks must have a type": "Ongeldige inhoud, nodes en marks moeten een type hebben",
     "Invalid credentials.": "Ongeldige inloggegevens",
     "Invitation": "Uitnodiging",
     "Is": "Is",
@@ -523,7 +531,6 @@
     "Laptop": "Laptop",
     "Last Login": "Laaste login",
     "Last Modified": "Laatste aanpassing",
-    "Last Name": "Achternaam",
     "Last rebuild": "Laatste rebuild",
     "Latest Date": "Laatste datum",
     "Layout": "Layout",
@@ -645,6 +652,7 @@
     "Ordering": "Sorteren",
     "Origin": "Oorsprong",
     "Origin Behavior": "Oorsprong gedrag",
+    "Other": "Overig",
     "Override Alt": "Alt overschrijven",
     "Override For Role": "Overschrijf Voor Rol",
     "Override For User": "Overschrijf voor Gebruiker",
@@ -882,10 +890,12 @@
     "Taxonomy deleted": "Taxonomie verwijderd",
     "Taxonomy saved": "Taxonomie opgeslagen",
     "Template": "Template",
+    "Templates": "Templates",
     "Term created": "Term aangemaakt",
     "Term deleted": "Term verwijderd",
     "Term references updated": "Termreferencies geüpdatet",
     "Term saved": "Term opgeslagen",
+    "Term Template": "Term template",
     "Terms": "Termen",
     "Test email sent.": "Testmail verzonden",
     "Text": "Tekst",
@@ -904,7 +914,6 @@
     "This is now your start page.": "Dit is nu je startpagina.",
     "This is the published version": "Dit is de gepubliceerde versie",
     "This is the root page": "Dit is de root pagina",
-    "This user already exists.": "Deze gebruiker bestaat al.",
     "Time Enabled": "Tijd ingeschakeld",
     "Timepicker": "Tijd kiezer",
     "Title": "Titel",
@@ -1013,6 +1022,7 @@
     "You are not authorized to view navs.": "Je hebt geen toestemming om navigaties te bekijken.",
     "You are not authorized to view this collection.": "Je hebt geen toestemming om deze collectie te bekijken.",
     "You are now impersonating": "Je bent nu aan het imiteren",
+    "You can't do this while logged in": "Je kunt dit niet doen terwijl je bent ingelogd",
     "Your Favorites": "Jouw favorieten",
     "Your working copy will be replaced by the contents of this revision.": "Je werkkopie wordt vervangen met de inhoud van deze revisie."
 }
diff --git a/resources/lang/nl/fieldtypes.php b/resources/lang/nl/fieldtypes.php
index da35c32e71..295779a532 100644
--- a/resources/lang/nl/fieldtypes.php
+++ b/resources/lang/nl/fieldtypes.php
@@ -13,6 +13,7 @@
     'assets.config.max_files' => 'Het maximaal aantal selecteerbare assets.',
     'assets.config.min_files' => 'Het minimaal aantal selecteerbare assets.',
     'assets.config.mode' => 'Kies je voorkeur voor layoutstijl.',
+    'assets.config.query_scopes' => 'Kies welke query scopes toegepast worden bij het ophalen van selecteerbare assets.',
     'assets.config.restrict' => 'Voorkom dat gebruikers naar andere mapen kunnen bladeren.',
     'assets.config.show_filename' => 'Toon de bestandsnaam naast de voorbeeldafbeelding.',
     'assets.config.show_set_alt' => 'Toon een link om de alt-tekst van een afbeelding te bewerken.',
@@ -88,6 +89,8 @@
     'grid.config.mode' => 'Kies je voorkeurslayoutstijl.',
     'grid.config.reorderable' => 'Schakel in om het herordenen van rijen toe te staan.',
     'grid.title' => 'Grid',
+    'group.config.fields' => 'Configureer de velden die genest worden in deze groep.',
+    'group.title' => 'Groep',
     'hidden.title' => 'Hidden',
     'html.config.html_instruct' => 'Beheer de HTML die getoond wordt in het publiceer-formulier.',
     'html.title' => 'HTML',
diff --git a/resources/lang/nl/messages.php b/resources/lang/nl/messages.php
index 3af0a25232..79683cfdfe 100644
--- a/resources/lang/nl/messages.php
+++ b/resources/lang/nl/messages.php
@@ -116,6 +116,7 @@
     'form_configure_handle_instructions' => 'Wordt gebruikt om aan dit formulier te refereren aan de voorkant van de website. Het is niet persé eenvoudig om dit nadien te wijzigen.',
     'form_configure_honeypot_instructions' => 'De veldnaam die gebruikt moet worden als honeypot. Honeypot\'s zijn speciale velden die gebruikt worden om spam te verminderen.',
     'form_configure_intro' => 'Formulieren worden gebruikt om informatie van bezoekers te verzamelen en events en notificaties te triggeren als er een formulier wordt ingevuld.',
+    'form_configure_mailer_instructions' => 'Kies de mailer voor het versturen van deze mail. Laat leeg om de standaard mailer te gebruiken.',
     'form_configure_store_instructions' => 'Schakel uit om formulierinzendingen niet meer op te slaan. Events en e-mailnotificaties worden nog steeds verzonden.',
     'form_configure_title_instructions' => 'Meestal een call-to-action, zoals "Neem contact op".',
     'getting_started_widget_blueprints' => 'Blueprints definiëren de custom velden die gebruikt worden om content te maken en op te slaan.',
@@ -203,6 +204,9 @@
     'taxonomies_preview_targets_instructions' => 'De URLs die je kunt bezoeken via Live Preview. Lees meer in de [documentatie](https://statamic.dev/live-preview#preview-targets).',
     'taxonomy_configure_handle_instructions' => 'Wordt gebruikt om in de frontend aan deze taxonomie te refereren. Het is niet persé eenvoudig om dit nadien te wijzigen.',
     'taxonomy_configure_intro' => 'Een taxonomie is een systeem waarmee je data kunt classificeren op basis van unieke eigenschappen, zoals categorie of kleur.',
+    'taxonomy_configure_layout_instructions' => 'Configureer de standaard layout van deze taxonomie. Termen kunnen deze overschrijven door het instellen van een `layout` veld.',
+    'taxonomy_configure_template_instructions' => 'Configureer de standaard template van deze taxonomie.',
+    'taxonomy_configure_term_template_instructions' => 'Configureer de standaard template van deze term. Termen kunnen deze overschrijven door het instellen van een `template` veld.',
     'taxonomy_configure_title_instructions' => 'We adviseren een meervoudig zeflstandig naamwoord, zoals "Categorieën" of "Tags".',
     'taxonomy_next_steps_configure_description' => 'Configureer naamgeving, associeer collecties, definieer blueprints en meer.',
     'taxonomy_next_steps_create_term_description' => 'Maak de eerste term of een aantal tijdelijke termen, het is aan jou.',
@@ -214,14 +218,12 @@
     'user_groups_role_instructions' => 'Wijs rollen toe om gebruikers in deze groep alle bijbehorende bevoegdheden te geven.',
     'user_groups_title_instructions' => 'Meestal een meervoudig zelfstandig naamwoord, zoals Redacteuren of Fotografen.',
     'user_wizard_account_created' => 'Het gebruikersaccount is aangemaakt.',
-    'user_wizard_email_instructions' => 'Het e-mailadres is tevens gebruikersnaam en moet uniek zijn.',
     'user_wizard_intro' => 'Gebruikers kunnen rollen toegewezen krijgen om hun eigen bevoegdheden, toegang en mogelijkheden in het Control Panel aan te passen.',
     'user_wizard_invitation_body' => 'Activeer je nieuwe Statamic-account voor :site om te beginnen met het beheren van deze website. Voor je eigen veiligheid, onderstaande link verloopt na :expiry uur. Hierna zul je contact op moeten nemen met de administrator van deze site voor een nieuw wachtwoord.',
     'user_wizard_invitation_intro' => 'Stuur een welkomstmail naar deze gebruiker met instructies over hoe het account geactiveerd kan worden.',
     'user_wizard_invitation_share' => 'Kopieer deze inloggegevens en deel ze met <code>:email</code> via een communicatiekanaal naar keuze.',
     'user_wizard_invitation_share_before' => 'Nadat je een gebruiker hebt aangemaakt, komen er instructies beschikbaar die je via een communicatiekanaal naar keuze kunt delen met <code>:email</code>.',
     'user_wizard_invitation_subject' => 'Activeer je nieuwe Statamic-account voor :site',
-    'user_wizard_name_instructions' => 'Laat de naam leeg om de gebruiker deze te laten invullen.',
     'user_wizard_roles_groups_intro' => 'Aan gebruikers kunnen rollen toegewezen worden die hun bevoegdheden, toegang en mogelijkheden in het Control Panel aanpassen.',
     'user_wizard_super_admin_instructions' => 'Super admins hebben volledige controle over het Control Panel en kunnen alles wijzigen. Ga hier verstandig mee om.',
     'view_more_count' => 'Bekijk :count meer',
diff --git a/resources/lang/nl/validation.php b/resources/lang/nl/validation.php
index 0f662dd79b..ffadd56309 100644
--- a/resources/lang/nl/validation.php
+++ b/resources/lang/nl/validation.php
@@ -152,6 +152,7 @@
     'date_fieldtype_start_date_invalid' => 'Dit is geen geldige startdatum.',
     'date_fieldtype_end_date_required' => 'Einddatum is verplicht.',
     'date_fieldtype_end_date_invalid' => 'Dit is geen geldige einddatum.',
+    'date_fieldtype_only_single_mode_allowed' => 'Je kunt alleen de "Single" mode gebruiken als het veld een Datum veld is.',
     'code_fieldtype_rulers' => 'Dit is ongeldig.',
     'options_require_keys' => 'Voor elke optie is een key verplicht. ',
     'custom.attribute-name.rule-name' => 'aangepast-bericht',

From 4324e7b66bad6626c3500714f9339365bf9af79a Mon Sep 17 00:00:00 2001
From: Jack Sleight <jacksleight@gmail.com>
Date: Wed, 17 Jan 2024 21:30:57 +0000
Subject: [PATCH 014/149] [4.x] Fix additional blueprints in multi-part
 namespaces (#9325)

---
 src/Fields/BlueprintRepository.php                     | 5 +++--
 src/Http/Controllers/CP/Fields/BlueprintController.php | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Fields/BlueprintRepository.php b/src/Fields/BlueprintRepository.php
index 3e7f9df74c..3dbcdef92b 100644
--- a/src/Fields/BlueprintRepository.php
+++ b/src/Fields/BlueprintRepository.php
@@ -63,10 +63,11 @@ public function findStandardBlueprintPath($handle)
     public function findNamespacedBlueprintPath($handle)
     {
         [$namespace, $handle] = explode('::', $handle);
+        $namespaceDir = str_replace('.', '/', $namespace);
         $handle = str_replace('/', '.', $handle);
         $path = str_replace('.', '/', $handle);
 
-        $overridePath = "{$this->directory}/vendor/{$namespace}/{$path}.yaml";
+        $overridePath = "{$this->directory}/vendor/{$namespaceDir}/{$path}.yaml";
 
         if (File::exists($overridePath)) {
             return $overridePath;
@@ -207,7 +208,7 @@ protected function filesIn($namespace)
             if (isset($this->additionalNamespaces[$namespace])) {
                 $directory = $this->additionalNamespaces[$namespace];
 
-                $overridePath = "{$this->directory}/vendor/{$namespace}";
+                $overridePath = "{$this->directory}/vendor/{$namespaceDir}";
 
                 if (File::exists($overridePath)) {
                     $directory = $overridePath;
diff --git a/src/Http/Controllers/CP/Fields/BlueprintController.php b/src/Http/Controllers/CP/Fields/BlueprintController.php
index 336cc4bcf5..41a79d0579 100644
--- a/src/Http/Controllers/CP/Fields/BlueprintController.php
+++ b/src/Http/Controllers/CP/Fields/BlueprintController.php
@@ -22,7 +22,7 @@ public function index()
         $additional = Blueprint::getAdditionalNamespaces()
             ->map(function ($path, $key) {
                 return [
-                    'title' => Str::humanize($key),
+                    'title' => str_replace('.', ' ', Str::humanize($key)),
                     'blueprints' => Blueprint::in($key)
                         ->map(function ($blueprint) {
                             return [

From 686a7ee8fda63bac7b1250e53e282c33b07c2aa9 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Wed, 17 Jan 2024 21:37:57 +0000
Subject: [PATCH 015/149] [4.x] Fix "Read Only" text for section fields (#9315)

---
 resources/js/components/publish/Field.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/publish/Field.vue b/resources/js/components/publish/Field.vue
index dcf4cf21a2..f8582718a5 100644
--- a/resources/js/components/publish/Field.vue
+++ b/resources/js/components/publish/Field.vue
@@ -17,7 +17,7 @@
                 />
                 <i class="required mr-1" v-if="config.required">*</i>
                 <avatar v-if="isLocked" :user="lockingUser" class="w-4 rounded-full -mt-px ml-2 mr-2" v-tooltip="lockingUser.name" />
-                <span v-if="isReadOnly && !isTab" class="text-gray-500 font-normal text-2xs mr-1">
+                <span v-if="isReadOnly && !isTab && !isSection" class="text-gray-500 font-normal text-2xs mr-1">
                     {{ isLocked ? __('Locked') : __('Read Only') }}
                 </span>
                 <svg-icon name="translate" class="h-4 mr-1 w-4 text-gray-600" v-if="isLocalizable && !isTab" v-tooltip.top="__('Localizable field')" />
@@ -148,6 +148,10 @@ export default {
             return this.config.type === 'tab';
         },
 
+        isSection() {
+            return this.config.type === 'section';
+        },
+
         classes() {
             return [
                 'form-group publish-field',

From af3c359e5764374f8a93dfe214ba5c077f4867a8 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Thu, 18 Jan 2024 14:37:12 +0000
Subject: [PATCH 016/149] [4.x] Don't create revision when localizing entry
 unless revisions are enabled on the collection (#8908)

---
 src/Entries/Collection.php                    |  1 +
 .../CP/Collections/CollectionsController.php  |  2 +-
 src/Revisions/Revisable.php                   | 18 ++++++++-----
 tests/Feature/Entries/LocalizeEntryTest.php   | 26 ++++++++++++++++++-
 4 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/src/Entries/Collection.php b/src/Entries/Collection.php
index 94351777db..a96358a074 100644
--- a/src/Entries/Collection.php
+++ b/src/Entries/Collection.php
@@ -615,6 +615,7 @@ public function pastDateBehavior($behavior = null)
             ->args(func_get_args());
     }
 
+    /** @deprecated */
     public function revisions($enabled = null)
     {
         return $this
diff --git a/src/Http/Controllers/CP/Collections/CollectionsController.php b/src/Http/Controllers/CP/Collections/CollectionsController.php
index 1a6919fe06..a17eda29ce 100644
--- a/src/Http/Controllers/CP/Collections/CollectionsController.php
+++ b/src/Http/Controllers/CP/Collections/CollectionsController.php
@@ -234,7 +234,7 @@ public function update(Request $request, $collection)
             ->defaultPublishState($values['default_publish_state'])
             ->sortDirection($values['sort_direction'])
             ->mount($values['mount'] ?? null)
-            ->revisions($values['revisions'] ?? false)
+            ->revisionsEnabled($values['revisions'] ?? false)
             ->taxonomies($values['taxonomies'] ?? [])
             ->futureDateBehavior(array_get($values, 'future_date_behavior'))
             ->pastDateBehavior(array_get($values, 'past_date_behavior'))
diff --git a/src/Revisions/Revisable.php b/src/Revisions/Revisable.php
index c6008672f8..4ad1e7e15b 100644
--- a/src/Revisions/Revisable.php
+++ b/src/Revisions/Revisable.php
@@ -111,16 +111,20 @@ public function unpublishWorkingCopy($options = [])
 
     public function store($options = [])
     {
-        $this
+        $return = $this
             ->published(false)
             ->updateLastModified($user = $options['user'] ?? false)
             ->save();
 
-        return $this
-            ->makeRevision()
-            ->user($user)
-            ->message($options['message'] ?? false)
-            ->save();
+        if ($this->revisionsEnabled()) {
+            $return = $this
+                ->makeRevision()
+                ->user($user)
+                ->message($options['message'] ?? false)
+                ->save();
+        }
+
+        return $return;
     }
 
     public function createRevision($options = [])
@@ -135,7 +139,7 @@ public function createRevision($options = [])
 
     public function revisionsEnabled()
     {
-        return config('statamic.revisions.enabled') || ! Statamic::pro();
+        return config('statamic.revisions.enabled') && Statamic::pro();
     }
 
     abstract protected function revisionKey();
diff --git a/tests/Feature/Entries/LocalizeEntryTest.php b/tests/Feature/Entries/LocalizeEntryTest.php
index b396e12663..5e9d1b6ce1 100644
--- a/tests/Feature/Entries/LocalizeEntryTest.php
+++ b/tests/Feature/Entries/LocalizeEntryTest.php
@@ -34,7 +34,7 @@ public function setUp(): void
     public function it_localizes_an_entry()
     {
         $user = $this->user();
-        $entry = EntryFactory::collection('blog')->slug('test')->create();
+        $entry = EntryFactory::collection(tap(Collection::make('blog')->revisionsEnabled(false))->save())->slug('test')->create();
         $this->assertNull($entry->in('fr'));
 
         $response = $this
@@ -46,6 +46,8 @@ public function it_localizes_an_entry()
         $this->assertNotNull($localized);
         $this->assertEquals($user, $localized->lastModifiedBy());
         $response->assertJson(['handle' => 'fr', 'url' => $localized->editUrl()]);
+
+        $this->assertCount(0, $entry->in('fr')->revisions());
     }
 
     /** @test */
@@ -195,6 +197,28 @@ public function it_adds_an_entry_to_the_end_of_the_structure_tree_if_the_parent_
         ], Collection::findByHandle('pages')->structure()->in('fr')->tree());
     }
 
+    /** @test */
+    public function it_localizes_an_entry_with_revisions()
+    {
+        config(['statamic.revisions.enabled' => true]);
+
+        $user = $this->user();
+        $entry = EntryFactory::collection(tap(Collection::make('blog')->revisionsEnabled(true))->save())->slug('test')->create();
+        $this->assertNull($entry->in('fr'));
+
+        $response = $this
+            ->actingAs($user)
+            ->localize($entry, ['site' => 'fr'])
+            ->assertOk();
+
+        $localized = $entry->fresh()->in('fr');
+        $this->assertNotNull($localized);
+        $this->assertEquals($user, $localized->lastModifiedBy());
+        $response->assertJson(['handle' => 'fr', 'url' => $localized->editUrl()]);
+
+        $this->assertCount(1, $entry->in('fr')->revisions());
+    }
+
     private function localize($entry, $params = [])
     {
         $url = cp_route('collections.entries.localize', [

From bbeb405cdfdb40037589c95eb96937db9c1b9ebc Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Thu, 18 Jan 2024 16:53:05 +0000
Subject: [PATCH 017/149] [4.x] Fix error from Relationship Index Fieldtype
 after toggling column (#9355)

---
 .../fieldtypes/relationship/RelationshipIndexFieldtype.vue    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/js/components/fieldtypes/relationship/RelationshipIndexFieldtype.vue b/resources/js/components/fieldtypes/relationship/RelationshipIndexFieldtype.vue
index 4f30d7a0e0..da6f9f635e 100644
--- a/resources/js/components/fieldtypes/relationship/RelationshipIndexFieldtype.vue
+++ b/resources/js/components/fieldtypes/relationship/RelationshipIndexFieldtype.vue
@@ -33,11 +33,11 @@ export default {
 
     computed: {
         items() {
-            return this.showingAll ? this.value : this.value.slice(0, 2);
+            return this.showingAll ? this.value : this.value?.slice(0, 2);
         },
 
         hasMore() {
-            return this.value.length > 2;
+            return this.value?.length > 2;
         },
     },
 

From 16408f44a035cfb630f97918f262348ecaf538bd Mon Sep 17 00:00:00 2001
From: Andreas Schantl <andreas@schantl.io>
Date: Thu, 18 Jan 2024 18:29:36 +0100
Subject: [PATCH 018/149] [4.x] Allow optional asset fields in form submissions
 (#9356)

---
 src/Http/Controllers/FormController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Http/Controllers/FormController.php b/src/Http/Controllers/FormController.php
index 1304e1c3b4..8d7064e58d 100644
--- a/src/Http/Controllers/FormController.php
+++ b/src/Http/Controllers/FormController.php
@@ -79,7 +79,7 @@ private function validateContentType($request, $form)
     {
         $type = Str::before($request->headers->get('CONTENT_TYPE'), ';');
 
-        if ($type !== 'multipart/form-data' && $form->hasFiles()) {
+        if ($type !== 'multipart/form-data' && $form->hasFiles() && $request->assets()) {
             throw new FileContentTypeRequiredException;
         }
     }

From eae3183ee32ea17545e6d5c6d6b5e6ee7506a611 Mon Sep 17 00:00:00 2001
From: Michael Aerni <hello@michaelaerni.ch>
Date: Thu, 18 Jan 2024 12:30:51 -0500
Subject: [PATCH 019/149] [4.x] Autoload addon blueprints (#9324)

---
 src/Providers/AddonServiceProvider.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/Providers/AddonServiceProvider.php b/src/Providers/AddonServiceProvider.php
index a344f4e104..4df4504a5f 100644
--- a/src/Providers/AddonServiceProvider.php
+++ b/src/Providers/AddonServiceProvider.php
@@ -13,6 +13,7 @@
 use Statamic\Exceptions\NotBootedException;
 use Statamic\Extend\Manifest;
 use Statamic\Facades\Addon;
+use Statamic\Facades\Blueprint;
 use Statamic\Facades\Fieldset;
 use Statamic\Fields\Fieldtype;
 use Statamic\Forms\JsDrivers\JsDriver;
@@ -144,6 +145,11 @@ abstract class AddonServiceProvider extends ServiceProvider
      */
     protected $updateScripts = [];
 
+    /**
+     * @var string
+     */
+    protected $blueprintNamespace;
+
     /**
      * @var string
      */
@@ -198,6 +204,7 @@ public function boot()
                 ->bootMiddleware()
                 ->bootUpdateScripts()
                 ->bootViews()
+                ->bootBlueprints()
                 ->bootFieldsets()
                 ->bootPublishAfterInstall()
                 ->bootAddon();
@@ -617,6 +624,20 @@ protected function bootPublishAfterInstall()
         return $this;
     }
 
+    protected function bootBlueprints()
+    {
+        if (! file_exists($path = "{$this->getAddon()->directory()}resources/blueprints")) {
+            return $this;
+        }
+
+        Blueprint::addNamespace(
+            $this->blueprintNamespace ?? $this->getAddon()->slug(),
+            $path
+        );
+
+        return $this;
+    }
+
     protected function bootFieldsets()
     {
         if (! file_exists($path = "{$this->getAddon()->directory()}resources/fieldsets")) {

From 8f951052ac49104eaeb98f476604b225f761e890 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Thu, 18 Jan 2024 17:34:26 +0000
Subject: [PATCH 020/149] [4.x] Catch validation exceptions thrown in
 FormSubmitted events (#9348)

---
 src/Http/Controllers/FormController.php | 30 +++++++++++++++++++++
 tests/Tags/Form/FormErrorsTest.php      | 36 +++++++++++++++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/src/Http/Controllers/FormController.php b/src/Http/Controllers/FormController.php
index 8d7064e58d..1cacb10437 100644
--- a/src/Http/Controllers/FormController.php
+++ b/src/Http/Controllers/FormController.php
@@ -4,6 +4,8 @@
 
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\URL;
+use Illuminate\Support\MessageBag;
+use Illuminate\Validation\ValidationException;
 use Statamic\Contracts\Forms\Submission;
 use Statamic\Events\FormSubmitted;
 use Statamic\Events\SubmissionCreated;
@@ -57,6 +59,8 @@ public function submit(FrontendFormRequest $request, $form)
             // If any event listeners return false, we'll do a silent failure.
             // If they want to add validation errors, they can throw an exception.
             throw_if(FormSubmitted::dispatch($submission) === false, new SilentFormFailureException);
+        } catch (ValidationException $e) {
+            return $this->formFailure($params, $e->errors(), $form->handle());
         } catch (SilentFormFailureException $e) {
             return $this->formSuccess($params, $submission, true);
         }
@@ -84,6 +88,32 @@ private function validateContentType($request, $form)
         }
     }
 
+    /**
+     * The steps for a failed form submission.
+     *
+     * @param  array  $params
+     * @param  array  $submission
+     * @param  string  $form
+     * @return Response|RedirectResponse
+     */
+    private function formFailure($params, $errors, $form)
+    {
+        if (request()->ajax()) {
+            return response([
+                'errors' => (new MessageBag($errors))->all(),
+                'error' => collect($errors)->map(function ($errors, $field) {
+                    return $errors[0];
+                })->all(),
+            ], 400);
+        }
+
+        $redirect = Arr::get($params, '_error_redirect');
+
+        $response = $redirect ? redirect($redirect) : back();
+
+        return $response->withInput()->withErrors($errors, 'form.'.$form);
+    }
+
     /**
      * The steps for a successful form submission.
      *
diff --git a/tests/Tags/Form/FormErrorsTest.php b/tests/Tags/Form/FormErrorsTest.php
index c18adfde4a..28e6fdf88a 100644
--- a/tests/Tags/Form/FormErrorsTest.php
+++ b/tests/Tags/Form/FormErrorsTest.php
@@ -2,6 +2,10 @@
 
 namespace Tests\Tags\Form;
 
+use Illuminate\Support\Facades\Event;
+use Illuminate\Validation\ValidationException;
+use Statamic\Events\FormSubmitted;
+
 class FormErrorsTest extends FormTestCase
 {
     /** @test */
@@ -46,4 +50,36 @@ public function it_allows_use_of_sometimes_rule_for_conditionally_hidden_fields(
             ->assertSessionDoesntHaveErrors(['message'], null, 'form.contact')
             ->assertLocation('/');
     }
+
+    /** @test */
+    public function it_renders_errors_from_form_submitting_event()
+    {
+        Event::listen(FormSubmitted::class, function () {
+            throw ValidationException::withMessages(['custom' => 'This is a custom message']);
+        });
+
+        $this
+            ->post('/!/forms/contact', [
+                'name' => 'name',
+                'email' => 'test@test.com',
+                'message' => 'message',
+            ])
+            ->assertSessionHasErrors(['custom'], null, 'form.contact')
+            ->assertLocation('/');
+
+        $output = $this->tag(<<<'EOT'
+{{ form:errors in="contact" }}
+    <p class="error">{{ value }}</p>
+{{ /form:errors }}
+EOT
+        );
+
+        preg_match_all('/<p class="error">(.+)<\/p>/U', $output, $errors);
+
+        $expected = [
+            'This is a custom message',
+        ];
+
+        $this->assertEquals($expected, $errors[1]);
+    }
 }

From 63fe81ee1ceb7f7a5e8881dd68478d2423f80b46 Mon Sep 17 00:00:00 2001
From: Julia Lange <44929138+juliawarnke@users.noreply.github.com>
Date: Thu, 18 Jan 2024 18:35:24 +0100
Subject: [PATCH 021/149] [4.x] Update entry order and uri by ids (#9350)

---
 src/Stache/Stores/CollectionsStore.php | 27 ++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/Stache/Stores/CollectionsStore.php b/src/Stache/Stores/CollectionsStore.php
index b81d6a086b..e43f8da720 100644
--- a/src/Stache/Stores/CollectionsStore.php
+++ b/src/Stache/Stores/CollectionsStore.php
@@ -3,6 +3,7 @@
 namespace Statamic\Stache\Stores;
 
 use Statamic\Facades\Collection;
+use Statamic\Facades\Entry;
 use Statamic\Facades\Path;
 use Statamic\Facades\Site;
 use Statamic\Facades\Stache;
@@ -81,18 +82,32 @@ protected function getDefaultPublishState($data)
 
     public function updateEntryUris($collection, $ids = null)
     {
-        Stache::store('entries')
+        $index = Stache::store('entries')
             ->store($collection->handle())
-            ->index('uri')
-            ->update();
+            ->index('uri');
+
+        $this->updateEntriesWithinIndex($index, $ids);
     }
 
     public function updateEntryOrder($collection, $ids = null)
     {
-        Stache::store('entries')
+        $index = Stache::store('entries')
             ->store($collection->handle())
-            ->index('order')
-            ->update();
+            ->index('order');
+
+        $this->updateEntriesWithinIndex($index, $ids);
+    }
+
+    private function updateEntriesWithinIndex($index, $ids)
+    {
+        if (empty($ids)) {
+            return $index->update();
+        }
+
+        collect($ids)
+            ->map(fn ($id) => Entry::find($id))
+            ->filter()
+            ->each(fn ($entry) => $index->updateItem($entry));
     }
 
     public function handleFileChanges()

From 9430dd9808f1d082ec8481f70fe37ce5e825b0f7 Mon Sep 17 00:00:00 2001
From: Jack Sleight <jacksleight@gmail.com>
Date: Thu, 18 Jan 2024 18:46:22 +0000
Subject: [PATCH 022/149] [4.x] Improve Bard cut/copy/paste set (#7606)

---
 .../fieldtypes/bard/BardFieldtype.vue         | 14 +++++++
 .../js/components/fieldtypes/bard/Set.js      | 41 +++++++++++++++++++
 .../js/components/fieldtypes/bard/Set.vue     | 14 +++++--
 3 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/fieldtypes/bard/BardFieldtype.vue b/resources/js/components/fieldtypes/bard/BardFieldtype.vue
index 5f2784d0c5..7aaedbeaeb 100644
--- a/resources/js/components/fieldtypes/bard/BardFieldtype.vue
+++ b/resources/js/components/fieldtypes/bard/BardFieldtype.vue
@@ -467,6 +467,20 @@ export default {
             });
         },
 
+        pasteSet(attrs) {
+            const old_id = attrs.id;
+            const id = uniqid();
+            const enabled = attrs.enabled;
+            const values = Object.assign({}, attrs.values);
+
+            let previews = Object.assign({}, this.previews[old_id] || {});
+            this.previews = Object.assign({}, this.previews, { [id]: previews });
+
+            this.updateSetMeta(id, this.meta.existing[old_id] || this.meta.defaults[values.type] || {});
+
+            return { id, enabled, values };
+        },
+
         collapseSet(id) {
             if (!this.collapsed.includes(id)) {
                 this.collapsed.push(id)
diff --git a/resources/js/components/fieldtypes/bard/Set.js b/resources/js/components/fieldtypes/bard/Set.js
index d9eb491f93..48a9cb8a86 100644
--- a/resources/js/components/fieldtypes/bard/Set.js
+++ b/resources/js/components/fieldtypes/bard/Set.js
@@ -1,4 +1,7 @@
 import { Node } from '@tiptap/core';
+import { Plugin, PluginKey } from '@tiptap/pm/state';
+import { Slice, Fragment } from '@tiptap/pm/model';
+import { Decoration, DecorationSet } from "@tiptap/pm/view";
 import { VueNodeViewRenderer } from '@tiptap/vue-2'
 import SetComponent from './Set.vue';
 import { TextSelection } from '@tiptap/pm/state';
@@ -72,4 +75,42 @@ export const Set = Node.create({
         }
     },
 
+    addProseMirrorPlugins() {
+        const bard = this.options.bard;
+        const type = this.type;
+        return [
+            new Plugin({
+                key: new PluginKey('setSelectionDecorator'),
+                props: {
+                    decorations(state) {
+                        const { from, to } = state.selection;
+                        const decorations = [];
+                        state.doc.nodesBetween(from, to, (node, pos) => {
+                            if (node.type === type) {
+                                decorations.push(Decoration.node(pos, pos + node.nodeSize, {}, {
+                                    withinSelection: true,
+                                }));
+                            }
+                        });
+                        return DecorationSet.create(state.doc, decorations);
+                    }
+                },
+            }),
+            new Plugin({
+                key: new PluginKey('setPastedTransformer'),
+                props: {
+                    transformPasted: (slice) => {
+                        const { content } = slice.content;
+                        return new Slice(Fragment.fromArray(content.map(node => {
+                            if (node.type === type) {
+                                return node.type.create(bard.pasteSet(node.attrs));
+                            }
+                            return node.copy(node.content);
+                        })), slice.openStart, slice.openEnd);
+                    },
+                },
+            }),
+        ]
+    },
+
 })
diff --git a/resources/js/components/fieldtypes/bard/Set.vue b/resources/js/components/fieldtypes/bard/Set.vue
index 13bf5ffc89..b03e955f00 100644
--- a/resources/js/components/fieldtypes/bard/Set.vue
+++ b/resources/js/components/fieldtypes/bard/Set.vue
@@ -2,7 +2,7 @@
 
     <node-view-wrapper>
         <div class="bard-set whitespace-normal my-6 rounded bg-white border shadow-md"
-            :class="{ 'border-blue-400': selected, 'has-error': hasError }"
+            :class="{ 'border-blue-400': selected || withinSelection, 'has-error': hasError }"
             contenteditable="false" @copy.stop @paste.stop @cut.stop
         >
             <div ref="content" hidden />
@@ -96,11 +96,11 @@ export default {
         },
 
         meta() {
-            return this.extension.options.bard.meta.existing[this.node.attrs.id];
+            return this.extension.options.bard.meta.existing[this.node.attrs.id] || {};
         },
 
         previews() {
-            return this.extension.options.bard.meta.previews[this.node.attrs.id];
+            return this.extension.options.bard.meta.previews[this.node.attrs.id] || {};
         },
 
         collapsed() {
@@ -152,6 +152,14 @@ export default {
             return Object.keys(this.config).length === 0;
         },
 
+        decorationSpecs() {
+            return Object.assign({}, ...this.decorations.map((decoration) => decoration.type.spec));
+        },
+
+        withinSelection() {
+            return this.decorationSpecs.withinSelection;
+        },
+
     },
 
     methods: {

From 71185c4fc3e163660249ed9d1b95e0959af3a961 Mon Sep 17 00:00:00 2001
From: David Singer <127755230+singer-d@users.noreply.github.com>
Date: Thu, 18 Jan 2024 20:34:27 +0100
Subject: [PATCH 023/149] [4.x] Update vite.config.js to allow deploying
 statamic with url prefix (#8984)

---
 vite.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vite.config.js b/vite.config.js
index 9178733d63..2fb3c800d2 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -8,7 +8,7 @@ export default defineConfig(({ mode }) => {
     const env = loadEnv(mode, process.cwd(), '');
 
     return {
-        base: '/vendor/statamic/cp/build',
+        base: './',
         plugins: [
             laravel({
                 valetTls: env.VALET_TLS,

From 7fa74a0c543b4dbbd757bde943bd028f4b67727c Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 18 Jan 2024 15:02:55 -0500
Subject: [PATCH 024/149] [4.x] Allow search index updates to be queued (#9358)

---
 src/Search/UpdateItemIndexes.php         | 3 ++-
 tests/Auth/Eloquent/EloquentUserTest.php | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Search/UpdateItemIndexes.php b/src/Search/UpdateItemIndexes.php
index 353386ed54..3057e80338 100644
--- a/src/Search/UpdateItemIndexes.php
+++ b/src/Search/UpdateItemIndexes.php
@@ -2,6 +2,7 @@
 
 namespace Statamic\Search;
 
+use Illuminate\Contracts\Queue\ShouldQueue;
 use Statamic\Contracts\Taxonomies\Term;
 use Statamic\Events\AssetDeleted;
 use Statamic\Events\AssetSaved;
@@ -13,7 +14,7 @@
 use Statamic\Events\UserSaved;
 use Statamic\Facades\Search;
 
-class UpdateItemIndexes
+class UpdateItemIndexes implements ShouldQueue
 {
     public function subscribe($event)
     {
diff --git a/tests/Auth/Eloquent/EloquentUserTest.php b/tests/Auth/Eloquent/EloquentUserTest.php
index efb7fde007..0cf4d0565d 100644
--- a/tests/Auth/Eloquent/EloquentUserTest.php
+++ b/tests/Auth/Eloquent/EloquentUserTest.php
@@ -5,6 +5,7 @@
 use Illuminate\Foundation\Testing\WithFaker;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Event;
 use Statamic\Auth\Eloquent\User as EloquentUser;
 use Statamic\Auth\File\Role;
 use Statamic\Contracts\Auth\Role as RoleContract;
@@ -29,6 +30,10 @@ public function setUp(): void
         // TODO: The migration has been added into the test, but the implementation could be broken if the real
         // migration is different from what's in here. We should find a way to reference the actual migrations.
         $this->loadMigrationsFrom(__DIR__.'/__migrations__');
+
+        // Prevent the anonymous role classes throwing errors when getting serialized
+        // during event handling unrelated to these tests.
+        Event::fake();
     }
 
     /** @test */

From 112f877d2b1185b23e02b558636e1962c07277eb Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Thu, 18 Jan 2024 20:43:37 +0000
Subject: [PATCH 025/149] [4.x] Prevent handling field previews when previews
 are disabled (#9353)

---
 resources/js/components/fieldtypes/ArrayFieldtype.vue     | 2 ++
 .../js/components/fieldtypes/ButtonGroupFieldtype.vue     | 2 ++
 .../js/components/fieldtypes/CheckboxesFieldtype.vue      | 2 ++
 resources/js/components/fieldtypes/CodeFieldtype.vue      | 2 ++
 resources/js/components/fieldtypes/ColorFieldtype.vue     | 2 ++
 resources/js/components/fieldtypes/DateFieldtype.vue      | 1 +
 resources/js/components/fieldtypes/Fieldtype.vue          | 8 ++++++++
 resources/js/components/fieldtypes/GroupFieldtype.vue     | 2 ++
 resources/js/components/fieldtypes/RadioFieldtype.vue     | 2 ++
 resources/js/components/fieldtypes/SelectFieldtype.vue    | 2 ++
 resources/js/components/fieldtypes/TableFieldtype.vue     | 2 ++
 resources/js/components/fieldtypes/ToggleFieldtype.vue    | 2 ++
 .../js/components/fieldtypes/assets/AssetsFieldtype.vue   | 2 ++
 resources/js/components/fieldtypes/bard/BardFieldtype.vue | 2 ++
 resources/js/components/fieldtypes/bard/Set.vue           | 1 +
 resources/js/components/fieldtypes/grid/Grid.vue          | 2 ++
 .../components/fieldtypes/markdown/MarkdownFieldtype.vue  | 2 ++
 .../fieldtypes/relationship/RelationshipFieldtype.vue     | 2 ++
 resources/js/components/fieldtypes/replicator/Field.vue   | 2 ++
 .../js/components/fieldtypes/replicator/Replicator.vue    | 2 ++
 resources/js/components/fieldtypes/replicator/Set.vue     | 1 +
 21 files changed, 45 insertions(+)

diff --git a/resources/js/components/fieldtypes/ArrayFieldtype.vue b/resources/js/components/fieldtypes/ArrayFieldtype.vue
index bc98ff0f6c..37ede3db49 100644
--- a/resources/js/components/fieldtypes/ArrayFieldtype.vue
+++ b/resources/js/components/fieldtypes/ArrayFieldtype.vue
@@ -170,6 +170,8 @@ export default {
         },
 
         replicatorPreview() {
+            if (! this.showFieldPreviews || ! this.config.replicator_preview) return;
+
             return _.reduce(this.value, (carry, value, key) => {
                 let str = `${key}: ${value}`;
                 if (carry) str = carry + ', ' + str;
diff --git a/resources/js/components/fieldtypes/ButtonGroupFieldtype.vue b/resources/js/components/fieldtypes/ButtonGroupFieldtype.vue
index 34b997a7b6..543c311cce 100644
--- a/resources/js/components/fieldtypes/ButtonGroupFieldtype.vue
+++ b/resources/js/components/fieldtypes/ButtonGroupFieldtype.vue
@@ -28,6 +28,8 @@ export default {
         },
 
         replicatorPreview() {
+            if (! this.showFieldPreviews || ! this.config.replicator_preview) return;
+
             var option = _.findWhere(this.config.options, {value: this.value});
             return (option) ? option.label : this.value;
         },
diff --git a/resources/js/components/fieldtypes/CheckboxesFieldtype.vue b/resources/js/components/fieldtypes/CheckboxesFieldtype.vue
index a7bc850d50..a1c9eb959e 100644
--- a/resources/js/components/fieldtypes/CheckboxesFieldtype.vue
+++ b/resources/js/components/fieldtypes/CheckboxesFieldtype.vue
@@ -34,6 +34,8 @@ export default {
         },
 
         replicatorPreview() {
+            if (! this.showFieldPreviews || ! this.config.replicator_preview) return;
+
             return this.values.map(value => {
                 const option = _.findWhere(this.options, { value });
                 return option ? option.label : value;
diff --git a/resources/js/components/fieldtypes/CodeFieldtype.vue b/resources/js/components/fieldtypes/CodeFieldtype.vue
index 6fd083ccb3..7a11f191dd 100644
--- a/resources/js/components/fieldtypes/CodeFieldtype.vue
+++ b/resources/js/components/fieldtypes/CodeFieldtype.vue
@@ -105,6 +105,8 @@ export default {
             return 'theme-' + this.config.theme;
         },
         replicatorPreview() {
+            if (! this.showFieldPreviews || ! this.config.replicator_preview) return;
+
             return this.value.code ? truncate(this.value.code, 60) : '';
         },
         readOnlyOption() {
diff --git a/resources/js/components/fieldtypes/ColorFieldtype.vue b/resources/js/components/fieldtypes/ColorFieldtype.vue
index eedc8bc8be..70848b3011 100644
--- a/resources/js/components/fieldtypes/ColorFieldtype.vue
+++ b/resources/js/components/fieldtypes/ColorFieldtype.vue
@@ -92,6 +92,8 @@ export default {
     computed: {
 
         replicatorPreview() {
+            if (! this.showFieldPreviews || ! this.config.replicator_preview) return;
+
             return this.value
                 ? `<span class="little-dot" style="background-color:${this.value}"></span>`
                 : null;
diff --git a/resources/js/components/fieldtypes/DateFieldtype.vue b/resources/js/components/fieldtypes/DateFieldtype.vue
index 172bf3507a..720042907b 100644
--- a/resources/js/components/fieldtypes/DateFieldtype.vue
+++ b/resources/js/components/fieldtypes/DateFieldtype.vue
@@ -159,6 +159,7 @@ export default {
         },
 
         replicatorPreview() {
+            if (! this.showFieldPreviews || ! this.config.replicator_preview) return;
             if (! this.value.date) return;
 
             if (this.isRange) {
diff --git a/resources/js/components/fieldtypes/Fieldtype.vue b/resources/js/components/fieldtypes/Fieldtype.vue
index 00b50f441e..a40ff35fe2 100644
--- a/resources/js/components/fieldtypes/Fieldtype.vue
+++ b/resources/js/components/fieldtypes/Fieldtype.vue
@@ -21,6 +21,10 @@ export default {
             type: Boolean,
             default: false
         },
+        showFieldPreviews: {
+            type: Boolean,
+            default: false
+        },
         namePrefix: String,
         fieldPathPrefix: String,
     },
@@ -56,6 +60,8 @@ export default {
         },
 
         replicatorPreview() {
+            if (! this.showFieldPreviews || ! this.config.replicator_preview) return;
+
             return this.value;
         },
 
@@ -71,6 +77,8 @@ export default {
         replicatorPreview: {
             immediate: true,
             handler(text) {
+                if (! this.showFieldPreviews || ! this.config.replicator_preview) return;
+
                 this.$emit('replicator-preview-updated', text);
             }
         }
diff --git a/resources/js/components/fieldtypes/GroupFieldtype.vue b/resources/js/components/fieldtypes/GroupFieldtype.vue
index 599f85aa0b..c40b6d3687 100644
--- a/resources/js/components/fieldtypes/GroupFieldtype.vue
+++ b/resources/js/components/fieldtypes/GroupFieldtype.vue
@@ -106,6 +106,8 @@ export default {
             return this.config.fields;
         },
         replicatorPreview() {
+            if (! this.showFieldPreviews || ! this.config.replicator_preview) return;
+
             return Object.values(this.value).join(', ');
         }
     },
diff --git a/resources/js/components/fieldtypes/RadioFieldtype.vue b/resources/js/components/fieldtypes/RadioFieldtype.vue
index 0799d56882..f82f8ee1f6 100644
--- a/resources/js/components/fieldtypes/RadioFieldtype.vue
+++ b/resources/js/components/fieldtypes/RadioFieldtype.vue
@@ -32,6 +32,8 @@ export default {
         },
 
         replicatorPreview() {
+            if (! this.showFieldPreviews || ! this.config.replicator_preview) return;
+
             var option = _.findWhere(this.config.options, {value: this.value});
             return (option) ? option.label : this.value;
         },
diff --git a/resources/js/components/fieldtypes/SelectFieldtype.vue b/resources/js/components/fieldtypes/SelectFieldtype.vue
index 9294730f42..a1c0e43c48 100644
--- a/resources/js/components/fieldtypes/SelectFieldtype.vue
+++ b/resources/js/components/fieldtypes/SelectFieldtype.vue
@@ -110,6 +110,8 @@ export default {
         },
 
         replicatorPreview() {
+            if (! this.showFieldPreviews || ! this.config.replicator_preview) return;
+
             return this.selectedOptions.map(option => option.label).join(', ');
         },
 
diff --git a/resources/js/components/fieldtypes/TableFieldtype.vue b/resources/js/components/fieldtypes/TableFieldtype.vue
index 8dad81c814..147e025690 100644
--- a/resources/js/components/fieldtypes/TableFieldtype.vue
+++ b/resources/js/components/fieldtypes/TableFieldtype.vue
@@ -163,6 +163,8 @@ export default {
         },
 
         replicatorPreview() {
+            if (! this.showFieldPreviews || ! this.config.replicator_preview) return;
+
             // Join all values with commas. Exclude any empties.
             return _(this.data)
                 .map(row => row.value.cells.filter(cell => !!cell).join(', '))
diff --git a/resources/js/components/fieldtypes/ToggleFieldtype.vue b/resources/js/components/fieldtypes/ToggleFieldtype.vue
index 7898b20955..c519480101 100644
--- a/resources/js/components/fieldtypes/ToggleFieldtype.vue
+++ b/resources/js/components/fieldtypes/ToggleFieldtype.vue
@@ -16,6 +16,8 @@ export default {
         },
 
         replicatorPreview() {
+            if (! this.showFieldPreviews || ! this.config.replicator_preview) return;
+
             return (this.value ? '✓' : '✗') + ' ' + __(this.config.display);
         }
 
diff --git a/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue b/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
index 2d6304e960..ed0aeba884 100644
--- a/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
+++ b/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
@@ -336,6 +336,8 @@ export default {
         },
 
         replicatorPreview() {
+            if (! this.showFieldPreviews || ! this.config.replicator_preview) return;
+
             return replicatorPreviewHtml(_.map(this.assets, (asset) => {
                 return (asset.isImage || asset.isSvg) ?
                     `<img src="${asset.thumbnail}" width="20" height="20" title="${asset.basename}" />`
diff --git a/resources/js/components/fieldtypes/bard/BardFieldtype.vue b/resources/js/components/fieldtypes/bard/BardFieldtype.vue
index 7aaedbeaeb..2bc2899c44 100644
--- a/resources/js/components/fieldtypes/bard/BardFieldtype.vue
+++ b/resources/js/components/fieldtypes/bard/BardFieldtype.vue
@@ -286,6 +286,8 @@ export default {
         },
 
         replicatorPreview() {
+            if (! this.showFieldPreviews || ! this.config.replicator_preview) return;
+
             const stack = JSON.parse(this.value);
             let text = '';
             while (stack.length) {
diff --git a/resources/js/components/fieldtypes/bard/Set.vue b/resources/js/components/fieldtypes/bard/Set.vue
index b03e955f00..3e45bc579c 100644
--- a/resources/js/components/fieldtypes/bard/Set.vue
+++ b/resources/js/components/fieldtypes/bard/Set.vue
@@ -44,6 +44,7 @@
                     :set-index="index"
                     :field-path="fieldPath(field)"
                     :read-only="isReadOnly"
+                    :show-field-previews="showFieldPreviews"
                     @updated="updated(field.handle, $event)"
                     @meta-updated="metaUpdated(field.handle, $event)"
                     @focus="focused"
diff --git a/resources/js/components/fieldtypes/grid/Grid.vue b/resources/js/components/fieldtypes/grid/Grid.vue
index 868a163a0b..c38b32e40a 100644
--- a/resources/js/components/fieldtypes/grid/Grid.vue
+++ b/resources/js/components/fieldtypes/grid/Grid.vue
@@ -136,6 +136,8 @@ export default {
         },
 
         replicatorPreview() {
+            if (! this.showFieldPreviews || ! this.config.replicator_preview) return;
+
             return `${__(this.config.display)}: ${__n(':count row|:count rows', this.value.length)}`;
         }
 
diff --git a/resources/js/components/fieldtypes/markdown/MarkdownFieldtype.vue b/resources/js/components/fieldtypes/markdown/MarkdownFieldtype.vue
index 2657b3d4d1..4fd8dcd46d 100644
--- a/resources/js/components/fieldtypes/markdown/MarkdownFieldtype.vue
+++ b/resources/js/components/fieldtypes/markdown/MarkdownFieldtype.vue
@@ -692,6 +692,8 @@ export default {
         },
 
         replicatorPreview() {
+            if (! this.showFieldPreviews || ! this.config.replicator_preview) return;
+
             return marked(this.data || '', { renderer: new PlainTextRenderer })
                 .replace(/<\/?[^>]+(>|$)/g, "");
         }
diff --git a/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue b/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue
index 90962a95b8..3e91f3f778 100644
--- a/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue
+++ b/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue
@@ -134,6 +134,8 @@ export default {
         },
 
         replicatorPreview() {
+            if (! this.showFieldPreviews || ! this.config.replicator_preview) return;
+
             return this.value.map(id => {
                 const item = _.findWhere(this.meta.data, { id });
                 return item ? item.title : id;
diff --git a/resources/js/components/fieldtypes/replicator/Field.vue b/resources/js/components/fieldtypes/replicator/Field.vue
index 6c0465f4aa..a2fd3c43ef 100644
--- a/resources/js/components/fieldtypes/replicator/Field.vue
+++ b/resources/js/components/fieldtypes/replicator/Field.vue
@@ -23,6 +23,7 @@
             :field-path-prefix="fieldPath"
             :has-error="hasError || hasNestedError"
             :read-only="isReadOnly"
+            :show-field-previews="showFieldPreviews"
             @input="$emit('updated', $event)"
             @meta-updated="$emit('meta-updated', $event)"
             @focus="$emit('focus')"
@@ -69,6 +70,7 @@ export default {
             type: String
         },
         readOnly: Boolean,
+        showFieldPreviews: Boolean,
     },
 
     inject: ['storeName'],
diff --git a/resources/js/components/fieldtypes/replicator/Replicator.vue b/resources/js/components/fieldtypes/replicator/Replicator.vue
index 73ecb5f153..0dfb85324f 100644
--- a/resources/js/components/fieldtypes/replicator/Replicator.vue
+++ b/resources/js/components/fieldtypes/replicator/Replicator.vue
@@ -172,6 +172,8 @@ export default {
         },
 
         replicatorPreview() {
+            if (! this.showFieldPreviews || ! this.config.replicator_preview) return;
+
             return `${__(this.config.display)}: ${__n(':count set|:count sets', this.value.length)}`;
         }
     },
diff --git a/resources/js/components/fieldtypes/replicator/Set.vue b/resources/js/components/fieldtypes/replicator/Set.vue
index d1a8581397..4361bde58c 100644
--- a/resources/js/components/fieldtypes/replicator/Set.vue
+++ b/resources/js/components/fieldtypes/replicator/Set.vue
@@ -44,6 +44,7 @@
                     :set-index="index"
                     :field-path="fieldPath(field)"
                     :read-only="isReadOnly"
+                    :show-field-previews="showFieldPreviews"
                     @updated="updated(field.handle, $event)"
                     @meta-updated="metaUpdated(field.handle, $event)"
                     @focus="$emit('focus')"

From 481af609c8f52805182a12b6b43c9363f7595d78 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 18 Jan 2024 16:31:22 -0500
Subject: [PATCH 026/149] changelog

---
 CHANGELOG.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cdbcfbd299..d1be4bd978 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,33 @@
 # Release Notes
 
+## 4.45.0 (2024-01-18)
+
+### What's new
+- Allow search index updates to be queued. [#9358](https://github.com/statamic/cms/issues/9358) by @jasonvarga
+- Autoload addon blueprints. [#9324](https://github.com/statamic/cms/issues/9324) by @aerni
+- Add CC and BCC fields to form email config. [#9336](https://github.com/statamic/cms/issues/9336) by @godismyjudge95
+
+### What's improved
+- Prevent handling field previews when previews are disabled. [#9353](https://github.com/statamic/cms/issues/9353) by @duncanmcclean
+- Update entry order and uri by ids. [#9350](https://github.com/statamic/cms/issues/9350) by @jacksleight
+- Dutch translations. [#9347](https://github.com/statamic/cms/issues/9347) by @jeroenpeters1986
+
+### What's fixed
+- Improve Bard cut/copy/pasting sets. [#7606](https://github.com/statamic/cms/issues/7606) by @jacksleight
+- Catch validation exceptions thrown in FormSubmitted events. [#9348](https://github.com/statamic/cms/issues/9348) by @ryanmitchell
+- Allow optional asset fields in form submissions. [#9356](https://github.com/statamic/cms/issues/9356) by @AndreasSchantl
+- Fix error from Relationship Index Fieldtype after toggling column. [#9355](https://github.com/statamic/cms/issues/9355) by @duncanmcclean
+- Prevent creating revision when localizing entry unless revisions are enabled on the collection. [#8908](https://github.com/statamic/cms/issues/8908) by @duncanmcclean
+- Fix "Read Only" text for section fields. [#9315](https://github.com/statamic/cms/issues/9315) by @duncanmcclean
+- Fix additional blueprints in multi-part namespaces. [#9325](https://github.com/statamic/cms/issues/9325) by @jacksleight
+- Prevent Bard causing dirty state issues. [#9344](https://github.com/statamic/cms/issues/9344) by @duncanmcclean
+- Prevent original addon blueprint being deleted when saving. [#9326](https://github.com/statamic/cms/issues/9326) by @ryanmitchell
+- Fix Bard sets being inserted too early. [#9216](https://github.com/statamic/cms/issues/9216) by @duncanmcclean
+- Fix too many redirects on collection. [#9318](https://github.com/statamic/cms/issues/9318) by @aerni
+- Fix Statamic compiled assets not working when running in a subdirectory. [#8984](https://github.com/statamic/cms/issues/8984) by @singer-d
+
+
+
 ## 4.44.0 (2024-01-11)
 
 ### What's new

From 4d7ed52d355aaa0c5b2fa5a65c26e9acf3ae3112 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 18 Jan 2024 17:12:56 -0500
Subject: [PATCH 027/149] oops, sorry julia

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1be4bd978..4d95d5f9a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@
 
 ### What's improved
 - Prevent handling field previews when previews are disabled. [#9353](https://github.com/statamic/cms/issues/9353) by @duncanmcclean
-- Update entry order and uri by ids. [#9350](https://github.com/statamic/cms/issues/9350) by @jacksleight
+- Update entry order and uri by ids. [#9350](https://github.com/statamic/cms/issues/9350) by @juliawarnke
 - Dutch translations. [#9347](https://github.com/statamic/cms/issues/9347) by @jeroenpeters1986
 
 ### What's fixed

From bdfca491cb88557b0aaf296c13e70af591e5b9f0 Mon Sep 17 00:00:00 2001
From: Daniel Weaver <godismyjudge95@gmail.com>
Date: Thu, 18 Jan 2024 17:16:43 -0500
Subject: [PATCH 028/149] [4.x] Passthrough Cmd/Ctrl + Enter inside Bard
 (#9313)

---
 .../js/components/fieldtypes/bard/BardFieldtype.vue | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/resources/js/components/fieldtypes/bard/BardFieldtype.vue b/resources/js/components/fieldtypes/bard/BardFieldtype.vue
index 2bc2899c44..d558ef9855 100644
--- a/resources/js/components/fieldtypes/bard/BardFieldtype.vue
+++ b/resources/js/components/fieldtypes/bard/BardFieldtype.vue
@@ -103,6 +103,7 @@
 import uniqid from 'uniqid';
 import reduce from 'underscore/modules/reduce';
 import { BubbleMenu, Editor, EditorContent } from '@tiptap/vue-2';
+import { Extension } from '@tiptap/core';
 import { FloatingMenu } from './FloatingMenu';
 import Blockquote from '@tiptap/extension-blockquote';
 import Bold from '@tiptap/extension-bold';
@@ -715,9 +716,21 @@ export default {
                     },
                 }));
             }
+           
+            // Allow passthrough of Ctrl/Cmd + Enter to submit the form 
+            const DisableCtrlEnter = Extension.create({
+                addKeyboardShortcuts() {
+                    return {
+                        'Ctrl-Enter': () => true,
+                        'Cmd-Enter': () => true,
+                    }
+                },
+            });
+
             let exts = [
                 CharacterCount.configure({ limit: this.config.character_limit }),
                 ...modeExts,
+                DisableCtrlEnter,
                 Dropcursor,
                 Gapcursor,
                 History,

From 3e0ed10c3755f8682f8ae5d48ca598859f63e927 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Fri, 19 Jan 2024 14:33:47 +0000
Subject: [PATCH 029/149] [4.x] Fix whereTime affecting the date as well as
 time (#9360)

---
 src/Query/Builder.php                        |  6 ++++++
 tests/Data/Entries/EntryQueryBuilderTest.php | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/Query/Builder.php b/src/Query/Builder.php
index 16f604cbfa..ec7dbaca0f 100644
--- a/src/Query/Builder.php
+++ b/src/Query/Builder.php
@@ -480,6 +480,12 @@ public function whereTime($column, $operator, $value = null, $boolean = 'and')
             throw new InvalidArgumentException('Illegal operator for date comparison');
         }
 
+        if (! ($value instanceof DateTimeInterface)) {
+            $value = Carbon::parse($value);
+        }
+
+        $value = $value->format('H:i:s'); // we only care about the time part
+
         $this->wheres[] = [
             'type' => 'Time',
             'column' => $column,
diff --git a/tests/Data/Entries/EntryQueryBuilderTest.php b/tests/Data/Entries/EntryQueryBuilderTest.php
index ed85feb356..86ac2e3125 100644
--- a/tests/Data/Entries/EntryQueryBuilderTest.php
+++ b/tests/Data/Entries/EntryQueryBuilderTest.php
@@ -3,6 +3,7 @@
 namespace Tests\Data\Entries;
 
 use Facades\Tests\Factories\EntryFactory;
+use Illuminate\Support\Carbon;
 use Statamic\Facades\Blueprint;
 use Statamic\Facades\Collection;
 use Statamic\Facades\Entry;
@@ -174,6 +175,15 @@ public function entries_are_found_using_where_time()
 
         $this->assertCount(2, $entries);
         $this->assertEquals(['Post 1', 'Post 4'], $entries->map->title->all());
+
+        // if we send full dates it should only consider the time part
+        $entries = Entry::query()->whereTime('test_date', '2021-11-13 09:00')->get();
+        $this->assertCount(1, $entries);
+        $this->assertEquals(['Post 2'], $entries->map->title->all());
+
+        $entries = Entry::query()->whereTime('test_date', Carbon::createFromFormat('Y-m-d H:i', '2021-11-13 09:00'))->get();
+        $this->assertCount(1, $entries);
+        $this->assertEquals(['Post 2'], $entries->map->title->all());
     }
 
     private function createWhereDateTestEntries()

From 1e3d7fab4d88e53600e613e1d33d72eaee1115bc Mon Sep 17 00:00:00 2001
From: Peiman Nourani <nourani.peiman@gmail.com>
Date: Fri, 19 Jan 2024 19:06:10 +0330
Subject: [PATCH 030/149] [4.x] Fix some translations (#9361)

---
 .../js/components/fieldtypes/IconFieldtype.vue |  2 +-
 .../js/components/fieldtypes/SlugFieldtype.vue |  2 +-
 .../components/fieldtypes/bard/LinkToolbar.vue |  4 ++--
 resources/js/components/globals/Sites.vue      |  4 ++--
 resources/lang/en/messages.php                 |  6 ++++++
 resources/views/licensing.blade.php            |  4 ++--
 resources/views/updater/index.blade.php        |  2 +-
 src/Auth/UserRepository.php                    |  4 ++--
 .../Controllers/CP/Users/UsersController.php   |  2 +-
 src/Preferences/CorePreferences.php            |  2 +-
 src/Support/Str.php                            | 18 ++++++------------
 11 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/resources/js/components/fieldtypes/IconFieldtype.vue b/resources/js/components/fieldtypes/IconFieldtype.vue
index 15dad9381e..2adaf76dda 100644
--- a/resources/js/components/fieldtypes/IconFieldtype.vue
+++ b/resources/js/components/fieldtypes/IconFieldtype.vue
@@ -9,7 +9,7 @@
             :name="name"
             :disabled="config.disabled || isReadOnly"
             :options="options"
-            :placeholder="__(config.placeholder || 'Search ...')"
+            :placeholder="__(config.placeholder || 'Search...')"
             :searchable="true"
             :multiple="false"
             :close-on-select="true"
diff --git a/resources/js/components/fieldtypes/SlugFieldtype.vue b/resources/js/components/fieldtypes/SlugFieldtype.vue
index 309fcd3c84..e2bd90e5b5 100644
--- a/resources/js/components/fieldtypes/SlugFieldtype.vue
+++ b/resources/js/components/fieldtypes/SlugFieldtype.vue
@@ -19,7 +19,7 @@
                 @blur="$emit('blur')"
             >
                 <template v-slot:append v-if="config.show_regenerate">
-                    <button class="input-group-append items-center flex" @click="sync" v-tooltip="__('Regenerate from: ' + config.from)">
+                    <button class="input-group-append items-center flex" @click="sync" v-tooltip="__('Regenerate from: :field', { 'field': config.from })">
                         <svg-icon name="light/synchronize" class="w-5 h-5" />
                     </button>
                 </template>
diff --git a/resources/js/components/fieldtypes/bard/LinkToolbar.vue b/resources/js/components/fieldtypes/bard/LinkToolbar.vue
index 46b12e46ed..51dda0e6f7 100644
--- a/resources/js/components/fieldtypes/bard/LinkToolbar.vue
+++ b/resources/js/components/fieldtypes/bard/LinkToolbar.vue
@@ -28,7 +28,7 @@
                             type="text"
                             ref="urlInput"
                             class="input h-auto text-sm"
-                            placeholder="URL"
+                            :placeholder="__('URL')"
                             @keydown.enter.prevent="commit"
                         />
     
@@ -39,7 +39,7 @@
                             type="text"
                             ref="mailtoInput"
                             class="input h-auto text-sm"
-                            placeholder="Email Address"
+                            :placeholder="__('Email Address')"
                             @keydown.enter.prevent="commit"
                         />
     
diff --git a/resources/js/components/globals/Sites.vue b/resources/js/components/globals/Sites.vue
index 65b41779f4..8f77d63897 100644
--- a/resources/js/components/globals/Sites.vue
+++ b/resources/js/components/globals/Sites.vue
@@ -4,8 +4,8 @@
         <table class="grid-table">
             <thead>
                 <tr>
-                    <th>Site</th>
-                    <th>Origin</th>
+                    <th>{{ __('Site') }}</th>
+                    <th>{{ __('Origin') }}</th>
                 </tr>
             </thead>
             <tbody>
diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php
index 98969ff62c..75102b899c 100644
--- a/resources/lang/en/messages.php
+++ b/resources/lang/en/messages.php
@@ -234,4 +234,10 @@
     'user_wizard_roles_groups_intro' => 'Users can be assigned to roles that customize their permissions, access, and abilities throughout the Control Panel.',
     'user_wizard_super_admin_instructions' => 'Super admins have complete control and access to everything in the control panel. Grant this role wisely.',
     'view_more_count' => 'View :count more',
+    'units.B' => ':count B',
+    'units.KB' => ':count KB',
+    'units.MB' => ':count MB',
+    'units.GB' => ':count GB',
+    'units.s' => ':counts',
+    'units.ms' => ':countms',
 ];
diff --git a/resources/views/licensing.blade.php b/resources/views/licensing.blade.php
index 4f98ead681..c3afa90132 100644
--- a/resources/views/licensing.blade.php
+++ b/resources/views/licensing.blade.php
@@ -45,7 +45,7 @@
            </div>
         @endif
 
-        <h6 class="mt-8">Site</h6>
+        <h6 class="mt-8">{{ __('Site') }}</h6>
         <div class="card p-0 mt-2">
             <table class="data-table">
                 <tr>
@@ -64,7 +64,7 @@
             </table>
         </div>
 
-        <h6 class="mt-8">Core</h6>
+        <h6 class="mt-8">{{ __('Core') }}</h6>
         <div class="card p-0 mt-2">
             <table class="data-table">
                 <tr>
diff --git a/resources/views/updater/index.blade.php b/resources/views/updater/index.blade.php
index 03337fc131..1b7ca45da3 100644
--- a/resources/views/updater/index.blade.php
+++ b/resources/views/updater/index.blade.php
@@ -27,7 +27,7 @@ class="btn-primary btn-lg">{{ __('Try again') }}</a>
             <h1 class="flex-1">{{ __('Updates') }}</h1>
         </div>
 
-        <h6 class="mt-8">Core</h6>
+        <h6 class="mt-8">{{ __('Core') }}</h6>
         <div class="card p-0 mt-2">
             <table class="data-table">
                 <tr>
diff --git a/src/Auth/UserRepository.php b/src/Auth/UserRepository.php
index f059f71fcc..2dc1600ff4 100644
--- a/src/Auth/UserRepository.php
+++ b/src/Auth/UserRepository.php
@@ -63,10 +63,10 @@ public function blueprint()
         }
 
         $blueprint = Blueprint::find('user') ?? Blueprint::makeFromFields([
-            'name' => ['type' => 'text', 'display' => 'Name', 'listable' => true],
+            'name' => ['type' => 'text', 'display' => __('Name'), 'listable' => true],
         ])->setHandle('user');
 
-        $blueprint->ensureField('email', ['type' => 'text', 'input_type' => 'email', 'display' => 'Email Address', 'listable' => true]);
+        $blueprint->ensureField('email', ['type' => 'text', 'input_type' => 'email', 'display' => __('Email Address'), 'listable' => true]);
 
         if (Statamic::pro()) {
             $blueprint->ensureField('roles', ['type' => 'user_roles', 'mode' => 'select', 'width' => 50, 'listable' => true, 'filterable' => false]);
diff --git a/src/Http/Controllers/CP/Users/UsersController.php b/src/Http/Controllers/CP/Users/UsersController.php
index 0691688f8f..11b944dabd 100644
--- a/src/Http/Controllers/CP/Users/UsersController.php
+++ b/src/Http/Controllers/CP/Users/UsersController.php
@@ -213,7 +213,7 @@ public function edit(Request $request, $user)
         }
 
         if (User::current()->isSuper() && User::current()->id() !== $user->id()) {
-            $blueprint->ensureField('super', ['type' => 'toggle']);
+            $blueprint->ensureField('super', ['type' => 'toggle', 'display' => __('permissions.super')]);
         }
 
         $values = $user->data()
diff --git a/src/Preferences/CorePreferences.php b/src/Preferences/CorePreferences.php
index 3ccdd15cb6..aa1f3c18cb 100644
--- a/src/Preferences/CorePreferences.php
+++ b/src/Preferences/CorePreferences.php
@@ -59,7 +59,7 @@ public function boot()
                 [
                     'handle' => 'url',
                     'field' => [
-                        'display' => 'URL',
+                        'display' => __('URL'),
                         'type' => 'text',
                     ],
                 ],
diff --git a/src/Support/Str.php b/src/Support/Str.php
index 33fb2a2a61..a6fb9d3b61 100644
--- a/src/Support/Str.php
+++ b/src/Support/Str.php
@@ -139,29 +139,23 @@ public static function deslugify($string)
     public static function fileSizeForHumans($bytes, $decimals = 2)
     {
         if ($bytes >= 1073741824) {
-            $bytes = number_format($bytes / 1073741824, $decimals).' GB';
+            return trans_choice('statamic::messages.units.GB', number_format($bytes / 1073741824, $decimals));
         } elseif ($bytes >= 1048576) {
-            $bytes = number_format($bytes / 1048576, $decimals).' MB';
+            return trans_choice('statamic::messages.units.MB', number_format($bytes / 1048576, $decimals));
         } elseif ($bytes >= 1024) {
-            $bytes = number_format($bytes / 1024, $decimals).' KB';
-        } elseif ($bytes > 1) {
-            $bytes = $bytes.' B';
-        } elseif ($bytes == 1) {
-            $bytes = $bytes.' B';
-        } else {
-            $bytes = '0 B';
+            return trans_choice('statamic::messages.units.KB', number_format($bytes / 1024, $decimals));
         }
 
-        return $bytes;
+        return trans_choice('statamic::messages.units.B', $bytes);
     }
 
     public static function timeForHumans($ms)
     {
         if ($ms < 1000) {
-            return $ms.'ms';
+            return trans_choice('statamic::messages.units.ms', $ms);
         }
 
-        return round($ms / 1000, 2).'s';
+        return trans_choice('statamic::messages.units.s', round($ms / 1000, 2));
     }
 
     /**

From bb93e626f7ea76c1ed82f95e3af859f38c0abc9f Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 19 Jan 2024 13:37:21 -0500
Subject: [PATCH 031/149] [4.x] Always show slug rengerate button if enabled
 (#9366)

---
 resources/js/components/fieldtypes/SlugFieldtype.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/fieldtypes/SlugFieldtype.vue b/resources/js/components/fieldtypes/SlugFieldtype.vue
index e2bd90e5b5..2edf0bf7f8 100644
--- a/resources/js/components/fieldtypes/SlugFieldtype.vue
+++ b/resources/js/components/fieldtypes/SlugFieldtype.vue
@@ -12,7 +12,7 @@
                 v-model="slug"
                 classes="font-mono text-xs"
                 :isReadOnly="isReadOnly"
-                :append="config.show_regenerate && value"
+                :append="config.show_regenerate"
                 :name="slug"
                 :id="fieldId"
                 @focus="$emit('focus')"

From 50263e8ce68c601ed84a0c34bac0202143732070 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Fri, 19 Jan 2024 19:08:10 +0000
Subject: [PATCH 032/149] [4.x] Strip out `.html` from `parent_uri` (#9364)

---
 src/Structures/Page.php            |  6 +++-
 tests/Data/Structures/PageTest.php | 49 ++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/src/Structures/Page.php b/src/Structures/Page.php
index f1ec45f159..7455bd64d3 100644
--- a/src/Structures/Page.php
+++ b/src/Structures/Page.php
@@ -22,6 +22,7 @@
 use Statamic\Facades\Site;
 use Statamic\Facades\URL;
 use Statamic\GraphQL\ResolvesValues;
+use Statamic\Support\Str;
 
 class Page implements Arrayable, ArrayAccess, Augmentable, Entry, JsonSerializable, Protectable, ResolvesValuesContract, Responsable
 {
@@ -193,10 +194,13 @@ public function uri()
             return $uris[$this->reference] = $this->entry()->uri();
         }
 
+        $parentUri = $this->parent && ! $this->parent->isRoot() ? $this->parent->uri() : '';
+        $parentUri = Str::replace(['.html', '.htm'], '', $parentUri);
+
         return $uris[$this->reference] = app(UrlBuilder::class)
             ->content($this)
             ->merge([
-                'parent_uri' => $this->parent && ! $this->parent->isRoot() ? $this->parent->uri() : '',
+                'parent_uri' => $parentUri,
                 'slug' => $this->isRoot() ? '' : $this->slug(),
                 'depth' => $this->depth,
                 'is_root' => $this->isRoot(),
diff --git a/tests/Data/Structures/PageTest.php b/tests/Data/Structures/PageTest.php
index ea0fa6873d..9f4001793b 100644
--- a/tests/Data/Structures/PageTest.php
+++ b/tests/Data/Structures/PageTest.php
@@ -185,6 +185,55 @@ public function slug($slug = null)
         $this->assertFalse($page->hasCustomUrl());
     }
 
+    /**
+     * @test
+     *
+     * @dataProvider stripExtensionFromParentUriProvider
+     */
+    public function it_builds_a_uri_and_strips_out_file_extensions_from_parent_uri($ext)
+    {
+        $entry = new class extends Entry
+        {
+            public function id($id = null)
+            {
+                return 'a';
+            }
+
+            public function slug($slug = null)
+            {
+                return 'entry-slug';
+            }
+        };
+        $collection = tap(\Statamic\Facades\Collection::make('test'))->save();
+        $entry->collection('test');
+
+        $parent = Mockery::mock(Page::class);
+        $parent->shouldReceive('id')->andReturn('the-parent-entry');
+        $parent->shouldReceive('uri')->andReturn('/the-parent-entry.'.$ext);
+        $parent->shouldReceive('isRoot')->andReturnFalse();
+
+        $tree = $this->newTree()->setStructure(
+            $this->mock(CollectionStructure::class)->shouldReceive('collection')->andReturn($collection)->getMock()
+        );
+
+        $page = (new Page)
+            ->setTree($tree)
+            ->setRoute('/{parent_uri}/{slug}.'.$ext)
+            ->setParent($parent)
+            ->setEntry($entry);
+
+        $this->assertEquals('/the-parent-entry/entry-slug.'.$ext, $page->uri());
+        $this->assertFalse($page->hasCustomUrl());
+    }
+
+    public function stripExtensionFromParentUriProvider()
+    {
+        return [
+            'html' => ['html'],
+            'htm' => ['htm'],
+        ];
+    }
+
     /** @test */
     public function it_gets_the_entrys_uri_when_the_structure_does_not_have_a_collection()
     {

From 67fd0a2c75ddd6185d275e22033ea437f2cabe36 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Fri, 19 Jan 2024 19:20:04 +0000
Subject: [PATCH 033/149] [4.x] Sanitize SVG uploads (#9365)

---
 src/Assets/Uploader.php    |  9 +++++++++
 tests/Assets/AssetTest.php | 24 +++++++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/Assets/Uploader.php b/src/Assets/Uploader.php
index 6f4524d76b..e618a09009 100644
--- a/src/Assets/Uploader.php
+++ b/src/Assets/Uploader.php
@@ -3,7 +3,9 @@
 namespace Statamic\Assets;
 
 use Facades\Statamic\Imaging\ImageValidator;
+use Rhukster\DomSanitizer\DOMSanitizer;
 use Statamic\Facades\Glide;
+use Statamic\Support\Str;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 abstract class Uploader
@@ -50,6 +52,13 @@ private function write($sourcePath, $destinationPath)
     {
         $stream = fopen($sourcePath, 'r');
 
+        if (Str::endsWith($destinationPath, '.svg')) {
+            $sanitizer = new DOMSanitizer(DOMSanitizer::SVG);
+            $stream = $sanitizer->sanitize($svg = stream_get_contents($stream), [
+                'remove-xml-tags' => ! Str::startsWith($svg, '<?xml'),
+            ]);
+        }
+
         $this->disk()->put($this->uploadPathPrefix().$destinationPath, $stream);
 
         if (is_resource($stream)) {
diff --git a/tests/Assets/AssetTest.php b/tests/Assets/AssetTest.php
index dfc7be8ecc..a2b6321a28 100644
--- a/tests/Assets/AssetTest.php
+++ b/tests/Assets/AssetTest.php
@@ -1729,6 +1729,28 @@ public function it_can_upload_an_image_into_a_container_with_new_extension_forma
         Event::assertDispatched(AssetSaved::class);
     }
 
+    /** @test */
+    public function it_sanitizes_svgs_on_upload()
+    {
+        Event::fake();
+
+        $asset = (new Asset)->container($this->container)->path('path/to/asset.svg')->syncOriginal();
+
+        Facades\AssetContainer::shouldReceive('findByHandle')->with('test_container')->andReturn($this->container);
+        Storage::disk('test')->assertMissing('path/to/asset.svg');
+
+        $return = $asset->upload(UploadedFile::fake()->createWithContent('asset.svg', '<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" width="500" height="500"><script type="text/javascript">alert(`Bad stuff could go in here.`);</script></svg>'));
+
+        $this->assertEquals($asset, $return);
+        Storage::disk('test')->assertExists('path/to/asset.svg');
+        $this->assertEquals('path/to/asset.svg', $asset->path());
+
+        // Ensure the inline scripts were stripped out.
+        $this->assertStringNotContainsString('<script', $asset->contents());
+        $this->assertStringNotContainsString('Bad stuff could go in here.', $asset->contents());
+        $this->assertStringNotContainsString('</script>', $asset->contents());
+    }
+
     public function nonGlideableFileExtensions()
     {
         return [
@@ -1763,7 +1785,7 @@ public function it_doesnt_process_or_error_when_uploading_non_glideable_file_wit
         // Ensure a glide server is never instantiated for these extensions...
         Facades\Glide::partialMock()->shouldReceive('server')->never();
 
-        $return = $asset->upload(UploadedFile::fake()->create("file.{$extension}"));
+        $return = $asset->upload(UploadedFile::fake()->createWithContent("file.{$extension}", '<svg width="20" height="30"></svg>'));
 
         $this->assertEquals($asset, $return);
         $this->assertDirectoryExists($glideDir = storage_path('statamic/glide/tmp'));

From 95b81e630ebb05bbd5e037c2bbd73d0aa15bfe00 Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Fri, 19 Jan 2024 20:38:58 +0100
Subject: [PATCH 034/149] [4.x] Uniform image validation (#9290)

---
 src/Assets/Asset.php       | 3 ++-
 tests/Assets/AssetTest.php | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Assets/Asset.php b/src/Assets/Asset.php
index 79c74ef161..c6ebfa8004 100644
--- a/src/Assets/Asset.php
+++ b/src/Assets/Asset.php
@@ -4,6 +4,7 @@
 
 use ArrayAccess;
 use Facades\Statamic\Assets\Attributes;
+use Facades\Statamic\Imaging\ImageValidator;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Cache;
@@ -485,7 +486,7 @@ public function isPreviewable()
      */
     public function isImage()
     {
-        return $this->extensionIsOneOf(['jpg', 'jpeg', 'png', 'gif', 'webp']);
+        return ImageValidator::isValidExtension($this->extension());
     }
 
     /**
diff --git a/tests/Assets/AssetTest.php b/tests/Assets/AssetTest.php
index a2b6321a28..94aec7455d 100644
--- a/tests/Assets/AssetTest.php
+++ b/tests/Assets/AssetTest.php
@@ -1613,7 +1613,7 @@ private function uploadFileTest()
         Storage::disk('test')->assertMissing('path/to/asset.jpg');
 
         // This should only get called when glide processing source image on upload...
-        ImageValidator::shouldReceive('isValidImage')->never();
+        ImageValidator::partialMock()->shouldReceive('isValidImage')->never();
 
         $return = $asset->upload(UploadedFile::fake()->image('asset.jpg', 13, 15));
 
@@ -1663,7 +1663,8 @@ public function it_can_upload_an_image_into_a_container_with_glide_config()
         Facades\AssetContainer::shouldReceive('findByHandle')->with('test_container')->andReturn($this->container);
         Storage::disk('test')->assertMissing('path/to/asset.jpg');
 
-        ImageValidator::shouldReceive('isValidImage')
+        ImageValidator::partialMock()
+            ->shouldReceive('isValidImage')
             ->with('jpg', 'image/jpeg')
             ->andReturnTrue()
             ->once();
@@ -1710,7 +1711,8 @@ public function it_can_upload_an_image_into_a_container_with_new_extension_forma
         Facades\AssetContainer::shouldReceive('findByHandle')->with('test_container')->andReturn($this->container);
         Storage::disk('test')->assertMissing('path/to/asset.jpg');
 
-        ImageValidator::shouldReceive('isValidImage')
+        ImageValidator::partialMock()
+            ->shouldReceive('isValidImage')
             ->with('jpg', 'image/jpeg')
             ->andReturnTrue()
             ->once();

From 0742d1ade91eedc0279fa12b81687e668f833279 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Mon, 22 Jan 2024 14:58:21 +0000
Subject: [PATCH 035/149] [4.x] Bard: Only configure placeholder extension when
 placeholder is provided (#9369)

---
 .../js/components/fieldtypes/bard/BardFieldtype.vue    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/fieldtypes/bard/BardFieldtype.vue b/resources/js/components/fieldtypes/bard/BardFieldtype.vue
index d558ef9855..b671102bad 100644
--- a/resources/js/components/fieldtypes/bard/BardFieldtype.vue
+++ b/resources/js/components/fieldtypes/bard/BardFieldtype.vue
@@ -706,6 +706,7 @@ export default {
 
         getExtensions() {
             let modeExts = this.inputIsInline ? [DocumentInline] : [DocumentBlock, HardBreak];
+
             if (this.config.inline === 'break') {
                 modeExts.push(HardBreak.extend({
                     addKeyboardShortcuts() {
@@ -716,8 +717,12 @@ export default {
                     },
                 }));
             }
-           
-            // Allow passthrough of Ctrl/Cmd + Enter to submit the form 
+
+            if (this.config.placeholder) {
+                modeExts.push(Placeholder.configure({ placeholder: __(this.config.placeholder) }));
+            }
+
+            // Allow passthrough of Ctrl/Cmd + Enter to submit the form
             const DisableCtrlEnter = Extension.create({
                 addKeyboardShortcuts() {
                     return {
@@ -735,7 +740,6 @@ export default {
                 Gapcursor,
                 History,
                 Paragraph,
-                Placeholder.configure({ placeholder: __(this.config.placeholder) }),
                 Set.configure({ bard: this }),
                 Text
             ];

From 8fee8369068f72170a99f67183f556aa15df21bd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 10:34:36 -0500
Subject: [PATCH 036/149] [4.x] Bump vite from 4.2.3 to 4.5.2 (#9367)

---
 package-lock.json | 210 ++++++++++++++++++++++++----------------------
 package.json      |   2 +-
 2 files changed, 109 insertions(+), 103 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0747dabb6c..5239388d9b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -94,7 +94,7 @@
         "laravel-vite-plugin": "^0.7.2",
         "postcss": "^8.4.31",
         "tailwindcss": "^3.3.0",
-        "vite": "^4.2.3"
+        "vite": "^4.5.2"
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -1764,9 +1764,9 @@
       "dev": true
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.17.14",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.14.tgz",
-      "integrity": "sha512-0CnlwnjDU8cks0yJLXfkaU/uoLyRf9VZJs4p1PskBr2AlAHeEsFEwJEo0of/Z3g+ilw5mpyDwThlxzNEIxOE4g==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz",
+      "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==",
       "cpu": [
         "arm"
       ],
@@ -1780,9 +1780,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.17.14",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.14.tgz",
-      "integrity": "sha512-eLOpPO1RvtsP71afiFTvS7tVFShJBCT0txiv/xjFBo5a7R7Gjw7X0IgIaFoLKhqXYAXhahoXm7qAmRXhY4guJg==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz",
+      "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==",
       "cpu": [
         "arm64"
       ],
@@ -1796,9 +1796,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.17.14",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.14.tgz",
-      "integrity": "sha512-nrfQYWBfLGfSGLvRVlt6xi63B5IbfHm3tZCdu/82zuFPQ7zez4XjmRtF/wIRYbJQ/DsZrxJdEvYFE67avYXyng==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz",
+      "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==",
       "cpu": [
         "x64"
       ],
@@ -1812,9 +1812,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.17.14",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.14.tgz",
-      "integrity": "sha512-eoSjEuDsU1ROwgBH/c+fZzuSyJUVXQTOIN9xuLs9dE/9HbV/A5IqdXHU1p2OfIMwBwOYJ9SFVGGldxeRCUJFyw==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz",
+      "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==",
       "cpu": [
         "arm64"
       ],
@@ -1828,9 +1828,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.17.14",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.14.tgz",
-      "integrity": "sha512-zN0U8RWfrDttdFNkHqFYZtOH8hdi22z0pFm0aIJPsNC4QQZv7je8DWCX5iA4Zx6tRhS0CCc0XC2m7wKsbWEo5g==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz",
+      "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==",
       "cpu": [
         "x64"
       ],
@@ -1844,9 +1844,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.17.14",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.14.tgz",
-      "integrity": "sha512-z0VcD4ibeZWVQCW1O7szaLxGsx54gcCnajEJMdYoYjLiq4g1jrP2lMq6pk71dbS5+7op/L2Aod+erw+EUr28/A==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz",
+      "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==",
       "cpu": [
         "arm64"
       ],
@@ -1860,9 +1860,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.17.14",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.14.tgz",
-      "integrity": "sha512-hd9mPcxfTgJlolrPlcXkQk9BMwNBvNBsVaUe5eNUqXut6weDQH8whcNaKNF2RO8NbpT6GY8rHOK2A9y++s+ehw==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz",
+      "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==",
       "cpu": [
         "x64"
       ],
@@ -1876,9 +1876,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.17.14",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.14.tgz",
-      "integrity": "sha512-BNTl+wSJ1omsH8s3TkQmIIIQHwvwJrU9u1ggb9XU2KTVM4TmthRIVyxSp2qxROJHhZuW/r8fht46/QE8hU8Qvg==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz",
+      "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==",
       "cpu": [
         "arm"
       ],
@@ -1892,9 +1892,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.17.14",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.14.tgz",
-      "integrity": "sha512-FhAMNYOq3Iblcj9i+K0l1Fp/MHt+zBeRu/Qkf0LtrcFu3T45jcwB6A1iMsemQ42vR3GBhjNZJZTaCe3VFPbn9g==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz",
+      "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==",
       "cpu": [
         "arm64"
       ],
@@ -1908,9 +1908,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.17.14",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.14.tgz",
-      "integrity": "sha512-91OK/lQ5y2v7AsmnFT+0EyxdPTNhov3y2CWMdizyMfxSxRqHazXdzgBKtlmkU2KYIc+9ZK3Vwp2KyXogEATYxQ==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz",
+      "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==",
       "cpu": [
         "ia32"
       ],
@@ -1924,9 +1924,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.17.14",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.14.tgz",
-      "integrity": "sha512-vp15H+5NR6hubNgMluqqKza85HcGJgq7t6rMH7O3Y6ApiOWPkvW2AJfNojUQimfTp6OUrACUXfR4hmpcENXoMQ==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz",
+      "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==",
       "cpu": [
         "loong64"
       ],
@@ -1940,9 +1940,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.17.14",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.14.tgz",
-      "integrity": "sha512-90TOdFV7N+fgi6c2+GO9ochEkmm9kBAKnuD5e08GQMgMINOdOFHuYLPQ91RYVrnWwQ5683sJKuLi9l4SsbJ7Hg==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz",
+      "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==",
       "cpu": [
         "mips64el"
       ],
@@ -1956,9 +1956,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.17.14",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.14.tgz",
-      "integrity": "sha512-NnBGeoqKkTugpBOBZZoktQQ1Yqb7aHKmHxsw43NddPB2YWLAlpb7THZIzsRsTr0Xw3nqiPxbA1H31ZMOG+VVPQ==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz",
+      "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==",
       "cpu": [
         "ppc64"
       ],
@@ -1972,9 +1972,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.17.14",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.14.tgz",
-      "integrity": "sha512-0qdlKScLXA8MGVy21JUKvMzCYWovctuP8KKqhtE5A6IVPq4onxXhSuhwDd2g5sRCzNDlDjitc5sX31BzDoL5Fw==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz",
+      "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==",
       "cpu": [
         "riscv64"
       ],
@@ -1988,9 +1988,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.17.14",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.14.tgz",
-      "integrity": "sha512-Hdm2Jo1yaaOro4v3+6/zJk6ygCqIZuSDJHdHaf8nVH/tfOuoEX5Riv03Ka15LmQBYJObUTNS1UdyoMk0WUn9Ww==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz",
+      "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==",
       "cpu": [
         "s390x"
       ],
@@ -2004,9 +2004,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.17.14",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.14.tgz",
-      "integrity": "sha512-8KHF17OstlK4DuzeF/KmSgzrTWQrkWj5boluiiq7kvJCiQVzUrmSkaBvcLB2UgHpKENO2i6BthPkmUhNDaJsVw==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz",
+      "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==",
       "cpu": [
         "x64"
       ],
@@ -2020,9 +2020,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.17.14",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.14.tgz",
-      "integrity": "sha512-nVwpqvb3yyXztxIT2+VsxJhB5GCgzPdk1n0HHSnchRAcxqKO6ghXwHhJnr0j/B+5FSyEqSxF4q03rbA2fKXtUQ==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz",
+      "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==",
       "cpu": [
         "x64"
       ],
@@ -2036,9 +2036,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.17.14",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.14.tgz",
-      "integrity": "sha512-1RZ7uQQ9zcy/GSAJL1xPdN7NDdOOtNEGiJalg/MOzeakZeTrgH/DoCkbq7TaPDiPhWqnDF+4bnydxRqQD7il6g==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz",
+      "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==",
       "cpu": [
         "x64"
       ],
@@ -2052,9 +2052,9 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.17.14",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.14.tgz",
-      "integrity": "sha512-nqMjDsFwv7vp7msrwWRysnM38Sd44PKmW8EzV01YzDBTcTWUpczQg6mGao9VLicXSgW/iookNK6AxeogNVNDZA==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz",
+      "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==",
       "cpu": [
         "x64"
       ],
@@ -2068,9 +2068,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.17.14",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.14.tgz",
-      "integrity": "sha512-xrD0mccTKRBBIotrITV7WVQAwNJ5+1va6L0H9zN92v2yEdjfAN7864cUaZwJS7JPEs53bDTzKFbfqVlG2HhyKQ==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz",
+      "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==",
       "cpu": [
         "arm64"
       ],
@@ -2084,9 +2084,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.17.14",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.14.tgz",
-      "integrity": "sha512-nXpkz9bbJrLLyUTYtRotSS3t5b+FOuljg8LgLdINWFs3FfqZMtbnBCZFUmBzQPyxqU87F8Av+3Nco/M3hEcu1w==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz",
+      "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==",
       "cpu": [
         "ia32"
       ],
@@ -2100,9 +2100,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.17.14",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.14.tgz",
-      "integrity": "sha512-gPQmsi2DKTaEgG14hc3CHXHp62k8g6qr0Pas+I4lUxRMugGSATh/Bi8Dgusoz9IQ0IfdrvLpco6kujEIBoaogA==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz",
+      "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==",
       "cpu": [
         "x64"
       ],
@@ -4901,9 +4901,9 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.17.14",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.14.tgz",
-      "integrity": "sha512-vOO5XhmVj/1XQR9NQ1UPq6qvMYL7QFJU57J5fKBKBKxp17uDt5PgxFDb4A2nEiXhr1qQs4x0F5+66hVVw4ruNw==",
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz",
+      "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==",
       "dev": true,
       "hasInstallScript": true,
       "bin": {
@@ -4913,28 +4913,28 @@
         "node": ">=12"
       },
       "optionalDependencies": {
-        "@esbuild/android-arm": "0.17.14",
-        "@esbuild/android-arm64": "0.17.14",
-        "@esbuild/android-x64": "0.17.14",
-        "@esbuild/darwin-arm64": "0.17.14",
-        "@esbuild/darwin-x64": "0.17.14",
-        "@esbuild/freebsd-arm64": "0.17.14",
-        "@esbuild/freebsd-x64": "0.17.14",
-        "@esbuild/linux-arm": "0.17.14",
-        "@esbuild/linux-arm64": "0.17.14",
-        "@esbuild/linux-ia32": "0.17.14",
-        "@esbuild/linux-loong64": "0.17.14",
-        "@esbuild/linux-mips64el": "0.17.14",
-        "@esbuild/linux-ppc64": "0.17.14",
-        "@esbuild/linux-riscv64": "0.17.14",
-        "@esbuild/linux-s390x": "0.17.14",
-        "@esbuild/linux-x64": "0.17.14",
-        "@esbuild/netbsd-x64": "0.17.14",
-        "@esbuild/openbsd-x64": "0.17.14",
-        "@esbuild/sunos-x64": "0.17.14",
-        "@esbuild/win32-arm64": "0.17.14",
-        "@esbuild/win32-ia32": "0.17.14",
-        "@esbuild/win32-x64": "0.17.14"
+        "@esbuild/android-arm": "0.18.20",
+        "@esbuild/android-arm64": "0.18.20",
+        "@esbuild/android-x64": "0.18.20",
+        "@esbuild/darwin-arm64": "0.18.20",
+        "@esbuild/darwin-x64": "0.18.20",
+        "@esbuild/freebsd-arm64": "0.18.20",
+        "@esbuild/freebsd-x64": "0.18.20",
+        "@esbuild/linux-arm": "0.18.20",
+        "@esbuild/linux-arm64": "0.18.20",
+        "@esbuild/linux-ia32": "0.18.20",
+        "@esbuild/linux-loong64": "0.18.20",
+        "@esbuild/linux-mips64el": "0.18.20",
+        "@esbuild/linux-ppc64": "0.18.20",
+        "@esbuild/linux-riscv64": "0.18.20",
+        "@esbuild/linux-s390x": "0.18.20",
+        "@esbuild/linux-x64": "0.18.20",
+        "@esbuild/netbsd-x64": "0.18.20",
+        "@esbuild/openbsd-x64": "0.18.20",
+        "@esbuild/sunos-x64": "0.18.20",
+        "@esbuild/win32-arm64": "0.18.20",
+        "@esbuild/win32-ia32": "0.18.20",
+        "@esbuild/win32-x64": "0.18.20"
       }
     },
     "node_modules/escalade": {
@@ -9038,9 +9038,9 @@
       }
     },
     "node_modules/rollup": {
-      "version": "3.20.2",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.20.2.tgz",
-      "integrity": "sha512-3zwkBQl7Ai7MFYQE0y1MeQ15+9jsi7XxfrqwTb/9EK8D9C9+//EBR4M+CuA1KODRaNbFez/lWxA5vhEGZp4MUg==",
+      "version": "3.29.4",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz",
+      "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==",
       "dev": true,
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -9805,15 +9805,14 @@
       }
     },
     "node_modules/vite": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-4.2.3.tgz",
-      "integrity": "sha512-kLU+m2q0Y434Y1kCy3TchefAdtFso0ILi0dLyFV8Us3InXTU11H/B5ZTqCKIQHzSKNxVG/yEx813EA9f1imQ9A==",
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.2.tgz",
+      "integrity": "sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==",
       "dev": true,
       "dependencies": {
-        "esbuild": "^0.17.5",
-        "postcss": "^8.4.21",
-        "resolve": "^1.22.1",
-        "rollup": "^3.18.0"
+        "esbuild": "^0.18.10",
+        "postcss": "^8.4.27",
+        "rollup": "^3.27.1"
       },
       "bin": {
         "vite": "bin/vite.js"
@@ -9821,12 +9820,16 @@
       "engines": {
         "node": "^14.18.0 || >=16.0.0"
       },
+      "funding": {
+        "url": "https://github.com/vitejs/vite?sponsor=1"
+      },
       "optionalDependencies": {
         "fsevents": "~2.3.2"
       },
       "peerDependencies": {
         "@types/node": ">= 14",
         "less": "*",
+        "lightningcss": "^1.21.0",
         "sass": "*",
         "stylus": "*",
         "sugarss": "*",
@@ -9839,6 +9842,9 @@
         "less": {
           "optional": true
         },
+        "lightningcss": {
+          "optional": true
+        },
         "sass": {
           "optional": true
         },
diff --git a/package.json b/package.json
index 9d8f78b210..64c33a9109 100644
--- a/package.json
+++ b/package.json
@@ -99,6 +99,6 @@
     "laravel-vite-plugin": "^0.7.2",
     "postcss": "^8.4.31",
     "tailwindcss": "^3.3.0",
-    "vite": "^4.2.3"
+    "vite": "^4.5.2"
   }
 }

From 7f76ab663a7a81e5e2757e68d01c9c4c9ba9f669 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Mon, 22 Jan 2024 15:36:15 +0000
Subject: [PATCH 037/149] [4.x] Hide actions on form index/show pages when user
 is missing relevant permissions (#9371)

---
 resources/js/components/forms/Listing.vue     |  6 ++--
 resources/views/forms/show.blade.php          | 32 ++++++++++---------
 .../Controllers/CP/Forms/FormsController.php  |  2 ++
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/resources/js/components/forms/Listing.vue b/resources/js/components/forms/Listing.vue
index b564498b27..7c1ebc03f1 100644
--- a/resources/js/components/forms/Listing.vue
+++ b/resources/js/components/forms/Listing.vue
@@ -13,9 +13,9 @@
                     <a :href="form.show_url">{{ form.title }}</a>
                 </template>
                 <template slot="actions" slot-scope="{ row: form, index }">
-                    <dropdown-list>
-                        <dropdown-item :text="__('Edit')" :redirect="form.edit_url" />
-                        <dropdown-item :text="__('Edit Blueprint')" :redirect="form.blueprint_url" />
+                    <dropdown-list v-if="form.can_edit || form.can_edit_blueprints || form.actions.length">
+                        <dropdown-item v-if="form.can_edit" :text="__('Edit')" :redirect="form.edit_url" />
+                        <dropdown-item v-if="form.can_edit_blueprints" :text="__('Edit Blueprint')" :redirect="form.blueprint_url" />
                         <div class="divider" v-if="form.actions.length" />
                         <data-list-inline-actions
                             :item="form.id"
diff --git a/resources/views/forms/show.blade.php b/resources/views/forms/show.blade.php
index f7990842ff..5525da0a40 100644
--- a/resources/views/forms/show.blade.php
+++ b/resources/views/forms/show.blade.php
@@ -14,21 +14,23 @@
                 {{ $form->title() }}
             </h1>
 
-            <dropdown-list class="mr-2">
-                @can('edit', $form)
-                    <dropdown-item :text="__('Edit Form')" redirect="{{ $form->editUrl() }}"></dropdown-item>
-                @endcan
-                @can('delete', $form)
-                    <dropdown-item :text="__('Delete Form')" class="warning" @click="$refs.deleter.confirm()">
-                        <resource-deleter
-                            ref="deleter"
-                            resource-title="{{ $form->title() }}"
-                            route="{{ $form->deleteUrl() }}"
-                            redirect="{{ cp_route('forms.index') }}"
-                        ></resource-deleter>
-                    </dropdown-item>
-                @endcan
-            </dropdown-list>
+            @if(\Statamic\Facades\User::current()->can('edit', $form) || \Statamic\Facades\User::current()->can('delete', $form))
+                <dropdown-list class="mr-2">
+                    @can('edit', $form)
+                        <dropdown-item :text="__('Edit Form')" redirect="{{ $form->editUrl() }}"></dropdown-item>
+                    @endcan
+                    @can('delete', $form)
+                        <dropdown-item :text="__('Delete Form')" class="warning" @click="$refs.deleter.confirm()">
+                            <resource-deleter
+                                ref="deleter"
+                                resource-title="{{ $form->title() }}"
+                                route="{{ $form->deleteUrl() }}"
+                                redirect="{{ cp_route('forms.index') }}"
+                            ></resource-deleter>
+                        </dropdown-item>
+                    @endcan
+                </dropdown-list>
+            @endif
 
             @if (($exporters = $form->exporters()) && $exporters->isNotEmpty())
             <dropdown-list>
diff --git a/src/Http/Controllers/CP/Forms/FormsController.php b/src/Http/Controllers/CP/Forms/FormsController.php
index 6fc27b5fac..ea057f73e2 100644
--- a/src/Http/Controllers/CP/Forms/FormsController.php
+++ b/src/Http/Controllers/CP/Forms/FormsController.php
@@ -35,6 +35,8 @@ public function index(Request $request)
                     'show_url' => $form->showUrl(),
                     'edit_url' => $form->editUrl(),
                     'blueprint_url' => cp_route('forms.blueprint.edit', $form->handle()),
+                    'can_edit' => User::current()->can('edit', $form),
+                    'can_edit_blueprint' => User::current()->can('configure form fields', $form),
                     'actions' => Action::for($form),
                 ];
             })

From b8100e693defb6c74f91c97c3350befcd3000cd6 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Mon, 22 Jan 2024 17:38:40 +0000
Subject: [PATCH 038/149] [4.x] Avoid saving icons to field configs (#9372)

---
 src/Fields/FieldTransformer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Fields/FieldTransformer.php b/src/Fields/FieldTransformer.php
index d61431f93f..159b733f0b 100644
--- a/src/Fields/FieldTransformer.php
+++ b/src/Fields/FieldTransformer.php
@@ -26,7 +26,7 @@ private static function importTabField(array $submitted)
 
     private static function inlineTabField(array $submitted)
     {
-        $field = Arr::removeNullValues(array_except($submitted['config'], ['isNew']));
+        $field = Arr::removeNullValues(array_except($submitted['config'], ['isNew', 'icon']));
 
         if (Arr::get($field, 'width') === 100) {
             unset($field['width']);

From 9d66f94c4208185ca92b81fe1c263902a33a7a45 Mon Sep 17 00:00:00 2001
From: Daniel Kaufmann <hello@danielkaufmann.ch>
Date: Tue, 23 Jan 2024 10:28:18 +0100
Subject: [PATCH 039/149] [4.x] German translation (#9374)

German translation
---
 resources/lang/de.json              |  4 ++--
 resources/lang/de/fieldtypes.php    |  2 +-
 resources/lang/de/messages.php      | 16 ++++++++++++----
 resources/lang/de_CH.json           |  4 ++--
 resources/lang/de_CH/fieldtypes.php |  2 +-
 resources/lang/de_CH/messages.php   | 16 ++++++++++++----
 resources/lang/en/messages.php      | 12 ++++++------
 7 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/resources/lang/de.json b/resources/lang/de.json
index ce68f929cd..68f22c1a19 100644
--- a/resources/lang/de.json
+++ b/resources/lang/de.json
@@ -229,6 +229,7 @@
     "Copy password reset email for this user?": "E-Mail zum Zurücksetzen des Passworts für diese Benutzer:in kopieren?",
     "Copy Password Reset Link": "Passwort Zurücksetzen Link kopieren",
     "Copy URL": "URL kopieren",
+    "Core": "Core",
     "Couldn't save entry": "Eintrag konnte nicht gespeichert werden",
     "Couldn't save term": "Begriff konnte nicht gespeichert werden",
     "CP Nav": "CP Navigation",
@@ -705,13 +706,12 @@
     "Read the Documentation": "Dokumentation lesen",
     "Reading Time": "Lesezeit",
     "Rebuild Search": "Suche neu erstellen",
-    "Recipient": "Empfänger:in",
     "Records": "Aufzeichnungen",
     "Redirect": "Weiterleiten",
     "Refresh": "Aktualisieren",
     "Regards": "Viele Grüße",
     "Regenerate": "Regenerieren",
-    "Regenerate from:": "Regenerieren von:",
+    "Regenerate from :field": "Regenerieren von :field",
     "Registration successful.": "Registrierung erfolgreich.",
     "Relationship": "Beziehung",
     "Released on :date": "Veröffentlicht am :date",
diff --git a/resources/lang/de/fieldtypes.php b/resources/lang/de/fieldtypes.php
index 7b6bb40549..a70c81d1c4 100644
--- a/resources/lang/de/fieldtypes.php
+++ b/resources/lang/de/fieldtypes.php
@@ -13,10 +13,10 @@
     'assets.config.max_files' => 'Maximale Anzahl der auswählbaren Dateien festlegen.',
     'assets.config.min_files' => 'Die minimale Anzahl der auswählbaren Dateien.',
     'assets.config.mode' => 'Bevorzugte Darstellung wählen.',
+    'assets.config.query_scopes' => 'Auswählen, welche Abfragebereiche beim Abrufen der auswählbaren Dateien angewendet werden sollen.',
     'assets.config.restrict' => 'Verhindern, dass Benutzer:innen zu anderen Ordnern navigieren können.',
     'assets.config.show_filename' => 'Dateiname neben dem Vorschaubild anzeigen.',
     'assets.config.show_set_alt' => 'Einen Link zum Erfassen des Alt-Texts bei allen Bildern anzeigen.',
-    'assets.config.query_scopes' => 'Auswählen, welche Abfragebereiche beim Abrufen der auswählbaren Dateien angewendet werden sollen.',
     'assets.title' => 'Dateien',
     'bard.config.allow_source' => 'Ermöglicht beim Schreiben das Anzeigen des HTML-Quellcodes.',
     'bard.config.always_show_set_button' => 'Ermöglicht das ständige Anzeigen des „Set hinzufügen“-Buttons.',
diff --git a/resources/lang/de/messages.php b/resources/lang/de/messages.php
index a208ecd20a..b64f6eb4ba 100644
--- a/resources/lang/de/messages.php
+++ b/resources/lang/de/messages.php
@@ -112,7 +112,9 @@
     'form_configure_email_reply_to_instructions' => 'Feld leer lassen, um stattdessen die Absenderadresse zu verwenden.',
     'form_configure_email_subject_instructions' => 'Betreffzeile der E-Mail.',
     'form_configure_email_text_instructions' => 'Darstellung für die Textversion dieser E-Mail.',
-    'form_configure_email_to_instructions' => 'E-Mail-Adresse der Empfänger:in.',
+    'form_configure_email_to_instructions' => 'E-Mail-Adresse(n) der Empfänger:innen - durch Kommas getrennt.',
+    'form_configure_email_cc_instructions' => 'E-Mail-Adresse(n) der CC-Empfänger:innen - durch Kommas getrennt.',
+    'form_configure_email_bcc_instructions' => 'E-Mail-Adresse(n) der BCC-Empfänger:innen - durch Kommas getrennt.',
     'form_configure_handle_instructions' => 'Damit wird im Frontend auf dieses Formular verwiesen. Dies kann später nicht ohne Weiteres geändert werden.',
     'form_configure_honeypot_instructions' => 'Dieser Feldname als *Honeypot* verwenden. Honeypots sind besondere Felder, die zum Vermeiden von Spam-Antworten benutzt werden.',
     'form_configure_intro' => 'Mit Formularen werden Informationen von Besucher:innen gesammelt sowie Events ausgelöst und Benachrichtigungen gesendet, sobald es neue Antworten gibt.',
@@ -200,18 +202,24 @@
     'status_scheduled_with_date' => 'Geplante Veröffentlichung am :date',
     'taxonomies_blueprints_instructions' => 'Begriffe in dieser Taxonomie können jedes dieser Blueprints verwenden.',
     'taxonomies_collections_instructions' => 'Die Sammlungen, in denen diese Taxonomie verwendet wird.',
-    'taxonomy_configure_layout_instructions' => 'Standardlayout dieser Taxonomie festlegen. Begriffe können diese Einstellung mit einem `layout`-Feld überschreiben.',
-    'taxonomy_configure_template_instructions' => 'Standardtemplate dieser Taxonomie festlegen.',
-    'taxonomy_configure_term_template_instructions' => 'Standardtemplate dieser Taxonomie festlegen. Begriffe können diese Einstellung mit einem `template`-Feld überschreiben.',
     'taxonomies_preview_target_refresh_instructions' => 'Die Vorschau während der Bearbeitung automatisch aktualisieren. Wird dies deaktiviert, wird postMessage verwendet.',
     'taxonomies_preview_targets_instructions' => 'Die URLs, die in der Live-Vorschau angezeigt werden können. Erfahre mehr in der [Dokumentation](https://statamic.dev/live-preview#preview-targets).',
     'taxonomy_configure_handle_instructions' => 'Damit wird im Frontend auf diese Taxonomie verwiesen. Dies kann später nicht ohne Weiteres geändert werden.',
     'taxonomy_configure_intro' => 'Eine Taxonomie ist ein System zum Klassifizieren von Daten anhand einer Reihe eindeutiger Merkmale, wie z.B. Kategorien, Tags oder Farben.',
+    'taxonomy_configure_layout_instructions' => 'Standardlayout dieser Taxonomie festlegen. Begriffe können diese Einstellung mit einem `layout`-Feld überschreiben.',
+    'taxonomy_configure_template_instructions' => 'Standardtemplate dieser Taxonomie festlegen.',
+    'taxonomy_configure_term_template_instructions' => 'Standardtemplate dieser Taxonomie festlegen. Begriffe können diese Einstellung mit einem `template`-Feld überschreiben.',
     'taxonomy_configure_title_instructions' => 'Wir empfehlen ein Substantiv im Plural, wie z.B. Kategorien oder Tags.',
     'taxonomy_next_steps_configure_description' => 'Konfiguriere Namen, verknüpfe Sammlungen, definiere Blueprints und vieles mehr.',
     'taxonomy_next_steps_create_term_description' => 'Erstelle den ersten Begriff oder mach eine Handvoll Platzhaltereinträge – es liegt ganz an dir.',
     'taxonomy_next_steps_documentation_description' => 'Erfahre mehr über Taxonomien, wie sie funktionieren und wie man sie konfiguriert.',
     'try_again_in_seconds' => '{0,1} Versuch es jetzt noch einmal.|Versuch es in :count Sekunden noch einmal.',
+    'units.B' => ':count B',
+    'units.KB' => ':count KB',
+    'units.MB' => ':count MB',
+    'units.GB' => ':count GB',
+    'units.s' => ':counts',
+    'units.ms' => ':countms',
     'updater_require_version_command' => 'Führe den folgenden Befehl aus, um eine bestimmte Version anzufordern',
     'updater_update_to_latest_command' => 'Führe den folgenden Befehl aus, um die aktuelle Version zu installieren',
     'user_groups_intro' => 'Mit Benutzergruppen kannst du Benutzer:innen organisieren und berechtigungsbasierte Rollen zusammenfassen.',
diff --git a/resources/lang/de_CH.json b/resources/lang/de_CH.json
index 703bf003ae..189522679c 100644
--- a/resources/lang/de_CH.json
+++ b/resources/lang/de_CH.json
@@ -229,6 +229,7 @@
     "Copy password reset email for this user?": "E-Mail zum Zurücksetzen des Passworts für diese Benutzer:in kopieren?",
     "Copy Password Reset Link": "Passwort Zurücksetzen Link kopieren",
     "Copy URL": "URL kopieren",
+    "Core": "Core",
     "Couldn't save entry": "Eintrag konnte nicht gespeichert werden",
     "Couldn't save term": "Begriff konnte nicht gespeichert werden",
     "CP Nav": "CP Navigation",
@@ -705,13 +706,12 @@
     "Read the Documentation": "Dokumentation lesen",
     "Reading Time": "Lesezeit",
     "Rebuild Search": "Suche neu erstellen",
-    "Recipient": "Empfänger:in",
     "Records": "Aufzeichnungen",
     "Redirect": "Weiterleiten",
     "Refresh": "Aktualisieren",
     "Regards": "Viele Grüsse",
     "Regenerate": "Regenerieren",
-    "Regenerate from:": "Regenerieren von:",
+    "Regenerate from :field": "Regenerieren von :field",
     "Registration successful.": "Registrierung erfolgreich.",
     "Relationship": "Beziehung",
     "Released on :date": "Veröffentlicht am :date",
diff --git a/resources/lang/de_CH/fieldtypes.php b/resources/lang/de_CH/fieldtypes.php
index c4cddf860f..11a9f740b6 100644
--- a/resources/lang/de_CH/fieldtypes.php
+++ b/resources/lang/de_CH/fieldtypes.php
@@ -13,10 +13,10 @@
     'assets.config.max_files' => 'Maximale Anzahl der auswählbaren Dateien festlegen.',
     'assets.config.min_files' => 'Die minimale Anzahl der auswählbaren Dateien.',
     'assets.config.mode' => 'Bevorzugte Darstellung wählen.',
+    'assets.config.query_scopes' => 'Auswählen, welche Abfragebereiche beim Abrufen der auswählbaren Dateien angewendet werden sollen.',
     'assets.config.restrict' => 'Verhindern, dass Benutzer:innen zu anderen Ordnern navigieren können.',
     'assets.config.show_filename' => 'Dateiname neben dem Vorschaubild anzeigen.',
     'assets.config.show_set_alt' => 'Einen Link zum Erfassen des Alt-Texts bei allen Bildern anzeigen.',
-    'assets.config.query_scopes' => 'Auswählen, welche Abfragebereiche beim Abrufen der auswählbaren Dateien angewendet werden sollen.',
     'assets.title' => 'Dateien',
     'bard.config.allow_source' => 'Ermöglicht beim Schreiben das Anzeigen des HTML-Quellcodes.',
     'bard.config.always_show_set_button' => 'Ermöglicht das ständige Anzeigen des «Set hinzufügen»-Buttons.',
diff --git a/resources/lang/de_CH/messages.php b/resources/lang/de_CH/messages.php
index 4ff411ecde..4abf855097 100644
--- a/resources/lang/de_CH/messages.php
+++ b/resources/lang/de_CH/messages.php
@@ -112,7 +112,9 @@
     'form_configure_email_reply_to_instructions' => 'Feld leer lassen, um stattdessen die Absenderadresse zu verwenden.',
     'form_configure_email_subject_instructions' => 'Betreffzeile der E-Mail.',
     'form_configure_email_text_instructions' => 'Darstellung für die Textversion dieser E-Mail.',
-    'form_configure_email_to_instructions' => 'E-Mail-Adresse der Empfänger:in.',
+    'form_configure_email_to_instructions' => 'E-Mail-Adresse(n) der Empfänger:innen - durch Kommas getrennt.',
+    'form_configure_email_cc_instructions' => 'E-Mail-Adresse(n) der CC-Empfänger:innen - durch Kommas getrennt.',
+    'form_configure_email_bcc_instructions' => 'E-Mail-Adresse(n) der BCC-Empfänger:innen - durch Kommas getrennt.',
     'form_configure_handle_instructions' => 'Damit wird im Frontend auf dieses Formular verwiesen. Dies kann später nicht ohne Weiteres geändert werden.',
     'form_configure_honeypot_instructions' => 'Dieser Feldname als *Honeypot* verwenden. Honeypots sind besondere Felder, die zum Vermeiden von Spam-Antworten benutzt werden.',
     'form_configure_intro' => 'Mit Formularen werden Informationen von Besucher:innen gesammelt sowie Events ausgelöst und Benachrichtigungen gesendet, sobald es neue Antworten gibt.',
@@ -200,18 +202,24 @@
     'status_scheduled_with_date' => 'Geplante Veröffentlichung am :date',
     'taxonomies_blueprints_instructions' => 'Begriffe in dieser Taxonomie können jedes dieser Blueprints verwenden.',
     'taxonomies_collections_instructions' => 'Die Sammlungen, in denen diese Taxonomie verwendet wird.',
-    'taxonomy_configure_layout_instructions' => 'Das Standardlayout dieser Taxonomie festlegen. Begriffe können diese Einstellung mit einem `layout`-Feld überschreiben.',
-    'taxonomy_configure_template_instructions' => 'Standardtemplate dieser Taxonomie festlegen.',
-    'taxonomy_configure_term_template_instructions' => 'Standardtemplate dieser Taxonomie festlegen. Begriffe können diese Einstellung mit einem `template`-Feld überschreiben.',
     'taxonomies_preview_target_refresh_instructions' => 'Die Vorschau während der Bearbeitung automatisch aktualisieren. Wird dies deaktiviert, wird postMessage verwendet.',
     'taxonomies_preview_targets_instructions' => 'Die URLs, die in der Live-Vorschau angezeigt werden können. Erfahre mehr in der [Dokumentation](https://statamic.dev/live-preview#preview-targets).',
     'taxonomy_configure_handle_instructions' => 'Damit wird im Frontend auf diese Taxonomie verwiesen. Dies kann später nicht ohne Weiteres geändert werden.',
     'taxonomy_configure_intro' => 'Eine Taxonomie ist ein System zum Klassifizieren von Daten anhand einer Reihe eindeutiger Merkmale, wie z.B. Kategorien, Tags oder Farben.',
+    'taxonomy_configure_layout_instructions' => 'Standardlayout dieser Taxonomie festlegen. Begriffe können diese Einstellung mit einem `layout`-Feld überschreiben.',
+    'taxonomy_configure_template_instructions' => 'Standardtemplate dieser Taxonomie festlegen.',
+    'taxonomy_configure_term_template_instructions' => 'Standardtemplate dieser Taxonomie festlegen. Begriffe können diese Einstellung mit einem `template`-Feld überschreiben.',
     'taxonomy_configure_title_instructions' => 'Wir empfehlen ein Substantiv im Plural, wie z.B. Kategorien oder Tags.',
     'taxonomy_next_steps_configure_description' => 'Konfiguriere Namen, verknüpfe Sammlungen, definiere Blueprints und vieles mehr.',
     'taxonomy_next_steps_create_term_description' => 'Erstelle den ersten Begriff oder mach eine Handvoll Platzhaltereinträge – es liegt ganz an dir.',
     'taxonomy_next_steps_documentation_description' => 'Erfahre mehr über Taxonomien, wie sie funktionieren und wie man sie konfiguriert.',
     'try_again_in_seconds' => '{0,1} Versuch es jetzt noch einmal.|Versuch es in :count Sekunden noch einmal.',
+    'units.B' => ':count B',
+    'units.KB' => ':count KB',
+    'units.MB' => ':count MB',
+    'units.GB' => ':count GB',
+    'units.s' => ':counts',
+    'units.ms' => ':countms',
     'updater_require_version_command' => 'Führe den folgenden Befehl aus, um eine bestimmte Version anzufordern',
     'updater_update_to_latest_command' => 'Führe den folgenden Befehl aus, um die aktuelle Version zu installieren',
     'user_groups_intro' => 'Mit Benutzergruppen kannst du Benutzer:innen organisieren und berechtigungsbasierte Rollen zusammenfassen.',
diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php
index 75102b899c..9a9953f62a 100644
--- a/resources/lang/en/messages.php
+++ b/resources/lang/en/messages.php
@@ -215,6 +215,12 @@
     'taxonomy_next_steps_create_term_description' => 'Create the first term or stub out a handful of placeholder terms, it\'s up to you.',
     'taxonomy_next_steps_documentation_description' => 'Learn more about taxonomies, how they work, and how to configure them.',
     'try_again_in_seconds' => '{0,1}Try again now.|Try again in :count seconds.',
+    'units.B' => ':count B',
+    'units.KB' => ':count KB',
+    'units.MB' => ':count MB',
+    'units.GB' => ':count GB',
+    'units.s' => ':counts',
+    'units.ms' => ':countms',
     'updater_require_version_command' => 'To require a specific version, run the following command',
     'updater_update_to_latest_command' => 'To update to the latest version, run the following command',
     'updates_available' => 'Updates are available!',
@@ -234,10 +240,4 @@
     'user_wizard_roles_groups_intro' => 'Users can be assigned to roles that customize their permissions, access, and abilities throughout the Control Panel.',
     'user_wizard_super_admin_instructions' => 'Super admins have complete control and access to everything in the control panel. Grant this role wisely.',
     'view_more_count' => 'View :count more',
-    'units.B' => ':count B',
-    'units.KB' => ':count KB',
-    'units.MB' => ':count MB',
-    'units.GB' => ':count GB',
-    'units.s' => ':counts',
-    'units.ms' => ':countms',
 ];

From 96aa7eaa9db0545c2f60cc3042bfeffe4e397472 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Tue, 23 Jan 2024 19:02:53 +0000
Subject: [PATCH 040/149] [4.x] Allow roles and groups to be database driven
 (#5686)

---
 composer.json                                 |   1 +
 config/users.php                              |   2 +
 src/Auth/Eloquent/Role.php                    |  35 ++++++
 src/Auth/Eloquent/RoleModel.php               |  30 +++++
 src/Auth/Eloquent/RoleRepository.php          |  69 ++++++++++
 src/Auth/Eloquent/UserGroup.php               |  34 +++++
 src/Auth/Eloquent/UserGroupModel.php          |  29 +++++
 src/Auth/Eloquent/UserGroupRepository.php     |  71 +++++++++++
 src/Console/Commands/AuthMigration.php        |  50 +++++++-
 .../stubs/auth/statamic_auth_tables.php.stub  |  13 +-
 .../stubs/auth/statamic_groups_table.php.stub |  32 +++++
 .../stubs/auth/statamic_roles_table.php.stub  |  33 +++++
 tests/Auth/Eloquent/EloquentRoleTest.php      | 119 ++++++++++++++++++
 tests/Auth/Eloquent/EloquentUserGroupTest.php | 118 +++++++++++++++++
 tests/Auth/Eloquent/EloquentUserTest.php      |  38 +++++-
 ...0_00_00_000000_create_test_user_tables.php |  13 --
 16 files changed, 659 insertions(+), 28 deletions(-)
 create mode 100644 src/Auth/Eloquent/RoleModel.php
 create mode 100644 src/Auth/Eloquent/UserGroupModel.php
 create mode 100644 src/Console/Commands/stubs/auth/statamic_groups_table.php.stub
 create mode 100644 src/Console/Commands/stubs/auth/statamic_roles_table.php.stub
 create mode 100644 tests/Auth/Eloquent/EloquentRoleTest.php
 create mode 100644 tests/Auth/Eloquent/EloquentUserGroupTest.php

diff --git a/composer.json b/composer.json
index 1bbf69cc6b..ced5d7890e 100644
--- a/composer.json
+++ b/composer.json
@@ -37,6 +37,7 @@
         "wilderborn/partyline": "^1.0"
     },
     "require-dev": {
+        "doctrine/dbal": "^3.6",
         "fakerphp/faker": "~1.10",
         "google/cloud-translate": "^1.6",
         "laravel/pint": "^1.0",
diff --git a/config/users.php b/config/users.php
index f51cf04a5d..137519c394 100644
--- a/config/users.php
+++ b/config/users.php
@@ -131,7 +131,9 @@
     'tables' => [
         'users' => 'users',
         'role_user' => 'role_user',
+        'roles' => false,
         'group_user' => 'group_user',
+        'groups' => false,
     ],
 
     /*
diff --git a/src/Auth/Eloquent/Role.php b/src/Auth/Eloquent/Role.php
index 69f16fa38e..1c2672e127 100644
--- a/src/Auth/Eloquent/Role.php
+++ b/src/Auth/Eloquent/Role.php
@@ -6,4 +6,39 @@
 
 class Role extends FileRole
 {
+    protected $model;
+
+    public static function fromModel(RoleModel $model)
+    {
+        return (new static)
+            ->title($model->title)
+            ->handle($model->handle)
+            ->permissions($model->permissions ?? [])
+            ->preferences($model->preferences ?? [])
+            ->model($model);
+    }
+
+    public function toModel()
+    {
+        return RoleModel::findOrNew($this->model ? $this->model->id : null)
+            ->fill([
+                'title' => $this->title,
+                'handle' => $this->handle,
+                'permissions' => $this->permissions,
+                'preferences' => $this->preferences,
+            ]);
+    }
+
+    public function model($model = null)
+    {
+        if (func_num_args() === 0) {
+            return $this->model;
+        }
+
+        $this->model = $model;
+
+        $this->handle($model->handle);
+
+        return $this;
+    }
 }
diff --git a/src/Auth/Eloquent/RoleModel.php b/src/Auth/Eloquent/RoleModel.php
new file mode 100644
index 0000000000..cd4cdedb08
--- /dev/null
+++ b/src/Auth/Eloquent/RoleModel.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Statamic\Auth\Eloquent;
+
+use Illuminate\Database\Eloquent\Model as Eloquent;
+
+class RoleModel extends Eloquent
+{
+    protected $guarded = [];
+
+    protected $table = 'roles';
+
+    protected $casts = [
+        'permissions' => 'json',
+        'preferences' => 'json',
+        'created_at' => 'datetime',
+        'updated_at' => 'datetime',
+    ];
+
+    public function __construct(array $attributes = [])
+    {
+        parent::__construct($attributes);
+
+        if ($table = config('statamic.users.tables.roles')) {
+            $this->setTable($table);
+        }
+
+        $this->setConnection(config('statamic.users.database'));
+    }
+}
diff --git a/src/Auth/Eloquent/RoleRepository.php b/src/Auth/Eloquent/RoleRepository.php
index 64045cec54..b29aee08c5 100644
--- a/src/Auth/Eloquent/RoleRepository.php
+++ b/src/Auth/Eloquent/RoleRepository.php
@@ -2,8 +2,10 @@
 
 namespace Statamic\Auth\Eloquent;
 
+use Illuminate\Support\Collection;
 use Statamic\Auth\RoleRepository as BaseRepository;
 use Statamic\Contracts\Auth\Role as RoleContract;
+use Statamic\Facades\Blink;
 
 class RoleRepository extends BaseRepository
 {
@@ -11,4 +13,71 @@ public function make(?string $handle = null): RoleContract
     {
         return (new Role)->handle($handle);
     }
+
+    public function save($role)
+    {
+        if (! $this->isEloquentEnabled()) {
+            return parent::save($role);
+        }
+
+        $model = $role->toModel();
+        $model->save();
+
+        $role->model($model->fresh());
+
+        Blink::forget("eloquent-roles-{$role->handle()}");
+    }
+
+    public function delete($role)
+    {
+        if (! $this->isEloquentEnabled()) {
+            return parent::delete($role);
+        }
+
+        $role->model()->delete();
+
+        Blink::forget("eloquent-roles-{$role->handle()}");
+        Blink::forget('eloquent-roles-all');
+    }
+
+    public static function bindings(): array
+    {
+        return [
+            RoleContract::class => Role::class,
+        ];
+    }
+
+    public function all(): Collection
+    {
+        if (! $this->isEloquentEnabled()) {
+            return parent::all();
+        }
+
+        return Blink::once('eloquent-roles-all', function () {
+            return RoleModel::all()
+                ->map(function ($model) {
+                    return Blink::once("eloquent-roles-{$model->handle}", function () use ($model) {
+                        return (new Role)->fromModel($model);
+                    });
+                });
+        });
+    }
+
+    public function find($handle): ?RoleContract
+    {
+        if (! $this->isEloquentEnabled()) {
+            return parent::find($handle);
+        }
+
+        return Blink::once("eloquent-roles-{$handle}", function () use ($handle) {
+            $model = RoleModel::where(is_numeric($handle) ? 'id' : 'handle', $handle)->first();
+
+            return $model ? (new Role)->fromModel($model) : null;
+        });
+    }
+
+    private function isEloquentEnabled()
+    {
+        return config('statamic.users.tables.roles', false) != false;
+    }
 }
diff --git a/src/Auth/Eloquent/UserGroup.php b/src/Auth/Eloquent/UserGroup.php
index 06288285ff..e2897096ba 100644
--- a/src/Auth/Eloquent/UserGroup.php
+++ b/src/Auth/Eloquent/UserGroup.php
@@ -7,6 +7,40 @@
 
 class UserGroup extends FileUserGroup
 {
+    protected $model;
+
+    public static function fromModel(UserGroupModel $model)
+    {
+        return (new static)
+            ->title($model->title)
+            ->handle($model->handle)
+            ->roles($model->roles ?? [])
+            ->model($model);
+    }
+
+    public function toModel()
+    {
+        return UserGroupModel::findOrNew($this->model ? $this->model->id : null)
+            ->fill([
+                'title' => $this->title,
+                'handle' => $this->handle,
+                'roles' => $this->roles->keys(),
+            ]);
+    }
+
+    public function model($model = null)
+    {
+        if (func_num_args() === 0) {
+            return $this->model;
+        }
+
+        $this->model = $model;
+
+        $this->handle($model->handle);
+
+        return $this;
+    }
+
     public function queryUsers()
     {
         return User::query()->whereIn('id', $this->getUserIds());
diff --git a/src/Auth/Eloquent/UserGroupModel.php b/src/Auth/Eloquent/UserGroupModel.php
new file mode 100644
index 0000000000..8c4622080e
--- /dev/null
+++ b/src/Auth/Eloquent/UserGroupModel.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Statamic\Auth\Eloquent;
+
+use Illuminate\Database\Eloquent\Model as Eloquent;
+
+class UserGroupModel extends Eloquent
+{
+    protected $guarded = [];
+
+    protected $table = 'groups';
+
+    protected $casts = [
+        'roles' => 'json',
+        'created_at' => 'datetime',
+        'updated_at' => 'datetime',
+    ];
+
+    public function __construct(array $attributes = [])
+    {
+        parent::__construct($attributes);
+
+        if ($table = config('statamic.users.tables.groups')) {
+            $this->setTable($table);
+        }
+
+        $this->setConnection(config('statamic.users.database'));
+    }
+}
diff --git a/src/Auth/Eloquent/UserGroupRepository.php b/src/Auth/Eloquent/UserGroupRepository.php
index 38a9cbe893..c52b9ddd54 100644
--- a/src/Auth/Eloquent/UserGroupRepository.php
+++ b/src/Auth/Eloquent/UserGroupRepository.php
@@ -2,7 +2,10 @@
 
 namespace Statamic\Auth\Eloquent;
 
+use Illuminate\Support\Collection;
 use Statamic\Auth\File\UserGroupRepository as BaseRepository;
+use Statamic\Contracts\Auth\UserGroup as UserGroupContract;
+use Statamic\Facades\Blink;
 
 class UserGroupRepository extends BaseRepository
 {
@@ -10,4 +13,72 @@ public function make()
     {
         return new UserGroup;
     }
+
+    public function save($userGroup)
+    {
+        if (! $this->isEloquentEnabled()) {
+            return parent::save($userGroup);
+        }
+
+        $model = $userGroup->toModel();
+
+        $model->save();
+
+        $userGroup->model($model->fresh());
+
+        Blink::forget("eloquent-groups-{$userGroup->handle()}");
+    }
+
+    public function delete($userGroup)
+    {
+        if (! $this->isEloquentEnabled()) {
+            return parent::delete($userGroup);
+        }
+
+        $userGroup->model()->delete();
+
+        Blink::forget("eloquent-groups-{$userGroup->handle()}");
+        Blink::forget('eloquent-groups-all');
+    }
+
+    public static function bindings(): array
+    {
+        return [
+            UserGroupContract::class => UserGroup::class,
+        ];
+    }
+
+    public function all(): Collection
+    {
+        if (! $this->isEloquentEnabled()) {
+            return parent::all();
+        }
+
+        return Blink::once('eloquent-groups-all', function () {
+            return UserGroupModel::all()
+                ->map(function ($model) {
+                    return Blink::once("eloquent-groups-{$model->handle}", function () use ($model) {
+                        return (new UserGroup)->fromModel($model);
+                    });
+                });
+        });
+    }
+
+    public function find($handle): ?UserGroupContract
+    {
+        if (! $this->isEloquentEnabled()) {
+            return parent::find($handle);
+        }
+
+        return Blink::once("eloquent-groups-{$handle}", function () use ($handle) {
+            $model = UserGroupModel::where(is_numeric($handle) ? 'id' : 'handle', $handle)->first();
+
+            return $model ? (new UserGroup)->fromModel($model) : null;
+        });
+    }
+
+    private function isEloquentEnabled()
+    {
+        return config('statamic.users.tables.groups', false) != false;
+    }
 }
diff --git a/src/Console/Commands/AuthMigration.php b/src/Console/Commands/AuthMigration.php
index 504b2786da..75981821ea 100644
--- a/src/Console/Commands/AuthMigration.php
+++ b/src/Console/Commands/AuthMigration.php
@@ -3,6 +3,7 @@
 namespace Statamic\Console\Commands;
 
 use Illuminate\Console\Command;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Composer;
 use Statamic\Console\RunsInPlease;
 use Statamic\Facades\File;
@@ -12,7 +13,7 @@ class AuthMigration extends Command
     use RunsInPlease;
 
     protected $composer;
-    protected $name = 'statamic:auth:migration';
+    protected $signature = 'statamic:auth:migration {--path=}';
     protected $description = 'Generate Auth Migrations';
 
     public function __construct(Composer $composer)
@@ -25,8 +26,8 @@ public function __construct(Composer $composer)
     public function handle()
     {
         $from = __DIR__.'/stubs/auth/statamic_auth_tables.php.stub';
-        $file = date('Y_m_d_His', time()).'_statamic_auth_tables';
-        $to = database_path("migrations/{$file}.php");
+        $file = Carbon::now()->format('Y_m_d_His').'_statamic_auth_tables';
+        $to = ($path = $this->option('path')) ? $path."/{$file}.php" : database_path("migrations/{$file}.php");
 
         $contents = File::get($from);
 
@@ -42,8 +43,49 @@ public function handle()
 
         File::put($to, $contents);
 
-        $this->line("<info>Created Migration:</info> {$file}");
+        $this->line("<info>Created Auth Migration:</info> {$file}");
+
+        $this->createGroupsTable();
+        $this->createRolesTable();
 
         $this->composer->dumpAutoloads();
     }
+
+    private function createGroupsTable()
+    {
+        if (config('statamic.users.tables.groups', false) == false) {
+            return;
+        }
+
+        $from = __DIR__.'/stubs/auth/statamic_groups_table.php.stub';
+        $file = Carbon::now()->format('Y_m_d_His').'_statamic_groups_table';
+        $to = ($path = $this->option('path')) ? $path."/{$file}.php" : database_path("migrations/{$file}.php");
+
+        $contents = File::get($from);
+
+        $contents = str_replace('GROUPS_TABLE', config('statamic.users.tables.groups', 'groups'), $contents);
+
+        File::put($to, $contents);
+
+        $this->line("<info>Created Groups Migration:</info> {$file}");
+    }
+
+    private function createRolesTable()
+    {
+        if (config('statamic.users.tables.roles', false) == false) {
+            return;
+        }
+
+        $from = __DIR__.'/stubs/auth/statamic_roles_table.php.stub';
+        $file = Carbon::now()->format('Y_m_d_His').'_statamic_roles_table';
+        $to = ($path = $this->option('path')) ? $path."/{$file}.php" : database_path("migrations/{$file}.php");
+
+        $contents = File::get($from);
+
+        $contents = str_replace('ROLES_TABLE', config('statamic.users.tables.roles', 'roles'), $contents);
+
+        File::put($to, $contents);
+
+        $this->line("<info>Created Roles Migration:</info> {$file}");
+    }
 }
diff --git a/src/Console/Commands/stubs/auth/statamic_auth_tables.php.stub b/src/Console/Commands/stubs/auth/statamic_auth_tables.php.stub
index b05ec2702d..00a21c4971 100644
--- a/src/Console/Commands/stubs/auth/statamic_auth_tables.php.stub
+++ b/src/Console/Commands/stubs/auth/statamic_auth_tables.php.stub
@@ -15,14 +15,14 @@ class StatamicAuthTables extends Migration
     {
         USERS_TABLE_REPLACE
         Schema::create('ROLE_USER_TABLE', function (Blueprint $table) {
-            $table->increments('id');
-            $table->integer('user_id');
+            $table->id('id');
+            $table->foreignId('user_id')->constrained('USERS_TABLE')->cascadeOnDelete();
             $table->string('role_id');
         });
 
         Schema::create('GROUP_USER_TABLE', function (Blueprint $table) {
-            $table->increments('id');
-            $table->integer('user_id');
+            $table->id('id');
+            $table->foreignId('user_id')->constrained('USERS_TABLE')->cascadeOnDelete();
             $table->string('group_id');
         });
 
@@ -39,10 +39,7 @@ class StatamicAuthTables extends Migration
      public function down()
      {
          Schema::table('USERS_TABLE', function (Blueprint $table) {
-             $table->dropColumn('super');
-             $table->dropColumn('avatar');
-             $table->dropColumn('preferences');
-             $table->dropColumn('last_login');
+             $table->dropColumn(['super', 'avatar', 'preferences', 'last_login']);
              $table->string('password')->nullable(false)->change();
          });
 
diff --git a/src/Console/Commands/stubs/auth/statamic_groups_table.php.stub b/src/Console/Commands/stubs/auth/statamic_groups_table.php.stub
new file mode 100644
index 0000000000..6eccf18bd3
--- /dev/null
+++ b/src/Console/Commands/stubs/auth/statamic_groups_table.php.stub
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class StatamicGroupsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('GROUPS_TABLE', function (Blueprint $table) {
+            $table->id();
+            $table->string('handle')->unique();
+            $table->string('title');
+            $table->json('roles')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down()
+    {
+        Schema::dropIfExists('GROUPS_TABLE');
+    }
+}
diff --git a/src/Console/Commands/stubs/auth/statamic_roles_table.php.stub b/src/Console/Commands/stubs/auth/statamic_roles_table.php.stub
new file mode 100644
index 0000000000..12285a75d8
--- /dev/null
+++ b/src/Console/Commands/stubs/auth/statamic_roles_table.php.stub
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class StatamicRolesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('ROLES_TABLE', function (Blueprint $table) {
+            $table->id();
+            $table->string('handle')->unique();
+            $table->string('title');
+            $table->json('permissions')->nullable();
+            $table->json('preferences')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down()
+    {
+        Schema::dropIfExists('ROLES_TABLE');
+    }
+}
diff --git a/tests/Auth/Eloquent/EloquentRoleTest.php b/tests/Auth/Eloquent/EloquentRoleTest.php
new file mode 100644
index 0000000000..e528d999a2
--- /dev/null
+++ b/tests/Auth/Eloquent/EloquentRoleTest.php
@@ -0,0 +1,119 @@
+<?php
+
+namespace Tests\Auth\Eloquent;
+
+use Illuminate\Filesystem\Filesystem;
+use Illuminate\Foundation\Testing\WithFaker;
+use Illuminate\Support\Carbon;
+use Statamic\Auth\Eloquent\Role as EloquentRole;
+use Statamic\Auth\Eloquent\RoleModel;
+use Statamic\Auth\Eloquent\User as EloquentUser;
+use Tests\TestCase;
+
+class EloquentRoleTest extends TestCase
+{
+    use WithFaker;
+
+    public static $migrationsGenerated = false;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        Carbon::setTestNow(Carbon::create(2019, 11, 21, 23, 39, 29));
+
+        config([
+            'statamic.users.repository' => 'eloquent',
+            'statamic.users.tables.roles' => 'roles',
+        ]);
+
+        $this->loadMigrationsFrom(static::migrationsDir());
+
+        $tmpDir = static::migrationsDir().'/tmp';
+
+        if (! self::$migrationsGenerated) {
+            $this->artisan('statamic:auth:migration', ['--path' => $tmpDir]);
+
+            self::$migrationsGenerated = true;
+        }
+
+        $this->loadMigrationsFrom($tmpDir);
+    }
+
+    private static function migrationsDir()
+    {
+        return __DIR__.'/__migrations__';
+    }
+
+    public function tearDown(): void
+    {
+        \Statamic\Facades\User::all()->each->delete();
+
+        parent::tearDown();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        // Clean up the orphaned migration file.
+        (new Filesystem)->deleteDirectory(static::migrationsDir().'/tmp');
+
+        parent::tearDownAfterClass();
+    }
+
+    public function makeRole()
+    {
+        return (new EloquentRole)
+            ->model(RoleModel::create([
+                'handle' => $this->faker->word,
+                'title' => $this->faker->words(2, true),
+                'permissions' => [],
+                'preferences' => [],
+            ])
+            );
+    }
+
+    public function makeUser()
+    {
+        return (new EloquentUser)
+            ->model(User::create([
+                'name' => $this->faker->name,
+                'email' => $this->faker->unique()->safeEmail,
+                // 'password' => '$2y$10$TKh8H1.PfQx37YgCzwiKb.KjNyWgaHb9cbcoQgdIVFlYg7B77UdFm', // secret
+                'remember_token' => str_random(10),
+            ])
+            );
+    }
+
+    /** @test */
+    public function it_creates_a_role()
+    {
+        $role = $this->makeRole();
+
+        $this->assertInstanceOf(EloquentRole::class, $role);
+    }
+
+    /** @test */
+    public function it_assigns_a_role_to_a_user()
+    {
+        $role = $this->makeRole();
+        $user = $this->makeUser();
+        $user->assignRole($role);
+
+        $this->assertEquals($user->roles()->first(), $role);
+    }
+
+    /** @test */
+    public function it_assigns_a_role_to_a_user_and_then_removes_it()
+    {
+        $role = $this->makeRole();
+        $user = $this->makeUser();
+        $user->assignRole($role);
+
+        $this->assertEquals($user->roles()->first(), $role);
+        $this->assertCount(1, $user->roles());
+
+        $user->removeRole($role);
+
+        $this->assertCount(0, $user->roles());
+    }
+}
diff --git a/tests/Auth/Eloquent/EloquentUserGroupTest.php b/tests/Auth/Eloquent/EloquentUserGroupTest.php
new file mode 100644
index 0000000000..bb8756f925
--- /dev/null
+++ b/tests/Auth/Eloquent/EloquentUserGroupTest.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace Tests\Auth\Eloquent;
+
+use Illuminate\Filesystem\Filesystem;
+use Illuminate\Foundation\Testing\WithFaker;
+use Illuminate\Support\Carbon;
+use Statamic\Auth\Eloquent\User as EloquentUser;
+use Statamic\Auth\Eloquent\UserGroup as EloquentGroup;
+use Statamic\Auth\Eloquent\UserGroupModel;
+use Tests\TestCase;
+
+class EloquentUserGroupTest extends TestCase
+{
+    use WithFaker;
+
+    public static $migrationsGenerated = false;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        Carbon::setTestNow(Carbon::create(2019, 11, 21, 23, 39, 29));
+
+        config([
+            'statamic.users.repository' => 'eloquent',
+            'statamic.users.tables.groups' => 'groups',
+        ]);
+
+        $this->loadMigrationsFrom(static::migrationsDir());
+
+        $tmpDir = static::migrationsDir().'/tmp';
+
+        if (! self::$migrationsGenerated) {
+            $this->artisan('statamic:auth:migration', ['--path' => $tmpDir]);
+
+            self::$migrationsGenerated = true;
+        }
+
+        $this->loadMigrationsFrom($tmpDir);
+    }
+
+    private static function migrationsDir()
+    {
+        return __DIR__.'/__migrations__';
+    }
+
+    public function tearDown(): void
+    {
+        \Statamic\Facades\User::all()->each->delete();
+
+        parent::tearDown();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        // Clean up the orphaned migration file.
+        (new Filesystem)->deleteDirectory(static::migrationsDir().'/tmp');
+
+        parent::tearDownAfterClass();
+    }
+
+    public function makeGroup()
+    {
+        return (new EloquentGroup)
+            ->model(UserGroupModel::create([
+                'handle' => $this->faker->word,
+                'title' => $this->faker->words(2, true),
+                'roles' => [],
+            ])
+            );
+    }
+
+    public function makeUser()
+    {
+        return (new EloquentUser)
+            ->model(User::create([
+                'name' => $this->faker->name,
+                'email' => $this->faker->unique()->safeEmail,
+                // 'password' => '$2y$10$TKh8H1.PfQx37YgCzwiKb.KjNyWgaHb9cbcoQgdIVFlYg7B77UdFm', // secret
+                'remember_token' => str_random(10),
+            ])
+            );
+    }
+
+    /** @test */
+    public function it_creates_a_group()
+    {
+        $group = $this->makeGroup();
+
+        $this->assertInstanceOf(EloquentGroup::class, $group);
+    }
+
+    /** @test */
+    public function it_assigns_a_group_to_a_user()
+    {
+        $group = $this->makeGroup();
+        $user = $this->makeUser();
+        $user->addToGroup($group);
+
+        $this->assertEquals($user->groups()->first(), $group);
+    }
+
+    /** @test */
+    public function it_assigns_a_group_to_a_user_then_removes_it()
+    {
+        $group = $this->makeGroup();
+        $user = $this->makeUser();
+        $user->addToGroup($group);
+
+        $this->assertEquals($user->groups()->first(), $group);
+        $this->assertCount(1, $user->groups());
+
+        $user->removeFromGroup($group);
+
+        $this->assertCount(0, $user->groups());
+    }
+}
diff --git a/tests/Auth/Eloquent/EloquentUserTest.php b/tests/Auth/Eloquent/EloquentUserTest.php
index 0cf4d0565d..5115cf6387 100644
--- a/tests/Auth/Eloquent/EloquentUserTest.php
+++ b/tests/Auth/Eloquent/EloquentUserTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Auth\Eloquent;
 
+use Illuminate\Filesystem\Filesystem;
 use Illuminate\Foundation\Testing\WithFaker;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
@@ -19,6 +20,8 @@ class EloquentUserTest extends TestCase
 {
     use HasPreferencesTests, PermissibleContractTests, UserContractTests, WithFaker;
 
+    public static $migrationsGenerated = false;
+
     public function setUp(): void
     {
         parent::setUp();
@@ -27,15 +30,44 @@ public function setUp(): void
 
         config(['statamic.users.repository' => 'eloquent']);
 
-        // TODO: The migration has been added into the test, but the implementation could be broken if the real
-        // migration is different from what's in here. We should find a way to reference the actual migrations.
-        $this->loadMigrationsFrom(__DIR__.'/__migrations__');
+        $this->loadMigrationsFrom(static::migrationsDir());
+
+        $tmpDir = static::migrationsDir().'/tmp';
+
+        if (! self::$migrationsGenerated) {
+            $this->artisan('statamic:auth:migration', ['--path' => $tmpDir]);
+
+            self::$migrationsGenerated = true;
+        }
+
+        $this->loadMigrationsFrom($tmpDir);
 
         // Prevent the anonymous role classes throwing errors when getting serialized
         // during event handling unrelated to these tests.
         Event::fake();
     }
 
+    private static function migrationsDir()
+    {
+        return __DIR__.'/__migrations__';
+    }
+
+    public function tearDown(): void
+    {
+        // Prevent error about null password during the down migration.
+        User::all()->each->delete();
+
+        parent::tearDown();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        // Clean up the orphaned migration file.
+        (new Filesystem)->deleteDirectory(static::migrationsDir().'/tmp');
+
+        parent::tearDownAfterClass();
+    }
+
     /** @test */
     public function it_gets_roles_already_in_the_db_without_explicitly_assigning_them()
     {
diff --git a/tests/Auth/Eloquent/__migrations__/0000_00_00_000000_create_test_user_tables.php b/tests/Auth/Eloquent/__migrations__/0000_00_00_000000_create_test_user_tables.php
index 524539de27..fe1d19ca00 100644
--- a/tests/Auth/Eloquent/__migrations__/0000_00_00_000000_create_test_user_tables.php
+++ b/tests/Auth/Eloquent/__migrations__/0000_00_00_000000_create_test_user_tables.php
@@ -18,21 +18,8 @@ public function up()
             $table->string('name');
             $table->string('email')->unique();
             $table->string('password')->nullable(); // Only nullable for tests so we can test passwords get encrypted.
-            $table->boolean('super')->default(false);
             $table->rememberToken();
             $table->timestamps();
         });
-
-        Schema::create(config('statamic.users.tables.role_user', 'role_user'), function (Blueprint $table) {
-            $table->increments('id');
-            $table->integer('user_id');
-            $table->string('role_id');
-        });
-
-        Schema::create(config('statamic.users.tables.group_user', 'group_user'), function (Blueprint $table) {
-            $table->increments('id');
-            $table->integer('user_id');
-            $table->string('group_id');
-        });
     }
 }

From cd26efde3c17ace685c0ddaa536d472e73d517f0 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Tue, 23 Jan 2024 19:11:00 +0000
Subject: [PATCH 041/149] [4.x] Fix user groups/roles querying (#6131)

---
 src/Auth/Eloquent/UserQueryBuilder.php    |  92 ++++++++++++-
 src/Query/Scopes/Filters/UserGroup.php    |   2 +-
 src/Query/Scopes/Filters/UserRole.php     |   2 +-
 src/Stache/Indexes/Index.php              |   2 +-
 src/Stache/Query/UserQueryBuilder.php     |  66 +++++++++
 src/Tags/Users.php                        |   8 +-
 tests/Auth/Eloquent/EloquentUserTest.php  | 110 +++++++++++++++
 tests/Auth/FileUserTest.php               |   1 +
 tests/Auth/PermissibleContractTests.php   |   2 +
 tests/Data/Users/UserQueryBuilderTest.php | 156 ++++++++++++++++++++++
 tests/Tags/UsersTagsTest.php              |  75 +++++++++++
 11 files changed, 504 insertions(+), 12 deletions(-)
 create mode 100644 tests/Tags/UsersTagsTest.php

diff --git a/src/Auth/Eloquent/UserQueryBuilder.php b/src/Auth/Eloquent/UserQueryBuilder.php
index f89c5584a5..e873979125 100644
--- a/src/Auth/Eloquent/UserQueryBuilder.php
+++ b/src/Auth/Eloquent/UserQueryBuilder.php
@@ -2,12 +2,93 @@
 
 namespace Statamic\Auth\Eloquent;
 
+use Illuminate\Support\Facades\DB;
 use Statamic\Auth\UserCollection;
 use Statamic\Facades\User;
 use Statamic\Query\EloquentQueryBuilder;
 
 class UserQueryBuilder extends EloquentQueryBuilder
 {
+    public function whereGroup($value, $operator = '=', $boolean = 'and')
+    {
+        $method = $boolean == 'or' ? 'orWhereExists' : 'whereExists';
+        $this->$method(function ($query) use ($operator, $value) {
+            $query->select(DB::raw(1))
+                ->from($this->groupsTable())
+                ->where('group_id', $operator, $value)
+                ->whereColumn($this->groupsTable().'.user_id', 'users.id');
+        });
+
+        return $this;
+    }
+
+    public function orWhereGroup($value, $operator = '=')
+    {
+        $this->whereGroup($value, $operator, 'or');
+
+        return $this;
+    }
+
+    public function whereGroupIn($groups, $boolean = 'and')
+    {
+        $method = $boolean == 'or' ? 'orWhereExists' : 'whereExists';
+        $this->$method(function ($query) use ($groups) {
+            $query->select(DB::raw(1))
+                ->from($this->groupsTable())
+                ->whereIn('group_id', $groups)
+                ->whereColumn($this->groupsTable().'.user_id', 'users.id');
+        });
+
+        return $this;
+    }
+
+    public function orWhereGroupIn($groups)
+    {
+        $this->whereGroupIn($groups, 'or');
+
+        return $this;
+    }
+
+    public function whereRole($value, $operator = '=', $boolean = 'and')
+    {
+        $method = $boolean == 'or' ? 'orWhereExists' : 'whereExists';
+        $this->$method(function ($query) use ($operator, $value) {
+            $query->select(DB::raw(1))
+                ->from($this->rolesTable())
+                ->where('role_id', $operator, $value)
+                ->whereColumn($this->rolesTable().'.user_id', 'users.id');
+        });
+
+        return $this;
+    }
+
+    public function orWhereRole($value, $operator = '=')
+    {
+        $this->whereRole($value, $operator, 'or');
+
+        return $this;
+    }
+
+    public function whereRoleIn($roles, $boolean = 'and')
+    {
+        $method = $boolean == 'or' ? 'orWhereExists' : 'whereExists';
+        $this->$method(function ($query) use ($roles) {
+            $query->select(DB::raw(1))
+                ->from($this->rolesTable())
+                ->whereIn('role_id', $roles)
+                ->whereColumn($this->rolesTable().'.user_id', 'users.id');
+        });
+
+        return $this;
+    }
+
+    public function orWhereRoleIn($roles)
+    {
+        $this->whereRoleIn($roles, 'or');
+
+        return $this;
+    }
+
     protected function transform($items, $columns = ['*'])
     {
         return UserCollection::make($items)->map(function ($model) {
@@ -15,12 +96,13 @@ protected function transform($items, $columns = ['*'])
         });
     }
 
-    protected function column($column)
+    private function groupsTable()
     {
-        if ($column === 'id') {
-            return User::make()->model()->getKeyName();
-        }
+        return config('statamic.users.tables.group_user', 'group_user');
+    }
 
-        return $column;
+    private function rolesTable()
+    {
+        return config('statamic.users.tables.role_user', 'role_user');
     }
 }
diff --git a/src/Query/Scopes/Filters/UserGroup.php b/src/Query/Scopes/Filters/UserGroup.php
index 022d96b2fe..eae56449d9 100644
--- a/src/Query/Scopes/Filters/UserGroup.php
+++ b/src/Query/Scopes/Filters/UserGroup.php
@@ -27,7 +27,7 @@ public function fieldItems()
 
     public function apply($query, $values)
     {
-        $query->where('groups/'.$values['group'], true);
+        $query->whereGroup($values['group']);
     }
 
     public function badge($values)
diff --git a/src/Query/Scopes/Filters/UserRole.php b/src/Query/Scopes/Filters/UserRole.php
index 18e4e8aea8..51a5a6635f 100644
--- a/src/Query/Scopes/Filters/UserRole.php
+++ b/src/Query/Scopes/Filters/UserRole.php
@@ -30,7 +30,7 @@ public function apply($query, $values)
         if ($values['role'] === 'super') {
             $query->where('super', true);
         } else {
-            $query->where('roles/'.$values['role'], true);
+            $query->whereRole($values['role']);
         }
     }
 
diff --git a/src/Stache/Indexes/Index.php b/src/Stache/Indexes/Index.php
index 89200a6e6e..6b5d751176 100644
--- a/src/Stache/Indexes/Index.php
+++ b/src/Stache/Indexes/Index.php
@@ -133,7 +133,7 @@ public function cacheKey()
     {
         return vsprintf('stache::indexes::%s::%s', [
             $this->store->key(),
-            str_replace('.', '::', $this->name),
+            str_replace(['.', '/'], ['::', '->'], $this->name),
         ]);
     }
 
diff --git a/src/Stache/Query/UserQueryBuilder.php b/src/Stache/Query/UserQueryBuilder.php
index 6f821daac2..49be86af18 100644
--- a/src/Stache/Query/UserQueryBuilder.php
+++ b/src/Stache/Query/UserQueryBuilder.php
@@ -6,6 +6,72 @@
 
 class UserQueryBuilder extends Builder
 {
+    public function whereGroup($value, $operator = '=', $boolean = 'and')
+    {
+        $this->where('groups/'.$value, $operator, true, $boolean);
+
+        return $this;
+    }
+
+    public function orWhereGroup($value, $operator = '=')
+    {
+        $this->whereGroup($value, $operator, 'or');
+
+        return $this;
+    }
+
+    public function whereGroupIn($groups, $boolean = 'and')
+    {
+        $method = $boolean == 'or' ? 'orWhere' : 'where';
+        $this->$method(function ($query) use ($groups) {
+            foreach ($groups as $group) {
+                $query->orWhere('groups/'.$group, true);
+            }
+        });
+
+        return $this;
+    }
+
+    public function orWhereGroupIn($groups)
+    {
+        $this->whereGroupIn($groups, 'or');
+
+        return $this;
+    }
+
+    public function whereRole($value, $operator = '=', $boolean = 'and')
+    {
+        $this->where('roles/'.$value, $operator, true, $boolean);
+
+        return $this;
+    }
+
+    public function orWhereRole($value, $operator = '=')
+    {
+        $this->whereRole($value, $operator, 'or');
+
+        return $this;
+    }
+
+    public function whereRoleIn($roles, $boolean = 'and')
+    {
+        $method = $boolean == 'or' ? 'orWhere' : 'where';
+        $this->$method(function ($query) use ($roles) {
+            foreach ($roles as $role) {
+                $query->orWhere('roles/'.$role, true);
+            }
+        });
+
+        return $this;
+    }
+
+    public function orWhereRoleIn($roles)
+    {
+        $this->whereRoleIn($roles, 'or');
+
+        return $this;
+    }
+
     protected function getFilteredKeys()
     {
         if (! empty($this->wheres)) {
diff --git a/src/Tags/Users.php b/src/Tags/Users.php
index 7b33d33738..7b72536ec6 100644
--- a/src/Tags/Users.php
+++ b/src/Tags/Users.php
@@ -19,12 +19,12 @@ public function index()
     {
         $query = $this->query();
 
-        if ($group = $this->params->get('group')) {
-            $query->where('group', $group);
+        if ($groups = $this->params->explode('group', [])) {
+            $query->whereGroupIn($groups);
         }
 
-        if ($role = $this->params->get('role')) {
-            $query->where('role', $role);
+        if ($roles = $this->params->explode('role', [])) {
+            $query->whereRoleIn($roles);
         }
 
         return $this->output($this->results($query));
diff --git a/tests/Auth/Eloquent/EloquentUserTest.php b/tests/Auth/Eloquent/EloquentUserTest.php
index 5115cf6387..47cd74ec49 100644
--- a/tests/Auth/Eloquent/EloquentUserTest.php
+++ b/tests/Auth/Eloquent/EloquentUserTest.php
@@ -9,7 +9,9 @@
 use Illuminate\Support\Facades\Event;
 use Statamic\Auth\Eloquent\User as EloquentUser;
 use Statamic\Auth\File\Role;
+use Statamic\Auth\File\UserGroup;
 use Statamic\Contracts\Auth\Role as RoleContract;
+use Statamic\Contracts\Auth\UserGroup as UserGroupContract;
 use Statamic\Facades;
 use Tests\Auth\PermissibleContractTests;
 use Tests\Auth\UserContractTests;
@@ -124,6 +126,114 @@ public function handle(?string $handle = null)
             'c' => 'c',
             'd' => 'd',
         ], $user->roles()->map->handle()->all());
+
+        $this->assertSame(Facades\User::query()->whereRole('a')->get()->first()->id(), $user->id());
+
+        $userTwo = $this->createPermissible();
+        $userThree = $this->createPermissible();
+        $userFour = $this->createPermissible();
+
+        \DB::table(config('statamic.users.tables.role_user', 'role_user'))->insert([
+            ['user_id' => $userTwo->id(), 'role_id' => 'a'],
+            ['user_id' => $userThree->id(), 'role_id' => 'b'],
+            ['user_id' => $userFour->id(), 'role_id' => 'c'],
+        ]);
+
+        $this->assertCount(2, Facades\User::query()->whereRole('a')->get());
+        $this->assertCount(2, Facades\User::query()->whereRole('b')->get());
+        $this->assertCount(2, Facades\User::query()->whereRole('c')->get());
+        $this->assertCount(1, Facades\User::query()->whereRole('d')->get());
+
+        $this->assertSame([$user->email(), $userTwo->email()], Facades\User::query()->whereRole('a')->get()->map->email()->all());
+        $this->assertSame([$user->email(), $userThree->email()], Facades\User::query()->whereRole('b')->get()->map->email()->all());
+        $this->assertSame([$user->email()], Facades\User::query()->whereRole('b')->whereRole('c')->get()->map->email()->all());
+        $this->assertSame([$user->email(), $userThree->email(), $userFour->email()], Facades\User::query()->whereRole('b')->orWhereRole('c')->get()->map->email()->all());
+
+        $this->assertSame([$user->email(), $userTwo->email(), $userThree->email()], Facades\User::query()->whereRoleIn(['a', 'b'])->get()->map->email()->all());
+        $this->assertSame([$user->email(), $userTwo->email(), $userThree->email(), $userFour->email()], Facades\User::query()->whereRoleIn(['a', 'b'])->orWhereRoleIn(['c'])->get()->map->email()->all());
+    }
+
+    /** @test */
+    public function it_gets_groups_already_in_the_db_without_explicitly_assigning_them()
+    {
+        $roleA = new class extends UserGroup
+        {
+            public function handle(?string $handle = null)
+            {
+                return 'a';
+            }
+        };
+        $roleB = new class extends UserGroup
+        {
+            public function handle(?string $handle = null)
+            {
+                return 'b';
+            }
+        };
+        $roleC = new class extends UserGroup
+        {
+            public function handle(?string $handle = null)
+            {
+                return 'c';
+            }
+        };
+        $roleD = new class extends UserGroup
+        {
+            public function handle(?string $handle = null)
+            {
+                return 'd';
+            }
+        };
+
+        Facades\UserGroup::shouldReceive('find')->with('a')->andReturn($roleA);
+        Facades\UserGroup::shouldReceive('find')->with('b')->andReturn($roleB);
+        Facades\UserGroup::shouldReceive('find')->with('c')->andReturn($roleC);
+        Facades\UserGroup::shouldReceive('find')->with('d')->andReturn($roleD);
+        Facades\UserGroup::shouldReceive('find')->with('unknown')->andReturnNull();
+
+        $user = $this->createPermissible();
+
+        \DB::table(config('statamic.users.tables.group_user', 'group_user'))->insert([
+            ['user_id' => $user->id(), 'group_id' => 'a'],
+            ['user_id' => $user->id(), 'group_id' => 'b'],
+            ['user_id' => $user->id(), 'group_id' => 'c'],
+            ['user_id' => $user->id(), 'group_id' => 'd'],
+        ]);
+
+        $this->assertInstanceOf(Collection::class, $user->groups());
+        $this->assertCount(4, $user->groups());
+        $this->assertEveryItemIsInstanceOf(UserGroupContract::class, $user->groups());
+        $this->assertEquals([
+            'a' => 'a',
+            'b' => 'b',
+            'c' => 'c',
+            'd' => 'd',
+        ], $user->groups()->map->handle()->all());
+
+        $this->assertSame(Facades\User::query()->whereGroup('a')->get()->first()->id(), $user->id());
+
+        $userTwo = $this->createPermissible();
+        $userThree = $this->createPermissible();
+        $userFour = $this->createPermissible();
+
+        \DB::table(config('statamic.users.tables.group_user', 'group_user'))->insert([
+            ['user_id' => $userTwo->id(), 'group_id' => 'a'],
+            ['user_id' => $userThree->id(), 'group_id' => 'b'],
+            ['user_id' => $userFour->id(), 'group_id' => 'c'],
+        ]);
+
+        $this->assertCount(2, Facades\User::query()->whereGroup('a')->get());
+        $this->assertCount(2, Facades\User::query()->whereGroup('b')->get());
+        $this->assertCount(2, Facades\User::query()->whereGroup('c')->get());
+        $this->assertCount(1, Facades\User::query()->whereGroup('d')->get());
+
+        $this->assertSame([$user->email(), $userTwo->email()], Facades\User::query()->whereGroup('a')->get()->map->email()->all());
+        $this->assertSame([$user->email(), $userThree->email()], Facades\User::query()->whereGroup('b')->get()->map->email()->all());
+        $this->assertSame([$user->email()], Facades\User::query()->whereGroup('b')->whereGroup('c')->get()->map->email()->all());
+        $this->assertSame([$user->email(), $userThree->email(), $userFour->email()], Facades\User::query()->whereGroup('b')->orWhereGroup('c')->get()->map->email()->all());
+
+        $this->assertSame([$user->email(), $userTwo->email(), $userThree->email()], Facades\User::query()->whereGroupIn(['a', 'b'])->get()->map->email()->all());
+        $this->assertSame([$user->email(), $userTwo->email(), $userThree->email(), $userFour->email()], Facades\User::query()->whereGroupIn(['a', 'b'])->orWhereGroupIn(['c'])->get()->map->email()->all());
     }
 
     public function makeUser()
diff --git a/tests/Auth/FileUserTest.php b/tests/Auth/FileUserTest.php
index 7919b561a6..d26ab67ee1 100644
--- a/tests/Auth/FileUserTest.php
+++ b/tests/Auth/FileUserTest.php
@@ -100,6 +100,7 @@ public function it_gets_permissions_from_a_cache()
         $userGroup->shouldReceive('roles')->once()->andReturn(collect([$userGroupRole]));
 
         Role::shouldReceive('find')->with('direct')->andReturn($directRole);
+        Role::shouldReceive('all')->andReturn(collect([$directRole])); // the stache calls this when getting a user. unrelated to test.
         UserGroup::shouldReceive('find')->with('usergroup')->andReturn($userGroup);
         Role::shouldReceive('all')->andReturn(collect([$directRole]));     // the stache calls this when getting a user. unrelated to test.
         UserGroup::shouldReceive('all')->andReturn(collect([$userGroup])); // the stache calls this when getting a user. unrelated to test.
diff --git a/tests/Auth/PermissibleContractTests.php b/tests/Auth/PermissibleContractTests.php
index 8dd99ae522..4834fc4e3b 100644
--- a/tests/Auth/PermissibleContractTests.php
+++ b/tests/Auth/PermissibleContractTests.php
@@ -174,6 +174,7 @@ public function it_gets_and_checks_permissions()
         $userGroup = (new UserGroup)->handle('usergroup')->assignRole($userGroupRole);
 
         RoleAPI::shouldReceive('find')->with('direct')->andReturn($directRole);
+        RoleAPI::shouldReceive('all')->andReturn(collect([$directRole])); // the stache calls this when getting a user. unrelated to test.
         UserGroupAPI::shouldReceive('find')->with('usergroup')->andReturn($userGroup);
         RoleAPI::shouldReceive('all')->andReturn(collect([$directRole]));     // the stache calls this when getting a user. unrelated to test.
         UserGroupAPI::shouldReceive('all')->andReturn(collect([$userGroup])); // the stache calls this when getting a user. unrelated to test.
@@ -257,6 +258,7 @@ public function permissions($permissions = null)
 
         RoleAPI::shouldReceive('find')->with('superrole')->andReturn($superRole);
         RoleAPI::shouldReceive('find')->with('nonsuperrole')->andReturn($nonSuperRole);
+        RoleAPI::shouldReceive('all')->andReturn(collect([$superRole, $nonSuperRole])); // the stache calls this when getting a user. unrelated to test.
         UserGroupAPI::shouldReceive('find')->with('supergroup')->andReturn($superGroup);
         UserGroupAPI::shouldReceive('find')->with('nonsupergroup')->andReturn($nonSuperGroup);
         RoleAPI::shouldReceive('all')->andReturn(collect([$superRole, $nonSuperRole]));        // the stache calls this when getting a user. unrelated to test.
diff --git a/tests/Data/Users/UserQueryBuilderTest.php b/tests/Data/Users/UserQueryBuilderTest.php
index 6b3876074b..b59ef225b7 100644
--- a/tests/Data/Users/UserQueryBuilderTest.php
+++ b/tests/Data/Users/UserQueryBuilderTest.php
@@ -2,7 +2,9 @@
 
 namespace Tests\Data\Users;
 
+use Statamic\Facades\Role;
 use Statamic\Facades\User;
+use Statamic\Facades\UserGroup;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
 
@@ -208,4 +210,158 @@ public function users_are_found_using_tap()
         $this->assertCount(1, $users);
         $this->assertEquals(['Gandalf'], $users->map->name->all());
     }
+
+    /** @test **/
+    public function users_are_found_using_where_group()
+    {
+        $groupOne = tap(UserGroup::make()->handle('one'))->save();
+        $groupTwo = tap(UserGroup::make()->handle('two'))->save();
+
+        $userOne = tap(User::make()->email('gandalf@precious.com')->data(['name' => 'Gandalf']))->save();
+        $userTwo = tap(User::make()->email('smeagol@precious.com')->data(['name' => 'Smeagol']))->save();
+        $userThree = tap(User::make()->email('frodo@precious.com')->data(['name' => 'Frodo']))->save();
+
+        $userOne->addToGroup($groupOne)->save();
+        $userTwo->addToGroup($groupOne)->save();
+        $userThree->addToGroup($groupTwo)->save();
+
+        $users = User::query()->whereGroup('one')->get();
+
+        $this->assertCount(2, $users);
+        $this->assertEquals(['Gandalf', 'Smeagol'], $users->map->name->all());
+
+        $users = User::query()->whereGroup('two')->get();
+
+        $this->assertCount(1, $users);
+        $this->assertEquals(['Frodo'], $users->map->name->all());
+    }
+
+    /** @test **/
+    public function users_are_found_using_where_group_in()
+    {
+        $groupOne = tap(UserGroup::make()->handle('one'))->save();
+        $groupTwo = tap(UserGroup::make()->handle('two'))->save();
+        $groupThree = tap(UserGroup::make()->handle('three'))->save();
+
+        $userOne = tap(User::make()->email('gandalf@precious.com')->data(['name' => 'Gandalf']))->save();
+        $userTwo = tap(User::make()->email('smeagol@precious.com')->data(['name' => 'Smeagol']))->save();
+        $userThree = tap(User::make()->email('frodo@precious.com')->data(['name' => 'Frodo']))->save();
+
+        $userOne->addToGroup($groupOne)->save();
+        $userTwo->addToGroup($groupThree)->save();
+        $userThree->addToGroup($groupTwo)->save();
+
+        $users = User::query()->whereGroupIn(['one', 'three'])->get();
+
+        $this->assertCount(2, $users);
+        $this->assertEquals(['Gandalf', 'Smeagol'], $users->map->name->all());
+
+        $users = User::query()->whereGroupIn(['two'])->get();
+
+        $this->assertCount(1, $users);
+        $this->assertEquals(['Frodo'], $users->map->name->all());
+
+        $users = User::query()->whereGroupIn(['one', 'two'])->orWhereGroupIn(['three'])->get();
+
+        $this->assertCount(3, $users);
+        $this->assertEquals(['Gandalf', 'Frodo', 'Smeagol'], $users->map->name->all());
+    }
+
+    /** @test **/
+    public function users_are_found_using_or_where_group()
+    {
+        $groupOne = tap(UserGroup::make()->handle('one'))->save();
+        $groupTwo = tap(UserGroup::make()->handle('two'))->save();
+        $groupThree = tap(UserGroup::make()->handle('three'))->save();
+
+        $userOne = tap(User::make()->email('gandalf@precious.com')->data(['name' => 'Gandalf']))->save();
+        $userTwo = tap(User::make()->email('smeagol@precious.com')->data(['name' => 'Smeagol']))->save();
+        $userThree = tap(User::make()->email('frodo@precious.com')->data(['name' => 'Frodo']))->save();
+
+        $userOne->addToGroup($groupOne)->save();
+        $userTwo->addToGroup($groupThree)->save();
+        $userThree->addToGroup($groupTwo)->save();
+
+        $users = User::query()->whereGroup('one')->orWhereGroup('three')->get();
+
+        $this->assertCount(2, $users);
+        $this->assertEquals(['Gandalf', 'Smeagol'], $users->map->name->all());
+    }
+
+    /** @test **/
+    public function users_are_found_using_where_role()
+    {
+        $roleOne = tap(Role::make()->handle('one'))->save();
+        $roleTwo = tap(Role::make()->handle('two'))->save();
+
+        $userOne = tap(User::make()->email('gandalf@precious.com')->data(['name' => 'Gandalf']))->save();
+        $userTwo = tap(User::make()->email('smeagol@precious.com')->data(['name' => 'Smeagol']))->save();
+        $userThree = tap(User::make()->email('frodo@precious.com')->data(['name' => 'Frodo']))->save();
+
+        $userOne->assignRole($roleOne)->save();
+        $userTwo->assignRole($roleOne)->save();
+        $userThree->assignRole($roleTwo)->save();
+
+        $users = User::query()->whereRole('one')->get();
+
+        $this->assertCount(2, $users);
+        $this->assertEquals(['Gandalf', 'Smeagol'], $users->map->name->all());
+
+        $users = User::query()->whereRole('two')->get();
+
+        $this->assertCount(1, $users);
+        $this->assertEquals(['Frodo'], $users->map->name->all());
+    }
+
+    /** @test **/
+    public function users_are_found_using_where_role_in()
+    {
+        $roleOne = tap(Role::make()->handle('one'))->save();
+        $roleTwo = tap(Role::make()->handle('two'))->save();
+        $roleThree = tap(Role::make()->handle('three'))->save();
+
+        $userOne = tap(User::make()->email('gandalf@precious.com')->data(['name' => 'Gandalf']))->save();
+        $userTwo = tap(User::make()->email('smeagol@precious.com')->data(['name' => 'Smeagol']))->save();
+        $userThree = tap(User::make()->email('frodo@precious.com')->data(['name' => 'Frodo']))->save();
+
+        $userOne->assignRole($roleOne)->save();
+        $userTwo->assignRole($roleThree)->save();
+        $userThree->assignRole($roleTwo)->save();
+
+        $users = User::query()->whereRoleIn(['one', 'three'])->get();
+
+        $this->assertCount(2, $users);
+        $this->assertEquals(['Gandalf', 'Smeagol'], $users->map->name->all());
+
+        $users = User::query()->whereRoleIn(['two'])->get();
+
+        $this->assertCount(1, $users);
+        $this->assertEquals(['Frodo'], $users->map->name->all());
+
+        $users = User::query()->whereRoleIn(['one', 'two'])->orWhereRoleIn(['three'])->get();
+
+        $this->assertCount(3, $users);
+        $this->assertEquals(['Gandalf', 'Frodo', 'Smeagol'], $users->map->name->all());
+    }
+
+    /** @test **/
+    public function users_are_found_using_or_where_role()
+    {
+        $roleOne = tap(Role::make()->handle('one'))->save();
+        $roleTwo = tap(Role::make()->handle('two'))->save();
+        $roleThree = tap(Role::make()->handle('three'))->save();
+
+        $userOne = tap(User::make()->email('gandalf@precious.com')->data(['name' => 'Gandalf']))->save();
+        $userTwo = tap(User::make()->email('smeagol@precious.com')->data(['name' => 'Smeagol']))->save();
+        $userThree = tap(User::make()->email('frodo@precious.com')->data(['name' => 'Frodo']))->save();
+
+        $userOne->assignRole($roleOne)->save();
+        $userTwo->assignRole($roleThree)->save();
+        $userThree->assignRole($roleTwo)->save();
+
+        $users = User::query()->whereRole('one')->orWhereRole('three')->get();
+
+        $this->assertCount(2, $users);
+        $this->assertEquals(['Gandalf', 'Smeagol'], $users->map->name->all());
+    }
 }
diff --git a/tests/Tags/UsersTagsTest.php b/tests/Tags/UsersTagsTest.php
new file mode 100644
index 0000000000..a4cd0e5e6f
--- /dev/null
+++ b/tests/Tags/UsersTagsTest.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace Tests\Tags;
+
+use Statamic\Facades\Parse;
+use Statamic\Facades\User;
+use Tests\FakesRoles;
+use Tests\FakesUserGroups;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class UsersTagsTest extends TestCase
+{
+    use FakesRoles,
+        FakesUserGroups,
+        PreventSavingStacheItemsToDisk;
+
+    private function tag($tag)
+    {
+        return Parse::template($tag, []);
+    }
+
+    /** @test */
+    public function it_renders()
+    {
+        $user = User::make()->email('foo@bar.com')->save();
+
+        $this->assertEquals('foo@bar.com', $this->tag('{{ users }}{{email}}{{ /users }}'));
+    }
+
+    /** @test */
+    public function it_only_shows_users_in_groups()
+    {
+        $this->setTestRoles([
+            'webmaster' => ['super'],
+        ]);
+
+        $this->setTestUserGroups([
+            'favourite' => ['webmaster'], // Though super users have permission to do everything, they do not inherit all groups
+            'non_favourite',
+            'another_non_favourite',
+        ]);
+
+        $user = User::make()->email('foo@bar.com')->addToGroup('favourite')->save();
+
+        $this->assertEquals('foo@bar.com', $this->tag('{{ users group="favourite" }}{{ email }}{{ /users }}'));
+        $this->assertEquals('', $this->tag('{{ users group="non_favourite" }}{{ email }}{{ /users }}'));
+
+        $this->assertEquals('foo@bar.com', $this->tag('{{ users group="favourite|non_favourite" }}{{ email }}{{ /users }}'));
+        $this->assertEquals('', $this->tag('{{ users group="non_favourite|another_non_favourite" }}{{ email }}{{ /users }}'));
+    }
+
+    /** @test */
+    public function it_only_shows_users_in_roles()
+    {
+        $this->setTestRoles([
+            'webmaster' => ['super'],
+            'not_webmaster' => [],
+            'another_not_webmaster' => [],
+        ]);
+
+        $this->setTestUserGroups([
+            'favourite' => ['webmaster'], // Though super users have permission to do everything, they do not inherit all groups
+            'non_favourite',
+        ]);
+
+        $user = User::make()->email('foo@bar.com')->assignRole('webmaster')->save();
+
+        $this->assertEquals('foo@bar.com', $this->tag('{{ users role="webmaster" }}{{ email }}{{ /users }}'));
+        $this->assertEquals('', $this->tag('{{ users group="not_webmaster" }}{{ email }}{{ /users }}'));
+
+        $this->assertEquals('foo@bar.com', $this->tag('{{ users role="webmaster|not_webmaster" }}{{ email }}{{ /users }}'));
+        $this->assertEquals('', $this->tag('{{ users group="not_webmaster|another_not_webmaster" }}{{ email }}{{ /users }}'));
+    }
+}

From b18025a53642a103bd0a642232a3a00f5cedf35f Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 23 Jan 2024 14:54:54 -0500
Subject: [PATCH 042/149] [4.x] Support brackets in translation strings (#9380)

---
 src/Translator/MethodDiscovery.php                 | 11 +++++++++--
 tests/Translator/MethodDiscoveryTest.php           |  5 +++++
 tests/Translator/__fixtures__/blade/test.blade.php |  1 +
 tests/Translator/__fixtures__/php/test.php         |  7 +++++++
 tests/Translator/__fixtures__/vue/test.vue         |  2 ++
 5 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/Translator/MethodDiscovery.php b/src/Translator/MethodDiscovery.php
index 21a8bba69b..4e53f3b3c7 100644
--- a/src/Translator/MethodDiscovery.php
+++ b/src/Translator/MethodDiscovery.php
@@ -40,13 +40,20 @@ protected function methodRegex()
     {
         return '(trans(?:_choice)?|__n?)'
             .'\([\'"`]'
-            .'([\w\d\s\t\n\r,.\'\":\\\?!@£$%^&*<>_\-=\/\|\+]+)'
+            .'('
+            .'[\w\d\s\t\n\r,.\'\":\\\?!@£$%^&*<>_\-=\/\|\+|]+'
+            .'(?:\(s\))?'
+            .')'
             .'[\'\"`]';
     }
 
     protected function annotatedReturnRegex()
     {
         return '\/\**? @translation \*\/\s+'
-            .'return ([\'"])([\w\d\s\t\n\r,.\'\":\\\?!@£$%^&*<>_\-=\/\|\+]+)\1;';
+            .'return '
+            .'('
+            .'[\'"])([\w\d\s\t\n\r,.\'\":\\\?!@£$%^&*<>_\-=\/\|\+]+'
+            .'(?:\(s\))?'
+            .')\1;';
     }
 }
diff --git a/tests/Translator/MethodDiscoveryTest.php b/tests/Translator/MethodDiscoveryTest.php
index ff70e1adad..64d3f74650 100644
--- a/tests/Translator/MethodDiscoveryTest.php
+++ b/tests/Translator/MethodDiscoveryTest.php
@@ -44,6 +44,7 @@ public function it_discovers_methods()
             'vue template backtick quote :count',
             'vue template backtick quote :param',
             'vue template with/slash',
+            'vue template with bracket(s)',
             'vue script single quote',
             'vue script single quote :count',
             'vue script single quote :param',
@@ -54,6 +55,7 @@ public function it_discovers_methods()
             'vue script backtick quote :count',
             'vue script backtick quote :param',
             'vue script with/slash',
+            'vue script with bracket(s)',
 
             'blade trans single quote string',
             'blade trans single quote :param',
@@ -66,6 +68,7 @@ public function it_discovers_methods()
             'blade trans_choice double quote :param',
 
             'blade with/slash',
+            'blade with bracket(s)',
 
             'php trans single quote string',
             'php trans single quote :param',
@@ -85,6 +88,8 @@ public function it_discovers_methods()
 
             'php with/slash',
             'php annotated return with/slash',
+            'php with bracket(s)',
+            'php annotated return with bracket(s)',
 
             'vue template trans single quote',
             'vue template trans single quote :param',
diff --git a/tests/Translator/__fixtures__/blade/test.blade.php b/tests/Translator/__fixtures__/blade/test.blade.php
index 4b3479bb48..52ba2bf38e 100644
--- a/tests/Translator/__fixtures__/blade/test.blade.php
+++ b/tests/Translator/__fixtures__/blade/test.blade.php
@@ -14,3 +14,4 @@
 {{ trans_choice("blade trans_choice double quote :param", 2, ['param']) }}
 
 {{ __('blade with/slash') }}
+{{ __('blade with bracket(s)') }}
diff --git a/tests/Translator/__fixtures__/php/test.php b/tests/Translator/__fixtures__/php/test.php
index 134ae2dea7..ad403fcbd0 100644
--- a/tests/Translator/__fixtures__/php/test.php
+++ b/tests/Translator/__fixtures__/php/test.php
@@ -21,6 +21,7 @@ public function method()
             trans_choice('php trans_choice double quote :param', 2, ['param']),
 
             __('php with/slash'),
+            __('php with bracket(s)'),
         ];
     }
 
@@ -59,4 +60,10 @@ public function returnMethodSix()
         /** @translation */
         return 'php annotated return with/slash';
     }
+
+    public function returnMethodSeven()
+    {
+        /** @translation */
+        return 'php annotated return with bracket(s)';
+    }
 }
diff --git a/tests/Translator/__fixtures__/vue/test.vue b/tests/Translator/__fixtures__/vue/test.vue
index d7155c6960..6d456e3eea 100644
--- a/tests/Translator/__fixtures__/vue/test.vue
+++ b/tests/Translator/__fixtures__/vue/test.vue
@@ -32,6 +32,7 @@
         {{ trans_choice(`vue template trans_choice backtick quote :param`, 2, { param: 'test' }) }}
 
         {{ __('vue template with/slash') }}
+        {{ __('vue template with bracket(s)') }}
     </div>
 
 </template>
@@ -66,6 +67,7 @@ export default {
             trans_choice(`vue script trans_choice backtick quote :param`, 2, { param: 'test' }),
 
             __('vue script with/slash'),
+            __('vue script with bracket(s)'),
         ];
     }
 

From 5ae2b5cd12b2a98685b20249b250b71fefb1dbe2 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 23 Jan 2024 16:00:39 -0500
Subject: [PATCH 043/149] [4.x] Avoid caching URLs with a token (#9381)

---
 src/StaticCaching/Middleware/Cache.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/StaticCaching/Middleware/Cache.php b/src/StaticCaching/Middleware/Cache.php
index 4d9f3ce20c..7b889214ab 100644
--- a/src/StaticCaching/Middleware/Cache.php
+++ b/src/StaticCaching/Middleware/Cache.php
@@ -116,7 +116,7 @@ private function canBeCached($request)
             return false;
         }
 
-        if ($request->isLivePreview()) {
+        if ($request->statamicToken()) {
             return false;
         }
 
@@ -141,7 +141,7 @@ private function shouldBeCached($request, $response)
             return false;
         }
 
-        if ($request->isLivePreview()) {
+        if ($request->statamicToken()) {
             return false;
         }
 

From ec9e5c51dc5237846385c48a5e7bb519d3c506cf Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 23 Jan 2024 16:33:47 -0500
Subject: [PATCH 044/149] [4.x] Only use site language for form submission
 validation messages if submitted from front-end (#9383)

---
 src/Http/Requests/FrontendFormRequest.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Http/Requests/FrontendFormRequest.php b/src/Http/Requests/FrontendFormRequest.php
index 19df613aaf..f4537dfe99 100644
--- a/src/Http/Requests/FrontendFormRequest.php
+++ b/src/Http/Requests/FrontendFormRequest.php
@@ -116,8 +116,11 @@ private function normalizeAssetsValues($fields)
 
     public function validateResolved()
     {
-        $site = Site::findByUrl(URL::previous()) ?? Site::default();
+        // If this was submitted from a front-end form, we want to use the appropriate language
+        // for the translation messages. If there's no previous url, it was likely submitted
+        // directly in a headless format. In that case, we'll just use the default lang.
+        $site = ($previousUrl = session()->previousUrl()) ? Site::findByUrl($previousUrl) : null;
 
-        return $this->withLocale($site->lang(), fn () => parent::validateResolved());
+        return $this->withLocale($site?->lang(), fn () => parent::validateResolved());
     }
 }

From 1f78d859c72d6c559893c3ca77284a5ba728eebc Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Tue, 23 Jan 2024 21:56:37 +0000
Subject: [PATCH 045/149] [4.x] Catch errors when sending user activation email
 (#9382)

---
 resources/lang/en/messages.php                    |  1 +
 src/Http/Controllers/CP/Users/UsersController.php | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php
index 9a9953f62a..8741ceb7b9 100644
--- a/resources/lang/en/messages.php
+++ b/resources/lang/en/messages.php
@@ -224,6 +224,7 @@
     'updater_require_version_command' => 'To require a specific version, run the following command',
     'updater_update_to_latest_command' => 'To update to the latest version, run the following command',
     'updates_available' => 'Updates are available!',
+    'user_activation_email_not_sent_error' => 'The activation email couldn\'t be sent. Please check your email configuration and try again.',
     'user_groups_handle_instructions' => 'Used to reference this user group on the frontend. It\'s non-trivial to change later.',
     'user_groups_intro' => 'User groups allow you to organize users and apply permission-based roles in aggregate.',
     'user_groups_role_instructions' => 'Assign roles to give users in this group all of their corresponding permissions.',
diff --git a/src/Http/Controllers/CP/Users/UsersController.php b/src/Http/Controllers/CP/Users/UsersController.php
index 11b944dabd..c441abfaf2 100644
--- a/src/Http/Controllers/CP/Users/UsersController.php
+++ b/src/Http/Controllers/CP/Users/UsersController.php
@@ -6,6 +6,7 @@
 use Statamic\Auth\Passwords\PasswordReset;
 use Statamic\Contracts\Auth\User as UserContract;
 use Statamic\Exceptions\NotFoundHttpException;
+use Statamic\Facades\CP\Toast;
 use Statamic\Facades\Scope;
 use Statamic\Facades\Search;
 use Statamic\Facades\User;
@@ -16,6 +17,7 @@
 use Statamic\Notifications\ActivateAccount;
 use Statamic\Query\Scopes\Filters\Concerns\QueriesFilters;
 use Statamic\Search\Result;
+use Symfony\Component\Mailer\Exception\TransportException;
 
 class UsersController extends CpController
 {
@@ -184,7 +186,13 @@ public function store(Request $request)
         if ($request->invitation['send']) {
             ActivateAccount::subject($request->invitation['subject']);
             ActivateAccount::body($request->invitation['message']);
-            $user->generateTokenAndSendActivateAccountNotification();
+
+            try {
+                $user->generateTokenAndSendActivateAccountNotification();
+            } catch (TransportException $e) {
+                Toast::error(__('statamic::messages.user_activation_email_not_sent_error'));
+            }
+
             $url = null;
         } else {
             $url = PasswordReset::url($user->generateActivateAccountToken(), PasswordReset::BROKER_ACTIVATIONS);

From 829f294c4ae7efc431ae9ca86508f6197a35a9ce Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Wed, 24 Jan 2024 14:43:40 +0000
Subject: [PATCH 046/149] [4.x] Fix importing fieldsets in custom blueprint
 namespaces (#9387)

---
 src/Http/View/Composers/FieldComposer.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Http/View/Composers/FieldComposer.php b/src/Http/View/Composers/FieldComposer.php
index bc03118b58..626e2dcfcd 100644
--- a/src/Http/View/Composers/FieldComposer.php
+++ b/src/Http/View/Composers/FieldComposer.php
@@ -12,6 +12,7 @@
 class FieldComposer
 {
     const VIEWS = [
+        'statamic::blueprints.edit',
         'statamic::*.blueprints.edit',
         'statamic::fieldsets.edit',
     ];

From ecfe5892851c20cd02ae536e11e7e162ca89a550 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Wed, 24 Jan 2024 16:50:22 +0000
Subject: [PATCH 047/149] [4.x] Add console import for file based groups and
 roles to database (#6774)

---
 src/Console/Commands/ImportGroups.php    | 80 ++++++++++++++++++++++++
 src/Console/Commands/ImportRoles.php     | 80 ++++++++++++++++++++++++
 src/Providers/ConsoleServiceProvider.php |  2 +
 3 files changed, 162 insertions(+)
 create mode 100644 src/Console/Commands/ImportGroups.php
 create mode 100644 src/Console/Commands/ImportRoles.php

diff --git a/src/Console/Commands/ImportGroups.php b/src/Console/Commands/ImportGroups.php
new file mode 100644
index 0000000000..1598eb756b
--- /dev/null
+++ b/src/Console/Commands/ImportGroups.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace Statamic\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Facade;
+use Statamic\Auth\Eloquent\UserGroup as EloquentGroup;
+use Statamic\Auth\Eloquent\UserGroupRepository as EloquentRepository;
+use Statamic\Auth\File\UserGroup as FileGroup;
+use Statamic\Auth\File\UserGroupRepository as FileRepository;
+use Statamic\Console\RunsInPlease;
+use Statamic\Contracts\Auth\UserGroup as GroupContract;
+use Statamic\Contracts\Auth\UserGroupRepository as GroupRepositoryContract;
+use Statamic\Facades\UserGroup;
+
+class ImportGroups extends Command
+{
+    use RunsInPlease;
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'statamic:eloquent:import-groups';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Imports file based groups into the database.';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        if (! config('statamic.users.tables.groups', false)) {
+            $this->error('You do not have eloquent driven groups enabled');
+
+            return;
+        }
+
+        $this->importGroups();
+
+        return 0;
+    }
+
+    private function importGroups()
+    {
+        app()->bind(GroupContract::class, FileGroup::class);
+        app()->bind(GroupRepositoryContract::class, FileRepository::class);
+
+        Facade::clearResolvedInstance(GroupContract::class);
+        Facade::clearResolvedInstance(GroupRepositoryContract::class);
+
+        $groups = UserGroup::path(config('statamic.users.paths.groups', resource_path('users/groups.yaml')))->all();
+
+        app()->bind(GroupContract::class, EloquentGroup::class);
+        app()->bind(GroupRepositoryContract::class, EloquentRepository::class);
+
+        Facade::clearResolvedInstance(GroupContract::class);
+        Facade::clearResolvedInstance(GroupRepositoryContract::class);
+
+        $this->withProgressBar($groups, function ($group) {
+            $eloquentGroup = UserGroup::make()
+                ->handle($group->handle())
+                ->title($group->title())
+                ->roles($group->roles());
+
+            $eloquentGroup->save();
+        });
+
+        $this->newLine();
+        $this->info('Groups imported');
+    }
+}
diff --git a/src/Console/Commands/ImportRoles.php b/src/Console/Commands/ImportRoles.php
new file mode 100644
index 0000000000..49abf026fc
--- /dev/null
+++ b/src/Console/Commands/ImportRoles.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace Statamic\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Facade;
+use Statamic\Auth\Eloquent\Role as EloquentRole;
+use Statamic\Auth\Eloquent\RoleRepository as EloquentRepository;
+use Statamic\Auth\File\Role as FileRole;
+use Statamic\Auth\File\RoleRepository as FileRepository;
+use Statamic\Console\RunsInPlease;
+use Statamic\Contracts\Auth\Role as RoleContract;
+use Statamic\Contracts\Auth\RoleRepository as RoleRepositoryContract;
+use Statamic\Facades\Role;
+
+class ImportRoles extends Command
+{
+    use RunsInPlease;
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'statamic:eloquent:import-roles';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Imports file based roles into the database.';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        if (! config('statamic.users.tables.roles', false)) {
+            $this->error('You do not have eloquent driven roles enabled');
+
+            return;
+        }
+
+        $this->importRoles();
+
+        return 0;
+    }
+
+    private function importRoles()
+    {
+        app()->bind(RoleContract::class, FileRole::class);
+        app()->bind(RoleRepositoryContract::class, FileRepository::class);
+
+        Facade::clearResolvedInstance(RoleContract::class);
+        Facade::clearResolvedInstance(RoleRepositoryContract::class);
+
+        $roles = Role::path(config('statamic.users.paths.roles', resource_path('users/roles.yaml')))->all();
+
+        app()->bind(RoleContract::class, EloquentRole::class);
+        app()->bind(RoleRepositoryContract::class, EloquentRepository::class);
+
+        Facade::clearResolvedInstance(RoleContract::class);
+        Facade::clearResolvedInstance(RoleRepositoryContract::class);
+
+        $this->withProgressBar($roles, function ($role) {
+            $eloquentRole = Role::make($role->handle())
+                ->title($role->title())
+                ->permissions($role->permissions())
+                ->preferences($role->preferences());
+
+            $eloquentRole->save();
+        });
+
+        $this->newLine();
+        $this->info('Roles imported');
+    }
+}
diff --git a/src/Providers/ConsoleServiceProvider.php b/src/Providers/ConsoleServiceProvider.php
index ed67494388..9353ccb1ae 100644
--- a/src/Providers/ConsoleServiceProvider.php
+++ b/src/Providers/ConsoleServiceProvider.php
@@ -43,6 +43,8 @@ class ConsoleServiceProvider extends ServiceProvider
         Commands\Multisite::class,
         Commands\SiteClear::class,
         Commands\UpdatesRun::class,
+        Commands\ImportGroups::class,
+        Commands\ImportRoles::class,
         Commands\ImportUsers::class,
     ];
 

From 5a9a76292c65239449f147d1146ee8578c595b35 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 24 Jan 2024 18:38:00 -0500
Subject: [PATCH 048/149] [4.x] Revert overzealous file extension renaming
 feature (#9389)

---
 src/Assets/AssetUploader.php | 13 +------------
 src/Assets/FileUploader.php  |  4 +---
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/Assets/AssetUploader.php b/src/Assets/AssetUploader.php
index 2b69451e7c..f13c2e4ac5 100644
--- a/src/Assets/AssetUploader.php
+++ b/src/Assets/AssetUploader.php
@@ -26,7 +26,7 @@ public static function asset(Asset $asset)
 
     protected function uploadPath(UploadedFile $file)
     {
-        $ext = $this->getNewExtension() ?? $this->getFileExtension($file);
+        $ext = $this->getNewExtension() ?? $file->getClientOriginalExtension();
 
         if (config('statamic.assets.lowercase')) {
             $ext = strtolower($ext);
@@ -71,17 +71,6 @@ protected function getNewExtension()
         return $ext;
     }
 
-    private function getFileExtension(UploadedFile $file)
-    {
-        $extension = $file->getClientOriginalExtension();
-        $guessed = $file->guessExtension();
-
-        // Only use the guessed extension if it's different than the original.
-        // This allows us to maintain the casing of the original extension
-        // if the the "lowercase filenames" config option is disabled.
-        return strtolower($extension) === strtolower($guessed) ? $extension : $guessed;
-    }
-
     public static function getSafeFilename($string)
     {
         $replacements = [
diff --git a/src/Assets/FileUploader.php b/src/Assets/FileUploader.php
index e36d5e40aa..58a1e3f086 100644
--- a/src/Assets/FileUploader.php
+++ b/src/Assets/FileUploader.php
@@ -22,9 +22,7 @@ public static function container(?string $container = null)
 
     protected function uploadPath(UploadedFile $file)
     {
-        $filename = pathinfo($file->getClientOriginalName(), PATHINFO_FILENAME);
-
-        return now()->timestamp.'/'.$filename.'.'.$file->guessExtension();
+        return now()->timestamp.'/'.$file->getClientOriginalName();
     }
 
     protected function uploadPathPrefix()

From dc72cb5ceb9acfbc5725fa329b0eeee9ed18dd46 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 25 Jan 2024 08:53:36 -0500
Subject: [PATCH 049/149] [4.x] Make copy reset password link action opt-in
 (#9390)

---
 src/Actions/CopyPasswordResetLink.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Actions/CopyPasswordResetLink.php b/src/Actions/CopyPasswordResetLink.php
index 713bcdfcde..ab19f96a61 100644
--- a/src/Actions/CopyPasswordResetLink.php
+++ b/src/Actions/CopyPasswordResetLink.php
@@ -16,7 +16,7 @@ public static function title()
 
     public function visibleTo($item)
     {
-        return $item instanceof UserContract;
+        return config('statamic.users.allow_copy_reset_password_link', false) && $item instanceof UserContract;
     }
 
     public function visibleToBulk($items)

From 2a2e9fcd15f2de7ca1bd4c6505d7bc8596b3264c Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 25 Jan 2024 09:04:04 -0500
Subject: [PATCH 050/149] [4.x] Revert uniform image validation (#9392)

---
 src/Assets/Asset.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Assets/Asset.php b/src/Assets/Asset.php
index c6ebfa8004..79c74ef161 100644
--- a/src/Assets/Asset.php
+++ b/src/Assets/Asset.php
@@ -4,7 +4,6 @@
 
 use ArrayAccess;
 use Facades\Statamic\Assets\Attributes;
-use Facades\Statamic\Imaging\ImageValidator;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Cache;
@@ -486,7 +485,7 @@ public function isPreviewable()
      */
     public function isImage()
     {
-        return ImageValidator::isValidExtension($this->extension());
+        return $this->extensionIsOneOf(['jpg', 'jpeg', 'png', 'gif', 'webp']);
     }
 
     /**

From 77210435363e328f72e5466fca33c0d54592f14b Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 25 Jan 2024 13:03:27 -0500
Subject: [PATCH 051/149] [4.x] Support data in Eloquent based user groups
 (#9395)

---
 src/Auth/Eloquent/UserGroup.php               |  2 ++
 src/Auth/Eloquent/UserGroupModel.php          |  1 +
 src/Console/Commands/ImportGroups.php         |  3 +-
 .../stubs/auth/statamic_groups_table.php.stub |  1 +
 .../CP/Users/UserGroupsController.php         |  6 +++-
 tests/Auth/Eloquent/EloquentUserGroupTest.php | 32 +++++++++++++++----
 6 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/src/Auth/Eloquent/UserGroup.php b/src/Auth/Eloquent/UserGroup.php
index e2897096ba..e2ef88ea88 100644
--- a/src/Auth/Eloquent/UserGroup.php
+++ b/src/Auth/Eloquent/UserGroup.php
@@ -15,6 +15,7 @@ public static function fromModel(UserGroupModel $model)
             ->title($model->title)
             ->handle($model->handle)
             ->roles($model->roles ?? [])
+            ->data($model->data ?? [])
             ->model($model);
     }
 
@@ -25,6 +26,7 @@ public function toModel()
                 'title' => $this->title,
                 'handle' => $this->handle,
                 'roles' => $this->roles->keys(),
+                'data' => $this->data->all(),
             ]);
     }
 
diff --git a/src/Auth/Eloquent/UserGroupModel.php b/src/Auth/Eloquent/UserGroupModel.php
index 8c4622080e..8a77ab3b6a 100644
--- a/src/Auth/Eloquent/UserGroupModel.php
+++ b/src/Auth/Eloquent/UserGroupModel.php
@@ -12,6 +12,7 @@ class UserGroupModel extends Eloquent
 
     protected $casts = [
         'roles' => 'json',
+        'data' => 'json',
         'created_at' => 'datetime',
         'updated_at' => 'datetime',
     ];
diff --git a/src/Console/Commands/ImportGroups.php b/src/Console/Commands/ImportGroups.php
index 1598eb756b..0d8a522f84 100644
--- a/src/Console/Commands/ImportGroups.php
+++ b/src/Console/Commands/ImportGroups.php
@@ -69,7 +69,8 @@ private function importGroups()
             $eloquentGroup = UserGroup::make()
                 ->handle($group->handle())
                 ->title($group->title())
-                ->roles($group->roles());
+                ->roles($group->roles())
+                ->data($group->data()->except(['title', 'roles']));
 
             $eloquentGroup->save();
         });
diff --git a/src/Console/Commands/stubs/auth/statamic_groups_table.php.stub b/src/Console/Commands/stubs/auth/statamic_groups_table.php.stub
index 6eccf18bd3..a8e45464fd 100644
--- a/src/Console/Commands/stubs/auth/statamic_groups_table.php.stub
+++ b/src/Console/Commands/stubs/auth/statamic_groups_table.php.stub
@@ -17,6 +17,7 @@ class StatamicGroupsTable extends Migration
             $table->id();
             $table->string('handle')->unique();
             $table->string('title');
+            $table->json('data')->nullable();
             $table->json('roles')->nullable();
             $table->timestamps();
         });
diff --git a/src/Http/Controllers/CP/Users/UserGroupsController.php b/src/Http/Controllers/CP/Users/UserGroupsController.php
index b4109b5414..7ff480fbcf 100644
--- a/src/Http/Controllers/CP/Users/UserGroupsController.php
+++ b/src/Http/Controllers/CP/Users/UserGroupsController.php
@@ -74,7 +74,11 @@ public function edit(Request $request, $group)
 
         $fields = $blueprint
             ->fields()
-            ->addValues($group->data()->merge(['handle' => $group->handle()])->all())
+            ->addValues($group->data()->merge([
+                'title' => $group->title(),
+                'handle' => $group->handle(),
+                'roles' => $group->roles()->map->handle()->values()->all(),
+            ])->all())
             ->preProcess();
 
         $viewData = [
diff --git a/tests/Auth/Eloquent/EloquentUserGroupTest.php b/tests/Auth/Eloquent/EloquentUserGroupTest.php
index bb8756f925..b274085d82 100644
--- a/tests/Auth/Eloquent/EloquentUserGroupTest.php
+++ b/tests/Auth/Eloquent/EloquentUserGroupTest.php
@@ -5,9 +5,11 @@
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Foundation\Testing\WithFaker;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Collection;
 use Statamic\Auth\Eloquent\User as EloquentUser;
 use Statamic\Auth\Eloquent\UserGroup as EloquentGroup;
 use Statamic\Auth\Eloquent\UserGroupModel;
+use Statamic\Facades\UserGroup;
 use Tests\TestCase;
 
 class EloquentUserGroupTest extends TestCase
@@ -62,13 +64,11 @@ public static function tearDownAfterClass(): void
 
     public function makeGroup()
     {
-        return (new EloquentGroup)
-            ->model(UserGroupModel::create([
-                'handle' => $this->faker->word,
-                'title' => $this->faker->words(2, true),
-                'roles' => [],
-            ])
-            );
+        return EloquentGroup::fromModel(UserGroupModel::create([
+            'handle' => $this->faker->word,
+            'title' => $this->faker->words(2, true),
+            'roles' => [],
+        ]));
     }
 
     public function makeUser()
@@ -115,4 +115,22 @@ public function it_assigns_a_group_to_a_user_then_removes_it()
 
         $this->assertCount(0, $user->groups());
     }
+
+    /** @test */
+    public function it_sets_and_gets_data()
+    {
+        $group = $this->makeGroup();
+
+        $this->assertInstanceOf(Collection::class, $data = $group->data());
+        $this->assertEquals([], $data->all());
+
+        $group->data(['alfa' => 'bravo']);
+        $group->set('charlie', 'delta');
+        $this->assertEquals(['alfa' => 'bravo', 'charlie' => 'delta'], $group->data()->all());
+
+        $group->save();
+
+        $group = UserGroup::all()->first();
+        $this->assertEquals(['alfa' => 'bravo', 'charlie' => 'delta'], $group->data()->all());
+    }
 }

From f9032ecaeefcb7e2850b82b46ec826d2f25d2d10 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 25 Jan 2024 13:26:19 -0500
Subject: [PATCH 052/149] changelog

---
 CHANGELOG.md | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d95d5f9a5..5397db14bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,37 @@
 # Release Notes
 
+## 4.46.0 (2024-01-25)
+
+### What's new
+- Allow roles and groups to be database driven. [#5686](https://github.com/statamic/cms/issues/5686) by @ryanmitchell
+- Add console command to import file-based groups and roles into database. [#6774](https://github.com/statamic/cms/issues/6774) by @ryanmitchell
+- SVG images get sanitized upon upload. [#9365](https://github.com/statamic/cms/issues/9365) by @duncanmcclean
+- Allow `.html` to be stripped from `parent_uri` in routes. [#9364](https://github.com/statamic/cms/issues/9364) by @duncanmcclean
+
+### What's improved
+- German translations. [#9374](https://github.com/statamic/cms/issues/9374) by @helloDanuk
+
+### What's fixed
+- Support data in Eloquent based user groups. [#9395](https://github.com/statamic/cms/issues/9395) by @jasonvarga
+- Revert overzealous file extension renaming feature. [#9389](https://github.com/statamic/cms/issues/9389) by @jasonvarga
+- Make copy reset password link action opt-in. [#9390](https://github.com/statamic/cms/issues/9390) by @jasonvarga
+- Fix importing fieldsets in custom blueprint namespaces. [#9387](https://github.com/statamic/cms/issues/9387) by @duncanmcclean
+- Catch errors when sending user activation email. [#9382](https://github.com/statamic/cms/issues/9382) by @duncanmcclean
+- Only use site language for form submission validation messages if submitted from front-end. [#9383](https://github.com/statamic/cms/issues/9383) by @jasonvarga
+- Avoid caching URLs with a token. [#9381](https://github.com/statamic/cms/issues/9381) by @jasonvarga
+- Fix user groups/roles querying. [#6131](https://github.com/statamic/cms/issues/6131) by @ryanmitchell
+- Avoid saving icons to field configs. [#9372](https://github.com/statamic/cms/issues/9372) by @duncanmcclean
+- Hide actions on form index/show pages when user is missing relevant permissions. [#9371](https://github.com/statamic/cms/issues/9371) by @duncanmcclean
+- Bard: Only configure placeholder extension when placeholder is provided. [#9369](https://github.com/statamic/cms/issues/9369) by @duncanmcclean
+- Always show slug rengerate button if enabled. [#9366](https://github.com/statamic/cms/issues/9366) by @jasonvarga
+- Fix some translations. [#9361](https://github.com/statamic/cms/issues/9361) by @peimn
+- Fix whereTime affecting the date as well as time. [#9360](https://github.com/statamic/cms/issues/9360) by @ryanmitchell
+- Passthrough Cmd/Ctrl + Enter inside Bard. [#9313](https://github.com/statamic/cms/issues/9313) by @godismyjudge95
+- Support brackets in translation strings in translator helper. [#9380](https://github.com/statamic/cms/issues/9380) by @jasonvarga
+- Bump vite from 4.2.3 to 4.5.2. [#9367](https://github.com/statamic/cms/issues/9367) by @dependabot
+
+
+
 ## 4.45.0 (2024-01-18)
 
 ### What's new

From 12456d283f45cb3f491ad630305b5d9afd1fac20 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 25 Jan 2024 13:45:33 -0500
Subject: [PATCH 053/149] [4.x] Make copy reset password link action opt-in
 (#9397)

---
 src/Actions/CopyPasswordResetLink.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Actions/CopyPasswordResetLink.php b/src/Actions/CopyPasswordResetLink.php
index ab19f96a61..224445851e 100644
--- a/src/Actions/CopyPasswordResetLink.php
+++ b/src/Actions/CopyPasswordResetLink.php
@@ -2,6 +2,7 @@
 
 namespace Statamic\Actions;
 
+use Exception;
 use Statamic\Auth\Passwords\PasswordReset;
 use Statamic\Contracts\Auth\User as UserContract;
 
@@ -43,6 +44,10 @@ public function buttonText()
 
     public function run($items, $values)
     {
+        if (! config('statamic.users.allow_copy_reset_password_link', false)) {
+            throw new Exception('Copying password reset links is not allowed.');
+        }
+
         $user = $items->first();
 
         $passwordResetLink = $user->password()

From 23215679fd9620b5b0c4740e81f3dc48b89ae3a6 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 25 Jan 2024 13:46:32 -0500
Subject: [PATCH 054/149] changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5397db14bb..fef1809c72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@
 ### What's fixed
 - Support data in Eloquent based user groups. [#9395](https://github.com/statamic/cms/issues/9395) by @jasonvarga
 - Revert overzealous file extension renaming feature. [#9389](https://github.com/statamic/cms/issues/9389) by @jasonvarga
-- Make copy reset password link action opt-in. [#9390](https://github.com/statamic/cms/issues/9390) by @jasonvarga
+- Make copy reset password link action opt-in. [#9390](https://github.com/statamic/cms/issues/9390) [#9397](https://github.com/statamic/cms/issues/9397) by @jasonvarga
 - Fix importing fieldsets in custom blueprint namespaces. [#9387](https://github.com/statamic/cms/issues/9387) by @duncanmcclean
 - Catch errors when sending user activation email. [#9382](https://github.com/statamic/cms/issues/9382) by @duncanmcclean
 - Only use site language for form submission validation messages if submitted from front-end. [#9383](https://github.com/statamic/cms/issues/9383) by @jasonvarga

From a0efa0889493febaf3bc9df4f1c8838eb36791d5 Mon Sep 17 00:00:00 2001
From: Peiman Nourani <nourani.peiman@gmail.com>
Date: Thu, 25 Jan 2024 23:26:25 +0330
Subject: [PATCH 055/149] [4.x] Translate dimension conjunction (#9393)

---
 resources/js/components/assets/Editor/Editor.vue | 2 +-
 resources/lang/en/messages.php                   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/assets/Editor/Editor.vue b/resources/js/components/assets/Editor/Editor.vue
index ce6f193d28..a04e9473aa 100644
--- a/resources/js/components/assets/Editor/Editor.vue
+++ b/resources/js/components/assets/Editor/Editor.vue
@@ -143,7 +143,7 @@
                 <div id="asset-meta-data" class="flex-1 hidden sm:flex space-x-3 py-1 h-full text-xs text-gray-800">
                     <div class="flex items-center bg-gray-400 rounded py-1 pl-2 pr-3" v-if="isImage">
                         <svg-icon name="image-picture" class="h-3 mr-2" />
-                        <div class="">{{ asset.width }} x {{ asset.height }}</div>
+                        <div class="">{{ __('messages.width_x_height', { width: asset.width, height: asset.height }) }}</div>
                     </div>
                     <div class="flex items-center bg-gray-400 rounded py-1 pl-2 pr-3">
                         <svg-icon name="sd-card" class="h-3 mr-2" />
diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php
index 8741ceb7b9..8c2988bb31 100644
--- a/resources/lang/en/messages.php
+++ b/resources/lang/en/messages.php
@@ -241,4 +241,5 @@
     'user_wizard_roles_groups_intro' => 'Users can be assigned to roles that customize their permissions, access, and abilities throughout the Control Panel.',
     'user_wizard_super_admin_instructions' => 'Super admins have complete control and access to everything in the control panel. Grant this role wisely.',
     'view_more_count' => 'View :count more',
+    'width_x_height' => ':width x :height',
 ];

From e340a4a1ef625f3b7aec65e4d49e5df241c578cd Mon Sep 17 00:00:00 2001
From: Emmanuel Beauchamps <e.bops@hotmail.fr>
Date: Fri, 26 Jan 2024 17:30:10 +0100
Subject: [PATCH 056/149] [4.x] French translations (#9402)

---
 resources/lang/fr.json         |  8 ++++++--
 resources/lang/fr/messages.php | 12 +++++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/resources/lang/fr.json b/resources/lang/fr.json
index 79136ae485..063af08d04 100644
--- a/resources/lang/fr.json
+++ b/resources/lang/fr.json
@@ -138,6 +138,7 @@
     "Automatic Links": "Liens automatiques",
     "Available Columns": "Colonnes disponibles",
     "Back to Users": "Retour aux Utilisateurs",
+    "BCC Recipient(s)": "Destinataire(s) Cci",
     "Before": "Avant",
     "Before you can delete this fieldset, you need to remove references to it in blueprints and fieldsets:": "Avant de supprimer ce jeu de champs, vous devez supprimer les liens qui y font référence dans les Blueprints et les jeux de champs :",
     "Behavior": "Comportement",
@@ -163,6 +164,7 @@
     "Cached images": "Images en cache",
     "Cancel": "Annuler",
     "Cast Booleans": "Initialisation des booléens",
+    "CC Recipient(s)": "Destinataire(s) Cc",
     "Change Password": "Changer le mot de passe",
     "Change successful.": "Modification réussie.",
     "Changes to this field in the fieldset will stay in sync.": "Les modifications de ce champ dans le jeu de champs resteront synchronisées.",
@@ -229,6 +231,7 @@
     "Copy password reset email for this user?": "Copier l'e-mail de réinitialisation du mot de passe pour cet utilisateur ?",
     "Copy Password Reset Link": "Copier le lien de réinitialisation du mot de passe",
     "Copy URL": "Copier l'URL",
+    "Core": "Core",
     "Couldn't save entry": "Impossible d'enregistrer l'entrée",
     "Couldn't save term": "Impossible d'enregistrer le terme",
     "CP Nav": "Navigation du CP",
@@ -705,13 +708,13 @@
     "Read the Documentation": "Lire la documentation",
     "Reading Time": "Temps de lecture",
     "Rebuild Search": "Reconstruire la recherche",
-    "Recipient": "Destinataire",
+    "Recipient(s)": "Destinataire(s)",
     "Records": "Enregistrements",
     "Redirect": "Rediriger",
     "Refresh": "Rafraîchir",
     "Regards": "Cordialement",
     "Regenerate": "Régénérer",
-    "Regenerate from:": "Régénérer à partir de :",
+    "Regenerate from: :field": "Régénérer à partir de : :field",
     "Registration successful.": "Inscription réussie.",
     "Relationship": "Relation",
     "Released on :date": "Publiée le :date",
@@ -795,6 +798,7 @@
     "Searching in:": "Recherche dans",
     "Select": "Choisir",
     "Select asset container": "Choisir un conteneur de ressources",
+    "Select Collection(s)": "Choisir collection(s)",
     "Select Dropdown": "Liste déroulante",
     "Select Group": "Choisir un groupe",
     "Select Operator": "Choisir un opérateur",
diff --git a/resources/lang/fr/messages.php b/resources/lang/fr/messages.php
index f5255da3a1..eb0be17b89 100644
--- a/resources/lang/fr/messages.php
+++ b/resources/lang/fr/messages.php
@@ -105,6 +105,8 @@
     'forgot_password_enter_email' => 'Entrez votre adresse e-mail afin que nous puissions envoyer un lien de réinitialisation du mot de passe.',
     'form_configure_blueprint_instructions' => 'Choisissez un Blueprint existant ou créez-en un nouveau.',
     'form_configure_email_attachments_instructions' => 'Joindre à cet e-mail une ressource déjà téléchargée.',
+    'form_configure_email_bcc_instructions' => 'Adresse(s) email du(des) destinataire(s) Cci - séparateur virgule.',
+    'form_configure_email_cc_instructions' => 'Adresse(s) email du(des) destinataire(s) Cc - séparateur virgule.',
     'form_configure_email_from_instructions' => 'Laissez vide pour revenir à la valeur par défaut du site.',
     'form_configure_email_html_instructions' => 'La vue pour la version HTML de cet e-mail.',
     'form_configure_email_instructions' => 'Configurez les emails à envoyer quand de nouvelles soumissions de formulaires sont reçues.',
@@ -112,7 +114,7 @@
     'form_configure_email_reply_to_instructions' => 'Laissez le champ vide pour un retour à l’expéditeur.',
     'form_configure_email_subject_instructions' => 'Objet de l’e-mail.',
     'form_configure_email_text_instructions' => 'La vue pour la version Texte de cet e-mail.',
-    'form_configure_email_to_instructions' => 'Adresse email du destinataire.',
+    'form_configure_email_to_instructions' => 'Adresse(s) email du(des) destinataire(s) - séparateur virgule.',
     'form_configure_handle_instructions' => 'Comment vous allez faire référence à ce formulaire sur le frontal. Ne peut pas être facilement changé.',
     'form_configure_honeypot_instructions' => 'Le nom du champ à utiliser pour le pot de miel. Les pots de miel sont des champs spéciaux utilisés pour réduire le nombre de spams.',
     'form_configure_intro' => 'Les formulaires sont utilisés pour collecter des informations auprès de vos visiteurs et envoyer des évènements et des notifications quand il y a de nouvelles soumissions.',
@@ -212,8 +214,15 @@
     'taxonomy_next_steps_create_term_description' => 'Créez votre premier terme ou générez une poignée de termes génériques, à vous de voir.',
     'taxonomy_next_steps_documentation_description' => 'Apprenez-en plus au sujet des taxonomies, comment elles fonctionnent et comment les configurer.',
     'try_again_in_seconds' => '{0,1} Réessayez maintenant. | Réessayez dans :count secondes.',
+    'units.B' => ':count B',
+    'units.GB' => ':count GB',
+    'units.KB' => ':count KB',
+    'units.MB' => ':count MB',
+    'units.ms' => ':countms',
+    'units.s' => ':counts',
     'updater_require_version_command' => 'Pour exiger une version spécifique, exécutez la commande suivante',
     'updater_update_to_latest_command' => 'Pour mettre à jour vers la dernière version, exécutez la commande suivante',
+    'user_activation_email_not_sent_error' => 'L’email d’activation n’a pas pû être envoyé. Merci de vérifier votre configuration email et de réessayer.',
     'user_groups_intro' => 'Les groupes d’utilisateurs vous permettent d’organiser les utilisateurs et d’appliquer des rôles basés sur des autorisations dans leur ensemble.',
     'user_groups_role_instructions' => 'Affectez des rôles afin de donner aux utilisateurs de ce groupe toutes les autorisations correspondantes.',
     'user_groups_title_instructions' => 'Habituellement un nom au pluriel, comme "Editeurs" ou "Photographes".',
@@ -227,4 +236,5 @@
     'user_wizard_roles_groups_intro' => 'Les utilisateurs peuvent se voir attribuer des rôles qui personnalisent leurs autorisations, accès et possibilités d’agir au sein du Panneau de configuration.',
     'user_wizard_super_admin_instructions' => 'Les super-admin ont le contrôle complet du système et l’accès à tout ce qui se trouve dans le Panneau de configuration. Accordez ce rôle à bon escient.',
     'view_more_count' => 'En voir :count de plus',
+    'width_x_height' => ':width x :height',
 ];

From 6a6a924152429d92a296910d558a8c651f22c8d3 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 26 Jan 2024 11:30:34 -0500
Subject: [PATCH 057/149] [4.x] Explain that you should write a PR description
 (#9407)

---
 .github/PULL_REQUEST_TEMPLATE.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 91ee39e2b9..a6167bd040 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -11,3 +11,5 @@ Please take 30 seconds to read the following so we can be as efficient as possib
 4️⃣ We _really_ appreciate it if your PR includes tests. This makes it much easier for us to review, merge, and release. A PR with tests is usually reviewed and merged 5x-10x faster.
 
 5️⃣ If your PR introduce a new feature, adds to an existing one, or changes current behavior, please **open an issue for it in the [statamic/docs](https://github.com/statamic/docs/issues) repo referencing your PR**. A simple "Goes along with statamic/cms#9000" is enough. Otherwise it's really easy to forget and no will ever become aware of your ✨ sparkling ✨ invention if it's not documented.
+
+6️⃣ Remove this placeholder text and replace it with a description of what this PR is doing.

From 50b4cf4a1741078d0358a49e3eed361f255ddd52 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Fri, 26 Jan 2024 17:59:20 +0000
Subject: [PATCH 058/149] [4.x] Fix translations in `nocache` tag (#9400)

---
 routes/web.php                                |  2 ++
 src/StaticCaching/NoCache/NoCacheLocalize.php | 17 +++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 src/StaticCaching/NoCache/NoCacheLocalize.php

diff --git a/routes/web.php b/routes/web.php
index 4cfaf5af8c..74c56707a7 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -15,6 +15,7 @@
 use Statamic\Http\Middleware\CP\AuthGuard as CPAuthGuard;
 use Statamic\Statamic;
 use Statamic\StaticCaching\NoCache\Controller as NoCacheController;
+use Statamic\StaticCaching\NoCache\NoCacheLocalize;
 
 Route::name('statamic.')->group(function () {
     Route::group(['prefix' => config('statamic.routes.action')], function () {
@@ -45,6 +46,7 @@
 
     Route::prefix(config('statamic.routes.action'))
         ->post('nocache', NoCacheController::class)
+        ->middleware(NoCacheLocalize::class)
         ->withoutMiddleware('App\Http\Middleware\VerifyCsrfToken');
 
     if (OAuth::enabled()) {
diff --git a/src/StaticCaching/NoCache/NoCacheLocalize.php b/src/StaticCaching/NoCache/NoCacheLocalize.php
new file mode 100644
index 0000000000..4ab8d25bf7
--- /dev/null
+++ b/src/StaticCaching/NoCache/NoCacheLocalize.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Statamic\StaticCaching\NoCache;
+
+use Closure;
+use Statamic\Facades\Site;
+use Statamic\Http\Middleware\Localize;
+
+class NoCacheLocalize extends Localize
+{
+    public function handle($request, Closure $next)
+    {
+        Site::resolveCurrentUrlUsing(fn () => $request->get('url'));
+
+        return parent::handle($request, $next);
+    }
+}

From 3f74f268ef770265ef8640bfc4a75416daceabcd Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Fri, 26 Jan 2024 18:30:29 +0000
Subject: [PATCH 059/149] [4.x] Fix Entries fieldtype tree view on Assets
 publish form (#9404)

---
 .../fieldtypes/relationship/RelationshipFieldtype.vue       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue b/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue
index 3e91f3f778..b0efc76512 100644
--- a/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue
+++ b/resources/js/components/fieldtypes/relationship/RelationshipFieldtype.vue
@@ -92,9 +92,11 @@ export default {
         },
 
         site() {
-            if (! this.storeName) return this.$config.get('selectedSite');
+            if (this.storeName) {
+                return this.$store.state.publish[this.storeName].site || this.$config.get('selectedSite');
+            }
 
-            return this.$store.state.publish[this.storeName].site;
+            return this.$config.get('selectedSite');
         },
 
         canEdit() {

From 74387f0ca0df9e1a0f42c519f751a1c9cbcdac3a Mon Sep 17 00:00:00 2001
From: Jack Sleight <jacksleight@gmail.com>
Date: Fri, 26 Jan 2024 21:03:50 +0000
Subject: [PATCH 060/149] [4.x] Ability to add inline scripts into the CP
 (#9386)

---
 resources/views/partials/scripts.blade.php |  4 ++++
 src/Statamic.php                           | 13 +++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/resources/views/partials/scripts.blade.php b/resources/views/partials/scripts.blade.php
index ad2b703fae..355286e399 100644
--- a/resources/views/partials/scripts.blade.php
+++ b/resources/views/partials/scripts.blade.php
@@ -14,6 +14,10 @@
            ->withEntryPoints($vite['input']) }}
 @endforeach
 
+@foreach (Statamic::availableInlineScripts(request()) as $script)
+    <script>{!! $script !!}</script>
+@endforeach
+
 <script>
 var StatamicConfig = {!! json_encode(array_merge(Statamic::jsonVariables(request()), [
     'wrapperClass' => $__env->getSection('wrapper_class', 'max-w-xl')
diff --git a/src/Statamic.php b/src/Statamic.php
index e4a283d5bd..24d5a96852 100644
--- a/src/Statamic.php
+++ b/src/Statamic.php
@@ -25,6 +25,7 @@ class Statamic
 
     protected static $scripts = [];
     protected static $externalScripts = [];
+    protected static $inlineScripts = [];
     protected static $styles = [];
     protected static $externalStyles = [];
     protected static $vites = [];
@@ -84,6 +85,18 @@ public static function externalScript($url)
         return new static;
     }
 
+    public static function inlineScript($html)
+    {
+        static::$inlineScripts[] = $html;
+
+        return new static;
+    }
+
+    public static function availableInlineScripts(Request $request)
+    {
+        return static::$inlineScripts;
+    }
+
     public static function availableStyles(Request $request)
     {
         return static::$styles;

From 4d788297d427e66e4a7ebc0bd6c29a09e0c2d564 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Mon, 29 Jan 2024 18:09:16 +0000
Subject: [PATCH 061/149] [4.x] Rename route binding parameter to prevent
 overlapping (#9415)

---
 routes/cp.php                                          |  4 ++--
 .../Controllers/CP/Updater/UpdateProductController.php | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/routes/cp.php b/routes/cp.php
index 4be0638541..c3dd3ef5e9 100644
--- a/routes/cp.php
+++ b/routes/cp.php
@@ -246,8 +246,8 @@
 
     Route::get('updater', [UpdaterController::class, 'index'])->name('updater');
     Route::get('updater/count', [UpdaterController::class, 'count']);
-    Route::get('updater/{product}', [UpdateProductController::class, 'show'])->name('updater.product');
-    Route::get('updater/{product}/changelog', [UpdateProductController::class, 'changelog']);
+    Route::get('updater/{marketplaceProductSlug}', [UpdateProductController::class, 'show'])->name('updater.product');
+    Route::get('updater/{marketplaceProductSlug}/changelog', [UpdateProductController::class, 'changelog']);
 
     Route::group(['prefix' => 'duplicates'], function () {
         Route::get('/', [DuplicatesController::class, 'index'])->name('duplicates');
diff --git a/src/Http/Controllers/CP/Updater/UpdateProductController.php b/src/Http/Controllers/CP/Updater/UpdateProductController.php
index b11091e95d..9168e55a0d 100644
--- a/src/Http/Controllers/CP/Updater/UpdateProductController.php
+++ b/src/Http/Controllers/CP/Updater/UpdateProductController.php
@@ -12,16 +12,16 @@ class UpdateProductController extends CpController
      *
      * @param  string  $slug
      */
-    public function show($slug)
+    public function show($marketplaceProductSlug)
     {
         $this->authorize('view updates');
 
-        if (! $product = Marketplace::product($slug)) {
+        if (! $product = Marketplace::product($marketplaceProductSlug)) {
             return $this->pageNotFound();
         }
 
         return view('statamic::updater.show', [
-            'slug' => $slug,
+            'slug' => $marketplaceProductSlug,
             'package' => $product->package(),
             'name' => $product->name(),
         ]);
@@ -32,11 +32,11 @@ public function show($slug)
      *
      * @param  string  $slug
      */
-    public function changelog($slug)
+    public function changelog($marketplaceProductSlug)
     {
         $this->authorize('view updates');
 
-        if (! $product = Marketplace::product($slug)) {
+        if (! $product = Marketplace::product($marketplaceProductSlug)) {
             return $this->pageNotFound();
         }
 

From 0da35cc2a2b3842c1fd18592a18c570fbb9e82c4 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Mon, 29 Jan 2024 18:24:01 +0000
Subject: [PATCH 062/149] [4.x] Allow a custom static caching url store to be
 specified (#9405)

---
 src/StaticCaching/StaticCacheManager.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/StaticCaching/StaticCacheManager.php b/src/StaticCaching/StaticCacheManager.php
index 34bd5ae0c7..d61c50046e 100644
--- a/src/StaticCaching/StaticCacheManager.php
+++ b/src/StaticCaching/StaticCacheManager.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Cache\Repository;
 use Illuminate\Support\Facades\Cache;
+use InvalidArgumentException;
 use Statamic\Facades\Site;
 use Statamic\StaticCaching\Cachers\ApplicationCacher;
 use Statamic\StaticCaching\Cachers\FileCacher;
@@ -30,7 +31,13 @@ public function createNullDriver()
 
     public function createFileDriver(array $config)
     {
-        return new FileCacher(new Writer, $this->app[Repository::class], $config);
+        try {
+            $store = Cache::store('static_cache');
+        } catch (InvalidArgumentException $e) {
+            $store = Cache::store();
+        }
+
+        return new FileCacher(new Writer, $store, $config);
     }
 
     public function createApplicationDriver(array $config)

From a692edebbf79da673afb090152f4362b2cff5b21 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Tue, 30 Jan 2024 18:56:39 +0000
Subject: [PATCH 063/149] [4.x] Hide listing filters when reordering entries
 (#9420)

---
 resources/js/components/entries/Listing.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/entries/Listing.vue b/resources/js/components/entries/Listing.vue
index ae4a253496..3c110fb5af 100644
--- a/resources/js/components/entries/Listing.vue
+++ b/resources/js/components/entries/Listing.vue
@@ -16,7 +16,7 @@
         >
             <div slot-scope="{ hasSelections }">
                 <div class="card overflow-hidden p-0 relative">
-                    <div class="flex flex-wrap items-center justify-between px-2 pb-2 text-sm border-b">
+                    <div v-if="!reordering" class="flex flex-wrap items-center justify-between px-2 pb-2 text-sm border-b">
 
                         <data-list-filter-presets
                             ref="presets"

From 89e2a45e1e8eb4622fe677f2aa9fa88113b5be2f Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Tue, 30 Jan 2024 20:06:17 +0000
Subject: [PATCH 064/149] [4.x] Add reset button to Color Fieldtype (#9419)

---
 .../components/fieldtypes/ColorFieldtype.vue  | 128 ++++++++++--------
 1 file changed, 68 insertions(+), 60 deletions(-)

diff --git a/resources/js/components/fieldtypes/ColorFieldtype.vue b/resources/js/components/fieldtypes/ColorFieldtype.vue
index 70848b3011..2804b63418 100644
--- a/resources/js/components/fieldtypes/ColorFieldtype.vue
+++ b/resources/js/components/fieldtypes/ColorFieldtype.vue
@@ -1,72 +1,76 @@
 <template>
-    <div class="input-group max-w-[130px]">
-        <popover name="swatches" class="color-picker" placement="bottom-start">
-            <template #trigger>
-                <div
-                    class="input-group-prepend px-px"
-                    v-tooltip="__('Pick Color')"
-                >
-                    <div class="relative flex items-center outline-none">
-                        <div class="inline-block cursor-pointer rounded m-0 p-[2px]">
-                            <div
-                                class="rounded-sm w-8 h-8"
-                                :class="{ 'border': !value, 'cursor-not-allowed': isReadOnly }"
-                                :style="{ 'background-color': value }"
-                            />
+    <div class=" flex items-center">
+        <div class="input-group w-auto" :class="{ 'max-w-[130px]': config.allow_any }">
+            <popover name="swatches" class="color-picker" placement="bottom-start">
+                <template #trigger>
+                    <div
+                        class="input-group-prepend px-px"
+                        v-tooltip="__('Pick Color')"
+                    >
+                        <div class="relative flex items-center outline-none">
+                            <div class="inline-block cursor-pointer rounded m-0 p-[2px]">
+                                <div
+                                    class="rounded-sm w-8 h-8"
+                                    :class="{ 'border': !value, 'cursor-not-allowed': isReadOnly }"
+                                    :style="{ 'background-color': value }"
+                                />
+                            </div>
                         </div>
                     </div>
-                </div>
-            </template>
-            <template #default="{ close: closePopover }">
-                <div class="p-4">
-                    <div v-if="config.swatches.length" class="grid grid-cols-4 gap-3">
-                        <div
-                            v-for="swatch in config.swatches"
-                            class="w-10 h-10 inline-block cursor-pointer rounded flex border border-gray-400"
-                            :style="{ 'background-color': swatch }"
-                            @click="() => { update(swatch); closePopover(); }"
-                        >
+                </template>
+                <template #default="{ close: closePopover }">
+                    <div class="p-4">
+                        <div v-if="config.swatches.length" class="grid grid-cols-4 gap-3">
                             <div
-                                v-if="swatch === value"
-                                class="flex items-center justify-center h-full w-full"
+                                v-for="swatch in config.swatches"
+                                class="w-10 h-10 inline-block cursor-pointer rounded flex border border-gray-400"
+                                :style="{ 'background-color': swatch }"
+                                @click="() => { update(swatch); closePopover(); }"
                             >
-                                <div class="w-5 h-5 rounded-full bg-black/10 flex items-center justify-center">
-                                    <svg version="1.1" role="presentation" width="12" height="12" viewBox="0 0 1792 1792" class="text-white fill-current"><path d="M1671 566q0 40-28 68l-724 724-136 136q-28 28-68 28t-68-28l-136-136-362-362q-28-28-28-68t28-68l136-136q28-28 68-28t68 28l294 295 656-657q28-28 68-28t68 28l136 136q28 28 28 68z" ></path></svg>
+                                <div
+                                    v-if="swatch === value"
+                                    class="flex items-center justify-center h-full w-full"
+                                >
+                                    <div class="w-5 h-5 rounded-full bg-black/10 flex items-center justify-center">
+                                        <svg version="1.1" role="presentation" width="12" height="12" viewBox="0 0 1792 1792" class="text-white fill-current"><path d="M1671 566q0 40-28 68l-724 724-136 136q-28 28-68 28t-68-28l-136-136-362-362q-28-28-28-68t28-68l136-136q28-28 68-28t68 28l294 295 656-657q28-28 68-28t68 28l136 136q28 28 28 68z" ></path></svg>
+                                    </div>
                                 </div>
                             </div>
                         </div>
-                    </div>
 
-                    <div
-                        v-if="config.allow_any"
-                        class="flex items-center"
-                        :class="{ 'mt-5': config.swatches.length }"
-                    >
-                        <input
-                            class="h-10 w-full cursor-pointer input-text w-full rounded p-[2px] mr-2"
-                            type="color"
-                            :value="customColor"
-                            @input="customColorSelected"
-                        />
-                        <button
-                            class="btn btn-primary h-10 px-2"
-                            v-text="__('OK')"
-                            @click="() => { commitCustomColor(); closePopover() }"
-                        />
+                        <div
+                            v-if="config.allow_any"
+                            class="flex items-center"
+                            :class="{ 'mt-5': config.swatches.length }"
+                        >
+                            <input
+                                class="h-10 w-full cursor-pointer input-text w-full rounded p-[2px] mr-2"
+                                type="color"
+                                :value="customColor"
+                                @input="customColorSelected"
+                            />
+                            <button
+                                class="btn btn-primary h-10 px-2"
+                                v-text="__('OK')"
+                                @click="() => { commitCustomColor(); closePopover() }"
+                            />
+                        </div>
                     </div>
-                </div>
-            </template>
-        </popover>
-
-        <input
-            v-if="config.allow_any"
-            class="input-text font-mono"
-            maxlength="7"
-            type="text"
-            :readonly="isReadOnly"
-            :value="customColor"
-            @input="updateDebounced($event.target.value)"
-        />
+                </template>
+            </popover>
+
+            <input
+                v-if="config.allow_any"
+                class="input-text font-mono"
+                maxlength="7"
+                type="text"
+                :readonly="isReadOnly"
+                :value="customColor"
+                @input="updateDebounced($event.target.value)"
+            />
+        </div>
+
+        <button v-if="value" class="btn-close ml-1" :aria-label="__('Reset')" @click="resetColor">&times;</button>
     </div>
 </template>
 
@@ -109,7 +113,11 @@ export default {
 
         commitCustomColor() {
             this.update(this.customColor);
-        }
+        },
+
+        resetColor() {
+            this.update(null);
+        },
 
     }
 

From 65acd8197d1f35c9c087f0e9c779b2bcf845c375 Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Tue, 30 Jan 2024 15:59:47 -0500
Subject: [PATCH 065/149] [4.x] Fix user wizard error when user blueprint has
 bard field (#9416)

---
 src/Http/Controllers/CP/Users/UsersController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Http/Controllers/CP/Users/UsersController.php b/src/Http/Controllers/CP/Users/UsersController.php
index c441abfaf2..6a1ee7ad6e 100644
--- a/src/Http/Controllers/CP/Users/UsersController.php
+++ b/src/Http/Controllers/CP/Users/UsersController.php
@@ -132,7 +132,7 @@ public function create(Request $request)
         $viewData = [
             'values' => (object) $fields->values()->only($additional)->all(),
             'meta' => (object) $fields->meta()->only($additional)->all(),
-            'fields' => collect($fields->toPublishArray())->filter(fn ($field) => $additional->contains($field['handle']))->values()->all(),
+            'fields' => collect($blueprint->fields()->toPublishArray())->filter(fn ($field) => $additional->contains($field['handle']))->values()->all(),
             'blueprint' => $blueprint->toPublishArray(),
             'expiry' => $expiry,
             'separateNameFields' => $blueprint->hasField('first_name'),

From 2d58efbfa8ab94b648703e02cf79fd24b6bf9b5d Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Tue, 30 Jan 2024 21:36:17 +0000
Subject: [PATCH 066/149] [4.x] Prevent serialization errors with `@nocache`
 directive when using Blade view components (#9409)

---
 src/StaticCaching/NoCache/Region.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/StaticCaching/NoCache/Region.php b/src/StaticCaching/NoCache/Region.php
index 51e95207d0..851da04fec 100644
--- a/src/StaticCaching/NoCache/Region.php
+++ b/src/StaticCaching/NoCache/Region.php
@@ -2,6 +2,7 @@
 
 namespace Statamic\StaticCaching\NoCache;
 
+use Illuminate\View\InvokableComponentVariable;
 use Statamic\Support\Arr;
 
 abstract class Region
@@ -27,9 +28,16 @@ public function context(): array
 
     protected function filterContext(array $context)
     {
-        foreach (['__env', 'app', 'errors', 'resolve', 'resolveComponentsUsing', 'forgetComponentsResolver', 'forgetFactory', 'flushCache', 'constructor'] as $var) {
-            unset($context[$var]);
-        }
+        $context = collect($context)
+            ->reject(fn ($value, $key) => in_array($key, ['__env', 'app', 'errors', 'resolve', 'resolveComponentsUsing', 'forgetComponentsResolver', 'forgetFactory', 'flushCache', 'constructor']))
+            ->map(function ($value, $key) {
+                if ($value instanceof InvokableComponentVariable) {
+                    return $value->resolveDisplayableValue();
+                }
+
+                return $value;
+            })
+            ->toArray();
 
         return $this->arrayRecursiveDiff($context, $this->session->cascade());
     }

From a18568aac660af35a9993bbeb8c98a42202b2771 Mon Sep 17 00:00:00 2001
From: John Koster <john@stillat.com>
Date: Tue, 30 Jan 2024 15:38:40 -0600
Subject: [PATCH 067/149] [4.x] Improve collection Stache watcher performance
 (#9302)

---
 src/Stache/Stores/CollectionsStore.php |  2 ++
 src/Stache/Stores/Store.php            |  5 ++--
 src/Stache/Traverser.php               | 33 ++++++++++++++++++++++++--
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/src/Stache/Stores/CollectionsStore.php b/src/Stache/Stores/CollectionsStore.php
index e43f8da720..b3cf9ebe6d 100644
--- a/src/Stache/Stores/CollectionsStore.php
+++ b/src/Stache/Stores/CollectionsStore.php
@@ -12,6 +12,8 @@
 
 class CollectionsStore extends BasicStore
 {
+    protected $traverseRecursively = false;
+
     public function key()
     {
         return 'collections';
diff --git a/src/Stache/Stores/Store.php b/src/Stache/Stores/Store.php
index 41dc66bc9f..d336ee768d 100644
--- a/src/Stache/Stores/Store.php
+++ b/src/Stache/Stores/Store.php
@@ -22,6 +22,7 @@ abstract class Store
     protected $storeIndexes = [];
     protected $usedIndexes;
     protected $fileChangesHandled = false;
+    protected $traverseRecursively = true;
     protected $paths;
     protected $fileItems;
     protected $shouldCacheFileItems = false;
@@ -180,7 +181,7 @@ public function handleFileChanges()
         $existing = collect(Cache::get($cacheKey, []));
 
         // Get the files and timestamps from the filesystem right now.
-        $files = Traverser::filter([$this, 'getItemFilter'])->traverse($this);
+        $files = Traverser::filter([$this, 'getItemFilter'])->traverse($this, $this->traverseRecursively);
 
         // Cache the files and timestamps, ready for comparisons on the next request.
         // We'll do it now since there are multiple early returns coming up.
@@ -292,7 +293,7 @@ public function paths()
             return $this->paths = collect($paths);
         }
 
-        $files = Traverser::filter([$this, 'getItemFilter'])->traverse($this);
+        $files = Traverser::filter([$this, 'getItemFilter'])->traverse($this, $this->traverseRecursively);
 
         $fileItems = $files->map(function ($timestamp, $path) {
             return [
diff --git a/src/Stache/Traverser.php b/src/Stache/Traverser.php
index 84723f0534..9a1fb6bcc4 100644
--- a/src/Stache/Traverser.php
+++ b/src/Stache/Traverser.php
@@ -2,8 +2,13 @@
 
 namespace Statamic\Stache;
 
+use DirectoryIterator;
+use FilesystemIterator;
 use Illuminate\Filesystem\Filesystem;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
 use Statamic\Facades\Path;
+use Symfony\Component\Finder\SplFileInfo;
 
 class Traverser
 {
@@ -15,7 +20,7 @@ public function __construct(Filesystem $filesystem)
         $this->filesystem = $filesystem;
     }
 
-    public function traverse($store)
+    public function traverse($store, $recursive = true)
     {
         if (! $dir = $store->directory()) {
             throw new \Exception("Store [{$store->key()}] does not have a directory defined.");
@@ -27,7 +32,7 @@ public function traverse($store)
             return collect();
         }
 
-        $files = collect($this->filesystem->allFiles($dir));
+        $files = collect($this->getFiles($dir, $recursive));
 
         if ($this->filter) {
             $files = $files->filter($this->filter);
@@ -45,4 +50,28 @@ public function filter($filter)
 
         return $this;
     }
+
+    private function getFiles($dir, $recursive)
+    {
+        $files = [];
+
+        if ($recursive) {
+            $iterator = new RecursiveIteratorIterator(
+                new RecursiveDirectoryIterator($dir, FilesystemIterator::SKIP_DOTS | FilesystemIterator::CURRENT_AS_SELF),
+                RecursiveIteratorIterator::CHILD_FIRST
+            );
+        } else {
+            $iterator = new DirectoryIterator($dir);
+        }
+
+        foreach ($iterator as $fileInfo) {
+            if ($fileInfo->isDir() || $fileInfo->getFilename()[0] === '.') {
+                continue;
+            }
+
+            $files[] = new SplFileInfo($fileInfo->getPathname(), $fileInfo->getPath(), $fileInfo->getFilename());
+        }
+
+        return $files;
+    }
 }

From 6bd4976198b9e4cdb68c3c69686487a3c391c30a Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Tue, 30 Jan 2024 22:04:34 +0000
Subject: [PATCH 068/149] [4.x] Don't set termTemplate and template if they are
 the defaults (#9421)

---
 src/Http/Controllers/CP/Taxonomies/TaxonomiesController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Http/Controllers/CP/Taxonomies/TaxonomiesController.php b/src/Http/Controllers/CP/Taxonomies/TaxonomiesController.php
index 06da6e4af9..82cb5289bb 100644
--- a/src/Http/Controllers/CP/Taxonomies/TaxonomiesController.php
+++ b/src/Http/Controllers/CP/Taxonomies/TaxonomiesController.php
@@ -133,8 +133,8 @@ public function edit($taxonomy)
             'collections' => $taxonomy->collections()->map->handle()->all(),
             'sites' => $taxonomy->sites()->all(),
             'preview_targets' => $taxonomy->basePreviewTargets(),
-            'term_template' => $taxonomy->termTemplate(),
-            'template' => $taxonomy->template(),
+            'term_template' => $taxonomy->termTemplate,
+            'template' => $taxonomy->template,
             'layout' => $taxonomy->layout(),
         ];
 

From 557df8b5715ae18d3a8a5d0db44d884c10201cf1 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Wed, 31 Jan 2024 14:04:59 +0000
Subject: [PATCH 069/149] [4.x] Improve UX of Field Conditions Builder for
 Select & Toggle fields (#9379)

---
 .../blueprints/SuggestsConditionalFields.js   |   4 +-
 .../components/field-conditions/Builder.vue   |  77 ++------
 .../components/field-conditions/Condition.vue | 186 ++++++++++++++++++
 3 files changed, 204 insertions(+), 63 deletions(-)
 create mode 100644 resources/js/components/field-conditions/Condition.vue

diff --git a/resources/js/components/blueprints/SuggestsConditionalFields.js b/resources/js/components/blueprints/SuggestsConditionalFields.js
index 98766b0681..b66a516125 100644
--- a/resources/js/components/blueprints/SuggestsConditionalFields.js
+++ b/resources/js/components/blueprints/SuggestsConditionalFields.js
@@ -21,7 +21,7 @@ export default {
                 return fields.concat(
                     field.type === 'import'
                         ? this.getFieldsFromImportedFieldset(field.fieldset, field.prefix)
-                        : [field.handle]
+                        : [field]
                 );
             }, []);
 
@@ -46,7 +46,7 @@ export default {
                     return fields.concat(
                         field.type === 'import'
                             ? this.getFieldsFromImportedFieldset(field.fieldset, field.prefix)
-                            : [field.handle]
+                            : [field]
                     );
                 }, [])
                 .map(handle => prefix ? `${prefix}${handle}` : handle);
diff --git a/resources/js/components/field-conditions/Builder.vue b/resources/js/components/field-conditions/Builder.vue
index 313f1b6297..91a45d49f1 100644
--- a/resources/js/components/field-conditions/Builder.vue
+++ b/resources/js/components/field-conditions/Builder.vue
@@ -25,43 +25,17 @@
                     class="ml-4 flex-1" />
             </div>
 
-            <div
+            <condition
                 v-if="hasConditions && isStandard"
                 v-for="(condition, index) in conditions"
+                :index="index"
+                :config="config"
+                :condition="condition"
                 :key="condition._id"
-                class="flex flex-wrap items-center py-4 border-t"
-            >
-                <div v-if="index === 0" class="help-block" v-text="__('messages.field_conditions_field_instructions')" />
-
-                <v-select
-                    ref="fieldSelect"
-                    v-model="conditions[index].field"
-                    class="w-full md:w-1/3 mb-2 md:mb-0"
-                    :options="fieldOptions"
-                    :placeholder="__('Field')"
-                    :taggable="true"
-                    :push-tags="true"
-                    :reduce="field => field.value"
-                    :create-option="field => ({value: field, label: field })"
-                    @search:blur="fieldSelectBlur(index)"
-                >
-                    <template #no-options><div class="hidden" /></template>
-                </v-select>
-
-                <select-input
-                    v-model="conditions[index].operator"
-                    :options="operatorOptions"
-                    :placeholder="false"
-                    class="md:ml-4" />
-
-                <text-input
-                    v-model="conditions[index].value"
-                    class="ml-4" />
-
-                <button @click="remove(index)" class="btn-close ml-2 group">
-                    <svg-icon name="micro/trash" class="w-4 h-4 group-hover:text-red-500" />
-                </button>
-            </div>
+                :suggestable-fields="suggestableFields"
+                @updated="updated(index, $event)"
+                @removed="remove(index)"
+            />
 
             <div class="border-t pt-6" v-if="hasConditions && isStandard">
                 <button
@@ -90,11 +64,15 @@ import uniqid from 'uniqid';
 import HasInputOptions from '../fieldtypes/HasInputOptions.js';
 import Converter from '../field-conditions/Converter.js';
 import { KEYS, OPERATORS } from '../field-conditions/Constants.js';
+import Condition from './Condition.vue';
+import { __ } from '../../bootstrap/globals';
 
 export default {
 
     mixins: [HasInputOptions],
 
+    components: { Condition },
+
     props: {
         config: {
             required: true
@@ -132,28 +110,6 @@ export default {
             });
         },
 
-        fieldOptions() {
-            return this.normalizeInputOptions(
-                _.reject(this.suggestableFields, field => field === this.config.handle || this.conditions.map(condition => condition.field).includes(field))
-            );
-        },
-
-        operatorOptions() {
-            return this.normalizeInputOptions({
-                'equals': __('equals'),
-                'not': __('not'),
-                'contains': __('contains'),
-                'contains_any': __('contains any'),
-                '===': '===',
-                '!==': '!==',
-                '>': '>',
-                '>=': '>=',
-                '<': '<',
-                '<=': '<=',
-                'custom': __('custom'),
-            });
-        },
-
         hasConditions() {
             return this.when !== 'always';
         },
@@ -218,6 +174,10 @@ export default {
             this.conditions.splice(index, 1);
         },
 
+        updated(index, condition) {
+            this.conditions.splice(index, 1, condition);
+        },
+
         getInitialConditions() {
             let key = _.chain(KEYS)
                 .filter(key => this.config[key])
@@ -280,11 +240,6 @@ export default {
             return operator;
         },
 
-        fieldSelectBlur(index) {
-            const value = this.$refs.fieldSelect[index].$refs.search.value;
-            if (value) this.conditions[index].field = value;
-        },
-
     }
 }
 </script>
diff --git a/resources/js/components/field-conditions/Condition.vue b/resources/js/components/field-conditions/Condition.vue
new file mode 100644
index 0000000000..195f1e34ed
--- /dev/null
+++ b/resources/js/components/field-conditions/Condition.vue
@@ -0,0 +1,186 @@
+<template>
+    <div class="flex flex-wrap items-center py-4 border-t">
+        <div v-if="index === 0" class="help-block" v-text="__('messages.field_conditions_field_instructions')" />
+
+        <v-select
+            ref="fieldSelect"
+            :value="condition.field"
+            class="w-full md:w-1/3 mb-2 md:mb-0"
+            :options="fieldOptions"
+            :placeholder="__('Field')"
+            :taggable="true"
+            :push-tags="true"
+            :reduce="field => field.value"
+            :create-option="field => ({value: field, label: field })"
+            @input="fieldSelected"
+            @search:blur="fieldSelectBlur"
+        >
+            <template #no-options><div class="hidden" /></template>
+            <template slot="option" slot-scope="option">
+                <div class="flex items-center">
+                    <span v-text="option.label" />
+                    <span v-text="option.value" class="font-mono text-2xs text-gray-500" :class="{ 'ml-2': option.label }" />
+                </div>
+            </template>
+        </v-select>
+
+        <select-input
+            :value="condition.operator"
+            :options="operatorOptions"
+            :placeholder="false"
+            class="md:ml-4"
+            @input="operatorSelected" />
+
+        <toggle-input
+            v-if="showValueToggle"
+            class="ml-4"
+            :value="condition.value === 'true'"
+            @input="valueUpdated" />
+
+        <v-select
+            v-else-if="showValueDropdown"
+            ref="valueSelect"
+            :value="condition.value"
+            class="ml-4 w-full md:w-52 mb-2 md:mb-0"
+            :options="valueOptions"
+            :placeholder="__('Option')"
+            :taggable="false"
+            :push-tags="true"
+            :reduce="field => field.value"
+            :create-option="field => ({value: field, label: field })"
+            @input="valueUpdated"
+            @search:blur="valueSelectBlur"
+        >
+            <template #no-options><div class="hidden" /></template>
+        </v-select>
+
+        <text-input
+            v-else
+            :value="condition.value"
+            class="ml-4"
+            @input="valueUpdated" />
+
+        <button @click="remove" class="btn-close ml-2 group">
+            <svg-icon name="micro/trash" class="w-4 h-4 group-hover:text-red-500" />
+        </button>
+    </div>
+</template>
+
+<script>
+import _ from 'underscore/modules/underscore';
+import HasInputOptions from '../fieldtypes/HasInputOptions.js';
+
+export default {
+    mixins: [HasInputOptions],
+
+    props: {
+        config: {
+            type: Object,
+            required: true
+        },
+        condition: {
+            type: Object,
+            required: true
+        },
+        index: {
+            type: Number,
+            required: true
+        },
+        suggestableFields: {
+            type: Array,
+            required: true
+        },
+    },
+
+    computed: {
+        field() {
+            return this.suggestableFields.find(field => field.handle === this.condition.field);
+        },
+
+        showValueToggle() {
+            return this.field
+                && ['toggle'].includes(this.field.config.type)
+                && ['equals', 'not', '===', '!=='].includes(this.condition.operator);
+        },
+
+        showValueDropdown() {
+            return this.field
+                && ['button_group', 'checkboxes', 'radio', 'select'].includes(this.field.config.type)
+                && ['equals', 'not', '===', '!=='].includes(this.condition.operator);
+        },
+
+        valueOptions() {
+            if (! this.showValueDropdown) return;
+
+            return this.normalizeInputOptions(this.field.config.options);
+        },
+
+        fieldOptions() {
+            return _(this.suggestableFields)
+                .reject(field => field.handle === this.config.handle || this.condition.field === field.handle)
+                .map(field => {
+                    let display = field.config.display;
+
+                    if (! display) {
+                        display = field.handle.replace(/_/g, ' ').replace(/(?:^|\s)\S/g, function(a) { return a.toUpperCase(); });
+                    }
+
+                    return {value: field.handle, label: display}
+                });
+        },
+
+        operatorOptions() {
+            return this.normalizeInputOptions({
+                'equals': __('equals'),
+                'not': __('not'),
+                'contains': __('contains'),
+                'contains_any': __('contains any'),
+                '===': '===',
+                '!==': '!==',
+                '>': '>',
+                '>=': '>=',
+                '<': '<',
+                '<=': '<=',
+                'custom': __('custom'),
+            });
+        },
+    },
+
+    methods: {
+        fieldSelected(field) {
+            this.$emit('updated', {
+                ...this.condition,
+                field: field,
+            });
+        },
+
+        fieldSelectBlur() {
+            const value = this.$refs.fieldSelect.$refs.search.value;
+            if (value) this.fieldUpdated(value);
+        },
+
+        operatorSelected(operator) {
+            this.$emit('updated', {
+                ...this.condition,
+                operator: operator,
+            });
+        },
+
+        valueUpdated(value) {
+            this.$emit('updated', {
+                ...this.condition,
+                value: value.toString(),
+            });
+        },
+
+        valueSelectBlur() {
+            const value = this.$refs.valueSelect.$refs.search.value;
+            if (value) this.valueUpdated(value);
+        },
+
+        remove() {
+            this.$emit('removed');
+        }
+    }
+}
+</script>

From b42f996b6905076865b1f0e3827764da3fae9966 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Wed, 31 Jan 2024 14:09:16 +0000
Subject: [PATCH 070/149] [4.x] Fix issue with Set Previews in Bard (#9422)

---
 resources/js/components/fieldtypes/ListFieldtype.vue      | 4 ----
 .../js/components/fieldtypes/assets/AssetsFieldtype.vue   | 8 --------
 resources/js/components/fieldtypes/bard/Set.vue           | 4 +---
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/resources/js/components/fieldtypes/ListFieldtype.vue b/resources/js/components/fieldtypes/ListFieldtype.vue
index 191cd0e4ba..c9e53a6637 100644
--- a/resources/js/components/fieldtypes/ListFieldtype.vue
+++ b/resources/js/components/fieldtypes/ListFieldtype.vue
@@ -171,10 +171,6 @@ export default {
         deleteItem(index) {
             return this.data.splice(index, 1);
         },
-
-        getReplicatorPreviewText() {
-            return this.data.map(item => item.value).join(', ');
-        }
     }
 };
 </script>
diff --git a/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue b/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
index ed0aeba884..91a7b2c9b8 100644
--- a/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
+++ b/resources/js/components/fieldtypes/assets/AssetsFieldtype.vue
@@ -487,14 +487,6 @@ export default {
             this.$refs.uploader.browse();
         },
 
-        getReplicatorPreviewText() {
-            return _.map(this.assets, (asset) => {
-                return asset.is_image ?
-                    `<img src="${asset.thumbnail}" width="20" height="20" title="${asset.basename}" />`
-                    : asset.basename;
-            }).join(', ');
-        },
-
         idChanged(oldId, newId) {
             const index = this.value.indexOf(oldId);
             this.update([...this.value.slice(0, index), newId, ...this.value.slice(index + 1)]);
diff --git a/resources/js/components/fieldtypes/bard/Set.vue b/resources/js/components/fieldtypes/bard/Set.vue
index 3e45bc579c..4dff4eaae0 100644
--- a/resources/js/components/fieldtypes/bard/Set.vue
+++ b/resources/js/components/fieldtypes/bard/Set.vue
@@ -179,9 +179,7 @@ export default {
         },
 
         previewUpdated(handle, value) {
-            let previews = clone(this.previews);
-            previews[handle] = value;
-            this.extension.options.bard.updateSetPreviews(this.node.attrs.id, previews);
+            this.extension.options.bard.updateSetPreviews(this.node.attrs.id, { ...this.previews, [handle]: value });
         },
 
         focused() {

From c77599c0f57a7d1fe4d8ab2853a5e3ae979eba9c Mon Sep 17 00:00:00 2001
From: Jesse Leite <jesseleite@gmail.com>
Date: Wed, 31 Jan 2024 14:38:30 -0500
Subject: [PATCH 071/149] [4.x] Improve the workflow around enabling Statamic
 Pro (#9435)

---
 config/editions.php                      |   2 +-
 src/Console/Commands/ProEnable.php       | 138 +++++++++++++++++++++++
 src/Providers/ConsoleServiceProvider.php |   1 +
 3 files changed, 140 insertions(+), 1 deletion(-)
 create mode 100644 src/Console/Commands/ProEnable.php

diff --git a/config/editions.php b/config/editions.php
index e4839d4c3e..1dbe5994a1 100644
--- a/config/editions.php
+++ b/config/editions.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'pro' => false,
+    'pro' => env('STATAMIC_PRO_ENABLED', false),
 
     'addons' => [
         //
diff --git a/src/Console/Commands/ProEnable.php b/src/Console/Commands/ProEnable.php
new file mode 100644
index 0000000000..8d7f291a8a
--- /dev/null
+++ b/src/Console/Commands/ProEnable.php
@@ -0,0 +1,138 @@
+<?php
+
+namespace Statamic\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Console\ConfirmableTrait;
+use Statamic\Console\EnhancesCommands;
+use Statamic\Console\RunsInPlease;
+
+class ProEnable extends Command
+{
+    use ConfirmableTrait, EnhancesCommands, RunsInPlease;
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'statamic:pro:enable
+        { --force : Force the operation to run when in production }';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Enable Statamic Pro in .env';
+
+    /**
+     * Execute the console command.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        if (! $this->setProInEnvironmentFile()) {
+            return;
+        }
+
+        $this->laravel['config']['statamic.editions.pro'] = true;
+
+        $this->checkInfo('Statamic Pro successfully enabled in .env file!');
+
+        if ($this->configNotReferencingEnv()) {
+            $this->crossLine('Statamic editions config not currently referencing .env file.');
+            $this->comment(PHP_EOL.'For this setting to take effect, please modify your [config/statamic/editions.php] as follows:');
+            $this->line("'pro' => env('STATAMIC_PRO_ENABLED', false)");
+        }
+    }
+
+    /**
+     * Set to pro in the environment file.
+     *
+     * @return bool
+     */
+    protected function setProInEnvironmentFile()
+    {
+        if (! $this->confirmToProceed()) {
+            return false;
+        }
+
+        if ($this->proEnvVarExists()) {
+            $this->ensureProInEnv();
+        } else {
+            $this->appendProToEnv();
+        }
+
+        return true;
+    }
+
+    /**
+     * Check whether the pro env var already exists.
+     *
+     * @return bool
+     */
+    protected function proEnvVarExists()
+    {
+        return preg_match('/^STATAMIC_PRO_ENABLED=/m', $this->envContents());
+    }
+
+    /**
+     * Ensure pro in .env file.
+     *
+     * @return void
+     */
+    protected function ensureProInEnv()
+    {
+        file_put_contents($this->envPath(), preg_replace(
+            '/^STATAMIC_PRO_ENABLED=.*$/m',
+            'STATAMIC_PRO_ENABLED=true',
+            $this->envContents()
+        ));
+    }
+
+    /**
+     * Append pro to end of .env file.
+     *
+     * @return void
+     */
+    protected function appendProToEnv()
+    {
+        file_put_contents($this->envPath(), $this->envContents()."\nSTATAMIC_PRO_ENABLED=true");
+    }
+
+    /**
+     * Get app .env path.
+     *
+     * @return string
+     */
+    protected function envPath()
+    {
+        return $this->laravel->environmentFilePath();
+    }
+
+    /**
+     * Get app .env contents.
+     *
+     * @return string
+     */
+    protected function envContents()
+    {
+        return file_get_contents($this->envPath());
+    }
+
+    /**
+     * Check whether the editions config is referencing the .env var.
+     *
+     * @return bool
+     */
+    protected function configNotReferencingEnv()
+    {
+        if (! file_exists($configPath = config_path('statamic/editions.php'))) {
+            return false;
+        }
+
+        return ! preg_match('/[\'"]pro[\'"]\s*=>\s*env\([\'"]STATAMIC_PRO_ENABLED[\'"]/m', file_get_contents($configPath));
+    }
+}
diff --git a/src/Providers/ConsoleServiceProvider.php b/src/Providers/ConsoleServiceProvider.php
index 9353ccb1ae..7f78a5c6eb 100644
--- a/src/Providers/ConsoleServiceProvider.php
+++ b/src/Providers/ConsoleServiceProvider.php
@@ -46,6 +46,7 @@ class ConsoleServiceProvider extends ServiceProvider
         Commands\ImportGroups::class,
         Commands\ImportRoles::class,
         Commands\ImportUsers::class,
+        Commands\ProEnable::class,
     ];
 
     public function boot()

From 35200d1c8f6ebdd74bf5d3db5b648ddc20a298f9 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 31 Jan 2024 14:55:55 -0500
Subject: [PATCH 072/149] changelog

---
 CHANGELOG.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fef1809c72..3999e245a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,31 @@
 # Release Notes
 
+## 4.47.0 (2024-01-31)
+
+### What's new
+- Allow a custom static caching url store to be specified. [#9405](https://github.com/statamic/cms/issues/9405) by @ryanmitchell
+- Add reset button to color fieldtype. [#9419](https://github.com/statamic/cms/issues/9419) by @duncanmcclean
+- Ability to add inline scripts into the CP. [#9386](https://github.com/statamic/cms/issues/9386) by @jacksleight
+
+### What's improved
+- Improve the workflow around enabling Statamic Pro. [#9435](https://github.com/statamic/cms/issues/9435) by @jesseleite
+- Improve collection Stache watcher performance. [#9302](https://github.com/statamic/cms/issues/9302) by @JohnathonKoster
+- French translations. [#9402](https://github.com/statamic/cms/issues/9402) by @ebeauchamps
+
+### What's fixed
+- Fix issue with set previews in Bard. [#9422](https://github.com/statamic/cms/issues/9422) by @duncanmcclean
+- Improve UX of field conditions builder for select & toggle fields. [#9379](https://github.com/statamic/cms/issues/9379) by @duncanmcclean
+- Don't set termTemplate and template if they are the defaults. [#9421](https://github.com/statamic/cms/issues/9421) by @ryanmitchell
+- Prevent serialization errors with `@nocache` directive when using Blade view components. [#9409](https://github.com/statamic/cms/issues/9409) by @duncanmcclean
+- Fix user wizard error when user blueprint has Bard field. [#9416](https://github.com/statamic/cms/issues/9416) by @jesseleite
+- Hide listing filters when reordering entries. [#9420](https://github.com/statamic/cms/issues/9420) by @duncanmcclean
+- Rename route binding parameter to prevent overlapping. [#9415](https://github.com/statamic/cms/issues/9415) by @duncanmcclean
+- Fix Entries fieldtype tree view on Assets publish form. [#9404](https://github.com/statamic/cms/issues/9404) by @duncanmcclean
+- Fix translations in `nocache` tag. [#9400](https://github.com/statamic/cms/issues/9400) by @duncanmcclean
+- Translate dimension conjunction. [#9393](https://github.com/statamic/cms/issues/9393) by @peimn
+
+
+
 ## 4.46.0 (2024-01-25)
 
 ### What's new

From bffeeddb6a023fc8d6fff73a9eb35df861a636f9 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 31 Jan 2024 16:05:36 -0500
Subject: [PATCH 073/149] [4.x] Implied Statamic route views (#9436)

---
 src/Mixins/Router.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Mixins/Router.php b/src/Mixins/Router.php
index 3dcfc0e7e9..aae71aba42 100644
--- a/src/Mixins/Router.php
+++ b/src/Mixins/Router.php
@@ -3,12 +3,17 @@
 namespace Statamic\Mixins;
 
 use Statamic\Http\Controllers\FrontendController;
+use Statamic\Support\Str;
 
 class Router
 {
     public function statamic()
     {
-        return function ($uri, $view, $data = []) {
+        return function ($uri, $view = null, $data = []) {
+            if (! $view) {
+                $view = Str::of($uri)->ltrim('/');
+            }
+
             return $this->get($uri, [FrontendController::class, 'route'])
                 ->defaults('view', $view)
                 ->defaults('data', $data);

From 2116fa2d4934bc513a9dd7e84a905d5a3c6890b3 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Thu, 1 Feb 2024 16:35:11 +0000
Subject: [PATCH 074/149] [4.x] Ensure template and termTemplate are accessed
 correctly in Taxonomy controller (#9444)

---
 .../Controllers/CP/Taxonomies/TaxonomiesController.php |  4 ++--
 src/Taxonomies/Taxonomy.php                            | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Http/Controllers/CP/Taxonomies/TaxonomiesController.php b/src/Http/Controllers/CP/Taxonomies/TaxonomiesController.php
index 82cb5289bb..e3c19a43b7 100644
--- a/src/Http/Controllers/CP/Taxonomies/TaxonomiesController.php
+++ b/src/Http/Controllers/CP/Taxonomies/TaxonomiesController.php
@@ -133,8 +133,8 @@ public function edit($taxonomy)
             'collections' => $taxonomy->collections()->map->handle()->all(),
             'sites' => $taxonomy->sites()->all(),
             'preview_targets' => $taxonomy->basePreviewTargets(),
-            'term_template' => $taxonomy->termTemplate,
-            'template' => $taxonomy->template,
+            'term_template' => $taxonomy->hasCustomTermTemplate() ? $taxonomy->termTemplate() : null,
+            'template' => $taxonomy->hasCustomTemplate() ? $taxonomy->template() : null,
             'layout' => $taxonomy->layout(),
         ];
 
diff --git a/src/Taxonomies/Taxonomy.php b/src/Taxonomies/Taxonomy.php
index 9b689730de..f9905c148c 100644
--- a/src/Taxonomies/Taxonomy.php
+++ b/src/Taxonomies/Taxonomy.php
@@ -518,4 +518,14 @@ private function previewTargetsForFile()
             ];
         })->filter()->values()->all();
     }
+
+    public function hasCustomTemplate()
+    {
+        return $this->template !== null;
+    }
+
+    public function hasCustomTermTemplate()
+    {
+        return $this->termTemplate !== null;
+    }
 }

From 7e7eef3f8095b8e2a22c1c1184a7bc7e92250da0 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Thu, 1 Feb 2024 19:56:52 +0000
Subject: [PATCH 075/149] [4.x] Tidy up replicator field styles to match
 "normal" fields (#9446)

---
 resources/js/components/fieldtypes/replicator/Field.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/js/components/fieldtypes/replicator/Field.vue b/resources/js/components/fieldtypes/replicator/Field.vue
index a2fd3c43ef..b0f5a0528b 100644
--- a/resources/js/components/fieldtypes/replicator/Field.vue
+++ b/resources/js/components/fieldtypes/replicator/Field.vue
@@ -9,7 +9,7 @@
         </label>
 
         <div
-            class="help-block"
+            class="help-block" :class="{ '-mt-2': showLabel }"
             v-if="instructions && field.instructions_position !== 'below'"
             v-html="instructions" />
 
@@ -37,7 +37,7 @@
             v-html="instructions" />
 
         <div v-if="hasError">
-            <small class="help-block text-red-500 mt-2" v-for="(error, i) in errors" :key="i" v-text="error" />
+            <small class="help-block text-red-500 mt-2 mb-0" v-for="(error, i) in errors" :key="i" v-text="error" />
         </div>
 
     </div>

From 5c8b65e36068c6d4ed1dfd430570c717f785e974 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 2 Feb 2024 11:04:49 -0500
Subject: [PATCH 076/149] [4.x] Revert Stache watcher performance PR (#9448)

---
 src/Stache/Stores/CollectionsStore.php |  2 --
 src/Stache/Stores/Store.php            |  5 ++--
 src/Stache/Traverser.php               | 33 ++------------------------
 3 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/src/Stache/Stores/CollectionsStore.php b/src/Stache/Stores/CollectionsStore.php
index b3cf9ebe6d..e43f8da720 100644
--- a/src/Stache/Stores/CollectionsStore.php
+++ b/src/Stache/Stores/CollectionsStore.php
@@ -12,8 +12,6 @@
 
 class CollectionsStore extends BasicStore
 {
-    protected $traverseRecursively = false;
-
     public function key()
     {
         return 'collections';
diff --git a/src/Stache/Stores/Store.php b/src/Stache/Stores/Store.php
index d336ee768d..41dc66bc9f 100644
--- a/src/Stache/Stores/Store.php
+++ b/src/Stache/Stores/Store.php
@@ -22,7 +22,6 @@ abstract class Store
     protected $storeIndexes = [];
     protected $usedIndexes;
     protected $fileChangesHandled = false;
-    protected $traverseRecursively = true;
     protected $paths;
     protected $fileItems;
     protected $shouldCacheFileItems = false;
@@ -181,7 +180,7 @@ public function handleFileChanges()
         $existing = collect(Cache::get($cacheKey, []));
 
         // Get the files and timestamps from the filesystem right now.
-        $files = Traverser::filter([$this, 'getItemFilter'])->traverse($this, $this->traverseRecursively);
+        $files = Traverser::filter([$this, 'getItemFilter'])->traverse($this);
 
         // Cache the files and timestamps, ready for comparisons on the next request.
         // We'll do it now since there are multiple early returns coming up.
@@ -293,7 +292,7 @@ public function paths()
             return $this->paths = collect($paths);
         }
 
-        $files = Traverser::filter([$this, 'getItemFilter'])->traverse($this, $this->traverseRecursively);
+        $files = Traverser::filter([$this, 'getItemFilter'])->traverse($this);
 
         $fileItems = $files->map(function ($timestamp, $path) {
             return [
diff --git a/src/Stache/Traverser.php b/src/Stache/Traverser.php
index 9a1fb6bcc4..84723f0534 100644
--- a/src/Stache/Traverser.php
+++ b/src/Stache/Traverser.php
@@ -2,13 +2,8 @@
 
 namespace Statamic\Stache;
 
-use DirectoryIterator;
-use FilesystemIterator;
 use Illuminate\Filesystem\Filesystem;
-use RecursiveDirectoryIterator;
-use RecursiveIteratorIterator;
 use Statamic\Facades\Path;
-use Symfony\Component\Finder\SplFileInfo;
 
 class Traverser
 {
@@ -20,7 +15,7 @@ public function __construct(Filesystem $filesystem)
         $this->filesystem = $filesystem;
     }
 
-    public function traverse($store, $recursive = true)
+    public function traverse($store)
     {
         if (! $dir = $store->directory()) {
             throw new \Exception("Store [{$store->key()}] does not have a directory defined.");
@@ -32,7 +27,7 @@ public function traverse($store, $recursive = true)
             return collect();
         }
 
-        $files = collect($this->getFiles($dir, $recursive));
+        $files = collect($this->filesystem->allFiles($dir));
 
         if ($this->filter) {
             $files = $files->filter($this->filter);
@@ -50,28 +45,4 @@ public function filter($filter)
 
         return $this;
     }
-
-    private function getFiles($dir, $recursive)
-    {
-        $files = [];
-
-        if ($recursive) {
-            $iterator = new RecursiveIteratorIterator(
-                new RecursiveDirectoryIterator($dir, FilesystemIterator::SKIP_DOTS | FilesystemIterator::CURRENT_AS_SELF),
-                RecursiveIteratorIterator::CHILD_FIRST
-            );
-        } else {
-            $iterator = new DirectoryIterator($dir);
-        }
-
-        foreach ($iterator as $fileInfo) {
-            if ($fileInfo->isDir() || $fileInfo->getFilename()[0] === '.') {
-                continue;
-            }
-
-            $files[] = new SplFileInfo($fileInfo->getPathname(), $fileInfo->getPath(), $fileInfo->getFilename());
-        }
-
-        return $files;
-    }
 }

From b9d3eea9742ce1cf9f191d4bf7cfa09e7054c466 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Fri, 2 Feb 2024 17:53:57 +0000
Subject: [PATCH 077/149] [4.x] Fix timeout when using nocache tag (#9449)

---
 src/StaticCaching/NoCache/Region.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/StaticCaching/NoCache/Region.php b/src/StaticCaching/NoCache/Region.php
index 851da04fec..52686d9b60 100644
--- a/src/StaticCaching/NoCache/Region.php
+++ b/src/StaticCaching/NoCache/Region.php
@@ -37,7 +37,7 @@ protected function filterContext(array $context)
 
                 return $value;
             })
-            ->toArray();
+            ->all();
 
         return $this->arrayRecursiveDiff($context, $this->session->cascade());
     }

From 4e595a8a7327ae06c64fa2560718b7328fe89751 Mon Sep 17 00:00:00 2001
From: Peiman Nourani <nourani.peiman@gmail.com>
Date: Fri, 2 Feb 2024 23:16:38 +0330
Subject: [PATCH 078/149] [4.x] Translate more untranslated strings (#9451)

---
 resources/views/utilities/phpinfo.blade.php | 2 +-
 src/CP/Utilities/CoreUtilities.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/utilities/phpinfo.blade.php b/resources/views/utilities/phpinfo.blade.php
index 724fb105e9..b91ad7d4ce 100644
--- a/resources/views/utilities/phpinfo.blade.php
+++ b/resources/views/utilities/phpinfo.blade.php
@@ -14,7 +14,7 @@
     <div class="card p-0">
         <table class="data-table">
             <tr>
-                <th class="pl-4 py-2 w-1/4">PHP Version</th>
+                <th class="pl-4 py-2 w-1/4">{{ __('PHP Version') }}</th>
                 <td>{{ PHP_VERSION }}</td>
             </tr>
         </table>
diff --git a/src/CP/Utilities/CoreUtilities.php b/src/CP/Utilities/CoreUtilities.php
index 3f284daca1..4d8318a1a0 100644
--- a/src/CP/Utilities/CoreUtilities.php
+++ b/src/CP/Utilities/CoreUtilities.php
@@ -68,7 +68,7 @@ public static function boot()
         if (config('statamic.git.enabled') && Statamic::pro()) {
             Utility::register('git')
                 ->action([GitController::class, 'index'])
-                ->title('Git')
+                ->title(__('Git'))
                 ->icon('git')
                 ->description(__('statamic::messages.git_utility_description'))
                 ->docsUrl(Statamic::docsUrl('utilities/git'))

From be26a94a9d9f33569485a759239488437cb8e68e Mon Sep 17 00:00:00 2001
From: Jonas Siewertsen <jonas@pingu-solutions.com>
Date: Mon, 5 Feb 2024 17:15:10 +0100
Subject: [PATCH 079/149] [4.x] Remove Typo inside UserProvider (#9459)

---
 src/Auth/UserProvider.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Auth/UserProvider.php b/src/Auth/UserProvider.php
index d7ce4a9dcc..229456f1fa 100644
--- a/src/Auth/UserProvider.php
+++ b/src/Auth/UserProvider.php
@@ -21,7 +21,7 @@ public function retrieveById($identifier)
     }
 
     /**
-     * Retrieve a user by by their unique identifier and "remember me" token.
+     * Retrieve a user by their unique identifier and "remember me" token.
      *
      * @param  mixed  $identifier
      * @param  string  $token

From 822e5ee8f6e84644ae4123d6fb1cdd573fafbba9 Mon Sep 17 00:00:00 2001
From: Sylvester Damgaard <syda@tv2reg.dk>
Date: Tue, 6 Feb 2024 16:18:21 +0100
Subject: [PATCH 080/149] [4.x] Make tags macroable (#9466)

---
 src/Tags/Tags.php       | 13 ++++++++++++-
 tests/Tags/LinkTest.php | 11 +++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/Tags/Tags.php b/src/Tags/Tags.php
index f21515e77b..ac43708882 100644
--- a/src/Tags/Tags.php
+++ b/src/Tags/Tags.php
@@ -2,6 +2,7 @@
 
 namespace Statamic\Tags;
 
+use Illuminate\Support\Traits\Macroable;
 use Statamic\Extend\HasAliases;
 use Statamic\Extend\HasHandle;
 use Statamic\Extend\RegistersItself;
@@ -10,7 +11,7 @@
 
 abstract class Tags
 {
-    use HasAliases, HasHandle, RegistersItself;
+    use HasAliases, HasHandle, Macroable, RegistersItself;
 
     protected static $binding = 'tags';
 
@@ -133,6 +134,16 @@ public function __call($method, $args)
             throw new \BadMethodCallException("Call to undefined method {$method}.");
         }
 
+        if (static::hasMacro($method)) {
+            $macro = static::$macros[$method];
+
+            if ($macro instanceof Closure) {
+                $macro = $macro->bindTo($this, static::class);
+            }
+
+            return $macro(...$args);
+        }
+
         $this->wildcardHandled = true;
 
         return $this->{$this->wildcardMethod}($this->method);
diff --git a/tests/Tags/LinkTest.php b/tests/Tags/LinkTest.php
index 6c56526078..0720231f5e 100644
--- a/tests/Tags/LinkTest.php
+++ b/tests/Tags/LinkTest.php
@@ -5,6 +5,7 @@
 use Statamic\Facades\Data;
 use Statamic\Facades\Parse;
 use Statamic\Facades\Site;
+use Statamic\Tags\Link;
 use Tests\TestCase;
 
 class LinkTest extends TestCase
@@ -150,4 +151,14 @@ public function it_outputs_nothing_if_data_doesnt_exist()
 
         $this->assertEquals('', $this->tag('{{ link:123 }}'));
     }
+
+    /** @test */
+    public function it_outputs_statamic_website_using_macroable()
+    {
+        Link::macro('statamic', function () {
+            return 'https://www.statamic.com';
+        });
+
+        $this->assertEquals('https://www.statamic.com', $this->tag('{{ link:statamic }}'));
+    }
 }

From 210103520483ee574937fba4386f0747d910f368 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 6 Feb 2024 10:25:10 -0500
Subject: [PATCH 081/149] [4.x] Add sites to support details output (#9461)

---
 src/Providers/AppServiceProvider.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/Providers/AppServiceProvider.php b/src/Providers/AppServiceProvider.php
index b01fb5261a..dfa8af930c 100644
--- a/src/Providers/AppServiceProvider.php
+++ b/src/Providers/AppServiceProvider.php
@@ -10,6 +10,7 @@
 use Statamic\Facades;
 use Statamic\Facades\Addon;
 use Statamic\Facades\Preference;
+use Statamic\Facades\Site;
 use Statamic\Facades\Token;
 use Statamic\Sites\Sites;
 use Statamic\Statamic;
@@ -191,10 +192,26 @@ protected function addAboutCommandInfo()
             'Addons' => $addons->count(),
             'Stache Watcher' => config('statamic.stache.watcher') ? 'Enabled' : 'Disabled',
             'Static Caching' => config('statamic.static_caching.strategy') ?: 'Disabled',
+            'Sites' => fn () => $this->sitesAboutCommandInfo(),
         ]);
 
         foreach ($addons as $addon) {
             AboutCommand::add('Statamic Addons', $addon->package(), $addon->version());
         }
     }
+
+    private function sitesAboutCommandInfo()
+    {
+        if (($sites = Site::all())->count() === 1) {
+            return 1;
+        }
+
+        // If there are 5 or fewer sites, list all their names.
+        // If there are more than 5, list the first 3 and append "and n more".
+        $summary = $sites->count() <= 5
+            ? $sites->map->name()->join(', ')
+            : $sites->take(3)->map->name()->join(', ').', and '.($sites->count() - 3).' more';
+
+        return $sites->count().' ('.$summary.')';
+    }
 }

From 2132729cf4113cd7bfdf97fff03142021481c232 Mon Sep 17 00:00:00 2001
From: Jack Sleight <jacksleight@gmail.com>
Date: Tue, 6 Feb 2024 20:22:49 +0000
Subject: [PATCH 082/149] [4.x] Allow custom Echo client configuration (#9464)

---
 resources/js/components/Echo.js            | 9 ++++++++-
 src/Providers/BroadcastServiceProvider.php | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/Echo.js b/resources/js/components/Echo.js
index f7ce027137..57684c8547 100644
--- a/resources/js/components/Echo.js
+++ b/resources/js/components/Echo.js
@@ -5,15 +5,20 @@ window.Pusher = Pusher;
 class Echo {
 
     constructor() {
+        this.configCallbacks = [];
         this.bootedCallbacks = [];
     }
 
+    config(callback) {
+        this.configCallbacks.push(callback);
+    }
+
     booted(callback) {
         this.bootedCallbacks.push(callback);
     }
 
     start() {
-        const config = {
+        let config = {
             broadcaster: 'pusher',
             key: Statamic.$config.get('broadcasting.pusher.key'),
             cluster: Statamic.$config.get('broadcasting.pusher.cluster'),
@@ -22,6 +27,8 @@ class Echo {
             authEndpoint: Statamic.$config.get('broadcasting.endpoint'),
         };
 
+        this.configCallbacks.forEach(callback => config = callback(config));
+
         this.echo = new LaravelEcho(config);
 
         this.bootedCallbacks.forEach(callback => callback(this));
diff --git a/src/Providers/BroadcastServiceProvider.php b/src/Providers/BroadcastServiceProvider.php
index dd3e1da1c7..dfad2c9566 100755
--- a/src/Providers/BroadcastServiceProvider.php
+++ b/src/Providers/BroadcastServiceProvider.php
@@ -24,6 +24,9 @@ protected function variables()
                 'key' => config('broadcasting.connections.pusher.key'),
                 'cluster' => config('broadcasting.connections.pusher.options.cluster'),
                 'encrypted' => config('broadcasting.connections.pusher.options.encrypted'),
+                'scheme' => config('broadcasting.connections.pusher.options.scheme'),
+                'host' => config('broadcasting.connections.pusher.options.host'),
+                'port' => config('broadcasting.connections.pusher.options.port'),
             ],
         ];
     }

From c2495fadb0dc7de3ac9598299893486d54d0e1e8 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 6 Feb 2024 15:31:12 -0500
Subject: [PATCH 083/149] [4.x] Fix unit translations (#9472)

---
 src/Support/Str.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Support/Str.php b/src/Support/Str.php
index a6fb9d3b61..9296cdc3a6 100644
--- a/src/Support/Str.php
+++ b/src/Support/Str.php
@@ -139,23 +139,23 @@ public static function deslugify($string)
     public static function fileSizeForHumans($bytes, $decimals = 2)
     {
         if ($bytes >= 1073741824) {
-            return trans_choice('statamic::messages.units.GB', number_format($bytes / 1073741824, $decimals));
+            return trans('statamic::messages.units.GB', ['count' => number_format($bytes / 1073741824, $decimals)]);
         } elseif ($bytes >= 1048576) {
-            return trans_choice('statamic::messages.units.MB', number_format($bytes / 1048576, $decimals));
+            return trans('statamic::messages.units.MB', ['count' => number_format($bytes / 1048576, $decimals)]);
         } elseif ($bytes >= 1024) {
-            return trans_choice('statamic::messages.units.KB', number_format($bytes / 1024, $decimals));
+            return trans('statamic::messages.units.KB', ['count' => number_format($bytes / 1024, $decimals)]);
         }
 
-        return trans_choice('statamic::messages.units.B', $bytes);
+        return trans('statamic::messages.units.B', ['count' => $bytes]);
     }
 
     public static function timeForHumans($ms)
     {
         if ($ms < 1000) {
-            return trans_choice('statamic::messages.units.ms', $ms);
+            return trans('statamic::messages.units.ms', ['count' => $ms]);
         }
 
-        return trans_choice('statamic::messages.units.s', round($ms / 1000, 2));
+        return trans('statamic::messages.units.s', ['count' => round($ms / 1000, 2)]);
     }
 
     /**

From f3e1adee776b7ae716e9fb5564cf32d6b295a021 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 6 Feb 2024 15:50:42 -0500
Subject: [PATCH 084/149] changelog

---
 CHANGELOG.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3999e245a5..a018408982 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Release Notes
 
+## 4.48.0 (2024-02-06)
+
+### What's new
+- Ability to customize Echo client configuration. [#9464](https://github.com/statamic/cms/issues/9464) by @jacksleight
+- Tags are macroable. [#9466](https://github.com/statamic/cms/issues/9466) by @SylvesterDamgaard
+- Statamic route views can be implied. [#9436](https://github.com/statamic/cms/issues/9436) by @jasonvarga
+- Add sites to support details output. [#9461](https://github.com/statamic/cms/issues/9461) by @jasonvarga
+
+### What's fixed
+- Fix unit translations. [#9472](https://github.com/statamic/cms/issues/9472) by @jasonvarga
+- Remove typo inside UserProvider. [#9459](https://github.com/statamic/cms/issues/9459) by @jonassiewertsen
+- Translate more untranslated strings. [#9451](https://github.com/statamic/cms/issues/9451) by @peimn
+- Fix timeout when using `nocache` tag. [#9449](https://github.com/statamic/cms/issues/9449) by @duncanmcclean
+- Revert Stache watcher performance PR. [#9448](https://github.com/statamic/cms/issues/9448) by @jasonvarga
+- Tidy up replicator field styles to match normal fields. [#9446](https://github.com/statamic/cms/issues/9446) by @duncanmcclean
+- Ensure template and termTemplate are accessed correctly in Taxonomy controller. [#9444](https://github.com/statamic/cms/issues/9444) by @ryanmitchell
+
+
+
 ## 4.47.0 (2024-01-31)
 
 ### What's new

From 18be44ed7000ebc0aa22063ceae96bbec67eea38 Mon Sep 17 00:00:00 2001
From: Emmanuel Beauchamps <e.bops@hotmail.fr>
Date: Wed, 7 Feb 2024 17:39:12 +0100
Subject: [PATCH 085/149] [4.x] French translations (#9476)

---
 resources/lang/fr.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/fr.json b/resources/lang/fr.json
index 063af08d04..d48d3a70a7 100644
--- a/resources/lang/fr.json
+++ b/resources/lang/fr.json
@@ -452,6 +452,7 @@
     "Future Date Behavior": "Comportement si date future",
     "General": "Général",
     "Generate": "Générer",
+    "Git": "Git",
     "Global Search": "Recherche globale",
     "Global Set created": "Jeu de globales créé",
     "Global Set deleted": "Jeu de globales supprimé",
@@ -645,6 +646,7 @@
     "Open Dropdown": "Ouvrir le menu déroulant",
     "Open in a new window": "Ouvrir dans une nouvelle fenêtre",
     "Open in new window": "Ouvrir dans une nouvelle fenetre",
+    "Option": "Option",
     "Optional": "Optionnelle",
     "Options": "Options",
     "or": "ou",
@@ -672,6 +674,7 @@
     "Permissions": "Permissions",
     "Phone": "Téléphone",
     "PHP Info": "Info PHP",
+    "PHP Version": "Version PHP",
     "Pick Color": "Choisir une couleur",
     "Pin to Favorites": "Épingler aux Favoris",
     "Pin to Top Level": "Epingler au niveau supérieur",

From b4b200b5a11dc5535a316b9ee7a844ab83872f71 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 7 Feb 2024 15:31:55 -0500
Subject: [PATCH 086/149] [4.x] Fix updates badge (#9477)

---
 resources/views/nav/updates.blade.php         | 2 +-
 resources/views/partials/nav-main.blade.php   | 6 +++---
 resources/views/partials/nav-mobile.blade.php | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/resources/views/nav/updates.blade.php b/resources/views/nav/updates.blade.php
index e09b99e867..8569c1ecbe 100644
--- a/resources/views/nav/updates.blade.php
+++ b/resources/views/nav/updates.blade.php
@@ -1,6 +1,6 @@
 <li class="{{ $item->isActive() ? 'current' : '' }}">
     <a href="{{ $item->url() }}">
-        <i>{!! $item->icon() !!}</i><span>{{ __($item->name()) }}</span>
+        <i>{!! $item->icon() !!}</i><span v-pre>{{ __($item->name()) }}</span>
         <updates-badge class="ml-2"></updates-badge>
     </a>
 </li>
diff --git a/resources/views/partials/nav-main.blade.php b/resources/views/partials/nav-main.blade.php
index fe4b03d51c..6e4dda8227 100644
--- a/resources/views/partials/nav-main.blade.php
+++ b/resources/views/partials/nav-main.blade.php
@@ -2,15 +2,15 @@
 
 @section('nav-main')
     <nav class="nav-main" v-cloak>
-        <div class="nav-main-inner" v-pre>
+        <div class="nav-main-inner">
             @foreach ($nav as $section)
                 @if ($section['display'] !== 'Top Level')
-                    <h6>{{ __($section['display']) }}</h6>
+                    <h6 v-pre>{{ __($section['display']) }}</h6>
                 @endif
                 <ul class="nav-section-{{ Statamic\Support\Str::slug($section['display']) }}">
                     @foreach ($section['items'] as $item)
                         @unless ($item->view())
-                            <li class="{{ $item->isActive() ? 'current' : '' }}">
+                            <li class="{{ $item->isActive() ? 'current' : '' }}" v-pre>
                                 <a href="{{ $item->url() }}" {{ $item->attributes() }}>
                                     <i>{!! $item->icon() !!}</i><span>{{ __($item->name()) }}</span>
                                 </a>
diff --git a/resources/views/partials/nav-mobile.blade.php b/resources/views/partials/nav-mobile.blade.php
index 2f116f6e72..4190aad2df 100644
--- a/resources/views/partials/nav-mobile.blade.php
+++ b/resources/views/partials/nav-mobile.blade.php
@@ -1,15 +1,15 @@
 @php use function Statamic\trans as __; @endphp
 
 <nav class="nav-main nav-mobile" v-cloak>
-    <div class="nav-main-inner" v-pre>
+    <div class="nav-main-inner">
         @foreach ($nav as $section)
             @if ($section['display'] !== 'Top Level')
-                <h6>{{ __($section['display']) }}</h6>
+                <h6 v-pre>{{ __($section['display']) }}</h6>
             @endif
             <ul>
                 @foreach ($section['items'] as $item)
                     @unless ($item->view())
-                        <li class="{{ $item->isActive() ? 'current' : '' }}">
+                        <li class="{{ $item->isActive() ? 'current' : '' }}" v-pre>
                             <a href="{{ $item->url() }}">
                                 <i>{!! $item->icon() !!}</i><span>{{ __($item->name()) }}</span>
                             </a>

From cad33954901f9b5f9a949fef0d50f236c98270a8 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 7 Feb 2024 16:21:29 -0500
Subject: [PATCH 087/149] [4.x] Fix update counter (#9479)

---
 resources/js/components/UpdatesBadge.vue      | 45 +++++++++++++------
 .../CP/Updater/UpdaterController.php          |  2 +-
 src/Updater/UpdatesOverview.php               | 20 ++++-----
 3 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/resources/js/components/UpdatesBadge.vue b/resources/js/components/UpdatesBadge.vue
index d33a84502c..47424fa03f 100644
--- a/resources/js/components/UpdatesBadge.vue
+++ b/resources/js/components/UpdatesBadge.vue
@@ -6,28 +6,45 @@
 
 <script>
     export default {
-        data() {
-            return {
-                count: 0,
-            };
-        },
 
-        mounted() {
-            this.getCount();
+        computed: {
+            count() {
+                return this.$store.state.updates.count;
+            }
         },
 
         created() {
-            this.$events.$on('recount-updates', this.getCount);
+            this.registerVuexModule();
+
+            this.getCount();
         },
 
         methods: {
-            getCount(clearCache = true) {
-                let params = clearCache ? {'clearCache': clearCache} : {};
+            registerVuexModule() {
+                if (this.$store.state.updates) return;
 
-                this.$axios.get(cp_url('updater/count'), params).then(response => {
-                    this.count = !isNaN(response.data) ? response.data : 0;
-                });
-            }
+                this.$store.registerModule('updates', {
+                    namespaced: true,
+                    state: {
+                        count: 0,
+                        requested: false,
+                    },
+                    mutations: {
+                        count: (state, count) => state.count = count,
+                        requested: (state) => state.requested = true,
+                    }
+                })
+            },
+
+            getCount() {
+                if (this.$store.state.updates.requested) return;
+
+                this.$axios
+                    .get(cp_url('updater/count'))
+                    .then(response => this.$store.commit('updates/count', !isNaN(response.data) ? response.data : 0));
+
+                this.$store.commit('updates/requested');
+            },
         }
     }
 </script>
diff --git a/src/Http/Controllers/CP/Updater/UpdaterController.php b/src/Http/Controllers/CP/Updater/UpdaterController.php
index 5609acb792..c907479f9e 100644
--- a/src/Http/Controllers/CP/Updater/UpdaterController.php
+++ b/src/Http/Controllers/CP/Updater/UpdaterController.php
@@ -40,7 +40,7 @@ public function count(Request $request)
     {
         $this->authorize('view updates');
 
-        return UpdatesOverview::count($request->input('clearCache', false));
+        return UpdatesOverview::count();
     }
 
     /**
diff --git a/src/Updater/UpdatesOverview.php b/src/Updater/UpdatesOverview.php
index ed65276322..10dd74809a 100644
--- a/src/Updater/UpdatesOverview.php
+++ b/src/Updater/UpdatesOverview.php
@@ -18,46 +18,42 @@ class UpdatesOverview
     /**
      * Get updates count.
      *
-     * @param  bool  $clearCache
      * @return int
      */
-    public function count($clearCache = false)
+    public function count()
     {
-        return $this->getCached('updates-overview.count', $clearCache);
+        return $this->getCached('updates-overview.count');
     }
 
     /**
      * Check if statamic update is available.
      *
-     * @param  bool  $clearCache
      * @return bool
      */
-    public function hasStatamicUpdate($clearCache = false)
+    public function hasStatamicUpdate()
     {
-        return $this->getCached('updates-overview.statamic', $clearCache);
+        return $this->getCached('updates-overview.statamic');
     }
 
     /**
      * List updatable addons.
      *
-     * @param  bool  $clearCache
      * @return array
      */
-    public function updatableAddons($clearCache = false)
+    public function updatableAddons()
     {
-        return $this->getCached('updates-overview.addons', $clearCache);
+        return $this->getCached('updates-overview.addons');
     }
 
     /**
      * Get value from cache.
      *
      * @param  string  $key
-     * @param  bool  $clearCache
      * @return mixed
      */
-    public function getCached($key, $clearCache = false)
+    public function getCached($key)
     {
-        if (! Cache::has($key) || $clearCache) {
+        if (! Cache::has($key)) {
             $this->checkAndCache();
         }
 

From 04e4830799b2ada001b25ad297c1d7971be6c13a Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Thu, 8 Feb 2024 14:36:25 +0000
Subject: [PATCH 088/149] [4.x] Allow namespace to be passed in
 Blueprint::make() (#9484)

---
 src/Fields/BlueprintRepository.php       | 9 +++++++++
 tests/Fields/BlueprintRepositoryTest.php | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/src/Fields/BlueprintRepository.php b/src/Fields/BlueprintRepository.php
index 3dbcdef92b..4375b55c64 100644
--- a/src/Fields/BlueprintRepository.php
+++ b/src/Fields/BlueprintRepository.php
@@ -130,6 +130,15 @@ public function make($handle = null)
         $blueprint = new Blueprint;
 
         if ($handle) {
+            $handle = explode('::', $handle);
+
+            if (count($handle) > 1) {
+                $namespace = array_shift($handle);
+                $blueprint->setNamespace($namespace);
+            }
+
+            $handle = implode('::', $handle);
+
             $blueprint->setHandle($handle);
         }
 
diff --git a/tests/Fields/BlueprintRepositoryTest.php b/tests/Fields/BlueprintRepositoryTest.php
index d5ab307d03..7e91f93647 100644
--- a/tests/Fields/BlueprintRepositoryTest.php
+++ b/tests/Fields/BlueprintRepositoryTest.php
@@ -293,4 +293,13 @@ public function it_returns_empty_collection_if_directory_doesnt_exist()
         $this->assertInstanceOf(Collection::class, $all);
         $this->assertCount(0, $all);
     }
+
+    /** @test */
+    public function it_sets_the_namespace_when_passed_when_making()
+    {
+        $blueprint = $this->repo->make('test::handle');
+
+        $this->assertSame($blueprint->namespace(), 'test');
+        $this->assertSame($blueprint->handle(), 'handle');
+    }
 }

From ff10717927d73077d668aaaf869b56007a514c81 Mon Sep 17 00:00:00 2001
From: Jack Sleight <jacksleight@gmail.com>
Date: Thu, 8 Feb 2024 17:05:41 +0000
Subject: [PATCH 089/149] [4.x] Make `BlueprintRepository` a singleton (#9489)

---
 src/Providers/AppServiceProvider.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Providers/AppServiceProvider.php b/src/Providers/AppServiceProvider.php
index dfa8af930c..8c9caaa528 100644
--- a/src/Providers/AppServiceProvider.php
+++ b/src/Providers/AppServiceProvider.php
@@ -135,7 +135,7 @@ public function register()
                 ->setRepository('user', \Statamic\Contracts\Auth\UserRepository::class);
         });
 
-        $this->app->bind(\Statamic\Fields\BlueprintRepository::class, function () {
+        $this->app->singleton(\Statamic\Fields\BlueprintRepository::class, function () {
             return (new \Statamic\Fields\BlueprintRepository)
                 ->setDirectory(resource_path('blueprints'))
                 ->setFallback('default', function () {

From b1bb52bcd6b20e5b33db73f945c9124fe7dec9b9 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Thu, 8 Feb 2024 17:05:55 +0000
Subject: [PATCH 090/149] [4.x] Actually run tests on Windows in GitHub Actions
 (#9482)

---
 .github/workflows/tests.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d43228ec3e..4a39621236 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -40,7 +40,7 @@ jobs:
 
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v41
+        uses: tj-actions/changed-files@v42
         with:
           files: |
             config
@@ -58,7 +58,9 @@ jobs:
       - name: Determine whether tests should run
         id: should-run-tests
         if: steps.changed-files.outputs.any_modified == 'true' || github.event_name == 'schedule'
-        run: echo "result=true" >> $GITHUB_OUTPUT
+        run: |
+          echo "result=true" >> $GITHUB_OUTPUT
+          echo "result=true" >> $env:GITHUB_OUTPUT
 
       - name: Update apt sources
         if: steps.should-run-tests.outputs.result == 'true' && matrix.os == 'ubuntu-latest'
@@ -108,16 +110,19 @@ jobs:
 
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v41
+        uses: tj-actions/changed-files@v42
         with:
           files: |
             **.{js,vue,ts}
             package.json
+            .github/workflows/tests.yml
 
       - name: Determine whether tests should run
         id: should-run-tests
         if: steps.changed-files.outputs.any_modified == 'true' || github.event_name == 'schedule'
-        run: echo "result=true" >> $GITHUB_OUTPUT
+        run: |
+          echo "result=true" >> $GITHUB_OUTPUT
+          echo "result=true" >> $env:GITHUB_OUTPUT
 
       - name: Install required npm version
         if: steps.should-run-tests.outputs.result == 'true'

From f77064c981d8a88f89bcf168b4d7e441e9c96c88 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Thu, 8 Feb 2024 19:45:32 +0000
Subject: [PATCH 091/149] [4.x] Localize entry & term fields in Taxonomy Term
 GraphQL queries (#9492)

---
 src/Fieldtypes/Entries.php | 3 ++-
 src/Fieldtypes/Terms.php   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Fieldtypes/Entries.php b/src/Fieldtypes/Entries.php
index f29272c518..f6306e6808 100644
--- a/src/Fieldtypes/Entries.php
+++ b/src/Fieldtypes/Entries.php
@@ -23,6 +23,7 @@
 use Statamic\Search\Index;
 use Statamic\Search\Result;
 use Statamic\Support\Arr;
+use Statamic\Taxonomies\LocalizedTerm;
 
 class Entries extends Relationship
 {
@@ -321,7 +322,7 @@ protected function collect($value)
     public function augment($values)
     {
         $site = Site::current()->handle();
-        if (($parent = $this->field()->parent()) && $parent instanceof Localization) {
+        if (($parent = $this->field()->parent()) && ($parent instanceof Localization || $parent instanceof LocalizedTerm)) {
             $site = $parent->locale();
         }
 
diff --git a/src/Fieldtypes/Terms.php b/src/Fieldtypes/Terms.php
index 4a9bef98a5..51884e22bd 100644
--- a/src/Fieldtypes/Terms.php
+++ b/src/Fieldtypes/Terms.php
@@ -22,6 +22,7 @@
 use Statamic\Query\Scopes\Filters\Fields\Terms as TermsFilter;
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
+use Statamic\Taxonomies\LocalizedTerm;
 
 class Terms extends Relationship
 {
@@ -111,7 +112,7 @@ public function augment($values)
         // entry, but could also be something else, like another taxonomy term.
         $parent = $this->field->parent();
 
-        $site = $parent && $parent instanceof Localization
+        $site = $parent && ($parent instanceof Localization || $parent instanceof LocalizedTerm)
             ? $parent->locale()
             : Site::current()->handle(); // Use the "current" site so this will get localized appropriately on the front-end.
 

From b2b45468c89007d205dac34c6efd4a56a8c4b4f7 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Fri, 9 Feb 2024 15:08:15 +0000
Subject: [PATCH 092/149] [4.x] Include honeypot in Alpine.js form data (#9498)

---
 src/Forms/JsDrivers/AbstractJsDriver.php       | 1 +
 tests/Tags/Form/FormCreateAlpineTest.php       | 8 ++++++--
 tests/Tags/Form/FormCreateCustomDriverTest.php | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Forms/JsDrivers/AbstractJsDriver.php b/src/Forms/JsDrivers/AbstractJsDriver.php
index 075f621f65..a864d196ae 100644
--- a/src/Forms/JsDrivers/AbstractJsDriver.php
+++ b/src/Forms/JsDrivers/AbstractJsDriver.php
@@ -136,6 +136,7 @@ protected function getInitialFormData()
             ->fields()
             ->preProcess()
             ->values()
+            ->when($this->form->honeypot(), fn ($fields, $honeypot) => $fields->merge([$honeypot => null]))
             ->map(function ($defaultProcessedValue, $handle) use ($oldValues) {
                 return $oldValues->has($handle)
                     ? $oldValues->get($handle)
diff --git a/tests/Tags/Form/FormCreateAlpineTest.php b/tests/Tags/Form/FormCreateAlpineTest.php
index e8e568059d..4648398e30 100644
--- a/tests/Tags/Form/FormCreateAlpineTest.php
+++ b/tests/Tags/Form/FormCreateAlpineTest.php
@@ -97,6 +97,7 @@ public function it_renders_x_data_on_form_tag()
             'fav_animals' => [],
             'fav_colour' => null,
             'fav_subject' => null,
+            'winnie' => null,
         ]);
 
         $expected = '<form method="POST" action="http://localhost/!/forms/contact" x-data="'.$expectedXData.'">';
@@ -122,6 +123,7 @@ public function it_renders_x_data_with_old_data_on_form_tag()
             'fav_animals' => [],
             'fav_colour' => null,
             'fav_subject' => null,
+            'winnie' => null,
         ]);
 
         $expected = '<form method="POST" action="http://localhost/!/forms/contact" x-data="'.$expectedXData.'">';
@@ -142,6 +144,7 @@ public function it_renders_scoped_x_data_on_form_tag()
                 'fav_animals' => [],
                 'fav_colour' => null,
                 'fav_subject' => null,
+                'winnie' => null,
             ],
         ]);
 
@@ -170,6 +173,7 @@ public function it_renders_scoped_x_data_with_old_data_on_form_tag()
                 'fav_animals' => ['cat'],
                 'fav_colour' => null,
                 'fav_subject' => null,
+                'winnie' => null,
             ],
         ]);
 
@@ -194,7 +198,7 @@ public function it_renders_proper_x_data_for_multiple_select_field()
             ],
         ];
 
-        $expected = 'x-data="'.$this->jsonEncode(['favourite_animals' => []]).'"';
+        $expected = 'x-data="'.$this->jsonEncode(['favourite_animals' => [], 'winnie' => null]).'"';
 
         $this->assertFieldRendersHtml($expected, $config, [], ['js' => 'alpine']);
     }
@@ -211,7 +215,7 @@ public function it_renders_proper_x_data_for_multiple_assets_field()
             ],
         ];
 
-        $expected = 'x-data="'.$this->jsonEncode(['selfies' => []]).'"';
+        $expected = 'x-data="'.$this->jsonEncode(['selfies' => [], 'winnie' => null]).'"';
 
         $this->assertFieldRendersHtml($expected, $config, [], ['js' => 'alpine']);
     }
diff --git a/tests/Tags/Form/FormCreateCustomDriverTest.php b/tests/Tags/Form/FormCreateCustomDriverTest.php
index 2e4daeb288..ba37e8519d 100644
--- a/tests/Tags/Form/FormCreateCustomDriverTest.php
+++ b/tests/Tags/Form/FormCreateCustomDriverTest.php
@@ -156,6 +156,7 @@ public function custom_driver_can_get_initial_form_data()
             'name' => null,
             'email' => null,
             'message' => null,
+            'winnie' => null,
         ];
 
         $this->assertEquals($expected, $initialData);
@@ -179,6 +180,7 @@ public function custom_driver_getting_initial_data_respects_old_data()
             'name' => 'San Holo',
             'email' => null,
             'message' => null,
+            'winnie' => null,
         ];
 
         $this->assertEquals($expected, $initialData);

From 461f8c716b9d27ef51743d0eca20838889aa7e15 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Fri, 9 Feb 2024 15:37:53 +0000
Subject: [PATCH 093/149] [4.x] Fix directory separator in Templates fieldtype
 on Windows (#9483)

---
 routes/cp.php                                 |  4 +--
 .../CP/API/TemplatesController.php            | 11 ++++--
 tests/Fieldtypes/TemplatesTest.php            | 35 +++++++++++++++++++
 .../templates/blog/index.antlers.html         |  1 +
 4 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 tests/Fieldtypes/TemplatesTest.php
 create mode 100644 tests/__fixtures__/templates/blog/index.antlers.html

diff --git a/routes/cp.php b/routes/cp.php
index c3dd3ef5e9..881bed8fdc 100644
--- a/routes/cp.php
+++ b/routes/cp.php
@@ -300,8 +300,8 @@
     });
 
     Route::group(['prefix' => 'api', 'as' => 'api.'], function () {
-        Route::resource('addons', AddonsApiController::class);
-        Route::resource('templates', TemplatesController::class);
+        Route::resource('addons', AddonsApiController::class)->only('index');
+        Route::resource('templates', TemplatesController::class)->only('index');
     });
 
     Route::group(['prefix' => 'preferences', 'as' => 'preferences.'], function () {
diff --git a/src/Http/Controllers/CP/API/TemplatesController.php b/src/Http/Controllers/CP/API/TemplatesController.php
index f5bf71b2bd..fc42c5d732 100644
--- a/src/Http/Controllers/CP/API/TemplatesController.php
+++ b/src/Http/Controllers/CP/API/TemplatesController.php
@@ -5,6 +5,7 @@
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 use Statamic\Http\Controllers\CP\CpController;
+use Statamic\Support\Str;
 
 class TemplatesController extends CpController
 {
@@ -17,11 +18,17 @@ public function index()
 
                 foreach ($iterator as $file) {
                     if ($file->isFile()) {
-                        $views->push(str_before(str_replace_first($path.DIRECTORY_SEPARATOR, '', $file->getPathname()), '.'));
+                        $viewPath = Str::of($file->getPathname())
+                            ->after($path.DIRECTORY_SEPARATOR)
+                            ->before('.')
+                            ->replace('\\', '/')
+                            ->toString();
+
+                        $views->push($viewPath);
                     }
                 }
 
-                return $views->filter()->values();
+                return $views->filter()->sort()->values();
             })
             ->values();
     }
diff --git a/tests/Fieldtypes/TemplatesTest.php b/tests/Fieldtypes/TemplatesTest.php
new file mode 100644
index 0000000000..5848c325f3
--- /dev/null
+++ b/tests/Fieldtypes/TemplatesTest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Tests\Fieldtypes;
+
+use Statamic\Facades\User;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class TemplatesTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->app['config']->set('view.paths', [
+            __DIR__.'/../__fixtures__/templates',
+        ]);
+    }
+
+    /** @test */
+    public function it_returns_a_list_of_templates()
+    {
+        $this
+            ->actingAs(User::make()->makeSuper()->save())
+            ->get(cp_route('api.templates.index'))
+            ->assertJson([
+                'blog/index',
+                'conditions-literals',
+                'five_hundred_nested_ifs',
+                'nested-conditionals',
+            ]);
+    }
+}
diff --git a/tests/__fixtures__/templates/blog/index.antlers.html b/tests/__fixtures__/templates/blog/index.antlers.html
new file mode 100644
index 0000000000..26be7babe6
--- /dev/null
+++ b/tests/__fixtures__/templates/blog/index.antlers.html
@@ -0,0 +1 @@
+<h1>Blog Listing</h1>

From 71956583f6737046a8d24b5a129766423061d92a Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Fri, 9 Feb 2024 15:41:56 +0000
Subject: [PATCH 094/149] [4.x] Fix `$authenticatedUser` error with third-party
 addon events (#9490)

---
 src/Events/Event.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Events/Event.php b/src/Events/Event.php
index 1a74725925..d22e6c4c4c 100644
--- a/src/Events/Event.php
+++ b/src/Events/Event.php
@@ -10,7 +10,7 @@ abstract class Event
 {
     use Dispatchable;
 
-    public ?UserContract $authenticatedUser;
+    public ?UserContract $authenticatedUser = null;
 
     public static function dispatch()
     {

From e259196e077a85cfff56953dfc3eb4c4e6786e50 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Fri, 9 Feb 2024 15:49:31 +0000
Subject: [PATCH 095/149] [4.x] Fix error from Code Fieldtype when switching
 sites in global (#9488)

---
 resources/js/components/fieldtypes/CodeFieldtype.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/js/components/fieldtypes/CodeFieldtype.vue b/resources/js/components/fieldtypes/CodeFieldtype.vue
index 7a11f191dd..ce0c3964a5 100644
--- a/resources/js/components/fieldtypes/CodeFieldtype.vue
+++ b/resources/js/components/fieldtypes/CodeFieldtype.vue
@@ -136,6 +136,8 @@ export default {
     watch: {
         value(value, oldValue) {
             if (value.code == this.codemirror.doc.getValue()) return;
+            if (! value.code) value.code = '';
+
             this.codemirror.doc.setValue(value.code);
         },
         readOnlyOption(val) {

From e383870f70aab6c7debabc05c6a0f496c91d1220 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Fri, 9 Feb 2024 15:58:07 +0000
Subject: [PATCH 096/149] [4.x] Add GraphQL type for Group fieldtype (#9499)

---
 src/Fieldtypes/Group.php        | 27 ++++++++++++++++++++++++++-
 src/GraphQL/Types/GroupType.php | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 src/GraphQL/Types/GroupType.php

diff --git a/src/Fieldtypes/Group.php b/src/Fieldtypes/Group.php
index 33a997e8a7..e86e1e7130 100644
--- a/src/Fieldtypes/Group.php
+++ b/src/Fieldtypes/Group.php
@@ -2,8 +2,12 @@
 
 namespace Statamic\Fieldtypes;
 
+use Statamic\Facades\GraphQL;
 use Statamic\Fields\Fields;
 use Statamic\Fields\Fieldtype;
+use Statamic\Fields\Values;
+use Statamic\GraphQL\Types\GroupType;
+use Statamic\Support\Str;
 
 class Group extends Fieldtype
 {
@@ -108,7 +112,7 @@ private function performAugmentation($value, $shallow)
     {
         $method = $shallow ? 'shallowAugment' : 'augment';
 
-        return $this->fields()->addValues($value ?? [])->{$method}()->values()->all();
+        return new Values($this->fields()->addValues($value ?? [])->{$method}()->values()->all());
     }
 
     public function preProcessValidatable($value)
@@ -122,4 +126,25 @@ public function preProcessValidatable($value)
                 ->all(),
         );
     }
+
+    public function toGqlType()
+    {
+        return GraphQL::type($this->gqlItemTypeName());
+    }
+
+    public function addGqlTypes()
+    {
+        GraphQL::addType(new GroupType($this, $this->gqlItemTypeName()));
+
+        $this->fields()->all()->each(function ($field) {
+            $field->fieldtype()->addGqlTypes();
+        });
+    }
+
+    private function gqlItemTypeName()
+    {
+        return 'Group_'.collect($this->field->handlePath())->map(function ($part) {
+            return Str::studly($part);
+        })->join('_');
+    }
 }
diff --git a/src/GraphQL/Types/GroupType.php b/src/GraphQL/Types/GroupType.php
new file mode 100644
index 0000000000..8f391f922f
--- /dev/null
+++ b/src/GraphQL/Types/GroupType.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Statamic\GraphQL\Types;
+
+use Rebing\GraphQL\Support\Type;
+
+class GroupType extends Type
+{
+    protected $fieldtype;
+
+    public function __construct($fieldtype, $name)
+    {
+        $this->fieldtype = $fieldtype;
+        $this->attributes['name'] = $name;
+    }
+
+    public function fields(): array
+    {
+        $fields = $this->fieldtype->fields()->toGql();
+
+        return $fields
+            ->map(function ($field) use ($fields) {
+                $field['resolve'] = function ($row, $args, $context, $info) use ($fields) {
+                    return ($resolver = $fields[$info->fieldName]['resolve'] ?? null)
+                         ? $resolver($row, $args, $context, $info)
+                         : $row[$info->fieldName];
+                };
+
+                return $field;
+            })
+            ->all();
+    }
+}

From 269f70e069d4f79285049e70c8e059e61effd039 Mon Sep 17 00:00:00 2001
From: Jack Sleight <jacksleight@gmail.com>
Date: Fri, 9 Feb 2024 16:27:28 +0000
Subject: [PATCH 097/149] [4.x] Add clear value button to popover date
 fieldtype (#9478)

---
 resources/js/components/fieldtypes/date/RangePopover.vue | 9 ++++++++-
 .../js/components/fieldtypes/date/SinglePopover.vue      | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/resources/js/components/fieldtypes/date/RangePopover.vue b/resources/js/components/fieldtypes/date/RangePopover.vue
index 6e1b6b6977..7f9c3cc36c 100644
--- a/resources/js/components/fieldtypes/date/RangePopover.vue
+++ b/resources/js/components/fieldtypes/date/RangePopover.vue
@@ -28,7 +28,7 @@
                         <div class="input-group-prepend flex items-center">
                             <svg-icon name="light/calendar" class="w-4 h-4" />
                         </div>
-                        <div class="input-text border border-gray-500 border-l-0" :class="{ 'read-only': isReadOnly }">
+                        <div class="input-text border border-gray-500 border-l-0 flex items-center pr-0" :class="{ 'read-only': isReadOnly }">
                             <input
                                 class="input-text-minimal p-0 bg-transparent leading-none"
                                 :readonly="isReadOnly"
@@ -37,6 +37,9 @@
                                 @focus="$emit('focus', $event.target)"
                                 @blur="$emit('blur')"
                             />
+                            <button @click="clear" type="button" title="Clear" aria-label="Clear" class="cursor-pointer px-2 hover:text-blue-500">
+                                <span>×</span>
+                            </button>
                         </div>
                     </div>
                 </template>
@@ -195,6 +198,10 @@ export default {
             });
         },
 
+        clear() {
+            this.$emit('input', null)
+        },
+
         resetPicker() {
             this.picker = this.$refs.picker;
         }
diff --git a/resources/js/components/fieldtypes/date/SinglePopover.vue b/resources/js/components/fieldtypes/date/SinglePopover.vue
index fb8addafff..587649977c 100644
--- a/resources/js/components/fieldtypes/date/SinglePopover.vue
+++ b/resources/js/components/fieldtypes/date/SinglePopover.vue
@@ -23,7 +23,7 @@
                     <div class="input-group-prepend flex items-center">
                         <svg-icon name="light/calendar" class="w-4 h-4" />
                     </div>
-                    <div class="input-text border border-gray-500 border-l-0" :class="{ 'read-only': isReadOnly }">
+                    <div class="input-text border border-gray-500 border-l-0 flex items-center pr-0" :class="{ 'read-only': isReadOnly }">
                         <input
                             class="input-text-minimal p-0 bg-transparent leading-none"
                             :readonly="isReadOnly"
@@ -32,6 +32,9 @@
                             @focus="$emit('focus', $event.target)"
                             @blur="$emit('blur')"
                         />
+                        <button @click="clear" type="button" title="Clear" aria-label="Clear" class="cursor-pointer px-2 hover:text-blue-500">
+                            <span>×</span>
+                        </button>
                     </div>
                 </div>
             </template>
@@ -93,6 +96,10 @@ export default {
             this.$nextTick(() => this.$refs.popover?.close());
         },
 
+        clear() {
+            this.$emit('input', null)
+        },
+
         resetPicker() {
             this.picker = this.$refs.picker;
         }

From 4b62dc18bf7c1aaae427842acb919af00467068e Mon Sep 17 00:00:00 2001
From: Peiman Nourani <nourani.peiman@gmail.com>
Date: Fri, 9 Feb 2024 21:30:18 +0330
Subject: [PATCH 098/149] [4.x] Translatable displays (#9450)

---
 resources/js/components/Breadcrumb.vue        |  2 +-
 resources/js/components/ResourceDeleter.vue   |  2 +-
 resources/js/components/SiteSelector.vue      |  2 +-
 .../js/components/assets/Browser/Browser.vue  |  2 +-
 .../js/components/blueprints/LinkFields.vue   |  6 +++---
 .../js/components/blueprints/Listing.vue      |  2 +-
 .../js/components/blueprints/RegularField.vue |  2 +-
 .../js/components/blueprints/Section.vue      |  2 +-
 resources/js/components/blueprints/Tab.vue    |  2 +-
 .../collections/OneOrManySitesField.vue       |  2 +-
 resources/js/components/collections/View.vue  |  2 +-
 .../js/components/data-list/ColumnPicker.vue  |  4 ++--
 resources/js/components/data-list/Table.vue   |  2 +-
 .../js/components/entries/PublishForm.vue     |  6 +++---
 .../components/field-validation/Builder.vue   |  2 +-
 resources/js/components/fields/Settings.vue   |  2 +-
 .../js/components/fieldsets/EditForm.vue      |  2 +-
 .../components/fieldsets/FieldsetDeleter.vue  |  2 +-
 resources/js/components/fieldsets/Listing.vue |  2 +-
 resources/js/components/globals/Sites.vue     |  4 ++--
 resources/js/components/inputs/Text.vue       |  2 +-
 .../components/inputs/relationship/Item.vue   |  6 +++---
 .../inputs/relationship/SelectField.vue       |  4 ++--
 resources/js/components/nav/Builder.vue       |  4 ++--
 .../js/components/navigation/Listing.vue      |  2 +-
 resources/js/components/roles/Listing.vue     |  2 +-
 resources/js/components/roles/PublishForm.vue |  2 +-
 resources/js/components/terms/PublishForm.vue |  2 +-
 .../js/components/user-groups/Listing.vue     |  2 +-
 resources/js/components/users/Listing.vue     |  4 ++--
 resources/views/blueprints/index.blade.php    | 20 +++++++++----------
 resources/views/collections/empty.blade.php   |  2 +-
 .../views/forms/blueprints/edit.blade.php     |  2 +-
 resources/views/forms/show.blade.php          |  2 +-
 resources/views/partials/breadcrumb.blade.php |  2 +-
 resources/views/taxonomies/empty.blade.php    |  2 +-
 resources/views/taxonomies/show.blade.php     |  2 +-
 resources/views/usergroups/show.blade.php     |  2 +-
 src/Auth/CorePermissions.php                  | 14 ++++++-------
 src/Fieldtypes/UserRoles.php                  |  4 ++--
 src/Forms/Fieldtype.php                       |  4 ++--
 .../Controllers/CP/Forms/FormsController.php  |  4 ++--
 .../CP/Preferences/Nav/RoleNavController.php  |  2 +-
 .../Controllers/CP/Users/RolesController.php  |  2 +-
 44 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/resources/js/components/Breadcrumb.vue b/resources/js/components/Breadcrumb.vue
index 9b85eafbd4..56e6d13119 100644
--- a/resources/js/components/Breadcrumb.vue
+++ b/resources/js/components/Breadcrumb.vue
@@ -2,7 +2,7 @@
     <div class="breadcrumb flex">
         <a :href="url" class="flex-initial flex p-2 -m-2 items-center text-xs text-gray-700 hover:text-gray-900">
             <svg-icon name="micro/chevron-right" class="h-6 w-4 rotate-180" />
-            <span v-text="title" />
+            <span v-text="__(title)" />
         </a>
     </div>
 </template>
diff --git a/resources/js/components/ResourceDeleter.vue b/resources/js/components/ResourceDeleter.vue
index ce8049b28b..76e7fe1845 100644
--- a/resources/js/components/ResourceDeleter.vue
+++ b/resources/js/components/ResourceDeleter.vue
@@ -45,7 +45,7 @@ export default {
         },
 
         modalTitle() {
-            return __('Delete :resource', {resource: this.title});
+            return __('Delete :resource', {resource: __(this.title)});
         },
 
         modalBody() {
diff --git a/resources/js/components/SiteSelector.vue b/resources/js/components/SiteSelector.vue
index c999529f9f..163685c202 100644
--- a/resources/js/components/SiteSelector.vue
+++ b/resources/js/components/SiteSelector.vue
@@ -5,7 +5,7 @@
         :value="site"
         :clearable="false"
         :searchable="false"
-        :get-option-label="site => site.name"
+        :get-option-label="site => __(site.name)"
         :options="sites"
         @input="$emit('input', $event)"
     />
diff --git a/resources/js/components/assets/Browser/Browser.vue b/resources/js/components/assets/Browser/Browser.vue
index f26158c5dc..5226089cf7 100644
--- a/resources/js/components/assets/Browser/Browser.vue
+++ b/resources/js/components/assets/Browser/Browser.vue
@@ -23,7 +23,7 @@
 
                 <div class="publish-tabs tabs rounded-none rounded-t mb-3 shadow-none" v-if="showContainerTabs">
                     <button class="tab-button" v-for="item in containers" :key="item.id"
-                        v-text="item.title"
+                        v-text="__(item.title)"
                         :class="{
                             active: item.id === container.id,
                             'border-b border-gray-300': item.id !== container.id
diff --git a/resources/js/components/blueprints/LinkFields.vue b/resources/js/components/blueprints/LinkFields.vue
index 3d34145110..dea83e6a43 100644
--- a/resources/js/components/blueprints/LinkFields.vue
+++ b/resources/js/components/blueprints/LinkFields.vue
@@ -111,8 +111,8 @@ export default {
                 .filter(field => field.type !== 'import')
                 .map(field => ({
                     value: `${fieldset.handle}.${field.handle}`,
-                    label: field.config.display,
-                    fieldset: fieldset.title,
+                    label: __(field.config.display),
+                    fieldset: __(fieldset.title),
                 }));
         });
 
@@ -124,7 +124,7 @@ export default {
             fieldSuggestions,
             fieldsetSuggestions: fieldsets.map(fieldset => ({
                 value: fieldset.handle,
-                label: fieldset.title,
+                label: __(fieldset.title),
             })),
             fieldsets,
         }
diff --git a/resources/js/components/blueprints/Listing.vue b/resources/js/components/blueprints/Listing.vue
index 730ea0d44a..84f2f8b14f 100644
--- a/resources/js/components/blueprints/Listing.vue
+++ b/resources/js/components/blueprints/Listing.vue
@@ -8,7 +8,7 @@
                 <template slot="cell-title" slot-scope="{ row: blueprint }">
                     <div class="flex items-center">
                         <div class="little-dot mr-2" :class="[blueprint.hidden ? 'hollow' : 'bg-green-600']" />
-                        <a :href="blueprint.edit_url">{{ blueprint.title }}</a>
+                        <a :href="blueprint.edit_url">{{ __(blueprint.title) }}</a>
                     </div>
                 </template>
                 <template slot="cell-handle" slot-scope="{ value }">
diff --git a/resources/js/components/blueprints/RegularField.vue b/resources/js/components/blueprints/RegularField.vue
index 2057317f6d..c0c2e27b84 100644
--- a/resources/js/components/blueprints/RegularField.vue
+++ b/resources/js/components/blueprints/RegularField.vue
@@ -6,7 +6,7 @@
             <div class="flex flex-1 items-center justify-between">
                 <div class="flex items-center flex-1 pr-4 py-2 pl-2">
                     <svg-icon class="text-gray-800 mr-2 h-4 w-4 flex-none" :name="field.icon.startsWith('<svg') ? field.icon : `light/${field.icon}`" v-tooltip="tooltipText" default="light/generic-field" />
-                    <a class="break-all" v-text="labelText" @click="$emit('edit')" />
+                    <a class="break-all" v-text="__(labelText)" @click="$emit('edit')" />
                     <svg-icon name="light/hyperlink" v-if="isReferenceField" class="text-gray-600 text-3xs ml-2 h-4 w-4" v-tooltip="__('Imported from fieldset') + ': ' + field.field_reference" />
                 </div>
                 <div class="flex-none pr-2 flex">
diff --git a/resources/js/components/blueprints/Section.vue b/resources/js/components/blueprints/Section.vue
index 55a0dcd878..e6dec7d50b 100644
--- a/resources/js/components/blueprints/Section.vue
+++ b/resources/js/components/blueprints/Section.vue
@@ -8,7 +8,7 @@
                 <div class="p-2 flex-1 flex items-center">
                     <a class="flex items-center flex-1 group" @click="edit">
                         <svg-icon :name="iconName(section.icon)" :directory="iconBaseDirectory" class="h-4 w-4 mr-2 text-gray-700 group-hover:text-blue-500" />
-                        <div class="mr-2" v-text="section.display" />
+                        <div class="mr-2" v-text="__(section.display)" />
                     </a>
                     <button class="flex items-center text-gray-700 hover:text-gray-950 mr-3" @click="edit">
                         <svg-icon class="h-4 w-4" name="pencil" />
diff --git a/resources/js/components/blueprints/Tab.vue b/resources/js/components/blueprints/Tab.vue
index 2662c7df4e..6c2cfdd3d6 100644
--- a/resources/js/components/blueprints/Tab.vue
+++ b/resources/js/components/blueprints/Tab.vue
@@ -13,7 +13,7 @@
     >
         <svg-icon v-if="tab.icon" :name="iconName(tab.icon)" :directory="iconBaseDirectory" class="w-4 h-4 mr-1" />
 
-        {{ tab.display }}
+        {{ __(tab.display) }}
 
         <dropdown-list v-if="isActive" ref="dropdown" placement="bottom-start" class="text-left">
             <template #trigger>
diff --git a/resources/js/components/collections/OneOrManySitesField.vue b/resources/js/components/collections/OneOrManySitesField.vue
index 7d1321e263..72ac1b40d6 100644
--- a/resources/js/components/collections/OneOrManySitesField.vue
+++ b/resources/js/components/collections/OneOrManySitesField.vue
@@ -20,7 +20,7 @@
                 </thead>
                 <tbody>
                     <tr v-for="site in sites" :key="site.handle">
-                        <td class="align-middle" v-text="site.name" />
+                        <td class="align-middle" v-text="__(site.name)" />
                         <td>
                             <text-input
                                 class="slug-field"
diff --git a/resources/js/components/collections/View.vue b/resources/js/components/collections/View.vue
index 08ae9afa2f..46c70e855b 100644
--- a/resources/js/components/collections/View.vue
+++ b/resources/js/components/collections/View.vue
@@ -133,7 +133,7 @@
                         v-for="blueprint in blueprints"
                         :key="blueprint.handle"
                         @click="createEntry(blueprint.handle, branch.id)"
-                        v-text="blueprints.length > 1 ? blueprint.title : __('Create Child Entry')" />
+                        v-text="blueprints.length > 1 ? __(blueprint.title) : __('Create Child Entry')" />
                 </template>
                 <template v-if="branch.can_delete">
                     <li class="divider"></li>
diff --git a/resources/js/components/data-list/ColumnPicker.vue b/resources/js/components/data-list/ColumnPicker.vue
index a38884c7a3..6eebcb4110 100644
--- a/resources/js/components/data-list/ColumnPicker.vue
+++ b/resources/js/components/data-list/ColumnPicker.vue
@@ -24,7 +24,7 @@
                             <div class="column-picker-item" v-for="column in hiddenColumns" :key="column.field" v-if="hiddenColumns.length">
                                 <label class="flex items-center cursor-pointer">
                                     <input type="checkbox" class="mr-2" v-model="column.visible" @change="columnToggled(column) "/>
-                                    {{ column.label }}
+                                    {{ __(column.label) }}
                                 </label>
                             </div>
                         </div>
@@ -48,7 +48,7 @@
                                         <div class="item-move py-1">&nbsp;</div>
                                         <div class="flex flex-1 ml-2 items-center p-0">
                                             <input type="checkbox" class="mr-2" v-model="column.visible" @change="columnToggled(column)" :disabled="selectedColumns.length === 1" />
-                                            {{ column.label }}
+                                            {{ __(column.label) }}
                                         </div>
                                     </div>
                                 </div>
diff --git a/resources/js/components/data-list/Table.vue b/resources/js/components/data-list/Table.vue
index 2cb66f0bf1..58cb7ddb6f 100644
--- a/resources/js/components/data-list/Table.vue
+++ b/resources/js/components/data-list/Table.vue
@@ -17,7 +17,7 @@
                     class="group"
                     @click.prevent="changeSortColumn(column.field)"
                 >
-                    <span v-text="column.label" />
+                    <span v-text="__(column.label)" />
                     <svg v-if="column.sortable" :class="[sharedState.sortDirection, {'opacity-100 pointer-events-none': sharedState.sortColumn === column.field}]" height="8" width="8" viewBox="0 0 10 6.5" class="ml-1 opacity-0 group-hover:opacity-100">
                         <path d="M9.9,1.4L5,6.4L0,1.4L1.4,0L5,3.5L8.5,0L9.9,1.4z" fill="currentColor"/>
                     </svg>
diff --git a/resources/js/components/entries/PublishForm.vue b/resources/js/components/entries/PublishForm.vue
index 8bff49f2a7..d93cd6d022 100644
--- a/resources/js/components/entries/PublishForm.vue
+++ b/resources/js/components/entries/PublishForm.vue
@@ -6,8 +6,8 @@
         <div class="flex items-center mb-6">
             <h1 class="flex-1">
                 <div class="flex items-center">
-                    <span v-if="! isCreating" class="little-dot mr-2" :class="activeLocalization.status" v-tooltip="activeLocalization.status" />
-                    <span v-html="$options.filters.striptags(title)" />
+                    <span v-if="! isCreating" class="little-dot mr-2" :class="activeLocalization.status" v-tooltip="__(activeLocalization.status)" />
+                    <span v-html="$options.filters.striptags(__(title))" />
                 </div>
             </h1>
 
@@ -176,7 +176,7 @@
                                                 'bg-gray-500': !option.published,
                                                 'bg-red-500': !option.exists
                                             }" />
-                                            {{ option.name }}
+                                            {{ __(option.name) }}
                                             <loading-graphic
                                                 :size="14"
                                                 text=""
diff --git a/resources/js/components/field-validation/Builder.vue b/resources/js/components/field-validation/Builder.vue
index d429ecc581..36aad05240 100644
--- a/resources/js/components/field-validation/Builder.vue
+++ b/resources/js/components/field-validation/Builder.vue
@@ -59,7 +59,7 @@
                     />
                 </template>
                 <template #option="{ value, display }">
-                    {{ display }} <code class="ml-2">{{ valueWithoutTrailingColon(value) }}</code>
+                    {{ __(display) }} <code class="ml-2">{{ valueWithoutTrailingColon(value) }}</code>
                 </template>
                 <template #no-options="{ search }">
                     <div class="vs__dropdown-option text-left">{{ __('Add') }} <code class="ml-2">{{ search }}</code></div>
diff --git a/resources/js/components/fields/Settings.vue b/resources/js/components/fields/Settings.vue
index 23a9842507..83976854e8 100644
--- a/resources/js/components/fields/Settings.vue
+++ b/resources/js/components/fields/Settings.vue
@@ -8,7 +8,7 @@
 
         <header v-if="!loading" class="flex items-center sticky top-0 inset-x-0 bg-white shadow px-8 py-2 z-1 h-13">
             <h1 class="flex-1 flex items-center text-xl">
-                {{ values.display || config.display || config.handle }}
+                {{ __(values.display) || __(config.display) || config.handle }}
                 <small class="badge-pill bg-gray-100 ml-4 border text-xs text-gray-700 font-medium leading-none flex items-center">
                     <svg-icon class="h-4 w-4 mr-2 inline-block text-gray-700" :name="fieldtype.icon.startsWith('<svg') ? fieldtype.icon : `light/${fieldtype.icon}`"></svg-icon>
                     {{ fieldtype.title }}
diff --git a/resources/js/components/fieldsets/EditForm.vue b/resources/js/components/fieldsets/EditForm.vue
index 575ecbd243..2967efbafa 100644
--- a/resources/js/components/fieldsets/EditForm.vue
+++ b/resources/js/components/fieldsets/EditForm.vue
@@ -5,7 +5,7 @@
         <header class="mb-6">
             <breadcrumb :url="breadcrumbUrl" :title="__('Fieldsets')" />
             <div class="flex items-center justify-between">
-                <h1>{{ initialTitle }}</h1>
+                <h1>{{ __(initialTitle) }}</h1>
                 <button type="submit" class="btn-primary" @click.prevent="save" v-text="__('Save')" />
             </div>
         </header>
diff --git a/resources/js/components/fieldsets/FieldsetDeleter.vue b/resources/js/components/fieldsets/FieldsetDeleter.vue
index 01b65da9d0..6c0ce29354 100644
--- a/resources/js/components/fieldsets/FieldsetDeleter.vue
+++ b/resources/js/components/fieldsets/FieldsetDeleter.vue
@@ -67,7 +67,7 @@ export default {
         },
 
         modalTitle() {
-            return __('Delete :resource', {resource: this.title});
+            return __('Delete :resource', {resource: __(this.title)});
         },
 
         deleteUrl() {
diff --git a/resources/js/components/fieldsets/Listing.vue b/resources/js/components/fieldsets/Listing.vue
index 58fbacdc80..933fb228a5 100644
--- a/resources/js/components/fieldsets/Listing.vue
+++ b/resources/js/components/fieldsets/Listing.vue
@@ -4,7 +4,7 @@
             <div class="overflow-x-auto overflow-y-hidden">
                 <data-list-table>
                     <template slot="cell-title" slot-scope="{ row: fieldset }">
-                        <a :href="fieldset.edit_url">{{ fieldset.title }}</a>
+                        <a :href="fieldset.edit_url">{{ __(fieldset.title) }}</a>
                     </template>
                     <template slot="cell-handle" slot-scope="{ value }">
                         <span class="font-mono text-xs">{{ value }}</span>
diff --git a/resources/js/components/globals/Sites.vue b/resources/js/components/globals/Sites.vue
index 8f77d63897..04ed120fe3 100644
--- a/resources/js/components/globals/Sites.vue
+++ b/resources/js/components/globals/Sites.vue
@@ -13,7 +13,7 @@
                     <td>
                         <div class="flex items-center text-sm">
                             <toggle-input v-model="site.enabled" class="mr-4" />
-                            {{ site.name }}
+                            {{ __(site.name) }}
                         </div>
                     </td>
                     <td class="text-sm">
@@ -60,7 +60,7 @@ export default {
 
         siteOriginOptions(site) {
             return this.sites
-                .map(s => ({ value: s.handle, label: s.name }))
+                .map(s => ({ value: s.handle, label: __(s.name) }))
                 .filter(s => s.value !== site.handle)
         }
 
diff --git a/resources/js/components/inputs/Text.vue b/resources/js/components/inputs/Text.vue
index c92ce63814..002e35ea8d 100644
--- a/resources/js/components/inputs/Text.vue
+++ b/resources/js/components/inputs/Text.vue
@@ -17,7 +17,7 @@
                 :step="step"
                 :disabled="disabled"
                 :readonly="isReadOnly"
-                :placeholder="placeholder"
+                :placeholder="__(placeholder)"
                 :autocomplete="autocomplete"
                 :autofocus="focus"
                 :min="min"
diff --git a/resources/js/components/inputs/relationship/Item.vue b/resources/js/components/inputs/relationship/Item.vue
index 8e589ca437..121ad38189 100644
--- a/resources/js/components/inputs/relationship/Item.vue
+++ b/resources/js/components/inputs/relationship/Item.vue
@@ -11,12 +11,12 @@
             <div
                 v-if="item.invalid"
                 v-tooltip.top="__('An item with this ID could not be found')"
-                v-text="item.title" />
+                v-text="__(item.title)" />
 
 
-            <a v-if="!item.invalid && editable" @click.prevent="edit" v-text="item.title" class="truncate" v-tooltip="item.title" :href="item.edit_url" />
+            <a v-if="!item.invalid && editable" @click.prevent="edit" v-text="__(item.title)" class="truncate" v-tooltip="item.title" :href="item.edit_url" />
 
-            <div v-if="!item.invalid && !editable" v-text="item.title" />
+            <div v-if="!item.invalid && !editable" v-text="__(item.title)" />
 
             <inline-edit-form
                 v-if="isEditing"
diff --git a/resources/js/components/inputs/relationship/SelectField.vue b/resources/js/components/inputs/relationship/SelectField.vue
index 5f1b21a1c9..5e6a57d07b 100644
--- a/resources/js/components/inputs/relationship/SelectField.vue
+++ b/resources/js/components/inputs/relationship/SelectField.vue
@@ -11,7 +11,7 @@
             :multiple="multiple"
             :options="options"
             :get-option-key="(option) => option.id"
-            :get-option-label="(option) => option.title"
+            :get-option-label="(option) => __(option.title)"
             :create-option="(value) => ({ title: value, id: value })"
             :placeholder="__(config.placeholder) || __('Choose...')"
             :searchable="true"
@@ -46,7 +46,7 @@
                 >
                     <div class="vs__selected-options-outside flex flex-wrap">
                         <span v-for="item in items" :key="item.id" class="vs__selected mt-2" :class="{ 'sortable-item': !readOnly }">
-                            {{ item.title }}
+                            {{ __(item.title) }}
                             <button v-if="!readOnly" @click="deselect(item)" type="button" :aria-label="__('Deselect option')" class="vs__deselect">
                                 <span>×</span>
                             </button>
diff --git a/resources/js/components/nav/Builder.vue b/resources/js/components/nav/Builder.vue
index b417a30078..5331205517 100644
--- a/resources/js/components/nav/Builder.vue
+++ b/resources/js/components/nav/Builder.vue
@@ -6,7 +6,7 @@
             <breadcrumb v-if="indexUrl" :url="indexUrl" :title="__('CP Nav Preferences')" />
 
             <div class="flex items-center">
-                <h1 class="flex-1">{{ title }}</h1>
+                <h1 class="flex-1">{{ __(title) }}</h1>
 
                 <dropdown-list class="mr-2">
                     <dropdown-item :text="__('Reset Nav Customizations')" class="warning" @click="confirmingReset = true"></dropdown-item>
@@ -43,7 +43,7 @@
                         <dropdown-item v-for="option in saveAsOptions" :key="option.url" @click="saveAs(option.url)" class="group">
                             <div class="flex items-start pr-4">
                                 <svg-icon :name="option.icon" class="text-gray shrink-0 mr-2 w-4 group-hover:text-white" />
-                                <span class="whitespace-normal">{{ option.label }}</span>
+                                <span class="whitespace-normal">{{ __(option.label) }}</span>
                             </div>
                         </dropdown-item>
                     </dropdown-list>
diff --git a/resources/js/components/navigation/Listing.vue b/resources/js/components/navigation/Listing.vue
index 93cfa348fa..256d8c6300 100644
--- a/resources/js/components/navigation/Listing.vue
+++ b/resources/js/components/navigation/Listing.vue
@@ -3,7 +3,7 @@
         <div class="card p-0" slot-scope="{ filteredRows: rows }">
             <data-list-table :rows="rows">
                 <template slot="cell-title" slot-scope="{ row: structure }">
-                    <a :href="structure.show_url" class="flex items-center" v-text="structure.title" />
+                    <a :href="structure.show_url" class="flex items-center" v-text="__(structure.title)" />
                 </template>
                 <template slot="actions" slot-scope="{ row: structure, index }">
                     <dropdown-list>
diff --git a/resources/js/components/roles/Listing.vue b/resources/js/components/roles/Listing.vue
index 5e208c6ef0..c9d8ce23a1 100644
--- a/resources/js/components/roles/Listing.vue
+++ b/resources/js/components/roles/Listing.vue
@@ -3,7 +3,7 @@
         <div class="card p-0" slot-scope="{ }">
             <data-list-table>
                 <template slot="cell-title" slot-scope="{ row: role, index }">
-                    <a :href="role.edit_url">{{ role.title }}</a>
+                    <a :href="role.edit_url">{{ __(role.title) }}</a>
                 </template>
                 <template slot="cell-handle" slot-scope="{ value: handle }">
                     <span class="font-mono text-xs">{{ handle }}</span>
diff --git a/resources/js/components/roles/PublishForm.vue b/resources/js/components/roles/PublishForm.vue
index b3d47e2dbf..954374f85c 100644
--- a/resources/js/components/roles/PublishForm.vue
+++ b/resources/js/components/roles/PublishForm.vue
@@ -4,7 +4,7 @@
             <header class="mb-6">
                 <breadcrumb :url="breadcrumbUrl" :title="__('Roles & Permissions')" />
                 <div class="flex items-center justify-between">
-                    <h1 v-text="initialTitle || __('Create Role')" />
+                    <h1 v-text="__(initialTitle) || __('Create Role')" />
                     <button type="submit" class="btn-primary" @click="save">{{ __('Save') }}</button>
                 </div>
             </header>
diff --git a/resources/js/components/terms/PublishForm.vue b/resources/js/components/terms/PublishForm.vue
index b3caebbbcf..9dca80133b 100644
--- a/resources/js/components/terms/PublishForm.vue
+++ b/resources/js/components/terms/PublishForm.vue
@@ -175,7 +175,7 @@
                                                 'bg-gray-500': !option.published,
                                                 'bg-red-500': !option.exists
                                             }" />
-                                            {{ option.name }}
+                                            {{ __(option.name) }}
                                             <loading-graphic :size="14" text="" class="ml-2" v-if="localizing === option.handle" />
                                         </div>
                                         <div class="badge-sm bg-orange" v-if="option.origin" v-text="__('Origin')" />
diff --git a/resources/js/components/user-groups/Listing.vue b/resources/js/components/user-groups/Listing.vue
index 8980afd08c..977b23be82 100644
--- a/resources/js/components/user-groups/Listing.vue
+++ b/resources/js/components/user-groups/Listing.vue
@@ -3,7 +3,7 @@
         <div class="card p-0" slot-scope="{ }">
             <data-list-table>
                 <template slot="cell-title" slot-scope="{ row: group, index }">
-                    <a :href="group.show_url">{{ group.title }}</a>
+                    <a :href="group.show_url">{{ __(group.title) }}</a>
                 </template>
                 <template slot="cell-handle" slot-scope="{ value: handle }">
                     <span class="font-mono text-xs">{{ handle }}</span>
diff --git a/resources/js/components/users/Listing.vue b/resources/js/components/users/Listing.vue
index 6c0a52aed5..303bd8cd0b 100644
--- a/resources/js/components/users/Listing.vue
+++ b/resources/js/components/users/Listing.vue
@@ -83,12 +83,12 @@
                                 <div class="role-index-field">
                                     <div v-if="user.super" class="role-index-field-item mr-1 mb-1.5">{{ __('Super Admin') }}</div>
                                     <div v-if="!roles || roles.length === 0" />
-                                    <div v-for="(role, i) in (roles || [])" class="role-index-field-item mr-1 mb-1.5">{{ role.title }}</div>
+                                    <div v-for="(role, i) in (roles || [])" class="role-index-field-item mr-1 mb-1.5">{{ __(role.title) }}</div>
                                 </div>
                             </template>
                             <template slot="cell-groups" slot-scope="{ row: user, value: groups }">
                                 <div class="groups-index-field">
-                                    <div v-for="group in (groups || [])" class="groups-index-field-item mr-1 mb-1.5">{{ group.title }}</div>
+                                    <div v-for="group in (groups || [])" class="groups-index-field-item mr-1 mb-1.5">{{ __(group.title) }}</div>
                                 </div>
                             </template>
                             <template slot="actions" slot-scope="{ row: user, index }">
diff --git a/resources/views/blueprints/index.blade.php b/resources/views/blueprints/index.blade.php
index b8e0cee8e1..77bf411694 100644
--- a/resources/views/blueprints/index.blade.php
+++ b/resources/views/blueprints/index.blade.php
@@ -16,12 +16,12 @@
 
             @foreach (Statamic\Facades\Collection::all() as $collection)
                 @if ($loop->first)<h6 class="p-2">{{ __('Collections') }}</h6>@endif
-                <dropdown-item redirect="{{ cp_route('collections.blueprints.create', $collection) }}" text="{{ $collection->title() }}"></dropdown-item>
+                <dropdown-item redirect="{{ cp_route('collections.blueprints.create', $collection) }}" text="{{ __($collection->title()) }}"></dropdown-item>
             @endforeach
 
             @foreach (Statamic\Facades\Taxonomy::all() as $taxonomy)
                 @if ($loop->first)<h6 class="p-2 mt-4">{{ __('Taxonomies') }}</h6>@endif
-                <dropdown-item redirect="{{ cp_route('taxonomies.blueprints.create', $taxonomy) }}" text="{{ $taxonomy->title() }}"></dropdown-item>
+                <dropdown-item redirect="{{ cp_route('taxonomies.blueprints.create', $taxonomy) }}" text="{{ __($taxonomy->title()) }}"></dropdown-item>
             @endforeach
         </dropdown-list>
         </div>
@@ -39,10 +39,10 @@
                             <div class="flex items-center">
                                 <div class="w-4 h-4 mr-4">@cp_svg('icons/light/content-writing')</div>
                                 <span class="little-dot {{ $blueprint->hidden() ? 'hollow' : 'bg-green-600' }} mr-2" v-tooltip="'{{ __($blueprint->hidden() ? 'Hidden': 'Visible') }}'"></span>
-                                <a href="{{ cp_route('collections.blueprints.edit', [$collection, $blueprint]) }}" v-pre>{{ $blueprint->title() }}</a>
+                                <a href="{{ cp_route('collections.blueprints.edit', [$collection, $blueprint]) }}" v-pre>{{ __($blueprint->title()) }}</a>
                             </div>
                         </td>
-                        <td class="text-right text-2xs" v-pre>{{ $collection->title() }}</td>
+                        <td class="text-right text-2xs" v-pre>{{ __($collection->title()) }}</td>
                     </tr>
                 @endforeach
         @if ($loop->last)
@@ -63,10 +63,10 @@
                             <div class="flex items-center">
                                 <div class="w-4 h-4 mr-4">@cp_svg('icons/light/tags')</div>
                                 <span class="little-dot {{ $blueprint->hidden() ? 'hollow' : 'bg-green-600' }} mr-2" v-tooltip="'{{ __($blueprint->hidden() ? 'Hidden': 'Visible') }}'"></span>
-                                <a href="{{ cp_route('taxonomies.blueprints.edit', [$taxonomy, $blueprint]) }}" v-pre>{{ $blueprint->title() }}</a>
+                                <a href="{{ cp_route('taxonomies.blueprints.edit', [$taxonomy, $blueprint]) }}" v-pre>{{ __($blueprint->title()) }}</a>
                             </div>
                         </td>
-                        <td class="text-right text-2xs" v-pre>{{ $taxonomy->title() }}</td>
+                        <td class="text-right text-2xs" v-pre>{{ __($taxonomy->title()) }}</td>
                     </tr>
                 @endforeach
         @if ($loop->last)
@@ -85,7 +85,7 @@
                     <td>
                         <div class="flex items-center">
                             <div class="w-4 h-4 mr-4">@cp_svg('icons/light/hierarchy-files')</div>
-                            <a href="{{ cp_route('navigation.blueprint.edit', $nav->handle()) }}" v-pre>{{ $nav->title() }}</a>
+                            <a href="{{ cp_route('navigation.blueprint.edit', $nav->handle()) }}" v-pre>{{ __($nav->title()) }}</a>
                         </div>
                     </td>
                 </tr>
@@ -105,7 +105,7 @@
                     <td>
                         <div class="flex items-center">
                             <div class="w-4 h-4 mr-4">@cp_svg('icons/light/earth')</div>
-                            <a href="{{ cp_route('globals.blueprint.edit', $set->handle()) }}" v-pre>{{ $set->title() }}</a>
+                            <a href="{{ cp_route('globals.blueprint.edit', $set->handle()) }}" v-pre>{{ __($set->title()) }}</a>
                         </div>
                     </td>
                 </tr>
@@ -125,7 +125,7 @@
                     <td>
                         <div class="flex items-center">
                             <div class="w-4 h-4 mr-4">@cp_svg('icons/light/assets')</div>
-                            <a href="{{ cp_route('asset-containers.blueprint.edit', $container->handle()) }}" v-pre>{{ $container->title() }}</a>
+                            <a href="{{ cp_route('asset-containers.blueprint.edit', $container->handle()) }}" v-pre>{{ __($container->title()) }}</a>
                         </div>
                     </td>
                 </tr>
@@ -146,7 +146,7 @@
                     <td>
                         <div class="flex items-center">
                             <div class="w-4 h-4 mr-4">@cp_svg('icons/light/drawer-file')</div>
-                            <a href="{{ cp_route('forms.blueprint.edit', $form->handle()) }}" v-pre>{{ $form->title() }}</a>
+                            <a href="{{ cp_route('forms.blueprint.edit', $form->handle()) }}" v-pre>{{ __($form->title()) }}</a>
                         </div>
                     </td>
             @if ($loop->last)
diff --git a/resources/views/collections/empty.blade.php b/resources/views/collections/empty.blade.php
index 0ce30204c8..b82fe23559 100644
--- a/resources/views/collections/empty.blade.php
+++ b/resources/views/collections/empty.blade.php
@@ -8,7 +8,7 @@
         'url' => cp_route('collections.index'),
         'title' => __('Collections')
     ])
-    <h1>{{ $collection->title() }}</h1>
+    <h1>{{ __($collection->title()) }}</h1>
 </header>
 
 <div class="card p-4 content">
diff --git a/resources/views/forms/blueprints/edit.blade.php b/resources/views/forms/blueprints/edit.blade.php
index 032a064897..3c40b230d7 100644
--- a/resources/views/forms/blueprints/edit.blade.php
+++ b/resources/views/forms/blueprints/edit.blade.php
@@ -5,7 +5,7 @@
 
     @include('statamic::partials.breadcrumb', [
         'url' => cp_route('forms.show', $form->handle()),
-        'title' => $form->title(),
+        'title' => __($form->title()),
     ])
 
     <blueprint-builder
diff --git a/resources/views/forms/show.blade.php b/resources/views/forms/show.blade.php
index 5525da0a40..c6553bdbc4 100644
--- a/resources/views/forms/show.blade.php
+++ b/resources/views/forms/show.blade.php
@@ -11,7 +11,7 @@
         ])
         <div class="flex items-center">
             <h1 class="flex-1">
-                {{ $form->title() }}
+                {{ __($form->title()) }}
             </h1>
 
             @if(\Statamic\Facades\User::current()->can('edit', $form) || \Statamic\Facades\User::current()->can('delete', $form))
diff --git a/resources/views/partials/breadcrumb.blade.php b/resources/views/partials/breadcrumb.blade.php
index 37c253d957..de0d5e6ea8 100644
--- a/resources/views/partials/breadcrumb.blade.php
+++ b/resources/views/partials/breadcrumb.blade.php
@@ -3,6 +3,6 @@
         <div class="h-6 rotate-180 svg-icon using-svg">
             @cp_svg('icons/micro/chevron-right')
         </div>
-        <span v-pre>{{ $title }}</span>
+        <span v-pre>{{ __($title) }}</span>
     </a>
 </div>
diff --git a/resources/views/taxonomies/empty.blade.php b/resources/views/taxonomies/empty.blade.php
index 54b91b3ea6..c362cafd05 100644
--- a/resources/views/taxonomies/empty.blade.php
+++ b/resources/views/taxonomies/empty.blade.php
@@ -8,7 +8,7 @@
         'url' => cp_route('taxonomies.index'),
         'title' => __('Taxonomies')
     ])
-    <h1>{{ $taxonomy->title() }}</h1>
+    <h1>{{ __($taxonomy->title()) }}</h1>
 </header>
 
 <div class="card p-4 content">
diff --git a/resources/views/taxonomies/show.blade.php b/resources/views/taxonomies/show.blade.php
index 5f1ae3d8cf..56a106c9aa 100644
--- a/resources/views/taxonomies/show.blade.php
+++ b/resources/views/taxonomies/show.blade.php
@@ -10,7 +10,7 @@
             'title' => __('Taxonomies')
         ])
         <div class="flex items-center">
-            <h1 class="flex-1">{{ $taxonomy->title() }}</h1>
+            <h1 class="flex-1">{{ __($taxonomy->title()) }}</h1>
 
             <dropdown-list class="mr-2">
                 @can('edit', $taxonomy)
diff --git a/resources/views/usergroups/show.blade.php b/resources/views/usergroups/show.blade.php
index c0efed4f36..ecc2850ad2 100644
--- a/resources/views/usergroups/show.blade.php
+++ b/resources/views/usergroups/show.blade.php
@@ -10,7 +10,7 @@
             'title' => __('User Groups')
         ])
         <div class="flex items-center">
-            <h1 class="flex-1">{{ $group->title() }}</h1>
+            <h1 class="flex-1">{{ __($group->title()) }}</h1>
             <dropdown-list class="mr-2">
                 @can('edit', $group)
                     <dropdown-item :text="__('Edit User Group')" redirect="{{ $group->editUrl() }}"></dropdown-item>
diff --git a/src/Auth/CorePermissions.php b/src/Auth/CorePermissions.php
index 9637e1f20b..69f9d4e64f 100644
--- a/src/Auth/CorePermissions.php
+++ b/src/Auth/CorePermissions.php
@@ -77,7 +77,7 @@ protected function registerSites()
         $this->register('access {site} site', function ($permission) {
             $permission->replacements('site', function () {
                 return Site::all()->map(function ($site) {
-                    return ['value' => $site->handle(), 'label' => $site->name().' ('.$site->handle().')', 'handle' => $site->handle()];
+                    return ['value' => $site->handle(), 'label' => __($site->name()).' ('.$site->handle().')', 'handle' => $site->handle()];
                 });
             });
         });
@@ -101,7 +101,7 @@ protected function registerCollections()
                 ]),
             ])->replacements('collection', function () {
                 return Collection::all()->map(function ($collection) {
-                    return ['value' => $collection->handle(), 'label' => $collection->title()];
+                    return ['value' => $collection->handle(), 'label' => __($collection->title())];
                 });
             });
         });
@@ -116,7 +116,7 @@ protected function registerNavigation()
                 $this->permission('edit {nav} nav'),
             ])->replacements('nav', function () {
                 return Nav::all()->map(function ($nav) {
-                    return ['value' => $nav->handle(), 'label' => $nav->title()];
+                    return ['value' => $nav->handle(), 'label' => __($nav->title())];
                 });
             });
         });
@@ -129,7 +129,7 @@ protected function registerGlobals()
         $this->register('edit {global} globals', function ($permission) {
             $permission->replacements('global', function () {
                 return GlobalSet::all()->map(function ($global) {
-                    return ['value' => $global->handle(), 'label' => $global->title()];
+                    return ['value' => $global->handle(), 'label' => __($global->title())];
                 });
             });
         });
@@ -147,7 +147,7 @@ protected function registerTaxonomies()
                 ]),
             ])->replacements('taxonomy', function () {
                 return Taxonomy::all()->map(function ($taxonomy) {
-                    return ['value' => $taxonomy->handle(), 'label' => $taxonomy->title()];
+                    return ['value' => $taxonomy->handle(), 'label' => __($taxonomy->title())];
                 });
             });
         });
@@ -167,7 +167,7 @@ protected function registerAssets()
                 ]),
             ])->replacements('container', function () {
                 return AssetContainer::all()->map(function ($container) {
-                    return ['value' => $container->handle(), 'label' => $container->title()];
+                    return ['value' => $container->handle(), 'label' => __($container->title())];
                 });
             });
         });
@@ -206,7 +206,7 @@ protected function registerForms()
                 $this->permission('delete {form} form submissions'),
             ])->replacements('form', function () {
                 return Form::all()->map(function ($form) {
-                    return ['value' => $form->handle(), 'label' => $form->title()];
+                    return ['value' => $form->handle(), 'label' => __($form->title())];
                 });
             });
         });
diff --git a/src/Fieldtypes/UserRoles.php b/src/Fieldtypes/UserRoles.php
index e06423431c..f056fa3573 100644
--- a/src/Fieldtypes/UserRoles.php
+++ b/src/Fieldtypes/UserRoles.php
@@ -17,7 +17,7 @@ protected function toItemArray($id, $site = null)
     {
         if ($role = Role::find($id)) {
             return [
-                'title' => $role->title(),
+                'title' => __($role->title()),
                 'id' => $role->handle(),
             ];
         }
@@ -42,7 +42,7 @@ public function getIndexItems($request)
         return Role::all()->sortBy('title')->map(function ($role) {
             return [
                 'id' => $role->handle(),
-                'title' => $role->title(),
+                'title' => __($role->title()),
             ];
         })->values();
     }
diff --git a/src/Forms/Fieldtype.php b/src/Forms/Fieldtype.php
index 9fb8fe87e7..8ff9b21478 100644
--- a/src/Forms/Fieldtype.php
+++ b/src/Forms/Fieldtype.php
@@ -57,7 +57,7 @@ protected function toItemArray($id, $site = null)
     {
         if ($form = Facades\Form::find($id)) {
             return [
-                'title' => $form->title(),
+                'title' => __($form->title()),
                 'id' => $form->handle(),
             ];
         }
@@ -85,7 +85,7 @@ public function getIndexItems($request)
         $formFields = function ($form) {
             return [
                 'id' => $form->handle(),
-                'title' => $form->title(),
+                'title' => __($form->title()),
                 'submissions' => $form->submissions()->count(),
             ];
         };
diff --git a/src/Http/Controllers/CP/Forms/FormsController.php b/src/Http/Controllers/CP/Forms/FormsController.php
index ea057f73e2..74497e1222 100644
--- a/src/Http/Controllers/CP/Forms/FormsController.php
+++ b/src/Http/Controllers/CP/Forms/FormsController.php
@@ -30,7 +30,7 @@ public function index(Request $request)
             ->map(function ($form) {
                 return [
                     'id' => $form->handle(),
-                    'title' => $form->title(),
+                    'title' => __($form->title()),
                     'submissions' => $form->submissions()->count(),
                     'show_url' => $form->showUrl(),
                     'edit_url' => $form->editUrl(),
@@ -143,7 +143,7 @@ public function edit($form)
 
         $values = [
             'handle' => $form->handle(),
-            'title' => $form->title(),
+            'title' => __($form->title()),
             'honeypot' => $form->honeypot(),
             'store' => $form->store(),
             'email' => $form->email(),
diff --git a/src/Http/Controllers/CP/Preferences/Nav/RoleNavController.php b/src/Http/Controllers/CP/Preferences/Nav/RoleNavController.php
index ced54f5354..57806826a0 100644
--- a/src/Http/Controllers/CP/Preferences/Nav/RoleNavController.php
+++ b/src/Http/Controllers/CP/Preferences/Nav/RoleNavController.php
@@ -32,7 +32,7 @@ public function edit($handle)
             : Nav::buildWithoutPreferences(true);
 
         return $this->navBuilder($nav, [
-            'title' => $role->title(),
+            'title' => __($role->title()),
             'updateUrl' => cp_route('preferences.nav.role.update', $role->handle()),
             'destroyUrl' => cp_route('preferences.nav.role.destroy', $role->handle()),
         ]);
diff --git a/src/Http/Controllers/CP/Users/RolesController.php b/src/Http/Controllers/CP/Users/RolesController.php
index 0fa5588e29..465a071a07 100644
--- a/src/Http/Controllers/CP/Users/RolesController.php
+++ b/src/Http/Controllers/CP/Users/RolesController.php
@@ -24,7 +24,7 @@ public function index(Request $request)
         $roles = Role::all()->map(function ($role) {
             return [
                 'id' => $role->handle(),
-                'title' => $role->title(),
+                'title' => __($role->title()),
                 'handle' => $role->handle(),
                 'permissions' => $role->isSuper() ? __('Super User') : $role->permissions()->count(),
                 'edit_url' => $role->editUrl(),

From e100f686676350ca7d8bad8a17b7f56933fd7a5d Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 9 Feb 2024 14:01:04 -0500
Subject: [PATCH 099/149] [4.x] Clean up some event handlers (#9500)

---
 resources/js/components/assets/Browser/Browser.vue | 5 +++++
 resources/js/components/data-list/Action.vue       | 4 ++++
 resources/js/components/data-list/DataList.vue     | 4 ++++
 3 files changed, 13 insertions(+)

diff --git a/resources/js/components/assets/Browser/Browser.vue b/resources/js/components/assets/Browser/Browser.vue
index 5226089cf7..c513dccc3f 100644
--- a/resources/js/components/assets/Browser/Browser.vue
+++ b/resources/js/components/assets/Browser/Browser.vue
@@ -446,6 +446,11 @@ export default {
         this.$events.$on('editor-action-completed', this.actionCompleted);
     },
 
+    destroyed() {
+        this.$events.$off('editor-action-started', this.actionStarted);
+        this.$events.$off('editor-action-completed', this.actionCompleted);
+    },
+
     watch: {
 
         initialContainer() {
diff --git a/resources/js/components/data-list/Action.vue b/resources/js/components/data-list/Action.vue
index dbc286cff0..28cf706d4c 100644
--- a/resources/js/components/data-list/Action.vue
+++ b/resources/js/components/data-list/Action.vue
@@ -92,6 +92,10 @@ export default {
         this.$events.$on('reset-action-modals', this.reset);
     },
 
+    destroyed() {
+        this.$events.$off('reset-action-modals', this.reset);
+    },
+
     methods: {
 
         select() {
diff --git a/resources/js/components/data-list/DataList.vue b/resources/js/components/data-list/DataList.vue
index 4d3a56d216..c40d42ee02 100644
--- a/resources/js/components/data-list/DataList.vue
+++ b/resources/js/components/data-list/DataList.vue
@@ -109,6 +109,10 @@ export default {
         this.$events.$on('clear-selections', this.clearSelections);
     },
 
+    destroyed() {
+        this.$events.$off('clear-selections', this.clearSelections);
+    },
+
     methods: {
 
         setInitialSortColumn() {

From 36a955b11b71b107117f5ef7436f8ce25c68686f Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Fri, 9 Feb 2024 19:19:22 +0000
Subject: [PATCH 100/149] [4.x] Fix pagination with the `nocache` tag (#9394)

---
 src/StaticCaching/NoCache/Session.php | 13 +++++++++++++
 src/Tags/Concerns/OutputsItems.php    |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/StaticCaching/NoCache/Session.php b/src/StaticCaching/NoCache/Session.php
index f60f9c6b25..cf727fdcba 100644
--- a/src/StaticCaching/NoCache/Session.php
+++ b/src/StaticCaching/NoCache/Session.php
@@ -2,8 +2,10 @@
 
 namespace Statamic\StaticCaching\NoCache;
 
+use Illuminate\Pagination\AbstractPaginator;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Str;
 use Statamic\Facades\Cascade;
 use Statamic\Facades\Data;
 
@@ -113,6 +115,8 @@ public function restore()
         $this->regions = $this->regions->merge($session['regions'] ?? []);
         $this->cascade = $this->restoreCascade();
 
+        $this->resolvePageAndPathForPagination();
+
         return $this;
     }
 
@@ -124,6 +128,15 @@ private function restoreCascade()
             ->toArray();
     }
 
+    private function resolvePageAndPathForPagination(): void
+    {
+        AbstractPaginator::currentPathResolver(fn () => Str::before($this->url, '?'));
+
+        AbstractPaginator::currentPageResolver(function () {
+            return Str::of($this->url)->after('page=')->before('&')->__toString();
+        });
+    }
+
     private function cacheRegion(Region $region)
     {
         Cache::forever('nocache::region.'.$region->key(), $region);
diff --git a/src/Tags/Concerns/OutputsItems.php b/src/Tags/Concerns/OutputsItems.php
index 000b3de6cf..c4a743dd8d 100644
--- a/src/Tags/Concerns/OutputsItems.php
+++ b/src/Tags/Concerns/OutputsItems.php
@@ -60,7 +60,7 @@ protected function getPaginationData($paginator)
             'current_page' => $paginator->currentPage(),
             'prev_page' => $paginator->previousPageUrl(),
             'next_page' => $paginator->nextPageUrl(),
-            'auto_links' => $paginator->render('pagination::default'),
+            'auto_links' => (string) $paginator->render('pagination::default'),
             'links' => $paginator->renderArray(),
         ];
     }

From e6599bbeaa00f463cc6678c5a7d9b7cd2f5c1f7c Mon Sep 17 00:00:00 2001
From: John Koster <john@stillat.com>
Date: Mon, 12 Feb 2024 08:52:31 -0600
Subject: [PATCH 101/149] [4.x] Antlers: Allow number literals inside variable
 bindings (#9503)

---
 .../Language/Parser/AntlersNodeParser.php     |  6 ++++
 tests/Antlers/Runtime/ParametersTest.php      | 31 +++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/src/View/Antlers/Language/Parser/AntlersNodeParser.php b/src/View/Antlers/Language/Parser/AntlersNodeParser.php
index b7e83abefe..532f976670 100644
--- a/src/View/Antlers/Language/Parser/AntlersNodeParser.php
+++ b/src/View/Antlers/Language/Parser/AntlersNodeParser.php
@@ -15,6 +15,7 @@
 use Statamic\View\Antlers\Language\Nodes\Parameters\ParameterNode;
 use Statamic\View\Antlers\Language\Nodes\RecursiveNode;
 use Statamic\View\Antlers\Language\Nodes\TagIdentifier;
+use Statamic\View\Antlers\Language\Runtime\Sandbox\TypeCoercion;
 use Statamic\View\Antlers\Language\Utilities\StringUtilities;
 
 class AntlersNodeParser
@@ -569,6 +570,11 @@ private function getParameters(AntlersNode $node)
                 if (Str::startsWith($name, DocumentParser::Punctuation_Colon)) {
                     $parameterNode->isVariableReference = true;
                     $name = StringUtilities::substr($name, 1);
+
+                    if (is_numeric($content)) {
+                        $content = TypeCoercion::coerceType($content);
+                        $parameterNode->isVariableReference = false;
+                    }
                 }
 
                 $parameterNode->name = $name;
diff --git a/tests/Antlers/Runtime/ParametersTest.php b/tests/Antlers/Runtime/ParametersTest.php
index 9e59263341..2809991605 100644
--- a/tests/Antlers/Runtime/ParametersTest.php
+++ b/tests/Antlers/Runtime/ParametersTest.php
@@ -334,4 +334,35 @@ public function index()
 
         $this->assertSame('123:456', $result);
     }
+
+    public function test_numeric_literals_inside_variable_bindings_stay_numbers()
+    {
+        (new class extends Tags
+        {
+            protected static $handle = 'test';
+
+            public function index()
+            {
+                return $this->parse(array_merge($this->params->all(), $this->context->all()));
+            }
+        })::register();
+
+        $this->assertSame(
+            '124',
+            $this->renderString('{{ test :my_value="123" }}{{ my_value + 1 }}{{ /test }}', [], true),
+            'Simple addition'
+        );
+
+        $this->assertSame(
+            '-122',
+            $this->renderString('{{ test :my_value="-123" }}{{ my_value + 1 }}{{ /test }}', [], true),
+            'Negative numbers'
+        );
+
+        $this->assertSame(
+            '123.5',
+            $this->renderString('{{ test :my_value="123.0" }}{{ my_value + 0.5 }}{{ /test }}', [], true),
+            'Floats'
+        );
+    }
 }

From 14beab95fb74a7dee1199e65e72730d80445d49d Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Mon, 12 Feb 2024 15:49:32 +0000
Subject: [PATCH 102/149] [4.x] Prevent warming redirect URLs (#9509)

---
 src/Console/Commands/StaticWarm.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Console/Commands/StaticWarm.php b/src/Console/Commands/StaticWarm.php
index 2a654329f2..ad9a8b1975 100644
--- a/src/Console/Commands/StaticWarm.php
+++ b/src/Console/Commands/StaticWarm.php
@@ -189,6 +189,10 @@ protected function entryUris(): Collection
                 return null;
             }
 
+            if ($entry->isRedirect()) {
+                return null;
+            }
+
             return $entry->absoluteUrl();
         })->filter();
 

From 1f08790aa9b53325c1f4a4bd4ee91507b95362ad Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Mon, 12 Feb 2024 15:52:30 +0000
Subject: [PATCH 103/149] [4.x] Fix scrolling in Inline Publish Form on Safari
 on iOS (#9510)

---
 .../js/components/inputs/relationship/InlinePublishForm.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/inputs/relationship/InlinePublishForm.vue b/resources/js/components/inputs/relationship/InlinePublishForm.vue
index f56057e4ac..aa1b1852d8 100644
--- a/resources/js/components/inputs/relationship/InlinePublishForm.vue
+++ b/resources/js/components/inputs/relationship/InlinePublishForm.vue
@@ -5,7 +5,7 @@
         :before-close="shouldClose"
         @closed="close"
     >
-    <div class="h-full overflow-auto p-6 bg-gray-300">
+    <div class="h-full overflow-scroll overflow-x-auto p-6 bg-gray-300">
 
         <div v-if="loading" class="absolute inset-0 z-200 flex items-center justify-center text-center">
             <loading-graphic />

From 8ee617d374bd2689ab3a944a2363d71d44deda1a Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 12 Feb 2024 14:13:06 -0500
Subject: [PATCH 104/149] [4.x] Fix numbers not being cast in API filters
 (#9511)

---
 src/Http/Controllers/API/ApiController.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Http/Controllers/API/ApiController.php b/src/Http/Controllers/API/ApiController.php
index 56d15310d7..d1df7933dd 100644
--- a/src/Http/Controllers/API/ApiController.php
+++ b/src/Http/Controllers/API/ApiController.php
@@ -101,6 +101,8 @@ protected function filter($query)
                     $value = true;
                 } elseif ($value === 'false') {
                     $value = false;
+                } elseif (is_numeric($value)) {
+                    $value = str_contains($value, '.') ? (float) $value : (int) $value;
                 }
 
                 if (Str::contains($filter, ':')) {

From a93a06ccbfe8acb4de34df2114de9442eba81d70 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Tue, 13 Feb 2024 19:15:38 +0000
Subject: [PATCH 105/149] [4.x] Prevent non-images being processed through
 source preset (#9517)

---
 src/Assets/AssetUploader.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Assets/AssetUploader.php b/src/Assets/AssetUploader.php
index f13c2e4ac5..c50a1d705b 100644
--- a/src/Assets/AssetUploader.php
+++ b/src/Assets/AssetUploader.php
@@ -64,6 +64,10 @@ protected function getNewExtension()
             return null;
         }
 
+        if (! $this->asset->isImage()) {
+            return null;
+        }
+
         if (! $ext = Arr::get(Image::userManipulationPresets(), "$preset.fm")) {
             return null;
         }

From dbe27665e61678d475540de70275ce3832c044b0 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 13 Feb 2024 15:05:59 -0500
Subject: [PATCH 106/149] [4.x] Fix table drag handles disappearing (#9522)

---
 resources/css/elements/tables.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/css/elements/tables.css b/resources/css/elements/tables.css
index 46c176ac7b..d0637f9cba 100644
--- a/resources/css/elements/tables.css
+++ b/resources/css/elements/tables.css
@@ -242,6 +242,7 @@
 
 td.table-drag-handle {
 	@apply w-3 border-r h-full p-2;
+    min-width: 16px;
 	cursor: grab;
 	background: theme('colors.gray.200') url('../../svg/icons/light/drag-dots.svg') center center no-repeat;
     background-size: 7px 17px;

From 384649fe41971c867e7bf9c7bc95028d70288447 Mon Sep 17 00:00:00 2001
From: Manuel Maier <manuel@morethings.digital>
Date: Tue, 13 Feb 2024 21:42:04 +0100
Subject: [PATCH 107/149] [4.x] Support YouTube Shorts in embed_code modifier
 (#9521)

---
 src/Modifiers/CoreModifiers.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/Modifiers/CoreModifiers.php b/src/Modifiers/CoreModifiers.php
index 1bdf818646..5858cae1d1 100644
--- a/src/Modifiers/CoreModifiers.php
+++ b/src/Modifiers/CoreModifiers.php
@@ -2909,10 +2909,19 @@ public function embedUrl($url)
             }
         }
 
+        if (Str::contains($url, 'youtube.com/shorts/')) {
+            $url = str_replace('shorts/', 'embed/', $url);
+        }
+
         if (Str::contains($url, 'youtube.com')) {
             $url = str_replace('youtube.com', 'youtube-nocookie.com', $url);
         }
 
+        // This avoids SSL issues when using the non-www version
+        if (Str::contains($url, '//youtube-nocookie.com')) {
+            $url = str_replace('//youtube-nocookie.com', '//www.youtube-nocookie.com', $url);
+        }
+
         return $url;
     }
 

From d6fc17fd725fde3bb3bcb652247a6cdb53234470 Mon Sep 17 00:00:00 2001
From: Jack Sleight <jacksleight@gmail.com>
Date: Tue, 13 Feb 2024 21:28:14 +0000
Subject: [PATCH 108/149] [4.x] Add PHP `fieldPathPrefix` method (#9080)

---
 .../js/components/fieldtypes/Fieldtype.vue    |   6 +
 src/Fields/Field.php                          |  29 ++++-
 src/Fields/Fields.php                         |  14 +-
 src/Fieldtypes/Bard.php                       |  24 ++--
 src/Fieldtypes/Bard/Augmentor.php             |   4 +-
 src/Fieldtypes/Grid.php                       |  32 ++---
 src/Fieldtypes/Replicator.php                 |  39 +++---
 tests/Fields/FieldsTest.php                   |  20 +++
 tests/Fieldtypes/BardTest.php                 | 120 ++++++++++++++++++
 tests/Fieldtypes/GridTest.php                 |  72 +++++++++++
 tests/Fieldtypes/ReplicatorTest.php           |  78 ++++++++++++
 11 files changed, 379 insertions(+), 59 deletions(-)

diff --git a/resources/js/components/fieldtypes/Fieldtype.vue b/resources/js/components/fieldtypes/Fieldtype.vue
index a40ff35fe2..05d99e2c61 100644
--- a/resources/js/components/fieldtypes/Fieldtype.vue
+++ b/resources/js/components/fieldtypes/Fieldtype.vue
@@ -65,6 +65,12 @@ export default {
             return this.value;
         },
 
+        fieldPathKeys() {
+            const prefix = this.fieldPathPrefix || this.handle;
+
+            return prefix.split('.');
+        },
+
         fieldId() {
             let prefix = this.fieldPathPrefix ? this.fieldPathPrefix+'.' : '';
 
diff --git a/src/Fields/Field.php b/src/Fields/Field.php
index 46c6722083..087be0d4e2 100644
--- a/src/Fields/Field.php
+++ b/src/Fields/Field.php
@@ -20,6 +20,7 @@ class Field implements Arrayable
     protected $value;
     protected $parent;
     protected $parentField;
+    protected $parentIndex;
     protected $validationContext;
     protected ?Form $form = null;
 
@@ -33,7 +34,7 @@ public function newInstance()
     {
         return (new static($this->handle, $this->config))
             ->setParent($this->parent)
-            ->setParentField($this->parentField)
+            ->setParentField($this->parentField, $this->parentIndex)
             ->setValue($this->value);
     }
 
@@ -58,6 +59,24 @@ public function handlePath()
         return $path;
     }
 
+    public function fieldPathKeys()
+    {
+        $path = $this->parentField ? $this->parentField->fieldPathKeys() : [];
+
+        if (isset($this->parentIndex)) {
+            $path[] = $this->parentIndex;
+        }
+
+        $path[] = $this->handle();
+
+        return $path;
+    }
+
+    public function fieldPathPrefix()
+    {
+        return implode('.', $this->fieldPathKeys());
+    }
+
     public function setPrefix($prefix)
     {
         $this->prefix = $prefix;
@@ -70,6 +89,11 @@ public function prefix()
         return $this->prefix;
     }
 
+    public function parentIndex()
+    {
+        return $this->parentIndex;
+    }
+
     public function type()
     {
         return array_get($this->config, 'type', 'text');
@@ -277,9 +301,10 @@ public function parent()
         return $this->parent;
     }
 
-    public function setParentField($field)
+    public function setParentField($field, $index = null)
     {
         $this->parentField = $field;
+        $this->parentIndex = $index;
 
         return $this;
     }
diff --git a/src/Fields/Fields.php b/src/Fields/Fields.php
index 0fb89bd44a..56b41bdb0f 100644
--- a/src/Fields/Fields.php
+++ b/src/Fields/Fields.php
@@ -16,15 +16,16 @@ class Fields
     protected $fields;
     protected $parent;
     protected $parentField;
+    protected $parentIndex;
     protected $filled = [];
     protected $withValidatableValues = false;
     protected $withComputedValues = false;
 
-    public function __construct($items = [], $parent = null, $parentField = null)
+    public function __construct($items = [], $parent = null, $parentField = null, $parentIndex = null)
     {
         $this
             ->setParent($parent)
-            ->setParentField($parentField)
+            ->setParentField($parentField, $parentIndex)
             ->setItems($items);
     }
 
@@ -59,12 +60,13 @@ public function setParent($parent)
         return $this;
     }
 
-    public function setParentField($field)
+    public function setParentField($field, $index = null)
     {
         $this->parentField = $field;
+        $this->parentIndex = $index;
 
         if ($this->fields) {
-            $this->fields->each(fn ($f) => $f->setParentField($field));
+            $this->fields->each(fn ($f) => $f->setParentField($field, $index));
         }
 
         return $this;
@@ -115,7 +117,7 @@ public function newInstance()
     {
         return (new static)
             ->setParent($this->parent)
-            ->setParentField($this->parentField)
+            ->setParentField($this->parentField, $this->parentIndex)
             ->setItems($this->items)
             ->setFields($this->fields)
             ->setFilled($this->filled);
@@ -245,7 +247,7 @@ protected function newField($handle, $config)
     {
         return (new Field($handle, $config))
             ->setParent($this->parent)
-            ->setParentField($this->parentField);
+            ->setParentField($this->parentField, $this->parentIndex);
     }
 
     private function getReferencedField(array $config): Field
diff --git a/src/Fieldtypes/Bard.php b/src/Fieldtypes/Bard.php
index 3a8d24447c..5bea35aca1 100644
--- a/src/Fieldtypes/Bard.php
+++ b/src/Fieldtypes/Bard.php
@@ -9,7 +9,6 @@
 use Statamic\Facades\Entry;
 use Statamic\Facades\GraphQL;
 use Statamic\Facades\Site;
-use Statamic\Fields\Fields;
 use Statamic\Fieldtypes\Bard\Augmentor;
 use Statamic\GraphQL\Types\BardSetsType;
 use Statamic\GraphQL\Types\BardTextType;
@@ -265,12 +264,12 @@ public function process($value)
             $value = $this->unwrapInlineValue($value);
         }
 
-        $structure = collect($value)->map(function ($row) {
+        $structure = collect($value)->map(function ($row, $index) {
             if ($row['type'] !== 'set') {
                 return $row;
             }
 
-            return $this->processRow($row);
+            return $this->processRow($row, $index);
         })->all();
 
         if ($this->shouldSaveHtml()) {
@@ -334,9 +333,9 @@ protected function shouldSaveHtml()
         return $this->config('save_html');
     }
 
-    protected function processRow($row)
+    protected function processRow($row, $index)
     {
-        $row['attrs']['values'] = parent::processRow($row['attrs']['values']);
+        $row['attrs']['values'] = parent::processRow($row['attrs']['values'], $index);
 
         if (array_get($row, 'attrs.enabled', true) === true) {
             unset($row['attrs']['enabled']);
@@ -532,21 +531,20 @@ public function preload()
 
         $existing = collect($value)->filter(function ($item) {
             return $item['type'] === 'set';
-        })->mapWithKeys(function ($set) {
+        })->mapWithKeys(function ($set, $index) {
             $values = $set['attrs']['values'];
-            $config = Arr::get($this->flattenedSetsConfig(), "{$values['type']}.fields", []);
 
-            return [$set['attrs']['id'] => (new Fields($config))->addValues($values)->meta()->put('_', '_')];
+            return [$set['attrs']['id'] => $this->fields($values['type'], $index)->addValues($values)->meta()->put('_', '_')];
         })->toArray();
 
-        $defaults = collect($this->flattenedSetsConfig())->map(function ($set) {
-            return (new Fields($set['fields']))->all()->map(function ($field) {
+        $defaults = collect($this->flattenedSetsConfig())->map(function ($set, $handle) {
+            return $this->fields($handle)->all()->map(function ($field) {
                 return $field->fieldtype()->preProcess($field->defaultValue());
             })->all();
         })->all();
 
         $new = collect($this->flattenedSetsConfig())->map(function ($set, $handle) use ($defaults) {
-            return (new Fields($set['fields']))->addValues($defaults[$handle])->meta()->put('_', '_');
+            return $this->fields($handle)->addValues($defaults[$handle])->meta()->put('_', '_');
         })->toArray();
 
         $previews = collect($existing)->map(function ($fields) {
@@ -587,14 +585,14 @@ public function preProcessValidatable($value)
 
         $value = json_decode($value ?? '[]', true);
 
-        return collect($value)->map(function ($item) {
+        return collect($value)->map(function ($item, $index) {
             if ($item['type'] !== 'set') {
                 return $item;
             }
 
             $values = $item['attrs']['values'];
 
-            $processed = $this->fields($values['type'])
+            $processed = $this->fields($values['type'], $index)
                 ->addValues($values)
                 ->preProcessValidatables()
                 ->values()
diff --git a/src/Fieldtypes/Bard/Augmentor.php b/src/Fieldtypes/Bard/Augmentor.php
index 84aeec923f..1b0e037f97 100644
--- a/src/Fieldtypes/Bard/Augmentor.php
+++ b/src/Fieldtypes/Bard/Augmentor.php
@@ -149,12 +149,12 @@ protected function augmentSets($value, $shallow)
     {
         $augmentMethod = $shallow ? 'shallowAugment' : 'augment';
 
-        return $value->map(function ($set) use ($augmentMethod) {
+        return $value->map(function ($set, $index) use ($augmentMethod) {
             if (! Arr::get($this->fieldtype->flattenedSetsConfig(), "{$set['type']}.fields")) {
                 return $set;
             }
 
-            $values = $this->fieldtype->fields($set['type'])->addValues($set)->{$augmentMethod}()->values()->all();
+            $values = $this->fieldtype->fields($set['type'], $index)->addValues($set)->{$augmentMethod}()->values()->all();
 
             return array_merge($values, [RowId::handle() => $set[RowId::handle()] ?? null, 'type' => $set['type']]);
         })->all();
diff --git a/src/Fieldtypes/Grid.php b/src/Fieldtypes/Grid.php
index e07dc02fd8..5f4783d586 100644
--- a/src/Fieldtypes/Grid.php
+++ b/src/Fieldtypes/Grid.php
@@ -84,14 +84,14 @@ public function filter()
 
     public function process($data)
     {
-        return collect($data)->map(function ($row) {
-            return $this->processRow($row);
+        return collect($data)->map(function ($row, $index) {
+            return $this->processRow($row, $index);
         })->all();
     }
 
-    private function processRow($row)
+    private function processRow($row, $index)
     {
-        $fields = $this->fields()->addValues($row)->process()->values()->all();
+        $fields = $this->fields($index)->addValues($row)->process()->values()->all();
 
         $row = array_merge([RowId::handle() => Arr::pull($row, '_id')], $row, $fields);
 
@@ -113,7 +113,7 @@ public function preProcess($data)
 
     private function preProcessRow($row, $index)
     {
-        $fields = $this->fields()->addValues($row)->preProcess()->values()->all();
+        $fields = $this->fields($index)->addValues($row)->preProcess()->values()->all();
 
         $id = Arr::pull($row, RowId::handle()) ?? RowId::generate();
 
@@ -122,9 +122,9 @@ private function preProcessRow($row, $index)
         ]);
     }
 
-    public function fields()
+    public function fields($index = -1)
     {
-        return new Fields($this->config('fields'), $this->field()->parent(), $this->field());
+        return new Fields($this->config('fields'), $this->field()->parent(), $this->field(), $index);
     }
 
     public function rules(): array
@@ -154,7 +154,7 @@ public function extraRules(): array
     protected function rowRules($data, $index)
     {
         $rules = $this
-            ->fields()
+            ->fields($index)
             ->addValues($data)
             ->validator()
             ->withContext([
@@ -174,9 +174,9 @@ protected function rowRuleFieldPrefix($index)
 
     public function extraValidationAttributes(): array
     {
-        $attributes = $this->fields()->validator()->attributes();
+        return collect($this->field->value())->map(function ($row, $index) {
+            $attributes = $this->fields($index)->validator()->attributes();
 
-        return collect($this->field->value())->map(function ($row, $index) use ($attributes) {
             return collect($attributes)->except('_id')->mapWithKeys(function ($attribute, $handle) use ($index) {
                 return [$this->rowRuleFieldPrefix($index).'.'.$handle => $attribute];
             });
@@ -190,8 +190,8 @@ public function preload()
         return [
             'defaults' => $this->defaultRowData()->all(),
             'new' => $this->fields()->meta()->all(),
-            'existing' => collect($this->field->value())->mapWithKeys(function ($row) {
-                return [$row['_id'] => $this->fields()->addValues($row)->meta()];
+            'existing' => collect($this->field->value())->mapWithKeys(function ($row, $index) {
+                return [$row['_id'] => $this->fields($index)->addValues($row)->meta()];
             })->toArray(),
         ];
     }
@@ -217,8 +217,8 @@ private function performAugmentation($value, $shallow)
     {
         $method = $shallow ? 'shallowAugment' : 'augment';
 
-        return collect($value)->map(function ($row) use ($method) {
-            $values = $this->fields()->addValues($row)->{$method}()->values();
+        return collect($value)->map(function ($row, $index) use ($method) {
+            $values = $this->fields($index)->addValues($row)->{$method}()->values();
 
             return new Values($values->merge([RowId::handle() => $row[RowId::handle()] ?? null])->all());
         })->all();
@@ -247,8 +247,8 @@ private function gqlItemTypeName()
 
     public function preProcessValidatable($value)
     {
-        return collect($value)->map(function ($values) {
-            $processed = $this->fields()
+        return collect($value)->map(function ($values, $index) {
+            $processed = $this->fields($index)
                 ->addValues($values)
                 ->preProcessValidatables()
                 ->values()
diff --git a/src/Fieldtypes/Replicator.php b/src/Fieldtypes/Replicator.php
index 9c502e15f2..a437022e07 100644
--- a/src/Fieldtypes/Replicator.php
+++ b/src/Fieldtypes/Replicator.php
@@ -78,14 +78,14 @@ public function filter()
 
     public function process($data)
     {
-        return collect($data)->map(function ($row) {
-            return $this->processRow($row);
+        return collect($data)->map(function ($row, $i) {
+            return $this->processRow($row, $i);
         })->all();
     }
 
-    protected function processRow($row)
+    protected function processRow($row, $index)
     {
-        $fields = $this->fields($row['type'])->addValues($row)->process()->values()->all();
+        $fields = $this->fields($row['type'], $index)->addValues($row)->process()->values()->all();
 
         $row = array_merge([RowId::handle() => Arr::pull($row, '_id')], $row, $fields);
 
@@ -101,7 +101,7 @@ public function preProcess($data)
 
     protected function preProcessRow($row, $index)
     {
-        $fields = $this->fields($row['type'])->addValues($row)->preProcess()->values()->all();
+        $fields = $this->fields($row['type'], $index)->addValues($row)->preProcess()->values()->all();
 
         $id = Arr::pull($row, RowId::handle()) ?? RowId::generate();
 
@@ -111,12 +111,13 @@ protected function preProcessRow($row, $index)
         ]);
     }
 
-    public function fields($set)
+    public function fields($set, $index = -1)
     {
         return new Fields(
             Arr::get($this->flattenedSetsConfig(), "$set.fields"),
             $this->field()->parent(),
-            $this->field()
+            $this->field(),
+            $index
         );
     }
 
@@ -132,7 +133,7 @@ public function extraRules(): array
     protected function setRules($handle, $data, $index)
     {
         $rules = $this
-            ->fields($handle)
+            ->fields($handle, $index)
             ->addValues($data)
             ->validator()
             ->withContext([
@@ -161,7 +162,7 @@ public function extraValidationAttributes(): array
 
     protected function setValidationAttributes($handle, $data, $index)
     {
-        $attributes = $this->fields($handle)->addValues($data)->validator()->attributes();
+        $attributes = $this->fields($handle, $index)->addValues($data)->validator()->attributes();
 
         return collect($attributes)->mapWithKeys(function ($attribute, $handle) use ($index) {
             return [$this->setRuleFieldPrefix($index).'.'.$handle => $attribute];
@@ -182,14 +183,14 @@ protected function performAugmentation($values, $shallow)
     {
         return collect($values)->reject(function ($set, $key) {
             return array_get($set, 'enabled', true) === false;
-        })->map(function ($set) use ($shallow) {
+        })->map(function ($set, $index) use ($shallow) {
             if (! Arr::get($this->flattenedSetsConfig(), "{$set['type']}.fields")) {
                 return $set;
             }
 
             $augmentMethod = $shallow ? 'shallowAugment' : 'augment';
 
-            $values = $this->fields($set['type'])->addValues($set)->{$augmentMethod}()->values();
+            $values = $this->fields($set['type'], $index)->addValues($set)->{$augmentMethod}()->values();
 
             return new Values($values->merge([RowId::handle() => $set[RowId::handle()] ?? null, 'type' => $set['type']])->all());
         })->values()->all();
@@ -197,20 +198,18 @@ protected function performAugmentation($values, $shallow)
 
     public function preload()
     {
-        $existing = collect($this->field->value())->mapWithKeys(function ($set) {
-            $config = Arr::get($this->flattenedSetsConfig(), "{$set['type']}.fields", []);
-
-            return [$set['_id'] => (new Fields($config))->addValues($set)->meta()->put('_', '_')];
+        $existing = collect($this->field->value())->mapWithKeys(function ($set, $index) {
+            return [$set['_id'] => $this->fields($set['type'], $index)->addValues($set)->meta()->put('_', '_')];
         })->toArray();
 
-        $defaults = collect($this->flattenedSetsConfig())->map(function ($set) {
-            return (new Fields($set['fields']))->all()->map(function ($field) {
+        $defaults = collect($this->flattenedSetsConfig())->map(function ($set, $handle) {
+            return $this->fields($handle)->all()->map(function ($field) {
                 return $field->fieldtype()->preProcess($field->defaultValue());
             })->all();
         })->all();
 
         $new = collect($this->flattenedSetsConfig())->map(function ($set, $handle) use ($defaults) {
-            return (new Fields($set['fields']))->addValues($defaults[$handle])->meta()->put('_', '_');
+            return $this->fields($handle)->addValues($defaults[$handle])->meta()->put('_', '_');
         })->toArray();
 
         $previews = collect($existing)->map(function ($fields) {
@@ -294,8 +293,8 @@ protected function gqlSetsTypeName()
 
     public function preProcessValidatable($value)
     {
-        return collect($value)->map(function ($values) {
-            $processed = $this->fields($values['type'])
+        return collect($value)->map(function ($values, $index) {
+            $processed = $this->fields($values['type'], $index)
                 ->addValues($values)
                 ->preProcessValidatables()
                 ->values()
diff --git a/tests/Fields/FieldsTest.php b/tests/Fields/FieldsTest.php
index 995c7a8818..2f54f6ee1f 100644
--- a/tests/Fields/FieldsTest.php
+++ b/tests/Fields/FieldsTest.php
@@ -983,4 +983,24 @@ public function it_sets_the_parentfield_on_all_fields()
         $this->assertEquals('foo', $collection['one']->parentField());
         $this->assertEquals('foo', $collection['two']->parentField());
     }
+
+    /**
+     * @test
+     */
+    public function it_sets_the_parentindex_on_all_fields()
+    {
+        $fields = new Fields([
+            ['handle' => 'one', 'field' => ['type' => 'text']],
+            ['handle' => 'two', 'field' => ['type' => 'text']],
+        ]);
+
+        $collection = $fields->all();
+        $this->assertNull($collection['one']->parentIndex());
+        $this->assertNull($collection['two']->parentIndex());
+
+        $fields->setParentField('foo', 1);
+        $collection = $fields->all();
+        $this->assertEquals(1, $collection['one']->parentIndex());
+        $this->assertEquals(1, $collection['two']->parentIndex());
+    }
 }
diff --git a/tests/Fieldtypes/BardTest.php b/tests/Fieldtypes/BardTest.php
index fbb8c90dd5..78fa2c621d 100644
--- a/tests/Fieldtypes/BardTest.php
+++ b/tests/Fieldtypes/BardTest.php
@@ -1091,6 +1091,126 @@ public function it_converts_tiptap_v1_snake_case_types_to_v2_camel_case_types()
         $this->assertEquals($expected, json_decode($this->bard()->preProcess($data), true));
     }
 
+    /**
+     * @test
+     *
+     * @dataProvider groupedSetsProvider
+     */
+    public function it_generates_field_path_prefix($areSetsGrouped)
+    {
+        $fieldtype = new class extends Fieldtype
+        {
+            public static function handle()
+            {
+                return 'custom';
+            }
+
+            public function preProcess($value)
+            {
+                return $this->field()->fieldPathPrefix();
+            }
+
+            public function process($value)
+            {
+                return $this->field()->fieldPathPrefix();
+            }
+
+            public function preload()
+            {
+                return ['fieldPathPrefix' => $this->field()->fieldPathPrefix()];
+            }
+
+            public function augment($value)
+            {
+                return $this->field()->fieldPathPrefix();
+            }
+        };
+
+        $fieldtype::register();
+
+        $field = (new Field('test', [
+            'type' => 'bard',
+            'sets' => $this->groupSets($areSetsGrouped, [
+                'one' => [
+                    'fields' => [
+                        ['handle' => 'words', 'field' => ['type' => 'custom']],
+                    ],
+                ],
+            ]),
+        ]))->setValue([
+            [
+                'type' => 'set',
+                'attrs' => [
+                    'id' => 'set-id-1',
+                    'values' => [
+                        'type' => 'one',
+                        'words' => 'test',
+                    ],
+                ],
+            ],
+            [
+                'type' => 'set',
+                'attrs' => [
+                    'id' => 'set-id-2',
+                    'values' => [
+                        'type' => 'one',
+                        'words' => 'test',
+                    ],
+                ],
+            ],
+        ]);
+
+        $value = $field->augment()->value()->value();
+        $this->assertEquals('test.0.words', $value[0]['words']);
+        $this->assertEquals('test.1.words', $value[1]['words']);
+
+        $value = json_decode($field->preProcess()->value(), true);
+        $this->assertEquals('test.0.words', $value[0]['attrs']['values']['words']);
+        $this->assertEquals('test.1.words', $value[1]['attrs']['values']['words']);
+
+        $field = (new Field('test', [
+            'type' => 'bard',
+            'sets' => $this->groupSets($areSetsGrouped, [
+                'one' => [
+                    'fields' => [
+                        ['handle' => 'words', 'field' => ['type' => 'custom']],
+                    ],
+                ],
+            ]),
+        ]))->setValue(json_encode([
+            [
+                'type' => 'set',
+                'attrs' => [
+                    'id' => 'set-id-1',
+                    'values' => [
+                        'type' => 'one',
+                        'words' => 'test',
+                    ],
+                ],
+            ],
+            [
+                'type' => 'set',
+                'attrs' => [
+                    'id' => 'set-id-2',
+                    'values' => [
+                        'type' => 'one',
+                        'words' => 'test',
+                    ],
+                ],
+            ],
+        ]));
+
+        $value = $field->process()->value();
+        $this->assertEquals('test.0.words', $value[0]['attrs']['values']['words']);
+        $this->assertEquals('test.1.words', $value[1]['attrs']['values']['words']);
+
+        $value = $field->fieldtype()->preload();
+        $this->assertEquals('test.0.words', $value['existing']['set-id-1']['words']['fieldPathPrefix']);
+        $this->assertEquals('test.1.words', $value['existing']['set-id-2']['words']['fieldPathPrefix']);
+        $this->assertEquals('test.-1.words', $value['new']['one']['words']['fieldPathPrefix']);
+        $this->assertEquals('test.-1.words', $value['defaults']['one']['words']);
+    }
+
     private function bard($config = [])
     {
         return (new Bard)->setField(new Field('test', array_merge(['type' => 'bard', 'sets' => ['one' => []]], $config)));
diff --git a/tests/Fieldtypes/GridTest.php b/tests/Fieldtypes/GridTest.php
index 61be84be2a..233b3cd73f 100644
--- a/tests/Fieldtypes/GridTest.php
+++ b/tests/Fieldtypes/GridTest.php
@@ -527,4 +527,76 @@ public function it_converts_a_queryable_value()
         $this->assertNull((new Grid)->toQueryableValue([]));
         $this->assertEquals([['foo' => 'bar']], (new Grid)->toQueryableValue([['foo' => 'bar']]));
     }
+
+    /**
+     * @test
+     */
+    public function it_generates_field_path_prefix()
+    {
+        $fieldtype = new class extends Fieldtype
+        {
+            public static function handle()
+            {
+                return 'custom';
+            }
+
+            public function preProcess($value)
+            {
+                return $this->field()->fieldPathPrefix();
+            }
+
+            public function process($value)
+            {
+                return $this->field()->fieldPathPrefix();
+            }
+
+            public function preload()
+            {
+                return ['fieldPathPrefix' => $this->field()->fieldPathPrefix()];
+            }
+
+            public function augment($value)
+            {
+                return $this->field()->fieldPathPrefix();
+            }
+        };
+
+        $fieldtype::register();
+
+        $field = (new Field('test', [
+            'type' => 'grid',
+            'fields' => [
+                ['handle' => 'words', 'field' => ['type' => 'custom']],
+            ],
+        ]))->setValue([
+            [
+                '_id' => 'set-id-1',
+                'type' => 'one',
+                'words' => 'test',
+            ],
+            [
+                '_id' => 'set-id-2',
+                'type' => 'one',
+                'words' => 'test',
+            ],
+        ]);
+
+        $value = $field->augment()->value()->value();
+        $this->assertEquals('test.0.words', $value[0]['words']);
+        $this->assertEquals('test.1.words', $value[1]['words']);
+
+        $value = $field->preProcess()->value();
+        $this->assertEquals('test.0.words', $value[0]['words']);
+        $this->assertEquals('test.1.words', $value[1]['words']);
+
+        $value = $field->process()->value();
+        $this->assertEquals('test.0.words', $value[0]['words']);
+        $this->assertEquals('test.1.words', $value[1]['words']);
+
+        $value = $field->fieldtype()->preload();
+        $this->assertEquals('test.0.words', $value['existing']['set-id-1']['words']['fieldPathPrefix']);
+        $this->assertEquals('test.1.words', $value['existing']['set-id-2']['words']['fieldPathPrefix']);
+        $this->assertEquals('test.-1.words', $value['new']['words']['fieldPathPrefix']);
+        $this->assertEquals('test.-1.words', $value['defaults']['words']);
+    }
 }
diff --git a/tests/Fieldtypes/ReplicatorTest.php b/tests/Fieldtypes/ReplicatorTest.php
index a86bf5f1dd..64f13a86af 100644
--- a/tests/Fieldtypes/ReplicatorTest.php
+++ b/tests/Fieldtypes/ReplicatorTest.php
@@ -613,6 +613,84 @@ public function it_converts_a_queryable_value()
         $this->assertEquals([['foo' => 'bar']], (new Replicator)->toQueryableValue([['foo' => 'bar']]));
     }
 
+    /**
+     * @test
+     *
+     * @dataProvider groupedSetsProvider
+     */
+    public function it_generates_field_path_prefix($areSetsGrouped)
+    {
+        $fieldtype = new class extends Fieldtype
+        {
+            public static function handle()
+            {
+                return 'custom';
+            }
+
+            public function preProcess($value)
+            {
+                return $this->field()->fieldPathPrefix();
+            }
+
+            public function process($value)
+            {
+                return $this->field()->fieldPathPrefix();
+            }
+
+            public function preload()
+            {
+                return ['fieldPathPrefix' => $this->field()->fieldPathPrefix()];
+            }
+
+            public function augment($value)
+            {
+                return $this->field()->fieldPathPrefix();
+            }
+        };
+
+        $fieldtype::register();
+
+        $field = (new Field('test', [
+            'type' => 'replicator',
+            'sets' => $this->groupSets($areSetsGrouped, [
+                'one' => [
+                    'fields' => [
+                        ['handle' => 'words', 'field' => ['type' => 'custom']],
+                    ],
+                ],
+            ]),
+        ]))->setValue([
+            [
+                '_id' => 'set-id-1',
+                'type' => 'one',
+                'words' => 'test',
+            ],
+            [
+                '_id' => 'set-id-2',
+                'type' => 'one',
+                'words' => 'test',
+            ],
+        ]);
+
+        $value = $field->augment()->value()->value();
+        $this->assertEquals('test.0.words', $value[0]['words']);
+        $this->assertEquals('test.1.words', $value[1]['words']);
+
+        $value = $field->preProcess()->value();
+        $this->assertEquals('test.0.words', $value[0]['words']);
+        $this->assertEquals('test.1.words', $value[1]['words']);
+
+        $value = $field->process()->value();
+        $this->assertEquals('test.0.words', $value[0]['words']);
+        $this->assertEquals('test.1.words', $value[1]['words']);
+
+        $value = $field->fieldtype()->preload();
+        $this->assertEquals('test.0.words', $value['existing']['set-id-1']['words']['fieldPathPrefix']);
+        $this->assertEquals('test.1.words', $value['existing']['set-id-2']['words']['fieldPathPrefix']);
+        $this->assertEquals('test.-1.words', $value['new']['one']['words']['fieldPathPrefix']);
+        $this->assertEquals('test.-1.words', $value['defaults']['one']['words']);
+    }
+
     public function groupedSetsProvider()
     {
         return [

From 77c1aa3a8d40661401e940756f3b0b7a273ba1ed Mon Sep 17 00:00:00 2001
From: Lukas <helloiamlukas@fastmail.com>
Date: Wed, 14 Feb 2024 20:09:34 +0100
Subject: [PATCH 109/149] [4.x] Only search for descendants if multi-site mode
 is enabled (#9528)

---
 src/Actions/DuplicateEntry.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Actions/DuplicateEntry.php b/src/Actions/DuplicateEntry.php
index b214b72b3f..9f0bfe808b 100644
--- a/src/Actions/DuplicateEntry.php
+++ b/src/Actions/DuplicateEntry.php
@@ -5,6 +5,7 @@
 use Illuminate\Support\Str;
 use Statamic\Contracts\Entries\Entry;
 use Statamic\Facades\Entry as Entries;
+use Statamic\Facades\Site;
 use Statamic\Facades\User;
 
 class DuplicateEntry extends Action
@@ -21,7 +22,7 @@ public function visibleTo($item)
 
     public function confirmationText()
     {
-        $hasDescendants = $this->items
+        $hasDescendants = Site::hasMultiple() && $this->items
             ->map(fn ($entry) => $entry->hasOrigin() ? $entry->root() : $entry)
             ->unique()
             ->contains(fn ($entry) => $entry->descendants()->count());

From d76a4b4d0743e809b0f63485e9d40be980787f4c Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 15 Feb 2024 09:34:53 -0500
Subject: [PATCH 110/149] [4.x] PHPUnit 10 (#9529)

---
 .gitignore                                    |   1 +
 composer.json                                 |   2 +-
 phpunit.xml.dist                              |   8 +-
 tests/API/APITest.php                         |  10 +-
 tests/API/CacherTest.php                      |   2 +-
 tests/API/FilterAuthorizerTest.php            |   2 +-
 tests/API/ResourceAuthorizerTest.php          |   2 +-
 tests/Actions/DuplicateEntryTest.php          |   4 +-
 .../Addon/Tags/{Test.php => TestTags.php}     |   4 +-
 .../Tags/{VarTest.php => VarTestTags.php}     |   2 +-
 .../Runtime/AntlersQueryBuilderTest.php       |   2 +-
 tests/Antlers/Runtime/ConditionLogicTest.php  |   2 +-
 tests/Antlers/Runtime/CoreModifiersTest.php   | 106 +++++++++---------
 .../Runtime/Fieldtypes/AssetTemplateTest.php  |   2 +-
 .../Antlers/Runtime/ModifierArgumentTest.php  |   2 +-
 tests/Antlers/Runtime/ParametersTest.php      |   2 +-
 .../UseCaseTests/ConditionalParameterTest.php |   2 +-
 tests/Antlers/ScratchTest.php                 |   2 +-
 tests/Assets/AssetContainerTest.php           |   2 +-
 tests/Assets/AssetTest.php                    |  16 +--
 ...neratePresetImageManipulationsOnUpload.php |   2 +-
 tests/Auth/UserContractTests.php              |   2 +-
 .../NavPreferencesNormalizerTest.php          |   4 +-
 tests/Data/DataRepositoryTest.php             |   4 +-
 tests/Data/Entries/CollectionTest.php         |   2 +-
 tests/Data/Entries/EntryQueryBuilderTest.php  |   2 +-
 tests/Data/Entries/EntryTest.php              |   6 +-
 tests/Data/Entries/GetDateFromPathTest.php    |   4 +-
 tests/Data/Entries/GetSlugFromPathTest.php    |   4 +-
 tests/Data/Entries/GetSuffixFromPathTest.php  |   4 +-
 .../Data/Entries/RemoveSuffixFromPathTest.php |   4 +-
 tests/Data/ExistsAsFileTest.php               |   4 +-
 tests/Data/Globals/VariablesTest.php          |   2 +-
 tests/Data/Structures/PageTest.php            |   2 +-
 tests/Data/Taxonomies/LocalizedTermTest.php   |   2 +-
 tests/Data/Taxonomies/TaxonomyTest.php        |   2 +-
 tests/Extend/AddonTest.php                    |   2 +-
 tests/Facades/PathTest.php                    |   2 +-
 tests/Facades/PatternTest.php                 |   4 +-
 tests/Facades/UrlTest.php                     |   6 +-
 ...ionTest.php => ShowCollectionTestCase.php} |   2 +-
 .../Collections/ShowRegularCollectionTest.php |   2 +-
 .../ShowStructuredCollectionTest.php          |   2 +-
 .../Collections/UpdateCollectionTreeTest.php  |   2 +-
 tests/Feature/Entries/StoreEntryTest.php      |   2 +-
 tests/Feature/Entries/UpdateEntryTest.php     |   2 +-
 tests/Feature/Fieldtypes/FilesTest.php        |   2 +-
 tests/Feature/GraphQL/EntryTest.php           |   4 +-
 .../GraphQL/Fieldtypes/BardFieldtypeTest.php  |   2 +-
 .../Fieldtypes/ReplicatorFieldtypeTest.php    |   2 +-
 tests/Feature/GraphQL/RequestCacheTest.php    |   2 +-
 tests/Feature/GraphQL/UsersTest.php           |   2 +-
 tests/Fields/FieldsetRepositoryTest.php       |   2 +-
 tests/Fields/FieldsetTest.php                 |   2 +-
 tests/Fields/FieldtypeTest.php                |   2 +-
 tests/Fields/ValueTest.php                    |   2 +-
 tests/Fields/ValuesTest.php                   |   2 +-
 tests/Fieldtypes/BardTest.php                 |   4 +-
 tests/Fieldtypes/CodeTest.php                 |   8 +-
 tests/Fieldtypes/DateTest.php                 |  14 +--
 tests/Fieldtypes/EntriesTest.php              |   2 +-
 tests/Fieldtypes/LabeledValueTests.php        |   2 +-
 .../Fieldtypes/MultipleLabeledValueTests.php  |   2 +-
 tests/Fieldtypes/ReplicatorTest.php           |   2 +-
 tests/Fieldtypes/TermsTest.php                |   2 +-
 tests/Fieldtypes/TextTest.php                 |   4 +-
 tests/Fieldtypes/TimeTest.php                 |   4 +-
 tests/Fieldtypes/YamlTest.php                 |   2 +-
 .../Addon/Tags/{Test.php => TestTags.php}     |   4 +-
 tests/Forms/EmailTest.php                     |   6 +-
 tests/Forms/SendEmailsTest.php                |   2 +-
 tests/FrontendTest.php                        |   6 +-
 tests/Http/Middleware/AddViewPathsTest.php    |   4 +-
 tests/Imaging/GlideImageManipulatorTest.php   |   4 +-
 tests/Imaging/ImageGeneratorTest.php          |   2 +-
 tests/MiscTest.php                            |   2 +-
 tests/Modifiers/BackgroundPositionTest.php    |   4 +-
 tests/Modifiers/CamelizeTest.php              |   4 +-
 tests/Modifiers/CeilTest.php                  |   4 +-
 tests/Modifiers/CollapseWhitespaceTest.php    |   4 +-
 tests/Modifiers/CountTest.php                 |   4 +-
 tests/Modifiers/DashifyTest.php               |   4 +-
 tests/Modifiers/DecodeTest.php                |   4 +-
 tests/Modifiers/DeslugifyTest.php             |   4 +-
 tests/Modifiers/EntitiesTest.php              |   2 +-
 tests/Modifiers/ExtensionTest.php             |   4 +-
 tests/Modifiers/FirstTest.php                 |   4 +-
 tests/Modifiers/FloorTest.php                 |   4 +-
 tests/Modifiers/HasLowerCaseTest.php          |   4 +-
 tests/Modifiers/HasUpperCaseTest.php          |   4 +-
 tests/Modifiers/IsAlphaTest.php               |   4 +-
 tests/Modifiers/IsAlphanumericTest.php        |   4 +-
 tests/Modifiers/IsArrayTest.php               |   4 +-
 tests/Modifiers/IsEmailTest.php               |   4 +-
 tests/Modifiers/IsEmbeddableTest.php          |   4 +-
 tests/Modifiers/IsFutureTest.php              |   4 +-
 tests/Modifiers/IsIterableTest.php            |   4 +-
 tests/Modifiers/IsJsonTest.php                |   4 +-
 tests/Modifiers/IsLowercaseTest.php           |   4 +-
 tests/Modifiers/IsNumberwangTest.php          |   4 +-
 tests/Modifiers/IsNumericTest.php             |   4 +-
 tests/Modifiers/IsPastTest.php                |   2 +-
 tests/Modifiers/IsTodayTest.php               |   4 +-
 tests/Modifiers/IsTomorrowTest.php            |   4 +-
 tests/Modifiers/IsUppercaseTest.php           |   4 +-
 tests/Modifiers/IsUrlTest.php                 |   4 +-
 tests/Modifiers/IsWeekdayTest.php             |   4 +-
 tests/Modifiers/IsWeekendTest.php             |   4 +-
 tests/Modifiers/IsYesterdayTest.php           |   4 +-
 tests/Modifiers/KebabTest.php                 |   4 +-
 tests/Modifiers/LastTest.php                  |   4 +-
 tests/Modifiers/Nl2brTest.php                 |   4 +-
 tests/Modifiers/PartialTest.php               |   2 +-
 tests/Modifiers/PluralTest.php                |   4 +-
 tests/Modifiers/SetQueryParamTest.php         |  20 ++--
 tests/Modifiers/SingularTest.php              |   4 +-
 tests/Modifiers/SlugifyTest.php               |   4 +-
 tests/Modifiers/SmartypantsTest.php           |   4 +-
 tests/Modifiers/SnakeTest.php                 |   4 +-
 tests/Modifiers/SpacelessTest.php             |   4 +-
 tests/Modifiers/StrPadBothTest.php            |   4 +-
 tests/Modifiers/StrPadLeftTest.php            |   4 +-
 tests/Modifiers/StrPadRightTest.php           |   4 +-
 tests/Modifiers/StrPadTest.php                |   4 +-
 tests/Modifiers/SumTest.php                   |   4 +-
 tests/Query/OrderByTest.php                   |   2 +-
 tests/Query/ResolveValueTest.php              |   4 +-
 tests/Query/StatusQueryBuilderTest.php        |   2 +-
 tests/Routing/RouteBindingTest.php            |   6 +-
 tests/Routing/RoutesTest.php                  |   2 +-
 tests/Search/CombTest.php                     |   2 +-
 tests/Search/SearchTest.php                   |   4 +-
 tests/Search/Searchables/AssetsTest.php       |   4 +-
 tests/Search/Searchables/EntriesTest.php      |   4 +-
 tests/Search/Searchables/TermsTest.php        |   4 +-
 tests/Search/Searchables/UsersTest.php        |   4 +-
 .../Repositories/EntryRepositoryTest.php      |   2 +-
 tests/StatamicTest.php                        |  10 +-
 tests/StaticCaching/ApplicationCacherTest.php |   2 +-
 tests/StaticCaching/FileCacherTest.php        |   2 +-
 .../StringEqualsStringIgnoringLineEndings.php |  46 ++++++++
 tests/Support/ArrTest.php                     |   2 +-
 tests/Support/DateFormatTest.php              |   2 +-
 tests/Tags/Concerns/RendersFormsTest.php      |   8 +-
 tests/Tags/FluentTagTest.php                  |   2 +-
 tests/Tags/GetErrorsTest.php                  |   6 +-
 tests/TestCase.php                            |  20 ++--
 tests/Tokens/HandleTokenMiddlewareTest.php    |   4 +-
 tests/View/Antlers/ParserTests.php            |   9 +-
 tests/View/Antlers/ViewTest.php               |   4 +-
 tests/WindowsHelpers.php                      |  22 ----
 tests/Yaml/YamlTest.php                       |  16 +--
 152 files changed, 393 insertions(+), 359 deletions(-)
 rename tests/Antlers/Fixtures/Addon/Tags/{Test.php => TestTags.php} (94%)
 rename tests/Antlers/Fixtures/Addon/Tags/{VarTest.php => VarTestTags.php} (88%)
 rename tests/Feature/Collections/{ShowCollectionTest.php => ShowCollectionTestCase.php} (95%)
 rename tests/Fixtures/Addon/Tags/{Test.php => TestTags.php} (93%)
 create mode 100644 tests/StringEqualsStringIgnoringLineEndings.php

diff --git a/.gitignore b/.gitignore
index c1d30a9b5a..2cae2b82df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 node_modules
 .DS_Store
 .phpunit.result.cache
+.phpunit.cache
 .php-cs-fixer.cache
 tests/Fakes/Composer/Package/test-package/composer.json
 resources/dist
diff --git a/composer.json b/composer.json
index ced5d7890e..8c867b6f05 100644
--- a/composer.json
+++ b/composer.json
@@ -43,7 +43,7 @@
         "laravel/pint": "^1.0",
         "mockery/mockery": "^1.3.3",
         "orchestra/testbench": "^7.0 || ^8.0",
-        "phpunit/phpunit": "^9.0"
+        "phpunit/phpunit": "^9.0 || ^10.0"
     },
     "config": {
         "optimize-autoloader": true,
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index e0cf4ba75a..2a6a07aeb8 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
          backupGlobals="false"
-         backupStaticAttributes="false"
+         backupStaticProperties="false"
          bootstrap="vendor/autoload.php"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
          processIsolation="false"
+         cacheDirectory=".phpunit.cache"
          stopOnFailure="false">
     <testsuites>
         <testsuite name="Tests">
diff --git a/tests/API/APITest.php b/tests/API/APITest.php
index 2e3ad65265..97344e5eb4 100644
--- a/tests/API/APITest.php
+++ b/tests/API/APITest.php
@@ -44,7 +44,7 @@ public function it_handles_not_found_entries($url, $requestShouldSucceed)
         }
     }
 
-    public function entryNotFoundProvider()
+    public static function entryNotFoundProvider()
     {
         return [
             'valid entry id' => ['/api/collections/pages/entries/about', true],
@@ -53,7 +53,7 @@ public function entryNotFoundProvider()
         ];
     }
 
-    public function exampleFilters()
+    public static function exampleFiltersProvider()
     {
         return [['status:is'], ['published:is'], ['title:is']];
     }
@@ -61,7 +61,7 @@ public function exampleFilters()
     /**
      * @test
      *
-     * @dataProvider exampleFilters
+     * @dataProvider exampleFiltersProvider
      */
     public function it_cannot_filter_entries_by_default($filter)
     {
@@ -416,7 +416,7 @@ public function it_replaces_terms_using_live_preview_token()
         ]);
     }
 
-    public function userPasswordFilterProvider()
+    public static function userPasswordFilterProvider()
     {
         return collect([
             'password',
@@ -449,7 +449,7 @@ public function it_handles_not_found_terms($url, $requestShouldSucceed)
         }
     }
 
-    public function termNotFoundProvider()
+    public static function termNotFoundProvider()
     {
         return [
             'valid term id' => ['/api/taxonomies/tags/terms/test', true],
diff --git a/tests/API/CacherTest.php b/tests/API/CacherTest.php
index ec5b056db7..54e8ea3c08 100644
--- a/tests/API/CacherTest.php
+++ b/tests/API/CacherTest.php
@@ -105,7 +105,7 @@ public function it_doesnt_bypass_cache_when_using_an_invalid_token($endpoint, $h
         $this->assertEquals([$cacheKey], Cache::get('api-cache:tracked-responses'));
     }
 
-    public function bypassCacheProvider()
+    public static function bypassCacheProvider()
     {
         $endpoint = '/api/collections/articles/entries';
 
diff --git a/tests/API/FilterAuthorizerTest.php b/tests/API/FilterAuthorizerTest.php
index 5c29ff8b56..0afa503d13 100644
--- a/tests/API/FilterAuthorizerTest.php
+++ b/tests/API/FilterAuthorizerTest.php
@@ -35,7 +35,7 @@ public function setUp(): void
         Facades\Form::make('newsletter')->save();
     }
 
-    public function configFileProvider()
+    public static function configFileProvider()
     {
         return [
             ['api'],
diff --git a/tests/API/ResourceAuthorizerTest.php b/tests/API/ResourceAuthorizerTest.php
index bd4b645e13..616394292c 100644
--- a/tests/API/ResourceAuthorizerTest.php
+++ b/tests/API/ResourceAuthorizerTest.php
@@ -35,7 +35,7 @@ public function setUp(): void
         Facades\Form::make('newsletter')->save();
     }
 
-    public function configFileProvider()
+    public static function configFileProvider()
     {
         return [
             ['api'],
diff --git a/tests/Actions/DuplicateEntryTest.php b/tests/Actions/DuplicateEntryTest.php
index 3baec45ce4..57ec7ede38 100644
--- a/tests/Actions/DuplicateEntryTest.php
+++ b/tests/Actions/DuplicateEntryTest.php
@@ -94,7 +94,7 @@ public function it_authorizes(
         $this->assertEquals($expectedToBeAuthorized, (new DuplicateEntry)->authorize($user, $item));
     }
 
-    public function authorizationProvider()
+    public static function authorizationProvider()
     {
         return [
             'no permission' => [
@@ -160,7 +160,7 @@ public function it_authorizes_in_bulk(
         $this->assertEquals($expectedToBeAuthorized, (new DuplicateEntry)->authorizeBulk($user, $items));
     }
 
-    public function bulkAuthorizationProvider()
+    public static function bulkAuthorizationProvider()
     {
         return [
             'no permission' => [
diff --git a/tests/Antlers/Fixtures/Addon/Tags/Test.php b/tests/Antlers/Fixtures/Addon/Tags/TestTags.php
similarity index 94%
rename from tests/Antlers/Fixtures/Addon/Tags/Test.php
rename to tests/Antlers/Fixtures/Addon/Tags/TestTags.php
index 0c0f77c2b9..ade2efef90 100644
--- a/tests/Antlers/Fixtures/Addon/Tags/Test.php
+++ b/tests/Antlers/Fixtures/Addon/Tags/TestTags.php
@@ -4,10 +4,12 @@
 
 use Statamic\Tags\Tags;
 
-class Test extends Tags
+class TestTags extends Tags
 {
     public static $lastValue = null;
 
+    public static $handle = 'test';
+
     public function index()
     {
         self::$lastValue = $this->params->get('variable');
diff --git a/tests/Antlers/Fixtures/Addon/Tags/VarTest.php b/tests/Antlers/Fixtures/Addon/Tags/VarTestTags.php
similarity index 88%
rename from tests/Antlers/Fixtures/Addon/Tags/VarTest.php
rename to tests/Antlers/Fixtures/Addon/Tags/VarTestTags.php
index c4b6136abb..f79c1c48a1 100644
--- a/tests/Antlers/Fixtures/Addon/Tags/VarTest.php
+++ b/tests/Antlers/Fixtures/Addon/Tags/VarTestTags.php
@@ -4,7 +4,7 @@
 
 use Statamic\Tags\Tags;
 
-class VarTest extends Tags
+class VarTestTags extends Tags
 {
     protected static $handle = 'var_test';
     public static $var = null;
diff --git a/tests/Antlers/Runtime/AntlersQueryBuilderTest.php b/tests/Antlers/Runtime/AntlersQueryBuilderTest.php
index 2df37f1751..f30714dad5 100644
--- a/tests/Antlers/Runtime/AntlersQueryBuilderTest.php
+++ b/tests/Antlers/Runtime/AntlersQueryBuilderTest.php
@@ -9,7 +9,7 @@
 use Statamic\View\Antlers\Language\Runtime\GlobalRuntimeState;
 use Statamic\View\Antlers\Language\Runtime\NodeProcessor;
 use Tests\Antlers\Fixtures\Addon\Modifiers\IsBuilder;
-use Tests\Antlers\Fixtures\Addon\Tags\VarTest;
+use Tests\Antlers\Fixtures\Addon\Tags\VarTestTags as VarTest;
 use Tests\Antlers\ParserTestCase;
 
 class AntlersQueryBuilderTest extends ParserTestCase
diff --git a/tests/Antlers/Runtime/ConditionLogicTest.php b/tests/Antlers/Runtime/ConditionLogicTest.php
index 805d026257..2b6bd983fa 100644
--- a/tests/Antlers/Runtime/ConditionLogicTest.php
+++ b/tests/Antlers/Runtime/ConditionLogicTest.php
@@ -14,7 +14,7 @@
 use Statamic\Taxonomies\TermCollection;
 use Statamic\View\Antlers\Language\Exceptions\AntlersException;
 use Statamic\View\Cascade;
-use Tests\Antlers\Fixtures\Addon\Tags\VarTest;
+use Tests\Antlers\Fixtures\Addon\Tags\VarTestTags as VarTest;
 use Tests\Antlers\ParserTestCase;
 use Tests\FakesViews;
 use Tests\PreventSavingStacheItemsToDisk;
diff --git a/tests/Antlers/Runtime/CoreModifiersTest.php b/tests/Antlers/Runtime/CoreModifiersTest.php
index e54c989bbf..4b7dc8040b 100644
--- a/tests/Antlers/Runtime/CoreModifiersTest.php
+++ b/tests/Antlers/Runtime/CoreModifiersTest.php
@@ -82,7 +82,7 @@ protected function setUp(): void
         ];
     }
 
-    protected function result($text)
+    protected function resultOf($text)
     {
         return $this->renderString($text, $this->data, true);
     }
@@ -90,81 +90,81 @@ protected function result($text)
     public function test_starts_with_accepts_special_characters()
     {
         // Issue: https://github.com/statamic/cms/issues/5128
-        $this->assertSame('yes', $this->result('{{ if test_currency_symbol|starts_with:£ }}yes{{else}}no{{/if}}'));
-        $this->assertSame('yes', $this->result('{{ if test_currency_symbol|starts_with("£") }}yes{{else}}no{{/if}}'));
-        $this->assertSame('no', $this->result('{{ if remove_left_var|starts_with:£ }}yes{{else}}no{{/if}}'));
+        $this->assertSame('yes', $this->resultOf('{{ if test_currency_symbol|starts_with:£ }}yes{{else}}no{{/if}}'));
+        $this->assertSame('yes', $this->resultOf('{{ if test_currency_symbol|starts_with("£") }}yes{{else}}no{{/if}}'));
+        $this->assertSame('no', $this->resultOf('{{ if remove_left_var|starts_with:£ }}yes{{else}}no{{/if}}'));
     }
 
     public function test_math_add()
     {
-        $this->assertSame('10', $this->result('{{ value | add: 5 }}'));
+        $this->assertSame('10', $this->resultOf('{{ value | add: 5 }}'));
     }
 
     public function test_query_param()
     {
-        $this->assertSame('https://www.google.com/search?q=test', $this->result('{{ base_url|add_query_param:q:test }}'));
-        $this->assertSame('https://www.google.com/search?q=test', $this->result('{{ base_url|add_query_param:{"q"}:{"test"} }}'));
+        $this->assertSame('https://www.google.com/search?q=test', $this->resultOf('{{ base_url|add_query_param:q:test }}'));
+        $this->assertSame('https://www.google.com/search?q=test', $this->resultOf('{{ base_url|add_query_param:{"q"}:{"test"} }}'));
     }
 
     public function test_ampersand_list()
     {
-        $this->assertSame('one, two, and three', $this->result('{{ list |ampersand_list:and:true }}'));
-        $this->assertSame('one, two, and three', $this->result('{{ list |ampersand_list:{"and"}:{"true"} }}'));
+        $this->assertSame('one, two, and three', $this->resultOf('{{ list |ampersand_list:and:true }}'));
+        $this->assertSame('one, two, and three', $this->resultOf('{{ list |ampersand_list:{"and"}:{"true"} }}'));
     }
 
     public function test_ascii()
     {
-        $this->assertSame('u', $this->result('{{ "ü" |ascii }}'));
+        $this->assertSame('u', $this->resultOf('{{ "ü" |ascii }}'));
     }
 
     public function test_at()
     {
-        $this->assertSame('e', $this->result('{{ "Test"|at:1 }}'));
-        $this->assertSame('e', $this->result('{{ "Test"|at:{1+0} }}'));
+        $this->assertSame('e', $this->resultOf('{{ "Test"|at:1 }}'));
+        $this->assertSame('e', $this->resultOf('{{ "Test"|at:{1+0} }}'));
     }
 
     public function test_background_position()
     {
-        $this->assertSame('50% 30%', $this->result('{{ focus | background_position }}'));
+        $this->assertSame('50% 30%', $this->resultOf('{{ focus | background_position }}'));
     }
 
     public function test_backspace()
     {
-        $this->assertSame('te', $this->result('{{ "test" | backspace: 2 }}'));
-        $this->assertSame('te', $this->result('{{ "test" | backspace:2 }}'));
-        $this->assertSame('te', $this->result('{{ "test" | backspace: {(2-2)+2} }}'));
+        $this->assertSame('te', $this->resultOf('{{ "test" | backspace: 2 }}'));
+        $this->assertSame('te', $this->resultOf('{{ "test" | backspace:2 }}'));
+        $this->assertSame('te', $this->resultOf('{{ "test" | backspace: {(2-2)+2} }}'));
     }
 
     public function test_camelize()
     {
-        $this->assertSame('testPhrase', $this->result('{{ phrase | camelize }}'));
+        $this->assertSame('testPhrase', $this->resultOf('{{ phrase | camelize }}'));
     }
 
     public function test_cdata()
     {
-        $this->assertSame('<![CDATA[test phrase]]>', $this->result('{{ phrase | cdata }}'));
+        $this->assertSame('<![CDATA[test phrase]]>', $this->resultOf('{{ phrase | cdata }}'));
     }
 
     public function test_ceil()
     {
-        $this->assertSame('5', $this->result('{{ 4.3 | ceil }}'));
+        $this->assertSame('5', $this->resultOf('{{ 4.3 | ceil }}'));
     }
 
     public function test_chunk()
     {
-        $this->assertSame('onetwothree', $this->result('{{ chunks chunk="3" }}{{ chunk }}{{ name }}{{ /chunk }}{{ /chunks }}'));
-        $this->assertSame('onetwothree', $this->result('{{ chunks chunk="{2 + 1}" }}{{ chunk }}{{ name }}{{ /chunk }}{{ /chunks }}'));
-        $this->assertSame('onetwothree', $this->result('{{ chunks :chunk="chunkSize" }}{{ chunk }}{{ name }}{{ /chunk }}{{ /chunks }}'));
+        $this->assertSame('onetwothree', $this->resultOf('{{ chunks chunk="3" }}{{ chunk }}{{ name }}{{ /chunk }}{{ /chunks }}'));
+        $this->assertSame('onetwothree', $this->resultOf('{{ chunks chunk="{2 + 1}" }}{{ chunk }}{{ name }}{{ /chunk }}{{ /chunks }}'));
+        $this->assertSame('onetwothree', $this->resultOf('{{ chunks :chunk="chunkSize" }}{{ chunk }}{{ name }}{{ /chunk }}{{ /chunks }}'));
     }
 
     public function test_collapse()
     {
-        $this->assertSame('onetwothree', $this->result('{{ collapse | collapse }}{{ value }}{{ /collapse }}'));
+        $this->assertSame('onetwothree', $this->resultOf('{{ collapse | collapse }}{{ value }}{{ /collapse }}'));
     }
 
     public function test_collapse_whitespace()
     {
-        $this->assertSame('te st', $this->result('{{ "te    st" | collapse_whitespace }}'));
+        $this->assertSame('te st', $this->resultOf('{{ "te    st" | collapse_whitespace }}'));
     }
 
     public function test_contains()
@@ -173,7 +173,7 @@ public function test_contains()
 {{ if list|contains:one }}yep{{ else }}no{{/if}}
 EOT;
 
-        $this->assertSame('yep', $this->result($template));
+        $this->assertSame('yep', $this->resultOf($template));
     }
 
     public function test_contains_all()
@@ -182,7 +182,7 @@ public function test_contains_all()
 {{ if list|contains:one:two:three }}yep{{ else }}no{{/if}}
 EOT;
 
-        $this->assertSame('yep', $this->result($template));
+        $this->assertSame('yep', $this->resultOf($template));
     }
 
     public function test_contains_any()
@@ -191,35 +191,35 @@ public function test_contains_any()
 {{ if list|contains:one:three }}yep{{ else }}no{{/if}}
 EOT;
 
-        $this->assertSame('yep', $this->result($template));
+        $this->assertSame('yep', $this->resultOf($template));
     }
 
     public function test_count()
     {
-        $this->assertSame('3', $this->result('{{ list | count }}'));
+        $this->assertSame('3', $this->resultOf('{{ list | count }}'));
     }
 
     public function test_count_substring()
     {
-        $this->assertSame('2', $this->result('{{ count_substr count_substring="est" }}'));
-        $this->assertSame('2', $this->result('{{ count_substr :count_substring="count_substr_var_ref" }}'));
-        $this->assertSame('2', $this->result('{{ count_substr count_substring="{"est"}" }}'));
+        $this->assertSame('2', $this->resultOf('{{ count_substr count_substring="est" }}'));
+        $this->assertSame('2', $this->resultOf('{{ count_substr :count_substring="count_substr_var_ref" }}'));
+        $this->assertSame('2', $this->resultOf('{{ count_substr count_substring="{"est"}" }}'));
     }
 
     public function test_dashify()
     {
-        $this->assertSame('test-phrase', $this->result('{{ phrase |dashify }}'));
+        $this->assertSame('test-phrase', $this->resultOf('{{ phrase |dashify }}'));
     }
 
     public function test_wrap()
     {
-        $this->assertSame('<h1 class="fast furious">As the World Turns</h1>', $this->result('{{ title | wrap:h1.fast.furious }}'));
-        $this->assertSame('<h1 class="fast furious">As the World Turns</h1>', $this->result('{{ title | wrap:{"h1.fast.furious"} }}'));
+        $this->assertSame('<h1 class="fast furious">As the World Turns</h1>', $this->resultOf('{{ title | wrap:h1.fast.furious }}'));
+        $this->assertSame('<h1 class="fast furious">As the World Turns</h1>', $this->resultOf('{{ title | wrap:{"h1.fast.furious"} }}'));
     }
 
     public function test_word_count()
     {
-        $this->assertSame('8', $this->result('{{  "There are probably seven words in this sentence."|word_count }}'));
+        $this->assertSame('8', $this->resultOf('{{  "There are probably seven words in this sentence."|word_count }}'));
     }
 
     public function test_where()
@@ -228,70 +228,70 @@ public function test_where()
 {{ games where="feeling|love" }}{{ title}}{{ /games }}
 EOT;
 
-        $this->assertSame('DominionNetrunner', $this->result($template));
+        $this->assertSame('DominionNetrunner', $this->resultOf($template));
 
         $template = <<<'EOT'
 {{ games where="{"feeling"}|{"love"}" }}{{ title}}{{ /games }}
 EOT;
 
-        $this->assertSame('DominionNetrunner', $this->result($template));
+        $this->assertSame('DominionNetrunner', $this->resultOf($template));
     }
 
     public function test_unique()
     {
-        $this->assertSame('zebra, hippo, hyena, giraffe', $this->result('{{ checklist | unique | list }}'));
+        $this->assertSame('zebra, hippo, hyena, giraffe', $this->resultOf('{{ checklist | unique | list }}'));
     }
 
     public function test_underscored()
     {
-        $this->assertSame('test_phrase', $this->result('{{ phrase |underscored }}'));
+        $this->assertSame('test_phrase', $this->resultOf('{{ phrase |underscored }}'));
     }
 
     public function test_sort()
     {
-        $this->assertSame('AltruisticAlphaBlatheringBravoZealousZebra', $this->result('{{ complex sort="last_name" }}{{ first_name }}{{ last_name }}{{ /complex }}'));
+        $this->assertSame('AltruisticAlphaBlatheringBravoZealousZebra', $this->resultOf('{{ complex sort="last_name" }}{{ first_name }}{{ last_name }}{{ /complex }}'));
 
-        $this->assertSame('ZealousZebraBlatheringBravoAltruisticAlpha', $this->result('{{ complex sort="last_name|desc" }}{{ first_name }}{{ last_name }}{{ /complex }}'));
+        $this->assertSame('ZealousZebraBlatheringBravoAltruisticAlpha', $this->resultOf('{{ complex sort="last_name|desc" }}{{ first_name }}{{ last_name }}{{ /complex }}'));
     }
 
     public function test_repeat()
     {
-        $this->assertSame('testtesttest', $this->result('{{ "test" | repeat:3 }}'));
+        $this->assertSame('testtesttest', $this->resultOf('{{ "test" | repeat:3 }}'));
     }
 
     public function test_remove_right()
     {
-        $this->assertSame('https://laravel.com', $this->result('{{ "https://laravel.com/" |remove_right:/ }}'));
+        $this->assertSame('https://laravel.com', $this->resultOf('{{ "https://laravel.com/" |remove_right:/ }}'));
     }
 
     public function test_remove_left()
     {
-        $this->assertSame('laravel.com/', $this->result('{{ "https://laravel.com/" |remove_left:"https://" }}'));
-        $this->assertSame('laravel.com/', $this->result('{{ "https://laravel.com/" |remove_left:{remove_left_var} }}'));
+        $this->assertSame('laravel.com/', $this->resultOf('{{ "https://laravel.com/" |remove_left:"https://" }}'));
+        $this->assertSame('laravel.com/', $this->resultOf('{{ "https://laravel.com/" |remove_left:{remove_left_var} }}'));
     }
 
     public function test_lclast()
     {
-        $this->assertSame('tEST', $this->result('{{ "TEST" | lcfirst }}'));
+        $this->assertSame('tEST', $this->resultOf('{{ "TEST" | lcfirst }}'));
     }
 
     public function test_is_numeric()
     {
-        $this->assertSame('yep', $this->result('{{ if "123456"|is_numeric }}yep{{ /if}}'));
+        $this->assertSame('yep', $this->resultOf('{{ if "123456"|is_numeric }}yep{{ /if}}'));
     }
 
     public function test_shorthand_syntax_accepts_space_inside_strings()
     {
-        $this->assertSame('test', $this->result('{{ phrase | explode:" " | first }}'));
-        $this->assertSame('test', $this->result('{{ phrase | explode: " " | first }}'));
-        $this->assertSame('test', $this->result("{{ phrase | explode: ' ' | first }}"));
-        $this->assertSame('test', $this->result("{{ phrase | explode:' ' | first }}"));
+        $this->assertSame('test', $this->resultOf('{{ phrase | explode:" " | first }}'));
+        $this->assertSame('test', $this->resultOf('{{ phrase | explode: " " | first }}'));
+        $this->assertSame('test', $this->resultOf("{{ phrase | explode: ' ' | first }}"));
+        $this->assertSame('test', $this->resultOf("{{ phrase | explode:' ' | first }}"));
     }
 
     public function test_shorthand_syntax_accepts_strings_with_leading_whitespace()
     {
-        $this->assertSame('test', $this->result('{{ phrase | explode:                   " " | first }}'));
-        $this->assertSame('test', $this->result("{{ phrase | explode:                   ' ' | first }}"));
+        $this->assertSame('test', $this->resultOf('{{ phrase | explode:                   " " | first }}'));
+        $this->assertSame('test', $this->resultOf("{{ phrase | explode:                   ' ' | first }}"));
     }
 
     public function test_shorthand_syntax_can_handle_string_escape_sequences()
diff --git a/tests/Antlers/Runtime/Fieldtypes/AssetTemplateTest.php b/tests/Antlers/Runtime/Fieldtypes/AssetTemplateTest.php
index 81376d7eba..fca55a3409 100644
--- a/tests/Antlers/Runtime/Fieldtypes/AssetTemplateTest.php
+++ b/tests/Antlers/Runtime/Fieldtypes/AssetTemplateTest.php
@@ -8,7 +8,7 @@
 use Statamic\Assets\AssetContainer;
 use Statamic\Fields\Value;
 use Statamic\View\Antlers\Language\Utilities\StringUtilities;
-use Tests\Antlers\Fixtures\Addon\Tags\VarTest;
+use Tests\Antlers\Fixtures\Addon\Tags\VarTestTags as VarTest;
 use Tests\Antlers\ParserTestCase;
 
 class AssetTemplateTest extends ParserTestCase
diff --git a/tests/Antlers/Runtime/ModifierArgumentTest.php b/tests/Antlers/Runtime/ModifierArgumentTest.php
index fd92e9641e..c4fe320f34 100644
--- a/tests/Antlers/Runtime/ModifierArgumentTest.php
+++ b/tests/Antlers/Runtime/ModifierArgumentTest.php
@@ -5,7 +5,7 @@
 use Facades\Tests\Factories\EntryFactory;
 use Statamic\Entries\EntryCollection;
 use Tests\Antlers\Fixtures\Addon\Modifiers\VarTestModifier;
-use Tests\Antlers\Fixtures\Addon\Tags\VarTest;
+use Tests\Antlers\Fixtures\Addon\Tags\VarTestTags as VarTest;
 use Tests\Antlers\ParserTestCase;
 use Tests\PreventSavingStacheItemsToDisk;
 
diff --git a/tests/Antlers/Runtime/ParametersTest.php b/tests/Antlers/Runtime/ParametersTest.php
index 2809991605..379300b940 100644
--- a/tests/Antlers/Runtime/ParametersTest.php
+++ b/tests/Antlers/Runtime/ParametersTest.php
@@ -5,7 +5,7 @@
 use Carbon\Carbon;
 use Statamic\Tags\Tags;
 use Tests\Antlers\Fixtures\Addon\Tags\EchoMethod;
-use Tests\Antlers\Fixtures\Addon\Tags\Test;
+use Tests\Antlers\Fixtures\Addon\Tags\TestTags as Test;
 use Tests\Antlers\Fixtures\MethodClasses\ClassTwo;
 use Tests\Antlers\ParserTestCase;
 use Tests\FakesViews;
diff --git a/tests/Antlers/Runtime/UseCaseTests/ConditionalParameterTest.php b/tests/Antlers/Runtime/UseCaseTests/ConditionalParameterTest.php
index 5aa351a803..140edea0e4 100644
--- a/tests/Antlers/Runtime/UseCaseTests/ConditionalParameterTest.php
+++ b/tests/Antlers/Runtime/UseCaseTests/ConditionalParameterTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Antlers\Runtime\UseCaseTests;
 
-use Tests\Antlers\Fixtures\Addon\Tags\Test;
+use Tests\Antlers\Fixtures\Addon\Tags\TestTags as Test;
 use Tests\Antlers\ParserTestCase;
 
 class ConditionalParameterTest extends ParserTestCase
diff --git a/tests/Antlers/ScratchTest.php b/tests/Antlers/ScratchTest.php
index 0ae8eb8aac..b166347320 100644
--- a/tests/Antlers/ScratchTest.php
+++ b/tests/Antlers/ScratchTest.php
@@ -37,7 +37,7 @@ public function if_with_extra_leading_spaces_should_work()
     /** @test */
     public function interpolated_parameter_with_extra_space_should_work()
     {
-        $this->app['statamic.tags']['test'] = \Tests\Fixtures\Addon\Tags\Test::class;
+        $this->app['statamic.tags']['test'] = \Tests\Fixtures\Addon\Tags\TestTags::class;
 
         $this->assertEquals('baz', (string) Antlers::parse('{{ test variable="{bar }" }}', ['bar' => 'baz']));
         $this->assertEquals('baz', (string) Antlers::parse('{{ test variable="{ bar}" }}', ['bar' => 'baz']));
diff --git a/tests/Assets/AssetContainerTest.php b/tests/Assets/AssetContainerTest.php
index 358b966b4a..495b9f3175 100644
--- a/tests/Assets/AssetContainerTest.php
+++ b/tests/Assets/AssetContainerTest.php
@@ -262,7 +262,7 @@ public function it_defines_which_presets_to_warm($source, $presets, $expectedInt
         $this->assertEquals($expectedWarm, $container->warmPresets());
     }
 
-    public function warmPresetProvider()
+    public static function warmPresetProvider()
     {
         return [
             'no source, no presets' => [null, null, true, ['small', 'medium', 'large', 'max']],
diff --git a/tests/Assets/AssetTest.php b/tests/Assets/AssetTest.php
index 94aec7455d..8129503f9f 100644
--- a/tests/Assets/AssetTest.php
+++ b/tests/Assets/AssetTest.php
@@ -299,7 +299,7 @@ public function it_removes_data_values()
     /**
      * @test
      *
-     * @dataProvider reAddRemovedData
+     * @dataProvider reAddRemovedDataProvider
      **/
     public function it_doesnt_try_to_re_remove_newly_added_data_from_meta($reAddRemovedData)
     {
@@ -341,7 +341,7 @@ public function it_doesnt_try_to_re_remove_newly_added_data_from_meta($reAddRemo
         $this->assertEquals(123, $asset->getRawMeta()['size']);
     }
 
-    public function reAddRemovedData()
+    public static function reAddRemovedDataProvider()
     {
         return [
             'by calling set method' => [fn ($asset) => $asset->set('one', 'new-foo')],
@@ -414,7 +414,7 @@ public function augment($value)
         $this->assertSame($builder, $asset->foo());
     }
 
-    public function queryBuilderProvider()
+    public static function queryBuilderProvider()
     {
         return [
             'statamic' => [Mockery::mock(\Statamic\Query\Builder::class)],
@@ -1686,7 +1686,7 @@ public function it_can_upload_an_image_into_a_container_with_glide_config()
         $this->assertEquals(15, $meta['height']);
     }
 
-    public function formatParams()
+    public static function formatParamsProvider()
     {
         return [['format'], ['fm']];
     }
@@ -1694,7 +1694,7 @@ public function formatParams()
     /**
      * @test
      *
-     * @dataProvider formatParams
+     * @dataProvider formatParamsProvider
      **/
     public function it_can_upload_an_image_into_a_container_with_new_extension_format($formatParam)
     {
@@ -1753,7 +1753,7 @@ public function it_sanitizes_svgs_on_upload()
         $this->assertStringNotContainsString('</script>', $asset->contents());
     }
 
-    public function nonGlideableFileExtensions()
+    public static function nonGlideableFileExtensionsProvider()
     {
         return [
             ['txt'], // not an image
@@ -1766,7 +1766,7 @@ public function nonGlideableFileExtensions()
     /**
      * @test
      *
-     * @dataProvider nonGlideableFileExtensions
+     * @dataProvider nonGlideableFileExtensionsProvider
      **/
     public function it_doesnt_process_or_error_when_uploading_non_glideable_file_with_glide_config($extension)
     {
@@ -2355,7 +2355,7 @@ public function it_gets_which_presets_to_warm($extension, $orientation, $cpEnabl
         $this->assertEquals($expectedWarm, $asset->warmPresets());
     }
 
-    public function warmPresetProvider()
+    public static function warmPresetProvider()
     {
         return [
             'portrait' => ['jpg', 'portrait', true, ['one', 'two', 'cp_thumbnail_small_portrait']],
diff --git a/tests/Assets/GeneratePresetImageManipulationsOnUpload.php b/tests/Assets/GeneratePresetImageManipulationsOnUpload.php
index 561a844dd8..df3c53e28b 100644
--- a/tests/Assets/GeneratePresetImageManipulationsOnUpload.php
+++ b/tests/Assets/GeneratePresetImageManipulationsOnUpload.php
@@ -46,7 +46,7 @@ public function presets_are_generated_for_images($event, $extension, $shouldGene
         $listener->handle(new $event($asset));
     }
 
-    public function presetProvider()
+    public static function presetProvider()
     {
         return [
             [AssetUploaded::class, 'jpg', true],
diff --git a/tests/Auth/UserContractTests.php b/tests/Auth/UserContractTests.php
index 4b63572578..41bfc36125 100644
--- a/tests/Auth/UserContractTests.php
+++ b/tests/Auth/UserContractTests.php
@@ -177,7 +177,7 @@ public function augment($value)
         $this->assertSame($builder, $user->foo());
     }
 
-    public function queryBuilderProvider()
+    public static function queryBuilderProvider()
     {
         return [
             'statamic' => [Mockery::mock(\Statamic\Query\Builder::class)],
diff --git a/tests/CP/Navigation/NavPreferencesNormalizerTest.php b/tests/CP/Navigation/NavPreferencesNormalizerTest.php
index 9d3abf298a..2a6b795a58 100644
--- a/tests/CP/Navigation/NavPreferencesNormalizerTest.php
+++ b/tests/CP/Navigation/NavPreferencesNormalizerTest.php
@@ -257,7 +257,7 @@ public function it_doesnt_remove_inherit_action_items_when_actually_reordering()
     /**
      * @test
      *
-     * @dataProvider modifiers
+     * @dataProvider modifiersProvider
      **/
     public function it_defaults_action_to_modify_when_modifying_in_original_section($modifier)
     {
@@ -284,7 +284,7 @@ public function it_defaults_action_to_modify_when_modifying_in_original_section(
         ]), 'sections.content.items.content::collections::pages.action'));
     }
 
-    public function modifiers()
+    public static function modifiersProvider()
     {
         return collect(NavPreferencesNormalizer::ALLOWED_NAV_ITEM_MODIFICATIONS)->map(fn ($key) => [$key]);
     }
diff --git a/tests/Data/DataRepositoryTest.php b/tests/Data/DataRepositoryTest.php
index abfc51cd76..13d816ee77 100644
--- a/tests/Data/DataRepositoryTest.php
+++ b/tests/Data/DataRepositoryTest.php
@@ -141,7 +141,7 @@ public function it_finds_by_request_url_with_no_root_site($requestUrl, $entryId)
         $this->findByRequestUrlTest($requestUrl, $entryId);
     }
 
-    public function findByRequestUrlProvider()
+    public static function findByRequestUrlProvider()
     {
         return [
             'root' => ['http://localhost', 'home'],
@@ -161,7 +161,7 @@ public function findByRequestUrlProvider()
         ];
     }
 
-    public function findByRequestUrlNoRootSiteProvider()
+    public static function findByRequestUrlNoRootSiteProvider()
     {
         return [
             'root' => ['http://localhost', null],
diff --git a/tests/Data/Entries/CollectionTest.php b/tests/Data/Entries/CollectionTest.php
index 45a1b25fc8..e5e79b1966 100644
--- a/tests/Data/Entries/CollectionTest.php
+++ b/tests/Data/Entries/CollectionTest.php
@@ -926,7 +926,7 @@ public function it_trucates_entries()
         $this->assertCount(0, $collection->queryEntries()->get());
     }
 
-    public function additionalPreviewTargetProvider()
+    public static function additionalPreviewTargetProvider()
     {
         return [
             'through object' => [false],
diff --git a/tests/Data/Entries/EntryQueryBuilderTest.php b/tests/Data/Entries/EntryQueryBuilderTest.php
index 86ac2e3125..ac60eedbc2 100644
--- a/tests/Data/Entries/EntryQueryBuilderTest.php
+++ b/tests/Data/Entries/EntryQueryBuilderTest.php
@@ -722,7 +722,7 @@ public function entries_are_found_using_like($like, $expected)
         $this->assertEquals($expected, Entry::query()->where('title', 'like', $like)->get()->map->title->all());
     }
 
-    public function likeProvider()
+    public static function likeProvider()
     {
         return collect([
             'foo' => ['foo'],
diff --git a/tests/Data/Entries/EntryTest.php b/tests/Data/Entries/EntryTest.php
index 2f00200244..779855bad7 100644
--- a/tests/Data/Entries/EntryTest.php
+++ b/tests/Data/Entries/EntryTest.php
@@ -240,7 +240,7 @@ public function augment($value)
         $this->assertSame($builder, $entry->foo());
     }
 
-    public function queryBuilderProvider()
+    public static function queryBuilderProvider()
     {
         return [
             'statamic' => [Mockery::mock(\Statamic\Query\Builder::class)],
@@ -941,7 +941,7 @@ public function it_gets_dates_for_dated_collection_entries(
         $this->assertEquals($expectedPath, pathinfo($entry->path(), PATHINFO_FILENAME));
     }
 
-    public function dateCollectionEntriesProvider()
+    public static function dateCollectionEntriesProvider()
     {
         return [
             'no date explicitly set, time not explicitly enabled' => [null, null, null, '2015-09-24 00:00:00', false, false, 'foo'], // By default, the date field added to dated collection blueprints does not have time enabled.
@@ -2167,7 +2167,7 @@ public function it_gets_the_auto_generated_title($format)
         $this->assertEquals('Talkboy by Tiger Electronics', $entry->autoGeneratedTitle());
     }
 
-    public function autoGeneratedTitleProvider()
+    public static function autoGeneratedTitleProvider()
     {
         return [
             'antlers' => ['{{ product }} by {{ company }}'],
diff --git a/tests/Data/Entries/GetDateFromPathTest.php b/tests/Data/Entries/GetDateFromPathTest.php
index f3b3afb380..687b0d61a8 100644
--- a/tests/Data/Entries/GetDateFromPathTest.php
+++ b/tests/Data/Entries/GetDateFromPathTest.php
@@ -10,14 +10,14 @@ class GetDateFromPathTest extends TestCase
     /**
      * @test
      *
-     * @dataProvider paths
+     * @dataProvider pathsProvider
      **/
     public function it_gets_the_date_from_a_path($expected, $path)
     {
         $this->assertEquals($expected, (new GetDateFromPath)($path));
     }
 
-    public function paths()
+    public static function pathsProvider()
     {
         return [
             'date' => ['2015-01-01', 'path/to/2015-01-01.post.md'],
diff --git a/tests/Data/Entries/GetSlugFromPathTest.php b/tests/Data/Entries/GetSlugFromPathTest.php
index c556ed2313..2e302391a1 100644
--- a/tests/Data/Entries/GetSlugFromPathTest.php
+++ b/tests/Data/Entries/GetSlugFromPathTest.php
@@ -10,14 +10,14 @@ class GetSlugFromPathTest extends TestCase
     /**
      * @test
      *
-     * @dataProvider paths
+     * @dataProvider pathsProvider
      **/
     public function it_gets_the_slug_from_a_path($expected, $path)
     {
         $this->assertEquals($expected, (new GetSlugFromPath)('path/to/'.$path));
     }
 
-    public function paths()
+    public static function pathsProvider()
     {
         return [
             'date' => ['post', '2015-01-01.post.md'],
diff --git a/tests/Data/Entries/GetSuffixFromPathTest.php b/tests/Data/Entries/GetSuffixFromPathTest.php
index e6a8731062..a0822ef67f 100644
--- a/tests/Data/Entries/GetSuffixFromPathTest.php
+++ b/tests/Data/Entries/GetSuffixFromPathTest.php
@@ -10,14 +10,14 @@ class GetSuffixFromPathTest extends TestCase
     /**
      * @test
      *
-     * @dataProvider paths
+     * @dataProvider pathsProvider
      **/
     public function it_gets_the_suffix_from_a_path($expected, $path)
     {
         $this->assertEquals($expected, (new GetSuffixFromPath)($path));
     }
 
-    public function paths()
+    public static function pathsProvider()
     {
         return [
             'date' => [null, 'path/to/2015-01-01.post.md'],
diff --git a/tests/Data/Entries/RemoveSuffixFromPathTest.php b/tests/Data/Entries/RemoveSuffixFromPathTest.php
index 8b20dafa5a..62386741fa 100644
--- a/tests/Data/Entries/RemoveSuffixFromPathTest.php
+++ b/tests/Data/Entries/RemoveSuffixFromPathTest.php
@@ -10,14 +10,14 @@ class RemoveSuffixFromPathTest extends TestCase
     /**
      * @test
      *
-     * @dataProvider paths
+     * @dataProvider pathsProvider
      **/
     public function it_removes_the_suffix_from_a_path($expected, $path)
     {
         $this->assertEquals($expected, (new RemoveSuffixFromPath)($path));
     }
 
-    public function paths()
+    public static function pathsProvider()
     {
         return [
             'date' => ['path/to/2015-01-01.post.md', 'path/to/2015-01-01.post.md'],
diff --git a/tests/Data/ExistsAsFileTest.php b/tests/Data/ExistsAsFileTest.php
index 27d4aead05..82bc09e75b 100644
--- a/tests/Data/ExistsAsFileTest.php
+++ b/tests/Data/ExistsAsFileTest.php
@@ -46,7 +46,7 @@ public function it_dumps_yaml_with_front_matter_when_theres_content()
 the content
 EOT;
 
-        $this->assertEquals($expected, trim($item->fileContents()));
+        $this->assertStringEqualsStringIgnoringLineEndings($expected, trim($item->fileContents()));
     }
 
     /** @test */
@@ -66,7 +66,7 @@ public function it_dumps_yaml_with_front_matter_when_content_is_missing()
 ---
 EOT;
 
-        $this->assertEquals($expected, trim($item->fileContents()));
+        $this->assertStringEqualsStringIgnoringLineEndings($expected, trim($item->fileContents()));
     }
 
     /** @test */
diff --git a/tests/Data/Globals/VariablesTest.php b/tests/Data/Globals/VariablesTest.php
index 22a82d8511..72756f2a64 100644
--- a/tests/Data/Globals/VariablesTest.php
+++ b/tests/Data/Globals/VariablesTest.php
@@ -281,7 +281,7 @@ public function augment($value)
         $this->assertSame($builder, $variables->foo());
     }
 
-    public function queryBuilderProvider()
+    public static function queryBuilderProvider()
     {
         return [
             'statamic' => [Mockery::mock(\Statamic\Query\Builder::class)],
diff --git a/tests/Data/Structures/PageTest.php b/tests/Data/Structures/PageTest.php
index 9f4001793b..8ea87e29bd 100644
--- a/tests/Data/Structures/PageTest.php
+++ b/tests/Data/Structures/PageTest.php
@@ -226,7 +226,7 @@ public function slug($slug = null)
         $this->assertFalse($page->hasCustomUrl());
     }
 
-    public function stripExtensionFromParentUriProvider()
+    public static function stripExtensionFromParentUriProvider()
     {
         return [
             'html' => ['html'],
diff --git a/tests/Data/Taxonomies/LocalizedTermTest.php b/tests/Data/Taxonomies/LocalizedTermTest.php
index 03d693e4b8..3ecdb6a135 100644
--- a/tests/Data/Taxonomies/LocalizedTermTest.php
+++ b/tests/Data/Taxonomies/LocalizedTermTest.php
@@ -145,7 +145,7 @@ public function augment($value)
         $this->assertSame($builder, $localized->foo());
     }
 
-    public function queryBuilderProvider()
+    public static function queryBuilderProvider()
     {
         return [
             'statamic' => [Mockery::mock(\Statamic\Query\Builder::class)],
diff --git a/tests/Data/Taxonomies/TaxonomyTest.php b/tests/Data/Taxonomies/TaxonomyTest.php
index dd747430bc..191a4e59c1 100644
--- a/tests/Data/Taxonomies/TaxonomyTest.php
+++ b/tests/Data/Taxonomies/TaxonomyTest.php
@@ -465,7 +465,7 @@ public function it_cannot_view_taxonomies_from_sites_that_the_user_is_not_author
         $this->assertFalse($user->can('view', $taxonomy3));
     }
 
-    public function additionalPreviewTargetProvider()
+    public static function additionalPreviewTargetProvider()
     {
         return [
             'through object' => [false],
diff --git a/tests/Extend/AddonTest.php b/tests/Extend/AddonTest.php
index 229cd8ec41..54fc722827 100644
--- a/tests/Extend/AddonTest.php
+++ b/tests/Extend/AddonTest.php
@@ -254,7 +254,7 @@ public function it_checks_if_its_the_latest_version($version, $latest, $isLatest
         ])->isLatestVersion());
     }
 
-    public function isLatestVersionProvider()
+    public static function isLatestVersionProvider()
     {
         return [
             ['1.0.0', '1.0.0', true],
diff --git a/tests/Facades/PathTest.php b/tests/Facades/PathTest.php
index 1e98a05ff1..86b7843ad2 100644
--- a/tests/Facades/PathTest.php
+++ b/tests/Facades/PathTest.php
@@ -23,7 +23,7 @@ public function it_gets_the_extension($path, $extension)
         $this->assertSame($extension, Path::extension($path));
     }
 
-    public function extensionProvider()
+    public static function extensionProvider()
     {
         return [
             'with extension' => ['path.ext', 'ext'],
diff --git a/tests/Facades/PatternTest.php b/tests/Facades/PatternTest.php
index 6e0d02051a..a4cb4ac300 100644
--- a/tests/Facades/PatternTest.php
+++ b/tests/Facades/PatternTest.php
@@ -17,7 +17,7 @@ public function it_escapes_sql_like_syntax($string, $expected)
         $this->assertEquals($expected, Pattern::sqlLikeQuote($string));
     }
 
-    public function likeProvider()
+    public static function likeProvider()
     {
         return collect([
             'foo' => 'foo',
@@ -41,7 +41,7 @@ public function it_converts_sql_like_syntax_to_regex($string, $expected)
         $this->assertEquals($expected, Pattern::sqlLikeToRegex($string));
     }
 
-    public function likeRegexProvider()
+    public static function likeRegexProvider()
     {
         return collect([
             'foo' => '^foo$',
diff --git a/tests/Facades/UrlTest.php b/tests/Facades/UrlTest.php
index 74c9e534ab..8c2da63885 100644
--- a/tests/Facades/UrlTest.php
+++ b/tests/Facades/UrlTest.php
@@ -88,7 +88,7 @@ public function it_checks_whether_a_url_is_an_ancestor_of_another($child, $paren
         $this->assertSame($isAncestor, URL::isAncestorOf($child, $parent));
     }
 
-    public function ancestorProvider()
+    public static function ancestorProvider()
     {
         return [
             'homepage to homepage' => ['/', '/', false],
@@ -144,7 +144,7 @@ public function it_makes_urls_absolute($url, $expected, $forceScheme = false)
         $this->assertSame($expected, URL::makeAbsolute($url));
     }
 
-    public function absoluteProvider()
+    public static function absoluteProvider()
     {
         return [
             ['http://example.com', 'http://example.com'],
@@ -177,7 +177,7 @@ public function makes_urls_relative($url, $expected)
         $this->assertSame($expected, URL::makeRelative($url));
     }
 
-    public function relativeProvider()
+    public static function relativeProvider()
     {
         return [
             ['http://example.com', '/'],
diff --git a/tests/Feature/Collections/ShowCollectionTest.php b/tests/Feature/Collections/ShowCollectionTestCase.php
similarity index 95%
rename from tests/Feature/Collections/ShowCollectionTest.php
rename to tests/Feature/Collections/ShowCollectionTestCase.php
index 9095dee249..196cd221a5 100644
--- a/tests/Feature/Collections/ShowCollectionTest.php
+++ b/tests/Feature/Collections/ShowCollectionTestCase.php
@@ -7,7 +7,7 @@
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
 
-abstract class ShowCollectionTest extends TestCase
+abstract class ShowCollectionTestCase extends TestCase
 {
     use FakesRoles;
     use PreventSavingStacheItemsToDisk;
diff --git a/tests/Feature/Collections/ShowRegularCollectionTest.php b/tests/Feature/Collections/ShowRegularCollectionTest.php
index 9843fdd88a..8fd6f8c12f 100644
--- a/tests/Feature/Collections/ShowRegularCollectionTest.php
+++ b/tests/Feature/Collections/ShowRegularCollectionTest.php
@@ -7,7 +7,7 @@
 use Statamic\Facades\User;
 use Tests\PreventSavingStacheItemsToDisk;
 
-class ShowRegularCollectionTest extends ShowCollectionTest
+class ShowRegularCollectionTest extends ShowCollectionTestCase
 {
     use PreventSavingStacheItemsToDisk;
 
diff --git a/tests/Feature/Collections/ShowStructuredCollectionTest.php b/tests/Feature/Collections/ShowStructuredCollectionTest.php
index 095777731c..19341e3817 100644
--- a/tests/Feature/Collections/ShowStructuredCollectionTest.php
+++ b/tests/Feature/Collections/ShowStructuredCollectionTest.php
@@ -7,7 +7,7 @@
 use Statamic\Facades\User;
 use Tests\PreventSavingStacheItemsToDisk;
 
-class ShowStructuredCollectionTest extends ShowCollectionTest
+class ShowStructuredCollectionTest extends ShowCollectionTestCase
 {
     use PreventSavingStacheItemsToDisk;
 
diff --git a/tests/Feature/Collections/UpdateCollectionTreeTest.php b/tests/Feature/Collections/UpdateCollectionTreeTest.php
index bbb0f1e824..1fad4ef640 100644
--- a/tests/Feature/Collections/UpdateCollectionTreeTest.php
+++ b/tests/Feature/Collections/UpdateCollectionTreeTest.php
@@ -63,7 +63,7 @@ public function it_updates_the_tree($collectionHandle)
         ], $collection->structure()->in('en')->tree());
     }
 
-    public function collectionTreeDataProvider()
+    public static function collectionTreeDataProvider()
     {
         return [
             'arbitrary handle' => ['pages'],
diff --git a/tests/Feature/Entries/StoreEntryTest.php b/tests/Feature/Entries/StoreEntryTest.php
index f620071984..211e662a21 100644
--- a/tests/Feature/Entries/StoreEntryTest.php
+++ b/tests/Feature/Entries/StoreEntryTest.php
@@ -102,7 +102,7 @@ public function slug_is_not_required_and_will_get_created_from_the_submitted_tit
         $this->assertEquals($expectedSlug.'.md', pathinfo($entry->path(), PATHINFO_BASENAME));
     }
 
-    public function multipleSlugLangsProvider()
+    public static function multipleSlugLangsProvider()
     {
         return [
             'English' => ['en', 'test-entry-aeoa'],
diff --git a/tests/Feature/Entries/UpdateEntryTest.php b/tests/Feature/Entries/UpdateEntryTest.php
index 1f66653fc8..9fae81a268 100644
--- a/tests/Feature/Entries/UpdateEntryTest.php
+++ b/tests/Feature/Entries/UpdateEntryTest.php
@@ -151,7 +151,7 @@ public function slug_is_not_required_and_will_get_created_from_the_submitted_tit
         $this->assertEquals($expectedSlug.'.md', pathinfo($entry->path(), PATHINFO_BASENAME));
     }
 
-    public function multipleSlugLangsProvider()
+    public static function multipleSlugLangsProvider()
     {
         return [
             'English' => ['en', 'foo-bar-baz-aeoa'],
diff --git a/tests/Feature/Fieldtypes/FilesTest.php b/tests/Feature/Fieldtypes/FilesTest.php
index 9b4eee5ea5..5729a6a460 100644
--- a/tests/Feature/Fieldtypes/FilesTest.php
+++ b/tests/Feature/Fieldtypes/FilesTest.php
@@ -77,7 +77,7 @@ public function it_uploads_a_file($container, $isImage, $expectedPath, $expected
         }
     }
 
-    public function uploadProvider()
+    public static function uploadProvider()
     {
         return [
             'no container' => [null, true, '1671484636/test.jpg', 50, 75],
diff --git a/tests/Feature/GraphQL/EntryTest.php b/tests/Feature/GraphQL/EntryTest.php
index eb6076605d..476945f898 100644
--- a/tests/Feature/GraphQL/EntryTest.php
+++ b/tests/Feature/GraphQL/EntryTest.php
@@ -77,7 +77,7 @@ public function it_cannot_query_against_non_allowed_sub_resource_with_collection
             ]);
     }
 
-    public function findEventOneByArg()
+    public static function findEventOneByArgProvider()
     {
         return [
             ['id: "3"'],
@@ -89,7 +89,7 @@ public function findEventOneByArg()
     /**
      * @test
      *
-     * @dataProvider findEventOneByArg
+     * @dataProvider findEventOneByArgProvider
      */
     public function it_cannot_query_against_non_allowed_sub_resource_with_other_args($arg)
     {
diff --git a/tests/Feature/GraphQL/Fieldtypes/BardFieldtypeTest.php b/tests/Feature/GraphQL/Fieldtypes/BardFieldtypeTest.php
index 4f723bff3e..f03561e402 100644
--- a/tests/Feature/GraphQL/Fieldtypes/BardFieldtypeTest.php
+++ b/tests/Feature/GraphQL/Fieldtypes/BardFieldtypeTest.php
@@ -448,7 +448,7 @@ public function it_outputs_bard_fields_with_value_based_subfields()
             ]]);
     }
 
-    public function groupedSetsProvider()
+    public static function groupedSetsProvider()
     {
         return [
             'grouped sets (new)' => [true],
diff --git a/tests/Feature/GraphQL/Fieldtypes/ReplicatorFieldtypeTest.php b/tests/Feature/GraphQL/Fieldtypes/ReplicatorFieldtypeTest.php
index a46ca71c6f..8f1c22968f 100644
--- a/tests/Feature/GraphQL/Fieldtypes/ReplicatorFieldtypeTest.php
+++ b/tests/Feature/GraphQL/Fieldtypes/ReplicatorFieldtypeTest.php
@@ -300,7 +300,7 @@ public function it_outputs_replicator_fields_with_value_based_subfields()
             ]]);
     }
 
-    public function groupedSetsProvider()
+    public static function groupedSetsProvider()
     {
         return [
             'grouped sets (new)' => [true],
diff --git a/tests/Feature/GraphQL/RequestCacheTest.php b/tests/Feature/GraphQL/RequestCacheTest.php
index 29444b8973..38f07d4ffa 100644
--- a/tests/Feature/GraphQL/RequestCacheTest.php
+++ b/tests/Feature/GraphQL/RequestCacheTest.php
@@ -146,7 +146,7 @@ public function it_doesnt_bypass_cache_when_using_an_invalid_token($url, $header
         ], $requests->all());
     }
 
-    public function bypassCacheProvider()
+    public static function bypassCacheProvider()
     {
         return [
             ['/graphql?token=test-token', []],
diff --git a/tests/Feature/GraphQL/UsersTest.php b/tests/Feature/GraphQL/UsersTest.php
index a585dffd59..812c86dea1 100644
--- a/tests/Feature/GraphQL/UsersTest.php
+++ b/tests/Feature/GraphQL/UsersTest.php
@@ -372,7 +372,7 @@ public function it_doesnt_allow_filtering_users_by_password($field, $filter)
             ]);
     }
 
-    public function userPasswordFilterProvider()
+    public static function userPasswordFilterProvider()
     {
         return [
             'password' => ['password', '{ password: "abc" }'],
diff --git a/tests/Fields/FieldsetRepositoryTest.php b/tests/Fields/FieldsetRepositoryTest.php
index 3f0e5f54cf..8cda3c9e7c 100644
--- a/tests/Fields/FieldsetRepositoryTest.php
+++ b/tests/Fields/FieldsetRepositoryTest.php
@@ -219,7 +219,7 @@ public function it_saves_to_disk($handle, $expectedPath)
         $this->repo->save($fieldset);
     }
 
-    public function saveProvider()
+    public static function saveProvider()
     {
         return [
             'standard' => ['test', '/path/to/resources/fieldsets/test.yaml'],
diff --git a/tests/Fields/FieldsetTest.php b/tests/Fields/FieldsetTest.php
index f2476aeeb5..4d634d0ae3 100644
--- a/tests/Fields/FieldsetTest.php
+++ b/tests/Fields/FieldsetTest.php
@@ -80,7 +80,7 @@ public function it_gets_the_title($handle, $title, $expectedTitle)
         $this->assertEquals($expectedTitle, $fieldset->title());
     }
 
-    public function titleProvider()
+    public static function titleProvider()
     {
         return [
             'title' => ['test_fieldset', 'The Provided Title', 'The Provided Title'],
diff --git a/tests/Fields/FieldtypeTest.php b/tests/Fields/FieldtypeTest.php
index 230bd1a326..838e848485 100644
--- a/tests/Fields/FieldtypeTest.php
+++ b/tests/Fields/FieldtypeTest.php
@@ -365,7 +365,7 @@ public function it_gets_the_config_blueprint($property, $expectedSections, $expe
         $this->assertEquals($expectedConfigFields, $fieldtype->configFields()->all()->map(fn ($field) => $field->type())->all());
     }
 
-    public function configBlueprintProvider()
+    public static function configBlueprintProvider()
     {
         return [
             'linear fields results in one section' => [
diff --git a/tests/Fields/ValueTest.php b/tests/Fields/ValueTest.php
index 9b1778d927..418160fa81 100644
--- a/tests/Fields/ValueTest.php
+++ b/tests/Fields/ValueTest.php
@@ -21,7 +21,7 @@ public function it_gets_whether_its_a_relationship_through_the_fieldtype($isRela
         $this->assertEquals($isRelationship, $value->isRelationship());
     }
 
-    public function isRelationshipFieldtypeProvider()
+    public static function isRelationshipFieldtypeProvider()
     {
         return [
             'relationship' => [true, new class extends Fieldtype
diff --git a/tests/Fields/ValuesTest.php b/tests/Fields/ValuesTest.php
index 9b4cd8b7e8..3995e489a3 100644
--- a/tests/Fields/ValuesTest.php
+++ b/tests/Fields/ValuesTest.php
@@ -85,7 +85,7 @@ public function its_arrayable()
         ], $values->toArray());
     }
 
-    public function queryBuilderProvider()
+    public static function queryBuilderProvider()
     {
         return [
             'statamic' => [Mockery::mock(\Statamic\Query\Builder::class)],
diff --git a/tests/Fieldtypes/BardTest.php b/tests/Fieldtypes/BardTest.php
index 78fa2c621d..57ecb6887c 100644
--- a/tests/Fieldtypes/BardTest.php
+++ b/tests/Fieldtypes/BardTest.php
@@ -900,7 +900,7 @@ public function it_augments_inline_value($config)
         $this->assertEquals($expected, $this->bard(['inline' => $config, 'sets' => null])->augment($data));
     }
 
-    public function inlineProvider()
+    public static function inlineProvider()
     {
         return [
             'true' => [true],
@@ -1216,7 +1216,7 @@ private function bard($config = [])
         return (new Bard)->setField(new Field('test', array_merge(['type' => 'bard', 'sets' => ['one' => []]], $config)));
     }
 
-    public function groupedSetsProvider()
+    public static function groupedSetsProvider()
     {
         return [
             'grouped sets (new)' => [true],
diff --git a/tests/Fieldtypes/CodeTest.php b/tests/Fieldtypes/CodeTest.php
index aa42236a4a..5aff4f4e8b 100644
--- a/tests/Fieldtypes/CodeTest.php
+++ b/tests/Fieldtypes/CodeTest.php
@@ -11,7 +11,7 @@ class CodeTest extends TestCase
     /**
      * @test
      *
-     * @dataProvider processValues
+     * @dataProvider processValuesProvider
      **/
     public function it_processes_values($isSelectable, $value, $expected)
     {
@@ -23,7 +23,7 @@ public function it_processes_values($isSelectable, $value, $expected)
         $this->assertEquals($expected, $field->process($value));
     }
 
-    public function processValues()
+    public static function processValuesProvider()
     {
         return [
             'selectable' => [true, ['code' => 'bar', 'mode' => 'htmlmixed'], ['code' => 'bar', 'mode' => 'htmlmixed']],
@@ -34,7 +34,7 @@ public function processValues()
     /**
      * @test
      *
-     * @dataProvider preProcessValues
+     * @dataProvider preProcessValuesProvider
      **/
     public function it_preprocesses_values($value, $expected)
     {
@@ -43,7 +43,7 @@ public function it_preprocesses_values($value, $expected)
         $this->assertEquals($expected, $field->preProcess($value));
     }
 
-    public function preProcessValues()
+    public static function preProcessValuesProvider()
     {
         return [
             'string' => ['bar', ['code' => 'bar', 'mode' => 'htmlmixed']],
diff --git a/tests/Fieldtypes/DateTest.php b/tests/Fieldtypes/DateTest.php
index d17cbafacc..d88f4fe4fa 100644
--- a/tests/Fieldtypes/DateTest.php
+++ b/tests/Fieldtypes/DateTest.php
@@ -35,7 +35,7 @@ public function it_augments($config, $value, $expected)
         $this->assertEquals($expected, $augmented->format('Y M d H:i:s'));
     }
 
-    public function augmentProvider()
+    public static function augmentProvider()
     {
         return [
             'date' => [
@@ -124,7 +124,7 @@ public function it_processes_on_save($config, $value, $expected)
         $this->assertSame($expected, $this->fieldtype($config)->process($value));
     }
 
-    public function processProvider()
+    public static function processProvider()
     {
         return [
             'null' => [
@@ -217,7 +217,7 @@ public function it_preprocesses($config, $value, $expected)
         $this->assertSame($expected, $this->fieldtype($config)->preProcess($value));
     }
 
-    public function preProcessProvider()
+    public static function preProcessProvider()
     {
         return [
             'null' => [
@@ -321,7 +321,7 @@ public function it_preprocesses_for_index($config, $value, $expected)
         $this->assertSame($expected, $this->fieldtype($config)->preProcessIndex($value));
     }
 
-    public function preProcessIndexProvider()
+    public static function preProcessIndexProvider()
     {
         return [
             'null' => [
@@ -468,7 +468,7 @@ public function it_preprocess_validatables($config, $input, $expected)
         }
     }
 
-    public function validatablesProvider()
+    public static function validatablesProvider()
     {
         // This only contains valid values. Invalid ones would throw a validation exception, tested in "it_validates" below.
 
@@ -535,7 +535,7 @@ public function it_preprocess_range_validatables($config, $input, $expected)
         }
     }
 
-    public function rangeValidatablesProvider()
+    public static function rangeValidatablesProvider()
     {
         // This only contains valid values. Invalid ones would throw a validation exception, tested in "it_validates" below.
 
@@ -596,7 +596,7 @@ public function it_validates($config, $input, $expected)
         $this->assertEquals($expected, $messages);
     }
 
-    public function validationProvider()
+    public static function validationProvider()
     {
         return [
             'valid date' => [
diff --git a/tests/Fieldtypes/EntriesTest.php b/tests/Fieldtypes/EntriesTest.php
index 2d3890657f..6efedca5df 100644
--- a/tests/Fieldtypes/EntriesTest.php
+++ b/tests/Fieldtypes/EntriesTest.php
@@ -61,7 +61,7 @@ public function it_augments_to_a_query_builder($expectedIds, $queryCallback)
         $this->assertEquals($expectedIds, $results->map->id()->all());
     }
 
-    public function augmentQueryBuilderProvider()
+    public static function augmentQueryBuilderProvider()
     {
         return [
             'published (default, no where clause)' => [['456', '123'], fn ($q) => null],
diff --git a/tests/Fieldtypes/LabeledValueTests.php b/tests/Fieldtypes/LabeledValueTests.php
index 91e05d8266..32e0f8e96b 100644
--- a/tests/Fieldtypes/LabeledValueTests.php
+++ b/tests/Fieldtypes/LabeledValueTests.php
@@ -279,7 +279,7 @@ public function it_augments_to_a_LabeledValue_object_with_no_options($options)
         $this->assertEquals('missing', $augmented->label());
     }
 
-    public function noOptionsProvider()
+    public static function noOptionsProvider()
     {
         return [
             'empty_array' => [[]],
diff --git a/tests/Fieldtypes/MultipleLabeledValueTests.php b/tests/Fieldtypes/MultipleLabeledValueTests.php
index cce27d5909..90631f5bce 100644
--- a/tests/Fieldtypes/MultipleLabeledValueTests.php
+++ b/tests/Fieldtypes/MultipleLabeledValueTests.php
@@ -148,7 +148,7 @@ public function it_augments_multiple_enabled_to_an_array_of_LabeledValue_equival
         ], $field->augment([null, false, true, 'missing']));
     }
 
-    public function noMultipleOptionsProvider()
+    public static function noMultipleOptionsProvider()
     {
         return [
             'empty_array' => [[]],
diff --git a/tests/Fieldtypes/ReplicatorTest.php b/tests/Fieldtypes/ReplicatorTest.php
index 64f13a86af..b69b584021 100644
--- a/tests/Fieldtypes/ReplicatorTest.php
+++ b/tests/Fieldtypes/ReplicatorTest.php
@@ -691,7 +691,7 @@ public function augment($value)
         $this->assertEquals('test.-1.words', $value['defaults']['one']['words']);
     }
 
-    public function groupedSetsProvider()
+    public static function groupedSetsProvider()
     {
         return [
             'grouped sets (new)' => [true],
diff --git a/tests/Fieldtypes/TermsTest.php b/tests/Fieldtypes/TermsTest.php
index 334be127cf..5b3c3d43e7 100644
--- a/tests/Fieldtypes/TermsTest.php
+++ b/tests/Fieldtypes/TermsTest.php
@@ -378,7 +378,7 @@ public function it_attaches_collection_during_augmentation($expectCollection, $p
         }
     }
 
-    public function collectionAttachmentProvider()
+    public static function collectionAttachmentProvider()
     {
         $expectCollection = $parentIsEntry = $isRootLevel = $collectionUsesTaxonomy = true;
         $dontExpectCollection = $parentIsNotEntry = $isNested = $collectionDoesNotUseTaxonomy = false;
diff --git a/tests/Fieldtypes/TextTest.php b/tests/Fieldtypes/TextTest.php
index f3a9f8297d..dbfadc775b 100644
--- a/tests/Fieldtypes/TextTest.php
+++ b/tests/Fieldtypes/TextTest.php
@@ -11,7 +11,7 @@ class TextTest extends TestCase
     /**
      * @test
      *
-     * @dataProvider processValues
+     * @dataProvider processValuesProvider
      **/
     public function it_processes_values($mode, $values)
     {
@@ -27,7 +27,7 @@ public function it_processes_values($mode, $values)
         $this->assertSame($values[4], $field->process(null));
     }
 
-    public function processValues()
+    public static function processValuesProvider()
     {
         return [
             'text' => ['text', ['test', '3', '3test', '3.14', null]],
diff --git a/tests/Fieldtypes/TimeTest.php b/tests/Fieldtypes/TimeTest.php
index aac2abca58..6da0d4067c 100644
--- a/tests/Fieldtypes/TimeTest.php
+++ b/tests/Fieldtypes/TimeTest.php
@@ -31,7 +31,7 @@ public function it_processes_on_save($config, $value, $expected)
         $this->assertSame($expected, $this->fieldtype($config)->process($value));
     }
 
-    public function processProvider()
+    public static function processProvider()
     {
         return [
             'null' => [
@@ -76,7 +76,7 @@ public function it_validates($config, $input, $expected)
         $this->assertEquals($expected, $messages);
     }
 
-    public function validationProvider()
+    public static function validationProvider()
     {
         return [
             'valid time' => [
diff --git a/tests/Fieldtypes/YamlTest.php b/tests/Fieldtypes/YamlTest.php
index 1fedfaea04..c63d6d9885 100644
--- a/tests/Fieldtypes/YamlTest.php
+++ b/tests/Fieldtypes/YamlTest.php
@@ -18,7 +18,7 @@ public function it_processes($value, $expected)
         $this->assertSame($expected, $this->fieldtype()->process($value));
     }
 
-    public function processProvider()
+    public static function processProvider()
     {
         return [
             'string' => ['alfa', 'alfa'],
diff --git a/tests/Fixtures/Addon/Tags/Test.php b/tests/Fixtures/Addon/Tags/TestTags.php
similarity index 93%
rename from tests/Fixtures/Addon/Tags/Test.php
rename to tests/Fixtures/Addon/Tags/TestTags.php
index 547b370ee7..085d644b83 100644
--- a/tests/Fixtures/Addon/Tags/Test.php
+++ b/tests/Fixtures/Addon/Tags/TestTags.php
@@ -4,8 +4,10 @@
 
 use Statamic\Tags\Tags;
 
-class Test extends Tags
+class TestTags extends Tags
 {
+    protected static $handle = 'test';
+
     public function index()
     {
         return $this->params->get('variable');
diff --git a/tests/Forms/EmailTest.php b/tests/Forms/EmailTest.php
index 4eeaaf94b6..5f7d104a16 100644
--- a/tests/Forms/EmailTest.php
+++ b/tests/Forms/EmailTest.php
@@ -78,7 +78,7 @@ public function it_adds_bcc_from_the_config($address, $expected)
         $this->assertEquals($expected, $email->bcc);
     }
 
-    public function singleAddressProvider()
+    public static function singleAddressProvider()
     {
         return [
             'single email' => ['foo@bar.com', [
@@ -102,9 +102,9 @@ public function singleAddressProvider()
         ];
     }
 
-    public function multipleAddressProvider()
+    public static function multipleAddressProvider()
     {
-        return array_merge($this->singleAddressProvider(), [
+        return array_merge(static::singleAddressProvider(), [
             'multiple emails' => ['foo@bar.com, baz@qux.com', [
                 ['address' => 'foo@bar.com', 'name' => null],
                 ['address' => 'baz@qux.com', 'name' => null],
diff --git a/tests/Forms/SendEmailsTest.php b/tests/Forms/SendEmailsTest.php
index 4acf0c5323..38716d65e3 100644
--- a/tests/Forms/SendEmailsTest.php
+++ b/tests/Forms/SendEmailsTest.php
@@ -117,7 +117,7 @@ public function no_email_jobs_are_queued_if_none_are_configured($emailConfig)
         Queue::assertNotPushed(SendEmail::class);
     }
 
-    public function noEmailsProvider()
+    public static function noEmailsProvider()
     {
         return [
             'null' => [null],
diff --git a/tests/FrontendTest.php b/tests/FrontendTest.php
index f227211f5b..e8489157b7 100644
--- a/tests/FrontendTest.php
+++ b/tests/FrontendTest.php
@@ -817,7 +817,7 @@ public function augment($value)
         }
     }
 
-    public function redirectProvider()
+    public static function redirectProvider()
     {
         return [
             'valid redirect' => [
@@ -844,7 +844,7 @@ public function redirectProvider()
     /**
      * @test
      *
-     * @dataProvider redirectProviderNoBlueprint
+     * @dataProvider redirectProviderNoBlueprintProvider
      */
     public function redirect_is_followed_when_no_field_is_present_in_blueprint(
         $dataValue,
@@ -881,7 +881,7 @@ public function redirect_is_followed_when_no_field_is_present_in_blueprint(
         }
     }
 
-    public function redirectProviderNoBlueprint()
+    public static function redirectProviderNoBlueprintProvider()
     {
         return [
             'valid redirect' => [
diff --git a/tests/Http/Middleware/AddViewPathsTest.php b/tests/Http/Middleware/AddViewPathsTest.php
index 10cd56f502..07792346cc 100644
--- a/tests/Http/Middleware/AddViewPathsTest.php
+++ b/tests/Http/Middleware/AddViewPathsTest.php
@@ -95,7 +95,7 @@ private function createRequest($url)
         app()->instance('request', $request);
     }
 
-    public function viewPathProvider()
+    public static function viewPathProvider()
     {
         return [
             'amp enabled, amp request' => [true, '/amp/fr/test', [
@@ -125,7 +125,7 @@ public function viewPathProvider()
         ];
     }
 
-    public function namespacedViewPathProvider()
+    public static function namespacedViewPathProvider()
     {
         return [
             'default site' => [
diff --git a/tests/Imaging/GlideImageManipulatorTest.php b/tests/Imaging/GlideImageManipulatorTest.php
index d4aa8682e0..474c59fa00 100644
--- a/tests/Imaging/GlideImageManipulatorTest.php
+++ b/tests/Imaging/GlideImageManipulatorTest.php
@@ -51,7 +51,7 @@ public function adds_standard_api_params_using_magic_method($param)
         $this->assertArrayHasKey($param, $this->man->getParams());
     }
 
-    public function paramProvider()
+    public static function paramProvider()
     {
         return [
             'or' => ['or'],
@@ -111,7 +111,7 @@ public function testAddsParamsUsingAliases($alias, $value, $expected)
         $this->assertArraySubset($expected, $this->man->getParams());
     }
 
-    public function aliasProvider()
+    public static function aliasProvider()
     {
         return [
             'width' => ['width', 10, ['w' => 10]],
diff --git a/tests/Imaging/ImageGeneratorTest.php b/tests/Imaging/ImageGeneratorTest.php
index 0442b65400..8feaa7aa14 100644
--- a/tests/Imaging/ImageGeneratorTest.php
+++ b/tests/Imaging/ImageGeneratorTest.php
@@ -291,7 +291,7 @@ public function the_watermark_disk_is_a_guzzle_adapter_when_a_url_is_provided($p
         $this->assertEquals(['mark' => 'foo/hoff.jpg'], $generator->getParams());
     }
 
-    public function guzzleWatermarkProvider()
+    public static function guzzleWatermarkProvider()
     {
         return ['http' => ['http'], 'https' => ['https']];
     }
diff --git a/tests/MiscTest.php b/tests/MiscTest.php
index e831323126..efdbb3cca4 100644
--- a/tests/MiscTest.php
+++ b/tests/MiscTest.php
@@ -59,7 +59,7 @@ public function locales_tag_doesnt_ruin_future_tag_pairs($withParameter)
         $this->assertEquals($expected, View::make('test')->cascadeContent($a)->render());
     }
 
-    public function localesTagTestProvider()
+    public static function localesTagTestProvider()
     {
         return [
             'without parameter' => [false],
diff --git a/tests/Modifiers/BackgroundPositionTest.php b/tests/Modifiers/BackgroundPositionTest.php
index bb9ab7f1e7..1b3d695b04 100644
--- a/tests/Modifiers/BackgroundPositionTest.php
+++ b/tests/Modifiers/BackgroundPositionTest.php
@@ -7,7 +7,7 @@
 
 class BackgroundPositionTest extends TestCase
 {
-    public function backgroundPositions(): array
+    public static function backgroundPositionsProvider(): array
     {
         return [
             ['0% 0%', '0-0'],
@@ -25,7 +25,7 @@ public function backgroundPositions(): array
     /**
      * @test
      *
-     * @dataProvider backgroundPositions
+     * @dataProvider backgroundPositionsProvider
      */
     public function it_converts_a_focus_point_into_css_compatible_percent_value($expected, $input): void
     {
diff --git a/tests/Modifiers/CamelizeTest.php b/tests/Modifiers/CamelizeTest.php
index 8b7fdf980b..8b8451bb05 100644
--- a/tests/Modifiers/CamelizeTest.php
+++ b/tests/Modifiers/CamelizeTest.php
@@ -7,7 +7,7 @@
 
 class CamelizeTest extends TestCase
 {
-    public function camelFarm(): array
+    public static function camelFarmProvider(): array
     {
         return [
             'it_camelize_underscores' => ['makeEverythingBetter', 'make_everything_better'],
@@ -21,7 +21,7 @@ public function camelFarm(): array
     /**
      * @test
      *
-     * @dataProvider camelFarm
+     * @dataProvider camelFarmProvider
      */
     public function it_camelizes_underscores($expected, $input): void
     {
diff --git a/tests/Modifiers/CeilTest.php b/tests/Modifiers/CeilTest.php
index 80ecefb14f..de66b3f9be 100644
--- a/tests/Modifiers/CeilTest.php
+++ b/tests/Modifiers/CeilTest.php
@@ -7,7 +7,7 @@
 
 class CeilTest extends TestCase
 {
-    public function numbersPool(): array
+    public static function numbersPoolProvider(): array
     {
         return [
             [-10, -10],
@@ -25,7 +25,7 @@ public function numbersPool(): array
     /**
      * @test
      *
-     * @dataProvider numbersPool
+     * @dataProvider numbersPoolProvider
      */
     public function it_rounds_a_number_up_to_next_whole_number($expected, $input): void
     {
diff --git a/tests/Modifiers/CollapseWhitespaceTest.php b/tests/Modifiers/CollapseWhitespaceTest.php
index 4a976e7608..8e79dcbae8 100644
--- a/tests/Modifiers/CollapseWhitespaceTest.php
+++ b/tests/Modifiers/CollapseWhitespaceTest.php
@@ -7,7 +7,7 @@
 
 class CollapseWhitespaceTest extends TestCase
 {
-    public function stringsWithWeirdWhitespaces(): array
+    public static function stringsWithWeirdWhitespacesProvider(): array
     {
         return [
             'multiple_whitespace' => ['Bad at typing', 'Bad   at           typing'],
@@ -22,7 +22,7 @@ public function stringsWithWeirdWhitespaces(): array
     /**
      * @test
      *
-     * @dataProvider stringsWithWeirdWhitespaces
+     * @dataProvider stringsWithWeirdWhitespacesProvider
      */
     public function it_collapses_whitespaces($expected, $input): void
     {
diff --git a/tests/Modifiers/CountTest.php b/tests/Modifiers/CountTest.php
index 01590bd9fd..023d06497f 100644
--- a/tests/Modifiers/CountTest.php
+++ b/tests/Modifiers/CountTest.php
@@ -7,7 +7,7 @@
 
 class CountTest extends TestCase
 {
-    public function arraysToCount(): array
+    public static function arraysToCountProvider(): array
     {
         return [
             [0, []],
@@ -20,7 +20,7 @@ public function arraysToCount(): array
     /**
      * @test
      *
-     * @dataProvider arraysToCount
+     * @dataProvider arraysToCountProvider
      */
     public function it_counts_number_of_items_in_array($expected, $input): void
     {
diff --git a/tests/Modifiers/DashifyTest.php b/tests/Modifiers/DashifyTest.php
index 9a5ba98d99..f660073f31 100644
--- a/tests/Modifiers/DashifyTest.php
+++ b/tests/Modifiers/DashifyTest.php
@@ -7,7 +7,7 @@
 
 class DashifyTest extends TestCase
 {
-    public function undashyThings(): array
+    public static function undashyThingsProvider(): array
     {
         return [
             'with_whitespaces' => ['just-because-i-can', 'Just Because I Can'],
@@ -20,7 +20,7 @@ public function undashyThings(): array
     /**
      * @test
      *
-     * @dataProvider undashyThings
+     * @dataProvider undashyThingsProvider
      */
     public function it_returns_a_lowercase_and_trimmed_string_separated_by_dashes($expected, $input): void
     {
diff --git a/tests/Modifiers/DecodeTest.php b/tests/Modifiers/DecodeTest.php
index 67a8a3aa95..08404ae45b 100644
--- a/tests/Modifiers/DecodeTest.php
+++ b/tests/Modifiers/DecodeTest.php
@@ -7,7 +7,7 @@
 
 class DecodeTest extends TestCase
 {
-    public function undecoded(): array
+    public static function undecodedProvider(): array
     {
         return [
             ['I\'ll "eat" the <b>bacon</b> now', "I'll \"eat\" the <b>bacon</b> now"],
@@ -17,7 +17,7 @@ public function undecoded(): array
     /**
      * @test
      *
-     * @dataProvider undecoded
+     * @dataProvider undecodedProvider
      */
     public function it_converts_all_html_entities_to_applicable_chars($expected, $input): void
     {
diff --git a/tests/Modifiers/DeslugifyTest.php b/tests/Modifiers/DeslugifyTest.php
index 6e74cb2074..bb2a643c77 100644
--- a/tests/Modifiers/DeslugifyTest.php
+++ b/tests/Modifiers/DeslugifyTest.php
@@ -7,7 +7,7 @@
 
 class DeslugifyTest extends TestCase
 {
-    public function slackingSlugs(): array
+    public static function slackingSlugsProvider(): array
     {
         return [
             'with_dashes' => ['Just Because I Can', 'Just-Because-I-Can'],
@@ -18,7 +18,7 @@ public function slackingSlugs(): array
     /**
      * @test
      *
-     * @dataProvider slackingSlugs
+     * @dataProvider slackingSlugsProvider
      */
     public function it_replaces_all_hyphens_and_underscores_with_spaces($expected, $input): void
     {
diff --git a/tests/Modifiers/EntitiesTest.php b/tests/Modifiers/EntitiesTest.php
index 5871414ed6..57f184e542 100644
--- a/tests/Modifiers/EntitiesTest.php
+++ b/tests/Modifiers/EntitiesTest.php
@@ -7,7 +7,7 @@
 
 class EntitiesTest extends TestCase
 {
-    public function entityDataProvider(): array
+    public static function entityDataProvider(): array
     {
         return [
             ['The &#039;bacon&#039; is &lt;b&gt;crispy&lt;/b&gt;', "The 'bacon' is <b>crispy</b>"],
diff --git a/tests/Modifiers/ExtensionTest.php b/tests/Modifiers/ExtensionTest.php
index 59bab4e97a..92931a124b 100644
--- a/tests/Modifiers/ExtensionTest.php
+++ b/tests/Modifiers/ExtensionTest.php
@@ -7,7 +7,7 @@
 
 class ExtensionTest extends TestCase
 {
-    public function filenames(): array
+    public static function filenamesProvider(): array
     {
         return [
             ['pdf', 'example.pdf'],
@@ -20,7 +20,7 @@ public function filenames(): array
     /**
      * @test
      *
-     * @dataProvider filenames
+     * @dataProvider filenamesProvider
      */
     public function it_returns_the_extension_of_filename($expected, $input): void
     {
diff --git a/tests/Modifiers/FirstTest.php b/tests/Modifiers/FirstTest.php
index f2b71c487f..41e2dad549 100644
--- a/tests/Modifiers/FirstTest.php
+++ b/tests/Modifiers/FirstTest.php
@@ -17,7 +17,7 @@ public function it_gets_the_first_n_characters_of_a_string($arg, $expected)
         $this->assertEquals($expected, $this->modify('Testing', $arg));
     }
 
-    public function stringProvider()
+    public static function stringProvider()
     {
         return [
             [1, 'T'],
@@ -35,7 +35,7 @@ public function it_gets_the_first_value_of_an_array($value, $expected)
         $this->assertEquals($expected, $this->modify($value));
     }
 
-    public function arrayProvider()
+    public static function arrayProvider()
     {
         return [
             'list' => [
diff --git a/tests/Modifiers/FloorTest.php b/tests/Modifiers/FloorTest.php
index a6a737b653..0762c90130 100644
--- a/tests/Modifiers/FloorTest.php
+++ b/tests/Modifiers/FloorTest.php
@@ -7,7 +7,7 @@
 
 class FloorTest extends TestCase
 {
-    public function numbersPool(): array
+    public static function numbersPoolProvider(): array
     {
         return [
             [-10, -10],
@@ -25,7 +25,7 @@ public function numbersPool(): array
     /**
      * @test
      *
-     * @dataProvider numbersPool
+     * @dataProvider numbersPoolProvider
      */
     public function it_rounds_a_number_down_to_next_whole_number($expected, $input): void
     {
diff --git a/tests/Modifiers/HasLowerCaseTest.php b/tests/Modifiers/HasLowerCaseTest.php
index d23b8dc904..e51877f5be 100644
--- a/tests/Modifiers/HasLowerCaseTest.php
+++ b/tests/Modifiers/HasLowerCaseTest.php
@@ -7,7 +7,7 @@
 
 class HasLowerCaseTest extends TestCase
 {
-    public function strings(): array
+    public static function stringsProvider(): array
     {
         return [
             'string_with_one_lowercase_char' => [true, "I DON'T KNOW WHAT WE'RE YELLINg ABOUT!"],
@@ -19,7 +19,7 @@ public function strings(): array
     /**
      * @test
      *
-     * @dataProvider strings
+     * @dataProvider stringsProvider
      */
     public function it_returns_true_if_the_string_has_lowercase_char_false_if_does_not($expected, $input): void
     {
diff --git a/tests/Modifiers/HasUpperCaseTest.php b/tests/Modifiers/HasUpperCaseTest.php
index 5b5f5a2714..1954b943ff 100644
--- a/tests/Modifiers/HasUpperCaseTest.php
+++ b/tests/Modifiers/HasUpperCaseTest.php
@@ -7,7 +7,7 @@
 
 class HasUpperCaseTest extends TestCase
 {
-    public function strings(): array
+    public static function stringsProvider(): array
     {
         return [
             'string_with_one_uppercase_char' => [true, "i don't know what we're yellinG about!"],
@@ -20,7 +20,7 @@ public function strings(): array
     /**
      * @test
      *
-     * @dataProvider strings
+     * @dataProvider stringsProvider
      */
     public function it_returns_true_if_the_string_has_uppercase_char_false_if_does_not($expected, $input): void
     {
diff --git a/tests/Modifiers/IsAlphaTest.php b/tests/Modifiers/IsAlphaTest.php
index 69c20a4237..416c332a57 100644
--- a/tests/Modifiers/IsAlphaTest.php
+++ b/tests/Modifiers/IsAlphaTest.php
@@ -7,7 +7,7 @@
 
 class IsAlphaTest extends TestCase
 {
-    public function strings(): array
+    public static function stringsProvider(): array
     {
         return [
             'string_with_chars' => [true, 'abc'],
@@ -22,7 +22,7 @@ public function strings(): array
     /**
      * @test
      *
-     * @dataProvider strings
+     * @dataProvider stringsProvider
      */
     public function it_returns_true_if_the_string_contains_only_alphabetical_chars($expected, $input): void
     {
diff --git a/tests/Modifiers/IsAlphanumericTest.php b/tests/Modifiers/IsAlphanumericTest.php
index c31a0c5b1b..c5ea6178d2 100644
--- a/tests/Modifiers/IsAlphanumericTest.php
+++ b/tests/Modifiers/IsAlphanumericTest.php
@@ -7,7 +7,7 @@
 
 class IsAlphanumericTest extends TestCase
 {
-    public function strings(): array
+    public static function stringsProvider(): array
     {
         return [
             'string_with_numbers' => [true, '123'],
@@ -22,7 +22,7 @@ public function strings(): array
     /**
      * @test
      *
-     * @dataProvider strings
+     * @dataProvider stringsProvider
      */
     public function it_returns_true_if_the_string_contains_only_alphanumeric_chars($expected, $input): void
     {
diff --git a/tests/Modifiers/IsArrayTest.php b/tests/Modifiers/IsArrayTest.php
index 8b54011bd5..1234beccf5 100644
--- a/tests/Modifiers/IsArrayTest.php
+++ b/tests/Modifiers/IsArrayTest.php
@@ -7,7 +7,7 @@
 
 class IsArrayTest extends TestCase
 {
-    public function array(): array
+    public static function arrayProvider(): array
     {
         return [
             'empty_array' => [true, []],
@@ -22,7 +22,7 @@ public function array(): array
     /**
      * @test
      *
-     * @dataProvider array
+     * @dataProvider arrayProvider
      */
     public function it_returns_true_if_value_is_array($expected, $input): void
     {
diff --git a/tests/Modifiers/IsEmailTest.php b/tests/Modifiers/IsEmailTest.php
index 5e6af4239b..758d165cea 100644
--- a/tests/Modifiers/IsEmailTest.php
+++ b/tests/Modifiers/IsEmailTest.php
@@ -7,7 +7,7 @@
 
 class IsEmailTest extends TestCase
 {
-    public function emails(): array
+    public static function emailsProvider(): array
     {
         return [
             'email' => [true, 'lknope@inpra.org'],
@@ -18,7 +18,7 @@ public function emails(): array
     /**
      * @test
      *
-     * @dataProvider emails
+     * @dataProvider emailsProvider
      */
     public function it_returns_true_if_the_string_is_a_valid_email_address($expected, $input): void
     {
diff --git a/tests/Modifiers/IsEmbeddableTest.php b/tests/Modifiers/IsEmbeddableTest.php
index b32975a330..bc7e3e526b 100644
--- a/tests/Modifiers/IsEmbeddableTest.php
+++ b/tests/Modifiers/IsEmbeddableTest.php
@@ -7,7 +7,7 @@
 
 class IsEmbeddableTest extends TestCase
 {
-    public function embeddables(): array
+    public static function embeddablesProvider(): array
     {
         return [
             'youtube.com' => [true, 'https://www.youtube.com/watch?v=s9F5fhJQo34'],
@@ -20,7 +20,7 @@ public function embeddables(): array
     /**
      * @test
      *
-     * @dataProvider embeddables
+     * @dataProvider embeddablesProvider
      */
     public function it_checks_if_an_url_is_embeddable($expected, $input): void
     {
diff --git a/tests/Modifiers/IsFutureTest.php b/tests/Modifiers/IsFutureTest.php
index b150c2f11d..181a53a6e9 100644
--- a/tests/Modifiers/IsFutureTest.php
+++ b/tests/Modifiers/IsFutureTest.php
@@ -8,7 +8,7 @@
 
 class IsFutureTest extends TestCase
 {
-    public function dates(): array
+    public static function datesProvider(): array
     {
         $futureDate = Carbon::createFromDate(2030, 10, 21);
         $pastDate = Carbon::createFromDate(2015, 10, 21);
@@ -27,7 +27,7 @@ public function dates(): array
     /**
      * @test
      *
-     * @dataProvider dates
+     * @dataProvider datesProvider
      */
     public function it_returns_true_if_date_is_future($expected, $input): void
     {
diff --git a/tests/Modifiers/IsIterableTest.php b/tests/Modifiers/IsIterableTest.php
index 3731177590..bbe680f4bf 100644
--- a/tests/Modifiers/IsIterableTest.php
+++ b/tests/Modifiers/IsIterableTest.php
@@ -8,7 +8,7 @@
 
 class IsIterableTest extends TestCase
 {
-    public function iterables(): array
+    public static function iterablesProvider(): array
     {
         return [
             'array' => [true, ['foo', 'bar', 'baz']],
@@ -21,7 +21,7 @@ public function iterables(): array
     /**
      * @test
      *
-     * @dataProvider iterables
+     * @dataProvider iterablesProvider
      */
     public function it_returns_true_if_input_is_iterable($expected, $input): void
     {
diff --git a/tests/Modifiers/IsJsonTest.php b/tests/Modifiers/IsJsonTest.php
index e33284dd32..64d071c06d 100644
--- a/tests/Modifiers/IsJsonTest.php
+++ b/tests/Modifiers/IsJsonTest.php
@@ -7,7 +7,7 @@
 
 class IsJsonTest extends TestCase
 {
-    public function bourneJsonBourne(): array
+    public static function bourneJsonBourneProvider(): array
     {
         return [
             'empty_json' => [true, '{}'],
@@ -19,7 +19,7 @@ public function bourneJsonBourne(): array
     /**
      * @test
      *
-     * @dataProvider bourneJsonBourne
+     * @dataProvider bourneJsonBourneProvider
      */
     public function it_returns_true_if_string_is_valid_json($expected, $input): void
     {
diff --git a/tests/Modifiers/IsLowercaseTest.php b/tests/Modifiers/IsLowercaseTest.php
index 4e5abe0c5e..2a713cc20c 100644
--- a/tests/Modifiers/IsLowercaseTest.php
+++ b/tests/Modifiers/IsLowercaseTest.php
@@ -7,7 +7,7 @@
 
 class IsLowercaseTest extends TestCase
 {
-    public function strings(): array
+    public static function stringsProvider(): array
     {
         return [
             'string_with_one_uppercase_char' => [false, "i don't know what we're yellinG about!"],
@@ -21,7 +21,7 @@ public function strings(): array
     /**
      * @test
      *
-     * @dataProvider strings
+     * @dataProvider stringsProvider
      */
     public function it_returns_true_if_string_has_only_lowercase_chars($expected, $input): void
     {
diff --git a/tests/Modifiers/IsNumberwangTest.php b/tests/Modifiers/IsNumberwangTest.php
index f375471603..d12dc3b9ed 100644
--- a/tests/Modifiers/IsNumberwangTest.php
+++ b/tests/Modifiers/IsNumberwangTest.php
@@ -7,7 +7,7 @@
 
 class IsNumberwangTest extends TestCase
 {
-    public function numbers(): array
+    public static function numbersProvider(): array
     {
         return [
             [true, 1],
@@ -28,7 +28,7 @@ public function numbers(): array
     /**
      * @test
      *
-     * @dataProvider numbers
+     * @dataProvider numbersProvider
      */
     public function is_it_or_is_not_numberwang($expected, $input): void
     {
diff --git a/tests/Modifiers/IsNumericTest.php b/tests/Modifiers/IsNumericTest.php
index a80831b4e6..3d30627b90 100644
--- a/tests/Modifiers/IsNumericTest.php
+++ b/tests/Modifiers/IsNumericTest.php
@@ -7,7 +7,7 @@
 
 class IsNumericTest extends TestCase
 {
-    public function numbers(): array
+    public static function numbersProvider(): array
     {
         return [
             'numbers' => [true, 4815162342],
@@ -19,7 +19,7 @@ public function numbers(): array
     /**
      * @test
      *
-     * @dataProvider numbers
+     * @dataProvider numbersProvider
      */
     public function it_returns_true_if_value_is_number_or_numeric_string($expected, $input): void
     {
diff --git a/tests/Modifiers/IsPastTest.php b/tests/Modifiers/IsPastTest.php
index 881aedd8d5..f9e134b1e6 100644
--- a/tests/Modifiers/IsPastTest.php
+++ b/tests/Modifiers/IsPastTest.php
@@ -8,7 +8,7 @@
 
 class IsPastTest extends TestCase
 {
-    public function dates(): array
+    public static function dates(): array
     {
         $futureDate = Carbon::createFromDate(2030, 10, 21);
         $pastDate = Carbon::createFromDate(2015, 10, 21);
diff --git a/tests/Modifiers/IsTodayTest.php b/tests/Modifiers/IsTodayTest.php
index 0a876583bc..8f7932ff13 100644
--- a/tests/Modifiers/IsTodayTest.php
+++ b/tests/Modifiers/IsTodayTest.php
@@ -8,7 +8,7 @@
 
 class IsTodayTest extends TestCase
 {
-    public function dates(): array
+    public static function datesProvider(): array
     {
         $futureDate = Carbon::createFromDate(2030, 10, 21);
         $today = Carbon::today();
@@ -28,7 +28,7 @@ public function dates(): array
     /**
      * @test
      *
-     * @dataProvider dates
+     * @dataProvider datesProvider
      */
     public function it_returns_true_if_date_is_today($expected, $input): void
     {
diff --git a/tests/Modifiers/IsTomorrowTest.php b/tests/Modifiers/IsTomorrowTest.php
index 1264cb530d..bdcab01664 100644
--- a/tests/Modifiers/IsTomorrowTest.php
+++ b/tests/Modifiers/IsTomorrowTest.php
@@ -8,7 +8,7 @@
 
 class IsTomorrowTest extends TestCase
 {
-    public function dates(): array
+    public static function datesProvider(): array
     {
         $futureDate = Carbon::createFromDate(2030, 10, 21);
         $tomorrow = Carbon::tomorrow();
@@ -28,7 +28,7 @@ public function dates(): array
     /**
      * @test
      *
-     * @dataProvider dates
+     * @dataProvider datesProvider
      */
     public function it_returns_true_if_date_is_tomorrow($expected, $input): void
     {
diff --git a/tests/Modifiers/IsUppercaseTest.php b/tests/Modifiers/IsUppercaseTest.php
index dfa94c91ff..8f9b6efa1e 100644
--- a/tests/Modifiers/IsUppercaseTest.php
+++ b/tests/Modifiers/IsUppercaseTest.php
@@ -7,7 +7,7 @@
 
 class IsUppercaseTest extends TestCase
 {
-    public function strings(): array
+    public static function stringsProvider(): array
     {
         return [
             'string_all_uppercase' => [true, 'NOISES'],
@@ -21,7 +21,7 @@ public function strings(): array
     /**
      * @test
      *
-     * @dataProvider strings
+     * @dataProvider stringsProvider
      */
     public function it_returns_true_if_string_has_only_uppercase_chars($expected, $input): void
     {
diff --git a/tests/Modifiers/IsUrlTest.php b/tests/Modifiers/IsUrlTest.php
index 04a9a668d4..438dce3af1 100644
--- a/tests/Modifiers/IsUrlTest.php
+++ b/tests/Modifiers/IsUrlTest.php
@@ -7,7 +7,7 @@
 
 class IsUrlTest extends TestCase
 {
-    public function urls(): array
+    public static function urlsProvider(): array
     {
         return [
             'valid_url_http' => [true, 'http://google.com/'],
@@ -22,7 +22,7 @@ public function urls(): array
     /**
      * @test
      *
-     * @dataProvider urls()
+     * @dataProvider urlsProvider
      */
     public function it_returns_true_if_value_is_valid_url($expected, $input): void
     {
diff --git a/tests/Modifiers/IsWeekdayTest.php b/tests/Modifiers/IsWeekdayTest.php
index 644ea9e225..55710c217e 100644
--- a/tests/Modifiers/IsWeekdayTest.php
+++ b/tests/Modifiers/IsWeekdayTest.php
@@ -8,7 +8,7 @@
 
 class IsWeekdayTest extends TestCase
 {
-    public function dates(): array
+    public static function datesProvider(): array
     {
         $sunday = Carbon::createFromDate(2022, 2, 13);
         $monday = Carbon::createFromDate(2022, 2, 14);
@@ -22,7 +22,7 @@ public function dates(): array
     /**
      * @test
      *
-     * @dataProvider dates
+     * @dataProvider datesProvider
      */
     public function it_returns_true_if_date_is_weekday($expected, $input): void
     {
diff --git a/tests/Modifiers/IsWeekendTest.php b/tests/Modifiers/IsWeekendTest.php
index 839d4d2028..40183de480 100644
--- a/tests/Modifiers/IsWeekendTest.php
+++ b/tests/Modifiers/IsWeekendTest.php
@@ -8,7 +8,7 @@
 
 class IsWeekendTest extends TestCase
 {
-    public function dates(): array
+    public static function datesProvider(): array
     {
         $sunday = Carbon::createFromDate(2022, 2, 13);
         $monday = Carbon::createFromDate(2022, 2, 14);
@@ -22,7 +22,7 @@ public function dates(): array
     /**
      * @test
      *
-     * @dataProvider dates
+     * @dataProvider datesProvider
      */
     public function it_returns_true_if_date_is_weekend($expected, $input): void
     {
diff --git a/tests/Modifiers/IsYesterdayTest.php b/tests/Modifiers/IsYesterdayTest.php
index f84d9fa5bc..a97d072832 100644
--- a/tests/Modifiers/IsYesterdayTest.php
+++ b/tests/Modifiers/IsYesterdayTest.php
@@ -8,7 +8,7 @@
 
 class IsYesterdayTest extends TestCase
 {
-    public function dates(): array
+    public static function datesProvider(): array
     {
         $futureDate = Carbon::createFromDate(2030, 10, 21);
         $tomorrow = Carbon::tomorrow();
@@ -28,7 +28,7 @@ public function dates(): array
     /**
      * @test
      *
-     * @dataProvider dates
+     * @dataProvider datesProvider
      */
     public function it_returns_true_if_date_is_yesterday($expected, $input): void
     {
diff --git a/tests/Modifiers/KebabTest.php b/tests/Modifiers/KebabTest.php
index eb6122cefa..583908c83c 100644
--- a/tests/Modifiers/KebabTest.php
+++ b/tests/Modifiers/KebabTest.php
@@ -7,7 +7,7 @@
 
 class KebabTest extends TestCase
 {
-    public function strings(): array
+    public static function stringsProvider(): array
     {
         return [
             'with_whitespaces' => ['just-because-i-can', 'Just Because I Can'],
@@ -20,7 +20,7 @@ public function strings(): array
     /**
      * @test
      *
-     * @dataProvider strings
+     * @dataProvider stringsProvider
      */
     public function it_converts_the_value_to_kebab_case($expected, $input): void
     {
diff --git a/tests/Modifiers/LastTest.php b/tests/Modifiers/LastTest.php
index 686c6d9db1..7754d11df4 100644
--- a/tests/Modifiers/LastTest.php
+++ b/tests/Modifiers/LastTest.php
@@ -17,7 +17,7 @@ public function it_gets_the_last_n_characters_of_a_string($arg, $expected)
         $this->assertEquals($expected, $this->modify('Testing', $arg));
     }
 
-    public function stringProvider()
+    public static function stringProvider()
     {
         return [
             [1, 'g'],
@@ -36,7 +36,7 @@ public function it_gets_the_last_value_of_an_array($value, $expected)
         $this->assertEquals($expected, $this->modify($value));
     }
 
-    public function arrayProvider()
+    public static function arrayProvider()
     {
         return [
             'list' => [
diff --git a/tests/Modifiers/Nl2brTest.php b/tests/Modifiers/Nl2brTest.php
index a77ffe41d7..5dec974f7b 100644
--- a/tests/Modifiers/Nl2brTest.php
+++ b/tests/Modifiers/Nl2brTest.php
@@ -7,7 +7,7 @@
 
 class Nl2brTest extends TestCase
 {
-    public function strings(): array
+    public static function stringsProvider(): array
     {
         return [
             ["This is a summary <br />\n on multiple lines", "This is a summary \n on multiple lines"],
@@ -18,7 +18,7 @@ public function strings(): array
     /**
      * @test
      *
-     * @dataProvider strings
+     * @dataProvider stringsProvider
      */
     public function it_replaces_linebreaks_with_br_tags($expected, $input): void
     {
diff --git a/tests/Modifiers/PartialTest.php b/tests/Modifiers/PartialTest.php
index d4fa48446c..c81cc77563 100644
--- a/tests/Modifiers/PartialTest.php
+++ b/tests/Modifiers/PartialTest.php
@@ -25,7 +25,7 @@ public function it_injects_variable_data_into_a_partial_and_renders_it(): void
         $expected = "<h1>Bubble Guppies</h1>\n<p>Science died a little bit today.</p>\n\n";
 
         $modified = $this->modify($data, ['demo'], []);
-        $this->assertEquals($expected, (string) $modified);
+        $this->assertStringEqualsStringIgnoringLineEndings($expected, (string) $modified);
     }
 
     private function modify($value, array $params, array $context)
diff --git a/tests/Modifiers/PluralTest.php b/tests/Modifiers/PluralTest.php
index 39425097a4..201d09b29e 100644
--- a/tests/Modifiers/PluralTest.php
+++ b/tests/Modifiers/PluralTest.php
@@ -10,7 +10,7 @@
  */
 class PluralTest extends TestCase
 {
-    public function shoppingList()
+    public static function shoppingListProvider()
     {
         return [
             ['pickle', ['item' => 'pickle', 'quantity' => 1]],
@@ -22,7 +22,7 @@ public function shoppingList()
     /**
      * @test
      *
-     * @dataProvider shoppingList
+     * @dataProvider shoppingListProvider
      */
     public function it_returns_the_plural_form_of_an_english_word_from_context($expected, $input): void
     {
diff --git a/tests/Modifiers/SetQueryParamTest.php b/tests/Modifiers/SetQueryParamTest.php
index 4e6d05fc45..0e4ac779e7 100644
--- a/tests/Modifiers/SetQueryParamTest.php
+++ b/tests/Modifiers/SetQueryParamTest.php
@@ -8,16 +8,16 @@
 class SetQueryParamTest extends TestCase
 {
     protected $baseUrl = 'https://www.google.com/search';
-    protected $queryParam = ['q', 'test'];
+    protected static $queryParam = ['q', 'test'];
 
-    public function existingQueryParametersProvider()
+    public static function existingQueryParametersProvider()
     {
         return [
             ['?q=', '?q=statamic', ['q']],
-            ['?q=test', '?q=statamic', $this->queryParam],
-            ['?q=test#test', '?q=statamic#test', $this->queryParam],
-            ['?q=test&sourceid=chrome', '?q=statamic&sourceid=chrome', $this->queryParam],
-            ['?sourceid=chrome&q=test', '?sourceid=chrome&q=statamic', $this->queryParam],
+            ['?q=test', '?q=statamic', static::$queryParam],
+            ['?q=test#test', '?q=statamic#test', static::$queryParam],
+            ['?q=test&sourceid=chrome', '?q=statamic&sourceid=chrome', static::$queryParam],
+            ['?sourceid=chrome&q=test', '?sourceid=chrome&q=statamic', static::$queryParam],
         ];
     }
 
@@ -34,13 +34,13 @@ public function it_updates_an_existing_query_param($expected, $input, array $que
         );
     }
 
-    public function nonExistingQueryParametersProvider()
+    public static function nonExistingQueryParametersProvider()
     {
         return [
             ['?q=', '', ['q']],
-            ['?q=test', '', $this->queryParam],
-            ['?q=test#test', '#test', $this->queryParam],
-            ['?sourceid=chrome&q=test', '?sourceid=chrome', $this->queryParam],
+            ['?q=test', '', static::$queryParam],
+            ['?q=test#test', '#test', static::$queryParam],
+            ['?sourceid=chrome&q=test', '?sourceid=chrome', static::$queryParam],
         ];
     }
 
diff --git a/tests/Modifiers/SingularTest.php b/tests/Modifiers/SingularTest.php
index cad7d09c6b..76bbccf5b1 100644
--- a/tests/Modifiers/SingularTest.php
+++ b/tests/Modifiers/SingularTest.php
@@ -7,7 +7,7 @@
 
 class SingularTest extends TestCase
 {
-    public function pluralWords(): array
+    public static function pluralWordsProvider(): array
     {
         return [
             ['nickle', 'nickles'],
@@ -19,7 +19,7 @@ public function pluralWords(): array
     /**
      * @test
      *
-     * @dataProvider pluralWords
+     * @dataProvider pluralWordsProvider
      */
     public function it_returns_the_singular_word_of_an_english_word($expected, $input): void
     {
diff --git a/tests/Modifiers/SlugifyTest.php b/tests/Modifiers/SlugifyTest.php
index c65f37f1b8..1f8a319b4c 100644
--- a/tests/Modifiers/SlugifyTest.php
+++ b/tests/Modifiers/SlugifyTest.php
@@ -7,7 +7,7 @@
 
 class SlugifyTest extends TestCase
 {
-    public function wordsDontComeEasyToMe(): array
+    public static function wordsDontComeEasyToMeProvider(): array
     {
         return [
             ['please-have-some-lemonade', 'Please, have some lemoñade.'],
@@ -17,7 +17,7 @@ public function wordsDontComeEasyToMe(): array
     /**
      * @test
      *
-     * @dataProvider wordsDontComeEasyToMe
+     * @dataProvider wordsDontComeEasyToMeProvider
      */
     public function it_converts_the_string_to_an_url_slug($expected, $input): void
     {
diff --git a/tests/Modifiers/SmartypantsTest.php b/tests/Modifiers/SmartypantsTest.php
index 7d1da2e7b0..d58652980f 100644
--- a/tests/Modifiers/SmartypantsTest.php
+++ b/tests/Modifiers/SmartypantsTest.php
@@ -7,7 +7,7 @@
 
 class SmartypantsTest extends TestCase
 {
-    public function dumbChars(): array
+    public static function dumbCharsProvider(): array
     {
         return [
             [
@@ -20,7 +20,7 @@ public function dumbChars(): array
     /**
      * @test
      *
-     * @dataProvider dumbChars
+     * @dataProvider dumbCharsProvider
      */
     public function it_translates_plain_ascii_chars_into_smart_punctuation($expected, $input): void
     {
diff --git a/tests/Modifiers/SnakeTest.php b/tests/Modifiers/SnakeTest.php
index f477e28b55..0f8e343232 100644
--- a/tests/Modifiers/SnakeTest.php
+++ b/tests/Modifiers/SnakeTest.php
@@ -7,7 +7,7 @@
 
 class SnakeTest extends TestCase
 {
-    public function raidersOfTheLostArk(): array
+    public static function raidersOfTheLostArkProvider(): array
     {
         return [
             ['foo_bar_baz', 'foo bar baz'],
@@ -18,7 +18,7 @@ public function raidersOfTheLostArk(): array
     /**
      * @test
      *
-     * @dataProvider raidersOfTheLostArk
+     * @dataProvider raidersOfTheLostArkProvider
      */
     public function it_converts_a_string_into_snake_case($expected, $input): void
     {
diff --git a/tests/Modifiers/SpacelessTest.php b/tests/Modifiers/SpacelessTest.php
index 46b321bfeb..19db25fe31 100644
--- a/tests/Modifiers/SpacelessTest.php
+++ b/tests/Modifiers/SpacelessTest.php
@@ -7,7 +7,7 @@
 
 class SpacelessTest extends TestCase
 {
-    public function stringsWithSpaces(): array
+    public static function stringsWithSpacesProvider(): array
     {
         return [
             'spaces_and_linebreaks' => [
@@ -22,7 +22,7 @@ public function stringsWithSpaces(): array
     /**
      * @test
      *
-     * @dataProvider stringsWithSpaces
+     * @dataProvider stringsWithSpacesProvider
      */
     public function it_removes_excess_whitespace_and_linebreaks_from_string($expected, $input): void
     {
diff --git a/tests/Modifiers/StrPadBothTest.php b/tests/Modifiers/StrPadBothTest.php
index 82bcb04b04..8d3e0fc1c4 100644
--- a/tests/Modifiers/StrPadBothTest.php
+++ b/tests/Modifiers/StrPadBothTest.php
@@ -7,7 +7,7 @@
 
 class StrPadBothTest extends TestCase
 {
-    public function paddington(): array
+    public static function padProvider(): array
     {
         return [
             'pads_5_tilde' => ['test~', 'test', [5, '~']],
@@ -19,7 +19,7 @@ public function paddington(): array
     /**
      * @test
      *
-     * @dataProvider paddington
+     * @dataProvider padProvider
      */
     public function it_pads_a_string(string $expected, string $input, array $params): void
     {
diff --git a/tests/Modifiers/StrPadLeftTest.php b/tests/Modifiers/StrPadLeftTest.php
index 889537bd17..8b0ab3b69e 100644
--- a/tests/Modifiers/StrPadLeftTest.php
+++ b/tests/Modifiers/StrPadLeftTest.php
@@ -7,7 +7,7 @@
 
 class StrPadLeftTest extends TestCase
 {
-    public function paddington(): array
+    public static function padProvider(): array
     {
         return [
             'pads_5_tilde' => ['~test', 'test', [5, '~']],
@@ -19,7 +19,7 @@ public function paddington(): array
     /**
      * @test
      *
-     * @dataProvider paddington
+     * @dataProvider padProvider
      */
     public function it_pads_a_string(string $expected, string $input, array $params): void
     {
diff --git a/tests/Modifiers/StrPadRightTest.php b/tests/Modifiers/StrPadRightTest.php
index 90a7cd1182..60f71b2c47 100644
--- a/tests/Modifiers/StrPadRightTest.php
+++ b/tests/Modifiers/StrPadRightTest.php
@@ -7,7 +7,7 @@
 
 class StrPadRightTest extends TestCase
 {
-    public function paddington(): array
+    public static function padProvider(): array
     {
         return [
             'pads_5_tilde' => ['test~', 'test', [5, '~']],
@@ -19,7 +19,7 @@ public function paddington(): array
     /**
      * @test
      *
-     * @dataProvider paddington
+     * @dataProvider padProvider
      */
     public function it_pads_a_string(string $expected, string $input, array $params): void
     {
diff --git a/tests/Modifiers/StrPadTest.php b/tests/Modifiers/StrPadTest.php
index d430593a52..287b3fab9a 100644
--- a/tests/Modifiers/StrPadTest.php
+++ b/tests/Modifiers/StrPadTest.php
@@ -7,7 +7,7 @@
 
 class StrPadTest extends TestCase
 {
-    public function paddington(): array
+    public static function padProvider(): array
     {
         return [
             'pads_4_default' => ['test', 'test', [4]],
@@ -21,7 +21,7 @@ public function paddington(): array
     /**
      * @test
      *
-     * @dataProvider paddington
+     * @dataProvider padProvider
      */
     public function it_pads_a_string(string $expected, string $input, array $params): void
     {
diff --git a/tests/Modifiers/SumTest.php b/tests/Modifiers/SumTest.php
index bc4031641f..395765a2dd 100644
--- a/tests/Modifiers/SumTest.php
+++ b/tests/Modifiers/SumTest.php
@@ -14,14 +14,14 @@ class SumTest extends TestCase
     /**
      * @test
      *
-     * @dataProvider sums
+     * @dataProvider sumsProvider
      **/
     public function it_sums($sum, $key, $array)
     {
         $this->assertSame($sum, $this->modify($array, $key));
     }
 
-    public function sums()
+    public static function sumsProvider()
     {
         return [
             'list of ints' => [7, null, [1, 2, 3, 1]],
diff --git a/tests/Query/OrderByTest.php b/tests/Query/OrderByTest.php
index ffc8ff8ac1..084582da21 100644
--- a/tests/Query/OrderByTest.php
+++ b/tests/Query/OrderByTest.php
@@ -20,7 +20,7 @@ public function it_parses_string($string, $sort, $dir)
         $this->assertEquals($dir, $orderby->direction);
     }
 
-    public function parseProvider()
+    public static function parseProvider()
     {
         return [
             ['foo', 'foo', 'asc'],
diff --git a/tests/Query/ResolveValueTest.php b/tests/Query/ResolveValueTest.php
index 8129912ecd..99b8c1ad14 100644
--- a/tests/Query/ResolveValueTest.php
+++ b/tests/Query/ResolveValueTest.php
@@ -21,7 +21,7 @@ public function it_resolves_values($item, $field, $expected)
         $this->assertEquals($expected, $value);
     }
 
-    public function resolvesValueProvider()
+    public static function resolvesValueProvider()
     {
         $data = [
             'the_foo_field' => 'getfoo',
@@ -81,7 +81,7 @@ public function it_delegates_resolving_to_the_queryable_class($field, $expected)
         $this->assertEquals($expected, $value);
     }
 
-    public function delegatesToClassProvider()
+    public static function delegatesToClassProvider()
     {
         return [
             'standard' => ['foo', 'bar'],
diff --git a/tests/Query/StatusQueryBuilderTest.php b/tests/Query/StatusQueryBuilderTest.php
index c7b9667f7d..371a99b178 100644
--- a/tests/Query/StatusQueryBuilderTest.php
+++ b/tests/Query/StatusQueryBuilderTest.php
@@ -96,7 +96,7 @@ public function it_doesnt_perform_fallback_status_query_when_published_is_explic
         $this->assertEquals('results', $query->get());
     }
 
-    public function statusQueryMethodProvider()
+    public static function statusQueryMethodProvider()
     {
         return collect([
             'where',
diff --git a/tests/Routing/RouteBindingTest.php b/tests/Routing/RouteBindingTest.php
index fd5ea972a0..7401b192e9 100644
--- a/tests/Routing/RouteBindingTest.php
+++ b/tests/Routing/RouteBindingTest.php
@@ -232,7 +232,7 @@ private function setupContent()
         Facades\Form::make('contact')->title('Contact Us')->save();
     }
 
-    public function statamicRouteProvider()
+    public static function statamicRouteProvider()
     {
 
         return [
@@ -543,7 +543,7 @@ function (Form $form) {
         ];
     }
 
-    public function frontendRouteProvider()
+    public static function frontendRouteProvider()
     {
         return [
 
@@ -956,7 +956,7 @@ public function bypassForBroadcasting(string $binding)
         $this->assertEquals('test', $value);
     }
 
-    public function bypassForBroadcastingProvider()
+    public static function bypassForBroadcastingProvider()
     {
         return collect([
             'collection',
diff --git a/tests/Routing/RoutesTest.php b/tests/Routing/RoutesTest.php
index d27257bec4..4fe4edd15b 100644
--- a/tests/Routing/RoutesTest.php
+++ b/tests/Routing/RoutesTest.php
@@ -155,7 +155,7 @@ public function it_renders_a_view_without_a_layout($route)
             ->assertDontSee('The layout');
     }
 
-    public function undefinedLayoutRouteProvider()
+    public static function undefinedLayoutRouteProvider()
     {
         return [
             'null' => ['route-with-null-layout'],
diff --git a/tests/Search/CombTest.php b/tests/Search/CombTest.php
index 6337677958..7a25ec1bfc 100644
--- a/tests/Search/CombTest.php
+++ b/tests/Search/CombTest.php
@@ -222,7 +222,7 @@ public function it_can_search_for_plus_signs()
         $this->assertSame(1, $result['info']['total_results']);
     }
 
-    public function searchesProvider()
+    public static function searchesProvider()
     {
         return [
             'string with single result' => ['jane', ['Jane Doe']],
diff --git a/tests/Search/SearchTest.php b/tests/Search/SearchTest.php
index 7d424ea9cb..29e51810bf 100644
--- a/tests/Search/SearchTest.php
+++ b/tests/Search/SearchTest.php
@@ -31,7 +31,7 @@ public function it_updates_indexes($updateMock)
         $search->updateWithinIndexes($item);
     }
 
-    public function saveProvider()
+    public static function saveProvider()
     {
         return [
             'contains entry' => [
@@ -87,7 +87,7 @@ public function it_deletes_from_indexes($updateMock)
         $search->deleteFromIndexes($item);
     }
 
-    public function deleteProvider()
+    public static function deleteProvider()
     {
         return [
             'index exists' => [
diff --git a/tests/Search/Searchables/AssetsTest.php b/tests/Search/Searchables/AssetsTest.php
index d96175105a..4d59498a67 100644
--- a/tests/Search/Searchables/AssetsTest.php
+++ b/tests/Search/Searchables/AssetsTest.php
@@ -55,7 +55,7 @@ public function it_gets_assets($locale, $config, $expected)
         }
     }
 
-    public function assetsProvider()
+    public static function assetsProvider()
     {
         return [
             'all' => [
@@ -155,7 +155,7 @@ public function it_can_use_a_custom_filter($filter)
         $this->assertTrue($provider->contains($d));
     }
 
-    public function indexFilterProvider()
+    public static function indexFilterProvider()
     {
         return [
             'class' => [TestSearchableAssetsFilter::class],
diff --git a/tests/Search/Searchables/EntriesTest.php b/tests/Search/Searchables/EntriesTest.php
index 1c05269b05..3d4c893f3a 100644
--- a/tests/Search/Searchables/EntriesTest.php
+++ b/tests/Search/Searchables/EntriesTest.php
@@ -55,7 +55,7 @@ public function it_gets_entries($locale, $config, $expected)
         }
     }
 
-    public function entriesProvider()
+    public static function entriesProvider()
     {
         return [
             'all' => [
@@ -151,7 +151,7 @@ public function it_can_use_a_custom_filter($filter)
         $this->assertTrue($provider->contains($e));
     }
 
-    public function indexFilterProvider()
+    public static function indexFilterProvider()
     {
         return [
             'class' => [TestSearchableEntriesFilter::class],
diff --git a/tests/Search/Searchables/TermsTest.php b/tests/Search/Searchables/TermsTest.php
index 90dbcdfe88..569a5da98c 100644
--- a/tests/Search/Searchables/TermsTest.php
+++ b/tests/Search/Searchables/TermsTest.php
@@ -76,7 +76,7 @@ public function it_gets_terms($locale, $config, $expected)
         }
     }
 
-    public function termsProvider()
+    public static function termsProvider()
     {
         return [
             'all' => [
@@ -217,7 +217,7 @@ public function it_can_use_a_custom_filter($filter)
         $this->assertTrue($provider->contains($d->in('en')));
     }
 
-    public function indexFilterProvider()
+    public static function indexFilterProvider()
     {
         return [
             'class' => [TestSearchableTermsFilter::class],
diff --git a/tests/Search/Searchables/UsersTest.php b/tests/Search/Searchables/UsersTest.php
index c111850402..a4c914d21e 100644
--- a/tests/Search/Searchables/UsersTest.php
+++ b/tests/Search/Searchables/UsersTest.php
@@ -42,7 +42,7 @@ public function it_gets_users($locale, $config, $expected)
         }
     }
 
-    public function usersProvider()
+    public static function usersProvider()
     {
         return [
             'all' => [
@@ -105,7 +105,7 @@ public function it_can_use_a_custom_filter($filter)
         $this->assertTrue($provider->contains($d));
     }
 
-    public function indexFilterProvider()
+    public static function indexFilterProvider()
     {
         return [
             'class' => [TestSearchableUsersFilter::class],
diff --git a/tests/Stache/Repositories/EntryRepositoryTest.php b/tests/Stache/Repositories/EntryRepositoryTest.php
index 3a1a8597ef..4a9262f3a8 100644
--- a/tests/Stache/Repositories/EntryRepositoryTest.php
+++ b/tests/Stache/Repositories/EntryRepositoryTest.php
@@ -153,7 +153,7 @@ public function it_gets_entry_by_uri($uri, $expectedTitle)
         }
     }
 
-    public function entryByUriProvider()
+    public static function entryByUriProvider()
     {
         return [
             'case sensitive' => ['/alphabetical/bravo', 'Bravo'],
diff --git a/tests/StatamicTest.php b/tests/StatamicTest.php
index 46b0105bbd..54a445b37a 100644
--- a/tests/StatamicTest.php
+++ b/tests/StatamicTest.php
@@ -87,7 +87,7 @@ public function it_appends_time_if_system_date_format_doesnt_have_time_in_it()
     /**
      * @test
      *
-     * @dataProvider formatsWithTime
+     * @dataProvider formatsWithTimeProvider
      **/
     public function it_doesnt_append_time_if_system_date_format_already_has_time_in_it($format)
     {
@@ -107,7 +107,7 @@ public function it_appends_time_if_cp_date_format_doesnt_have_time_in_it()
     /**
      * @test
      *
-     * @dataProvider formatsWithTime
+     * @dataProvider formatsWithTimeProvider
      **/
     public function it_doesnt_append_time_if_cp_date_format_already_has_time_in_it($format)
     {
@@ -128,7 +128,7 @@ public function it_wraps_fluent_modifier_helper()
         $this->assertInstanceOf(\Statamic\Modifiers\Modify::class, Statamic::modify('some_value'));
     }
 
-    public function formatsWithTime()
+    public static function formatsWithTimeProvider()
     {
         return [
             '12-hour without leading zeros' => ['g'],
@@ -270,7 +270,7 @@ public function it_gets_a_cp_asset_url($url, $expected)
         $this->assertEquals($expected, Statamic::cpAssetUrl($url));
     }
 
-    public function cpAssetUrlProvider()
+    public static function cpAssetUrlProvider()
     {
         return [
             'slash' => ['/foo/bar.jpg', 'http://test-asset-url.com/vendor/statamic/cp/foo/bar.jpg'],
@@ -290,7 +290,7 @@ public function it_gets_the_vendor_package_asset_url($arguments, $expected)
         $this->assertEquals($expected, Statamic::vendorPackageAssetUrl(...$arguments));
     }
 
-    public function vendorPackageAssetUrlProvider()
+    public static function vendorPackageAssetUrlProvider()
     {
         return [
             'package' => [['package', 'cp.js'], 'http://test-asset-url.com/vendor/package/cp.js'],
diff --git a/tests/StaticCaching/ApplicationCacherTest.php b/tests/StaticCaching/ApplicationCacherTest.php
index 3804cb3338..9c7174c9e0 100644
--- a/tests/StaticCaching/ApplicationCacherTest.php
+++ b/tests/StaticCaching/ApplicationCacherTest.php
@@ -130,7 +130,7 @@ public function invalidating_a_url_dispatches_event($domain, $expectedUrl)
         });
     }
 
-    public function invalidateEventProvider()
+    public static function invalidateEventProvider()
     {
         return [
             'no domain' => [null, 'http://base.com/foo'],
diff --git a/tests/StaticCaching/FileCacherTest.php b/tests/StaticCaching/FileCacherTest.php
index dbbafa0fd0..d7f6420aff 100644
--- a/tests/StaticCaching/FileCacherTest.php
+++ b/tests/StaticCaching/FileCacherTest.php
@@ -318,7 +318,7 @@ public function invalidating_a_url_dispatches_event($domain, $expectedUrl)
         });
     }
 
-    public function invalidateEventProvider()
+    public static function invalidateEventProvider()
     {
         return [
             'no domain' => [null, 'http://base.com/foo'],
diff --git a/tests/StringEqualsStringIgnoringLineEndings.php b/tests/StringEqualsStringIgnoringLineEndings.php
new file mode 100644
index 0000000000..eb51590877
--- /dev/null
+++ b/tests/StringEqualsStringIgnoringLineEndings.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Tests;
+
+use PHPUnit\Framework\Constraint\Constraint;
+
+class StringEqualsStringIgnoringLineEndings extends Constraint
+{
+    private string $string;
+
+    public function __construct(string $string)
+    {
+        $this->string = $this->normalizeLineEndings($string);
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     */
+    public function toString(): string
+    {
+        return sprintf(
+            'is equal to "%s" ignoring line endings',
+            $this->string,
+        );
+    }
+
+    /**
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
+     */
+    protected function matches(mixed $other): bool
+    {
+        return $this->string === $this->normalizeLineEndings((string) $other);
+    }
+
+    private function normalizeLineEndings(string $string): string
+    {
+        return strtr(
+            $string,
+            [
+                "\r\n" => "\n",
+                "\r" => "\n",
+            ],
+        );
+    }
+}
diff --git a/tests/Support/ArrTest.php b/tests/Support/ArrTest.php
index 01fdce6a45..8b1a6ea9d2 100644
--- a/tests/Support/ArrTest.php
+++ b/tests/Support/ArrTest.php
@@ -76,7 +76,7 @@ public function it_adds_scope_to_multidimensional_array($mapInto)
         $this->assertEquals($expected, Arr::addScope($arr, 'myscope'));
     }
 
-    public function multiDimensionalArrayScopeProvider()
+    public static function multiDimensionalArrayScopeProvider()
     {
         return [
             'array' => [null],
diff --git a/tests/Support/DateFormatTest.php b/tests/Support/DateFormatTest.php
index c7ce5ad309..91449fba48 100644
--- a/tests/Support/DateFormatTest.php
+++ b/tests/Support/DateFormatTest.php
@@ -23,7 +23,7 @@ public function it_converts_from_php_to_iso($php, $iso)
         $this->assertEquals($iso, DateFormat::toIso($php));
     }
 
-    public function formatProvider()
+    public static function formatProvider()
     {
         return collect(DateFormat::phpToIsoConversions())->mapWithKeys(function ($iso, $php) {
             return [$php => [$php, $iso]];
diff --git a/tests/Tags/Concerns/RendersFormsTest.php b/tests/Tags/Concerns/RendersFormsTest.php
index eabe05fbc2..ceae4c5bf5 100644
--- a/tests/Tags/Concerns/RendersFormsTest.php
+++ b/tests/Tags/Concerns/RendersFormsTest.php
@@ -161,7 +161,7 @@ public function renders_textarea_fields($value, $default, $old, $expected)
         $this->assertStringContainsString('>'.$rendered['value'].'</textarea', $rendered['field']);
     }
 
-    public function renderTextProvider()
+    public static function renderTextProvider()
     {
         return [
             'no value, missing' => ['value' => null, 'default' => null, 'old' => self::MISSING, 'expectedValue' => null],
@@ -201,7 +201,7 @@ public function renders_toggles($value, $default, $old, $expected)
         }
     }
 
-    public function renderToggleProvider()
+    public static function renderToggleProvider()
     {
         return [
             'no value, missing' => ['value' => null, 'default' => null, 'old' => self::MISSING, 'expectedValue' => false],
@@ -299,7 +299,7 @@ public function renders_radio_fields($value, $default, $old, $expected)
         }
     }
 
-    public function renderSingleSelectProvider()
+    public static function renderSingleSelectProvider()
     {
         return [
             'no value, no default, missing' => ['value' => null, 'default' => null, 'old' => self::MISSING, 'expectedValue' => null],
@@ -386,7 +386,7 @@ public function renders_checkboxes_fields($value, $default, $old, $expected)
         }
     }
 
-    public function renderMultipleSelectProvider()
+    public static function renderMultipleSelectProvider()
     {
         return [
             'no value, no default, missing' => ['value' => null, 'default' => null, 'old' => self::MISSING, 'expectedValue' => null],
diff --git a/tests/Tags/FluentTagTest.php b/tests/Tags/FluentTagTest.php
index 2fff5f62e9..d0d144e3d2 100644
--- a/tests/Tags/FluentTagTest.php
+++ b/tests/Tags/FluentTagTest.php
@@ -81,7 +81,7 @@ public function it_handles_params_fluently($usedTag, $expectedTagName, $expected
         $this->assertEquals('tag return value', $fluentTag->fetch());
     }
 
-    public function fluentTagProvider()
+    public static function fluentTagProvider()
     {
         return [
             'foo' => ['foo', 'foo', 'foo:index', 'index', 'index'],
diff --git a/tests/Tags/GetErrorsTest.php b/tests/Tags/GetErrorsTest.php
index 483ac0e891..541d62e47d 100644
--- a/tests/Tags/GetErrorsTest.php
+++ b/tests/Tags/GetErrorsTest.php
@@ -39,7 +39,7 @@ public function it_gets_errors_organized_into_fields($params, $bag, $errors, $ex
         $this->assertEquals($expected, $this->tag($template));
     }
 
-    public function organizedProvider()
+    public static function organizedProvider()
     {
         $filledExpectation = <<<'EOT'
 
@@ -110,7 +110,7 @@ public function it_gets_errors_for_all_fields_together($params, $bag, $errors, $
         $this->assertEquals($expected, $this->tag($template));
     }
 
-    public function allProvider()
+    public static function allProvider()
     {
         $filledExpectation = <<<'EOT'
 
@@ -175,7 +175,7 @@ public function it_gets_errors_for_a_single_field($params, $bag, $errors, $expec
         $this->assertEquals($expected, $this->tag($template));
     }
 
-    public function fieldProvider()
+    public static function fieldProvider()
     {
         $filledExpectation = <<<'EOT'
 
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 6c3064b1af..2401ed41ae 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -123,13 +123,6 @@ protected function getEnvironmentSetUp($app)
         $app['config']->set('view.paths', $viewPaths);
     }
 
-    public static function assertEquals($expected, $actual, string $message = '', float $delta = 0.0, int $maxDepth = 10, bool $canonicalize = false, bool $ignoreCase = false): void
-    {
-        $args = static::normalizeArgsForWindows(func_get_args());
-
-        parent::assertEquals(...$args);
-    }
-
     protected function assertEveryItem($items, $callback)
     {
         if ($items instanceof \Illuminate\Support\Collection) {
@@ -222,4 +215,17 @@ private function addGqlMacros()
             return $this;
         });
     }
+
+    public function __call($name, $arguments)
+    {
+        if ($name == 'assertStringEqualsStringIgnoringLineEndings') {
+            return Assert::assertThat(
+                $arguments[1],
+                new StringEqualsStringIgnoringLineEndings($arguments[0]),
+                $arguments[2] ?? ''
+            );
+        }
+
+        throw new \BadMethodCallException("Method [$name] does not exist.");
+    }
 }
diff --git a/tests/Tokens/HandleTokenMiddlewareTest.php b/tests/Tokens/HandleTokenMiddlewareTest.php
index 506ef9cc25..1468fe1c89 100644
--- a/tests/Tokens/HandleTokenMiddlewareTest.php
+++ b/tests/Tokens/HandleTokenMiddlewareTest.php
@@ -45,7 +45,7 @@ public function it_should_handle_valid_tokens($paramToken, $headerToken)
         $this->assertEquals('valid-token', $response->headers->get('X-Test-Middleware'));
     }
 
-    public function validTokenProvider()
+    public static function validTokenProvider()
     {
         return [
             'param' => ['valid-token', null],
@@ -72,7 +72,7 @@ public function it_should_not_handle_invalid_tokens($paramToken, $headerToken)
         $this->assertEquals('ok', $return);
     }
 
-    public function invalidTokenProvider()
+    public static function invalidTokenProvider()
     {
         return [
             'param' => ['invalid-token', null],
diff --git a/tests/View/Antlers/ParserTests.php b/tests/View/Antlers/ParserTests.php
index ccd7a6c897..7ee8fa05fc 100644
--- a/tests/View/Antlers/ParserTests.php
+++ b/tests/View/Antlers/ParserTests.php
@@ -428,7 +428,7 @@ public function ternary_escapes_quotes_properly()
     /** @test */
     public function ternary_condition_inside_parameter()
     {
-        $this->app['statamic.tags']['test'] = \Tests\Fixtures\Addon\Tags\Test::class;
+        $this->app['statamic.tags']['test'] = \Tests\Fixtures\Addon\Tags\TestTags::class;
 
         $this->assertEquals('yes', $this->renderString(
             "{{ test variable='{{ good ? 'yes' : 'fail' }}' }}",
@@ -646,7 +646,8 @@ public function conditions_with_relaxed_modifiers()
     public function tags_with_curlies_in_params_gets_parsed()
     {
         // the variables are inside Test@index
-        $this->app['statamic.tags']['test'] = \Tests\Fixtures\Addon\Tags\Test::class;
+        // $this->app['statamic.tags']['test'] = \Tests\Fixtures\Addon\Tags\TestTags::class;
+        \Tests\Fixtures\Addon\Tags\TestTags::register();
 
         $template = "{{ test variable='{string}' }}";
 
@@ -729,7 +730,7 @@ public function empty_values_are_not_overridden_by_previous_iteration()
     /** @test */
     public function empty_values_are_not_overridden_by_previous_iteration_with_parsing()
     {
-        $this->app['statamic.tags']['test'] = \Tests\Antlers\Fixtures\Addon\Tags\Test::class;
+        $this->app['statamic.tags']['test'] = \Tests\Antlers\Fixtures\Addon\Tags\TestTags::class;
 
         // Variable name was changed from "loop" to "loopvar" compared to the original test to avoid a
         // headache since the base test class is going to be loading all of the core Statamic Tags.
@@ -2437,7 +2438,7 @@ public function it_uses_entries_as_conditions($object)
         ]));
     }
 
-    public function objectInConditionProvider()
+    public static function objectInConditionProvider()
     {
         return [
             'with __toString' => [new class()
diff --git a/tests/View/Antlers/ViewTest.php b/tests/View/Antlers/ViewTest.php
index 80bbe1b04b..2221f74f8f 100644
--- a/tests/View/Antlers/ViewTest.php
+++ b/tests/View/Antlers/ViewTest.php
@@ -187,7 +187,7 @@ public function view_data_can_be_accessed_from_template_and_layout()
 template-bar
 EOT;
 
-        $this->assertEquals($expected, trim($view->render()));
+        $this->assertStringEqualsStringIgnoringLineEndings($expected, trim($view->render()));
     }
 
     /** @test */
@@ -215,6 +215,6 @@ public function current_view_data_wins()
 partial-bar
 EOT;
 
-        $this->assertEquals($expected, trim($view->render()));
+        $this->assertStringEqualsStringIgnoringLineEndings($expected, trim($view->render()));
     }
 }
diff --git a/tests/WindowsHelpers.php b/tests/WindowsHelpers.php
index f82a58141a..9c9be629a3 100644
--- a/tests/WindowsHelpers.php
+++ b/tests/WindowsHelpers.php
@@ -4,28 +4,6 @@
 
 trait WindowsHelpers
 {
-    protected static function normalizeArgsForWindows($args)
-    {
-        if (static::isRunningWindows()) {
-            return collect($args)
-                ->map(function ($arg) {
-                    return static::normalizeMultilineStringForWindows($arg);
-                })
-                ->all();
-        }
-
-        return $args;
-    }
-
-    protected static function normalizeMultilineStringForWindows($value)
-    {
-        if (static::isRunningWindows() && is_string($value)) {
-            return str_replace("\r\n", "\n", $value);
-        }
-
-        return $value;
-    }
-
     protected static function isRunningWindows()
     {
         return DIRECTORY_SEPARATOR === '\\';
diff --git a/tests/Yaml/YamlTest.php b/tests/Yaml/YamlTest.php
index 0c980193f0..d35ac10147 100644
--- a/tests/Yaml/YamlTest.php
+++ b/tests/Yaml/YamlTest.php
@@ -43,7 +43,7 @@ public function it_dumps_with_front_matter_when_content_is_passed()
 some content
 EOT;
 
-        $this->assertEquals($expected, YAML::dump(['foo' => 'bar'], 'some content'));
+        $this->assertStringEqualsStringIgnoringLineEndings($expected, YAML::dump(['foo' => 'bar'], 'some content'));
     }
 
     /** @test */
@@ -93,7 +93,7 @@ public function it_explicitly_dumps_front_matter()
 
 EOT;
 
-        $this->assertEquals($expected, YAML::dumpFrontMatter(['foo' => 'bar']));
+        $this->assertStringEqualsStringIgnoringLineEndings($expected, YAML::dumpFrontMatter(['foo' => 'bar']));
     }
 
     /** @test */
@@ -106,7 +106,7 @@ public function it_explicitly_dumps_front_matter_with_content()
 some content
 EOT;
 
-        $this->assertEquals($expected, YAML::dumpFrontMatter(['foo' => 'bar'], 'some content'));
+        $this->assertStringEqualsStringIgnoringLineEndings($expected, YAML::dumpFrontMatter(['foo' => 'bar'], 'some content'));
     }
 
     /** @test */
@@ -121,7 +121,7 @@ public function it_explicitly_dumps_front_matter_including_content_when_its_an_a
 
 EOT;
 
-        $this->assertEquals($expected, YAML::dumpFrontMatter(['foo' => 'bar'], ['baz' => 'qux']));
+        $this->assertStringEqualsStringIgnoringLineEndings($expected, YAML::dumpFrontMatter(['foo' => 'bar'], ['baz' => 'qux']));
     }
 
     /** @test */
@@ -135,7 +135,7 @@ public function it_explicitly_dumps_front_matter_including_content_when_its_an_e
 
 EOT;
 
-        $this->assertEquals($expected, YAML::dumpFrontMatter(['foo' => 'bar'], []));
+        $this->assertStringEqualsStringIgnoringLineEndings($expected, YAML::dumpFrontMatter(['foo' => 'bar'], []));
     }
 
     /** @test */
@@ -148,8 +148,8 @@ public function it_explicitly_dumps_front_matter_without_content_when_its_null()
 
 EOT;
 
-        $this->assertEquals($expected, YAML::dumpFrontMatter(['foo' => 'bar'], null));
-        $this->assertEquals($expected, YAML::dumpFrontMatter(['foo' => 'bar']));
+        $this->assertStringEqualsStringIgnoringLineEndings($expected, YAML::dumpFrontMatter(['foo' => 'bar'], null));
+        $this->assertStringEqualsStringIgnoringLineEndings($expected, YAML::dumpFrontMatter(['foo' => 'bar']));
     }
 
     /**
@@ -188,7 +188,7 @@ public function it_dumps_front_matter_properly_when_symfony_yaml_dumper_doesnt_e
 content
 EOT;
 
-        $this->assertEquals($expected, YAML::dumpFrontMatter($array, 'content'));
+        $this->assertStringEqualsStringIgnoringLineEndings($expected, YAML::dumpFrontMatter($array, 'content'));
     }
 
     /** @test */

From b5a5814a8a78e5a0ad849b41f164cbbb47ed2abd Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 16 Feb 2024 15:25:39 -0500
Subject: [PATCH 111/149] [4.x] Exclude super when using a custom field (#9536)

---
 src/Http/Controllers/CP/Users/UsersController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Http/Controllers/CP/Users/UsersController.php b/src/Http/Controllers/CP/Users/UsersController.php
index 6a1ee7ad6e..b7d3cf7aea 100644
--- a/src/Http/Controllers/CP/Users/UsersController.php
+++ b/src/Http/Controllers/CP/Users/UsersController.php
@@ -126,7 +126,7 @@ public function create(Request $request)
         $expiry = config("auth.passwords.{$broker}.expire") / 60;
 
         $additional = $fields->all()
-            ->reject(fn ($field) => in_array($field->handle(), ['roles', 'groups']))
+            ->reject(fn ($field) => in_array($field->handle(), ['roles', 'groups', 'super']))
             ->keys();
 
         $viewData = [
@@ -271,7 +271,7 @@ public function update(Request $request, $user)
             ->withReplacements(['id' => $user->id()])
             ->validate();
 
-        $values = $fields->process()->values()->except(['email', 'groups', 'roles']);
+        $values = $fields->process()->values()->except(['email', 'groups', 'roles', 'super']);
 
         foreach ($values as $key => $value) {
             $user->set($key, $value);

From 1d6b9b9f9ee1cac3a20618fbf66b3ee534f8b84b Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 16 Feb 2024 15:44:23 -0500
Subject: [PATCH 112/149] changelog

---
 CHANGELOG.md | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a018408982..3aab8bc9f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,42 @@
 # Release Notes
 
+## 4.49.0 (2024-02-16)
+
+### What's new
+- Support YouTube Shorts in `embed_code` modifier. [#9521](https://github.com/statamic/cms/issues/9521) by @mnlmaier
+- Allow number literals inside Antlers tag parameters. [#9503](https://github.com/statamic/cms/issues/9503) by @JohnathonKoster
+- Add clear value button to popover `date` fieldtype. [#9478](https://github.com/statamic/cms/issues/9478) by @jacksleight
+- Add GraphQL type for `group` fieldtype. [#9499](https://github.com/statamic/cms/issues/9499) by @duncanmcclean
+- Add PHP `fieldPathPrefix` method. [#9080](https://github.com/statamic/cms/issues/9080) by @jacksleight
+
+### What's improved
+- French translations. [#9476](https://github.com/statamic/cms/issues/9476) by @ebeauchamps
+- Improve speed of "Duplicate" action by only searching for descendants if multi-site is enabled. [#9528](https://github.com/statamic/cms/issues/9528) by @helloiamlukas
+- Improve CP page speed by cleaning up some JS event handlers. [#9500](https://github.com/statamic/cms/issues/9500) by @jasonvarga
+
+### What's fixed
+- Exclude super when using a custom field. [#9536](https://github.com/statamic/cms/issues/9536) by @jasonvarga
+- Fix table drag handles disappearing. [#9522](https://github.com/statamic/cms/issues/9522) by @jasonvarga
+- Prevent non-images being processed through source preset. [#9517](https://github.com/statamic/cms/issues/9517) by @duncanmcclean
+- Fix numbers not being cast in API filters. [#9511](https://github.com/statamic/cms/issues/9511) by @jasonvarga
+- Fix scrolling in Inline Publish Form on Safari on iOS. [#9510](https://github.com/statamic/cms/issues/9510) by @duncanmcclean
+- Prevent warming redirect URLs. [#9509](https://github.com/statamic/cms/issues/9509) by @duncanmcclean
+- Fix pagination with the `nocache` tag. [#9394](https://github.com/statamic/cms/issues/9394) by @duncanmcclean
+- Fix missing translations. [#9450](https://github.com/statamic/cms/issues/9450) by @peimn
+- Fix error from `code` fieldtype when switching sites in global. [#9488](https://github.com/statamic/cms/issues/9488) by @duncanmcclean
+- Fix `$authenticatedUser` error with third-party addon events. [#9490](https://github.com/statamic/cms/issues/9490) by @duncanmcclean
+- Fix directory separator in `templates` fieldtype on Windows. [#9483](https://github.com/statamic/cms/issues/9483) by @duncanmcclean
+- Include `honeypot` in Alpine.js form data. [#9498](https://github.com/statamic/cms/issues/9498) by @duncanmcclean
+- Localize entry & term fields in Taxonomy Term GraphQL queries. [#9492](https://github.com/statamic/cms/issues/9492) by @duncanmcclean
+- Make `BlueprintRepository` a singleton. [#9489](https://github.com/statamic/cms/issues/9489) by @jacksleight
+- Allow namespace to be passed in `Blueprint::make()`. [#9484](https://github.com/statamic/cms/issues/9484) by @ryanmitchell
+- Fix update counter. [#9479](https://github.com/statamic/cms/issues/9479) by @jasonvarga
+- Fix missing updates badge. [#9477](https://github.com/statamic/cms/issues/9477) by @jasonvarga
+- Test suite uses PHPUnit 10. [#9529](https://github.com/statamic/cms/issues/9529) by @jasonvarga
+- Fix Windows tests not running in GitHub Actions. [#9482](https://github.com/statamic/cms/issues/9482) by @duncanmcclean
+
+
+
 ## 4.48.0 (2024-02-06)
 
 ### What's new

From c16b57652b4d57379692ae5b6c5a6e67272f25d4 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Fri, 16 Feb 2024 22:06:49 +0000
Subject: [PATCH 113/149] [4.x] Fix issues when saving entries with
 `JsonResource::withoutWrapping()` (#9519)

---
 .../CP/Collections/EntriesController.php            | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Http/Controllers/CP/Collections/EntriesController.php b/src/Http/Controllers/CP/Collections/EntriesController.php
index 5102b70e41..2b3c5b8ad4 100644
--- a/src/Http/Controllers/CP/Collections/EntriesController.php
+++ b/src/Http/Controllers/CP/Collections/EntriesController.php
@@ -259,13 +259,12 @@ public function update(Request $request, $collection, $entry)
 
         [$values] = $this->extractFromFields($entry, $blueprint);
 
-        return (new EntryResource($entry->fresh()))
-            ->additional([
-                'saved' => $saved,
-                'data' => [
-                    'values' => $values,
-                ],
-            ]);
+        return [
+            'data' => array_merge((new EntryResource($entry->fresh()))->resolve()['data'], [
+                'values' => $values,
+            ]),
+            'saved' => $saved,
+        ];
     }
 
     public function create(Request $request, $collection, $site)

From 76bd9721f848d4a851518f2490b58b7309e9ac31 Mon Sep 17 00:00:00 2001
From: John Koster <john@stillat.com>
Date: Fri, 16 Feb 2024 16:07:53 -0600
Subject: [PATCH 114/149] [4.x] Antlers: stops double-initial execution of tags
 within conditions (#9504)

---
 .../Language/Runtime/ConditionProcessor.php   |  1 -
 .../Language/Runtime/Sandbox/Environment.php  |  6 ++-
 tests/Antlers/Sandbox/ConditionalsTest.php    | 54 +++++++++++++++++++
 3 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/src/View/Antlers/Language/Runtime/ConditionProcessor.php b/src/View/Antlers/Language/Runtime/ConditionProcessor.php
index 3d22965796..8a2a43319a 100644
--- a/src/View/Antlers/Language/Runtime/ConditionProcessor.php
+++ b/src/View/Antlers/Language/Runtime/ConditionProcessor.php
@@ -104,7 +104,6 @@ public function process(ConditionNode $node, $data)
                 }
 
                 if ($result == true) {
-
                     $this->processor->setIsConditionProcessor($condValueToRestore);
 
                     return $branch;
diff --git a/src/View/Antlers/Language/Runtime/Sandbox/Environment.php b/src/View/Antlers/Language/Runtime/Sandbox/Environment.php
index 1be0064e03..f39a8ed31f 100644
--- a/src/View/Antlers/Language/Runtime/Sandbox/Environment.php
+++ b/src/View/Antlers/Language/Runtime/Sandbox/Environment.php
@@ -1567,7 +1567,11 @@ public function getValue($val)
             $varName = $this->nameOf($val);
 
             if ($val->isInterpolationReference) {
-                $interpolationValue = $this->adjustValue($this->nodeProcessor->reduceInterpolatedVariable($val), $val);
+                if (array_key_exists($varName->normalizedReference, $this->data)) {
+                    $interpolationValue = $this->adjustValue($this->data[$varName->normalizedReference], $val);
+                } else {
+                    $interpolationValue = $this->adjustValue($this->nodeProcessor->reduceInterpolatedVariable($val), $val);
+                }
 
                 // If the currently active node is an instance of ArithmeticNodeContract,
                 // we will ask the runtime type coercion to convert whatever value
diff --git a/tests/Antlers/Sandbox/ConditionalsTest.php b/tests/Antlers/Sandbox/ConditionalsTest.php
index 7c905b4e87..f355bae547 100644
--- a/tests/Antlers/Sandbox/ConditionalsTest.php
+++ b/tests/Antlers/Sandbox/ConditionalsTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Antlers\Sandbox;
 
+use Statamic\Tags\Tags;
 use Tests\Antlers\ParserTestCase;
 
 class ConditionalsTest extends ParserTestCase
@@ -47,6 +48,59 @@ public function test_sandbox_will_defer_collapsing_arrays()
         $this->assertSame('no', $this->renderString($template, $data));
     }
 
+    public function test_tags_are_not_initially_evaluated_twice()
+    {
+        $template = <<<'EOT'
+{{ if {switch between='yes|no'} == 'yes' }}yes{{ else }}no{{ /if }}{{ if {switch between='yes|no'} == 'yes' }}yes{{ else }}no{{ /if }}
+EOT;
+
+        $this->assertSame('yesno', $this->renderString($template, [], true));
+    }
+
+    public function test_tags_are_evaluated_twice_if_called_twice()
+    {
+        $template = <<<'EOT'
+{{ if {switch between='yes|no'} == 'yes' && {switch between='yes|no'} == 'no' }}yes{{ else }}no{{ /if }}{{ if {switch between='yes|no'} == 'yes' && {switch between='yes|no'} == 'no' }}yes{{ else }}no{{ /if }}{{ if {switch between='yes|no'} == 'no' && {switch between='yes|no'} == 'yes' }}yes{{ else }}no{{ /if }}
+EOT;
+
+        $this->assertSame('yesyesno', $this->renderString($template, [], true));
+    }
+
+    public function test_value_adjustments_inside_of_conditionals()
+    {
+        $template = <<<'EOT'
+{{ if 'bob' == 'bo{c}' }}yes{{ else }}no{{ /if }}
+EOT;
+        $this->assertSame('yes', $this->renderString($template, ['c' => 'b'], false));
+    }
+
+    public function test_many_tag_value_adjustments_inside_of_conditionals()
+    {
+        $template = <<<'EOT'
+{{ if 'one_{switch between='yes|no'}' == 'one_yes' && 'two_{switch between='yes|no'}' == 'two_no' }}yes{{ else }}no{{ /if }}
+EOT;
+
+        $this->assertSame('yes', $this->renderString($template, [], true));
+    }
+
+    public function test_value_adjustments_resolved_tag_values()
+    {
+        (new class extends Tags
+        {
+            protected static $handle = 'the_tag';
+
+            public function index()
+            {
+                return 'bob';
+            }
+        })::register();
+
+        $template = <<<'EOT'
+{{ if 'bob' == '{the_tag}' }}yes{{ else }}no{{ /if }}
+EOT;
+        $this->assertSame('yes', $this->renderString($template, [], true));
+    }
+
     public function test_sandbox_evaluates_simple_boolean_expressions()
     {
         $result = $this->getBoolResult('true == false', []);

From 693762c4d3db2ae9623dbb66af81c60e35de7257 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Mon, 19 Feb 2024 10:55:39 +0000
Subject: [PATCH 115/149] [4.x] Fix protection redirect URLs when they contain
 query parameters (#9543)

Fix protection redirect URLs when they contain query parameters
---
 src/Auth/Protect/Protection.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Auth/Protect/Protection.php b/src/Auth/Protect/Protection.php
index 1f8a5b0592..993b2dcfb8 100644
--- a/src/Auth/Protect/Protection.php
+++ b/src/Auth/Protect/Protection.php
@@ -67,7 +67,7 @@ public function protect()
 
     protected function url()
     {
-        return URL::tidy(request()->url());
+        return URL::tidy(request()->fullUrl());
     }
 
     protected function log($message)

From 8c2a481abd576b06fa77153fb05d78d9346f57f3 Mon Sep 17 00:00:00 2001
From: Jack Sleight <jacksleight@gmail.com>
Date: Tue, 20 Feb 2024 15:56:46 +0000
Subject: [PATCH 116/149] [4.x] Pass parent field and index down to imported
 fields (#9550)

---
 src/Fields/Fields.php       | 11 ++++++--
 tests/Fields/FieldsTest.php | 54 +++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/src/Fields/Fields.php b/src/Fields/Fields.php
index 56b41bdb0f..d80c256a93 100644
--- a/src/Fields/Fields.php
+++ b/src/Fields/Fields.php
@@ -260,7 +260,10 @@ private function getReferencedField(array $config): Field
             $field->setConfig(array_merge($field->config(), $overrides));
         }
 
-        return $field->setParent($this->parent)->setHandle($config['handle']);
+        return $field
+            ->setParent($this->parent)
+            ->setParentField($this->parentField, $this->parentIndex)
+            ->setHandle($config['handle']);
     }
 
     private function getImportedFields(array $config): array
@@ -291,7 +294,11 @@ private function getImportedFields(array $config): array
             }
 
             return $fields;
-        })->each->setParent($this->parent)->all();
+        })->each(function ($field) {
+            $field
+                ->setParent($this->parent)
+                ->setParentField($this->parentField, $this->parentIndex);
+        })->all();
     }
 
     public function meta()
diff --git a/tests/Fields/FieldsTest.php b/tests/Fields/FieldsTest.php
index 2f54f6ee1f..db5ab5a85f 100644
--- a/tests/Fields/FieldsTest.php
+++ b/tests/Fields/FieldsTest.php
@@ -1003,4 +1003,58 @@ public function it_sets_the_parentindex_on_all_fields()
         $this->assertEquals(1, $collection['one']->parentIndex());
         $this->assertEquals(1, $collection['two']->parentIndex());
     }
+
+    /**
+     * @test
+     */
+    public function it_sets_the_parentfield_and_parentindex_on_imported_fields()
+    {
+        $fieldset = (new Fieldset)->setHandle('partial')->setContents([
+            'fields' => [
+                ['handle' => 'bar', 'field' => ['type' => 'text']],
+            ],
+        ]);
+
+        FieldsetRepository::shouldReceive('find')->with('partial')->once()->andReturn($fieldset);
+
+        $parentField = new Field('foo', ['type' => 'replicator']);
+
+        $fields = new Fields(
+            [['import' => 'partial']],
+            null,
+            $parentField,
+            1,
+        );
+
+        $collection = $fields->all();
+        $this->assertEquals($parentField, $collection['bar']->parentField());
+        $this->assertEquals(1, $collection['bar']->parentIndex());
+    }
+
+    /**
+     * @test
+     */
+    public function it_sets_the_parentfield_and_parentindex_on_referenced_fields()
+    {
+        $fieldset = (new Fieldset)->setHandle('partial')->setContents([
+            'fields' => [
+                ['handle' => 'bar', 'field' => ['type' => 'text']],
+            ],
+        ]);
+
+        FieldsetRepository::shouldReceive('find')->with('partial')->once()->andReturn($fieldset);
+
+        $parentField = new Field('foo', ['type' => 'replicator']);
+
+        $fields = new Fields(
+            [['handle' => 'bar', 'field' => 'partial.bar']],
+            null,
+            $parentField,
+            1,
+        );
+
+        $collection = $fields->all();
+        $this->assertEquals($parentField, $collection['bar']->parentField());
+        $this->assertEquals(1, $collection['bar']->parentIndex());
+    }
 }

From e0d10d57acf8186d2e6879948d5eca936d748be9 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Tue, 20 Feb 2024 15:57:27 +0000
Subject: [PATCH 117/149] [4.x] Check if form request wantsJson (#9533)

---
 src/Http/Controllers/FormController.php   | 2 +-
 src/Http/Requests/FrontendFormRequest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Http/Controllers/FormController.php b/src/Http/Controllers/FormController.php
index 1cacb10437..8a88ab5bf0 100644
--- a/src/Http/Controllers/FormController.php
+++ b/src/Http/Controllers/FormController.php
@@ -98,7 +98,7 @@ private function validateContentType($request, $form)
      */
     private function formFailure($params, $errors, $form)
     {
-        if (request()->ajax()) {
+        if (request()->ajax() || request()->wantsJson()) {
             return response([
                 'errors' => (new MessageBag($errors))->all(),
                 'error' => collect($errors)->map(function ($errors, $field) {
diff --git a/src/Http/Requests/FrontendFormRequest.php b/src/Http/Requests/FrontendFormRequest.php
index f4537dfe99..8533be2952 100644
--- a/src/Http/Requests/FrontendFormRequest.php
+++ b/src/Http/Requests/FrontendFormRequest.php
@@ -60,7 +60,7 @@ public function validator()
 
     protected function failedValidation(Validator $validator)
     {
-        if ($this->ajax()) {
+        if ($this->ajax() || $this->wantsJson()) {
             $errors = $validator->errors();
 
             $response = response([

From 8193ac99367c5ac4f48d19a05be9482bda386ab5 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Tue, 20 Feb 2024 15:59:03 +0000
Subject: [PATCH 118/149] [4.x] Remove any uploaded assets when submission
 silently fails or validation fails (#9549)

---
 src/Http/Controllers/FormController.php |  27 +++++-
 tests/Tags/Form/FormCreateTest.php      | 109 ++++++++++++++++++++++++
 2 files changed, 135 insertions(+), 1 deletion(-)

diff --git a/src/Http/Controllers/FormController.php b/src/Http/Controllers/FormController.php
index 8a88ab5bf0..c86f61554b 100644
--- a/src/Http/Controllers/FormController.php
+++ b/src/Http/Controllers/FormController.php
@@ -10,6 +10,7 @@
 use Statamic\Events\FormSubmitted;
 use Statamic\Events\SubmissionCreated;
 use Statamic\Exceptions\SilentFormFailureException;
+use Statamic\Facades\Asset;
 use Statamic\Facades\Form;
 use Statamic\Facades\Site;
 use Statamic\Forms\Exceptions\FileContentTypeRequiredException;
@@ -50,7 +51,9 @@ public function submit(FrontendFormRequest $request, $form)
         try {
             throw_if(Arr::get($values, $form->honeypot()), new SilentFormFailureException);
 
-            $values = array_merge($values, $submission->uploadFiles($assets));
+            $uploadedAssets = $submission->uploadFiles($assets);
+
+            $values = array_merge($values, $uploadedAssets);
 
             $submission->data(
                 $fields->addValues($values)->process()->values()
@@ -60,8 +63,14 @@ public function submit(FrontendFormRequest $request, $form)
             // If they want to add validation errors, they can throw an exception.
             throw_if(FormSubmitted::dispatch($submission) === false, new SilentFormFailureException);
         } catch (ValidationException $e) {
+            $this->removeUploadedAssets($uploadedAssets);
+
             return $this->formFailure($params, $e->errors(), $form->handle());
         } catch (SilentFormFailureException $e) {
+            if (isset($uploadedAssets)) {
+                $this->removeUploadedAssets($uploadedAssets);
+            }
+
             return $this->formSuccess($params, $submission, true);
         }
 
@@ -156,4 +165,20 @@ private function formSuccessRedirect($params, $submission)
 
         return $redirect;
     }
+
+    /**
+     * Remove any uploaded assets
+     *
+     * Triggered by a validation exception or silent failure
+     */
+    private function removeUploadedAssets(array $assets)
+    {
+        collect($assets)
+            ->flatten()
+            ->each(function ($id) {
+                if ($asset = Asset::find($id)) {
+                    $asset->delete();
+                }
+            });
+    }
 }
diff --git a/tests/Tags/Form/FormCreateTest.php b/tests/Tags/Form/FormCreateTest.php
index 557a6314a7..d097f5d699 100644
--- a/tests/Tags/Form/FormCreateTest.php
+++ b/tests/Tags/Form/FormCreateTest.php
@@ -2,6 +2,11 @@
 
 namespace Tests\Tags\Form;
 
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Validation\ValidationException;
+use Statamic\Facades\AssetContainer;
 use Statamic\Facades\Form;
 use Statamic\Statamic;
 
@@ -822,4 +827,108 @@ public function it_fetches_form_data()
         $this->assertEquals($form['honeypot'], 'winnie');
         $this->assertEquals($form['js_driver'], 'alpine');
     }
+
+    /** @test */
+    public function it_uploads_assets()
+    {
+        Storage::fake('avatars');
+        AssetContainer::make('avatars')->disk('avatars')->save();
+
+        $this->createForm([
+            'tabs' => [
+                'main' => [
+                    'sections' => [
+                        [
+                            'display' => 'One',
+                            'instructions' => 'One Instructions',
+                            'fields' => [
+                                ['handle' => 'alpha', 'field' => ['type' => 'text']],
+                                ['handle' => 'bravo', 'field' => ['type' => 'assets', 'container' => 'avatars']],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ], 'survey');
+
+        $this
+            ->post('/!/forms/survey', [
+                'alpha' => 'test',
+                'bravo' => UploadedFile::fake()->image('avatar.jpg'),
+            ]);
+
+        Storage::disk('avatars')->assertExists('avatar.jpg');
+    }
+
+    /** @test */
+    public function it_removes_any_uploaded_assets_when_a_submission_silently_fails()
+    {
+        Storage::fake('avatars');
+        AssetContainer::make('avatars')->disk('avatars')->save();
+
+        Event::listen(function (\Statamic\Events\FormSubmitted $event) {
+            return false;
+        });
+
+        $this->createForm([
+            'tabs' => [
+                'main' => [
+                    'sections' => [
+                        [
+                            'display' => 'One',
+                            'instructions' => 'One Instructions',
+                            'fields' => [
+                                ['handle' => 'alpha', 'field' => ['type' => 'text']],
+                                ['handle' => 'bravo', 'field' => ['type' => 'assets', 'container' => 'avatars']],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ], 'survey');
+
+        $this
+            ->post('/!/forms/survey', [
+                'alpha' => 'test',
+                'bravo' => UploadedFile::fake()->image('avatar.jpg'),
+            ]);
+
+        Storage::disk('avatars')->assertMissing('avatar.jpg');
+    }
+
+    /** @test */
+    public function it_removes_any_uploaded_assets_when_a_listener_throws_a_validation_exception()
+    {
+        Storage::fake('avatars');
+        AssetContainer::make('avatars')->disk('avatars')->save();
+
+        Event::listen(function (\Statamic\Events\FormSubmitted $event) {
+            throw ValidationException::withMessages(['custom' => 'This is a custom message']);
+        });
+
+        $this->createForm([
+            'tabs' => [
+                'main' => [
+                    'sections' => [
+                        [
+                            'display' => 'One',
+                            'instructions' => 'One Instructions',
+                            'fields' => [
+                                ['handle' => 'alpha', 'field' => ['type' => 'text']],
+                                ['handle' => 'bravo', 'field' => ['type' => 'assets', 'container' => 'avatars']],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ], 'survey');
+
+        $this
+            ->post('/!/forms/survey', [
+                'alpha' => 'test',
+                'bravo' => UploadedFile::fake()->image('avatar.jpg'),
+            ]);
+
+        Storage::disk('avatars')->assertMissing('avatar.jpg');
+    }
 }

From 6ab5f3c10a801cb8d993e246570061835a833cae Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Tue, 20 Feb 2024 16:36:04 +0000
Subject: [PATCH 119/149] [4.x] Drop Laravel 6 mail view (#9545)

---
 resources/views/utilities/email.blade.php     | 47 +++++++++++++++++--
 .../utilities/partials/email-l6.blade.php     | 40 ----------------
 .../utilities/partials/email-l7.blade.php     | 44 -----------------
 3 files changed, 43 insertions(+), 88 deletions(-)
 delete mode 100644 resources/views/utilities/partials/email-l6.blade.php
 delete mode 100644 resources/views/utilities/partials/email-l7.blade.php

diff --git a/resources/views/utilities/email.blade.php b/resources/views/utilities/email.blade.php
index 0655b38046..8b5e02ce8a 100644
--- a/resources/views/utilities/email.blade.php
+++ b/resources/views/utilities/email.blade.php
@@ -29,10 +29,49 @@
     <p class="text-sm text-gray mb-4">{!! __('statamic::messages.email_utility_configuration_description', ['path' => config_path('mail.php')]) !!}</p>
     <div class="card p-0">
         <table class="data-table">
-            @if (config('mail.mailers'))
-                @include('statamic::utilities.partials.email-l7')
-            @else
-                @include('statamic::utilities.partials.email-l6')
+            <tr>
+                <th class="pl-4 py-2 w-1/4">{{ __('Default Mailer') }}</th>
+                <td><code>{{ config('mail.default') }}</code></td>
+            </tr>
+            @if (config('mail.default') == 'smtp')
+            <tr>
+                <th class="pl-4 py-2 w-1/4">{{ __('Host') }}</th>
+                <td><code>{{ config('mail.mailers.smtp.host') }}</code></td>
+            </tr>
+            <tr>
+                <th class="pl-4 py-2 w-1/4">{{ __('Port') }}</th>
+                <td><code>{{ config('mail.mailers.smtp.port') }}</code></td>
+            </tr>
+            <tr>
+                <th class="pl-4 py-2 w-1/4">{{ __('Encryption') }}</th>
+                <td>
+                    @if (config('mail.mailers.smtp.encryption'))
+                        <code>{{ config('mail.mailers.smtp.encryption') }}</code>
+                    @endif
+                </td>
+            </tr>
+            <tr>
+                <th class="pl-4 py-2 w-1/4">{{ __('Username') }}</th>
+                <td>
+                    @if (config('mail.mailers.smtp.username'))
+                        <code>{{ config('mail.mailers.smtp.username') }}</code>
+                    @endif
+                </td>
+            </tr>
+            <tr>
+                <th class="pl-4 py-2 w-1/4">{{ __('Password') }}</th>
+                <td>
+                    @if (config('mail.mailers.smtp.password'))
+                        <code>{{ config('mail.mailers.smtp.password') }}</code>
+                    @endif
+                </td>
+            </tr>
+            @endif
+            @if (config('mail.default') == 'sendmail')
+            <tr>
+                <th class="pl-4 py-2 w-1/4">{{ __('Sendmail') }}</th>
+                <td><code>{{ config('mail.mailers.sendmail.path') }}</code></td>
+            </tr>
             @endif
             <tr>
                 <th class="pl-4 py-2 w-1/4">{{ __('Default From Address') }}</th>
diff --git a/resources/views/utilities/partials/email-l6.blade.php b/resources/views/utilities/partials/email-l6.blade.php
deleted file mode 100644
index e03b6ef10c..0000000000
--- a/resources/views/utilities/partials/email-l6.blade.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Driver') }}</th>
-    <td><code>{{ config('mail.driver') }}</code></td>
-</tr>
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Host') }}</th>
-    <td><code>{{ config('mail.host') }}</code></td>
-</tr>
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Port') }}</th>
-    <td><code>{{ config('mail.port') }}</code></td>
-</tr>
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Encryption') }}</th>
-    <td>
-        @if (config('mail.encryption'))
-            <code>{{ config('mail.encryption') }}</code>
-        @endif
-    </td>
-</tr>
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Username') }}</th>
-    <td>
-        @if (config('mail.username'))
-            <code>{{ config('mail.username') }}</code>
-        @endif
-    </td>
-</tr>
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Password') }}</th>
-    <td>
-        @if (config('mail.password'))
-            <code>{{ config('mail.password') }}</code>
-        @endif
-    </td>
-</tr>
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Sendmail') }}</th>
-    <td><code>{{ config('mail.sendmail') }}</code></td>
-</tr>
diff --git a/resources/views/utilities/partials/email-l7.blade.php b/resources/views/utilities/partials/email-l7.blade.php
deleted file mode 100644
index 7c6f611cfb..0000000000
--- a/resources/views/utilities/partials/email-l7.blade.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Default Mailer') }}</th>
-    <td><code>{{ config('mail.default') }}</code></td>
-</tr>
-@if (config('mail.default') == 'smtp')
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Host') }}</th>
-    <td><code>{{ config('mail.mailers.smtp.host') }}</code></td>
-</tr>
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Port') }}</th>
-    <td><code>{{ config('mail.mailers.smtp.port') }}</code></td>
-</tr>
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Encryption') }}</th>
-    <td>
-        @if (config('mail.mailers.smtp.encryption'))
-            <code>{{ config('mail.mailers.smtp.encryption') }}</code>
-        @endif
-    </td>
-</tr>
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Username') }}</th>
-    <td>
-        @if (config('mail.mailers.smtp.username'))
-            <code>{{ config('mail.mailers.smtp.username') }}</code>
-        @endif
-    </td>
-</tr>
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Password') }}</th>
-    <td>
-        @if (config('mail.mailers.smtp.password'))
-            <code>{{ config('mail.mailers.smtp.password') }}</code>
-        @endif
-    </td>
-</tr>
-@endif
-@if (config('mail.default') == 'sendmail')
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Sendmail') }}</th>
-    <td><code>{{ config('mail.mailers.sendmail.path') }}</code></td>
-</tr>
-@endif

From 150b07e7ecb09e299211c8a3230bdb54067df0e8 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Tue, 20 Feb 2024 16:43:45 +0000
Subject: [PATCH 120/149] [4.x] Delete temporary uploaded file after response
 (#9542)

---
 src/Assets/Uploader.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Assets/Uploader.php b/src/Assets/Uploader.php
index e618a09009..e34d6d3126 100644
--- a/src/Assets/Uploader.php
+++ b/src/Assets/Uploader.php
@@ -16,7 +16,13 @@ public function upload(UploadedFile $file)
 
         $this->write($source, $path = $this->uploadPath($file));
 
-        app('files')->delete($source);
+        if (app()->runningInConsole()) {
+            app('files')->delete($source);
+
+            return $path;
+        }
+
+        dispatch(fn () => app('files')->delete($source))->afterResponse();
 
         return $path;
     }

From 7fc56a911d83a3c39d7aacb3434a617a0dc614ca Mon Sep 17 00:00:00 2001
From: John Koster <john@stillat.com>
Date: Tue, 20 Feb 2024 10:54:33 -0600
Subject: [PATCH 121/149] [4.x] Antlers: Resolve values from augmented values
 when there is more data to process (#9548)

---
 .../Language/Runtime/PathDataManager.php      | 13 ++++
 tests/Antlers/Runtime/ParametersTest.php      | 60 +++++++++++++++++++
 2 files changed, 73 insertions(+)

diff --git a/src/View/Antlers/Language/Runtime/PathDataManager.php b/src/View/Antlers/Language/Runtime/PathDataManager.php
index 32dd2ff48e..be8b289b5e 100644
--- a/src/View/Antlers/Language/Runtime/PathDataManager.php
+++ b/src/View/Antlers/Language/Runtime/PathDataManager.php
@@ -476,6 +476,15 @@ private function checkForValueIntercept($pathItem)
         }
     }
 
+    private function collapseValues(bool $isFinal)
+    {
+        if (! $isFinal && $this->reducedVar instanceof Values) {
+            $this->lockData();
+            $this->reducedVar = self::reduce($this->reducedVar, true, $this->shouldDoValueIntercept);
+            $this->unlockData();
+        }
+    }
+
     private function collapseQueryBuilder($builder)
     {
         $this->reducedVar = $builder->get();
@@ -616,6 +625,8 @@ public function getData(VariableReference $path, $data, $isForArrayIndex = false
                             $this->unlockData();
                         }
 
+                        $this->collapseValues($pathItem->isFinal);
+
                         continue;
                     } else {
                         if ($this->cascade != null) {
@@ -660,6 +671,8 @@ public function getData(VariableReference $path, $data, $isForArrayIndex = false
 
                 $this->reduceVar($pathItem, $data);
 
+                $this->collapseValues($pathItem->isFinal);
+
                 if ($pathItem->isFinal && $this->reducedVar instanceof Builder && ! $wasBuilderGoingIntoLast) {
                     $this->encounteredBuilderOnFinalPart = true;
                 }
diff --git a/tests/Antlers/Runtime/ParametersTest.php b/tests/Antlers/Runtime/ParametersTest.php
index 379300b940..32e92bef0f 100644
--- a/tests/Antlers/Runtime/ParametersTest.php
+++ b/tests/Antlers/Runtime/ParametersTest.php
@@ -3,6 +3,9 @@
 namespace Tests\Antlers\Runtime;
 
 use Carbon\Carbon;
+use Statamic\Fields\Field;
+use Statamic\Fields\Value;
+use Statamic\Fieldtypes\Group;
 use Statamic\Tags\Tags;
 use Tests\Antlers\Fixtures\Addon\Tags\EchoMethod;
 use Tests\Antlers\Fixtures\Addon\Tags\TestTags as Test;
@@ -365,4 +368,61 @@ public function index()
             'Floats'
         );
     }
+
+    public function test_values_objects_are_resolved_when_processing_tag_params()
+    {
+        (new class extends Tags
+        {
+            protected static $handle = 'test';
+
+            public function index()
+            {
+                return $this->params->get('param');
+            }
+        })::register();
+
+        $theGroup = new Group();
+
+        $theField = new Field('the_group', [
+            'type' => 'group',
+            'fields' => [
+                ['handle' => 'one', 'field' => ['type' => 'text']],
+                ['handle' => 'two', 'field' => ['type' => 'text']],
+            ],
+        ]);
+
+        $theGroup->setField($theField);
+
+        $theValue = new Value([
+            'one' => 'One',
+            'two' => 'Two',
+        ], 'the_group', $theGroup);
+
+        $data = [
+            'thing' => [
+                [
+                    'the_group' => $theValue,
+                ],
+            ],
+        ];
+
+        $template = <<<'EOT'
+{{ thing scope="block" }}
+{{ test :param="block:the_group:two" }}
+{{ /thing }}
+EOT;
+
+        $this->assertSame('Two', trim($this->renderString($template, $data, true)));
+
+        // Test when the group is the first part of the path.
+        $data = [
+            'the_group' => $theValue,
+        ];
+
+        $template = <<<'EOT'
+{{ test :param="the_group:one" }}
+EOT;
+
+        $this->assertSame('One', trim($this->renderString($template, $data, true)));
+    }
 }

From ab4e254771f54290042621c9e78fa5615c37099f Mon Sep 17 00:00:00 2001
From: John Koster <john@stillat.com>
Date: Tue, 20 Feb 2024 11:56:21 -0600
Subject: [PATCH 122/149] [4.x] Fix Stache problem on Windows (#9537)

---
 src/Stache/Indexes/Index.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Stache/Indexes/Index.php b/src/Stache/Indexes/Index.php
index 6b5d751176..c147917cd0 100644
--- a/src/Stache/Indexes/Index.php
+++ b/src/Stache/Indexes/Index.php
@@ -131,9 +131,15 @@ abstract public function getItems();
 
     public function cacheKey()
     {
+        $replacements = ['::', '->'];
+
+        if (windows_os()) {
+            $replacements[1] = '-]';
+        }
+
         return vsprintf('stache::indexes::%s::%s', [
             $this->store->key(),
-            str_replace(['.', '/'], ['::', '->'], $this->name),
+            str_replace(['.', '/'], $replacements, $this->name),
         ]);
     }
 

From f7a247b8cd98cc2ecd86e3349d2aa24dd8041d85 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Tue, 20 Feb 2024 17:58:21 +0000
Subject: [PATCH 123/149] [4.x] Fix arrays being returned by translations
 (#9525)

---
 resources/views/addons/index.blade.php                      | 2 ++
 resources/views/addons/settings.blade.php                   | 2 ++
 resources/views/assets/browse.blade.php                     | 2 ++
 resources/views/assets/containers/blueprints/edit.blade.php | 2 ++
 resources/views/assets/containers/create.blade.php          | 2 ++
 resources/views/assets/containers/edit.blade.php            | 2 ++
 resources/views/assets/containers/index.blade.php           | 2 ++
 resources/views/assets/index.blade.php                      | 2 ++
 resources/views/auth/login.blade.php                        | 2 ++
 resources/views/auth/passwords/email.blade.php              | 2 ++
 resources/views/auth/passwords/reset.blade.php              | 2 ++
 resources/views/auth/unauthorized.blade.php                 | 2 ++
 resources/views/blueprints/edit.blade.php                   | 2 ++
 resources/views/blueprints/index.blade.php                  | 2 ++
 resources/views/collections/blueprints/create.blade.php     | 2 ++
 resources/views/collections/blueprints/edit.blade.php       | 2 ++
 resources/views/collections/blueprints/index.blade.php      | 2 ++
 resources/views/collections/create.blade.php                | 2 ++
 resources/views/collections/edit.blade.php                  | 2 ++
 resources/views/collections/empty.blade.php                 | 2 ++
 resources/views/collections/index.blade.php                 | 2 ++
 resources/views/collections/scaffold.blade.php              | 2 ++
 resources/views/dashboard.blade.php                         | 2 ++
 resources/views/duplicates.blade.php                        | 2 ++
 resources/views/errors/404.blade.php                        | 5 ++++-
 resources/views/fields/index.blade.php                      | 2 ++
 resources/views/fieldsets/create.blade.php                  | 2 ++
 resources/views/fieldsets/edit.blade.php                    | 2 ++
 resources/views/fieldsets/index.blade.php                   | 2 ++
 resources/views/forms/blueprints/edit.blade.php             | 2 ++
 resources/views/forms/create.blade.php                      | 2 ++
 resources/views/forms/edit.blade.php                        | 2 ++
 resources/views/forms/index.blade.php                       | 2 ++
 resources/views/forms/show.blade.php                        | 2 ++
 resources/views/forms/widget.blade.php                      | 2 ++
 resources/views/globals/blueprints/edit.blade.php           | 2 ++
 resources/views/globals/configure.blade.php                 | 2 ++
 resources/views/globals/create.blade.php                    | 2 ++
 resources/views/globals/edit.blade.php                      | 2 ++
 resources/views/globals/index.blade.php                     | 2 ++
 resources/views/impersonator/terminate.blade.php            | 2 ++
 resources/views/licensing.blade.php                         | 2 ++
 resources/views/nav/index.blade.php                         | 2 ++
 resources/views/navigation/blueprints/edit.blade.php        | 2 ++
 resources/views/navigation/create.blade.php                 | 2 ++
 resources/views/navigation/edit.blade.php                   | 2 ++
 resources/views/navigation/index.blade.php                  | 2 ++
 resources/views/partials/breadcrumb.blade.php               | 2 ++
 resources/views/partials/create-first.blade.php             | 2 ++
 resources/views/partials/docs-callout.blade.php             | 2 ++
 resources/views/partials/global-header.blade.php            | 2 ++
 resources/views/partials/head.blade.php                     | 2 ++
 resources/views/partials/licensing-alerts.blade.php         | 1 +
 resources/views/playground.blade.php                        | 2 ++
 resources/views/preferences/edit.blade.php                  | 2 ++
 resources/views/preferences/index.blade.php                 | 2 ++
 resources/views/roles/create.blade.php                      | 2 ++
 resources/views/roles/edit.blade.php                        | 2 ++
 resources/views/roles/index.blade.php                       | 2 ++
 resources/views/settings/edit.blade.php                     | 2 ++
 resources/views/taxonomies/blueprints/create.blade.php      | 2 ++
 resources/views/taxonomies/blueprints/edit.blade.php        | 2 ++
 resources/views/taxonomies/blueprints/index.blade.php       | 2 ++
 resources/views/taxonomies/create.blade.php                 | 2 ++
 resources/views/taxonomies/edit.blade.php                   | 2 ++
 resources/views/taxonomies/empty.blade.php                  | 2 ++
 resources/views/taxonomies/index.blade.php                  | 2 ++
 resources/views/taxonomies/show.blade.php                   | 2 ++
 resources/views/terms/edit.blade.php                        | 2 ++
 resources/views/updater/index.blade.php                     | 2 ++
 resources/views/updater/show.blade.php                      | 2 ++
 resources/views/usergroups/blueprints/edit.blade.php        | 2 ++
 resources/views/usergroups/create.blade.php                 | 2 ++
 resources/views/usergroups/edit.blade.php                   | 2 ++
 resources/views/usergroups/index.blade.php                  | 2 ++
 resources/views/usergroups/show.blade.php                   | 2 ++
 resources/views/users/blueprints/edit.blade.php             | 2 ++
 resources/views/users/create.blade.php                      | 2 ++
 resources/views/users/edit.blade.php                        | 2 ++
 resources/views/users/index.blade.php                       | 2 ++
 resources/views/utilities/cache.blade.php                   | 2 ++
 resources/views/utilities/email.blade.php                   | 2 ++
 resources/views/utilities/git.blade.php                     | 2 ++
 resources/views/utilities/index.blade.php                   | 2 ++
 resources/views/utilities/phpinfo.blade.php                 | 2 ++
 resources/views/utilities/search.blade.php                  | 2 ++
 resources/views/widgets/getting-started.blade.php           | 2 ++
 resources/views/widgets/updater.blade.php                   | 2 ++
 88 files changed, 177 insertions(+), 1 deletion(-)

diff --git a/resources/views/addons/index.blade.php b/resources/views/addons/index.blade.php
index cec1e466f2..331587496d 100644
--- a/resources/views/addons/index.blade.php
+++ b/resources/views/addons/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Addons'))
 
diff --git a/resources/views/addons/settings.blade.php b/resources/views/addons/settings.blade.php
index 450e2b0068..6b1510bf5e 100644
--- a/resources/views/addons/settings.blade.php
+++ b/resources/views/addons/settings.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Addon Settings'))
 
diff --git a/resources/views/assets/browse.blade.php b/resources/views/assets/browse.blade.php
index f67a60b5dd..9ccadf0d70 100644
--- a/resources/views/assets/browse.blade.php
+++ b/resources/views/assets/browse.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', Statamic::crumb('Assets', $container['title']))
 @section('wrapper_class', 'max-w-full')
diff --git a/resources/views/assets/containers/blueprints/edit.blade.php b/resources/views/assets/containers/blueprints/edit.blade.php
index c89aaeb30e..4056034f64 100644
--- a/resources/views/assets/containers/blueprints/edit.blade.php
+++ b/resources/views/assets/containers/blueprints/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Edit Blueprint'))
 
diff --git a/resources/views/assets/containers/create.blade.php b/resources/views/assets/containers/create.blade.php
index 619de5ed34..ec60d541f8 100644
--- a/resources/views/assets/containers/create.blade.php
+++ b/resources/views/assets/containers/create.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Create Asset Container'))
 
diff --git a/resources/views/assets/containers/edit.blade.php b/resources/views/assets/containers/edit.blade.php
index 1de86d4e9a..38c22225a9 100644
--- a/resources/views/assets/containers/edit.blade.php
+++ b/resources/views/assets/containers/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Configure Asset Container'))
 
diff --git a/resources/views/assets/containers/index.blade.php b/resources/views/assets/containers/index.blade.php
index 28372c6982..87065f1229 100644
--- a/resources/views/assets/containers/index.blade.php
+++ b/resources/views/assets/containers/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Asset Containers'))
 
diff --git a/resources/views/assets/index.blade.php b/resources/views/assets/index.blade.php
index 5bf5bb0105..ae8bdb91f4 100644
--- a/resources/views/assets/index.blade.php
+++ b/resources/views/assets/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Assets'))
 
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 5a18356659..21647d0700 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @inject('str', 'Statamic\Support\Str')
 @extends('statamic::outside')
 @section('title', __('Log in'))
diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
index 353ee5016c..0c06c1066d 100644
--- a/resources/views/auth/passwords/email.blade.php
+++ b/resources/views/auth/passwords/email.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::outside')
 
 @section('content')
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
index a34fd5a869..cf80d74a09 100644
--- a/resources/views/auth/passwords/reset.blade.php
+++ b/resources/views/auth/passwords/reset.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::outside')
 
 @section('content')
diff --git a/resources/views/auth/unauthorized.blade.php b/resources/views/auth/unauthorized.blade.php
index 7c316c5c4a..ac074e1364 100644
--- a/resources/views/auth/unauthorized.blade.php
+++ b/resources/views/auth/unauthorized.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::outside')
 @section('title', __('Unauthorized'))
 
diff --git a/resources/views/blueprints/edit.blade.php b/resources/views/blueprints/edit.blade.php
index c5039088c0..2279d5ae0e 100644
--- a/resources/views/blueprints/edit.blade.php
+++ b/resources/views/blueprints/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Edit Blueprint'))
 
diff --git a/resources/views/blueprints/index.blade.php b/resources/views/blueprints/index.blade.php
index 77bf411694..a479d0db46 100644
--- a/resources/views/blueprints/index.blade.php
+++ b/resources/views/blueprints/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Blueprints'))
 
diff --git a/resources/views/collections/blueprints/create.blade.php b/resources/views/collections/blueprints/create.blade.php
index f499ec074d..df8df5e720 100644
--- a/resources/views/collections/blueprints/create.blade.php
+++ b/resources/views/collections/blueprints/create.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Create Blueprint'))
 
diff --git a/resources/views/collections/blueprints/edit.blade.php b/resources/views/collections/blueprints/edit.blade.php
index cc3e4a51ed..83c66e01fd 100644
--- a/resources/views/collections/blueprints/edit.blade.php
+++ b/resources/views/collections/blueprints/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Edit Blueprint'))
 
diff --git a/resources/views/collections/blueprints/index.blade.php b/resources/views/collections/blueprints/index.blade.php
index 7c1863c8c2..99f786adf5 100644
--- a/resources/views/collections/blueprints/index.blade.php
+++ b/resources/views/collections/blueprints/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Blueprints'))
 
diff --git a/resources/views/collections/create.blade.php b/resources/views/collections/create.blade.php
index 97160cd89b..0ac3159c7c 100644
--- a/resources/views/collections/create.blade.php
+++ b/resources/views/collections/create.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Create Collection'))
 
diff --git a/resources/views/collections/edit.blade.php b/resources/views/collections/edit.blade.php
index 17fe2d16e0..4d136aca7f 100644
--- a/resources/views/collections/edit.blade.php
+++ b/resources/views/collections/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Configure Collection'))
 
diff --git a/resources/views/collections/empty.blade.php b/resources/views/collections/empty.blade.php
index b82fe23559..b1f9bdb30d 100644
--- a/resources/views/collections/empty.blade.php
+++ b/resources/views/collections/empty.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', Statamic::crumb($collection->title(), 'Collections'))
 
diff --git a/resources/views/collections/index.blade.php b/resources/views/collections/index.blade.php
index ce0c98ac48..790ac82b35 100644
--- a/resources/views/collections/index.blade.php
+++ b/resources/views/collections/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Collections'))
 
diff --git a/resources/views/collections/scaffold.blade.php b/resources/views/collections/scaffold.blade.php
index ac09426a46..4d1b1a0184 100644
--- a/resources/views/collections/scaffold.blade.php
+++ b/resources/views/collections/scaffold.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Scaffold Collection'))
 
diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
index bea51b6367..bb879129e9 100644
--- a/resources/views/dashboard.blade.php
+++ b/resources/views/dashboard.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Dashboard'))
 
diff --git a/resources/views/duplicates.blade.php b/resources/views/duplicates.blade.php
index 31ee07775d..f5ced94f0e 100644
--- a/resources/views/duplicates.blade.php
+++ b/resources/views/duplicates.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Duplicate IDs'))
 
diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php
index 1faf8dabba..447eeddb1c 100644
--- a/resources/views/errors/404.blade.php
+++ b/resources/views/errors/404.blade.php
@@ -1,4 +1,7 @@
-<?php $authed = \Statamic\Facades\User::current(); ?>
+@php
+use function Statamic\trans as __;
+$authed = \Statamic\Facades\User::current();
+@endphp
 
 @extends($authed ? 'statamic::layout' : 'statamic::outside')
 
diff --git a/resources/views/fields/index.blade.php b/resources/views/fields/index.blade.php
index 77531ecaf5..646236a136 100644
--- a/resources/views/fields/index.blade.php
+++ b/resources/views/fields/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Fields'))
 
diff --git a/resources/views/fieldsets/create.blade.php b/resources/views/fieldsets/create.blade.php
index d3c988d9ac..ce2113b33b 100644
--- a/resources/views/fieldsets/create.blade.php
+++ b/resources/views/fieldsets/create.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Create Fieldset'))
 
diff --git a/resources/views/fieldsets/edit.blade.php b/resources/views/fieldsets/edit.blade.php
index 3500daf6bb..f22cc64f9f 100644
--- a/resources/views/fieldsets/edit.blade.php
+++ b/resources/views/fieldsets/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Edit Fieldset'))
 
diff --git a/resources/views/fieldsets/index.blade.php b/resources/views/fieldsets/index.blade.php
index fa74e11489..9c6ccb1c00 100644
--- a/resources/views/fieldsets/index.blade.php
+++ b/resources/views/fieldsets/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Fieldsets'))
 
diff --git a/resources/views/forms/blueprints/edit.blade.php b/resources/views/forms/blueprints/edit.blade.php
index 3c40b230d7..bf36f2de20 100644
--- a/resources/views/forms/blueprints/edit.blade.php
+++ b/resources/views/forms/blueprints/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Edit Blueprint'))
 
diff --git a/resources/views/forms/create.blade.php b/resources/views/forms/create.blade.php
index b9a97d63fa..246cbe1641 100644
--- a/resources/views/forms/create.blade.php
+++ b/resources/views/forms/create.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Create Form'))
 
diff --git a/resources/views/forms/edit.blade.php b/resources/views/forms/edit.blade.php
index f063be49f6..743431b68e 100644
--- a/resources/views/forms/edit.blade.php
+++ b/resources/views/forms/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Configure Form'))
 
diff --git a/resources/views/forms/index.blade.php b/resources/views/forms/index.blade.php
index 51800b7a0a..78effd3191 100644
--- a/resources/views/forms/index.blade.php
+++ b/resources/views/forms/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Forms'))
 
diff --git a/resources/views/forms/show.blade.php b/resources/views/forms/show.blade.php
index c6553bdbc4..5da84e66f5 100644
--- a/resources/views/forms/show.blade.php
+++ b/resources/views/forms/show.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', Statamic::crumb($form->title(), 'Forms'))
 @section('wrapper_class', 'max-w-full')
diff --git a/resources/views/forms/widget.blade.php b/resources/views/forms/widget.blade.php
index 99ed15935a..cb0554df83 100644
--- a/resources/views/forms/widget.blade.php
+++ b/resources/views/forms/widget.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 <div class="card p-0 overflow-hidden">
     <div class="flex justify-between items-center p-4">
         <h2>
diff --git a/resources/views/globals/blueprints/edit.blade.php b/resources/views/globals/blueprints/edit.blade.php
index d1f0e32578..f6eb5baf42 100644
--- a/resources/views/globals/blueprints/edit.blade.php
+++ b/resources/views/globals/blueprints/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Edit Blueprint'))
 
diff --git a/resources/views/globals/configure.blade.php b/resources/views/globals/configure.blade.php
index 61281a9668..00504e3d68 100644
--- a/resources/views/globals/configure.blade.php
+++ b/resources/views/globals/configure.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Configure Global Set'))
 
diff --git a/resources/views/globals/create.blade.php b/resources/views/globals/create.blade.php
index c2dc4d825b..43a5e09992 100644
--- a/resources/views/globals/create.blade.php
+++ b/resources/views/globals/create.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Create Global Set'))
 @section('content')
diff --git a/resources/views/globals/edit.blade.php b/resources/views/globals/edit.blade.php
index 61399ffbc5..81b9f46dbb 100644
--- a/resources/views/globals/edit.blade.php
+++ b/resources/views/globals/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Edit Global Set'))
 
diff --git a/resources/views/globals/index.blade.php b/resources/views/globals/index.blade.php
index 385a290a75..e2dab2ebab 100644
--- a/resources/views/globals/index.blade.php
+++ b/resources/views/globals/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Global Sets'))
 
diff --git a/resources/views/impersonator/terminate.blade.php b/resources/views/impersonator/terminate.blade.php
index ee771d4021..6ad42b2baf 100644
--- a/resources/views/impersonator/terminate.blade.php
+++ b/resources/views/impersonator/terminate.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 <style>
   #__impersonator-link__ {
     position: fixed;
diff --git a/resources/views/licensing.blade.php b/resources/views/licensing.blade.php
index c3afa90132..1734be7b43 100644
--- a/resources/views/licensing.blade.php
+++ b/resources/views/licensing.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Licensing'))
 
diff --git a/resources/views/nav/index.blade.php b/resources/views/nav/index.blade.php
index e0f3b94f47..b52015c7d2 100644
--- a/resources/views/nav/index.blade.php
+++ b/resources/views/nav/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('CP Nav Preferences'))
 
diff --git a/resources/views/navigation/blueprints/edit.blade.php b/resources/views/navigation/blueprints/edit.blade.php
index fb2af09835..a93911340a 100644
--- a/resources/views/navigation/blueprints/edit.blade.php
+++ b/resources/views/navigation/blueprints/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Edit Blueprint'))
 
diff --git a/resources/views/navigation/create.blade.php b/resources/views/navigation/create.blade.php
index e9b6a720e1..2430ba0c64 100644
--- a/resources/views/navigation/create.blade.php
+++ b/resources/views/navigation/create.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Create Navigation'))
 
diff --git a/resources/views/navigation/edit.blade.php b/resources/views/navigation/edit.blade.php
index 611c25573e..8eb010c017 100644
--- a/resources/views/navigation/edit.blade.php
+++ b/resources/views/navigation/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Edit Navigation'))
 
diff --git a/resources/views/navigation/index.blade.php b/resources/views/navigation/index.blade.php
index fae54938a8..e4f60f9ca9 100644
--- a/resources/views/navigation/index.blade.php
+++ b/resources/views/navigation/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Navigation'))
 
diff --git a/resources/views/partials/breadcrumb.blade.php b/resources/views/partials/breadcrumb.blade.php
index de0d5e6ea8..75361b5945 100644
--- a/resources/views/partials/breadcrumb.blade.php
+++ b/resources/views/partials/breadcrumb.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 <div class="flex">
     <a href="{{ $url }}" class="flex-initial flex p-2 -m-2 items-center text-xs text-gray-700 hover:text-gray-900">
         <div class="h-6 rotate-180 svg-icon using-svg">
diff --git a/resources/views/partials/create-first.blade.php b/resources/views/partials/create-first.blade.php
index d9eee4af74..a0d111ee9d 100644
--- a/resources/views/partials/create-first.blade.php
+++ b/resources/views/partials/create-first.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 <div class="no-results border-dashed border-2">
     <div class="text-center max-w-md mx-auto mt-10 rounded-lg px-8 py-30">
 
diff --git a/resources/views/partials/docs-callout.blade.php b/resources/views/partials/docs-callout.blade.php
index f2126ce278..16e87fb4af 100644
--- a/resources/views/partials/docs-callout.blade.php
+++ b/resources/views/partials/docs-callout.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @if (config('statamic.cp.link_to_docs'))
     <div class="flex justify-center text-center mt-16">
         <div class="bg-white rounded-full px-6 py-2 shadow-sm text-sm text-gray-700">{{ $text ?? __('Learn more about') }} <a href="{{ $url }}" target="_blank" rel="noopener noopener" class="text-blue hover:text-blue-700">{{ $topic }}</a></div>
diff --git a/resources/views/partials/global-header.blade.php b/resources/views/partials/global-header.blade.php
index 373c0137fc..e1b340d8d3 100644
--- a/resources/views/partials/global-header.blade.php
+++ b/resources/views/partials/global-header.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 <div class="global-header">
     <div class="lg:min-w-xl pl-2 md:pl-6 h-full flex items-center">
         <button class="nav-toggle hidden md:flex ml-1 shrink-0" @click="toggleNav" aria-label="{{ __('Toggle Nav') }}">@cp_svg('icons/light/burger', 'h-4 w-4')</button>
diff --git a/resources/views/partials/head.blade.php b/resources/views/partials/head.blade.php
index 3ef85b2479..03f4173694 100644
--- a/resources/views/partials/head.blade.php
+++ b/resources/views/partials/head.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <meta name="viewport" content="width=device-width">
diff --git a/resources/views/partials/licensing-alerts.blade.php b/resources/views/partials/licensing-alerts.blade.php
index e39a4f9450..a2f056d040 100644
--- a/resources/views/partials/licensing-alerts.blade.php
+++ b/resources/views/partials/licensing-alerts.blade.php
@@ -1,3 +1,4 @@
+@php use function Statamic\trans as __; @endphp
 @inject('licenses', 'Statamic\Licensing\LicenseManager')
 
 @if ($licenses->requestFailed())
diff --git a/resources/views/playground.blade.php b/resources/views/playground.blade.php
index e35ecc00a8..54b472ab09 100644
--- a/resources/views/playground.blade.php
+++ b/resources/views/playground.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 
 @section('nontent')
diff --git a/resources/views/preferences/edit.blade.php b/resources/views/preferences/edit.blade.php
index 8d113eea0c..c57eeed95f 100644
--- a/resources/views/preferences/edit.blade.php
+++ b/resources/views/preferences/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', $title)
 
diff --git a/resources/views/preferences/index.blade.php b/resources/views/preferences/index.blade.php
index 4858af0d17..d4d66df7b7 100644
--- a/resources/views/preferences/index.blade.php
+++ b/resources/views/preferences/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Preferences'))
 
diff --git a/resources/views/roles/create.blade.php b/resources/views/roles/create.blade.php
index e1eceff987..b07ba247f6 100644
--- a/resources/views/roles/create.blade.php
+++ b/resources/views/roles/create.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', Statamic::crumb(__('Create Role'), __('Roles & Permissions')))
 
diff --git a/resources/views/roles/edit.blade.php b/resources/views/roles/edit.blade.php
index 525a9c18f1..b24b0309fb 100644
--- a/resources/views/roles/edit.blade.php
+++ b/resources/views/roles/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', Statamic::crumb(__('Configure Role'), __('Permissions')))
 
diff --git a/resources/views/roles/index.blade.php b/resources/views/roles/index.blade.php
index ab033947e8..937e014613 100644
--- a/resources/views/roles/index.blade.php
+++ b/resources/views/roles/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Roles'))
 
diff --git a/resources/views/settings/edit.blade.php b/resources/views/settings/edit.blade.php
index 1f8a29d27c..cbafc216b0 100644
--- a/resources/views/settings/edit.blade.php
+++ b/resources/views/settings/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('content-class', 'publishing')
 @section('title', __('Settings'))
diff --git a/resources/views/taxonomies/blueprints/create.blade.php b/resources/views/taxonomies/blueprints/create.blade.php
index f499ec074d..df8df5e720 100644
--- a/resources/views/taxonomies/blueprints/create.blade.php
+++ b/resources/views/taxonomies/blueprints/create.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Create Blueprint'))
 
diff --git a/resources/views/taxonomies/blueprints/edit.blade.php b/resources/views/taxonomies/blueprints/edit.blade.php
index 4f27e0686e..f2aef8b6db 100644
--- a/resources/views/taxonomies/blueprints/edit.blade.php
+++ b/resources/views/taxonomies/blueprints/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Edit Blueprint'))
 
diff --git a/resources/views/taxonomies/blueprints/index.blade.php b/resources/views/taxonomies/blueprints/index.blade.php
index 56dcaacff5..d4656e70fe 100644
--- a/resources/views/taxonomies/blueprints/index.blade.php
+++ b/resources/views/taxonomies/blueprints/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Blueprints'))
 
diff --git a/resources/views/taxonomies/create.blade.php b/resources/views/taxonomies/create.blade.php
index 69fb399176..fe3b35c3db 100644
--- a/resources/views/taxonomies/create.blade.php
+++ b/resources/views/taxonomies/create.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Create Taxonomy'))
 
diff --git a/resources/views/taxonomies/edit.blade.php b/resources/views/taxonomies/edit.blade.php
index be6cf92636..5ec975ac36 100644
--- a/resources/views/taxonomies/edit.blade.php
+++ b/resources/views/taxonomies/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Configure Taxonomy'))
 
diff --git a/resources/views/taxonomies/empty.blade.php b/resources/views/taxonomies/empty.blade.php
index c362cafd05..345c1d8116 100644
--- a/resources/views/taxonomies/empty.blade.php
+++ b/resources/views/taxonomies/empty.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', Statamic::crumb($taxonomy->title(), 'Taxonomies'))
 
diff --git a/resources/views/taxonomies/index.blade.php b/resources/views/taxonomies/index.blade.php
index e8f7fc0301..63fe6a32be 100644
--- a/resources/views/taxonomies/index.blade.php
+++ b/resources/views/taxonomies/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Taxonomies'))
 
diff --git a/resources/views/taxonomies/show.blade.php b/resources/views/taxonomies/show.blade.php
index 56a106c9aa..f0f983efe4 100644
--- a/resources/views/taxonomies/show.blade.php
+++ b/resources/views/taxonomies/show.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', Statamic::crumb($taxonomy->title(), 'Taxonomies'))
 @section('wrapper_class', 'max-w-full')
diff --git a/resources/views/terms/edit.blade.php b/resources/views/terms/edit.blade.php
index 98e9c80e52..bcf3e9e6a6 100644
--- a/resources/views/terms/edit.blade.php
+++ b/resources/views/terms/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @inject('str', 'Statamic\Support\Str')
 @extends('statamic::layout')
 @section('title', __('Edit Term'))
diff --git a/resources/views/updater/index.blade.php b/resources/views/updater/index.blade.php
index 1b7ca45da3..56fda6c5d9 100644
--- a/resources/views/updater/index.blade.php
+++ b/resources/views/updater/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Updater'))
 
diff --git a/resources/views/updater/show.blade.php b/resources/views/updater/show.blade.php
index 2eb22b4d0c..cd79a1c3a7 100644
--- a/resources/views/updater/show.blade.php
+++ b/resources/views/updater/show.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Updater'))
 
diff --git a/resources/views/usergroups/blueprints/edit.blade.php b/resources/views/usergroups/blueprints/edit.blade.php
index 074b725907..42d91d8ef1 100644
--- a/resources/views/usergroups/blueprints/edit.blade.php
+++ b/resources/views/usergroups/blueprints/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Edit Blueprint'))
 
diff --git a/resources/views/usergroups/create.blade.php b/resources/views/usergroups/create.blade.php
index a9269eec9c..111978837a 100644
--- a/resources/views/usergroups/create.blade.php
+++ b/resources/views/usergroups/create.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Create User Group'))
 
diff --git a/resources/views/usergroups/edit.blade.php b/resources/views/usergroups/edit.blade.php
index 2fdb8be1fc..cb80fb45cd 100644
--- a/resources/views/usergroups/edit.blade.php
+++ b/resources/views/usergroups/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Configure User Group'))
 
diff --git a/resources/views/usergroups/index.blade.php b/resources/views/usergroups/index.blade.php
index bfa9e74897..a0e36a5d96 100644
--- a/resources/views/usergroups/index.blade.php
+++ b/resources/views/usergroups/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('User Groups'))
 
diff --git a/resources/views/usergroups/show.blade.php b/resources/views/usergroups/show.blade.php
index ecc2850ad2..8aa906d1ba 100644
--- a/resources/views/usergroups/show.blade.php
+++ b/resources/views/usergroups/show.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', Statamic::crumb($group->title(), 'User Group'))
 @section('wrapper_class', 'max-w-full')
diff --git a/resources/views/users/blueprints/edit.blade.php b/resources/views/users/blueprints/edit.blade.php
index 69140ea1c5..fc111367b7 100644
--- a/resources/views/users/blueprints/edit.blade.php
+++ b/resources/views/users/blueprints/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Edit Blueprint'))
 
diff --git a/resources/views/users/create.blade.php b/resources/views/users/create.blade.php
index 085e4dd97d..2542a5cac8 100644
--- a/resources/views/users/create.blade.php
+++ b/resources/views/users/create.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @inject('str', 'Statamic\Support\Str')
 @extends('statamic::layout')
 @section('title', __('Create User'))
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 856a61c8f0..6138df9584 100644
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Edit User'))
 
diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index 1711ca295d..3ae95b9ddc 100644
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Users'))
 @section('wrapper_class', 'max-w-full')
diff --git a/resources/views/utilities/cache.blade.php b/resources/views/utilities/cache.blade.php
index 4a5401d6f5..5df2e72db5 100644
--- a/resources/views/utilities/cache.blade.php
+++ b/resources/views/utilities/cache.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Cache Manager'))
 
diff --git a/resources/views/utilities/email.blade.php b/resources/views/utilities/email.blade.php
index 8b5e02ce8a..a8ec55dcab 100644
--- a/resources/views/utilities/email.blade.php
+++ b/resources/views/utilities/email.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', Statamic::crumb(__('Email'), __('Utilities')))
 
diff --git a/resources/views/utilities/git.blade.php b/resources/views/utilities/git.blade.php
index 572a80bdeb..2d082b71b2 100644
--- a/resources/views/utilities/git.blade.php
+++ b/resources/views/utilities/git.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', Statamic::crumb('Git', __('Utilities')))
 
diff --git a/resources/views/utilities/index.blade.php b/resources/views/utilities/index.blade.php
index d41c006eb1..1d267c6aef 100644
--- a/resources/views/utilities/index.blade.php
+++ b/resources/views/utilities/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Utilities'))
 
diff --git a/resources/views/utilities/phpinfo.blade.php b/resources/views/utilities/phpinfo.blade.php
index b91ad7d4ce..2dab6292c5 100644
--- a/resources/views/utilities/phpinfo.blade.php
+++ b/resources/views/utilities/phpinfo.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('PHP Info'))
 
diff --git a/resources/views/utilities/search.blade.php b/resources/views/utilities/search.blade.php
index 1c209804c7..01e2b09c22 100644
--- a/resources/views/utilities/search.blade.php
+++ b/resources/views/utilities/search.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Rebuild Search'))
 
diff --git a/resources/views/widgets/getting-started.blade.php b/resources/views/widgets/getting-started.blade.php
index 8c3d2fd6ae..f6fdd9aaba 100644
--- a/resources/views/widgets/getting-started.blade.php
+++ b/resources/views/widgets/getting-started.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 <div class="card p-0 content">
     <div class="py-6 px-8 border-b">
         <h1>{{ __('statamic::messages.getting_started_widget_header') }}</h1>
diff --git a/resources/views/widgets/updater.blade.php b/resources/views/widgets/updater.blade.php
index b5ca176973..8926c024a9 100644
--- a/resources/views/widgets/updater.blade.php
+++ b/resources/views/widgets/updater.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 <div class="card p-0 h-full">
     <header class="flex justify-between items-center p-4 border-b">
         <h2 class="flex items-center">

From 20b83802d373f4f8b83d780eed6a3b8ab2f7abf3 Mon Sep 17 00:00:00 2001
From: John Koster <john@stillat.com>
Date: Tue, 20 Feb 2024 14:26:02 -0600
Subject: [PATCH 124/149] [4.x] Customize Columns Modal Height Thrashing
 (#9538)

---
 resources/css/core/utilities.css                          | 4 ++++
 resources/js/components/SessionExpiry.vue                 | 2 ++
 resources/js/components/data-list/ColumnPicker.vue        | 2 +-
 resources/js/components/modals/KeyboardShortcutsModal.vue | 2 ++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/resources/css/core/utilities.css b/resources/css/core/utilities.css
index 22a0f1ec64..c2845dacee 100644
--- a/resources/css/core/utilities.css
+++ b/resources/css/core/utilities.css
@@ -90,3 +90,7 @@
 [x-cloak] {
     display: none
 }
+
+.-max-h-screen-px {
+    max-height: calc(100vh - 1px) !important;
+}
diff --git a/resources/js/components/SessionExpiry.vue b/resources/js/components/SessionExpiry.vue
index e03d568603..e40cda9a46 100644
--- a/resources/js/components/SessionExpiry.vue
+++ b/resources/js/components/SessionExpiry.vue
@@ -5,6 +5,7 @@
         <button v-if="isWarning" class="session-expiry-stripe" @click="extend" v-text="warningText" />
 
         <modal name="session-timeout-login" v-if="isShowingLogin" height="auto" width="500px" :adaptive="true">
+            <div class="-max-h-screen-px">
             <div class="flex items-center p-6 bg-gray-200 border-b text-center">
                 {{ __('Resume Your Session') }}
             </div>
@@ -42,6 +43,7 @@
                     </div>
                 </div>
             </div>
+            </div>
         </modal>
 
     </div>
diff --git a/resources/js/components/data-list/ColumnPicker.vue b/resources/js/components/data-list/ColumnPicker.vue
index 6eebcb4110..a7200ab668 100644
--- a/resources/js/components/data-list/ColumnPicker.vue
+++ b/resources/js/components/data-list/ColumnPicker.vue
@@ -9,7 +9,7 @@
         </button>
 
         <modal v-if="open" name="column-picker" @closed="open = false" draggable=".modal-drag-handle" click-to-close>
-            <div class="flex flex-col h-full">
+            <div class="flex flex-col h-full -max-h-screen-px">
 
                 <header class="modal-drag-handle p-4 bg-gray-200 border-b flex items-center justify-between cursor-grab active:cursor-grabbing">
                     <h2>{{ __('Customize Columns') }}</h2>
diff --git a/resources/js/components/modals/KeyboardShortcutsModal.vue b/resources/js/components/modals/KeyboardShortcutsModal.vue
index d8d6bcc7c2..23a7cc5390 100644
--- a/resources/js/components/modals/KeyboardShortcutsModal.vue
+++ b/resources/js/components/modals/KeyboardShortcutsModal.vue
@@ -1,5 +1,6 @@
 <template>
     <modal v-if="open" name="keyboard-shortcuts" width="380" height="auto" :adaptive="true" @closed="open = false" click-to-close>
+        <div class="-max-h-screen-px">
         <h1 class="p-4 bg-gray-200 border-b text-center">
             {{ __('Keyboard Shortcuts') }}
         </h1>
@@ -47,6 +48,7 @@
                 <span class="shortcut-value">{{ __('Close Modal') }}</span>
             </div>
         </div>
+        </div>
     </modal>
 </template>
 

From 1f310746e7aa88b02622d0da794361e75d6006b3 Mon Sep 17 00:00:00 2001
From: Ben Furfie <benfurfie@users.noreply.github.com>
Date: Tue, 20 Feb 2024 22:04:33 +0000
Subject: [PATCH 125/149] [4.x] Implement find or fail on EntryRepository
 (#9506)

---
 src/Exceptions/EntryNotFoundException.php     | 15 +++++++++++++++
 src/Facades/Entry.php                         |  1 +
 src/Stache/Repositories/EntryRepository.php   | 12 ++++++++++++
 .../Repositories/EntryRepositoryTest.php      | 19 +++++++++++++++++++
 4 files changed, 47 insertions(+)
 create mode 100644 src/Exceptions/EntryNotFoundException.php

diff --git a/src/Exceptions/EntryNotFoundException.php b/src/Exceptions/EntryNotFoundException.php
new file mode 100644
index 0000000000..5e042adddd
--- /dev/null
+++ b/src/Exceptions/EntryNotFoundException.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Statamic\Exceptions;
+
+class EntryNotFoundException extends \Exception
+{
+    protected $entry;
+
+    public function __construct($entry)
+    {
+        parent::__construct("Entry [{$entry}] not found");
+
+        $this->entry = $entry;
+    }
+}
diff --git a/src/Facades/Entry.php b/src/Facades/Entry.php
index 32c9f30a12..9453af9bd5 100644
--- a/src/Facades/Entry.php
+++ b/src/Facades/Entry.php
@@ -10,6 +10,7 @@
  * @method static \Statamic\Entries\EntryCollection whereCollection(string $handle)
  * @method static \Statamic\Entries\EntryCollection whereInCollection(array $handles)
  * @method static null|\Statamic\Contracts\Entries\Entry find($id)
+ * @method static \Statamic\Contracts\Entries\Entry findOrFail($id)
  * @method static null|\Statamic\Contracts\Entries\Entry findByUri(string $uri, string $site)
  * @method static \Statamic\Contracts\Entries\Entry make()
  * @method static \Statamic\Contracts\Entries\QueryBuilder query()
diff --git a/src/Stache/Repositories/EntryRepository.php b/src/Stache/Repositories/EntryRepository.php
index f3d3d738ac..06167fb3e7 100644
--- a/src/Stache/Repositories/EntryRepository.php
+++ b/src/Stache/Repositories/EntryRepository.php
@@ -6,6 +6,7 @@
 use Statamic\Contracts\Entries\EntryRepository as RepositoryContract;
 use Statamic\Contracts\Entries\QueryBuilder;
 use Statamic\Entries\EntryCollection;
+use Statamic\Exceptions\EntryNotFoundException;
 use Statamic\Stache\Query\EntryQueryBuilder;
 use Statamic\Stache\Stache;
 use Statamic\Support\Arr;
@@ -43,6 +44,17 @@ public function find($id): ?Entry
         return $this->query()->where('id', $id)->first();
     }
 
+    public function findOrFail($id): Entry
+    {
+        $entry = $this->find($id);
+
+        if (! $entry) {
+            throw new EntryNotFoundException($id);
+        }
+
+        return $entry;
+    }
+
     public function findByUri(string $uri, ?string $site = null): ?Entry
     {
         $site = $site ?? $this->stache->sites()->first();
diff --git a/tests/Stache/Repositories/EntryRepositoryTest.php b/tests/Stache/Repositories/EntryRepositoryTest.php
index 4a9262f3a8..2e475af271 100644
--- a/tests/Stache/Repositories/EntryRepositoryTest.php
+++ b/tests/Stache/Repositories/EntryRepositoryTest.php
@@ -4,6 +4,7 @@
 
 use Statamic\Contracts\Entries\Entry;
 use Statamic\Entries\EntryCollection;
+use Statamic\Exceptions\EntryNotFoundException;
 use Statamic\Facades\Collection;
 use Statamic\Facades\Entry as EntryAPI;
 use Statamic\Stache\Repositories\EntryRepository;
@@ -136,6 +137,24 @@ public function it_gets_entry_by_id()
         $this->assertNull($this->repo->find('unknown'));
     }
 
+    /** @test */
+    public function test_find_or_fail_gets_entry()
+    {
+        $entry = $this->repo->findOrFail('alphabetical-bravo');
+
+        $this->assertInstanceOf(Entry::class, $entry);
+        $this->assertEquals('Bravo', $entry->get('title'));
+    }
+
+    /** @test */
+    public function test_find_or_fail_throws_exception_when_entry_does_not_exist()
+    {
+        $this->expectException(EntryNotFoundException::class);
+        $this->expectExceptionMessage('Entry [does-not-exist] not found');
+
+        $this->repo->findOrFail('does-not-exist');
+    }
+
     /**
      * @test
      *

From 78d8f4b410bffed28c060418168af1c9ca59e089 Mon Sep 17 00:00:00 2001
From: Rob de Kort <rob@studio1902.nl>
Date: Wed, 21 Feb 2024 16:34:39 +0100
Subject: [PATCH 126/149] [4.x] Add `accepted_if` validation rule (#9557)

---
 resources/js/components/field-validation/Rules.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/resources/js/components/field-validation/Rules.js b/resources/js/components/field-validation/Rules.js
index abfb7aeeae..65274d8eb3 100644
--- a/resources/js/components/field-validation/Rules.js
+++ b/resources/js/components/field-validation/Rules.js
@@ -10,6 +10,11 @@ export default [
         label: 'Accepted',
         value: 'accepted'
     },
+    {
+        label: 'Accepted If',
+        value: 'accepted_if:',
+        example: 'accepted_if:anotherfield,value,...'
+    },
     {
         label: 'Active URL',
         value: 'active_url'

From 108b9e59d2bb1f249ad94f80cc8f5f4162a686d7 Mon Sep 17 00:00:00 2001
From: Michael Aerni <hello@michaelaerni.ch>
Date: Thu, 22 Feb 2024 09:56:21 -0500
Subject: [PATCH 127/149] [4.x] Fix locales tag inside replicator, bard, and
 grid (#9566)

---
 src/Tags/Locales.php          |  2 +-
 tests/Tags/LocalesTagTest.php | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/Tags/Locales.php b/src/Tags/Locales.php
index f339bff5de..71a246a07b 100644
--- a/src/Tags/Locales.php
+++ b/src/Tags/Locales.php
@@ -158,7 +158,7 @@ private function getData()
             return $this->data;
         }
 
-        $id = $this->params->get('id', $this->context->value('id'));
+        $id = $this->params->get('id') ?? $this->context->value('page.id') ?? $this->context->value('id');
 
         $data = Data::find($id);
 
diff --git a/tests/Tags/LocalesTagTest.php b/tests/Tags/LocalesTagTest.php
index 2667efacd5..9787e81080 100644
--- a/tests/Tags/LocalesTagTest.php
+++ b/tests/Tags/LocalesTagTest.php
@@ -449,4 +449,36 @@ public function it_displays_nothing_when_context_id_is_null()
             $this->tag('{{ locales }}you should not see this{{ /locales }}', ['id' => $value])
         );
     }
+
+    /** @test */
+    public function it_prefers_page_id_over_id()
+    {
+        (new EntryFactory)
+            ->collection('test')
+            ->locale('english')
+            ->id('1')
+            ->data(['title' => 'hello'])
+            ->create();
+
+        $this->assertEquals(
+            '<hello>',
+            $this->tag('{{ locales }}<{{ title }}>{{ /locales }}', ['page' => ['id' => '1']])
+        );
+    }
+
+    /** @test */
+    public function it_prefers_id_param_over_page_id()
+    {
+        (new EntryFactory)
+            ->collection('test')
+            ->locale('english')
+            ->id('1')
+            ->data(['title' => 'hello'])
+            ->create();
+
+        $this->assertEquals(
+            '<hello>',
+            $this->tag('{{ locales id="1" }}<{{ title }}>{{ /locales }}', ['page' => ['id' => '7']])
+        );
+    }
 }

From e62342e06b2d973837df861ddbda52464e68a5c5 Mon Sep 17 00:00:00 2001
From: Rob de Kort <rob@studio1902.nl>
Date: Thu, 22 Feb 2024 16:16:38 +0100
Subject: [PATCH 128/149] [4.x] Add `accepted_if` validation to Bard
 `enable_input_rules` (#9555)

---
 src/Fieldtypes/Bard.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Fieldtypes/Bard.php b/src/Fieldtypes/Bard.php
index 5bea35aca1..4add244408 100644
--- a/src/Fieldtypes/Bard.php
+++ b/src/Fieldtypes/Bard.php
@@ -113,6 +113,7 @@ protected function configFieldItems(): array
                         'instructions' => __('statamic::fieldtypes.bard.config.enable_input_rules'),
                         'type' => 'toggle',
                         'default' => true,
+                        'validate' => 'accepted_if:smart_typography,true',
                     ],
                     'enable_paste_rules' => [
                         'display' => __('Enable Paste Rules'),

From b9c9fa2155eca39f996af85db23cf89ff0b4a51a Mon Sep 17 00:00:00 2001
From: Sylvester Damgaard <syda@tv2reg.dk>
Date: Thu, 22 Feb 2024 17:33:04 +0100
Subject: [PATCH 129/149] [4.x] Make tags with old __call methods macroable by
 using wildcard method instead. (#9553)

---
 src/Tags/Asset.php                 | 2 +-
 src/Tags/Assets.php                | 2 +-
 src/Tags/Collection/Collection.php | 6 ++----
 src/Tags/Glide.php                 | 2 +-
 src/Tags/ParentTags.php            | 2 +-
 src/Tags/Scope.php                 | 2 +-
 src/Tags/Section.php               | 2 +-
 src/Tags/Tags.php                  | 2 +-
 src/Tags/Theme.php                 | 2 +-
 src/Tags/Yields.php                | 2 +-
 10 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/Tags/Asset.php b/src/Tags/Asset.php
index 0d346f976f..bb6f98e64c 100644
--- a/src/Tags/Asset.php
+++ b/src/Tags/Asset.php
@@ -21,7 +21,7 @@ class Asset extends Assets
      *
      * @return string
      */
-    public function __call($method, $arguments)
+    public function wildcard($method)
     {
         $value = Arr::get($this->context, $this->method);
         $value = (array) $value;
diff --git a/src/Tags/Assets.php b/src/Tags/Assets.php
index b1d3c396b6..9ef77dcc8b 100644
--- a/src/Tags/Assets.php
+++ b/src/Tags/Assets.php
@@ -27,7 +27,7 @@ class Assets extends Tags
      *
      * @return string
      */
-    public function __call($method, $arguments)
+    public function wildcard($method)
     {
         $value = Arr::get($this->context, $this->method);
 
diff --git a/src/Tags/Collection/Collection.php b/src/Tags/Collection/Collection.php
index dc3b316c60..73a22a0d32 100644
--- a/src/Tags/Collection/Collection.php
+++ b/src/Tags/Collection/Collection.php
@@ -15,13 +15,11 @@ class Collection extends Tags
     /**
      * {{ collection:* }} ... {{ /collection:* }}.
      */
-    public function __call($method, $args)
+    public function wildcard($method)
     {
         $this->params['from'] = $this->method;
 
-        return $this->output(
-            $this->entries()->get()
-        );
+        return $this->index();
     }
 
     /**
diff --git a/src/Tags/Glide.php b/src/Tags/Glide.php
index bfd584c92a..1f89c2ea49 100644
--- a/src/Tags/Glide.php
+++ b/src/Tags/Glide.php
@@ -28,7 +28,7 @@ class Glide extends Tags
      * @param  array  $args
      * @return string
      */
-    public function __call($method, $args)
+    public function wildcard($method)
     {
         $tag = explode(':', $this->tag, 2)[1];
 
diff --git a/src/Tags/ParentTags.php b/src/Tags/ParentTags.php
index 640622803a..9a53a1ebd5 100644
--- a/src/Tags/ParentTags.php
+++ b/src/Tags/ParentTags.php
@@ -22,7 +22,7 @@ class ParentTags extends Tags
      * @param  array  $args
      * @return mixed
      */
-    public function __call($method, $args)
+    public function wildcard($method)
     {
         $var_name = Stringy::removeLeft($this->tag, 'parent:');
 
diff --git a/src/Tags/Scope.php b/src/Tags/Scope.php
index 1bf769b23d..54edc29879 100644
--- a/src/Tags/Scope.php
+++ b/src/Tags/Scope.php
@@ -6,7 +6,7 @@
 
 class Scope extends Tags
 {
-    public function __call($method, $args)
+    public function wildcard($method)
     {
         throw_unless($this->isPair, new \Exception('Scope tag must be a pair'));
 
diff --git a/src/Tags/Section.php b/src/Tags/Section.php
index fc596799a7..1051ae8aa6 100644
--- a/src/Tags/Section.php
+++ b/src/Tags/Section.php
@@ -6,7 +6,7 @@
 
 class Section extends Tags
 {
-    public function __call($method, $args)
+    public function wildcard($method)
     {
         $name = explode(':', $this->tag)[1];
 
diff --git a/src/Tags/Tags.php b/src/Tags/Tags.php
index ac43708882..4c873ab2fe 100644
--- a/src/Tags/Tags.php
+++ b/src/Tags/Tags.php
@@ -137,7 +137,7 @@ public function __call($method, $args)
         if (static::hasMacro($method)) {
             $macro = static::$macros[$method];
 
-            if ($macro instanceof Closure) {
+            if ($macro instanceof \Closure) {
                 $macro = $macro->bindTo($this, static::class);
             }
 
diff --git a/src/Tags/Theme.php b/src/Tags/Theme.php
index b7c84999a9..808bc101ed 100644
--- a/src/Tags/Theme.php
+++ b/src/Tags/Theme.php
@@ -20,7 +20,7 @@ class Theme extends Tags
      * @param  array  $arguments  Unused
      * @return string
      */
-    public function __call($method, $arguments)
+    public function wildcard($method)
     {
         return $this->path($method);
     }
diff --git a/src/Tags/Yields.php b/src/Tags/Yields.php
index dd7445dee9..063fe12d67 100644
--- a/src/Tags/Yields.php
+++ b/src/Tags/Yields.php
@@ -8,7 +8,7 @@ class Yields extends Tags
 {
     protected static $aliases = ['yield'];
 
-    public function __call($method, $args)
+    public function wildcard($method)
     {
         $name = explode(':', $this->tag)[1];
 

From a79ca6d270a211825871deb1833ce77168de0aac Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Fri, 23 Feb 2024 19:15:17 +0000
Subject: [PATCH 130/149] [4.x] Also Use static_cache store for nocache (#9527)

---
 src/StaticCaching/NoCache/Session.php      | 14 ++++++-----
 src/StaticCaching/StaticCacheManager.php   | 27 +++++++++++++---------
 tests/StaticCaching/ManagerTest.php        |  1 +
 tests/StaticCaching/NoCacheSessionTest.php |  2 ++
 4 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/StaticCaching/NoCache/Session.php b/src/StaticCaching/NoCache/Session.php
index cf727fdcba..bf42e198af 100644
--- a/src/StaticCaching/NoCache/Session.php
+++ b/src/StaticCaching/NoCache/Session.php
@@ -4,10 +4,10 @@
 
 use Illuminate\Pagination\AbstractPaginator;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
 use Statamic\Facades\Cascade;
 use Statamic\Facades\Data;
+use Statamic\Facades\StaticCache;
 
 class Session
 {
@@ -48,7 +48,7 @@ public function regions(): Collection
 
     public function region(string $key): Region
     {
-        if ($this->regions->contains($key) && ($region = Cache::get('nocache::region.'.$key))) {
+        if ($this->regions->contains($key) && ($region = StaticCache::cacheStore()->get('nocache::region.'.$key))) {
             return $region;
         }
 
@@ -101,16 +101,18 @@ public function write()
             return;
         }
 
-        Cache::forever('nocache::urls', collect(Cache::get('nocache::urls', []))->push($this->url)->unique()->all());
+        $store = StaticCache::cacheStore();
 
-        Cache::forever('nocache::session.'.md5($this->url), [
+        $store->forever('nocache::urls', collect($store->get('nocache::urls', []))->push($this->url)->unique()->all());
+
+        $store->forever('nocache::session.'.md5($this->url), [
             'regions' => $this->regions,
         ]);
     }
 
     public function restore()
     {
-        $session = Cache::get('nocache::session.'.md5($this->url));
+        $session = StaticCache::cacheStore()->get('nocache::session.'.md5($this->url));
 
         $this->regions = $this->regions->merge($session['regions'] ?? []);
         $this->cascade = $this->restoreCascade();
@@ -139,6 +141,6 @@ private function resolvePageAndPathForPagination(): void
 
     private function cacheRegion(Region $region)
     {
-        Cache::forever('nocache::region.'.$region->key(), $region);
+        StaticCache::cacheStore()->forever('nocache::region.'.$region->key(), $region);
     }
 }
diff --git a/src/StaticCaching/StaticCacheManager.php b/src/StaticCaching/StaticCacheManager.php
index d61c50046e..cdcca1374a 100644
--- a/src/StaticCaching/StaticCacheManager.php
+++ b/src/StaticCaching/StaticCacheManager.php
@@ -30,6 +30,16 @@ public function createNullDriver()
     }
 
     public function createFileDriver(array $config)
+    {
+        return new FileCacher(new Writer, $this->cacheStore(), $config);
+    }
+
+    public function createApplicationDriver(array $config)
+    {
+        return new ApplicationCacher($this->app[Repository::class], $config);
+    }
+
+    public function cacheStore()
     {
         try {
             $store = Cache::store('static_cache');
@@ -37,12 +47,7 @@ public function createFileDriver(array $config)
             $store = Cache::store();
         }
 
-        return new FileCacher(new Writer, $store, $config);
-    }
-
-    public function createApplicationDriver(array $config)
-    {
-        return new ApplicationCacher($this->app[Repository::class], $config);
+        return $store;
     }
 
     protected function getConfig($name)
@@ -62,13 +67,13 @@ public function flush()
     {
         $this->driver()->flush();
 
-        collect(Cache::get('nocache::urls', []))->each(function ($url) {
-            $session = Cache::get($sessionKey = 'nocache::session.'.md5($url));
-            collect($session['regions'] ?? [])->each(fn ($region) => Cache::forget('nocache::region.'.$region));
-            Cache::forget($sessionKey);
+        collect($this->cacheStore()->get('nocache::urls', []))->each(function ($url) {
+            $session = $this->cacheStore()->get($sessionKey = 'nocache::session.'.md5($url));
+            collect($session['regions'] ?? [])->each(fn ($region) => $this->cacheStore()->forget('nocache::region.'.$region));
+            $this->cacheStore()->forget($sessionKey);
         });
 
-        Cache::forget('nocache::urls');
+        $this->cacheStore()->forget('nocache::urls');
     }
 
     public function nocacheJs(string $js)
diff --git a/tests/StaticCaching/ManagerTest.php b/tests/StaticCaching/ManagerTest.php
index be865df05e..3b770f3ba7 100644
--- a/tests/StaticCaching/ManagerTest.php
+++ b/tests/StaticCaching/ManagerTest.php
@@ -21,6 +21,7 @@ public function it_flushes()
         $mock = Mockery::mock(Cacher::class)->shouldReceive('flush')->once()->getMock();
         StaticCache::extend('test', fn () => $mock);
 
+        Cache::shouldReceive('store')->andReturnSelf();
         Cache::shouldReceive('get')->with('nocache::urls', [])->once()->andReturn(['/one', '/two']);
         Cache::shouldReceive('get')->with('nocache::session.'.md5('/one'))->once()->andReturn(['regions' => ['r1', 'r2']]);
         Cache::shouldReceive('get')->with('nocache::session.'.md5('/two'))->once()->andReturn(['regions' => ['r3', 'r4']]);
diff --git a/tests/StaticCaching/NoCacheSessionTest.php b/tests/StaticCaching/NoCacheSessionTest.php
index d5022fc16f..68a35d658b 100644
--- a/tests/StaticCaching/NoCacheSessionTest.php
+++ b/tests/StaticCaching/NoCacheSessionTest.php
@@ -80,6 +80,8 @@ public function it_writes()
 
         // Testing that the cache key used is unique to the url.
         // The contents aren't really important.
+        Cache::shouldReceive('store')
+            ->andReturnSelf();
 
         Cache::shouldReceive('forever')
             ->with('nocache::session.'.md5('/'), Mockery::any())

From 8b98f00b9399c0eceb42458e7c80ab48d88f64e8 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Fri, 23 Feb 2024 20:55:03 +0000
Subject: [PATCH 131/149] [4.x] Hooks (#9481)

---
 src/Support/Traits/Hookable.php    | 37 +++++++++++
 src/Tags/Collection/Collection.php | 40 +++++++-----
 src/Tags/Tags.php                  |  5 +-
 tests/Support/HookableTest.php     | 99 ++++++++++++++++++++++++++++++
 tests/Tags/LoaderTest.php          | 30 +++++++++
 5 files changed, 195 insertions(+), 16 deletions(-)
 create mode 100644 src/Support/Traits/Hookable.php
 create mode 100644 tests/Support/HookableTest.php
 create mode 100644 tests/Tags/LoaderTest.php

diff --git a/src/Support/Traits/Hookable.php b/src/Support/Traits/Hookable.php
new file mode 100644
index 0000000000..15cd8175b3
--- /dev/null
+++ b/src/Support/Traits/Hookable.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Statamic\Support\Traits;
+
+use Closure;
+use Illuminate\Pipeline\Pipeline;
+
+trait Hookable
+{
+    private static $hooks = [];
+
+    public static function hook(string $name, Closure $hook)
+    {
+        static::$hooks[static::class][$name][] = $hook;
+    }
+
+    protected function runHooks(string $name, $payload = null)
+    {
+        $closures = collect(
+            static::$hooks[static::class][$name] ?? []
+        )->map->bindTo($this, $this);
+
+        if (debugbar()->isEnabled()) {
+            $message = vsprintf('Hook: %s (Listeners: %s)', [
+                static::class.'@'.$name,
+                $closures->count(),
+            ]);
+
+            debugbar()->addMessage($message, 'hooks');
+        }
+
+        return (new Pipeline)
+            ->send($payload)
+            ->through($closures->all())
+            ->thenReturn();
+    }
+}
diff --git a/src/Tags/Collection/Collection.php b/src/Tags/Collection/Collection.php
index 73a22a0d32..a16155ec8e 100644
--- a/src/Tags/Collection/Collection.php
+++ b/src/Tags/Collection/Collection.php
@@ -31,9 +31,11 @@ public function index()
             return $this->context->value('collection');
         }
 
-        return $this->output(
-            $this->entries()->get()
-        );
+        $results = $this->entries()->get();
+
+        $results = $this->runHooks('fetched-entries', $results);
+
+        return $this->output($results);
     }
 
     /**
@@ -51,9 +53,11 @@ public function next()
     {
         $this->params['from'] = $this->currentEntry()->collection()->handle();
 
-        return $this->output(
-            $this->entries()->next($this->currentEntry())
-        );
+        $results = $this->entries()->next($this->currentEntry());
+
+        $this->runHooks('fetched-entries', $results);
+
+        return $this->output($results);
     }
 
     /**
@@ -63,9 +67,11 @@ public function previous()
     {
         $this->params['from'] = $this->currentEntry()->collection()->handle();
 
-        return $this->output(
-            $this->entries()->previous($this->currentEntry())
-        );
+        $results = $this->entries()->previous($this->currentEntry());
+
+        $this->runHooks('fetched-entries', $results);
+
+        return $this->output($results);
     }
 
     /**
@@ -75,9 +81,11 @@ public function older()
     {
         $this->params['from'] = $this->currentEntry()->collection()->handle();
 
-        return $this->output(
-            $this->entries()->older($this->currentEntry())
-        );
+        $results = $this->entries()->older($this->currentEntry());
+
+        $results = $this->runHooks('fetched-entries', $results);
+
+        return $this->output($results);
     }
 
     /**
@@ -87,9 +95,11 @@ public function newer()
     {
         $this->params['from'] = $this->currentEntry()->collection()->handle();
 
-        return $this->output(
-            $this->entries()->newer($this->currentEntry())
-        );
+        $results = $this->entries()->newer($this->currentEntry());
+
+        $results = $this->runHooks('fetched-entries', $results);
+
+        return $this->output($results);
     }
 
     protected function entries()
diff --git a/src/Tags/Tags.php b/src/Tags/Tags.php
index 4c873ab2fe..1d476090c4 100644
--- a/src/Tags/Tags.php
+++ b/src/Tags/Tags.php
@@ -8,10 +8,11 @@
 use Statamic\Extend\RegistersItself;
 use Statamic\Facades\Antlers;
 use Statamic\Support\Arr;
+use Statamic\Support\Traits\Hookable;
 
 abstract class Tags
 {
-    use HasAliases, HasHandle, Macroable, RegistersItself;
+    use HasAliases, HasHandle, Hookable, Macroable, RegistersItself;
 
     protected static $binding = 'tags';
 
@@ -92,6 +93,8 @@ public function setProperties($properties)
         $this->setParameters($properties['params']);
         $this->tag = array_get($properties, 'tag');
         $this->method = array_get($properties, 'tag_method');
+
+        $this->runHooks('init');
     }
 
     public function setParser($parser)
diff --git a/tests/Support/HookableTest.php b/tests/Support/HookableTest.php
new file mode 100644
index 0000000000..6435c08bea
--- /dev/null
+++ b/tests/Support/HookableTest.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace Tests\Support;
+
+use Statamic\Support\Traits\Hookable;
+use Tests\TestCase;
+use Tests\TestDependency;
+
+class HookableTest extends TestCase
+{
+    /** @test */
+    public function hooks_can_be_run()
+    {
+        $test = $this;
+
+        TestHookable::hook('constructed', function ($payload, $next) use ($test) {
+            $test->assertEquals('initial', $payload);
+            $test->assertInstanceOf(TestHookable::class, $this);
+            $this->setFoo('bar');
+
+            return $next($payload);
+        });
+
+        // Do it twice to ensure that they are executed in order
+        // and the payload is passed along through the closures.
+        TestHookable::hook('constructed', function ($payload, $next) use ($test) {
+            $test->assertInstanceOf(TestHookable::class, $this);
+            $test->assertEquals('initial', $payload);
+            $this->setFoo($this->foo.'baz');
+
+            return $next($payload);
+        });
+
+        $class = app(TestHookable::class);
+
+        $this->assertEquals('barbaz', $class->foo);
+    }
+
+    /** @test */
+    public function hooks_from_one_class_dont_happen_on_another()
+    {
+        $hooksRan = 0;
+
+        TestHookable::hook('constructed', function ($payload, $next) use (&$hooksRan) {
+            $this->setFoo('bar');
+            $hooksRan++;
+
+            return $next($this);
+        });
+
+        AnotherTestHookable::hook('constructed', function ($payload, $next) use (&$hooksRan) {
+            $this->setFoo($this->foo.'baz');
+            $hooksRan++;
+
+            return $next($this);
+        });
+
+        $class = app(AnotherTestHookable::class);
+
+        $this->assertEquals(1, $hooksRan);
+        $this->assertEquals('baz', $class->foo);
+    }
+}
+
+class TestHookable
+{
+    use Hookable;
+
+    public $dependency;
+    public $foo = 'initial';
+
+    public function __construct(TestDependency $dependency)
+    {
+        $this->dependency = $dependency;
+
+        $this->runHooks('constructed', $this->foo);
+    }
+
+    public function setFoo(string $foo)
+    {
+        $this->foo = $foo;
+    }
+}
+
+class AnotherTestHookable
+{
+    use Hookable;
+    public $foo = '';
+
+    public function __construct()
+    {
+        $this->runHooks('constructed');
+    }
+
+    public function setFoo(string $foo)
+    {
+        $this->foo = $foo;
+    }
+}
diff --git a/tests/Tags/LoaderTest.php b/tests/Tags/LoaderTest.php
new file mode 100644
index 0000000000..c5c3705bca
--- /dev/null
+++ b/tests/Tags/LoaderTest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Tests\Tags;
+
+use Statamic\Facades\Antlers;
+use Tests\Fixtures\Addon\Tags\TestTags;
+use Tests\TestCase;
+
+class LoaderTest extends TestCase
+{
+    /** @test */
+    public function loading_a_tag_will_run_the_init_hook()
+    {
+        TestTags::register();
+        $test = $this;
+        $tag = null;
+
+        // This hook should add to the tag's params, which we can assert about later.
+        TestTags::hook('init', function ($payload, $next) use (&$tag, $test) {
+            $test->assertInstanceOf(TestTags::class, $this);
+            $this->params['alfa'] = 'bravo';
+            $tag = $this;
+
+            return $next($payload);
+        });
+
+        $this->assertEquals('bar', (string) Antlers::parse('{{ test :variable="foo" }}', ['foo' => 'bar']));
+        $this->assertEquals(['variable' => 'bar', 'alfa' => 'bravo'], $tag->params->all());
+    }
+}

From f569a5f01e0b65afad19f66451724ebc639ae841 Mon Sep 17 00:00:00 2001
From: John Koster <john@stillat.com>
Date: Fri, 23 Feb 2024 15:36:54 -0600
Subject: [PATCH 132/149] [4.x] Antlers: Adds shorthand parameter value syntax
 (#9505)

---
 .../Language/Errors/AntlersErrorCodes.php     |  2 +
 .../Language/Parser/AntlersNodeParser.php     | 93 +++++++++++++++++++
 tests/Antlers/Parser/NodeParametersTest.php   | 63 +++++++++++++
 tests/Antlers/Parser/ParserErrorsTest.php     | 20 ++++
 tests/Antlers/Runtime/ParametersTest.php      | 23 +++++
 5 files changed, 201 insertions(+)

diff --git a/src/View/Antlers/Language/Errors/AntlersErrorCodes.php b/src/View/Antlers/Language/Errors/AntlersErrorCodes.php
index 48c48af3c7..2073858334 100644
--- a/src/View/Antlers/Language/Errors/AntlersErrorCodes.php
+++ b/src/View/Antlers/Language/Errors/AntlersErrorCodes.php
@@ -129,4 +129,6 @@ class AntlersErrorCodes
     const TYPE_MODIFIER_UNEXPECTED_TOKEN_METHOD_SYNTAX = 'ANTLR_129';
     const TYPE_RUNTIME_ATTEMPTING_TO_RENDER_OBJECT_AS_STRING = 'ANTLR_130';
     const TYPE_UNPAIRED_CLOSING_TAG = 'ANTLR_131';
+    const TYPE_UNEXPECTED_CHARACTER_WHILE_PARSING_SHORTHAND_PARAMETER = 'ANTLR_132';
+    const TYPE_UNEXPECTED_EOI_PARSING_SHORTHAND_PARAMETER = 'ANTLR_133';
 }
diff --git a/src/View/Antlers/Language/Parser/AntlersNodeParser.php b/src/View/Antlers/Language/Parser/AntlersNodeParser.php
index 532f976670..32bf6dc1c3 100644
--- a/src/View/Antlers/Language/Parser/AntlersNodeParser.php
+++ b/src/View/Antlers/Language/Parser/AntlersNodeParser.php
@@ -372,6 +372,15 @@ private function throwConditionWithoutExpression(AntlersNode $node)
         );
     }
 
+    private function isValidShorthandCharacter($char)
+    {
+        if (ctype_alpha($char) || $char == '_' || $char == '-' || ctype_digit($char)) {
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Parses the content of the provided node, and returns any parameters.
      *
@@ -389,6 +398,7 @@ private function getParameters(AntlersNode $node)
         StringUtilities::prepareSplit($content);
         $chars = StringUtilities::split(trim($content));
         $parameters = [];
+        $parsingShorthandVariable = false;
 
         $hasFoundName = false;
         $currentChars = [];
@@ -443,6 +453,89 @@ private function getParameters(AntlersNode $node)
                 $ignorePrevious = false;
             }
 
+            if ($current == DocumentParser::Punctuation_Colon && $next == DocumentParser::Punctuation_Dollar) {
+                $startAt = $i;
+                $parsingShorthandVariable = true;
+                $currentChars = [];
+
+                $currentChars[] = $current;
+                $currentChars[] = $next;
+
+                if ($i + 2 < $charCount) {
+                    $peek = $chars[$i + 2];
+
+                    if (ctype_digit($peek)) {
+                        throw ErrorFactory::makeSyntaxError(
+                            AntlersErrorCodes::TYPE_UNEXPECTED_CHARACTER_WHILE_PARSING_SHORTHAND_PARAMETER,
+                            $node,
+                            'Shorthand variable parameters cannot start with a number.'
+                        );
+                    } elseif (ctype_space($peek)) {
+                        throw ErrorFactory::makeSyntaxError(
+                            AntlersErrorCodes::TYPE_UNEXPECTED_EOI_PARSING_SHORTHAND_PARAMETER,
+                            $node,
+                            'Unexpected end of input while parsing shorthand variable parameter.'
+                        );
+                    }
+                } else {
+                    throw ErrorFactory::makeSyntaxError(
+                        AntlersErrorCodes::TYPE_UNEXPECTED_EOI_PARSING_SHORTHAND_PARAMETER,
+                        $node,
+                        'Unexpected end of input while parsing shorthand variable parameter.'
+                    );
+                }
+
+                $i += 1;
+
+                continue;
+            }
+
+            if ($parsingShorthandVariable && ! ctype_space($current) && ! $this->isValidShorthandCharacter($current)) {
+                throw ErrorFactory::makeSyntaxError(
+                    AntlersErrorCodes::TYPE_UNEXPECTED_CHARACTER_WHILE_PARSING_SHORTHAND_PARAMETER,
+                    $node,
+                    'Unexpected character while parsing shorthand variable parameter.'
+                );
+            }
+
+            if ((ctype_space($current) || $next == null) && $parsingShorthandVariable) {
+                $endAt = $i;
+
+                if ($next == null) {
+                    $currentChars[] = $current;
+                    $endAt += 1;
+                }
+
+                $parameterNode = new ParameterNode();
+                $parameterNode->isVariableReference = true;
+
+                $name = implode('', array_slice($currentChars, 2));
+
+                $parameterNode->name = $name;
+                $parameterNode->value = $name;
+                $parameterNode->startPosition = $node->relativePositionFromOffset($startAt, $nameStart);
+
+                if (in_array($name, ['as', 'scope', 'handle_prefix'])) {
+                    $node->hasScopeAdjustingParameters = true;
+                }
+
+                $parameterNode->endPosition = $node->relativePositionFromOffset($endAt, $endAt);
+                $parameterNode->parent = $node;
+
+                $parameters[] = $parameterNode;
+
+                if ($next == null) {
+                    break;
+                }
+
+                $currentChars = [];
+                $hasFoundName = false;
+                $parsingShorthandVariable = false;
+                $name = '';
+
+                continue;
+            }
+
             if ($hasFoundName == false && ctype_space($current)) {
                 // Flush the buffer.
                 $currentChars = [];
diff --git a/tests/Antlers/Parser/NodeParametersTest.php b/tests/Antlers/Parser/NodeParametersTest.php
index a17dcc47f7..18bf2151fd 100644
--- a/tests/Antlers/Parser/NodeParametersTest.php
+++ b/tests/Antlers/Parser/NodeParametersTest.php
@@ -265,4 +265,67 @@ public function test_double_braces_inside_a_parameter_emits_final_literal_node_i
         $this->assertSame(' <div class="list-of-classes">     ', $nodes[0]->content);
         $this->assertSame('FINAL_LITERAL </div> ', $nodes[2]->content);
     }
+
+    public function test_shorthand_variable_syntax()
+    {
+        $template = <<<'EOT'
+{{ tag_name :$class }}
+EOT;
+
+        $nodes = $this->parseNodes($template);
+
+        $this->assertCount(1, $nodes);
+        $this->assertInstanceOf(AntlersNode::class, $nodes[0]);
+
+        $this->assertCount(1, $nodes[0]->parameters);
+
+        $this->assertParameterNameValue($nodes[0]->parameters[0], 'class', 'class');
+        $this->assertTrue($nodes[0]->parameters[0]->isVariableReference);
+    }
+
+    public function test_multiple_shorthand_variable_parameters()
+    {
+        $template = <<<'EOT'
+{{ tag_name :$class :$another_one }}
+EOT;
+
+        $nodes = $this->parseNodes($template);
+
+        $this->assertCount(1, $nodes);
+        $this->assertInstanceOf(AntlersNode::class, $nodes[0]);
+
+        $this->assertCount(2, $nodes[0]->parameters);
+
+        $this->assertParameterNameValue($nodes[0]->parameters[0], 'class', 'class');
+        $this->assertTrue($nodes[0]->parameters[0]->isVariableReference);
+
+        $this->assertParameterNameValue($nodes[0]->parameters[1], 'another_one', 'another_one');
+        $this->assertTrue($nodes[0]->parameters[1]->isVariableReference);
+    }
+
+    public function test_it_parses_shorthand_parameters_and_regular_parameters()
+    {
+        $template = <<<'EOT'
+{{ tag_name this="that" :$class cool="beans" :$another_one lucky="egg" }}
+EOT;
+
+        $nodes = $this->parseNodes($template);
+
+        $this->assertCount(1, $nodes);
+        $this->assertInstanceOf(AntlersNode::class, $nodes[0]);
+
+        $this->assertCount(5, $nodes[0]->parameters);
+
+        $this->assertParameterNameValue($nodes[0]->parameters[0], 'this', 'that');
+        $this->assertParameterNameValue($nodes[0]->parameters[1], 'class', 'class');
+        $this->assertParameterNameValue($nodes[0]->parameters[2], 'cool', 'beans');
+        $this->assertParameterNameValue($nodes[0]->parameters[3], 'another_one', 'another_one');
+        $this->assertParameterNameValue($nodes[0]->parameters[4], 'lucky', 'egg');
+
+        $this->assertFalse($nodes[0]->parameters[0]->isVariableReference);
+        $this->assertTrue($nodes[0]->parameters[1]->isVariableReference);
+        $this->assertFalse($nodes[0]->parameters[2]->isVariableReference);
+        $this->assertTrue($nodes[0]->parameters[3]->isVariableReference);
+        $this->assertFalse($nodes[0]->parameters[4]->isVariableReference);
+    }
 }
diff --git a/tests/Antlers/Parser/ParserErrorsTest.php b/tests/Antlers/Parser/ParserErrorsTest.php
index a8d763f729..ff79c84100 100644
--- a/tests/Antlers/Parser/ParserErrorsTest.php
+++ b/tests/Antlers/Parser/ParserErrorsTest.php
@@ -194,4 +194,24 @@ public function test_modifier_method_syntax_with_extra_tokens_throws_error()
     {
         $this->assertThrowsParserError('{{ title | modifier_name(param1, param2) : something_else }}');
     }
+
+    public function test_shorthand_parameters_cannot_have_special_characters()
+    {
+        $this->assertThrowsParserError('{{ tag_name :$thing="that" }}');
+    }
+
+    public function test_shorthand_parameters_cannot_start_with_numbers()
+    {
+        $this->assertThrowsParserError('{{ tag_name :$1thing }}');
+    }
+
+    public function test_incomplete_shorthand_parameters_throws_error()
+    {
+        $this->assertThrowsParserError('{{ tag_name :$ }}');
+    }
+
+    public function test_incomplete_shorthand_parameters_throws_error_two()
+    {
+        $this->assertThrowsParserError('{{ tag_name :$}}');
+    }
 }
diff --git a/tests/Antlers/Runtime/ParametersTest.php b/tests/Antlers/Runtime/ParametersTest.php
index 32e92bef0f..76e64a826a 100644
--- a/tests/Antlers/Runtime/ParametersTest.php
+++ b/tests/Antlers/Runtime/ParametersTest.php
@@ -338,6 +338,29 @@ public function index()
         $this->assertSame('123:456', $result);
     }
 
+    public function test_shorthand_parameter_variable_syntax()
+    {
+        $data = [
+            'name' => 'Bacon',
+        ];
+
+        (new class extends Tags
+        {
+            protected static $handle = 'test';
+
+            public function index()
+            {
+                return 'From the tag! '.$this->params->get('name');
+            }
+        })::register();
+
+        $template = <<<'EOT'
+{{ test :$name }}
+EOT;
+
+        $this->assertSame('From the tag! Bacon', $this->renderString($template, $data, true));
+    }
+
     public function test_numeric_literals_inside_variable_bindings_stay_numbers()
     {
         (new class extends Tags

From d5ff74275648212441b1c297e708038caa046c59 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 23 Feb 2024 17:01:00 -0500
Subject: [PATCH 133/149] [4.x] Fix pixel gap on relationship fieldtype items
 (#9579)

wip
---
 resources/css/components/items.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/css/components/items.css b/resources/css/components/items.css
index 2bbc020678..4c7b82deb0 100644
--- a/resources/css/components/items.css
+++ b/resources/css/components/items.css
@@ -10,7 +10,7 @@
     }
 
     .item-inner {
-        @apply w-full flex items-center p-2;
+        @apply w-full flex items-center px-2;
     }
 
     &.invalid {

From 63bbdb4ee44c15a204c748c54674161c8b1915d4 Mon Sep 17 00:00:00 2001
From: Jack Sleight <jacksleight@gmail.com>
Date: Fri, 23 Feb 2024 22:09:21 +0000
Subject: [PATCH 134/149] [4.x] Reveal invalid field on validation error
 (#9577)

---
 resources/js/app.js                           |  1 +
 resources/js/bootstrap/fieldtypes.js          |  4 +++
 resources/js/bootstrap/globals.js             | 13 +++++++
 resources/js/components/Reveal.js             | 35 +++++++++++++++++++
 resources/js/components/Statamic.js           |  6 ++++
 .../js/components/entries/PublishForm.vue     |  1 +
 resources/js/components/publish/Tabs.vue      |  1 +
 resources/js/components/terms/PublishForm.vue |  1 +
 resources/js/components/users/PublishForm.vue |  1 +
 9 files changed, 63 insertions(+)
 create mode 100644 resources/js/components/Reveal.js

diff --git a/resources/js/app.js b/resources/js/app.js
index cb0b340799..968c30a852 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -66,6 +66,7 @@ Vue.prototype.$events = new Vue();
 Vue.prototype.$echo = Statamic.$echo;
 Vue.prototype.$bard = Statamic.$bard;
 Vue.prototype.$keys = Statamic.$keys;
+Vue.prototype.$reveal = Statamic.$reveal;
 
 import Moment from 'moment';
 window.moment = Vue.moment = Vue.prototype.$moment = Moment;
diff --git a/resources/js/bootstrap/fieldtypes.js b/resources/js/bootstrap/fieldtypes.js
index d65917d3ef..2608b7a861 100644
--- a/resources/js/bootstrap/fieldtypes.js
+++ b/resources/js/bootstrap/fieldtypes.js
@@ -15,6 +15,7 @@ import AssetsFieldtype from '../components/fieldtypes/assets/AssetsFieldtype.vue
 import AssetsIndexFieldtype from '../components/fieldtypes/assets/AssetsIndexFieldtype.vue';
 import AssetFolderFieldtype from '../components/fieldtypes/AssetFolderFieldtype.vue';
 import BardFieldtype from '../components/fieldtypes/bard/BardFieldtype.vue';
+import BardSet from '../components/fieldtypes/bard/Set.vue';
 import BardButtonsSettingFieldtype from '../components/fieldtypes/bard/BardButtonsSettingFieldtype.vue';
 import ButtonGroupFieldtype from '../components/fieldtypes/ButtonGroupFieldtype.vue';
 import CheckboxesFieldtype from '../components/fieldtypes/CheckboxesFieldtype.vue';
@@ -44,6 +45,7 @@ import RangeFieldtype from '../components/fieldtypes/RangeFieldtype.vue';
 import RelationshipFieldtype from '../components/fieldtypes/relationship/RelationshipFieldtype.vue';
 import RelationshipIndexFieldtype from '../components/fieldtypes/relationship/RelationshipIndexFieldtype.vue';
 import Replicator from '../components/fieldtypes/replicator/Replicator.vue';
+import ReplicatorSet from '../components/fieldtypes/replicator/Set.vue';
 import ReplicatorIndex from '../components/fieldtypes/replicator/ReplicatorIndex.vue';
 import SectionFieldtype from '../components/fieldtypes/SectionFieldtype.vue';
 import SelectFieldtype from '../components/fieldtypes/SelectFieldtype.vue';
@@ -74,6 +76,7 @@ Vue.component('assets-fieldtype', AssetsFieldtype);
 Vue.component('assets-fieldtype-index', AssetsIndexFieldtype);
 Vue.component('asset_folder-fieldtype', AssetFolderFieldtype);
 Vue.component('bard-fieldtype', BardFieldtype);
+Vue.component('bard-fieldtype-set', BardSet);
 Vue.component('bard_buttons_setting-fieldtype', BardButtonsSettingFieldtype);
 Vue.component('button_group-fieldtype', ButtonGroupFieldtype);
 Vue.component('checkboxes-fieldtype', CheckboxesFieldtype);
@@ -103,6 +106,7 @@ Vue.component('range-fieldtype', RangeFieldtype);
 Vue.component('relationship-fieldtype', RelationshipFieldtype);
 Vue.component('relationship-fieldtype-index', RelationshipIndexFieldtype);
 Vue.component('replicator-fieldtype', Replicator);
+Vue.component('replicator-fieldtype-set', ReplicatorSet);
 Vue.component('replicator-fieldtype-index', ReplicatorIndex);
 Vue.component('section-fieldtype', SectionFieldtype);
 Vue.component('select-fieldtype', SelectFieldtype);
diff --git a/resources/js/bootstrap/globals.js b/resources/js/bootstrap/globals.js
index 3285c41f21..7a5b554862 100644
--- a/resources/js/bootstrap/globals.js
+++ b/resources/js/bootstrap/globals.js
@@ -108,3 +108,16 @@ export function escapeHtml(string) {
 export function replicatorPreviewHtml(html) {
     return new PreviewHtml(html);
 }
+
+export function closestVm(el, name) {
+    let parent = el;
+    while (parent) {
+        if (parent.__vue__) break;
+        parent = parent.parentElement;
+    }
+    let vm = parent.__vue__;
+    while (vm !== vm.$root) {
+        if (!name || name === vm.$options.name) return vm;
+        vm = vm.$parent;
+    }
+}
\ No newline at end of file
diff --git a/resources/js/components/Reveal.js b/resources/js/components/Reveal.js
new file mode 100644
index 0000000000..8fc136229c
--- /dev/null
+++ b/resources/js/components/Reveal.js
@@ -0,0 +1,35 @@
+import { closestVm } from '../bootstrap/globals';
+
+class Reveal {
+    element(el) {
+        if (!el) return;
+        let parent = el;
+        while (parent) {
+            if (parent.matches('.tab-panel')) {
+                closestVm(parent, 'publish-tabs').setActive(parent.dataset.tabHandle);
+            }
+            if (parent.matches('.replicator-set')) {
+                closestVm(parent, 'replicator-fieldtype-set').expand();
+            }
+            if (parent.matches('.bard-set')) {
+                closestVm(parent, 'bard-fieldtype-set').expand();
+            }
+            parent = parent.parentElement;
+        }
+        Vue.nextTick(() => {
+            el.scrollIntoView({
+                block: 'center',
+            });
+        });
+    }
+
+    invalid() {
+        Vue.nextTick(() => {
+            const el = document.querySelector('.publish-field.has-error:not(:has(.publish-field.has-error))');
+            if (!el) return;
+            this.element(el);
+        });
+    }
+}
+
+export default Reveal;
diff --git a/resources/js/components/Statamic.js b/resources/js/components/Statamic.js
index 5a9ffe667d..75d6d71404 100644
--- a/resources/js/components/Statamic.js
+++ b/resources/js/components/Statamic.js
@@ -3,6 +3,7 @@ import Echo from './Echo';
 import Bard from './Bard';
 import Keys from './keys/Keys';
 import Hooks from './Hooks';
+import Reveal from './Reveal';
 import Components from './Components';
 import FieldConditions from './FieldConditions';
 import Callbacks from './Callbacks';
@@ -10,6 +11,7 @@ const echo = new Echo;
 const bard = new Bard;
 const keys = new Keys;
 const hooks = new Hooks;
+const reveal = new Reveal;
 const components = new Components;
 const conditions = new FieldConditions;
 const callbacks = new Callbacks;
@@ -49,6 +51,10 @@ export default new Vue({
             return hooks;
         },
 
+        $reveal() {
+            return reveal;
+        },
+
         $conditions() {
             return conditions;
         },
diff --git a/resources/js/components/entries/PublishForm.vue b/resources/js/components/entries/PublishForm.vue
index d93cd6d022..5c22989513 100644
--- a/resources/js/components/entries/PublishForm.vue
+++ b/resources/js/components/entries/PublishForm.vue
@@ -617,6 +617,7 @@ export default {
                 this.error = message;
                 this.errors = errors;
                 this.$toast.error(message);
+                this.$reveal.invalid();
             } else if (e.response) {
                 this.$toast.error(e.response.data.message);
             } else {
diff --git a/resources/js/components/publish/Tabs.vue b/resources/js/components/publish/Tabs.vue
index b6d01146e4..da4f427b15 100644
--- a/resources/js/components/publish/Tabs.vue
+++ b/resources/js/components/publish/Tabs.vue
@@ -63,6 +63,7 @@
                     :role="showTabs && 'tabpanel'"
                     :id="showTabs && tabPanelId(tab.handle)"
                     :aria-labelledby="showTabs && tabId(tab.handle)"
+                    :data-tab-handle="tab.handle"
                     tabindex="0"
                     :key="tab.handle"
                     v-for="tab in mainTabs"
diff --git a/resources/js/components/terms/PublishForm.vue b/resources/js/components/terms/PublishForm.vue
index 9dca80133b..4b9b6eb11a 100644
--- a/resources/js/components/terms/PublishForm.vue
+++ b/resources/js/components/terms/PublishForm.vue
@@ -507,6 +507,7 @@ export default {
                 this.error = message;
                 this.errors = errors;
                 this.$toast.error(message);
+                this.$reveal.invalid();
             } else {
                 this.$toast.error(__('Something went wrong'));
             }
diff --git a/resources/js/components/users/PublishForm.vue b/resources/js/components/users/PublishForm.vue
index 5f8e1f629d..15e0822e57 100644
--- a/resources/js/components/users/PublishForm.vue
+++ b/resources/js/components/users/PublishForm.vue
@@ -123,6 +123,7 @@ export default {
                     this.error = message;
                     this.errors = errors;
                     this.$toast.error(message);
+                    this.$reveal.invalid();
                 } else {
                     this.$toast.error(__('Something went wrong'));
                 }

From 815e1548ccd4f49a46fe9c8ba9dfeffbd3734010 Mon Sep 17 00:00:00 2001
From: Daniel Jones <daniel@1994.co.uk>
Date: Mon, 26 Feb 2024 15:18:29 +0000
Subject: [PATCH 135/149] [4.x] Add Hex To Rgb modifier (#9582)

---
 src/Modifiers/CoreModifiers.php  | 17 +++++++++++++++++
 tests/Modifiers/HexToRgbTest.php | 27 +++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 tests/Modifiers/HexToRgbTest.php

diff --git a/src/Modifiers/CoreModifiers.php b/src/Modifiers/CoreModifiers.php
index 5858cae1d1..1b1cf546cb 100644
--- a/src/Modifiers/CoreModifiers.php
+++ b/src/Modifiers/CoreModifiers.php
@@ -957,6 +957,23 @@ private function renderMLAStyleHeadline($value)
         return $headline;
     }
 
+    /**
+     * Converts a hex color to rgb values.
+     *
+     * @return string
+     */
+    public function hexToRgb($value)
+    {
+        // Remove the hash (#) if present
+        $hex = ltrim($value, '#');
+
+        // Parse the hex value into RGB components
+        $rgb = sscanf($hex, '%02x%02x%02x');
+
+        // Return the RGB values as a comma-separated string
+        return implode(', ', $rgb);
+    }
+
     /**
      * Get the date difference in hours.
      *
diff --git a/tests/Modifiers/HexToRgbTest.php b/tests/Modifiers/HexToRgbTest.php
new file mode 100644
index 0000000000..8ebeda7571
--- /dev/null
+++ b/tests/Modifiers/HexToRgbTest.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Tests\Modifiers;
+
+use Statamic\Modifiers\Modify;
+use Tests\TestCase;
+
+class HexToRgbTest extends TestCase
+{
+    /** @test */
+    public function it_converts_hex_values_to_rgb(): void
+    {
+        $modified = $this->modify('#FF269E');
+        $this->assertEquals('255, 38, 158', $modified);
+
+        $modified = $this->modify('01D7B0');
+        $this->assertEquals('1, 215, 176', $modified);
+
+        $modified = $this->modify('##B8FFF3');
+        $this->assertEquals('184, 255, 243', $modified);
+    }
+
+    private function modify(string $value)
+    {
+        return Modify::value($value)->hexToRgb()->fetch();
+    }
+}

From f54ab7346909d92899e2046aaf9a35696e3f3cc9 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Mon, 26 Feb 2024 15:19:04 +0000
Subject: [PATCH 136/149] [4.x] Fix field conditions in Grid fields (#9586)

---
 .../components/fieldtypes/grid/FieldsFieldtype.vue | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/fieldtypes/grid/FieldsFieldtype.vue b/resources/js/components/fieldtypes/grid/FieldsFieldtype.vue
index 1f1220517b..62ed949877 100644
--- a/resources/js/components/fieldtypes/grid/FieldsFieldtype.vue
+++ b/resources/js/components/fieldtypes/grid/FieldsFieldtype.vue
@@ -4,6 +4,7 @@
         :fields="fields"
         :editing-field="editingField"
         :can-define-localizable="false"
+        :suggestable-condition-fields="suggestableConditionFields"
         @field-created="fieldCreated"
         @field-updated="fieldUpdated"
         @field-linked="fieldLinked"
@@ -17,10 +18,15 @@
 <script>
 import Fields from '../../blueprints/Fields.vue';
 import {Sortable, Plugins} from '@shopify/draggable';
+import SuggestsConditionalFields from '../../blueprints/SuggestsConditionalFields';
 
 export default {
 
-    mixins: [Fieldtype],
+    mixins: [Fieldtype, SuggestsConditionalFields],
+
+    inject: {
+        suggestableConditionFieldsProvider: { default: null }
+    },
 
     components: {
         Fields,
@@ -33,6 +39,12 @@ export default {
         }
     },
 
+    computed: {
+        fieldsForConditionSuggestions() {
+            return this.fields;
+        },
+    },
+
     mounted() {
         this.makeSortable();
     },

From fcdecbed40a7aab8bf98a49eb3463aa9ad89a11a Mon Sep 17 00:00:00 2001
From: Jack Sleight <jacksleight@gmail.com>
Date: Mon, 26 Feb 2024 18:18:43 +0000
Subject: [PATCH 137/149] [4.x] Add UI mode option to forms fieldtype config
 (#9591)

---
 src/Forms/Fieldtype.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/Forms/Fieldtype.php b/src/Forms/Fieldtype.php
index 8ff9b21478..384f8d5dac 100644
--- a/src/Forms/Fieldtype.php
+++ b/src/Forms/Fieldtype.php
@@ -32,6 +32,17 @@ protected function configFieldItems(): array
                 'default' => 1,
                 'instructions' => __('statamic::fieldtypes.form.config.max_items'),
             ],
+            'mode' => [
+                'display' => __('UI Mode'),
+                'instructions' => __('statamic::fieldtypes.relationship.config.mode'),
+                'type' => 'radio',
+                'default' => 'default',
+                'options' => [
+                    'default' => __('Stack Selector'),
+                    'select' => __('Select Dropdown'),
+                    'typeahead' => __('Typeahead Field'),
+                ],
+            ],
             'query_scopes' => [
                 'display' => __('Query Scopes'),
                 'instructions' => __('statamic::fieldtypes.form.config.query_scopes'),

From 07e88757699d4b20d9f2800c7bc1278c0232c337 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Mon, 26 Feb 2024 13:35:53 -0500
Subject: [PATCH 138/149] changelog

---
 CHANGELOG.md | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3aab8bc9f5..70127a84cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,38 @@
 # Release Notes
 
+## 4.50.0 (2024-02-26)
+
+### What's new
+- Add `hex_to_rgb` modifier. [#9582](https://github.com/statamic/cms/issues/9582) by @DanielDarrenJones
+- Add UI mode option to forms fieldtype config. [#9591](https://github.com/statamic/cms/issues/9591) by @jacksleight
+- First invalid field will be scrolled into view when submitting publish forms. [#9577](https://github.com/statamic/cms/issues/9577) by @jacksleight
+- Add Antlers shorthand parameter value syntax. [#9505](https://github.com/statamic/cms/issues/9505) by @JohnathonKoster
+- Hooks. [#9481](https://github.com/statamic/cms/issues/9481) by @ryanmitchell
+- Add `Entry::findOrFail`. [#9506](https://github.com/statamic/cms/issues/9506) by @benfurfie
+
+### What's fixed
+- Fix field conditions in Grid fields. [#9586](https://github.com/statamic/cms/issues/9586) by @duncanmcclean
+- Fix pixel gap on relationship fieldtype items. [#9579](https://github.com/statamic/cms/issues/9579) by @jasonvarga
+- Use static_cache store for nocache. [#9527](https://github.com/statamic/cms/issues/9527) by @ryanmitchell
+- Make tags using old-style __call method compatible with Macroable. [#9553](https://github.com/statamic/cms/issues/9553) by @SylvesterDamgaard
+- Fix `locales` tag inside replicator, bard, and grid. [#9566](https://github.com/statamic/cms/issues/9566) by @aerni
+- Add `accepted_if` validation to Bard `enable_input_rules` [#9555](https://github.com/statamic/cms/issues/9555) by @robdekort
+- Add `accepted_if` validation rule [#9557](https://github.com/statamic/cms/issues/9557) by @robdekort
+- Fix modal height UI issue. [#9538](https://github.com/statamic/cms/issues/9538) by @JohnathonKoster
+- Fix arrays being returned by translations. [#9525](https://github.com/statamic/cms/issues/9525) by @duncanmcclean
+- Fix Stache pathing issue on Windows. [#9537](https://github.com/statamic/cms/issues/9537) by @JohnathonKoster
+- Antlers: Resolve values from augmented values when there is more data to process. [#9548](https://github.com/statamic/cms/issues/9548) by @JohnathonKoster
+- Antlers: Stop double-initial execution of tags within conditions. [#9504](https://github.com/statamic/cms/issues/9504) by @JohnathonKoster
+- Fix error in event listener when uploading file in front-end forms. [#9542](https://github.com/statamic/cms/issues/9542) by @ryanmitchell
+- Drop Laravel 6 mail view. [#9545](https://github.com/statamic/cms/issues/9545) by @duncanmcclean
+- Remove any uploaded assets when submission silently fails or validation fails. [#9549](https://github.com/statamic/cms/issues/9549) by @ryanmitchell
+- Check if form request wantsJson. [#9533](https://github.com/statamic/cms/issues/9533) by @ryanmitchell
+- Pass parent field and index down to imported fields. [#9550](https://github.com/statamic/cms/issues/9550) by @jacksleight
+- Fix protection redirect URLs when they contain query parameters. [#9543](https://github.com/statamic/cms/issues/9543) by @duncanmcclean
+- Fix issues when saving entries with `JsonResource::withoutWrapping()`. [#9519](https://github.com/statamic/cms/issues/9519) by @duncanmcclean
+
+
+
 ## 4.49.0 (2024-02-16)
 
 ### What's new

From 82cc01f9036bbfb4df6286698c379a0b69f7863f Mon Sep 17 00:00:00 2001
From: Rob de Kort <rob@studio1902.nl>
Date: Tue, 27 Feb 2024 15:38:02 +0100
Subject: [PATCH 139/149] [4.x] Fix pixel gap on relationship fieldtype items
 and prevent padding issue (#9597)

---
 resources/css/components/items.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/css/components/items.css b/resources/css/components/items.css
index 4c7b82deb0..c1cffcce6a 100644
--- a/resources/css/components/items.css
+++ b/resources/css/components/items.css
@@ -2,7 +2,7 @@
     @apply text-sm outline-none flex w-full justify-between rounded border bg-white shadow-sm items-center;
 
     .item-move {
-        @apply w-4 border-r rounded-l p-2;
+        @apply w-4 self-stretch border-r rounded-l p-2;
         cursor: grab;
         background: theme('colors.gray.200') url('../../svg/icons/light/drag-dots.svg') center center no-repeat;
         background-size: 7px 17px;
@@ -10,7 +10,7 @@
     }
 
     .item-inner {
-        @apply w-full flex items-center px-2;
+        @apply w-full flex items-center p-2;
     }
 
     &.invalid {

From a0cbe4b53bd5b7cccbf0e6ba2b20a7e29885900f Mon Sep 17 00:00:00 2001
From: Alexander Jensen <alexander@jensen.dev>
Date: Tue, 27 Feb 2024 20:25:41 +0100
Subject: [PATCH 140/149] [4.x] Fix docblock of FluentTag param method (#9601)

---
 src/Tags/FluentTag.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Tags/FluentTag.php b/src/Tags/FluentTag.php
index b4c15bdde3..d8b9c4337e 100644
--- a/src/Tags/FluentTag.php
+++ b/src/Tags/FluentTag.php
@@ -149,7 +149,7 @@ public function getIterator()
      * Allow calls to tag params.
      *
      * @param  string  $param
-     * @param  array  $value
+     * @param  mixed  $value
      * @return $this
      */
     public function param($param, $value = true)

From 1df70fd508cf50a20671486edf8fc31c8c5afd40 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Tue, 27 Feb 2024 19:27:40 +0000
Subject: [PATCH 141/149] [4.x] Only run custom validation errors when not
 precognitive (#9599)

---
 src/Http/Requests/FrontendFormRequest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Http/Requests/FrontendFormRequest.php b/src/Http/Requests/FrontendFormRequest.php
index 8533be2952..1627659af1 100644
--- a/src/Http/Requests/FrontendFormRequest.php
+++ b/src/Http/Requests/FrontendFormRequest.php
@@ -60,7 +60,7 @@ public function validator()
 
     protected function failedValidation(Validator $validator)
     {
-        if ($this->ajax() || $this->wantsJson()) {
+        if (! $this->isPrecognitive() && ($this->ajax() || $this->wantsJson())) {
             $errors = $validator->errors();
 
             $response = response([

From 6a304de81cb048b56f2ff62f3ef5136a2386ddbd Mon Sep 17 00:00:00 2001
From: Marty Friedel <1491079+martyf@users.noreply.github.com>
Date: Wed, 28 Feb 2024 06:30:33 +1100
Subject: [PATCH 142/149] [4.x] Tweak SuggestsConditionalFields behaviour when
 dealing with a fields prefix. (#9592)

---
 resources/js/components/blueprints/SuggestsConditionalFields.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/blueprints/SuggestsConditionalFields.js b/resources/js/components/blueprints/SuggestsConditionalFields.js
index b66a516125..6b45727472 100644
--- a/resources/js/components/blueprints/SuggestsConditionalFields.js
+++ b/resources/js/components/blueprints/SuggestsConditionalFields.js
@@ -49,7 +49,7 @@ export default {
                             : [field]
                     );
                 }, [])
-                .map(handle => prefix ? `${prefix}${handle}` : handle);
+                .map(field => prefix ? { ...field, handle: prefix + field.handle } : field);
         }
 
     }

From 7da46d84509954b01698b310268bdb0b2078a785 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Tue, 27 Feb 2024 20:10:49 +0000
Subject: [PATCH 143/149] [4.x] Add `isDirty` / `isClean` (#5502)

---
 src/Assets/Asset.php                     | 12 +++-
 src/Auth/Eloquent/User.php               |  7 +++
 src/Auth/File/User.php                   | 12 ++++
 src/Auth/User.php                        |  5 +-
 src/Data/HasDirtyState.php               | 59 ++++++++++++++++++
 src/Data/SyncsOriginalState.php          |  4 ++
 src/Entries/Entry.php                    | 17 ++++++
 src/Stache/Stores/BasicStore.php         |  8 +++
 src/Stache/Stores/NavTreeStore.php       |  3 +-
 src/Stache/Stores/TaxonomyTermsStore.php |  1 -
 src/Structures/Tree.php                  | 18 ++----
 src/Taxonomies/Term.php                  | 13 +++-
 tests/Assets/AssetTest.php               | 67 +++++++++++++++++++++
 tests/Auth/Eloquent/EloquentUserTest.php |  5 --
 tests/Auth/PermissibleContractTests.php  | 17 ++++++
 tests/Auth/UserContractTests.php         | 63 ++++++++++++++++++++
 tests/Data/Entries/EntryTest.php         | 71 ++++++++++++++++++++++
 tests/Data/Taxonomies/TermTest.php       | 76 ++++++++++++++++++++++++
 18 files changed, 432 insertions(+), 26 deletions(-)
 create mode 100644 src/Data/HasDirtyState.php

diff --git a/src/Assets/Asset.php b/src/Assets/Asset.php
index 79c74ef161..72de11eba3 100644
--- a/src/Assets/Asset.php
+++ b/src/Assets/Asset.php
@@ -17,6 +17,7 @@
 use Statamic\Contracts\Search\Searchable as SearchableContract;
 use Statamic\Data\ContainsData;
 use Statamic\Data\HasAugmentedInstance;
+use Statamic\Data\HasDirtyState;
 use Statamic\Data\TracksQueriedColumns;
 use Statamic\Data\TracksQueriedRelations;
 use Statamic\Events\AssetContainerBlueprintFound;
@@ -46,7 +47,7 @@
 
 class Asset implements Arrayable, ArrayAccess, AssetContract, Augmentable, ContainsQueryableValues, ResolvesValuesContract, SearchableContract
 {
-    use ContainsData, FluentlyGetsAndSets, HasAugmentedInstance,
+    use ContainsData, FluentlyGetsAndSets, HasAugmentedInstance, HasDirtyState,
         Searchable,
         TracksQueriedColumns, TracksQueriedRelations {
             set as traitSet;
@@ -65,7 +66,6 @@ class Asset implements Arrayable, ArrayAccess, AssetContract, Augmentable, Conta
     protected $withEvents = true;
     protected $shouldHydrate = true;
     protected $removedData = [];
-    protected $original = [];
 
     public function syncOriginal()
     {
@@ -1054,6 +1054,14 @@ public function getQueryableValue(string $field)
         return $field->fieldtype()->toQueryableValue($value);
     }
 
+    public function getCurrentDirtyStateAttributes(): array
+    {
+        return array_merge([
+            'path' => $this->path(),
+            'data' => $this->data()->toArray(),
+        ]);
+    }
+
     public function getCpSearchResultBadge(): string
     {
         return $this->container()->title();
diff --git a/src/Auth/Eloquent/User.php b/src/Auth/Eloquent/User.php
index f63ef51c0c..d2b01637ae 100644
--- a/src/Auth/Eloquent/User.php
+++ b/src/Auth/Eloquent/User.php
@@ -364,4 +364,11 @@ public function __set($key, $value)
 
         return $this->$key = $value;
     }
+
+    public function getCurrentDirtyStateAttributes(): array
+    {
+        return array_merge([
+            'email' => $this->email(),
+        ], $this->model()->attributesToArray());
+    }
 }
diff --git a/src/Auth/File/User.php b/src/Auth/File/User.php
index 18ace15810..e19d2107f2 100644
--- a/src/Auth/File/User.php
+++ b/src/Auth/File/User.php
@@ -356,4 +356,16 @@ public function fresh()
     {
         return Facades\User::find($this->id);
     }
+
+    public function getCurrentDirtyStateAttributes(): array
+    {
+        return array_merge([
+            'email' => $this->email(),
+            'groups' => $this->get('groups', []),
+            'password_hash' => $this->passwordHash(),
+            'permissions' => $this->get('permissions', []),
+            'roles' => $this->get('roles', []),
+            'super' => $this->get('super', false),
+        ], $this->data()->toArray());
+    }
 }
diff --git a/src/Auth/User.php b/src/Auth/User.php
index 371e5d421c..1ef800a0ce 100644
--- a/src/Auth/User.php
+++ b/src/Auth/User.php
@@ -21,6 +21,7 @@
 use Statamic\Contracts\Search\Searchable as SearchableContract;
 use Statamic\Data\ContainsComputedData;
 use Statamic\Data\HasAugmentedInstance;
+use Statamic\Data\HasDirtyState;
 use Statamic\Data\TracksQueriedColumns;
 use Statamic\Data\TracksQueriedRelations;
 use Statamic\Events\UserCreated;
@@ -39,7 +40,7 @@
 
 abstract class User implements Arrayable, ArrayAccess, Augmentable, Authenticatable, AuthorizableContract, CanResetPasswordContract, ContainsQueryableValues, HasLocalePreference, ResolvesValuesContract, SearchableContract, UserContract
 {
-    use Authorizable, CanResetPassword, ContainsComputedData, HasAugmentedInstance, HasAvatar, Notifiable, ResolvesValues, Searchable, TracksQueriedColumns, TracksQueriedRelations;
+    use Authorizable, CanResetPassword, ContainsComputedData, HasAugmentedInstance, HasAvatar, HasDirtyState, Notifiable, ResolvesValues, Searchable, TracksQueriedColumns, TracksQueriedRelations;
 
     protected $afterSaveCallbacks = [];
     protected $withEvents = true;
@@ -193,6 +194,8 @@ public function save()
             UserSaved::dispatch($this);
         }
 
+        $this->syncOriginal();
+
         return $this;
     }
 
diff --git a/src/Data/HasDirtyState.php b/src/Data/HasDirtyState.php
new file mode 100644
index 0000000000..02949f26ae
--- /dev/null
+++ b/src/Data/HasDirtyState.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Statamic\Data;
+
+use Statamic\Support\Arr;
+
+trait HasDirtyState
+{
+    protected array $original = [];
+
+    abstract public function getCurrentDirtyStateAttributes(): array;
+
+    /**
+     * Determine if the item or any of the given attribute(s) have been modified.
+     *
+     * @param  null|string|array  $attributes
+     */
+    public function isDirty($attributes = null): bool
+    {
+        $currentValues = $this->getCurrentDirtyStateAttributes();
+        $originalValues = $this->getOriginal();
+
+        if (! $attributes) {
+            return json_encode($currentValues) !== json_encode($originalValues);
+        }
+
+        return collect($attributes)->contains(function ($property) use ($currentValues, $originalValues) {
+            // In an asset, the data key holds all the data. It would be a breaking
+            // change to make it the root level, so we'll support both for now.
+            if (! array_key_exists($property, $currentValues)) {
+                $property = 'data.'.$property;
+            }
+
+            return data_get($currentValues, $property) !== data_get($originalValues, $property);
+        });
+    }
+
+    /**
+     * Determine if the item or all the given attribute(s) have remained the same.
+     *
+     * @param  null|string|array  $attributes
+     */
+    public function isClean($attributes = null): bool
+    {
+        return ! $this->isDirty($attributes);
+    }
+
+    public function syncOriginal(): static
+    {
+        $this->original = $this->getCurrentDirtyStateAttributes();
+
+        return $this;
+    }
+
+    public function getOriginal($key = null, $fallback = null)
+    {
+        return Arr::get($this->original, $key, $fallback);
+    }
+}
diff --git a/src/Data/SyncsOriginalState.php b/src/Data/SyncsOriginalState.php
index d1017497b0..4c6f41e84a 100644
--- a/src/Data/SyncsOriginalState.php
+++ b/src/Data/SyncsOriginalState.php
@@ -4,6 +4,10 @@
 
 use Statamic\Support\Arr;
 
+/**
+ * @deprecated
+ * @see \Statamic\Data\HasDirtyState
+ */
 trait SyncsOriginalState
 {
     protected $original = [];
diff --git a/src/Entries/Entry.php b/src/Entries/Entry.php
index fd76d84dd1..819ff7f3e3 100644
--- a/src/Entries/Entry.php
+++ b/src/Entries/Entry.php
@@ -23,6 +23,7 @@
 use Statamic\Data\ContainsData;
 use Statamic\Data\ExistsAsFile;
 use Statamic\Data\HasAugmentedInstance;
+use Statamic\Data\HasDirtyState;
 use Statamic\Data\HasOrigin;
 use Statamic\Data\Publishable;
 use Statamic\Data\TracksLastModified;
@@ -56,6 +57,7 @@ class Entry implements Arrayable, ArrayAccess, Augmentable, ContainsQueryableVal
 {
     use ContainsComputedData, ContainsData, ExistsAsFile, FluentlyGetsAndSets, HasAugmentedInstance, Localizable, Publishable, Revisable, Searchable, TracksLastModified, TracksQueriedColumns, TracksQueriedRelations;
 
+    use HasDirtyState;
     use HasOrigin {
         value as originValue;
         values as originValues;
@@ -173,6 +175,19 @@ public function newAugmentedInstance(): Augmented
         return new AugmentedEntry($this);
     }
 
+    public function getCurrentDirtyStateAttributes(): array
+    {
+        return array_merge([
+            'collection' => $this->collectionHandle(),
+            'locale' => $this->locale(),
+            'origin' => $this->hasOrigin() ? $this->origin()->id() : null,
+            'slug' => $this->slug(),
+            'date' => optional($this->date())->format('Y-m-d-Hi'),
+            'published' => $this->published(),
+            'path' => $this->initialPath() ?? $this->path(),
+        ], $this->data()->except(['updated_at'])->toArray());
+    }
+
     public function delete()
     {
         if (EntryDeleting::dispatch($this) === false) {
@@ -384,6 +399,8 @@ public function save()
 
         $stack->pop();
 
+        $this->syncOriginal();
+
         return true;
     }
 
diff --git a/src/Stache/Stores/BasicStore.php b/src/Stache/Stores/BasicStore.php
index f12eed78f0..ae099d5149 100644
--- a/src/Stache/Stores/BasicStore.php
+++ b/src/Stache/Stores/BasicStore.php
@@ -24,6 +24,10 @@ public function getItem($key)
         }
 
         if ($item = $this->getCachedItem($key)) {
+            if (method_exists($item, 'syncOriginal')) {
+                $item->syncOriginal();
+            }
+
             return $item;
         }
 
@@ -31,6 +35,10 @@ public function getItem($key)
 
         $this->cacheItem($item);
 
+        if (method_exists($item, 'syncOriginal')) {
+            $item->syncOriginal();
+        }
+
         return $item;
     }
 
diff --git a/src/Stache/Stores/NavTreeStore.php b/src/Stache/Stores/NavTreeStore.php
index 3c91ad6660..9f2a5d422c 100644
--- a/src/Stache/Stores/NavTreeStore.php
+++ b/src/Stache/Stores/NavTreeStore.php
@@ -26,8 +26,7 @@ public function makeItemFromFile($path, $contents)
     {
         return $this
             ->newTreeClassByPath($path)
-            ->tree(YAML::file($path)->parse($contents)['tree'] ?? [])
-            ->syncOriginal();
+            ->tree(YAML::file($path)->parse($contents)['tree'] ?? []);
     }
 
     protected function newTreeClassByPath($path)
diff --git a/src/Stache/Stores/TaxonomyTermsStore.php b/src/Stache/Stores/TaxonomyTermsStore.php
index bf38d8dccb..f9873c63c7 100644
--- a/src/Stache/Stores/TaxonomyTermsStore.php
+++ b/src/Stache/Stores/TaxonomyTermsStore.php
@@ -60,7 +60,6 @@ public function makeItemFromFile($path, $contents)
         }
 
         $term->dataForLocale($term->defaultLocale(), $data);
-        $term->syncOriginal();
 
         return $term;
     }
diff --git a/src/Structures/Tree.php b/src/Structures/Tree.php
index fafdcd9156..99c120da33 100644
--- a/src/Structures/Tree.php
+++ b/src/Structures/Tree.php
@@ -5,7 +5,7 @@
 use Statamic\Contracts\Data\Localization;
 use Statamic\Contracts\Structures\Tree as Contract;
 use Statamic\Data\ExistsAsFile;
-use Statamic\Data\SyncsOriginalState;
+use Statamic\Data\HasDirtyState;
 use Statamic\Facades\Blink;
 use Statamic\Facades\Entry;
 use Statamic\Facades\Site;
@@ -14,7 +14,7 @@
 
 abstract class Tree implements Contract, Localization
 {
-    use ExistsAsFile, FluentlyGetsAndSets, SyncsOriginalState;
+    use ExistsAsFile, FluentlyGetsAndSets, HasDirtyState;
 
     protected $handle;
     protected $locale;
@@ -22,7 +22,6 @@ abstract class Tree implements Contract, Localization
     protected $cachedFlattenedPages;
     protected $withEntries = false;
     protected $uriCacheEnabled = true;
-    protected $syncOriginalProperties = ['tree'];
 
     public function idKey()
     {
@@ -378,15 +377,10 @@ public function withEntries()
         return $this;
     }
 
-    public function __sleep()
+    public function getCurrentDirtyStateAttributes(): array
     {
-        $vars = Arr::except(get_object_vars($this), ['original']);
-
-        return array_keys($vars);
-    }
-
-    public function __wakeup()
-    {
-        $this->syncOriginal();
+        return [
+            'tree' => $this->tree,
+        ];
     }
 }
diff --git a/src/Taxonomies/Term.php b/src/Taxonomies/Term.php
index 6ff5b264cf..53138586d9 100644
--- a/src/Taxonomies/Term.php
+++ b/src/Taxonomies/Term.php
@@ -4,7 +4,7 @@
 
 use Statamic\Contracts\Taxonomies\Term as TermContract;
 use Statamic\Data\ExistsAsFile;
-use Statamic\Data\SyncsOriginalState;
+use Statamic\Data\HasDirtyState;
 use Statamic\Events\TermBlueprintFound;
 use Statamic\Events\TermCreated;
 use Statamic\Events\TermCreating;
@@ -22,7 +22,7 @@
 
 class Term implements TermContract
 {
-    use ExistsAsFile, FluentlyGetsAndSets, SyncsOriginalState;
+    use ExistsAsFile, FluentlyGetsAndSets, HasDirtyState;
 
     protected $taxonomy;
     protected $slug;
@@ -31,7 +31,6 @@ class Term implements TermContract
     protected $data;
     protected $afterSaveCallbacks = [];
     protected $withEvents = true;
-    protected $syncOriginalProperties = ['slug'];
 
     public function __construct()
     {
@@ -282,6 +281,14 @@ public function set($key, $value)
         return $this;
     }
 
+    public function getCurrentDirtyStateAttributes(): array
+    {
+        return array_merge([
+            'slug' => $this->slug(),
+            'taxonomy' => $this->taxonomyHandle(),
+        ], $this->data()->except(['updated_at'])->toArray());
+    }
+
     public function __call($method, $args)
     {
         $default = $this->inDefaultLocale();
diff --git a/tests/Assets/AssetTest.php b/tests/Assets/AssetTest.php
index 8129503f9f..94cb4e69ad 100644
--- a/tests/Assets/AssetTest.php
+++ b/tests/Assets/AssetTest.php
@@ -2160,6 +2160,73 @@ public function augment($values)
         ], Arr::only($asset->selectedQueryRelations(['charlie'])->toArray(), ['alfa', 'bravo', 'charlie']));
     }
 
+    /**
+     * @test
+     */
+    public function it_has_a_dirty_state()
+    {
+        $container = Facades\AssetContainer::make('test')->disk('test');
+        Facades\AssetContainer::shouldReceive('findByHandle')->with('test')->andReturn($container);
+
+        $asset = (new Asset)->container($container)->path('test.jpg');
+
+        $asset->data([
+            'title' => 'English',
+            'food' => 'Burger',
+            'drink' => 'Water',
+        ])->save();
+
+        $this->assertFalse($asset->isDirty());
+        $this->assertFalse($asset->isDirty('title'));
+        $this->assertFalse($asset->isDirty('food'));
+        $this->assertFalse($asset->isDirty(['title']));
+        $this->assertFalse($asset->isDirty(['food']));
+        $this->assertFalse($asset->isDirty(['title', 'food']));
+        $this->assertTrue($asset->isClean());
+        $this->assertTrue($asset->isClean('title'));
+        $this->assertTrue($asset->isClean('food'));
+        $this->assertTrue($asset->isClean(['title']));
+        $this->assertTrue($asset->isClean(['food']));
+        $this->assertTrue($asset->isClean(['title', 'food']));
+
+        $asset->merge(['title' => 'French']);
+
+        $this->assertTrue($asset->isDirty());
+        $this->assertTrue($asset->isDirty('title'));
+        $this->assertFalse($asset->isDirty('food'));
+        $this->assertTrue($asset->isDirty(['title']));
+        $this->assertFalse($asset->isDirty(['food']));
+        $this->assertTrue($asset->isDirty(['title', 'food']));
+        $this->assertFalse($asset->isClean());
+        $this->assertFalse($asset->isClean('title'));
+        $this->assertTrue($asset->isClean('food'));
+        $this->assertFalse($asset->isClean(['title']));
+        $this->assertTrue($asset->isClean(['food']));
+        $this->assertFalse($asset->isClean(['title', 'food']));
+    }
+
+    /** @test */
+    public function it_syncs_original_at_the_right_time()
+    {
+        $eventsHandled = 0;
+
+        Event::listen(function (AssetSaved $event) use (&$eventsHandled) {
+            $eventsHandled++;
+            $this->assertTrue($event->asset->isDirty());
+        });
+
+        $container = Facades\AssetContainer::make('test')->disk('test');
+        Facades\AssetContainer::shouldReceive('findByHandle')->with('test')->andReturn($container);
+        $asset = $container->makeAsset('test.jpg');
+
+        $asset
+            ->set('foo', 'bar')
+            ->save();
+
+        $this->assertFalse($asset->isDirty());
+        $this->assertEquals(1, $eventsHandled);
+    }
+
     /** @test */
     public function it_augments_in_the_parser()
     {
diff --git a/tests/Auth/Eloquent/EloquentUserTest.php b/tests/Auth/Eloquent/EloquentUserTest.php
index 47cd74ec49..653223752a 100644
--- a/tests/Auth/Eloquent/EloquentUserTest.php
+++ b/tests/Auth/Eloquent/EloquentUserTest.php
@@ -6,7 +6,6 @@
 use Illuminate\Foundation\Testing\WithFaker;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Event;
 use Statamic\Auth\Eloquent\User as EloquentUser;
 use Statamic\Auth\File\Role;
 use Statamic\Auth\File\UserGroup;
@@ -43,10 +42,6 @@ public function setUp(): void
         }
 
         $this->loadMigrationsFrom($tmpDir);
-
-        // Prevent the anonymous role classes throwing errors when getting serialized
-        // during event handling unrelated to these tests.
-        Event::fake();
     }
 
     private static function migrationsDir()
diff --git a/tests/Auth/PermissibleContractTests.php b/tests/Auth/PermissibleContractTests.php
index 4834fc4e3b..79a2c4925c 100644
--- a/tests/Auth/PermissibleContractTests.php
+++ b/tests/Auth/PermissibleContractTests.php
@@ -3,6 +3,7 @@
 namespace Tests\Auth;
 
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Event;
 use Statamic\Auth\File\Role;
 use Statamic\Auth\File\UserGroup;
 use Statamic\Contracts\Auth\Role as RoleContract;
@@ -17,6 +18,10 @@ abstract protected function createPermissible();
     /** @test */
     public function it_gets_and_assigns_roles()
     {
+        // Prevent the anonymous role classes throwing errors when getting serialized
+        // during event handling unrelated to this test.
+        Event::fake();
+
         $roleA = new class extends Role
         {
             public function handle(?string $handle = null)
@@ -78,6 +83,10 @@ public function handle(?string $handle = null)
     /** @test */
     public function it_removes_a_role_assignment()
     {
+        // Prevent the anonymous role classes throwing errors when getting serialized
+        // during event handling unrelated to this test.
+        Event::fake();
+
         $roleA = new class extends Role
         {
             public function handle(?string $handle = null)
@@ -124,6 +133,10 @@ public function handle(?string $handle = null)
     /** @test */
     public function it_checks_if_it_has_a_role()
     {
+        // Prevent the anonymous role classes throwing errors when getting serialized
+        // during event handling unrelated to this test.
+        Event::fake();
+
         $roleA = new class extends Role
         {
             public function handle(?string $handle = null)
@@ -228,6 +241,10 @@ public function it_gets_and_checks_permissions()
     /** @test */
     public function it_checks_if_it_has_super_permissions_through_roles_and_groups()
     {
+        // Prevent the anonymous role classes throwing errors when getting serialized
+        // during event handling unrelated to this test.
+        Event::fake();
+
         $superRole = new class extends Role
         {
             public function handle(?string $handle = null)
diff --git a/tests/Auth/UserContractTests.php b/tests/Auth/UserContractTests.php
index 41bfc36125..8e02a3a981 100644
--- a/tests/Auth/UserContractTests.php
+++ b/tests/Auth/UserContractTests.php
@@ -5,10 +5,13 @@
 use BadMethodCallException;
 use Facades\Statamic\Fields\BlueprintRepository;
 use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Hash;
 use Mockery;
 use Statamic\Auth\File\Role;
 use Statamic\Auth\File\UserGroup;
+use Statamic\Events\UserSaved;
+use Statamic\Events\UserSaving;
 use Statamic\Facades;
 use Statamic\Facades\Blueprint;
 use Statamic\Fields\Fieldtype;
@@ -513,6 +516,66 @@ public function additionalToArrayValues()
         return [];
     }
 
+    /**
+     * @test
+     */
+    public function it_has_a_dirty_state()
+    {
+        $user = $this->makeUser();
+        $user->email('test@test.com');
+        $user->save();
+
+        $this->assertFalse($user->isDirty());
+        $this->assertFalse($user->isDirty('email'));
+        $this->assertFalse($user->isDirty('name'));
+        $this->assertFalse($user->isDirty(['email']));
+        $this->assertFalse($user->isDirty(['name']));
+        $this->assertFalse($user->isDirty(['email', 'name']));
+        $this->assertTrue($user->isClean());
+        $this->assertTrue($user->isClean('email'));
+        $this->assertTrue($user->isClean('name'));
+        $this->assertTrue($user->isClean(['email']));
+        $this->assertTrue($user->isClean(['name']));
+        $this->assertTrue($user->isClean(['email', 'name']));
+
+        $user->email('test@tester.com');
+
+        $this->assertTrue($user->isDirty());
+        $this->assertTrue($user->isDirty('email'));
+        $this->assertFalse($user->isDirty('name'));
+        $this->assertTrue($user->isDirty(['email']));
+        $this->assertFalse($user->isDirty(['name']));
+        $this->assertTrue($user->isDirty(['email', 'name']));
+        $this->assertFalse($user->isClean());
+        $this->assertFalse($user->isClean('email'));
+        $this->assertTrue($user->isClean('name'));
+        $this->assertFalse($user->isClean(['email']));
+        $this->assertTrue($user->isClean(['name']));
+        $this->assertFalse($user->isClean(['email', 'name']));
+    }
+
+    /** @test */
+    public function it_syncs_original_at_the_right_time()
+    {
+        $eventsHandled = 0;
+
+        Event::listen(function (UserSaving $event) use (&$eventsHandled) {
+            $eventsHandled++;
+            $this->assertTrue($event->user->isDirty());
+        });
+        Event::listen(function (UserSaved $event) use (&$eventsHandled) {
+            $eventsHandled++;
+            $this->assertTrue($event->user->isDirty());
+        });
+
+        $user = $this->makeUser();
+        $user->email('test@test.com');
+        $user->save();
+
+        $this->assertFalse($user->isDirty());
+        $this->assertEquals(2, $eventsHandled);
+    }
+
     private function createRole($handle)
     {
         $class = new class($handle) extends Role
diff --git a/tests/Data/Entries/EntryTest.php b/tests/Data/Entries/EntryTest.php
index 779855bad7..8aeaadaa40 100644
--- a/tests/Data/Entries/EntryTest.php
+++ b/tests/Data/Entries/EntryTest.php
@@ -2253,6 +2253,77 @@ public function it_gets_preview_targets()
         ], $entryDe->previewTargets()->all());
     }
 
+    /**
+     * @test
+     */
+    public function it_has_a_dirty_state()
+    {
+        $collection = tap(Collection::make('test'))->save();
+        $entry = tap((new Entry)->collection($collection)->locale('en')->id('en')->data([
+            'title' => 'English',
+            'food' => 'Burger',
+            'drink' => 'Water',
+        ]))->save();
+
+        $this->assertFalse($entry->isDirty());
+        $this->assertFalse($entry->isDirty('title'));
+        $this->assertFalse($entry->isDirty('food'));
+        $this->assertFalse($entry->isDirty(['title']));
+        $this->assertFalse($entry->isDirty(['food']));
+        $this->assertFalse($entry->isDirty(['title', 'food']));
+        $this->assertTrue($entry->isClean());
+        $this->assertTrue($entry->isClean('title'));
+        $this->assertTrue($entry->isClean('food'));
+        $this->assertTrue($entry->isClean(['title']));
+        $this->assertTrue($entry->isClean(['food']));
+        $this->assertTrue($entry->isClean(['title', 'food']));
+
+        $entry->merge(['title' => 'French']);
+
+        $this->assertTrue($entry->isDirty());
+        $this->assertTrue($entry->isDirty('title'));
+        $this->assertFalse($entry->isDirty('food'));
+        $this->assertTrue($entry->isDirty(['title']));
+        $this->assertFalse($entry->isDirty(['food']));
+        $this->assertTrue($entry->isDirty(['title', 'food']));
+        $this->assertFalse($entry->isClean());
+        $this->assertFalse($entry->isClean('title'));
+        $this->assertTrue($entry->isClean('food'));
+        $this->assertFalse($entry->isClean(['title']));
+        $this->assertTrue($entry->isClean(['food']));
+        $this->assertFalse($entry->isClean(['title', 'food']));
+    }
+
+    /** @test */
+    public function it_syncs_original_at_the_right_time()
+    {
+        $eventsHandled = 0;
+
+        Event::listen(function (EntryCreating $event) use (&$eventsHandled) {
+            $eventsHandled++;
+            $this->assertTrue($event->entry->isDirty());
+        });
+        Event::listen(function (EntrySaving $event) use (&$eventsHandled) {
+            $eventsHandled++;
+            $this->assertTrue($event->entry->isDirty());
+        });
+        Event::listen(function (EntryCreated $event) use (&$eventsHandled) {
+            $eventsHandled++;
+            $this->assertTrue($event->entry->isDirty());
+        });
+        Event::listen(function (EntrySaved $event) use (&$eventsHandled) {
+            $eventsHandled++;
+            $this->assertTrue($event->entry->isDirty());
+        });
+
+        $collection = (new Collection)->handle('pages')->save();
+        $entry = (new Entry)->id('a')->collection($collection);
+        $entry->save();
+
+        $this->assertFalse($entry->isDirty());
+        $this->assertEquals(4, $eventsHandled);
+    }
+
     /** @test */
     public function it_gets_all_descendants()
     {
diff --git a/tests/Data/Taxonomies/TermTest.php b/tests/Data/Taxonomies/TermTest.php
index 31c6de4e3c..418d89e144 100644
--- a/tests/Data/Taxonomies/TermTest.php
+++ b/tests/Data/Taxonomies/TermTest.php
@@ -316,6 +316,82 @@ public function it_gets_preview_targets()
         ], $termDe->previewTargets()->all());
     }
 
+    /** @test */
+    public function it_has_a_dirty_state()
+    {
+        tap(Taxonomy::make('tags')->sites(['en', 'fr']))->save();
+
+        $term = (new Term)
+            ->taxonomy('tags')
+            ->slug('test');
+
+        $term->data([
+            'title' => 'English',
+            'food' => 'Burger',
+            'drink' => 'Water',
+        ])->save();
+
+        $this->assertFalse($term->isDirty());
+        $this->assertFalse($term->isDirty('title'));
+        $this->assertFalse($term->isDirty('food'));
+        $this->assertFalse($term->isDirty(['title']));
+        $this->assertFalse($term->isDirty(['food']));
+        $this->assertFalse($term->isDirty(['title', 'food']));
+        $this->assertTrue($term->isClean());
+        $this->assertTrue($term->isClean('title'));
+        $this->assertTrue($term->isClean('food'));
+        $this->assertTrue($term->isClean(['title']));
+        $this->assertTrue($term->isClean(['food']));
+        $this->assertTrue($term->isClean(['title', 'food']));
+
+        $term->merge(['title' => 'French']);
+
+        $this->assertTrue($term->isDirty());
+        $this->assertTrue($term->isDirty('title'));
+        $this->assertFalse($term->isDirty('food'));
+        $this->assertTrue($term->isDirty(['title']));
+        $this->assertFalse($term->isDirty(['food']));
+        $this->assertTrue($term->isDirty(['title', 'food']));
+        $this->assertFalse($term->isClean());
+        $this->assertFalse($term->isClean('title'));
+        $this->assertTrue($term->isClean('food'));
+        $this->assertFalse($term->isClean(['title']));
+        $this->assertTrue($term->isClean(['food']));
+        $this->assertFalse($term->isClean(['title', 'food']));
+    }
+
+    /** @test */
+    public function it_syncs_original_at_the_right_time()
+    {
+        $eventsHandled = 0;
+
+        Event::listen(function (TermCreating $event) use (&$eventsHandled) {
+            $eventsHandled++;
+            $this->assertTrue($event->term->isDirty());
+        });
+        Event::listen(function (TermSaving $event) use (&$eventsHandled) {
+            $eventsHandled++;
+            $this->assertTrue($event->term->isDirty());
+        });
+        Event::listen(function (TermCreated $event) use (&$eventsHandled) {
+            $eventsHandled++;
+            $this->assertTrue($event->term->isDirty());
+        });
+        Event::listen(function (TermSaved $event) use (&$eventsHandled) {
+            $eventsHandled++;
+            $this->assertTrue($event->term->isDirty());
+        });
+
+        tap(Taxonomy::make('tags'))->save();
+
+        $term = (new Term)->taxonomy('tags')->slug('test');
+        $term->dataForLocale('en', ['title' => 'The title']);
+        $term->save();
+
+        $this->assertFalse($term->isDirty());
+        $this->assertEquals(4, $eventsHandled);
+    }
+
     /** @test */
     public function it_gets_and_sets_the_layout()
     {

From b9b56adfd3ef5b36b4291266bec57e746b319316 Mon Sep 17 00:00:00 2001
From: Marty Friedel <1491079+martyf@users.noreply.github.com>
Date: Thu, 29 Feb 2024 01:23:04 +1100
Subject: [PATCH 144/149] [4.x] Support for validation Rule objects (#9332)

---
 src/Fields/ClassRuleParser.php       | 44 +++++++++++++++++
 src/Fields/Validator.php             |  6 +++
 tests/Fields/ClassRuleParserTest.php | 71 ++++++++++++++++++++++++++++
 3 files changed, 121 insertions(+)
 create mode 100644 src/Fields/ClassRuleParser.php
 create mode 100644 tests/Fields/ClassRuleParserTest.php

diff --git a/src/Fields/ClassRuleParser.php b/src/Fields/ClassRuleParser.php
new file mode 100644
index 0000000000..b952369fdd
--- /dev/null
+++ b/src/Fields/ClassRuleParser.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Statamic\Fields;
+
+use Statamic\Support\Str;
+
+class ClassRuleParser
+{
+    public function parse(string $rule): array
+    {
+        $rule = Str::substr($rule, 4);
+
+        if (! str_contains($rule, '(')) {
+            return [$rule, []];
+        }
+
+        $class = Str::before($rule, '(');
+
+        $arguments = Str::of($rule)
+            ->between('(', ')')
+            ->explode(',')
+            ->mapWithKeys(function ($arg, $key) {
+                $arg = trim($arg);
+
+                if (preg_match('/^[a-zA-Z]+: ?/', $arg)) {
+                    [$key, $arg] = explode(':', $arg, 2);
+                    $key = trim($key);
+                    $arg = trim($arg);
+                }
+
+                if (is_numeric($arg)) {
+                    return [$key => str_contains($arg, '.') ? (float) $arg : (int) $arg];
+                } elseif (Str::startsWith($arg, '"') && Str::endsWith($arg, '"')) {
+                    return [$key => (string) Str::of($arg)->trim('"')->replace('\\"', '"')];
+                } elseif (Str::startsWith($arg, "'") && Str::endsWith($arg, "'")) {
+                    return [$key => (string) Str::of($arg)->trim("'")->replace("\\'", "'")];
+                }
+
+                return [$key => $arg];
+            });
+
+        return [$class, $arguments->all()];
+    }
+}
diff --git a/src/Fields/Validator.php b/src/Fields/Validator.php
index b215b6057c..91ce5157df 100644
--- a/src/Fields/Validator.php
+++ b/src/Fields/Validator.php
@@ -124,6 +124,12 @@ public function attributes()
 
     private function parse($rule)
     {
+        if (is_string($rule) && Str::startsWith($rule, 'new ')) {
+            [$class, $arguments] = (new ClassRuleParser)->parse($rule);
+
+            return new $class(...$arguments);
+        }
+
         if (! is_string($rule) ||
             ! Str::contains($rule, '{') ||
             Str::startsWith($rule, 'regex:') ||
diff --git a/tests/Fields/ClassRuleParserTest.php b/tests/Fields/ClassRuleParserTest.php
new file mode 100644
index 0000000000..18d97578cc
--- /dev/null
+++ b/tests/Fields/ClassRuleParserTest.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace Tests\Fields;
+
+use Statamic\Fields\ClassRuleParser;
+use Tests\TestCase;
+
+class ClassRuleParserTest extends TestCase
+{
+    /**
+     * @test
+     *
+     * @dataProvider classRuleProvider
+     */
+    public function it_parses_class_rules($input, $expected)
+    {
+        $output = (new ClassRuleParser)->parse($input);
+
+        $this->assertSame($expected, $output);
+    }
+
+    public static function classRuleProvider()
+    {
+        return [
+            'just class' => [
+                'new App\MyRule',
+                ['App\MyRule', []],
+            ],
+            'single quoted string' => [
+                "new App\MyRule('foo')",
+                ['App\MyRule', ['foo']],
+            ],
+            'double quoted string' => [
+                'new App\MyRule("foo")',
+                ['App\MyRule', ['foo']],
+            ],
+            'multiple arguments' => [
+                "new App\MyRule('foo', 123, 'bar')",
+                ['App\MyRule', ['foo', 123, 'bar']],
+            ],
+            'quote in a single quoted string' => [
+                "new App\MyRule('it\'s a me mario')",
+                ['App\MyRule', ["it's a me mario"]],
+            ],
+            'double quote in a double quoted string' => [
+                'new App\MyRule("stop trying to make \"fetch\" happen")',
+                ['App\MyRule', ['stop trying to make "fetch" happen']],
+            ],
+            'only named arguments' => [
+                'new App\MyRule(a: "foo", b: 123)',
+                ['App\MyRule', ['a' => 'foo', 'b' => 123]],
+            ],
+            'only named arguments with no spaces' => [
+                'new App\MyRule(a:"foo", b:123)',
+                ['App\MyRule', ['a' => 'foo', 'b' => 123]],
+            ],
+            'some named arguments' => [
+                'new App\MyRule("foo", c: 123)',
+                ['App\MyRule', ['foo', 'c' => 123]],
+            ],
+            'non-named argument with colon' => [
+                'new App\MyRule("foo:bar")',
+                ['App\MyRule', ['foo:bar']],
+            ],
+            'named argument with colon' => [
+                'new App\MyRule(a: "foo:bar")',
+                ['App\MyRule', ['a' => 'foo:bar']],
+            ],
+        ];
+    }
+}

From f20d135dabe6920edd679e8e72224899ee56e2d5 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Wed, 28 Feb 2024 14:23:50 +0000
Subject: [PATCH 145/149] [4.x] Fix search dropdown being hidden on Taggable
 Fieldtype (#9606)

---
 resources/js/components/fieldtypes/TagsFieldtype.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/js/components/fieldtypes/TagsFieldtype.vue b/resources/js/components/fieldtypes/TagsFieldtype.vue
index b4c50681f4..1338677fbc 100644
--- a/resources/js/components/fieldtypes/TagsFieldtype.vue
+++ b/resources/js/components/fieldtypes/TagsFieldtype.vue
@@ -10,6 +10,7 @@
         :searchable="true"
         :select-on-key-codes="[9, 13, 188]"
         :taggable="true"
+        :append-to-body="true"
         :value="value"
         @input="update"
         @search:focus="$emit('focus')"

From e088b18035ecab27a80a9c2f91289b8acf877211 Mon Sep 17 00:00:00 2001
From: Duncan McClean <duncan@duncanmcclean.com>
Date: Wed, 28 Feb 2024 14:58:47 +0000
Subject: [PATCH 146/149] [4.x] Use protection scheme from data before using
 site-wide protection scheme (#9607)

---
 src/Auth/Protect/Protection.php       | 12 ++++++++----
 tests/Auth/Protect/ProtectionTest.php | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/Auth/Protect/Protection.php b/src/Auth/Protect/Protection.php
index 993b2dcfb8..ba56c52714 100644
--- a/src/Auth/Protect/Protection.php
+++ b/src/Auth/Protect/Protection.php
@@ -30,12 +30,16 @@ public function data()
 
     public function scheme()
     {
-        if ($default = config('statamic.protect.default')) {
-            return $default;
+        if (
+            $this->data
+            && $this->data instanceof Protectable
+            && $scheme = $this->data->getProtectionScheme()
+        ) {
+            return $scheme;
         }
 
-        if ($this->data && $this->data instanceof Protectable) {
-            return $this->data->getProtectionScheme();
+        if ($default = config('statamic.protect.default')) {
+            return $default;
         }
 
         return null;
diff --git a/tests/Auth/Protect/ProtectionTest.php b/tests/Auth/Protect/ProtectionTest.php
index b3339e98ae..633081c764 100644
--- a/tests/Auth/Protect/ProtectionTest.php
+++ b/tests/Auth/Protect/ProtectionTest.php
@@ -48,6 +48,20 @@ public function scheme_comes_from_data()
         $this->assertEquals('logged_in', $this->protection->scheme());
     }
 
+    /** @test */
+    public function scheme_comes_from_data_even_when_sitewide_scheme_is_defined()
+    {
+        config(['statamic.protect.default' => 'logged_in']);
+        config(['statamic.protect.schemes.logged_in' => [
+            'driver' => 'auth',
+            'form_url' => '/login',
+        ]]);
+
+        $this->protection->setData($this->createEntryWithScheme('password'));
+
+        $this->assertEquals('password', $this->protection->scheme());
+    }
+
     /** @test */
     public function if_the_data_isnt_protectable_it_doesnt_get_a_scheme()
     {

From d2dc38494d672fcff6e962f0a4742763d33dd49b Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 28 Feb 2024 10:24:29 -0500
Subject: [PATCH 147/149] changelog

---
 CHANGELOG.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70127a84cb..96de2ffcfb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Release Notes
 
+## 4.51.0 (2024-02-28)
+
+### What's new
+- Add `isDirty` / `isClean`. [#5502](https://github.com/statamic/cms/issues/5502) by @ryanmitchell
+- Support for validation Rule objects. [#9332](https://github.com/statamic/cms/issues/9332) by @martyf
+
+### What's fixed
+- Use protection scheme from data before using site-wide protection scheme. [#9607](https://github.com/statamic/cms/issues/9607) by @duncanmcclean
+- Fix search dropdown being hidden on Taggable Fieldtype. [#9606](https://github.com/statamic/cms/issues/9606) by @duncanmcclean
+- Tweak SuggestsConditionalFields behaviour when dealing with a fields prefix. [#9592](https://github.com/statamic/cms/issues/9592) by @martyf
+- Only run custom validation errors when not precognitive. [#9599](https://github.com/statamic/cms/issues/9599) by @ryanmitchell
+- Fix docblock of FluentTag param method. [#9601](https://github.com/statamic/cms/issues/9601) by @ajnsn
+- Fix pixel gap on relationship fieldtype items and prevent padding issue. [#9597](https://github.com/statamic/cms/issues/9597) by @robdekort
+
+
+
 ## 4.50.0 (2024-02-26)
 
 ### What's new

From 901fa9d9b1a5a17fa202db3592762bf5677e80f4 Mon Sep 17 00:00:00 2001
From: Nicolas P <0kyn.dev@gmail.com>
Date: Wed, 28 Feb 2024 22:14:27 +0100
Subject: [PATCH 148/149] [4.x] Fix page url value in TreeBuilder (#9611)

---
 src/Structures/TreeBuilder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Structures/TreeBuilder.php b/src/Structures/TreeBuilder.php
index 1ab105cf7f..a99f73bf91 100644
--- a/src/Structures/TreeBuilder.php
+++ b/src/Structures/TreeBuilder.php
@@ -90,7 +90,7 @@ protected function transformTreeForController($tree)
                 'entry' => $page->reference(),
                 'title' => $page->hasCustomTitle() ? $page->title() : null,
                 'entry_title' => $page->referenceExists() ? $page->entry()->value('title') : null,
-                'url' => $page->referenceExists() ? null : $page->url(),
+                'url' => $page->referenceExists() ? $page->url() : null,
                 'edit_url' => $page->editUrl(),
                 'can_delete' => $page->referenceExists() ? User::current()->can('delete', $page->entry()) : true,
                 'slug' => $page->slug(),

From 341c86f9e11e851bfc5fba5e9cb2bcd8d97654c6 Mon Sep 17 00:00:00 2001
From: Sylvester Damgaard <syda@tv2reg.dk>
Date: Wed, 28 Feb 2024 22:15:08 +0100
Subject: [PATCH 149/149] [4.x] Filter away bad bard nodes during preprocessing
 (#9608)

---
 src/Fieldtypes/Bard.php       |  7 +++++++
 tests/Fieldtypes/BardTest.php | 14 ++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/src/Fieldtypes/Bard.php b/src/Fieldtypes/Bard.php
index 4add244408..8d33306636 100644
--- a/src/Fieldtypes/Bard.php
+++ b/src/Fieldtypes/Bard.php
@@ -349,6 +349,13 @@ protected function processRow($row, $index)
 
     public function preProcess($value)
     {
+        // Filter out broken nodes
+        if (is_array($value)) {
+            $value = collect($value)->filter(function ($node) {
+                return array_key_exists('type', $node);
+            })->values()->all();
+        }
+
         if (empty($value) || $value === '[]') {
             return '[]';
         }
diff --git a/tests/Fieldtypes/BardTest.php b/tests/Fieldtypes/BardTest.php
index 57ecb6887c..3374548667 100644
--- a/tests/Fieldtypes/BardTest.php
+++ b/tests/Fieldtypes/BardTest.php
@@ -1211,6 +1211,20 @@ public function augment($value)
         $this->assertEquals('test.-1.words', $value['defaults']['one']['words']);
     }
 
+    /** @test */
+    public function it_filters_away_bad_nodes()
+    {
+        $data = [
+            [],
+            ['type' => 'text', 'text' => 'This is inline text.'],
+            ['text' => 'I have no type'],
+        ];
+
+        $expected = '[{"type":"paragraph","content":[{"type":"text","text":"This is inline text."}]}]';
+
+        $this->assertEquals($expected, $this->bard(['input_mode' => 'block', 'sets' => null])->preProcess($data));
+    }
+
     private function bard($config = [])
     {
         return (new Bard)->setField(new Field('test', array_merge(['type' => 'bard', 'sets' => ['one' => []]], $config)));