diff --git a/app/Mage.php b/app/Mage.php index 8bf1a5218a0..001766eae25 100644 --- a/app/Mage.php +++ b/app/Mage.php @@ -965,14 +965,8 @@ public static function getIsDeveloperMode() */ public static function printException(Throwable $e, $extra = '') { + self::dispatchEvent('mage_print_exception_before', ['exception' => $e, 'extra' => $extra]); if (self::$_isDeveloperMode) { - if (class_exists('\Spatie\Ignition\Ignition')) { - \Spatie\Ignition\Ignition::make() - ->applicationPath(Mage::getBaseDir()) - ->handleException($e); - die(); - } - print '
'; if (!empty($extra)) { print $extra . "\n\n"; @@ -1003,6 +997,7 @@ public static function printException(Throwable $e, $extra = '') require_once(self::getBaseDir() . DS . 'errors' . DS . 'report.php'); } + self::dispatchEvent('mage_print_exception_after', ['exception' => $e, 'extra' => $extra]); die(); } diff --git a/app/code/core/Mage/Core/Model/App.php b/app/code/core/Mage/Core/Model/App.php index 94b4efea263..b9e95a02a9e 100644 --- a/app/code/core/Mage/Core/Model/App.php +++ b/app/code/core/Mage/Core/Model/App.php @@ -384,15 +384,10 @@ public function run($params) */ protected function _initEnvironment() { - if (Mage::getIsDeveloperMode() && class_exists('\Spatie\Ignition\Ignition')) { - \Spatie\Ignition\Ignition::make() - ->applicationPath(Mage::getBaseDir()) - ->register(); - } else { - $this->setErrorHandler(self::DEFAULT_ERROR_HANDLER); - } - + $this->setErrorHandler(self::DEFAULT_ERROR_HANDLER); date_default_timezone_set(Mage_Core_Model_Locale::DEFAULT_TIMEZONE); + Mage::dispatchEvent('core_app_init_environment_after', ['app' => $this]); + return $this; } diff --git a/docs/EVENTS.md b/docs/EVENTS.md index 63f7aa8a314..fe6d5bad33b 100644 --- a/docs/EVENTS.md +++ b/docs/EVENTS.md @@ -193,6 +193,7 @@ | controller_front_send_response_before | 1.9.4.5 | | controller_response_redirect | 1.9.4.5 | | core_app_run_after | 20.1.0 | +| core_app_init_environment_after | 20.7.0 | | core_block_abstract_prepare_layout_after | 1.9.4.5 | | core_block_abstract_prepare_layout_before | 1.9.4.5 | | core_block_abstract_to_html_after | 1.9.4.5 | @@ -237,6 +238,8 @@ | log_visitor_collection_load_before | 1.9.4.5 | | mage_run_installed_exception | 20.7.0 | | mage_run_exception | 1.9.4.5 | +| mage_print_exception_before | 20.7.0 | +| mage_print_exception_after | 20.7.0 | | model_config_data_save_before | 1.9.4.5 | | model_delete_after | 1.9.4.5 | | model_delete_before | 1.9.4.5 |