Skip to content

Commit

Permalink
Fixed formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
@yousuf-hossain-shanto
yousuf-hossain-shanto committed May 19, 2021
1 parent cf89754 commit f93d8d8
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 50 deletions.
44 changes: 22 additions & 22 deletions src/Illuminate/Broadcasting/Broadcasters/AblyBroadcaster.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class AblyBroadcaster extends Broadcaster
/**
* Create a new broadcaster instance.
*
* @param \Ably\AblyRest $ably
* @param \Ably\AblyRest $ably
* @return void
*/
public function __construct(AblyRest $ably)
Expand All @@ -33,7 +33,7 @@ public function __construct(AblyRest $ably)
/**
* Authenticate the incoming request for a given channel.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Http\Request $request
* @return mixed
*
* @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
Expand All @@ -44,7 +44,7 @@ public function auth($request)

if (empty($request->channel_name) ||
($this->isGuardedChannel($request->channel_name) &&
!$this->retrieveUser($request, $channelName))) {
! $this->retrieveUser($request, $channelName))) {
throw new AccessDeniedHttpException;
}

Expand All @@ -56,8 +56,8 @@ public function auth($request)
/**
* Return the valid authentication response.
*
* @param \Illuminate\Http\Request $request
* @param mixed $result
* @param \Illuminate\Http\Request $request
* @param mixed $result
* @return mixed
*/
public function validAuthenticationResponse($request, $result)
Expand All @@ -67,7 +67,7 @@ public function validAuthenticationResponse($request, $result)
$request->channel_name, $request->socket_id
);

return ['auth' => $this->getPublicToken() . ':' . $signature];
return ['auth' => $this->getPublicToken().':'.$signature];
}

$channelName = $this->normalizeChannelName($request->channel_name);
Expand All @@ -79,40 +79,40 @@ public function validAuthenticationResponse($request, $result)
$request->channel_name,
$request->socket_id,
$userData = array_filter([
'user_id' => (string)$broadcastIdentifier,
'user_id' => (string) $broadcastIdentifier,
'user_info' => $result,
])
);

return [
'auth' => $this->getPublicToken() . ':' . $signature,
'auth' => $this->getPublicToken().':'.$signature,
'channel_data' => json_encode($userData),
];
}

/**
* Generate the signature needed for Ably authentication headers.
*
* @param string $channelName
* @param string $socketId
* @param array|null $userData
* @param string $channelName
* @param string $socketId
* @param array|null $userData
* @return string
*/
public function generateAblySignature($channelName, $socketId, $userData = null)
{
return hash_hmac(
'sha256',
sprintf('%s:%s%s', $socketId, $channelName, $userData ? ':' . json_encode($userData) : ''),
sprintf('%s:%s%s', $socketId, $channelName, $userData ? ':'.json_encode($userData) : ''),
$this->getPrivateToken(),
);
}

/**
* Broadcast the given event.
*
* @param array $channels
* @param string $event
* @param array $payload
* @param array $channels
* @param string $event
* @param array $payload
* @return void
*/
public function broadcast(array $channels, $event, array $payload = [])
Expand All @@ -125,7 +125,7 @@ public function broadcast(array $channels, $event, array $payload = [])
/**
* Return true if the channel is protected by authentication.
*
* @param string $channel
* @param string $channel
* @return bool
*/
public function isGuardedChannel($channel)
Expand All @@ -136,15 +136,15 @@ public function isGuardedChannel($channel)
/**
* Remove prefix from channel name.
*
* @param string $channel
* @param string $channel
* @return string
*/
public function normalizeChannelName($channel)
{
if ($this->isGuardedChannel($channel)) {
return Str::startsWith($channel, 'private-')
? Str::replaceFirst('private-', '', $channel)
: Str::replaceFirst('presence-', '', $channel);
? Str::replaceFirst('private-', '', $channel)
: Str::replaceFirst('presence-', '', $channel);
}

return $channel;
Expand All @@ -153,21 +153,21 @@ public function normalizeChannelName($channel)
/**
* Format the channel array into an array of strings.
*
* @param array $channels
* @param array $channels
* @return array
*/
protected function formatChannels(array $channels)
{
return array_map(function ($channel) {
$channel = (string)$channel;
$channel = (string) $channel;

if (Str::startsWith($channel, ['private-', 'presence-'])) {
return Str::startsWith($channel, 'private-')
? Str::replaceFirst('private-', 'private:', $channel)
: Str::replaceFirst('presence-', 'presence:', $channel);
}

return 'public:' . $channel;
return 'public:'.$channel;
}, $channels);
}

Expand Down
28 changes: 14 additions & 14 deletions src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class PusherBroadcaster extends Broadcaster
/**
* Create a new broadcaster instance.
*
* @param \Pusher\Pusher $pusher
* @param \Pusher\Pusher $pusher
* @return void
*/
public function __construct(Pusher $pusher)
Expand All @@ -34,7 +34,7 @@ public function __construct(Pusher $pusher)
/**
* Authenticate the incoming request for a given channel.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Http\Request $request
* @return mixed
*
* @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
Expand All @@ -45,7 +45,7 @@ public function auth($request)

if (empty($request->channel_name) ||
($this->isGuardedChannel($request->channel_name) &&
!$this->retrieveUser($request, $channelName))) {
! $this->retrieveUser($request, $channelName))) {
throw new AccessDeniedHttpException;
}

Expand All @@ -57,8 +57,8 @@ public function auth($request)
/**
* Return the valid authentication response.
*
* @param \Illuminate\Http\Request $request
* @param mixed $result
* @param \Illuminate\Http\Request $request
* @param mixed $result
* @return mixed
*/
public function validAuthenticationResponse($request, $result)
Expand Down Expand Up @@ -86,26 +86,26 @@ public function validAuthenticationResponse($request, $result)
/**
* Decode the given Pusher response.
*
* @param \Illuminate\Http\Request $request
* @param mixed $response
* @param \Illuminate\Http\Request $request
* @param mixed $response
* @return array
*/
protected function decodePusherResponse($request, $response)
{
if (!$request->input('callback', false)) {
if (! $request->input('callback', false)) {
return json_decode($response, true);
}

return response()->json(json_decode($response, true))
->withCallback($request->callback);
->withCallback($request->callback);
}

/**
* Broadcast the given event.
*
* @param array $channels
* @param string $event
* @param array $payload
* @param array $channels
* @param string $event
* @param array $payload
* @return void
*
* @throws \Illuminate\Broadcasting\BroadcastException
Expand Down Expand Up @@ -137,7 +137,7 @@ public function broadcast(array $channels, $event, array $payload = [])
}

throw new BroadcastException(
!empty($response['body'])
! empty($response['body'])
? sprintf('Pusher error: %s.', $response['body'])
: 'Failed to connect to Pusher.'
);
Expand Down Expand Up @@ -167,7 +167,7 @@ public function getPusher()
/**
* Set the Pusher SDK instance.
*
* @param \Pusher\Pusher $pusher
* @param \Pusher\Pusher $pusher
* @return void
*/
public function setPusher($pusher)
Expand Down
24 changes: 12 additions & 12 deletions src/Illuminate/Broadcasting/Broadcasters/RedisBroadcaster.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ class RedisBroadcaster extends Broadcaster
/**
* Create a new broadcaster instance.
*
* @param \Illuminate\Contracts\Redis\Factory $redis
* @param string|null $connection
* @param string $prefix
* @param \Illuminate\Contracts\Redis\Factory $redis
* @param string|null $connection
* @param string $prefix
* @return void
*/
public function __construct(Redis $redis, $connection = null, $prefix = '')
Expand All @@ -49,7 +49,7 @@ public function __construct(Redis $redis, $connection = null, $prefix = '')
/**
* Authenticate the incoming request for a given channel.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Http\Request $request
* @return mixed
*
* @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
Expand All @@ -62,7 +62,7 @@ public function auth($request)

if (empty($request->channel_name) ||
($this->isGuardedChannel($request->channel_name) &&
!$this->retrieveUser($request, $channelName))) {
! $this->retrieveUser($request, $channelName))) {
throw new AccessDeniedHttpException;
}

Expand All @@ -74,8 +74,8 @@ public function auth($request)
/**
* Return the valid authentication response.
*
* @param \Illuminate\Http\Request $request
* @param mixed $result
* @param \Illuminate\Http\Request $request
* @param mixed $result
* @return mixed
*/
public function validAuthenticationResponse($request, $result)
Expand All @@ -98,9 +98,9 @@ public function validAuthenticationResponse($request, $result)
/**
* Broadcast the given event.
*
* @param array $channels
* @param string $event
* @param array $payload
* @param array $channels
* @param string $event
* @param array $payload
* @return void
*/
public function broadcast(array $channels, $event, array $payload = [])
Expand Down Expand Up @@ -143,13 +143,13 @@ protected function broadcastMultipleChannelsScript()
/**
* Format the channel array into an array of strings.
*
* @param array $channels
* @param array $channels
* @return array
*/
protected function formatChannels(array $channels)
{
return array_map(function ($channel) {
return $this->prefix . $channel;
return $this->prefix.$channel;
}, parent::formatChannels($channels));
}
}
2 changes: 1 addition & 1 deletion tests/Broadcasting/PusherBroadcasterTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ protected function getMockRequestWithUserForChannel($channel)
$user->shouldReceive('getAuthIdentifierForBroadcasting')
->andReturn(42);
$user->shouldReceive('getAuthIdentifier')
->andReturn(42);
->andReturn(42);

$request->shouldReceive('user')
->andReturn($user);
Expand Down
2 changes: 1 addition & 1 deletion tests/Broadcasting/RedisBroadcasterTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ protected function getMockRequestWithUserForChannel($channel)
$user->shouldReceive('getAuthIdentifierForBroadcasting')
->andReturn(42);
$user->shouldReceive('getAuthIdentifier')
->andReturn(42);
->andReturn(42);

$request->shouldReceive('user')
->andReturn($user);
Expand Down

0 comments on commit f93d8d8

Please sign in to comment.