Get rid of deprecated method calls

This commit is contained in:
Marcel Pociot
2021-05-19 12:10:13 +02:00
parent 96fa7c653f
commit c1f7125f72
9 changed files with 28 additions and 18 deletions

View File

@@ -4,6 +4,7 @@ namespace App\Client\Http\Controllers;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Logger\RequestLogger; use App\Logger\RequestLogger;
use GuzzleHttp\Psr7\Message;
use GuzzleHttp\Psr7\Response; use GuzzleHttp\Psr7\Response;
use function GuzzleHttp\Psr7\str; use function GuzzleHttp\Psr7\str;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@@ -28,11 +29,11 @@ class AttachDataToLogController extends Controller
$this->requestLogger->pushLoggedRequest($loggedRequest); $this->requestLogger->pushLoggedRequest($loggedRequest);
$httpConnection->send(str(new Response(200))); $httpConnection->send(Message::toString(new Response(200)));
return; return;
} }
$httpConnection->send(str(new Response(404))); $httpConnection->send(Message::toString(new Response(404)));
} }
} }

View File

@@ -3,6 +3,7 @@
namespace App\Client\Http\Controllers; namespace App\Client\Http\Controllers;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use GuzzleHttp\Psr7\Message;
use GuzzleHttp\Psr7\Response; use GuzzleHttp\Psr7\Response;
use function GuzzleHttp\Psr7\str; use function GuzzleHttp\Psr7\str;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@@ -20,7 +21,7 @@ class CreateTunnelController extends Controller
$httpConnection->send(respond_json($data)); $httpConnection->send(respond_json($data));
$httpConnection->close(); $httpConnection->close();
}, function () use ($httpConnection) { }, function () use ($httpConnection) {
$httpConnection->send(str(new Response(500))); $httpConnection->send(Message::toString(new Response(500)));
$httpConnection->close(); $httpConnection->close();
}); });
} }

View File

@@ -5,6 +5,7 @@ namespace App\Client\Http\Controllers;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\WebSockets\Socket; use App\WebSockets\Socket;
use Exception; use Exception;
use GuzzleHttp\Psr7\Message;
use GuzzleHttp\Psr7\Response; use GuzzleHttp\Psr7\Response;
use function GuzzleHttp\Psr7\str; use function GuzzleHttp\Psr7\str;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@@ -23,9 +24,9 @@ class PushLogsToDashboardController extends Controller
$webSocketConnection->send($request->getContent()); $webSocketConnection->send($request->getContent());
} }
$httpConnection->send(str(new Response(200))); $httpConnection->send(Message::toString(new Response(200)));
} catch (Exception $e) { } catch (Exception $e) {
$httpConnection->send(str(new Response(500, [], $e->getMessage()))); $httpConnection->send(Message::toString(new Response(500, [], $e->getMessage())));
} }
} }
} }

View File

@@ -6,6 +6,7 @@ use App\Client\Configuration;
use App\Client\Http\Modifiers\CheckBasicAuthentication; use App\Client\Http\Modifiers\CheckBasicAuthentication;
use App\Logger\RequestLogger; use App\Logger\RequestLogger;
use Clue\React\Buzz\Browser; use Clue\React\Buzz\Browser;
use GuzzleHttp\Psr7\Message;
use function GuzzleHttp\Psr7\parse_request; use function GuzzleHttp\Psr7\parse_request;
use function GuzzleHttp\Psr7\str; use function GuzzleHttp\Psr7\str;
use Laminas\Http\Request; use Laminas\Http\Request;
@@ -85,17 +86,19 @@ class HttpClient
protected function sendRequestToApplication(RequestInterface $request, $proxyConnection = null) protected function sendRequestToApplication(RequestInterface $request, $proxyConnection = null)
{ {
(new Browser($this->loop, $this->createConnector())) (new Browser($this->loop, $this->createConnector()))
->withOptions([ ->withFollowRedirects(true)
'followRedirects' => false, ->withRejectErrorResponse(false)
'obeySuccessCode' => false, ->requestStreaming(
'streaming' => true, $request->getMethod(),
]) $request->getUri(),
->send($request) $request->getHeaders(),
$request->getBody()
)
->then(function (ResponseInterface $response) use ($proxyConnection) { ->then(function (ResponseInterface $response) use ($proxyConnection) {
if (! isset($response->buffer)) { if (! isset($response->buffer)) {
$response = $this->rewriteResponseHeaders($response); $response = $this->rewriteResponseHeaders($response);
$response->buffer = str($response); $response->buffer = Message::toString($response);
} }
$this->sendChunkToServer($response->buffer, $proxyConnection); $this->sendChunkToServer($response->buffer, $proxyConnection);

View File

@@ -3,6 +3,7 @@
namespace App\Client\Http\Modifiers; namespace App\Client\Http\Modifiers;
use App\Client\Configuration; use App\Client\Configuration;
use GuzzleHttp\Psr7\Message;
use GuzzleHttp\Psr7\Response; use GuzzleHttp\Psr7\Response;
use function GuzzleHttp\Psr7\str; use function GuzzleHttp\Psr7\str;
use Illuminate\Support\Arr; use Illuminate\Support\Arr;
@@ -29,7 +30,7 @@ class CheckBasicAuthentication
if (is_null($username)) { if (is_null($username)) {
$proxyConnection->send( $proxyConnection->send(
str(new Response(401, [ Message::toString(new Response(401, [
'WWW-Authenticate' => 'Basic realm=Expose', 'WWW-Authenticate' => 'Basic realm=Expose',
], 'Unauthorized')) ], 'Unauthorized'))
); );

View File

@@ -3,6 +3,7 @@
namespace App\Server\Http\Controllers\Admin; namespace App\Server\Http\Controllers\Admin;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use GuzzleHttp\Psr7\Message;
use GuzzleHttp\Psr7\Response; use GuzzleHttp\Psr7\Response;
use function GuzzleHttp\Psr7\str; use function GuzzleHttp\Psr7\str;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@@ -24,7 +25,7 @@ abstract class AdminController extends Controller
return true; return true;
} catch (\Throwable $e) { } catch (\Throwable $e) {
$httpConnection->send(str(new Response(401, [ $httpConnection->send(Message::toString(new Response(401, [
'WWW-Authenticate' => 'Basic realm="Expose"', 'WWW-Authenticate' => 'Basic realm="Expose"',
]))); ])));
} }

View File

@@ -2,6 +2,7 @@
namespace App\Server\Http\Controllers\Admin; namespace App\Server\Http\Controllers\Admin;
use GuzzleHttp\Psr7\Message;
use GuzzleHttp\Psr7\Response; use GuzzleHttp\Psr7\Response;
use function GuzzleHttp\Psr7\str; use function GuzzleHttp\Psr7\str;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@@ -12,7 +13,7 @@ class RedirectToUsersController extends AdminController
{ {
public function handle(Request $request, ConnectionInterface $httpConnection) public function handle(Request $request, ConnectionInterface $httpConnection)
{ {
$httpConnection->send(str(new Response(301, [ $httpConnection->send(Message::toString(new Response(301, [
'Location' => '/sites', 'Location' => '/sites',
]))); ])));
} }

View File

@@ -1,11 +1,12 @@
<?php <?php
use GuzzleHttp\Psr7\Message;
use GuzzleHttp\Psr7\Response; use GuzzleHttp\Psr7\Response;
use function GuzzleHttp\Psr7\str; use function GuzzleHttp\Psr7\str;
function respond_json($responseData, int $statusCode = 200) function respond_json($responseData, int $statusCode = 200)
{ {
return str(new Response( return Message::toString(new Response(
$statusCode, $statusCode,
['Content-Type' => 'application/json'], ['Content-Type' => 'application/json'],
json_encode($responseData, JSON_INVALID_UTF8_IGNORE) json_encode($responseData, JSON_INVALID_UTF8_IGNORE)
@@ -14,7 +15,7 @@ function respond_json($responseData, int $statusCode = 200)
function respond_html(string $html, int $statusCode = 200) function respond_html(string $html, int $statusCode = 200)
{ {
return str(new Response( return Message::toString(new Response(
$statusCode, $statusCode,
['Content-Type' => 'text/html'], ['Content-Type' => 'text/html'],
$html $html

View File

@@ -36,7 +36,7 @@ return [
| |
| The DNS server to use when resolving the shared URLs. | The DNS server to use when resolving the shared URLs.
| When Expose is running from within Docker containers, you should set this to | When Expose is running from within Docker containers, you should set this to
| `true` to fall-back to the system default DNS servers. | `true` to fall-back to the system default DNS servers.
| |
*/ */
'dns' => '127.0.0.1', 'dns' => '127.0.0.1',