From 70416dcb182ed569723deaad347fe8941a6ff0bc Mon Sep 17 00:00:00 2001 From: Marcel Pociot Date: Wed, 10 Nov 2021 15:44:02 +0000 Subject: [PATCH] Apply fixes from StyleCI --- app/Server/Connections/ConnectionManager.php | 2 +- app/Server/Factory.php | 2 +- .../Http/Controllers/Admin/GetLogsController.php | 1 - .../Admin/GetLogsForSubdomainController.php | 1 - app/Server/Http/Router.php | 1 + app/Server/LoggerRepository/DatabaseLogger.php | 10 +++++----- app/Server/LoggerRepository/NullLogger.php | 1 - 7 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/Server/Connections/ConnectionManager.php b/app/Server/Connections/ConnectionManager.php index 8998778..ed9b2bb 100644 --- a/app/Server/Connections/ConnectionManager.php +++ b/app/Server/Connections/ConnectionManager.php @@ -3,11 +3,11 @@ namespace App\Server\Connections; use App\Contracts\ConnectionManager as ConnectionManagerContract; +use App\Contracts\LoggerRepository; use App\Contracts\StatisticsCollector; use App\Contracts\SubdomainGenerator; use App\Http\QueryParameters; use App\Server\Exceptions\NoFreePortAvailable; -use App\Contracts\LoggerRepository; use Ratchet\ConnectionInterface; use React\EventLoop\LoopInterface; use React\Socket\Server; diff --git a/app/Server/Factory.php b/app/Server/Factory.php index e8f4237..c3e834d 100644 --- a/app/Server/Factory.php +++ b/app/Server/Factory.php @@ -4,6 +4,7 @@ namespace App\Server; use App\Contracts\ConnectionManager as ConnectionManagerContract; use App\Contracts\DomainRepository; +use App\Contracts\LoggerRepository; use App\Contracts\StatisticsCollector; use App\Contracts\StatisticsRepository; use App\Contracts\SubdomainGenerator; @@ -39,7 +40,6 @@ use App\Server\Http\Controllers\ControlMessageController; use App\Server\Http\Controllers\TunnelMessageController; use App\Server\Http\Router; use App\Server\LoggerRepository\NullLogger; -use App\Contracts\LoggerRepository; use App\Server\StatisticsCollector\DatabaseStatisticsCollector; use App\Server\StatisticsRepository\DatabaseStatisticsRepository; use App\Server\SubdomainRepository\DatabaseSubdomainRepository; diff --git a/app/Server/Http/Controllers/Admin/GetLogsController.php b/app/Server/Http/Controllers/Admin/GetLogsController.php index fa5de95..6a0af32 100644 --- a/app/Server/Http/Controllers/Admin/GetLogsController.php +++ b/app/Server/Http/Controllers/Admin/GetLogsController.php @@ -3,7 +3,6 @@ namespace App\Server\Http\Controllers\Admin; use App\Contracts\LoggerRepository; -use App\Contracts\UserRepository; use App\Server\Configuration; use Illuminate\Http\Request; use Ratchet\ConnectionInterface; diff --git a/app/Server/Http/Controllers/Admin/GetLogsForSubdomainController.php b/app/Server/Http/Controllers/Admin/GetLogsForSubdomainController.php index c1bb2aa..aba3700 100644 --- a/app/Server/Http/Controllers/Admin/GetLogsForSubdomainController.php +++ b/app/Server/Http/Controllers/Admin/GetLogsForSubdomainController.php @@ -3,7 +3,6 @@ namespace App\Server\Http\Controllers\Admin; use App\Contracts\LoggerRepository; -use App\Contracts\UserRepository; use App\Server\Configuration; use Illuminate\Http\Request; use Ratchet\ConnectionInterface; diff --git a/app/Server/Http/Router.php b/app/Server/Http/Router.php index c9cf103..3ef7609 100644 --- a/app/Server/Http/Router.php +++ b/app/Server/Http/Router.php @@ -35,6 +35,7 @@ class Router implements HttpServerInterface /** * {@inheritdoc} + * * @throws \UnexpectedValueException If a controller is not \Ratchet\Http\HttpServerInterface */ public function onOpen(ConnectionInterface $conn, RequestInterface $request = null) diff --git a/app/Server/LoggerRepository/DatabaseLogger.php b/app/Server/LoggerRepository/DatabaseLogger.php index 1a4ba47..06a6d02 100644 --- a/app/Server/LoggerRepository/DatabaseLogger.php +++ b/app/Server/LoggerRepository/DatabaseLogger.php @@ -2,9 +2,9 @@ namespace App\Server\LoggerRepository; +use App\Contracts\LoggerRepository; use App\Contracts\UserRepository; use Clue\React\SQLite\DatabaseInterface; -use App\Contracts\LoggerRepository; use Clue\React\SQLite\Result; use React\Promise\Deferred; use React\Promise\PromiseInterface; @@ -45,7 +45,7 @@ class DatabaseLogger implements LoggerRepository $deferred = new Deferred(); $this->database - ->query(" + ->query(' SELECT logs.id AS log_id, logs.subdomain, @@ -53,7 +53,7 @@ class DatabaseLogger implements LoggerRepository FROM logs INNER JOIN users ON users.id = logs.user_id - WHERE logs.subdomain = :subdomain", ['subdomain' => $subdomain]) + WHERE logs.subdomain = :subdomain', ['subdomain' => $subdomain]) ->then(function (Result $result) use ($deferred) { $deferred->resolve($result->rows); }); @@ -66,14 +66,14 @@ class DatabaseLogger implements LoggerRepository $deferred = new Deferred(); $this->database - ->query(" + ->query(' SELECT logs.id AS log_id, logs.subdomain, users.* FROM logs INNER JOIN users - ON users.id = logs.user_id") + ON users.id = logs.user_id') ->then(function (Result $result) use ($deferred) { $deferred->resolve($result->rows); }); diff --git a/app/Server/LoggerRepository/NullLogger.php b/app/Server/LoggerRepository/NullLogger.php index d64fb4b..95b9d5d 100644 --- a/app/Server/LoggerRepository/NullLogger.php +++ b/app/Server/LoggerRepository/NullLogger.php @@ -3,7 +3,6 @@ namespace App\Server\LoggerRepository; use App\Contracts\LoggerRepository; -use Clue\React\SQLite\DatabaseInterface; use React\Promise\PromiseInterface; class NullLogger implements LoggerRepository