Merge 3.x into master

sonata-project · Feb 6, 2019 · fbbea65 · fbbea65
2 parents 72966e7 + 70b79e0
commit fbbea65
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,8 +14,7 @@ php:
   - '7.3'
   - nightly
 
-sudo: false
-dist: trusty
+dist: xenial
 
 addons:
   apt:

diff --git a/Makefile b/Makefile
@@ -54,11 +54,19 @@ cs-fix-xml:
 build:
 	mkdir $@
 
+HAS_XDEBUG=$(shell php --modules|grep --quiet xdebug;echo $$?)
+
 build/xdebug-filter.php: phpunit.xml.dist build
-	phpunit  --dump-xdebug-filter $@
+ifeq ($(HAS_XDEBUG), 0)
+	phpunit --dump-xdebug-filter $@
+endif
 
 test: build/xdebug-filter.php
+ifeq ($(HAS_XDEBUG), 0)
 	phpunit --prepend build/xdebug-filter.php -c phpunit.xml.dist --coverage-clover build/logs/clover.xml
+else
+	phpunit -c phpunit.xml.dist
+endif
 .PHONY: test
 
 docs: