From 18855e8568e0fcd604d4577c7a22fb6b9bfd3389 Mon Sep 17 00:00:00 2001 From: Dave Ross Date: Fri, 11 Dec 2015 17:04:57 -0500 Subject: [PATCH 01/20] Mark --customruleset as taking a required argument --- bin/wp-enforcer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/wp-enforcer b/bin/wp-enforcer index 032b80f..98a2c3f 100755 --- a/bin/wp-enforcer +++ b/bin/wp-enforcer @@ -13,7 +13,7 @@ ruleset=false # Follow -o with a comma-separated list of single-character option names. # Follow -l with a comma-separated list of long option names. # Options may be followed by one colon to indicate they have a required argument -if ! options=$(getopt -o h,v,c -l help,version,vip,customruleset -- "$@") +if ! options=$(getopt -o h,v,c -l help,version,vip,customruleset: -- "$@") then # something went wrong, getopt will put out an error message for us exit 1 From 219fe9c10bf6d913d793ed2ba5edec72b69bfcce Mon Sep 17 00:00:00 2001 From: Dave Ross Date: Fri, 11 Dec 2015 17:05:33 -0500 Subject: [PATCH 02/20] Add required FILE parameter to --customruleset in built-in help --- bin/wp-enforcer | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/wp-enforcer b/bin/wp-enforcer index 98a2c3f..92f82bb 100755 --- a/bin/wp-enforcer +++ b/bin/wp-enforcer @@ -29,10 +29,10 @@ do echo " wp-enforcer [options]" echo "" echo "OPTIONS:" - echo " --help, -h Show this help and usage" - echo " --version, -v Show the current version of WP Enforcer" - echo " --vip Configure the project to use the WordPress.com VIP coding standards" - echo " --customruleset, -c Configure the project to use a custom PHPCS ruleset file" + echo " --help, -h Show this help and usage" + echo " --version, -v Show the current version of WP Enforcer" + echo " --vip Configure the project to use the WordPress.com VIP coding standards" + echo " --customruleset=FILE, -c Configure the project to use a custom PHPCS ruleset file" echo "" exit;; -v|--version) From 890f1efe630d2f18dfafe421725621f869c7298b Mon Sep 17 00:00:00 2001 From: Dave Ross Date: Fri, 11 Dec 2015 17:39:44 -0500 Subject: [PATCH 03/20] Fixed parsing multiple arguments. Prevent using --vip and --customruleset together as that doesn't make much sense. --- bin/wp-enforcer | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/bin/wp-enforcer b/bin/wp-enforcer index 92f82bb..2949bd9 100755 --- a/bin/wp-enforcer +++ b/bin/wp-enforcer @@ -9,6 +9,15 @@ readonly PROJECT="$(pwd)" vip=false ruleset=false +# Trigger an error and exit, but also tell users how they can re-run the script. +error() { + echo + echo "Error: $1" >&2 + echo "You may re-run this setup at any time by running $DIR/wp-enforcer" + echo + exit 1; +} + # Define command-line options here. # Follow -o with a comma-separated list of single-character option names. # Follow -l with a comma-separated list of long option names. @@ -39,20 +48,23 @@ do echo "$VERSION" exit;; --vip) - vip=true; - break;; + vip=true;; -c|--customruleset) - ruleset="$2" ; shift; - break;; + ruleset="$2" ; shift;; # For options with required arguments, an additional shift is required # -o|--option) myarg="$2" ; shift;; - (--) shift; break;; + (--) shift;; (-*) echo "$0: error - unrecognized option $1" 1>&2; exit 1;; - (*) break;; + (*) shift;; esac shift done +# --vip and --customruleset aren't compatible +if [[ "$ruleset" != false && "$vip" = true ]]; then + error "You can't use both --vip and --customruleset" +fi + # Display a confirmation message and return 0/1 based on the result. confirm() { read -r -p "$1 [Y/n] " response @@ -74,15 +86,6 @@ copy_hook() { echo "Copying $hook hook" } -# Trigger an error and exit, but also tell users how they can re-run the script. -error() { - echo - echo "Error: $1" >&2 - echo "You may re-run this setup at any time by running $DIR/wp-enforcer" - echo - exit 1; -} - echo "Installing WP Enforcer..." # Check that the target Git repository exists From 57e7a53e0b1e76535a1bf51c436c13ee9a8dc508 Mon Sep 17 00:00:00 2001 From: Dave Ross Date: Fri, 11 Dec 2015 17:55:29 -0500 Subject: [PATCH 04/20] Updated README to include --customruleset option --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index ddfc689..1e39646 100644 --- a/README.md +++ b/README.md @@ -52,6 +52,9 @@ If you need to switch an existing project to the WordPress.com VIP coding standa ``` +### Using a custom ruleset + +If you want to use a custom XML configuration file with PHPCS, add `--customruleset=[FILE]` when you run the `wp-enforcer` command. ## Configuration From 6c22a2f8ab54602818839d30c4ecda7efad0198a Mon Sep 17 00:00:00 2001 From: Dave Ross Date: Mon, 21 Dec 2015 13:45:38 -0500 Subject: [PATCH 05/20] Removed single-character -c parameter --- bin/wp-enforcer | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/wp-enforcer b/bin/wp-enforcer index 2949bd9..002dabd 100755 --- a/bin/wp-enforcer +++ b/bin/wp-enforcer @@ -38,10 +38,10 @@ do echo " wp-enforcer [options]" echo "" echo "OPTIONS:" - echo " --help, -h Show this help and usage" - echo " --version, -v Show the current version of WP Enforcer" - echo " --vip Configure the project to use the WordPress.com VIP coding standards" - echo " --customruleset=FILE, -c Configure the project to use a custom PHPCS ruleset file" + echo " --help, -h Show this help and usage" + echo " --version, -v Show the current version of WP Enforcer" + echo " --vip Configure the project to use the WordPress.com VIP coding standards" + echo " --customruleset=FILE Configure the project to use a custom PHPCS ruleset file" echo "" exit;; -v|--version) @@ -49,7 +49,7 @@ do exit;; --vip) vip=true;; - -c|--customruleset) + --customruleset) ruleset="$2" ; shift;; # For options with required arguments, an additional shift is required # -o|--option) myarg="$2" ; shift;; From ca5efdfbee224ec4f610fcc4743b202ee631efb2 Mon Sep 17 00:00:00 2001 From: Dave Ross Date: Mon, 21 Dec 2015 13:52:59 -0500 Subject: [PATCH 06/20] Renamed --customruleset to --ruleset --- bin/wp-enforcer | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/wp-enforcer b/bin/wp-enforcer index 002dabd..aa726a2 100755 --- a/bin/wp-enforcer +++ b/bin/wp-enforcer @@ -38,10 +38,10 @@ do echo " wp-enforcer [options]" echo "" echo "OPTIONS:" - echo " --help, -h Show this help and usage" - echo " --version, -v Show the current version of WP Enforcer" - echo " --vip Configure the project to use the WordPress.com VIP coding standards" - echo " --customruleset=FILE Configure the project to use a custom PHPCS ruleset file" + echo " --help, -h Show this help and usage" + echo " --version, -v Show the current version of WP Enforcer" + echo " --vip Configure the project to use the WordPress.com VIP coding standards" + echo " --ruleset=FILE Configure the project to use a custom PHPCS ruleset file" echo "" exit;; -v|--version) @@ -49,7 +49,7 @@ do exit;; --vip) vip=true;; - --customruleset) + --ruleset) ruleset="$2" ; shift;; # For options with required arguments, an additional shift is required # -o|--option) myarg="$2" ; shift;; From 18ca1aa6c063f4d7e1c9761591b81105f8f7bad0 Mon Sep 17 00:00:00 2001 From: Dave Ross Date: Mon, 21 Dec 2015 16:22:45 -0500 Subject: [PATCH 07/20] Removed the last vestiges of the --customruleset command before it was renamed --- README.md | 2 +- bin/wp-enforcer | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1e39646..22342a7 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ If you need to switch an existing project to the WordPress.com VIP coding standa ### Using a custom ruleset -If you want to use a custom XML configuration file with PHPCS, add `--customruleset=[FILE]` when you run the `wp-enforcer` command. +If you want to use a custom XML configuration file with PHPCS, add `--ruleset=[FILE]` when you run the `wp-enforcer` command. ## Configuration diff --git a/bin/wp-enforcer b/bin/wp-enforcer index aa726a2..2b30ac2 100755 --- a/bin/wp-enforcer +++ b/bin/wp-enforcer @@ -22,7 +22,7 @@ error() { # Follow -o with a comma-separated list of single-character option names. # Follow -l with a comma-separated list of long option names. # Options may be followed by one colon to indicate they have a required argument -if ! options=$(getopt -o h,v,c -l help,version,vip,customruleset: -- "$@") +if ! options=$(getopt -o h,v -l help,version,vip,ruleset: -- "$@") then # something went wrong, getopt will put out an error message for us exit 1 @@ -60,9 +60,9 @@ do shift done -# --vip and --customruleset aren't compatible +# --vip and --ruleset aren't compatible if [[ "$ruleset" != false && "$vip" = true ]]; then - error "You can't use both --vip and --customruleset" + error "You can't use both --vip and --ruleset" fi # Display a confirmation message and return 0/1 based on the result. From 15504b20124e717a34e5b8519e6daf8030e9706b Mon Sep 17 00:00:00 2001 From: Brandon Hubbard Date: Mon, 13 Mar 2017 14:54:16 -0700 Subject: [PATCH 08/20] Updated readme to explain PHP CodeSniffer Autofix --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 22342a7..6b3dcba 100644 --- a/README.md +++ b/README.md @@ -79,6 +79,11 @@ This leaves you with a copy of PHP_CodeSniffer, a phpcs.xml file, and the WordPr ```bash $ ./vendor/bin/phpcs ``` +You may also run PHP_CodeSniffer autofixer as needed: + +```bash +$ ./vendor/bin/phpcbf +`` Once CodeSniffer comes back clean, re-run the WP Enforcer installation script to restore the Git hook, forcing all future commits to be clean: From f8a1469d4e0f59bc34816e096e2fdcc6895761b4 Mon Sep 17 00:00:00 2001 From: Brandon Hubbard Date: Thu, 13 Apr 2017 10:29:08 -0700 Subject: [PATCH 09/20] Clarified name as PHP Code Beautifier and Fixer --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6b3dcba..e0bdef8 100644 --- a/README.md +++ b/README.md @@ -79,7 +79,7 @@ This leaves you with a copy of PHP_CodeSniffer, a phpcs.xml file, and the WordPr ```bash $ ./vendor/bin/phpcs ``` -You may also run PHP_CodeSniffer autofixer as needed: +You may also run PHP Code Beautifier and Fixer, which can fix many common indentation and formatting issues automatically, using the PHP Code Beautifier and Fixer (phpcbf) command: ```bash $ ./vendor/bin/phpcbf From 12e0088d0d89954fd7068b144f4de84943e9f2c5 Mon Sep 17 00:00:00 2001 From: Josh Habdas Date: Sat, 27 May 2017 11:53:25 +0800 Subject: [PATCH 10/20] docs(README): install dev always closes #34 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e0bdef8..70b6b5b 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ WP Enforcer uses [Git Hooks](https://git-scm.com/book/en/v2/Customizing-Git-Git- The easiest way to install WP Enforcer is via Composer: ```bash -$ composer require stevegrunwell/wp-enforcer +$ composer require stevegrunwell/wp-enforcer --dev ``` This will add WP Enforcer to your composer.json file and install the WP Enforcer package. From a55a04d7155aa77719e90e69ebe56928b38663a1 Mon Sep 17 00:00:00 2001 From: Steve Grunwell Date: Sun, 28 May 2017 13:10:32 -0400 Subject: [PATCH 11/20] Allow any version of wp-coding-standards/wpcs, avoiding conflicts with packages that use older versions. Fixes #37. --- CHANGELOG.md | 5 +++++ composer.json | 2 +- composer.lock | 25 ++++++++++++------------- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d77b702..1b25fd9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [Unreleased] + +* Allow any version of [wp-coding-standards/wpcs](https://github.com/wp-coding-standards/wpcs), avoiding conflicts with packages that use older versions. + + ## [0.4.2] - 2017-01-04 * Don't lock [wp-coding-standards/wpcs](https://github.com/wp-coding-standards/wpcs) to a single version. diff --git a/composer.json b/composer.json index 5336940..22431d4 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "PHP_CodeSniffer" ], "require": { - "wp-coding-standards/wpcs": "^0.10.0" + "wp-coding-standards/wpcs": "*" }, "bin": [ "bin/wp-enforcer" diff --git a/composer.lock b/composer.lock index ce68c57..5f876d0 100644 --- a/composer.lock +++ b/composer.lock @@ -4,21 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "28e365a28935034b2a8296e0d293e843", - "content-hash": "e73e27e50f889d9f52d101cbd0bec3cb", + "content-hash": "dd482ce6f6bf5dcefae89051b40b9d35", "packages": [ { "name": "squizlabs/php_codesniffer", - "version": "2.7.1", + "version": "2.9.1", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "9b324f3a1132459a7274a0ace2e1b766ba80930f" + "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9b324f3a1132459a7274a0ace2e1b766ba80930f", - "reference": "9b324f3a1132459a7274a0ace2e1b766ba80930f", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/dcbed1074f8244661eecddfc2a675430d8d33f62", + "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62", "shasum": "" }, "require": { @@ -83,24 +82,24 @@ "phpcs", "standards" ], - "time": "2016-11-30 04:02:31" + "time": "2017-05-22T02:43:20+00:00" }, { "name": "wp-coding-standards/wpcs", - "version": "0.10.0", + "version": "0.11.0", "source": { "type": "git", "url": "https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git", - "reference": "b39490465f6fd7375743a395019cd597e12119c9" + "reference": "407e4b85f547a5251185f89ceae6599917343388" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WordPress-Coding-Standards/WordPress-Coding-Standards/zipball/b39490465f6fd7375743a395019cd597e12119c9", - "reference": "b39490465f6fd7375743a395019cd597e12119c9", + "url": "https://api.github.com/repos/WordPress-Coding-Standards/WordPress-Coding-Standards/zipball/407e4b85f547a5251185f89ceae6599917343388", + "reference": "407e4b85f547a5251185f89ceae6599917343388", "shasum": "" }, "require": { - "squizlabs/php_codesniffer": "^2.6" + "squizlabs/php_codesniffer": "^2.8.1" }, "type": "library", "notification-url": "https://packagist.org/downloads/", @@ -119,7 +118,7 @@ "standards", "wordpress" ], - "time": "2016-08-29 20:04:47" + "time": "2017-03-20T23:17:58+00:00" } ], "packages-dev": [], From 1409abb7271cb6125d3902e4bb4cc36857bd64d7 Mon Sep 17 00:00:00 2001 From: Steve Grunwell Date: Sun, 28 May 2017 13:15:37 -0400 Subject: [PATCH 12/20] Move the --dev flag ahead of the package list for maximum portability --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 70b6b5b..52d11a0 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ WP Enforcer uses [Git Hooks](https://git-scm.com/book/en/v2/Customizing-Git-Git- The easiest way to install WP Enforcer is via Composer: ```bash -$ composer require stevegrunwell/wp-enforcer --dev +$ composer require --dev stevegrunwell/wp-enforcer ``` This will add WP Enforcer to your composer.json file and install the WP Enforcer package. From c07822bfb7b711286228a4880ecc2b0ec867ef32 Mon Sep 17 00:00:00 2001 From: Steve Grunwell Date: Sun, 28 May 2017 13:23:20 -0400 Subject: [PATCH 13/20] Clarify the instructions when setting up post-install-cmd and post-update-cmd scripts within composer.json, fixes #41 --- README.md | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 52d11a0..625f765 100644 --- a/README.md +++ b/README.md @@ -31,17 +31,22 @@ Next, you'll need to run the WP Enforcer installation script to copy the Git hoo $ ./vendor/bin/wp-enforcer ``` -If you'd like to require WP Enforcer for all developers on your project, you can add the following commands to your composer.json file to have WP Enforcer automatically set up Git hooks on `composer install` and `composer update`: +If you'd like to require WP Enforcer for all developers on your project, you can add the following scripts to your `composer.json` file to have WP Enforcer automatically set up Git hooks on `composer install` and `composer update` (for more information, please see [Composer Scripts](https://getcomposer.org/doc/articles/scripts.md)): ```json -"post-install-cmd": [ - "wp-enforcer" -], -"post-update-cmd": [ - "wp-enforcer" -] +{ + "scripts": { + "post-install-cmd": [ + "wp-enforcer" + ], + "post-update-cmd": [ + "wp-enforcer" + ] + } +} ``` + ### Writing for WordPress.com VIP WP Enforcer includes built-in support for the [WordPress.com VIP coding standards](https://vip.wordpress.com/documentation/developers-guide-to-wordpress-com-vip/), simply add `--vip` when you run the `wp-enforcer` command (including in the post-install and post-update commands). From e947ae9dc0ae4d6b318a4364feb6a5195edf7519 Mon Sep 17 00:00:00 2001 From: Steve Grunwell Date: Sun, 28 May 2017 13:23:36 -0400 Subject: [PATCH 14/20] Formatting and whitespace in the README.md file --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 625f765..5e24446 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ The easiest way to install WP Enforcer is via Composer: $ composer require --dev stevegrunwell/wp-enforcer ``` -This will add WP Enforcer to your composer.json file and install the WP Enforcer package. +This will add WP Enforcer to your `composer.json` file and install the WP Enforcer package. Next, you'll need to run the WP Enforcer installation script to copy the Git hooks into your local repository: @@ -57,9 +57,11 @@ If you need to switch an existing project to the WordPress.com VIP coding standa ``` + ### Using a custom ruleset -If you want to use a custom XML configuration file with PHPCS, add `--ruleset=[FILE]` when you run the `wp-enforcer` command. +If you want to use a custom XML configuration file with PHP_CodeSniffer, add `--ruleset=[FILE]` when you run the `wp-enforcer` command. + ## Configuration @@ -84,6 +86,7 @@ This leaves you with a copy of PHP_CodeSniffer, a phpcs.xml file, and the WordPr ```bash $ ./vendor/bin/phpcs ``` + You may also run PHP Code Beautifier and Fixer, which can fix many common indentation and formatting issues automatically, using the PHP Code Beautifier and Fixer (phpcbf) command: ```bash From 9e25e9228386d9560d10f934f68e7017bd1797d9 Mon Sep 17 00:00:00 2001 From: Steve Grunwell Date: Sun, 28 May 2017 13:31:06 -0400 Subject: [PATCH 15/20] Exclude the phpcs.xml file from being checked by PHP_CodeSniffer, fixes #27 --- phpcs-vip.xml.sample | 2 +- phpcs.xml.sample | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpcs-vip.xml.sample b/phpcs-vip.xml.sample index 6b2034f..886d04f 100644 --- a/phpcs-vip.xml.sample +++ b/phpcs-vip.xml.sample @@ -7,7 +7,7 @@ Coding standards from WP Enforcer. - + phpcs.xml */tests/* */vendor/* diff --git a/phpcs.xml.sample b/phpcs.xml.sample index 563f72e..dbb6871 100644 --- a/phpcs.xml.sample +++ b/phpcs.xml.sample @@ -7,7 +7,7 @@ Coding standards from WP Enforcer. - + phpcs.xml */tests/* */vendor/* From aa537812eb21ec8422db06e4ea05e804caa2b1ab Mon Sep 17 00:00:00 2001 From: Steve Grunwell Date: Sun, 28 May 2017 13:39:19 -0400 Subject: [PATCH 16/20] Add documentation on bypassing WP Enforcer via `git commit --no-verify`. --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 5e24446..add4a61 100644 --- a/README.md +++ b/README.md @@ -100,3 +100,10 @@ $ ./vendor/bin/wp-enforcer ``` Finally, merge your clean-up branch into master, kicking your project's coding standards compliance into high gear. + + +## Bypassing WP Enforcer + +If it's necessary to bypass WP Enforcer's sniffs for a particular commit (for instance, you're committing small chunks of a file that has older, non-compliant code) you may do so by using [`git commit --no-verify`](https://git-scm.com/docs/git-commit#git-commit--n). + +It's recommended that WP Enforcer is only bypassed when making changes in legacy files that simply haven't been cleaned up yet. For more on integrating WP Enforcer with legacy projects, please see [Adding to an Existing Project](#adding-to-an-existing-project). From 439fae12bb2ec4f4f78be9ac419c43109a54cb5a Mon Sep 17 00:00:00 2001 From: Steve Grunwell Date: Sun, 28 May 2017 13:44:01 -0400 Subject: [PATCH 17/20] Add a missing backtick that was breaking Markdown formatting in the README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index add4a61..fa7f0a0 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ You may also run PHP Code Beautifier and Fixer, which can fix many common indent ```bash $ ./vendor/bin/phpcbf -`` +``` Once CodeSniffer comes back clean, re-run the WP Enforcer installation script to restore the Git hook, forcing all future commits to be clean: From cdbb4b413fb15fa8aaa19ebb7f5d447a77a2811c Mon Sep 17 00:00:00 2001 From: Steve Grunwell Date: Sun, 28 May 2017 13:47:41 -0400 Subject: [PATCH 18/20] Document the changes (namely #27 and #41) from the doc cleanup --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b25fd9..e68b98b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,9 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] -* Allow any version of [wp-coding-standards/wpcs](https://github.com/wp-coding-standards/wpcs), avoiding conflicts with packages that use older versions. +* Allow any version of [wp-coding-standards/wpcs](https://github.com/wp-coding-standards/wpcs), avoiding conflicts with packages that use older versions ([#37]). +* Clarify placement of scripts within `composer.json` ([#41]). +* Exclude `phpcs.xml` from being checked by PHP_CodeSniffer ([#27]). ## [0.4.2] - 2017-01-04 @@ -61,4 +63,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). [#11]: https://github.com/stevegrunwell/wp-enforcer/issues/11 [#12]: https://github.com/stevegrunwell/wp-enforcer/issues/12 [#19]: https://github.com/stevegrunwell/wp-enforcer/issues/19 +[#27]: https://github.com/stevegrunwell/wp-enforcer/issues/27 [#29]: https://github.com/stevegrunwell/wp-enforcer/issues/29 +[#37]: https://github.com/stevegrunwell/wp-enforcer/issues/37 +[#41]: https://github.com/stevegrunwell/wp-enforcer/issues/41 From a2e61032362d10fcc2ff6d8c352d7707423b5e6b Mon Sep 17 00:00:00 2001 From: Steve Grunwell Date: Sun, 28 May 2017 14:40:27 -0400 Subject: [PATCH 19/20] Version bump within the wp-enforcer binary --- bin/wp-enforcer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/wp-enforcer b/bin/wp-enforcer index 2b30ac2..02b964a 100755 --- a/bin/wp-enforcer +++ b/bin/wp-enforcer @@ -2,7 +2,7 @@ # # Copy files for WP Enforcer into the project directory. -readonly VERSION="0.4.0" +readonly VERSION="0.5.0" readonly BIN="$(cd "$(dirname "$0")" && pwd -P)" readonly DIR="$BIN/$(dirname "$(readlink "$0")")" readonly PROJECT="$(pwd)" From e1fbad3c7f1a62af3aef668ec05528caf56228b7 Mon Sep 17 00:00:00 2001 From: Steve Grunwell Date: Sun, 28 May 2017 14:41:53 -0400 Subject: [PATCH 20/20] Bump version in change log --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e68b98b..b83459b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## [Unreleased] +## [0.5.0] - 2017-05-28 * Allow any version of [wp-coding-standards/wpcs](https://github.com/wp-coding-standards/wpcs), avoiding conflicts with packages that use older versions ([#37]). * Clarify placement of scripts within `composer.json` ([#41]). @@ -49,7 +49,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). [Unreleased]: https://github.com/stevegrunwell/wp-enforcer/compare/develop...master -[0.4.2]: https://github.com/stevegrunwell/wp-enforcer/compare/v0.4.1...master +[0.4.2]: https://github.com/stevegrunwell/wp-enforcer/compare/v0.5.0...master +[0.4.2]: https://github.com/stevegrunwell/wp-enforcer/compare/v0.4.1...v0.4.2 [0.4.1]: https://github.com/stevegrunwell/wp-enforcer/compare/v0.4.0...v0.4.1 [0.4.0]: https://github.com/stevegrunwell/wp-enforcer/compare/v0.3.0...v0.4.0 [0.3.0]: https://github.com/stevegrunwell/wp-enforcer/compare/v0.2.0...v0.3.0