Merge branch 'release/1.2.5'

.travis.yml

@@ -2,33 +2,44 @@ sudo: false
 
 language: php
 
-matrix:
-  fast_finish: true
-
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 7.0
-  - hhvm
-
 env:
-  matrix:
-  - 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
   global:
   - secure: GZuBoHlpcrgIBwu4Y254Enq2ahpC36jnyXhB2YJLI1+3xqmf4qq7IjxuOLmZkIHA/VCls7L7+avarrw/lT/z7ZeaCVJ0x/oK34WcHm84dP21wIe+jPlom7TN1leWTNbqAXfrrYvQJGEF9JweKw5WWRBhvXtgXiT2ckvBijuVAdA=
   - secure: DAcE4hAgVJPQOU+qvU77S6rseu+9Mc9sKamPZRUEVNFY+xU/B5ZuVivRJd0VtGHzgRqsZXRMXih96Nau5TSSxV28C/Sd8bnu0VzA1UnV07uKhwOyb7vRi+KbdNN0ICFPuqw7RFgoqytV4BpKRer+ZQDohpN7XdiBumrrrBREZyk=
   - secure: OgtWjiebuZowAhHEthCbFocW/4LnapqqXNlZr9+KI93IgpHoubiimO0WSNL3S2//CO47qyuENNYOmUQWlXcQ1qIlhB/fzZ911CDU0oT2f1CSFihoUemRXRXYbuXHD52kT7eQttqHYCVmPWeH++B5r7kzYa2kNgP9fCJ3Vk29nCc=
   - secure: h3rVFMIzYoTE9Y/WEhVUKV1LU7Oq5m0MI/2ufTTR+yFrX9qIX08QbE6ZnDvCihOVDCDT0rx6AcnaB+u1ay2gTsedmHw44GJbI37xiLFx+C9F6edXtTjlUkF/WG/06N/NYmb1lsxb2sgmMXl8vOcT1CpBnvxr07eDpzGG534fdXQ=
 
+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
+
+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

CHANGELOG.md

@@ -7,7 +7,10 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
 ## [Unreleased][unreleased]
 -
 
-## [1.2.4] - 2016-02-1
+## [1.2.5] - 2016-02-05
+- Improved unit tests.
+
+## [1.2.4] - 2016-02-01
 - Added an gateway settings class.
 
 ## [1.2.3] - 2015-10-14
@@ -34,7 +37,9 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
 ## 1.0.0 - 2015-01-19
 - First release.
 
-[unreleased]: https://github.com/wp-pay-gateways/multisafepay-connect/compare/1.2.3...HEAD
+[unreleased]: https://github.com/wp-pay-gateways/multisafepay-connect/compare/1.2.5...HEAD
+[1.2.5]: https://github.com/wp-pay-gateways/multisafepay-connect/compare/1.2.4...1.2.5
+[1.2.4]: https://github.com/wp-pay-gateways/multisafepay-connect/compare/1.2.3...1.2.4
 [1.2.3]: https://github.com/wp-pay-gateways/multisafepay-connect/compare/1.2.2...1.2.3
 [1.2.2]: https://github.com/wp-pay-gateways/multisafepay-connect/compare/1.2.1...1.2.2
 [1.2.1]: https://github.com/wp-pay-gateways/multisafepay-connect/compare/1.2.0...1.2.1

Gruntfile.js

@@ -23,6 +23,7 @@ module.exports = function( grunt ) {
 				],
 			},
 			options: {
+				bin: 'vendor/bin/phpcs',
 				standard: 'phpcs.ruleset.xml',
 				showSniffCodes: true
 			}

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

bin/travis-after_success

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Coveralls
+if [[ '1' == $COVERAGE ]]; then
+	php vendor/bin/coveralls
+fi

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 

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

composer.json

@@ -28,11 +28,28 @@
 	},
 	"require": {
 		"php": ">=5.2.4",
+		"xrstf/composer-php52": "1.*",
 		"wp-pay/core": "^1.3.1",
 		"wp-pay-gateways/common": "^1.0.0",
 		"wp-pay-gateways/multisafepay": "^1.1.2"
 	},
 	"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"
+		]
 	}
 }