Merge branch 'hotfix/4089'

Close zendframework/zendframework#4089
zendframework · Mar 28, 2013 · 157b3a0 · 157b3a0
commit 157b3a0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/PHPUnit/Controller/AbstractControllerTestCase.php b/src/PHPUnit/Controller/AbstractControllerTestCase.php
@@ -233,6 +233,7 @@ function(&$item, $key) { $item = $key . '=' . $item; }
         $request->setQuery(new Parameters($query));
         $request->setPost(new Parameters($post));
         $request->setUri($uri);
+        $request->setRequestUri($uri->getPath());
 
         return $this;
     }

diff --git a/test/PHPUnit/Controller/AbstractControllerTestCaseTest.php b/test/PHPUnit/Controller/AbstractControllerTestCaseTest.php
@@ -233,4 +233,10 @@ public function testAssertApplicationErrorsEvents()
         $this->assertEquals(true, $result->stopped());
         $this->assertEquals(Application::ERROR_ROUTER_NO_MATCH, $this->getApplication()->getMvcEvent()->getError());
     }
+
+    public function testDispatchRequestUri()
+    {
+        $this->dispatch('/tests');
+        $this->assertEquals('/tests', $this->getApplication()->getRequest()->getRequestUri());
+    }
 }