Allow overriding ErrorHandler, add exception listeners

mlocati-forks · Dec 13, 2024 · 769c128 · 769c128
1 parent 09798f7
commit 769c128
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/concrete/src/Error/Handling/ErrorHandler.php b/concrete/src/Error/Handling/ErrorHandler.php
@@ -17,6 +17,11 @@ class ErrorHandler extends SymfonyErrorHandler
      */
     protected $config;
 
+    /**
+     * @var callable[]
+     */
+    protected $exceptionListeners = [];
+
     public function __construct(LoggerInterface $logger, Repository $config)
     {
         $this->config = $config;
@@ -54,6 +59,19 @@ public function __construct(LoggerInterface $logger, Repository $config)
         $this->throwAt($thrownErrors, true);
     }
 
+    /**
+     * Add a callable to be invoked when we have an exception.
+     * If the callable returns true we won't do anything.
+     *
+     * @return $this
+     */
+    public function addExceptionListener(callable $listener): self
+    {
+        $this->exceptionListeners[] = $listener;
+
+        return $this;
+    }
+
     /**
      * {@inheritDoc}
      *
@@ -77,6 +95,12 @@ protected function getErrorEnhancers(): iterable
      */
     protected function renderConcreteException(\Throwable $exception): void
     {
+        foreach ($this->exceptionListeners as $exceptionListener) {
+            if ($exceptionListener($exception) === true) {
+                return;
+            }
+        }
+
         $renderer = \in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) ? new CliErrorRenderer() : app(ConcreteErrorRenderer::class, ['config' => $this->config]);
 
         $exception = $renderer->render($exception);

diff --git a/concrete/src/Error/Provider/ErrorHandlingServiceProvider.php b/concrete/src/Error/Provider/ErrorHandlingServiceProvider.php
@@ -1,17 +1,22 @@
 <?php
 namespace Concrete\Core\Error\Provider;
 
-use Concrete\Core\Foundation\Service\Provider;
 use Concrete\Core\Error\Handling\ErrorHandler;
+use Concrete\Core\Foundation\Service\Provider;
 use Concrete\Core\Logging\Channels;
 use Concrete\Core\Logging\LoggerFactory;
 
 class ErrorHandlingServiceProvider extends Provider
 {
     public function register()
     {
-        $logger = $this->app->make(LoggerFactory::class)->createLogger(Channels::CHANNEL_EXCEPTIONS);
-        $handler = $this->app->make(ErrorHandler::class, ['logger' => $logger]);
+        if ($this->app->bound(ErrorHandler::class)) {
+            $handler = $this->app->make(ErrorHandler::class);
+        } else {
+            $logger = $this->app->make(LoggerFactory::class)->createLogger(Channels::CHANNEL_EXCEPTIONS);
+            $handler = $this->app->make(ErrorHandler::class, ['logger' => $logger]);
+            $this->app->instance(ErrorHandler::class, $handler);
+        }
         $handler = ErrorHandler::register($handler);
         $handler->setExceptionHandler([$handler, 'renderConcreteException']);
     }