diff --git a/src/Phaseolies/Error/Handlers/WebErrorHandler.php b/src/Phaseolies/Error/Handlers/WebErrorHandler.php index 70deb9f2..2c351d00 100644 --- a/src/Phaseolies/Error/Handlers/WebErrorHandler.php +++ b/src/Phaseolies/Error/Handlers/WebErrorHandler.php @@ -34,6 +34,6 @@ public function handle(Throwable $exception): void */ public function supports(): bool { - return !request()->isAjax() && !request()->isApiRequest() && PHP_SAPI !== 'cli'; + return !request()->isAjax() || !request()->isApiRequest() || PHP_SAPI !== 'cli'; } } diff --git a/src/Phaseolies/Helpers/helpers.php b/src/Phaseolies/Helpers/helpers.php index e088635c..df7e7931 100644 --- a/src/Phaseolies/Helpers/helpers.php +++ b/src/Phaseolies/Helpers/helpers.php @@ -60,17 +60,11 @@ function dopparEnv(string $key, string|float|int|bool|null $default = null): str */ function app($abstract = null, array $parameters = []) { - $container = Container::getInstance(); - if (is_null($abstract)) { - return $container; - } - - if (!$container->has($abstract)) { - return null; + return Container::getInstance(); } - return $container->get($abstract, $parameters); + return Container::getInstance()->get($abstract, $parameters); } }