This commit is contained in:
xl
2024-08-29 17:01:09 +08:00
parent 976f67a838
commit c8041cc09e
+3 -10
View File
@@ -34,13 +34,6 @@ class ErrorHandler extends Component implements ErrorInterface
public string $category = 'app'; public string $category = 'app';
/**
* @var ContainerInterface
*/
#[Container(ContainerInterface::class)]
public ContainerInterface $container;
/** /**
* @param array|Closure|null $callback * @param array|Closure|null $callback
* @return void * @return void
@@ -51,7 +44,7 @@ class ErrorHandler extends Component implements ErrorInterface
if (empty($callback)) { if (empty($callback)) {
$callback = [$this, 'exceptionHandler']; $callback = [$this, 'exceptionHandler'];
} else if (is_array($callback) && is_string($callback[0])) { } else if (is_array($callback) && is_string($callback[0])) {
$callback[0] = $this->container->get($callback[0]); $callback[0] = \Kiri::getDi()->get($callback[0]);
} }
set_exception_handler($callback); set_exception_handler($callback);
} }
@@ -67,7 +60,7 @@ class ErrorHandler extends Component implements ErrorInterface
if (empty($callback)) { if (empty($callback)) {
$callback = [$this, 'errorHandler']; $callback = [$this, 'errorHandler'];
} else if (is_array($callback) && is_string($callback[0])) { } else if (is_array($callback) && is_string($callback[0])) {
$callback[0] = $this->container->get($callback[0]); $callback[0] = \Kiri::getDi()->get($callback[0]);
} }
set_error_handler($callback); set_error_handler($callback);
} }
@@ -83,7 +76,7 @@ class ErrorHandler extends Component implements ErrorInterface
if (empty($callback)) { if (empty($callback)) {
$callback = [$this, 'shutdown']; $callback = [$this, 'shutdown'];
} else if (is_array($callback) && is_string($callback[0])) { } else if (is_array($callback) && is_string($callback[0])) {
$callback[0] = $this->container->get($callback[0]); $callback[0] = \Kiri::getDi()->get($callback[0]);
} }
register_shutdown_function($callback); register_shutdown_function($callback);
} }