From 0687b9ed8a08d2f9828b1fcc7882cd3071c61509 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
<skjnldsv@protonmail.com>
Date: Thu, 6 Feb 2020 18:13:04 +0100
Subject: [PATCH] [3rdparty] Bump guzzlehttp/guzzle from 6.3.3 to 6.5.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
3rdparty | 2 +-
tests/lib/Http/Client/ClientTest.php | 48 +++++++++++++-------------
tests/lib/Http/Client/ResponseTest.php | 4 +--
3 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/3rdparty b/3rdparty
index 7b4be1f0bf3..ad7f5526980 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 7b4be1f0bf34c520e5672c8a6fb79de27191a93b
+Subproject commit ad7f5526980028b68bc8dcca9a63efc9cae37562
diff --git a/tests/lib/Http/Client/ClientTest.php b/tests/lib/Http/Client/ClientTest.php
index 2a7bd6a185d..73cfb0bb6ca 100644
--- a/tests/lib/Http/Client/ClientTest.php
+++ b/tests/lib/Http/Client/ClientTest.php
@@ -122,8 +122,8 @@ class ClientTest extends \Test\TestCase {
$this->guzzleClient->method('request')
->with('get', 'http://localhost/', $this->defaultRequestOptions)
- ->willReturn(new Response(1337));
- $this->assertEquals(1337, $this->client->get('http://localhost/', [])->getStatusCode());
+ ->willReturn(new Response(418));
+ $this->assertEquals(418, $this->client->get('http://localhost/', [])->getStatusCode());
}
public function testGetWithOptions(): void {
@@ -136,8 +136,8 @@ class ClientTest extends \Test\TestCase {
$this->guzzleClient->method('request')
->with('get', 'http://localhost/', $options)
- ->willReturn(new Response(1337));
- $this->assertEquals(1337, $this->client->get('http://localhost/', $options)->getStatusCode());
+ ->willReturn(new Response(418));
+ $this->assertEquals(418, $this->client->get('http://localhost/', $options)->getStatusCode());
}
public function testPost(): void {
@@ -145,8 +145,8 @@ class ClientTest extends \Test\TestCase {
$this->guzzleClient->method('request')
->with('post', 'http://localhost/', $this->defaultRequestOptions)
- ->willReturn(new Response(1337));
- $this->assertEquals(1337, $this->client->post('http://localhost/', [])->getStatusCode());
+ ->willReturn(new Response(418));
+ $this->assertEquals(418, $this->client->post('http://localhost/', [])->getStatusCode());
}
public function testPostWithOptions(): void {
@@ -159,8 +159,8 @@ class ClientTest extends \Test\TestCase {
$this->guzzleClient->method('request')
->with('post', 'http://localhost/', $options)
- ->willReturn(new Response(1337));
- $this->assertEquals(1337, $this->client->post('http://localhost/', $options)->getStatusCode());
+ ->willReturn(new Response(418));
+ $this->assertEquals(418, $this->client->post('http://localhost/', $options)->getStatusCode());
}
public function testPut(): void {
@@ -168,8 +168,8 @@ class ClientTest extends \Test\TestCase {
$this->guzzleClient->method('request')
->with('put', 'http://localhost/', $this->defaultRequestOptions)
- ->willReturn(new Response(1337));
- $this->assertEquals(1337, $this->client->put('http://localhost/', [])->getStatusCode());
+ ->willReturn(new Response(418));
+ $this->assertEquals(418, $this->client->put('http://localhost/', [])->getStatusCode());
}
public function testPutWithOptions(): void {
@@ -182,8 +182,8 @@ class ClientTest extends \Test\TestCase {
$this->guzzleClient->method('request')
->with('put', 'http://localhost/', $options)
- ->willReturn(new Response(1337));
- $this->assertEquals(1337, $this->client->put('http://localhost/', $options)->getStatusCode());
+ ->willReturn(new Response(418));
+ $this->assertEquals(418, $this->client->put('http://localhost/', $options)->getStatusCode());
}
public function testDelete(): void {
@@ -191,8 +191,8 @@ class ClientTest extends \Test\TestCase {
$this->guzzleClient->method('request')
->with('delete', 'http://localhost/', $this->defaultRequestOptions)
- ->willReturn(new Response(1337));
- $this->assertEquals(1337, $this->client->delete('http://localhost/', [])->getStatusCode());
+ ->willReturn(new Response(418));
+ $this->assertEquals(418, $this->client->delete('http://localhost/', [])->getStatusCode());
}
public function testDeleteWithOptions(): void {
@@ -205,8 +205,8 @@ class ClientTest extends \Test\TestCase {
$this->guzzleClient->method('request')
->with('delete', 'http://localhost/', $options)
- ->willReturn(new Response(1337));
- $this->assertEquals(1337, $this->client->delete('http://localhost/', $options)->getStatusCode());
+ ->willReturn(new Response(418));
+ $this->assertEquals(418, $this->client->delete('http://localhost/', $options)->getStatusCode());
}
public function testOptions(): void {
@@ -214,8 +214,8 @@ class ClientTest extends \Test\TestCase {
$this->guzzleClient->method('request')
->with('options', 'http://localhost/', $this->defaultRequestOptions)
- ->willReturn(new Response(1337));
- $this->assertEquals(1337, $this->client->options('http://localhost/', [])->getStatusCode());
+ ->willReturn(new Response(418));
+ $this->assertEquals(418, $this->client->options('http://localhost/', [])->getStatusCode());
}
public function testOptionsWithOptions(): void {
@@ -228,8 +228,8 @@ class ClientTest extends \Test\TestCase {
$this->guzzleClient->method('request')
->with('options', 'http://localhost/', $options)
- ->willReturn(new Response(1337));
- $this->assertEquals(1337, $this->client->options('http://localhost/', $options)->getStatusCode());
+ ->willReturn(new Response(418));
+ $this->assertEquals(418, $this->client->options('http://localhost/', $options)->getStatusCode());
}
public function testHead(): void {
@@ -237,8 +237,8 @@ class ClientTest extends \Test\TestCase {
$this->guzzleClient->method('request')
->with('head', 'http://localhost/', $this->defaultRequestOptions)
- ->willReturn(new Response(1337));
- $this->assertEquals(1337, $this->client->head('http://localhost/', [])->getStatusCode());
+ ->willReturn(new Response(418));
+ $this->assertEquals(418, $this->client->head('http://localhost/', [])->getStatusCode());
}
public function testHeadWithOptions(): void {
@@ -251,8 +251,8 @@ class ClientTest extends \Test\TestCase {
$this->guzzleClient->method('request')
->with('head', 'http://localhost/', $options)
- ->willReturn(new Response(1337));
- $this->assertEquals(1337, $this->client->head('http://localhost/', $options)->getStatusCode());
+ ->willReturn(new Response(418));
+ $this->assertEquals(418, $this->client->head('http://localhost/', $options)->getStatusCode());
}
public function testSetDefaultOptionsWithNotInstalled(): void {
diff --git a/tests/lib/Http/Client/ResponseTest.php b/tests/lib/Http/Client/ResponseTest.php
index 963a3eb8179..f8f520d6a73 100644
--- a/tests/lib/Http/Client/ResponseTest.php
+++ b/tests/lib/Http/Client/ResponseTest.php
@@ -21,7 +21,7 @@ class ResponseTest extends \Test\TestCase {
protected function setUp(): void {
parent::setUp();
- $this->guzzleResponse = new GuzzleResponse(1337);
+ $this->guzzleResponse = new GuzzleResponse(418);
}
public function testGetBody() {
@@ -31,7 +31,7 @@ class ResponseTest extends \Test\TestCase {
public function testGetStatusCode() {
$response = new Response($this->guzzleResponse);
- $this->assertSame(1337, $response->getStatusCode());
+ $this->assertSame(418, $response->getStatusCode());
}
public function testGetHeader() {
--
GitLab