diff --git a/app/Client/Factory.php b/app/Client/Factory.php index 0b01e76..467a61d 100644 --- a/app/Client/Factory.php +++ b/app/Client/Factory.php @@ -140,7 +140,7 @@ class Factory $this->router->post('/api/logs/{request_id}/data', AttachDataToLogController::class); $this->router->get('/api/logs/clear', ClearLogsController::class); - $this->app->route('/socket', new WsServer(new Socket()), ['*'], ""); + $this->app->route('/socket', new WsServer(new Socket()), ['*'], ''); foreach ($this->router->getRoutes()->all() as $name => $route) { $this->app->routes->add($name, $route); diff --git a/app/Client/Fileserver/ConnectionHandler.php b/app/Client/Fileserver/ConnectionHandler.php index 9a01d17..5337a67 100644 --- a/app/Client/Fileserver/ConnectionHandler.php +++ b/app/Client/Fileserver/ConnectionHandler.php @@ -88,7 +88,8 @@ class ConnectionHandler } if ($this->name !== '') { - $filter = new class(basename($targetPath), [$this->name]) extends FilenameFilterIterator { + $filter = new class(basename($targetPath), [$this->name]) extends FilenameFilterIterator + { protected $filename; public function __construct(string $filename, array $matchPatterns) diff --git a/app/Client/Http/Controllers/AttachDataToLogController.php b/app/Client/Http/Controllers/AttachDataToLogController.php index 439ec6a..fc56433 100644 --- a/app/Client/Http/Controllers/AttachDataToLogController.php +++ b/app/Client/Http/Controllers/AttachDataToLogController.php @@ -6,7 +6,6 @@ use App\Http\Controllers\Controller; use App\Logger\RequestLogger; use GuzzleHttp\Psr7\Message; use GuzzleHttp\Psr7\Response; -use function GuzzleHttp\Psr7\str; use Illuminate\Http\Request; use Ratchet\ConnectionInterface; diff --git a/app/Client/Http/Controllers/CreateTunnelController.php b/app/Client/Http/Controllers/CreateTunnelController.php index 610d624..e4d1051 100644 --- a/app/Client/Http/Controllers/CreateTunnelController.php +++ b/app/Client/Http/Controllers/CreateTunnelController.php @@ -5,7 +5,6 @@ namespace App\Client\Http\Controllers; use App\Http\Controllers\Controller; use GuzzleHttp\Psr7\Message; use GuzzleHttp\Psr7\Response; -use function GuzzleHttp\Psr7\str; use Illuminate\Http\Request; use Ratchet\ConnectionInterface; diff --git a/app/Client/Http/Controllers/PushLogsToDashboardController.php b/app/Client/Http/Controllers/PushLogsToDashboardController.php index b3b41b1..d829bc7 100644 --- a/app/Client/Http/Controllers/PushLogsToDashboardController.php +++ b/app/Client/Http/Controllers/PushLogsToDashboardController.php @@ -7,7 +7,6 @@ use App\WebSockets\Socket; use Exception; use GuzzleHttp\Psr7\Message; use GuzzleHttp\Psr7\Response; -use function GuzzleHttp\Psr7\str; use Illuminate\Http\Request; use Ratchet\ConnectionInterface; diff --git a/app/Client/Http/Controllers/ReplayLogController.php b/app/Client/Http/Controllers/ReplayLogController.php index 583fb8b..5d329de 100644 --- a/app/Client/Http/Controllers/ReplayLogController.php +++ b/app/Client/Http/Controllers/ReplayLogController.php @@ -4,13 +4,9 @@ namespace App\Client\Http\Controllers; use App\Client\Http\HttpClient; use App\Http\Controllers\Controller; -use App\Logger\LoggedRequest; use App\Logger\RequestLogger; use GuzzleHttp\Psr7\Message; use GuzzleHttp\Psr7\Response; -use Illuminate\Support\Str; -use Laminas\Http\Header\GenericHeader; -use function GuzzleHttp\Psr7\str; use Illuminate\Http\Request; use Ratchet\ConnectionInterface; diff --git a/app/Client/Http/Modifiers/CheckBasicAuthentication.php b/app/Client/Http/Modifiers/CheckBasicAuthentication.php index c0f69a4..4e0addb 100644 --- a/app/Client/Http/Modifiers/CheckBasicAuthentication.php +++ b/app/Client/Http/Modifiers/CheckBasicAuthentication.php @@ -5,7 +5,6 @@ namespace App\Client\Http\Modifiers; use App\Client\Configuration; use GuzzleHttp\Psr7\Message; use GuzzleHttp\Psr7\Response; -use function GuzzleHttp\Psr7\str; use Illuminate\Support\Arr; use Psr\Http\Message\RequestInterface; use Ratchet\Client\WebSocket; diff --git a/app/Commands/ServerAwareCommand.php b/app/Commands/ServerAwareCommand.php index 317ad9f..5ccb8e4 100644 --- a/app/Commands/ServerAwareCommand.php +++ b/app/Commands/ServerAwareCommand.php @@ -5,7 +5,6 @@ namespace App\Commands; use App\Logger\CliRequestLogger; use Illuminate\Console\Parser; use LaravelZero\Framework\Commands\Command; -use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\ConsoleOutput; abstract class ServerAwareCommand extends Command diff --git a/app/Commands/ShareCommand.php b/app/Commands/ShareCommand.php index e1bc360..452f809 100644 --- a/app/Commands/ShareCommand.php +++ b/app/Commands/ShareCommand.php @@ -3,9 +3,7 @@ namespace App\Commands; use App\Client\Factory; -use App\Logger\CliRequestLogger; use React\EventLoop\LoopInterface; -use Symfony\Component\Console\Output\ConsoleOutput; class ShareCommand extends ServerAwareCommand { diff --git a/app/Commands/ShareFilesCommand.php b/app/Commands/ShareFilesCommand.php index 43cf6da..f29781f 100644 --- a/app/Commands/ShareFilesCommand.php +++ b/app/Commands/ShareFilesCommand.php @@ -3,10 +3,7 @@ namespace App\Commands; use App\Client\Factory; -use App\Logger\CliRequestLogger; -use LaravelZero\Framework\Commands\Command; use React\EventLoop\LoopInterface; -use Symfony\Component\Console\Output\ConsoleOutput; class ShareFilesCommand extends ServerAwareCommand { diff --git a/app/Logger/LoggedRequest.php b/app/Logger/LoggedRequest.php index 7cdf073..8ef568d 100644 --- a/app/Logger/LoggedRequest.php +++ b/app/Logger/LoggedRequest.php @@ -3,10 +3,10 @@ namespace App\Logger; use Carbon\Carbon; -use Laminas\Http\Header\GenericHeader; use function GuzzleHttp\Psr7\parse_request; use Illuminate\Support\Arr; use Illuminate\Support\Str; +use Laminas\Http\Header\GenericHeader; use Laminas\Http\Request; use Laminas\Http\Response; use Namshi\Cuzzle\Formatter\CurlFormatter; diff --git a/app/Server/Http/Controllers/Admin/RedirectToUsersController.php b/app/Server/Http/Controllers/Admin/RedirectToUsersController.php index e12be8c..5ae4c61 100644 --- a/app/Server/Http/Controllers/Admin/RedirectToUsersController.php +++ b/app/Server/Http/Controllers/Admin/RedirectToUsersController.php @@ -4,9 +4,7 @@ namespace App\Server\Http\Controllers\Admin; use GuzzleHttp\Psr7\Message; use GuzzleHttp\Psr7\Response; -use function GuzzleHttp\Psr7\str; use Illuminate\Http\Request; -use Illuminate\Support\Str; use Ratchet\ConnectionInterface; class RedirectToUsersController extends AdminController diff --git a/app/helpers.php b/app/helpers.php index 35441d3..bf63daf 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -2,7 +2,6 @@ use GuzzleHttp\Psr7\Message; use GuzzleHttp\Psr7\Response; -use function GuzzleHttp\Psr7\str; function respond_json($responseData, int $statusCode = 200) { diff --git a/tests/Feature/Client/DashboardTest.php b/tests/Feature/Client/DashboardTest.php index 42f6103..2b8de51 100755 --- a/tests/Feature/Client/DashboardTest.php +++ b/tests/Feature/Client/DashboardTest.php @@ -11,8 +11,8 @@ use Clue\React\Buzz\Browser; use Clue\React\Buzz\Message\ResponseException; use GuzzleHttp\Psr7\Message; use GuzzleHttp\Psr7\Request; -use Illuminate\Support\Arr; use function GuzzleHttp\Psr7\str; +use Illuminate\Support\Arr; use Mockery as m; use Psr\Http\Message\RequestInterface; use Psr\Http\Message\ResponseInterface; @@ -67,6 +67,7 @@ class DashboardTest extends TestCase ->once() ->withArgs(function ($arg) { $sentRequest = Message::parseMessage($arg); + return Arr::get($sentRequest, 'start-line') === 'GET /example HTTP/1.1'; });