From adb46d2b10d6ca61cdf706ce1f21523a68edcdb2 Mon Sep 17 00:00:00 2001 From: Thomas Lamy Date: Tue, 16 Mar 2021 16:40:20 +0100 Subject: [PATCH 1/3] #4591 do not treat warnings as error in teamcity --- src/Util/Log/TeamCity.php | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Util/Log/TeamCity.php b/src/Util/Log/TeamCity.php index c00584a1661..79e54f9f870 100644 --- a/src/Util/Log/TeamCity.php +++ b/src/Util/Log/TeamCity.php @@ -80,15 +80,7 @@ public function addError(Test $test, Throwable $t, float $time): void */ public function addWarning(Test $test, Warning $e, float $time): void { - $this->printEvent( - 'testFailed', - [ - 'name' => $test->getName(), - 'message' => self::getMessage($e), - 'details' => self::getDetails($e), - 'duration' => self::toMilliseconds($time), - ] - ); + $this->write(self::getMessage($e).PHP_EOL); } /** From 5243fc38030a0bc7ea580e5bdd2ed3b4ff25ff64 Mon Sep 17 00:00:00 2001 From: Thomas Lamy Date: Wed, 17 Mar 2021 07:48:30 +0100 Subject: [PATCH 2/3] #4591 do not treat warnings as error in teamcity (reformat) --- src/Util/Log/TeamCity.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Util/Log/TeamCity.php b/src/Util/Log/TeamCity.php index 79e54f9f870..edfd97d26fe 100644 --- a/src/Util/Log/TeamCity.php +++ b/src/Util/Log/TeamCity.php @@ -9,19 +9,6 @@ */ namespace PHPUnit\Util\Log; -use function class_exists; -use function count; -use function explode; -use function get_class; -use function getmypid; -use function ini_get; -use function is_bool; -use function is_scalar; -use function method_exists; -use function print_r; -use function round; -use function str_replace; -use function stripos; use PHPUnit\Framework\AssertionFailedError; use PHPUnit\Framework\ExceptionWrapper; use PHPUnit\Framework\ExpectationFailedException; @@ -38,6 +25,19 @@ use ReflectionException; use SebastianBergmann\Comparator\ComparisonFailure; use Throwable; +use function class_exists; +use function count; +use function explode; +use function get_class; +use function getmypid; +use function ini_get; +use function is_bool; +use function is_scalar; +use function method_exists; +use function print_r; +use function round; +use function str_replace; +use function stripos; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit @@ -80,7 +80,7 @@ public function addError(Test $test, Throwable $t, float $time): void */ public function addWarning(Test $test, Warning $e, float $time): void { - $this->write(self::getMessage($e).PHP_EOL); + $this->write(self::getMessage($e) . PHP_EOL); } /** From 73be1613af01c6772924d528cf4b942e998c3713 Mon Sep 17 00:00:00 2001 From: Thomas Lamy Date: Wed, 17 Mar 2021 07:50:36 +0100 Subject: [PATCH 3/3] #4591 reformatted too much --- src/Util/Log/TeamCity.php | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Util/Log/TeamCity.php b/src/Util/Log/TeamCity.php index edfd97d26fe..31839e3eed0 100644 --- a/src/Util/Log/TeamCity.php +++ b/src/Util/Log/TeamCity.php @@ -9,6 +9,19 @@ */ namespace PHPUnit\Util\Log; +use function class_exists; +use function count; +use function explode; +use function get_class; +use function getmypid; +use function ini_get; +use function is_bool; +use function is_scalar; +use function method_exists; +use function print_r; +use function round; +use function str_replace; +use function stripos; use PHPUnit\Framework\AssertionFailedError; use PHPUnit\Framework\ExceptionWrapper; use PHPUnit\Framework\ExpectationFailedException; @@ -25,19 +38,6 @@ use ReflectionException; use SebastianBergmann\Comparator\ComparisonFailure; use Throwable; -use function class_exists; -use function count; -use function explode; -use function get_class; -use function getmypid; -use function ini_get; -use function is_bool; -use function is_scalar; -use function method_exists; -use function print_r; -use function round; -use function str_replace; -use function stripos; /** * @internal This class is not covered by the backward compatibility promise for PHPUnit