Merge branch 'master' into fork

Author: octalmage

Gruntfile.js

@@ -1,5 +1,7 @@
+var phpPaths = ['wpengine-phpcompat.php', 'src/*.php'];
+
 module.exports = function(grunt) {
-	
+
 	grunt.initConfig({
 		wp_readme_to_markdown: {
 			options: {
@@ -12,18 +14,32 @@ module.exports = function(grunt) {
 				},
 			},
 		},
+		phplint: {
+			plugin: phpPaths
+		},
+		phpcs: {
+			plugin: {
+				src: phpPaths
+			},
+			options: {
+				bin: 'vendor/bin/phpcs',
+				standard: 'src/ruleset-wordpress.xml'
+			}
+		}
 	});
-	
+
 	grunt.loadNpmTasks('grunt-wp-readme-to-markdown');
-	
-	grunt.registerTask('default', [
-		'wp_readme_to_markdown'
-	]); 
+	grunt.loadNpmTasks('grunt-phplint');
+	grunt.loadNpmTasks('grunt-phpcs');
+
+	grunt.registerTask('default', ['phplint', 'phpcs']);
+
+	grunt.registerTask('readme', ['wp_readme_to_markdown']);
 };
 
 // Add build status image to GitHub readme.
 function addBuildStatus(readme) {
 	var buildImage = '<a href="https://travis-ci.org/wpengine/phpcompat"><img src="https://travis-ci.org/wpengine/phpcompat.svg?branch=master"></a>';
-	
+
 	return readme.replace(/# PHP Compatibility Checker #/, '# PHP Compatibility Checker ' + buildImage);
 }

composer.json

@@ -6,16 +6,24 @@
 		"name": "Jason Stallings",
 		"email": "[email protected]"
 	}],
-    "require": {
-    	"squizlabs/php_codesniffer": "2.*",
+	"require": {
+		"squizlabs/php_codesniffer": "2.6.*",
 		"wimg/php-compatibility": "dev-master",
 		"simplyadmire/composer-plugins" : "@dev"
-   	},
-   	"autoload": {
-        "classmap": ["src/wpephpcompat.php"]
+	},
+	"require-dev": {
+		"wp-coding-standards/wpcs": "dev-master",
+		"neronmoon/scriptsdev": "^0.1.0"
+	},
+	"autoload": {
+		"classmap": ["src/wpephpcompat.php"]
 	},
 	"scripts": {
-	   "post-update-cmd": "rm -rf vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/PHPCompatibility; cp -rp vendor/wimg/php-compatibility vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/PHPCompatibility",
-	   "post-install-cmd": "rm -rf vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/PHPCompatibility; cp -rp vendor/wimg/php-compatibility vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/PHPCompatibility"
-    }
+		"post-update-cmd": "vendor/bin/phpcs --config-delete installed_paths; rm -rf vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/PHPCompatibility; cp -rp vendor/wimg/php-compatibility vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/PHPCompatibility",
+		"post-install-cmd": "vendor/bin/phpcs --config-delete installed_paths; rm -rf vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/PHPCompatibility; cp -rp vendor/wimg/php-compatibility vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/PHPCompatibility"
+	},
+	"scripts-dev": {
+		"post-update-cmd": "vendor/bin/phpcs --config-set installed_paths vendor/wp-coding-standards/wpcs/;",
+		"post-install-cmd": "vendor/bin/phpcs --config-set installed_paths vendor/wp-coding-standards/wpcs/;"
+	}
 }

composer.lock

@@ -3,9 +3,14 @@
   "devDependencies": {
     "grunt": "^0.4.5",
     "grunt-wp-readme-to-markdown": "^2.0.0",
-    "node-qunit-phantomjs": "^1.4.0"
+    "node-qunit-phantomjs": "^1.4.0",
+    "grunt-phpcs": "^0.4.0",
+    "grunt-phplint": "0.0.8"
   },
   "scripts": {
-    "test": "node-qunit-phantomjs tests/qunit/index.html --verbose"
+    "test": "npm run test:lint && npm run test:qunit",
+    "test:qunit": "node-qunit-phantomjs tests/qunit/index.html  --verbose",
+    "test:lint": "grunt",
+    "readme": "grunt readme"
   }
 }