Fix event:list shows non-registered events (#31444)

4refael · web-flow · commit 1b6484e0f138 · 2020-02-12T07:57:03.000-06:00
diff --git a/src/Illuminate/Foundation/Console/EventListCommand.php b/src/Illuminate/Foundation/Console/EventListCommand.php
@@ -48,7 +48,7 @@ protected function getEvents()
         $events = [];
 
         foreach ($this->laravel->getProviders(EventServiceProvider::class) as $provider) {
-            $providerEvents = array_merge_recursive($provider->discoverEvents(), $provider->listens());
+            $providerEvents = array_merge_recursive($provider->shouldDiscoverEvents() ? $provider->discoverEvents() : [], $provider->listens());
 
             $events = array_merge_recursive($events, $providerEvents);
         }

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ protected function getEvents()`
`48`	`48`	`$events = [];`
`49`	`49`
`50`	`50`	`foreach ($this->laravel->getProviders(EventServiceProvider::class) as $provider) {`
`51`		`- $providerEvents = array_merge_recursive($provider->discoverEvents(), $provider->listens());`
	`51`	`+ $providerEvents = array_merge_recursive($provider->shouldDiscoverEvents() ? $provider->discoverEvents() : [], $provider->listens());`
`52`	`52`
`53`	`53`	`$events = array_merge_recursive($events, $providerEvents);`
`54`	`54`	`}`