Fix NullResponseException tests.

wtfzdotnet · wtfzdotnet · commit 7cb86b8e1849 · 2016-10-16T03:49:17.000+02:00
diff --git a/lib/Tmdb/HttpClient/Adapter/GuzzleAdapter.php b/lib/Tmdb/HttpClient/Adapter/GuzzleAdapter.php
@@ -139,10 +139,8 @@ protected function handleRequestException(Request $request, RequestException $pr
     {
         if (null !== $previousException) {
             $response = $previousException->getResponse();
-            if(null == $response) {
-                throw new NullResponseException($this->request, $previousException);
-            }
-            if($response->getStatusCode() >= 500 && $response->getStatusCode() <= 599) {
+
+            if (null == $response || ($response->getStatusCode() >= 500 && $response->getStatusCode() <= 599)) {
                 throw new NullResponseException($this->request, $previousException);
             }
         }
diff --git a/test/Tmdb/Tests/HttpClient/Adapter/GuzzleAdapterTest.php b/test/Tmdb/Tests/HttpClient/Adapter/GuzzleAdapterTest.php
@@ -16,6 +16,7 @@
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
+use GuzzleHttp\Psr7\Stream;
 use Tmdb\ApiToken;
 use Tmdb\Exception\NullResponseException;
 use Tmdb\HttpClient\Adapter\GuzzleAdapter;
@@ -305,21 +306,21 @@ public function shouldThrowNullResponseException()
      */
     public function shouldThrowExceptionForServerError()
     {
-        $client = $this->getMock('GuzzleHttp\ClientInterface');
+        $client = $this->createMock('GuzzleHttp\ClientInterface');
 
         $client->expects($this->once())
-            ->method('get')
+            ->method('request')
             ->will($this->throwException(
                 new RequestException(
                     '500',
-                    new \GuzzleHttp\Message\Request('get', '/'),
-                    new \GuzzleHttp\Message\Response(500, [], Stream::factory('<html><body>Internal Server Error</body></html>'))
+                    new \GuzzleHttp\Psr7\Request('GET', '/'),
+                    new Response(500, [], '<html><body>Internal Server Error</body></html>')
                 )
             ))
         ;
 
         $adapter = new GuzzleAdapter($client);
-        $adapter->get(new Request());
+        $adapter->get(new Request('/'));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -139,10 +139,8 @@ protected function handleRequestException(Request $request, RequestException $pr`
`139`	`139`	`{`
`140`	`140`	`if (null !== $previousException) {`
`141`	`141`	`$response = $previousException->getResponse();`
`142`		`- if(null == $response) {`
`143`		`- throw new NullResponseException($this->request, $previousException);`
`144`		`- }`
`145`		`- if($response->getStatusCode() >= 500 && $response->getStatusCode() <= 599) {`
	`142`	`+`
	`143`	`+ if (null == $response \|\| ($response->getStatusCode() >= 500 && $response->getStatusCode() <= 599)) {`
`146`	`144`	`throw new NullResponseException($this->request, $previousException);`
`147`	`145`	`}`
`148`	`146`	`}`