Skip to content

Commit ae3ec35

Browse files
authored
Merge branch 'main' into try/composer-phar
2 parents d82fb16 + 8ef9aec commit ae3ec35

3 files changed

Lines changed: 358 additions & 270 deletions

File tree

.github/workflows/deployment.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
echo "$CLI_VERSION" > cli_version.txt
4949
5050
- name: Upload WP-CLI version
51-
uses: actions/upload-artifact@v3
51+
uses: actions/upload-artifact@v4
5252
with:
5353
name: cli_version
5454
path: cli_version.txt
@@ -57,7 +57,7 @@ jobs:
5757
run: php -dphar.readonly=0 utils/make-phar.php wp-cli.phar --version=$CLI_VERSION
5858

5959
- name: Upload built Phar file
60-
uses: actions/upload-artifact@v3
60+
uses: actions/upload-artifact@v4
6161
with:
6262
name: wp-cli-phar
6363
path: wp-cli.phar
@@ -153,7 +153,7 @@ jobs:
153153
sudo sed -i 's/^.*policy.*coder.*none.*PDF.*//' /etc/ImageMagick-6/policy.xml
154154
155155
- name: Download built Phar file
156-
uses: actions/download-artifact@v3
156+
uses: actions/download-artifact@v4
157157
with:
158158
name: wp-cli-phar
159159

@@ -201,7 +201,7 @@ jobs:
201201
token: ${{ secrets.ACTIONS_BOT }}
202202

203203
- name: Download WP-CLI version
204-
uses: actions/download-artifact@v3
204+
uses: actions/download-artifact@v4
205205
with:
206206
name: cli_version
207207

@@ -210,7 +210,7 @@ jobs:
210210
cat cli_version.txt > phar/NIGHTLY_VERSION
211211
212212
- name: Download built Phar file
213-
uses: actions/download-artifact@v3
213+
uses: actions/download-artifact@v4
214214
with:
215215
name: wp-cli-phar
216216

@@ -310,7 +310,7 @@ jobs:
310310
token: ${{ secrets.ACTIONS_BOT }}
311311

312312
- name: Download built Phar file
313-
uses: actions/download-artifact@v3
313+
uses: actions/download-artifact@v4
314314
with:
315315
name: wp-cli-phar
316316

@@ -364,7 +364,7 @@ jobs:
364364
token: ${{ secrets.ACTIONS_BOT }}
365365

366366
- name: Download built Phar file
367-
uses: actions/download-artifact@v3
367+
uses: actions/download-artifact@v4
368368
with:
369369
name: wp-cli-phar
370370

composer.json

Lines changed: 84 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,89 @@
11
{
2-
"name": "wp-cli/wp-cli-bundle",
3-
"description": "WP-CLI bundle package with default commands.",
4-
"keywords": [
5-
"cli",
6-
"wordpress"
7-
],
8-
"homepage": "https://wp-cli.org",
9-
"license": "MIT",
10-
"require": {
11-
"php": ">=5.6",
12-
"composer/composer": "^1.10.23 || ~2.2.17",
13-
"wp-cli/cache-command": "^2",
14-
"wp-cli/checksum-command": "^2.1",
15-
"wp-cli/config-command": "^2.1",
16-
"wp-cli/core-command": "^2.1",
17-
"wp-cli/cron-command": "^2",
18-
"wp-cli/db-command": "^2",
19-
"wp-cli/embed-command": "^2",
20-
"wp-cli/entity-command": "^2",
21-
"wp-cli/eval-command": "^2",
22-
"wp-cli/export-command": "^2",
23-
"wp-cli/extension-command": "^2.1",
24-
"wp-cli/i18n-command": "^2",
25-
"wp-cli/import-command": "^2",
26-
"wp-cli/language-command": "^2",
27-
"wp-cli/maintenance-mode-command": "^2",
28-
"wp-cli/media-command": "^2",
29-
"wp-cli/package-command": "^2.1",
30-
"wp-cli/rewrite-command": "^2",
31-
"wp-cli/role-command": "^2",
32-
"wp-cli/scaffold-command": "^2",
33-
"wp-cli/search-replace-command": "^2",
34-
"wp-cli/server-command": "^2",
35-
"wp-cli/shell-command": "^2",
36-
"wp-cli/super-admin-command": "^2",
37-
"wp-cli/widget-command": "^2",
38-
"wp-cli/wp-cli": "dev-main"
2+
"name": "wp-cli/wp-cli-bundle",
3+
"description": "WP-CLI bundle package with default commands.",
4+
"keywords": [
5+
"cli",
6+
"wordpress"
7+
],
8+
"homepage": "https://wp-cli.org",
9+
"license": "MIT",
10+
"require": {
11+
"php": ">=5.6",
12+
"wp-cli/cache-command": "^2",
13+
"wp-cli/checksum-command": "^2.1",
14+
"wp-cli/config-command": "^2.1",
15+
"wp-cli/core-command": "^2.1",
16+
"wp-cli/cron-command": "^2",
17+
"wp-cli/db-command": "^2",
18+
"wp-cli/embed-command": "^2",
19+
"wp-cli/entity-command": "^2",
20+
"wp-cli/eval-command": "^2",
21+
"wp-cli/export-command": "^2",
22+
"wp-cli/extension-command": "^2.1",
23+
"wp-cli/i18n-command": "^2",
24+
"wp-cli/import-command": "^2",
25+
"wp-cli/language-command": "^2",
26+
"wp-cli/maintenance-mode-command": "^2",
27+
"wp-cli/media-command": "^2",
28+
"wp-cli/package-command": "^2.1",
29+
"wp-cli/rewrite-command": "^2",
30+
"wp-cli/role-command": "^2",
31+
"wp-cli/scaffold-command": "^2",
32+
"wp-cli/search-replace-command": "^2",
33+
"wp-cli/server-command": "^2",
34+
"wp-cli/shell-command": "^2",
35+
"wp-cli/super-admin-command": "^2",
36+
"wp-cli/widget-command": "^2",
37+
"wp-cli/wp-cli": "dev-main"
38+
},
39+
"require-dev": {
40+
"roave/security-advisories": "dev-latest",
41+
"wp-cli/wp-cli-tests": "^4"
42+
},
43+
"suggest": {
44+
"psy/psysh": "Enhanced `wp shell` functionality"
45+
},
46+
"config": {
47+
"allow-plugins": {
48+
"dealerdirect/phpcodesniffer-composer-installer": true,
49+
"johnpbloch/wordpress-core-installer": true
3950
},
40-
"require-dev": {
41-
"roave/security-advisories": "dev-latest",
42-
"wp-cli/wp-cli-tests": "^4"
51+
"platform": {
52+
"php": "5.6"
4353
},
44-
"suggest": {
45-
"psy/psysh": "Enhanced `wp shell` functionality"
46-
},
47-
"config": {
48-
"allow-plugins": {
49-
"dealerdirect/phpcodesniffer-composer-installer": true,
50-
"johnpbloch/wordpress-core-installer": true
51-
},
52-
"platform": {
53-
"php": "5.6"
54-
},
55-
"process-timeout": 7200,
56-
"sort-packages": true
57-
},
58-
"extra": {
59-
"branch-alias": {
60-
"dev-main": "2.9.x-dev"
61-
}
62-
},
63-
"autoload-dev": {
64-
"psr-4": {
65-
"WP_CLI\\Maintenance\\": "utils/maintenance"
66-
}
67-
},
68-
"minimum-stability": "dev",
69-
"prefer-stable": true,
70-
"scripts": {
71-
"behat": "run-behat-tests",
72-
"behat-rerun": "rerun-behat-tests",
73-
"lint": "run-linter-tests",
74-
"phpcs": "run-phpcs-tests",
75-
"phpunit": "run-php-unit-tests",
76-
"placeholder": "value",
77-
"prepare-tests": "install-package-tests",
78-
"test": [
79-
"@lint",
80-
"@phpcs",
81-
"@phpunit",
82-
"@behat"
83-
]
84-
},
85-
"support": {
86-
"issues": "https://github.com/wp-cli/wp-cli-bundle/issues",
87-
"source": "https://github.com/wp-cli/wp-cli-bundle",
88-
"docs": "https://make.wordpress.org/cli/handbook/"
54+
"process-timeout": 7200,
55+
"sort-packages": true
56+
},
57+
"extra": {
58+
"branch-alias": {
59+
"dev-main": "2.9.x-dev"
60+
}
61+
},
62+
"autoload-dev": {
63+
"psr-4": {
64+
"WP_CLI\\Maintenance\\": "utils/maintenance"
8965
}
66+
},
67+
"minimum-stability": "dev",
68+
"prefer-stable": true,
69+
"scripts": {
70+
"behat": "run-behat-tests",
71+
"behat-rerun": "rerun-behat-tests",
72+
"lint": "run-linter-tests",
73+
"phpcs": "run-phpcs-tests",
74+
"phpunit": "run-php-unit-tests",
75+
"placeholder": "value",
76+
"prepare-tests": "install-package-tests",
77+
"test": [
78+
"@lint",
79+
"@phpcs",
80+
"@phpunit",
81+
"@behat"
82+
]
83+
},
84+
"support": {
85+
"issues": "https://github.com/wp-cli/wp-cli-bundle/issues",
86+
"source": "https://github.com/wp-cli/wp-cli-bundle",
87+
"docs": "https://make.wordpress.org/cli/handbook/"
88+
}
9089
}

0 commit comments

Comments
 (0)