Apply compatibility patch before running PHPCS against our own code

Author: colinodell

.travis.yml

@@ -24,7 +24,7 @@ before_install:
 install: travis_retry composer update --prefer-dist
 
 script:
-  - vendor/bin/phpcs
+  - make phpcs
   - vendor/bin/phpunit
   - make test-report
 

Makefile

@@ -1,9 +1,14 @@
-.PHONY: test test-report test-fix update-compatibility-patch
+.PHONY: test phpcs test-report test-fix update-compatibility-patch
 
 PHP_74_OR_NEWER=`php -r "echo (int) version_compare(PHP_VERSION, '7.4', '>=');"`
 
 test: test-report test-fix
 
+phpcs:
+	@if [ $(PHP_74_OR_NEWER) -eq 1 ]; then git apply tests/php-compatibility.patch; fi
+	@vendor/bin/phpcs src
+	@if [ $(PHP_74_OR_NEWER) -eq 1 ]; then git apply -R tests/php-compatibility.patch; fi
+
 test-report: vendor
 	@if [ $(PHP_74_OR_NEWER) -eq 1 ]; then git apply tests/php-compatibility.patch; fi
 	@vendor/bin/phpcs `find tests/input/* | sort` --report=summary --report-file=phpcs.log; diff tests/expected_report.txt phpcs.log; if [ $$? -ne 0 ] && [ $(PHP_74_OR_NEWER) -eq 1 ]; then git apply -R tests/php-compatibility.patch; exit 1; fi

tests/php-compatibility.patch

@@ -1,5 +1,5 @@
 diff --git a/src/Unleashed/Sniffs/Namespaces/FullyQualifiedGlobalFunctionsSniff.php b/src/Unleashed/Sniffs/Namespaces/FullyQualifiedGlobalFunctionsSniff.php
-index 1905143..518a85b 100644
+index eee1c6f..742226e 100644
 --- a/src/Unleashed/Sniffs/Namespaces/FullyQualifiedGlobalFunctionsSniff.php
 +++ b/src/Unleashed/Sniffs/Namespaces/FullyQualifiedGlobalFunctionsSniff.php
 @@ -11,11 +11,10 @@ use Unleashed\SniffHelper;