Merge branch 'hotfix/149'

Close #149
Fixes #36

Author: weierophinney

CHANGELOG.md

@@ -22,6 +22,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
+- [#149](https://github.com/zendframework/zend-http/pull/149) provides fixes to `Client::setUri()` to ensure its status as a relative
+  or absolute URI is correctly memoized.
+
 - [#162](https://github.com/zendframework/zend-http/pull/162) fixes a typo in an exception message raised within `Cookies::fromString()`.
 
 - [#121](https://github.com/zendframework/zend-http/pull/121) adds detection for non-numeric connection timeout values as well as

src/Client.php

@@ -324,14 +324,18 @@ public function setUri($uri)
                 $this->clearAuth();
             }
 
+            $uri = $this->getUri();
+            $user = $uri->getUser();
+            $password = $uri->getPassword();
+
             // Set auth if username and password has been specified in the uri
-            if ($this->getUri()->getUser() && $this->getUri()->getPassword()) {
-                $this->setAuth($this->getUri()->getUser(), $this->getUri()->getPassword());
+            if ($user && $password) {
+                $this->setAuth($user, $password);
             }
 
             // We have no ports, set the defaults
-            if (! $this->getUri()->getPort()) {
-                $this->getUri()->setPort(($this->getUri()->getScheme() == 'https' ? 443 : 80));
+            if (! $uri->getPort() && $uri->isAbsolute()) {
+                $uri->setPort($uri->getScheme() === 'https' ? 443 : 80);
             }
         }
         return $this;
@@ -901,8 +905,8 @@ public function send(Request $request = null)
                 }
             }
             // If we have no ports, set the defaults
-            if (! $uri->getPort()) {
-                $uri->setPort($uri->getScheme() == 'https' ? 443 : 80);
+            if (! $uri->getPort() && $uri->isAbsolute()) {
+                $uri->setPort($uri->getScheme() === 'https' ? 443 : 80);
             }
 
             // method

test/ClientTest.php

@@ -524,4 +524,59 @@ public function testFormUrlEncodeSeparator()
         $rawRequest = $client->getLastRawRequest();
         $this->assertContains('foo=bar&baz=foo', $rawRequest);
     }
+
+    public function uriDataProvider()
+    {
+        return [
+            'valid-relative' => ['/example', true],
+            'invalid-absolute' => ['http://localhost/example', false],
+        ];
+    }
+
+    /**
+     * @dataProvider uriDataProvider
+     */
+    public function testUriCorrectlyDeterminesWhetherOrNotItIsAValidRelativeUri($uri, $isValidRelativeURI)
+    {
+        $client = new Client($uri);
+        $this->assertSame($isValidRelativeURI, $client->getUri()->isValidRelative());
+
+        $client->setAdapter(Test::class);
+        $client->send();
+        $this->assertSame($isValidRelativeURI, $client->getUri()->isValidRelative());
+    }
+
+    public function portChangeDataProvider()
+    {
+        return [
+            'default-https' => ['https://localhost/example', 443],
+            'default-http' => ['http://localhost/example', 80]
+        ];
+    }
+
+    /**
+     * @dataProvider portChangeDataProvider
+     */
+    public function testUriPortIsSetToAppropriateDefaultValueWhenAnUriOmittingThePortIsProvided($absoluteURI, $port)
+    {
+        $client = new Client();
+        $client->getUri()->setPort(null);
+
+        $client->setUri($absoluteURI);
+        $this->assertSame($port, $client->getUri()->getPort());
+
+        $client->setAdapter(Test::class);
+        $client->send();
+        $this->assertSame($port, $client->getUri()->getPort());
+    }
+
+    public function testUriPortIsNotSetWhenUriIsRelative()
+    {
+        $client = new Client('/example');
+        $this->assertNull($client->getUri()->getPort());
+
+        $client->setAdapter(Test::class);
+        $client->send();
+        $this->assertNull($client->getUri()->getPort());
+    }
 }