From b9ab4272192d079539c32787d66a35a31a7815ce Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylor@laravel.com>
Date: Thu, 26 Apr 2018 08:18:21 -0500
Subject: [PATCH] formatting

---
 .../Broadcasting/BroadcastManager.php         |  3 ++-
 .../Broadcasters/PusherBroadcaster.php        | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/Illuminate/Broadcasting/BroadcastManager.php b/src/Illuminate/Broadcasting/BroadcastManager.php
index a74f046be644..0ac9055f8301 100644
--- a/src/Illuminate/Broadcasting/BroadcastManager.php
+++ b/src/Illuminate/Broadcasting/BroadcastManager.php
@@ -65,7 +65,8 @@ public function routes(array $attributes = null)
         $attributes = $attributes ?: ['middleware' => ['web']];
 
         $this->app['router']->group($attributes, function ($router) {
-            $router->match(['post', 'get'], '/broadcasting/auth',
+            $router->match(
+                ['get', 'post'], '/broadcasting/auth',
                 '\\'.BroadcastController::class.'@authenticate'
             );
         });
diff --git a/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php b/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php
index 649b2bf779fd..127cf609327a 100644
--- a/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php
+++ b/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php
@@ -62,33 +62,34 @@ public function validAuthenticationResponse($request, $result)
     {
         if (Str::startsWith($request->channel_name, 'private')) {
             return $this->decodePusherResponse(
-                $request,
-                $this->pusher->socket_auth($request->channel_name, $request->socket_id)
+                $request, $this->pusher->socket_auth($request->channel_name, $request->socket_id)
             );
         }
 
         return $this->decodePusherResponse(
             $request,
             $this->pusher->presence_auth(
-                $request->channel_name, $request->socket_id, $request->user()->getAuthIdentifier(), $result)
+                $request->channel_name, $request->socket_id,
+                $request->user()->getAuthIdentifier(), $result
+            )
         );
     }
 
     /**
-     * Decode the given Pusher response, apply the callback for JSONP support.
+     * Decode the given Pusher response.
      *
-     * @param  mixed  $request
+     * @param  \Illuminate\Http\Request  $request
      * @param  mixed  $response
      * @return array
      */
     protected function decodePusherResponse($request, $response)
     {
-        if ($request->callback) {
-            return response()->json(json_decode($response, true))
-            ->withCallback($request->callback);
+        if (! $request->callback) {
+            return json_decode($response, true);
         }
 
-        return json_decode($response, true);
+        return response()->json(json_decode($response, true))
+                    ->withCallback($request->callback);
     }
 
     /**