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

Fix notice error when reading empty values.

Browse source 
When reading empty values a notice error would be triggered.
Slicing the first char off and comparing that solves this.

Fixes #2537
This commit is contained in:
mark_story 2012-02-11 11:32:44 -05:00
parent 6f914174a6
commit 7e17da0ae8
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -483,7 +483,8 @@ class CookieComponent extends Component {
* @return array Map of key and values * @return array Map of key and values
*/ */
protected function _explode($string) { protected function _explode($string) {
if ($string[0] === '{' || $string[0] === '[') { $first = substr($string, 0, 1);
if ($first !== false && $first === '{' || $first === '[') {
$ret = json_decode($string, true); $ret = json_decode($string, true);
return ($ret != null) ? $ret : $string; return ($ret != null) ? $ret : $string;
} }

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

@ -471,6 +471,21 @@ class CookieComponentTest extends CakeTestCase {
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
} }
/**
* Test reading empty values.
*/
public function testReadEmpty() {
$_COOKIE['CakeTestCookie'] = array(
'JSON' => '{"name":"value"}',
'Empty' => '',
'String' => '{"somewhat:"broken"}'
);
$this->assertEqual(array('name' => 'value'), $this->Cookie->read('JSON'));
$this->assertEqual('value', $this->Cookie->read('JSON.name'));
$this->assertEqual('', $this->Cookie->read('Empty'));
$this->assertEqual('{"somewhat:"broken"}', $this->Cookie->read('String'));
}
/** /**
* test that no error is issued for non array data. * test that no error is issued for non array data.
* *
@ -483,6 +498,7 @@ class CookieComponentTest extends CakeTestCase {
$this->assertNull($this->Cookie->read('value')); $this->assertNull($this->Cookie->read('value'));
} }
/** /**
* test that deleting a top level keys kills the child elements too. * test that deleting a top level keys kills the child elements too.
* *