Merge branch 'master' into hotfix/ZF-3821

Conflicts: tests/Zend/InfoCard/XmlParsingTest.php
zendframework · Aug 26, 2011 · 6279a0a · 6279a0a
commit 6279a0a
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 2 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,14 @@ protected function parseUserInfo()
         $this->setUser($user);
         $this->setPassword($password);
     }
+
+    public function getPort()
+    {
+        if (empty($this->port)) {
+            if (array_key_exists($this->scheme, self::$defaultPorts)) {
+                $this->port= 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);
             }
 

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;
     }
 
     /**