Merge branch '5.x' into 5.next

Author: ADmad

.github/workflows/deploy_5.yml

@@ -10,6 +10,9 @@ on:
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
 
+permissions:
+    contents: read
+
 jobs:
   deploy:
     runs-on: ubuntu-latest
@@ -20,7 +23,7 @@ jobs:
           fetch-depth: 0
 
       - name: Push to dokku
-        uses: dokku/github-action@master
+        uses: dokku/github-action@cc7dec1d2b9fed249a14ae462bc953bba436f78c # v1.10.0
         with:
           branch: '5.next'
           git_remote_url: 'ssh://dokku@apps.cakephp.org:22/newbook-5next'

.github/workflows/stale.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/stale@v10
+    - uses: actions/stale@v11
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'This issue is stale because it has been open for 120 days with no activity. Remove the `stale` label or comment or this will be closed in 15 days'

README.md

@@ -37,7 +37,7 @@ npm run docs:preview
 
 ### Prerequisites
 
-- `node` (version 18 or newer) - JavaScript runtime required by Vite/VitePress
+- `node` (version 22 or newer) - JavaScript runtime required by Vite/VitePress
 - `npm` - Package manager (included with most Node.js installations)
 - `git` - Required to install `@cakephp/docs-skeleton` from GitHub
 

docs/en/intro/supported-versions.md

@@ -4,11 +4,11 @@ See [CakePHP Development Process](../appendices/cakephp-development-process.md)
 
 ## CakePHP Supported Versions
 
-This table was last updated in February 2026.
+This table was last updated in August 2026.
 
 | Major Version | Supported Version | PHP-Version    | Active Support | Security Support     |
 |---------------|-------------------|----------------|----------------|----------------------|
-| `5.x`         | `5.1` to `5.3`    | `8.1` to `8.5` | `5.3+`         | ✅                    |
+| `5.x`         | `5.2` to `5.4`    | `8.1` to `8.5` | `5.4+`         | ✅                    |
 | `4.x`         | `4.4` to `4.6`    | `7.2` to `8.3` | ❌              | September 10th, 2026 |
 | `3.x`         | None              | `5.6` to `7.4` | ❌              | ❌                    |
 | `2.x`         | None              | `5.4` to `7.4` | ❌              | ❌                    |

docs/en/orm/behaviors.md

@@ -18,7 +18,7 @@ a perfect fit for.
 
 ## Using Behaviors
 
-<!--@include: ./table-objects.md{414,460}-->
+<!--@include: ./table-objects.md#behaviors-->
 
 ## Core Behaviors
 

docs/en/orm/query-builder.md

@@ -1905,11 +1905,11 @@ data, you first need to setup associations between the tables as described in
 the [Associations - Linking Tables Together](../orm/associations) section. This technique of combining queries
 to fetch associated data from other tables is called **eager loading**.
 
-<!--@include: ./retrieving-data-and-resultsets.md{507,719}-->
+<!--@include: ./retrieving-data-and-resultsets.md#contain-->
 
 ### Filtering by Associated Data
 
-<!--@include: ./retrieving-data-and-resultsets.md{727,938}-->
+<!--@include: ./retrieving-data-and-resultsets.md#filtering-->
 
 ### Adding Joins
 

docs/en/orm/retrieving-data-and-resultsets.md

@@ -525,7 +525,7 @@ By default, CakePHP does not load **any** associated data when using `find()`.
 You need to 'contain' or eager-load each association you want loaded in your
 results.
 
-<!-- start-contain -->
+<!-- #region contain -->
 
 Eager loading helps avoid many of the potential performance problems
 surrounding lazy-loading in an ORM. The queries generated by eager loading can
@@ -739,13 +739,13 @@ $query->contain([
 ]);
 ```
 
-<!-- end-contain -->
+<!-- #endregion contain -->
 
 <a id="filtering-by-associated-data"></a>
 
 ## Filtering by Associated Data Via Matching And Joins
 
-<!-- start-filtering -->
+<!-- #region filtering -->
 
 A fairly common query case with associations is finding records 'matching'
 specific associated data. For example if you have 'Articles belongsToMany Tags'
@@ -958,7 +958,7 @@ $query = $authorsTable
 This function will not load any columns from the specified associations into the
 result set.
 
-<!-- end-filtering -->
+<!-- #endregion filtering -->
 
 ## Changing Fetching Strategies
 

docs/en/orm/table-objects.md

@@ -443,7 +443,7 @@ You can manage event priorities in one of a few ways:
 
 `method` Cake\\ORM\\Table::**addBehavior**(string $name, array $options = []): static
 
-<!-- start-behaviors -->
+<!-- #region behaviors -->
 
 Behaviors provide a way to create horizontally re-usable pieces of logic
 related to table classes. You may be wondering why behaviors are regular classes
@@ -491,7 +491,7 @@ class ArticlesTable extends Table
 }
 ```
 
-<!-- end-behaviors -->
+<!-- #endregion behaviors -->
 
 You can find out more about behaviors, including the behaviors provided by
 CakePHP in the chapter on [Behaviors](../orm/behaviors).

docs/ja/orm/behaviors.md

@@ -12,7 +12,7 @@
 
 ## ビヘイビアーの利用
 
-<!--@include: ./table-objects.md{401,446}-->
+<!--@include: ./table-objects.md#behaviors-->
 
 ## コアビヘイビアー
 

docs/ja/orm/query-builder.md

@@ -1258,11 +1258,11 @@ $query->cache(function ($q) {
 あるようにテーブル間の関連をセットアップしてください。他のテーブルから関連するデータを
 フェッチするためにクエリーを合成する技術を **イーガーロード** (eager load) といいます。
 
-<!--@include: ./retrieving-data-and-resultsets.md{488,680}-->
+<!--@include: ./retrieving-data-and-resultsets.md#contain-->
 
 ### 関連付くデータでフィルターする
 
-<!--@include: ./retrieving-data-and-resultsets.md{686,858}-->
+<!--@include: ./retrieving-data-and-resultsets.md#filtering-->
 
 ### Join を追加する