Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.5] Upgrade pusher to v3.0 #20016

Merged
merged 1 commit into from
Jul 12, 2017
Merged

[5.5] Upgrade pusher to v3.0 #20016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Illuminate/Broadcasting/BroadcastManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace Illuminate\Broadcasting;

use Pusher;
use Closure;
use Pusher\Pusher;
use Psr\Log\LoggerInterface;
use InvalidArgumentException;
use Illuminate\Broadcasting\Broadcasters\LogBroadcaster;
Expand Down
8 changes: 4 additions & 4 deletions src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Illuminate\Broadcasting\Broadcasters;

use Pusher;
use Pusher\Pusher;
use Illuminate\Support\Arr;
use Illuminate\Support\Str;
use Illuminate\Broadcasting\BroadcastException;
Expand All @@ -13,14 +13,14 @@ class PusherBroadcaster extends Broadcaster
/**
* The Pusher SDK instance.
*
* @var \Pusher
* @var Pusher
*/
protected $pusher;

/**
* Create a new broadcaster instance.
*
* @param \Pusher $pusher
* @param Pusher $pusher
* @return void
*/
public function __construct(Pusher $pusher)
Expand Down Expand Up @@ -112,7 +112,7 @@ public function broadcast(array $channels, $event, array $payload = [])
/**
* Get the Pusher SDK instance.
*
* @return \Pusher
* @return Pusher
*/
public function getPusher()
{
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Broadcasting/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
}
},
"suggest": {
"pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~2.0)."
"pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~3.0)."
},
"config": {
"sort-packages": true
Expand Down