Merge remote-tracking branch 'upstream/master'

zendframework · Mar 13, 2013 · 21286c5 · 21286c5
commit 21286c5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/Http.php b/src/Http.php
@@ -33,7 +33,7 @@ class Http extends Uri
     /**
      * @see Uri::$validHostTypes
      */
-    protected $validHostTypes = self::HOST_DNS_OR_IPV4_OR_IPV6;
+    protected $validHostTypes = self::HOST_DNS_OR_IPV4_OR_IPV6_OR_REGNAME;
 
     /**
      * User name as provided in authority of URI

diff --git a/src/Uri.php b/src/Uri.php
@@ -42,6 +42,7 @@ class Uri implements UriInterface
     const HOST_DNS_OR_IPV4_OR_IPV6  = 0x0B; //01011
     const HOST_DNS_OR_IPVANY        = 0x0F; //01111
     const HOST_REGNAME              = 0x10; //10000
+    const HOST_DNS_OR_IPV4_OR_IPV6_OR_REGNAME = 0x13; //10011
     const HOST_ALL                  = 0x1F; //11111
 
     /**
@@ -359,17 +360,17 @@ public function toString()
         }
 
         if ($this->path) {
-            $uri .= self::encodePath($this->path);
+            $uri .= static::encodePath($this->path);
         } elseif ($this->host && ($this->query || $this->fragment)) {
             $uri .= '/';
         }
 
         if ($this->query) {
-            $uri .= "?" . self::encodeQueryFragment($this->query);
+            $uri .= "?" . static::encodeQueryFragment($this->query);
         }
 
         if ($this->fragment) {
-            $uri .= "#" . self::encodeQueryFragment($this->fragment);
+            $uri .= "#" . static::encodeQueryFragment($this->fragment);
         }
 
         return $uri;

diff --git a/test/HttpTest.php b/test/HttpTest.php
@@ -250,4 +250,10 @@ public function testGetPortDoesntModifyUrlHttps()
         $uri->getPort();
         $this->assertEquals($origUri, $uri->toString());
     }
+
+    public function testValidHostTypesWithUnderScore()
+    {
+        $uri = new HttpUri('http://zf2_app.local');
+        $this->assertTrue($uri->isValid());
+    }
 }