修复过滤器额外参数传递错误问题

deatil · Jun 14, 2024 · 0b23ad3 · 0b23ad3
1 parent 45e0781
commit 0b23ad3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/resources/config/laket.php b/resources/config/laket.php
@@ -4,8 +4,8 @@
     'admin' => [
         "name"      => "LaketAdmin",
         "name_mini" => "Laket",
-        "version"   => "1.2.19",
-        "release"   => "1.2.19.20240615",
+        "version"   => "1.2.20",
+        "release"   => "1.2.20.20240615",
     ],
 
     // 登录

diff --git a/src/Event/Event.php b/src/Event/Event.php
@@ -66,8 +66,11 @@ public function doAction($event, ...$var): void
 
         if (str_contains($event, '.')) {
             [$prefix, $event] = explode('.', $event, 2);
-            if (isset($this->listener[$prefix . '.*'])) {
-                $listeners = array_merge($listeners, $this->listener[$prefix . '.*']);
+
+            foreach ($this->listener as $e => $listener) {
+                if ($event == '*' && str_starts_with($e, $prefix . '.')) {
+                    $listeners = array_merge($listeners, $listener);
+                }
             }
         }
 
@@ -117,8 +120,11 @@ public function applyFilters($event, $params = null, ...$var)
 
         if (str_contains($event, '.')) {
             [$prefix, $event] = explode('.', $event, 2);
-            if (isset($this->listener[$prefix . '.*'])) {
-                $listeners = array_merge($listeners, $this->listener[$prefix . '.*']);
+
+            foreach ($this->listener as $e => $listener) {
+                if ($event == '*' && str_starts_with($e, $prefix . '.')) {
+                    $listeners = array_merge($listeners, $listener);
+                }
             }
         }
 
@@ -134,6 +140,7 @@ public function applyFilters($event, $params = null, ...$var)
             array_unshift($tmp, $result);
 
             $result = $this->dispatch($listener['listener'], $tmp);
+            $tmp = $var;
         }
 
         return $result;