Skip to content

Commit 6f7f964

Browse files
committed
Merge branch 'trunk' of https://github.com/sabernhardt/wordpress-develop into trunk
2 parents e659186 + ebc66bb commit 6f7f964

256 files changed

Lines changed: 26528 additions & 1313 deletions

File tree

Some content is hidden

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

.github/workflows/phpunit-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
fail-fast: false
4646
matrix:
4747
os: [ ubuntu-latest ]
48-
php: [ '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
48+
php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
4949
db-type: [ 'mysql' ]
5050
db-version: [ '5.7', '8.0', '8.1', '8.2', '8.3' ]
5151
multisite: [ false, true ]
@@ -97,7 +97,7 @@ jobs:
9797
fail-fast: false
9898
matrix:
9999
os: [ ubuntu-latest ]
100-
php: [ '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
100+
php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
101101
db-type: [ 'mariadb' ]
102102
db-version: [ '10.4', '10.6', '10.11', '11.2' ]
103103
multisite: [ false, true ]

.github/workflows/upgrade-testing.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
fail-fast: false
4444
matrix:
4545
os: [ 'ubuntu-latest' ]
46-
php: [ '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
46+
php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
4747
db-type: [ 'mysql' ]
4848
db-version: [ '5.7', '8.0' ]
4949
wp: [ '6.0', '6.1', '6.2', '6.3', '6.4', '6.5' ]
@@ -66,7 +66,7 @@ jobs:
6666
fail-fast: false
6767
matrix:
6868
os: [ 'ubuntu-latest' ]
69-
php: [ '7.0', '7.1', '7.2', '7.3', '7.4' ]
69+
php: [ '7.2', '7.3', '7.4' ]
7070
db-type: [ 'mysql' ]
7171
db-version: [ '5.7', '8.0' ]
7272
wp: [ '5.0', '5.1', '5.2', '5.3', '5.4', '5.5', '5.6', '5.7', '5.8', '5.9' ]
@@ -116,7 +116,7 @@ jobs:
116116
fail-fast: false
117117
matrix:
118118
os: [ 'ubuntu-latest' ]
119-
php: [ '7.0', '7.1', '7.2', '7.3', '7.4' ]
119+
php: [ '7.2', '7.3', '7.4' ]
120120
db-type: [ 'mysql' ]
121121
db-version: [ '5.7', '8.0' ]
122122
wp: [ '4.1', '4.2', '4.3', '4.4', '4.5', '4.6', '4.7', '4.8', '4.9' ]

.version-support-php.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
{
2+
"6-6": [
3+
"7.2",
4+
"7.3",
5+
"7.4",
6+
"8.0",
7+
"8.1",
8+
"8.2",
9+
"8.3"
10+
],
211
"6-5": [
312
"7.0",
413
"7.1",

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ To get started, create a codespace for this repository by clicking this 👇
1313

1414
[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://github.com/codespaces/new?hide_repo_select=true&ref=trunk&repo=75645659)
1515

16-
A codespace will open in a web-based version of Visual Studio Code. The [dev container](.devcontainer/devcontainer.json) is fully configured with softwares needed for this project.
16+
A codespace will open in a web-based version of Visual Studio Code. The [dev container](.devcontainer/devcontainer.json) is fully configured with software needed for this project.
1717

1818
**Note**: Dev containers is an open spec which is supported by [GitHub Codespaces](https://github.com/codespaces) and [other tools](https://containers.dev/supporting).
1919

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
},
1212
"require": {
1313
"ext-json": "*",
14-
"php": ">=7.0"
14+
"php": ">=7.2.24"
1515
},
1616
"suggest": {
1717
"ext-dom": "*"
1818
},
1919
"require-dev": {
20-
"squizlabs/php_codesniffer": "3.8.1",
21-
"wp-coding-standards/wpcs": "~3.0.1",
20+
"squizlabs/php_codesniffer": "3.9.0",
21+
"wp-coding-standards/wpcs": "~3.1.0",
2222
"phpcompatibility/phpcompatibility-wp": "~2.1.3",
2323
"yoast/phpunit-polyfills": "^1.1.0"
2424
},

phpcompat.xml.dist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@
6363

6464
<rule ref="PHPCompatibilityWP"/>
6565

66-
<!-- WordPress Core currently supports PHP 7.0+. -->
67-
<config name="testVersion" value="7.0-"/>
66+
<!-- WordPress Core currently supports PHP 7.2+. -->
67+
<config name="testVersion" value="7.2-"/>
6868

6969
<!--
7070
#############################################################################

phpunit.xml.dist

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<group>ms-files</group>
2929
<group>ms-required</group>
3030
<group>external-http</group>
31+
<group>html-api-html5lib-tests</group>
3132
</exclude>
3233
</groups>
3334
<logging>

src/js/_enqueues/lib/admin-bar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@
203203
}
204204

205205
/**
206-
* Toogle hover class for mobile devices.
206+
* Toggle hover class for mobile devices.
207207
*
208208
* @since 5.3.1
209209
*

src/js/_enqueues/wp/backbone.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ window.wp = window.wp || {};
310310
* @since 3.6.0
311311
*
312312
* @param {Object} options Options for call.
313-
* @param {boolean} options.silent If true, `unset` wil *not* be triggered on
313+
* @param {boolean} options.silent If true, `unset` will *not* be triggered on
314314
* the master views' parent.
315315
*
316316
* @return {wp.Backbone.Subviews} The current Subviews instance.

src/js/_enqueues/wp/customize/controls.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1799,7 +1799,7 @@
17991799
section.closeDetails();
18001800
} else {
18011801

1802-
// Escape from the inifinite scroll list.
1802+
// Escape from the infinite scroll list.
18031803
section.headerContainer.find( '.customize-themes-section-title' ).focus();
18041804
}
18051805
event.stopPropagation(); // Prevent section from being collapsed.
@@ -7199,7 +7199,7 @@
71997199
} ) );
72007200

72017201
/**
7202-
* Return whether the pubish settings section should be active.
7202+
* Return whether the publish settings section should be active.
72037203
*
72047204
* @return {boolean} Is section active.
72057205
*/

0 commit comments

Comments
 (0)