Merge branch 'statamic:5.x' into feature/replicator-clip-dnd

.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/PULL_REQUEST_TEMPLATE.md

@@ -6,7 +6,7 @@ Please take 30 seconds to read the following so we can be as efficient as possib
 
 2️⃣ Please make sure to create a new branch for your PR.
 
-3️⃣ Typically you should target the branch of the most current release, e.g. `4.x`, unless your PR includes a breaking change, in which case you should target the `master` branch for the next major release.
+3️⃣ Typically you should target the branch of the most current release, e.g. `5.x`, unless your PR includes a breaking change, in which case you should target the `master` branch for the next major release.
 
 4️⃣ We _really_ appreciate it if your PR includes tests. This makes it much easier for us to review, merge, and release. A PR with tests is usually reviewed and merged 5x-10x faster.
 

.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 }}
 
@@ -79,6 +81,7 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           extensions: fileinfo, exif, gd, pdo, sqlite, pdo_sqlite
+          ini-values: short_open_tag=on
           coverage: none
 
       - name: Install dependencies
@@ -114,7 +117,7 @@ jobs:
         uses: tj-actions/changed-files@v44
         with:
           files: |
-            **.{js,vue,ts}
+            **/*.{js,vue,ts}
             package.json
             .github/workflows/tests.yml
 

README.md

@@ -4,7 +4,10 @@
 
 Statamic is the flat-first, Laravel + Git powered CMS designed for building beautiful, easy to manage websites.
 
-> **Note:** This repository contains the code for the core CMS package. To start your own website project with Statamic, visit the [Statamic application repository][app-repo].
+> [!NOTE]
+> This repository contains the code for the core Statamic Composer package, to be installed into an existing Laravel application. 
+> 
+> The [application repository][app-repo] is where you can find a Laravel application preconfigured with Statamic, which is used when creating a new project via the Statamic CLI tool.
 
 ## Learning Statamic
 

SECURITY.md

@@ -9,7 +9,7 @@ While working to identify potential security vulnerabilities in Statamic, we ask
 - Provide a quality report with precise explanations and concrete attack scenarios.
 
 ## Scope
-We are only interested in vulnerabilities that affect Statamic itself, tested against **your own local installation** of the software, running the latest version. You can install a local copy of Statamic by following these [installation instructions](https://statamic.dev/installing). Do not test against any Statamic installation that you don’t own, including [statamic.com](https:/statamic.com) or [statamic.dev](https://statamic.dev).
+We are only interested in vulnerabilities that affect Statamic itself, tested against **your own local installation** of the software, running the latest version. You can install a local copy of Statamic by following these [installation instructions](https://statamic.dev/installing). Do not test against any Statamic installation that you don’t own, including [statamic.com](https:/statamic.com), [statamic.dev](https://statamic.dev), and [demo.statamic.com](https://demo.statamic.com).
 
 ### Potentially Qualifying Vulnerabilities
 

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,28 @@
         "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.1",
-        "voku/portable-ascii": "^2.0",
+        "ueberdosis/tiptap-php": "^1.4",
+        "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": {
         "optimize-autoloader": true,
@@ -79,7 +81,8 @@
         },
         "files": [
             "src/helpers.php",
-            "src/namespaced_helpers.php"
+            "src/namespaced_helpers.php",
+            "src/View/Blade/helpers.php"
         ]
     },
     "autoload-dev": {

config/cp.php

@@ -15,6 +15,21 @@
 
     'route' => env('CP_ROUTE', 'cp'),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Authentication
+    |--------------------------------------------------------------------------
+    |
+    | Whether the Control Panel's authentication pages should be enabled,
+    | and where users should be redirected in order to authenticate.
+    |
+    */
+
+    'auth' => [
+        'enabled' => true,
+        'redirect_to' => null,
+    ],
+
     /*
     |--------------------------------------------------------------------------
     | Start Page
@@ -124,6 +139,8 @@
 
     'custom_dark_logo_url' => env('STATAMIC_CUSTOM_DARK_LOGO_URL', null),
 
+    'custom_logo_text' => env('STATAMIC_CUSTOM_LOGO_TEXT', null),
+
     'custom_favicon_url' => env('STATAMIC_CUSTOM_FAVICON_URL', null),
 
     'custom_css_url' => env('STATAMIC_CUSTOM_CSS_URL', null),

config/git.php

@@ -102,6 +102,7 @@
         resource_path('forms'),
         resource_path('users'),
         resource_path('preferences.yaml'),
+        resource_path('sites.yaml'),
         storage_path('forms'),
         public_path('assets'),
     ],

config/protect.php

@@ -44,6 +44,7 @@
         'password' => [
             'driver' => 'password',
             'allowed' => ['secret'],
+            'field' => null,
             'form_url' => null,
         ],
 

config/stache.php

@@ -15,7 +15,18 @@
     |
     */
 
-    'watcher' => env('STATAMIC_STACHE_WATCHER', true),
+    'watcher' => env('STATAMIC_STACHE_WATCHER', 'auto'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Cache Store
+    |--------------------------------------------------------------------------
+    |
+    | Here you may configure which Cache Store the Stache uses.
+    |
+    */
+
+    'cache_store' => null,
 
     /*
     |--------------------------------------------------------------------------

config/static_caching.php

@@ -102,6 +102,31 @@
 
     'ignore_query_strings' => false,
 
+    'allowed_query_strings' => [
+        //
+    ],
+
+    'disallowed_query_strings' => [
+        //
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Nocache
+    |--------------------------------------------------------------------------
+    |
+    | Here you may define where the nocache data is stored.
+    |
+    | https://statamic.dev/tags/nocache#database
+    |
+    | Supported drivers: "cache", "database"
+    |
+    */
+
+    'nocache' => 'cache',
+
+    'nocache_js_position' => 'body',
+
     /*
     |--------------------------------------------------------------------------
     | Replacers
@@ -122,12 +147,14 @@
     | Warm Queue
     |--------------------------------------------------------------------------
     |
-    | Here you may define the name of the queue that requests will be pushed
-    | onto when warming the static cache using the static:warm command.
+    | Here you may define the queue name and connection
+    | that will be used when warming the static cache.
     |
     */
 
-    'warm_queue' => null,
+    'warm_queue' => env('STATAMIC_STATIC_WARM_QUEUE'),
+
+    'warm_queue_connection' => env('STATAMIC_STATIC_WARM_QUEUE_CONNECTION'),
 
     /*
     |--------------------------------------------------------------------------

config/system.php

@@ -8,7 +8,7 @@
     |--------------------------------------------------------------------------
     |
     | The license key for the corresponding domain from your Statamic account.
-    | Without a key entered, your app will considered to be in Trial Mode.
+    | Without a key entered, your app will be considered to be in Trial Mode.
     |
     | https://statamic.dev/licensing#trial-mode
     |
@@ -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'),
+
 ];