Merge branch 'update/prevent-fatal-errors-when-extending-rest-api' of https://github.com/woocommerce/woocommerce into update/prevent-fatal-errors-when-extending-rest-api

.travis.yml

@@ -71,8 +71,7 @@ before_script:
   - |
     # Install wpcs globally if needed:
     if [[ ${RUN_PHPCS} == 1 ]] && [[ ${TRAVIS_PHP_VERSION:0:3} != "5.2" ]]; then
-      composer global require wp-coding-standards/wpcs
-      phpcs --config-set installed_paths $HOME/.composer/vendor/wp-coding-standards/wpcs
+      composer require woocommerce/woocommerce-sniffs
     fi
 
 script:

tests/bin/phpcs.sh

@@ -6,6 +6,6 @@ if [[ ${RUN_PHPCS} == 1 ]]; then
 
 	if [ "$CHANGED_FILES" != "" ]; then
 		echo "Running Code Sniffer."
-		phpcs --ignore=$IGNORE --encoding=utf-8 -s -n -p $CHANGED_FILES
+		./vendor/bin/phpcs --ignore=$IGNORE --encoding=utf-8 -s -n -p $CHANGED_FILES
 	fi
 fi