From 66255ffbf91b1542eca8d64fa7b3cb5154bfd878 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Tue, 23 Feb 2021 15:47:44 +0100 Subject: [PATCH] Ref #16584 - Replace exit code ints by constants They where added in console version 5.1 Signed-off-by: William Desportes --- libraries/classes/Command/CacheWarmupCommand.php | 12 ++++++------ libraries/classes/Command/SetVersionCommand.php | 6 ++---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/libraries/classes/Command/CacheWarmupCommand.php b/libraries/classes/Command/CacheWarmupCommand.php index bb964a19a5..225c317ab8 100644 --- a/libraries/classes/Command/CacheWarmupCommand.php +++ b/libraries/classes/Command/CacheWarmupCommand.php @@ -55,7 +55,7 @@ final class CacheWarmupCommand extends Command if ($input->getOption('twig') === true && $input->getOption('routing') === true) { $output->writeln('Please specify --twig or --routing'); - return 1; + return Command::FAILURE; } if ($input->getOption('twig') === true) { @@ -81,7 +81,7 @@ final class CacheWarmupCommand extends Command } $output->writeln('Warm up of all caches done.', OutputInterface::VERBOSITY_VERBOSE); - return 0; + return Command::SUCCESS; } private function warmUpRoutingCache(OutputInterface $output): int @@ -92,7 +92,7 @@ final class CacheWarmupCommand extends Command if (is_file(Routing::ROUTES_CACHE_FILE)) { $output->writeln('Warm up done.', OutputInterface::VERBOSITY_VERBOSE); - return 0; + return Command::SUCCESS; } $output->writeln( sprintf( @@ -102,7 +102,7 @@ final class CacheWarmupCommand extends Command OutputInterface::VERBOSITY_NORMAL ); - return 1; + return Command::FAILURE; } private function warmUpTwigCache(OutputInterface $output): int @@ -178,13 +178,13 @@ final class CacheWarmupCommand extends Command // Store replacements in JSON $handle = fopen($tmpDir . '/replace.json', 'w'); if ($handle === false) { - return 1; + return Command::FAILURE; } fwrite($handle, (string) json_encode($replacements)); fclose($handle); $output->writeln('Warm up done.', OutputInterface::VERBOSITY_VERBOSE); - return 0; + return Command::SUCCESS; } } diff --git a/libraries/classes/Command/SetVersionCommand.php b/libraries/classes/Command/SetVersionCommand.php index 780bd1b498..ea0c0bb65b 100644 --- a/libraries/classes/Command/SetVersionCommand.php +++ b/libraries/classes/Command/SetVersionCommand.php @@ -61,14 +61,12 @@ PHP; $generatedClass = $this->getGeneratedClass($version); if (! $this->writeGeneratedClassFile($generatedClass)) { - // failure - return 1; + return Command::FAILURE; } $output->writeln('PhpMyAdmin\Version class successfully generated!'); - // success - return 0; + return Command::SUCCESS; } private function getGeneratedClass(string $version): string