Skip to content

Commit c1dbb40

Browse files
committed
Merge branch '5.x' into 5.next
2 parents e8964e0 + e72df0d commit c1dbb40

File tree

5 files changed

+10
-4
lines changed

5 files changed

+10
-4
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
doc-type: ['HTML', 'EPUB', 'PDF']
2323

2424
steps:
25-
- uses: actions/checkout@v5
25+
- uses: actions/checkout@v6
2626

2727
- uses: actions/setup-python@v6
2828
with:

.github/workflows/deploy_5.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Cloning repo
19-
uses: actions/checkout@v5
19+
uses: actions/checkout@v6
2020
with:
2121
fetch-depth: 0
2222

.github/workflows/deploy_5next.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Cloning repo
19-
uses: actions/checkout@v5
19+
uses: actions/checkout@v6
2020
with:
2121
fetch-depth: 0
2222

en/core-libraries/collections.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ data from paginated services::
265265

266266
$allPagesItems = $items->toList();
267267

268-
You can use the ``yield`` keyword inside ``unfold()``to return as
268+
You can use the ``yield`` keyword inside ``unfold()`` to return as
269269
many elements for each item in the collection as you may need::
270270

271271
$oddNumbers = [1, 3, 5, 7];

ja/core-libraries/file-folder.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
Folder & File
22
#############
33

4+
.. deprecated:: 4.0
5+
``File`` クラスと ``Folder`` は バージョン5.0で削除されます。
6+
``SplFileInfo`` や ``SplFileObject`` などの SPL クラス、
7+
および、``RecursiveDirectoryIterator``, ``RecursiveRegexIterator`` などのような
8+
イテレータクラスを使用してください。
9+
410
.. php:namespace:: Cake\Filesystem
511
612
Folder と File ユーティリティは、ファイルの読み書きやフォルダー内のファイル名一覧の取得、

0 commit comments

Comments
 (0)