Skip to content

Commit c8bc1fa

Browse files
committed
fix event:list
(cherry picked from commit 96eb367) (cherry picked from commit 42927f4)
1 parent 28ee484 commit c8bc1fa

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

src/Illuminate/Foundation/Console/EventListCommand.php

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,7 @@ public function handle()
5555
*/
5656
protected function getEvents()
5757
{
58-
$events = [];
59-
60-
$events = $this->addListenersOnDispatcher($events);
58+
$events = $this->getListenersOnDispatcher();
6159

6260
if ($this->filteringByEvent()) {
6361
$events = $this->filterEvents($events);
@@ -69,19 +67,24 @@ protected function getEvents()
6967
}
7068

7169
/**
72-
* Adds the event / listeners on the dispatcher object to the given list.
70+
* Get the event / listeners from the dispatcher object.
7371
*
74-
* @param array $events
7572
* @return array
7673
*/
77-
protected function addListenersOnDispatcher(array $events)
74+
protected function getListenersOnDispatcher()
7875
{
76+
$events = [];
7977
foreach ($this->getRawListeners() as $event => $rawListeners) {
8078
foreach ($rawListeners as $rawListener) {
8179
if (is_string($rawListener)) {
8280
$events[$event][] = $rawListener;
8381
} elseif ($rawListener instanceof Closure) {
8482
$events[$event][] = $this->stringifyClosure($rawListener);
83+
} elseif (is_array($rawListener) && count($rawListener) === 2) {
84+
if (is_object($rawListener[0])) {
85+
$rawListener[0] = get_class($rawListener[0]);
86+
}
87+
$events[$event][] = implode('@', $rawListener);
8588
}
8689
}
8790
}

0 commit comments

Comments
 (0)