Merge pull request #221 from php-http/fix-redirect-host

redirection to different domain must not keep previous port

Author: dbu

.github/workflows/static.yml

@@ -2,6 +2,8 @@ name: static
 
 on:
   push:
+      branches:
+          - master
   pull_request:
 
 jobs:
@@ -19,3 +21,16 @@ jobs:
           REQUIRE_DEV: false
         with:
           args: analyze --no-progress
+
+  php-cs-fixer:
+      name: PHP-CS-Fixer
+      runs-on: ubuntu-latest
+
+      steps:
+          - name: Checkout code
+            uses: actions/checkout@v2
+
+          - name: PHP-CS-Fixer
+            uses: docker://oskarstark/php-cs-fixer-ga
+            with:
+                args: --dry-run --diff

.github/workflows/tests.yml

@@ -2,6 +2,8 @@ name: tests
 
 on:
   push:
+      branches:
+          - master
   pull_request:
 
 jobs:

.gitignore

@@ -1,5 +1,5 @@
-/.php_cs
-/.php_cs.cache
+/.php-cs-fixer.php
+/.php-cs-fixer.cache
 /behat.yml
 /build/
 /composer.lock

.php-cs-fixer.dist.php

@@ -0,0 +1,18 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__.'/src')
+    ->in(__DIR__.'/tests')
+    ->name('*.php')
+;
+
+$config = new PhpCsFixer\Config();
+
+return $config
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@Symfony' => true,
+        'single_line_throw' => false,
+    ])
+    ->setFinder($finder)
+;

CHANGELOG.md

@@ -4,7 +4,8 @@
 
 ### Fixed
 
-- Fixes false positive circular detection in RedirectPlugin in cases when target location does not contain path
+- [RedirectPlugin] Fixed handling of redirection to different domain with default port
+- [RedirectPlugin] Fixed false positive circular detection in RedirectPlugin in cases when target location does not contain path
 
 ## 2.5.0 - 2021-11-26
 

spec/Plugin/RedirectPluginSpec.php

@@ -506,54 +506,4 @@ public function it_throws_circular_redirection_exception_on_alternating_redirect
         $promise->shouldReturnAnInstanceOf(HttpRejectedPromise::class);
         $promise->shouldThrow(CircularRedirectionException::class)->duringWait();
     }
-
-    public function it_redirects_http_to_https(
-        UriInterface $uri,
-        UriInterface $uriRedirect,
-        RequestInterface $request,
-        ResponseInterface $responseRedirect,
-        RequestInterface $modifiedRequest,
-        ResponseInterface $finalResponse,
-        Promise $promise
-    ) {
-        $responseRedirect->getStatusCode()->willReturn(302);
-        $responseRedirect->hasHeader('Location')->willReturn(true);
-        $responseRedirect->getHeaderLine('Location')->willReturn('https://my-site.com/original');
-
-        $request->getUri()->willReturn($uri);
-        $request->withUri($uriRedirect)->willReturn($modifiedRequest);
-        $uri->__toString()->willReturn('http://my-site.com/original');
-        $uri->withPath('/original')->willReturn($uri);
-        $uri->withFragment('')->willReturn($uri);
-        $uri->withQuery('')->willReturn($uri);
-
-        $uri->withScheme('https')->willReturn($uriRedirect);
-        $uriRedirect->withHost('my-site.com')->willReturn($uriRedirect);
-        $uriRedirect->withPath('/original')->willReturn($uriRedirect);
-        $uriRedirect->withFragment('')->willReturn($uriRedirect);
-        $uriRedirect->withQuery('')->willReturn($uriRedirect);
-        $uriRedirect->__toString()->willReturn('https://my-site.com/original');
-
-        $modifiedRequest->getUri()->willReturn($uriRedirect);
-        $modifiedRequest->getMethod()->willReturn('GET');
-
-        $next = function (RequestInterface $receivedRequest) use ($request, $responseRedirect) {
-            if (Argument::is($request->getWrappedObject())->scoreArgument($receivedRequest)) {
-                return new HttpFulfilledPromise($responseRedirect->getWrappedObject());
-            }
-        };
-
-        $first = function (RequestInterface $receivedRequest) use ($modifiedRequest, $promise) {
-            if (Argument::is($modifiedRequest->getWrappedObject())->scoreArgument($receivedRequest)) {
-                return $promise->getWrappedObject();
-            }
-        };
-
-        $promise->getState()->willReturn(Promise::FULFILLED);
-        $promise->wait()->shouldBeCalled()->willReturn($finalResponse);
-
-        $finalPromise = $this->handleRequest($request, $next, $first);
-        $finalPromise->shouldReturnAnInstanceOf(HttpFulfilledPromise::class);
-        $finalPromise->wait()->shouldReturn($finalResponse);
-    }
 }

src/Deferred.php

@@ -146,7 +146,10 @@ public function wait($unwrap = true)
             return $this->value;
         }
 
-        /** @var ClientExceptionInterface */
+        if (null === $this->failure) {
+            throw new \RuntimeException('Internal Error: Promise is not fulfilled but has no exception stored');
+        }
+
         throw $this->failure;
     }
 }

src/HttpClientPool/HttpClientPool.php

@@ -46,9 +46,9 @@ public function addHttpClient($client): void
     /**
      * Return an http client given a specific strategy.
      *
-     * @throws HttpClientNotFoundException When no http client has been found into the pool
-     *
      * @return HttpClientPoolItem Return a http client that can do both sync or async
+     *
+     * @throws HttpClientNotFoundException When no http client has been found into the pool
      */
     abstract protected function chooseHttpClient(): HttpClientPoolItem;
 

src/Plugin/AddHostPlugin.php

@@ -31,7 +31,7 @@ final class AddHostPlugin implements Plugin
      * @param array{'replace'?: bool} $config
      *
      * Configuration options:
-     *   - replace: True will replace all hosts, false will only add host when none is specified.
+     *   - replace: True will replace all hosts, false will only add host when none is specified
      */
     public function __construct(UriInterface $host, array $config = [])
     {

src/Plugin/AddPathPlugin.php

@@ -70,7 +70,7 @@ public function handleRequest(RequestInterface $request, callable $next, callabl
         if (substr($path, 0, strlen($prepend)) !== $prepend) {
             $request = $request->withUri($request->getUri()
                  ->withPath($prepend.$path)
-             );
+            );
         }
 
         return $next($request);