Extend router and remove RoutingServiceProvider

src/ServiceProvider.php

@@ -4,6 +4,8 @@
 
 namespace DragonCode\LaravelRouteNames;
 
+use DragonCode\LaravelRouteNames\Routing\Router;
+use Illuminate\Routing\Router as BaseRouter;
 use Illuminate\Support\ServiceProvider as BaseServiceProvider;
 
 class ServiceProvider extends BaseServiceProvider
@@ -16,6 +18,7 @@ public function boot(): void
     public function register(): void
     {
         $this->registerConfig();
+        $this->extendRouter();
     }
 
     protected function publishConfig(): void
@@ -37,4 +40,17 @@ protected function getPath(): string
     {
         return __DIR__ . '/../config/route.php';
     }
+
+    protected function extendRouter(): void
+    {
+        $this->app->booting(function (): void {
+            $this->app->extend(
+                'router',
+                static fn(
+                    BaseRouter $router,
+                    $app
+                ): Router => !$router instanceof Router ? new Router($app['events'], $app) : $router
+            );
+        });
+    }
 }

tests/TestCase.php

@@ -17,7 +17,6 @@
 
 namespace Tests;
 
-use DragonCode\LaravelRouteNames\Providers\RoutingServiceProvider;
 use DragonCode\LaravelRouteNames\ServiceProvider;
 use Illuminate\Events\EventServiceProvider;
 use Illuminate\Log\LogServiceProvider;
@@ -35,7 +34,6 @@ protected function getPackageProviders($app): array
         return [
             EventServiceProvider::class,
             LogServiceProvider::class,
-            RoutingServiceProvider::class,
             ServiceProvider::class,
         ];
     }