@@ -58,6 +58,7 @@ public function testGetRequest()
5858 $ this ->assertSame (['application/json ' ], $ headers ['content-type ' ]);
5959
6060 $ body = json_decode ($ response ->getContent (), true );
61+ $ this ->assertSame ($ body , $ response ->toArray ());
6162
6263 $ this ->assertSame ('HTTP/1.1 ' , $ body ['SERVER_PROTOCOL ' ]);
6364 $ this ->assertSame ('/ ' , $ body ['REQUEST_URI ' ]);
@@ -79,7 +80,7 @@ public function testNonBufferedGetRequest()
7980 'headers ' => ['Foo ' => 'baR ' ],
8081 ]);
8182
82- $ body = json_decode ( $ response ->getContent (), true );
83+ $ body = $ response ->toArray ( );
8384 $ this ->assertSame ('baR ' , $ body ['HTTP_FOO ' ]);
8485
8586 $ this ->expectException (TransportExceptionInterface::class);
@@ -106,7 +107,7 @@ public function testHttpVersion()
106107 $ this ->assertSame (200 , $ response ->getStatusCode ());
107108 $ this ->assertSame ('HTTP/1.0 200 OK ' , $ response ->getInfo ('raw_headers ' )[0 ]);
108109
109- $ body = json_decode ( $ response ->getContent (), true );
110+ $ body = $ response ->toArray ( );
110111
111112 $ this ->assertSame ('HTTP/1.0 ' , $ body ['SERVER_PROTOCOL ' ]);
112113 $ this ->assertSame ('GET ' , $ body ['REQUEST_METHOD ' ]);
@@ -203,7 +204,7 @@ public function testInlineAuth()
203204 $ client = $ this ->getHttpClient ();
204205 $ response = $ client ->request ('GET ' , 'http://foo:bar%3Dbar@localhost:8057 ' );
205206
206- $ body = json_decode ( $ response ->getContent (), true );
207+ $ body = $ response ->toArray ( );
207208
208209 $ this ->assertSame ('foo ' , $ body ['PHP_AUTH_USER ' ]);
209210 $ this ->assertSame ('bar=bar ' , $ body ['PHP_AUTH_PW ' ]);
@@ -219,7 +220,7 @@ public function testRedirects()
219220 },
220221 ]);
221222
222- $ body = json_decode ( $ response ->getContent (), true );
223+ $ body = $ response ->toArray ( );
223224 $ this ->assertSame ('GET ' , $ body ['REQUEST_METHOD ' ]);
224225 $ this ->assertSame ('Basic Zm9vOmJhcg== ' , $ body ['HTTP_AUTHORIZATION ' ]);
225226 $ this ->assertSame ('http://localhost:8057/ ' , $ response ->getInfo ('url ' ));
@@ -250,7 +251,8 @@ public function testRelativeRedirects()
250251 $ client = $ this ->getHttpClient ();
251252 $ response = $ client ->request ('GET ' , 'http://localhost:8057/302/relative ' );
252253
253- $ body = json_decode ($ response ->getContent (), true );
254+ $ body = $ response ->toArray ();
255+
254256 $ this ->assertSame ('/ ' , $ body ['REQUEST_URI ' ]);
255257 $ this ->assertNull ($ response ->getInfo ('redirect_url ' ));
256258
@@ -279,7 +281,7 @@ public function testRedirect307()
279281 'body ' => 'foo=bar ' ,
280282 ]);
281283
282- $ body = json_decode ( $ response ->getContent (), true );
284+ $ body = $ response ->toArray ( );
283285
284286 $ this ->assertSame (['foo ' => 'bar ' , 'REQUEST_METHOD ' => 'POST ' ], $ body );
285287 }
@@ -388,7 +390,7 @@ public function testOnProgress()
388390 'on_progress ' => function (...$ state ) use (&$ steps ) { $ steps [] = $ state ; },
389391 ]);
390392
391- $ body = json_decode ( $ response ->getContent (), true );
393+ $ body = $ response ->toArray ( );
392394
393395 $ this ->assertSame (['foo ' => '0123456789 ' , 'REQUEST_METHOD ' => 'POST ' ], $ body );
394396 $ this ->assertSame ([0 , 0 ], \array_slice ($ steps [0 ], 0 , 2 ));
@@ -405,7 +407,7 @@ public function testPostArray()
405407 'body ' => ['foo ' => 'bar ' ],
406408 ]);
407409
408- $ this ->assertSame (['foo ' => 'bar ' , 'REQUEST_METHOD ' => 'POST ' ], json_decode ( $ response ->getContent (), true ));
410+ $ this ->assertSame (['foo ' => 'bar ' , 'REQUEST_METHOD ' => 'POST ' ], $ response ->toArray ( ));
409411 }
410412
411413 public function testPostResource ()
@@ -420,7 +422,7 @@ public function testPostResource()
420422 'body ' => $ h ,
421423 ]);
422424
423- $ body = json_decode ( $ response ->getContent (), true );
425+ $ body = $ response ->toArray ( );
424426
425427 $ this ->assertSame (['foo ' => '0123456789 ' , 'REQUEST_METHOD ' => 'POST ' ], $ body );
426428 }
@@ -438,7 +440,7 @@ public function testPostCallback()
438440 },
439441 ]);
440442
441- $ this ->assertSame (['foo ' => '0123456789 ' , 'REQUEST_METHOD ' => 'POST ' ], json_decode ( $ response ->getContent (), true ));
443+ $ this ->assertSame (['foo ' => '0123456789 ' , 'REQUEST_METHOD ' => 'POST ' ], $ response ->toArray ( ));
442444 }
443445
444446 public function testOnProgressCancel ()
@@ -581,15 +583,15 @@ public function testProxy()
581583 'proxy ' => 'http://localhost:8057 ' ,
582584 ]);
583585
584- $ body = json_decode ( $ response ->getContent (), true );
586+ $ body = $ response ->toArray ( );
585587 $ this ->assertSame ('localhost:8057 ' , $ body ['HTTP_HOST ' ]);
586588 $ this ->assertRegexp ('#^http://(localhost|127\.0\.0\.1):8057/$# ' , $ body ['REQUEST_URI ' ]);
587589
588590 $ response = $ client ->request ('GET ' , 'http://localhost:8057/ ' , [
589591 'proxy ' => 'http://foo:b%3Dar@localhost:8057 ' ,
590592 ]);
591593
592- $ body = json_decode ( $ response ->getContent (), true );
594+ $ body = $ response ->toArray ( );
593595 $ this ->assertSame ('Basic Zm9vOmI9YXI= ' , $ body ['HTTP_PROXY_AUTHORIZATION ' ]);
594596 }
595597
@@ -603,7 +605,7 @@ public function testNoProxy()
603605 'proxy ' => 'http://localhost:8057 ' ,
604606 ]);
605607
606- $ body = json_decode ( $ response ->getContent (), true );
608+ $ body = $ response ->toArray ( );
607609
608610 $ this ->assertSame ('HTTP/1.1 ' , $ body ['SERVER_PROTOCOL ' ]);
609611 $ this ->assertSame ('/ ' , $ body ['REQUEST_URI ' ]);
@@ -629,7 +631,7 @@ public function testAutoEncodingRequest()
629631 $ this ->assertSame (['Accept-Encoding ' ], $ headers ['vary ' ]);
630632 $ this ->assertContains ('gzip ' , $ headers ['content-encoding ' ][0 ]);
631633
632- $ body = json_decode ( $ response ->getContent (), true );
634+ $ body = $ response ->toArray ( );
633635
634636 $ this ->assertContains ('gzip ' , $ body ['HTTP_ACCEPT_ENCODING ' ]);
635637 }
@@ -652,7 +654,7 @@ public function testQuery()
652654 'query ' => ['b ' => 'b ' ],
653655 ]);
654656
655- $ body = json_decode ( $ response ->getContent (), true );
657+ $ body = $ response ->toArray ( );
656658 $ this ->assertSame ('GET ' , $ body ['REQUEST_METHOD ' ]);
657659 $ this ->assertSame ('/?a=a&b=b ' , $ body ['REQUEST_URI ' ]);
658660 }
@@ -673,10 +675,9 @@ public function testUserlandEncodingRequest()
673675 $ this ->assertContains ('gzip ' , $ headers ['content-encoding ' ][0 ]);
674676
675677 $ body = $ response ->getContent ();
676-
677678 $ this ->assertSame ("\x1F" , $ body [0 ]);
678- $ body = json_decode (gzdecode ($ body ), true );
679679
680+ $ body = json_decode (gzdecode ($ body ), true );
680681 $ this ->assertSame ('gzip ' , $ body ['HTTP_ACCEPT_ENCODING ' ]);
681682 }
682683
0 commit comments