Skip to content

Commit 3ae4201

Browse files
schlesseraschlessera
authored
Merge pull request #4 from wp-cli/adapt-for-v2
Adapt package for framework v2
2 parents 0c26976 + 578b41b commit 3ae4201

File tree

5 files changed

+558
-326
lines changed

5 files changed

+558
-326
lines changed

‎.travis.yml‎

Lines changed: 42 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,68 +2,73 @@ sudo: false
22
dist: trusty
33

44
language: php
5-
php: 7.1
5+
php: 7.2
6+
7+
notifications:
8+
email:
9+
on_success: never
10+
on_failure: change
11+
12+
branches:
13+
only:
14+
- master
15+
16+
cache:
17+
directories:
18+
- $HOME/.composer/cache
619

720
env:
821
global:
9-
- WP_CLI_BIN_DIR=/tmp/wp-cli-phar
22+
- PATH="$TRAVIS_BUILD_DIR/vendor/bin:$PATH"
23+
- WP_CLI_BIN_DIR="$TRAVIS_BUILD_DIR/vendor/bin"
24+
25+
before_install:
26+
- |
27+
# Remove Xdebug for a huge performance increase:
28+
if [ -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini ]; then
29+
phpenv config-rm xdebug.ini
30+
else
31+
echo "xdebug.ini does not exist"
32+
fi
33+
- |
34+
# Raise PHP memory limit to 2048MB
35+
echo 'memory_limit = 2048M' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
36+
- composer validate
1037

11-
before_script:
12-
- export PATH="$HOME/.composer/vendor/bin:$PATH"
13-
- ./ci/prepare.sh
38+
install:
39+
- composer install
40+
- composer prepare-tests
41+
42+
script:
43+
- composer phpunit
44+
- composer behat
1445

1546
jobs:
1647
include:
1748
- stage: sniff
18-
script: composer lint && composer phpcs
49+
script:
50+
- composer lint
51+
- composer phpcs
1952
env: BUILD=sniff
2053
- stage: test
21-
script: composer prepare-tests && composer phpunit && composer behat
2254
php: 7.2
2355
env: WP_VERSION=latest
2456
- stage: test
25-
script: composer prepare-tests && composer phpunit && composer behat
2657
php: 7.1
2758
env: WP_VERSION=latest
2859
- stage: test
29-
script: composer prepare-tests && composer phpunit && composer behat
3060
php: 7.0
3161
env: WP_VERSION=latest
3262
- stage: test
33-
script: composer prepare-tests && composer phpunit && composer behat
3463
php: 5.6
3564
env: WP_VERSION=latest
3665
- stage: test
37-
script: composer prepare-tests && composer phpunit && composer behat
38-
php: 5.6
39-
env: WP_VERSION=trunk
40-
- stage: test
41-
script: composer prepare-tests && composer phpunit && composer behat
4266
php: 5.6
43-
env: WP_VERSION=latest BUILD=git WP_CLI_BIN_DIR=''
67+
env: WP_VERSION=3.7.11
4468
- stage: test
45-
script: composer prepare-tests && composer phpunit && composer behat
4669
php: 5.6
47-
env: WP_VERSION=3.7.11
70+
env: WP_VERSION=trunk
4871
- stage: test
49-
script: composer prepare-tests && composer phpunit && composer behat
5072
php: 5.4
5173
dist: precise
52-
env: WP_VERSION=3.7.11
53-
- stage: deploy
54-
env: DEPLOY_BRANCH=master
55-
script: ./ci/deploy.sh
56-
57-
cache:
58-
directories:
59-
- $HOME/.composer/cache
60-
61-
branches:
62-
only:
63-
- master
64-
- /^release-.+$/
65-
66-
notifications:
67-
email:
68-
on_success: never
69-
on_failure: change
74+
env: WP_VERSION=latest

‎composer.json‎

Lines changed: 44 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,39 @@
77
],
88
"homepage": "https://wp-cli.org",
99
"license": "MIT",
10-
"support": {
11-
"issues": "https://github.com/wp-cli/wp-cli-bundle/issues",
12-
"source": "https://github.com/wp-cli/wp-cli-bundle",
13-
"docs": "https://make.wordpress.org/cli/handbook/"
10+
"require": {
11+
"php": ">=5.4",
12+
"wp-cli/cache-command": "^2",
13+
"wp-cli/checksum-command": "^2",
14+
"wp-cli/config-command": "^2",
15+
"wp-cli/core-command": "^2",
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",
23+
"wp-cli/import-command": "^2",
24+
"wp-cli/language-command": "^2",
25+
"wp-cli/media-command": "^2",
26+
"wp-cli/package-command": "^2",
27+
"wp-cli/rewrite-command": "^2",
28+
"wp-cli/role-command": "^2",
29+
"wp-cli/scaffold-command": "^2",
30+
"wp-cli/search-replace-command": "^2",
31+
"wp-cli/server-command": "^2",
32+
"wp-cli/shell-command": "^2",
33+
"wp-cli/super-admin-command": "^2",
34+
"wp-cli/widget-command": "^2",
35+
"wp-cli/wp-cli": "^2"
36+
},
37+
"require-dev": {
38+
"roave/security-advisories": "dev-master",
39+
"wp-cli/wp-cli-tests": "^2"
40+
},
41+
"suggest": {
42+
"psy/psysh": "Enhanced `wp shell` functionality"
1443
},
1544
"config": {
1645
"platform": {
@@ -19,56 +48,22 @@
1948
"process-timeout": 7200,
2049
"sort-packages": true
2150
},
22-
"minimum-stability": "dev",
23-
"prefer-stable": true,
24-
"require": {
25-
"php": ">=5.4",
26-
"wp-cli/cache-command": "^1.0",
27-
"wp-cli/checksum-command": "^1.0",
28-
"wp-cli/config-command": "^1.0",
29-
"wp-cli/core-command": "^1.0",
30-
"wp-cli/cron-command": "^1.0",
31-
"wp-cli/db-command": "^1.0",
32-
"wp-cli/embed-command": "^1.0",
33-
"wp-cli/entity-command": "^1.0",
34-
"wp-cli/eval-command": "^1.0",
35-
"wp-cli/export-command": "^1.0",
36-
"wp-cli/extension-command": "^1.0",
37-
"wp-cli/import-command": "^1.0",
38-
"wp-cli/language-command": "^1.0",
39-
"wp-cli/media-command": "^1.0",
40-
"wp-cli/package-command": "^1.0",
41-
"wp-cli/rewrite-command": "^1.0",
42-
"wp-cli/role-command": "^1.0",
43-
"wp-cli/scaffold-command": "^1.0",
44-
"wp-cli/search-replace-command": "^1.0",
45-
"wp-cli/server-command": "^1.0",
46-
"wp-cli/shell-command": "^1.0",
47-
"wp-cli/super-admin-command": "^1.0",
48-
"wp-cli/widget-command": "^1.0",
49-
"wp-cli/wp-cli": "dev-master"
50-
},
51-
"require-dev": {
52-
"roave/security-advisories": "dev-master",
53-
"wp-cli/wp-cli-tests": "dev-master"
54-
},
55-
"repositories": [
56-
{
57-
"type": "path",
58-
"url": "../wp-cli-refactor"
51+
"extra": {
52+
"branch-alias": {
53+
"dev-master": "2.0.x-dev"
5954
}
60-
],
61-
"suggest": {
62-
"psy/psysh": "Enhanced `wp shell` functionality"
6355
},
56+
"minimum-stability": "dev",
57+
"prefer-stable": true,
6458
"scripts": {
6559
"post-install-cmd": [
6660
"./utils/git-setup-pre-commit-hook"
6761
],
62+
"behat": "run-behat-tests",
6863
"lint": "run-linter-tests",
6964
"phpcs": "run-phpcs-tests",
7065
"phpunit": "run-php-unit-tests",
71-
"behat": "run-behat-tests",
66+
"placeholder": "value",
7267
"prepare-tests": "install-package-tests",
7368
"test": [
7469
"@lint",
@@ -77,9 +72,9 @@
7772
"@behat"
7873
]
7974
},
80-
"extra": {
81-
"branch-alias": {
82-
"dev-master": "2.0.x-dev"
83-
}
75+
"support": {
76+
"issues": "https://github.com/wp-cli/wp-cli-bundle/issues",
77+
"source": "https://github.com/wp-cli/wp-cli-bundle",
78+
"docs": "https://make.wordpress.org/cli/handbook/"
8479
}
8580
}

0 commit comments

Comments
 (0)