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/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
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/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;
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..c513dccc3f 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
@@ -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/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/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/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/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() {
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/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) {
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/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;
         }
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/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 />
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/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/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());
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;
         }
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/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)
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();
 
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()
     {
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/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/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/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/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/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();
+    }
+}
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, ':')) {
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/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)
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(),
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);
diff --git a/src/Modifiers/CoreModifiers.php b/src/Modifiers/CoreModifiers.php
index e3e35e1891..34034b252d 100644
--- a/src/Modifiers/CoreModifiers.php
+++ b/src/Modifiers/CoreModifiers.php
@@ -2902,10 +2902,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;
     }
 
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(),
         ];
     }
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/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/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 9e59263341..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;
@@ -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'
+        );
+    }
 }
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/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', []);
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/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/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 fbb8c90dd5..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],
@@ -1091,12 +1091,132 @@ 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)));
     }
 
-    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/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/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 a86bf5f1dd..b69b584021 100644
--- a/tests/Fieldtypes/ReplicatorTest.php
+++ b/tests/Fieldtypes/ReplicatorTest.php
@@ -613,7 +613,85 @@ public function it_converts_a_queryable_value()
         $this->assertEquals([['foo' => 'bar']], (new Replicator)->toQueryableValue([['foo' => 'bar']]));
     }
 
-    public function groupedSetsProvider()
+    /**
+     * @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 static function groupedSetsProvider()
     {
         return [
             'grouped sets (new)' => [true],
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/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/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);
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/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 */
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>