YueMi-Development/cloudflare-php
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge pull request #24 from limenet/master

Browse Source 
Don't double JSON-encode the request
This commit is contained in:
Junade
2017-10-07 00:03:10 +01:00
committed by GitHub
parent ca80e2c388 70ee68f755
commit e1cf1ae41f
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Adapter/Guzzle.php
View File

@@ -67,13 +67,11 @@ class Guzzle implements Adapter
*/ */
public function put(String $uri, array $headers = [], array $body = []): ResponseInterface public function put(String $uri, array $headers = [], array $body = []): ResponseInterface
{ {
$jsonBody = json_encode($body);
$response = $this->client->put( $response = $this->client->put(
$uri, $uri,
[ [
'headers' => $headers, 'headers' => $headers,
'json' => $jsonBody 'json' => $body
] ]
); );
@@ -86,13 +84,11 @@ class Guzzle implements Adapter
*/ */
public function patch(String $uri, array $headers = [], array $body = []): ResponseInterface public function patch(String $uri, array $headers = [], array $body = []): ResponseInterface
{ {
$jsonBody = json_encode($body);
$response = $this->client->patch( $response = $this->client->patch(
$uri, $uri,
[ [
'headers' => $headers, 'headers' => $headers,
'json' => $jsonBody 'json' => $body
] ]
); );

4
tests/Adapter/GuzzleTest.php
View File

@@ -58,7 +58,7 @@ class GuzzleTest extends TestCase
$this->assertEquals("application/json", $headers["Content-Type"][0]); $this->assertEquals("application/json", $headers["Content-Type"][0]);
$body = json_decode($response->getBody()); $body = json_decode($response->getBody());
$this->assertEquals("Testing a PUT request.", json_decode($body->json)->{"X-Put-Test"}); $this->assertEquals("Testing a PUT request.", $body->json->{"X-Put-Test"});
} }
public function testPatch() public function testPatch()
@@ -73,7 +73,7 @@ class GuzzleTest extends TestCase
$this->assertEquals("application/json", $headers["Content-Type"][0]); $this->assertEquals("application/json", $headers["Content-Type"][0]);
$body = json_decode($response->getBody()); $body = json_decode($response->getBody());
$this->assertEquals("Testing a PATCH request.", json_decode($body->json)->{"X-Patch-Test"}); $this->assertEquals("Testing a PATCH request.", $body->json->{"X-Patch-Test"});
} }
public function testDelete() public function testDelete()