Fix query string support.

* The documented query option was not implemented. * Skip routing when the params have been passed through requestAction().
cakephp · Jul 9, 2012 · ac87e5c · ac87e5c
1 parent 8c2a447
commit ac87e5c
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 10 deletions.
diff --git a/lib/Cake/Core/Object.php b/lib/Cake/Core/Object.php
@@ -77,9 +77,18 @@ public function requestAction($url, $extra = array()) {
 			$extra['autoRender'] = 1;
 			unset($extra[$index]);
 		}
-		$extra = array_merge(array('autoRender' => 0, 'return' => 1, 'bare' => 1, 'requested' => 1), $extra);
-		$data = isset($extra['post']) ? $extra['post'] : null;
-		unset($extra['post']);
+		$extra = array_merge(
+			['autoRender' => 0, 'return' => 1, 'bare' => 1, 'requested' => 1],
+			$extra
+		);
+		$post = $query = [];
+		if (isset($extra['post'])) {
+			$post = $extra['post'];
+		}
+		if (isset($extra['query'])) {
+			$query = $extra['query'];
+		}
+		unset($extra['post'], $extra['query']);
 
 		if (is_string($url) && strpos($url, FULL_BASE_URL) === 0) {
 			$url = Router::normalize(str_replace(FULL_BASE_URL, '', $url));
@@ -89,13 +98,17 @@ public function requestAction($url, $extra = array()) {
 				'url' => $url
 			);
 		} elseif (is_array($url)) {
-			$url += array('pass' => array(), 'base' => false);
-			$params = array(
+			$params = array_merge($url, [
+				'pass' => [],
+				'base' => false,
 				'url' => Router::reverse($url)
-			);
+			]);
+		}
+		if (!empty($post)) {
+			$params['post'] = $post;
 		}
-		if (isset($data)) {
-			$params['post'] = $data;
+		if (!empty($query)) {
+			$params['query'] = $query;
 		}
 		$request = new Request($params);
 		$dispatcher = new Dispatcher();

diff --git a/lib/Cake/Routing/Dispatcher.php b/lib/Cake/Routing/Dispatcher.php
@@ -218,8 +218,10 @@ public function parseParams($event) {
 			$this->_loadRoutes();
 		}
 
-		$params = Router::parse($request->url);
-		$request->addParams($params);
+		if (empty($request->params['controller'])) {
+			$params = Router::parse($request->url);
+			$request->addParams($params);
+		}
 
 		if (!empty($event->data['additionalParams'])) {
 			$request->addParams($event->data['additionalParams']);

diff --git a/lib/Cake/Test/TestApp/Controller/RequestActionController.php b/lib/Cake/Test/TestApp/Controller/RequestActionController.php
@@ -91,6 +91,15 @@ public function post_pass() {
 		return $this->request->data;
 	}
 
+/**
+ * query pass, testing query passing
+ *
+ * @return array
+ */
+	public function query_pass() {
+		return $this->request->query;
+	}
+
 /**
  * test param passing and parsing.
  *

diff --git a/lib/Cake/Test/TestCase/Core/ObjectTest.php b/lib/Cake/Test/TestCase/Core/ObjectTest.php
@@ -527,6 +527,29 @@ public function testRequestActionNoPostPassing() {
 		$this->assertEquals($expected, $result);
 	}
 
+/**
+ * test that requestAction() can get query data from the query string and
+ * query option.
+ *
+ * @return void
+ */
+	public function testRequestActionWithQueryString() {
+		Router::reload();
+		require CAKE . 'Config' . DS . 'routes.php';
+		$query = ['page' => 1, 'sort' => 'title'];
+		$result = $this->object->requestAction(
+			['controller' => 'request_action', 'action' => 'query_pass'],
+			['query' => $query]
+		);
+		$this->assertEquals($query, $result);
+
+		$result = $this->object->requestAction(
+			'/request_action/query_pass?page=3&sort=body'
+		);
+		$expected = ['page' => 3, 'sort' => 'body'];
+		$this->assertEquals($expected, $result);
+	}
+
 /**
  * Test requestAction with post data.
  *