Apply suggestions from code review by @SimonFrings

Co-authored-by: Simon Frings <[email protected]>

Author: dinooo13

src/Io/Transaction.php

@@ -264,28 +264,23 @@ private function onResponseRedirect(ResponseInterface $response, RequestInterfac
      */
     private function makeRedirectRequest(RequestInterface $request, UriInterface $location, $statusCode)
     {
-        $originalHost = $request->getUri()->getHost();
-        $request = $request->withoutHeader('Host')->withUri($location);
-
-        if (!$this->isTemporaryOrPermanentRedirect($statusCode)) {
-            $request = $request
-                ->withoutHeader('Content-Type')
-                ->withoutHeader('Content-Length');
-        }
 
         // Remove authorization if changing hostnames (but not if just changing ports or protocols).
+        $originalHost = $request->getUri()->getHost();
         if ($location->getHost() !== $originalHost) {
             $request = $request->withoutHeader('Authorization');
         }
 
-        if ($this->isTemporaryOrPermanentRedirect($statusCode)) {
+        if ($statusCode === Response::STATUS_TEMPORARY_REDIRECT || $statusCode === Response::STATUS_PERMANENT_REDIRECT) {
             if ($request->getBody() instanceof ReadableStreamInterface) {
                 throw new \RuntimeException('Unable to redirect request with streaming body');
             }
         } else {
-            // naïve approach..
-            $method = ($request->getMethod() === 'HEAD') ? 'HEAD' : 'GET';
-            $request = $request->withMethod($method)->withBody(new EmptyBodyStream());
+            $request = $request
+                ->withMethod($request->getMethod() === 'HEAD' ? 'HEAD' : 'GET')
+                ->withoutHeader('Content-Type')
+                ->withoutHeader('Content-Length')
+                ->withBody(new EmptyBodyStream());
         }
 
         return $request;
@@ -311,14 +306,4 @@ private function progress($name, array $args = array())
         echo PHP_EOL;
     }
 
-    /**
-     * @param $statusCode
-     * @return bool
-     */
-    public function isTemporaryOrPermanentRedirect($statusCode)
-    {
-        return
-            $statusCode === Response::STATUS_TEMPORARY_REDIRECT
-            || $statusCode === Response::STATUS_PERMANENT_REDIRECT;
-    }
 }

tests/Io/TransactionTest.php

@@ -768,8 +768,13 @@ public function testRedirectingStreamingBodyWith307Or308ShouldThrowCantRedirectS
         $transaction = new Transaction($sender, $loop);
         $promise = $transaction->send($request);
 
-        $this->setExpectedException('RuntimeException', 'Unable to redirect request with streaming body');
-        \React\Async\await($promise, $loop);
+        $exception = null;
+        $promise->then(null, function ($reason) use (&$exception) {
+            $exception = $reason;
+        });
+
+        assert($exception instanceof RuntimeException);
+        $this->assertEquals('Unable to redirect request with streaming body', $exception->getMessage());
     }
 
     public function testCancelTransactionWillCancelRequest()