[5.3] Fixed broken event interface listening (#16877)

* Fixed broken event interface listening * Fixed typos * Use the correct variable
laravel · Dec 20, 2016 · d744b01 · d744b01
1 parent ec9a49d
commit d744b01
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/Illuminate/Events/Dispatcher.php b/src/Illuminate/Events/Dispatcher.php
@@ -305,10 +305,16 @@ protected function sortListeners($eventName)
         $listeners = isset($this->listeners[$eventName])
                             ? $this->listeners[$eventName] : [];
 
-        if (class_exists($eventName, false)) {
+        if (class_exists($eventName)) {
             foreach (class_implements($eventName) as $interface) {
                 if (isset($this->listeners[$interface])) {
-                    $listeners = array_merge_recursive($listeners, $this->listeners[$interface]);
+                    foreach ($this->listeners[$interface] as $priority => $names) {
+                        if (isset($listeners[$priority])) {
+                            $listeners[$priority] = array_merge($listeners[$priority], $names);
+                        } else {
+                            $listeners[$priority] = $names;
+                        }
+                    }
                 }
             }
         }