From 4d0d25d479a66a4b045c611bf518c638adb67d2b Mon Sep 17 00:00:00 2001 From: Nekrasov Ilya Date: Thu, 2 Jun 2022 00:13:47 +0300 Subject: [PATCH] Fix #19401: Delay `exit(1)` in `yii\base\ErrorHandler::handleFatalError` --- framework/CHANGELOG.md | 1 + framework/base/ErrorHandler.php | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index d439ef80818..3c8f82029f2 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -28,6 +28,7 @@ Yii Framework 2 Change Log - Bug #19368: Fix PHP 8.1 error when `$fileMimeType` is `null` in `yii\validators\FileValidator::validateMimeType()` (bizley) - Enh #19384: Normalize `setBodyParams()` and `getBodyParam()` in `yii\web\Request` (WinterSilence, albertborsos) - Bug #19386: Fix recursive calling `yii\helpers\BaseArrayHelper::htmlDecode()` (WinterSilence) +- Enh #19401: Delay `exit(1)` in `yii\base\ErrorHandler::handleFatalError` (arrilot) - Bug #19402: Add shutdown event and fix working directory in `yii\base\ErrorHandler` (WinterSilence) - Enh #19416: Update and improve configurations for `yii\console\controllers\MessageController` (WinterSilence) - Bug #19403: Fix types in `yii\web\SessionIterator` (WinterSilence) diff --git a/framework/base/ErrorHandler.php b/framework/base/ErrorHandler.php index dbe114bb990..04dfbb8d8e4 100644 --- a/framework/base/ErrorHandler.php +++ b/framework/base/ErrorHandler.php @@ -321,7 +321,10 @@ public function handleFatalError() $this->trigger(static::EVENT_SHUTDOWN); - exit(1); + // ensure it is called after user-defined shutdown functions + register_shutdown_function(function() { + exit(1); + }); } }