Refactor DiscoverEvents::within()

The pairs of listeners and events can be mapped to groups of listeners keyed by the event name. By using `mapToDictionary` we can void zipping the pairs and then unzipping them while reducing.
laravel · Apr 5, 2019 · 1bf41e9 · 1bf41e9
1 parent abefa7b
commit 1bf41e9
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/src/Illuminate/Foundation/Events/DiscoverEvents.php b/src/Illuminate/Foundation/Events/DiscoverEvents.php
@@ -19,17 +19,12 @@ class DiscoverEvents
      */
     public static function within($listenerPath, $basePath)
     {
-        $listenerEvents = collect(static::getListenerEvents((new Finder)
-                    ->files()
-                    ->in($listenerPath), $basePath));
-
-        return $listenerEvents->values()
-                ->zip($listenerEvents->keys()->all())
-                ->reduce(function ($carry, $listenerEventPair) {
-                    $carry[$listenerEventPair[0]][] = $listenerEventPair[1];
-
-                    return $carry;
-                }, []);
+        return collect(static::getListenerEvents((new Finder)
+            ->files()
+            ->in($listenerPath), $basePath))
+            ->mapToDictionary(function ($event, $listener) {
+                return [$event => $listener];
+            })->all();
     }
 
     /**