From 4d1d998032326ec4c8496295966936fbd1297232 Mon Sep 17 00:00:00 2001 From: Siad Ardroumli Date: Sat, 14 Nov 2020 23:56:22 +0100 Subject: [PATCH] Update PHPUnitTask.php --- .../phing/tasks/ext/phpunit/PHPUnitTask.php | 65 +++++++++++++++---- 1 file changed, 54 insertions(+), 11 deletions(-) diff --git a/classes/phing/tasks/ext/phpunit/PHPUnitTask.php b/classes/phing/tasks/ext/phpunit/PHPUnitTask.php index 70ed687a67..f7c3fded54 100644 --- a/classes/phing/tasks/ext/phpunit/PHPUnitTask.php +++ b/classes/phing/tasks/ext/phpunit/PHPUnitTask.php @@ -37,6 +37,9 @@ class PHPUnitTask extends Task private $haltonfailure = false; private $haltonincomplete = false; private $haltonskipped = false; + private $haltondefect = false; + private $haltonwarning = false; + private $haltonrisky = false; private $errorproperty; private $failureproperty; private $incompleteproperty; @@ -137,6 +140,54 @@ public function setSkippedproperty($value) $this->skippedproperty = $value; } + /** + * @return bool + */ + public function getHaltondefect(): bool + { + return $this->haltondefect; + } + + /** + * @param bool $haltondefect + */ + public function setHaltondefect(bool $haltondefect): void + { + $this->haltondefect = $haltondefect; + } + + /** + * @return bool + */ + public function getHaltonwarning(): bool + { + return $this->haltonwarning; + } + + /** + * @param bool $haltonwarning + */ + public function setHaltonwarning(bool $haltonwarning): void + { + $this->haltonwarning = $haltonwarning; + } + + /** + * @return bool + */ + public function getHaltonrisky(): bool + { + return $this->haltonrisky; + } + + /** + * @param bool $haltonrisky + */ + public function setHaltonrisky(bool $haltonrisky): void + { + $this->haltonrisky = $haltonrisky; + } + /** * @param $value */ @@ -329,6 +380,9 @@ protected function handlePHPUnitConfiguration(PhingFile $configuration) $this->setHaltonerror($phpunit->stopOnError()); $this->setHaltonskipped($phpunit->stopOnSkipped()); $this->setHaltonincomplete($phpunit->stopOnIncomplete()); + $this->setHaltondefect($phpunit->stopOnDefect()); + $this->setHaltonwarning($phpunit->stopOnWarning()); + $this->setHaltonrisky($phpunit->stopOnRisky()); $this->setProcessIsolation($phpunit->processIsolation()); foreach ($config->listeners() as $listener) { @@ -357,17 +411,6 @@ protected function handlePHPUnitConfiguration(PhingFile $configuration) } } -/* if (method_exists($config, 'getSeleniumBrowserConfiguration')) { - $browsers = $config->getSeleniumBrowserConfiguration(); - - if ( - !empty($browsers) - && class_exists('PHPUnit_Extensions_SeleniumTestCase') - ) { - PHPUnit_Extensions_SeleniumTestCase::$browsers = $browsers; - } - } */ - return $phpunit; }