[5.8] Configure application namespace while discovering events

src/Illuminate/Foundation/Events/DiscoverEvents.php

@@ -67,6 +67,10 @@ protected static function classFromFile(SplFileInfo $file, $basePath)
     {
         $class = trim(str_replace($basePath, '', $file->getRealPath()), DIRECTORY_SEPARATOR);
 
-        return str_replace(DIRECTORY_SEPARATOR, '\\', ucfirst(Str::replaceLast('.php', '', $class)));
+        return str_replace(
+            [DIRECTORY_SEPARATOR, 'App\\'],
+            ['\\', app()->getNamespace()],
+            ucfirst(Str::replaceLast('.php', '', $class))
+        );
     }
 }

tests/Foundation/DiscoverEventsTest.php → tests/Integration/Foundation/DiscoverEventsTest.php

@@ -1,18 +1,18 @@
 <?php
 
-namespace Illuminate\Tests\Foundation;
+namespace Illuminate\Tests\Integration\Foundation;
 
-use PHPUnit\Framework\TestCase;
+use Orchestra\Testbench\TestCase;
 use Illuminate\Foundation\Events\DiscoverEvents;
-use Illuminate\Tests\Foundation\Fixtures\EventDiscovery\Events\EventOne;
-use Illuminate\Tests\Foundation\Fixtures\EventDiscovery\Events\EventTwo;
-use Illuminate\Tests\Foundation\Fixtures\EventDiscovery\Listeners\Listener;
+use Illuminate\Tests\Integration\Foundation\Fixtures\EventDiscovery\Events\EventOne;
+use Illuminate\Tests\Integration\Foundation\Fixtures\EventDiscovery\Events\EventTwo;
+use Illuminate\Tests\Integration\Foundation\Fixtures\EventDiscovery\Listeners\Listener;
 
 class DiscoverEventsTest extends TestCase
 {
     public function test_events_can_be_discovered()
     {
-        class_alias(Listener::class, 'Tests\Foundation\Fixtures\EventDiscovery\Listeners\Listener');
+        class_alias(Listener::class, 'Tests\Integration\Foundation\Fixtures\EventDiscovery\Listeners\Listener');
 
         $events = DiscoverEvents::within(__DIR__.'/Fixtures/EventDiscovery/Listeners', getcwd());
 

tests/Integration/Foundation/Fixtures/EventDiscovery/Events/EventOne.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Illuminate\Tests\Integration\Foundation\Fixtures\EventDiscovery\Events;
+
+class EventOne
+{
+}

tests/Integration/Foundation/Fixtures/EventDiscovery/Events/EventTwo.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Illuminate\Tests\Integration\Foundation\Fixtures\EventDiscovery\Events;
+
+class EventTwo
+{
+}

tests/Integration/Foundation/Fixtures/EventDiscovery/Listeners/Listener.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Illuminate\Tests\Integration\Foundation\Fixtures\EventDiscovery\Listeners;
+
+use Illuminate\Tests\Integration\Foundation\Fixtures\EventDiscovery\Events\EventOne;
+use Illuminate\Tests\Integration\Foundation\Fixtures\EventDiscovery\Events\EventTwo;
+
+class Listener
+{
+    public function handle(EventOne $event)
+    {
+        //
+    }
+
+    public function handleEventOne(EventOne $event)
+    {
+        //
+    }
+
+    public function handleEventTwo(EventTwo $event)
+    {
+        //
+    }
+}