Merge 3.x into master

sonata-project · Mar 17, 2020 · 75d5cfe · 75d5cfe
2 parents 428bdba + 63e76da
commit 75d5cfe
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -27,10 +27,8 @@ cache:
 env:
   global:
     - PATH="$HOME/.local/bin:$PATH"
-    - SYMFONY_DEPRECATIONS_HELPER=max[self]=0
     - TARGET=test
     - UPSTREAM_URL=https://github.com/sonata-project/SonataDoctrineMongoDBAdminBundle.git
-    - PHPUNIT_VERSION=8
 
 matrix:
   fast_finish: true
@@ -63,6 +61,7 @@ install:
   - if [ -x .travis/install_${TARGET}.sh ]; then .travis/install_${TARGET}.sh; fi;
 
 before_script:
+  - phpenv config-rm xdebug.ini
   - if [ -x .travis/before_script_${TARGET}.sh ]; then .travis/before_script_${TARGET}.sh; fi;
 
 script: make $TARGET

diff --git a/.travis/install_test.sh b/.travis/install_test.sh
@@ -3,11 +3,10 @@ set -ev
 
 mkdir --parents "${HOME}/bin"
 
-wget "https://phar.phpunit.de/phpunit-${PHPUNIT_VERSION}.phar" --output-document="${HOME}/bin/phpunit"
-chmod u+x "${HOME}/bin/phpunit"
-
 # Coveralls client install
 wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar --output-document="${HOME}/bin/coveralls"
 chmod u+x "${HOME}/bin/coveralls"
 
+pecl install pcov
+
 composer update --prefer-dist --no-interaction --prefer-stable ${COMPOSER_FLAGS}
diff --git a/Makefile b/Makefile
@@ -54,18 +54,11 @@ cs-fix-xml:
 build:
 	mkdir $@
 
-HAS_XDEBUG=$(shell php --modules|grep --quiet xdebug;echo $$?)
-
-build/xdebug-filter.php: phpunit.xml.dist build
-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
+test:
+ifeq ($(shell php --modules|grep --quiet pcov;echo $$?), 0)
+	vendor/bin/simple-phpunit -c phpunit.xml.dist --coverage-clover build/logs/clover.xml
 else
-	phpunit -c phpunit.xml.dist
+	vendor/bin/simple-phpunit -c phpunit.xml.dist
 endif
 .PHONY: test
 

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -22,18 +22,17 @@ It's auto-generated by sonata-project/dev-kit package.
         </testsuite>
     </testsuites>
 
-    <listeners>
-       <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-    </listeners>
-
     <filter>
         <whitelist>
             <directory suffix=".php">./src/</directory>
         </whitelist>
     </filter>
 
     <php>
-        <ini name="precision" value="8"/>
+        <ini name="precision" value="8" />
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0" />
+        <env name="SYMFONY_PHPUNIT_REMOVE" value="symfony/yaml" />
+        <env name="SYMFONY_PHPUNIT_VERSION" value="8.5.0" />
     </php>
 
 </phpunit>