Skip to content

Commit 85909c3

Browse files
afragenafragen
committed
Merge branch 'trunk' into hello-dolly
2 parents 129864b + b0f085e commit 85909c3

3,012 files changed

Lines changed: 228434 additions & 111845 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.

‎.cache/.gitkeep‎

Whitespace-only changes.

‎.devcontainer/devcontainer.json‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// For format details, see https://aka.ms/devcontainer.json.
2+
{
3+
"name": "WordPress Core Development",
4+
"dockerComposeFile": "docker-compose.yml",
5+
"service": "app",
6+
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
7+
8+
// Features to add to the dev container. More info: https://containers.dev/features.
9+
"features": {
10+
"ghcr.io/devcontainers/features/common-utils:2": {
11+
"username": "wordpress"
12+
},
13+
"ghcr.io/devcontainers/features/node:1": {
14+
"version": "14"
15+
},
16+
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
17+
"ghcr.io/devcontainers/features/git:1": {}
18+
},
19+
"onCreateCommand": "sudo chmod +x .devcontainer/install-tools.sh && .devcontainer/install-tools.sh",
20+
"postCreateCommand": "sudo chmod +x .devcontainer/setup.sh && .devcontainer/setup.sh",
21+
"forwardPorts": [
22+
8080
23+
],
24+
"remoteUser": "wordpress"
25+
}

‎.devcontainer/docker-compose.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
version: '3.1'
2+
3+
services:
4+
app:
5+
image: wordpress
6+
restart: always
7+
ports:
8+
- 8080:80
9+
environment:
10+
WORDPRESS_DB_HOST: db
11+
WORDPRESS_DB_USER: exampleuser
12+
WORDPRESS_DB_PASSWORD: examplepass
13+
WORDPRESS_DB_NAME: exampledb
14+
volumes:
15+
- ../..:/workspaces:cached
16+
17+
db:
18+
image: mariadb
19+
restart: unless-stopped
20+
environment:
21+
MYSQL_DATABASE: exampledb
22+
MYSQL_USER: exampleuser
23+
MYSQL_PASSWORD: examplepass
24+
MYSQL_RANDOM_ROOT_PASSWORD: '1'
25+
volumes:
26+
- db:/var/lib/mysql
27+
28+
volumes:
29+
db:

‎.devcontainer/install-tools.sh‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/bin/sh
2+
3+
set -eux
4+
5+
echo "Installing wp-cli..."
6+
curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
7+
sudo chmod +x wp-cli.phar
8+
sudo mv wp-cli.phar /usr/local/bin/wp
9+
10+
echo "Installing chromium..."
11+
sudo apt-get update
12+
sudo apt-get -y install --no-install-recommends chromium
13+
14+
# Copy the welcome message
15+
sudo cp .devcontainer/welcome-message.txt /usr/local/etc/vscode-dev-containers/first-run-notice.txt

‎.devcontainer/setup.sh‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/sh
2+
3+
set -eux
4+
5+
if [ -z ${CODESPACE_NAME+x} ]; then
6+
SITE_HOST="http://localhost:8080"
7+
else
8+
SITE_HOST="https://${CODESPACE_NAME}-8080.${GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN}"
9+
fi
10+
11+
# Install dependencies
12+
cd /workspaces/wordpress-develop
13+
npm install && npm run build:dev
14+
15+
# Install WordPress and activate the plugin/theme.
16+
cd /var/www/html
17+
echo "Setting up WordPress at $SITE_HOST"
18+
wp core install --url="$SITE_HOST" --title="WordPress Trunk" --admin_user="admin" --admin_email="[email protected]" --admin_password="password" --skip-email

‎.devcontainer/welcome-message.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
👋 Welcome to "WordPress Core Development" in Codespaces!
2+
3+
🛠️ Your environment is fully setup with all the required software.
4+
5+
🚀 To get started, wait for the "postCreateCommand" to finish setting things up, then open the portforwarded URL and append '/wp-admin'.
6+

‎.env‎

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#
77
# Below, the following substitutions can be made:
88
# - '{version}': any major.minor PHP version from 5.2 onwards.
9-
# - '{phpunit_version}': any major PHPUnit version starting with 4.
109
##
1110

1211
# The site will be available at http://localhost:LOCAL_PORT
@@ -18,29 +17,21 @@ LOCAL_DIR=src
1817
# The PHP version to use. Valid options are 'latest', and '{version}-fpm'.
1918
LOCAL_PHP=latest
2019

20+
# Whether or not to enable Xdebug.
21+
LOCAL_PHP_XDEBUG=false
22+
2123
##
22-
# The PHPUnit version to use when running tests.
23-
#
24-
# Support for new PHPUnit versions is not backported to past versions, so some old WordPress branches require an older
25-
# version to run tests.
24+
# The Xdebug features to enable.
2625
#
27-
# Valid versions are:
28-
# - 'latest' for the highest version of PHPUnit supported on the highest version of PHP supported.
29-
# - '{version}-fpm' for the highest version of PHPUnit supported on the specified version of PHP.
30-
# - '{phpunit_version}-php-{version}-fpm' for a specific version of PHPUnit on the specified version of PHP. This format
31-
# is only available for PHP versions 5.6 and higher.
26+
# By default, the following features are enabled in the local environment:
27+
# - Development helpers (`develop`).
28+
# - Step debugging (`debug`).
3229
#
33-
# For the full list of available options, see https://hub.docker.com/r/wordpressdevelop/phpunit/tags.
30+
# To generate a code coverage report, `coverage` mode must be active.
3431
#
35-
# For full documentation on PHPUnit compatibility and WordPress versions, see
36-
# https://make.wordpress.org/core/handbook/references/phpunit-compatibility-and-wordpress-versions/.
37-
#
38-
# This defaults to the value assigned to the value of LOCAL_PHP.
32+
# For a full list of accepted values, see https://xdebug.org/docs/all_settings#mode.
3933
##
40-
LOCAL_PHPUNIT=${LOCAL_PHP}
41-
42-
# Whether or not to enable XDebug.
43-
LOCAL_PHP_XDEBUG=false
34+
LOCAL_PHP_XDEBUG_MODE=develop,debug
4435

4536
# Whether or not to enable Memcached.
4637
LOCAL_PHP_MEMCACHED=false
@@ -57,8 +48,8 @@ LOCAL_DB_TYPE=mysql
5748
#
5849
# Defaults to 5.7 with the assumption that LOCAL_DB_TYPE is set to `mysql` above.
5950
#
60-
# When using `mysql`, see https://hub.docker.com/_/mysql/ for valid versions.
61-
# When using `mariadb`, see https://hub.docker.com/_/mariadb for valid versions.
51+
# When using `mysql`, see https://hub.docker.com/r/amd64/mysql for valid versions.
52+
# When using `mariadb`, see https://hub.docker.com/r/amd64/mariadb for valid versions.
6253
##
6354
LOCAL_DB_VERSION=5.7
6455

@@ -71,10 +62,3 @@ LOCAL_WP_ENVIRONMENT_TYPE=local
7162

7263
# The URL to use when running e2e tests.
7364
WP_BASE_URL=http://localhost:${LOCAL_PORT}
74-
75-
##
76-
# The revision number of the WordPress Importer plugin to use when running unit tests.
77-
#
78-
# This should be an SVN revision number from the official plugin repository on wordpress.org.
79-
##
80-
WP_IMPORTER_REVISION=2387243

‎.git-blame-ignore-revs‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# Pinking shears
2+
a4789b3cc1cb59e5cd062670f4439f264c0d34f3 # [12042]
3+
fb4e38b0e750c0cab5eb4c50532da93e2d9882b3 # [15843]
4+
4b33a0e9c45d67c5f3123577262f73727444254a # [16438]
5+
fa33255b567df6b19ccc3a61824ad243db116993 # [16439]
6+
46d96c7704b978b9d070bfec1cb1a33e4caf46b0 # [18254]
7+
feaf2597bf16b1bd6b489a0e5680501f12990bee # [18276]
8+
9e7890c3f61781200b9337186d85cd4034edac61 # [18386]
9+
fd10e500e47ca1ae3280ac6817e725965f7fc0dc # [19054]
10+
6610e321e79d9b56c6fc496b6630dd2ac664a0d3 # [19528]
11+
d26f0a4c407a5d13a095c7676b397e51a959d82c # [19577]
12+
89e9bcc1d69ebbac01c8c4501f9066e421125e66 # [20000]
13+
8c50f982ea9784fe06844ce84b1a3297b1241442 # [20715]
14+
b6e23d7269e50296270f93dda96dacb118bee8b3 # [20944]
15+
48a3ec24c5ea7615431bde431098546674a0096c # [21070]
16+
2439e4d722f5093631c4bac9a45106ab33624aaa # [21381]
17+
56c4577feae624f7a3bf55d001295e0707c972b6 # [21486]
18+
680b671330327f2568549dec9460a2e942219d55 # [21492]
19+
dd39a3b3d2d1f792b6ed8e88b1fcc13877fbd8dd # [22491]
20+
6d8bce688f5215ad20133b2cefedc72ac5136be3 # [22634]
21+
05c0f14024a2bb8ef9bdfcb84589d04205f8ce24 # [23679]
22+
ece7a7714477142d4cdb3269d2f9ad3d5dab2e5f # [23780]
23+
687d1a2ce992a0e7e24675b506b85a57e42fe78e # [24303]
24+
45d2a20783460667f85d5fdced422efd54c33b72 # [24603]
25+
c8889d984fd98381d6f0bd3228972e93348f1266 # [25085]
26+
# 21da24227f2c0087c95f44c60b1bca65cedf0611 # [25824] includes a punctuation change
27+
30f822b8ee767c0b07fe1780f2829de0cba8c314 # [25880]
28+
1cdb0ac2fa5452e58d7a002b260d594a581af02e # [26475]
29+
37a37b5fc578d945376cf3b66b4a23265d6491f3 # [26597]
30+
bda43fd1071ed45ded3def7872866f62e40af9f5 # [26627]
31+
98fe4a5aedfdaa8c769bf2aaedc58eb63d342320 # [26631]
32+
d6e06a2ee5c15b19ca80b9162f3e19c06b5af34d # [26714]
33+
cfd5c395bb3ba810edaec6cf4483212181823d2e # [26851]
34+
2ec5e68249bdacee9ac0ce59fad91b1149244af8 # [27123]
35+
305e72859a4154fc96bac7774ab7808ead6a06d4 # [29169]
36+
ca32a2d410f954b6b40d23f3392ba53e62a3d9f1 # [29707]
37+
48a504cc50a16f60a395ace8d133130e3d6962f5 # [30047]
38+
b539bd985bdf2dde162f46fcbf14e51e46ff8be7 # [30372]
39+
9a3942ffd82b28a77982e0a0d1c2bb0b8a70ce44 # [30996]
40+
469164785ff8defefbfcdf972c57d9004c273256 # [31077]
41+
c4e9c64233166957cd1cbcc54ff54b1a02edd3b5 # [31623]
42+
f4f1b4821342fd1d58708356b3ec39d6fefe31ac # [33411]
43+
0ec540b946eaebebc7e8ee39a8e4738914e7f2a3 # [33627]
44+
0c5bd752629b0960c6f43ca212a64724e4f40346 # [34534]
45+
991feb70438e981290696fa2b4fbe2ea54696a02 # [34774]
46+
6911ff11308089eace23719fc50160d403081a8e # [35627]
47+
8df8cf2df14fe26174f97af5bb17d63f2e867231 # [42843]
48+
49+
# Coding Standards
50+
8f95800d52c1736d651ae6e259f90ad4a0db2c3f # [42343]

‎.github/dependabot.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Configure Dependabot scanning.
2+
version: 2
3+
4+
updates:
5+
# Check for updates to GitHub Actions.
6+
- package-ecosystem: "github-actions"
7+
directory: "/"
8+
schedule:
9+
interval: "daily"
10+
open-pull-requests-limit: 10

0 commit comments

Comments
 (0)