Merge branch '5.x'

jasonvarga · jasonvarga · commit 928b17af9d01 · 2025-09-03T11:58:48.000-04:00
# Conflicts:
#	config/assets.php
#	resources/js/components/assets/Browser/Browser.vue
#	resources/views/blueprints/index.blade.php
#	src/Http/Controllers/CP/Assets/AssetContainersController.php
#	src/Http/Controllers/CP/Collections/EntriesController.php
#	src/Policies/AssetFolderPolicy.php
diff --git a/config/assets.php b/config/assets.php
@@ -235,4 +235,16 @@
         'cache_path' => storage_path('statamic/glide/ffmpeg'),
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Use V6 Permissions
+    |--------------------------------------------------------------------------
+    |
+    | This allows you to opt in to the asset permissions that will become the
+    | default behavior in Statamic 6. This will be removed in Statamic 6.
+    |
+    */
+
+    'v6_permissions' => false,
+
 ];
diff --git a/resources/js/components/assets/Browser/Browser.vue b/resources/js/components/assets/Browser/Browser.vue
@@ -297,24 +297,15 @@ export default {
         },
 
         canCreateFolders() {
-            return (
-                this.folder &&
-                this.container.create_folders &&
-                !this.restrictFolderNavigation &&
-                (this.can('upload ' + this.container.id + ' assets') || this.can('configure asset containers'))
-            );
+            return this.folder && this.container.create_folders && !this.restrictFolderNavigation;
         },
 
         canEdit() {
             return this.can('edit ' + this.container.id + ' assets') || this.can('configure asset containers');
         },
 
         canUpload() {
-            return (
-                this.folder &&
-                this.container.allow_uploads &&
-                (this.can('upload ' + this.container.id + ' assets') || this.can('configure asset containers'))
-            );
+            return this.folder && this.container.allow_uploads;
         },
 
         containerIsEmpty() {
diff --git a/resources/lang/de/permissions.php b/resources/lang/de/permissions.php
@@ -57,6 +57,11 @@
     'move_{container}_assets' => 'Dateien verschieben',
     'rename_{container}_assets' => 'Dateien umbenennen',
     'delete_{container}_assets' => 'Dateien löschen',
+    'edit_{container}_folders' => 'Ordner bearbeiten',
+    'create_{container}_folders' => 'Ordner erstellen',
+    'move_{container}_folders' => 'Ordner verschieben',
+    'rename_{container}_folders' => 'Ordner umbenennen',
+    'delete_{container}_folders' => 'Ordner löschen',
     'group_forms' => 'Formulare',
     'configure_forms' => 'Formulare konfigurieren',
     'configure_forms_desc' => 'Gewährt Zugriff auf alle Berechtigungen im Zusammenhang mit Formularen.',
diff --git a/resources/lang/de_CH/permissions.php b/resources/lang/de_CH/permissions.php
@@ -57,6 +57,11 @@
     'move_{container}_assets' => 'Dateien verschieben',
     'rename_{container}_assets' => 'Dateien umbenennen',
     'delete_{container}_assets' => 'Dateien löschen',
+    'edit_{container}_folders' => 'Ordner bearbeiten',
+    'create_{container}_folders' => 'Ordner erstellen',
+    'move_{container}_folders' => 'Ordner verschieben',
+    'rename_{container}_folders' => 'Ordner umbenennen',
+    'delete_{container}_folders' => 'Ordner löschen',
     'group_forms' => 'Formulare',
     'configure_forms' => 'Formulare konfigurieren',
     'configure_forms_desc' => 'Gewährt Zugriff auf alle Berechtigungen im Zusammenhang mit Formularen.',
diff --git a/resources/lang/en/permissions.php b/resources/lang/en/permissions.php
@@ -63,6 +63,11 @@
     'move_{container}_assets' => 'Move assets',
     'rename_{container}_assets' => 'Rename assets',
     'delete_{container}_assets' => 'Delete assets',
+    'edit_{container}_folders' => 'Edit folders',
+    'create_{container}_folders' => 'Create folders',
+    'move_{container}_folders' => 'Move folders',
+    'rename_{container}_folders' => 'Rename folders',
+    'delete_{container}_folders' => 'Delete folders',
 
     'group_forms' => 'Forms',
     'configure_forms' => 'Configure forms',
diff --git a/resources/lang/es/permissions.php b/resources/lang/es/permissions.php
@@ -57,6 +57,11 @@
     'move_{container}_assets' => 'Mover medios',
     'rename_{container}_assets' => 'Renombrar medios',
     'delete_{container}_assets' => 'Eliminar medios',
+    'edit_{container}_folders' => 'Editar carpetas',
+    'create_{container}_folders' => 'Crear carpetas',
+    'move_{container}_folders' => 'Mover carpetas',
+    'rename_{container}_folders' => 'Renombrar carpetas',
+    'delete_{container}_folders' => 'Eliminar carpetas',
     'group_forms' => 'Formularios',
     'configure_forms' => 'Configurar formularios',
     'configure_forms_desc' => 'Otorga acceso a todos los permisos relacionados con formularios',
diff --git a/resources/lang/fr/permissions.php b/resources/lang/fr/permissions.php
@@ -57,6 +57,11 @@
     'move_{container}_assets' => 'Déplacer des ressources',
     'rename_{container}_assets' => 'Renommer des ressources',
     'delete_{container}_assets' => 'Supprimer des ressources',
+    'edit_{container}_folders' => 'Modifier des dossiers',
+    'create_{container}_folders' => 'Créer des dossiers',
+    'move_{container}_folders' => 'Déplacer des dossiers',
+    'rename_{container}_folders' => 'Renommer des dossiers',
+    'delete_{container}_folders' => 'Supprimer des dossiers',
     'group_forms' => 'Formulaires',
     'configure_forms' => 'Configurer les formulaires',
     'configure_forms_desc' => 'Permet d’accéder à toutes les autorisations liées aux formulaires.',
diff --git a/resources/lang/it/permissions.php b/resources/lang/it/permissions.php
@@ -57,6 +57,11 @@
     'move_{container}_assets' => 'Sposta media',
     'rename_{container}_assets' => 'Rinomina media',
     'delete_{container}_assets' => 'Elimina media',
+    'edit_{container}_folders' => 'Modifica cartelle',
+    'create_{container}_folders' => 'Crea cartelle',
+    'move_{container}_folders' => 'Sposta cartelle',
+    'rename_{container}_folders' => 'Rinomina cartelle',
+    'delete_{container}_folders' => 'Elimina cartelle',
     'group_forms' => 'Form',
     'configure_forms' => 'Configura form',
     'configure_forms_desc' => 'Consente l\'accesso a tutti i permessi relativi ai form',
diff --git a/resources/lang/nl/permissions.php b/resources/lang/nl/permissions.php
@@ -57,6 +57,11 @@
     'move_{container}_assets' => 'Verplaats assets',
     'rename_{container}_assets' => 'Hernoem assets',
     'delete_{container}_assets' => 'Verwijder assets',
+    'edit_{container}_folders' => 'Wijzig mappen',
+    'create_{container}_folders' => 'Maak mappen aan',
+    'move_{container}_folders' => 'Verplaats mappen',
+    'rename_{container}_folders' => 'Hernoem mappen',
+    'delete_{container}_folders' => 'Verwijder mappen',
     'group_forms' => 'Formulieren',
     'configure_forms' => 'Beheer formulieren',
     'configure_forms_desc' => 'Geeft toegang tot alle rechten behorende bij formulieren',
diff --git a/resources/views/blueprints/index.blade.php b/resources/views/blueprints/index.blade.php
@@ -258,7 +258,7 @@
                             <td>
                                 <div class="flex items-center gap-2">
                                     <ui-icon name="blueprints" class="text-gray-500 me-1" />
-                                    <a href="{{ cp_route('blueprints.additional.edit', [$blueprint['namespace'], $blueprint['handle']]) }}" v-pre>{{ $blueprint['title'] }}</a>
+                                    <a href="{{ cp_route('blueprints.additional.edit', [$blueprint['namespace'], $blueprint['handle']]) }}" v-pre>{{ __($blueprint['title']) }}</a>
                                 </div>
                             </td>
                             <td class="actions-column">
diff --git a/src/Actions/RenameAssetFolder.php b/src/Actions/RenameAssetFolder.php
@@ -11,7 +11,7 @@ class RenameAssetFolder extends Action
 
     public static function title()
     {
-        return __('Rename Folder');
+        return __('Rename');
     }
 
     public function visibleTo($item)
diff --git a/src/Assets/AssetContainer.php b/src/Assets/AssetContainer.php
@@ -520,6 +520,8 @@ public function private()
      *
      * @param  bool|null  $allowDownloading
      * @return bool|$this
+     *
+     * @deprecated
      */
     public function allowDownloading($allowDownloading = null)
     {
@@ -536,6 +538,8 @@ public function allowDownloading($allowDownloading = null)
      *
      * @param  bool|null  $allowMoving
      * @return bool|$this
+     *
+     * @deprecated
      */
     public function allowMoving($allowMoving = null)
     {
@@ -552,6 +556,8 @@ public function allowMoving($allowMoving = null)
      *
      * @param  bool|null  $allowRenaming
      * @return bool|$this
+     *
+     * @deprecated
      */
     public function allowRenaming($allowRenaming = null)
     {
@@ -568,6 +574,8 @@ public function allowRenaming($allowRenaming = null)
      *
      * @param  bool|null  $allowUploads
      * @return bool|$this
+     *
+     * @deprecated
      */
     public function allowUploads($allowUploads = null)
     {
@@ -584,6 +592,8 @@ public function allowUploads($allowUploads = null)
      *
      * @param  bool|null  $createFolders
      * @return bool|$this
+     *
+     * @deprecated
      */
     public function createFolders($createFolders = null)
     {
diff --git a/src/Auth/CorePermissions.php b/src/Auth/CorePermissions.php
@@ -165,14 +165,20 @@ protected function registerAssets()
         $this->register('configure asset containers');
 
         $this->register('view {container} assets', function ($permission) {
-            $this->permission($permission)->children([
+            $childPermissions = [
                 $this->permission('upload {container} assets'),
                 $this->permission('edit {container} assets')->children([
                     $this->permission('move {container} assets'),
                     $this->permission('rename {container} assets'),
                     $this->permission('delete {container} assets'),
                 ]),
-            ])->replacements('container', function () {
+            ];
+
+            if (config('statamic.assets.v6_permissions')) {
+                $childPermissions[] = $this->permission('edit {container} folders');
+            }
+
+            $this->permission($permission)->children($childPermissions)->replacements('container', function () {
                 return AssetContainer::all()->map(function ($container) {
                     return ['value' => $container->handle(), 'label' => __($container->title())];
                 });
diff --git a/src/Http/Controllers/CP/Assets/AssetContainersController.php b/src/Http/Controllers/CP/Assets/AssetContainersController.php
@@ -3,7 +3,9 @@
 namespace Statamic\Http\Controllers\CP\Assets;
 
 use Illuminate\Http\Request;
+use Statamic\Contracts\Assets\Asset;
 use Statamic\Contracts\Assets\AssetContainer as AssetContainerContract;
+use Statamic\Contracts\Assets\AssetFolder;
 use Statamic\CP\PublishForm;
 use Statamic\Facades\AssetContainer;
 use Statamic\Facades\Blueprint;
@@ -26,11 +28,8 @@ public function index(Request $request)
             return [
                 'id' => $container->handle(),
                 'title' => $container->title(),
-                'allow_downloading' => $container->allowDownloading(),
-                'allow_moving' => $container->allowMoving(),
-                'allow_renaming' => $container->allowRenaming(),
-                'allow_uploads' => $container->allowUploads(),
-                'create_folders' => $container->createFolders(),
+                'allow_uploads' => User::current()->can('store', [Asset::class, $container]),
+                'create_folders' => User::current()->can('create', [AssetFolder::class, $container]),
                 'edit_url' => $container->editUrl(),
                 'delete_url' => $container->deleteUrl(),
                 'blueprint_url' => cp_route('blueprints.asset-containers.edit', $container->handle()),
diff --git a/src/Http/Controllers/CP/Assets/FoldersController.php b/src/Http/Controllers/CP/Assets/FoldersController.php
@@ -5,6 +5,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Statamic\Assets\AssetUploader;
+use Statamic\Contracts\Assets\AssetFolder;
 use Statamic\Facades\Path;
 use Statamic\Http\Controllers\CP\CpController;
 use Statamic\Http\Resources\CP\Assets\Folder;
@@ -14,7 +15,7 @@ class FoldersController extends CpController
 {
     public function store(Request $request, $container)
     {
-        abort_unless($container->createFolders(), 403);
+        $this->authorize('create', [AssetFolder::class, $container]);
 
         $request->validate([
             'path' => 'required',
diff --git a/src/Http/Controllers/CP/Collections/EntriesController.php b/src/Http/Controllers/CP/Collections/EntriesController.php
@@ -7,6 +7,7 @@
 use Statamic\Contracts\Entries\Entry as EntryContract;
 use Statamic\Exceptions\BlueprintNotFoundException;
 use Statamic\Facades\Action;
+use Statamic\Facades\Blink;
 use Statamic\Facades\Entry;
 use Statamic\Facades\Site;
 use Statamic\Facades\Stache;
@@ -91,6 +92,7 @@ public function edit(Request $request, $collection, $entry)
 
         $entry = $entry->fromWorkingCopy();
 
+        Blink::forget("entry-{$entry->id()}-blueprint");
         $blueprint = $entry->blueprint();
 
         if (! $blueprint) {
diff --git a/src/Http/Resources/CP/Assets/Asset.php b/src/Http/Resources/CP/Assets/Asset.php
@@ -56,7 +56,7 @@ public function toArray($request)
             $this->merge($this->thumbnails()),
             $this->merge($this->publishFormData()),
 
-            'allowDownloading' => $this->container()->allowDownloading(),
+            'allowDownloading' => config('statamic.assets.v6_permissions') ? true : $this->container()->allowDownloading(),
             'actionUrl' => cp_route('assets.actions.run'),
             'actions' => Action::for($this->resource, [
                 'container' => $this->container()->handle(),
diff --git a/src/Policies/AssetFolderPolicy.php b/src/Policies/AssetFolderPolicy.php
@@ -10,7 +10,9 @@ class AssetFolderPolicy
 {
     public function before($user)
     {
-        if (User::fromUser($user)->isSuper()) {
+        $user = User::fromUser($user);
+
+        if ($user->isSuper() || $user->hasPermission('configure asset containers')) {
             return true;
         }
     }
@@ -19,7 +21,11 @@ public function create($user, $assetContainer)
     {
         $user = User::fromUser($user);
 
-        if (! $user->hasPermission("upload {$assetContainer->handle()} assets")) {
+        $permission = config('statamic.assets.v6_permissions')
+            ? "edit {$assetContainer->handle()} folders"
+            : "upload {$assetContainer->handle()} assets";
+
+        if (! $user->hasPermission($permission)) {
             return false;
         }
 
@@ -30,7 +36,12 @@ public function move($user, $assetFolder)
     {
         $user = User::fromUser($user);
 
-        if (! $user->hasPermission("move {$assetFolder->container()->handle()} assets")) {
+        $hasPermission = config('statamic.assets.v6_permissions')
+            ? ($user->hasPermission("edit {$assetFolder->container()->handle()} folders")
+                && $user->hasPermission("move {$assetFolder->container()->handle()} assets"))
+            : $user->hasPermission("move {$assetFolder->container()->handle()} assets");
+
+        if (! $hasPermission) {
             return false;
         }
 
@@ -48,7 +59,12 @@ public function rename($user, $assetFolder)
     {
         $user = User::fromUser($user);
 
-        if (! $user->hasPermission("rename {$assetFolder->container()->handle()} assets")) {
+        $hasPermission = config('statamic.assets.v6_permissions')
+            ? ($user->hasPermission("edit {$assetFolder->container()->handle()} folders")
+                && $user->hasPermission("rename {$assetFolder->container()->handle()} assets"))
+            : $user->hasPermission("rename {$assetFolder->container()->handle()} assets");
+
+        if (! $hasPermission) {
             return false;
         }
 
@@ -66,7 +82,12 @@ public function delete($user, $assetFolder)
     {
         $user = User::fromUser($user);
 
-        if (! $user->hasPermission("delete {$assetFolder->container()->handle()} assets")) {
+        $hasPermission = config('statamic.assets.v6_permissions')
+            ? ($user->hasPermission("edit {$assetFolder->container()->handle()} folders")
+                && $user->hasPermission("delete {$assetFolder->container()->handle()} assets"))
+            : $user->hasPermission("delete {$assetFolder->container()->handle()} assets");
+
+        if (! $hasPermission) {
             return false;
         }
 
diff --git a/src/View/Antlers/Language/Nodes/AntlersNode.php b/src/View/Antlers/Language/Nodes/AntlersNode.php
@@ -312,6 +312,8 @@ public function copyBasicDetailsTo($instance)
         $instance->rawEnd = $this->rawEnd;
         $instance->startPosition = $this->startPosition;
         $instance->endPosition = $this->endPosition;
+        $instance->interpolationRegions = $this->interpolationRegions;
+        $instance->processedInterpolationRegions = $this->processedInterpolationRegions;
 
         return $instance;
     }
diff --git a/tests/Antlers/Runtime/UnlessTest.php b/tests/Antlers/Runtime/UnlessTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Antlers\Runtime;
 
+use Illuminate\Support\Str;
 use Tests\Antlers\ParserTestCase;
 
 class UnlessTest extends ParserTestCase
@@ -17,4 +18,19 @@ public function test_elseunless_conditions_does_not_cause_error()
             'last' => false,
         ]));
     }
+
+    public function test_unless_with_vars()
+    {
+        $template = <<<'EOT'
+{{ the_var = 1 }}
+
+{{ unless {the_var} }}true{{ else }}false{{ /unless }}
+{{ if ! {the_var} }}true{{ else }}false{{ /if }}
+EOT;
+
+        $this->assertSame(
+            'false false',
+            Str::squish($this->renderString($template))
+        );
+    }
 }
diff --git a/tests/Feature/AssetContainers/ListAssetContainersTest.php b/tests/Feature/AssetContainers/ListAssetContainersTest.php
diff --git a/tests/Policies/AssetContainerPolicyTest.php b/tests/Policies/AssetContainerPolicyTest.php
diff --git a/tests/Policies/AssetFolderPolicyTest.php b/tests/Policies/AssetFolderPolicyTest.php
diff --git a/tests/Policies/AssetPolicyTest.php b/tests/Policies/AssetPolicyTest.php
