Browse Source

Changed serialize/unserialize to json encode/decode.

This better represents potential real world usage.
ADmad 12 years ago
parent
commit
2f0aa5109f

+ 10 - 10
tests/TestCase/Routing/RequestActionTraitTest.php

@@ -186,7 +186,7 @@ class RequestActionTraitTest extends TestCase {
  */
 	public function testRequestActionParamParseAndPass() {
 		$result = $this->object->requestAction('/request_action/params_pass');
-		$result = unserialize($result);
+		$result = json_decode($result, true);
 		$this->assertEquals('request_action/params_pass', $result['url']);
 		$this->assertEquals('request_action', $result['params']['controller']);
 		$this->assertEquals('params_pass', $result['params']['action']);
@@ -204,14 +204,14 @@ class RequestActionTraitTest extends TestCase {
 			'item' => 'value'
 		);
 		$result = $this->object->requestAction(array('controller' => 'request_action', 'action' => 'post_pass'));
-		$result = unserialize($result);
+		$result = json_decode($result, true);
 		$this->assertEmpty($result);
 
 		$result = $this->object->requestAction(
 			array('controller' => 'request_action', 'action' => 'post_pass'),
 			array('post' => $_POST)
 		);
-		$result = unserialize($result);
+		$result = json_decode($result, true);
 		$expected = $_POST;
 		$this->assertEquals($expected, $result);
 	}
@@ -230,7 +230,7 @@ class RequestActionTraitTest extends TestCase {
 			['controller' => 'request_action', 'action' => 'query_pass'],
 			['query' => $query]
 		);
-		$result = unserialize($result);
+		$result = json_decode($result, true);
 		$this->assertEquals($query, $result);
 
 		$result = $this->object->requestAction([
@@ -238,13 +238,13 @@ class RequestActionTraitTest extends TestCase {
 			'action' => 'query_pass',
 			'?' => $query
 		]);
-		$result = unserialize($result);
+		$result = json_decode($result, true);
 		$this->assertEquals($query, $result);
 
 		$result = $this->object->requestAction(
 			'/request_action/query_pass?page=3&sort=body'
 		);
-		$result = unserialize($result);
+		$result = json_decode($result, true);
 		$expected = ['page' => 3, 'sort' => 'body'];
 		$this->assertEquals($expected, $result);
 	}
@@ -262,14 +262,14 @@ class RequestActionTraitTest extends TestCase {
 			array('controller' => 'request_action', 'action' => 'post_pass'),
 			array('post' => $data)
 		);
-		$result = unserialize($result);
+		$result = json_decode($result, true);
 		$this->assertEquals($data, $result);
 
 		$result = $this->object->requestAction(
 			'/request_action/post_pass',
 			array('post' => $data)
 		);
-		$result = unserialize($result);
+		$result = json_decode($result, true);
 		$this->assertEquals($data, $result);
 	}
 
@@ -282,14 +282,14 @@ class RequestActionTraitTest extends TestCase {
 		$result = $this->object->requestAction(
 			'/request_action/params_pass?get=value&limit=5'
 		);
-		$result = unserialize($result);
+		$result = json_decode($result, true);
 		$this->assertEquals('value', $result['query']['get']);
 
 		$result = $this->object->requestAction(
 			array('controller' => 'request_action', 'action' => 'params_pass'),
 			array('query' => array('get' => 'value', 'limit' => 5))
 		);
-		$result = unserialize($result);
+		$result = json_decode($result, true);
 		$this->assertEquals('value', $result['query']['get']);
 	}
 

+ 3 - 3
tests/test_app/TestApp/Controller/RequestActionController.php

@@ -87,7 +87,7 @@ class RequestActionController extends AppController {
  * @return array
  */
 	public function post_pass() {
-		$this->response->body(serialize($this->request->data));
+		$this->response->body(json_encode($this->request->data));
 	}
 
 /**
@@ -96,7 +96,7 @@ class RequestActionController extends AppController {
  * @return array
  */
 	public function query_pass() {
-		$this->response->body(serialize($this->request->query));
+		$this->response->body(json_encode($this->request->query));
 	}
 
 /**
@@ -105,7 +105,7 @@ class RequestActionController extends AppController {
  * @return void
  */
 	public function params_pass() {
-		$this->response->body(serialize([
+		$this->response->body(json_encode([
 			'params' => $this->request->params,
 			'query' => $this->request->query,
 			'url' => $this->request->url