Merge pull request #28426 from paul-thebaud/5.8

[5.8] Replace first occurrence instead of last for event discovery
laravel · May 7, 2019 · 2b539a3 · 2b539a3
2 parents 506eedb + f70e7cc
commit 2b539a3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Illuminate/Foundation/Events/DiscoverEvents.php b/src/Illuminate/Foundation/Events/DiscoverEvents.php
@@ -65,7 +65,7 @@ protected static function getListenerEvents($listeners, $basePath)
      */
     protected static function classFromFile(SplFileInfo $file, $basePath)
     {
-        $class = trim(Str::replaceLast($basePath, '', $file->getRealPath()), DIRECTORY_SEPARATOR);
+        $class = trim(Str::replaceFirst($basePath, '', $file->getRealPath()), DIRECTORY_SEPARATOR);
 
         return str_replace(
             [DIRECTORY_SEPARATOR, 'App\\'],