Merge branch '4.x' into pr/5502

ryanmitchell · Dec 5, 2023 · 75a370d · 75a370d
2 parents 676969a + af45cab
commit 75a370d
Show file tree

Hide file tree

Showing 328 changed files with 7,920 additions and 1,217 deletions.
diff --git 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 }}
 
@@ -50,6 +52,7 @@ jobs:
             tests
             composer.json
             phpunit.xml.dist
+            .github/workflows/tests.yml
             **.php
 
       - name: Determine whether tests should run
@@ -60,8 +63,7 @@ jobs:
       - name: Update apt sources
         if: steps.should-run-tests.outputs.result == 'true' && matrix.os == 'ubuntu-latest'
         run: |
-          sudo gem install apt-spy2
-          sudo apt-spy2 fix --commit --launchpad --country=US
+          sudo apt-get check || sudo apt --fix-broken install -y
           sudo apt-get update
 
       - name: Install French Locale

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/composer.json b/composer.json
@@ -39,6 +39,7 @@
     "require-dev": {
         "fakerphp/faker": "~1.10",
         "google/cloud-translate": "^1.6",
+        "laravel/pint": "^1.0",
         "mockery/mockery": "^1.3.3",
         "orchestra/testbench": "^7.0 || ^8.0",
         "phpunit/phpunit": "^9.0"

diff --git a/config/assets.php b/config/assets.php
@@ -198,4 +198,16 @@
 
     'lowercase' => true,
 
+    /*
+    |--------------------------------------------------------------------------
+    | Additional Uploadable Extensions
+    |--------------------------------------------------------------------------
+    |
+    | Statamic will only allow uploads of certain approved file extensions.
+    | If you need to allow more file extensions, you may add them here.
+    |
+    */
+
+    'additional_uploadable_extensions' => [],
+
 ];
diff --git a/config/forms.php b/config/forms.php
@@ -48,27 +48,21 @@
 
     /*
     |--------------------------------------------------------------------------
-    | CSV Export Delimiter
+    | Exporters
     |--------------------------------------------------------------------------
     |
-    | Statamic will use this character as delimiter for csv exports.
+    | Here you may define all the available form submission exporters.
+    | You may customize the options within each exporter's array.
     |
     */
 
-    'csv_delimiter' => ',',
-
-    /*
-    |--------------------------------------------------------------------------
-    | CSV Export Headings
-    |--------------------------------------------------------------------------
-    |
-    | The values to be used in the csv export header rows.
-    | Can be the field handle or the field display text.
-    |
-    | Supported values: "handle", "display"
-    |
-    */
-
-    'csv_headers' => 'handle',
+    'exporters' => [
+        'csv' => [
+            'class' => Statamic\Forms\Exporters\CsvExporter::class,
+        ],
+        'json' => [
+            'class' => Statamic\Forms\Exporters\JsonExporter::class,
+        ],
+    ],
 
 ];
diff --git 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/package-lock.json b/package-lock.json
diff --git a/resources/css/components/fieldtypes/bard.css b/resources/css/components/fieldtypes/bard.css
@@ -17,7 +17,7 @@
     }
 }
 
-.bard-editor .bard-invalid {
+.bard-editor .bard-error {
     @apply p-2 @lg:px-4 bg-red-100 text-red-500 text-xs whitespace-nowrap;
 }
 
@@ -465,7 +465,7 @@
     }
 
     p > code {
-        @apply font-mono bg-gray-400 rounded-sm text-xs relative;
+        @apply font-mono bg-gray-400 rounded-sm text-xs;
         padding: 2px 4px;
         top: -1px;
     }

diff --git a/resources/css/components/global-header.css b/resources/css/components/global-header.css
@@ -108,10 +108,13 @@
     .v-select { @apply h-full }
     .vs__dropdown-toggle { @apply border-none bg-none }
     .vs__actions { @apply hidden }
-    .vs__search { @apply hidden }
+    .vs__search { @apply p-0 }
     .vs__selected-options { @apply border-none shadow-none p-0 bg-none }
     .vs__selected { @apply flex }
-    .vs__dropdown-toggle { @apply h-full rounded-none bg-transparent }
+    .vs__dropdown-toggle {
+        @apply h-full rounded-none bg-transparent;
+        box-shadow: none;
+    }
 
     .vs--single.vs--unsearchable .vs__selected-options { @apply bg-none }
 }

diff --git a/resources/css/components/publish.css b/resources/css/components/publish.css
@@ -89,7 +89,8 @@ code.parent-url {
 }
 
 .publish-section-header-inner {
-    @apply px-3 @sm:px-4 @lg:px-6 pt-4 pb-3;
+    @apply px-4 @lg:px-6 pt-4 pb-3;
+
 }
 
 .publish-sidebar {