Skip to content

Commit a2b49aa

Browse files
Refactor
1 parent c697539 commit a2b49aa

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

src/TextUI/Application.php

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -271,14 +271,7 @@ public function run(array $argv): int
271271
}
272272

273273
$shellExitCode = (new ShellExitCodeCalculator)->calculate(
274-
$configuration->failOnDeprecation() || $configuration->failOnAllIssues(),
275-
$configuration->failOnPhpunitDeprecation() || $configuration->failOnAllIssues(),
276-
$configuration->failOnEmptyTestSuite() || $configuration->failOnAllIssues(),
277-
$configuration->failOnIncomplete() || $configuration->failOnAllIssues(),
278-
$configuration->failOnNotice() || $configuration->failOnAllIssues(),
279-
$configuration->failOnRisky() || $configuration->failOnAllIssues(),
280-
$configuration->failOnSkipped() || $configuration->failOnAllIssues(),
281-
$configuration->failOnWarning() || $configuration->failOnAllIssues(),
274+
$configuration,
282275
$result,
283276
);
284277

src/TextUI/ShellExitCodeCalculator.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
namespace PHPUnit\TextUI;
1111

1212
use PHPUnit\TestRunner\TestResult\TestResult;
13+
use PHPUnit\TextUI\Configuration\Configuration;
1314

1415
/**
1516
* @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
@@ -22,8 +23,17 @@ final class ShellExitCodeCalculator
2223
private const FAILURE_EXIT = 1;
2324
private const EXCEPTION_EXIT = 2;
2425

25-
public function calculate(bool $failOnDeprecation, bool $failOnPhpunitDeprecation, bool $failOnEmptyTestSuite, bool $failOnIncomplete, bool $failOnNotice, bool $failOnRisky, bool $failOnSkipped, bool $failOnWarning, TestResult $result): int
26+
public function calculate(Configuration $configuration, TestResult $result): int
2627
{
28+
$failOnDeprecation = $configuration->failOnDeprecation() || $configuration->failOnAllIssues();
29+
$failOnPhpunitDeprecation = $configuration->failOnPhpunitDeprecation() || $configuration->failOnAllIssues();
30+
$failOnEmptyTestSuite = $configuration->failOnEmptyTestSuite() || $configuration->failOnAllIssues();
31+
$failOnIncomplete = $configuration->failOnIncomplete() || $configuration->failOnAllIssues();
32+
$failOnNotice = $configuration->failOnNotice() || $configuration->failOnAllIssues();
33+
$failOnRisky = $configuration->failOnRisky() || $configuration->failOnAllIssues();
34+
$failOnSkipped = $configuration->failOnSkipped() || $configuration->failOnAllIssues();
35+
$failOnWarning = $configuration->failOnWarning() || $configuration->failOnAllIssues();
36+
2737
$returnCode = self::FAILURE_EXIT;
2838

2939
if ($result->wasSuccessful()) {

0 commit comments

Comments
 (0)