From 6c0aa790e504e305407f08859a462c37f19de597 Mon Sep 17 00:00:00 2001 From: Marcel Pociot Date: Fri, 21 May 2021 15:21:13 +0000 Subject: [PATCH] Apply fixes from StyleCI --- app/Commands/ServerAwareCommand.php | 5 ++--- app/Server/Http/Controllers/Admin/AdminController.php | 1 - app/Server/Http/Controllers/Admin/GetSitesController.php | 1 + .../Http/Controllers/Admin/GetTcpConnectionsController.php | 1 + app/Server/Http/Controllers/Admin/ListSitesController.php | 1 - .../Http/Controllers/Admin/ListTcpConnectionsController.php | 1 - app/Server/Http/Controllers/Admin/StoreUsersController.php | 1 - app/Server/UserRepository/DatabaseUserRepository.php | 1 - tests/Feature/Server/AdminTest.php | 3 --- 9 files changed, 4 insertions(+), 11 deletions(-) diff --git a/app/Commands/ServerAwareCommand.php b/app/Commands/ServerAwareCommand.php index c5346d1..b9ccf2e 100644 --- a/app/Commands/ServerAwareCommand.php +++ b/app/Commands/ServerAwareCommand.php @@ -45,7 +45,7 @@ abstract class ServerAwareCommand extends Command /** * Try to find the server in the servers array. * If no array exists at all (when upgrading from v1), - * always return sharedwithexpose.com + * always return sharedwithexpose.com. */ if (config('expose.servers') === null) { return static::DEFAULT_HOSTNAME; @@ -70,13 +70,12 @@ abstract class ServerAwareCommand extends Command /** * Try to find the server in the servers array. * If no array exists at all (when upgrading from v1), - * always return sharedwithexpose.com + * always return sharedwithexpose.com. */ if (config('expose.servers') === null) { return static::DEFAULT_PORT; } - $server = $this->option('server'); $host = config('expose.servers.'.$server.'.port'); diff --git a/app/Server/Http/Controllers/Admin/AdminController.php b/app/Server/Http/Controllers/Admin/AdminController.php index 28354d6..df16d23 100644 --- a/app/Server/Http/Controllers/Admin/AdminController.php +++ b/app/Server/Http/Controllers/Admin/AdminController.php @@ -5,7 +5,6 @@ namespace App\Server\Http\Controllers\Admin; use App\Http\Controllers\Controller; use GuzzleHttp\Psr7\Message; use GuzzleHttp\Psr7\Response; -use function GuzzleHttp\Psr7\str; use Illuminate\Http\Request; use Illuminate\Support\Str; use Ratchet\ConnectionInterface; diff --git a/app/Server/Http/Controllers/Admin/GetSitesController.php b/app/Server/Http/Controllers/Admin/GetSitesController.php index 9c23563..aac34bf 100644 --- a/app/Server/Http/Controllers/Admin/GetSitesController.php +++ b/app/Server/Http/Controllers/Admin/GetSitesController.php @@ -49,6 +49,7 @@ class GetSitesController extends AdminController $users = collect($users); $sites = collect($sites)->map(function ($site) use ($users) { $site['user'] = $users->firstWhere('auth_token', $site['auth_token']); + return $site; })->toArray(); diff --git a/app/Server/Http/Controllers/Admin/GetTcpConnectionsController.php b/app/Server/Http/Controllers/Admin/GetTcpConnectionsController.php index 53dba22..622b281 100644 --- a/app/Server/Http/Controllers/Admin/GetTcpConnectionsController.php +++ b/app/Server/Http/Controllers/Admin/GetTcpConnectionsController.php @@ -49,6 +49,7 @@ class GetTcpConnectionsController extends AdminController $users = collect($users); $connections = collect($connections)->map(function ($connection) use ($users) { $connection['user'] = $users->firstWhere('auth_token', $connection['auth_token']); + return $connection; })->toArray(); diff --git a/app/Server/Http/Controllers/Admin/ListSitesController.php b/app/Server/Http/Controllers/Admin/ListSitesController.php index bbc05a9..d9bb37d 100644 --- a/app/Server/Http/Controllers/Admin/ListSitesController.php +++ b/app/Server/Http/Controllers/Admin/ListSitesController.php @@ -4,7 +4,6 @@ namespace App\Server\Http\Controllers\Admin; use App\Contracts\ConnectionManager; use App\Server\Configuration; -use App\Server\Connections\ControlConnection; use Illuminate\Http\Request; use Ratchet\ConnectionInterface; diff --git a/app/Server/Http/Controllers/Admin/ListTcpConnectionsController.php b/app/Server/Http/Controllers/Admin/ListTcpConnectionsController.php index be755b0..cd9c6fb 100644 --- a/app/Server/Http/Controllers/Admin/ListTcpConnectionsController.php +++ b/app/Server/Http/Controllers/Admin/ListTcpConnectionsController.php @@ -4,7 +4,6 @@ namespace App\Server\Http\Controllers\Admin; use App\Contracts\ConnectionManager; use App\Server\Configuration; -use App\Server\Connections\TcpControlConnection; use Illuminate\Http\Request; use Ratchet\ConnectionInterface; diff --git a/app/Server/Http/Controllers/Admin/StoreUsersController.php b/app/Server/Http/Controllers/Admin/StoreUsersController.php index ab2986e..c17474f 100644 --- a/app/Server/Http/Controllers/Admin/StoreUsersController.php +++ b/app/Server/Http/Controllers/Admin/StoreUsersController.php @@ -3,7 +3,6 @@ namespace App\Server\Http\Controllers\Admin; use App\Contracts\UserRepository; -use function GuzzleHttp\Psr7\str; use Illuminate\Http\Request; use Illuminate\Support\Facades\Validator; use Illuminate\Support\Str; diff --git a/app/Server/UserRepository/DatabaseUserRepository.php b/app/Server/UserRepository/DatabaseUserRepository.php index 06536f6..e6b5f31 100644 --- a/app/Server/UserRepository/DatabaseUserRepository.php +++ b/app/Server/UserRepository/DatabaseUserRepository.php @@ -167,7 +167,6 @@ class DatabaseUserRepository implements UserRepository $this->database->query('SELECT * FROM users WHERE auth_token IN ('.$authTokenString.')') ->then(function (Result $result) use ($deferred) { - $users = collect($result->rows)->map(function ($user) { return $this->getUserDetails($user); })->toArray(); diff --git a/tests/Feature/Server/AdminTest.php b/tests/Feature/Server/AdminTest.php index f45d92f..ff9389a 100644 --- a/tests/Feature/Server/AdminTest.php +++ b/tests/Feature/Server/AdminTest.php @@ -2,15 +2,12 @@ namespace Tests\Feature\Server; -use App\Contracts\ConnectionManager; use App\Server\Factory; use Clue\React\Buzz\Browser; use Clue\React\Buzz\Message\ResponseException; use GuzzleHttp\Psr7\Response; use Illuminate\Support\Str; -use Nyholm\Psr7\Request; use Psr\Http\Message\ResponseInterface; -use Ratchet\Server\IoConnection; use Tests\Feature\TestCase; class AdminTest extends TestCase