Merge pull request #261 from wpengine/ryanmeier/feature/npm-security-updates

NPM Security Updates

Author: rfmeier

.phplint.yml

@@ -0,0 +1,7 @@
+path: ./
+jobs: 10
+cache: build/phplint.cache
+extensions:
+  - php
+exclude:
+  - vendor

.travis.yml

@@ -29,7 +29,7 @@ matrix:
     - php: 7.3
       env: WP_VERSION=5.2 WP_MULTISITE=1
     - php: 7.3
-      env: WP_VERSION=latest WP_MULTISITE=1
+      env: WP_VERSION=latest WP_MULTISITE=1 PHPCS=1
     - php: 7.3
       env: NPM_TESTS=1
   exclude:
@@ -87,8 +87,13 @@ before_script:
     fi
 script:
   - |
+    if [[ "$PHPCS" == "1" ]]; then
+      composer phpcs
+    fi
+
     if [[ "$NPM_TESTS" == "1" ]]; then
       npm test
     else
+      bash php-lint.sh
       phpunit
     fi

Gruntfile.js

@@ -1,11 +1,4 @@
-var phpPaths = [
-	'wpengine-phpcompat.php',
-	'load-files.php',
-	'src/*.php',
-];
-
 module.exports = function(grunt) {
-
 	grunt.initConfig({
 		wp_readme_to_markdown: {
 			options: {
@@ -17,27 +10,12 @@ module.exports = function(grunt) {
 					'readme.md': 'readme.txt'
 				},
 			},
-		},
-		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.loadNpmTasks('grunt-phplint');
-	grunt.loadNpmTasks('grunt-phpcs');
-
-	grunt.registerTask('default', ['phplint', 'phpcs']);
 
+	grunt.registerTask('default', []);
 	grunt.registerTask('readme', ['wp_readme_to_markdown']);
 };
 

composer.json

@@ -20,6 +20,8 @@
 		],
 		"post-install-cmd": [
 			"cd php52; composer install; cd .."
-		]
+		],
+		"phpcs": "phpcs --standard=src/ruleset-wordpress.xml wpengine-phpcompat.php load-files.php src/*.php",
+		"phpcs:fix": "phpcbf --standard=src/ruleset-wordpress.xml wpengine-phpcompat.php load-files.php src/*.php"
 	}
 }

composer.lock

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

package-lock.json

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+find . -not \( -path ./vendor -prune \) -not \( -path ./php52 -prune \) -type f -name '*.php' -print0 | xargs -0 -n1 -P4 -I {} php -l -n {} | (! grep -v "No syntax errors detected" )