renamed ErrorHandler::deRegister to unregister. [skip ci]

ardianp · May 12, 2014 · 32aa175 · 32aa175
1 parent e55f819
commit 32aa175
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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();