Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
remcotolsma committed Jan 4, 2016
2 parents 1ea2750 + dd89525 commit d9ea57e
Show file tree
Hide file tree
Showing 19 changed files with 1,374 additions and 241 deletions.
45 changes: 28 additions & 17 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,37 @@ sudo: false

language: php

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

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

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 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
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a CHANGELOG](http://keepachangelog.com/).

## [Unreleased][unreleased]
-
- Added an gateway settings class.

## [1.2.4] - 2015-10-19
- Fixed fatal error with wrong constant usage.
Expand Down
8 changes: 7 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ module.exports = function( grunt ) {
],
},
options: {
bin: 'vendor/bin/phpcs',
standard: 'phpcs.ruleset.xml',
showSniffCodes: true
}
Expand Down Expand Up @@ -48,8 +49,13 @@ module.exports = function( grunt ) {
rulesets: 'phpmd.ruleset.xml'
}
},

// PHPUnit
phpunit: {
application: {},
}
} );

// Default task(s).
grunt.registerTask( 'default', [ 'jshint', 'phplint', 'phpmd', 'phpcs' ] );
grunt.registerTask( 'default', [ 'jshint', 'phplint', 'phpmd', 'phpcs', 'phpunit' ] );
};
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,18 @@
**ICEPAY driver for the WordPress payment processing library.**

[![Build Status](https://travis-ci.org/wp-pay-gateways/icepay.svg?branch=develop)](https://travis-ci.org/wp-pay-gateways/icepay)
[![Coverage Status](https://coveralls.io/repos/wp-pay-gateways/icepay/badge.png?branch=develop)](https://coveralls.io/r/wp-pay-gateways/icepay?branch=develop)
[![Coverage Status](https://coveralls.io/repos/wp-pay-gateways/icepay/badge.svg?branch=master&service=github)](https://coveralls.io/github/wp-pay-gateways/icepay?branch=master)
[![Latest Stable Version](https://poser.pugx.org/wp-pay-gateways/icepay/v/stable.svg)](https://packagist.org/packages/wp-pay-gateways/icepay)
[![Total Downloads](https://poser.pugx.org/wp-pay-gateways/icepay/downloads.svg)](https://packagist.org/packages/wp-pay-gateways/icepay)
[![Latest Unstable Version](https://poser.pugx.org/wp-pay-gateways/icepay/v/unstable.svg)](https://packagist.org/packages/wp-pay-gateways/icepay)
[![License](https://poser.pugx.org/wp-pay-gateways/icepay/license.svg)](https://packagist.org/packages/wp-pay-gateways/icepay)
[![Built with Grunt](https://cdn.gruntjs.com/builtwith.png)](http://gruntjs.com/)

## Links

* https://icepay.com/
* https://portal.icepay.com/

## Documentation

* [ICEPAY](http://www.icepay.com/)
Expand Down
6 changes: 6 additions & 0 deletions bin/install-wpcs
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
22 changes: 20 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,28 @@
},
"require": {
"php": ">=5.2.4",
"xrstf/composer-php52": "1.*",
"icepay/icepay": "~2.4.0",
"wp-pay/core": ">=1.2.3"
"wp-pay/core": "dev-develop",
"wp-pay-gateways/common": "dev-develop"
},
"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"
]
}
}
Loading

0 comments on commit d9ea57e

Please sign in to comment.