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

Allowing returning numeric 0 from read

Browse source
This commit is contained in:
Larry E. Masters 2015-12-28 23:26:06 -05:00
parent a02fb9e771
commit a966e46545
4 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/Cake/Model/Datasource/Session/CacheSession.php
View file

@ -53,7 +53,8 @@ class CacheSession implements CakeSessionHandlerInterface {
*/
public function read($id) {
$data = Cache::read($id, Configure::read('Session.handler.config'));
if (empty($data)) {
if (!is_numeric($data) && empty($data)) {
return '';
}
return $data;

2
lib/Cake/Model/Datasource/Session/DatabaseSession.php
View file

@ -92,7 +92,7 @@ class DatabaseSession implements CakeSessionHandlerInterface {
'conditions' => array($this->_model->alias . '.' . $this->_model->primaryKey => $id)
));
if (empty($row[$this->_model->alias]['data'])) {
if (!is_numeric($row[$this->_model->alias]['data']) && empty($row[$this->_model->alias]['data'])) {
return '';
}

2
lib/Cake/Test/Case/Model/Datasource/Session/CacheSessionTest.php
View file

@ -104,6 +104,8 @@ class CacheSessionTest extends CakeTestCase {
public function testRead() {
$this->storage->write('test_one', 'Some other value');
$this->assertEquals('Some other value', $this->storage->read('test_one'), 'Incorrect value.');
$this->storage->write('test_two', 0);
$this->assertEquals(0, $this->storage->read('test_two'));
}
/**

3
lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php
View file

@ -144,7 +144,10 @@ class DatabaseSessionTest extends CakeTestCase {
public function testRead() {
$this->storage->write('foo', 'Some value');
$this->assertEquals($this->storage->read('foo'), 'Some value');
$this->storage->write('bar', 0);
$this->assertEquals(0, $this->storage->read('bar'));
$this->assertSame('', $this->storage->read('made up value'));
}
/**