Merge branch 'hotfix/4893'

Close zendframework/zendframework#4893
zendframework · Aug 19, 2013 · 6bd62cc · 6bd62cc
commit 6bd62cc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/Request.php b/src/Request.php
@@ -93,7 +93,7 @@ public static function fromString($string)
         $request->setMethod($matches['method']);
         $request->setUri($matches['uri']);
 
-        if ($matches['version']) {
+        if (isset($matches['version'])) {
             $request->setVersion($matches['version']);
         }
 

diff --git a/test/RequestTest.php b/test/RequestTest.php
@@ -229,6 +229,16 @@ public function testRequestIsFlashRequest()
         $this->assertTrue($request->isFlashRequest());
     }
 
+    /**
+     * @group 4893
+     */
+    public function testRequestsWithoutHttpVersionAreOK()
+    {
+        $requestString = "GET http://www.domain.com/index.php";
+        $request = Request::fromString($requestString);
+        $this->assertEquals($request::METHOD_GET, $request->getMethod());
+    }
+
     /**
      * PHPUNIT DATA PROVIDER
      *