From 5185caa7f3eb18679d8fa7db4d6e52725af65b43 Mon Sep 17 00:00:00 2001
From: Casey Dwyer <casey@cubitcreative.com>
Date: Mon, 9 Oct 2023 14:47:28 -0500
Subject: [PATCH 01/36] [4.x] Bug: Fix Section fieldtype first-child's
 top-margin (#8822)

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

diff --git a/resources/css/components/fieldtypes/section.css b/resources/css/components/fieldtypes/section.css
index dca53e719f..5600d19185 100644
--- a/resources/css/components/fieldtypes/section.css
+++ b/resources/css/components/fieldtypes/section.css
@@ -9,11 +9,11 @@
     &.form-group {
         position: relative;
         &:first-child {
-            @apply rounded-t-md border-t-0;
+            @apply mt-0 rounded-t-md border-t-0;
         }
 
         &:last-child {
-            @apply rounded-b-md mt-0;
+            @apply rounded-b-md;
         }
 
         .field-inner > label {

From 20f159e2d7f6205ee345ca4e6ab022a9cf4e132f Mon Sep 17 00:00:00 2001
From: John Koster <john@stillat.com>
Date: Mon, 9 Oct 2023 15:02:57 -0500
Subject: [PATCH 02/36] [4.x] Makes using the Icon fieldtype with the SVG tag
 simpler (#8815)

---
 src/Fieldtypes/Icon.php       |  4 +++-
 src/Tags/Svg.php              |  6 ++++++
 tests/Fieldtypes/IconTest.php | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 tests/Fieldtypes/IconTest.php

diff --git a/src/Fieldtypes/Icon.php b/src/Fieldtypes/Icon.php
index 362bf7bb47..33ab650204 100644
--- a/src/Fieldtypes/Icon.php
+++ b/src/Fieldtypes/Icon.php
@@ -9,6 +9,8 @@
 
 class Icon extends Fieldtype
 {
+    public const DEFAULT_FOLDER = 'regular';
+
     protected $categories = ['media'];
     protected $icon = 'icon_picker';
 
@@ -71,7 +73,7 @@ private function resolveParts()
 
         $folder = $this->config(
             'folder',
-            $hasConfiguredDirectory ? null : 'regular' // Only apply a default folder if using Statamic icons.
+            $hasConfiguredDirectory ? null : self::DEFAULT_FOLDER // Only apply a default folder if using Statamic icons.
         );
 
         $path = Path::tidy($directory.'/'.$folder);
diff --git a/src/Tags/Svg.php b/src/Tags/Svg.php
index 212ff3999b..8ac9d502ce 100644
--- a/src/Tags/Svg.php
+++ b/src/Tags/Svg.php
@@ -5,6 +5,7 @@
 use Rhukster\DomSanitizer\DOMSanitizer;
 use Statamic\Facades\File;
 use Statamic\Facades\URL;
+use Statamic\Fieldtypes\Icon;
 use Statamic\Support\Str;
 use Stringy\StaticStringy;
 
@@ -28,6 +29,7 @@ public function index()
             resource_path(),
             public_path('svg'),
             public_path(),
+            statamic_path('resources/svg/icons/'.Icon::DEFAULT_FOLDER),
         ];
 
         $svg = null;
@@ -42,6 +44,10 @@ public function index()
             }
         }
 
+        if (! $svg && Str::startsWith(mb_strtolower(trim($name)), '<svg')) {
+            $svg = $this->params->get('src');
+        }
+
         $attributes = $this->renderAttributesFromParams(['src', 'title', 'desc']);
 
         if ($this->params->get('title') || $this->params->get('desc')) {
diff --git a/tests/Fieldtypes/IconTest.php b/tests/Fieldtypes/IconTest.php
new file mode 100644
index 0000000000..9600b1c876
--- /dev/null
+++ b/tests/Fieldtypes/IconTest.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Tests\Fieldtypes;
+
+use Statamic\Facades\Antlers;
+use Statamic\Fields\Field;
+use Statamic\Fields\Value;
+use Statamic\Fieldtypes\Icon;
+use Tests\TestCase;
+
+class IconTest extends TestCase
+{
+    /** @test */
+    public function it_finds_default_icons()
+    {
+        $result = (string) Antlers::parse('{{ svg src="{test|raw}" }}', ['test' => new Value('add', $this->fieldtype())]);
+
+        $this->assertStringContainsString('<svg', $result);
+    }
+
+    /** @test */
+    public function it_accepts_svg_strings()
+    {
+        $result = (string) Antlers::parse('{{ svg :src="test" class="w-4 h-4" }}', ['test' => new Value('add', $this->fieldtype())]);
+
+        $this->assertStringContainsString('<svg class="w-4 h-4"', $result);
+    }
+
+    private function fieldtype($config = [])
+    {
+        return (new Icon)->setField(new Field('test', array_merge(['type' => 'icon'], $config)));
+    }
+}

From a44049705eab98c659422f11d88d83e52da32c51 Mon Sep 17 00:00:00 2001
From: Jack Sleight <jacksleight@gmail.com>
Date: Mon, 9 Oct 2023 21:03:58 +0100
Subject: [PATCH 03/36] [4.x] Bard link email, phone and relationship options
 (#8777)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 .../fieldtypes/bard/LinkToolbar.vue           | 202 ++++++++++++------
 .../fieldtypes/bard/LinkToolbarButton.vue     |   2 +-
 src/Fieldtypes/Bard/LinkMark.php              |   7 +
 3 files changed, 148 insertions(+), 63 deletions(-)

diff --git a/resources/js/components/fieldtypes/bard/LinkToolbar.vue b/resources/js/components/fieldtypes/bard/LinkToolbar.vue
index 448ac259b5..46b12e46ed 100644
--- a/resources/js/components/fieldtypes/bard/LinkToolbar.vue
+++ b/resources/js/components/fieldtypes/bard/LinkToolbar.vue
@@ -2,68 +2,93 @@
 
     <div class="bard-link-toolbar">
         <div>
-            <!-- Link type select -->
-            <div class="flex items-center px-4 py-2 border-b">
-
-                <button
-                    class="button-tab"
-                    v-for="visibleLinkType in visibleLinkTypes"
-                    :class="{active: visibleLinkType.type === linkType}"
-                    :for="visibleLinkType.type"
-                    :key="visibleLinkType.type"
-                    :id="visibleLinkType.type"
-                    @click="setLinkType(visibleLinkType.type)"
-                >
-                    {{ visibleLinkType.title }}
-                </button>
-            </div>
-
             <div class="px-4 py-4 border-b">
-                <div class="h-8 mb-4 p-2 bg-gray-100 text-gray-800 w-full border rounded shadow-inner placeholder:text-gray-600 flex items-center">
 
-                    <!-- URL input -->
-                    <input
-                        v-if="linkType === 'url'"
-                        v-model="url.url"
-                        type="text"
-                        ref="urlInput"
-                        class="input h-auto text-sm"
-                        placeholder="URL"
-                        @keydown.enter.prevent="commit"
-                    />
+                <div class="flex">
 
-                    <!-- Data input -->
-                    <div
-                        v-else
-                        class="w-full flex items-center justify-between cursor-pointer"
-                        @click="openSelector"
-                    >
-
-                        <loading-graphic v-if="isLoading" :inline="true" />
-
-                        <div v-else class="flex-1 flex items-center mr-2 truncate">
-                            <img
-                                v-if="linkType === 'asset' && itemData.asset && itemData.isImage"
-                                :src="itemData.asset.thumbnail || itemData.asset.url"
-                                class="asset-thumbnail max-h-full max-w-full rounded w-6 h-6 mr-2 object-cover lazyloaded"
+                    <div class="h-8 mb-4 bg-gray-100 text-gray-800 border rounded shadow-inner flex items-center mr-1">
+                        <select
+                            class="input w-auto text-sm px-1"
+                            v-model="linkType">
+                            <option
+                                v-for="visibleLinkType in visibleLinkTypes"
+                                :value="visibleLinkType.type"
                             >
-                            {{ displayValue }}
-                        </div>
+                                {{ visibleLinkType.title }}
+                            </option>
+                        </select>
+                    </div>
 
-                        <button
-                        class="flex items-center"
-                            v-tooltip="`${__('Browse')}...`"
-                            :aria-label="`${__('Browse')}...`"
+                    <div class="h-8 mb-4 p-2 bg-gray-100 text-gray-800 w-full border rounded shadow-inner placeholder:text-gray-600 flex items-center">
+    
+                        <!-- URL input -->
+                        <input
+                            v-if="linkType === 'url'"
+                            v-model="url.url"
+                            type="text"
+                            ref="urlInput"
+                            class="input h-auto text-sm"
+                            placeholder="URL"
+                            @keydown.enter.prevent="commit"
+                        />
+    
+                        <!-- Email input -->
+                        <input
+                            v-else-if="linkType === 'mailto'"
+                            v-model="urlData.mailto"
+                            type="text"
+                            ref="mailtoInput"
+                            class="input h-auto text-sm"
+                            placeholder="Email Address"
+                            @keydown.enter.prevent="commit"
+                        />
+    
+                        <!-- Phone input -->
+                        <input
+                            v-else-if="linkType === 'tel'"
+                            v-model="urlData.tel"
+                            type="text"
+                            ref="telInput"
+                            class="input h-auto text-sm"
+                            placeholder="Phone Number"
+                            @keydown.enter.prevent="commit"
+                        />
+    
+                        <!-- Data input -->
+                        <div
+                            v-else
+                            class="w-full flex items-center justify-between cursor-pointer"
                             @click="openSelector"
                         >
-                            <svg-icon v-show="linkType === 'asset'" name="folder-image" class="h-4 w-4" />
-                            <svg-icon v-show="linkType !== 'asset'" name="folder-generic" class="h-4 w-4" />
-                        </button>
-
+    
+                            <loading-graphic v-if="isLoading" :inline="true" />
+    
+                            <div v-else class="flex-1 flex items-center mr-2 truncate">
+                                <img
+                                    v-if="linkType === 'asset' && itemData.asset && itemData.isImage"
+                                    :src="itemData.asset.thumbnail || itemData.asset.url"
+                                    class="asset-thumbnail max-h-full max-w-full rounded w-6 h-6 mr-2 object-cover lazyloaded"
+                                >
+                                {{ displayValue }}
+                            </div>
+    
+                            <button
+                            class="flex items-center"
+                                v-tooltip="`${__('Browse')}...`"
+                                :aria-label="`${__('Browse')}...`"
+                                @click="openSelector"
+                            >
+                                <svg-icon v-show="linkType === 'asset'" name="folder-image" class="h-4 w-4" />
+                                <svg-icon v-show="linkType !== 'asset'" name="folder-generic" class="h-4 w-4" />
+                            </button>
+    
+                        </div>
+    
                     </div>
-
+                    
                 </div>
 
+
                 <!-- Title attribute -->
                 <div class="h-8 mb-4 p-2 bg-gray-100 text-gray-800 w-full border rounded shadow-inner placeholder:text-gray-600 flex items-center" >
                     <input
@@ -75,7 +100,18 @@
                     />
                 </div>
 
-                <label for="target-blank" class="flex items-center font-normal cursor-pointer text-gray-800 hover:text-black">
+                <!-- Rel attribute -->
+                <div class="h-8 p-2 bg-gray-100 text-gray-800 w-full border rounded shadow-inner placeholder:text-gray-600 flex items-center" >
+                    <input
+                        type="text"
+                        ref="input"
+                        v-model="rel"
+                        class="input h-auto text-sm placeholder-gray-50"
+                        :placeholder="`${__('Relationship')} (${__('Optional')})`"
+                    />
+                </div>
+
+                <label for="target-blank" class="mt-4 flex items-center font-normal cursor-pointer text-gray-800 hover:text-black" v-if="canHaveTarget">
                     <input class="checkbox mr-2" type="checkbox" v-model="targetBlank" id="target-blank">
                     {{ __('Open in new window') }}
                 </label>
@@ -170,10 +206,14 @@ export default {
                 { type: 'url', title: __('URL') },
                 { type: 'entry', title: __('Entry') },
                 { type: 'asset', title: __('Asset') },
+                { type: 'mailto', title: __('Email') },
+                { type: 'tel', title: __('Phone') },
             ],
             url: {},
+            urlData: {},
             itemData: {},
             title: null,
+            rel: null,
             targetBlank: null,
             showAssetSelector: false,
             isLoading: false,
@@ -199,6 +239,10 @@ export default {
                     return this.itemData.entry ? this.itemData.entry.title : null;
                 case 'asset':
                     return this.itemData.asset ? this.itemData.asset.basename : null;
+                case 'mailto':
+                    return this.urlData.mailto ? this.urlData.mailto : null;
+                case 'tel':
+                    return this.urlData.tel ? this.urlData.tel : null;
             }
         },
 
@@ -210,7 +254,7 @@ export default {
             return this.sanitizeLink(this.url[this.linkType]);
         },
 
-        rel() {
+        defaultRel() {
             let rel = [];
             if (this.config.link_noopener) rel.push('noopener');
             if (this.config.link_noreferrer) rel.push('noreferrer');
@@ -251,7 +295,11 @@ export default {
 
         collections() {
             return this.bard.meta.linkCollections;
-        }
+        },
+
+        canHaveTarget() {
+            return ['url', 'entry', 'asset'].includes(this.linkType);
+        },
 
     },
 
@@ -259,7 +307,19 @@ export default {
 
         linkType() {
             this.autofocus();
-        }
+        },
+
+        urlData: {
+            deep: true,
+            handler() {
+                if (!['mailto', 'tel'].includes(this.linkType)) {
+                    return;
+                }
+                this.setUrl(this.linkType, this.urlData[this.linkType]
+                    ? `${this.linkType}:${this.urlData[this.linkType]}`
+                    : null);
+            },
+        },
 
     },
 
@@ -285,18 +345,18 @@ export default {
             this.linkType = this.getLinkTypeForUrl(attrs.href);
 
             this.url = { [this.linkType]: attrs.href };
+            this.urlData = { [this.linkType]: this.getUrlDataForUrl(attrs.href) };
             this.itemData = { [this.linkType]: this.getItemDataForUrl(attrs.href) };
 
             this.title = attrs.title;
+            this.rel = attrs.href 
+                ? attrs.rel
+                : this.defaultRel;
             this.targetBlank = attrs.href
                 ? attrs.target === '_blank'
                 : this.config.target_blank;
         },
 
-        setLinkType(type) {
-            this.linkType = type;
-        },
-
         autofocus() {
             if (this.linkType === 'url') {
                 this.$nextTick(() => {
@@ -333,7 +393,7 @@ export default {
             this.$emit('updated', {
                 href: this.href,
                 rel: this.rel,
-                target: this.targetBlank ? '_blank' : null,
+                target: (this.canHaveTarget && this.targetBlank) ? '_blank' : null,
                 title: this.title,
             });
         },
@@ -404,7 +464,25 @@ export default {
 
         getLinkTypeForUrl(url) {
             const { type } = this.parseDataUrl(url);
-            return type || 'url';
+            if (type) {
+                return type;
+            }
+
+            const matches = url ? url.match(/^(mailto|tel):(.*)$/) : null;
+            if (matches) {
+                return matches[1];
+            }
+
+            return 'url';
+        },
+
+        getUrlDataForUrl(url) {
+            const matches = url ? url.match(/^(mailto|tel):(.*)$/) : null;
+            if (! matches) {
+                return null;
+            }
+
+            return matches[2];
         },
 
         getItemDataForUrl(url) {
diff --git a/resources/js/components/fieldtypes/bard/LinkToolbarButton.vue b/resources/js/components/fieldtypes/bard/LinkToolbarButton.vue
index ff02bc6092..372e7478fe 100644
--- a/resources/js/components/fieldtypes/bard/LinkToolbarButton.vue
+++ b/resources/js/components/fieldtypes/bard/LinkToolbarButton.vue
@@ -13,7 +13,7 @@
         </template>
         <template #default>
             <link-toolbar
-                class="w-80"
+                class="w-84"
                 ref="toolbar"
                 v-if="showingToolbar"
                 :link-attrs="linkAttrs"
diff --git a/src/Fieldtypes/Bard/LinkMark.php b/src/Fieldtypes/Bard/LinkMark.php
index 96aafeaf4d..91f21ec4d2 100644
--- a/src/Fieldtypes/Bard/LinkMark.php
+++ b/src/Fieldtypes/Bard/LinkMark.php
@@ -43,6 +43,13 @@ public function addAttributes()
                 },
             ],
             'title' => [],
+            'rel' => [
+                'renderHTML' => function ($attributes) {
+                    return [
+                        'rel' => $attributes->rel ?? '',
+                    ];
+                },
+            ],
         ];
     }
 

From a9344ba83ea52be51cd7f33898fdc9ca9ede2621 Mon Sep 17 00:00:00 2001
From: Jack Sleight <jacksleight@gmail.com>
Date: Mon, 9 Oct 2023 21:05:12 +0100
Subject: [PATCH 04/36] [4.x] Improve initial render speed of replicators with
 many sets (#8716)

---
 .../fieldtypes/replicator/Replicator.vue      | 25 +++++++++++--------
 .../components/fieldtypes/replicator/Set.vue  |  4 +--
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/resources/js/components/fieldtypes/replicator/Replicator.vue b/resources/js/components/fieldtypes/replicator/Replicator.vue
index 48a28ed19a..602bf22e03 100644
--- a/resources/js/components/fieldtypes/replicator/Replicator.vue
+++ b/resources/js/components/fieldtypes/replicator/Replicator.vue
@@ -133,6 +133,7 @@ export default {
         return {
             focused: false,
             collapsed: clone(this.meta.collapsed),
+            previews: this.meta.previews,
             fullScreenMode: false,
             provide: {
                 storeName: this.storeName
@@ -142,10 +143,6 @@ export default {
 
     computed: {
 
-        previews() {
-            return this.meta.previews;
-        },
-
         canAddSet() {
             if (this.isReadOnly) return false;
 
@@ -242,13 +239,7 @@ export default {
         },
 
         updateSetPreviews(id, previews) {
-            this.updateMeta({
-                ...this.meta,
-                previews: {
-                    ...this.meta.previews,
-                    [id]: previews,
-                },
-            });
+            this.previews[id] = previews;
         },
 
         collapseSet(id) {
@@ -314,6 +305,18 @@ export default {
             this.updateMeta({ ...this.meta, collapsed: clone(collapsed) });
         },
 
+        previews: {
+            deep: true,
+            handler(value) {
+                if (JSON.stringify(this.meta.previews) === JSON.stringify(value)) {
+                    return
+                }
+                const meta = this.meta;
+                meta.previews = value;
+                this.updateMeta(meta);
+            }
+        },
+
     }
 
 }
diff --git a/resources/js/components/fieldtypes/replicator/Set.vue b/resources/js/components/fieldtypes/replicator/Set.vue
index a8e2cb8794..675927142f 100644
--- a/resources/js/components/fieldtypes/replicator/Set.vue
+++ b/resources/js/components/fieldtypes/replicator/Set.vue
@@ -166,9 +166,7 @@ export default {
         },
 
         previewUpdated(handle, value) {
-            setTimeout(() => {
-                this.$emit('previews-updated', { ...this.previews, [handle]: value });
-            }, 0);
+            this.$emit('previews-updated', { ...this.previews, [handle]: value });
         },
 
         destroy() {

From eef1f28b3ecf7033bef01a7d65863ad10b13d411 Mon Sep 17 00:00:00 2001
From: Jack Sleight <jacksleight@gmail.com>
Date: Mon, 9 Oct 2023 21:59:35 +0100
Subject: [PATCH 05/36] [4.x] Improve post-save performance with many Bard and
 Revealer fields (#8712)

---
 resources/js/components/publish/HasHiddenFields.js |  4 +---
 resources/js/components/publish/Values.js          | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/publish/HasHiddenFields.js b/resources/js/components/publish/HasHiddenFields.js
index 735e653a3c..25a215b18c 100644
--- a/resources/js/components/publish/HasHiddenFields.js
+++ b/resources/js/components/publish/HasHiddenFields.js
@@ -36,9 +36,7 @@ export default {
             let originalValues = new Values(this.values, this.jsonSubmittingFields);
             let newValues = new Values(responseValues, this.jsonSubmittingFields);
 
-            preserveFields.forEach(dottedKey => {
-                newValues.set(dottedKey, originalValues.get(dottedKey));
-            });
+            newValues.mergeDottedKeys(preserveFields, originalValues);
 
             return newValues.all();
         },
diff --git a/resources/js/components/publish/Values.js b/resources/js/components/publish/Values.js
index ba4c8a9990..59dc2b9467 100644
--- a/resources/js/components/publish/Values.js
+++ b/resources/js/components/publish/Values.js
@@ -39,6 +39,20 @@ export default class Values {
         return this;
     }
 
+    mergeDottedKeys(dottedKeys, values)  {
+        let decodedValues = new this.constructor(clone(values.values), values.jsonFields)
+            .jsonDecode()
+            .values;
+
+        this.jsonDecode();
+        dottedKeys.forEach(dottedKey => {
+            data_set(this.values, dottedKey, data_get(decodedValues, dottedKey));
+        });
+        this.jsonEncode();
+
+        return this;
+    }
+
     except(dottedKeys) {
         return this.jsonDecode()
             .rejectValuesByKey(dottedKeys)

From d638862cda762912ab61468889bb01261270fefa Mon Sep 17 00:00:00 2001
From: Jeroen Peters <mail@jeroenpeters.com>
Date: Tue, 10 Oct 2023 18:00:07 +0200
Subject: [PATCH 06/36] [4.x] Dutch translations (#8823)

Co-authored-by: Jeroen Peters <jeroenpeters@impres.nl>
---
 resources/lang/nl.json           |   3 +
 resources/lang/nl/fieldtypes.php |   1 +
 resources/lang/nl/validation.php | 108 ++++++++++++++++++++++---------
 3 files changed, 80 insertions(+), 32 deletions(-)

diff --git a/resources/lang/nl.json b/resources/lang/nl.json
index 9fd8d962ea..c879e36212 100644
--- a/resources/lang/nl.json
+++ b/resources/lang/nl.json
@@ -137,6 +137,7 @@
     "Before": "Voor",
     "Behavior": "Gedrag",
     "Below": "Onder",
+    "Between": "Tussen",
     "Blockquote": "Blockquote",
     "Blueprint": "Blueprint",
     "Blueprint created": "Blueprint aangemaakt",
@@ -497,6 +498,7 @@
     "Inline": "Inline",
     "Inline Code": "Inline code",
     "Inline Label": "Inline label",
+    "Inline Label when True": "Inline label als waar",
     "Input Behavior": "Invoer Gedrag",
     "Input Label": "Inputlabel",
     "Input Type": "Inputtype",
@@ -659,6 +661,7 @@
     "Per Page": "Per pagina",
     "Per-site": "Per site",
     "Permissions": "Permissies",
+    "Phone": "Telefoon",
     "PHP Info": "PHP-Info",
     "Pick Color": "Kies een kleur",
     "Pin to Favorites": "Vastpinnen aan favorieten",
diff --git a/resources/lang/nl/fieldtypes.php b/resources/lang/nl/fieldtypes.php
index 56471c5475..4bed4bdc2b 100644
--- a/resources/lang/nl/fieldtypes.php
+++ b/resources/lang/nl/fieldtypes.php
@@ -176,6 +176,7 @@
     'time.config.seconds_enabled' => 'Toon seconden in de tijdpicker.',
     'time.title' => 'Time',
     'toggle.config.inline_label' => 'Een inline label die naast de toggle getoond wordt.',
+    'toggle.config.inline_label_when_true' => 'Een inline label die naast de toggle getoond wordt als de waarde true is.',
     'toggle.title' => 'Toggle',
     'user_groups.title' => 'User Groups',
     'user_roles.title' => 'User Roles',
diff --git a/resources/lang/nl/validation.php b/resources/lang/nl/validation.php
index a0944fe934..80d05e4594 100644
--- a/resources/lang/nl/validation.php
+++ b/resources/lang/nl/validation.php
@@ -2,6 +2,7 @@
 
 return [
     'accepted' => 'Moet worden geaccepteerd',
+    'accepted_if' => 'Moet worden geaccepteerd als :other :value is.',
     'active_url' => 'Dit is geen geldige URL.',
     'after' => 'Moet een datum zijn na :date.',
     'after_or_equal' => 'Moet een datum zijn na of gelijk aan :date.',
@@ -9,35 +10,50 @@
     'alpha_dash' => 'Mag alleen letters, nummers, streepjes en lage streepjes bevatten.',
     'alpha_num' => 'Mag alleen cijfers en letters bevatten.',
     'array' => 'Moet een array zijn.',
+    'ascii' => 'ASCII',
     'before' => 'Moet een datum zijn voor :date.',
     'before_or_equal' => 'Moet een datum zijn voor of gelijk aan :date.',
-    'between.numeric' => 'Moet tussen :min en :max zitten.',
-    'between.file' => 'Moet tussen :min en :max kilobytes zitten.',
-    'between.string' => 'Moet tussen de :min en :max aantal karakters zitten.',
-    'between.array' => 'Moet minimaal tussen de :min en :max items bevatten.',
+    'between' => [
+        'array' => 'Moet minimaal tussen de :min en :max items bevatten.',
+        'file' => 'Moet tussen :min en :max kilobytes zitten.',
+        'numeric' => 'Moet tussen :min en :max zitten.',
+        'string' => 'Moet tussen de :min en :max aantal karakters zitten.',
+    ],
     'boolean' => 'Moet true of false zijn.',
+    'can' => 'Bevat een niet toegestane waarde.',
     'confirmed' => 'De bevestiging komt niet overeen.',
     'current_password' => 'Huidig wachtwoord is onjuist.',
     'date' => 'Geen geldige datum.',
+    'date_equals' => 'Moet een datum zijn gelijk aan :date.',
     'date_format' => 'Voldoet niet aan het :format formaat.',
+    'decimal' => 'Moet :decimal decimalen bevatten.',
+    'declined' => 'Moet worden afgewezen.',
+    'declined_if' => 'Moet worden afgewezen als :other :value is.',
     'different' => 'Dit veld en :other moeten verschillend zijn.',
     'digits' => 'Moet :digits cijfers zijn.',
     'digits_between' => 'Moet tussen de :min en :max aantal cijfers zitten.',
     'dimensions' => 'Geen geldige afbeeldingsafmetingen.',
     'distinct' => 'Dit veld heeft een dubbele waarde.',
+    'doesnt_end_with' => 'Mag niet eindigen met :values.',
+    'doesnt_start_with' => 'Mag niet beginnen met :values.',
     'email' => 'Moet een geldig e-mailadres zijn.',
     'ends_with' => 'Moet eindigen op :values',
+    'enum' => 'De geselecteerde :attribute is ongeldig.',
     'exists' => 'Dit is niet geldig.',
     'file' => 'Moet een bestand zijn.',
     'filled' => 'Moet een waarde hebben.',
-    'gt.numeric' => 'Moet hoger zijn dan :value.',
-    'gt.file' => 'Moet groter zijn dan :value kilobytes.',
-    'gt.string' => 'Moet groter zijn dan :value karakters.',
-    'gt.array' => 'Moet meer dan :value items bevatten.',
-    'gte.numeric' => 'Moet groter zijn dan of gelijk aan :value.',
-    'gte.file' => 'Moet groter zijn dan of gelijk aan :value kilobytes.',
-    'gte.string' => 'Moet groter zijn dan of gelijk aan :value karakters.',
-    'gte.array' => 'Moet :value items of meer hebben.',
+    'gt' => [
+        'array' => 'Moet meer dan :value items bevatten.',
+        'file' => 'Moet groter zijn dan :value kilobytes.',
+        'numeric' => 'Moet hoger zijn dan :value.',
+        'string' => 'Moet groter zijn dan :value karakters.',
+    ],
+    'gt' => [
+        'numeric' => 'Moet groter zijn dan of gelijk aan :value.',
+        'file' => 'Moet groter zijn dan of gelijk aan :value kilobytes.',
+        'string' => 'Moet groter zijn dan of gelijk aan :value karakters.',
+        'array' => 'Moet :value items of meer hebben.',
+    ],
     'image' => 'Moet een afbeelding zijn.',
     'in' => 'Dit is ongeldig.',
     'in_array' => 'Dit veld bestaat niet in :other.',
@@ -47,47 +63,75 @@
     'ipv6' => 'Moet een geldig IPv6-adres zijn.',
     'json' => 'Moet een geldige JSON-string zijn.',
     'lowercase' => 'Moet in kleine letters zijn.',
-    'lt.numeric' => 'Moet kleiner zijn dan :value.',
-    'lt.file' => 'Moet kleiner zijn dan :value kilobytes.',
-    'lt.string' => 'Moet kleiner zijn dan :value karakters.',
-    'lt.array' => 'Moet minder dan :value items bevatten.',
-    'lte.numeric' => 'Moet kleiner zijn dan of gelijk aan :value.',
-    'lte.file' => 'Moet kleiner zijn dan of gelijk aan :value kilobytes.',
-    'lte.string' => 'Moet kleiner zijn dan of gelijk aan :value karakters.',
-    'lte.array' => 'Mag niet meer dan :items bevatten.',
-    'max.numeric' => 'Mag niet groter zijn dan :max.',
-    'max.file' => 'Mag niet groter zijn dan :max kilobytes.',
-    'max.string' => 'Mag niet langer zijn dan :max karakters.',
-    'max.array' => 'Mag niet meer dan :items bevatten.',
+    'lt' => [
+        'numeric' => 'Moet kleiner zijn dan :value.',
+        'file' => 'Moet kleiner zijn dan :value kilobytes.',
+        'string' => 'Moet kleiner zijn dan :value karakters.',
+        'array' => 'Moet minder dan :value items bevatten.',
+    ],
+    'lte' => [
+        'numeric' => 'Moet kleiner zijn dan of gelijk aan :value.',
+        'file' => 'Moet kleiner zijn dan of gelijk aan :value kilobytes.',
+        'string' => 'Moet kleiner zijn dan of gelijk aan :value karakters.',
+        'array' => 'Mag niet meer dan :items bevatten.',
+    ],
+    'mac_address' => 'Moet een geldig MAC-adres zijn.',
+    'max' => [
+        'numeric' => 'Mag niet groter zijn dan :max.',
+        'file' => 'Mag niet groter zijn dan :max kilobytes.',
+        'string' => 'Mag niet langer zijn dan :max karakters.',
+        'array' => 'Mag niet meer dan :items bevatten.',
+    ],
+    'max_digits' => 'Mag niet meer dan :max cijfers bevatten.',
     'mimes' => 'Moet een bestand zijn van het type: :values.',
     'mimetypes' => 'Moet een bestand zijn van het type: values.',
-    'min.numeric' => 'Moet minimaal :min zijn.',
-    'min.file' => 'Moet minimaal :min kilobytes zijn.',
-    'min.string' => 'Moet minimaal :min karakters lang zijn.',
-    'min.array' => 'Moet minimaal :min items bevatten.',
+    'min' => [
+        'numeric' => 'Moet minimaal :min zijn.',
+        'file' => 'Moet minimaal :min kilobytes zijn.',
+        'string' => 'Moet minimaal :min karakters lang zijn.',
+        'array' => 'Moet minimaal :min items bevatten.',
+    ],
+    'min_digits' => 'Moet minimaal :min cijfers bevatten.',
+    'missing' => 'Moet ontbreken.',
+    'missing_if' => 'Moet ontbreken als :other :value is.',
+    'missing_unless' => 'Moet ontbreken tenzij :other :value is.',
+    'missing_with' => 'Moet ontbreken als :values aanwezig is.',
+    'missing_with_all' => 'Moet ontbreken als :values aanwezig zijn.',
+    'multiple_of' => 'Moet een veelvoud zijn van :value.',
     'not_in' => 'Dit is ongeldig.',
     'not_regex' => 'Formaat ongeldig.',
     'numeric' => 'Moet een nummer zijn.',
     'present' => 'Moet aanwezig zijn.',
+    'prohibited' => 'Niet toegestaan.',
+    'prohibited_if' => 'Niet toegestaan als :other :value is.',
+    'prohibited_unless' => 'Niet toegestaan tenzij :other :value is.',
+    'prohibits' => 'Voorkomt dat :other aanwezig is.',
     'regex' => 'Formaat is ongeldig.',
     'required' => 'Dit veld is verplicht.',
+    'required_array_keys' => 'Vereist items voor: :values.',
     'required_if' => 'Dit veld is verplicht als :other :value is.',
+    'required_if_accepted' => 'Dit veld is verplicht als :other geaccepteerd is.',
     'required_unless' => 'Dit veld is verplicht behalve als :other :value is.',
     'required_with' => 'Dit veld is verplicht als :value aanwezig is.',
     'required_with_all' => 'Dit veld is verplicht als :value aanwezig zijn.',
     'required_without' => 'Dit veld is verplicht als :value niet aanwezig is.',
     'required_without_all' => 'Dit veld is verplicht als geen van :values aanwezig zijn.',
     'same' => 'Dit veld en :other komen niet overeen.',
-    'size.numeric' => 'Moet :size zijn.',
-    'size.file' => 'Moet :size kilobytes zijn.',
-    'size.string' => 'Moet :size karakters zijn.',
-    'size.array' => 'Moet :size items bevatten.',
+    'size' => [
+        'array' => 'Moet :size items bevatten.',
+        'file' => 'Moet :size kilobytes zijn.',
+        'numeric' => 'Moet :size zijn.',
+        'string' => 'Moet :size karakters zijn.',
+    ],
     'starts_with' => 'Moet beginnen met :values',
     'string' => 'Moet een string zijn.',
     'timezone' => 'Moet een geldige tijdzone zijn.',
     'unique' => 'Deze waarde is al gekozen.',
     'uploaded' => 'Het uploaden is mislukt.',
+    'uppercase' => 'Moet in hoofdletters zijn.',
     'url' => 'Formaat is ongeldig.',
+    'ulid' => 'Moet een geldige ULID zijn.',
+    'uuid' => 'Moet een geldige UUID zijn.',
     'unique_entry_value' => 'Deze waarde is al gekozen.',
     'unique_term_value' => 'Deze waarde is al gekozen.',
     'unique_user_value' => 'Deze waarde is al gekozen.',

From 7156abf4979414387c79ebbf318f87ca5171db9a Mon Sep 17 00:00:00 2001
From: John Koster <john@stillat.com>
Date: Tue, 10 Oct 2023 12:56:18 -0500
Subject: [PATCH 07/36] [4.x] Antlers: Adds first-class support for sending
 custom variables to the layout (#8775)

---
 .../Language/Runtime/GlobalRuntimeState.php   |  4 ++
 .../Language/Runtime/RuntimeParser.php        |  5 ++
 src/View/View.php                             |  8 ++-
 tests/Antlers/Runtime/ParserIsolationTest.php | 51 +++++++++++++++++++
 4 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/src/View/Antlers/Language/Runtime/GlobalRuntimeState.php b/src/View/Antlers/Language/Runtime/GlobalRuntimeState.php
index 26044971a4..01bb7a95c1 100644
--- a/src/View/Antlers/Language/Runtime/GlobalRuntimeState.php
+++ b/src/View/Antlers/Language/Runtime/GlobalRuntimeState.php
@@ -192,6 +192,8 @@ public static function mergeTagRuntimeAssignments($assignments)
     public static $prefixState = [];
 
     public static $containsLayout = false;
+    public static $shareVariablesTemplateTrigger = '';
+    public static $layoutVariables = [];
 
     public static $requiresRuntimeIsolation = false;
 
@@ -213,6 +215,8 @@ public static function mergeTagRuntimeAssignments($assignments)
 
     public static function resetGlobalState()
     {
+        self::$shareVariablesTemplateTrigger = '';
+        self::$layoutVariables = [];
         self::$containsLayout = false;
         self::$tracedRuntimeAssignments = [];
         self::$traceTagAssignments = false;
diff --git a/src/View/Antlers/Language/Runtime/RuntimeParser.php b/src/View/Antlers/Language/Runtime/RuntimeParser.php
index c45c746cab..37156c88ab 100644
--- a/src/View/Antlers/Language/Runtime/RuntimeParser.php
+++ b/src/View/Antlers/Language/Runtime/RuntimeParser.php
@@ -435,6 +435,11 @@ protected function renderText($text, $data = [])
             $bufferContent = str_replace(DocumentParser::getRightBraceEscape(), DocumentParser::RightBrace, $bufferContent);
         }
 
+        if (GlobalRuntimeState::$containsLayout && $this->view == GlobalRuntimeState::$shareVariablesTemplateTrigger) {
+            // Force the root runtime assignments to be merged into the global state.
+            GlobalRuntimeState::$layoutVariables = $this->nodeProcessor->getRuntimeAssignments();
+        }
+
         return new AntlersString($bufferContent, $this);
     }
 
diff --git a/src/View/View.php b/src/View/View.php
index 2b3b17e585..161812e1a0 100644
--- a/src/View/View.php
+++ b/src/View/View.php
@@ -89,19 +89,23 @@ public function render(): string
 
         if ($this->shouldUseLayout()) {
             GlobalRuntimeState::$containsLayout = true;
-
             $contents = view($this->templateViewName(), $cascade);
 
             if (Str::endsWith($this->layoutViewPath(), Engine::EXTENSIONS)) {
                 $contents = $contents->withoutExtractions();
             }
 
+            GlobalRuntimeState::$shareVariablesTemplateTrigger = $contents->getPath();
+
             $contents = $contents->render();
             GlobalRuntimeState::$containsLayout = false;
+            GlobalRuntimeState::$shareVariablesTemplateTrigger = '';
 
-            $contents = view($this->layoutViewName(), array_merge($cascade, [
+            $contents = view($this->layoutViewName(), array_merge($cascade, GlobalRuntimeState::$layoutVariables, [
                 'template_content' => $contents,
             ]));
+
+            GlobalRuntimeState::$layoutVariables = [];
         } else {
             $contents = view($this->templateViewName(), $cascade);
         }
diff --git a/tests/Antlers/Runtime/ParserIsolationTest.php b/tests/Antlers/Runtime/ParserIsolationTest.php
index 6a404d809e..fcbcb5a748 100644
--- a/tests/Antlers/Runtime/ParserIsolationTest.php
+++ b/tests/Antlers/Runtime/ParserIsolationTest.php
@@ -178,4 +178,55 @@ public function test_runtime_assignment_variable_leak_multiple_requests_inside_s
         $this->assertSame('A new title', $content);
         $this->assertSame('Two', $contentTwo);
     }
+
+    public function test_variables_created_in_template_are_shared_with_the_layout()
+    {
+        $this->createBlueprintsAndData();
+        $this->withFakeViews();
+
+        $layout = <<<'LAYOUT'
+Layout 1: {{ _test }}
+{{ partial:test }}
+{{ template_content }}
+Layout 2: {{ _test }}
+Layout 3: {{ _something }}
+LAYOUT;
+
+        $partial = <<<'PARTIAL'
+Partial inside layout: {{ _test }}
+PARTIAL;
+
+        $partial2 = <<<'PARTIAL'
+Partial inside template: {{ _test }}
+{{ _something = "something" }}
+PARTIAL;
+
+        $template = <<<'TEMPLATE'
+{{ _test = "test" }}
+{{ partial:test2 }}
+TEMPLATE;
+
+        $this->viewShouldReturnRaw('layout', $layout);
+        $this->viewShouldReturnRaw('test', $partial);
+        $this->viewShouldReturnRaw('test2', $partial2);
+        $this->viewShouldReturnRaw('default', $template);
+
+        $response = $this->get('bravo/news-2')
+            ->assertOk();
+
+        $result = StringUtilities::normalizeLineEndings(trim($response->content()));
+
+        // The last Layout 3 variable should be empty.
+        $expected = <<<'EXPECTED'
+Layout 1: test
+Partial inside layout: test
+
+Partial inside template: test
+
+Layout 2: test
+Layout 3:
+EXPECTED;
+
+        $this->assertSame($expected, $result);
+    }
 }

From 5b996efa001fe208b58e70f6345339607c1dd94c Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 10 Oct 2023 18:13:31 -0400
Subject: [PATCH 08/36] changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 622146ea15..018ed488c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Release Notes
 
+## 4.26.0 (2023-10-10)
+
+### What's new
+- Support for Antlers template-defined variables to be available in the layout. [#8775](https://github.com/statamic/cms/issues/8775) by @JohnathonKoster
+- Add Bard link email, phone and relationship options. [#8777](https://github.com/statamic/cms/issues/8777) by @jacksleight
+
+### What's improved
+- Dutch translations. [#8823](https://github.com/statamic/cms/issues/8823) by @jeroenpeters1986
+- Improve post-save performance with many Bard and Revealer fields. [#8712](https://github.com/statamic/cms/issues/8712) by @jacksleight
+- Improve initial render speed of Replicators with many sets. [#8716](https://github.com/statamic/cms/issues/8716) by @jacksleight
+- Simplify usage of the icon fieldtype with the SVG tag. [#8815](https://github.com/statamic/cms/issues/8815) by @JohnathonKoster
+
+### What's fixed
+- Fix section fieldtype first-child's top margin. [#8822](https://github.com/statamic/cms/issues/8822) by @caseydwyer
+
+
+
 ## 4.25.0 (2023-10-09)
 
 ### What's new

From 8f5da38d0b7b1a85a0e5ce348f681ec798527d9c Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 11 Oct 2023 12:16:40 -0400
Subject: [PATCH 09/36] [4.x] Fix assets being deleted when renaming snake_case
 folder to kebab-case. (#8826)

---
 src/Assets/AssetContainer.php                 |  3 +-
 src/Facades/Endpoint/Pattern.php              | 33 +++++++++
 src/Query/Builder.php                         |  7 +-
 tests/Assets/AssetContainerTest.php           | 18 ++++-
 .../snake-kebab/foo-bar/bravo.txt             |  0
 .../__fixtures__/snake-kebab/foo_bar/alfa.txt |  0
 tests/Data/Entries/EntryQueryBuilderTest.php  | 68 +++++++++++++++++++
 tests/Facades/PatternTest.php                 | 67 ++++++++++++++++++
 8 files changed, 190 insertions(+), 6 deletions(-)
 create mode 100644 tests/Assets/__fixtures__/snake-kebab/foo-bar/bravo.txt
 create mode 100644 tests/Assets/__fixtures__/snake-kebab/foo_bar/alfa.txt
 create mode 100644 tests/Facades/PatternTest.php

diff --git a/src/Assets/AssetContainer.php b/src/Assets/AssetContainer.php
index d20399873d..a3228f6157 100644
--- a/src/Assets/AssetContainer.php
+++ b/src/Assets/AssetContainer.php
@@ -20,6 +20,7 @@
 use Statamic\Facades\Blueprint;
 use Statamic\Facades\File;
 use Statamic\Facades\Image;
+use Statamic\Facades\Pattern;
 use Statamic\Facades\Search;
 use Statamic\Facades\Stache;
 use Statamic\Facades\URL;
@@ -357,7 +358,7 @@ public function assets($folder = '/', $recursive = false)
 
         if ($folder !== null) {
             if ($recursive) {
-                $query->where('path', 'like', "{$folder}/%");
+                $query->where('path', 'like', Pattern::sqlLikeQuote($folder).'/%');
             } else {
                 $query->where('folder', $folder);
             }
diff --git a/src/Facades/Endpoint/Pattern.php b/src/Facades/Endpoint/Pattern.php
index 19f571af8e..3697c67fb6 100644
--- a/src/Facades/Endpoint/Pattern.php
+++ b/src/Facades/Endpoint/Pattern.php
@@ -2,6 +2,8 @@
 
 namespace Statamic\Facades\Endpoint;
 
+use Statamic\Support\Str;
+
 /**
  * Regular expressions, et al.
  */
@@ -104,4 +106,35 @@ public function isUUID($value)
     {
         return (bool) preg_match($this->uuid(), $value);
     }
+
+    /**
+     * Quotes (escapes) SQL LIKE syntax.
+     *
+     * Similar to the preg_quote method for regular expressions.
+     */
+    public function sqlLikeQuote(string $like): string
+    {
+        return Str::of($like)
+            ->replace('%', '\%')
+            ->replace('_', '\_');
+    }
+
+    /**
+     * Converts SQL LIKE syntax to a regular expression.
+     *
+     * @return string  The regular expression without delimiters.
+     */
+    public function sqlLikeToRegex(string $like): string
+    {
+        return Str::of($like)
+            ->replace('\_', $underscore = Str::random())
+            ->replace('\%', $percent = Str::random())
+            ->pipe(fn ($str) => preg_quote($str, '/'))
+            ->replace('%', '.*')
+            ->replace('_', '.')
+            ->replace($underscore, '_')
+            ->replace($percent, '%')
+            ->prepend('^')
+            ->append('$');
+    }
 }
diff --git a/src/Query/Builder.php b/src/Query/Builder.php
index cefe3feead..7951112284 100644
--- a/src/Query/Builder.php
+++ b/src/Query/Builder.php
@@ -10,6 +10,7 @@
 use InvalidArgumentException;
 use Statamic\Contracts\Query\Builder as Contract;
 use Statamic\Extensions\Pagination\LengthAwarePaginator;
+use Statamic\Facades\Pattern;
 
 abstract class Builder implements Contract
 {
@@ -629,13 +630,13 @@ protected function filterTestGreaterThanOrEqualTo($item, $value)
 
     protected function filterTestLike($item, $like)
     {
-        $pattern = '/^'.str_replace(['%', '_'], ['.*', '.'], preg_quote($like, '/')).'$/im';
-
         if (is_array($item)) {
             $item = json_encode($item);
         }
 
-        return preg_match($pattern, (string) $item);
+        $pattern = Pattern::sqlLikeToRegex($like);
+
+        return preg_match('/'.$pattern.'/im', (string) $item);
     }
 
     protected function filterTestNotLike($item, $like)
diff --git a/tests/Assets/AssetContainerTest.php b/tests/Assets/AssetContainerTest.php
index 017616ca0a..780bc8c4df 100644
--- a/tests/Assets/AssetContainerTest.php
+++ b/tests/Assets/AssetContainerTest.php
@@ -821,6 +821,20 @@ public function it_gets_assets_in_a_folder_recursively()
         });
     }
 
+    /**
+     * @test
+     *
+     * @see https://github.com/statamic/cms/issues/8825
+     * @see https://github.com/statamic/cms/pull/8826
+     **/
+    public function it_doesnt_get_kebab_case_folder_assets_when_querying_snake_case_folder()
+    {
+        tap($this->containerWithDisk('snake-kebab')->assets('foo_bar', true), function ($assets) {
+            $this->assertCount(1, $assets);
+            $this->assertEquals('foo_bar/alfa.txt', $assets->first()->path());
+        });
+    }
+
     /**
      * @test
      *
@@ -954,11 +968,11 @@ public function it_is_arrayable()
             });
     }
 
-    private function containerWithDisk()
+    private function containerWithDisk($fixture = 'container')
     {
         config(['filesystems.disks.test' => [
             'driver' => 'local',
-            'root' => __DIR__.'/__fixtures__/container',
+            'root' => __DIR__.'/__fixtures__/'.$fixture,
         ]]);
 
         $container = (new AssetContainer)->handle('test')->disk('test');
diff --git a/tests/Assets/__fixtures__/snake-kebab/foo-bar/bravo.txt b/tests/Assets/__fixtures__/snake-kebab/foo-bar/bravo.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/Assets/__fixtures__/snake-kebab/foo_bar/alfa.txt b/tests/Assets/__fixtures__/snake-kebab/foo_bar/alfa.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/Data/Entries/EntryQueryBuilderTest.php b/tests/Data/Entries/EntryQueryBuilderTest.php
index b1149a640d..877804622b 100644
--- a/tests/Data/Entries/EntryQueryBuilderTest.php
+++ b/tests/Data/Entries/EntryQueryBuilderTest.php
@@ -669,4 +669,72 @@ public function entries_are_found_using_offset()
         $this->assertCount(2, $entries);
         $this->assertEquals(['Post 2', 'Post 3'], $entries->map->title->all());
     }
+
+    /**
+     * @test
+     *
+     * @dataProvider likeProvider
+     */
+    public function entries_are_found_using_like($like, $expected)
+    {
+        Collection::make('posts')->save();
+
+        collect([
+            'on',
+            'only',
+            'foo',
+            'food',
+            'boo',
+            'foo bar',
+            'foo_bar',
+            'foodbar',
+            'hello world',
+            'waterworld',
+            'world of warcraft',
+            '20%',
+            '20% of the time',
+            '20 something',
+            'Pi is 3.14159',
+            'Pi is not 3x14159',
+            'Use a [4.x] prefix for PRs',
+            '/',
+            '/ test',
+            'test /',
+            'test / test',
+        ])->each(function ($val, $i) {
+            EntryFactory::id($i)
+                ->slug('post-'.$i)
+                ->collection('posts')
+                ->data(['title' => $val])
+                ->create();
+        });
+
+        $this->assertEquals($expected, Entry::query()->where('title', 'like', $like)->get()->map->title->all());
+    }
+
+    public function likeProvider()
+    {
+        return collect([
+            'foo' => ['foo'],
+            'foo%' => ['foo', 'food', 'foo bar', 'foo_bar', 'foodbar'],
+            '%world' => ['hello world', 'waterworld'],
+            '%world%' => ['hello world', 'waterworld', 'world of warcraft'],
+            '_oo' => ['foo', 'boo'],
+            'o_' => ['on'],
+            'foo_bar' => ['foo bar', 'foo_bar', 'foodbar'],
+            'foo__bar' => [],
+            'fo__bar' => ['foo bar', 'foo_bar', 'foodbar'],
+            'foo\_bar' => ['foo_bar'],
+            '20\%' => ['20%'],
+            '20\%%' => ['20%', '20% of the time'],
+            '%3.14%' => ['Pi is 3.14159'],
+            '%[4%' => ['Use a [4.x] prefix for PRs'],
+            '/' => ['/'],
+            '%/' => ['/', 'test /'],
+            '/%' => ['/', '/ test'],
+            '%/%' => ['/', '/ test', 'test /', 'test / test'],
+        ])->mapWithKeys(function ($expected, $like) {
+            return [$like => [$like, $expected]];
+        });
+    }
 }
diff --git a/tests/Facades/PatternTest.php b/tests/Facades/PatternTest.php
new file mode 100644
index 0000000000..6e0d02051a
--- /dev/null
+++ b/tests/Facades/PatternTest.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Tests\Facades;
+
+use Statamic\Facades\Pattern;
+use Tests\TestCase;
+
+class PatternTest extends TestCase
+{
+    /**
+     * @test
+     *
+     * @dataProvider likeProvider
+     */
+    public function it_escapes_sql_like_syntax($string, $expected)
+    {
+        $this->assertEquals($expected, Pattern::sqlLikeQuote($string));
+    }
+
+    public function likeProvider()
+    {
+        return collect([
+            'foo' => 'foo',
+            '%foo' => '\%foo',
+            'foo%' => 'foo\%',
+            '%foo%' => '\%foo\%',
+            '_foo' => '\_foo',
+            'foo_' => 'foo\_',
+            '_foo_' => '\_foo\_',
+            'f_o' => 'f\_o',
+        ])->mapWithKeys(fn ($expected, $string) => [$string => [$string, $expected]])->all();
+    }
+
+    /**
+     * @test
+     *
+     * @dataProvider likeRegexProvider
+     */
+    public function it_converts_sql_like_syntax_to_regex($string, $expected)
+    {
+        $this->assertEquals($expected, Pattern::sqlLikeToRegex($string));
+    }
+
+    public function likeRegexProvider()
+    {
+        return collect([
+            'foo' => '^foo$',
+            'foo%' => '^foo.*$',
+            '%world' => '^.*world$',
+            '%world%' => '^.*world.*$',
+            '_oo' => '^.oo$',
+            'o_' => '^o.$',
+            'foo_bar' => '^foo.bar$',
+            'foo__bar' => '^foo..bar$',
+            'fo__bar' => '^fo..bar$',
+            'foo\_bar' => '^foo_bar$',
+            '20\%' => '^20%$',
+            '20\%%' => '^20%.*$',
+            '%3.14%' => '^.*3\.14.*$',
+            '%[4%' => '^.*\[4.*$',
+            '/' => '^\/$',
+            '%/' => '^.*\/$',
+            '/%' => '^\/.*$',
+            '%/%' => '^.*\/.*$',
+        ])->mapWithKeys(fn ($expected, $string) => [$string => [$string, $expected]])->all();
+    }
+}

From 41f79ad969d351dca8d82975df49d0f698db5fd7 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 11 Oct 2023 12:18:05 -0400
Subject: [PATCH 10/36] changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 018ed488c7..0f50efb2d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Release Notes
 
+
+## 4.26.1 (2023-10-11)
+
+### What's fixed
+- Fix assets being deleted when renaming snake_case folder to kebab-case. [#8826](https://github.com/statamic/cms/issues/8826) by @jasonvarga
+
+
+
 ## 4.26.0 (2023-10-10)
 
 ### What's new

From a9e607863429af43aefe79916df7cbecd1c9c2fd Mon Sep 17 00:00:00 2001
From: Jack McDade <jack@jackmcdade.com>
Date: Wed, 11 Oct 2023 16:10:19 -0400
Subject: [PATCH 11/36] [4.x] Multi-site Permissions (#5946)

Co-authored-by: StyleCI Bot <bot@styleci.io>
Co-authored-by: edalzell <erin@silentz.co>
Co-authored-by: Arthur Perton <arthur@webenapp.nl>
Co-authored-by: Jesse Leite <jesseleite@gmail.com>
Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 resources/lang/en/permissions.php             |   3 +
 .../views/partials/global-header.blade.php    |   2 +-
 src/Auth/CorePermissions.php                  |  20 ++
 src/CP/Navigation/CoreNav.php                 |   5 -
 src/Console/Commands/Multisite.php            |  13 ++
 src/Facades/Site.php                          |   2 +
 src/Globals/GlobalSet.php                     |   5 +
 .../CP/Collections/CollectionsController.php  |  32 +--
 .../CP/Collections/EntriesController.php      |  21 +-
 .../CP/Globals/GlobalVariablesController.php  |  10 +-
 .../CP/Navigation/NavigationController.php    |  13 +-
 .../Navigation/NavigationTreeController.php   |   2 +
 .../Controllers/CP/SelectSiteController.php   |  10 +-
 .../CP/Taxonomies/TermsController.php         |  15 +-
 src/Http/Middleware/CP/SelectedSite.php       |  28 +++
 .../View/Composers/JavascriptComposer.php     |   2 +-
 src/Policies/CollectionPolicy.php             |   7 +-
 src/Policies/Concerns/HasMultisitePolicy.php  |  26 +++
 src/Policies/EntryPolicy.php                  |  22 +-
 src/Policies/GlobalSetPolicy.php              |   8 +-
 src/Policies/GlobalSetVariablesPolicy.php     |  19 +-
 src/Policies/LocalizedTermPolicy.php          |  19 ++
 src/Policies/NavPolicy.php                    |  15 +-
 src/Policies/NavTreePolicy.php                |  32 +++
 src/Policies/SitePolicy.php                   |  18 ++
 src/Policies/TaxonomyPolicy.php               |   7 +-
 src/Policies/TermPolicy.php                   |  14 +-
 src/Providers/AuthServiceProvider.php         |   2 +
 src/Providers/CpServiceProvider.php           |   1 +
 src/Providers/ExtensionServiceProvider.php    |   1 +
 src/Query/Scopes/Filters/Site.php             |   2 +-
 src/Sites/Sites.php                           |  11 +
 src/Structures/Nav.php                        |   5 +
 src/UpdateScripts/AddSitePermissions.php      |  26 +++
 tests/CP/Navigation/CoreNavTest.php           | 216 ++++++++++++++++++
 tests/CP/Navigation/NavTest.php               |  22 --
 tests/Data/Entries/CollectionTest.php         |  35 +++
 tests/Data/Globals/GlobalSetTest.php          |  68 ++++++
 tests/Data/Structures/NavTest.php             |  63 +++++
 tests/Data/Taxonomies/TaxonomyTest.php        |  35 +++
 tests/Factories/GlobalFactory.php             |  10 +-
 tests/FakesRoles.php                          |  10 +
 tests/Feature/Entries/UpdateEntryTest.php     |  36 ++-
 .../Feature/Entries/ViewEntryListingTest.php  |  93 ++++++++
 .../Globals/UpdateGlobalVariablesTest.php     |  27 ++-
 .../Globals/ViewGlobalsListingTest.php        |  61 ++++-
 tests/Feature/Navigation/MocksStructures.php  |   1 +
 .../Navigation/UpdateNavigationTreeTest.php   |  90 ++++++--
 tests/Feature/Sites/SelectSiteTest.php        |  81 +++++++
 tests/Feature/Taxonomies/UpdateTermTest.php   |  87 +++++++
 tests/Git/GitEventTest.php                    |   1 +
 tests/Http/Middleware/SelectedSiteTest.php    | 105 +++++++++
 tests/Policies/CollectionPolicyTest.php       |  93 ++++++++
 tests/Policies/EntryPolicyTest.php            | 164 +++++++++++++
 tests/Policies/GlobalSetPolicyTest.php        |  92 ++++++++
 .../Policies/GlobalSetVariablesPolicyTest.php |  66 ++++++
 tests/Policies/LocalizedTermPolicyTest.php    | 131 +++++++++++
 tests/Policies/NavPolicyTest.php              | 144 ++++++++++++
 tests/Policies/NavTreePolicyTest.php          |  70 ++++++
 tests/Policies/PolicyTestCase.php             |  30 +++
 tests/Policies/SitePolicyTest.php             |  50 ++++
 tests/Policies/TaxonomyPolicyTest.php         |  93 ++++++++
 tests/Policies/TermPolicyTest.php             | 107 +++++++++
 tests/Sites/SitesTest.php                     |  28 +++
 .../UpdateScripts/AddSitePermissionsTest.php  |  90 ++++++++
 .../Concerns/RunsUpdateScripts.php            |   8 +
 66 files changed, 2518 insertions(+), 107 deletions(-)
 create mode 100644 src/Http/Middleware/CP/SelectedSite.php
 create mode 100644 src/Policies/Concerns/HasMultisitePolicy.php
 create mode 100644 src/Policies/LocalizedTermPolicy.php
 create mode 100644 src/Policies/NavTreePolicy.php
 create mode 100644 src/Policies/SitePolicy.php
 create mode 100644 src/UpdateScripts/AddSitePermissions.php
 create mode 100644 tests/CP/Navigation/CoreNavTest.php
 create mode 100644 tests/Feature/Entries/ViewEntryListingTest.php
 create mode 100644 tests/Feature/Sites/SelectSiteTest.php
 create mode 100644 tests/Feature/Taxonomies/UpdateTermTest.php
 create mode 100644 tests/Http/Middleware/SelectedSiteTest.php
 create mode 100644 tests/Policies/CollectionPolicyTest.php
 create mode 100644 tests/Policies/EntryPolicyTest.php
 create mode 100644 tests/Policies/GlobalSetPolicyTest.php
 create mode 100644 tests/Policies/GlobalSetVariablesPolicyTest.php
 create mode 100644 tests/Policies/LocalizedTermPolicyTest.php
 create mode 100644 tests/Policies/NavPolicyTest.php
 create mode 100644 tests/Policies/NavTreePolicyTest.php
 create mode 100644 tests/Policies/PolicyTestCase.php
 create mode 100644 tests/Policies/SitePolicyTest.php
 create mode 100644 tests/Policies/TaxonomyPolicyTest.php
 create mode 100644 tests/Policies/TermPolicyTest.php
 create mode 100644 tests/UpdateScripts/AddSitePermissionsTest.php

diff --git a/resources/lang/en/permissions.php b/resources/lang/en/permissions.php
index d3186c9a8c..cedf334b07 100644
--- a/resources/lang/en/permissions.php
+++ b/resources/lang/en/permissions.php
@@ -15,6 +15,9 @@
     'manage_preferences' => 'Manage Preferences',
     'manage_preferences_desc' => 'Ability to customize global and role-specific preferences.',
 
+    'group_sites' => 'Sites',
+    'access_{site}_site' => 'Access :site site',
+
     'group_collections' => 'Collections',
     'configure_collections' => 'Configure Collections',
     'configure_collections_desc' => 'Grants access to all collection related permissions',
diff --git a/resources/views/partials/global-header.blade.php b/resources/views/partials/global-header.blade.php
index a4b288be5e..9795eb1a6e 100644
--- a/resources/views/partials/global-header.blade.php
+++ b/resources/views/partials/global-header.blade.php
@@ -22,7 +22,7 @@
 
     <div class="head-link h-full md:pr-6 flex items-center justify-end">
 
-        @if (Statamic\Facades\Site::hasMultiple())
+        @if (Statamic\Facades\Site::authorized()->count() > 1)
             <global-site-selector>
                 <template slot="icon">@cp_svg('icons/light/sites')</template>
             </global-site-selector>
diff --git a/src/Auth/CorePermissions.php b/src/Auth/CorePermissions.php
index a4008dbd54..af37326194 100644
--- a/src/Auth/CorePermissions.php
+++ b/src/Auth/CorePermissions.php
@@ -8,6 +8,7 @@
 use Statamic\Facades\GlobalSet;
 use Statamic\Facades\Nav;
 use Statamic\Facades\Permission;
+use Statamic\Facades\Site;
 use Statamic\Facades\Taxonomy;
 use Statamic\Facades\Utility;
 
@@ -23,6 +24,10 @@ public function boot()
             $this->register('manage preferences');
         });
 
+        $this->group('sites', function () {
+            $this->registerSites();
+        });
+
         $this->group('collections', function () {
             $this->registerCollections();
         });
@@ -63,6 +68,21 @@ public function boot()
         $this->register('view graphql');
     }
 
+    protected function registerSites()
+    {
+        if (! Site::hasMultiple()) {
+            return;
+        }
+
+        $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()];
+                });
+            });
+        });
+    }
+
     protected function registerCollections()
     {
         $this->register('configure collections');
diff --git a/src/CP/Navigation/CoreNav.php b/src/CP/Navigation/CoreNav.php
index 0cfd637c44..383c4af073 100644
--- a/src/CP/Navigation/CoreNav.php
+++ b/src/CP/Navigation/CoreNav.php
@@ -18,7 +18,6 @@
 use Statamic\Facades\Role as RoleAPI;
 use Statamic\Facades\Stache;
 use Statamic\Facades\Taxonomy as TaxonomyAPI;
-use Statamic\Facades\User;
 use Statamic\Facades\UserGroup as UserGroupAPI;
 use Statamic\Facades\Utility;
 use Statamic\Statamic;
@@ -117,10 +116,6 @@ protected function makeContentSection()
                 return GlobalSetAPI::all()->sortBy->title()->map(function ($globalSet) {
                     $localized = $globalSet->inSelectedSite();
 
-                    if (! $localized && User::current()->cant('edit', $globalSet)) {
-                        return null;
-                    }
-
                     return Nav::item($globalSet->title())
                         ->url($localized ? $localized->editUrl() : $globalSet->editUrl())
                         ->can('view', $globalSet);
diff --git a/src/Console/Commands/Multisite.php b/src/Console/Commands/Multisite.php
index 9ffcb0a641..69b1414c42 100644
--- a/src/Console/Commands/Multisite.php
+++ b/src/Console/Commands/Multisite.php
@@ -10,6 +10,7 @@
 use Statamic\Facades\File;
 use Statamic\Facades\GlobalSet;
 use Statamic\Facades\Nav;
+use Statamic\Facades\Role;
 use Statamic\Facades\Site;
 use Statamic\Facades\Stache;
 use Statamic\Facades\YAML;
@@ -80,6 +81,8 @@ public function handle()
             $this->checkLine("Nav [<comment>{$nav->handle()}</comment>] updated.");
         });
 
+        $this->addPermissions();
+
         Cache::clear();
         $this->checkLine('Cache cleared.');
 
@@ -278,4 +281,14 @@ protected function newSites()
     {
         return $this->sites->slice(1);
     }
+
+    protected function addPermissions()
+    {
+        Role::all()->each(function ($role) {
+            Site::all()->each(fn ($site) => $role->addPermission("access {$site->handle()} site"));
+            $role->save();
+            $this->checkLine("Site permissions added to [<comment>{$role->handle()}</comment>] role.");
+        });
+
+    }
 }
diff --git a/src/Facades/Site.php b/src/Facades/Site.php
index e0ecf44293..7d5c5b9c77 100644
--- a/src/Facades/Site.php
+++ b/src/Facades/Site.php
@@ -7,6 +7,7 @@
 
 /**
  * @method static mixed all()
+ * @method static mixed authorized()
  * @method static mixed default()
  * @method static bool hasMultiple()
  * @method static mixed get($handle)
@@ -14,6 +15,7 @@
  * @method static mixed current()
  * @method static void setCurrent($site)
  * @method static mixed selected()
+ * @method static void setSelected($site)
  * @method static void setConfig($key, $value = null)
  *
  * @see \Statamic\Sites\Sites
diff --git a/src/Globals/GlobalSet.php b/src/Globals/GlobalSet.php
index b9e9cdeb6f..f22a55eae1 100644
--- a/src/Globals/GlobalSet.php
+++ b/src/Globals/GlobalSet.php
@@ -170,6 +170,11 @@ public function removeLocalization($localization)
         return $this;
     }
 
+    public function sites()
+    {
+        return $this->localizations()->map->locale()->values()->toBase();
+    }
+
     public function in($locale)
     {
         return $this->localizations()->get($locale);
diff --git a/src/Http/Controllers/CP/Collections/CollectionsController.php b/src/Http/Controllers/CP/Collections/CollectionsController.php
index 744319a9a4..34dd7591e0 100644
--- a/src/Http/Controllers/CP/Collections/CollectionsController.php
+++ b/src/Http/Controllers/CP/Collections/CollectionsController.php
@@ -93,18 +93,7 @@ public function show(Request $request, $collection)
                 'collection' => $collection->handle(),
                 'blueprints' => $blueprints->pluck('handle')->all(),
             ]),
-            'sites' => $collection->sites()->map(function ($site_handle) {
-                $site = Site::get($site_handle);
-
-                if (! $site) {
-                    throw new SiteNotFoundException($site_handle);
-                }
-
-                return [
-                    'handle' => $site->handle(),
-                    'name' => $site->name(),
-                ];
-            })->values()->all(),
+            'sites' => $this->getAuthorizedSitesForCollection($collection),
             'createUrls' => $collection->sites()
                 ->mapWithKeys(fn ($site) => [$site => cp_route('collections.entries.create', [$collection->handle(), $site])])
                 ->all(),
@@ -210,7 +199,7 @@ public function store(Request $request)
             ->futureDateBehavior('private');
 
         if (Site::hasMultiple()) {
-            $collection->sites([Site::default()->handle()]);
+            $collection->sites([Site::selected()->handle()]);
         }
 
         $collection->save();
@@ -560,4 +549,21 @@ protected function editFormBlueprint($collection)
 
         return Blueprint::makeFromTabs($fields);
     }
+
+    protected function getAuthorizedSitesForCollection($collection)
+    {
+        return $collection
+            ->sites()
+            ->mapWithKeys(fn ($handle) => [$handle => Site::get($handle)])
+            ->each(fn ($site, $handle) => throw_unless($site, new SiteNotFoundException($handle)))
+            ->filter(fn ($site) => User::current()->can('view', $site))
+            ->map(function ($site) {
+                return [
+                    'handle' => $site->handle(),
+                    'name' => $site->name(),
+                ];
+            })
+            ->values()
+            ->all();
+    }
 }
diff --git a/src/Http/Controllers/CP/Collections/EntriesController.php b/src/Http/Controllers/CP/Collections/EntriesController.php
index 96f1101bac..1a2057f65d 100644
--- a/src/Http/Controllers/CP/Collections/EntriesController.php
+++ b/src/Http/Controllers/CP/Collections/EntriesController.php
@@ -72,6 +72,10 @@ protected function indexQuery($collection)
             $query->where('title', 'like', '%'.$search.'%');
         }
 
+        if (Site::hasMultiple()) {
+            $query->whereIn('site', Site::authorized()->map->handle()->all());
+        }
+
         return $query;
     }
 
@@ -126,7 +130,7 @@ public function edit(Request $request, $collection, $entry)
             'originValues' => $originValues ?? null,
             'originMeta' => $originMeta ?? null,
             'permalink' => $entry->absoluteUrl(),
-            'localizations' => $collection->sites()->map(function ($handle) use ($entry) {
+            'localizations' => $this->getAuthorizedSitesForCollection($collection)->map(function ($handle) use ($entry) {
                 $localized = $entry->in($handle);
                 $exists = $localized !== null;
 
@@ -142,7 +146,7 @@ public function edit(Request $request, $collection, $entry)
                     'url' => $exists ? $localized->editUrl() : null,
                     'livePreviewUrl' => $exists ? $localized->livePreviewUrl() : null,
                 ];
-            })->all(),
+            })->values()->all(),
             'hasWorkingCopy' => $entry->hasWorkingCopy(),
             'preloadedAssets' => $this->extractAssetsFromValues($values),
             'revisionsEnabled' => $entry->revisionsEnabled(),
@@ -261,7 +265,7 @@ public function update(Request $request, $collection, $entry)
 
     public function create(Request $request, $collection, $site)
     {
-        $this->authorize('create', [EntryContract::class, $collection]);
+        $this->authorize('create', [EntryContract::class, $collection, $site]);
 
         $blueprint = $collection->entryBlueprint($request->blueprint);
 
@@ -303,7 +307,7 @@ public function create(Request $request, $collection, $site)
             'blueprint' => $blueprint->toPublishArray(),
             'published' => $collection->defaultPublishState(),
             'locale' => $site->handle(),
-            'localizations' => $collection->sites()->map(function ($handle) use ($collection, $site, $blueprint) {
+            'localizations' => $this->getAuthorizedSitesForCollection($collection)->map(function ($handle) use ($collection, $site, $blueprint) {
                 return [
                     'handle' => $handle,
                     'name' => Site::get($handle)->name(),
@@ -313,7 +317,7 @@ public function create(Request $request, $collection, $site)
                     'url' => cp_route('collections.entries.create', [$collection->handle(), $handle, 'blueprint' => $blueprint->handle()]),
                     'livePreviewUrl' => $collection->route($handle) ? cp_route('collections.entries.preview.create', [$collection->handle(), $handle]) : null,
                 ];
-            })->all(),
+            })->values()->all(),
             'revisionsEnabled' => $collection->revisionsEnabled(),
             'breadcrumbs' => $this->breadcrumbs($collection),
             'canManagePublishState' => User::current()->can('publish '.$collection->handle().' entries'),
@@ -553,4 +557,11 @@ protected function breadcrumbs($collection)
             ],
         ]);
     }
+
+    protected function getAuthorizedSitesForCollection($collection)
+    {
+        return $collection
+            ->sites()
+            ->filter(fn ($handle) => User::current()->can('view', Site::get($handle)));
+    }
 }
diff --git a/src/Http/Controllers/CP/Globals/GlobalVariablesController.php b/src/Http/Controllers/CP/Globals/GlobalVariablesController.php
index 66adf29424..b3925432a8 100644
--- a/src/Http/Controllers/CP/Globals/GlobalVariablesController.php
+++ b/src/Http/Controllers/CP/Globals/GlobalVariablesController.php
@@ -50,7 +50,7 @@ public function edit(Request $request, $id)
             'hasOrigin' => $hasOrigin,
             'originValues' => $originValues ?? null,
             'originMeta' => $originMeta ?? null,
-            'localizations' => $variables->globalSet()->localizations()->map(function ($localized) use ($variables) {
+            'localizations' => $this->getAuthorizedLocalizationsForVariables($variables)->map(function ($localized) use ($variables) {
                 return [
                     'handle' => $localized->locale(),
                     'name' => $localized->site()->name(),
@@ -118,4 +118,12 @@ protected function extractFromFields($set, $blueprint)
 
         return [$fields->values()->all(), $fields->meta()->all()];
     }
+
+    protected function getAuthorizedLocalizationsForVariables($variables)
+    {
+        return $variables
+            ->globalSet()
+            ->localizations()
+            ->filter(fn ($set) => User::current()->can('edit', $set));
+    }
 }
diff --git a/src/Http/Controllers/CP/Navigation/NavigationController.php b/src/Http/Controllers/CP/Navigation/NavigationController.php
index 4a92c1c3ea..4acb58ad74 100644
--- a/src/Http/Controllers/CP/Navigation/NavigationController.php
+++ b/src/Http/Controllers/CP/Navigation/NavigationController.php
@@ -65,20 +65,20 @@ public function show(Request $request, $nav)
     {
         abort_if(! $nav = Nav::find($nav), 404);
 
-        $this->authorize('view', $nav, __('You are not authorized to view navs.'));
-
         $site = $request->site ?? Site::selected()->handle();
 
         if (! $nav->existsIn($site)) {
             return redirect($nav->trees()->first()->showUrl());
         }
 
+        $this->authorize('view', $nav->in($site), __('You are not authorized to view navs.'));
+
         return view('statamic::navigation.show', [
             'site' => $site,
             'nav' => $nav,
             'expectsRoot' => $nav->expectsRoot(),
             'collections' => $nav->collections()->map->handle()->all(),
-            'sites' => $nav->trees()->map(function ($tree) {
+            'sites' => $this->getAuthorizedTreesForNav($nav)->map(function ($tree) {
                 return [
                     'handle' => $tree->locale(),
                     'name' => $tree->site()->name(),
@@ -89,6 +89,13 @@ public function show(Request $request, $nav)
         ]);
     }
 
+    private function getAuthorizedTreesForNav($nav)
+    {
+        return $nav
+            ->trees()
+            ->filter(fn ($tree) => User::current()->can('view', Site::get($tree->locale())));
+    }
+
     public function update(Request $request, $nav)
     {
         $nav = Nav::find($nav);
diff --git a/src/Http/Controllers/CP/Navigation/NavigationTreeController.php b/src/Http/Controllers/CP/Navigation/NavigationTreeController.php
index beecc0f3e4..7cecc54201 100644
--- a/src/Http/Controllers/CP/Navigation/NavigationTreeController.php
+++ b/src/Http/Controllers/CP/Navigation/NavigationTreeController.php
@@ -39,6 +39,8 @@ public function update(Request $request, $nav)
 
         $tree = $nav->in($request->site);
 
+        $this->authorize('edit', $tree);
+
         $this->data = $this->flattenExistingBranchData([], $tree->tree());
 
         $blueprint = $nav->blueprint()
diff --git a/src/Http/Controllers/CP/SelectSiteController.php b/src/Http/Controllers/CP/SelectSiteController.php
index 06235f60db..59b3277dd7 100644
--- a/src/Http/Controllers/CP/SelectSiteController.php
+++ b/src/Http/Controllers/CP/SelectSiteController.php
@@ -2,11 +2,19 @@
 
 namespace Statamic\Http\Controllers\CP;
 
+use Statamic\Facades\Site;
+
 class SelectSiteController extends CpController
 {
     public function select($handle)
     {
-        session()->put('statamic.cp.selected-site', $handle);
+        if (! $site = Site::get($handle)) {
+            return back()->withError('Invalid site.');
+        }
+
+        $this->authorize('view', $site);
+
+        Site::setSelected($handle);
 
         return back()->with('success', __('Site selected.'));
     }
diff --git a/src/Http/Controllers/CP/Taxonomies/TermsController.php b/src/Http/Controllers/CP/Taxonomies/TermsController.php
index f5268243e8..fd11217810 100644
--- a/src/Http/Controllers/CP/Taxonomies/TermsController.php
+++ b/src/Http/Controllers/CP/Taxonomies/TermsController.php
@@ -119,7 +119,7 @@ public function edit(Request $request, $taxonomy, $term)
             'originValues' => $originValues ?? null,
             'originMeta' => $originMeta ?? null,
             'permalink' => $term->absoluteUrl(),
-            'localizations' => $taxonomy->sites()->map(function ($handle) use ($term) {
+            'localizations' => $this->getAuthorizedSitesForTaxonomy($taxonomy)->map(function ($handle) use ($term) {
                 $localized = $term->in($handle);
 
                 return [
@@ -203,7 +203,7 @@ public function update(Request $request, $taxonomy, $term, $site)
 
     public function create(Request $request, $taxonomy, $site)
     {
-        $this->authorize('create', [TermContract::class, $taxonomy]);
+        $this->authorize('create', [TermContract::class, $taxonomy, $site]);
 
         $blueprint = $taxonomy->termBlueprint($request->blueprint);
 
@@ -232,7 +232,7 @@ public function create(Request $request, $taxonomy, $site)
             'blueprint' => $blueprint->toPublishArray(),
             'published' => $taxonomy->defaultPublishState(),
             'locale' => $site->handle(),
-            'localizations' => $taxonomy->sites()->map(function ($handle) use ($taxonomy, $site) {
+            'localizations' => $this->getAuthorizedSitesForTaxonomy($taxonomy)->map(function ($handle) use ($taxonomy, $site) {
                 return [
                     'handle' => $handle,
                     'name' => Site::get($handle)->name(),
@@ -242,7 +242,7 @@ public function create(Request $request, $taxonomy, $site)
                     'url' => cp_route('taxonomies.terms.create', [$taxonomy->handle(), $handle]),
                     'livePreviewUrl' => cp_route('taxonomies.terms.preview.create', [$taxonomy->handle(), $handle]),
                 ];
-            })->all(),
+            })->values()->all(),
             'breadcrumbs' => $this->breadcrumbs($taxonomy),
             'previewTargets' => $taxonomy->previewTargets()->all(),
         ];
@@ -359,4 +359,11 @@ protected function breadcrumbs($taxonomy)
             ],
         ]);
     }
+
+    protected function getAuthorizedSitesForTaxonomy($taxonomy)
+    {
+        return $taxonomy
+            ->sites()
+            ->filter(fn ($handle) => User::current()->can('view', Site::get($handle)));
+    }
 }
diff --git a/src/Http/Middleware/CP/SelectedSite.php b/src/Http/Middleware/CP/SelectedSite.php
new file mode 100644
index 0000000000..bbb9e833e9
--- /dev/null
+++ b/src/Http/Middleware/CP/SelectedSite.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Statamic\Http\Middleware\CP;
+
+use Closure;
+use Statamic\Facades\Site;
+use Statamic\Facades\User;
+
+class SelectedSite
+{
+    public function handle($request, Closure $next)
+    {
+        $this->updateSelectedSite();
+
+        return $next($request);
+    }
+
+    private function updateSelectedSite()
+    {
+        if (User::current()->can('view', Site::selected())) {
+            return;
+        }
+
+        if ($first = Site::authorized()->first()) {
+            Site::setSelected($first->handle());
+        }
+    }
+}
diff --git a/src/Http/View/Composers/JavascriptComposer.php b/src/Http/View/Composers/JavascriptComposer.php
index e3e44f790c..6239bc7376 100644
--- a/src/Http/View/Composers/JavascriptComposer.php
+++ b/src/Http/View/Composers/JavascriptComposer.php
@@ -72,7 +72,7 @@ private function protectedVariables()
 
     protected function sites()
     {
-        return Site::all()->map(function ($site) {
+        return Site::authorized()->map(function ($site) {
             return [
                 'name' => $site->name(),
                 'handle' => $site->handle(),
diff --git a/src/Policies/CollectionPolicy.php b/src/Policies/CollectionPolicy.php
index 1c6798be73..d17a9682ce 100644
--- a/src/Policies/CollectionPolicy.php
+++ b/src/Policies/CollectionPolicy.php
@@ -7,7 +7,9 @@
 
 class CollectionPolicy
 {
-    public function before($user, $ability)
+    use Concerns\HasMultisitePolicy;
+
+    public function before($user)
     {
         $user = User::fromUser($user);
 
@@ -43,7 +45,8 @@ public function view($user, $collection)
     {
         $user = User::fromUser($user);
 
-        return $user->hasPermission("view {$collection->handle()} entries");
+        return $user->hasPermission("view {$collection->handle()} entries")
+            && $this->userCanAccessAnySite($user, $collection->sites());
     }
 
     public function edit($user, $collection)
diff --git a/src/Policies/Concerns/HasMultisitePolicy.php b/src/Policies/Concerns/HasMultisitePolicy.php
new file mode 100644
index 0000000000..e6092241fb
--- /dev/null
+++ b/src/Policies/Concerns/HasMultisitePolicy.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Statamic\Policies\Concerns;
+
+use Statamic\Facades\Site as Sites;
+use Statamic\Sites\Site;
+
+trait HasMultisitePolicy
+{
+    protected function userCanAccessSite($user, Site $site)
+    {
+        return $user->can('view', $site);
+    }
+
+    protected function userCanAccessAnySite($user, $sites)
+    {
+        if (! Sites::hasMultiple()) {
+            return true;
+        }
+
+        return $sites
+            ->map(fn ($site) => Sites::get($site))
+            ->filter(fn ($site) => $user->can('view', $site))
+            ->isNotEmpty();
+    }
+}
diff --git a/src/Policies/EntryPolicy.php b/src/Policies/EntryPolicy.php
index e381bc51e0..ba6f7ab9e5 100644
--- a/src/Policies/EntryPolicy.php
+++ b/src/Policies/EntryPolicy.php
@@ -6,7 +6,9 @@
 
 class EntryPolicy
 {
-    public function before($user, $ability)
+    use Concerns\HasMultisitePolicy;
+
+    public function before($user)
     {
         $user = User::fromUser($user);
 
@@ -24,6 +26,10 @@ public function view($user, $entry)
     {
         $user = User::fromUser($user);
 
+        if (! $this->userCanAccessSite($user, $entry->site())) {
+            return false;
+        }
+
         return $this->edit($user, $entry)
             || $user->hasPermission("view {$entry->collectionHandle()} entries");
     }
@@ -32,6 +38,10 @@ public function edit($user, $entry)
     {
         $user = User::fromUser($user);
 
+        if (! $this->userCanAccessSite($user, $entry->site())) {
+            return false;
+        }
+
         if ($this->hasAnotherAuthor($user, $entry)) {
             return $user->hasPermission("edit other authors {$entry->collectionHandle()} entries");
         }
@@ -57,16 +67,20 @@ public function update($user, $entry)
         return $this->edit($user, $entry);
     }
 
-    public function create($user, $collection)
+    public function create($user, $collection, $site = null)
     {
         $user = User::fromUser($user);
 
+        if ($site && (! $collection->sites()->contains($site->handle()) || ! $this->userCanAccessSite($user, $site))) {
+            return false;
+        }
+
         return $user->hasPermission("create {$collection->handle()} entries");
     }
 
-    public function store($user, $collection)
+    public function store($user, $collection, $site = null)
     {
-        return $this->create($user, $collection);
+        return $this->create($user, $collection, $site);
     }
 
     public function delete($user, $entry)
diff --git a/src/Policies/GlobalSetPolicy.php b/src/Policies/GlobalSetPolicy.php
index bd66e63536..6f48eb36b4 100644
--- a/src/Policies/GlobalSetPolicy.php
+++ b/src/Policies/GlobalSetPolicy.php
@@ -7,7 +7,9 @@
 
 class GlobalSetPolicy
 {
-    public function before($user, $ability)
+    use Concerns\HasMultisitePolicy;
+
+    public function before($user)
     {
         $user = User::fromUser($user);
 
@@ -38,6 +40,10 @@ public function view($user, $set)
     {
         $user = User::fromUser($user);
 
+        if (! $this->userCanAccessAnySite($user, $set->sites())) {
+            return false;
+        }
+
         return $user->hasPermission("edit {$set->handle()} globals");
     }
 
diff --git a/src/Policies/GlobalSetVariablesPolicy.php b/src/Policies/GlobalSetVariablesPolicy.php
index 45594274f6..785a408984 100644
--- a/src/Policies/GlobalSetVariablesPolicy.php
+++ b/src/Policies/GlobalSetVariablesPolicy.php
@@ -2,10 +2,25 @@
 
 namespace Statamic\Policies;
 
+use Statamic\Facades\User;
+
 class GlobalSetVariablesPolicy extends GlobalSetPolicy
 {
-    public function edit($user, $set)
+    use Concerns\HasMultisitePolicy;
+
+    public function view($user, $variables)
+    {
+        $user = User::fromUser($user);
+
+        if (! $this->userCanAccessSite($user, $variables->site())) {
+            return false;
+        }
+
+        return $user->hasPermission("edit {$variables->handle()} globals");
+    }
+
+    public function edit($user, $variables)
     {
-        return $this->view($user, $set);
+        return $this->view($user, $variables);
     }
 }
diff --git a/src/Policies/LocalizedTermPolicy.php b/src/Policies/LocalizedTermPolicy.php
new file mode 100644
index 0000000000..250b27b76c
--- /dev/null
+++ b/src/Policies/LocalizedTermPolicy.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Statamic\Policies;
+
+use Statamic\Facades\User;
+
+class LocalizedTermPolicy extends TermPolicy
+{
+    public function edit($user, $term)
+    {
+        $user = User::fromUser($user);
+
+        if (! $this->userCanAccessSite($user, $term->site())) {
+            return false;
+        }
+
+        return $user->hasPermission("edit {$term->taxonomyHandle()} terms");
+    }
+}
diff --git a/src/Policies/NavPolicy.php b/src/Policies/NavPolicy.php
index 0481c01741..8614dc0db4 100644
--- a/src/Policies/NavPolicy.php
+++ b/src/Policies/NavPolicy.php
@@ -7,7 +7,9 @@
 
 class NavPolicy
 {
-    public function before($user, $ability)
+    use Concerns\HasMultisitePolicy;
+
+    public function before($user)
     {
         $user = User::fromUser($user);
 
@@ -43,13 +45,22 @@ public function view($user, $nav)
     {
         $user = User::fromUser($user);
 
-        return $user->hasPermission("view {$nav->handle()} nav");
+        if (! $this->userCanAccessAnySite($user, $nav->sites())) {
+            return false;
+        }
+
+        return $this->edit($user, $nav)
+            || $user->hasPermission("view {$nav->handle()} nav");
     }
 
     public function edit($user, $nav)
     {
         $user = User::fromUser($user);
 
+        if (! $this->userCanAccessAnySite($user, $nav->sites())) {
+            return false;
+        }
+
         return $user->hasPermission("edit {$nav->handle()} nav");
     }
 
diff --git a/src/Policies/NavTreePolicy.php b/src/Policies/NavTreePolicy.php
new file mode 100644
index 0000000000..2caa568e0a
--- /dev/null
+++ b/src/Policies/NavTreePolicy.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Statamic\Policies;
+
+use Statamic\Facades\User;
+
+class NavTreePolicy extends NavPolicy
+{
+    use Concerns\HasMultisitePolicy;
+
+    public function view($user, $nav)
+    {
+        $user = User::fromUser($user);
+
+        if (! $this->userCanAccessSite($user, $nav->site())) {
+            return false;
+        }
+
+        return $user->hasPermission("view {$nav->handle()} nav");
+    }
+
+    public function edit($user, $nav)
+    {
+        $user = User::fromUser($user);
+
+        if (! $this->userCanAccessSite($user, $nav->site())) {
+            return false;
+        }
+
+        return $user->hasPermission("edit {$nav->handle()} nav");
+    }
+}
diff --git a/src/Policies/SitePolicy.php b/src/Policies/SitePolicy.php
new file mode 100644
index 0000000000..4870432466
--- /dev/null
+++ b/src/Policies/SitePolicy.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Statamic\Policies;
+
+use Statamic\Facades\Site;
+use Statamic\Facades\User;
+
+class SitePolicy
+{
+    public function view($user, $site)
+    {
+        if (! Site::hasMultiple()) {
+            return true;
+        }
+
+        return User::fromUser($user)->hasPermission("access {$site->handle()} site");
+    }
+}
diff --git a/src/Policies/TaxonomyPolicy.php b/src/Policies/TaxonomyPolicy.php
index d378418899..ed91bd4c8b 100644
--- a/src/Policies/TaxonomyPolicy.php
+++ b/src/Policies/TaxonomyPolicy.php
@@ -7,7 +7,9 @@
 
 class TaxonomyPolicy
 {
-    public function before($user, $ability)
+    use Concerns\HasMultisitePolicy;
+
+    public function before($user)
     {
         $user = User::fromUser($user);
 
@@ -43,7 +45,8 @@ public function view($user, $taxonomy)
     {
         $user = User::fromUser($user);
 
-        return $user->hasPermission("view {$taxonomy->handle()} terms");
+        return $user->hasPermission("view {$taxonomy->handle()} terms")
+            && $this->userCanAccessAnySite($user, $taxonomy->sites());
     }
 
     public function edit($user, $taxonomy)
diff --git a/src/Policies/TermPolicy.php b/src/Policies/TermPolicy.php
index 5f84f7d782..b823b87743 100644
--- a/src/Policies/TermPolicy.php
+++ b/src/Policies/TermPolicy.php
@@ -6,7 +6,9 @@
 
 class TermPolicy
 {
-    public function before($user, $ability)
+    use Concerns\HasMultisitePolicy;
+
+    public function before($user)
     {
         $user = User::fromUser($user);
 
@@ -42,16 +44,20 @@ public function update($user, $term)
         return $this->edit($user, $term);
     }
 
-    public function create($user, $taxonomy)
+    public function create($user, $taxonomy, $site = null)
     {
         $user = User::fromUser($user);
 
+        if ($site && (! $taxonomy->sites()->contains($site->handle()) || ! $this->userCanAccessSite($user, $site))) {
+            return false;
+        }
+
         return $user->hasPermission("create {$taxonomy->handle()} terms");
     }
 
-    public function store($user, $taxonomy)
+    public function store($user, $taxonomy, $site = null)
     {
-        return $this->create($user, $taxonomy);
+        return $this->create($user, $taxonomy, $site);
     }
 
     public function delete($user, $term)
diff --git a/src/Providers/AuthServiceProvider.php b/src/Providers/AuthServiceProvider.php
index 1a8f3132d2..3aba6e4eee 100755
--- a/src/Providers/AuthServiceProvider.php
+++ b/src/Providers/AuthServiceProvider.php
@@ -21,6 +21,7 @@ class AuthServiceProvider extends ServiceProvider
 {
     protected $policies = [
         \Statamic\Contracts\Structures\Nav::class => Policies\NavPolicy::class,
+        \Statamic\Contracts\Structures\NavTree::class => Policies\NavTreePolicy::class,
         \Statamic\Contracts\Entries\Collection::class => Policies\CollectionPolicy::class,
         \Statamic\Contracts\Entries\Entry::class => Policies\EntryPolicy::class,
         \Statamic\Contracts\Taxonomies\Taxonomy::class => Policies\TaxonomyPolicy::class,
@@ -34,6 +35,7 @@ class AuthServiceProvider extends ServiceProvider
         \Statamic\Contracts\Assets\AssetFolder::class => Policies\AssetFolderPolicy::class,
         \Statamic\Contracts\Assets\AssetContainer::class => Policies\AssetContainerPolicy::class,
         \Statamic\Fields\Fieldset::class => Policies\FieldsetPolicy::class,
+        \Statamic\Sites\Site::class => Policies\SitePolicy::class,
     ];
 
     public function register()
diff --git a/src/Providers/CpServiceProvider.php b/src/Providers/CpServiceProvider.php
index b17afe4bfd..f526f9e738 100644
--- a/src/Providers/CpServiceProvider.php
+++ b/src/Providers/CpServiceProvider.php
@@ -80,6 +80,7 @@ protected function registerMiddlewareGroups()
         $router->middlewareGroup('statamic.cp.authenticated', [
             \Statamic\Http\Middleware\CP\Authorize::class,
             \Statamic\Http\Middleware\CP\Localize::class,
+            \Statamic\Http\Middleware\CP\SelectedSite::class,
             \Statamic\Http\Middleware\CP\BootPermissions::class,
             \Statamic\Http\Middleware\CP\BootPreferences::class,
             \Statamic\Http\Middleware\CP\BootUtilities::class,
diff --git a/src/Providers/ExtensionServiceProvider.php b/src/Providers/ExtensionServiceProvider.php
index 770dc12e93..725147a87e 100644
--- a/src/Providers/ExtensionServiceProvider.php
+++ b/src/Providers/ExtensionServiceProvider.php
@@ -227,6 +227,7 @@ class ExtensionServiceProvider extends ServiceProvider
         Updates\AddAssignRolesAndGroupsPermissions::class,
         Updates\AddDefaultPreferencesToGitConfig::class,
         Updates\AddConfigureFormFieldsPermission::class,
+        Updates\AddSitePermissions::class,
     ];
 
     public function register()
diff --git a/src/Query/Scopes/Filters/Site.php b/src/Query/Scopes/Filters/Site.php
index 5e5ad09210..fcfa0ebde8 100644
--- a/src/Query/Scopes/Filters/Site.php
+++ b/src/Query/Scopes/Filters/Site.php
@@ -51,7 +51,7 @@ public function visibleTo($key)
 
     protected function options()
     {
-        return Facades\Site::all()->mapWithKeys(function ($site) {
+        return Facades\Site::authorized()->mapWithKeys(function ($site) {
             return [$site->handle() => $site->name()];
         });
     }
diff --git a/src/Sites/Sites.php b/src/Sites/Sites.php
index 90e9984547..b67fd13f9b 100644
--- a/src/Sites/Sites.php
+++ b/src/Sites/Sites.php
@@ -2,6 +2,7 @@
 
 namespace Statamic\Sites;
 
+use Statamic\Facades\User;
 use Statamic\Support\Str;
 
 class Sites
@@ -20,6 +21,11 @@ public function all()
         return $this->sites;
     }
 
+    public function authorized()
+    {
+        return $this->sites->filter(fn ($site) => User::current()->can('view', $site));
+    }
+
     public function default()
     {
         return $this->sites->first();
@@ -62,6 +68,11 @@ public function selected()
         return $this->get(session('statamic.cp.selected-site')) ?? $this->default();
     }
 
+    public function setSelected($site)
+    {
+        session()->put('statamic.cp.selected-site', $site);
+    }
+
     public function setConfig($key, $value = null)
     {
         // If no value is provided, then the key must've been the entire config.
diff --git a/src/Structures/Nav.php b/src/Structures/Nav.php
index 4d7ee5cb0e..bb26b83793 100644
--- a/src/Structures/Nav.php
+++ b/src/Structures/Nav.php
@@ -104,6 +104,11 @@ public function trees()
         })->filter();
     }
 
+    public function sites()
+    {
+        return $this->trees()->keys();
+    }
+
     public function existsIn($site)
     {
         return $this->trees()->has($site);
diff --git a/src/UpdateScripts/AddSitePermissions.php b/src/UpdateScripts/AddSitePermissions.php
new file mode 100644
index 0000000000..84b6ebbac0
--- /dev/null
+++ b/src/UpdateScripts/AddSitePermissions.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Statamic\UpdateScripts;
+
+use Statamic\Facades\Role;
+use Statamic\Facades\Site;
+
+class AddSitePermissions extends UpdateScript
+{
+    public function shouldUpdate($newVersion, $oldVersion)
+    {
+        return $this->isUpdatingTo('4.27.0');
+    }
+
+    public function update()
+    {
+        Role::all()->each(fn ($role) => $this->updateRole($role));
+    }
+
+    private function updateRole($role)
+    {
+        Site::all()->each(fn ($site) => $role->addPermission("access {$site->handle()} site"));
+
+        $role->save();
+    }
+}
diff --git a/tests/CP/Navigation/CoreNavTest.php b/tests/CP/Navigation/CoreNavTest.php
new file mode 100644
index 0000000000..952042320d
--- /dev/null
+++ b/tests/CP/Navigation/CoreNavTest.php
@@ -0,0 +1,216 @@
+<?php
+
+namespace Tests\CP\Navigation;
+
+use Statamic\Facades;
+use Statamic\Facades\CP\Nav;
+use Statamic\Facades\User;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class CoreNavTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+
+    protected $shouldPreventNavBeingBuilt = false;
+
+    /** @test */
+    public function it_can_build_a_default_nav()
+    {
+        $expected = collect([
+            'Top Level' => ['Dashboard', 'Playground'],
+            'Content' => ['Collections', 'Navigation', 'Taxonomies', 'Assets', 'Globals'],
+            'Fields' => ['Blueprints', 'Fieldsets'],
+            'Tools' => ['Forms', 'Updates', 'Addons', 'Utilities', 'GraphQL'],
+            'Users' => ['Users', 'Groups', 'Permissions'],
+        ]);
+
+        $this->actingAs(tap(User::make()->makeSuper())->save());
+
+        $nav = $this->build();
+
+        $this->assertEquals($expected->keys(), $nav->keys());
+        $this->assertEquals($expected->get('Content'), $nav->get('Content')->map->display()->all());
+        $this->assertEquals($expected->get('Fields'), $nav->get('Fields')->map->display()->all());
+        $this->assertEquals($expected->get('Tools'), $nav->get('Tools')->map->display()->all());
+        $this->assertEquals($expected->get('Users'), $nav->get('Users')->map->display()->all());
+    }
+
+    /** @test */
+    public function it_doesnt_build_collection_children_from_sites_that_the_user_is_not_authorized_to_see()
+    {
+        Facades\Site::setConfig(['sites' => [
+            'en' => ['url' => '/', 'locale' => 'en_US', 'name' => 'English'],
+            'fr' => ['url' => '/', 'locale' => 'fr_FR', 'name' => 'French'],
+            'de' => ['url' => '/', 'locale' => 'de_DE', 'name' => 'German'],
+        ]]);
+
+        Facades\Collection::make('has_some_french')->sites(['en', 'fr', 'de'])->save();
+        Facades\Collection::make('has_no_french')->sites(['en', 'de'])->save();
+        Facades\Collection::make('has_only_french')->sites(['fr'])->save();
+
+        $this->setTestRoles(['test' => [
+            'access cp',
+            'view has_some_french entries',
+            'view has_no_french entries',
+            'view has_only_french entries',
+            'access en site',
+            // 'access fr site', // Give them access to all data, but not all sites
+            'access de site',
+        ]]);
+
+        $this
+            ->actingAs(tap(User::make()->assignRole('test'))->save())
+            ->get(cp_route('collections.index'));
+
+        $actual = $this->build()->get('Content')->keyBy->display()->get('Collections')->children()->map->id()->all();
+
+        $expected = [
+            'content::collections::has_some_french', // Can see, because content type contains data from accessible sites.
+            'content::collections::has_no_french', // Can see, because content type only contains data from accessible sites.
+            // 'content::collections::has_only_french', // Cannot, because content only contains data from prohibited sites.
+        ];
+
+        $this->assertEqualsCanonicalizing($expected, $actual);
+    }
+
+    /** @test */
+    public function it_doesnt_build_navigation_children_from_sites_that_the_user_is_not_authorized_to_see()
+    {
+        Facades\Site::setConfig(['sites' => [
+            'en' => ['url' => '/', 'locale' => 'en_US', 'name' => 'English'],
+            'fr' => ['url' => '/', 'locale' => 'fr_FR', 'name' => 'French'],
+            'de' => ['url' => '/', 'locale' => 'de_DE', 'name' => 'German'],
+        ]]);
+
+        $nav1 = tap(Facades\Nav::make()->handle('has_some_french'))->save();
+        $nav1->makeTree('en')->save();
+        $nav1->makeTree('fr')->save();
+        $nav1->makeTree('de')->save();
+
+        $nav2 = tap(Facades\Nav::make()->handle('has_no_french'))->save();
+        $nav2->makeTree('en')->save();
+        $nav2->makeTree('de')->save();
+
+        $nav3 = tap(Facades\Nav::make()->handle('has_only_french'))->save();
+        $nav3->makeTree('fr')->save();
+
+        $this->setTestRoles(['test' => [
+            'access cp',
+            'view has_some_french nav',
+            'view has_no_french nav',
+            'view has_only_french nav',
+            'access en site',
+            // 'access fr site', // Give them access to all data, but not all sites
+            'access de site',
+        ]]);
+
+        $this
+            ->actingAs(tap(User::make()->assignRole('test'))->save())
+            ->get(cp_route('navigation.index'));
+
+        $actual = $this->build()->get('Content')->keyBy->display()->get('Navigation')->children()->map->id()->all();
+
+        $expected = [
+            'content::navigation::has_some_french', // Can see, because content type contains data from accessible sites.
+            'content::navigation::has_no_french', // Can see, because content type only contains data from accessible sites.
+            // 'content::navigation::has_only_french', // Cannot, because content only contains data from prohibited sites.
+        ];
+
+        $this->assertEqualsCanonicalizing($expected, $actual);
+    }
+
+    /** @test */
+    public function it_doesnt_build_taxonomy_children_from_sites_that_the_user_is_not_authorized_to_see()
+    {
+        Facades\Site::setConfig(['sites' => [
+            'en' => ['url' => '/', 'locale' => 'en_US', 'name' => 'English'],
+            'fr' => ['url' => '/', 'locale' => 'fr_FR', 'name' => 'French'],
+            'de' => ['url' => '/', 'locale' => 'de_DE', 'name' => 'German'],
+        ]]);
+
+        Facades\Taxonomy::make('has_some_french')->sites(['en', 'fr', 'de'])->save();
+        Facades\Taxonomy::make('has_no_french')->sites(['en', 'de'])->save();
+        Facades\Taxonomy::make('has_only_french')->sites(['fr'])->save();
+
+        $this->setTestRoles(['test' => [
+            'access cp',
+            'view has_some_french terms',
+            'view has_no_french terms',
+            'view has_only_french terms',
+            'access en site',
+            // 'access fr site', // Give them access to all data, but not all sites
+            'access de site',
+        ]]);
+
+        $this
+            ->actingAs(tap(User::make()->assignRole('test'))->save())
+            ->get(cp_route('taxonomies.index'));
+
+        $actual = $this->build()->get('Content')->keyBy->display()->get('Taxonomies')->children()->map->id()->all();
+
+        $expected = [
+            'content::taxonomies::has_some_french', // Can see, because content type contains data from accessible sites.
+            'content::taxonomies::has_no_french', // Can see, because content type only contains data from accessible sites.
+            // 'content::taxonomies::has_only_french', // Cannot, because content only contains data from prohibited sites.
+        ];
+
+        $this->assertEqualsCanonicalizing($expected, $actual);
+    }
+
+    /** @test */
+    public function it_doesnt_build_globals_children_from_sites_that_the_user_is_not_authorized_to_see()
+    {
+        Facades\Site::setConfig(['sites' => [
+            'en' => ['url' => '/', 'locale' => 'en_US', 'name' => 'English'],
+            'fr' => ['url' => '/', 'locale' => 'fr_FR', 'name' => 'French'],
+            'de' => ['url' => '/', 'locale' => 'de_DE', 'name' => 'German'],
+        ]]);
+
+        $set1 = Facades\GlobalSet::make('has_some_french');
+        $set1->addLocalization($set1->makeLocalization('en'));
+        $set1->addLocalization($set1->makeLocalization('fr'));
+        $set1->addLocalization($set1->makeLocalization('de'));
+        $set1->save();
+
+        $set2 = Facades\GlobalSet::make('has_no_french');
+        $set2->addLocalization($set2->makeLocalization('en'));
+        $set2->addLocalization($set2->makeLocalization('de'));
+        $set2->save();
+
+        $set3 = Facades\GlobalSet::make('has_only_french');
+        $set3->addLocalization($set3->makeLocalization('fr'));
+        $set3->save();
+
+        $this->setTestRoles(['test' => [
+            'access cp',
+            'edit has_some_french globals',
+            'edit has_no_french globals',
+            'edit has_only_french globals',
+            'access en site',
+            // 'access fr site', // Give them access to all data, but not all sites
+            'access de site',
+        ]]);
+
+        $this
+            ->actingAs(tap(User::make()->assignRole('test'))->save())
+            ->get(cp_route('globals.index'));
+
+        $actual = $this->build()->get('Content')->keyBy->display()->get('Globals')->children()->map->id()->all();
+
+        $expected = [
+            'content::globals::has_some_french', // Can see, because content type contains data from accessible sites.
+            'content::globals::has_no_french', // Can see, because content type only contains data from accessible sites.
+            // 'content::globals::has_only_french', // Cannot, because content only contains data from prohibited sites.
+        ];
+
+        $this->assertEqualsCanonicalizing($expected, $actual);
+    }
+
+    protected function build()
+    {
+        return Nav::build()->pluck('items', 'display');
+    }
+}
diff --git a/tests/CP/Navigation/NavTest.php b/tests/CP/Navigation/NavTest.php
index 0fe2d54bde..491a8f3c83 100644
--- a/tests/CP/Navigation/NavTest.php
+++ b/tests/CP/Navigation/NavTest.php
@@ -31,28 +31,6 @@ public function setUp(): void
         Facades\Form::shouldReceive('all')->andReturn(collect());
     }
 
-    /** @test */
-    public function it_can_build_a_default_nav()
-    {
-        $expected = collect([
-            'Top Level' => ['Dashboard', 'Playground'],
-            'Content' => ['Collections', 'Navigation', 'Taxonomies', 'Assets', 'Globals'],
-            'Fields' => ['Blueprints', 'Fieldsets'],
-            'Tools' => ['Forms', 'Updates', 'Addons', 'Utilities', 'GraphQL'],
-            'Users' => ['Users', 'Groups', 'Permissions'],
-        ]);
-
-        $this->actingAs(tap(User::make()->makeSuper())->save());
-
-        $nav = $this->build();
-
-        $this->assertEquals($expected->keys(), $nav->keys());
-        $this->assertEquals($expected->get('Content'), $nav->get('Content')->map->display()->all());
-        $this->assertEquals($expected->get('Fields'), $nav->get('Fields')->map->display()->all());
-        $this->assertEquals($expected->get('Tools'), $nav->get('Tools')->map->display()->all());
-        $this->assertEquals($expected->get('Users'), $nav->get('Users')->map->display()->all());
-    }
-
     /** @test */
     public function it_can_create_a_nav_item()
     {
diff --git a/tests/Data/Entries/CollectionTest.php b/tests/Data/Entries/CollectionTest.php
index f8f34f9705..8bb2635754 100644
--- a/tests/Data/Entries/CollectionTest.php
+++ b/tests/Data/Entries/CollectionTest.php
@@ -15,13 +15,16 @@
 use Statamic\Facades;
 use Statamic\Facades\Antlers;
 use Statamic\Facades\Site;
+use Statamic\Facades\User;
 use Statamic\Fields\Blueprint;
 use Statamic\Structures\CollectionStructure;
+use Tests\FakesRoles;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
 
 class CollectionTest extends TestCase
 {
+    use FakesRoles;
     use PreventSavingStacheItemsToDisk;
 
     /** @test */
@@ -863,4 +866,36 @@ public function additionalPreviewTargetProvider()
             'through facade' => [true],
         ];
     }
+
+    /** @test */
+    public function it_cannot_view_collections_from_sites_that_the_user_is_not_authorized_to_see()
+    {
+        Site::setConfig([
+            'default' => 'en',
+            'sites' => [
+                'en' => ['name' => 'English', 'locale' => 'en_US', 'url' => 'http://test.com/'],
+                'fr' => ['name' => 'French', 'locale' => 'fr_FR', 'url' => 'http://fr.test.com/'],
+                'de' => ['name' => 'German', 'locale' => 'de_DE', 'url' => 'http://test.com/de/'],
+            ],
+        ]);
+
+        $collection1 = tap(Facades\Collection::make('has_some_french')->sites(['en', 'fr', 'de']))->save();
+        $collection2 = tap(Facades\Collection::make('has_no_french')->sites(['en', 'de']))->save();
+        $collection3 = tap(Facades\Collection::make('has_only_french')->sites(['fr']))->save();
+
+        $this->setTestRoles(['test' => [
+            'access cp',
+            'view has_some_french entries',
+            'view has_no_french entries',
+            'view has_only_french entries',
+            'access en site',
+            // 'access fr site', // Give them access to all data, but not all sites
+            'access de site',
+        ]]);
+
+        $user = tap(User::make()->assignRole('test'))->save();
+        $this->assertTrue($user->can('view', $collection1));
+        $this->assertTrue($user->can('view', $collection2));
+        $this->assertFalse($user->can('view', $collection3));
+    }
 }
diff --git a/tests/Data/Globals/GlobalSetTest.php b/tests/Data/Globals/GlobalSetTest.php
index bf61d68f34..0cae525973 100644
--- a/tests/Data/Globals/GlobalSetTest.php
+++ b/tests/Data/Globals/GlobalSetTest.php
@@ -10,13 +10,16 @@
 use Statamic\Facades\GlobalSet as GlobalSetFacade;
 use Statamic\Facades\GlobalVariables;
 use Statamic\Facades\Site;
+use Statamic\Facades\User;
 use Statamic\Globals\GlobalSet;
 use Statamic\Globals\VariablesCollection;
+use Tests\FakesRoles;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
 
 class GlobalSetTest extends TestCase
 {
+    use FakesRoles;
     use PreventSavingStacheItemsToDisk;
 
     /** @test */
@@ -334,4 +337,69 @@ public function it_updates_the_origin_of_descendants_when_saving_an_entry_with_l
         $this->assertEquals('fr updated', $global->in('fr')->foo);
         $this->assertEquals('fr updated', $global->in('de')->foo);
     }
+
+    /** @test */
+    public function it_gets_available_sites_from_localizations()
+    {
+        Site::setConfig([
+            'default' => 'en',
+            'sites' => [
+                'en' => ['name' => 'English', 'locale' => 'en_US', 'url' => 'http://test.com/'],
+                'fr' => ['name' => 'French', 'locale' => 'fr_FR', 'url' => 'http://fr.test.com/'],
+                'de' => ['name' => 'German', 'locale' => 'de_DE', 'url' => 'http://test.com/de/'],
+            ],
+        ]);
+
+        $set = GlobalSet::make('test');
+        $set->addLocalization($set->makeLocalization('en'));
+        $set->addLocalization($set->makeLocalization('fr'));
+        $set->save();
+
+        $this->assertEquals(\Illuminate\Support\Collection::class, get_class($set->sites()));
+        $this->assertEquals(['en', 'fr'], $set->sites()->all());
+    }
+
+    /** @test */
+    public function it_cannot_view_global_sets_from_sites_that_the_user_is_not_authorized_to_see()
+    {
+        Site::setConfig([
+            'default' => 'en',
+            'sites' => [
+                'en' => ['name' => 'English', 'locale' => 'en_US', 'url' => 'http://test.com/'],
+                'fr' => ['name' => 'French', 'locale' => 'fr_FR', 'url' => 'http://fr.test.com/'],
+                'de' => ['name' => 'German', 'locale' => 'de_DE', 'url' => 'http://test.com/de/'],
+            ],
+        ]);
+
+        $set1 = GlobalSet::make('has_some_french');
+        $set1->addLocalization($set1->makeLocalization('en'));
+        $set1->addLocalization($set1->makeLocalization('fr'));
+        $set1->addLocalization($set1->makeLocalization('de'));
+        $set1->save();
+
+        $set2 = GlobalSet::make('has_no_french');
+        $set2->addLocalization($set2->makeLocalization('en'));
+        $set2->addLocalization($set2->makeLocalization('de'));
+        $set2->save();
+
+        $set3 = GlobalSet::make('has_only_french');
+        $set3->addLocalization($set3->makeLocalization('fr'));
+        $set3->save();
+
+        $this->setTestRoles(['test' => [
+            'access cp',
+            'edit has_some_french globals',
+            'edit has_no_french globals',
+            'edit has_only_french globals',
+            'access en site',
+            // 'access fr site', // Give them access to all data, but not all sites
+            'access de site',
+        ]]);
+
+        $user = tap(User::make()->assignRole('test'))->save();
+
+        $this->assertTrue($user->can('view', $set1));
+        $this->assertTrue($user->can('view', $set2));
+        $this->assertFalse($user->can('view', $set3));
+    }
 }
diff --git a/tests/Data/Structures/NavTest.php b/tests/Data/Structures/NavTest.php
index be743464eb..069c105907 100644
--- a/tests/Data/Structures/NavTest.php
+++ b/tests/Data/Structures/NavTest.php
@@ -7,12 +7,15 @@
 use Statamic\Contracts\Entries\Collection as StatamicCollection;
 use Statamic\Facades;
 use Statamic\Facades\Site;
+use Statamic\Facades\User;
 use Statamic\Structures\Nav;
 use Statamic\Structures\NavTree;
+use Tests\FakesRoles;
 use Tests\PreventSavingStacheItemsToDisk;
 
 class NavTest extends StructureTestCase
 {
+    use FakesRoles;
     use PreventSavingStacheItemsToDisk;
 
     public function structure($handle = null)
@@ -148,4 +151,64 @@ public function it_has_no_route()
     {
         $this->assertNull($this->structure('test')->route('en'));
     }
+
+    /** @test */
+    public function it_gets_available_sites_from_trees()
+    {
+        Site::setConfig([
+            'default' => 'en',
+            'sites' => [
+                'en' => ['name' => 'English', 'locale' => 'en_US', 'url' => 'http://test.com/'],
+                'fr' => ['name' => 'French', 'locale' => 'fr_FR', 'url' => 'http://fr.test.com/'],
+                'de' => ['name' => 'German', 'locale' => 'de_DE', 'url' => 'http://test.com/de/'],
+            ],
+        ]);
+
+        $nav = tap(Facades\Nav::make()->handle('test'))->save();
+        $nav->makeTree('en')->save();
+        $nav->makeTree('fr')->save();
+
+        $this->assertInstanceOf(\Illuminate\Support\Collection::class, $nav->sites());
+        $this->assertEquals(['en', 'fr'], $nav->sites()->all());
+    }
+
+    /** @test */
+    public function it_cannot_view_navs_from_sites_that_the_user_is_not_authorized_to_see()
+    {
+        Site::setConfig([
+            'default' => 'en',
+            'sites' => [
+                'en' => ['name' => 'English', 'locale' => 'en_US', 'url' => 'http://test.com/'],
+                'fr' => ['name' => 'French', 'locale' => 'fr_FR', 'url' => 'http://fr.test.com/'],
+                'de' => ['name' => 'German', 'locale' => 'de_DE', 'url' => 'http://test.com/de/'],
+            ],
+        ]);
+
+        $nav1 = tap(Facades\Nav::make()->handle('has_some_french'))->save();
+        $nav1->makeTree('en')->save();
+        $nav1->makeTree('fr')->save();
+        $nav1->makeTree('de')->save();
+
+        $nav2 = tap(Facades\Nav::make()->handle('has_no_french'))->save();
+        $nav2->makeTree('en')->save();
+        $nav2->makeTree('de')->save();
+
+        $nav3 = tap(Facades\Nav::make()->handle('has_only_french'))->save();
+        $nav3->makeTree('fr')->save();
+
+        $this->setTestRoles(['test' => [
+            'access cp',
+            'view has_some_french nav',
+            'view has_no_french nav',
+            'view has_only_french nav',
+            'access en site',
+            // 'access fr site', // Give them access to all data, but not all sites
+            'access de site',
+        ]]);
+
+        $user = tap(User::make()->assignRole('test'))->save();
+        $this->assertTrue($user->can('view', $nav1));
+        $this->assertTrue($user->can('view', $nav2));
+        $this->assertFalse($user->can('view', $nav3));
+    }
 }
diff --git a/tests/Data/Taxonomies/TaxonomyTest.php b/tests/Data/Taxonomies/TaxonomyTest.php
index 2502ae16e6..063403c8fe 100644
--- a/tests/Data/Taxonomies/TaxonomyTest.php
+++ b/tests/Data/Taxonomies/TaxonomyTest.php
@@ -14,14 +14,17 @@
 use Statamic\Facades\Collection;
 use Statamic\Facades\Entry;
 use Statamic\Facades\Site;
+use Statamic\Facades\User;
 use Statamic\Fields\Blueprint;
 use Statamic\Support\Arr;
 use Statamic\Taxonomies\Taxonomy;
+use Tests\FakesRoles;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
 
 class TaxonomyTest extends TestCase
 {
+    use FakesRoles;
     use PreventSavingStacheItemsToDisk;
 
     /** @test */
@@ -364,6 +367,38 @@ public function if_saving_event_returns_false_the_taxonomy_doesnt_save()
         Event::assertNotDispatched(TaxonomySaved::class);
     }
 
+    /** @test */
+    public function it_cannot_view_taxonomies_from_sites_that_the_user_is_not_authorized_to_see()
+    {
+        Site::setConfig([
+            'default' => 'en',
+            'sites' => [
+                'en' => ['name' => 'English', 'locale' => 'en_US', 'url' => 'http://test.com/'],
+                'fr' => ['name' => 'French', 'locale' => 'fr_FR', 'url' => 'http://fr.test.com/'],
+                'de' => ['name' => 'German', 'locale' => 'de_DE', 'url' => 'http://test.com/de/'],
+            ],
+        ]);
+
+        $taxonomy1 = tap(Facades\Taxonomy::make('has_some_french')->sites(['en', 'fr', 'de']))->save();
+        $taxonomy2 = tap(Facades\Taxonomy::make('has_no_french')->sites(['en', 'de']))->save();
+        $taxonomy3 = tap(Facades\Taxonomy::make('has_only_french')->sites(['fr']))->save();
+
+        $this->setTestRoles(['test' => [
+            'access cp',
+            'view has_some_french terms',
+            'view has_no_french terms',
+            'view has_only_french terms',
+            'access en site',
+            // 'access fr site', // Give them access to all data, but not all sites
+            'access de site',
+        ]]);
+
+        $user = tap(User::make()->assignRole('test'))->save();
+        $this->assertTrue($user->can('view', $taxonomy1));
+        $this->assertTrue($user->can('view', $taxonomy2));
+        $this->assertFalse($user->can('view', $taxonomy3));
+    }
+
     public function additionalPreviewTargetProvider()
     {
         return [
diff --git a/tests/Factories/GlobalFactory.php b/tests/Factories/GlobalFactory.php
index 73bc508c75..20a5f7322c 100644
--- a/tests/Factories/GlobalFactory.php
+++ b/tests/Factories/GlobalFactory.php
@@ -9,6 +9,7 @@ class GlobalFactory
     protected $id;
     protected $handle;
     protected $data = [];
+    protected $site = 'en';
 
     public function id($id)
     {
@@ -31,12 +32,19 @@ public function data($data)
         return $this;
     }
 
+    public function site($handle)
+    {
+        $this->site = $handle;
+
+        return $this;
+    }
+
     public function make()
     {
         $set = GlobalSet::make($this->handle);
 
         $set->addLocalization(
-            $set->makeLocalization('en')->data($this->data)
+            $set->makeLocalization($this->site)->data($this->data)
         );
 
         if ($this->id) {
diff --git a/tests/FakesRoles.php b/tests/FakesRoles.php
index dee2e251c9..2184e4e13a 100644
--- a/tests/FakesRoles.php
+++ b/tests/FakesRoles.php
@@ -43,4 +43,14 @@ public function all(): Collection
         app()->instance(RepositoryContract::class, $fake);
         Role::swap($fake);
     }
+
+    protected function setTestRole(string $handle, array $permissions)
+    {
+        $this->setTestRoles(array_merge(
+            Role::all()->mapWithKeys(function ($role) {
+                return [$role->handle() => $role->permissions()];
+            })->toArray(),
+            [$handle => $permissions]
+        ));
+    }
 }
diff --git a/tests/Feature/Entries/UpdateEntryTest.php b/tests/Feature/Entries/UpdateEntryTest.php
index 3544a9edae..1f66653fc8 100644
--- a/tests/Feature/Entries/UpdateEntryTest.php
+++ b/tests/Feature/Entries/UpdateEntryTest.php
@@ -9,6 +9,7 @@
 use Statamic\Facades\Blueprint;
 use Statamic\Facades\Collection;
 use Statamic\Facades\Entry;
+use Statamic\Facades\Role;
 use Statamic\Facades\Site;
 use Statamic\Facades\User;
 use Tests\FakesRoles;
@@ -21,7 +22,7 @@ class UpdateEntryTest extends TestCase
     use PreventSavingStacheItemsToDisk;
 
     /** @test */
-    public function it_denies_access_if_you_dont_have_permission()
+    public function it_denies_access_if_you_dont_have_edit_permission()
     {
         $this->setTestRoles(['test' => ['access cp']]);
         $user = tap(User::make()->assignRole('test'))->save();
@@ -41,6 +42,32 @@ public function it_denies_access_if_you_dont_have_permission()
         $this->assertEquals('Existing Entry', $entry->fresh()->value('title'));
     }
 
+    /** @test */
+    public function it_denies_access_if_you_dont_have_site_permission()
+    {
+        Site::setConfig(['sites' => [
+            'en' => ['url' => '/', 'locale' => 'en_US', 'name' => 'English'],
+            'fr' => ['url' => '/', 'locale' => 'fr_FR', 'name' => 'French'],
+        ]]);
+
+        [$user, $collection] = $this->seedUserAndCollection();
+        $collection->sites(['en', 'fr'])->save();
+        Role::find('test')->removePermission('access en site');
+
+        $entry = EntryFactory::collection($collection)
+            ->slug('existing-entry')
+            ->data(['title' => 'Existing Entry'])
+            ->create();
+
+        $this
+            ->actingAs($user)
+            ->update($entry)
+            ->assertForbidden();
+
+        $this->assertCount(1, Entry::all());
+        $this->assertEquals('Existing Entry', $entry->fresh()->value('title'));
+    }
+
     /** @test */
     public function entry_gets_updated()
     {
@@ -342,7 +369,12 @@ public function user_without_permission_to_manage_publish_state_cannot_change_pu
 
     private function seedUserAndCollection()
     {
-        $this->setTestRoles(['test' => ['access cp', 'edit test entries']]);
+        $this->setTestRoles(['test' => [
+            'access cp',
+            'edit test entries',
+            'access en site',
+            'access fr site',
+        ]]);
         $user = tap(User::make()->assignRole('test'))->save();
         $collection = tap(Collection::make('test'))->save();
 
diff --git a/tests/Feature/Entries/ViewEntryListingTest.php b/tests/Feature/Entries/ViewEntryListingTest.php
new file mode 100644
index 0000000000..544e5ad00f
--- /dev/null
+++ b/tests/Feature/Entries/ViewEntryListingTest.php
@@ -0,0 +1,93 @@
+<?php
+
+namespace Tests\Feature\Entries;
+
+use Facades\Tests\Factories\EntryFactory;
+use Statamic\Entries\Collection;
+use Statamic\Facades\Site;
+use Statamic\Facades\User;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class ViewEntryListingTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+
+    /** @test */
+    public function it_shows_entries_index()
+    {
+        $this->setTestRoles(['test' => [
+            'access cp',
+            'view test entries',
+        ]]);
+
+        $user = tap(User::make()->assignRole('test'))->save();
+
+        $collection = tap(Collection::make('test'))->save();
+
+        foreach (['one', 'two', 'three'] as $handle) {
+            EntryFactory::collection($collection)
+                ->slug($handle)
+                ->create();
+        }
+
+        $response = $this
+            ->actingAs($user)
+            ->get(cp_route('collections.entries.index', ['collection' => 'test']))
+            ->assertOk();
+
+        $entries = collect($response->getData()->data);
+
+        $this->assertEquals(['one', 'two', 'three'], $entries->pluck('slug')->all());
+    }
+
+    /** @test */
+    public function it_shows_only_entries_in_index_for_sites_user_can_access()
+    {
+        Site::setConfig(['sites' => [
+            'en' => ['url' => '/', 'locale' => 'en_US', 'name' => 'English'],
+            'fr' => ['url' => '/', 'locale' => 'fr_FR', 'name' => 'French'],
+            'de' => ['url' => '/', 'locale' => 'de_DE', 'name' => 'German'],
+        ]]);
+
+        $collection = tap(Collection::make('test'))->save();
+
+        foreach (['en', 'fr', 'de'] as $locale) {
+            foreach (['one', 'two', 'three'] as $handle) {
+                EntryFactory::collection($collection)
+                    ->slug("{$locale}-{$handle}")
+                    ->locale($locale)
+                    ->create();
+            }
+        }
+
+        $this->setTestRoles(['test' => [
+            'access cp',
+            'view test entries',
+            'access en site',
+            'access de site',
+        ]]);
+
+        $user = tap(User::make()->assignRole('test'))->save();
+
+        $response = $this
+            ->actingAs($user)
+            ->get(cp_route('collections.entries.index', ['collection' => 'test']))
+            ->assertOk();
+
+        $entries = collect($response->getData()->data);
+
+        $expected = [
+            'en-one',
+            'en-two',
+            'en-three',
+            'de-one',
+            'de-two',
+            'de-three',
+        ];
+
+        $this->assertEquals($expected, $entries->pluck('slug')->all());
+    }
+}
diff --git a/tests/Feature/Globals/UpdateGlobalVariablesTest.php b/tests/Feature/Globals/UpdateGlobalVariablesTest.php
index 91c67700c6..effe9c6beb 100644
--- a/tests/Feature/Globals/UpdateGlobalVariablesTest.php
+++ b/tests/Feature/Globals/UpdateGlobalVariablesTest.php
@@ -8,6 +8,7 @@
 use Statamic\Events\GlobalVariablesSaved;
 use Statamic\Facades\Blueprint;
 use Statamic\Facades\GlobalSet;
+use Statamic\Facades\Site;
 use Statamic\Facades\User;
 use Tests\FakesRoles;
 use Tests\PreventSavingStacheItemsToDisk;
@@ -19,16 +20,36 @@ class UpdateGlobalVariablesTest extends TestCase
     use PreventSavingStacheItemsToDisk;
 
     /** @test */
-    public function it_denies_access_if_you_dont_have_permission()
+    public function it_denies_access_if_you_dont_have_edit_permission()
     {
-        $this->setTestRoles(['test' => ['access cp']]);
+        $this->setTestRoles(['test' => ['access cp', 'access en site']]);
         $user = User::make()->assignRole('test')->save();
         $global = GlobalFactory::handle('test')->create();
 
         $this
             ->from('/original')
             ->actingAs($user)
-            ->patch($global->in('en')->editUrl())
+            ->patch($global->in('en')->updateUrl())
+            ->assertRedirect('/original')
+            ->assertSessionHas('error');
+    }
+
+    /** @test */
+    public function it_denies_access_if_you_dont_have_site_permission()
+    {
+        Site::setConfig(['sites' => [
+            'en' => ['locale' => 'en', 'url' => '/'],
+            'fr' => ['locale' => 'fr', 'url' => '/fr/'],
+        ]]);
+        $this->setTestRoles(['test' => ['access cp', 'edit test globals']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+        $global = GlobalFactory::handle('test')->data(['foo' => 'bar'])->make();
+        $global->addLocalization($global->makeLocalization('fr'))->save();
+
+        $this
+            ->from('/original')
+            ->actingAs($user)
+            ->patch($global->in('fr')->updateUrl(), ['foo' => 'baz'])
             ->assertRedirect('/original')
             ->assertSessionHas('error');
     }
diff --git a/tests/Feature/Globals/ViewGlobalsListingTest.php b/tests/Feature/Globals/ViewGlobalsListingTest.php
index 9137605528..fbad083bec 100644
--- a/tests/Feature/Globals/ViewGlobalsListingTest.php
+++ b/tests/Feature/Globals/ViewGlobalsListingTest.php
@@ -33,10 +33,10 @@ public function it_lists_globals()
             ->get(cp_route('globals.index'))
             ->assertOk()
             ->assertViewHas('globals', function ($globals) {
-                return Arr::get($globals, '0.handle', 'test_one')
-                    && Arr::get($globals, '0.edit_url', url('/cp/globals/test_one'))
-                    && Arr::get($globals, '1.handle', 'test_three')
-                    && Arr::get($globals, '1.edit_url', url('/cp/globals/test_three'));
+                return Arr::get($globals, '0.handle') === 'test_one'
+                    && Arr::get($globals, '0.edit_url') === url('/cp/globals/test_one')
+                    && Arr::get($globals, '1.handle') === 'test_three'
+                    && Arr::get($globals, '1.edit_url') === url('/cp/globals/test_three');
             });
     }
 
@@ -50,6 +50,8 @@ public function it_uses_the_configure_url_if_it_doesnt_exist_in_the_selected_sit
 
         $this->setTestRoles(['test' => [
             'access cp',
+            'access en site',
+            'access fr site',
             'configure globals',
         ]]);
         $user = User::make()->assignRole('test')->save();
@@ -57,16 +59,16 @@ public function it_uses_the_configure_url_if_it_doesnt_exist_in_the_selected_sit
         $one->addLocalization($one->makeLocalization('fr'))->save();
         $two = GlobalFactory::handle('test_two')->create();
 
-        session()->put('statamic.cp.selected-site', 'fr');
+        Site::setSelected('fr');
 
         $this->actingAs($user)
             ->get(cp_route('globals.index'))
             ->assertOk()
             ->assertViewHas('globals', function ($globals) {
-                return Arr::get($globals, '0.handle', 'test_one')
-                    && Arr::get($globals, '0.edit_url', url('/cp/globals/test_one?site=fr'))
-                    && Arr::get($globals, '1.handle', 'test_two')
-                    && Arr::get($globals, '1.edit_url', url('/cp/globals/test_two/edit'));
+                return Arr::get($globals, '0.handle') === 'test_one'
+                    && Arr::get($globals, '0.edit_url') === url('/cp/globals/test_one?site=fr')
+                    && Arr::get($globals, '1.handle') === 'test_two'
+                    && Arr::get($globals, '1.edit_url') === url('/cp/globals/test_two/edit');
             });
     }
 
@@ -80,6 +82,8 @@ public function it_filters_out_globals_if_it_doesnt_exist_in_the_selected_site_a
 
         $this->setTestRoles(['test' => [
             'access cp',
+            'access en site',
+            'access fr site',
             'edit test_one globals',
             'edit test_three globals',
         ]]);
@@ -89,7 +93,7 @@ public function it_filters_out_globals_if_it_doesnt_exist_in_the_selected_site_a
         $two = GlobalFactory::handle('test_two')->create();
         $three = GlobalFactory::handle('test_three')->create();
 
-        session()->put('statamic.cp.selected-site', 'fr');
+        Site::setSelected('fr');
 
         $this->actingAs($user)
             ->get(cp_route('globals.index'))
@@ -98,8 +102,41 @@ public function it_filters_out_globals_if_it_doesnt_exist_in_the_selected_site_a
                 return $globals->count() === 1;
             })
             ->assertViewHas('globals', function ($globals) {
-                return Arr::get($globals, '0.handle', 'test_one')
-                    && Arr::get($globals, '0.edit_url', url('/cp/globals/test_one?site=fr'));
+                return Arr::get($globals, '0.handle') === 'test_one'
+                    && Arr::get($globals, '0.edit_url') === url('/cp/globals/test_one?site=fr');
+            });
+    }
+
+    /** @test */
+    public function it_filters_out_globals_in_sites_you_dont_have_permission_to_access()
+    {
+        Site::setConfig(['sites' => [
+            'en' => ['url' => 'http://localhost/', 'locale' => 'en', 'name' => 'English'],
+            'fr' => ['url' => 'http://localhost/fr/', 'locale' => 'fr', 'name' => 'French'],
+        ]]);
+
+        $this->setTestRoles(['test' => [
+            'access cp',
+            'edit fr globals',
+            'access fr site',
+        ]]);
+        $user = User::make()->assignRole('test')->save();
+        $one = GlobalFactory::handle('en')->site('en')->create();
+        $two = GlobalFactory::handle('fr')->site('fr')->create();
+
+        Site::setSelected('fr');
+
+        $this->actingAs($user)
+            ->get(cp_route('globals.index'))
+            ->assertOk()
+            ->assertViewHas('globals', function ($globals) {
+                return $globals->count() === 1;
+            })
+            ->assertViewHas('globals', function ($globals) {
+                $sorted = $globals->sortBy('handle')->values();
+
+                return (Arr::get($sorted, '0.handle') == 'fr') &&
+                       (Arr::get($sorted, '0.edit_url') == url('/cp/globals/fr?site=fr'));
             });
     }
 }
diff --git a/tests/Feature/Navigation/MocksStructures.php b/tests/Feature/Navigation/MocksStructures.php
index 69cc9d05f8..49a2239702 100644
--- a/tests/Feature/Navigation/MocksStructures.php
+++ b/tests/Feature/Navigation/MocksStructures.php
@@ -21,6 +21,7 @@ private function createNav($handle)
             $s->shouldReceive('collections')->andReturn(collect());
             $s->shouldReceive('expectsRoot')->andReturnFalse();
             $s->shouldReceive('maxDepth')->andReturnNull();
+            $s->shouldReceive('sites')->andReturn(collect(['en']));
         });
     }
 
diff --git a/tests/Feature/Navigation/UpdateNavigationTreeTest.php b/tests/Feature/Navigation/UpdateNavigationTreeTest.php
index a9493ec3ba..1017e496f4 100644
--- a/tests/Feature/Navigation/UpdateNavigationTreeTest.php
+++ b/tests/Feature/Navigation/UpdateNavigationTreeTest.php
@@ -6,8 +6,8 @@
 use Facades\Statamic\Fields\FieldtypeRepository;
 use Facades\Statamic\Structures\BranchIdGenerator;
 use Statamic\Facades\Blueprint;
-use Statamic\Facades\Collection;
 use Statamic\Facades\Nav;
+use Statamic\Facades\Site;
 use Statamic\Facades\User;
 use Statamic\Fields\Fieldtype;
 use Tests\FakesRoles;
@@ -51,7 +51,8 @@ public function it_updates_the_tree()
         BlueprintRepository::shouldReceive('find')->with('navigation.test')->andReturn($blueprint);
         BranchIdGenerator::shouldReceive('generate')->times(3)->andReturn('newly-generated-id1', 'newly-generated-id2', 'newly-generated-id3');
 
-        $user = tap(User::make()->makeSuper())->save();
+        $this->setTestRoles(['test' => ['access cp', 'edit test nav']]);
+        $user = tap(User::make()->assignRole('test'))->save();
         $nav = tap(Nav::make('test'))->save();
         $nav->makeTree('en', [
             ['id' => 'id1', 'title' => 'URL', 'url' => 'http://example.com', 'children' => [
@@ -65,7 +66,7 @@ public function it_updates_the_tree()
 
         $this
             ->actingAs($user)
-            ->update($nav, [
+            ->update($nav, 'en', [
                 'pages' => [
                     ['id' => 'id1', 'children' => []],
                     ['id' => 'id3', 'children' => []],
@@ -147,22 +148,87 @@ public function it_updates_the_tree()
     /** @test */
     public function it_denies_access_if_you_dont_have_permission_to_reorder()
     {
-        $this->markTestIncomplete();
-
         $this->setTestRoles(['test' => ['access cp']]);
         $user = tap(User::make()->assignRole('test'))->save();
-        $collection = tap(Collection::make('test')->structureContents(['tree' => []]))->save();
+        $nav = tap(Nav::make('test'))->save();
+        $nav->makeTree('en', [])->save();
+
+        $this
+            ->actingAs($user)
+            ->update($nav, 'en', ['site' => 'en', 'pages' => [], 'data' => []])
+            ->assertForbidden();
+    }
+
+    /** @test */
+    public function it_denies_access_if_you_dont_have_site_permission()
+    {
+        Site::setConfig(['sites' => [
+            'en' => ['locale' => 'en', 'url' => '/'],
+            'fr' => ['locale' => 'fr', 'url' => '/fr'],
+        ]]);
+        $this->setTestRoles(['test' => ['access cp', 'edit test nav']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+        $nav = tap(Nav::make('test'))->save();
+        $nav->makeTree('en', [])->save();
 
         $this
             ->actingAs($user)
-            ->update($collection, ['site' => 'en', 'pages' => []])
+            ->update($nav, 'en', ['site' => 'en', 'pages' => [], 'data' => []])
             ->assertForbidden();
     }
 
-    public function update($nav, $payload = [])
+    /** @test */
+    public function it_updates_a_specific_sites_tree()
+    {
+        $this->withoutExceptionHandling();
+        Site::setConfig(['sites' => [
+            'en' => ['locale' => 'en', 'url' => '/'],
+            'fr' => ['locale' => 'fr', 'url' => '/fr'],
+        ]]);
+        $this->setTestRoles(['test' => ['access cp', 'edit test nav', 'access fr site']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+        $nav = tap(Nav::make('test'))->save();
+        $nav->makeTree('fr', [
+            ['id' => 'id1', 'title' => 'One'],
+            ['id' => 'id2', 'title' => 'two'],
+        ])->save();
+
+        $this
+            ->actingAs($user)
+            ->update($nav, 'fr', [
+                'pages' => [
+                    ['id' => 'id2', 'children' => []],
+                    ['id' => 'id1', 'children' => []],
+                ],
+                'data' => [
+                    'id1' => [
+                        'values' => [
+                            'title' => 'Updated One',
+                            'url' => 'http://updated-one.com',
+                        ],
+                        'localizedFields' => ['title', 'url'],
+                    ],
+                    'id2' => [
+                        'values' => [
+                            'title' => 'Updated Two',
+                            'url' => 'http://updated-two.com',
+                        ],
+                        'localizedFields' => ['title', 'url'],
+                    ],
+                ],
+            ])
+            ->assertOk();
+
+        $this->assertEquals([
+            ['id' => 'id2', 'title' => 'Updated Two', 'url' => 'http://updated-two.com'],
+            ['id' => 'id1', 'title' => 'Updated One', 'url' => 'http://updated-one.com'],
+        ], $nav->in('fr')->tree());
+    }
+
+    public function update($nav, $site = 'en', $payload = [])
     {
         $validParams = [
-            'site' => 'en',
+            'site' => $site,
         ];
 
         return $this->patchJson(
@@ -170,10 +236,4 @@ public function update($nav, $payload = [])
             array_merge($validParams, $payload)
         );
     }
-
-    /** @test */
-    public function it_updates_a_specific_sites_tree()
-    {
-        $this->markTestIncomplete();
-    }
 }
diff --git a/tests/Feature/Sites/SelectSiteTest.php b/tests/Feature/Sites/SelectSiteTest.php
new file mode 100644
index 0000000000..916b8a281e
--- /dev/null
+++ b/tests/Feature/Sites/SelectSiteTest.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace Tests\Feature\Sites;
+
+use Statamic\Facades\Site;
+use Statamic\Facades\User;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class SelectSiteTest extends TestCase
+{
+    use FakesRoles, PreventSavingStacheItemsToDisk;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        Site::setConfig(['sites' => [
+            'en' => ['url' => '/', 'locale' => 'en'],
+            'fr' => ['url' => '/fr/', 'locale' => 'fr'],
+        ]]);
+
+        $this->setTestRoles([
+            'can_access_fr' => [
+                'access cp',
+                'access en site',
+                'access fr site',
+            ],
+            'cant_access_fr' => [
+                'access cp',
+                'access en site',
+            ],
+        ]);
+    }
+
+    /** @test */
+    public function site_can_be_selected()
+    {
+        $this->assertEquals('en', Site::selected()->handle());
+
+        $this
+            ->actingAs(tap(User::make()->assignRole('can_access_fr'))->save())
+            ->from('/original')
+            ->get('cp/select-site/fr')
+            ->assertRedirect('/original')
+            ->assertSessionHas('success', 'Site selected.');
+
+        $this->assertEquals('fr', Site::selected()->handle());
+    }
+
+    /** @test */
+    public function invalid_site_cannot_be_selected()
+    {
+        $this->assertEquals('en', Site::selected()->handle());
+
+        $this
+            ->actingAs(tap(User::make()->assignRole('can_access_fr'))->save())
+            ->from('/original')
+            ->get('cp/select-site/invalid')
+            ->assertRedirect('/original')
+            ->assertSessionHas('error', 'Invalid site.');
+
+        $this->assertEquals('en', Site::selected()->handle());
+    }
+
+    /** @test */
+    public function site_cannot_be_selected_without_permission()
+    {
+        $this->assertEquals('en', Site::selected()->handle());
+
+        $this
+            ->actingAs(tap(User::make()->assignRole('cant_access_fr'))->save())
+            ->from('/original')
+            ->get('cp/select-site/fr')
+            ->assertRedirect('/original')
+            ->assertSessionHas('error', 'This action is unauthorized.');
+
+        $this->assertEquals('en', Site::selected()->handle());
+    }
+}
diff --git a/tests/Feature/Taxonomies/UpdateTermTest.php b/tests/Feature/Taxonomies/UpdateTermTest.php
new file mode 100644
index 0000000000..8a6619ce9e
--- /dev/null
+++ b/tests/Feature/Taxonomies/UpdateTermTest.php
@@ -0,0 +1,87 @@
+<?php
+
+use Statamic\Facades\Site;
+use Statamic\Facades\Taxonomy;
+use Statamic\Facades\Term;
+use Statamic\Facades\User;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class UpdateTermTest extends TestCase
+{
+    use FakesRoles, PreventSavingStacheItemsToDisk;
+
+    /** @test */
+    public function it_denies_access_if_you_dont_have_edit_permission()
+    {
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+
+        Taxonomy::make('tags')->save();
+        $term = tap(Term::make()->taxonomy('tags')->inDefaultLocale()->slug('alfa')->data(['title' => 'alfa']))->save();
+
+        $this
+            ->actingAs($user)
+            ->update($term, ['title' => 'Updated alfa'])
+            ->assertForbidden();
+
+        $term = $term->fresh();
+        $this->assertEquals('alfa', $term->title);
+    }
+
+    /** @test */
+    public function it_denies_access_if_you_dont_have_site_permission()
+    {
+        Site::setConfig(['sites' => [
+            'en' => ['locale' => 'en', 'url' => '/'],
+            'fr' => ['locale' => 'fr', 'url' => '/fr'],
+        ]]);
+        $this->setTestRoles(['test' => ['access cp', 'edit tags terms']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+
+        Taxonomy::make('tags')->save();
+        $term = tap(Term::make()->taxonomy('tags')->slug('alfa')
+            ->dataForLocale('en', ['title' => 'alfa'])
+            ->dataForLocale('fr', ['title' => 'le alfa'])
+        )->save();
+
+        $term = $term->in('fr');
+
+        $this
+            ->actingAs($user)
+            ->update($term, ['title' => 'Updated le alfa'])
+            ->assertForbidden();
+
+        $term = $term->fresh();
+        $this->assertEquals('le alfa', $term->title);
+    }
+
+    /** @test */
+    public function term_gets_updated()
+    {
+        $this->setTestRoles(['test' => ['access cp', 'edit tags terms']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+
+        Taxonomy::make('tags')->save();
+        $term = tap(Term::make()->taxonomy('tags')->inDefaultLocale()->slug('alfa')->data(['title' => 'alfa']))->save();
+
+        $this
+            ->actingAs($user)
+            ->update($term, ['title' => 'Updated alfa'])
+            ->assertOk();
+
+        $term = $term->fresh();
+        $this->assertEquals('Updated alfa', $term->title);
+    }
+
+    private function update($term, $attrs = [])
+    {
+        $payload = array_merge([
+            'title' => 'Updated term',
+            'slug' => 'updated-term',
+        ], $attrs);
+
+        return $this->patchJson($term->updateUrl(), $payload);
+    }
+}
diff --git a/tests/Git/GitEventTest.php b/tests/Git/GitEventTest.php
index 4b2f48ae9a..974bd2ef9a 100644
--- a/tests/Git/GitEventTest.php
+++ b/tests/Git/GitEventTest.php
@@ -33,6 +33,7 @@ public function setUp(): void
 
         $this->actingAs(
             User::make()
+                ->id('chewbacca')
                 ->email('chew@bacca.com')
                 ->data(['name' => 'Chewbacca'])
                 ->makeSuper()
diff --git a/tests/Http/Middleware/SelectedSiteTest.php b/tests/Http/Middleware/SelectedSiteTest.php
new file mode 100644
index 0000000000..e58098c668
--- /dev/null
+++ b/tests/Http/Middleware/SelectedSiteTest.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace Tests\Http\Middleware;
+
+use Illuminate\Http\Request;
+use Statamic\Facades\Site;
+use Statamic\Facades\User;
+use Statamic\Http\Middleware\CP\SelectedSite;
+use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
+use Symfony\Component\HttpFoundation\Response;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class SelectedSiteTest extends TestCase
+{
+    use FakesRoles, PreventSavingStacheItemsToDisk;
+
+    /**
+     * @test
+     */
+    public function it_sets_selected_site_first_authorized_one()
+    {
+        Site::setConfig(['sites' => [
+            'en' => ['url' => '/', 'locale' => 'en'],
+            'fr' => ['url' => '/fr/', 'locale' => 'fr'],
+            'de' => ['url' => '/de/', 'locale' => 'de'],
+        ]]);
+
+        Site::setSelected('de');
+        $this->assertEquals('de', Site::selected()->handle());
+
+        $this->setTestRoles(['test' => ['access fr site']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+
+        $this->actingAs($user);
+        $request = $this->createRequest('/cp/foo');
+        $handled = false;
+
+        (new SelectedSite())->handle($request, function () use (&$handled) {
+            $handled = true;
+
+            return new Response;
+        });
+
+        $this->assertTrue($handled);
+        $this->assertEquals('fr', Site::selected()->handle());
+    }
+
+    /**
+     * @test
+     */
+    public function it_doesnt_do_anything_when_there_are_no_authorized_sites()
+    {
+        // If the user doesn't have permission to access any sites, then... ¯\_(ツ)_/¯
+        // The global site selector isn't going to be visible, and they won't be
+        // able to able to access any areas that require a site anyway.
+
+        Site::setConfig(['sites' => [
+            'en' => ['url' => '/', 'locale' => 'en'],
+            'fr' => ['url' => '/fr/', 'locale' => 'fr'],
+            'de' => ['url' => '/de/', 'locale' => 'de'],
+        ]]);
+
+        Site::setSelected('de');
+        $this->assertEquals('de', Site::selected()->handle());
+
+        $this->setTestRoles(['test' => [
+            // no authorized sites
+        ]]);
+        $user = tap(User::make()->assignRole('test'))->save();
+
+        $this->actingAs($user);
+        $request = $this->createRequest('/cp/foo');
+        $handled = false;
+
+        (new SelectedSite())->handle($request, function () use (&$handled) {
+            $handled = true;
+
+            return new Response;
+        });
+
+        $this->assertTrue($handled);
+        $this->assertEquals('de', Site::selected()->handle());
+    }
+
+    /**
+     * @test
+     */
+    public function middleware_attached_to_routes()
+    {
+        /** @var Router $router */
+        $router = app('router');
+        $this->assertTrue(in_array(SelectedSite::class, $router->getMiddlewareGroups()['statamic.cp.authenticated']));
+    }
+
+    private function createRequest($url)
+    {
+        $symfonyRequest = SymfonyRequest::create($url);
+        $request = Request::createFromBase($symfonyRequest);
+        app()->instance('request', $request);
+
+        return $request;
+    }
+}
diff --git a/tests/Policies/CollectionPolicyTest.php b/tests/Policies/CollectionPolicyTest.php
new file mode 100644
index 0000000000..d5063465c8
--- /dev/null
+++ b/tests/Policies/CollectionPolicyTest.php
@@ -0,0 +1,93 @@
+<?php
+
+namespace Tests\Policies;
+
+use Statamic\Contracts\Entries\Collection as CollectionContract;
+use Statamic\Facades\Collection;
+
+class CollectionPolicyTest extends PolicyTestCase
+{
+    /** @test */
+    public function index_is_allowed_if_any_collection_is_viewable()
+    {
+        $userWithAlfaPermission = $this->userWithPermissions(['view alfa entries']);
+        $userWithBravoPermission = $this->userWithPermissions(['view bravo entries']);
+        $userWithConfigurePermission = $this->userWithPermissions(['configure collections']);
+        $userWithoutPermission = $this->userWithPermissions([]);
+
+        Collection::make('alfa')->save();
+        Collection::make('bravo')->save();
+
+        $this->assertTrue($userWithAlfaPermission->can('index', CollectionContract::class));
+        $this->assertTrue($userWithBravoPermission->can('index', CollectionContract::class));
+        $this->assertTrue($userWithConfigurePermission->can('index', CollectionContract::class));
+        $this->assertFalse($userWithoutPermission->can('index', CollectionContract::class));
+    }
+
+    /** @test */
+    public function index_is_allowed_if_any_collection_is_viewable_with_site_permissions()
+    {
+        $this->withSites(['en', 'fr', 'de']);
+
+        $userWithEnPermission = $this->userWithPermissions([
+            'view test entries',
+            'access en site',
+        ]);
+        $userWithDePermission = $this->userWithPermissions([
+            'view test entries',
+            'access de site',
+        ]);
+
+        Collection::make('test')->sites(['en', 'fr'])->save();
+
+        $this->assertTrue($userWithEnPermission->can('index', CollectionContract::class));
+        $this->assertFalse($userWithDePermission->can('index', CollectionContract::class));
+    }
+
+    /** @test */
+    public function collections_are_viewable_with_view_permissions()
+    {
+        $user = $this->userWithPermissions(['view alfa entries']);
+
+        $collectionA = Collection::make('alfa');
+        $collectionB = Collection::make('bravo');
+
+        $this->assertTrue($user->can('view', $collectionA));
+        $this->assertFalse($user->can('edit', $collectionA));
+        $this->assertFalse($user->can('view', $collectionB));
+        $this->assertFalse($user->can('edit', $collectionB));
+    }
+
+    /** @test */
+    public function collections_are_editable_with_configure_permissions()
+    {
+        $authorizedUser = $this->userWithPermissions(['configure collections']);
+        $forbiddenUser = $this->userWithPermissions(['edit test entries']);
+
+        $collection = Collection::make('test');
+
+        $this->assertTrue($authorizedUser->can('edit', $collection));
+        $this->assertFalse($forbiddenUser->can('edit', $collection));
+    }
+
+    /** @test */
+    public function collections_can_be_created_with_configure_permission()
+    {
+        $forbiddenUser = $this->userWithPermissions([]);
+        $authorizedUser = $this->userWithPermissions(['configure collections']);
+
+        $this->assertTrue($authorizedUser->can('create', CollectionContract::class));
+        $this->assertFalse($forbiddenUser->can('create', CollectionContract::class));
+    }
+
+    /** @test */
+    public function collections_can_be_deleted_with_configure_permission()
+    {
+        $forbiddenUser = $this->userWithPermissions([]);
+        $authorizedUser = $this->userWithPermissions(['configure collections']);
+        $collection = Collection::make('test');
+
+        $this->assertTrue($authorizedUser->can('delete', $collection));
+        $this->assertFalse($forbiddenUser->can('delete', $collection));
+    }
+}
diff --git a/tests/Policies/EntryPolicyTest.php b/tests/Policies/EntryPolicyTest.php
new file mode 100644
index 0000000000..062758974b
--- /dev/null
+++ b/tests/Policies/EntryPolicyTest.php
@@ -0,0 +1,164 @@
+<?php
+
+namespace Tests\Policies;
+
+use Facades\Tests\Factories\EntryFactory;
+use Statamic\Contracts\Entries\Entry;
+use Statamic\Facades\Collection;
+use Statamic\Facades\Site;
+
+class EntryPolicyTest extends PolicyTestCase
+{
+    /** @test */
+    public function entry_is_viewable_with_view_permissions()
+    {
+        $user = $this->userWithPermissions(['view alfa entries']);
+
+        $collectionA = tap(Collection::make('alfa'))->save();
+        $collectionB = tap(Collection::make('bravo'))->save();
+        $entryA = EntryFactory::id('1')->collection($collectionA)->create();
+        $entryB = EntryFactory::id('2')->collection($collectionB)->create();
+
+        $this->assertTrue($user->can('view', $entryA));
+        $this->assertFalse($user->can('edit', $entryA));
+        $this->assertFalse($user->can('view', $entryB));
+        $this->assertFalse($user->can('edit', $entryB));
+    }
+
+    /** @test */
+    public function entry_is_viewable_with_view_and_site_permissions()
+    {
+        $this->withSites(['en', 'fr', 'de', 'es']);
+
+        $user = $this->userWithPermissions([
+            'view alfa entries',
+            'access en site',
+            // 'access fr site', // Intentionally missing.
+            'access de site',
+        ]);
+
+        $collection = tap(Collection::make('alfa')->sites(['en', 'fr', 'de']))->save();
+
+        $entryEn = EntryFactory::id('1')->collection($collection)->locale('en')->create();
+        $entryFr = EntryFactory::id('2')->collection($collection)->locale('fr')->create();
+        $entryDe = EntryFactory::id('3')->collection($collection)->locale('de')->create();
+
+        $this->assertTrue($user->can('view', $entryEn));
+        $this->assertFalse($user->can('view', $entryFr));
+        $this->assertTrue($user->can('view', $entryDe));
+    }
+
+    /** @test */
+    public function entry_is_viewable_and_editable_with_edit_permissions()
+    {
+        $user = $this->userWithPermissions(['edit alfa entries']);
+
+        $collectionA = tap(Collection::make('alfa'))->save();
+        $collectionB = tap(Collection::make('bravo'))->save();
+        $entryA = EntryFactory::id('1')->collection($collectionA)->create();
+        $entryB = EntryFactory::id('2')->collection($collectionB)->create();
+
+        $this->assertTrue($user->can('view', $entryA));
+        $this->assertTrue($user->can('edit', $entryA));
+        $this->assertFalse($user->can('view', $entryB));
+        $this->assertFalse($user->can('edit', $entryB));
+    }
+
+    /** @test */
+    public function entry_is_editable_with_edit_and_site_permissions()
+    {
+        $this->withSites(['en', 'fr', 'de', 'es']);
+
+        $user = $this->userWithPermissions([
+            'edit alfa entries',
+            'access en site',
+            // 'access fr site', // Intentionally missing.
+            'access de site',
+        ]);
+
+        $collection = tap(Collection::make('alfa')->sites(['en', 'fr', 'de']))->save();
+        $entryEn = EntryFactory::id('1')->collection($collection)->locale('en')->create();
+        $entryFr = EntryFactory::id('2')->collection($collection)->locale('fr')->create();
+        $entryDe = EntryFactory::id('3')->collection($collection)->locale('de')->create();
+
+        $this->assertTrue($user->can('view', $entryEn));
+        $this->assertTrue($user->can('edit', $entryEn));
+        $this->assertFalse($user->can('view', $entryFr));
+        $this->assertFalse($user->can('edit', $entryFr));
+        $this->assertTrue($user->can('view', $entryDe));
+        $this->assertTrue($user->can('edit', $entryDe));
+    }
+
+    /** @test */
+    public function entry_is_creatable_with_create_permissions()
+    {
+        $user = $this->userWithPermissions(['create alfa entries']);
+
+        $collectionA = tap(Collection::make('alfa'))->save();
+        $collectionB = tap(Collection::make('bravo'))->save();
+
+        $this->assertTrue($user->can('create', [Entry::class, $collectionA]));
+        $this->assertFalse($user->can('create', [Entry::class, $collectionB]));
+        $this->assertTrue($user->can('store', [Entry::class, $collectionA]));
+        $this->assertFalse($user->can('store', [Entry::class, $collectionB]));
+    }
+
+    /** @test */
+    public function entry_is_creatable_with_create_and_site_permissions()
+    {
+        $this->withSites(['en', 'fr', 'de', 'es']);
+
+        $user = $this->userWithPermissions([
+            'create alfa entries',
+            'access en site',
+            // 'access fr site', // Intentionally missing.
+            'access de site',
+            'access es site',
+        ]);
+
+        $collection = tap(Collection::make('alfa')->sites(['en', 'fr', 'de']))->save();
+
+        $this->assertTrue($user->can('create', [Entry::class, $collection, Site::get('en')]));
+        $this->assertFalse($user->can('create', [Entry::class, $collection, Site::get('fr')]));
+        $this->assertTrue($user->can('create', [Entry::class, $collection, Site::get('de')]));
+        $this->assertFalse($user->can('create', [Entry::class, $collection, Site::get('es')]));
+
+        // If no site is specified, it should avoid checking site access.
+        $this->assertTrue($user->can('create', [Entry::class, $collection]));
+    }
+
+    /** @test */
+    public function entry_is_not_creatable_without_create_and_site_permissions()
+    {
+        $this->withSites(['en', 'fr', 'de', 'es']);
+
+        $user = $this->userWithPermissions([
+            'access en site',
+            // 'access fr site', // Intentionally missing.
+            'access de site',
+            'access es site',
+        ]);
+
+        $collection = tap(Collection::make('alfa')->sites(['en', 'fr', 'es']))->save();
+
+        $this->assertFalse($user->can('create', [Entry::class, $collection, Site::get('en')]));
+        $this->assertFalse($user->can('create', [Entry::class, $collection, Site::get('fr')]));
+        $this->assertFalse($user->can('create', [Entry::class, $collection, Site::get('de')]));
+        $this->assertFalse($user->can('create', [Entry::class, $collection, Site::get('es')]));
+
+        // If no site is specified, it should avoid checking site access.
+        $this->assertFalse($user->can('create', [Entry::class, $collection]));
+    }
+
+    /** @test */
+    public function another_authors_entry_is_editable()
+    {
+        $this->markTestIncomplete();
+    }
+
+    /** @test */
+    public function another_authors_entry_is_editable_with_site_permission()
+    {
+        $this->markTestIncomplete();
+    }
+}
diff --git a/tests/Policies/GlobalSetPolicyTest.php b/tests/Policies/GlobalSetPolicyTest.php
new file mode 100644
index 0000000000..e4d7700e9c
--- /dev/null
+++ b/tests/Policies/GlobalSetPolicyTest.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace Tests\Policies;
+
+use Facades\Tests\Factories\GlobalFactory;
+use Statamic\Contracts\Globals\GlobalSet;
+
+class GlobalSetPolicyTest extends PolicyTestCase
+{
+    /** @test */
+    public function index_is_allowed_if_any_set_is_viewable()
+    {
+        $userWithAlfaPermission = $this->userWithPermissions(['edit alfa globals']);
+        $userWithBravoPermission = $this->userWithPermissions(['edit bravo globals']);
+        $userWithConfigurePermission = $this->userWithPermissions(['configure globals']);
+        $userWithoutPermission = $this->userWithPermissions([]);
+
+        GlobalFactory::handle('alfa')->data(['foo' => 'bar'])->create();
+        GlobalFactory::handle('bravo')->data(['foo' => 'bar'])->create();
+
+        $this->assertTrue($userWithAlfaPermission->can('index', GlobalSet::class));
+        $this->assertTrue($userWithBravoPermission->can('index', GlobalSet::class));
+        $this->assertTrue($userWithConfigurePermission->can('index', GlobalSet::class));
+        $this->assertFalse($userWithoutPermission->can('index', GlobalSet::class));
+    }
+
+    /** @test */
+    public function index_is_allowed_if_any_set_is_viewable_with_site_permissions()
+    {
+        $this->withSites(['en', 'fr', 'de']);
+
+        $userWithEnPermission = $this->userWithPermissions([
+            'edit test globals',
+            'access en site',
+        ]);
+        $userWithDePermission = $this->userWithPermissions([
+            'edit test globals',
+            'access de site',
+        ]);
+
+        $global = GlobalFactory::handle('test')->data(['foo' => 'bar'])->create();
+        $global->addLocalization($global->makeLocalization('en'))->save();
+        $global->addLocalization($global->makeLocalization('fr'))->save();
+
+        $this->assertTrue($userWithEnPermission->can('index', GlobalSet::class));
+        $this->assertFalse($userWithDePermission->can('index', GlobalSet::class));
+    }
+
+    /** @test */
+    public function globals_are_viewable_with_edit_permissions()
+    {
+        $user = $this->userWithPermissions(['edit test globals']);
+
+        $global = GlobalFactory::handle('test')->data(['foo' => 'bar'])->create();
+
+        $this->assertTrue($user->can('view', $global));
+        $this->assertFalse($user->can('edit', $global));
+    }
+
+    /** @test */
+    public function globals_are_editable_with_configure_permissions()
+    {
+        $authorizedUser = $this->userWithPermissions(['configure globals']);
+        $forbiddenUser = $this->userWithPermissions(['edit test globals']);
+
+        $global = GlobalFactory::handle('test')->data(['foo' => 'bar'])->create();
+
+        $this->assertTrue($authorizedUser->can('edit', $global));
+        $this->assertFalse($forbiddenUser->can('edit', $global));
+    }
+
+    /** @test */
+    public function globals_can_be_created_with_configure_permission()
+    {
+        $forbiddenUser = $this->userWithPermissions([]);
+        $authorizedUser = $this->userWithPermissions(['configure globals']);
+
+        $this->assertTrue($authorizedUser->can('create', GlobalSet::class));
+        $this->assertFalse($forbiddenUser->can('create', GlobalSet::class));
+    }
+
+    /** @test */
+    public function globals_can_be_deleted_with_configure_permission()
+    {
+        $forbiddenUser = $this->userWithPermissions([]);
+        $authorizedUser = $this->userWithPermissions(['configure globals']);
+        $global = GlobalFactory::handle('test')->data(['foo' => 'bar'])->create();
+
+        $this->assertTrue($authorizedUser->can('delete', $global));
+        $this->assertFalse($forbiddenUser->can('delete', $global));
+    }
+}
diff --git a/tests/Policies/GlobalSetVariablesPolicyTest.php b/tests/Policies/GlobalSetVariablesPolicyTest.php
new file mode 100644
index 0000000000..1c69ab7545
--- /dev/null
+++ b/tests/Policies/GlobalSetVariablesPolicyTest.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Tests\Policies;
+
+use Facades\Tests\Factories\GlobalFactory;
+use Statamic\Contracts\Globals\Variables;
+
+class GlobalSetVariablesPolicyTest extends PolicyTestCase
+{
+    /** @test */
+    public function variables_are_editable_with_edit_permissions()
+    {
+        $user = $this->userWithPermissions(['edit test globals']);
+
+        $global = GlobalFactory::handle('test')->data(['foo' => 'bar'])->make();
+
+        $this->assertTrue($user->can('edit', $global->inDefaultSite()));
+        $this->assertTrue($user->can('view', $global->inDefaultSite()));
+    }
+
+    /** @test */
+    public function variables_are_editable_with_edit_and_site_permissions()
+    {
+        $this->withSites(['en', 'fr', 'de']);
+
+        $user = $this->userWithPermissions([
+            'edit test globals',
+            'access en site',
+            // 'access fr site', // Intentionally missing.
+            'access de site',
+        ]);
+
+        $global = GlobalFactory::handle('test')->data(['foo' => 'bar'])->make();
+        $global->addLocalization($global->makeLocalization('fr'))->save();
+        $global->addLocalization($global->makeLocalization('de'))->save();
+
+        $this->assertTrue($user->can('edit', $global->in('en')));
+        $this->assertTrue($user->can('view', $global->in('en')));
+        $this->assertFalse($user->can('edit', $global->in('fr')));
+        $this->assertFalse($user->can('view', $global->in('fr')));
+        $this->assertTrue($user->can('edit', $global->in('de')));
+        $this->assertTrue($user->can('view', $global->in('de')));
+    }
+
+    /** @test */
+    public function variables_can_be_created_with_configure_permission()
+    {
+        $forbiddenUser = $this->userWithPermissions([]);
+        $authorizedUser = $this->userWithPermissions(['configure globals']);
+
+        $this->assertTrue($authorizedUser->can('create', Variables::class));
+        $this->assertFalse($forbiddenUser->can('create', Variables::class));
+    }
+
+    /** @test */
+    public function variables_can_be_deleted_with_configure_permission()
+    {
+        $forbiddenUser = $this->userWithPermissions([]);
+        $authorizedUser = $this->userWithPermissions(['configure globals']);
+        $global = GlobalFactory::handle('test')->data(['foo' => 'bar'])->make();
+        $variables = $global->inDefaultSite();
+
+        $this->assertTrue($authorizedUser->can('delete', $variables));
+        $this->assertFalse($forbiddenUser->can('delete', $variables));
+    }
+}
diff --git a/tests/Policies/LocalizedTermPolicyTest.php b/tests/Policies/LocalizedTermPolicyTest.php
new file mode 100644
index 0000000000..bda2e881f9
--- /dev/null
+++ b/tests/Policies/LocalizedTermPolicyTest.php
@@ -0,0 +1,131 @@
+<?php
+
+namespace Tests\Policies;
+
+use Statamic\Facades\Site;
+use Statamic\Facades\Taxonomy;
+use Statamic\Facades\Term;
+use Statamic\Taxonomies\LocalizedTerm;
+
+class LocalizedTermPolicyTest extends PolicyTestCase
+{
+    /** @test */
+    public function term_is_viewable_with_view_permissions()
+    {
+        $user = $this->userWithPermissions(['view tags terms']);
+
+        Taxonomy::make('tags')->save();
+        Taxonomy::make('categories')->save();
+        $termA = tap(Term::make()->taxonomy('tags')->inDefaultLocale()->slug('alfa')->data([]))->save();
+        $termB = tap(Term::make()->taxonomy('categories')->inDefaultLocale()->slug('alfa')->data([]))->save();
+
+        $this->assertTrue($user->can('view', $termA));
+        $this->assertFalse($user->can('edit', $termA));
+        $this->assertFalse($user->can('view', $termB));
+        $this->assertFalse($user->can('edit', $termB));
+    }
+
+    /** @test */
+    public function term_is_viewable_and_editable_with_edit_permissions()
+    {
+        $user = $this->userWithPermissions(['edit tags terms']);
+
+        Taxonomy::make('tags')->save();
+        Taxonomy::make('categories')->save();
+        $termA = tap(Term::make()->taxonomy('tags')->inDefaultLocale()->slug('alfa')->data([]))->save();
+        $termB = tap(Term::make()->taxonomy('categories')->inDefaultLocale()->slug('alfa')->data([]))->save();
+
+        $this->assertTrue($user->can('view', $termA));
+        $this->assertTrue($user->can('edit', $termA));
+        $this->assertFalse($user->can('view', $termB));
+        $this->assertFalse($user->can('edit', $termB));
+    }
+
+    /** @test */
+    public function term_is_editable_with_edit_and_site_permissions()
+    {
+        $this->withSites(['en', 'fr', 'de', 'es']);
+
+        $user = $this->userWithPermissions([
+            'edit tags terms',
+            'access en site',
+            // 'access fr site', // Intentionally missing.
+            'access de site',
+        ]);
+
+        Taxonomy::make('tags')->sites(['en', 'fr', 'de'])->save();
+        $term = tap(Term::make()->taxonomy('tags')->slug('alfa')
+            ->dataForLocale('en', ['title' => 'alfa'])
+            ->dataForLocale('fr', ['title' => 'le alfa'])
+            ->dataForLocale('de', ['title' => 'das alfa'])
+        )->save();
+
+        $this->assertTrue($user->can('view', $term->in('en')));
+        $this->assertTrue($user->can('edit', $term->in('en')));
+        $this->assertFalse($user->can('view', $term->in('fr')));
+        $this->assertFalse($user->can('edit', $term->in('fr')));
+        $this->assertTrue($user->can('view', $term->in('de')));
+        $this->assertTrue($user->can('edit', $term->in('de')));
+    }
+
+    /** @test */
+    public function term_is_creatable_with_create_permissions()
+    {
+        $user = $this->userWithPermissions(['create alfa terms']);
+
+        $taxonomyA = tap(Taxonomy::make('alfa'))->save();
+        $taxonomyB = tap(Taxonomy::make('bravo'))->save();
+
+        $this->assertTrue($user->can('create', [LocalizedTerm::class, $taxonomyA]));
+        $this->assertFalse($user->can('create', [LocalizedTerm::class, $taxonomyB]));
+        $this->assertTrue($user->can('store', [LocalizedTerm::class, $taxonomyA]));
+        $this->assertFalse($user->can('store', [LocalizedTerm::class, $taxonomyB]));
+    }
+
+    /** @test */
+    public function term_is_creatable_with_create_and_site_permissions()
+    {
+        $this->withSites(['en', 'fr', 'de', 'es']);
+
+        $user = $this->userWithPermissions([
+            'create alfa terms',
+            'access en site',
+            // 'access fr site', // Intentionally missing.
+            'access de site',
+            'access es site',
+        ]);
+
+        $taxonomy = tap(Taxonomy::make('alfa')->sites(['en', 'fr', 'de']))->save();
+
+        $this->assertTrue($user->can('create', [LocalizedTerm::class, $taxonomy, Site::get('en')]));
+        $this->assertFalse($user->can('create', [LocalizedTerm::class, $taxonomy, Site::get('fr')]));
+        $this->assertTrue($user->can('create', [LocalizedTerm::class, $taxonomy, Site::get('de')]));
+        $this->assertFalse($user->can('create', [LocalizedTerm::class, $taxonomy, Site::get('es')]));
+
+        // If no site is specified, it should avoid checking site access.
+        $this->assertTrue($user->can('create', [LocalizedTerm::class, $taxonomy]));
+    }
+
+    /** @test */
+    public function term_is_not_creatable_without_create_and_site_permissions()
+    {
+        $this->withSites(['en', 'fr', 'de', 'es']);
+
+        $user = $this->userWithPermissions([
+            'access en site',
+            // 'access fr site', // Intentionally missing.
+            'access de site',
+            'access es site',
+        ]);
+
+        $taxonomy = tap(Taxonomy::make('alfa')->sites(['en', 'fr', 'es']))->save();
+
+        $this->assertFalse($user->can('create', [LocalizedTerm::class, $taxonomy, Site::get('en')]));
+        $this->assertFalse($user->can('create', [LocalizedTerm::class, $taxonomy, Site::get('fr')]));
+        $this->assertFalse($user->can('create', [LocalizedTerm::class, $taxonomy, Site::get('de')]));
+        $this->assertFalse($user->can('create', [LocalizedTerm::class, $taxonomy, Site::get('es')]));
+
+        // If no site is specified, it should avoid checking site access.
+        $this->assertFalse($user->can('create', [LocalizedTerm::class, $taxonomy]));
+    }
+}
diff --git a/tests/Policies/NavPolicyTest.php b/tests/Policies/NavPolicyTest.php
new file mode 100644
index 0000000000..d7a5b190f5
--- /dev/null
+++ b/tests/Policies/NavPolicyTest.php
@@ -0,0 +1,144 @@
+<?php
+
+namespace Tests\Policies;
+
+use Statamic\Contracts\Structures\Nav as NavContract;
+use Statamic\Facades\Nav;
+
+class NavPolicyTest extends PolicyTestCase
+{
+    /** @test */
+    public function index_is_allowed_if_any_nav_is_viewable()
+    {
+        $userWithAlfaPermission = $this->userWithPermissions(['view alfa nav']);
+        $userWithBravoPermission = $this->userWithPermissions(['view bravo nav']);
+        $userWithConfigurePermission = $this->userWithPermissions(['configure navs']);
+        $userWithoutPermission = $this->userWithPermissions([]);
+
+        Nav::make('alfa')->save();
+        Nav::make('bravo')->save();
+
+        $this->assertTrue($userWithAlfaPermission->can('index', NavContract::class));
+        $this->assertTrue($userWithBravoPermission->can('index', NavContract::class));
+        $this->assertTrue($userWithConfigurePermission->can('index', NavContract::class));
+        $this->assertFalse($userWithoutPermission->can('index', NavContract::class));
+    }
+
+    /** @test */
+    public function index_is_allowed_if_any_nav_is_viewable_with_site_permissions()
+    {
+        $this->withSites(['en', 'fr', 'de']);
+
+        $userWithEnPermission = $this->userWithPermissions([
+            'view test nav',
+            'access en site',
+        ]);
+        $userWithDePermission = $this->userWithPermissions([
+            'view test nav',
+            'access de site',
+        ]);
+
+        $nav = tap(Nav::make('test'))->save();
+        $nav->makeTree('en')->save();
+        $nav->makeTree('fr')->save();
+
+        $this->assertTrue($userWithEnPermission->can('index', NavContract::class));
+        $this->assertFalse($userWithDePermission->can('index', NavContract::class));
+    }
+
+    /** @test */
+    public function navs_are_viewable_with_view_permissions()
+    {
+        $user = $this->userWithPermissions(['view alfa nav']);
+
+        $navA = Nav::make('alfa');
+        $navB = Nav::make('bravo');
+
+        $this->assertTrue($user->can('view', $navA));
+        $this->assertFalse($user->can('edit', $navA));
+        $this->assertFalse($user->can('view', $navB));
+        $this->assertFalse($user->can('edit', $navB));
+    }
+
+    /** @test */
+    public function navs_are_viewable_with_view_and_site_permissions()
+    {
+        $this->withSites(['en', 'fr', 'de']);
+
+        $userWithEnPermission = $this->userWithPermissions([
+            'view test nav',
+            'access en site',
+        ]);
+        $userWithDePermission = $this->userWithPermissions([
+            'view test nav',
+            'access de site',
+        ]);
+
+        $nav = tap(Nav::make('test'))->save();
+        $nav->makeTree('en')->save();
+        $nav->makeTree('fr')->save();
+
+        $this->assertTrue($userWithEnPermission->can('view', $nav));
+        $this->assertFalse($userWithDePermission->can('view', $nav));
+    }
+
+    /** @test */
+    public function navs_are_editable_with_edit_permissions()
+    {
+        $user = $this->userWithPermissions(['edit alfa nav']);
+
+        $navA = Nav::make('alfa');
+        $navB = Nav::make('bravo');
+
+        $this->assertTrue($user->can('view', $navA));
+        $this->assertTrue($user->can('edit', $navA));
+        $this->assertFalse($user->can('view', $navB));
+        $this->assertFalse($user->can('edit', $navB));
+    }
+
+    /** @test */
+    public function navs_are_editable_with_edit_and_site_permissions()
+    {
+        $this->withSites(['en', 'fr', 'de']);
+
+        $userWithEnPermission = $this->userWithPermissions([
+            'edit test nav',
+            'access en site',
+        ]);
+        $userWithDePermission = $this->userWithPermissions([
+            'edit test nav',
+            'access de site',
+        ]);
+
+        $nav = tap(Nav::make('test'))->save();
+        $nav->makeTree('en')->save();
+        $nav->makeTree('fr')->save();
+
+        $this->assertTrue($userWithEnPermission->can('view', $nav));
+        $this->assertTrue($userWithEnPermission->can('edit', $nav));
+        $this->assertFalse($userWithDePermission->can('view', $nav));
+        $this->assertFalse($userWithDePermission->can('edit', $nav));
+
+    }
+
+    /** @test */
+    public function navs_can_be_created_with_configure_permission()
+    {
+        $forbiddenUser = $this->userWithPermissions([]);
+        $authorizedUser = $this->userWithPermissions(['configure navs']);
+
+        $this->assertTrue($authorizedUser->can('create', NavContract::class));
+        $this->assertFalse($forbiddenUser->can('create', NavContract::class));
+    }
+
+    /** @test */
+    public function navs_can_be_deleted_with_configure_permission()
+    {
+        $forbiddenUser = $this->userWithPermissions([]);
+        $authorizedUser = $this->userWithPermissions(['configure navs']);
+        $nav = Nav::make('test');
+
+        $this->assertTrue($authorizedUser->can('delete', $nav));
+        $this->assertFalse($forbiddenUser->can('delete', $nav));
+    }
+}
diff --git a/tests/Policies/NavTreePolicyTest.php b/tests/Policies/NavTreePolicyTest.php
new file mode 100644
index 0000000000..387e5d5143
--- /dev/null
+++ b/tests/Policies/NavTreePolicyTest.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Tests\Policies;
+
+use Statamic\Facades\Nav;
+
+class NavTreePolicyTest extends PolicyTestCase
+{
+    /** @test */
+    public function trees_are_viewable_with_view_permissions()
+    {
+        $user = $this->userWithPermissions(['view test nav']);
+
+        $nav = Nav::make('test');
+        $tree = $nav->makeTree('en');
+
+        $this->assertTrue($user->can('view', $tree));
+        $this->assertFalse($user->can('edit', $tree));
+    }
+
+    /** @test */
+    public function trees_are_viewable_with_view_and_site_permissions()
+    {
+        $this->withSites(['en', 'fr', 'de']);
+
+        $user = $this->userWithPermissions([
+            'view test nav',
+            'access en site',
+            'access de site',
+        ]);
+
+        $nav = Nav::make('test');
+
+        $this->assertTrue($user->can('view', $nav->makeTree('en')));
+        $this->assertFalse($user->can('view', $nav->makeTree('fr')));
+        $this->assertTrue($user->can('view', $nav->makeTree('de')));
+    }
+
+    /** @test */
+    public function navs_are_editable_with_edit_permissions()
+    {
+        $user = $this->userWithPermissions(['edit alfa nav']);
+
+        $navA = Nav::make('alfa');
+        $navB = Nav::make('bravo');
+
+        $this->assertTrue($user->can('view', $navA));
+        $this->assertTrue($user->can('edit', $navA));
+        $this->assertFalse($user->can('view', $navB));
+        $this->assertFalse($user->can('edit', $navB));
+    }
+
+    /** @test */
+    public function navs_are_editable_with_edit_and_site_permissions()
+    {
+        $this->withSites(['en', 'fr', 'de']);
+
+        $user = $this->userWithPermissions([
+            'edit test nav',
+            'access en site',
+            'access de site',
+        ]);
+
+        $nav = Nav::make('test');
+
+        $this->assertTrue($user->can('edit', $nav->makeTree('en')));
+        $this->assertFalse($user->can('edit', $nav->makeTree('fr')));
+        $this->assertTrue($user->can('edit', $nav->makeTree('de')));
+    }
+}
diff --git a/tests/Policies/PolicyTestCase.php b/tests/Policies/PolicyTestCase.php
new file mode 100644
index 0000000000..fe6ca6b6c0
--- /dev/null
+++ b/tests/Policies/PolicyTestCase.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Tests\Policies;
+
+use Statamic\Facades\Site;
+use Statamic\Facades\User;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class PolicyTestCase extends TestCase
+{
+    use FakesRoles, PreventSavingStacheItemsToDisk;
+
+    protected function withSites(array $sites)
+    {
+        Site::setConfig(['sites' => collect($sites)->mapWithKeys(fn ($site) => [
+            $site => ['locale' => $site, 'url' => '/'],
+        ])]);
+    }
+
+    protected function userWithPermissions(array $permissions)
+    {
+        $role = str_random();
+
+        $this->setTestRole($role, $permissions);
+
+        return tap(User::make()->assignRole($role))->save();
+    }
+}
diff --git a/tests/Policies/SitePolicyTest.php b/tests/Policies/SitePolicyTest.php
new file mode 100644
index 0000000000..533b2cf6a5
--- /dev/null
+++ b/tests/Policies/SitePolicyTest.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Tests\Policies;
+
+use Statamic\Facades\Site;
+use Statamic\Facades\User;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class SitePolicyTest extends TestCase
+{
+    use FakesRoles, PreventSavingStacheItemsToDisk;
+
+    /** @test */
+    public function site_is_viewable_with_permission()
+    {
+        Site::setConfig(['sites' => [
+            'first' => ['name' => 'First', 'locale' => 'en_US', 'url' => '/'],
+            'second' => ['name' => 'Second', 'locale' => 'en_US', 'url' => '/'],
+        ]]);
+
+        $this->setTestRoles(['test' => [
+            'access second site',
+        ]]);
+
+        $user = tap(User::make()->assignRole('test'))->save();
+
+        $this->assertTrue(Site::hasMultiple());
+        $this->assertFalse($user->can('view', Site::get('first')));
+        $this->assertTrue($user->can('view', Site::get('second')));
+    }
+
+    /** @test */
+    public function site_is_viewable_without_permission_if_theres_a_single_site()
+    {
+        Site::setConfig(['sites' => [
+            'default' => ['name' => 'Default', 'locale' => 'en_US', 'url' => '/'],
+        ]]);
+
+        $this->setTestRoles(['test' => [
+            //
+        ]]);
+
+        $user = tap(User::make()->assignRole('test'))->save();
+
+        $this->assertFalse(Site::hasMultiple());
+        $this->assertTrue($user->can('view', Site::default()));
+    }
+}
diff --git a/tests/Policies/TaxonomyPolicyTest.php b/tests/Policies/TaxonomyPolicyTest.php
new file mode 100644
index 0000000000..a079ce6cf9
--- /dev/null
+++ b/tests/Policies/TaxonomyPolicyTest.php
@@ -0,0 +1,93 @@
+<?php
+
+namespace Tests\Policies;
+
+use Statamic\Contracts\Taxonomies\Taxonomy as TaxonomyContract;
+use Statamic\Facades\Taxonomy;
+
+class TaxonomyPolicyTest extends PolicyTestCase
+{
+    /** @test */
+    public function index_is_allowed_if_any_taxonomy_is_viewable()
+    {
+        $userWithAlfaPermission = $this->userWithPermissions(['view alfa terms']);
+        $userWithBravoPermission = $this->userWithPermissions(['view bravo terms']);
+        $userWithConfigurePermission = $this->userWithPermissions(['configure taxonomies']);
+        $userWithoutPermission = $this->userWithPermissions([]);
+
+        Taxonomy::make('alfa')->save();
+        Taxonomy::make('bravo')->save();
+
+        $this->assertTrue($userWithAlfaPermission->can('index', TaxonomyContract::class));
+        $this->assertTrue($userWithBravoPermission->can('index', TaxonomyContract::class));
+        $this->assertTrue($userWithConfigurePermission->can('index', TaxonomyContract::class));
+        $this->assertFalse($userWithoutPermission->can('index', TaxonomyContract::class));
+    }
+
+    /** @test */
+    public function index_is_allowed_if_any_taxonomy_is_viewable_with_site_permissions()
+    {
+        $this->withSites(['en', 'fr', 'de']);
+
+        $userWithEnPermission = $this->userWithPermissions([
+            'view test terms',
+            'access en site',
+        ]);
+        $userWithDePermission = $this->userWithPermissions([
+            'view test terms',
+            'access de site',
+        ]);
+
+        Taxonomy::make('test')->sites(['en', 'fr'])->save();
+
+        $this->assertTrue($userWithEnPermission->can('index', TaxonomyContract::class));
+        $this->assertFalse($userWithDePermission->can('index', TaxonomyContract::class));
+    }
+
+    /** @test */
+    public function taxonomies_are_viewable_with_view_permissions()
+    {
+        $user = $this->userWithPermissions(['view alfa terms']);
+
+        $taxonomyA = Taxonomy::make('alfa');
+        $taxonomyB = Taxonomy::make('bravo');
+
+        $this->assertTrue($user->can('view', $taxonomyA));
+        $this->assertFalse($user->can('edit', $taxonomyA));
+        $this->assertFalse($user->can('view', $taxonomyB));
+        $this->assertFalse($user->can('edit', $taxonomyB));
+    }
+
+    /** @test */
+    public function taxonomies_are_editable_with_configure_permissions()
+    {
+        $authorizedUser = $this->userWithPermissions(['configure taxonomies']);
+        $forbiddenUser = $this->userWithPermissions(['edit test terms']);
+
+        $taxonomy = Taxonomy::make('test');
+
+        $this->assertTrue($authorizedUser->can('edit', $taxonomy));
+        $this->assertFalse($forbiddenUser->can('edit', $taxonomy));
+    }
+
+    /** @test */
+    public function taxonomies_can_be_created_with_configure_permission()
+    {
+        $forbiddenUser = $this->userWithPermissions([]);
+        $authorizedUser = $this->userWithPermissions(['configure taxonomies']);
+
+        $this->assertTrue($authorizedUser->can('create', TaxonomyContract::class));
+        $this->assertFalse($forbiddenUser->can('create', TaxonomyContract::class));
+    }
+
+    /** @test */
+    public function taxonomies_can_be_deleted_with_configure_permission()
+    {
+        $forbiddenUser = $this->userWithPermissions([]);
+        $authorizedUser = $this->userWithPermissions(['configure taxonomies']);
+        $taxonomy = Taxonomy::make('test');
+
+        $this->assertTrue($authorizedUser->can('delete', $taxonomy));
+        $this->assertFalse($forbiddenUser->can('delete', $taxonomy));
+    }
+}
diff --git a/tests/Policies/TermPolicyTest.php b/tests/Policies/TermPolicyTest.php
new file mode 100644
index 0000000000..3cec406ee0
--- /dev/null
+++ b/tests/Policies/TermPolicyTest.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace Tests\Policies;
+
+use Statamic\Contracts\Taxonomies\Term as TermContract;
+use Statamic\Facades\Site;
+use Statamic\Facades\Taxonomy;
+use Statamic\Facades\Term;
+
+class TermPolicyTest extends PolicyTestCase
+{
+    /** @test */
+    public function term_is_viewable_with_view_permissions()
+    {
+        $user = $this->userWithPermissions(['view tags terms']);
+
+        Taxonomy::make('tags')->save();
+        Taxonomy::make('categories')->save();
+        $termA = tap(Term::make()->taxonomy('tags')->inDefaultLocale()->slug('alfa')->data([]))->save();
+        $termB = tap(Term::make()->taxonomy('categories')->inDefaultLocale()->slug('alfa')->data([]))->save();
+
+        $termA = $termA->term();
+        $termB = $termB->term();
+
+        $this->assertTrue($user->can('view', $termA));
+        $this->assertFalse($user->can('edit', $termA));
+        $this->assertFalse($user->can('view', $termB));
+        $this->assertFalse($user->can('edit', $termB));
+    }
+
+    /** @test */
+    public function term_is_viewable_and_editable_with_edit_permissions()
+    {
+        $user = $this->userWithPermissions(['edit tags terms']);
+
+        Taxonomy::make('tags')->save();
+        Taxonomy::make('categories')->save();
+        $termA = tap(Term::make()->taxonomy('tags')->slug('alfa')->dataForLocale('en', []))->save();
+        $termB = tap(Term::make()->taxonomy('categories')->slug('alfa')->dataForLocale('en', []))->save();
+
+        $this->assertTrue($user->can('view', $termA));
+        $this->assertTrue($user->can('edit', $termA));
+        $this->assertFalse($user->can('view', $termB));
+        $this->assertFalse($user->can('edit', $termB));
+    }
+
+    /** @test */
+    public function term_is_creatable_with_create_permissions()
+    {
+        $user = $this->userWithPermissions(['create alfa terms']);
+
+        $taxonomyA = tap(Taxonomy::make('alfa'))->save();
+        $taxonomyB = tap(Taxonomy::make('bravo'))->save();
+
+        $this->assertTrue($user->can('create', [TermContract::class, $taxonomyA]));
+        $this->assertFalse($user->can('create', [TermContract::class, $taxonomyB]));
+        $this->assertTrue($user->can('store', [TermContract::class, $taxonomyA]));
+        $this->assertFalse($user->can('store', [TermContract::class, $taxonomyB]));
+    }
+
+    /** @test */
+    public function term_is_creatable_with_create_and_site_permissions()
+    {
+        $this->withSites(['en', 'fr', 'de', 'es']);
+
+        $user = $this->userWithPermissions([
+            'create alfa terms',
+            'access en site',
+            // 'access fr site', // Intentionally missing.
+            'access de site',
+            'access es site',
+        ]);
+
+        $taxonomy = tap(Taxonomy::make('alfa')->sites(['en', 'fr', 'de']))->save();
+
+        $this->assertTrue($user->can('create', [TermContract::class, $taxonomy, Site::get('en')]));
+        $this->assertFalse($user->can('create', [TermContract::class, $taxonomy, Site::get('fr')]));
+        $this->assertTrue($user->can('create', [TermContract::class, $taxonomy, Site::get('de')]));
+        $this->assertFalse($user->can('create', [TermContract::class, $taxonomy, Site::get('es')]));
+
+        // If no site is specified, it should avoid checking site access.
+        $this->assertTrue($user->can('create', [TermContract::class, $taxonomy]));
+    }
+
+    /** @test */
+    public function term_is_not_creatable_without_create_and_site_permissions()
+    {
+        $this->withSites(['en', 'fr', 'de', 'es']);
+
+        $user = $this->userWithPermissions([
+            'access en site',
+            // 'access fr site', // Intentionally missing.
+            'access de site',
+            'access es site',
+        ]);
+
+        $taxonomy = tap(Taxonomy::make('alfa')->sites(['en', 'fr', 'es']))->save();
+
+        $this->assertFalse($user->can('create', [TermContract::class, $taxonomy, Site::get('en')]));
+        $this->assertFalse($user->can('create', [TermContract::class, $taxonomy, Site::get('fr')]));
+        $this->assertFalse($user->can('create', [TermContract::class, $taxonomy, Site::get('de')]));
+        $this->assertFalse($user->can('create', [TermContract::class, $taxonomy, Site::get('es')]));
+
+        // If no site is specified, it should avoid checking site access.
+        $this->assertFalse($user->can('create', [TermContract::class, $taxonomy]));
+    }
+}
diff --git a/tests/Sites/SitesTest.php b/tests/Sites/SitesTest.php
index 83f1717092..4706551da6 100644
--- a/tests/Sites/SitesTest.php
+++ b/tests/Sites/SitesTest.php
@@ -3,12 +3,17 @@
 namespace Tests\Sites;
 
 use Illuminate\Support\Collection;
+use Statamic\Facades\Role;
+use Statamic\Facades\User;
 use Statamic\Sites\Site;
 use Statamic\Sites\Sites;
+use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
 
 class SitesTest extends TestCase
 {
+    use PreventSavingStacheItemsToDisk;
+
     private $sites;
 
     protected function resolveApplicationConfiguration($app)
@@ -45,6 +50,29 @@ public function gets_all_sites()
         });
     }
 
+    /** @test */
+    public function gets_authorized_sites()
+    {
+        Role::make('test')
+            ->permissions([
+                'access en site',
+                'access de site',
+            ])
+            ->save();
+
+        $this->actingAs(tap(User::make()->assignRole('test'))->save());
+
+        \Statamic\Facades\Site::shouldReceive('hasMultiple')->andReturnTrue();
+
+        tap($this->sites->authorized(), function ($sites) {
+            $this->assertInstanceOf(Collection::class, $sites);
+            $this->assertEquals(2, $sites->count());
+            $this->assertInstanceOf(Site::class, $sites->first());
+            $this->assertEquals('en', $sites->values()->get(0)->handle());
+            $this->assertEquals('de', $sites->values()->get(1)->handle());
+        });
+    }
+
     /** @test */
     public function can_reinitialize_sites_by_reproviding_the_config()
     {
diff --git a/tests/UpdateScripts/AddSitePermissionsTest.php b/tests/UpdateScripts/AddSitePermissionsTest.php
new file mode 100644
index 0000000000..9055eceb73
--- /dev/null
+++ b/tests/UpdateScripts/AddSitePermissionsTest.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace Tests\UpdateScripts;
+
+use Statamic\Facades\Role;
+use Statamic\Facades\Site;
+use Statamic\UpdateScripts\AddSitePermissions;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+use Tests\UpdateScripts\Concerns\RunsUpdateScripts;
+
+class AddSitePermissionsTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk, RunsUpdateScripts;
+
+    /** @test */
+    public function it_is_registered()
+    {
+        $this->assertUpdateScriptRegistered(AddSitePermissions::class);
+    }
+
+    /** @test */
+    public function it_can_add_site_permissions()
+    {
+        Site::setConfig(['sites' => [
+            'first' => ['name' => 'First Site', 'locale' => 'en_US', 'url' => '/'],
+            'second' => ['name' => 'Second Site', 'locale' => 'en_US', 'url' => '/second'],
+        ]]);
+
+        Role::make()
+            ->title('Webmaster')
+            ->handle('webmaster')
+            ->permissions('super')
+            ->save();
+
+        Role::make()
+            ->title('Author')
+            ->handle('author')
+            ->permissions([
+                'access cp',
+                'create blog entries',
+                'edit blog entries',
+                'create news entries',
+                'edit news entries',
+            ])
+            ->save();
+
+        Role::make()
+            ->title('Blog Admin')
+            ->handle('blog_admin')
+            ->permissions([
+                'access cp',
+                'create blog entries',
+                'edit blog entries',
+                'publish blog entries',
+                'delete blog entries',
+                'reorder blog entries',
+            ])
+            ->save();
+
+        $this->runUpdateScript(AddSitePermissions::class);
+
+        $expectedAuthor = [
+            'access cp',
+            'create blog entries',
+            'edit blog entries',
+            'create news entries',
+            'edit news entries',
+            'access first site', // New permission
+            'access second site', // New permission
+        ];
+
+        $expectedBlogAdmin = [
+            'access cp',
+            'create blog entries',
+            'edit blog entries',
+            'publish blog entries',
+            'delete blog entries',
+            'reorder blog entries',
+            'access first site', // New permission
+            'access second site', // New permission
+        ];
+
+        $this->assertTrue(Role::find('webmaster')->isSuper());
+        $this->assertEquals($expectedAuthor, Role::find('author')->permissions()->all());
+        $this->assertEquals($expectedBlogAdmin, Role::find('blog_admin')->permissions()->all());
+
+        Role::all()->each->delete(); // Clean up
+    }
+}
diff --git a/tests/UpdateScripts/Concerns/RunsUpdateScripts.php b/tests/UpdateScripts/Concerns/RunsUpdateScripts.php
index 5ed455a440..8e4a994749 100644
--- a/tests/UpdateScripts/Concerns/RunsUpdateScripts.php
+++ b/tests/UpdateScripts/Concerns/RunsUpdateScripts.php
@@ -16,4 +16,12 @@ protected function runUpdateScript($fqcn, $package = 'statamic/cms')
 
         $script->update();
     }
+
+    protected function assertUpdateScriptRegistered($class)
+    {
+        $this->assertTrue(
+            app('statamic.update-scripts')->map->class->contains($class),
+            "Update script $class is not registered."
+        );
+    }
 }

From fc6f71dd7315fef2a70a073f4655b19592603ea8 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 11 Oct 2023 16:32:04 -0400
Subject: [PATCH 12/36] changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f50efb2d7..8602ea7583 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Release Notes
 
+## 4.27.0 (2023-10-11)
+
+### What's new
+- Multi-site Permissions [#5946](https://github.com/statamic/cms/issues/5946) by @jackmcdade
+
+
 
 ## 4.26.1 (2023-10-11)
 

From f28595108197d000f251f6f002307012efcd0c21 Mon Sep 17 00:00:00 2001
From: Emmanuel Beauchamps <e.bops@hotmail.fr>
Date: Wed, 11 Oct 2023 22:43:40 +0200
Subject: [PATCH 13/36] [4.x] French translations (#8831)

---
 resources/lang/fr.json           |  2 ++
 resources/lang/fr/fieldtypes.php |  1 +
 resources/lang/fr/validation.php | 60 +++++++++++++++++++++++---------
 3 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/resources/lang/fr.json b/resources/lang/fr.json
index e0ffa18b54..d7bb6899a9 100644
--- a/resources/lang/fr.json
+++ b/resources/lang/fr.json
@@ -498,6 +498,7 @@
     "Inline": "En ligne",
     "Inline Code": "Code en ligne",
     "Inline Label": "Etiquette en ligne",
+    "Inline Label when True": "Etiquette en ligne si vrai (True)",
     "Input Behavior": "Comportement",
     "Input Label": "Etiquette de saisie",
     "Input Type": "Type de saisie",
@@ -660,6 +661,7 @@
     "Per Page": "Par page",
     "Per-site": "Par site",
     "Permissions": "Permissions",
+    "Phone": "Téléphone",
     "PHP Info": "Info PHP",
     "Pick Color": "Choisir une couleur",
     "Pin to Favorites": "Épingler aux Favoris",
diff --git a/resources/lang/fr/fieldtypes.php b/resources/lang/fr/fieldtypes.php
index 8ca1bcabcd..c57f12ec42 100644
--- a/resources/lang/fr/fieldtypes.php
+++ b/resources/lang/fr/fieldtypes.php
@@ -176,6 +176,7 @@
     'time.config.seconds_enabled' => 'Affichez les secondes dans l’horodateur.',
     'time.title' => 'Time',
     'toggle.config.inline_label' => 'Définissez une étiquette à afficher en ligne à côté du commutateur.',
+    'toggle.config.inline_label_when_true' => 'Définissez une étiquette à afficher en ligne quand la valeur du commutateur est vraie (True).',
     'toggle.title' => 'Toggle',
     'user_groups.title' => 'User Groups',
     'user_roles.title' => 'User Roles',
diff --git a/resources/lang/fr/validation.php b/resources/lang/fr/validation.php
index 8f2c80c710..30d30361cc 100644
--- a/resources/lang/fr/validation.php
+++ b/resources/lang/fr/validation.php
@@ -2,6 +2,7 @@
 
 return [
     'accepted' => 'Doit être accepté.',
+    'accepted_if' => 'Doit être accepté quand :other correspond à :value.',
     'active_url' => 'Ce n’est pas une URL valide.',
     'after' => 'Doit être une date strictement postérieure à :date.',
     'after_or_equal' => 'Doit être une date postérieure ou égale à :date.',
@@ -9,35 +10,44 @@
     'alpha_dash' => 'Peut uniquement contenir des lettres, des chiffres, des tirets et des traits de soulignement.',
     'alpha_num' => 'Peut uniquement contenir des lettres et des chiffres.',
     'array' => 'Doit être un tableau.',
+    'ascii' => 'Peut uniquement contenir des symboles et caractères alpanumériques mono-bits.',
     'before' => 'Doit être une date strictement antérieure à :date.',
     'before_or_equal' => 'Doit être une date antérieure ou égale à :date.',
-    'between.numeric' => 'Doit être compris entre :min et :max .',
+    'between.array' => 'Doit avoir entre :min et :max éléments.',
     'between.file' => 'Doit être compris entre :min et :max kilo-octets.',
+    'between.numeric' => 'Doit être compris entre :min et :max.',
     'between.string' => 'Doit être compris entre :min et :max caractères.',
-    'between.array' => 'Doit avoir entre :min et :max éléments.',
     'boolean' => 'Doit être vrai ou faux.',
+    'can' => 'Contient une valeur interdite.',
     'confirmed' => 'La confirmation ne correspond pas.',
     'current_password' => 'Le mot de passe est incorrect.',
     'date' => 'Date non valide.',
+    'date_equals' => 'Doit être une date égale à :date.',
     'date_format' => 'Ne correspond pas au format :format.',
+    'decimal' => 'Doit faire :decimal décimales.',
+    'declined' => 'Doit être décliné.',
+    'declined_if' => 'Doit être décliné quand :other correspond à :value.',
     'different' => 'Ce champ et :other doivent être différents.',
     'digits' => 'Doit faire :digits chiffres.',
     'digits_between' => 'Doit être compris entre :min et :max chiffres.',
     'dimensions' => 'Dimensions de l’image non valides.',
     'distinct' => 'Ce champ a une valeur en double.',
+    'doesnt_end_with' => 'Ne doit pas se terminer avec l’une des valeurs suivantes : :values.',
+    'doesnt_start_with' => 'Ne doit pas commencer par l’une des valeurs suivantes : :values.',
     'email' => 'Doit être une adresse e-mail valide.',
     'ends_with' => 'Doit se terminer par :values',
+    'enum' => ':attribute sélectionné est invalide.',
     'exists' => 'Ceci est invalide.',
     'file' => 'Doit être un fichier.',
     'filled' => 'Doit avoir une valeur.',
-    'gt.numeric' => 'Doit être supérieur à :value .',
+    'gt.array' => 'Doit avoir plus de :value éléments.',
     'gt.file' => 'Doit être supérieur à :value kilo-octets.',
+    'gt.numeric' => 'Doit être supérieur à :value.',
     'gt.string' => 'Doit faire plus de :value caractères.',
-    'gt.array' => 'Doit avoir plus de :value éléments.',
-    'gte.numeric' => 'Doit être supérieur ou égal à :value.',
+    'gte.array' => 'Doit avoir :value éléments ou plus.',
     'gte.file' => 'Doit être supérieur ou égal à :value kilo-octets.',
+    'gte.numeric' => 'Doit être supérieur ou égal à :value.',
     'gte.string' => 'Doit être supérieur ou égal à :value caractères.',
-    'gte.array' => 'Doit avoir :value éléments ou plus.',
     'image' => 'Doit être une image.',
     'in' => 'Ceci est invalide.',
     'in_array' => 'Ce champ n’existe pas dans :other.',
@@ -47,47 +57,65 @@
     'ipv6' => 'Doit être une adresse IPv6 valide.',
     'json' => 'Doit être une chaîne JSON valide.',
     'lowercase' => 'Doit être en minuscules.',
-    'lt.numeric' => 'Doit être strictement inférieur à :value.',
+    'lt.array' => 'Doit être strictement inférieur à :value éléments.',
     'lt.file' => 'Doit être strictement inférieur à :value kilo-octets.',
+    'lt.numeric' => 'Doit être strictement inférieur à :value.',
     'lt.string' => 'Doit être strictement inférieur à :value caractères.',
-    'lt.array' => 'Doit être strictement inférieur à :value éléments.',
-    'lte.numeric' => 'Doit être inférieur ou égal à :value.',
+    'lte.array' => 'Ne doit pas avoir plus de :value éléments.',
     'lte.file' => 'Doit être inférieur ou égal à :value kilo-octets.',
+    'lte.numeric' => 'Doit être inférieur ou égal à :value.',
     'lte.string' => 'Doit être inférieur ou égal à :value caractères.',
-    'lte.array' => 'Ne doit pas avoir plus de :value éléments.',
-    'max.numeric' => 'Ne peut pas être supérieur à :max.',
+    'mac_address' => 'Doit être une adresse MAC valide.',
+    'max.array' => 'Ne peut pas avoir plus de :max éléments.',
     'max.file' => 'Ne peut pas être supérieur à :max kilo-octets.',
+    'max.numeric' => 'Ne peut pas être supérieur à :max.',
     'max.string' => 'Ne peut pas être supérieur à :max caractères.',
-    'max.array' => 'Ne peut pas avoir plus de :max éléments.',
+    'max_digits' => 'Ne peut pas avoir plus de :max chiffres.',
     'mimes' => 'Doit être un fichier de type :values.',
     'mimetypes' => 'Doit être un fichier de type :values.',
-    'min.numeric' => 'Doit faire au moins :min.',
+    'min.array' => 'Doit avoir au moins :min éléments.',
     'min.file' => 'Doit faire au moins :min kilo-octets.',
+    'min.numeric' => 'Doit faire au moins :min.',
     'min.string' => 'Doit faire au moins :min caractères.',
-    'min.array' => 'Doit avoir au moins :min éléments.',
+    'min_digits' => 'Doit faire au moins :min chiffres.',
+    'missing' => 'Doit être absent.',
+    'missing_if' => 'Doit être absent quand :other correspond à :value.',
+    'missing_unless' => 'Doit être absent à moins que :other corresponde à :value.',
+    'missing_with' => 'Doit être absent quand :values existe.',
+    'missing_with_all' => 'Doit être absent quand :values existent.',
+    'multiple_of' => 'Doit être un multiple de :value.',
     'not_in' => 'Ceci est invalide.',
     'not_regex' => 'Le format est invalide.',
     'numeric' => 'Doit être un nombre.',
     'present' => 'Doit être présent.',
+    'prohibited' => 'Prohibé.',
+    'prohibited_if' => 'Prohibé quand :other correspond à :value.',
+    'prohibited_unless' => 'Prohibé à moins que :other soit dans :values.',
+    'prohibits' => 'Interdit la présence de :other.',
     'regex' => 'Le format est invalide.',
     'required' => 'Ce champ est obligatoire.',
+    'required_array_keys' => 'Doit contenir des entrées pour : :values.',
     'required_if' => 'Ce champ est obligatoire lorsque :other est :value.',
+    'required_if_accepted' => 'Ce champ est obligatoire quand :other est accepté.',
     'required_unless' => 'Ce champ est obligatoire, sauf si :other est dans :values.',
     'required_with' => 'Ce champ est requis lorsque :values est présent.',
     'required_with_all' => 'Ce champ est requis lorsque :values est présent.',
     'required_without' => 'Ce champ est obligatoire lorsque :values n’est pas présente.',
     'required_without_all' => 'Ce champ est obligatoire lorsqu’aucune des :values n’est présente.',
     'same' => 'Ce champ et :other doivent correspondre.',
-    'size.numeric' => 'Doit faire :size .',
+    'size.array' => 'Doit contenir :size éléments.',
     'size.file' => 'Doit faire :size kilo-octets.',
+    'size.numeric' => 'Doit faire :size .',
     'size.string' => 'Doit faire :size caractères.',
-    'size.array' => 'Doit contenir :size éléments.',
     'starts_with' => 'Doit commencer par :values',
     'string' => 'Doit être une chaîne.',
     'timezone' => 'Doit être une zone valide.',
     'unique' => 'Cette valeur a déjà été prise.',
     'uploaded' => 'Échec du téléchargement.',
+    'uppercase' => 'Doit être en majuscules.',
     'url' => 'Le format est invalide.',
+    'ulid' => 'Doit être une ULID valide.',
+    'uuid' => 'Doit être un UUID valide.',
     'unique_entry_value' => 'Cette valeur a déjà été prise.',
     'unique_term_value' => 'Cette valeur a déjà été prise.',
     'unique_user_value' => 'Cette valeur a déjà été prise.',

From 2e5ed242f1af306276be7ef2828a60b950b08eee Mon Sep 17 00:00:00 2001
From: joseph-d <joseph.d@nirada.co.th>
Date: Thu, 12 Oct 2023 18:01:11 +0100
Subject: [PATCH 14/36] [4.x] Console warning generated by invalid tabulator
 config (#8834)

---
 src/View/Debugbar/AntlersProfiler/resources/widget.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/View/Debugbar/AntlersProfiler/resources/widget.js b/src/View/Debugbar/AntlersProfiler/resources/widget.js
index 453dcea48d..909fcfc29a 100644
--- a/src/View/Debugbar/AntlersProfiler/resources/widget.js
+++ b/src/View/Debugbar/AntlersProfiler/resources/widget.js
@@ -541,7 +541,7 @@
                     dataTree: true,
                     dataTreeStartExpanded: true,
                     dataTreeChildField: 'children',
-                    layout: 'responsive',
+                    responsiveLayout: true,
                     tooltips: true,
                     rowFormatter: function (row) {
                         var data = row.getData(),

From d183d12b2ef9487b305b7b8e35d1127515895c54 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Thu, 12 Oct 2023 18:14:30 +0100
Subject: [PATCH 15/36] [4.x] Only show status indicator in stack view if item
 has a status (#8832)

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

diff --git a/resources/js/components/inputs/relationship/Selector.vue b/resources/js/components/inputs/relationship/Selector.vue
index c5b9af8b1d..a5200ee27a 100644
--- a/resources/js/components/inputs/relationship/Selector.vue
+++ b/resources/js/components/inputs/relationship/Selector.vue
@@ -49,7 +49,7 @@
                             >
                                 <template slot="cell-title" slot-scope="{ row: entry }">
                                     <div class="flex items-center">
-                                        <div class="little-dot mr-2" v-tooltip="getStatusLabel(entry)" :class="getStatusClass(entry)" v-if="! columnShowing('status')" />
+                                        <div class="little-dot mr-2" v-tooltip="getStatusLabel(entry)" :class="getStatusClass(entry)" v-if="entry.status && ! columnShowing('status')" />
                                         {{ entry.title }}
                                     </div>
                                 </template>

From 2316439032258a7999c9448a83f2cd3bbeede4de Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Thu, 12 Oct 2023 20:55:15 +0100
Subject: [PATCH 16/36] [4.x] Allow user defined fields in the CP to be
 translatable (#8664)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 resources/js/components/GlobalSiteSelector.vue       |  4 ++--
 .../js/components/fieldtypes/HasInputOptions.js      |  2 +-
 resources/js/components/fieldtypes/IconFieldtype.vue |  6 +++---
 .../js/components/fieldtypes/IntegerFieldtype.vue    |  4 ++--
 .../js/components/fieldtypes/RangeFieldtype.vue      |  4 ++--
 .../js/components/fieldtypes/RevealerFieldtype.vue   |  4 ++--
 .../js/components/fieldtypes/SelectFieldtype.vue     |  6 +++---
 .../js/components/fieldtypes/TableFieldtype.vue      |  2 +-
 resources/js/components/fieldtypes/TagsFieldtype.vue |  2 +-
 .../js/components/fieldtypes/TemplateFieldtype.vue   |  2 +-
 resources/js/components/fieldtypes/TextFieldtype.vue |  6 +++---
 .../js/components/fieldtypes/TextareaFieldtype.vue   |  2 +-
 .../js/components/fieldtypes/ToggleFieldtype.vue     |  4 ++--
 .../js/components/fieldtypes/VideoFieldtype.vue      |  2 +-
 .../js/components/fieldtypes/bard/BardFieldtype.vue  |  4 ++--
 resources/js/components/fieldtypes/bard/Set.vue      |  6 +++---
 resources/js/components/fieldtypes/grid/Grid.vue     |  8 ++++----
 .../js/components/fieldtypes/grid/HeaderCell.vue     |  4 ++--
 .../js/components/fieldtypes/replicator/Field.vue    |  4 ++--
 .../components/fieldtypes/replicator/Replicator.vue  |  4 ++--
 .../js/components/fieldtypes/replicator/Set.vue      |  6 +++---
 .../components/fieldtypes/replicator/SetPicker.vue   | 12 ++++++------
 resources/js/components/inputs/Select.vue            |  4 ++--
 resources/js/components/inputs/Text.vue              |  4 ++--
 .../components/inputs/relationship/SelectField.vue   |  4 ++--
 resources/js/components/publish/Field.vue            |  4 ++--
 resources/js/components/publish/Sections.vue         |  4 ++--
 resources/js/components/publish/Tabs.vue             |  4 ++--
 src/Query/Scopes/Filters/Site.php                    |  4 ++--
 29 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/resources/js/components/GlobalSiteSelector.vue b/resources/js/components/GlobalSiteSelector.vue
index 9bcdc8281c..b4c8e9dc08 100644
--- a/resources/js/components/GlobalSiteSelector.vue
+++ b/resources/js/components/GlobalSiteSelector.vue
@@ -13,11 +13,11 @@
             <template #selected-option="option">
                 <div class="flex items-center px-2 text-sm text-gray hover:text-gray-800 anti">
                     <svg-icon name="light/sites" class="mr-2 h-4 w-4" />
-                    <div class="whitespace-nowrap">{{ option.name }}</div>
+                    <div class="whitespace-nowrap">{{ __(option.name) }}</div>
                 </div>
             </template>
             <template #option="{ name, handle }">
-                <div :class="{ 'text-gray-500': handle === active }">{{ name }}</div>
+                <div :class="{ 'text-gray-500': handle === active }">{{ __(name) }}</div>
             </template>
         </v-select>
     </div>
diff --git a/resources/js/components/fieldtypes/HasInputOptions.js b/resources/js/components/fieldtypes/HasInputOptions.js
index a394603b32..44125bf0c3 100644
--- a/resources/js/components/fieldtypes/HasInputOptions.js
+++ b/resources/js/components/fieldtypes/HasInputOptions.js
@@ -4,7 +4,7 @@ export default {
             return _.map(options, (value, key) => {
                 return {
                     'value': Array.isArray(options) ? value : key,
-                    'label': value || key
+                    'label': __(value) || key
                 };
             });
         }
diff --git a/resources/js/components/fieldtypes/IconFieldtype.vue b/resources/js/components/fieldtypes/IconFieldtype.vue
index 6c90e5bd02..15dad9381e 100644
--- a/resources/js/components/fieldtypes/IconFieldtype.vue
+++ b/resources/js/components/fieldtypes/IconFieldtype.vue
@@ -9,7 +9,7 @@
             :name="name"
             :disabled="config.disabled || isReadOnly"
             :options="options"
-            :placeholder="config.placeholder || 'Search ...'"
+            :placeholder="__(config.placeholder || 'Search ...')"
             :searchable="true"
             :multiple="false"
             :close-on-select="true"
@@ -22,14 +22,14 @@
                 <div class="flex items-center">
                     <svg-icon v-if="!option.html" :name="`${meta.set}/${option.label}`" class="w-5 h-5" />
                     <div v-if="option.html" v-html="option.html" class="w-5 h-5" />
-                    <span class="text-xs ml-4 text-gray-800 truncate">{{ option.label }}</span>
+                    <span class="text-xs ml-4 text-gray-800 truncate">{{ __(option.label) }}</span>
                 </div>
             </template>
             <template slot="selected-option" slot-scope="option">
                 <div class="flex items-center">
                     <svg-icon v-if="!option.html" :name="`${meta.set}/${option.label}`" class="w-5 h-5 flex items-center" />
                     <div v-if="option.html" v-html="option.html" class="w-5 h-5" />
-                    <span class="text-xs ml-4 text-gray-800 truncate">{{ option.label }}</span>
+                    <span class="text-xs ml-4 text-gray-800 truncate">{{ __(option.label) }}</span>
                 </div>
             </template>
         </v-select>
diff --git a/resources/js/components/fieldtypes/IntegerFieldtype.vue b/resources/js/components/fieldtypes/IntegerFieldtype.vue
index c82a4f599f..e46f1b04bd 100644
--- a/resources/js/components/fieldtypes/IntegerFieldtype.vue
+++ b/resources/js/components/fieldtypes/IntegerFieldtype.vue
@@ -8,8 +8,8 @@
         :is-read-only="isReadOnly"
         :id="fieldId"
         :min="config.min"
-        :prepend="config.prepend"
-        :append="config.append"
+        :prepend="__(config.prepend)"
+        :append="__(config.append)"
         @input="updateDebounced"
         @focus="$emit('focus')"
         @blur="$emit('blur')"
diff --git a/resources/js/components/fieldtypes/RangeFieldtype.vue b/resources/js/components/fieldtypes/RangeFieldtype.vue
index ab567664f3..7a7d7533a8 100644
--- a/resources/js/components/fieldtypes/RangeFieldtype.vue
+++ b/resources/js/components/fieldtypes/RangeFieldtype.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="range-fieldtype-wrapper bg-gray-200 rounded py-2 px-4 border">
         <div class="flex items-center">
-            <div v-if="config.prepend" v-text="config.prepend" class="mr-2" />
+            <div v-if="config.prepend" v-text="__(config.prepend)" class="mr-2" />
             <input
                 type="range"
                 v-model="val"
@@ -16,7 +16,7 @@
                 class="flex-1 min-w-0"
             />
             <div class="rounded border px-2 py-1 mx-2 bg-gray-100">{{ val }}</div>
-            <div v-if="config.append" v-text="config.append" />
+            <div v-if="config.append" v-text="__(config.append)" />
         </div>
     </div>
 </template>
diff --git a/resources/js/components/fieldtypes/RevealerFieldtype.vue b/resources/js/components/fieldtypes/RevealerFieldtype.vue
index d2cf49550d..830c1a4cc4 100644
--- a/resources/js/components/fieldtypes/RevealerFieldtype.vue
+++ b/resources/js/components/fieldtypes/RevealerFieldtype.vue
@@ -4,7 +4,7 @@
         <template v-if="isToggleMode">
             <div class="toggle-fieldtype-wrapper">
                 <toggle-input :value="isRevealed" @input="update" :read-only="isReadOnly" />
-                <label v-if="config.input_label" class="ml-2 font-normal">{{ config.input_label }}</label>
+                <label v-if="config.input_label" class="ml-2 font-normal">{{ __(config.input_label) }}</label>
             </div>
         </template>
 
@@ -13,7 +13,7 @@
                 @click="buttonReveal"
                 class="btn"
                 :disabled="isReadOnly"
-                :v-tooltip="config.instructions"
+                :v-tooltip="__(config.instructions)"
                 v-text="config.input_label || __('Show Fields')" />
         </template>
     </div>
diff --git a/resources/js/components/fieldtypes/SelectFieldtype.vue b/resources/js/components/fieldtypes/SelectFieldtype.vue
index 65360ed2ef..9294730f42 100644
--- a/resources/js/components/fieldtypes/SelectFieldtype.vue
+++ b/resources/js/components/fieldtypes/SelectFieldtype.vue
@@ -10,7 +10,7 @@
             :clearable="config.clearable"
             :disabled="config.disabled || isReadOnly || (config.multiple && limitReached)"
             :options="options"
-            :placeholder="config.placeholder"
+            :placeholder="__(config.placeholder)"
             :searchable="config.searchable || config.taggable"
             :taggable="config.taggable"
             :push-tags="config.push_tags"
@@ -26,7 +26,7 @@
                 <template #selected-option-container v-if="config.multiple"><i class="hidden"></i></template>
                 <template #search="{ events, attributes }" v-if="config.multiple">
                     <input
-                        :placeholder="config.placeholder"
+                        :placeholder="__(config.placeholder)"
                         class="vs__search"
                         type="search"
                         v-on="events"
@@ -56,7 +56,7 @@
                     <div class="vs__selected-options-outside flex flex-wrap">
                         <span v-for="option in selectedOptions" :key="option.value" class="vs__selected mt-2 sortable-item">
                             <div v-if="config.label_html" v-html="option.label"></div>
-                            <template v-else>{{ option.label }}</template>
+                            <template v-else>{{ __(option.label) }}</template>
                             <button v-if="!readOnly" @click="deselect(option)" type="button" :aria-label="__('Deselect option')" class="vs__deselect">
                                 <span>×</span>
                             </button>
diff --git a/resources/js/components/fieldtypes/TableFieldtype.vue b/resources/js/components/fieldtypes/TableFieldtype.vue
index 73ae6a9128..8dad81c814 100644
--- a/resources/js/components/fieldtypes/TableFieldtype.vue
+++ b/resources/js/components/fieldtypes/TableFieldtype.vue
@@ -2,7 +2,7 @@
     <portal name="table-fullscreen" :disabled="!fullScreenMode" target-class="table-fieldtype">
         <div class="table-fieldtype-container" :class="{'table-fullscreen bg-white': fullScreenMode }">
             <header class="bg-gray-200 border-b py-3 pl-3 flex items-center justify-between relative" v-if="fullScreenMode">
-                <h2 v-text="config.display" />
+                <h2 v-text="__(config.display)" />
                 <button class="btn-close absolute top-2 right-5" @click="fullScreenMode = false" :aria-label="__('Exit Fullscreen Mode')">&times;</button>
             </header>
             <section :class="{'p-4': fullScreenMode}">
diff --git a/resources/js/components/fieldtypes/TagsFieldtype.vue b/resources/js/components/fieldtypes/TagsFieldtype.vue
index 5f50d68ee9..0065199f3f 100644
--- a/resources/js/components/fieldtypes/TagsFieldtype.vue
+++ b/resources/js/components/fieldtypes/TagsFieldtype.vue
@@ -6,7 +6,7 @@
         :close-on-select="false"
         :disabled="config.disabled || isReadOnly"
         :multiple="true"
-        :placeholder="config.placeholder"
+        :placeholder="__(config.placeholder)"
         :searchable="true"
         :select-on-key-codes="[9, 13, 188]"
         :taggable="true"
diff --git a/resources/js/components/fieldtypes/TemplateFieldtype.vue b/resources/js/components/fieldtypes/TemplateFieldtype.vue
index 86f9d5d94b..2f91f53e74 100644
--- a/resources/js/components/fieldtypes/TemplateFieldtype.vue
+++ b/resources/js/components/fieldtypes/TemplateFieldtype.vue
@@ -7,7 +7,7 @@
             append-to-body
             :calculate-position="positionOptions"
             :clearable="config.clearable"
-            :placeholder="config.placeholder"
+            :placeholder="__(config.placeholder)"
             :disabled="isReadOnly"
             :options="options"
             :reduce="selection => selection.value"
diff --git a/resources/js/components/fieldtypes/TextFieldtype.vue b/resources/js/components/fieldtypes/TextFieldtype.vue
index 76308c7a17..16de06afe8 100644
--- a/resources/js/components/fieldtypes/TextFieldtype.vue
+++ b/resources/js/components/fieldtypes/TextFieldtype.vue
@@ -7,10 +7,10 @@
         :autoselect="config.autoselect"
         :type="config.input_type"
         :isReadOnly="isReadOnly"
-        :prepend="config.prepend"
-        :append="config.append"
+        :prepend="__(config.prepend)"
+        :append="__(config.append)"
         :limit="config.character_limit"
-        :placeholder="config.placeholder"
+        :placeholder="__(config.placeholder)"
         :name="name"
         :id="fieldId"
         @input="updateDebounced"
diff --git a/resources/js/components/fieldtypes/TextareaFieldtype.vue b/resources/js/components/fieldtypes/TextareaFieldtype.vue
index 9f8832b9f2..b3b8a0c2b8 100644
--- a/resources/js/components/fieldtypes/TextareaFieldtype.vue
+++ b/resources/js/components/fieldtypes/TextareaFieldtype.vue
@@ -3,7 +3,7 @@
         :name="name"
         :isReadOnly="isReadOnly"
         :limit="config.character_limit || null"
-        :placeholder="config.placeholder"
+        :placeholder="__(config.placeholder)"
         :value="value"
         :id="fieldId"
         @blur="$emit('blur')"
diff --git a/resources/js/components/fieldtypes/ToggleFieldtype.vue b/resources/js/components/fieldtypes/ToggleFieldtype.vue
index f18d163db0..7898b20955 100644
--- a/resources/js/components/fieldtypes/ToggleFieldtype.vue
+++ b/resources/js/components/fieldtypes/ToggleFieldtype.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="toggle-fieldtype-wrapper">
         <toggle-input :value="value" @input="update" :read-only="isReadOnly" :id="fieldId" />
-        <label v-if="inlineLabel" class="inline-label" v-html="$options.filters.markdown(inlineLabel)"></label>
+        <label v-if="inlineLabel" class="inline-label" v-html="$options.filters.markdown(__(inlineLabel))"></label>
     </div>
 </template>
 
@@ -16,7 +16,7 @@ export default {
         },
 
         replicatorPreview() {
-            return (this.value ? '✓' : '✗') + ' ' + this.config.display;
+            return (this.value ? '✓' : '✗') + ' ' + __(this.config.display);
         }
 
     }
diff --git a/resources/js/components/fieldtypes/VideoFieldtype.vue b/resources/js/components/fieldtypes/VideoFieldtype.vue
index 6365754c1d..cd89f49cce 100644
--- a/resources/js/components/fieldtypes/VideoFieldtype.vue
+++ b/resources/js/components/fieldtypes/VideoFieldtype.vue
@@ -9,7 +9,7 @@
                     :class="{ 'bg-white': !isReadOnly }"
                     :id="fieldId"
                     :readonly="isReadOnly"
-                    :placeholder="config.placeholder || 'https://www.youtube.com/watch?v=dQw4w9WgXcQ'"
+                    :placeholder="__(config.placeholder) || 'https://www.youtube.com/watch?v=dQw4w9WgXcQ'"
                     @focus="$emit('focus')"
                     @blur="$emit('blur')" />
             </div>
diff --git a/resources/js/components/fieldtypes/bard/BardFieldtype.vue b/resources/js/components/fieldtypes/bard/BardFieldtype.vue
index a6c10ea80e..8645e2d4ca 100644
--- a/resources/js/components/fieldtypes/bard/BardFieldtype.vue
+++ b/resources/js/components/fieldtypes/bard/BardFieldtype.vue
@@ -295,7 +295,7 @@ export default {
                 } else if (node.type === 'set') {
                     const handle = node.attrs.values.type;
                     const set = this.setConfigs.find(set => set.handle === handle);
-                    text += ` [${set ? set.display : handle}]`;
+                    text += ` [${__(set ? set.display : handle)}]`;
                 }
                 if (text.length > 150) {
                     break;
@@ -666,7 +666,7 @@ export default {
                 Gapcursor,
                 History,
                 Paragraph,
-                Placeholder.configure({ placeholder: this.config.placeholder }),
+                Placeholder.configure({ placeholder: __(this.config.placeholder) }),
                 Set.configure({ bard: this }),
                 Text
             ];
diff --git a/resources/js/components/fieldtypes/bard/Set.vue b/resources/js/components/fieldtypes/bard/Set.vue
index 37c4a10890..373bebde97 100644
--- a/resources/js/components/fieldtypes/bard/Set.vue
+++ b/resources/js/components/fieldtypes/bard/Set.vue
@@ -11,7 +11,7 @@
                 <div class="flex items-center flex-1 p-2 replicator-set-header-inner cursor-pointer" :class="{'flex items-center': collapsed}" @click="toggleCollapsedState">
                     <label v-text="display || config.handle" class="text-xs whitespace-nowrap mr-2"/>
                     <div class="flex items-center" v-if="config.instructions && !collapsed">
-                        <svg-icon name="micro/circle-help" class="text-gray-700 hover:text-gray-800 h-3 w-3 text-xs" v-tooltip="{ content: $options.filters.markdown(config.instructions), html:true }" />
+                        <svg-icon name="micro/circle-help" class="text-gray-700 hover:text-gray-800 h-3 w-3 text-xs" v-tooltip="{ content: $options.filters.markdown(__(config.instructions)), html:true }" />
                     </div>
                     <div v-show="collapsed" class="flex-1 min-w-0 w-1 pr-8">
                         <div
@@ -88,7 +88,7 @@ export default {
         },
 
         display() {
-            return this.config.display || this.values.type;
+            return __(this.config.display || this.values.type);
         },
 
         values() {
@@ -137,7 +137,7 @@ export default {
         },
 
         instructions() {
-            return this.config.instructions ? markdown(this.config.instructions) : null;
+            return this.config.instructions ? markdown(__(this.config.instructions)) : null;
         },
 
         hasError() {
diff --git a/resources/js/components/fieldtypes/grid/Grid.vue b/resources/js/components/fieldtypes/grid/Grid.vue
index 1c9948f802..e1ac28b9c3 100644
--- a/resources/js/components/fieldtypes/grid/Grid.vue
+++ b/resources/js/components/fieldtypes/grid/Grid.vue
@@ -6,7 +6,7 @@
     <div class="grid-fieldtype-container" :class="{'grid-fullscreen bg-white': fullScreenMode }">
 
         <header class="bg-gray-200 border-b py-3 pl-3 flex items-center justify-between relative" v-if="fullScreenMode">
-            <h2 v-text="config.display" />
+            <h2 v-text="__(config.display)" />
             <button class="btn-close absolute top-2 right-5" @click="fullScreenMode = false" :aria-label="__('Exit Fullscreen Mode')">&times;</button>
         </header>
 
@@ -40,7 +40,7 @@
             <button
                 class="btn"
                 v-if="canAddRows"
-                v-text="addRowButtonLabel"
+                v-text="__(addRowButtonLabel)"
                 @click.prevent="addRow" />
 
         </section>
@@ -115,7 +115,7 @@ export default {
         },
 
         addRowButtonLabel() {
-            return this.config.add_row || __('Add Row');
+            return __(this.config.add_row) || __('Add Row');
         },
 
         hasMaxRows() {
@@ -135,7 +135,7 @@ export default {
         },
 
         replicatorPreview() {
-            return `${this.config.display}: ${__n(':count row|:count rows', this.value.length)}`;
+            return `${__(this.config.display)}: ${__n(':count row|:count rows', this.value.length)}`;
         }
 
     },
diff --git a/resources/js/components/fieldtypes/grid/HeaderCell.vue b/resources/js/components/fieldtypes/grid/HeaderCell.vue
index bb7a21e80a..13b8e922d7 100644
--- a/resources/js/components/fieldtypes/grid/HeaderCell.vue
+++ b/resources/js/components/fieldtypes/grid/HeaderCell.vue
@@ -2,8 +2,8 @@
 
     <th v-show="field.type !== 'hidden'">
         <div class="flex items-center justify-between">
-            <div><template v-if="!field.hide_display">{{ field.display || field.handle }}</template></div>
-            <svg-icon name="micro/circle-help" class="text-gray-600 hover:text-gray-700 h-3 w-3 text-xs" v-if="field.instructions" v-tooltip="{ content: $options.filters.markdown(field.instructions), html:true }" />
+            <div><template v-if="!field.hide_display">{{ __(field.display || field.handle) }}</template></div>
+            <svg-icon name="micro/circle-help" class="text-gray-600 hover:text-gray-700 h-3 w-3 text-xs" v-if="field.instructions" v-tooltip="{ content: $options.filters.markdown(__(field.instructions)), html:true }" />
         </div>
     </th>
 
diff --git a/resources/js/components/fieldtypes/replicator/Field.vue b/resources/js/components/fieldtypes/replicator/Field.vue
index 771d3073ad..6c0465f4aa 100644
--- a/resources/js/components/fieldtypes/replicator/Field.vue
+++ b/resources/js/components/fieldtypes/replicator/Field.vue
@@ -84,12 +84,12 @@ export default {
         },
 
         display() {
-            return this.field.display || this.field.handle[0].toUpperCase() + this.field.handle.slice(1)
+            return __(this.field.display || this.field.handle[0].toUpperCase() + this.field.handle.slice(1))
         },
 
         instructions() {
             return this.field.instructions
-                ? this.$options.filters.markdown(this.field.instructions)
+                ? this.$options.filters.markdown(__(this.field.instructions))
                 : null
         },
 
diff --git a/resources/js/components/fieldtypes/replicator/Replicator.vue b/resources/js/components/fieldtypes/replicator/Replicator.vue
index 602bf22e03..73ecb5f153 100644
--- a/resources/js/components/fieldtypes/replicator/Replicator.vue
+++ b/resources/js/components/fieldtypes/replicator/Replicator.vue
@@ -9,7 +9,7 @@
 <div class="replicator-fieldtype-container" :class="{'replicator-fullscreen bg-gray-200': fullScreenMode }">
 
     <header class="bg-white fixed top-0 inset-x-0 border-b p-3 pl-4 flex items-center justify-between shadow z-max" v-if="fullScreenMode">
-        <h2 v-text="config.display" class="flex-1" />
+        <h2 v-text="__(config.display)" class="flex-1" />
             <div class="flex items-center">
                 <div class="btn-group">
                     <button @click="expandAll" class="btn btn-icon flex items-center" v-tooltip="__('Expand Sets')" v-if="config.collapse !== 'accordion' && value.length > 0">
@@ -172,7 +172,7 @@ export default {
         },
 
         replicatorPreview() {
-            return `${this.config.display}: ${__n(':count set|:count sets', this.value.length)}`;
+            return `${__(this.config.display)}: ${__n(':count set|:count sets', this.value.length)}`;
         }
     },
 
diff --git a/resources/js/components/fieldtypes/replicator/Set.vue b/resources/js/components/fieldtypes/replicator/Set.vue
index 675927142f..1c72e7631f 100644
--- a/resources/js/components/fieldtypes/replicator/Set.vue
+++ b/resources/js/components/fieldtypes/replicator/Set.vue
@@ -9,7 +9,7 @@
                 <div class="flex items-center flex-1 p-2 replicator-set-header-inner cursor-pointer" :class="{'flex items-center': collapsed}" @click="toggleCollapsedState">
                     <label v-text="display || config.handle" class="text-xs whitespace-nowrap mr-2 cursor-pointer"/>
                     <div class="flex items-center" v-if="config.instructions && !collapsed">
-                        <svg-icon name="micro/circle-help" class="text-gray-700 hover:text-gray-800 h-3 w-3 text-xs" v-tooltip="{ content: $options.filters.markdown(config.instructions), html:true }" />
+                        <svg-icon name="micro/circle-help" class="text-gray-700 hover:text-gray-800 h-3 w-3 text-xs" v-tooltip="{ content: $options.filters.markdown(__(config.instructions)), html:true }" />
                     </div>
                     <div v-show="collapsed" class="flex-1 min-w-0 w-1 pr-8">
                         <div
@@ -134,11 +134,11 @@ export default {
         },
 
         display() {
-            return this.config.display || this.values.type;
+            return __(this.config.display) || this.values.type;
         },
 
         instructions() {
-            return this.config.instructions ? markdown(this.config.instructions) : null;
+            return this.config.instructions ? markdown(__(this.config.instructions)) : null;
         },
 
         hasMultipleFields() {
diff --git a/resources/js/components/fieldtypes/replicator/SetPicker.vue b/resources/js/components/fieldtypes/replicator/SetPicker.vue
index d8aa96ff6a..a949e8582a 100644
--- a/resources/js/components/fieldtypes/replicator/SetPicker.vue
+++ b/resources/js/components/fieldtypes/replicator/SetPicker.vue
@@ -31,8 +31,8 @@
                             <svg-icon :name="item.icon ? `plump/${item.icon}` : 'folder-generic'" class="text-gray-800" />
                         </div>
                         <div class="flex-1">
-                            <div class="text-md font-medium text-gray-800 truncate w-52">{{ item.display || item.handle }}</div>
-                            <div v-if="item.instructions" class="text-2xs text-gray-700 truncate w-52">{{ item.instructions }}</div>
+                            <div class="text-md font-medium text-gray-800 truncate w-52">{{ __(item.display || item.handle) }}</div>
+                            <div v-if="item.instructions" class="text-2xs text-gray-700 truncate w-52">{{ __(item.instructions) }}</div>
                         </div>
                         <svg-icon name="micro/chevron-right-thin" class="text-gray-600 group-hover:text-gray-800" />
                     </div>
@@ -41,8 +41,8 @@
                             <svg-icon :name="item.icon ? `plump/${item.icon}` : 'light/add'" class="text-gray-800" />
                         </div>
                         <div class="flex-1">
-                            <div class="text-md font-medium text-gray-800 truncate w-52">{{ item.display || item.handle }}</div>
-                            <div v-if="item.instructions" class="text-2xs text-gray-700 truncate w-52">{{ item.instructions }}</div>
+                            <div class="text-md font-medium text-gray-800 truncate w-52">{{ __(item.display || item.handle) }}</div>
+                            <div v-if="item.instructions" class="text-2xs text-gray-700 truncate w-52">{{ __(item.instructions) }}</div>
                         </div>
                     </div>
                 </div>
@@ -100,7 +100,7 @@ export default {
         },
 
         selectedGroupDisplayText() {
-            return this.selectedGroup ? this.selectedGroup.display || this.selectedGroup.handle : null;
+            return this.selectedGroup ? __(this.selectedGroup.display || this.selectedGroup.handle) : null;
         },
 
         visibleSets() {
@@ -112,7 +112,7 @@ export default {
 
             if (this.search) {
                 return sets.filter(set => {
-                    return set.display.toLowerCase().includes(this.search.toLowerCase())
+                    return __(set.display).toLowerCase().includes(this.search.toLowerCase())
                         || set.handle.toLowerCase().includes(this.search.toLowerCase());
                 });
             }
diff --git a/resources/js/components/inputs/Select.vue b/resources/js/components/inputs/Select.vue
index 7ba735bb25..28d44747d3 100644
--- a/resources/js/components/inputs/Select.vue
+++ b/resources/js/components/inputs/Select.vue
@@ -15,7 +15,7 @@
 
             <option
                 v-if="placeholder"
-                v-text="placeholder"
+                v-text="__(placeholder)"
                 value=""
                 disabled
                 :selected="value === null" />
@@ -23,7 +23,7 @@
             <option
                 v-for="option in options"
                 :key="option.value"
-                v-text="option.label"
+                v-text="__(option.label)"
                 :value="option.value"
                 :selected="isOptionSelected(option)" />
 
diff --git a/resources/js/components/inputs/Text.vue b/resources/js/components/inputs/Text.vue
index fd20a91174..72d3f17aad 100644
--- a/resources/js/components/inputs/Text.vue
+++ b/resources/js/components/inputs/Text.vue
@@ -3,7 +3,7 @@
         <div class="input-group">
             <slot name="prepend" v-if="prepend">
                 <div class="input-group-prepend">
-                    {{ prepend }}
+                    {{ __(prepend) }}
                 </div>
             </slot>
             <input
@@ -27,7 +27,7 @@
             >
             <slot name="append" v-if="append">
                 <div class="input-group-append">
-                    {{ append }}
+                    {{ __(append) }}
                 </div>
             </slot>
         </div>
diff --git a/resources/js/components/inputs/relationship/SelectField.vue b/resources/js/components/inputs/relationship/SelectField.vue
index b08a42c852..5f1b21a1c9 100644
--- a/resources/js/components/inputs/relationship/SelectField.vue
+++ b/resources/js/components/inputs/relationship/SelectField.vue
@@ -13,7 +13,7 @@
             :get-option-key="(option) => option.id"
             :get-option-label="(option) => option.title"
             :create-option="(value) => ({ title: value, id: value })"
-            :placeholder="config.placeholder || __('Choose...')"
+            :placeholder="__(config.placeholder) || __('Choose...')"
             :searchable="true"
             :taggable="isTaggable"
             :value="items"
@@ -25,7 +25,7 @@
             <template #selected-option-container v-if="multiple"><i class="hidden"></i></template>
             <template #search="{ events, attributes }" v-if="multiple">
                 <input
-                    :placeholder="config.placeholder || __('Choose...')"
+                    :placeholder="__(config.placeholder) || __('Choose...')"
                     class="vs__search"
                     type="search"
                     v-on="events"
diff --git a/resources/js/components/publish/Field.vue b/resources/js/components/publish/Field.vue
index ae3beddff5..dcf4cf21a2 100644
--- a/resources/js/components/publish/Field.vue
+++ b/resources/js/components/publish/Field.vue
@@ -12,7 +12,7 @@
                     v-if="showLabelText"
                     class="mr-1"
                     :class="{ 'text-gray-600': syncable && isSynced }"
-                    v-text="labelText"
+                    v-text="__(labelText)"
                     v-tooltip="{content: config.handle, delay: 500, autoHide: false}"
                 />
                 <i class="required mr-1" v-if="config.required">*</i>
@@ -126,7 +126,7 @@ export default {
 
         instructions() {
             return this.config.instructions
-                ? this.renderMarkdownAndLinks(this.config.instructions)
+                ? this.renderMarkdownAndLinks(__(this.config.instructions))
                 : null
         },
 
diff --git a/resources/js/components/publish/Sections.vue b/resources/js/components/publish/Sections.vue
index 50442357c3..75bf816204 100644
--- a/resources/js/components/publish/Sections.vue
+++ b/resources/js/components/publish/Sections.vue
@@ -4,8 +4,8 @@
             <div class="card p-0">
                 <header class="publish-section-header @container" v-if="section.display">
                     <div class="publish-section-header-inner">
-                        <label v-text="section.display" class="text-base font-semibold" />
-                        <div class="help-block" v-if="section.instructions"><p v-html="$options.filters.markdown(section.instructions)" /></div>
+                        <label v-text="__(section.display)" class="text-base font-semibold" />
+                        <div class="help-block" v-if="section.instructions"><p v-html="$options.filters.markdown(__(section.instructions))" /></div>
                     </div>
                 </header>
                 <publish-fields
diff --git a/resources/js/components/publish/Tabs.vue b/resources/js/components/publish/Tabs.vue
index f5980bba13..d509eb3a4d 100644
--- a/resources/js/components/publish/Tabs.vue
+++ b/resources/js/components/publish/Tabs.vue
@@ -34,7 +34,7 @@
                     :aria-selected="isActive(tab.handle)"
                     :tabindex="isActive(tab.handle) ? 0 : -1"
                     @click="setActive(tab.handle)"
-                    v-text="tab.display || `${tab.handle[0].toUpperCase()}${tab.handle.slice(1)}`"
+                    v-text="__(tab.display || `${tab.handle[0].toUpperCase()}${tab.handle.slice(1)}`)"
                 />
             </div>
             <div class="fade-left" v-if="canScrollLeft" />
@@ -46,7 +46,7 @@
                     v-for="(tab, index) in mainTabs"
                     v-show="shouldShowInDropdown(index)"
                     :key="tab.handle"
-                    :text="tab.display || `${tab.handle[0].toUpperCase()}${tab.handle.slice(1)}`"
+                    :text="__(tab.display || `${tab.handle[0].toUpperCase()}${tab.handle.slice(1)}`)"
                     @click.prevent="setActive(tab.handle)"
                 />
             </dropdown-list>
diff --git a/src/Query/Scopes/Filters/Site.php b/src/Query/Scopes/Filters/Site.php
index fcfa0ebde8..c316400c08 100644
--- a/src/Query/Scopes/Filters/Site.php
+++ b/src/Query/Scopes/Filters/Site.php
@@ -41,7 +41,7 @@ public function badge($values)
     {
         $site = Facades\Site::get($values['site']);
 
-        return __('Site').': '.$site->name();
+        return __('Site').': '.__($site->name());
     }
 
     public function visibleTo($key)
@@ -52,7 +52,7 @@ public function visibleTo($key)
     protected function options()
     {
         return Facades\Site::authorized()->mapWithKeys(function ($site) {
-            return [$site->handle() => $site->name()];
+            return [$site->handle() => __($site->name())];
         });
     }
 }

From 35641dee960946008304ac1c2671d632e4fa9318 Mon Sep 17 00:00:00 2001
From: Joshua Blum <hallo@joshuablum.de>
Date: Fri, 13 Oct 2023 17:12:14 +0200
Subject: [PATCH 17/36] [4.x] Fix lowercasing asset filenames to include file
 extension (#8842)

---
 src/Assets/AssetUploader.php |  5 +++++
 tests/Assets/AssetTest.php   | 12 ++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Assets/AssetUploader.php b/src/Assets/AssetUploader.php
index 746705bce2..f13c2e4ac5 100644
--- a/src/Assets/AssetUploader.php
+++ b/src/Assets/AssetUploader.php
@@ -27,6 +27,11 @@ public static function asset(Asset $asset)
     protected function uploadPath(UploadedFile $file)
     {
         $ext = $this->getNewExtension() ?? $file->getClientOriginalExtension();
+
+        if (config('statamic.assets.lowercase')) {
+            $ext = strtolower($ext);
+        }
+
         $filename = self::getSafeFilename(pathinfo($file->getClientOriginalName(), PATHINFO_FILENAME));
 
         $directory = $this->asset->folder();
diff --git a/tests/Assets/AssetTest.php b/tests/Assets/AssetTest.php
index 5cd5b5cee7..b26d6bfdf2 100644
--- a/tests/Assets/AssetTest.php
+++ b/tests/Assets/AssetTest.php
@@ -1830,10 +1830,10 @@ public function it_appends_timestamp_to_uploaded_files_filename_if_it_already_ex
     public function it_lowercases_uploaded_filenames_by_default()
     {
         Event::fake();
-        $asset = $this->container->makeAsset('path/to/lowercase-THIS-asset.jpg');
+        $asset = $this->container->makeAsset('path/to/lowercase-THIS-asset.JPG');
         Facades\AssetContainer::shouldReceive('findByHandle')->with('test_container')->andReturn($this->container);
 
-        $asset->upload(UploadedFile::fake()->image('lowercase-THIS-asset.jpg'));
+        $asset->upload(UploadedFile::fake()->image('lowercase-THIS-asset.JPG'));
 
         Storage::disk('test')->assertExists('path/to/lowercase-this-asset.jpg');
         $this->assertEquals('path/to/lowercase-this-asset.jpg', $asset->path());
@@ -1913,13 +1913,13 @@ public function it_doesnt_lowercase_uploaded_filenames_when_configured()
         config(['statamic.assets.lowercase' => false]);
 
         Event::fake();
-        $asset = $this->container->makeAsset('path/to/do-NOT-lowercase-THIS-asset.jpg');
+        $asset = $this->container->makeAsset('path/to/do-NOT-lowercase-THIS-asset.JPG');
         Facades\AssetContainer::shouldReceive('findByHandle')->with('test_container')->andReturn($this->container);
 
-        $asset->upload(UploadedFile::fake()->image('do-NOT-lowercase-THIS-asset.jpg'));
+        $asset->upload(UploadedFile::fake()->image('do-NOT-lowercase-THIS-asset.JPG'));
 
-        Storage::disk('test')->assertExists('path/to/do-NOT-lowercase-THIS-asset.jpg');
-        $this->assertEquals('path/to/do-NOT-lowercase-THIS-asset.jpg', $asset->path());
+        Storage::disk('test')->assertExists('path/to/do-NOT-lowercase-THIS-asset.JPG');
+        $this->assertEquals('path/to/do-NOT-lowercase-THIS-asset.JPG', $asset->path());
         Event::assertDispatched(AssetUploaded::class, function ($event) use ($asset) {
             return $event->asset = $asset;
         });

From a37a141cdc2a8a17691237cd9b74e951c28e8d23 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 13 Oct 2023 12:22:15 -0400
Subject: [PATCH 18/36] [4.x] PHP 8.3 (#8843)

---
 .github/workflows/tests.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f5e408e7ff..69686c4326 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [8.0, 8.1, 8.2]
+        php: [8.0, 8.1, 8.2, 8.3]
         laravel: [9.*, 10.*]
         stability: [prefer-lowest, prefer-stable]
         os: [ubuntu-latest]
@@ -29,6 +29,8 @@ jobs:
         exclude:
           - php: 8.0
             laravel: 10.*
+          - php: 8.3
+            laravel: 9.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

From 12d2bc7d9a189e0babb823dc77f52edcf8fe8c0d Mon Sep 17 00:00:00 2001
From: Emmanuel Beauchamps <e.bops@hotmail.fr>
Date: Fri, 13 Oct 2023 18:22:53 +0200
Subject: [PATCH 19/36] [4.x] French translations (#8835)

---
 resources/lang/fr/validation.php | 34 ++++++++++++++++----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/resources/lang/fr/validation.php b/resources/lang/fr/validation.php
index 30d30361cc..a973341399 100644
--- a/resources/lang/fr/validation.php
+++ b/resources/lang/fr/validation.php
@@ -10,7 +10,7 @@
     'alpha_dash' => 'Peut uniquement contenir des lettres, des chiffres, des tirets et des traits de soulignement.',
     'alpha_num' => 'Peut uniquement contenir des lettres et des chiffres.',
     'array' => 'Doit être un tableau.',
-    'ascii' => 'Peut uniquement contenir des symboles et caractères alpanumériques mono-bits.',
+    'ascii' => 'Peut uniquement contenir des symboles et caractères alphanumériques mono-bits.',
     'before' => 'Doit être une date strictement antérieure à :date.',
     'before_or_equal' => 'Doit être une date antérieure ou égale à :date.',
     'between.array' => 'Doit avoir entre :min et :max éléments.',
@@ -24,7 +24,7 @@
     'date' => 'Date non valide.',
     'date_equals' => 'Doit être une date égale à :date.',
     'date_format' => 'Ne correspond pas au format :format.',
-    'decimal' => 'Doit faire :decimal décimales.',
+    'decimal' => 'Doit avoir :decimal décimales.',
     'declined' => 'Doit être décliné.',
     'declined_if' => 'Doit être décliné quand :other correspond à :value.',
     'different' => 'Ce champ et :other doivent être différents.',
@@ -32,7 +32,7 @@
     'digits_between' => 'Doit être compris entre :min et :max chiffres.',
     'dimensions' => 'Dimensions de l’image non valides.',
     'distinct' => 'Ce champ a une valeur en double.',
-    'doesnt_end_with' => 'Ne doit pas se terminer avec l’une des valeurs suivantes : :values.',
+    'doesnt_end_with' => 'Ne doit pas se terminer par l’une des valeurs suivantes : :values.',
     'doesnt_start_with' => 'Ne doit pas commencer par l’une des valeurs suivantes : :values.',
     'email' => 'Doit être une adresse e-mail valide.',
     'ends_with' => 'Doit se terminer par :values',
@@ -41,13 +41,13 @@
     'file' => 'Doit être un fichier.',
     'filled' => 'Doit avoir une valeur.',
     'gt.array' => 'Doit avoir plus de :value éléments.',
-    'gt.file' => 'Doit être supérieur à :value kilo-octets.',
+    'gt.file' => 'Doit faire strictement plus de :value kilo-octets.',
     'gt.numeric' => 'Doit être supérieur à :value.',
-    'gt.string' => 'Doit faire plus de :value caractères.',
-    'gte.array' => 'Doit avoir :value éléments ou plus.',
-    'gte.file' => 'Doit être supérieur ou égal à :value kilo-octets.',
+    'gt.string' => 'Doit avoir plus de :value caractères.',
+    'gte.array' => 'Doit avoir au moins :value éléments.',
+    'gte.file' => 'Doit faire au moins :value kilo-octets.',
     'gte.numeric' => 'Doit être supérieur ou égal à :value.',
-    'gte.string' => 'Doit être supérieur ou égal à :value caractères.',
+    'gte.string' => 'Doit avoir au moins :value caractères.',
     'image' => 'Doit être une image.',
     'in' => 'Ceci est invalide.',
     'in_array' => 'Ce champ n’existe pas dans :other.',
@@ -57,26 +57,26 @@
     'ipv6' => 'Doit être une adresse IPv6 valide.',
     'json' => 'Doit être une chaîne JSON valide.',
     'lowercase' => 'Doit être en minuscules.',
-    'lt.array' => 'Doit être strictement inférieur à :value éléments.',
-    'lt.file' => 'Doit être strictement inférieur à :value kilo-octets.',
+    'lt.array' => 'Doit avoir strictement moins de :value éléments.',
+    'lt.file' => 'Doit faire strictement moins de :value kilo-octets.',
     'lt.numeric' => 'Doit être strictement inférieur à :value.',
-    'lt.string' => 'Doit être strictement inférieur à :value caractères.',
+    'lt.string' => 'Doit avoir strictement moins de :value caractères.',
     'lte.array' => 'Ne doit pas avoir plus de :value éléments.',
-    'lte.file' => 'Doit être inférieur ou égal à :value kilo-octets.',
+    'lte.file' => 'Ne doit pas faire plus de :value kilo-octets.',
     'lte.numeric' => 'Doit être inférieur ou égal à :value.',
-    'lte.string' => 'Doit être inférieur ou égal à :value caractères.',
+    'lte.string' => 'Ne doit pas avoir plus de :value caractères.',
     'mac_address' => 'Doit être une adresse MAC valide.',
     'max.array' => 'Ne peut pas avoir plus de :max éléments.',
     'max.file' => 'Ne peut pas être supérieur à :max kilo-octets.',
     'max.numeric' => 'Ne peut pas être supérieur à :max.',
-    'max.string' => 'Ne peut pas être supérieur à :max caractères.',
+    'max.string' => 'Ne peut pas avoir plus de :max caractères.',
     'max_digits' => 'Ne peut pas avoir plus de :max chiffres.',
     'mimes' => 'Doit être un fichier de type :values.',
     'mimetypes' => 'Doit être un fichier de type :values.',
     'min.array' => 'Doit avoir au moins :min éléments.',
     'min.file' => 'Doit faire au moins :min kilo-octets.',
     'min.numeric' => 'Doit faire au moins :min.',
-    'min.string' => 'Doit faire au moins :min caractères.',
+    'min.string' => 'Doit avoir au moins :min caractères.',
     'min_digits' => 'Doit faire au moins :min chiffres.',
     'missing' => 'Doit être absent.',
     'missing_if' => 'Doit être absent quand :other correspond à :value.',
@@ -98,8 +98,8 @@
     'required_if' => 'Ce champ est obligatoire lorsque :other est :value.',
     'required_if_accepted' => 'Ce champ est obligatoire quand :other est accepté.',
     'required_unless' => 'Ce champ est obligatoire, sauf si :other est dans :values.',
-    'required_with' => 'Ce champ est requis lorsque :values est présent.',
-    'required_with_all' => 'Ce champ est requis lorsque :values est présent.',
+    'required_with' => 'Ce champ est obligatoire lorsque :values est présent.',
+    'required_with_all' => 'Ce champ est obligatoire lorsque :values sont présentes.',
     'required_without' => 'Ce champ est obligatoire lorsque :values n’est pas présente.',
     'required_without_all' => 'Ce champ est obligatoire lorsqu’aucune des :values n’est présente.',
     'same' => 'Ce champ et :other doivent correspondre.',

From 1f7c152f097c8b55dd6905263b02c2d62092e5a1 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 13 Oct 2023 13:58:31 -0400
Subject: [PATCH 20/36] [4.x] Revert adding PHP 8.3 tests (#8846)

---
 .github/workflows/tests.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 69686c4326..f5e408e7ff 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [8.0, 8.1, 8.2, 8.3]
+        php: [8.0, 8.1, 8.2]
         laravel: [9.*, 10.*]
         stability: [prefer-lowest, prefer-stable]
         os: [ubuntu-latest]
@@ -29,8 +29,6 @@ jobs:
         exclude:
           - php: 8.0
             laravel: 10.*
-          - php: 8.3
-            laravel: 9.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

From bbf6c1992344f509ee0a465aa85598ccea11b8d5 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 13 Oct 2023 16:31:59 -0400
Subject: [PATCH 21/36] changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8602ea7583..92044ffef9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Release Notes
 
+## 4.28.0 (2023-10-13)
+
+### What's new
+- Allow user defined fields in the CP to be translatable. [#8664](https://github.com/statamic/cms/issues/8664) by @ryanmitchell
+
+### What's improved
+- French translations. [#8835](https://github.com/statamic/cms/issues/8835) [#8831](https://github.com/statamic/cms/issues/8831) by @ebeauchamps
+
+### What's fixed
+- Fix lowercasing of asset filenames to include file extension. [#8842](https://github.com/statamic/cms/issues/8842) by @joshuablum
+- Only show status indicator in stack view if item has a status. [#8832](https://github.com/statamic/cms/issues/8832) by @ryanmitchell
+- Fix console warning generated by invalid tabulator config. [#8834](https://github.com/statamic/cms/issues/8834) by @joseph-d
+
+
+
 ## 4.27.0 (2023-10-11)
 
 ### What's new

From e5665acd38da125a6915e2c8ae04543493aadde3 Mon Sep 17 00:00:00 2001
From: Jack Sleight <jacksleight@gmail.com>
Date: Mon, 16 Oct 2023 17:23:52 +0100
Subject: [PATCH 22/36] [4.x] Fix missing replicator set previews (#8855)

---
 resources/js/components/fieldtypes/replicator/Set.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/fieldtypes/replicator/Set.vue b/resources/js/components/fieldtypes/replicator/Set.vue
index 1c72e7631f..d1a8581397 100644
--- a/resources/js/components/fieldtypes/replicator/Set.vue
+++ b/resources/js/components/fieldtypes/replicator/Set.vue
@@ -127,6 +127,12 @@ export default {
         }
     },
 
+    data() {
+        return {
+            fieldPreviews: this.previews,
+        }
+    },
+
     computed: {
 
         fields() {
@@ -166,7 +172,7 @@ export default {
         },
 
         previewUpdated(handle, value) {
-            this.$emit('previews-updated', { ...this.previews, [handle]: value });
+            this.$emit('previews-updated', this.fieldPreviews = { ...this.fieldPreviews, [handle]: value });
         },
 
         destroy() {

From 323fa4ef3a7baba24ed3891d43398f3cb7d99b6d Mon Sep 17 00:00:00 2001
From: Emmanuel Beauchamps <e.bops@hotmail.fr>
Date: Mon, 16 Oct 2023 20:20:27 +0200
Subject: [PATCH 23/36] [4.x] French translations (#8848)

---
 resources/lang/fr/permissions.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/lang/fr/permissions.php b/resources/lang/fr/permissions.php
index 5ebe7cf2de..a994aa35cb 100644
--- a/resources/lang/fr/permissions.php
+++ b/resources/lang/fr/permissions.php
@@ -12,6 +12,8 @@
     'configure_addons_desc' => 'Permet d’accéder à la section des addons pour en installer ou désinstaller.',
     'manage_preferences' => 'Gérer les préférences',
     'manage_preferences_desc' => 'Possibilité de personnaliser les préférences globales et celles spécifiques au rôle.',
+    'group_sites' => 'Sites',
+    'access_{site}_site' => 'Accéder au site :site',
     'group_collections' => 'Collections',
     'configure_collections' => 'Configurer les collections',
     'configure_collections_desc' => 'Permet d’accéder à toutes les autorisations liées à la collection.',

From eb1a1fcff6b40c0a8d4f5d8ccb46487020928cc0 Mon Sep 17 00:00:00 2001
From: Marco Rieser <marco@rieser.dev>
Date: Mon, 16 Oct 2023 21:03:47 +0200
Subject: [PATCH 24/36] [4.x] Allow overwriting the column for
 `unique_user_value` validation (#8852)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 src/Validation/UniqueUserValue.php       |  6 ++++--
 tests/Validation/UniqueUserValueTest.php | 11 +++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/Validation/UniqueUserValue.php b/src/Validation/UniqueUserValue.php
index 06c4513ea8..9584fd1625 100644
--- a/src/Validation/UniqueUserValue.php
+++ b/src/Validation/UniqueUserValue.php
@@ -8,10 +8,12 @@ class UniqueUserValue
 {
     public function validate($attribute, $value, $parameters, $validator)
     {
-        [$except] = array_pad($parameters, 1, null);
+        [$except, $column] = array_pad($parameters, 2, null);
+
+        $column ??= $attribute;
 
         $existing = User::query()
-            ->where($attribute, $value)
+            ->where($column, $value)
             ->first();
 
         if (! $existing) {
diff --git a/tests/Validation/UniqueUserValueTest.php b/tests/Validation/UniqueUserValueTest.php
index 0df19292a7..ed4340b597 100644
--- a/tests/Validation/UniqueUserValueTest.php
+++ b/tests/Validation/UniqueUserValueTest.php
@@ -35,4 +35,15 @@ public function it_passes_when_updating()
             ['email' => 'unique_user_value:123']
         )->passes());
     }
+
+    /** @test */
+    public function it_supports_overwriting_the_column()
+    {
+        User::make()->email('foo@bar.com')->save();
+
+        $this->assertTrue(Validator::make(
+            ['baz' => 'foo@bar.com'],
+            ['baz' => 'unique_user_value:null,email']
+        )->fails());
+    }
 }

From 99c3f33d9c59610e72bb697f836ec06f310c818a Mon Sep 17 00:00:00 2001
From: Daniel Kaufmann <hello@danielkaufmann.ch>
Date: Tue, 17 Oct 2023 17:06:32 +0200
Subject: [PATCH 25/36] [4.x] German translations (#8857)

---
 resources/lang/de.json               |  4 ++
 resources/lang/de/fieldtypes.php     |  7 ++--
 resources/lang/de/messages.php       |  2 +-
 resources/lang/de/permissions.php    |  2 +
 resources/lang/de/validation.php     | 60 ++++++++++++++++++++--------
 resources/lang/de_CH.json            |  4 ++
 resources/lang/de_CH/fieldtypes.php  |  5 ++-
 resources/lang/de_CH/messages.php    |  2 +-
 resources/lang/de_CH/permissions.php |  2 +
 resources/lang/de_CH/validation.php  | 60 ++++++++++++++++++++--------
 10 files changed, 109 insertions(+), 39 deletions(-)

diff --git a/resources/lang/de.json b/resources/lang/de.json
index 9f7f2e05ba..9b26e93abe 100644
--- a/resources/lang/de.json
+++ b/resources/lang/de.json
@@ -137,6 +137,7 @@
     "Before": "Bevor",
     "Behavior": "Verhalten",
     "Below": "Unterhalb",
+    "Between": "Zwischen",
     "Blockquote": "Blockzitat",
     "Blueprint": "Blueprint",
     "Blueprint created": "Blueprint erstellt",
@@ -497,6 +498,7 @@
     "Inline": "Inline",
     "Inline Code": "Inline-Code",
     "Inline Label": "Inline Beschriftung",
+    "Inline Label when True": "Inline Beschriftung wenn aktiv",
     "Input Behavior": "Eingabeverhalten",
     "Input Label": "Beschriftung",
     "Input Type": "Eingabetyp",
@@ -659,6 +661,7 @@
     "Per Page": "Pro Seite",
     "Per-site": "Pro Website",
     "Permissions": "Berechtigungen",
+    "Phone": "Telefon",
     "PHP Info": "PHP Info",
     "Pick Color": "Farbe wählen",
     "Pin to Favorites": "Als Favorit speichern",
@@ -1010,6 +1013,7 @@
     "You are not authorized to view collections.": "Du bist nicht berechtigt, Sammlungen anzuzeigen.",
     "You are not authorized to view navs.": "Du bist nicht berechtigt, Navigationen anzuzeigen.",
     "You are not authorized to view this collection.": "Du bist nicht berechtigt, diese Sammlung anzuzeigen.",
+    "You are now impersonating": "Du gibst dich jetzt aus als",
     "Your Favorites": "Meine Favoriten",
     "Your working copy will be replaced by the contents of this revision.": "Deine Arbeitskopie wird durch den Inhalt dieser Überarbeitung ersetzt."
 }
diff --git a/resources/lang/de/fieldtypes.php b/resources/lang/de/fieldtypes.php
index 6b3a58351a..234ec79011 100644
--- a/resources/lang/de/fieldtypes.php
+++ b/resources/lang/de/fieldtypes.php
@@ -154,8 +154,8 @@
     'slug.title' => 'Slug',
     'structures.title' => 'Strukturen',
     'table.title' => 'Tabelle',
-    'taggable.title' => 'Tags',
     'taggable.config.placeholder' => 'Tippen und ↩ Enter drücken',
+    'taggable.title' => 'Tags',
     'taxonomies.title' => 'Taxonomien',
     'template.config.blueprint' => 'Fügt die Option „Korrespondiert mit Blueprint“ hinzu. Erfahre mehr in der [Dokumentation](https://statamic.dev/views#inferring-templates-from-entry-blueprints).',
     'template.config.folder' => 'Nur Templates aus diesem Ordner anzeigen.',
@@ -175,11 +175,12 @@
     'textarea.title' => 'Textbereich',
     'time.config.seconds_enabled' => 'Sekunden im Timepicker anzeigen.',
     'time.title' => 'Zeit',
-    'toggle.config.inline_label' => 'Inline-Beschriftung festlegen, welche neben dem Schalter angezeigt werden soll.',
+    'toggle.config.inline_label' => 'Eine Inline-Beschriftung festlegen, die neben dem Schalter angezeigt wird.',
+    'toggle.config.inline_label_when_true' => 'Eine Inline-Beschriftung festlegen, die neben dem Schalter angezeigt wird, wenn der Wert true ist.',
     'toggle.title' => 'Schalter',
     'user_groups.title' => 'Benutzergruppen',
-    'users.config.query_scopes' => 'Auswählen, welche Abfragebereiche beim Abrufen der auswählbaren Benutzer:innen angewendet werden sollen.',
     'user_roles.title' => 'Benutzerrollen',
+    'users.config.query_scopes' => 'Auswählen, welche Abfragebereiche beim Abrufen der auswählbaren Benutzer:innen angewendet werden sollen.',
     'users.title' => 'Benutzer:innen',
     'video.title' => 'Video',
     'width.config.options' => 'Verfügbare Breiten festlegen.',
diff --git a/resources/lang/de/messages.php b/resources/lang/de/messages.php
index c469864768..6c10ed5fc2 100644
--- a/resources/lang/de/messages.php
+++ b/resources/lang/de/messages.php
@@ -81,7 +81,7 @@
     'field_validation_required_instructions' => 'Steuert, ob dieses Feld erforderlich ist oder nicht.',
     'field_validation_sometimes_instructions' => 'Dieses Feld wird nur validiert, wenn es sichtbar ist oder abgeschickt wird.',
     'fields_blueprints_description' => 'Blueprints definieren die Felder für den inhaltlichen Aufbau von Sammlungen, Taxonomien, Benutzer:innen und Formularen.',
-    'fields_default_instructions' => 'Standardwert festlegen.',
+    'fields_default_instructions' => 'Diesen Wert immer dann einfügen, wenn das Feld in einem Veröffentlichungsformular leer ist.',
     'fields_display_instructions' => 'Name des Feldes im Control Panel.',
     'fields_duplicate_instructions' => 'Soll dieses Feld beim Duplizieren des Eintrags berücksichtigt werden?',
     'fields_fieldsets_description' => 'Fieldsets sind einfache, flexible und völlig optionale Gruppen von Feldern, mit deren Hilfe wiederverwendbare, vorkonfigurierte Blöcke organisiert werden können.',
diff --git a/resources/lang/de/permissions.php b/resources/lang/de/permissions.php
index 56f790409b..166b65b5aa 100644
--- a/resources/lang/de/permissions.php
+++ b/resources/lang/de/permissions.php
@@ -12,6 +12,8 @@
     'configure_addons_desc' => 'Ermöglicht den Zugriff auf den Addon-Bereich zum Installieren und Deinstallieren von Addons.',
     'manage_preferences' => 'Voreinstellungen verwalten',
     'manage_preferences_desc' => 'Ermöglicht globale und rollenspezifische Voreinstellungen anzupassen.',
+    'group_sites' => 'Websites',
+    'access_{site}_site' => 'Zugriff auf :site',
     'group_collections' => 'Sammlungen',
     'configure_collections' => 'Sammlungen konfigurieren',
     'configure_collections_desc' => 'Gewährt Zugriff auf alle Berechtigungen im Zusammenhang mit Sammlungen.',
diff --git a/resources/lang/de/validation.php b/resources/lang/de/validation.php
index 629cf5e3af..ad8f01d46b 100644
--- a/resources/lang/de/validation.php
+++ b/resources/lang/de/validation.php
@@ -2,6 +2,7 @@
 
 return [
     'accepted' => 'Muss akzeptiert werden.',
+    'accepted_if' => 'Muss akzeptiert werden, wenn :other gleich :value ist.',
     'active_url' => 'Dies ist keine gültige URL.',
     'after' => 'Muss ein Datum nach dem :date sein.',
     'after_or_equal' => 'Muss ein Datum nach oder gleich dem :date sein.',
@@ -9,35 +10,44 @@
     'alpha_dash' => 'Darf nur Buchstaben, Zahlen, Bindestriche und Unterstriche enthalten.',
     'alpha_num' => 'Darf nur Buchstaben und Zahlen enthalten.',
     'array' => 'Muss ein Array sein.',
+    'ascii' => 'Darf nur alphanumerische Ein-Byte-Zeichen und Symbole enthalten.',
     'before' => 'Muss ein Datum vor dem :date sein.',
     'before_or_equal' => 'Muss ein Datum vor oder gleich dem :date sein.',
-    'between.numeric' => 'Muss zwischen :min und :max liegen.',
+    'between.array' => 'Muss zwischen :min und :max Element haben.',
     'between.file' => 'Muss zwischen :min und :max Kilobyte liegen.',
+    'between.numeric' => 'Muss zwischen :min und :max liegen.',
     'between.string' => 'Muss zwischen :min und :max Zeichen liegen.',
-    'between.array' => 'Muss zwischen :min und :max Element haben.',
     'boolean' => 'Muss wahr oder falsch sein.',
+    'can' => 'Enthält einen unzulässigen Wert.',
     'confirmed' => 'Bestätigung stimmt nicht überein.',
     'current_password' => 'Das Passwort ist falsch.',
     'date' => 'Kein gültiges Datum.',
+    'date_equals' => 'Das Datum muss gleich :date sein.',
     'date_format' => 'Entspricht nicht dem Format :format .',
+    'decimal' => 'Muss :decimal Dezimalstellen haben.',
+    'declined' => 'Muss abgelehnt werden.',
+    'declined_if' => 'Muss abgelehnt werden, wenn :other gleich :value ist.',
     'different' => 'Dieses Feld und :other müssen unterschiedlich sein.',
     'digits' => 'Muss aus :digits Ziffern bestehen.',
     'digits_between' => 'Muss zwischen den Ziffern :min und :max liegen.',
     'dimensions' => 'Ungültige Bildabmessungen.',
     'distinct' => 'Dieses Feld hat einen doppelten Wert.',
+    'doesnt_end_with' => 'Darf nicht mit einer der folgenden Angaben enden: :values.',
+    'doesnt_start_with' => 'Darf nicht mit einer der folgenden Angaben beginnen: :values.',
     'email' => 'Muss eine gültige E-Mail-Adresse sein.',
     'ends_with' => 'Muss auf :values enden',
+    'enum' => 'Das ausgewählte :attribute ist ungültig.',
     'exists' => 'Dies ist ungültig.',
     'file' => 'Muss eine Datei sein.',
     'filled' => 'Muss einen Wert haben.',
-    'gt.numeric' => 'Muss größer als :value sein.',
+    'gt.array' => 'Muss mehr als :value Elemente haben.',
     'gt.file' => 'Muss größer als :value Kilobyte sein.',
+    'gt.numeric' => 'Muss größer als :value sein.',
     'gt.string' => 'Muss größer als :value Zeichen sein.',
-    'gt.array' => 'Muss mehr als :value Elemente haben.',
-    'gte.numeric' => 'Muss größer oder gleich :value sein.',
+    'gte.array' => 'Muss :value oder mehr Elemente haben.',
     'gte.file' => 'Muss größer oder gleich :value Kilobyte sein.',
+    'gte.numeric' => 'Muss größer oder gleich :value sein.',
     'gte.string' => 'Muss größer oder gleich :value Zeichen sein.',
-    'gte.array' => 'Muss :value oder mehr Elemente haben.',
     'image' => 'Muss ein Bild sein.',
     'in' => 'Dies ist ungültig.',
     'in_array' => 'Dieses Feld existiert nicht in :other .',
@@ -47,47 +57,65 @@
     'ipv6' => 'Muss eine gültige IPv6-Adresse sein.',
     'json' => 'Muss eine gültige JSON-Zeichenfolge sein.',
     'lowercase' => 'Muss klein geschrieben sein.',
-    'lt.numeric' => 'Muss kleiner als :value sein.',
+    'lt.array' => 'Muss weniger als :value Elemente enthalten.',
     'lt.file' => 'Muss kleiner als :value Kilobyte sein.',
+    'lt.numeric' => 'Muss kleiner als :value sein.',
     'lt.string' => 'Muss aus weniger als :value Zeichen bestehen.',
-    'lt.array' => 'Muss weniger als :value Elemente enthalten.',
-    'lte.numeric' => 'Muss kleiner oder gleich :value sein.',
+    'lte.array' => 'Darf nicht mehr als :value Elemente enthalten.',
     'lte.file' => 'Muss kleiner oder gleich :value Kilobyte sein.',
+    'lte.numeric' => 'Muss kleiner oder gleich :value sein.',
     'lte.string' => 'Muss kleiner oder gleich :value Zeichen sein.',
-    'lte.array' => 'Darf nicht mehr als :value Elemente enthalten.',
-    'max.numeric' => 'Darf nicht größer als :max sein.',
+    'mac_address' => 'Muss eine gültige MAC-Adresse sein.',
+    'max.array' => 'Darf nicht mehr als :max Elemente haben.',
     'max.file' => 'Darf nicht größer als :max kilobytes sein.',
+    'max.numeric' => 'Darf nicht größer als :max sein.',
     'max.string' => 'Darf nicht mehr als :max Zeichen haben.',
-    'max.array' => 'Darf nicht mehr als :max Elemente haben.',
+    'max_digits' => 'Darf nicht mehr als :max Ziffern enthalten.',
     'mimes' => 'Muss eine Datei vom Typ :values sein.',
     'mimetypes' => 'Muss eine Datei vom Typ :values sein.',
-    'min.numeric' => 'Muss mindestens :min sein.',
+    'min.array' => 'Muss mindestens :min Elemente enthalten.',
     'min.file' => 'Muss mindestens :min Kilobyte sein.',
+    'min.numeric' => 'Muss mindestens :min sein.',
     'min.string' => 'Muss mindestens :min Zeichen haben.',
-    'min.array' => 'Muss mindestens :min Elemente enthalten.',
+    'min_digits' => 'Darf nicht weniger als :max Ziffern enthalten.',
+    'missing' => 'Muss fehlen.',
+    'missing_if' => 'Muss fehlen, wenn :other gleich :value ist.',
+    'missing_unless' => 'Muss fehlen, wenn :other nicht :value ist.',
+    'missing_with' => 'Muss fehlen, wenn :values vorhanden ist.',
+    'missing_with_all' => 'Muss fehlen, wenn :values vorhanden sind.',
+    'multiple_of' => 'Muss ein Vielfaches von :value sein.',
     'not_in' => 'Dies ist ungültig.',
     'not_regex' => 'Das Format ist ungültig.',
     'numeric' => 'Muss eine Nummer sein.',
     'present' => 'Muss vorhanden sein.',
+    'prohibited' => 'Unzulässig.',
+    'prohibited_if' => 'Unzulässig, wenn :other gleich :value ist.',
+    'prohibited_unless' => 'Unzulässig, wenn :other nicht in :values enthalten ist.',
+    'prohibits' => 'Verbietet :other die Anwesenheit.',
     'regex' => 'Das Format ist ungültig.',
     'required' => 'Dieses Feld wird benötigt.',
+    'required_array_keys' => 'Muss Einträge für :values enthalten.',
     'required_if' => 'Dieses Feld ist erforderlich, wenn :other den Wert :value hat.',
+    'required_if_accepted' => 'Dieses Feld ist erforderlich, wenn :other zugelassen ist.',
     'required_unless' => 'Dieses Feld ist erforderlich, es sei denn, :other hat den Wert :values.',
     'required_with' => 'Dieses Feld ist erforderlich, wenn :values vorhanden ist.',
     'required_with_all' => 'Dieses Feld ist erforderlich, wenn :values vorhanden ist.',
     'required_without' => 'Dieses Feld ist erforderlich, wenn keiner der :values vorhanden ist.',
     'required_without_all' => 'Dieses Feld ist erforderlich, wenn keiner der :values vorhanden ist:',
     'same' => 'Dieses Feld und :other müssen übereinstimmen.',
-    'size.numeric' => 'Muss :size sein.',
+    'size.array' => 'Muss :size Elemente enthalten.',
     'size.file' => 'Muss :size Kilobyte sein.',
+    'size.numeric' => 'Muss :size sein.',
     'size.string' => 'Muss :size Zeichen haben.',
-    'size.array' => 'Muss :size Elemente enthalten.',
     'starts_with' => 'Muss mit :values beginnen',
     'string' => 'Muss eine Zeichenfolge sein.',
     'timezone' => 'Muss eine gültige Zeitzone sein.',
     'unique' => 'Dieser Wert wurde bereits vergeben.',
     'uploaded' => 'Der Upload ist fehlgeschlagen.',
+    'uppercase' => 'Muss in Großbuchstaben geschrieben sein.',
     'url' => 'Das Format ist ungültig.',
+    'ulid' => 'Muss eine gültige ULID sein.',
+    'uuid' => 'Muss eine gültige UUID sein.',
     'unique_entry_value' => 'Dieser Wert wurde bereits vergeben.',
     'unique_term_value' => 'Dieser Wert wurde bereits vergeben.',
     'unique_user_value' => 'Dieser Wert wurde bereits vergeben.',
diff --git a/resources/lang/de_CH.json b/resources/lang/de_CH.json
index 2143cb0789..2d15b40bc4 100644
--- a/resources/lang/de_CH.json
+++ b/resources/lang/de_CH.json
@@ -137,6 +137,7 @@
     "Before": "Bevor",
     "Behavior": "Verhalten",
     "Below": "Unterhalb",
+    "Between": "Zwischen",
     "Blockquote": "Blockzitat",
     "Blueprint": "Blueprint",
     "Blueprint created": "Blueprint erstellt",
@@ -497,6 +498,7 @@
     "Inline": "Inline",
     "Inline Code": "Inline-Code",
     "Inline Label": "Inline Beschriftung",
+    "Inline Label when True": "Inline Beschriftung wenn aktiv",
     "Input Behavior": "Eingabeverhalten",
     "Input Label": "Beschriftung",
     "Input Type": "Eingabetyp",
@@ -659,6 +661,7 @@
     "Per Page": "Pro Seite",
     "Per-site": "Pro Website",
     "Permissions": "Berechtigungen",
+    "Phone": "Telefon",
     "PHP Info": "PHP Info",
     "Pick Color": "Farbe wählen",
     "Pin to Favorites": "Als Favorit speichern",
@@ -1010,6 +1013,7 @@
     "You are not authorized to view collections.": "Du bist nicht berechtigt, Sammlungen anzuzeigen.",
     "You are not authorized to view navs.": "Du bist nicht berechtigt, Navigationen anzuzeigen.",
     "You are not authorized to view this collection.": "Du bist nicht berechtigt, diese Sammlung anzuzeigen.",
+    "You are now impersonating": "Du gibst dich jetzt aus als",
     "Your Favorites": "Meine Favoriten",
     "Your working copy will be replaced by the contents of this revision.": "Deine Arbeitskopie wird durch den Inhalt dieser Überarbeitung ersetzt."
 }
diff --git a/resources/lang/de_CH/fieldtypes.php b/resources/lang/de_CH/fieldtypes.php
index fc32a71232..d091a99f03 100644
--- a/resources/lang/de_CH/fieldtypes.php
+++ b/resources/lang/de_CH/fieldtypes.php
@@ -154,8 +154,8 @@
     'slug.title' => 'Slug',
     'structures.title' => 'Strukturen',
     'table.title' => 'Tabelle',
-    'taggable.title' => 'Tags',
     'taggable.config.placeholder' => 'Tippen und ↩ Enter drücken',
+    'taggable.title' => 'Tags',
     'taxonomies.title' => 'Taxonomien',
     'template.config.blueprint' => 'Fügt die Option «Korrespondiert mit Blueprint» hinzu. Erfahre mehr in der [Dokumentation](https://statamic.dev/views#inferring-templates-from-entry-blueprints).',
     'template.config.folder' => 'Nur Templates aus diesem Ordner anzeigen.',
@@ -175,7 +175,8 @@
     'textarea.title' => 'Textbereich',
     'time.config.seconds_enabled' => 'Sekunden im Timepicker anzeigen.',
     'time.title' => 'Zeit',
-    'toggle.config.inline_label' => 'Inline-Beschriftung festlegen, welche neben dem Schalter angezeigt werden soll.',
+    'toggle.config.inline_label' => 'Eine Inline-Beschriftung festlegen, die neben dem Schalter angezeigt wird.',
+    'toggle.config.inline_label_when_true' => 'Eine Inline-Beschriftung festlegen, die neben dem Schalter angezeigt wird, wenn der Wert true ist.',
     'toggle.title' => 'Schalter',
     'user_groups.title' => 'Benutzergruppen',
     'user_roles.title' => 'Benutzerrollen',
diff --git a/resources/lang/de_CH/messages.php b/resources/lang/de_CH/messages.php
index 2a1bb20b29..d1b7e43300 100644
--- a/resources/lang/de_CH/messages.php
+++ b/resources/lang/de_CH/messages.php
@@ -81,7 +81,7 @@
     'field_validation_required_instructions' => 'Steuert, ob dieses Feld erforderlich ist oder nicht.',
     'field_validation_sometimes_instructions' => 'Dieses Feld wird nur validiert, wenn es sichtbar ist oder abgeschickt wird.',
     'fields_blueprints_description' => 'Blueprints definieren die Felder für den inhaltlichen Aufbau von Sammlungen, Taxonomien, Benutzer:innen und Formularen.',
-    'fields_default_instructions' => 'Standardwert festlegen.',
+    'fields_default_instructions' => 'Diesen Wert immer dann einfügen, wenn das Feld in einem Veröffentlichungsformular leer ist.',
     'fields_display_instructions' => 'Name des Feldes im Control Panel.',
     'fields_duplicate_instructions' => 'Soll dieses Feld beim Duplizieren des Eintrags berücksichtigt werden?',
     'fields_fieldsets_description' => 'Fieldsets sind einfache, flexible und völlig optionale Gruppen von Feldern, mit deren Hilfe wiederverwendbare, vorkonfigurierte Blöcke organisiert werden können.',
diff --git a/resources/lang/de_CH/permissions.php b/resources/lang/de_CH/permissions.php
index 56f790409b..166b65b5aa 100644
--- a/resources/lang/de_CH/permissions.php
+++ b/resources/lang/de_CH/permissions.php
@@ -12,6 +12,8 @@
     'configure_addons_desc' => 'Ermöglicht den Zugriff auf den Addon-Bereich zum Installieren und Deinstallieren von Addons.',
     'manage_preferences' => 'Voreinstellungen verwalten',
     'manage_preferences_desc' => 'Ermöglicht globale und rollenspezifische Voreinstellungen anzupassen.',
+    'group_sites' => 'Websites',
+    'access_{site}_site' => 'Zugriff auf :site',
     'group_collections' => 'Sammlungen',
     'configure_collections' => 'Sammlungen konfigurieren',
     'configure_collections_desc' => 'Gewährt Zugriff auf alle Berechtigungen im Zusammenhang mit Sammlungen.',
diff --git a/resources/lang/de_CH/validation.php b/resources/lang/de_CH/validation.php
index b7c836ac79..df664d270b 100644
--- a/resources/lang/de_CH/validation.php
+++ b/resources/lang/de_CH/validation.php
@@ -2,6 +2,7 @@
 
 return [
     'accepted' => 'Muss akzeptiert werden.',
+    'accepted_if' => 'Muss akzeptiert werden, wenn :other gleich :value ist.',
     'active_url' => 'Dies ist keine gültige URL.',
     'after' => 'Muss ein Datum nach dem :date sein.',
     'after_or_equal' => 'Muss ein Datum nach oder gleich dem :date sein.',
@@ -9,35 +10,44 @@
     'alpha_dash' => 'Darf nur Buchstaben, Zahlen, Bindestriche und Unterstriche enthalten.',
     'alpha_num' => 'Darf nur Buchstaben und Zahlen enthalten.',
     'array' => 'Muss ein Array sein.',
+    'ascii' => 'Darf nur alphanumerische Ein-Byte-Zeichen und Symbole enthalten.',
     'before' => 'Muss ein Datum vor dem :date sein.',
     'before_or_equal' => 'Muss ein Datum vor oder gleich dem :date sein.',
-    'between.numeric' => 'Muss zwischen :min und :max liegen.',
+    'between.array' => 'Muss zwischen :min und :max Element haben.',
     'between.file' => 'Muss zwischen :min und :max Kilobyte liegen.',
+    'between.numeric' => 'Muss zwischen :min und :max liegen.',
     'between.string' => 'Muss zwischen :min und :max Zeichen liegen.',
-    'between.array' => 'Muss zwischen :min und :max Element haben.',
     'boolean' => 'Muss wahr oder falsch sein.',
+    'can' => 'Enthält einen unzulässigen Wert.',
     'confirmed' => 'Bestätigung stimmt nicht überein.',
     'current_password' => 'Das Passwort ist falsch.',
     'date' => 'Kein gültiges Datum.',
+    'date_equals' => 'Das Datum muss gleich :date sein.',
     'date_format' => 'Entspricht nicht dem Format :format .',
+    'decimal' => 'Muss :decimal Dezimalstellen haben.',
+    'declined' => 'Muss abgelehnt werden.',
+    'declined_if' => 'Muss abgelehnt werden, wenn :other gleich :value ist.',
     'different' => 'Dieses Feld und :other müssen unterschiedlich sein.',
     'digits' => 'Muss aus :digits Ziffern bestehen.',
     'digits_between' => 'Muss zwischen den Ziffern :min und :max liegen.',
     'dimensions' => 'Ungültige Bildabmessungen.',
     'distinct' => 'Dieses Feld hat einen doppelten Wert.',
+    'doesnt_end_with' => 'Darf nicht mit einer der folgenden Angaben enden: :values.',
+    'doesnt_start_with' => 'Darf nicht mit einer der folgenden Angaben beginnen: :values.',
     'email' => 'Muss eine gültige E-Mail-Adresse sein.',
     'ends_with' => 'Muss auf :values enden',
+    'enum' => 'Das ausgewählte :attribute ist ungültig.',
     'exists' => 'Dies ist ungültig.',
     'file' => 'Muss eine Datei sein.',
     'filled' => 'Muss einen Wert haben.',
-    'gt.numeric' => 'Muss grösser als :value sein.',
+    'gt.array' => 'Muss mehr als :value Elemente haben.',
     'gt.file' => 'Muss grösser als :value Kilobyte sein.',
+    'gt.numeric' => 'Muss grösser als :value sein.',
     'gt.string' => 'Muss grösser als :value Zeichen sein.',
-    'gt.array' => 'Muss mehr als :value Elemente haben.',
-    'gte.numeric' => 'Muss grösser oder gleich :value sein.',
+    'gte.array' => 'Muss :value oder mehr Elemente haben.',
     'gte.file' => 'Muss grösser oder gleich :value Kilobyte sein.',
+    'gte.numeric' => 'Muss grösser oder gleich :value sein.',
     'gte.string' => 'Muss grösser oder gleich :value Zeichen sein.',
-    'gte.array' => 'Muss :value oder mehr Elemente haben.',
     'image' => 'Muss ein Bild sein.',
     'in' => 'Dies ist ungültig.',
     'in_array' => 'Dieses Feld existiert nicht in :other .',
@@ -47,47 +57,65 @@
     'ipv6' => 'Muss eine gültige IPv6-Adresse sein.',
     'json' => 'Muss eine gültige JSON-Zeichenfolge sein.',
     'lowercase' => 'Muss klein geschrieben sein.',
-    'lt.numeric' => 'Muss kleiner als :value sein.',
+    'lt.array' => 'Muss weniger als :value Elemente enthalten.',
     'lt.file' => 'Muss kleiner als :value Kilobyte sein.',
+    'lt.numeric' => 'Muss kleiner als :value sein.',
     'lt.string' => 'Muss aus weniger als :value Zeichen bestehen.',
-    'lt.array' => 'Muss weniger als :value Elemente enthalten.',
-    'lte.numeric' => 'Muss kleiner oder gleich :value sein.',
+    'lte.array' => 'Darf nicht mehr als :value Elemente enthalten.',
     'lte.file' => 'Muss kleiner oder gleich :value Kilobyte sein.',
+    'lte.numeric' => 'Muss kleiner oder gleich :value sein.',
     'lte.string' => 'Muss kleiner oder gleich :value Zeichen sein.',
-    'lte.array' => 'Darf nicht mehr als :value Elemente enthalten.',
-    'max.numeric' => 'Darf nicht grösser als :max sein.',
+    'mac_address' => 'Muss eine gültige MAC-Adresse sein.',
+    'max.array' => 'Darf nicht mehr als :max Elemente haben.',
     'max.file' => 'Darf nicht grösser als :max kilobytes sein.',
+    'max.numeric' => 'Darf nicht grösser als :max sein.',
     'max.string' => 'Darf nicht mehr als :max Zeichen haben.',
-    'max.array' => 'Darf nicht mehr als :max Elemente haben.',
+    'max_digits' => 'Darf nicht mehr als :max Ziffern enthalten.',
     'mimes' => 'Muss eine Datei vom Typ :values sein.',
     'mimetypes' => 'Muss eine Datei vom Typ :values sein.',
-    'min.numeric' => 'Muss mindestens :min sein.',
+    'min.array' => 'Muss mindestens :min Elemente enthalten.',
     'min.file' => 'Muss mindestens :min Kilobyte sein.',
+    'min.numeric' => 'Muss mindestens :min sein.',
     'min.string' => 'Muss mindestens :min Zeichen haben.',
-    'min.array' => 'Muss mindestens :min Elemente enthalten.',
+    'min_digits' => 'Darf nicht weniger als :max Ziffern enthalten.',
+    'missing' => 'Muss fehlen.',
+    'missing_if' => 'Muss fehlen, wenn :other gleich :value ist.',
+    'missing_unless' => 'Muss fehlen, wenn :other nicht :value ist.',
+    'missing_with' => 'Muss fehlen, wenn :values vorhanden ist.',
+    'missing_with_all' => 'Muss fehlen, wenn :values vorhanden sind.',
+    'multiple_of' => 'Muss ein Vielfaches von :value sein.',
     'not_in' => 'Dies ist ungültig.',
     'not_regex' => 'Das Format ist ungültig.',
     'numeric' => 'Muss eine Nummer sein.',
     'present' => 'Muss vorhanden sein.',
+    'prohibited' => 'Unzulässig.',
+    'prohibited_if' => 'Unzulässig, wenn :other gleich :value ist.',
+    'prohibited_unless' => 'Unzulässig, wenn :other nicht in :values enthalten ist.',
+    'prohibits' => 'Verbietet :other die Anwesenheit.',
     'regex' => 'Das Format ist ungültig.',
     'required' => 'Dieses Feld wird benötigt.',
+    'required_array_keys' => 'Muss Einträge für :values enthalten.',
     'required_if' => 'Dieses Feld ist erforderlich, wenn :other den Wert :value hat.',
+    'required_if_accepted' => 'Dieses Feld ist erforderlich, wenn :other zugelassen ist.',
     'required_unless' => 'Dieses Feld ist erforderlich, es sei denn, :other hat den Wert :values.',
     'required_with' => 'Dieses Feld ist erforderlich, wenn :values vorhanden ist.',
     'required_with_all' => 'Dieses Feld ist erforderlich, wenn :values vorhanden ist.',
     'required_without' => 'Dieses Feld ist erforderlich, wenn keiner der :values vorhanden ist.',
     'required_without_all' => 'Dieses Feld ist erforderlich, wenn keiner der :values vorhanden ist:',
     'same' => 'Dieses Feld und :other müssen übereinstimmen.',
-    'size.numeric' => 'Muss :size sein.',
+    'size.array' => 'Muss :size Elemente enthalten.',
     'size.file' => 'Muss :size Kilobyte sein.',
+    'size.numeric' => 'Muss :size sein.',
     'size.string' => 'Muss :size Zeichen haben.',
-    'size.array' => 'Muss :size Elemente enthalten.',
     'starts_with' => 'Muss mit :values beginnen',
     'string' => 'Muss eine Zeichenfolge sein.',
     'timezone' => 'Muss eine gültige Zeitzone sein.',
     'unique' => 'Dieser Wert wurde bereits vergeben.',
     'uploaded' => 'Der Upload ist fehlgeschlagen.',
+    'uppercase' => 'Muss in Grossbuchstaben geschrieben sein.',
     'url' => 'Das Format ist ungültig.',
+    'ulid' => 'Muss eine gültige ULID sein.',
+    'uuid' => 'Muss eine gültige UUID sein.',
     'unique_entry_value' => 'Dieser Wert wurde bereits vergeben.',
     'unique_term_value' => 'Dieser Wert wurde bereits vergeben.',
     'unique_user_value' => 'Dieser Wert wurde bereits vergeben.',

From 497b845256ddb21193de2ef43ae053a4e63c48df Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Wed, 18 Oct 2023 15:51:05 +0100
Subject: [PATCH 26/36] [4.x] Add config to enable frontend route binding and
 support binding by field (#8853)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 config/routes.php                      |  13 +
 src/Providers/RouteServiceProvider.php | 300 ++++++--
 tests/Routing/RouteBindingTest.php     | 974 +++++++++++++++++++++++++
 tests/Routing/RoutesTest.php           |  63 ++
 4 files changed, 1304 insertions(+), 46 deletions(-)
 create mode 100644 tests/Routing/RouteBindingTest.php

diff --git a/config/routes.php b/config/routes.php
index aa40a8b16b..95a6427684 100644
--- a/config/routes.php
+++ b/config/routes.php
@@ -16,6 +16,19 @@
 
     'enabled' => true,
 
+    /*
+    |--------------------------------------------------------------------------
+    | Enable Route Bindings
+    |--------------------------------------------------------------------------
+    |
+    | Whether route bindings for Statamic repositories (entry, taxonomy,
+    | collections, etc) are enabled for front end routes. This may be
+    | useful if you want to make your own custom routes with them.
+    |
+    */
+
+    'bindings' => false,
+
     /*
     |--------------------------------------------------------------------------
     | Action Route Prefix
diff --git a/src/Providers/RouteServiceProvider.php b/src/Providers/RouteServiceProvider.php
index 551fe06a92..224e5ab5ee 100644
--- a/src/Providers/RouteServiceProvider.php
+++ b/src/Providers/RouteServiceProvider.php
@@ -2,7 +2,8 @@
 
 namespace Statamic\Providers;
 
-use Illuminate\Support\Facades\Route;
+use Illuminate\Routing\Route;
+use Illuminate\Support\Facades\Route as Routes;
 use Illuminate\Support\ServiceProvider;
 use Statamic\Exceptions\NotFoundHttpException;
 use Statamic\Facades\Asset;
@@ -29,7 +30,7 @@ public function register()
 
     public function boot()
     {
-        Route::mixin(new Router);
+        Routes::mixin(new Router);
 
         $this->bindCollections();
         $this->bindEntries();
@@ -45,13 +46,19 @@ public function boot()
 
     protected function bindCollections()
     {
-        Route::bind('collection', function ($handle, $route = null) {
-            if (! $this->isCpOrApiRoute($route)) {
+        Routes::bind('collection', function ($handle, $route = null) {
+            if (! $this->needsCollectionBinding($route)) {
                 return $handle;
             }
 
+            $field = $route->bindingFieldFor('collection') ?? 'handle';
+
+            $collection = $field == 'handle'
+                ? Collection::findByHandle($handle)
+                : Collection::all()->firstWhere($field, $handle);
+
             throw_unless(
-                $collection = Collection::findByHandle($handle),
+                $collection,
                 new NotFoundHttpException("Collection [$handle] not found.")
             );
 
@@ -59,15 +66,32 @@ protected function bindCollections()
         });
     }
 
+    private function needsCollectionBinding(?Route $route): bool
+    {
+        if (! $route) {
+            return false;
+        }
+
+        return $this->isCpOrApiRoute($route) || $this->isFrontendBindingEnabled();
+    }
+
     protected function bindEntries()
     {
-        Route::bind('entry', function ($handle, $route = null) {
-            if ($this->isApiRoute($route) || ! $this->isCpRoute($route)) {
+        Routes::bind('entry', function ($handle, $route = null) {
+            if (! $this->needsEntryBinding($route)) {
                 return $handle;
             }
 
+            $field = $route->bindingFieldFor('entry') ?? 'id';
+
+            $entry = $field == 'id'
+                ? Entry::find($handle)
+                : Entry::query()->where($field, $handle)->first();
+
+            $collection = $route->parameter('collection');
+
             throw_if(
-                ! ($entry = Entry::find($handle)) || $entry->collection()->id() !== $route->parameter('collection')->id(),
+                ! $entry || ($collection && $entry->collection()->id() !== $collection->id()),
                 new NotFoundHttpException("Entry [$handle] not found.")
             );
 
@@ -75,15 +99,38 @@ protected function bindEntries()
         });
     }
 
+    private function needsEntryBinding(?Route $route): bool
+    {
+        if (! $route) {
+            return false;
+        }
+
+        if ($this->isCpRoute($route)) {
+            return true;
+        }
+
+        if ($this->isApiRoute($route)) {
+            return false;
+        }
+
+        return $this->isFrontendBindingEnabled();
+    }
+
     protected function bindTaxonomies()
     {
-        Route::bind('taxonomy', function ($handle, $route = null) {
-            if (! $this->isCpOrApiRoute($route)) {
+        Routes::bind('taxonomy', function ($handle, $route = null) {
+            if (! $this->needsTaxonomyBinding($route)) {
                 return $handle;
             }
 
+            $field = $route->bindingFieldFor('taxonomy') ?? 'handle';
+
+            $taxonomy = $field == 'handle'
+                ? Taxonomy::findByHandle($handle)
+                : Taxonomy::all()->firstWhere($field, $handle);
+
             throw_unless(
-                $taxonomy = Taxonomy::findByHandle($handle),
+                $taxonomy,
                 new NotFoundHttpException("Taxonomy [$handle] not found.")
             );
 
@@ -91,18 +138,46 @@ protected function bindTaxonomies()
         });
     }
 
+    private function needsTaxonomyBinding(?Route $route): bool
+    {
+        if (! $route) {
+            return false;
+        }
+
+        if ($this->isCpOrApiRoute($route)) {
+            return true;
+        }
+
+        return $this->isFrontendBindingEnabled();
+    }
+
     protected function bindTerms()
     {
-        Route::bind('term', function ($handle, $route = null) {
-            if ($this->isApiRoute($route) || ! $this->isCpRoute($route)) {
+        Routes::bind('term', function ($handle, $route = null) {
+            if (! $this->needsTermBinding($route)) {
                 return $handle;
             }
 
-            $id = $route->parameter('taxonomy')->handle().'::'.$handle;
+            $field = $route->bindingFieldFor('term') ?? 'id';
+
+            $taxonomy = $route->parameter('taxonomy');
+
+            if ($field == 'id' && $taxonomy) {
+                $handle = $taxonomy->handle().'::'.$handle;
+            }
+
             $site = $route->parameter('site') ?? Site::default()->handle();
 
+            $term = $field == 'id'
+                ? Term::find($handle)?->in($site)
+                : Term::query()
+                    ->where($field, $handle)
+                    ->where('site', $site)
+                    ->when($taxonomy, fn ($query) => $query->where('taxonomy', $taxonomy->handle()))
+                    ->first();
+
             throw_unless(
-                ($term = Term::find($id)->in($site)) && $term->taxonomy()->id() === $route->parameter('taxonomy')->id(),
+                $term || ($term && $taxonomy && $term->taxonomy()->id() === $taxonomy->id()),
                 new NotFoundHttpException("Taxonomy term [$handle] not found.")
             );
 
@@ -110,15 +185,38 @@ protected function bindTerms()
         });
     }
 
+    private function needsTermBinding(?Route $route): bool
+    {
+        if (! $route) {
+            return false;
+        }
+
+        if ($this->isCpRoute($route)) {
+            return true;
+        }
+
+        if ($this->isApiRoute($route)) {
+            return false;
+        }
+
+        return $this->isFrontendBindingEnabled();
+    }
+
     protected function bindAssetContainers()
     {
-        Route::bind('asset_container', function ($handle, $route = null) {
-            if (! $this->isCpOrApiRoute($route)) {
+        Routes::bind('asset_container', function ($handle, $route = null) {
+            if (! $this->needsAssetContainerBinding($route)) {
                 return $handle;
             }
 
+            $field = $route->bindingFieldFor('asset_container') ?? 'handle';
+
+            $container = $field == 'handle'
+                ? AssetContainer::findByHandle($handle)
+                : AssetContainer::all()->firstWhere($field, $handle);
+
             throw_unless(
-                $container = AssetContainer::findByHandle($handle),
+                $container,
                 new NotFoundHttpException("Asset container [$handle] not found.")
             );
 
@@ -126,17 +224,40 @@ protected function bindAssetContainers()
         });
     }
 
+    private function needsAssetContainerBinding(?Route $route): bool
+    {
+        if (! $route) {
+            return false;
+        }
+
+        if ($this->isCpOrApiRoute($route)) {
+            return true;
+        }
+
+        return $this->isFrontendBindingEnabled();
+    }
+
     protected function bindAssets()
     {
-        Route::bind('asset', function ($handle, $route = null) {
-            if (! $this->isCpOrApiRoute($route)) {
+        Routes::bind('asset', function ($handle, $route = null) {
+            if (! $this->needsAssetBinding($route)) {
                 return $handle;
             }
 
-            $id = $route->parameter('asset_container')->handle().'::'.$handle;
+            $field = $route->bindingFieldFor('asset') ?? 'id';
+
+            $container = $route->parameter('asset_container');
+
+            if ($field == 'id') {
+                $handle = $container->handle().'::'.$handle;
+            }
+
+            $asset = $field == 'id'
+                ? Asset::find($handle)
+                : $container->queryAssets()->where($field, $handle)->first();
 
             throw_unless(
-                $asset = Asset::find($id),
+                $asset,
                 new NotFoundHttpException("Asset [$handle] not found.")
             );
 
@@ -144,17 +265,36 @@ protected function bindAssets()
         });
     }
 
+    private function needsAssetBinding(?Route $route): bool
+    {
+        if (! $route) {
+            return false;
+        }
+
+        if ($this->isCpOrApiRoute($route)) {
+            return true;
+        }
+
+        return $this->isFrontendBindingEnabled();
+    }
+
     protected function bindGlobalSets()
     {
-        Route::bind('global', function ($handle, $route = null) {
-            if (! $this->isCpOrApiRoute($route)) {
+        Routes::bind('global', function ($handle, $route = null) {
+            if (! $this->needsGlobalsBinding($route)) {
                 return $handle;
             }
 
+            $field = $route->bindingFieldFor('global') ?? 'handle';
+
+            $global = $field == 'handle'
+                ? GlobalSet::findByHandle($handle)
+                : GlobalSet::all()->first(fn ($set) => $set->$field($handle));
+
             $site = Site::default()->handle();
 
             throw_unless(
-                $globalSet = GlobalSet::findByHandle($handle)->in($site),
+                $globalSet = $global?->in($site),
                 new NotFoundHttpException("Global set [$handle] not found.")
             );
 
@@ -162,15 +302,34 @@ protected function bindGlobalSets()
         });
     }
 
+    private function needsGlobalsBinding(?Route $route): bool
+    {
+        if (! $route) {
+            return false;
+        }
+
+        if ($this->isCpOrApiRoute($route)) {
+            return true;
+        }
+
+        return $this->isFrontendBindingEnabled();
+    }
+
     protected function bindSites()
     {
-        Route::bind('site', function ($handle, $route = null) {
-            if (! $this->isCpOrApiRoute($route)) {
+        Routes::bind('site', function ($handle, $route = null) {
+            if (! $this->needsSiteBinding($route)) {
                 return $handle;
             }
 
+            $field = $route->bindingFieldFor('site') ?? 'handle';
+
+            $site = $field == 'handle'
+                ? Site::get($handle)
+                : Site::all()->firstWhere($field, $handle);
+
             throw_unless(
-                $site = Site::get($handle),
+                $site,
                 new NotFoundHttpException("Site [$handle] not found.")
             );
 
@@ -178,10 +337,23 @@ protected function bindSites()
         });
     }
 
+    private function needsSiteBinding(?Route $route): bool
+    {
+        if (! $route) {
+            return false;
+        }
+
+        if ($this->isCpOrApiRoute($route)) {
+            return true;
+        }
+
+        return $this->isFrontendBindingEnabled();
+    }
+
     protected function bindRevisions()
     {
-        Route::bind('revision', function ($reference, $route = null) {
-            if (! $this->isCpOrApiRoute($route)) {
+        Routes::bind('revision', function ($reference, $route = null) {
+            if (! $this->needsRevisionBinding($route)) {
                 return $reference;
             }
 
@@ -202,16 +374,38 @@ protected function bindRevisions()
         });
     }
 
+    private function needsRevisionBinding(?Route $route): bool
+    {
+        if (! $route) {
+            return false;
+        }
+
+        if ($this->isCpRoute($route)) {
+            return true;
+        }
+
+        if ($this->isApiRoute($route)) {
+            return false;
+        }
+
+        return $this->isFrontendBindingEnabled();
+    }
+
     protected function bindForms()
     {
-        Route::bind('form', function ($handle, $route = null) {
-            if (! $this->isCpOrApiRoute($route)
-                && ! Str::startsWith($route->uri(), config('statamic.routes.action').'/forms/')) {
+        Routes::bind('form', function ($handle, $route = null) {
+            if (! $this->needsFormBinding($route)) {
                 return $handle;
             }
 
+            $field = $route->bindingFieldFor('form') ?? 'handle';
+
+            $form = $field == 'handle'
+                ? Form::find($handle)
+                : Form::all()->firstWhere($field, $handle);
+
             throw_unless(
-                $form = Form::find($handle),
+                $form,
                 new NotFoundHttpException("Form [$handle] not found.")
             );
 
@@ -219,12 +413,34 @@ protected function bindForms()
         });
     }
 
-    private function isApiRoute(\Illuminate\Routing\Route $route = null)
+    private function needsFormBinding(?Route $route): bool
     {
-        if (is_null($route)) {
+        if (! $route) {
             return false;
         }
 
+        if ($this->isCpOrApiRoute($route)) {
+            return true;
+        }
+
+        if ($this->isFrontendBindingEnabled()) {
+            return true;
+        }
+
+        if ($route) {
+            return Str::startsWith($route->uri(), config('statamic.routes.action').'/forms/');
+        }
+
+        return false;
+    }
+
+    private function isFrontendBindingEnabled()
+    {
+        return config('statamic.routes.bindings', false);
+    }
+
+    private function isApiRoute(Route $route)
+    {
         $api = Str::ensureRight(config('statamic.api.route'), '/');
 
         if ($api === '/') {
@@ -234,12 +450,8 @@ private function isApiRoute(\Illuminate\Routing\Route $route = null)
         return Str::startsWith($route->uri(), $api);
     }
 
-    private function isCpRoute(\Illuminate\Routing\Route $route = null)
+    private function isCpRoute(Route $route)
     {
-        if (is_null($route)) {
-            return false;
-        }
-
         $cp = Str::ensureRight(config('statamic.cp.route'), '/');
 
         if ($cp === '/') {
@@ -249,12 +461,8 @@ private function isCpRoute(\Illuminate\Routing\Route $route = null)
         return Str::startsWith($route->uri(), $cp);
     }
 
-    private function isCpOrApiRoute(\Illuminate\Routing\Route $route = null)
+    private function isCpOrApiRoute(Route $route)
     {
-        if (is_null($route)) {
-            return false;
-        }
-
         return $this->isCpRoute($route) || $this->isApiRoute($route);
     }
 }
diff --git a/tests/Routing/RouteBindingTest.php b/tests/Routing/RouteBindingTest.php
new file mode 100644
index 0000000000..bdc4d721e9
--- /dev/null
+++ b/tests/Routing/RouteBindingTest.php
@@ -0,0 +1,974 @@
+<?php
+
+use Facades\Tests\Factories\EntryFactory;
+use Illuminate\Contracts\Routing\BindingRegistrar;
+use Illuminate\Routing\Middleware\SubstituteBindings;
+use Illuminate\Support\Facades\Route;
+use Illuminate\Support\Facades\Storage;
+use Statamic\Contracts\Assets\Asset;
+use Statamic\Contracts\Assets\AssetContainer;
+use Statamic\Contracts\Entries\Collection;
+use Statamic\Contracts\Entries\Entry;
+use Statamic\Contracts\Forms\Form;
+use Statamic\Contracts\Globals\Variables;
+use Statamic\Contracts\Revisions\Revision;
+use Statamic\Contracts\Taxonomies\Taxonomy;
+use Statamic\Contracts\Taxonomies\Term;
+use Statamic\Facades;
+use Statamic\Sites\Site;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class RouteBindingTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    private $route;
+
+    protected function resolveApplicationConfiguration($app)
+    {
+        parent::resolveApplicationConfiguration($app);
+
+        $app->booted(function () {
+            Route::middleware(SubstituteBindings::class)->group(function () {
+                collect([
+                    // entries and collections
+                    'cp/custom/collections/{collection}',
+                    'cp/custom/collections/{collection}/entries/{entry}',
+                    'api/custom/collections/{collection}',
+                    'api/custom/collections/{collection}/entries/{entry}',
+                    'custom/collections/title/{collection:title}',
+                    'custom/collections/{collection}',
+                    'custom/entries/slug/{entry:slug}',
+                    'custom/entries/{entry}',
+                    'custom/collections/{collection}/entries/{entry}',
+
+                    // terms and taxonomies
+                    'cp/custom/taxonomies/{taxonomy}',
+                    'cp/custom/taxonomies/{taxonomy}/terms/{term}',
+                    'api/custom/taxonomies/{taxonomy}',
+                    'api/custom/taxonomies/{taxonomy}/terms/{term}',
+                    'custom/taxonomies/title/{taxonomy:title}',
+                    'custom/taxonomies/{taxonomy}',
+                    'custom/terms/slug/{term:slug}',
+                    'custom/terms/{term}',
+                    'custom/taxonomies/{taxonomy}/terms/{term}',
+
+                    // assets and containers (more below)
+                    'cp/custom/containers/{asset_container}',
+                    'api/custom/containers/{asset_container}',
+                    'custom/containers/title/{asset_container:title}',
+                    'custom/containers/{asset_container}',
+                    'custom/assets/alt/{asset_container}/assets/{asset:alt}',
+
+                    // globals
+                    'cp/custom/globals/{global}',
+                    'api/custom/globals/{global}',
+                    'custom/globals/title/{global:title}',
+                    'custom/globals/{global}',
+
+                    // sites
+                    'cp/custom/sites/{site}',
+                    'api/custom/sites/{site}',
+                    'custom/sites/locale/{site:locale}',
+                    'custom/sites/{site}',
+
+                    // revisions
+                    'cp/custom/entries/{collection}/{entry}/revisions/{revision}',
+                    'cp/custom/terms/{taxonomy}/{term}/revisions/{revision}',
+                    'cp/custom/revisions/{revision}',
+                    'api/custom/entries/{collection}/{entry}/revisions/{revision}',
+                    'api/custom/terms/{taxonomy}/{term}/revisions/{revision}',
+                    'api/custom/revisions/{revision}',
+                    'custom/entries/{collection}/{entry}/revisions/{revision}',
+                    'custom/terms/{taxonomy}/{term}/revisions/{revision}',
+                    'custom/revisions/{revision}',
+
+                    // forms
+                    'cp/custom/forms/{form}',
+                    'api/custom/forms/{form}',
+                    'custom/forms/title/{form:title}',
+                    'custom/forms/{form}',
+                ])->each(fn ($uri) => Route::get($uri, fn () => $this->route()));
+
+                // assets are special because they have a path
+                Route::get('cp/custom/assets/{asset_container}/assets/{asset}', fn () => $this->route())->where('asset', '.*');
+                Route::get('api/custom/assets/{asset_container}/assets/{asset}', fn () => $this->route())->where('asset', '.*');
+                Route::get('custom/assets/{asset_container}/assets/{asset}', fn () => $this->route())->where('asset', '.*');
+            });
+        });
+    }
+
+    private function route()
+    {
+        $this->route = request()->route();
+    }
+
+    public function bindingsEnabled($app)
+    {
+        $app['config']->set('statamic.routes.bindings', true);
+    }
+
+    public function bindingsDisabled($app)
+    {
+        $app['config']->set('statamic.routes.bindings', false);
+    }
+
+    /**
+     * @test
+     *
+     * @define-env bindingsEnabled
+     *
+     * @dataProvider statamicRouteProvider
+     */
+    public function binds_route_parameters_in_statamic_routes(
+        $uri,
+        $expectationCallback = null
+    ) {
+        $this->setupContent();
+
+        $response = $this->get($uri);
+
+        if ($expectationCallback) {
+            $response->assertOk();
+            $this->assertTrue($expectationCallback(...$this->route->parameters()));
+        } else {
+            $response->assertNotFound();
+        }
+    }
+
+    /**
+     * @test
+     *
+     * @define-env bindingsDisabled
+     *
+     * @dataProvider statamicRouteProvider
+     */
+    public function binds_route_parameters_in_statamic_routes_with_bindings_disabled(
+        $uri,
+        $expectationCallback = null
+    ) {
+        $this->setupContent();
+
+        $response = $this->get($uri);
+
+        if ($expectationCallback) {
+            $response->assertOk();
+            $this->assertTrue($expectationCallback(...$this->route->parameters()));
+        } else {
+            $response->assertNotFound();
+        }
+    }
+
+    /**
+     * @test
+     *
+     * @define-env bindingsEnabled
+     *
+     * @dataProvider frontendRouteProvider
+     */
+    public function binds_route_parameters_in_frontend_routes(
+        $uri,
+        Closure $enabledCallback = null,
+        Closure $disabledCallback = null,
+    ) {
+        $this->setupContent();
+
+        $response = $this->get($uri);
+
+        if ($enabledCallback) {
+            $response->assertOk();
+            $this->assertTrue($enabledCallback(...$this->route->parameters()));
+        } else {
+            $response->assertNotFound();
+        }
+    }
+
+    /**
+     * @test
+     *
+     * @define-env bindingsDisabled
+     *
+     * @dataProvider frontendRouteProvider
+     */
+    public function binds_route_parameters_in_frontend_routes_with_bindings_disabled(
+        $uri,
+        Closure $enabledCallback = null,
+        Closure $disabledCallback = null,
+    ) {
+        $this->setupContent();
+
+        $response = $this->get($uri);
+
+        if ($disabledCallback) {
+            $response->assertOk();
+            $this->assertTrue($disabledCallback(...$this->route->parameters()));
+        } else {
+            $response->assertNotFound();
+        }
+    }
+
+    private function setupContent()
+    {
+        Facades\Collection::make('blog')->title('The Blog')->save();
+        $entry = EntryFactory::id('123')->slug('alfa')->collection('blog')->create();
+        $entryRevision = $entry->makeRevision()->id('1');
+        Facades\Revision::shouldReceive('whereKey')->with('collections/blog/en/123')->andReturn(collect(['1' => $entryRevision]));
+
+        Facades\Taxonomy::make('tags')->title('Product Tags')->save();
+        $term = tap(Facades\Term::make()->taxonomy('tags')->inDefaultLocale()->slug('bravo')->data([]))->save();
+        $termRevision = $term->inDefaultLocale()->makeRevision()->id('2');
+        Facades\Revision::shouldReceive('whereKey')->with('taxonomies/tags/en/bravo')->andReturn(collect(['2' => $termRevision]));
+
+        Facades\AssetContainer::make('files')->disk('files')->title('The Files')->save();
+        Storage::fake('files');
+        Storage::disk('files')->put('foo/bar.txt', '');
+        Storage::disk('files')->put('foo/.meta/bar.txt.yaml', "data:\n  alt: 'the alt text'");
+
+        $set = Facades\GlobalSet::make('seo')->title('SEO Settings');
+        $set->addLocalization($set->makeLocalization('en'));
+        $set->save();
+
+        Facades\Form::make('contact')->title('Contact Us')->save();
+    }
+
+    public function statamicRouteProvider()
+    {
+
+        return [
+
+            // entries and collections
+
+            'cp collection' => [
+                'cp/custom/collections/blog',
+                function (Collection $collection) {
+                    return $collection->handle() === 'blog';
+                },
+            ],
+
+            'cp missing collection' => [
+                'cp/custom/collections/invalid',
+            ],
+
+            'api collection' => [
+                'api/custom/collections/blog',
+                function (Collection $collection) {
+                    return $collection->handle() === 'blog';
+                },
+            ],
+
+            'api missing collection' => [
+                'api/custom/collections/invalid',
+            ],
+
+            'cp collection and entry' => [
+                'cp/custom/collections/blog/entries/123',
+                function (Collection $collection, Entry $entry) {
+                    return $collection->handle() === 'blog' && $entry->id() === '123';
+                },
+            ],
+
+            'cp missing collection and entry' => [
+                'cp/custom/collections/invalid/entries/123',
+            ],
+
+            'cp collection and missing entry' => [
+                'cp/custom/collections/blog/entries/invalid',
+            ],
+
+            'api collection and entry' => [
+                'api/custom/collections/blog/entries/123',
+                function (Collection $collection, string $entry) {
+                    return $collection->handle() === 'blog' && $entry === '123';
+                },
+            ],
+
+            'api missing collection and entry' => [
+                'api/custom/collections/invalid/entries/123',
+            ],
+
+            'api collection and missing entry' => [
+                'api/custom/collections/blog/entries/invalid',
+                function (Collection $collection, string $entry) {
+                    return $collection->handle() === 'blog' && $entry === 'invalid';
+                },
+            ],
+
+            // terms and taxonomies
+
+            'cp taxonomy' => [
+                'cp/custom/taxonomies/tags',
+                function (Taxonomy $taxonomy) {
+                    return $taxonomy->handle() === 'tags';
+                },
+            ],
+
+            'cp missing taxonomy' => [
+                'cp/custom/taxonomies/invalid',
+            ],
+
+            'api taxonomy' => [
+                'api/custom/taxonomies/tags',
+                function (Taxonomy $taxonomy) {
+                    return $taxonomy->handle() === 'tags';
+                },
+            ],
+
+            'api missing taxonomy' => [
+                'api/custom/taxonomies/invalid',
+            ],
+
+            'cp taxonomy and term' => [
+                'cp/custom/taxonomies/tags/terms/bravo',
+                function (Taxonomy $taxonomy, Term $term) {
+                    return $taxonomy->handle() === 'tags' && $term->id() === 'tags::bravo';
+                },
+            ],
+
+            'cp missing taxonomy and term' => [
+                'cp/custom/taxonomies/invalid/terms/bravo',
+            ],
+
+            'cp taxonomy and missing term' => [
+                'cp/custom/taxonomies/tags/terms/invalid',
+            ],
+
+            'api taxonomy and term' => [
+                'api/custom/taxonomies/tags/terms/bravo',
+                function (Taxonomy $taxonomy, string $term) {
+                    return $taxonomy->handle() === 'tags' && $term === 'bravo';
+                },
+            ],
+
+            'api missing taxonomy and term' => [
+                'api/custom/taxonomies/invalid/terms/bravo',
+            ],
+
+            'api taxonomy and missing term' => [
+                'api/custom/taxonomies/tags/terms/invalid',
+                function (Taxonomy $taxonomy, string $term) {
+                    return $taxonomy->handle() === 'tags' && $term === 'invalid';
+                },
+            ],
+
+            // assets and containers
+
+            'cp container' => [
+                'cp/custom/containers/files',
+                function (AssetContainer $asset_container) {
+                    return $asset_container->handle() === 'files';
+                },
+            ],
+
+            'cp missing container' => [
+                'cp/custom/containers/invalid',
+            ],
+
+            'api container' => [
+                'api/custom/containers/files',
+                function (AssetContainer $asset_container) {
+                    return $asset_container->handle() === 'files';
+                },
+            ],
+
+            'api missing container' => [
+                'api/custom/containers/invalid',
+            ],
+
+            'cp container and asset' => [
+                'cp/custom/assets/files/assets/foo/bar.txt',
+                function (AssetContainer $asset_container, Asset $asset) {
+                    return $asset_container->handle() === 'files' && $asset->id() === 'files::foo/bar.txt';
+                },
+            ],
+
+            'cp missing container and asset' => [
+                'cp/custom/assets/invalid/assets/foo/bar.txt',
+            ],
+
+            'cp container and missing asset' => [
+                'cp/custom/assets/files/assets/invalid',
+            ],
+
+            'api container and asset' => [
+                'api/custom/assets/files/assets/foo/bar.txt',
+                function (AssetContainer $asset_container, Asset $asset) {
+                    return $asset_container->handle() === 'files' && $asset->id() === 'files::foo/bar.txt';
+                },
+            ],
+
+            'api missing container and asset' => [
+                'api/custom/assets/invalid/assets/foo/bar.txt',
+            ],
+
+            'api container and missing asset' => [
+                'api/custom/assets/files/assets/foo/invalid.txt',
+            ],
+
+            // globals
+
+            'cp global' => [
+                'cp/custom/globals/seo',
+                function (Variables $global) {
+                    return $global->handle() === 'seo';
+                },
+            ],
+
+            'cp missing global' => [
+                'cp/custom/globals/invalid',
+            ],
+
+            'api global' => [
+                'api/custom/globals/seo',
+                function (Variables $global) {
+                    return $global->handle() === 'seo';
+                },
+            ],
+
+            'api missing global' => [
+                'api/custom/globals/invalid',
+            ],
+
+            // sites
+
+            'cp site' => [
+                'cp/custom/sites/en',
+                function (Site $site) {
+                    return $site->handle() === 'en';
+                },
+            ],
+
+            'cp missing site' => [
+                'cp/custom/sites/invalid',
+            ],
+
+            'api site' => [
+                'api/custom/sites/en',
+                function (Site $site) {
+                    return $site->handle() === 'en';
+                },
+            ],
+
+            'api missing site' => [
+                'api/custom/sites/invalid',
+            ],
+
+            // revisions
+
+            'cp entry revision' => [
+                'cp/custom/entries/blog/123/revisions/1',
+                function (Collection $collection, Entry $entry, Revision $revision) {
+                    return $collection->handle() === 'blog' && $entry->id() === '123' && $revision->id() === '1';
+                },
+            ],
+
+            'cp entry missing revision' => [
+                'cp/custom/entries/blog/123/revisions/invalid',
+            ],
+
+            'cp term revision' => [
+                'cp/custom/terms/tags/bravo/revisions/2',
+                function (Taxonomy $taxonomy, Term $term, Revision $revision) {
+                    return $taxonomy->handle() === 'tags' && $term->id() === 'tags::bravo' && $revision->id() === '2';
+                },
+            ],
+
+            'cp term missing revision' => [
+                'cp/custom/terms/tags/bravo/revisions/invalid',
+            ],
+
+            'cp invalid content revision' => [
+                'cp/custom/revisions/1',
+            ],
+
+            'api entry revision' => [
+                'api/custom/entries/blog/123/revisions/1',
+                function (Collection $collection, string $entry, string $revision) {
+                    return $collection->handle() === 'blog' && $entry === '123' && $revision === '1';
+                },
+            ],
+
+            'api entry missing revision' => [
+                'api/custom/entries/blog/123/revisions/invalid',
+                function (Collection $collection, string $entry, string $revision) {
+                    return $collection->handle() === 'blog' && $entry === '123' && $revision === 'invalid';
+                },
+            ],
+
+            'api term revision' => [
+                'api/custom/terms/tags/bravo/revisions/2',
+                function (Taxonomy $taxonomy, string $term, $revision) {
+                    return $taxonomy->handle() === 'tags' && $term === 'bravo' && $revision === '2';
+                },
+            ],
+
+            'api term missing revision' => [
+                'api/custom/terms/tags/bravo/revisions/invalid',
+                function (Taxonomy $taxonomy, string $term, string $revision) {
+                    return $taxonomy->handle() === 'tags' && $term === 'bravo' && $revision === 'invalid';
+                },
+            ],
+
+            'api invalid content revision' => [
+                'api/custom/revisions/1',
+                function (string $revision) {
+                    return $revision === '1';
+                },
+            ],
+
+            // forms
+
+            'cp form' => [
+                'cp/custom/forms/contact',
+                function (Form $form) {
+                    return $form->handle() === 'contact';
+                },
+            ],
+
+            'cp missing form' => [
+                'cp/custom/forms/invalid',
+            ],
+
+            'api form' => [
+                'cp/custom/forms/contact',
+                function (Form $form) {
+                    return $form->handle() === 'contact';
+                },
+            ],
+
+            'api missing form' => [
+                'api/custom/forms/invalid',
+            ],
+
+        ];
+    }
+
+    public function frontendRouteProvider()
+    {
+        return [
+
+            // entries and collections
+
+            'collection' => [
+                'custom/collections/blog',
+                function (Collection $collection) {
+                    return $collection->handle() === 'blog';
+                },
+                function (string $collection) {
+                    return $collection === 'blog';
+                },
+            ],
+
+            'collection with custom binding' => [
+                'custom/collections/title/The%20Blog',
+                function (Collection $collection) {
+                    return $collection->handle() === 'blog';
+                },
+                function (string $collection) {
+                    return $collection === 'The Blog';
+                },
+            ],
+
+            'missing collection' => [
+                'custom/collections/invalid',
+                null,
+                function (string $collection) {
+                    return $collection === 'invalid';
+                },
+            ],
+
+            'entry' => [
+                'custom/entries/123',
+                function (Entry $entry) {
+                    return $entry->id() === '123';
+                },
+                function (string $entry) {
+                    return $entry === '123';
+                },
+            ],
+
+            'missing entry' => [
+                'custom/entries/invalid',
+                null,
+                function (string $entry) {
+                    return $entry === 'invalid';
+                },
+            ],
+
+            'collection and entry' => [
+                'custom/collections/blog/entries/123',
+                function (Collection $collection, Entry $entry) {
+                    return $collection->handle() === 'blog' && $entry->id() === '123';
+                },
+                function (string $collection, string $entry) {
+                    return $collection === 'blog' && $entry === '123';
+                },
+            ],
+
+            'missing collection and entry' => [
+                'custom/collections/invalid/entries/123',
+                null,
+                function (string $collection, string $entry) {
+                    return $collection === 'invalid' && $entry === '123';
+                },
+            ],
+
+            'collection and missing entry' => [
+                'custom/collections/blog/entries/invalid',
+                null,
+                function (string $collection, string $entry) {
+                    return $collection === 'blog' && $entry === 'invalid';
+                },
+            ],
+
+            'entry with custom binding' => [
+                'custom/entries/slug/alfa',
+                function (Entry $entry) {
+                    return $entry->id() === '123';
+                },
+                function (string $entry) {
+                    return $entry === 'alfa';
+                },
+            ],
+
+            // terms and taxonomies
+
+            'taxonomy' => [
+                'custom/taxonomies/tags',
+                function (Taxonomy $taxonomy) {
+                    return $taxonomy->handle() === 'tags';
+                },
+                function (string $taxonomy) {
+                    return $taxonomy === 'tags';
+                },
+            ],
+
+            'taxonomy with custom binding' => [
+                'custom/taxonomies/title/Product%20Tags',
+                function (Taxonomy $taxonomy) {
+                    return $taxonomy->handle() === 'tags';
+                },
+                function (string $taxonomy) {
+                    return $taxonomy === 'Product Tags';
+                },
+            ],
+
+            'missing taxonomy' => [
+                'custom/taxonomies/invalid',
+                null,
+                function (string $taxonomy) {
+                    return $taxonomy === 'invalid';
+                },
+            ],
+
+            'term' => [
+                'custom/terms/tags::bravo',
+                function (Term $term) {
+                    return $term->id() === 'tags::bravo';
+                },
+                function (string $term) {
+                    return $term === 'tags::bravo';
+                },
+            ],
+
+            'missing term' => [
+                'custom/terms/tags::invalid',
+                null,
+                function (string $term) {
+                    return $term === 'tags::invalid';
+                },
+            ],
+
+            'taxonomy and term' => [
+                'custom/taxonomies/tags/terms/bravo',
+                function (Taxonomy $taxonomy, Term $term) {
+                    return $taxonomy->handle() === 'tags' && $term->id() === 'tags::bravo';
+                },
+                function (string $taxonomy, string $term) {
+                    return $taxonomy === 'tags' && $term === 'bravo';
+                },
+            ],
+
+            'missing taxonomy and term' => [
+                'custom/taxonomies/invalid/terms/bravo',
+                null,
+                function (string $taxonomy, string $term) {
+                    return $taxonomy === 'invalid' && $term === 'bravo';
+                },
+            ],
+
+            'taxonomy and missing term' => [
+                'custom/taxonomies/tags/terms/invalid',
+                null,
+                function (string $taxonomy, string $term) {
+                    return $taxonomy === 'tags' && $term === 'invalid';
+                },
+            ],
+
+            'term with custom binding' => [
+                'custom/terms/slug/bravo',
+                function (Term $term) {
+                    return $term->id() === 'tags::bravo';
+                },
+                function (string $term) {
+                    return $term === 'bravo';
+                },
+            ],
+
+            // assets and containers
+
+            'container' => [
+                'custom/containers/files',
+                function (AssetContainer $asset_container) {
+                    return $asset_container->handle() === 'files';
+                },
+                function (string $asset_container) {
+                    return $asset_container === 'files';
+                },
+            ],
+
+            'container with custom binding' => [
+                'custom/containers/title/The%20Files',
+                function (AssetContainer $asset_container) {
+                    return $asset_container->handle() === 'files';
+                },
+                function (string $asset_container) {
+                    return $asset_container === 'The Files';
+                },
+            ],
+
+            'missing container' => [
+                'custom/containers/invalid',
+                null,
+                function (string $asset_container) {
+                    return $asset_container === 'invalid';
+                },
+            ],
+
+            'container and asset' => [
+                'custom/assets/files/assets/foo/bar.txt',
+                function (AssetContainer $asset_container, Asset $asset) {
+                    return $asset_container->handle() === 'files' && $asset->id() === 'files::foo/bar.txt';
+                },
+                function (string $asset_container, string $asset) {
+                    return $asset_container === 'files' && $asset === 'foo/bar.txt';
+                },
+            ],
+
+            'missing container and asset' => [
+                'custom/assets/invalid/assets/foo/bar.txt',
+                null,
+                function (string $asset_container, string $asset) {
+                    return $asset_container === 'invalid' && $asset === 'foo/bar.txt';
+                },
+            ],
+
+            'container and missing asset' => [
+                'custom/assets/files/assets/invalid',
+                null,
+                function (string $asset_container, string $asset) {
+                    return $asset_container === 'files' && $asset === 'invalid';
+                },
+            ],
+
+            'asset with custom binding' => [
+                'custom/assets/alt/files/assets/the%20alt%20text',
+                function (AssetContainer $asset_container, Asset $asset) {
+                    return $asset_container->handle() === 'files' && $asset->id() === 'files::foo/bar.txt';
+                },
+                function (string $asset_container, string $asset) {
+                    return $asset_container === 'files' && $asset === 'the alt text';
+                },
+            ],
+
+            // globals
+
+            'global' => [
+                'custom/globals/seo',
+                function (Variables $global) {
+                    return $global->handle() === 'seo';
+                },
+                function (string $global) {
+                    return $global === 'seo';
+                },
+            ],
+
+            'global with custom binding' => [
+                'custom/globals/title/SEO%20Settings',
+                function (Variables $global) {
+                    return $global->handle() === 'seo';
+                },
+                function (string $global) {
+                    return $global === 'SEO Settings';
+                },
+            ],
+
+            'missing global' => [
+                'custom/globals/invalid',
+                null,
+                function (string $global) {
+                    return $global === 'invalid';
+                },
+            ],
+
+            // sites
+
+            'site' => [
+                'custom/sites/en',
+                function (Site $site) {
+                    return $site->handle() === 'en';
+                },
+                function (string $site) {
+                    return $site === 'en';
+                },
+            ],
+
+            'site with custom binding' => [
+                'custom/sites/locale/en_US',
+                function (Site $site) {
+                    return $site->handle() === 'en';
+                },
+                function (string $site) {
+                    return $site === 'en_US';
+                },
+            ],
+
+            'missing site' => [
+                'custom/sites/invalid',
+                null,
+                function (string $site) {
+                    return $site === 'invalid';
+                },
+            ],
+
+            // revisions
+
+            'entry revision' => [
+                'custom/entries/blog/123/revisions/1',
+                function (Collection $collection, Entry $entry, Revision $revision) {
+                    return $collection->handle() === 'blog' && $entry->id() === '123' && $revision->id() === '1';
+                },
+                function (string $collection, string $entry, string $revision) {
+                    return $collection === 'blog' && $entry === '123' && $revision === '1';
+                },
+            ],
+
+            'entry missing revision' => [
+                'custom/entries/blog/123/revisions/invalid',
+                null,
+                function (string $collection, string $entry, string $revision) {
+                    return $collection === 'blog' && $entry === '123' && $revision === 'invalid';
+                },
+            ],
+
+            'term revision' => [
+                'custom/terms/tags/bravo/revisions/2',
+                function (Taxonomy $taxonomy, Term $term, Revision $revision) {
+                    return $taxonomy->handle() === 'tags' && $term->id() === 'tags::bravo' && $revision->id() === '2';
+                },
+                function (string $taxonomy, string $term, string $revision) {
+                    return $taxonomy === 'tags' && $term === 'bravo' && $revision === '2';
+                },
+            ],
+
+            'term missing revision' => [
+                'custom/terms/tags/bravo/revisions/invalid',
+                null,
+                function (string $taxonomy, string $term, string $revision) {
+                    return $taxonomy === 'tags' && $term === 'bravo' && $revision === 'invalid';
+                },
+            ],
+
+            'invalid content revision' => [
+                'custom/revisions/1',
+                null,
+                function (string $revision) {
+                    return $revision === '1';
+                },
+            ],
+
+            // forms
+
+            'form' => [
+                'custom/forms/contact',
+                function (Form $form) {
+                    return $form->handle() === 'contact';
+                },
+                function (string $form) {
+                    return $form === 'contact';
+                },
+            ],
+
+            'form with custom binding' => [
+                'custom/forms/title/Contact%20Us',
+                function (Form $form) {
+                    return $form->handle() === 'contact';
+                },
+                function (string $form) {
+                    return $form === 'Contact Us';
+                },
+            ],
+
+            'missing form' => [
+                'custom/forms/invalid',
+                null,
+                function (string $form) {
+                    return $form === 'invalid';
+                },
+            ],
+
+        ];
+    }
+
+    /**
+     * @test
+     *
+     * @define-env bindingsDisabled
+     *
+     * @dataProvider bypassForBroadcastingProvider
+     */
+    public function it_bypasses_binding_for_broadcasting($binding)
+    {
+        $this->bypassForBroadcasting($binding);
+    }
+
+    /**
+     * @test
+     *
+     * @define-env bindingsEnabled
+     *
+     * @dataProvider bypassForBroadcastingProvider
+     */
+    public function it_bypasses_binding_for_broadcasting_with_bindings_enabled($binding)
+    {
+        $this->bypassForBroadcasting($binding);
+    }
+
+    public function bypassForBroadcasting(string $binding)
+    {
+        $binder = app(BindingRegistrar::class);
+
+        // Evaluate the binding closure, passing in the value.
+        // e.g. If you hit /something/{entry} then the closure will receive literally "entry" as the first argument.
+        $value = call_user_func($binder->getBindingCallback($binding), 'test');
+
+        // We want to make sure it just spits the value right back without any errors.
+        $this->assertEquals('test', $value);
+    }
+
+    public function bypassForBroadcastingProvider()
+    {
+        return collect([
+            'collection',
+            'entry',
+            'taxonomy',
+            'term',
+            'asset_container',
+            'asset',
+            'global',
+            'site',
+            'revision',
+            'form',
+        ])->mapWithKeys(fn ($key) => [$key => [$key]])->all();
+    }
+}
diff --git a/tests/Routing/RoutesTest.php b/tests/Routing/RoutesTest.php
index 69e0bba53b..d27257bec4 100644
--- a/tests/Routing/RoutesTest.php
+++ b/tests/Routing/RoutesTest.php
@@ -5,6 +5,9 @@
 use Facades\Tests\Factories\EntryFactory;
 use Illuminate\Support\Facades\Route;
 use Statamic\Facades\Collection;
+use Statamic\Facades\Config;
+use Statamic\Facades\Taxonomy;
+use Statamic\Facades\Term;
 use Tests\FakesViews;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
@@ -67,6 +70,26 @@ protected function resolveApplicationConfiguration($app)
             Route::statamic('/xml-with-custom-type', 'feed', [
                 'content_type' => 'json',
             ]);
+
+            Route::middleware(\Illuminate\Routing\Middleware\SubstituteBindings::class)->group(function () {
+
+                Route::get('/bindings/entry/{entry}', function ($entry) {
+                    return ['title' => $entry->get('title')];
+                });
+
+                Route::get('/bindings/entry/slug/{entry:slug}', function ($entry) {
+                    return ['title' => $entry->get('title')];
+                });
+
+                Route::get('/bindings/term/{term}', function ($term) {
+                    return ['title' => $term->get('title')];
+                });
+
+                Route::get('/bindings/term/title/{term:slug}', function ($term) {
+                    return ['title' => $term->get('title')];
+                });
+
+            });
         });
     }
 
@@ -249,4 +272,44 @@ public function xml_template_with_custom_content_type_does_not_change_to_xml()
             ->get('/xml-with-custom-type')
             ->assertHeader('Content-Type', 'application/json');
     }
+
+    /** @test */
+    public function it_loads_entry_by_binding()
+    {
+        Config::set('statamic.routes.bindings', true);
+
+        $collection = Collection::make('pages')->save();
+        EntryFactory::id('pages-blog')->collection($collection)->slug('blog')->data(['title' => 'Blog'])->create();
+
+        $this->get('/bindings/entry/pages-blog')
+            ->assertOk()
+            ->assertJson(['title' => 'Blog']);
+
+        $this->get('/bindings/entry/slug/blog')
+            ->assertOk()
+            ->assertJson(['title' => 'Blog']);
+
+        $this->get('/bindings/entry/slug/blog2')
+            ->assertNotFound();
+    }
+
+    /** @test */
+    public function it_loads_term_by_binding()
+    {
+        Config::set('statamic.routes.bindings', true);
+
+        $taxonomy = Taxonomy::make('pages')->save();
+        Term::make()->taxonomy('pages')->slug('blog')->data(['title' => 'Blog'])->save();
+
+        $this->get('/bindings/term/pages::blog')
+            ->assertOk()
+            ->assertJson(['title' => 'Blog']);
+
+        $this->get('/bindings/term/title/Blog')
+            ->assertOk()
+            ->assertJson(['title' => 'Blog']);
+
+        $this->get('/bindings/term/title/Blog2')
+            ->assertNotFound();
+    }
 }

From db283987666ad3fcb313d9e297a13465785da67a Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Wed, 18 Oct 2023 15:57:22 +0100
Subject: [PATCH 27/36] [4.x] Fix navigation 'Save Changes' button state
 (#8864)

---
 resources/js/components/navigation/View.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/js/components/navigation/View.vue b/resources/js/components/navigation/View.vue
index 630f7d9258..4c62b50f87 100644
--- a/resources/js/components/navigation/View.vue
+++ b/resources/js/components/navigation/View.vue
@@ -383,9 +383,9 @@ export default {
         },
 
         treeSaved(response) {
-            this.changed = false;
-
             this.replaceGeneratedIds(response.data.generatedIds);
+
+            this.changed = false;
         },
 
         replaceGeneratedIds(ids) {

From 8a1ba28509bbdada4fa037478158caff0f584c57 Mon Sep 17 00:00:00 2001
From: Marty Friedel <1491079+martyf@users.noreply.github.com>
Date: Thu, 19 Oct 2023 03:16:52 +1100
Subject: [PATCH 28/36] [4.x] Remove double-render of fields in Form tag
 (#8861)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 src/Forms/Tags.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Forms/Tags.php b/src/Forms/Tags.php
index dc876d4011..aefe86df6b 100644
--- a/src/Forms/Tags.php
+++ b/src/Forms/Tags.php
@@ -64,7 +64,9 @@ public function create()
         $jsDriver = $this->parseJsParamDriverAndOptions($this->params->get('js'), $form);
 
         $data['sections'] = $this->getSections($this->sessionHandle(), $jsDriver);
-        $data['fields'] = $this->getFields($this->sessionHandle(), $jsDriver);
+
+        $data['fields'] = collect($data['sections'])->flatMap->fields->all();
+
         $data['honeypot'] = $form->honeypot();
 
         if ($jsDriver) {

From 0e0b4846364e8ea6a4359478775a81de9c5323ca Mon Sep 17 00:00:00 2001
From: Marty Friedel <1491079+martyf@users.noreply.github.com>
Date: Thu, 19 Oct 2023 08:18:16 +1100
Subject: [PATCH 29/36] [4.x] Add form reference to field during render (#8862)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 src/Fields/Field.php       | 14 ++++++++++++++
 src/Forms/Tags.php         |  5 ++++-
 tests/Fields/FieldTest.php | 14 ++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/Fields/Field.php b/src/Fields/Field.php
index f2b82e0ff8..bf9bee6e5d 100644
--- a/src/Fields/Field.php
+++ b/src/Fields/Field.php
@@ -7,6 +7,7 @@
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Facades\Lang;
 use Rebing\GraphQL\Support\Field as GqlField;
+use Statamic\Contracts\Forms\Form;
 use Statamic\Facades\GraphQL;
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
@@ -20,6 +21,7 @@ class Field implements Arrayable
     protected $parent;
     protected $parentField;
     protected $validationContext;
+    protected ?Form $form = null;
 
     public function __construct($handle, array $config)
     {
@@ -409,4 +411,16 @@ public function isRelationship(): bool
     {
         return $this->fieldtype()->isRelationship();
     }
+
+    public function setForm(Form $form)
+    {
+        $this->form = $form;
+
+        return $this;
+    }
+
+    public function form(): ?Form
+    {
+        return $this->form;
+    }
 }
diff --git a/src/Forms/Tags.php b/src/Forms/Tags.php
index aefe86df6b..1800713d82 100644
--- a/src/Forms/Tags.php
+++ b/src/Forms/Tags.php
@@ -242,7 +242,10 @@ protected function getSections($sessionHandle, $jsDriver)
      */
     protected function getFields($sessionHandle, $jsDriver, $fields = null)
     {
-        return collect($fields ?? $this->form()->fields())
+        $form = $this->form();
+
+        return collect($fields ?? $form->fields())
+            ->each(fn ($field) => $field->setForm($form))
             ->map(function ($field) use ($sessionHandle, $jsDriver) {
                 return $this->getRenderableField($field, $sessionHandle, function ($data, $field) use ($jsDriver) {
                     return $jsDriver
diff --git a/tests/Fields/FieldTest.php b/tests/Fields/FieldTest.php
index c2dfa6368c..55e1e66b0e 100644
--- a/tests/Fields/FieldTest.php
+++ b/tests/Fields/FieldTest.php
@@ -6,6 +6,7 @@
 use Statamic\Fields\Field;
 use Statamic\Fields\Fieldtype;
 use Statamic\Fields\Value;
+use Statamic\Forms\Form;
 use Tests\TestCase;
 
 class FieldTest extends TestCase
@@ -618,4 +619,17 @@ public function isRelationship(): bool
 
         $this->assertTrue($field->isRelationship());
     }
+
+    /** @test */
+    public function it_gets_and_sets_the_form()
+    {
+        $field = new Field('test', ['type' => 'text']);
+
+        $this->assertNull($field->form());
+
+        $return = $field->setForm($form = new Form);
+
+        $this->assertEquals($field, $return);
+        $this->assertEquals($form, $field->form());
+    }
 }

From 99d264ad0abd018dcb1d89e1e7afa49a0ac20b98 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Oct 2023 13:29:37 -0400
Subject: [PATCH 30/36] [4.x] Bump @babel/traverse from 7.21.3 to 7.23.2
 (#8870)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 125 +++++++++++++++++++++++-----------------------
 1 file changed, 63 insertions(+), 62 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 15690075c6..2123d8a913 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -111,12 +111,13 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
-      "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+      "version": "7.22.13",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
+      "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
       "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.18.6"
+        "@babel/highlight": "^7.22.13",
+        "chalk": "^2.4.2"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -162,12 +163,12 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.3.tgz",
-      "integrity": "sha512-QS3iR1GYC/YGUnW7IdggFeN5c1poPUurnGttOV/bZgPGV+izC/D8HnD6DLwod0fsatNyVn1G3EVWMYIF0nHbeA==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
+      "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.21.3",
+        "@babel/types": "^7.23.0",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -290,9 +291,9 @@
       }
     },
     "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
-      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
@@ -311,25 +312,25 @@
       }
     },
     "node_modules/@babel/helper-function-name": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz",
-      "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.20.7",
-        "@babel/types": "^7.21.0"
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.23.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
-      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -459,30 +460,30 @@
       }
     },
     "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
-      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
-      "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
+      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
-      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
@@ -527,13 +528,13 @@
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
-      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
+      "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.18.6",
-        "chalk": "^2.0.0",
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "chalk": "^2.4.2",
         "js-tokens": "^4.0.0"
       },
       "engines": {
@@ -541,9 +542,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.3.tgz",
-      "integrity": "sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
+      "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -1708,33 +1709,33 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz",
-      "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/parser": "^7.20.7",
-        "@babel/types": "^7.20.7"
+        "@babel/code-frame": "^7.22.13",
+        "@babel/parser": "^7.22.15",
+        "@babel/types": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.3.tgz",
-      "integrity": "sha512-XLyopNeaTancVitYZe2MlUEvgKb6YVVPXzofHgqHijCImG33b/uTurMS488ht/Hbsb2XK3U2BnSTxKVNGV3nGQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.21.3",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.21.0",
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.21.3",
-        "@babel/types": "^7.21.3",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
+      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.22.13",
+        "@babel/generator": "^7.23.0",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-function-name": "^7.23.0",
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/parser": "^7.23.0",
+        "@babel/types": "^7.23.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -1743,13 +1744,13 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.21.3",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.3.tgz",
-      "integrity": "sha512-sBGdETxC+/M4o/zKC0sl6sjWv62WFR/uzxrJ6uYyMLZOUlPnwzw0tKgVHOXxaAd5l2g8pEDM5RZ495GPQI77kg==",
+      "version": "7.23.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
+      "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-string-parser": "^7.19.4",
-        "@babel/helper-validator-identifier": "^7.19.1",
+        "@babel/helper-string-parser": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.20",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {

From e8a24fe6a910e54ca3a8f59cedb4b4afd14d0794 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Thu, 19 Oct 2023 13:45:41 -0400
Subject: [PATCH 31/36] changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92044ffef9..e3df7b2cd5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Release Notes
 
+## 4.29.0 (2023-10-19)
+
+### What's new
+- Add form reference to field during render. [#8862](https://github.com/statamic/cms/issues/8862) by @martyf
+- Add config to enable frontend route binding and support binding by field. [#8853](https://github.com/statamic/cms/issues/8853) by @ryanmitchell
+- Allow overwriting the column for `unique_user_value` validation. [#8852](https://github.com/statamic/cms/issues/8852) by @marcorieser
+
+### What's improved
+- German translations [#8857](https://github.com/statamic/cms/issues/8857) by @helloDanuk
+- French translations [#8848](https://github.com/statamic/cms/issues/8848) by @ebeauchamps
+
+### What's fixed
+- Remove double-render of fields in Form tag. [#8861](https://github.com/statamic/cms/issues/8861) by @martyf
+- Fix navigation 'Save Changes' button state. [#8864](https://github.com/statamic/cms/issues/8864) by @duncanmcclean
+- Fix missing replicator set previews. [#8855](https://github.com/statamic/cms/issues/8855) by @jacksleight
+- Bump @babel/traverse from 7.21.3 to 7.23.2 [#8870](https://github.com/statamic/cms/issues/8870) by @dependabot
+
+
+
 ## 4.28.0 (2023-10-13)
 
 ### What's new

From 6da8c8856bdb73be99c0e8bca70d6957b07319ef Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Fri, 20 Oct 2023 16:31:28 +0100
Subject: [PATCH 32/36] [4.x] Default to using the CP broker when multiple are
 available (#8872)

---
 src/Auth/User.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Auth/User.php b/src/Auth/User.php
index ccb5db6dab..572b2ecac6 100644
--- a/src/Auth/User.php
+++ b/src/Auth/User.php
@@ -233,6 +233,10 @@ public function generatePasswordResetToken()
     {
         $broker = config('statamic.users.passwords.'.PasswordReset::BROKER_RESETS);
 
+        if (is_array($broker)) {
+            $broker = $broker['cp'];
+        }
+
         return Password::broker($broker)->createToken($this);
     }
 
@@ -240,6 +244,10 @@ public function generateActivateAccountToken()
     {
         $broker = config('statamic.users.passwords.'.PasswordReset::BROKER_ACTIVATIONS);
 
+        if (is_array($broker)) {
+            $broker = $broker['cp'];
+        }
+
         return Password::broker($broker)->createToken($this);
     }
 

From 49d96a5b2eae80a54fbd465dc91800daebbf87b9 Mon Sep 17 00:00:00 2001
From: Duncan McClean <19637309+duncanmcclean@users.noreply.github.com>
Date: Fri, 20 Oct 2023 16:59:32 +0100
Subject: [PATCH 33/36] [4.x] Multi-site Duplicator Support (#8665)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 resources/lang/en/messages.php       |   3 +
 src/Actions/DuplicateEntry.php       | 110 ++++---
 tests/Actions/DuplicateEntryTest.php | 444 +++++++++++++++++++++++++--
 3 files changed, 498 insertions(+), 59 deletions(-)

diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php
index c967e26463..a33e865c0d 100644
--- a/resources/lang/en/messages.php
+++ b/resources/lang/en/messages.php
@@ -68,6 +68,9 @@
     'collections_sort_direction_instructions' => 'The default sort direction.',
     'collections_preview_target_refresh_instructions' => 'Automatically refresh the preview while editing. Disabling this will use postMessage.',
     'collections_taxonomies_instructions' => 'Connect entries in this collection to taxonomies. Fields will be automatically added to publish forms.',
+    'duplicate_action_warning_localization' => 'This entry is a localization. The origin entry will be duplicated.',
+    'duplicate_action_warning_localizations' => 'One or more selected entries are localizations. In those cases, the origin entry will be duplicated instead.',
+    'duplicate_action_localizations_confirmation' => 'Are you sure you want to run this action? Localizations will also be duplicated.',
     'email_utility_configuration_description' => 'Mail settings are configured in <code>:path</code>',
     'email_utility_description' => 'Check email configuration settings and send test emails.',
     'entry_origin_instructions' => 'The new localization will inherit values from the entry in the selected site.',
diff --git a/src/Actions/DuplicateEntry.php b/src/Actions/DuplicateEntry.php
index 388f513c74..0737468330 100644
--- a/src/Actions/DuplicateEntry.php
+++ b/src/Actions/DuplicateEntry.php
@@ -5,7 +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
 {
@@ -16,45 +16,83 @@ public static function title()
 
     public function visibleTo($item)
     {
-        return $item instanceof Entry && ! Site::hasMultiple();
+        return $item instanceof Entry;
+    }
+
+    public function confirmationText()
+    {
+        $hasDescendants = $this->items
+            ->map(fn ($entry) => $entry->hasOrigin() ? $entry->root() : $entry)
+            ->unique()
+            ->contains(fn ($entry) => $entry->descendants()->count());
+
+        if ($hasDescendants) {
+            return 'duplicate_action_localizations_confirmation';
+        }
+
+        return parent::confirmationText();
+    }
+
+    public function warningText()
+    {
+        if ($this->items->contains(fn ($entry) => $entry->hasOrigin())) {
+            return $this->items->count() === 1
+                ? 'duplicate_action_warning_localization'
+                : 'duplicate_action_warning_localizations';
+        }
     }
 
     public function run($items, $values)
     {
-        $items->each(function (Entry $original) {
-            $originalParent = $this->getEntryParentFromStructure($original);
-            [$title, $slug] = $this->generateTitleAndSlug($original);
-
-            $data = $original
-                ->data()
-                ->except($original->blueprint()->fields()->all()->reject->shouldBeDuplicated()->keys())
-                ->merge(['title' => $title,
-                    'duplicated_from' => $original->id(),
-                ])->all();
-
-            $entry = Entries::make()
-                ->collection($original->collection())
-                ->blueprint($original->blueprint()->handle())
-                ->published(false)
-                ->data($data);
-
-            if ($original->collection()->requiresSlugs()) {
-                $entry->slug($slug);
-            }
+        $items
+            ->map(fn ($entry) => $entry->hasOrigin() ? $entry->root() : $entry)
+            ->unique()
+            ->each(fn ($original) => $this->duplicateEntry($original));
+    }
 
-            if ($original->hasDate()) {
-                $entry->date($original->date());
-            }
+    private function duplicateEntry(Entry $original, string $origin = null)
+    {
+        $originalParent = $this->getEntryParentFromStructure($original);
+        [$title, $slug] = $this->generateTitleAndSlug($original);
+
+        $data = $original
+            ->data()
+            ->except($original->blueprint()->fields()->all()->reject->shouldBeDuplicated()->keys())
+            ->merge(['title' => $title,
+                'duplicated_from' => $original->id(),
+            ])->all();
+
+        $entry = Entries::make()
+            ->locale($original->locale())
+            ->collection($original->collection())
+            ->blueprint($original->blueprint()->handle())
+            ->published(false)
+            ->data($data)
+            ->origin($origin);
+
+        if ($original->collection()->requiresSlugs()) {
+            $entry->slug($slug);
+        }
 
-            $entry->save();
+        if ($original->hasDate()) {
+            $entry->date($original->date());
+        }
 
-            if ($originalParent && $originalParent !== $original->id()) {
-                $entry->structure()
-                    ->in($original->locale())
-                    ->appendTo($originalParent->id(), $entry)
-                    ->save();
-            }
-        });
+        $entry->save();
+
+        $original
+            ->directDescendants()
+            ->filter(fn ($entry) => User::current()->can('create', [Entry::class, $entry->collection(), $entry->site()]))
+            ->each(function ($descendant) use ($entry) {
+                $this->duplicateEntry($descendant, origin: $entry->id());
+            });
+
+        if ($originalParent && $originalParent !== $original->id()) {
+            $entry->structure()
+                ->in($original->locale())
+                ->appendTo($originalParent->id(), $entry)
+                ->save();
+        }
     }
 
     protected function getEntryParentFromStructure(Entry $entry)
@@ -82,7 +120,7 @@ protected function getEntryParentFromStructure(Entry $entry)
 
     protected function generateTitleAndSlug(Entry $entry, $attempt = 1)
     {
-        $title = $entry->get('title');
+        $title = $entry->value('title');
         $slug = $entry->slug();
         $suffix = ' ('.__('Duplicated').')';
 
@@ -101,7 +139,7 @@ protected function generateTitleAndSlug(Entry $entry, $attempt = 1)
         $slug .= '-'.$attempt;
 
         // If the slug we've just built already exists, we'll try again, recursively.
-        if ($entry->collection()->queryEntries()->where('slug', $slug)->count()) {
+        if ($entry->collection()->queryEntries()->where('locale', $entry->locale())->where('slug', $slug)->count()) {
             [$title, $slug] = $this->generateTitleAndSlug($entry, $attempt + 1);
         }
 
@@ -110,6 +148,6 @@ protected function generateTitleAndSlug(Entry $entry, $attempt = 1)
 
     public function authorize($user, $item)
     {
-        return $user->can('create', [Entry::class, $item->collection()]);
+        return $user->can('create', [Entry::class, $item->collection(), $item->site()]);
     }
 }
diff --git a/tests/Actions/DuplicateEntryTest.php b/tests/Actions/DuplicateEntryTest.php
index 00ef6c360d..3baec45ce4 100644
--- a/tests/Actions/DuplicateEntryTest.php
+++ b/tests/Actions/DuplicateEntryTest.php
@@ -6,6 +6,7 @@
 use Statamic\Actions\DuplicateEntry;
 use Statamic\Facades\Collection;
 use Statamic\Facades\Entry;
+use Statamic\Facades\Site;
 use Statamic\Facades\User;
 use Tests\FakesRoles;
 use Tests\PreventSavingStacheItemsToDisk;
@@ -33,7 +34,7 @@ public function it_duplicates_an_entry()
         (new DuplicateEntry)->run(collect([
             Entry::find('alfa-id'),
             Entry::find('charlie-id'),
-        ]), collect());
+        ]), []);
 
         $this->assertEquals([
             ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa']],
@@ -53,7 +54,7 @@ public function it_increments_the_number_if_duplicate_already_exists()
 
         (new DuplicateEntry)->run(collect([
             Entry::find('alfa-id'),
-        ]), collect());
+        ]), []);
 
         $this->assertEquals([
             ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa']],
@@ -62,26 +63,132 @@ public function it_increments_the_number_if_duplicate_already_exists()
         ], $this->entryData());
     }
 
-    /** @test */
-    public function user_with_create_permission_is_authorized()
+    /**
+     * @test
+     *
+     * @dataProvider authorizationProvider
+     */
+    public function it_authorizes(
+        bool $isMultisite,
+        array $permissions,
+        bool $expectedToBeAuthorized
+    ) {
+        $this->setTestRoles(['test' => $permissions]);
+        $user = tap(User::make()->assignRole('test'))->save();
+
+        $collection = Collection::make('test');
+
+        if ($isMultisite) {
+            Site::setConfig(['sites' => [
+                'en' => ['url' => '/', 'locale' => 'en'],
+                'fr' => ['url' => '/fr/', 'locale' => 'fr'],
+            ]]);
+
+            $collection->sites(['en', 'fr']);
+        }
+
+        $collection->save();
+
+        $item = EntryFactory::collection('test')->slug('alfa')->locale('en')->create();
+
+        $this->assertEquals($expectedToBeAuthorized, (new DuplicateEntry)->authorize($user, $item));
+    }
+
+    public function authorizationProvider()
     {
-        $this->setTestRoles([
-            'access' => ['create test entries'],
-            'noaccess' => [],
-        ]);
+        return [
+            'no permission' => [
+                $multisite = false,
+                $permissions = [],
+                $expectedToBeAuthorized = false,
+            ],
+            'permission to create, access to no sites, but not using multisite' => [
+                $multisite = false,
+                $permissions = ['create test entries'],
+                $expectedToBeAuthorized = true,
+            ],
+            'permission to create, access to site' => [
+                $multisite = true,
+                $permissions = ['create test entries', 'access en site'],
+                $expectedToBeAuthorized = true,
+            ],
+            'permission to create, access to no sites' => [
+                $multisite = true,
+                $permissions = ['create test entries'],
+                $expectedToBeAuthorized = false,
+            ],
+            'permission to create, access to a different site' => [
+                $multisite = true,
+                $permissions = ['create test entries', 'access fr site'],
+                $expectedToBeAuthorized = false,
+            ],
+        ];
+    }
+
+    /**
+     * @test
+     *
+     * @dataProvider bulkAuthorizationProvider
+     */
+    public function it_authorizes_in_bulk(
+        bool $isMultisite,
+        array $permissions,
+        bool $expectedToBeAuthorized
+    ) {
+        $this->setTestRoles(['test' => $permissions]);
+        $user = tap(User::make()->assignRole('test'))->save();
+
+        $collection = Collection::make('test');
+
+        if ($isMultisite) {
+            Site::setConfig(['sites' => [
+                'en' => ['url' => '/', 'locale' => 'en'],
+                'fr' => ['url' => '/fr/', 'locale' => 'fr'],
+                'de' => ['url' => '/de/', 'locale' => 'de'],
+            ]]);
+
+            $collection->sites(['en', 'fr', 'de']);
+        }
+
+        $collection->save();
 
-        Collection::make('test')->save();
-        $userWithPermission = tap(User::make()->assignRole('access'))->save();
-        $userWithoutPermission = tap(User::make()->assignRole('noaccess'))->save();
         $items = collect([
-            EntryFactory::collection('test')->slug('alfa')->create(),
-            EntryFactory::collection('test')->slug('bravo')->create(),
+            EntryFactory::collection('test')->slug('alfa')->locale('en')->create(),
+            EntryFactory::collection('test')->slug('bravo')->locale($isMultisite ? 'fr' : 'en')->create(),
         ]);
 
-        $this->assertTrue((new DuplicateEntry)->authorize($userWithPermission, $items->first()));
-        $this->assertTrue((new DuplicateEntry)->authorizeBulk($userWithPermission, $items));
-        $this->assertFalse((new DuplicateEntry)->authorize($userWithoutPermission, $items->first()));
-        $this->assertFalse((new DuplicateEntry)->authorizeBulk($userWithoutPermission, $items));
+        $this->assertEquals($expectedToBeAuthorized, (new DuplicateEntry)->authorizeBulk($user, $items));
+    }
+
+    public function bulkAuthorizationProvider()
+    {
+        return [
+            'no permission' => [
+                $multisite = false,
+                $permissions = [],
+                $expectedToBeAuthorized = false,
+            ],
+            'permission to create, access to no sites, but not using multisite' => [
+                $multisite = false,
+                $permissions = ['create test entries'],
+                $expectedToBeAuthorized = true,
+            ],
+            'permission to create, access to all sites' => [
+                $multisite = true,
+                $permissions = ['create test entries', 'access en site', 'access fr site'],
+                $expectedToBeAuthorized = true,
+            ],
+            'permission to create, access to no sites' => [
+                $multisite = true,
+                $permissions = ['create test entries'],
+                $expectedToBeAuthorized = false,
+            ],
+            'permission to create, access to a site that the entries arent in' => [
+                $multisite = true,
+                $permissions = ['create test entries', 'access de site'],
+                $expectedToBeAuthorized = false,
+            ],
+        ];
     }
 
     /** @test */
@@ -101,7 +208,7 @@ public function it_respects_the_collection_not_requiring_slugs()
         (new DuplicateEntry)->run(collect([
             Entry::find('alfa-id'),
             Entry::find('charlie-id'),
-        ]), collect());
+        ]), []);
 
         $alfaDuplicate = Entry::query()->where('duplicated_from', 'alfa-id')->first();
 
@@ -116,12 +223,303 @@ public function it_respects_the_collection_not_requiring_slugs()
         $this->assertEquals($id.'.md', basename($charlieDuplicate->path()));
     }
 
+    /** @test */
+    public function it_duplicates_an_entry_with_localizations()
+    {
+        Site::setConfig(['sites' => [
+            'en' => ['url' => 'http://domain.com/', 'locale' => 'en'],
+            'fr' => ['url' => 'http://domain.com/fr/', 'locale' => 'fr'],
+            'de' => ['url' => 'http://domain.com/de/', 'locale' => 'de'], // Add additional site that the entry doesn't exist in, to ensure it doesn't get duplicated into it.
+            'es' => ['url' => 'http://domain.com/es/', 'locale' => 'es'],
+        ]]);
+
+        Collection::make('test')->sites(['en', 'fr', 'de', 'es'])->save();
+
+        $entry = EntryFactory::id('alfa-id')->locale('en')->collection('test')->slug('alfa')->data(['title' => 'Alfa'])->create();
+        $entry->makeLocalization('fr')->id('alfa-id-fr')->data(['title' => 'Alfa (French)'])->save();
+        $entry->makeLocalization('es')->id('alfa-id-es')->data(['title' => 'Alfa (Spanish)'])->save();
+
+        $this->assertEquals([
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa'], 'locale' => 'en', 'origin' => ''],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (French)'], 'locale' => 'fr', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (Spanish)'], 'locale' => 'es', 'origin' => 'en.alfa'],
+        ], $this->entryData());
+
+        // Make super user since this test isn't concerned with permissions.
+        $this->actingAs(tap(User::make()->makeSuper())->save());
+
+        (new DuplicateEntry)->run(collect([
+            Entry::find('alfa-id'),
+        ]), []);
+
+        $this->assertEquals([
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (French)'], 'locale' => 'fr', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (Spanish)'], 'locale' => 'es', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa-1', 'published' => false, 'data' => ['title' => 'Alfa (Duplicated)', 'duplicated_from' => 'alfa-id'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'alfa-1', 'published' => false, 'data' => ['title' => 'Alfa (French) (Duplicated)', 'duplicated_from' => 'alfa-id-fr'], 'locale' => 'fr', 'origin' => 'en.alfa-1'],
+            ['slug' => 'alfa-1', 'published' => false, 'data' => ['title' => 'Alfa (Spanish) (Duplicated)', 'duplicated_from' => 'alfa-id-es'], 'locale' => 'es', 'origin' => 'en.alfa-1'],
+        ], $this->entryData());
+    }
+
+    /** @test */
+    public function it_duplicates_an_entry_with_nested_localizations()
+    {
+        Site::setConfig(['sites' => [
+            'en' => ['url' => 'http://domain.com/', 'locale' => 'en'],
+            'fr' => ['url' => 'http://domain.com/fr/', 'locale' => 'fr'],
+            'fr_ca' => ['url' => 'http://domain.com/fr-ca/', 'locale' => 'fr_CA'],
+            'es' => ['url' => 'http://domain.com/es/', 'locale' => 'es'],
+        ]]);
+
+        Collection::make('test')->sites(['en', 'fr', 'fr_ca', 'es'])->save();
+
+        $entry = EntryFactory::id('alfa-id')->locale('en')->collection('test')->slug('alfa')->data(['title' => 'Alfa'])->create();
+        $entry->makeLocalization('es')->id('alfa-id-es')->data(['title' => 'Alfa (Spanish)'])->save();
+        $french = tap($entry->makeLocalization('fr')->id('alfa-id-fr')->data(['title' => 'Alfa (French)']))->save();
+        $french->makeLocalization('fr_ca')->id('alfa-id-fr-ca')->data(['title' => 'Alfa (French Canadian)'])->save();
+
+        $this->assertEquals([
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa'], 'locale' => 'en', 'origin' => ''],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (Spanish)'], 'locale' => 'es', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (French)'], 'locale' => 'fr', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (French Canadian)'], 'locale' => 'fr_ca', 'origin' => 'fr.alfa'],
+        ], $this->entryData());
+
+        $this->setTestRoles(['test' => [
+            'create test entries',
+            'access en site',
+            'access es site',
+            'access fr site',
+            'access fr_ca site',
+        ]]);
+
+        $this->actingAs(tap(User::make()->assignRole('test'))->save());
+
+        (new DuplicateEntry)->run(collect([
+            Entry::find('alfa-id'),
+        ]), []);
+
+        $this->assertEquals([
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (Spanish)'], 'locale' => 'es', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (French)'], 'locale' => 'fr', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (French Canadian)'], 'locale' => 'fr_ca', 'origin' => 'fr.alfa'],
+            ['slug' => 'alfa-1', 'published' => false, 'data' => ['title' => 'Alfa (Duplicated)', 'duplicated_from' => 'alfa-id'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'alfa-1', 'published' => false, 'data' => ['title' => 'Alfa (Spanish) (Duplicated)', 'duplicated_from' => 'alfa-id-es'], 'locale' => 'es', 'origin' => 'en.alfa-1'],
+            ['slug' => 'alfa-1', 'published' => false, 'data' => ['title' => 'Alfa (French) (Duplicated)', 'duplicated_from' => 'alfa-id-fr'], 'locale' => 'fr', 'origin' => 'en.alfa-1'],
+            ['slug' => 'alfa-1', 'published' => false, 'data' => ['title' => 'Alfa (French Canadian) (Duplicated)', 'duplicated_from' => 'alfa-id-fr-ca'], 'locale' => 'fr_ca', 'origin' => 'fr.alfa-1'],
+        ], $this->entryData());
+    }
+
+    /** @test */
+    public function it_only_duplicates_authorized_localizations()
+    {
+        Site::setConfig(['sites' => [
+            'en' => ['url' => 'http://domain.com/', 'locale' => 'en'],
+            'fr' => ['url' => 'http://domain.com/fr/', 'locale' => 'fr'],
+            'es' => ['url' => 'http://domain.com/es/', 'locale' => 'es'],
+        ]]);
+
+        Collection::make('test')->sites(['en', 'fr', 'es'])->save();
+
+        $entry = EntryFactory::id('alfa-id')->locale('en')->collection('test')->slug('alfa')->data(['title' => 'Alfa'])->create();
+        $entry->makeLocalization('fr')->id('alfa-id-fr')->data(['title' => 'Alfa (French)'])->save();
+        $entry->makeLocalization('es')->id('alfa-id-es')->data(['title' => 'Alfa (Spanish)'])->save();
+
+        $this->assertEquals([
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa'], 'locale' => 'en', 'origin' => ''],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (French)'], 'locale' => 'fr', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (Spanish)'], 'locale' => 'es', 'origin' => 'en.alfa'],
+        ], $this->entryData());
+
+        $this->setTestRoles(['test' => [
+            'create test entries',
+            'access en site',
+            'access es site',
+        ]]);
+
+        $this->actingAs(tap(User::make()->assignRole('test'))->save());
+
+        (new DuplicateEntry)->run(collect([
+            Entry::find('alfa-id'),
+        ]), []);
+
+        $this->assertEquals([
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (French)'], 'locale' => 'fr', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (Spanish)'], 'locale' => 'es', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa-1', 'published' => false, 'data' => ['title' => 'Alfa (Duplicated)', 'duplicated_from' => 'alfa-id'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'alfa-1', 'published' => false, 'data' => ['title' => 'Alfa (Spanish) (Duplicated)', 'duplicated_from' => 'alfa-id-es'], 'locale' => 'es', 'origin' => 'en.alfa-1'],
+        ], $this->entryData());
+    }
+
+    /** @test */
+    public function it_doesnt_duplicate_authorized_descendants_of_unauthorized_localizations()
+    {
+        // 🤯
+
+        Site::setConfig(['sites' => [
+            'en' => ['url' => 'http://domain.com/', 'locale' => 'en'],
+            'fr' => ['url' => 'http://domain.com/fr/', 'locale' => 'fr'],
+            'fr_ca' => ['url' => 'http://domain.com/fr-ca/', 'locale' => 'fr_CA'],
+            'es' => ['url' => 'http://domain.com/es/', 'locale' => 'es'],
+        ]]);
+
+        Collection::make('test')->sites(['en', 'fr', 'fr_ca', 'es'])->save();
+
+        $entry = EntryFactory::id('alfa-id')->locale('en')->collection('test')->slug('alfa')->data(['title' => 'Alfa'])->create();
+        $entry->makeLocalization('es')->id('alfa-id-es')->data(['title' => 'Alfa (Spanish)'])->save();
+        $french = tap($entry->makeLocalization('fr')->id('alfa-id-fr')->data(['title' => 'Alfa (French)']))->save();
+        $french->makeLocalization('fr_ca')->id('alfa-id-fr-ca')->data(['title' => 'Alfa (French Canadian)'])->save();
+
+        $this->assertEquals([
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa'], 'locale' => 'en', 'origin' => ''],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (Spanish)'], 'locale' => 'es', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (French)'], 'locale' => 'fr', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (French Canadian)'], 'locale' => 'fr_ca', 'origin' => 'fr.alfa'],
+        ], $this->entryData());
+
+        $this->setTestRoles(['test' => [
+            'create test entries',
+            'access en site',
+            'access es site',
+            // 'access fr site', // no permission for fr
+            'access fr_ca site',
+        ]]);
+
+        $this->actingAs(tap(User::make()->assignRole('test'))->save());
+
+        (new DuplicateEntry)->run(collect([
+            Entry::find('alfa-id'),
+        ]), []);
+
+        $this->assertEquals([
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (Spanish)'], 'locale' => 'es', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (French)'], 'locale' => 'fr', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa (French Canadian)'], 'locale' => 'fr_ca', 'origin' => 'fr.alfa'],
+            ['slug' => 'alfa-1', 'published' => false, 'data' => ['title' => 'Alfa (Duplicated)', 'duplicated_from' => 'alfa-id'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'alfa-1', 'published' => false, 'data' => ['title' => 'Alfa (Spanish) (Duplicated)', 'duplicated_from' => 'alfa-id-es'], 'locale' => 'es', 'origin' => 'en.alfa-1'],
+            // No french *or* french canadian, even though french canadian is authorized.
+        ], $this->entryData());
+    }
+
+    /** @test */
+    public function it_duplicates_an_entry_from_a_non_default_site()
+    {
+        Site::setConfig(['sites' => [
+            'en' => ['url' => 'http://domain.com/', 'locale' => 'en'],
+            'fr' => ['url' => 'http://domain.com/fr/', 'locale' => 'fr'],
+        ]]);
+
+        Collection::make('test')->sites(['en', 'fr'])->save();
+
+        EntryFactory::id('alfa-id')->locale('en')->collection('test')->slug('alfa')->data(['title' => 'Alfa'])->create();
+        EntryFactory::id('bravo-id')->locale('fr')->collection('test')->slug('bravo')->data(['title' => 'Bravo'])->create();
+
+        $this->assertEquals([
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'bravo', 'published' => true, 'data' => ['title' => 'Bravo'], 'locale' => 'fr', 'origin' => null],
+        ], $this->entryData());
+
+        // Make super user since this test isn't concerned with permissions.
+        $this->actingAs(tap(User::make()->makeSuper())->save());
+
+        (new DuplicateEntry)->run(collect([
+            Entry::find('bravo-id'),
+        ]), []);
+
+        $this->assertEquals([
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'bravo', 'published' => true, 'data' => ['title' => 'Bravo'], 'locale' => 'fr', 'origin' => null],
+            ['slug' => 'bravo-1', 'published' => false, 'data' => ['title' => 'Bravo (Duplicated)', 'duplicated_from' => 'bravo-id'], 'locale' => 'fr', 'origin' => null],
+        ], $this->entryData());
+    }
+
+    /** @test */
+    public function if_an_entry_has_an_origin_it_duplicates_the_root_origin()
+    {
+        Site::setConfig(['sites' => [
+            'en' => ['url' => 'http://domain.com/', 'locale' => 'en'],
+            'fr' => ['url' => 'http://domain.com/fr/', 'locale' => 'fr'],
+        ]]);
+
+        Collection::make('test')->sites(['en', 'fr'])->save();
+
+        $entry = EntryFactory::id('alfa-id')->locale('en')->collection('test')->slug('alfa')->data(['title' => 'Alfa'])->create();
+        $entry->makeLocalization('fr')->id('alfa-id-fr')->slug('alfa-fr')->data(['title' => 'Alfa (French)'])->save();
+
+        $this->assertEquals([
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'alfa-fr', 'published' => true, 'data' => ['title' => 'Alfa (French)'], 'locale' => 'fr', 'origin' => 'en.alfa'],
+        ], $this->entryData());
+
+        // Make super user since this test isn't concerned with permissions.
+        $this->actingAs(tap(User::make()->makeSuper())->save());
+
+        (new DuplicateEntry)->run(collect([
+            Entry::find('alfa-id-fr'),
+        ]), []);
+
+        $this->assertEquals([
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'alfa-fr', 'published' => true, 'data' => ['title' => 'Alfa (French)'], 'locale' => 'fr', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa-1', 'published' => false, 'data' => ['title' => 'Alfa (Duplicated)', 'duplicated_from' => 'alfa-id'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'alfa-fr-1', 'published' => false, 'data' => ['title' => 'Alfa (French) (Duplicated)', 'duplicated_from' => 'alfa-id-fr'], 'locale' => 'fr', 'origin' => 'en.alfa-1'],
+        ], $this->entryData());
+    }
+
+    /** @test */
+    public function if_an_entry_has_an_origin_and_the_root_origin_is_also_selected_it_only_duplicates_the_root_origin()
+    {
+        Site::setConfig(['sites' => [
+            'en' => ['url' => 'http://domain.com/', 'locale' => 'en'],
+            'fr' => ['url' => 'http://domain.com/fr/', 'locale' => 'fr'],
+        ]]);
+
+        Collection::make('test')->sites(['en', 'fr'])->save();
+
+        $entry = EntryFactory::id('alfa-id')->locale('en')->collection('test')->slug('alfa')->data(['title' => 'Alfa'])->create();
+        $entry->makeLocalization('fr')->id('alfa-id-fr')->slug('alfa-fr')->data(['title' => 'Alfa (French)'])->save();
+
+        $this->assertEquals([
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'alfa-fr', 'published' => true, 'data' => ['title' => 'Alfa (French)'], 'locale' => 'fr', 'origin' => 'en.alfa'],
+        ], $this->entryData());
+
+        // Make super user since this test isn't concerned with permissions.
+        $this->actingAs(tap(User::make()->makeSuper())->save());
+
+        (new DuplicateEntry)->run(collect([
+            Entry::find('alfa-id-fr'),
+            Entry::find('alfa-id'),
+        ]), []);
+
+        $this->assertEquals([
+            ['slug' => 'alfa', 'published' => true, 'data' => ['title' => 'Alfa'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'alfa-fr', 'published' => true, 'data' => ['title' => 'Alfa (French)'], 'locale' => 'fr', 'origin' => 'en.alfa'],
+            ['slug' => 'alfa-1', 'published' => false, 'data' => ['title' => 'Alfa (Duplicated)', 'duplicated_from' => 'alfa-id'], 'locale' => 'en', 'origin' => null],
+            ['slug' => 'alfa-fr-1', 'published' => false, 'data' => ['title' => 'Alfa (French) (Duplicated)', 'duplicated_from' => 'alfa-id-fr'], 'locale' => 'fr', 'origin' => 'en.alfa-1'],
+        ], $this->entryData());
+    }
+
     private function entryData()
     {
-        return Entry::all()->map(fn ($entry) => [
-            'slug' => $entry->slug(),
-            'published' => $entry->published(),
-            'data' => $entry->data()->all(),
-        ])->all();
+        return Entry::all()->map(function ($entry) {
+            $arr = [
+                'slug' => $entry->slug(),
+                'published' => $entry->published(),
+                'data' => $entry->data()->all(),
+            ];
+
+            if (Site::hasMultiple()) {
+                $arr['locale'] = $entry->locale();
+                // Use locale.slug string instead of id since we won't always know it in advance
+                $arr['origin'] = $entry->hasOrigin() ? $entry->origin()->locale().'.'.$entry->origin()->slug() : null;
+            }
+
+            return $arr;
+        })->all();
     }
 }

From 00cb12e6567b0dc272476e05c8e1ad59f1ae06d4 Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <ryan@thoughtcollective.com>
Date: Fri, 20 Oct 2023 18:11:03 +0100
Subject: [PATCH 34/36] [4.x] Add `EntryDeleting` to allow you to prevent items
 being deleted (#8833)

---
 src/Entries/Entry.php            |  5 +++++
 src/Events/EntryDeleting.php     | 23 ++++++++++++++++++++
 tests/Data/Entries/EntryTest.php | 36 ++++++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+)
 create mode 100644 src/Events/EntryDeleting.php

diff --git a/src/Entries/Entry.php b/src/Entries/Entry.php
index 51b1ba6738..65e3b30ed9 100644
--- a/src/Entries/Entry.php
+++ b/src/Entries/Entry.php
@@ -29,6 +29,7 @@
 use Statamic\Events\EntryBlueprintFound;
 use Statamic\Events\EntryCreated;
 use Statamic\Events\EntryDeleted;
+use Statamic\Events\EntryDeleting;
 use Statamic\Events\EntrySaved;
 use Statamic\Events\EntrySaving;
 use Statamic\Facades;
@@ -166,6 +167,10 @@ public function newAugmentedInstance(): Augmented
 
     public function delete()
     {
+        if (EntryDeleting::dispatch($this) === false) {
+            return false;
+        }
+
         if ($this->descendants()->map->fresh()->filter()->isNotEmpty()) {
             throw new \Exception('Cannot delete an entry with localizations.');
         }
diff --git a/src/Events/EntryDeleting.php b/src/Events/EntryDeleting.php
new file mode 100644
index 0000000000..3b2e64ce8f
--- /dev/null
+++ b/src/Events/EntryDeleting.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Statamic\Events;
+
+class EntryDeleting extends Event
+{
+    public $entry;
+
+    public function __construct($entry)
+    {
+        $this->entry = $entry;
+    }
+
+    /**
+     * Dispatch the event with the given arguments, and halt on first non-null listener response.
+     *
+     * @return mixed
+     */
+    public static function dispatch()
+    {
+        return event(new static(...func_get_args()), [], true);
+    }
+}
diff --git a/tests/Data/Entries/EntryTest.php b/tests/Data/Entries/EntryTest.php
index c3022292b3..f0dcd3bc67 100644
--- a/tests/Data/Entries/EntryTest.php
+++ b/tests/Data/Entries/EntryTest.php
@@ -21,6 +21,8 @@
 use Statamic\Entries\Entry;
 use Statamic\Events\EntryBlueprintFound;
 use Statamic\Events\EntryCreated;
+use Statamic\Events\EntryDeleted;
+use Statamic\Events\EntryDeleting;
 use Statamic\Events\EntrySaved;
 use Statamic\Events\EntrySaving;
 use Statamic\Facades;
@@ -1856,6 +1858,40 @@ public function it_deletes_through_the_api()
         $this->assertTrue($return);
     }
 
+    /** @test */
+    public function it_fires_a_deleting_event()
+    {
+        Event::fake();
+
+        $entry = EntryFactory::collection('test')->create();
+
+        $entry->delete();
+
+        Event::assertDispatched(EntryDeleting::class, function ($event) use ($entry) {
+            return $event->entry === $entry;
+        });
+    }
+
+    /** @test */
+    public function it_does_not_delete_when_a_deleting_event_returns_false()
+    {
+        Facades\Entry::spy();
+        Event::fake([EntryDeleted::class]);
+
+        Event::listen(EntryDeleting::class, function () {
+            return false;
+        });
+
+        $collection = tap(Collection::make('test'))->save();
+        $entry = (new Entry)->collection($collection);
+
+        $return = $entry->delete();
+
+        $this->assertFalse($return);
+        Facades\Entry::shouldNotHaveReceived('delete');
+        Event::assertNotDispatched(EntryDeleted::class);
+    }
+
     /** @test */
     public function it_prevents_deleting_if_there_are_descendants()
     {

From 329000b43e5df19eecfea3d192a482ebc0e6ae95 Mon Sep 17 00:00:00 2001
From: Jonas Siewertsen <jonas.siewertsen@spiegel.de>
Date: Fri, 20 Oct 2023 22:12:36 +0200
Subject: [PATCH 35/36] [4.x] Cache Blueprint columns (#8840)

Co-authored-by: Jason Varga <jason@pixelfear.com>
---
 src/Fields/Blueprint.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Fields/Blueprint.php b/src/Fields/Blueprint.php
index 307cee257f..66272c2a7a 100644
--- a/src/Fields/Blueprint.php
+++ b/src/Fields/Blueprint.php
@@ -39,6 +39,7 @@ class Blueprint implements Arrayable, ArrayAccess, Augmentable, QueryableValue
     protected $ensuredFields = [];
     protected $afterSaveCallbacks = [];
     protected $withEvents = true;
+    private ?Columns $columns = null;
 
     public function setHandle(string $handle)
     {
@@ -359,6 +360,10 @@ public function field($field)
 
     public function columns()
     {
+        if ($this->columns) {
+            return $this->columns;
+        }
+
         $columns = $this->fields()
             ->all()
             ->values()
@@ -375,7 +380,7 @@ public function columns()
             })
             ->keyBy('field');
 
-        return new Columns($columns);
+        return $this->columns = new Columns($columns);
     }
 
     public function isEmpty(): bool

From c24b6985543c91655100f6b8a7f27074a45ad3b9 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 20 Oct 2023 16:20:22 -0400
Subject: [PATCH 36/36] changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3df7b2cd5..9530435edf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Release Notes
 
+## 4.30.0 (2023-10-20)
+
+### What's new
+- Multi-site Duplicator Support. [#8665](https://github.com/statamic/cms/issues/8665) by @duncanmcclean
+- Add `EntryDeleting` to allow you to prevent items being deleted [#8833](https://github.com/statamic/cms/issues/8833) by @ryanmitchell
+
+### What's improved
+- Cache Blueprint columns. [#8840](https://github.com/statamic/cms/issues/8840) by @jonassiewertsen
+
+### What's fixed
+- Default to using the CP broker when multiple are available. [#8872](https://github.com/statamic/cms/issues/8872) by @ryanmitchell
+
+
+
 ## 4.29.0 (2023-10-19)
 
 ### What's new