adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moving query string params around. Updating test cases.

Browse source
This commit is contained in:
Mark Story 2010-04-29 23:20:31 -04:00
parent 0bbd7fae2c
commit 51db3c80ef
2 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cake/libs/cake_request.php
View file

@ -42,7 +42,14 @@ class CakeRequest implements ArrayAccess {
*
* @var array
*/
public $url = array();
public $query = array();
/**
* The url string used for the request.
*
* @var string
*/
public $url;
/**
* The built in detectors used with `is()` can be modified with `addDetector()`.
@ -122,9 +129,11 @@ class CakeRequest implements ArrayAccess {
$url = $_GET;
}
if (isset($this->params['url'])) {
$this->url = array_merge($this->url, $url);
} else {
$this->url = $url;
$url = array_merge($this->params['url'], $url);
}
$this->query = $url;
if (isset($this->query['url'])) {
$this->url = $this->query['url'];
}
}

12
cake/tests/cases/libs/cake_request.test.php
View file

@ -38,7 +38,17 @@ class CakeRequestTestCase extends CakeTestCase {
'two' => 'banana'
);
$request = new CakeRequest();
$this->assertEqual($request->url, $_GET);
$this->assertEqual($request->query, $_GET);
$_GET = array(
'one' => 'param',
'two' => 'banana',
'url' => '/some/path/here'
);
$request = new CakeRequest();
$this->assertEqual($request->query, $_GET);
$this->assertEqual($request->url, $_GET['url']);
}
/**