Fixes #17336: Fixed wildcard matching in Event::hasHandlers()

Author: samdark

Diff for: framework/CHANGELOG.md

@@ -7,6 +7,7 @@ Yii Framework 2 Change Log
 - Bug #16509: Fixed console command help text wordwrap for multi-byte strings (alexkart)
 - Bug #17299: Fixed adding of input error class in `\yii\widgets\ActiveField::widget` (alexkart)
 - Bug #17328: Added mime aliases for BMP and SVG files (cmoeke)
+- Bug #17336: Fixed wildcard matching in Event::hasHandlers() (samdark)
 
 
 2.0.19 May 21, 2019

Diff for: framework/base/Event.php

@@ -225,8 +225,8 @@ class_implements($class, true)
         );
 
         // regular events
-        foreach ($classes as $class) {
-            if (!empty(self::$_events[$name][$class])) {
+        foreach ($classes as $className) {
+            if (!empty(self::$_events[$name][$className])) {
                 return true;
             }
         }
@@ -240,8 +240,8 @@ class_implements($class, true)
                 if (empty($handlers)) {
                     continue;
                 }
-                foreach ($classes as $class) {
-                    if (!StringHelper::matchWildcard($classWildcard, $class)) {
+                foreach ($classes as $className) {
+                    if (StringHelper::matchWildcard($classWildcard, $className, ['escape' => false])) {
                         return true;
                     }
                 }

Diff for: tests/framework/base/EventTest.php

@@ -91,6 +91,18 @@ public function testHasHandlers()
         $this->assertTrue(Event::hasHandlers('yiiunit\framework\base\SomeInterface', SomeInterface::EVENT_SUPER_EVENT));
     }
 
+    /**
+     * @see https://github.com/yiisoft/yii2/issues/17336
+     */
+    public function testHasHandlersWithWildcard()
+    {
+        Event::on('\yiiunit\framework\base\*', 'save.*', function ($event) {
+            // do nothing
+        });
+
+        $this->assertTrue(Event::hasHandlers('yiiunit\framework\base\SomeInterface', 'save.it'), 'save.it');
+    }
+
     public function testOffUnmatchedHandler()
     {
         $this->assertFalse(Event::hasHandlers(Post::className(), 'afterSave'));