Merge branch 'master' of github.com:beyondcode/phunnel

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);

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)

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;
 

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;
 

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;
 

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;
 

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;

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

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
 {

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
 {

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;

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

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)
 {

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';
             });