Minor code style adjustments, phpdoc

framework/base/Component.php

@@ -552,8 +552,7 @@ class Component extends BaseObject
             return false;
         }
         if ($handler === null) {
-            unset($this->_events[$name]);
+            unset($this->_events[$name], $this->_eventWildcards[$name]);
-            unset($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]);
             }

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

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 Instance::ensure($this->cache, $cacheInterface);
-
-        return $cache;
     }
 
     /**