From 0f00d73c707d720a9819796296c16a27bfc5b628 Mon Sep 17 00:00:00 2001 From: LustyRain Date: Wed, 4 Oct 2017 21:02:48 +0900 Subject: [PATCH] Fix delete space, restored return --- lib/Cake/Console/ConsoleErrorHandler.php | 2 +- lib/Cake/Event/CakeEventManager.php | 2 +- lib/Cake/Model/BehaviorCollection.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Cake/Console/ConsoleErrorHandler.php b/lib/Cake/Console/ConsoleErrorHandler.php index 6a07d0128bf..3df0bf73455 100644 --- a/lib/Cake/Console/ConsoleErrorHandler.php +++ b/lib/Cake/Console/ConsoleErrorHandler.php @@ -88,7 +88,7 @@ public function handleError($code, $description, $file = null, $line = null, $co } if ($log === LOG_ERR) { - $this->_stop(1); + return $this->_stop(1); } } diff --git a/lib/Cake/Event/CakeEventManager.php b/lib/Cake/Event/CakeEventManager.php index e4b74a09614..ef53ea4c17c 100644 --- a/lib/Cake/Event/CakeEventManager.php +++ b/lib/Cake/Event/CakeEventManager.php @@ -167,7 +167,7 @@ protected function _extractCallable($function, $object) { public function detach($callable, $eventKey = null) { if ($callable instanceof CakeEventListener) { $this->_detachSubscriber($callable, $eventKey); - return ; + return; } if (empty($eventKey)) { foreach (array_keys($this->_listeners) as $eventKey) { diff --git a/lib/Cake/Model/BehaviorCollection.php b/lib/Cake/Model/BehaviorCollection.php index db10a8762ff..faae57064f4 100644 --- a/lib/Cake/Model/BehaviorCollection.php +++ b/lib/Cake/Model/BehaviorCollection.php @@ -204,7 +204,7 @@ public function unload($name) { * @deprecated 3.0.0 Will be removed in 3.0. Use unload instead. */ public function detach($name) { - $this->unload($name); + return $this->unload($name); } /**