Skip to content

Commit 29b508c

Browse files
dmsnelldmsnell
committed
Merge remote-tracking branch 'upstream/trunk' into build/restore-deleted-files-preserving-history
2 parents efc89d8 + 4bb460c commit 29b508c

File tree

870 files changed

+48545
-46941
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

870 files changed

+48545
-46941
lines changed

‎.github/pull_request_template.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,18 @@ If this is your first time contributing, you may also find reviewing these guide
1212
- Inline Documentation Standards: https://make.wordpress.org/core/handbook/best-practices/inline-documentation-standards/
1313
- Browser Support Policies: https://make.wordpress.org/core/handbook/best-practices/browser-support/
1414
- Proper spelling and grammar related best practices: https://make.wordpress.org/core/handbook/best-practices/spelling/
15+
- ✨ If you are using AI tools, you must adhere to the AI Guidelines: https://make.wordpress.org/ai/handbook/ai-guidelines/
1516
-->
1617

1718
<!-- Insert a description of your changes here -->
1819

1920
Trac ticket: <!-- insert a link to the WordPress Trac ticket here -->
2021

22+
## Use of AI Tools
23+
24+
<!--
25+
You are free to use artificial intelligence (AI) tooling to contribute, but you must disclose what tooling you are using and to what extent a pull request has been authored by AI. It is your responsibility to review and take responsibility for what AI generates. See the WordPress AI Guidelines: <https://make.wordpress.org/ai/handbook/ai-guidelines/>.
26+
-->
27+
2128
---
2229
**This Pull Request is for code review only. Please keep all other discussion in the Trac ticket. Do not merge this Pull Request. See [GitHub Pull Requests for Code Review](https://make.wordpress.org/core/handbook/contribute/git/github-pull-requests-for-code-review/) in the Core Handbook for more details.**

‎.github/workflows/commit-built-file-changes.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
rm -f private-key.pem
124124
125125
- name: Checkout repository
126-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
126+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
127127
if: ${{ steps.artifact-check.outputs.exists == 'true' }}
128128
with:
129129
repository: ${{ github.event.workflow_run.head_repository.full_name }}

‎.github/workflows/install-testing.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# Confirms that installing WordPress using WP-CLI works successfully.
22
#
33
# This workflow is not meant to test wordpress-develop checkouts, but rather tagged versions officially available on WordPress.org.
4+
#
5+
# This workflow is triggered for all WordPress versions that are currently receiving security updates. It therefore needs to
6+
# retain support for older PHP and database versions.
47
name: Installation Tests
58

69
on:
@@ -98,9 +101,9 @@ jobs:
98101
- db-version: '9.4'
99102
# MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
100103
- php: '7.2'
101-
db-version: '9.5'
104+
db-version: '9.6'
102105
- php: '7.3'
103-
db-version: '9.5'
106+
db-version: '9.6'
104107

105108
services:
106109
database:
@@ -119,7 +122,7 @@ jobs:
119122
120123
steps:
121124
- name: Set up PHP ${{ matrix.php }}
122-
uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # v2.35.5
125+
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
123126
with:
124127
php-version: '${{ matrix.php }}'
125128
coverage: none

‎.github/workflows/javascript-type-checking.yml‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
name: JavaScript Type Checking
2+
3+
on:
4+
# JavaScript type checking was introduced in 7.0.0.
5+
push:
6+
branches:
7+
- trunk
8+
- '[7-9].[0-9]'
9+
tags:
10+
- '[7-9].[0-9]'
11+
- '[7-9]+.[0-9].[0-9]+'
12+
pull_request:
13+
branches:
14+
- trunk
15+
- '[7-9].[0-9]'
16+
paths:
17+
# This workflow only scans JavaScript files.
18+
- '**.js'
19+
- '**.ts'
20+
- '**.tsx'
21+
# These files configure npm. Changes could affect the outcome.
22+
- 'package*.json'
23+
- '.nvmrc'
24+
# This file configures TypeScript. Changes could affect the outcome.
25+
- 'tsconfig.json'
26+
# This directory contains TypeScript definitions. Changes could affect the outcome.
27+
- 'typings/**'
28+
# Confirm any changes to relevant workflow files.
29+
- '.github/workflows/javascript-type-checking.yml'
30+
- '.github/workflows/reusable-javascript-type-checking-v1.yml'
31+
workflow_dispatch:
32+
33+
# Cancels all previous workflow runs for pull requests that have not completed.
34+
concurrency:
35+
# The concurrency group contains the workflow name and the branch name for pull requests
36+
# or the commit hash for any other events.
37+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
38+
cancel-in-progress: true
39+
40+
# Disable permissions for all available scopes by default.
41+
# Any needed permissions should be configured at the job level.
42+
permissions: {}
43+
44+
jobs:
45+
# Runs JavaScript type checking.
46+
typecheck:
47+
name: JavaScript type checking
48+
uses: ./.github/workflows/reusable-javascript-type-checking-v1.yml
49+
permissions:
50+
contents: read
51+
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
52+
53+
slack-notifications:
54+
name: Slack Notifications
55+
uses: ./.github/workflows/slack-notifications.yml
56+
permissions:
57+
actions: read
58+
contents: read
59+
needs: [ typecheck ]
60+
if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
61+
with:
62+
calling_status: ${{ contains( needs.*.result, 'cancelled' ) && 'cancelled' || contains( needs.*.result, 'failure' ) && 'failure' || 'success' }}
63+
secrets:
64+
SLACK_GHA_SUCCESS_WEBHOOK: ${{ secrets.SLACK_GHA_SUCCESS_WEBHOOK }}
65+
SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
66+
SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }}
67+
SLACK_GHA_FAILURE_WEBHOOK: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }}
68+
69+
failed-workflow:
70+
name: Failed workflow tasks
71+
runs-on: ubuntu-24.04
72+
permissions:
73+
actions: write
74+
needs: [ slack-notifications ]
75+
if: |
76+
always() &&
77+
github.repository == 'WordPress/wordpress-develop' &&
78+
github.event_name != 'pull_request' &&
79+
github.run_attempt < 2 &&
80+
(
81+
contains( needs.*.result, 'cancelled' ) ||
82+
contains( needs.*.result, 'failure' )
83+
)
84+
85+
steps:
86+
- name: Dispatch workflow run
87+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
88+
with:
89+
retries: 2
90+
retry-exempt-status-codes: 418
91+
script: |
92+
github.rest.actions.createWorkflowDispatch({
93+
owner: context.repo.owner,
94+
repo: context.repo.repo,
95+
workflow_id: 'failed-workflow.yml',
96+
ref: 'trunk',
97+
inputs: {
98+
run_id: `${context.runId}`,
99+
}
100+
});

‎.github/workflows/local-docker-environment.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,6 @@ jobs:
106106
- db-version: '9.2'
107107
- db-version: '9.3'
108108
- db-version: '9.4'
109-
# MySQL 9.0+ will not work on PHP 7.2 & 7.3. See https://core.trac.wordpress.org/ticket/61218.
110-
- php: '7.2'
111-
db-version: '9.5'
112-
- php: '7.3'
113-
db-version: '9.5'
114109
# No PHP 8.5 + Memcached support yet.
115110
- php: '8.5'
116111
memcached: true

‎.github/workflows/phpstan-static-analysis.yml‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
name: PHPStan Static Analysis
2+
3+
on:
4+
# PHPStan testing was introduced in 7.0.0.
5+
push:
6+
branches:
7+
- trunk
8+
- '[7-9].[0-9]'
9+
tags:
10+
- '[7-9].[0-9]'
11+
- '[7-9]+.[0-9].[0-9]+'
12+
pull_request:
13+
branches:
14+
- trunk
15+
- '[7-9].[0-9]'
16+
paths:
17+
# This workflow only scans PHP files.
18+
- '**.php'
19+
# These files configure Composer. Changes could affect the outcome.
20+
- 'composer.*'
21+
# These files configure PHPStan. Changes could affect the outcome.
22+
- 'phpstan.neon.dist'
23+
- 'tests/phpstan/base.neon'
24+
- 'tests/phpstan/baseline.php'
25+
# Confirm any changes to relevant workflow files.
26+
- '.github/workflows/phpstan-static-analysis.yml'
27+
- '.github/workflows/reusable-phpstan-static-analysis-v1.yml'
28+
workflow_dispatch:
29+
30+
# Cancels all previous workflow runs for pull requests that have not completed.
31+
concurrency:
32+
# The concurrency group contains the workflow name and the branch name for pull requests
33+
# or the commit hash for any other events.
34+
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
35+
cancel-in-progress: true
36+
37+
# Disable permissions for all available scopes by default.
38+
# Any needed permissions should be configured at the job level.
39+
permissions: {}
40+
41+
jobs:
42+
# Runs PHPStan Static Analysis.
43+
phpstan:
44+
name: PHP static analysis
45+
uses: ./.github/workflows/reusable-phpstan-static-analysis-v1.yml
46+
permissions:
47+
contents: read
48+
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
49+
50+
slack-notifications:
51+
name: Slack Notifications
52+
uses: ./.github/workflows/slack-notifications.yml
53+
permissions:
54+
actions: read
55+
contents: read
56+
needs: [ phpstan ]
57+
if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
58+
with:
59+
calling_status: ${{ contains( needs.*.result, 'cancelled' ) && 'cancelled' || contains( needs.*.result, 'failure' ) && 'failure' || 'success' }}
60+
secrets:
61+
SLACK_GHA_SUCCESS_WEBHOOK: ${{ secrets.SLACK_GHA_SUCCESS_WEBHOOK }}
62+
SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
63+
SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }}
64+
SLACK_GHA_FAILURE_WEBHOOK: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }}
65+
66+
failed-workflow:
67+
name: Failed workflow tasks
68+
runs-on: ubuntu-24.04
69+
permissions:
70+
actions: write
71+
needs: [ slack-notifications ]
72+
if: |
73+
always() &&
74+
github.repository == 'WordPress/wordpress-develop' &&
75+
github.event_name != 'pull_request' &&
76+
github.run_attempt < 2 &&
77+
(
78+
contains( needs.*.result, 'cancelled' ) ||
79+
contains( needs.*.result, 'failure' )
80+
)
81+
82+
steps:
83+
- name: Dispatch workflow run
84+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
85+
with:
86+
retries: 2
87+
retry-exempt-status-codes: 418
88+
script: |
89+
github.rest.actions.createWorkflowDispatch({
90+
owner: context.repo.owner,
91+
repo: context.repo.repo,
92+
workflow_id: 'failed-workflow.yml',
93+
ref: 'trunk',
94+
inputs: {
95+
run_id: `${context.runId}`,
96+
}
97+
});

‎.github/workflows/phpunit-tests.yml‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
fail-fast: false
7373
matrix:
7474
os: [ ubuntu-24.04 ]
75-
php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
75+
php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
7676
db-type: [ 'mysql' ]
7777
db-version: [ '5.7', '8.0', '8.4' ]
7878
tests-domain: [ 'example.org' ]
@@ -149,7 +149,7 @@ jobs:
149149
fail-fast: false
150150
matrix:
151151
os: [ ubuntu-24.04 ]
152-
php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
152+
php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
153153
db-type: [ 'mariadb' ]
154154
db-version: [ '5.5', '10.3', '10.5', '10.6', '10.11', '11.4', '11.8' ]
155155
multisite: [ false, true ]
@@ -201,24 +201,19 @@ jobs:
201201
fail-fast: false
202202
matrix:
203203
os: [ ubuntu-24.04 ]
204-
php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
204+
php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
205205
db-type: [ 'mysql', 'mariadb' ]
206-
db-version: [ '9.5', '12.0' ]
206+
db-version: [ '9.6', '12.1' ]
207207
multisite: [ false, true ]
208208
memcached: [ false ]
209209
db-innovation: [ true ]
210210

211211
exclude:
212-
# MySQL 9.0+ will not work on PHP <= 7.3 because mysql_native_password was removed. See https://core.trac.wordpress.org/ticket/61218.
213-
- php: '7.2'
214-
db-version: '9.5'
215-
- php: '7.3'
216-
db-version: '9.5'
217212
# Exclude version combinations that don't exist.
218213
- db-type: 'mariadb'
219-
db-version: '9.5'
214+
db-version: '9.6'
220215
- db-type: 'mysql'
221-
db-version: '12.0'
216+
db-version: '12.1'
222217
with:
223218
os: ${{ matrix.os }}
224219
php: ${{ matrix.php }}
@@ -248,7 +243,7 @@ jobs:
248243
strategy:
249244
fail-fast: false
250245
matrix:
251-
php: [ '7.2', '7.4', '8.0', '8.4' ]
246+
php: [ '7.4', '8.0', '8.4' ]
252247
db-type: [ 'mysql' ]
253248
db-version: [ '8.4' ]
254249
phpunit-test-groups: [ 'html-api-html5lib-tests' ]
@@ -277,7 +272,7 @@ jobs:
277272
strategy:
278273
fail-fast: false
279274
matrix:
280-
php: [ '7.2', '8.4' ]
275+
php: [ '7.4', '8.4' ]
281276
db-version: [ '8.4', '11.8' ]
282277
db-type: [ 'mysql', 'mariadb' ]
283278
multisite: [ false ]

‎.github/workflows/pull-request-comments.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ jobs:
167167
[WordPress Playground](https://developer.wordpress.org/playground/) is an experimental project that creates a full WordPress instance entirely within the browser.
168168
169169
### Some things to be aware of
170-
- The Plugin and Theme Directories cannot be accessed within Playground.
171170
- All changes will be lost when closing a tab with a Playground instance.
172171
- All changes will be lost when refreshing the page.
173172
- A fresh instance is created each time the link below is clicked.

‎.github/workflows/reusable-build-package.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ jobs:
2929

3030
steps:
3131
- name: Checkout repository
32-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
32+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3333
with:
3434
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
3535
persist-credentials: false
3636

3737
- name: Set up Node.js
38-
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
38+
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
3939
with:
4040
node-version-file: '.nvmrc'
4141
cache: npm
@@ -53,7 +53,7 @@ jobs:
5353
run: zip -q -r develop.zip wordpress/.
5454

5555
- name: Upload ZIP as a GitHub Actions artifact
56-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
56+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
5757
with:
5858
name: wordpress-develop
5959
path: develop.zip

‎.github/workflows/reusable-check-built-files.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ jobs:
3737
contents: read
3838
steps:
3939
- name: Checkout repository
40-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
40+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4141
with:
4242
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
4343

4444
- name: Set up Node.js
45-
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
45+
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
4646
with:
4747
node-version-file: '.nvmrc'
4848
cache: npm
@@ -103,7 +103,7 @@ jobs:
103103

104104
# Uploads the diff file as an artifact.
105105
- name: Upload diff file as artifact
106-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
106+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
107107
if: ${{ steps.built-file-check.outputs.uncommitted_changes == 'true' }}
108108
with:
109109
name: pr-built-file-changes

0 commit comments

Comments
 (0)