Merge branch 'master' into enhance

Author: xepozz

.gitattributes

@@ -26,7 +26,6 @@
 /.editorconfig      export-ignore
 /.gitattributes     export-ignore
 /.gitignore         export-ignore
-/.scrutinizer.yml   export-ignore
 /phpunit.xml.dist   export-ignore
 /tests              export-ignore
 /docs               export-ignore

.scrutinizer.yml

@@ -1,13 +1,18 @@
 # Yii Error Handler Change Log
 
-## 3.2.2 under development
+## 3.3.1 under development
 
-- Enh #117, #120: Show arguments table by click (@xepozz, @vjik)
+- no changes in this release.
+
+## 3.3.0 July 11, 2024
+
+- Enh #112: Add copy cURL button, sort request headers, fix UI (@xepozz)
+- Enh #113: Simplify error log (@xepozz)
+- Enh #114: Show full argument by click (@xepozz)
 - Enh #116: Remove @anonymous postfix (@xepozz)
+- Enh #117, #120: Show arguments table by click (@xepozz, @vjik)
 - Bug #114: Stop `click` event on text selection (@xepozz)
-- Enh #114: Show full argument by click (@xepozz)
-- Enh #113: Simplify error log (@xepozz)
-- Enh #112: Add copy cURL button, sort request headers, fix UI (@xepozz)
+- Bug #122: Do `exit(1)` after all shutdown functions, even postponed ones (@samdark)
 
 ## 3.2.1 March 07, 2024
 

CHANGELOG.md

@@ -9,8 +9,7 @@
 [![Latest Stable Version](https://poser.pugx.org/yiisoft/error-handler/v/stable.png)](https://packagist.org/packages/yiisoft/error-handler)
 [![Total Downloads](https://poser.pugx.org/yiisoft/error-handler/downloads.png)](https://packagist.org/packages/yiisoft/error-handler)
 [![Build status](https://github.com/yiisoft/error-handler/workflows/build/badge.svg)](https://github.com/yiisoft/error-handler/actions?query=workflow%3Abuild)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/yiisoft/error-handler/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/yiisoft/error-handler/?branch=master)
-[![Code Coverage](https://scrutinizer-ci.com/g/yiisoft/error-handler/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/yiisoft/error-handler/?branch=master)
+[![Code coverage](https://codecov.io/gh/yiisoft/error-handler/graph/badge.svg?token=3ZC0QHQHIN)](https://codecov.io/gh/yiisoft/error-handler)
 [![Mutation testing badge](https://img.shields.io/endpoint?style=flat&url=https%3A%2F%2Fbadge-api.stryker-mutator.io%2Fgithub.com%2Fyiisoft%2Ferror-handler%2Fmaster)](https://dashboard.stryker-mutator.io/reports/github.com/yiisoft/error-handler/master)
 [![static analysis](https://github.com/yiisoft/error-handler/workflows/static%20analysis/badge.svg)](https://github.com/yiisoft/error-handler/actions?query=workflow%3A%22static+analysis%22)
 

README.md

@@ -41,10 +41,17 @@ final class ErrorHandler
     private bool $enabled = false;
     private bool $initialized = false;
 
+    /**
+     * @param LoggerInterface $logger Logger to write errors to.
+     * @param ThrowableRendererInterface $defaultRenderer Default throwable renderer.
+     * @param EventDispatcherInterface|null $eventDispatcher Event dispatcher for error events.
+     * @param int $exitShutdownHandlerDepth Depth of the exit() shutdown handler to ensure it's executed last.
+     */
     public function __construct(
         private LoggerInterface $logger,
         private ThrowableRendererInterface $defaultRenderer,
         private ?EventDispatcherInterface $eventDispatcher = null,
+        private int $exitShutdownHandlerDepth = 2
     ) {
     }
 
@@ -108,7 +115,7 @@ public function register(): void
 
         $this->initializeOnce();
 
-        // Handles throwable, echo output and exit.
+        // Handles throwable that isn't caught otherwise, echo output and exit.
         set_exception_handler(function (Throwable $t): void {
             if (!$this->enabled) {
                 return;
@@ -200,16 +207,41 @@ private function renderThrowableAndTerminate(Throwable $t): void
         if (!empty($this->workingDirectory)) {
             chdir($this->workingDirectory);
         }
-        // disable error capturing to avoid recursive errors while handling exceptions
+        // 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
+        // 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);
         $this->eventDispatcher?->dispatch(new ApplicationError($t));
 
-        register_shutdown_function(static function (): void {
-            exit(1);
-        });
+        $handler = $this->wrapShutdownHandler(
+            static function (): void {
+                exit(1);
+            },
+            $this->exitShutdownHandlerDepth
+        );
+
+        register_shutdown_function($handler);
+    }
+
+    /**
+     * Wraps shutdown handler into another shutdown handler to ensure it is called last after all other shutdown
+     * functions, even those added to the end.
+     *
+     * @param callable $handler Shutdown handler to wrap.
+     * @param int $depth Wrapping depth.
+     * @return callable Wrapped handler.
+     */
+    private function wrapShutdownHandler(callable $handler, int $depth): callable
+    {
+        $currentDepth = 0;
+        while ($currentDepth < $depth) {
+            $handler = static function() use ($handler): void {
+                register_shutdown_function($handler);
+            };
+            $currentDepth++;
+        }
+        return $handler;
     }
 }