From 32aa175b7c16a6f9b205f2f7c4158f1262268777 Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Sun, 11 May 2014 20:47:27 -0400 Subject: [PATCH] renamed ErrorHandler::deRegister to unregister. [skip ci] --- framework/CHANGELOG.md | 2 +- framework/base/ErrorHandler.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index 13f5f44a832..d1a745865af 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -50,7 +50,7 @@ Yii Framework 2 Change Log - Enh: Added support to insert an event handler at the beginning of class-level event handler queue (qiangxue) - Enh: Added `yii\console\Controller::EXIT_CODE_NORMAL` and `yii\console\Controller::EXIT_CODE_ERROR` constants (samdark) - Enh: `yii\console\MigrateController` now returns `yii\console\Controller::EXIT_CODE_ERROR` in case of failed migration (samdark) -- Enh: Added method ErrorHandler::deRegister() for deregistering the ErrorHandler (cebe) +- Enh: Added method ErrorHandler::unregister() for unregistering the ErrorHandler (cebe) - Chg #2913: RBAC `DbManager` is now initialized via migration (samdark) - Chg #3036: Upgraded Twitter Bootstrap to 3.1.x (qiangxue) - Chg #3175: InvalidCallException, InvalidParamException, UnknownMethodException are now extended from SPL BadMethodCallException (samdark) diff --git a/framework/base/ErrorHandler.php b/framework/base/ErrorHandler.php index 6de6a0dccfc..4dd06817a95 100644 --- a/framework/base/ErrorHandler.php +++ b/framework/base/ErrorHandler.php @@ -60,9 +60,9 @@ public function register() } /** - * Deregister this error handler by restoring the PHP error and exception handlers. + * Unregisters this error handler by restoring the PHP error and exception handlers. */ - public function deRegister() + public function unregister() { restore_error_handler(); restore_exception_handler();