diff --git a/lib/Cake/Network/CakeRequest.php b/lib/Cake/Network/CakeRequest.php index e03257fd9..c3cbc908e 100644 --- a/lib/Cake/Network/CakeRequest.php +++ b/lib/Cake/Network/CakeRequest.php @@ -133,27 +133,26 @@ class CakeRequest implements ArrayAccess { /** * process the post data and set what is there into the object. - * The raw post is available at $this->params['form'], while a lightly processed - * version is available at $this->data + * processed data is available at $this->data * * @return void */ protected function _processPost() { - $this->params['form'] = $_POST; + $this->data = $_POST; if (ini_get('magic_quotes_gpc') === '1') { - $this->params['form'] = stripslashes_deep($this->params['form']); + $this->data = stripslashes_deep($this->data); } if (env('HTTP_X_HTTP_METHOD_OVERRIDE')) { - $this->params['form']['_method'] = env('HTTP_X_HTTP_METHOD_OVERRIDE'); + $this->data['_method'] = env('HTTP_X_HTTP_METHOD_OVERRIDE'); } - if (isset($this->params['form']['_method'])) { + if (isset($this->data['_method'])) { if (!empty($_SERVER)) { - $_SERVER['REQUEST_METHOD'] = $this->params['form']['_method']; + $_SERVER['REQUEST_METHOD'] = $this->data['_method']; } else { - $_ENV['REQUEST_METHOD'] = $this->params['form']['_method']; + $_ENV['REQUEST_METHOD'] = $this->data['_method']; } + unset($this->data['_method']); } - $this->data = $this->params['form']; if (isset($this->data['data'])) { $data = $this->data['data']; unset($this->data['data']); diff --git a/lib/Cake/tests/Case/Network/CakeRequestTest.php b/lib/Cake/tests/Case/Network/CakeRequestTest.php index addb2594a..ffb1febef 100644 --- a/lib/Cake/tests/Case/Network/CakeRequestTest.php +++ b/lib/Cake/tests/Case/Network/CakeRequestTest.php @@ -161,7 +161,6 @@ class CakeRequestTestCase extends CakeTestCase { $_POST = array('one' => 1, 'two' => 'three'); $request = new CakeRequest('some/path'); - $this->assertEquals($_POST, $request->params['form']); $this->assertEquals($_POST, $request->data); } diff --git a/lib/Cake/tests/Case/Routing/DispatcherTest.php b/lib/Cake/tests/Case/Routing/DispatcherTest.php index e86431a45..55e254409 100644 --- a/lib/Cake/tests/Case/Routing/DispatcherTest.php +++ b/lib/Cake/tests/Case/Routing/DispatcherTest.php @@ -585,8 +585,7 @@ class DispatcherTest extends CakeTestCase { $Dispatcher = new Dispatcher(); $test = $Dispatcher->parseParams(new CakeRequest("/")); - $this->assertFalse(empty($test['form']), "Parsed URL not returning post data"); - $this->assertEquals($test['form']['testdata'], "My Posted Content"); + $this->assertEquals($test['data']['testdata'], "My Posted Content"); } /** @@ -868,7 +867,7 @@ class DispatcherTest extends CakeTestCase { $expected = array( 'pass' => array('home'), 'named' => array('param'=> 'value', 'param2'=> 'value2'), 'plugin'=> 'my_plugin', - 'controller'=> 'some_pages', 'action'=> 'display', 'form'=> array(), + 'controller'=> 'some_pages', 'action'=> 'display' ); foreach ($expected as $key => $value) { $this->assertEqual($result[$key], $value, 'Value mismatch ' . $key . ' %'); @@ -1000,7 +999,6 @@ class DispatcherTest extends CakeTestCase { 'action' => 'admin_index', 'prefix' => 'admin', 'admin' => true, - 'form' => array(), 'return' => 1 ); foreach ($expected as $key => $value) { @@ -1524,7 +1522,7 @@ class DispatcherTest extends CakeTestCase { $dispatcher = new Dispatcher(); $result = $dispatcher->parseParams(new CakeRequest('/posts')); - $expected = array('pass' => array(), 'named' => array(), 'plugin' => null, 'controller' => 'posts', 'action' => 'add', '[method]' => 'POST', 'form' => array()); + $expected = array('pass' => array(), 'named' => array(), 'plugin' => null, 'controller' => 'posts', 'action' => 'add', '[method]' => 'POST'); foreach ($expected as $key => $value) { $this->assertEqual($result[$key], $value, 'Value mismatch for ' . $key . ' %s'); } @@ -1533,7 +1531,15 @@ class DispatcherTest extends CakeTestCase { $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'] = 'PUT'; $result = $dispatcher->parseParams(new CakeRequest('/posts/5')); - $expected = array('pass' => array('5'), 'named' => array(), 'id' => '5', 'plugin' => null, 'controller' => 'posts', 'action' => 'edit', '[method]' => 'PUT', 'form' => array()); + $expected = array( + 'pass' => array('5'), + 'named' => array(), + 'id' => '5', + 'plugin' => null, + 'controller' => 'posts', + 'action' => 'edit', + '[method]' => 'PUT' + ); foreach ($expected as $key => $value) { $this->assertEqual($result[$key], $value, 'Value mismatch for ' . $key . ' %s'); } @@ -1542,7 +1548,7 @@ class DispatcherTest extends CakeTestCase { $_SERVER['REQUEST_METHOD'] = 'GET'; $result = $dispatcher->parseParams(new CakeRequest('/posts/5')); - $expected = array('pass' => array('5'), 'named' => array(), 'id' => '5', 'plugin' => null, 'controller' => 'posts', 'action' => 'view', '[method]' => 'GET', 'form' => array()); + $expected = array('pass' => array('5'), 'named' => array(), 'id' => '5', 'plugin' => null, 'controller' => 'posts', 'action' => 'view', '[method]' => 'GET'); foreach ($expected as $key => $value) { $this->assertEqual($result[$key], $value, 'Value mismatch for ' . $key . ' %s'); } @@ -1550,7 +1556,7 @@ class DispatcherTest extends CakeTestCase { $_POST['_method'] = 'PUT'; $result = $dispatcher->parseParams(new CakeRequest('/posts/5')); - $expected = array('pass' => array('5'), 'named' => array(), 'id' => '5', 'plugin' => null, 'controller' => 'posts', 'action' => 'edit', '[method]' => 'PUT', 'form' => array()); + $expected = array('pass' => array('5'), 'named' => array(), 'id' => '5', 'plugin' => null, 'controller' => 'posts', 'action' => 'edit', '[method]' => 'PUT'); foreach ($expected as $key => $value) { $this->assertEqual($result[$key], $value, 'Value mismatch for ' . $key . ' %s'); } @@ -1563,7 +1569,7 @@ class DispatcherTest extends CakeTestCase { $result = $dispatcher->parseParams(new CakeRequest('/posts')); $expected = array( 'pass' => array(), 'named' => array(), 'plugin' => null, 'controller' => 'posts', 'action' => 'add', - '[method]' => 'POST', 'form' => array('extra' => 'data'), 'data' => array('Post' => array('title' => 'New Post')), + '[method]' => 'POST', 'data' => array('extra' => 'data', 'Post' => array('title' => 'New Post')), ); foreach ($expected as $key => $value) { $this->assertEqual($result[$key], $value, 'Value mismatch for ' . $key . ' %s'); diff --git a/lib/Cake/tests/Case/Routing/RouterTest.php b/lib/Cake/tests/Case/Routing/RouterTest.php index ac6f2fda6..d80bb7f43 100644 --- a/lib/Cake/tests/Case/Routing/RouterTest.php +++ b/lib/Cake/tests/Case/Routing/RouterTest.php @@ -2164,7 +2164,7 @@ class RouterTest extends CakeTestCase { $expected = array( 'plugin' => null, 'controller' => false, 'action' => false, - 'param1' => '1', 'param2' => '2', 'form' => array() + 'param1' => '1', 'param2' => '2' ); $this->assertEqual(Router::getParams(), $expected); $this->assertEqual(Router::getParam('controller'), false); @@ -2175,7 +2175,7 @@ class RouterTest extends CakeTestCase { $params = array('controller' => 'pages', 'action' => 'display'); Router::setRequestInfo(array($params, $paths)); - $expected = array('plugin' => null, 'controller' => 'pages', 'action' => 'display', 'form' => array()); + $expected = array('plugin' => null, 'controller' => 'pages', 'action' => 'display'); $this->assertEqual(Router::getParams(), $expected); $this->assertEqual(Router::getParams(true), $expected); }