From a9a992bbf221873762208b1480d14679c86a6ad0 Mon Sep 17 00:00:00 2001 From: Denis Smetannikov Date: Wed, 15 Feb 2023 23:13:38 +0300 Subject: [PATCH] Fixed PhpUnit Conflicts (#17) --- composer.json | 2 +- phpunit.xml.dist | 29 ++++++++++++++++------------- src/Makefiles/tests.Makefile | 4 +++- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index 1bad696..5195f58 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,7 @@ }, "require-dev" : { - "jbzoo/phpunit" : ">=5.0.0", + "jbzoo/phpunit" : "6.x-dev", "jbzoo/utils" : ">=4.5.5" }, diff --git a/phpunit.xml.dist b/phpunit.xml.dist index f501d46..f671b60 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -11,7 +11,8 @@ @copyright Copyright (C) JBZoo.com, All rights reserved. @link https://github.com/JBZoo/Codestyle --> - + + + src + + + + + + + + + tests - - - src - - - - - - - - + - diff --git a/src/Makefiles/tests.Makefile b/src/Makefiles/tests.Makefile index e576eb1..29b4e9e 100644 --- a/src/Makefiles/tests.Makefile +++ b/src/Makefiles/tests.Makefile @@ -31,6 +31,7 @@ test-phpunit-teamcity: @echo "##teamcity[progressStart 'PHPUnit Tests']" @XDEBUG_MODE=coverage $(PHP_BIN) `pwd`/vendor/bin/phpunit \ --configuration="$(JBZOO_CONFIG_PHPUNIT)" \ + --cache-result-file="$(PATH_BUILD)/phpunit.result.cache" \ --order-by=random \ --colors=always \ --teamcity \ @@ -47,6 +48,7 @@ test-phpunit-teamcity: test-phpunit-local: @XDEBUG_MODE=coverage $(PHP_BIN) `pwd`/vendor/bin/phpunit \ --configuration="$(JBZOO_CONFIG_PHPUNIT)" \ + --cache-result-file="$(PATH_BUILD)/phpunit.result.cache" \ --order-by=random \ --colors=always \ --verbose @@ -55,7 +57,7 @@ test-phpunit-local: test-phpunit-ga: @-XDEBUG_MODE=coverage $(PHP_BIN) `pwd`/vendor/bin/phpunit \ --configuration="$(JBZOO_CONFIG_PHPUNIT)" \ - --printer=Codedungeon\\PHPUnitPrettyResultPrinter\\Printer \ + --cache-result-file="$(PATH_BUILD)/phpunit.result.cache" \ --order-by=random \ --colors=always \ --verbose || true