From b8de9061fbf10fb4af7bbc5c4f7f279b2392b3c4 Mon Sep 17 00:00:00 2001
From: freek <freek@spatie.be>
Date: Tue, 27 Nov 2018 21:17:35 +0100
Subject: [PATCH] reorder

---
 src/Server/Router.php | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/Server/Router.php b/src/Server/Router.php
index 0016358..42e7d28 100644
--- a/src/Server/Router.php
+++ b/src/Server/Router.php
@@ -30,15 +30,18 @@ class Router
         return $this->routes;
     }
 
-    public function websocket(string $uri, $action)
+    public function echo()
     {
-        if (!is_subclass_of($action, MessageComponentInterface::class)) {
-            throw InvalidWebSocketController::withController($action);
-        }
+        $this->get('/app/{appKey}', WebSocketHandler::class);
 
-        $this->get($uri, $action);
+        $this->get('/apps/{appId}/channels', FetchChannelsController::class);
+        $this->get('/apps/{appId}/channels/{channelName}', FetchChannelController::class);
+        $this->get('/apps/{appId}/channels/{channelName}/users', FetchUsersController::class);
+        $this->post('/apps/{appId}/events', TriggerEventController::class);
     }
 
+
+
     public function get(string $uri, $action)
     {
         $this->addRoute('GET', $uri, $action);
@@ -64,6 +67,15 @@ class Router
         $this->addRoute('DELETE', $uri, $action);
     }
 
+    public function websocket(string $uri, $action)
+    {
+        if (!is_subclass_of($action, MessageComponentInterface::class)) {
+            throw InvalidWebSocketController::withController($action);
+        }
+
+        $this->get($uri, $action);
+    }
+
     public function addRoute(string $method, string $uri, $action)
     {
         $this->routes->add($uri, $this->getRoute($method, $uri, $action));
@@ -74,16 +86,7 @@ class Router
         return new Route($uri, ['_controller' => $this->wrapAction($action)], [], [], null, [], [$method]);
     }
 
-    public function echo()
-    {
-        $this->get('/app/{appKey}', WebSocketHandler::class);
 
-        $this->get('/apps/{appId}/channels', FetchChannelsController::class);
-        $this->get('/apps/{appId}/channels/{channelName}', FetchChannelController::class);
-        $this->get('/apps/{appId}/channels/{channelName}/users', FetchUsersController::class);
-
-        $this->post('/apps/{appId}/events', TriggerEventController::class);
-    }
 
     /**
      * @param string $action