Merge 580b001 into 43184b1

FriendsOfCake · Oct 4, 2015 · 6a8e926 · 6a8e926
2 parents 43184b1 + 580b001
commit 6a8e926
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -213,10 +213,11 @@ their own that I can ignore when I pull)
 * Pull request - bonus point for topic branches
 
 To ensure your PRs are considered for upstream, you MUST follow the CakePHP coding standards. A `pre-commit`
-hook has been included to automatically run the code sniffs for you:
+hook has been included to automatically run the code sniffs for you. From your project's root directory:
 
 ```
-ln -s ../../contrib/pre-commit .git/hooks/.
+cp vendor/friendsofcake/bootstrap-ui/contrib/pre-commit .git/hooks/
+chmod 755 .git/hooks/pre-commit
 ```
 
 ## Bugs & Feedback

diff --git a/contrib/pre-commit b/contrib/pre-commit
@@ -15,7 +15,7 @@ SFILES=${SFILES:-$FILES}
 if [ "$FILES" != "" ]
 then
     echo "Running PHPCS"
-    ./vendor/bin/phpcs --standard=vendor/cakephp/cakephp-codesniffer/CakePHP $SFILES
+    ./vendor/bin/phpcs --standard=vendor/cakephp/cakephp-codesniffer/CakePHP --ignore=*/config/Migrations/* $SFILES
     if [ $? != 0 ]
     then
         echo "PHPCS Errors found; commit aborted."