TooManyRedirectsException is converted to a Network error

Author: Nyholm

src/Guzzle6HttpAdapter.php

@@ -61,7 +61,7 @@ public function sendRequest(RequestInterface $request)
      */
     private function handleTransferException(Guzzle\TransferException $exception)
     {
-        if ($exception instanceof Guzzle\ConnectException) {
+        if ($exception instanceof Guzzle\ConnectException || $exception instanceof Guzzle\TooManyRedirectsException) {
             return new NetworkException($exception->getMessage(), $exception->getRequest(), $exception);
         }
 
@@ -76,12 +76,6 @@ private function handleTransferException(Guzzle\TransferException $exception)
                 );
             }
 
-            if ($exception instanceof Guzzle\TooManyRedirectsException) {
-                // Do not convert TooManyRedirectsException
-                return $exception;
-                //return new HttpException($exception->getMessage(), $exception->getRequest(), null, $exception);
-            }
-
             return new RequestException($exception->getMessage(), $exception->getRequest(), $exception);
         }
 

tests/Guzzle6HttpAdapterExceptionTest.php

@@ -32,7 +32,7 @@ public function testGetException()
         $this->assertInstanceOf('Http\Client\Exception\NetworkException', $outputException, "Guzzle's ConnectException should be converted to a NetworkException");
 
         $outputException = $method->invoke($adapter, new Guzzle\TooManyRedirectsException('foo', $request));
-        $this->assertInstanceOf('GuzzleHttp\Exception\TooManyRedirectsException', $outputException, "Guzzle's TooManyRedirectsException should not be converted");
+        $this->assertInstanceOf('Http\Client\Exception\NetworkException', $outputException, "Guzzle's TooManyRedirectsException should be converted to a NetworkException");
 
         $outputException = $method->invoke($adapter, new Guzzle\RequestException('foo', $request, $response));
         $this->assertInstanceOf('Http\Client\Exception\HttpException', $outputException, "Guzzle's RequestException should be converted to a HttpException");