Merge branch 'release/1.0.0'

wp-pay-gateways · Feb 1, 2016 · 396cdd9 · 396cdd9
2 parents 0185428 + 67249df
commit 396cdd9
Show file tree

Hide file tree

Showing 13 changed files with 133 additions and 101 deletions.
diff --git a/bin/install-wpcs b/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
diff --git a/bin/travis-script b/bin/travis-script
@@ -7,8 +7,6 @@ phpunit
 
 # Grunt
 if [[ '1' == $GRUNT ]]; then
-	vendor/bin/phpcs --config-set installed_paths vendor/wp-coding-standards/wpcs
-
 	npm install -g grunt-cli
 
 	npm install --no-optional

diff --git a/composer.json b/composer.json
@@ -29,10 +29,10 @@
 	"require": {
 		"php": ">=5.2.4",
 		"xrstf/composer-php52": "1.*",
-		"wp-pay/core": "dev-develop",
-		"wp-pay-gateways/common": "dev-develop",
-		"wp-pay-gateways/ideal": "dev-develop",
-		"wp-pay-gateways/ideal-basic": "dev-develop"
+		"wp-pay/core": "^1.3.1",
+		"wp-pay-gateways/common": "^1.0.0",
+		"wp-pay-gateways/ideal": "^1.1.1",
+		"wp-pay-gateways/ideal-basic": "^1.1.2"
 	},
 	"require-dev": {
 		"phpmd/phpmd": "^2.2.3",
@@ -49,7 +49,8 @@
 			"xrstf\\Composer52\\Generator::onPostInstallCmd"
 		],
 		"post-autoload-dump": [
-			"xrstf\\Composer52\\Generator::onPostInstallCmd"
+			"xrstf\\Composer52\\Generator::onPostInstallCmd",
+			"bin/install-wpcs"
 		]
 	}
 }