Permalink
Browse files

Rename `server` to `host`

  • Loading branch information...
LKaemmerling committed Dec 5, 2018
1 parent 30d1a6b commit 3f48a0fe503b6f6a3fbb006b0d9e7f068e731e82
Showing with 6 additions and 7 deletions.
  1. +0 −1 config/websockets.php
  2. +1 −1 resources/views/dashboard.blade.php
  3. +3 −3 src/Apps/App.php
  4. +2 −2 src/Apps/ConfigAppProvider.php
@@ -13,7 +13,6 @@
[
'id' => env('PUSHER_APP_ID'),
'name' => env('APP_NAME'),
'server' => null,
'key' => env('PUSHER_APP_KEY'),
'secret' => env('PUSHER_APP_SECRET'),
'enable_client_messages' => false,
@@ -109,7 +109,7 @@
methods: {
connect() {
this.pusher = new Pusher(this.app.key, {
wsHost: this.app.server.length === 0 ? window.location.hostname : this.app.server,
wsHost: this.app.host.length === 0 ? window.location.hostname : this.app.host,
wsPort: this.port,
disableStats: true,
authEndpoint: '/{{ request()->path() }}/auth',
@@ -19,7 +19,7 @@ class App
public $name;
/** @var string|null */
public $server;
public $host;
/** @var bool */
public $clientMessagesEnabled = false;
@@ -66,9 +66,9 @@ public function setName(string $appName)
return $this;
}
public function setServer(string $server)
public function setHost(string $host)
{
$this->server = $server;
$this->host = $host;
return $this;
}
@@ -67,8 +67,8 @@ protected function instanciate(?array $appAttributes): ?App
$app->setName($appAttributes['name']);
}
if (isset($appAttributes['server'])) {
$app->setServer($appAttributes['server']);
if (isset($appAttributes['host'])) {
$app->setHost($appAttributes['host']);
}
$app

0 comments on commit 3f48a0f

Please sign in to comment.