From 94e718372a4a01089a487318e85b07174287fd81 Mon Sep 17 00:00:00 2001 From: ADmad Date: Thu, 9 Oct 2014 19:19:53 +0530 Subject: [PATCH] Make CakeSession::read() return null for all failure cases. --- lib/Cake/Model/Datasource/CakeSession.php | 2 +- lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Cake/Model/Datasource/CakeSession.php b/lib/Cake/Model/Datasource/CakeSession.php index 96a66d899..6d7d53a20 100644 --- a/lib/Cake/Model/Datasource/CakeSession.php +++ b/lib/Cake/Model/Datasource/CakeSession.php @@ -378,7 +378,7 @@ class CakeSession { */ public static function read($name = null) { if (empty($name) && $name !== null) { - return false; + return null; } if (!self::_hasSession() || !self::start()) { return null; diff --git a/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php b/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php index 7f70ea82c..534aaa1ed 100644 --- a/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php @@ -280,7 +280,7 @@ class CakeSessionTest extends CakeTestCase { * @return void */ public function testReadyEmpty() { - $this->assertFalse(TestCakeSession::read('')); + $this->assertNull(TestCakeSession::read('')); } /**