Merge branch 'release/1.1.5'

pronamic · May 6, 2016 · 97ec589 · 97ec589
2 parents 97c1a6a + 5afe023
commit 97ec589
Show file tree

Hide file tree

Showing 11 changed files with 239 additions and 146 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,9 @@ 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]
--
+
+## [1.1.5] - 2016-05-06
+- Improved error handling.
 
 ## [1.1.4] - 2016-03-22
 - Added scheduled transaction status request.

diff --git a/composer.lock b/composer.lock
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pay-nl",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "Pay.nl driver for the WordPress payment processing library.",
   "repository": {
     "type": "git",
@@ -33,7 +33,7 @@
   },
   "homepage": "http://www.wp-pay.org/gateways/pay-nl/",
   "devDependencies": {
-    "grunt": "~0.4.5",
+    "grunt": "~1.0.1",
     "grunt-phplint": "0.0.8",
     "grunt-phpmd": "^0.1.1",
     "grunt-phpcs": "^0.4.0",

diff --git a/phpcs.ruleset.xml b/phpcs.ruleset.xml
@@ -16,4 +16,8 @@
 	<rule ref="WordPress.VIP.SlowDBQuery.slow_db_query">
 		<exclude-pattern>/src/Settings.php</exclude-pattern>
 	</rule>
+
+	<rule ref="WordPress.VIP.RestrictedFunctions.file_get_contents">
+		<exclude-pattern>/tests/ClientTest.php</exclude-pattern>
+	</rule>
 </ruleset>