From 0de49406dbc9557bf5a6614b83f6cc3393664cdd Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Sun, 18 Feb 2018 02:56:56 +0300 Subject: [PATCH] Minor code style adjustments, phpdoc --- framework/base/Component.php | 5 ++--- framework/base/Module.php | 2 ++ framework/behaviors/CacheableWidgetBehavior.php | 4 +--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/framework/base/Component.php b/framework/base/Component.php index 2f06af8..2bf4b7c 100644 --- a/framework/base/Component.php +++ b/framework/base/Component.php @@ -552,8 +552,7 @@ class Component extends BaseObject return false; } if ($handler === null) { - unset($this->_events[$name]); - unset($this->_eventWildcards[$name]); + unset($this->_events[$name], $this->_eventWildcards[$name]); return true; } @@ -582,7 +581,7 @@ class Component extends BaseObject } if ($removed) { $this->_eventWildcards[$name] = array_values($this->_eventWildcards[$name]); - // remove empty wildcards to save future redundant regex checks : + // remove empty wildcards to save future redundant regex checks: if (empty($this->_eventWildcards[$name])) { unset($this->_eventWildcards[$name]); } diff --git a/framework/base/Module.php b/framework/base/Module.php index 96d7c36..9fc1eaf 100644 --- a/framework/base/Module.php +++ b/framework/base/Module.php @@ -649,6 +649,8 @@ class Module extends ServiceLocator } /** + * Checks if class name or prefix is incorrect + * * @param string $className * @param string $prefix * @return bool diff --git a/framework/behaviors/CacheableWidgetBehavior.php b/framework/behaviors/CacheableWidgetBehavior.php index 288d8b2..bd7b007 100644 --- a/framework/behaviors/CacheableWidgetBehavior.php +++ b/framework/behaviors/CacheableWidgetBehavior.php @@ -157,9 +157,7 @@ class CacheableWidgetBehavior extends Behavior private function getCacheInstance() { $cacheInterface = 'yii\caching\CacheInterface'; - $cache = Instance::ensure($this->cache, $cacheInterface); - - return $cache; + return Instance::ensure($this->cache, $cacheInterface); } /**