From a1f5056adbb02353d3c8cbb70d5838ec9721c0db Mon Sep 17 00:00:00 2001 From: Denis Smetannikov Date: Tue, 12 Apr 2022 00:30:07 +0200 Subject: [PATCH] Fixes --- src/CliCommand.php | 4 ++-- tests/Cli/CliOutputTest.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/CliCommand.php b/src/CliCommand.php index f5cde72..f0ef247 100644 --- a/src/CliCommand.php +++ b/src/CliCommand.php @@ -60,7 +60,7 @@ protected function configure(): void InputOption::VALUE_NONE, "For any errors messages application will use StdOut instead of ErrOut. It's on your own risk!" ) - ->addOption('strict', null, InputOption::VALUE_NONE, 'None-zero exit code on any StdErr message') + ->addOption('non-zero-on-error', null, InputOption::VALUE_NONE, 'None-zero exit code on any StdErr message') ->addOption('timestamp', null, InputOption::VALUE_NONE, 'Show timestamp at the beginning of each message') ->addOption('profile', null, InputOption::VALUE_NONE, 'Display timing and memory usage information'); @@ -99,7 +99,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int $exitCode = Vars::range($exitCode, 0, 255); - if ($this->helper->isOutputHasErrors() && $this->getOptBool('strict')) { + if ($this->helper->isOutputHasErrors() && $this->getOptBool('non-zero-on-error')) { $exitCode = 1; } diff --git a/tests/Cli/CliOutputTest.php b/tests/Cli/CliOutputTest.php index 1293a9f..a021c4d 100644 --- a/tests/Cli/CliOutputTest.php +++ b/tests/Cli/CliOutputTest.php @@ -199,7 +199,7 @@ public function testStdoutOnly() public function testStrict() { // Redirect common message - [$exitCode, $stdOut, $errOut] = Helper::executeReal('test:output', ['strict' => null]); + [$exitCode, $stdOut, $errOut] = Helper::executeReal('test:output', ['non-zero-on-error' => null]); isSame(implode(PHP_EOL, [ 'Error: Message', 'Error (e)', @@ -238,7 +238,7 @@ public function testMuteErrors() [$exitCode] = Helper::executeReal( 'test:output', - ['exception' => 'Some message', 'mute-errors' => null, 'strict' => null] + ['exception' => 'Some message', 'mute-errors' => null, 'non-zero-on-error' => null] ); isSame(0, $exitCode); }