Merge remote-tracking branch 'origin/11.x' into mark-sensitive-params

.gitattributes

@@ -21,3 +21,4 @@ docker-compose.yml export-ignore
 phpstan.src.neon.dist export-ignore
 phpstan.types.neon.dist export-ignore
 phpunit.xml.dist export-ignore
+RELEASE.md export-ignore

.github/workflows/databases-nightly.yml

@@ -0,0 +1,53 @@
+name: databases-nightly
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+
+  mariadb:
+    runs-on: ubuntu-22.04
+    continue-on-error: true
+
+    services:
+      mariadb:
+        image: quay.io/mariadb-foundation/mariadb-devel:verylatest
+        env:
+          MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: yes
+          MARIADB_DATABASE: laravel
+        ports:
+          - 3306:3306
+        options: --health-cmd="healthcheck.sh --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=3
+
+    strategy:
+      fail-fast: true
+
+    name: MariaDB Very Latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.2
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr
+          tools: composer:v2
+          coverage: none
+
+      - name: Set Framework version
+        run: composer config version "11.x-dev"
+
+      - name: Install dependencies
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 5
+          max_attempts: 5
+          command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress
+
+      - name: Execute tests
+        run: vendor/bin/phpunit tests/Integration/Database
+        env:
+          DB_CONNECTION: mariadb

.github/workflows/releases.yml

@@ -27,18 +27,16 @@ jobs:
       - name: Remove optional "v" prefix
         id: version
         run: |
-          VERSION=${{ inputs.version }}
           echo "version=${VERSION#v}" >> "$GITHUB_OUTPUT"
+        env:
+          VERSION: ${{ inputs.version }}
 
       - name: Check if branch and version match
         id: guard
         run: |
           MAJOR_VERSION="${NUMERIC_VERSION%%.*}"
           BRANCH_MAJOR_VERSION="${BRANCH%%.*}"
 
-          echo "MAJOR_VERSION=$(echo $MAJOR_VERSION)" >> $GITHUB_OUTPUT;
-          echo "BRANCH_MAJOR_VERSION=$(echo $BRANCH_MAJOR_VERSION)" >> $GITHUB_OUTPUT;
-
           if [ "$MAJOR_VERSION" != "$BRANCH_MAJOR_VERSION" ]; then
             echo "Mismatched versions! Aborting."
             VERSION_MISMATCH='true';
@@ -47,7 +45,7 @@ jobs:
             VERSION_MISMATCH='false';
           fi
 
-          echo "VERSION_MISMATCH=$(echo $VERSION_MISMATCH)" >> $GITHUB_OUTPUT;
+          echo "VERSION_MISMATCH=$(echo $VERSION_MISMATCH)" >> "$GITHUB_OUTPUT";
         env:
           BRANCH: ${{ github.ref_name }}
           NUMERIC_VERSION: ${{ steps.version.outputs.version }}
@@ -90,9 +88,30 @@ jobs:
       - name: Cleanup release notes
         id: cleaned-notes
         run: |
-          RELEASE_NOTES=$(echo $RELEASE_NOTES | sed '/## What/d')
-          RELEASE_NOTES=$(echo $RELEASE_NOTES | sed '/## New Contributors/,$d')
-          echo "notes=${RELEASE_NOTES}" >> "$GITHUB_OUTPUT"
+          START_FROM=$(echo -n "$RELEASE_NOTES" | awk "/What's Changed/{ print NR; exit }" -)
+          DROP_FROM_CONTRIBUTORS=$(echo -n "$RELEASE_NOTES" | awk "/New Contributors/{ print NR; exit }" -)
+          DROP_FROM_FULL_CHANGELOG=$(echo -n "$RELEASE_NOTES" | awk "/Full Changelog/{ print NR; exit }" -)
+
+          # Drop everything starting from "Full Changelog"
+          if [ ! -z "$DROP_FROM_FULL_CHANGELOG" ]; then
+              RELEASE_NOTES=$(echo -n "$RELEASE_NOTES" | sed "${DROP_FROM_FULL_CHANGELOG},$ d")
+          fi
+
+          # Drop everything starting from "New Contributors"
+          if [ ! -z "$DROP_FROM_CONTRIBUTORS" ]; then
+              RELEASE_NOTES=$(echo -n "$RELEASE_NOTES" | sed "${DROP_FROM_CONTRIBUTORS},$ d")
+          fi
+
+          # Drop the line "What's Changed"
+          if [ ! -z "$START_FROM" ]; then
+              RELEASE_NOTES=$(echo -n "$RELEASE_NOTES" | sed "${START_FROM}d")
+          fi
+
+          {
+            echo 'notes<<EOF'
+            echo "$RELEASE_NOTES"
+            echo EOF
+          } >> "$GITHUB_OUTPUT";
         env:
           RELEASE_NOTES: ${{ steps.generated-notes.outputs.release-notes }}
 
@@ -105,7 +124,7 @@ jobs:
           name: v${{ steps.version.outputs.version }}
           body: ${{ steps.cleaned-notes.outputs.notes }}
           target_commitish: ${{ github.ref_name }}
-          make_latest: 'legacy'
+          make_latest: "${{ github.ref_name == github.event.repository.default_branch }}"
 
   update-changelog:
     needs: release

.github/workflows/tests.yml

@@ -53,7 +53,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd, redis-phpredis/[email protected], igbinary, msgpack, lzf, zstd, lz4, memcached, gmp, :php-psr
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd, redis, igbinary, msgpack, lzf, zstd, lz4, memcached, gmp, :php-psr
           ini-values: error_reporting=E_ALL
           tools: composer:v2
           coverage: none

.styleci.yml

@@ -6,6 +6,11 @@ php:
       - bad-syntax-strategy.php
 js:
   finder:
+    exclude:
+      - src/Illuminate/Foundation/resources/exceptions/renderer/dist
     not-name:
       - webpack.mix.js
-css: true
+css:
+  finder:
+    exclude:
+      - src/Illuminate/Foundation/resources/exceptions/renderer/dist