diff --git a/system/CLI/GeneratorTrait.php b/system/CLI/GeneratorTrait.php index 258f12379dd6..065197be5090 100644 --- a/system/CLI/GeneratorTrait.php +++ b/system/CLI/GeneratorTrait.php @@ -516,7 +516,7 @@ protected function setEnabledSuffixing(bool $enabledSuffixing) * Gets a single command-line option. Returns TRUE if the option exists, * but doesn't have a value, and is simply acting as a flag. */ - protected function getOption(string $name): string|bool|null + protected function getOption(string $name): bool|string|null { if (! array_key_exists($name, $this->params)) { return CLI::getOption($name); diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php index 65f5dd22b593..2cd98ccbd7fa 100644 --- a/system/CodeIgniter.php +++ b/system/CodeIgniter.php @@ -353,7 +353,7 @@ public function run(?RouteCollectionInterface $routes = null, bool $returnRespon } else { try { $this->response = $this->handleRequest($routes, config(Cache::class), $returnResponse); - } catch (ResponsableInterface|DeprecatedRedirectException $e) { + } catch (DeprecatedRedirectException|ResponsableInterface $e) { $this->outputBufferingEnd(); if ($e instanceof DeprecatedRedirectException) { $e = new RedirectException($e->getMessage(), $e->getCode(), $e);