Merge branch '4.x' into pr/6455

.github/workflows/pint-fix.yml

@@ -0,0 +1,29 @@
+name: Fix PHP code style issues
+
+on:
+  push:
+    paths:
+      - '**.php'
+
+permissions:
+  contents: write
+
+jobs:
+  fix-php-code-styling:
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'statamic'
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.head_ref }}
+          token: ${{ secrets.PINT }}
+
+      - name: Fix PHP code style issues
+        uses: aglipanci/laravel-pint-action@1.0.0
+
+      - name: Commit changes
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: Fix styling

.github/workflows/pint-lint.yml

@@ -0,0 +1,20 @@
+name: Lint PHP code style issues
+
+on:
+  pull_request:
+    paths:
+      - '**.php'
+
+jobs:
+  lint-php-code-styling:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Check PHP code style issues
+        uses: aglipanci/laravel-pint-action@1.0.0
+        with:
+          testMode: true
+          verboseMode: true

.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

composer.json

@@ -11,7 +11,7 @@
     "require": {
         "ext-json": "*",
         "ajthinking/archetype": "^1.0.3",
-        "composer/composer": "^1.10.22 || ^2.2.12",
+        "composer/composer": "^1.10.22 || ^2.2.22",
         "facade/ignition-contracts": "^1.0",
         "guzzlehttp/guzzle": "^6.3 || ^7.0",
         "james-heinrich/getid3": "^1.9.21",
@@ -25,7 +25,8 @@
         "nesbot/carbon": "^2.62.1",
         "pixelfear/composer-dist-plugin": "^0.1.4",
         "rebing/graphql-laravel": "^6.5 || ^8.0",
-        "spatie/blink": "^1.1.2",
+        "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",
@@ -38,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"

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' => [],
+
 ];

config/cp.php

@@ -126,4 +126,16 @@
 
     'custom_css_url' => env('STATAMIC_CUSTOM_CSS_URL', null),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Thumbnails
+    |--------------------------------------------------------------------------
+    |
+    | Here you may define additional CP asset thumbnail presets.
+    |
+    */
+
+    'thumbnail_presets' => [
+        // 'medium' => 800,
+    ],
 ];

config/forms.php

@@ -48,13 +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' => ',',
+    'exporters' => [
+        'csv' => [
+            'class' => Statamic\Forms\Exporters\CsvExporter::class,
+        ],
+        'json' => [
+            'class' => Statamic\Forms\Exporters\JsonExporter::class,
+        ],
+    ],
 
 ];

config/markdown.php

@@ -0,0 +1,28 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Markdown Parser Configurations
+    |--------------------------------------------------------------------------
+    |
+    | Here you may define the configuration arrays for each markdown parser.
+    | You may use the base CommonMark options as well as any extensions'
+    | options here. The available options are in the CommonMark docs.
+    |
+    | https://statamic.dev/extending/markdown#configuration
+    |
+    */
+
+    'configs' => [
+
+        'default' => [
+            // 'heading_permalink' => [
+            //     'symbol' => '#',
+            // ],
+        ],
+
+    ],
+
+];

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

config/stache.php

@@ -70,6 +70,11 @@
             'directory' => base_path('content/globals'),
         ],
 
+        'global-variables' => [
+            'class' => Stores\GlobalVariablesStore::class,
+            'directory' => base_path('content/globals'),
+        ],
+
         'asset-containers' => [
             'class' => Stores\AssetContainersStore::class,
             'directory' => base_path('content/assets'),

config/system.php

@@ -152,4 +152,17 @@
 
     'update_references' => true,
 
+    /*
+    |--------------------------------------------------------------------------
+    | Row ID handle
+    |--------------------------------------------------------------------------
+    |
+    | Rows in Grid, Replicator, and Bard fields will be given a unique ID using
+    | the "id" field. You may need your own field named "id", in which case
+    | you may customize the handle of the field that Statamic will use.
+    |
+    */
+
+    'row_id_handle' => 'id',
+
 ];

config/users.php

@@ -75,6 +75,18 @@
         //
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Registration form honeypot field
+    |--------------------------------------------------------------------------
+    |
+    | When registering new users through the user:register_form tag,
+    | specify the field to act as a honeypot for bots
+    |
+    */
+
+    'registration_form_honeypot_field' => null,
+
     /*
     |--------------------------------------------------------------------------
     | User Wizard Invitation Email
@@ -138,4 +150,17 @@
         'web' => 'web',
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Impersonation
+    |--------------------------------------------------------------------------
+    |
+    | Here you can configure if impersonation is available, and what URL to
+    | redirect to after impersonation begins
+    |
+    */
+    'impersonate' => [
+        'enabled' => env('STATAMIC_IMPERSONATE_ENABLED', true),
+        'redirect' => env('STATAMIC_IMPERSONATE_REDIRECT', null),
+    ],
 ];