Fix #54: Add shutdown event & fix cwd (#56)

Author: rustamwin

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 2.1.0 under development
 
 - Enh #55: Defer exit on terminate (rustamwin)
+- Enh #54: Add shutdown event, fix cwd (rustamwin)
 
 ## 2.0.2 February 04, 2022
 

src/ErrorHandler.php

@@ -4,9 +4,11 @@
 
 namespace Yiisoft\ErrorHandler;
 
+use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Log\LoggerInterface;
 use Throwable;
+use Yiisoft\ErrorHandler\Event\ApplicationError;
 use Yiisoft\ErrorHandler\Exception\ErrorException;
 use Yiisoft\ErrorHandler\Renderer\PlainTextRenderer;
 use Yiisoft\Http\Status;
@@ -37,14 +39,20 @@ final class ErrorHandler
     private int $memoryReserveSize = 262_144;
     private string $memoryReserve = '';
     private bool $debug = false;
+    private ?string $workingDirectory = null;
 
     private LoggerInterface $logger;
     private ThrowableRendererInterface $defaultRenderer;
+    private ?EventDispatcherInterface $eventDispatcher;
 
-    public function __construct(LoggerInterface $logger, ThrowableRendererInterface $defaultRenderer)
-    {
+    public function __construct(
+        LoggerInterface $logger,
+        ThrowableRendererInterface $defaultRenderer,
+        EventDispatcherInterface $eventDispatcher = null
+    ) {
         $this->logger = $logger;
         $this->defaultRenderer = $defaultRenderer;
+        $this->eventDispatcher = $eventDispatcher;
     }
 
     /**
@@ -136,6 +144,10 @@ public function register(): void
                 $this->renderThrowableAndTerminate($error);
             }
         });
+
+        if (!(PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg')) {
+            $this->workingDirectory = getcwd();
+        }
     }
 
     /**
@@ -154,12 +166,18 @@ public function unregister(): void
      */
     private function renderThrowableAndTerminate(Throwable $t): void
     {
+        if (!empty($this->workingDirectory)) {
+            chdir($this->workingDirectory);
+        }
         // disable error capturing to avoid recursive errors while handling exceptions
         $this->unregister();
         // set preventive HTTP status code to 500 in case error handling somehow fails and headers are sent
         http_response_code(Status::INTERNAL_SERVER_ERROR);
 
         echo $this->handle($t);
+        if ($this->eventDispatcher !== null) {
+            $this->eventDispatcher->dispatch(new ApplicationError($t));
+        }
         register_shutdown_function(static function (): void {
             exit(1);
         });

src/Event/ApplicationError.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\ErrorHandler\Event;
+
+use Throwable;
+
+/**
+ * ApplicationError represents an application error event.
+ */
+final class ApplicationError
+{
+    private Throwable $throwable;
+
+    public function __construct(Throwable $throwable)
+    {
+        $this->throwable = $throwable;
+    }
+
+    public function getThrowable(): Throwable
+    {
+        return $this->throwable;
+    }
+}