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

Simplify CookieComponent::read()

Browse source 
Also, this commit fixes an issue of when the second level key is empty.
Previously, read('foo.0') returned incorrect result.
This commit is contained in:
chinpei215 2017-10-16 21:01:19 +09:00
parent bbea91090d
commit 19bbb7da17
2 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/Cake/Controller/Component/CookieComponent.php
View file

@ -261,22 +261,7 @@ class CookieComponent extends Component {
if ($key === null) { if ($key === null) {
return $this->_values[$this->name]; return $this->_values[$this->name];
} }
return Hash::get($this->_values[$this->name], $key);
if (strpos($key, '.') !== false) {
$names = explode('.', $key, 2);
$key = $names[0];
}
if (!isset($this->_values[$this->name][$key])) {
return null;
}
if (!empty($names[1])) {
if (is_array($this->_values[$this->name][$key])) {
return Hash::get($this->_values[$this->name][$key], $names[1]);
}
return null;
}
return $this->_values[$this->name][$key];
} }
/** /**

14
lib/Cake/Test/Case/Controller/Component/CookieComponentTest.php
View file

@ -714,6 +714,20 @@ class CookieComponentTest extends CakeTestCase {
$this->assertEquals(array(), $this->Cookie->read('Array')); $this->assertEquals(array(), $this->Cookie->read('Array'));
} }
/**
* Test reading empty key
*
* @return void
*/
public function testReadEmptyKey() {
$_COOKIE['CakeTestCookie'] = array(
'0' => '{"name":"value"}',
'foo' => array('bar'),
);
$this->assertEquals('value', $this->Cookie->read('0.name'));
$this->assertEquals('bar', $this->Cookie->read('foo.0'));
}
/** /**
* test that no error is issued for non array data. * test that no error is issued for non array data.
* *