Merge pull request #2349 from baspeeters/fix/travis-errors

Fix failing builds (adaptation to PSR7 and Travis updates)

.travis.yml

@@ -3,7 +3,6 @@ language: php
 sudo: false
 
 php:
-  - 5.5
   - 5.6
   - 7.0
   - 7.1
@@ -25,7 +24,9 @@ matrix:
     - php: hhvm
       dist: trusty
     - php: nightly
-  include: 
+  include:
+    - php: 5.5
+      dist: trusty
     - php: hhvm
       dist: trusty
   fast_finish: true

src/RedirectMiddleware.php

@@ -186,7 +186,7 @@ class RedirectMiddleware
         if ($options['allow_redirects']['referer']
             && $modify['uri']->getScheme() === $request->getUri()->getScheme()
         ) {
-            $uri = $request->getUri()->withUserInfo('', '');
+            $uri = $request->getUri()->withUserInfo('');
             $modify['set_headers']['Referer'] = (string) $uri;
         } else {
             $modify['remove_headers'][] = 'Referer';

tests/Exception/RequestExceptionTest.php

@@ -60,18 +60,27 @@ class RequestExceptionTest extends TestCase
 
     public function testCreatesGenericErrorResponseException()
     {
-        $e = RequestException::create(new Request('GET', '/'), new Response(600));
+        $e = RequestException::create(new Request('GET', '/'), new Response(300));
         $this->assertContains(
             'GET /',
             $e->getMessage()
         );
         $this->assertContains(
-            '600 ',
+            '300 ',
             $e->getMessage()
         );
         $this->assertInstanceOf('GuzzleHttp\Exception\RequestException', $e);
     }
 
+    /**
+     * @expectedException InvalidArgumentException
+     * @expectedExceptionMessage Status code must be an integer value between 1xx and 5xx.
+     */
+    public function testThrowsInvalidArgumentExceptionOnOutOfBoundsResponseCode()
+    {
+        throw RequestException::create(new Request('GET', '/'), new Response(600));
+    }
+
     public function dataPrintableResponses()
     {
         return [

tests/MiddlewareTest.php

@@ -26,7 +26,7 @@ class MiddlewareTest extends TestCase
             [
                 function (RequestInterface $request) {
                     return new Response(200, [
-                        'Set-Cookie' => new SetCookie([
+                        'Set-Cookie' => (string) new SetCookie([
                             'Name'   => 'name',
                             'Value'  => 'value',
                             'Domain' => 'foo.com'

tests/RedirectMiddlewareTest.php

@@ -132,6 +132,26 @@ class RedirectMiddlewareTest extends TestCase
         );
     }
 
+    public function testAddsRefererHeaderButClearsUserInfo()
+    {
+        $mock = new MockHandler([
+            new Response(302, ['Location' => 'http://test.com']),
+            new Response(200)
+        ]);
+        $stack = new HandlerStack($mock);
+        $stack->push(Middleware::redirect());
+        $handler = $stack->resolve();
+        $request = new Request('GET', 'http://foo:bar@example.com?a=b');
+        $promise = $handler($request, [
+            'allow_redirects' => ['max' => 2, 'referer' => true]
+        ]);
+        $promise->wait();
+        $this->assertSame(
+            'http://example.com?a=b',
+            $mock->getLastRequest()->getHeaderLine('Referer')
+        );
+    }
+
     public function testAddsGuzzleRedirectHeader()
     {
         $mock = new MockHandler([