Skip to content

Commit

Permalink
Merge branch 'release/0.4.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
stevegrunwell committed Dec 21, 2015
2 parents 74ca822 + b4e875e commit 42a86a0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
10 changes: 8 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [0.4.1] - 2015-12-21

* Apply a `--diff-filter` in the pre-commit hook to ensure PHP_CodeSniffer doesn't attempt to tokenize files that have been deleted ([#29]). Props @JoeyBlake.

## [0.4.0] - 2015-12-02

* Restore explicit reference to `vendor/bin` (previously removed in [#3]) within the pre-commit Git hook ([#11]). Props @leewillis77.
Expand All @@ -28,7 +32,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).

* Initial public release.

[0.4.0]: https://github.com/stevegrunwell/wp-enforcer/compare/v0.3.0...HEAD
[0.4.1]: https://github.com/stevegrunwell/wp-enforcer/compare/v0.4.0...master
[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
[0.2.0]: https://github.com/stevegrunwell/wp-enforcer/compare/v0.1.0...v0.2.0
[#1]: https://github.com/stevegrunwell/wp-enforcer/issues/1
Expand All @@ -39,4 +44,5 @@ This project adheres to [Semantic Versioning](http://semver.org/).
[#8]: https://github.com/stevegrunwell/wp-enforcer/issues/8
[#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
[#19]: https://github.com/stevegrunwell/wp-enforcer/issues/19
[#29]: https://github.com/stevegrunwell/wp-enforcer/issues/29
2 changes: 1 addition & 1 deletion bin/hooks/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ fi
# Run PHP_CodeSniffer
echo "Running PHP_CodeSniffer..."

git diff --name-only --cached | xargs vendor/bin/phpcs $standard
git diff --name-only --cached --diff-filter=ACMRTUXB | xargs vendor/bin/phpcs $standard
if [ $? != 0 ]
then
echo "Please fix coding standards errors before committing"
Expand Down

0 comments on commit 42a86a0

Please sign in to comment.