Skip to content
This repository has been archived by the owner on Aug 5, 2021. It is now read-only.

Commit

Permalink
Merge branch 'release/1.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
remcotolsma committed Mar 2, 2016
2 parents b3e0b92 + 912fa37 commit a0a2596
Show file tree
Hide file tree
Showing 13 changed files with 895 additions and 185 deletions.
46 changes: 28 additions & 18 deletions .travis.yml
Expand Up @@ -3,26 +3,36 @@ sudo: false
language: php

matrix:
include:
- php: 5.2
env: WP_VERSION=latest WP_MULTISITE=1
- php: 5.2
env: WP_VERSION=4.0 WP_MULTISITE=1
- php: 5.3
env: WP_VERSION=4.0
- php: 5.4
env: WP_VERSION=4.0
- php: 5.5
env: WP_VERSION=4.0
- php: 5.6
env: WP_VERSION=4.0 COVERAGE=1 GRUNT=1
- php: 7.0
env: WP_VERSION=4.0
- php: hhvm
env: WP_VERSION=4.0
fast_finish: true

php:
- 5.3
- 5.4
- 5.5
- 7.0
- hhvm

env:
- WP_VERSION=latest WP_MULTISITE=0
- WP_VERSION=latest WP_MULTISITE=1
- WP_VERSION=4.0 WP_MULTISITE=0
- WP_VERSION=4.0 WP_MULTISITE=1
cache:
directories:
- node_modules
- vendor
- $HOME/.composer/cache

before_script:
- composer self-update
- composer install
- wget https://raw.githubusercontent.com/wp-cli/sample-plugin/master/bin/install-wp-tests.sh
- bash install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION
- bash bin/travis-before_script

script:
- bash bin/travis-script

after_script:
- php vendor/bin/coveralls
after_success:
- bash bin/travis-after_success
8 changes: 7 additions & 1 deletion CHANGELOG.md
Expand Up @@ -7,11 +7,17 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
## [Unreleased][unreleased]
-

## [1.0.2] - 2016-03-02
- Added get_settings function.
- Moved get_gateway_class() function to the configuration class.
- Removed get_config_class(), no longer required.

## [1.0.1] - 2016-02-03
- Fix fatal error "Can't use method return value in write context".

## 1.0.0 - 2016-02-01
- First release.

[unreleased]: https://github.com/wp-pay-gateways/ing-kassa-compleet/compare/1.0.1...HEAD
[unreleased]: https://github.com/wp-pay-gateways/ing-kassa-compleet/compare/1.0.2...HEAD
[1.0.2]: https://github.com/wp-pay-gateways/ing-kassa-compleet/compare/1.0.1...1.0.2
[1.0.1]: https://github.com/wp-pay-gateways/ing-kassa-compleet/compare/1.0.0...1.0.1
1 change: 1 addition & 0 deletions Gruntfile.js
Expand Up @@ -21,6 +21,7 @@ module.exports = function( grunt ) {
],
},
options: {
bin: 'vendor/bin/phpcs',
standard: 'phpcs.ruleset.xml',
showSniffCodes: true
}
Expand Down
6 changes: 6 additions & 0 deletions bin/install-wpcs
@@ -0,0 +1,6 @@
#!/bin/bash

# WordPress Coding Standards
if [[ -d vendor/wp-coding-standards/wpcs ]]; then
vendor/bin/phpcs --config-set installed_paths vendor/wp-coding-standards/wpcs
fi
6 changes: 6 additions & 0 deletions bin/travis-after_success
@@ -0,0 +1,6 @@
#!/bin/bash

# Coveralls
if [[ '1' == $COVERAGE ]]; then
php vendor/bin/coveralls
fi
21 changes: 21 additions & 0 deletions bin/travis-before_script
@@ -0,0 +1,21 @@
#!/bin/bash

set -ev

phpenv local 5.6

composer self-update

if [[ '1' == $COVERAGE ]]; then
composer install
else
composer install --no-dev
fi

phpenv local --unset

phpenv rehash

wget https://raw.githubusercontent.com/wp-cli/sample-plugin/master/bin/install-wp-tests.sh

bash install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION
15 changes: 15 additions & 0 deletions bin/travis-script
@@ -0,0 +1,15 @@
#!/bin/bash

set -ev

# PHPUnit
phpunit

# Grunt
if [[ '1' == $GRUNT ]]; then
npm install -g grunt-cli

npm install --no-optional

grunt
fi
23 changes: 20 additions & 3 deletions composer.json
Expand Up @@ -28,10 +28,27 @@
},
"require": {
"php": ">=5.2.4",
"wp-pay/core": "^1.3.1",
"wp-pay-gateways/common": "^1.0.0"
"xrstf/composer-php52": "1.*",
"wp-pay/core": "^1.3.4",
"wp-pay-gateways/common": "^1.0.1"
},
"require-dev": {
"satooshi/php-coveralls": "dev-master"
"phpmd/phpmd": "^2.2.3",
"satooshi/php-coveralls": "^0.7.1",
"squizlabs/php_codesniffer": "^2.2.0",
"wp-coding-standards/wpcs": "0.8.0",
"wp-cli/wp-cli": "^0.21.1"
},
"scripts": {
"post-install-cmd": [
"xrstf\\Composer52\\Generator::onPostInstallCmd"
],
"post-update-cmd": [
"xrstf\\Composer52\\Generator::onPostInstallCmd"
],
"post-autoload-dump": [
"xrstf\\Composer52\\Generator::onPostInstallCmd",
"bin/install-wpcs"
]
}
}

0 comments on commit a0a2596

Please sign in to comment.