Merge branch 'prototype/mvc-module' of github.com:weierophinney/zf2 i…

…nto prototype/mvc-module

src/Http.php

@@ -172,12 +172,20 @@ protected function parseUserInfo()
         $this->setUser($user);
         $this->setPassword($password);
     }
-
+
+    /**
+     * Return the URI port
+     *
+     * If no port is set, will return the default port according to the scheme
+     *
+     * @return integer
+     * @see    Zend\Uri\Uri::getPort()
+     */
     public function getPort()
     {
         if (empty($this->port)) {
             if (array_key_exists($this->scheme, self::$defaultPorts)) {
-                $this->port= self::$defaultPorts[$this->scheme];
+                return self::$defaultPorts[$this->scheme];
             }
         }
         return $this->port;

test/HttpTest.php

@@ -199,5 +199,32 @@ public function testUserInfoCanOmitPassword()
         $this->assertEquals('example.com', $uri->getHost());
     }
 
+    public function testGetPortReturnsDefaultPortHttp()
+    {
+        $uri = new HttpUri('http://www.example.com/');
+        $this->assertEquals(80, $uri->getPort());
+    }
+
+    public function testGetPortReturnsDefaultPortHttps()
+    {
+        $uri = new HttpUri('https://www.example.com/');
+        $this->assertEquals(443, $uri->getPort());
+    }
+
+    public function testGetPortDoesntModifyUrlHttp()
+    {
+        $origUri = 'http://www.example.com/foo';
+        $uri = new HttpUri($origUri);
+        $uri->getPort();
+        $this->assertEquals($origUri, $uri->toString());
+    }
+
+    public function testGetPortDoesntModifyUrlHttps()
+    {
+        $origUri = 'https://www.example.com/foo';
+        $uri = new HttpUri($origUri);
+        $uri->getPort();
+        $this->assertEquals($origUri, $uri->toString());
+    }
 }