blax-software
/
laravel-websockets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commit

This commit is contained in:
freek 2018-11-26 09:24:56 +01:00
parent adcd300a94 224845d6fd
commit c4da95a072
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/websockets.php
View File

@ -7,7 +7,7 @@ return [
/** /**
* This package comes with multi tenancy out of the box. Here you can * This package comes with multi tenancy out of the box. Here you can
* configure the diffente clients that can use the webSockets server. * configure the different clients that can use the webSockets server.
* *
* You should make sure that the app id is numeric. * You should make sure that the app id is numeric.
*/ */

4
src/Dashboard/Http/Middleware/Authorize.php
View File

@ -1,6 +1,10 @@
<?php <?php
<<<<<<< HEAD:src/Dashboard/Http/Middleware/Authorize.php
namespace BeyondCode\LaravelWebsockets\Dashboard\Http\Middleware; namespace BeyondCode\LaravelWebsockets\Dashboard\Http\Middleware;
=======
namespace BeyondCode\LaravelWebSockets\Http\Middleware;
>>>>>>> 224845d6fd754bb8f608af61675ef0519c5d2b1d:src/Http/Middleware/Authorize.php
use Illuminate\Support\Facades\Gate; use Illuminate\Support\Facades\Gate;

2
src/LaravelEcho/WebSocket/PusherServer.php
View File

@ -10,7 +10,7 @@ use Ratchet\RFC6455\Messaging\MessageInterface;
use BeyondCode\LaravelWebSockets\WebSocketController; use BeyondCode\LaravelWebSockets\WebSocketController;
use BeyondCode\LaravelWebSockets\ClientProviders\Client; use BeyondCode\LaravelWebSockets\ClientProviders\Client;
use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Channels\ChannelManager; use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Channels\ChannelManager;
use BeyondCode\LaravelWebsockets\LaravelEcho\Pusher\Exceptions\PusherException; use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Exceptions\PusherException;
use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Exceptions\UnknownAppKeyException; use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Exceptions\UnknownAppKeyException;
class PusherServer extends WebSocketController class PusherServer extends WebSocketController