Skip to content
Snippets Groups Projects
Unverified Commit ea67d391 authored by Roeland Jago Douma's avatar Roeland Jago Douma Committed by GitHub
Browse files

Merge pull request #19323 from nextcloud/3rdparty/composer/guzzlehttp/guzzle-6.5.2 

[3rdparty] Bump guzzlehttp/guzzle from 6.3.3 to 6.5.2
parents b943e014 0687b9ed
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
3rdparty @ ad7f5526
Compare 7b4be1f0...ad7f5526
Subproject commit 7b4be1f0bf34c520e5672c8a6fb79de27191a93b Subproject commit ad7f5526980028b68bc8dcca9a63efc9cae37562
tests/lib/Http/Client/ClientTest.php
+ 24
− 24
View file @ ea67d391
...@@ -122,8 +122,8 @@ class ClientTest extends \Test\TestCase { ...@@ -122,8 +122,8 @@ class ClientTest extends \Test\TestCase {
$this->guzzleClient->method('request') $this->guzzleClient->method('request')
->with('get', 'http://localhost/', $this->defaultRequestOptions) ->with('get', 'http://localhost/', $this->defaultRequestOptions)
->willReturn(new Response(1337)); ->willReturn(new Response(418));
$this->assertEquals(1337, $this->client->get('http://localhost/', [])->getStatusCode()); $this->assertEquals(418, $this->client->get('http://localhost/', [])->getStatusCode());
} }
public function testGetWithOptions(): void { public function testGetWithOptions(): void {
...@@ -136,8 +136,8 @@ class ClientTest extends \Test\TestCase { ...@@ -136,8 +136,8 @@ class ClientTest extends \Test\TestCase {
$this->guzzleClient->method('request') $this->guzzleClient->method('request')
->with('get', 'http://localhost/', $options) ->with('get', 'http://localhost/', $options)
->willReturn(new Response(1337)); ->willReturn(new Response(418));
$this->assertEquals(1337, $this->client->get('http://localhost/', $options)->getStatusCode()); $this->assertEquals(418, $this->client->get('http://localhost/', $options)->getStatusCode());
} }
public function testPost(): void { public function testPost(): void {
...@@ -145,8 +145,8 @@ class ClientTest extends \Test\TestCase { ...@@ -145,8 +145,8 @@ class ClientTest extends \Test\TestCase {
$this->guzzleClient->method('request') $this->guzzleClient->method('request')
->with('post', 'http://localhost/', $this->defaultRequestOptions) ->with('post', 'http://localhost/', $this->defaultRequestOptions)
->willReturn(new Response(1337)); ->willReturn(new Response(418));
$this->assertEquals(1337, $this->client->post('http://localhost/', [])->getStatusCode()); $this->assertEquals(418, $this->client->post('http://localhost/', [])->getStatusCode());
} }
public function testPostWithOptions(): void { public function testPostWithOptions(): void {
...@@ -159,8 +159,8 @@ class ClientTest extends \Test\TestCase { ...@@ -159,8 +159,8 @@ class ClientTest extends \Test\TestCase {
$this->guzzleClient->method('request') $this->guzzleClient->method('request')
->with('post', 'http://localhost/', $options) ->with('post', 'http://localhost/', $options)
->willReturn(new Response(1337)); ->willReturn(new Response(418));
$this->assertEquals(1337, $this->client->post('http://localhost/', $options)->getStatusCode()); $this->assertEquals(418, $this->client->post('http://localhost/', $options)->getStatusCode());
} }
public function testPut(): void { public function testPut(): void {
...@@ -168,8 +168,8 @@ class ClientTest extends \Test\TestCase { ...@@ -168,8 +168,8 @@ class ClientTest extends \Test\TestCase {
$this->guzzleClient->method('request') $this->guzzleClient->method('request')
->with('put', 'http://localhost/', $this->defaultRequestOptions) ->with('put', 'http://localhost/', $this->defaultRequestOptions)
->willReturn(new Response(1337)); ->willReturn(new Response(418));
$this->assertEquals(1337, $this->client->put('http://localhost/', [])->getStatusCode()); $this->assertEquals(418, $this->client->put('http://localhost/', [])->getStatusCode());
} }
public function testPutWithOptions(): void { public function testPutWithOptions(): void {
...@@ -182,8 +182,8 @@ class ClientTest extends \Test\TestCase { ...@@ -182,8 +182,8 @@ class ClientTest extends \Test\TestCase {
$this->guzzleClient->method('request') $this->guzzleClient->method('request')
->with('put', 'http://localhost/', $options) ->with('put', 'http://localhost/', $options)
->willReturn(new Response(1337)); ->willReturn(new Response(418));
$this->assertEquals(1337, $this->client->put('http://localhost/', $options)->getStatusCode()); $this->assertEquals(418, $this->client->put('http://localhost/', $options)->getStatusCode());
} }
public function testDelete(): void { public function testDelete(): void {
...@@ -191,8 +191,8 @@ class ClientTest extends \Test\TestCase { ...@@ -191,8 +191,8 @@ class ClientTest extends \Test\TestCase {
$this->guzzleClient->method('request') $this->guzzleClient->method('request')
->with('delete', 'http://localhost/', $this->defaultRequestOptions) ->with('delete', 'http://localhost/', $this->defaultRequestOptions)
->willReturn(new Response(1337)); ->willReturn(new Response(418));
$this->assertEquals(1337, $this->client->delete('http://localhost/', [])->getStatusCode()); $this->assertEquals(418, $this->client->delete('http://localhost/', [])->getStatusCode());
} }
public function testDeleteWithOptions(): void { public function testDeleteWithOptions(): void {
...@@ -205,8 +205,8 @@ class ClientTest extends \Test\TestCase { ...@@ -205,8 +205,8 @@ class ClientTest extends \Test\TestCase {
$this->guzzleClient->method('request') $this->guzzleClient->method('request')
->with('delete', 'http://localhost/', $options) ->with('delete', 'http://localhost/', $options)
->willReturn(new Response(1337)); ->willReturn(new Response(418));
$this->assertEquals(1337, $this->client->delete('http://localhost/', $options)->getStatusCode()); $this->assertEquals(418, $this->client->delete('http://localhost/', $options)->getStatusCode());
} }
public function testOptions(): void { public function testOptions(): void {
...@@ -214,8 +214,8 @@ class ClientTest extends \Test\TestCase { ...@@ -214,8 +214,8 @@ class ClientTest extends \Test\TestCase {
$this->guzzleClient->method('request') $this->guzzleClient->method('request')
->with('options', 'http://localhost/', $this->defaultRequestOptions) ->with('options', 'http://localhost/', $this->defaultRequestOptions)
->willReturn(new Response(1337)); ->willReturn(new Response(418));
$this->assertEquals(1337, $this->client->options('http://localhost/', [])->getStatusCode()); $this->assertEquals(418, $this->client->options('http://localhost/', [])->getStatusCode());
} }
public function testOptionsWithOptions(): void { public function testOptionsWithOptions(): void {
...@@ -228,8 +228,8 @@ class ClientTest extends \Test\TestCase { ...@@ -228,8 +228,8 @@ class ClientTest extends \Test\TestCase {
$this->guzzleClient->method('request') $this->guzzleClient->method('request')
->with('options', 'http://localhost/', $options) ->with('options', 'http://localhost/', $options)
->willReturn(new Response(1337)); ->willReturn(new Response(418));
$this->assertEquals(1337, $this->client->options('http://localhost/', $options)->getStatusCode()); $this->assertEquals(418, $this->client->options('http://localhost/', $options)->getStatusCode());
} }
public function testHead(): void { public function testHead(): void {
...@@ -237,8 +237,8 @@ class ClientTest extends \Test\TestCase { ...@@ -237,8 +237,8 @@ class ClientTest extends \Test\TestCase {
$this->guzzleClient->method('request') $this->guzzleClient->method('request')
->with('head', 'http://localhost/', $this->defaultRequestOptions) ->with('head', 'http://localhost/', $this->defaultRequestOptions)
->willReturn(new Response(1337)); ->willReturn(new Response(418));
$this->assertEquals(1337, $this->client->head('http://localhost/', [])->getStatusCode()); $this->assertEquals(418, $this->client->head('http://localhost/', [])->getStatusCode());
} }
public function testHeadWithOptions(): void { public function testHeadWithOptions(): void {
...@@ -251,8 +251,8 @@ class ClientTest extends \Test\TestCase { ...@@ -251,8 +251,8 @@ class ClientTest extends \Test\TestCase {
$this->guzzleClient->method('request') $this->guzzleClient->method('request')
->with('head', 'http://localhost/', $options) ->with('head', 'http://localhost/', $options)
->willReturn(new Response(1337)); ->willReturn(new Response(418));
$this->assertEquals(1337, $this->client->head('http://localhost/', $options)->getStatusCode()); $this->assertEquals(418, $this->client->head('http://localhost/', $options)->getStatusCode());
} }
public function testSetDefaultOptionsWithNotInstalled(): void { public function testSetDefaultOptionsWithNotInstalled(): void {
......
tests/lib/Http/Client/ResponseTest.php
+ 2
− 2
View file @ ea67d391
...@@ -21,7 +21,7 @@ class ResponseTest extends \Test\TestCase { ...@@ -21,7 +21,7 @@ class ResponseTest extends \Test\TestCase {
protected function setUp(): void { protected function setUp(): void {
parent::setUp(); parent::setUp();
$this->guzzleResponse = new GuzzleResponse(1337); $this->guzzleResponse = new GuzzleResponse(418);
} }
public function testGetBody() { public function testGetBody() {
...@@ -31,7 +31,7 @@ class ResponseTest extends \Test\TestCase { ...@@ -31,7 +31,7 @@ class ResponseTest extends \Test\TestCase {
public function testGetStatusCode() { public function testGetStatusCode() {
$response = new Response($this->guzzleResponse); $response = new Response($this->guzzleResponse);
$this->assertSame(1337, $response->getStatusCode()); $this->assertSame(418, $response->getStatusCode());
} }
public function testGetHeader() { public function testGetHeader() {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment