Skip to content

Commit 97ffbab

Browse files
committed
Updates!
1 parent 5260d95 commit 97ffbab

File tree

11 files changed

+1855
-80
lines changed

11 files changed

+1855
-80
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
composer.lock
21
vendor/
32
node_modules/
3+
build/

.travis.yml

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -71,26 +71,9 @@ before_script:
7171
else
7272
composer install
7373
fi
74-
- |
75-
if [[ "$WP_VERSION" == "latest" ]]; then
76-
curl -s http://api.wordpress.org/core/version-check/1.7/ > /tmp/wp-latest.json
77-
grep '[0-9]+\.[0-9]+(\.[0-9]+)?' /tmp/wp-latest.json
78-
WP_VERSION=$(grep -o '"version":"[^"]*' /tmp/wp-latest.json | sed 's/"version":"//')
79-
fi
8074
- |
8175
if [[ "$NPM_TESTS" != "1" ]]; then
82-
PLUGIN_SLUG=$(basename $(pwd))
83-
export WP_DEVELOP_DIR=/tmp/wordpress/
84-
git clone --depth=50 --branch="$WP_VERSION" git://develop.git.wordpress.org/ /tmp/wordpress
85-
cd ..
86-
cp -r "$PLUGIN_SLUG" "/tmp/wordpress/src/wp-content/plugins/$PLUGIN_SLUG"
87-
cd /tmp/wordpress/
88-
cp wp-tests-config-sample.php wp-tests-config.php
89-
sed -i "s/youremptytestdbnamehere/wordpress_tests/" wp-tests-config.php
90-
sed -i "s/yourusernamehere/travis/" wp-tests-config.php
91-
sed -i "s/yourpasswordhere//" wp-tests-config.php
92-
mysql -e "CREATE DATABASE wordpress_tests;" -uroot
93-
cd "/tmp/wordpress/src/wp-content/plugins/$PLUGIN_SLUG"
76+
tests/install-wp-tests.sh wordpress_tests travis "" localhost $WP_VERSION false
9477
phpenv rehash
9578
fi
9679
script:

Gruntfile.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
var phpPaths = ['wpengine-phpcompat.php', 'src/*.php'];
1+
var phpPaths = [
2+
'wpengine-phpcompat.php',
3+
'load-files.php',
4+
'src/*.php',
5+
];
26

37
module.exports = function(grunt) {
48

composer.json

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,19 @@
77
"email": "[email protected]"
88
}],
99
"require": {
10-
"squizlabs/php_codesniffer": "2.9.*",
11-
"wimg/php-compatibility": "^8",
12-
"simplyadmire/composer-plugins" : "@dev"
10+
"squizlabs/php_codesniffer": "^2.9.1",
11+
"dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
12+
"phpcompatibility/php-compatibility": "^8"
1313
},
1414
"require-dev": {
15-
"wp-coding-standards/wpcs": "dev-master",
16-
"neronmoon/scriptsdev": "^0.1.0"
15+
"wp-coding-standards/wpcs": "dev-master"
1716
},
1817
"scripts": {
1918
"post-update-cmd": [
20-
"cd php52; composer update; cd ..",
21-
"vendor/bin/phpcs --config-set installed_paths ../../wimg/php-compatibility"
19+
"cd php52; composer update; cd .."
2220
],
2321
"post-install-cmd": [
24-
"cd php52; composer install; cd ..",
25-
"vendor/bin/phpcs --config-set installed_paths ../../wimg/php-compatibility"
26-
]
27-
},
28-
"scripts-dev": {
29-
"post-update-cmd": [
30-
"cd php52; composer update; cd ..",
31-
"vendor/bin/phpcs --config-set installed_paths ../../wimg/php-compatibility,../../wp-coding-standards/wpcs"
32-
],
33-
"post-install-cmd": [
34-
"cd php52; composer install; cd ..",
35-
"vendor/bin/phpcs --config-set installed_paths ../../wimg/php-compatibility,../../wp-coding-standards/wpcs"
22+
"cd php52; composer install; cd .."
3623
]
3724
}
3825
}

composer.lock

Lines changed: 260 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)