adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-12 06:56:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

make the default return false so it matches previous use, improve tests for new method

Browse source
This commit is contained in:
dogmatic69 2014-05-25 00:46:40 +01:00
parent a657e410b2
commit 9dca564519
2 changed files with 58 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Network/CakeRequest.php
View file

@ -875,7 +875,7 @@ class CakeRequest implements ArrayAccess {
*/ */
public function param($name) { public function param($name) {
if (!isset($this->params[$name])) { if (!isset($this->params[$name])) {
return Hash::get($this->params, $name); return Hash::get($this->params, $name, false);
} }
return $this->params[$name]; return $this->params[$name];
} }

77
lib/Cake/Test/Case/Network/CakeRequestTest.php
View file

@ -1995,26 +1995,6 @@ class CakeRequestTest extends CakeTestCase {
$this->assertNull($result); $this->assertNull($result);
} }
/**
* Test using param()
*
* @return void
*/
public function testReadingParams() {
$request = new CakeRequest();
$request->addParams(array(
'controller' => 'posts',
'admin' => true,
'truthy' => 1,
'zero' => '0',
));
$this->assertFalse($request->param('not_set'));
$this->assertTrue($request->param('admin'));
$this->assertEquals(1, $request->param('truthy'));
$this->assertEquals('posts', $request->param('controller'));
$this->assertEquals('0', $request->param('zero'));
}
/** /**
* Test the data() method reading * Test the data() method reading
* *
@ -2077,6 +2057,63 @@ class CakeRequestTest extends CakeTestCase {
$this->assertSame('', $request->data['Post']['empty']); $this->assertSame('', $request->data['Post']['empty']);
} }
/**
* @dataProvider paramReadingDataProvider
*/
public function testParamReading($toRead, $expected) {
$request = new CakeRequest('/');
$request->addParams(array(
'action' => 'index',
'foo' => 'bar',
'baz' => array(
'a' => array(
'b' => 'c',
),
),
'admin' => true,
'truthy' => 1,
'zero' => '0',
));
$this->assertEquals($expected, $request->param($toRead));
}
public function paramReadingDataProvider() {
return array(
array(
'action',
'index',
),
array(
'baz',
array(
'a' => array(
'b' => 'c',
),
),
),
array(
'baz.a.b',
'c',
),
array(
'does_not_exist',
false,
),
array(
'admin',
true,
),
array(
'truthy',
1,
),
array(
'zero',
'0',
),
);
}
/** /**
* Test accept language * Test accept language
* *