Merge branch '6.x' into 7.x

GrahamCampbell · GrahamCampbell · commit 15c9af2842f8 · 2020-07-06T17:36:23.000+01:00
diff --git a/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php b/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php
@@ -119,7 +119,9 @@ public function broadcast(array $channels, $event, array $payload = [])
         }
 
         throw new BroadcastException(
-            is_bool($response) ? 'Failed to connect to Pusher.' : $response['body']
+            isset($response['body'])
+                ? sprintf('Pusher error: %s.', $response['status'])
+                : 'Failed to connect to Pusher.'
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,9 @@ public function broadcast(array $channels, $event, array $payload = [])`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`throw new BroadcastException(`
`122`		`- is_bool($response) ? 'Failed to connect to Pusher.' : $response['body']`
	`122`	`+ isset($response['body'])`
	`123`	`+ ? sprintf('Pusher error: %s.', $response['status'])`
	`124`	`+ : 'Failed to connect to Pusher.'`
`123`	`125`	`);`
`124`	`126`	`}`
`125`	`127`