Merge branch '5.x' into feature/where-has-relationships

.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

.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 }}
 
@@ -124,6 +122,11 @@ jobs:
           echo "result=true" >> $GITHUB_OUTPUT
           echo "result=true" >> $env:GITHUB_OUTPUT
 
+      - name: Use Node.js 16.13.0
+        uses: actions/setup-node@v2
+        with:
+          node-version: 16.13.0
+
       - name: Install required npm version
         if: steps.should-run-tests.outputs.result == 'true'
         run: npm -g install npm@8.5.5
@@ -145,7 +148,7 @@ jobs:
       - uses: technote-space/workflow-conclusion-action@v1
       - name: Send Slack notification
         uses: 8398a7/action-slack@v2
-        if: env.WORKFLOW_CONCLUSION == 'failure'
+        if: env.WORKFLOW_CONCLUSION == 'failure' && github.event_name == 'schedule'
         with:
           status: failure
           author_name: ${{ github.actor }}

composer.json

@@ -11,29 +11,28 @@
     "require": {
         "ext-json": "*",
         "ajthinking/archetype": "^1.0.3",
-        "composer/composer": "^1.10.22 || ^2.2.22",
-        "facade/ignition-contracts": "^1.0",
+        "composer/semver": "^3.4",
         "guzzlehttp/guzzle": "^6.3 || ^7.0",
         "james-heinrich/getid3": "^1.9.21",
-        "laravel/framework": "^9.50.0 || ^10.0",
-        "laravel/helpers": "^1.1",
+        "laravel/framework": "^10.40 || ^11.0",
+        "laravel/prompts": "^0.1.16",
         "league/commonmark": "^2.2",
         "league/csv": "^9.0",
-        "league/glide": "^1.1 || ^2.0",
-        "maennchen/zipstream-php": "^2.2",
+        "league/glide": "^2.3",
+        "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",
+        "spatie/ignition": "^1.12",
         "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.0",
+        "phpunit/phpunit": "^10.0"
     },
     "config": {
         "optimize-autoloader": true,

config/antlers.php

@@ -4,15 +4,16 @@
 
     /*
     |--------------------------------------------------------------------------
-    | Version
+    | Debugbar
     |--------------------------------------------------------------------------
     |
-    | The desired Antlers language version to utilize. Supported values are
-    | "runtime" for the modern parser, or "regex" for the legacy parser.
+    | Here you may specify whether the Antlers profiler should be added
+    | to the Laravel Debugbar. This is incredibly useful for finding
+    | performance impacts within any of your Antlers templates.
     |
     */
 
-    'version' => 'runtime',
+    'debugbar' => env('STATAMIC_ANTLERS_DEBUGBAR', true),
 
     /*
     |--------------------------------------------------------------------------

config/assets.php

@@ -210,4 +210,17 @@
 
     'additional_uploadable_extensions' => [],
 
+    /*
+    |--------------------------------------------------------------------------
+    | SVG Sanitization
+    |--------------------------------------------------------------------------
+    |
+    | Statamic will automatically sanitize SVG files when uploaded to avoid
+    | potential security issues. However, if you have a valid reason for
+    | disabling this, and you trust your users, you may do so here.
+    |
+    */
+
+    'svg_sanitization_on_upload' => true,
+
 ];

config/git.php

@@ -103,6 +103,7 @@
         resource_path('users'),
         resource_path('preferences.yaml'),
         storage_path('forms'),
+        public_path('assets'),
     ],
 
     /*
@@ -131,8 +132,8 @@
     */
 
     'commands' => [
-        'git add {{ paths }}',
-        'git -c "user.name={{ name }}" -c "user.email={{ email }}" commit -m "{{ message }}"',
+        config('statamic.git.binary').' add {{ paths }}',
+        config('statamic.git.binary').' -c "user.name={{ name }}" -c "user.email={{ email }}" commit -m "{{ message }}"',
     ],
 
     /*

config/stache.php

@@ -89,6 +89,11 @@
             'directory' => base_path('users'),
         ],
 
+        'form-submissions' => [
+            'class' => Stores\SubmissionsStore::class,
+            'directory' => storage_path('forms'),
+        ],
+
     ],
 
     /*

config/static_caching.php

@@ -37,6 +37,10 @@
             'driver' => 'file',
             'path' => public_path('static'),
             'lock_hold_length' => 0,
+            'permissions' => [
+                'directory' => 0755,
+                'file' => 0644,
+            ],
         ],
 
     ],

config/system.php

@@ -16,6 +16,22 @@
 
     'license_key' => env('STATAMIC_LICENSE_KEY'),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Enable Multi-site
+    |--------------------------------------------------------------------------
+    |
+    | Whether Statamic's multi-site functionality should be enabled. It is
+    | assumed Statamic Pro is also enabled. To get started, you can run
+    | the `php please multisite` command to update your content file
+    | structure, after which you can manage your sites in the CP.
+    |
+    | https://statamic.dev/multi-site
+    |
+    */
+
+    'multisite' => false,
+
     /*
     |--------------------------------------------------------------------------
     | Default Addons Paths
@@ -165,4 +181,17 @@
 
     'row_id_handle' => 'id',
 
+    /*
+    |--------------------------------------------------------------------------
+    | Fake SQL Queries
+    |--------------------------------------------------------------------------
+    |
+    | Enable while using the flat-file Stache driver to show fake "SQL" query
+    | approximations in your database debugging tools — including Debugbar,
+    | Laravel Telescope, and Ray with the ray()->showQueries() helper.
+    |
+    */
+
+    'fake_sql_queries' => config('app.debug'),
+
 ];

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