bitinflow/expose
1
0
Fork 0
mirror of https://github.com/bitinflow/expose.git synced 2026-03-13 13:35:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #309 from beyondcode/analysis-VrJ6R3

Browse Source 
Apply fixes from StyleCI
This commit is contained in:
Marcel Pociot
2022-03-04 15:53:46 +01:00
committed by GitHub
parent 4e2eda036a e375d21e4c
commit 428356badb
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Client/Client.php
View File

@@ -127,7 +127,7 @@ class Client
$this->logger->info($data->message); $this->logger->info($data->message);
$this->logger->info("Local-URL:\t\t<options=bold>{$sharedUrl}</>"); $this->logger->info("Local-URL:\t\t<options=bold>{$sharedUrl}</>");
$this->logger->info("Dashboard-URL:\t\t<options=bold>http://127.0.0.1:".config()->get('expose.dashboard_port')."</>"); $this->logger->info("Dashboard-URL:\t\t<options=bold>http://127.0.0.1:".config()->get('expose.dashboard_port').'</>');
$this->logger->info("Expose-URL:\t\t<options=bold>http://{$data->subdomain}.{$host}{$httpPort}</>"); $this->logger->info("Expose-URL:\t\t<options=bold>http://{$data->subdomain}.{$host}{$httpPort}</>");
$this->logger->info("Expose-URL:\t\t<options=bold>https://{$data->subdomain}.{$host}</>"); $this->logger->info("Expose-URL:\t\t<options=bold>https://{$data->subdomain}.{$host}</>");
$this->logger->line(''); $this->logger->line('');

2
app/Client/Support/ConsoleSectionOutput.php
View File

@@ -2,9 +2,9 @@
namespace App\Client\Support; namespace App\Client\Support;
use Symfony\Component\Console\Output\StreamOutput;
use Symfony\Component\Console\Formatter\OutputFormatterInterface; use Symfony\Component\Console\Formatter\OutputFormatterInterface;
use Symfony\Component\Console\Helper\Helper; use Symfony\Component\Console\Helper\Helper;
use Symfony\Component\Console\Output\StreamOutput;
use Symfony\Component\Console\Terminal; use Symfony\Component\Console\Terminal;
/** /**

7
app/Server/Http/Controllers/ControlMessageController.php
View File

@@ -12,7 +12,6 @@ use App\Server\Exceptions\NoFreePortAvailable;
use Illuminate\Support\Arr; use Illuminate\Support\Arr;
use Ratchet\ConnectionInterface; use Ratchet\ConnectionInterface;
use Ratchet\WebSocket\MessageComponentInterface; use Ratchet\WebSocket\MessageComponentInterface;
use React\EventLoop\LoopInterface;
use React\Promise\Deferred; use React\Promise\Deferred;
use React\Promise\PromiseInterface; use React\Promise\PromiseInterface;
use function React\Promise\reject; use function React\Promise\reject;
@@ -151,7 +150,8 @@ class ControlMessageController implements MessageComponentInterface
}); });
} }
protected function resolveConnectionMessage($connectionInfo, $user) { protected function resolveConnectionMessage($connectionInfo, $user)
{
$deferred = new Deferred(); $deferred = new Deferred();
$connectionMessageResolver = config('expose.admin.messages.resolve_connection_message')($connectionInfo, $user); $connectionMessageResolver = config('expose.admin.messages.resolve_connection_message')($connectionInfo, $user);
@@ -163,6 +163,7 @@ class ControlMessageController implements MessageComponentInterface
}); });
} else { } else {
$connectionInfo->message = $connectionMessageResolver; $connectionInfo->message = $connectionMessageResolver;
return \React\Promise\resolve($connectionInfo); return \React\Promise\resolve($connectionInfo);
} }
@@ -188,7 +189,7 @@ class ControlMessageController implements MessageComponentInterface
return $this->resolveConnectionMessage($connectionInfo, $user); return $this->resolveConnectionMessage($connectionInfo, $user);
}) })
->then(function ($connectionInfo) use ($data, $connection, $user) { ->then(function ($connectionInfo) use ($connection, $user) {
$connection->send(json_encode([ $connection->send(json_encode([
'event' => 'authenticated', 'event' => 'authenticated',
'data' => [ 'data' => [

2
app/Server/Support/RetrieveWelcomeMessageFromApi.php
View File

@@ -2,9 +2,9 @@
namespace App\Server\Support; namespace App\Server\Support;
use Clue\React\Buzz\Browser;
use Exception; use Exception;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use Clue\React\Buzz\Browser;
class RetrieveWelcomeMessageFromApi class RetrieveWelcomeMessageFromApi
{ {

1
tests/Feature/Server/ApiTest.php
View File

@@ -91,7 +91,6 @@ class ApiTest extends TestCase
$this->assertSame('Marcel', $user->name); $this->assertSame('Marcel', $user->name);
$this->assertSame(1, $user->can_specify_subdomains); $this->assertSame(1, $user->can_specify_subdomains);
$this->await($this->browser->post('http://127.0.0.1:8080/api/users', [ $this->await($this->browser->post('http://127.0.0.1:8080/api/users', [
'Host' => 'expose.localhost', 'Host' => 'expose.localhost',
'Authorization' => base64_encode('username:secret'), 'Authorization' => base64_encode('username:secret'),