Merge branch 'fix-http-request-1' of https://github.com/cogitatio/zf2 …

…into hotfix/uri-host-validation
zendframework · May 4, 2012 · b98761f · b98761f
16 parents f02a226 + 00c4ac3 + 3f52720 + 5508474 + 49ed2f6 + d562686 + 67b42b2 + bdb1dae + 9809630 + 7304e37 + 752a5af + 8181c8f + 53bdac2 + c2f9414 + d0e7648 + a4fd52f
commit b98761f
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 8 deletions.
diff --git a/src/Request.php b/src/Request.php
@@ -175,10 +175,16 @@ public function getMethod()
     public function setUri($uri)
     {
         if (is_string($uri)) {
-            if (!\Zend\Uri\Uri::validateHost($uri)) {
-                throw new Exception\InvalidArgumentException('Invalid URI passed as string');
+            try {
+                $uri = new HttpUri($uri);
+            } catch (Exception\InvalidUriPartException $e) {
+                throw new Exception\InvalidArgumentException(
+                        sprintf('Invalid URI passed as string (%s)', (string) $uri),
+                        $e->getCode(),
+                        $e
+                );
             }
-        } elseif (!($uri instanceof \Zend\Uri\Http)) {
+        } elseif (!($uri instanceof HttpUri)) {
             throw new Exception\InvalidArgumentException('URI must be an instance of Zend\Uri\Http or a string');
         }
         $this->uri = $uri;

diff --git a/test/RequestTest.php b/test/RequestTest.php
@@ -82,14 +82,26 @@ public function testRequestCanAlwaysForcesUppecaseMethodName()
         $this->assertEquals('GET', $request->getMethod());
     }
 
-    public function testRequestCanSetAndRetrieveUri()
+    /**
+     * @dataProvider uriDataProvider
+     */
+    public function testRequestCanSetAndRetrieveUri($uri)
     {
         $request = new Request();
-        $request->setUri('/foo');
-        $this->assertEquals('/foo', $request->getUri());
+        $request->setUri($uri);
+        $this->assertEquals($uri, $request->getUri());
         $this->assertInstanceOf('Zend\Uri\Uri', $request->uri());
-        $this->assertEquals('/foo', $request->uri()->toString());
-        $this->assertEquals('/foo', $request->getUri());
+        $this->assertEquals($uri, $request->uri()->toString());
+        $this->assertEquals($uri, $request->getUri());
+    }
+
+    public function uriDataProvider()
+    {
+        return array(
+            array('/foo'),
+            array('/foo#test'),
+            array('/hello?what=true#noway')
+        );
     }
 
     public function testRequestSetUriWillThrowExceptionOnInvalidArgument()