Merge pull request #7 from jakzal/php-7.3

Run tests on php 7.3
jakzal · Dec 17, 2018 · 01a22b4 · 01a22b4
2 parents 2355a49 + 8a394ca
commit 01a22b4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,10 +4,11 @@ matrix:
   - php: 7.1
     env: EXECUTE_DEPLOYMENT=true
   - php: 7.2
+  - php: 7.3
     env: deps=low
   fast_finish: true
 before_install:
-- phpenv config-rm xdebug.ini
+- phpenv config-rm xdebug.ini || echo "XDebug is not enabled"
 install:
 - if [[ $deps = low ]]; then make update-min; else make install; fi
 script:

diff --git a/Makefile b/Makefile
@@ -30,11 +30,11 @@ test-package: package test-package-tools
 .PHONY: test-package
 
 cs: tools/php-cs-fixer
-	tools/php-cs-fixer --dry-run --allow-risky=yes --no-interaction --ansi fix
+	PHP_CS_FIXER_IGNORE_ENV=1 tools/php-cs-fixer --dry-run --allow-risky=yes --no-interaction --ansi fix
 .PHONY: cs
 
 cs-fix: tools/php-cs-fixer
-	tools/php-cs-fixer --allow-risky=yes --no-interaction --ansi fix
+	PHP_CS_FIXER_IGNORE_ENV=1 tools/php-cs-fixer --allow-risky=yes --no-interaction --ansi fix
 .PHONY: cs-fix
 
 deptrac: tools/deptrac