Merge branch 'master' of github.com:beyondcode/laravel-websockets

Author: mpociot

config/websockets.php

@@ -56,6 +56,11 @@
         'interval_in_seconds' => 60,
     ],
 
+    /*
+     * This path will be used to register the necessary routes for the package.
+     */
+    'path' => 'laravel-websockets',
+
     /*
      * Define the optional SSL context for your WebSocket connections.
      * You can see all available options at: http://php.net/manual/en/context.ssl.php

src/WebSocketsServiceProvider.php

@@ -32,8 +32,7 @@ public function boot()
         }
 
         $this
-            ->registerRouteMacro()
-            ->registerStatisticRoute()
+            ->registerRoutes()
             ->registerDashboardGate();
 
         $this->loadViewsFrom(__DIR__ . '/../resources/views/', 'websockets');
@@ -60,23 +59,16 @@ public function register()
         });
     }
 
-    protected function registerRouteMacro()
+    protected function registerRoutes()
     {
-        Route::macro('webSockets', function ($prefix = 'laravel-websockets') {
-            Route::prefix($prefix)->namespace('\\')->middleware(Authorize::class)->group(function () {
+        Route::prefix(config('websockets.path'))->group(function() {
+            Route::middleware(Authorize::class)->group(function() {
                 Route::get('/', ShowDashboard::class);
-                Route::get('/api/{appId}/statistics', DashboardApiController::class . '@getStatistics');
+                Route::get('/api/{appId}/statistics', [DashboardApiController::class,  'getStatistics']);
                 Route::post('auth', AuthenticateDashboard::class);
                 Route::post('event', SendMessage::class);
             });
-        });
 
-        return $this;
-    }
-
-    protected function registerStatisticRoute()
-    {
-        Route::prefix('/laravel-websockets')->namespace('\\')->group(function () {
             Route::post('statistics', [WebSocketStatisticsEntriesController::class, 'store']);
         });
 

tests/TestCase.php

@@ -29,11 +29,6 @@ public function setUp()
 
         $this->channelManager = app(ChannelManager::class);
 
-        /** TODO: make this work without middleware prefix */
-        Route::middleware('App\Http\Controllers')->group(function() {
-            Route::webSockets();
-        });
-
         StatisticsLogger::fake();
     }