Merge branch 'master' of git://git.zendframework.com/zf

zendframework · Sep 20, 2011 · 2186cf3 · 2186cf3
commit 2186cf3
Show file tree

Hide file tree

Showing 11 changed files with 48 additions and 3 deletions.
diff --git a/src/Exception.php b/src/Exception.php
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
diff --git a/src/Exception/InvalidUriException.php b/src/Exception/InvalidUriException.php
diff --git a/src/Exception/InvalidUriPartException.php b/src/Exception/InvalidUriPartException.php
diff --git a/src/Exception/InvalidUriTypeException.php b/src/Exception/InvalidUriTypeException.php
diff --git a/src/File.php b/src/File.php
diff --git a/src/Http.php b/src/Http.php
@@ -172,4 +172,22 @@ 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)) {
+                return self::$defaultPorts[$this->scheme];
+            }
+        }
+        return $this->port;
+    }
 }
diff --git a/src/Mailto.php b/src/Mailto.php
diff --git a/src/Uri.php b/src/Uri.php
@@ -242,7 +242,7 @@ public function parse($uri)
                 $port = substr($authority, $colonPos + 1);
                 if ($port) {
                     $this->setPort((int) $port);
-                }
+                } 
                 $authority = substr($authority, 0, $colonPos);
             }
 
@@ -1063,7 +1063,7 @@ public static function removePathDotSegments($path)
      */
     public static function merge($baseUri, $relativeUri)
     {
-        $uri = new self($relativeUri);
+        $uri = new static($relativeUri);
         return $uri->resolve($baseUri);
     }
 

diff --git a/src/UriFactory.php b/src/UriFactory.php
@@ -70,7 +70,7 @@ abstract class UriFactory
     static public function registerScheme($scheme, $class)
     {
         $scheme = strtolower($scheme);
-        static::$_schemeClasses[$scheme] = $class;
+        static::$schemeClasses[$scheme] = $class;
     }
 
     /**

diff --git a/test/HttpTest.php b/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());
+    }
 }