Skip to content

Commit

Permalink
Merge pull request #19 from WordPoints/develop
Browse files Browse the repository at this point in the history
1.0.2
  • Loading branch information
JDGrimes authored Aug 9, 2016
2 parents 3fe5591 + 53efccd commit dc4e5af
Show file tree
Hide file tree
Showing 27 changed files with 288 additions and 227 deletions.
1 change: 1 addition & 0 deletions .coveralls.yml
1 change: 0 additions & 1 deletion .gitignore

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "dev-lib"]
path = dev-lib
url = https://github.com/WordPoints/dev-lib.git
1 change: 1 addition & 0 deletions .jshintignore
1 change: 1 addition & 0 deletions .jshintrc
73 changes: 73 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
# Travis CI configuration file for a WordPoints module.

language: php

# 5.3 runs first so that we can fail fast on the codesniff pass (see below).
php:
- 5.3
- 5.2
- 5.4
- 5.5
- 5.6
- 7.0

env:
- TRAVISCI_RUN=codesniff
- TRAVISCI_RUN=phpunit WP_VERSION=master WORDPOINTS_VERSION=master WC_VERSION=2.6.4
- TRAVISCI_RUN=phpunit WP_VERSION=4.5 WORDPOINTS_VERSION=master WC_VERSION=2.6.4
- TRAVISCI_RUN=phpunit WP_VERSION=4.4 WORDPOINTS_VERSION=master WC_VERSION=2.6.4

sudo: false

matrix:
include:
# Only run HHVM against trunk for now.
- php: hhvm
env: TRAVISCI_RUN=phpunit WP_VERSION=master WC_VERSION=2.6.4
# Only run nightly against trunk.
- php: nightly
env: TRAVISCI_RUN=phpunit WP_VERSION=master WC_VERSION=2.6.4
exclude:
# The codesniff pass only needs to be run once, I chose PHP 5.3, since WPCS requires it.
- php: 5.2
env: TRAVISCI_RUN=codesniff
- php: 5.4
env: TRAVISCI_RUN=codesniff
- php: 5.5
env: TRAVISCI_RUN=codesniff
- php: 5.6
env: TRAVISCI_RUN=codesniff
- php: 7.0
env: TRAVISCI_RUN=codesniff
allow_failures:
- php: hhvm
- php: nightly
fast_finish: true

before_script:
- export WORDPOINTS_PROJECT_TYPE=module
- export DEV_LIB_PATH=dev-lib
- if [ -e .wordpoints-dev-lib-config.sh ]; then source .wordpoints-dev-lib-config.sh; fi
- source $DEV_LIB_PATH/travis/before_script.sh

script:
- codesniff-php-syntax
- codesniff-php-autoloaders
- codesniff-phpcs
- codesniff-jshint
- codesniff-l10n
- codesniff-xmllint
- codesniff-bash
- codesniff-symlinks
- phpunit-basic
- phpunit-ms
- phpunit-ms-network
- phpunit-uninstall
- phpunit-ms-uninstall
- phpunit-ms-network-uninstall
- phpunit-ajax
- phpunit-ms-ajax
- phpunit-ms-network-ajax

after_script:
- source $DEV_LIB_PATH/travis/after_script.sh
25 changes: 25 additions & 0 deletions .wordpoints-dev-lib-config.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/bash

set -e
shopt -s expand_aliases

# Install WooCommerce when running tests.
install-woocommerce() {

mkdir /tmp/woocommerce

curl -L "https://github.com/woothemes/woocommerce/archive/${WC_VERSION}.tar.gz" \
| tar xvz --strip-components=1 -C /tmp/woocommerce

mv /tmp/woocommerce /tmp/wordpress/src/wp-content/plugins/woocommerce
}

# Sets up custom configuration.
function wordpoints-dev-lib-config() {

alias setup-phpunit="\setup-phpunit; install-woocommerce"
}

set +e

# EOF
40 changes: 40 additions & 0 deletions .wp-l10n-validator-cache.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"files": {
"\/components\/points\/includes\/functions.php": {
"size": 1634,
"hash": "268e6793315b680fbdb33bc00ee9ca31",
"errors": false
},
"\/components\/points\/includes\/gateways\/points.php": {
"size": 6250,
"hash": "ea3dd18ff0de80df7d129dac4e987b2a",
"errors": false
},
"\/components\/points\/points.php": {
"size": 494,
"hash": "5d7c235bbb9fc10e4e85fc64f1211651",
"errors": false
},
"\/includes\/class-un-installer.php": {
"size": 526,
"hash": "3fafcdde71acee86a0be045db47bc446",
"errors": false
},
"\/includes\/constants.php": {
"size": 449,
"hash": "cd895286efb36fff138393ba52ac61f9",
"errors": false
},
"\/includes\/functions.php": {
"size": 899,
"hash": "e3862371baeae43c74ecc2ff489613f6",
"errors": false
},
"\/woocommerce.php": {
"size": 1191,
"hash": "a14114c7cdf4aa604cadb6f93793548d",
"errors": false
}
},
"config_signature": "59e021655228772535dbe74b7e705298"
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,6 @@
}
},
"text": {
"105": {
"name": "array",
"type": "unknown",
"args_started": true,
"arg_count": 1,
"parentheses": 1
},
"112": {
"name": "array",
"type": "unknown",
Expand All @@ -53,13 +46,6 @@
}
},
"select": {
"119": {
"name": "array",
"type": "unknown",
"args_started": true,
"arg_count": 1,
"parentheses": 1
},
"127": {
"name": "array",
"type": "unknown",
Expand All @@ -78,7 +64,7 @@
}
},
"success": {
"197": {
"195": {
"name": "array",
"type": "unknown",
"args_started": true,
Expand All @@ -87,15 +73,12 @@
}
}
},
"\/includes\/functions.php": {
"wordpoints-woocommerce": {
"37": {
"name": "wordpoints_load_module_textdomain",
"type": "unknown",
"args_started": true,
"arg_count": 0,
"parentheses": 1
}
"\/includes\/class-un-installer.php": {
"module": {
"20": false
},
"WordPoints_WooCommerce_Un_Installer": {
"34": false
}
}
}
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"php": ">=5.2.0"
},
"require-dev": {
"wordpoints/module-uninstall-tester": "~0.2",
"wordpoints/l10n-validator-config": "~1.0"
"wordpoints/module-uninstall-tester": "^0.4"
}
}
52 changes: 17 additions & 35 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions dev-lib
Submodule dev-lib added at 31c8cd
1 change: 1 addition & 0 deletions phpcs.ruleset.xml
Loading

0 comments on commit dc4e5af

Please sign in to comment.