Merge branch 'hotfix/zendframework#7137-zendframework#7005-phpenviron…

…ment-request-ignores-query-string-fix' Close zendframework#7137 Close zendframework#7005
ed-posinitskiy · Jan 19, 2015 · 7e704a7 · 7e704a7
2 parents 4513cc4 + e8cc3bf
commit 7e704a7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/library/Zend/Http/Request.php b/library/Zend/Http/Request.php
@@ -93,6 +93,13 @@ public static function fromString($string)
         $request->setMethod($matches['method']);
         $request->setUri($matches['uri']);
 
+        $parsedUri = parse_url($matches['uri']);
+        if (array_key_exists('query', $parsedUri)) {
+            $parsedQuery = array();
+            parse_str($parsedUri['query'], $parsedQuery);
+            $request->setQuery(new Parameters($parsedQuery));
+        }
+
         if (isset($matches['version'])) {
             $request->setVersion($matches['version']);
         }

diff --git a/tests/ZendTest/Http/RequestTest.php b/tests/ZendTest/Http/RequestTest.php
@@ -17,11 +17,12 @@ class RequestTest extends \PHPUnit_Framework_TestCase
 {
     public function testRequestFromStringFactoryCreatesValidRequest()
     {
-        $string = "GET /foo HTTP/1.1\r\n\r\nSome Content";
+        $string = "GET /foo?myparam=myvalue HTTP/1.1\r\n\r\nSome Content";
         $request = Request::fromString($string);
 
         $this->assertEquals(Request::METHOD_GET, $request->getMethod());
-        $this->assertEquals('/foo', $request->getUri());
+        $this->assertEquals('/foo?myparam=myvalue', $request->getUri());
+        $this->assertEquals('myvalue', $request->getQuery()->get('myparam'));
         $this->assertEquals(Request::VERSION_11, $request->getVersion());
         $this->assertEquals('Some Content', $request->getContent());
     }