Do not convert TooManyRedirectsException

Author: Nyholm

src/Guzzle6HttpAdapter.php

@@ -8,7 +8,6 @@
  * For the full copyright and license information, please read the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace Http\Adapter;
 
 use GuzzleHttp\Client;
@@ -46,37 +45,46 @@ public function sendRequest(RequestInterface $request)
     {
         try {
             return $this->client->send($request);
-        } catch (Guzzle\RequestException $e) {
-            throw $this->handleRequestException($e);
-        } catch (Guzzle\GuzzleException $e) {
-            // Assert: $e instance of SeekException or TransferException
+        } catch (Guzzle\SeekException $e) {
             throw new RequestException($e->getMessage(), $request, $e);
+        } catch (Guzzle\TransferException $e) {
+            throw $this->handleTransferException($e);
         }
     }
 
     /**
      * Converts a Guzzle exception into an Httplug exception.
      *
-     * @param Guzzle\RequestException $exception
+     * @param Guzzle\TransferException $exception
      *
      * @return RequestException
      */
-    private function handleRequestException(Guzzle\RequestException $exception)
+    private function handleTransferException(Guzzle\TransferException $exception)
     {
-        if ($exception instanceof Guzzle\ConnectException || $exception instanceof Guzzle\TooManyRedirectsException) {
+        if ($exception instanceof Guzzle\ConnectException) {
             return new NetworkException($exception->getMessage(), $exception->getRequest(), $exception);
         }
 
-        // Make sure we have a response for the HttpException
-        if ($exception->hasResponse()) {
-            return new HttpException(
-                $exception->getMessage(),
-                $exception->getRequest(),
-                $exception->getResponse(),
-                $exception
-            );
+        if ($exception instanceof Guzzle\RequestException) {
+            // Make sure we have a response for the HttpException
+            if ($exception->hasResponse()) {
+                return new HttpException(
+                    $exception->getMessage(),
+                    $exception->getRequest(),
+                    $exception->getResponse(),
+                    $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);
         }
 
-        return new RequestException($exception->getMessage(), $exception->getRequest(), $exception);
+        return new TransferException($exception->getMessage(), 0, $exception);
     }
 }

tests/Guzzle6HttpAdapterExceptionTest.php

@@ -25,14 +25,14 @@ public function testGetException()
         $response = $this->getMock('Psr\Http\Message\ResponseInterface');
 
         $adapter = new Guzzle6HttpAdapter();
-        $method = new \ReflectionMethod('Http\Adapter\Guzzle6HttpAdapter', 'handleRequestException');
+        $method = new \ReflectionMethod('Http\Adapter\Guzzle6HttpAdapter', 'handleTransferException');
         $method->setAccessible(true);
 
         $outputException = $method->invoke($adapter, new Guzzle\ConnectException('foo', $request));
         $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('Http\Client\Exception\NetworkException', $outputException, "Guzzle's TooManyRedirectsException should be converted to a NetworkException");
+        $this->assertInstanceOf('GuzzleHttp\Exception\TooManyRedirectsException', $outputException, "Guzzle's TooManyRedirectsException should not be converted");
 
         $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");
@@ -46,6 +46,9 @@ public function testGetException()
         $outputException = $method->invoke($adapter, new Guzzle\ServerException('foo', $request, $response));
         $this->assertInstanceOf('Http\Client\Exception\HttpException', $outputException, "Guzzle's ServerException should be converted to a HttpException");
 
+        $outputException = $method->invoke($adapter, new Guzzle\TransferException('foo'));
+        $this->assertInstanceOf('Http\Client\Exception\TransferException', $outputException, "Guzzle's TransferException should be converted to a TransferException");
+
         /*
          * Test RequestException without response
          */