condition optimized

XanaduNWH · Dec 23, 2017 · 921310f · 921310f
1 parent 75d962a
commit 921310f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/framework/base/Component.php b/framework/base/Component.php
@@ -465,7 +465,7 @@ public function hasEventHandlers($name)
         $this->ensureBehaviors();
 
         foreach ($this->_eventWildcards as $wildcard => $handlers) {
-            if (StringHelper::matchWildcard($wildcard, $name) && !empty($handlers)) {
+            if (!empty($handlers) && StringHelper::matchWildcard($wildcard, $name)) {
                 return true;
             }
         }
@@ -582,6 +582,10 @@ public function off($name, $handler = null)
         }
         if ($removed) {
             $this->_eventWildcards[$name] = array_values($this->_eventWildcards[$name]);
+            // remove empty wildcards to save future redundant regex checks :
+            if (empty($this->_eventWildcards[$name])) {
+                unset($this->_eventWildcards[$name]);
+            }
         }
 
         return $removed;
@@ -599,11 +603,9 @@ public function trigger($name, Event $event = null)
         $this->ensureBehaviors();
 
         $eventHandlers = [];
-        if (!empty($this->_eventWildcards)) {
-            foreach ($this->_eventWildcards as $wildcard => $handlers) {
-                if (StringHelper::matchWildcard($wildcard, $name)) {
-                    $eventHandlers = array_merge($eventHandlers, $handlers);
-                }
+        foreach ($this->_eventWildcards as $wildcard => $handlers) {
+            if (StringHelper::matchWildcard($wildcard, $name)) {
+                $eventHandlers = array_merge($eventHandlers, $handlers);
             }
         }
 

diff --git a/framework/base/Event.php b/framework/base/Event.php
@@ -6,6 +6,7 @@
  */
 
 namespace yii\base;
+
 use yii\helpers\StringHelper;
 
 /**
@@ -171,6 +172,13 @@ public static function off($class, $name, $handler = null)
         }
         if ($removed) {
             self::$_eventWildcards[$name][$class] = array_values(self::$_eventWildcards[$name][$class]);
+            // remove empty wildcards to save future redundant regex checks :
+            if (empty(self::$_eventWildcards[$name][$class])) {
+                unset(self::$_eventWildcards[$name][$class]);
+                if (empty(self::$_eventWildcards[$name])) {
+                    unset(self::$_eventWildcards[$name]);
+                }
+            }
         }
 
         return $removed;
@@ -198,7 +206,7 @@ public static function offAll()
      */
     public static function hasHandlers($class, $name)
     {
-        if (empty(self::$_events[$name]) && empty(self::$_eventWildcards)) {
+        if (empty(self::$_eventWildcards) && empty(self::$_events[$name])) {
             return false;
         }
 
@@ -252,13 +260,11 @@ class_implements($class, true)
     public static function trigger($class, $name, $event = null)
     {
         $wildcardEventHandlers = [];
-        if (!empty(self::$_eventWildcards)) {
-            foreach (self::$_eventWildcards as $nameWildcard => $classHandlers) {
-                if (!StringHelper::matchWildcard($nameWildcard, $name)) {
-                    continue;
-                }
-                $wildcardEventHandlers = array_merge($wildcardEventHandlers, $classHandlers);
+        foreach (self::$_eventWildcards as $nameWildcard => $classHandlers) {
+            if (!StringHelper::matchWildcard($nameWildcard, $name)) {
+                continue;
             }
+            $wildcardEventHandlers = array_merge($wildcardEventHandlers, $classHandlers);
         }
 
         if (empty(self::$_events[$name]) && empty($wildcardEventHandlers)) {