bitinflow/expose
1
0
Fork 0
mirror of https://github.com/bitinflow/expose.git synced 2026-03-18 07:55:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add PHP8 compatibility to v1.x (#177)

Browse Source 
* Add PHP8 compatible requirements
* Readd DNS to allow resolving local shared domains
This commit is contained in:
Marcel Pociot
2021-01-14 13:20:59 +01:00
committed by GitHub
parent ff232d9ef4
commit 2934731c7a
6 changed files with 2417 additions and 1564 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Client/Http/HttpClient.php
View File

@@ -66,6 +66,7 @@ class HttpClient
protected function createConnector(): Connector protected function createConnector(): Connector
{ {
return new Connector($this->loop, [ return new Connector($this->loop, [
'dns' => '127.0.0.1',
'tls' => [ 'tls' => [
'verify_peer' => false, 'verify_peer' => false,
'verify_peer_name' => false, 'verify_peer_name' => false,

45
composer.json
View File

@@ -16,36 +16,35 @@
} }
], ],
"require": { "require": {
"php": "^7.3.0", "php": "^7.3.0 || ^8.0",
"ext-json": "*", "ext-json": "*"
"padraic/phar-updater": "^1.0.6"
}, },
"require-dev": { "require-dev": {
"cboden/ratchet": "^0.4.2", "cboden/ratchet": "^0.4.3",
"clue/block-react": "^1.3", "clue/block-react": "^1.4",
"clue/buzz-react": "^2.7", "clue/buzz-react": "^2.7",
"clue/reactphp-sqlite": "dev-modular-worker-for-phar-support", "clue/reactphp-sqlite": "dev-modular-worker-for-phar-support",
"guzzlehttp/guzzle": "^6.5", "guzzlehttp/guzzle": "^7.2",
"guzzlehttp/psr7": "dev-master as 1.6.1", "guzzlehttp/psr7": "^1.7",
"illuminate/http": "5.8.* || ^6.0 || ^7.0", "illuminate/http": "5.8.* || ^6.0 || ^7.0 || ^8.0",
"illuminate/pipeline": "^7.6", "illuminate/pipeline": "^7.6 || ^8.0",
"illuminate/validation": "^7.7", "illuminate/validation": "^7.7 || ^8.0",
"laminas/laminas-http": "^2.11", "laminas/laminas-http": "^2.13",
"laravel-zero/framework": "^7.0", "laravel-zero/framework": "^8.2",
"mockery/mockery": "^1.3", "mockery/mockery": "^1.4.2",
"namshi/cuzzle": "^2.0", "octoper/cuzzle": "^3.0",
"nikic/php-parser": "^4.4", "nikic/php-parser": "^v4.10",
"nyholm/psr7": "^1.2", "nyholm/psr7": "^1.3",
"phpunit/phpunit": "^8.5", "phpunit/phpunit": "^9.4.3",
"ratchet/pawl": "^0.3.4", "ratchet/pawl": "^0.3.5",
"react/http": "^0.8.6", "react/http": "^1.1.0",
"react/socket": "dev-master as 1.1", "react/socket": "^1.6",
"react/stream": "^1.1.1", "react/stream": "^1.1.1",
"riverline/multipart-parser": "^2.0", "riverline/multipart-parser": "^2.0",
"symfony/expression-language": "^5.0", "symfony/expression-language": "^5.2",
"symfony/http-kernel": "^4.0 || ^5.0", "symfony/http-kernel": "^4.0 || ^5.2",
"symfony/psr-http-message-bridge": "^2.0", "symfony/psr-http-message-bridge": "^2.0",
"twig/twig": "^3.0" "twig/twig": "^3.1"
}, },
"config": { "config": {
"optimize-autoloader": true, "optimize-autoloader": true,

3913
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

2
tests/Feature/Server/TunnelTest.php
View File

@@ -135,7 +135,7 @@ class TunnelTest extends TestCase
protected function createTestHttpServer() protected function createTestHttpServer()
{ {
$server = new Server(function (ServerRequestInterface $request) { $server = new Server($this->loop, function (ServerRequestInterface $request) {
return new Response(200, ['Content-Type' => 'text/plain'], 'Hello World!'); return new Response(200, ['Content-Type' => 'text/plain'], 'Hello World!');
}); });

10
tests/Unit/LoggedRequestTest.php
View File

@@ -13,7 +13,7 @@ class LoggedRequestTest extends TestCase
/** @test */ /** @test */
public function it_retrieves_the_request_id() public function it_retrieves_the_request_id()
{ {
$rawRequest = str(new Request(200, '/expose', [ $rawRequest = str(new Request('GET', '/expose', [
'X-Expose-Request-ID' => 'example-request', 'X-Expose-Request-ID' => 'example-request',
])); ]));
$parsedRequest = LaminasRequest::fromString($rawRequest); $parsedRequest = LaminasRequest::fromString($rawRequest);
@@ -25,7 +25,7 @@ class LoggedRequestTest extends TestCase
/** @test */ /** @test */
public function it_retrieves_the_request_for_chrome_extensions() public function it_retrieves_the_request_for_chrome_extensions()
{ {
$rawRequest = str(new Request(200, '/expose', [ $rawRequest = str(new Request('GET', '/expose', [
'Origin' => 'chrome-extension://expose', 'Origin' => 'chrome-extension://expose',
'X-Expose-Request-ID' => 'example-request', 'X-Expose-Request-ID' => 'example-request',
])); ]));
@@ -43,7 +43,7 @@ class LoggedRequestTest extends TestCase
'project' => 'expose', 'project' => 'expose',
]; ];
$rawRequest = str(new Request(200, '/expose', [ $rawRequest = str(new Request('GET', '/expose', [
'Content-Type' => 'application/json', 'Content-Type' => 'application/json',
], json_encode($postData))); ], json_encode($postData)));
$parsedRequest = LaminasRequest::fromString($rawRequest); $parsedRequest = LaminasRequest::fromString($rawRequest);
@@ -65,7 +65,7 @@ class LoggedRequestTest extends TestCase
/** @test */ /** @test */
public function it_returns_the_raw_request() public function it_returns_the_raw_request()
{ {
$rawRequest = str(new Request(200, '/expose', [ $rawRequest = str(new Request('GET', '/expose', [
'X-Expose-Request-ID' => 'example-request', 'X-Expose-Request-ID' => 'example-request',
])); ]));
$parsedRequest = LaminasRequest::fromString($rawRequest); $parsedRequest = LaminasRequest::fromString($rawRequest);
@@ -77,7 +77,7 @@ class LoggedRequestTest extends TestCase
/** @test */ /** @test */
public function it_returns_the_parsed_request() public function it_returns_the_parsed_request()
{ {
$rawRequest = str(new Request(200, '/expose', [ $rawRequest = str(new Request('GET', '/expose', [
'X-Expose-Request-ID' => 'example-request', 'X-Expose-Request-ID' => 'example-request',
])); ]));
$parsedRequest = LaminasRequest::fromString($rawRequest); $parsedRequest = LaminasRequest::fromString($rawRequest);

10
tests/Unit/RequestLoggerTest.php
View File

@@ -24,7 +24,7 @@ class RequestLoggerTest extends TestCase
$cliLogger = m::mock(CliRequestLogger::class); $cliLogger = m::mock(CliRequestLogger::class);
$cliLogger->shouldReceive('logRequest')->once(); $cliLogger->shouldReceive('logRequest')->once();
$requestString = str(new Request(200, '/example')); $requestString = str(new Request('GET', '/example'));
$parsedRequest = LaminasRequest::fromString($requestString); $parsedRequest = LaminasRequest::fromString($requestString);
$logger = new RequestLogger($browser, $cliLogger); $logger = new RequestLogger($browser, $cliLogger);
@@ -42,7 +42,7 @@ class RequestLoggerTest extends TestCase
$cliLogger = m::mock(CliRequestLogger::class); $cliLogger = m::mock(CliRequestLogger::class);
$cliLogger->shouldReceive('logRequest')->once(); $cliLogger->shouldReceive('logRequest')->once();
$requestString = str(new Request(200, '/example')); $requestString = str(new Request('GET', '/example'));
$parsedRequest = LaminasRequest::fromString($requestString); $parsedRequest = LaminasRequest::fromString($requestString);
$logger = new RequestLogger($browser, $cliLogger); $logger = new RequestLogger($browser, $cliLogger);
@@ -64,7 +64,7 @@ class RequestLoggerTest extends TestCase
$cliLogger->shouldReceive('logRequest') $cliLogger->shouldReceive('logRequest')
->twice(); ->twice();
$requestString = str(new Request(200, '/example')); $requestString = str(new Request('GET', '/example'));
$parsedRequest = LaminasRequest::fromString($requestString); $parsedRequest = LaminasRequest::fromString($requestString);
$logger = new RequestLogger($browser, $cliLogger); $logger = new RequestLogger($browser, $cliLogger);
@@ -89,7 +89,7 @@ class RequestLoggerTest extends TestCase
$cliLogger = m::mock(CliRequestLogger::class); $cliLogger = m::mock(CliRequestLogger::class);
$cliLogger->shouldReceive('logRequest')->once(); $cliLogger->shouldReceive('logRequest')->once();
$requestString = str(new Request(200, '/example')); $requestString = str(new Request('GET', '/example'));
$parsedRequest = LaminasRequest::fromString($requestString); $parsedRequest = LaminasRequest::fromString($requestString);
$logger = new RequestLogger($browser, $cliLogger); $logger = new RequestLogger($browser, $cliLogger);
@@ -107,7 +107,7 @@ class RequestLoggerTest extends TestCase
$cliLogger = m::mock(CliRequestLogger::class); $cliLogger = m::mock(CliRequestLogger::class);
$cliLogger->shouldReceive('logRequest'); $cliLogger->shouldReceive('logRequest');
$requestString = str(new Request(200, '/example')); $requestString = str(new Request('GET', '/example'));
$parsedRequest = LaminasRequest::fromString($requestString); $parsedRequest = LaminasRequest::fromString($requestString);
$logger = new RequestLogger($browser, $cliLogger); $logger = new RequestLogger($browser, $cliLogger);