Merge branch 'master' into collection-tree-cache-structure

statamic · Mar 12, 2024 · 7137d80 · 7137d80
2 parents dd4f5c3 + 7ce6c84
commit 7137d80
Show file tree

Hide file tree

Showing 320 changed files with 8,427 additions and 5,716 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -25,7 +25,7 @@ body:
       label: Environment
       description: |
         Details about your environment. Versions of Statamic, PHP, Laravel, any addons that are installed, etc.
-        (Go ahead and just paste the output of the `php please support:details` command.)    
+        (Go ahead and just paste the output of the `php please support:details` command.)
       render: yaml # the format of the command is close to yaml and gets highlighted nicely
     validations:
       required: true
@@ -40,15 +40,6 @@ body:
         - Other (please explain)
     validations:
       required: true
-  - type: dropdown
-    attributes:
-      label: Antlers Parser
-      description: If using 3.3+, which Antlers Parser are you using?
-      options:
-        - Runtime (default)
-        - Regex (legacy)
-    validations:
-      required: false
   - type: textarea
     attributes:
       label: Additional details

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,24 +13,22 @@ jobs:
 
     strategy:
       matrix:
-        php: [8.0, 8.1, 8.2, 8.3]
-        laravel: [9.*, 10.*]
+        php: [8.1, 8.2, 8.3]
+        laravel: [10.*, 11.*]
         stability: [prefer-lowest, prefer-stable]
         os: [ubuntu-latest]
         include:
           - os: windows-latest
-            php: 8.1
-            laravel: 9.*
+            php: 8.3
+            laravel: 10.*
             stability: prefer-stable
           - os: windows-latest
-            php: 8.1
-            laravel: 10.*
+            php: 8.3
+            laravel: 11.*
             stability: prefer-stable
         exclude:
-          - php: 8.0
-            laravel: 10.*
-          - php: 8.3
-            laravel: 9.*
+          - php: 8.1
+            laravel: 11.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
@@ -80,6 +78,16 @@ jobs:
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
           coverage: none
 
+      - name: Install Laravel 11
+        uses: nick-invision/retry@v2
+        if: steps.should-run-tests.outputs.result == 'true' && matrix.laravel == '11.*'
+        with:
+          timeout_minutes: 5
+          max_attempts: 5
+          command: |
+            composer config minimum-stability dev
+            composer config prefer-stable true
+
       - name: Install dependencies
         uses: nick-invision/retry@v2
         if: steps.should-run-tests.outputs.result == 'true'

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,55 @@
 # Release Notes
 
+## 4.53.1 (2024-03-12)
+
+### What's fixed
+- Fix broken navigation tree. [#9709](https://github.com/statamic/cms/issues/9709) by @duncanmcclean
+
+
+
+## 4.53.0 (2024-03-11)
+
+### What's new
+- Persian translation. [#9707](https://github.com/statamic/cms/issues/9707) by @peimn
+- Japanese translation. [#9683](https://github.com/statamic/cms/issues/9683) by @kusaka-kouki
+- Field based redirects may provide a status. [#9417](https://github.com/statamic/cms/issues/9417) by @ryanmitchell
+- RTL support in the Control Panel. [#9447](https://github.com/statamic/cms/issues/9447) by @peimn
+- Add AssetCreating, AssetCreated and AssetSaving events. [#9378](https://github.com/statamic/cms/issues/9378) by @ryanmitchell
+- Add validation to prevent duplicate field handles. [#9337](https://github.com/statamic/cms/issues/9337) by @duncanmcclean
+- Show blueprint title in tree view. [#9413](https://github.com/statamic/cms/issues/9413) by @mmodler
+- Bard & Replicators: Show set group in UI. [#9670](https://github.com/statamic/cms/issues/9670) by @duncanmcclean
+- Users Listing: Allow for configuring default sort field & direction. [#9671](https://github.com/statamic/cms/issues/9671) by @duncanmcclean
+- E.T. Phone Home. [#8416](https://github.com/statamic/cms/issues/8416) by @jackmcdade
+- Date/time fieldtypes use native time fields. [#9662](https://github.com/statamic/cms/issues/9662) by @aaronbushnell
+
+### What's fixed
+- Fix "Create Entry" button on collection widget in multisite. [#9699](https://github.com/statamic/cms/issues/9699) by @duncanmcclean
+- Ensure submission values take precedence over globals data. [#9698](https://github.com/statamic/cms/issues/9698) by @duncanmcclean
+- Fix preferences when user has role via group. [#8957](https://github.com/statamic/cms/issues/8957) by @duncanmcclean
+- Fix bug in deleting users in the CP controller. [#9677](https://github.com/statamic/cms/issues/9677) by @ryanmitchell
+- Fix Collection::computed docblock. [#9673](https://github.com/statamic/cms/issues/9673) by @ajnsn
+- Prevent localizing entries without edit permission. [#9605](https://github.com/statamic/cms/issues/9605) by @duncanmcclean
+
+
+
+## 4.52.0 (2024-03-04)
+
+### What's new
+- OAuth improvements including support for SAML2 providers. [#9612](https://github.com/statamic/cms/issues/9612) by @duncanmcclean
+
+### What's fixed
+- Fix entries not being "linked" to their localizations corrected. [#9661](https://github.com/statamic/cms/issues/9661) by @ryanmitchell
+- Fix prop type warning in validation builder. [#9665](https://github.com/statamic/cms/issues/9665) by @jasonvarga
+- Only suggest fields in the same replicator set. [#9663](https://github.com/statamic/cms/issues/9663) by @jasonvarga
+- Roll back to initial simple isAjax() check on front end forms. [#9629](https://github.com/statamic/cms/issues/9629) by @ryanmitchell
+- Fix Antlers sections not being yieldable in Blade layouts. [#9614](https://github.com/statamic/cms/issues/9614) by @JohnathonKoster
+- Fix Antlers strict equality inside conditions. [#9621](https://github.com/statamic/cms/issues/9621) by @JohnathonKoster
+- Fix test that fails on February 29th. [#9620](https://github.com/statamic/cms/issues/9620) by @jasonvarga
+- Filter away bad bard nodes during preprocessing. [#9608](https://github.com/statamic/cms/issues/9608) by @SylvesterDamgaard
+- Fix page url value in TreeBuilder. [#9611](https://github.com/statamic/cms/issues/9611) by @0kyn
+
+
+
 ## 4.51.0 (2024-02-28)
 
 ### What's new

diff --git a/composer.json b/composer.json
@@ -11,29 +11,28 @@
     "require": {
         "ext-json": "*",
         "ajthinking/archetype": "^1.0.3",
-        "composer/composer": "^1.10.22 || ^2.2.22",
+        "composer/composer": "^2.2.22",
         "facade/ignition-contracts": "^1.0",
         "guzzlehttp/guzzle": "^6.3 || ^7.0",
         "james-heinrich/getid3": "^1.9.21",
-        "laravel/framework": "^9.50.0 || ^10.0",
+        "laravel/framework": "^10.0 || ^11.0",
         "laravel/helpers": "^1.1",
         "league/commonmark": "^2.2",
         "league/csv": "^9.0",
-        "league/glide": "^1.1 || ^2.0",
-        "maennchen/zipstream-php": "^2.2",
+        "league/glide": "^2.0",
+        "maennchen/zipstream-php": "^3.1",
         "michelf/php-smartypants": "^1.8.1",
         "nesbot/carbon": "^2.62.1",
         "pixelfear/composer-dist-plugin": "^0.1.4",
-        "rebing/graphql-laravel": "^6.5 || ^8.0",
+        "rebing/graphql-laravel": "^9.5",
         "rhukster/dom-sanitizer": "^1.0.6",
         "spatie/blink": "^1.3",
         "statamic/stringy": "^3.1.2",
-        "symfony/http-foundation": "^4.3.3 || ^5.1.4 || ^6.0",
-        "symfony/lock": "^5.4",
-        "symfony/var-exporter": "^4.3 || ^5.1 || ^6.0",
-        "symfony/yaml": "^4.1 || ^5.1 || ^6.0",
+        "symfony/lock": "^6.4",
+        "symfony/var-exporter": "^6.0",
+        "symfony/yaml": "^6.0 || ^7.0",
         "ueberdosis/tiptap-php": "^1.1",
-        "voku/portable-ascii": "^1.6.1 || ^2.0",
+        "voku/portable-ascii": "^2.0",
         "wilderborn/partyline": "^1.0"
     },
     "require-dev": {
@@ -42,8 +41,8 @@
         "google/cloud-translate": "^1.6",
         "laravel/pint": "^1.0",
         "mockery/mockery": "^1.3.3",
-        "orchestra/testbench": "^7.0 || ^8.0",
-        "phpunit/phpunit": "^9.0 || ^10.0"
+        "orchestra/testbench": "^8.0 || ^9.x-dev",
+        "phpunit/phpunit": "^10.0"
     },
     "config": {
         "optimize-autoloader": true,

diff --git a/config/antlers.php b/config/antlers.php
@@ -2,18 +2,6 @@
 
 return [
 
-    /*
-    |--------------------------------------------------------------------------
-    | Version
-    |--------------------------------------------------------------------------
-    |
-    | The desired Antlers language version to utilize. Supported values are
-    | "runtime" for the modern parser, or "regex" for the legacy parser.
-    |
-    */
-
-    'version' => 'runtime',
-
     /*
     |--------------------------------------------------------------------------
     | Guarded Variables

diff --git a/config/users.php b/config/users.php
@@ -158,11 +158,25 @@
     |--------------------------------------------------------------------------
     |
     | Here you can configure if impersonation is available, and what URL to
-    | redirect to after impersonation begins
+    | redirect to after impersonation begins.
     |
     */
+
     'impersonate' => [
         'enabled' => env('STATAMIC_IMPERSONATE_ENABLED', true),
         'redirect' => env('STATAMIC_IMPERSONATE_REDIRECT', null),
     ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Sorting
+    |--------------------------------------------------------------------------
+    |
+    | Here you may configure the default sort behavior for user listings.
+    |
+    */
+
+    'sort_field' => 'email',
+    'sort_direction' => 'asc',
+
 ];
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -80,7 +80,7 @@
     "vue": "^2.7.14",
     "vue-clickaway": "~2.2.2",
     "vue-countable": "^1.0.9",
-    "vue-draggable-nested-tree": "^2.2.20",
+    "vue-draggable-nested-tree": "^2.3.0-beta.1",
     "vue-js-modal": "^2.0.1",
     "vue-select": "^3.10.1",
     "vue-toasted": "^1.1.27",

diff --git a/resources/css/components/array.css b/resources/css/components/array.css
@@ -13,7 +13,7 @@
     }
 }
 .array-table {
-    @apply rounded text-sm text-left w-full;
+    @apply rounded text-sm rtl:text-right ltr:text-left w-full;
     &:focus {
         @apply outline-none;
     }
@@ -25,28 +25,28 @@
     }
 
     th {
-        @apply border-r p-2 bg-gray-300;
+        @apply rtl:border-l ltr:border-r p-2 bg-gray-300;
     }
 
     td {
         @apply p-0 m-0;
     }
 
     tr:first-child th {
-        @apply rounded-tl;
+        @apply rtl:rounded-tr ltr:rounded-tl;
     }
 
     tr:first-child td,
     tr:first-child .input-text-minimal {
-        @apply rounded-tr;
+        @apply rtl:rounded-tl ltr:rounded-tr;
     }
 
     tr:last-child th {
-        @apply rounded-bl;
+        @apply rtl:rounded-br ltr:rounded-bl;
     }
     tr:last-child td:last-child,
     tr:last-child .input-minimal {
-        @apply rounded-br;
+        @apply rtl:rounded-bl ltr:rounded-br;
     }
 
     &:focus-within {

diff --git a/resources/css/components/assets.css b/resources/css/components/assets.css
@@ -16,7 +16,7 @@
 		i {
 			position: relative;
 			top: -1px;
-			margin-right: 10px;
+			margin-right: 10px ; [dir="rtl"] & { margin-left: 10px ; margin-right: 0 ; }
 		}
 	}
 }
@@ -60,12 +60,12 @@
 
     .search {
         flex: 1;
-        margin-right: 15px;
-        margin-left: 0;
+        margin-right: 15px ; [dir="rtl"] & { margin-left: 15px ; margin-right: 0 ; }
+        margin-left: 0 ; [dir="rtl"] & { margin-right: 0 ; margin-left: 0 ; }
     }
 
     > .btn {
-        margin-right: 15px;
+        margin-right: 15px ; [dir="rtl"] & { margin-left: 15px ; margin-right: 0 ; }
     }
 }
 
@@ -148,9 +148,9 @@
 
             > * {
                 @apply absolute w-auto h-auto max-w-full max-h-full;
-                left: 50%;
+                left: 50% ; [dir="rtl"] & { left: auto ; right: 50% ; }
                 top: 50%;
-                transform: translate(-50%, -50%);
+                transform: translate(-50%, -50%) ; [dir="rtl"] & { transform: translate(50%, -50%); }
                 box-shadow: 0 0 32px rgba(0, 0, 0, .35);
             }
         }

diff --git a/resources/css/components/blueprints.css b/resources/css/components/blueprints.css
@@ -41,7 +41,9 @@
     &:before {
         content: '';
         @apply border rounded absolute bg-gray-200 shadow-sm;
-        top: -3px; left: 6px; right: 0; bottom: 3px; z-index: 1;
+        top: -3px; left: 6px ; right: 0 ; bottom: 3px; z-index: 1;
+
+        [dir="rtl"] & { left: 0 ; right: 6px ; }
     }
 }
 

diff --git a/resources/css/components/configure.css b/resources/css/components/configure.css
@@ -11,6 +11,6 @@
        > .publish-fields > .toggle-fieldtype {
            @apply flex justify-between items-center flex-wrap;
            .help-block, .help-block p { @apply mb-0; }
-           .field-inner { @apply pr-8; }
+           .field-inner { @apply rtl:pl-8 ltr:pr-8; }
        }
    }
diff --git a/resources/css/components/fieldtypes/array.css b/resources/css/components/fieldtypes/array.css
@@ -24,13 +24,13 @@
         tr:last-child {
             td, th { border-radius: 0; }
         }
-        tr > :first-child { border-left: 0; }
-        tr > :last-child { border-right: 0; }
+        tr > :first-child { border-left: 0 ; [dir="rtl"] & { border-left: 0 ; border-right: 0 ; } }
+        tr > :last-child { border-right: 0 ; [dir="rtl"] & { border-right: 0 ; border-left: 0 ; } }
     }
 
     /*  Dynamic Mode */
     .array-dynamic .btn {
-        @apply text-blue block w-full h-auto border-0 text-left shadow-none;
+        @apply text-blue block w-full h-auto border-0 rtl:text-right ltr:text-left shadow-none;
         background: #f4f4f4;
         padding: 10px 10px 11px;
         margin: 15px 0 0;

diff --git a/resources/css/components/fieldtypes/assets.css b/resources/css/components/fieldtypes/assets.css
@@ -14,7 +14,7 @@
     }
 
     .asset-upload-control {
-      @apply mt-2 @sm:ml-4 @sm:mt-0 text-xs text-gray-600 leading-tight;
+      @apply mt-2 @sm:rtl:mr-4 @sm:ltr:ml-4 @sm:mt-0 text-xs text-gray-600 leading-tight;
     }
 
     .upload-text-button {
@@ -26,7 +26,7 @@
 }
 
 .assets-fieldtype .drag-drop-text {
-    @apply ml-1 text-gray-700;
+    @apply rtl:mr-1 ltr:ml-1 text-gray-700;
 }
 
 .assets-fieldtype .asset-upload-control {