Merge branch '5.x' into feature/return-model-attributes-in-antlers

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -24,8 +24,7 @@ body:
     attributes:
       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.)
+        Please paste the *full* output of the `php please support:details` command. It gives us some context about your project.
       render: yaml # the format of the command is close to yaml and gets highlighted nicely
     validations:
       required: true

.github/workflows/tests.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [8.1, 8.2, 8.3]
+        php: [8.1, 8.2, 8.3, 8.4]
         laravel: [10.*, 11.*]
         stability: [prefer-lowest, prefer-stable]
         os: [ubuntu-latest]
@@ -32,6 +32,8 @@ jobs:
         exclude:
           - php: 8.1
             laravel: 11.*
+          - php: 8.4
+            laravel: 10.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

composer.json

@@ -14,7 +14,7 @@
         "composer/semver": "^3.4",
         "guzzlehttp/guzzle": "^6.3 || ^7.0",
         "james-heinrich/getid3": "^1.9.21",
-        "laravel/framework": "^10.40 || ^11.0",
+        "laravel/framework": "^10.40 || ^11.34",
         "laravel/prompts": "^0.1.16",
         "league/commonmark": "^2.2",
         "league/csv": "^9.0",
@@ -23,26 +23,27 @@
         "michelf/php-smartypants": "^1.8.1",
         "nesbot/carbon": "^2.62.1",
         "pixelfear/composer-dist-plugin": "^0.1.4",
-        "rebing/graphql-laravel": "^9.5",
+        "rebing/graphql-laravel": "^9.7",
         "rhukster/dom-sanitizer": "^1.0.6",
         "spatie/blink": "^1.3",
-        "spatie/ignition": "^1.12",
+        "spatie/ignition": "^1.15",
         "statamic/stringy": "^3.1.2",
+        "stillat/blade-parser": "^1.10.1",
         "symfony/lock": "^6.4",
         "symfony/var-exporter": "^6.0",
         "symfony/yaml": "^6.0 || ^7.0",
         "ueberdosis/tiptap-php": "^1.4",
-        "voku/portable-ascii": "^2.0",
+        "voku/portable-ascii": "^2.0.2",
         "wilderborn/partyline": "^1.0"
     },
     "require-dev": {
         "doctrine/dbal": "^3.6",
         "fakerphp/faker": "~1.10",
         "google/cloud-translate": "^1.6",
         "laravel/pint": "1.16.0",
-        "mockery/mockery": "^1.3.3",
-        "orchestra/testbench": "^8.14 || ^9.0",
-        "phpunit/phpunit": "^10.0",
+        "mockery/mockery": "^1.6.10",
+        "orchestra/testbench": "^8.14 || ^9.2",
+        "phpunit/phpunit": "^10.5.35",
         "spatie/laravel-ray": "^1.37"
     },
     "config": {
@@ -80,7 +81,8 @@
         },
         "files": [
             "src/helpers.php",
-            "src/namespaced_helpers.php"
+            "src/namespaced_helpers.php",
+            "src/View/Blade/helpers.php"
         ]
     },
     "autoload-dev": {

config/static_caching.php

@@ -125,6 +125,8 @@
 
     'nocache' => 'cache',
 
+    'nocache_js_position' => 'body',
+
     /*
     |--------------------------------------------------------------------------
     | Replacers

config/system.php

@@ -168,6 +168,19 @@
 
     'update_references' => true,
 
+    /*
+    |--------------------------------------------------------------------------
+    | Always Augment to Query
+    |--------------------------------------------------------------------------
+    |
+    | By default, Statamic will augment relationship fields with max_items: 1
+    | to the result of a query, for example an Entry instance. Setting this
+    | to true will augment to the query builder instead of the result.
+    |
+    */
+
+    'always_augment_to_query' => false,
+
     /*
     |--------------------------------------------------------------------------
     | Row ID handle
@@ -194,4 +207,15 @@
 
     'fake_sql_queries' => config('app.debug'),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Layout
+    |--------------------------------------------------------------------------
+    |
+    | Define the default layout that will be used by views.
+    |
+    */
+
+    'layout' => env('STATAMIC_LAYOUT', 'layout'),
+
 ];