diff --git a/composer.json b/composer.json index 079fddcf..9e7946ae 100644 --- a/composer.json +++ b/composer.json @@ -40,13 +40,13 @@ "ext-simplexml": "*", "fidry/cpu-core-counter": "^0.4.1 || ^0.5.1", "jean85/pretty-package-versions": "^2.0.5", - "phpunit/php-code-coverage": "^10.1.2", + "phpunit/php-code-coverage": "^10.1.3", "phpunit/php-file-iterator": "^4.0.2", "phpunit/php-timer": "^6.0", - "phpunit/phpunit": "^10.2.6", + "phpunit/phpunit": "^10.3.1", "sebastian/environment": "^6.0.1", - "symfony/console": "^6.3.0", - "symfony/process": "^6.3.0" + "symfony/console": "^6.3.2", + "symfony/process": "^6.3.2" }, "require-dev": { "ext-pcov": "*", diff --git a/src/WrapperRunner/WrapperRunner.php b/src/WrapperRunner/WrapperRunner.php index 3e550d83..310e200a 100644 --- a/src/WrapperRunner/WrapperRunner.php +++ b/src/WrapperRunner/WrapperRunner.php @@ -259,7 +259,7 @@ private function complete(TestResult $testResultSum): int assert($testResult instanceof TestResult); $testResultSum = new TestResult( - $testResultSum->numberOfTests() + $testResult->numberOfTests(), + (int) $testResultSum->hasTests() + (int) $testResult->hasTests(), $testResultSum->numberOfTestsRun() + $testResult->numberOfTestsRun(), $testResultSum->numberOfAssertions() + $testResult->numberOfAssertions(), array_merge_recursive($testResultSum->testErroredEvents(), $testResult->testErroredEvents()), @@ -268,18 +268,18 @@ private function complete(TestResult $testResultSum): int array_merge_recursive($testResultSum->testSuiteSkippedEvents(), $testResult->testSuiteSkippedEvents()), array_merge_recursive($testResultSum->testSkippedEvents(), $testResult->testSkippedEvents()), array_merge_recursive($testResultSum->testMarkedIncompleteEvents(), $testResult->testMarkedIncompleteEvents()), - array_merge_recursive($testResultSum->testTriggeredDeprecationEvents(), $testResult->testTriggeredDeprecationEvents()), - array_merge_recursive($testResultSum->testTriggeredPhpDeprecationEvents(), $testResult->testTriggeredPhpDeprecationEvents()), array_merge_recursive($testResultSum->testTriggeredPhpunitDeprecationEvents(), $testResult->testTriggeredPhpunitDeprecationEvents()), - array_merge_recursive($testResultSum->testTriggeredErrorEvents(), $testResult->testTriggeredErrorEvents()), - array_merge_recursive($testResultSum->testTriggeredNoticeEvents(), $testResult->testTriggeredNoticeEvents()), - array_merge_recursive($testResultSum->testTriggeredPhpNoticeEvents(), $testResult->testTriggeredPhpNoticeEvents()), - array_merge_recursive($testResultSum->testTriggeredWarningEvents(), $testResult->testTriggeredWarningEvents()), - array_merge_recursive($testResultSum->testTriggeredPhpWarningEvents(), $testResult->testTriggeredPhpWarningEvents()), array_merge_recursive($testResultSum->testTriggeredPhpunitErrorEvents(), $testResult->testTriggeredPhpunitErrorEvents()), array_merge_recursive($testResultSum->testTriggeredPhpunitWarningEvents(), $testResult->testTriggeredPhpunitWarningEvents()), array_merge_recursive($testResultSum->testRunnerTriggeredDeprecationEvents(), $testResult->testRunnerTriggeredDeprecationEvents()), array_merge_recursive($testResultSum->testRunnerTriggeredWarningEvents(), $testResult->testRunnerTriggeredWarningEvents()), + array_merge_recursive($testResultSum->errors(), $testResult->errors()), + array_merge_recursive($testResultSum->deprecations(), $testResult->deprecations()), + array_merge_recursive($testResultSum->notices(), $testResult->notices()), + array_merge_recursive($testResultSum->warnings(), $testResult->warnings()), + array_merge_recursive($testResultSum->phpDeprecations(), $testResult->phpDeprecations()), + array_merge_recursive($testResultSum->phpNotices(), $testResult->phpNotices()), + array_merge_recursive($testResultSum->phpWarnings(), $testResult->phpWarnings()), ); } diff --git a/test/Unit/WrapperRunner/WrapperRunnerTest.php b/test/Unit/WrapperRunner/WrapperRunnerTest.php index d8df7583..d1b1a966 100644 --- a/test/Unit/WrapperRunner/WrapperRunnerTest.php +++ b/test/Unit/WrapperRunner/WrapperRunnerTest.php @@ -572,7 +572,7 @@ public function testHandleUnexpectedOutput(): void %s/test/fixtures/unexpected_output/UnexpectedOutputTest.php:%d -OK, but there are issues! +OK, but there were issues! %a EOF;