Merge pull request #14315 from ZhangRuiMingZRM/fixed-issue-14314

Fixed issue 14314
phalcon · Aug 20, 2019 · e0badaf · e0badaf
2 parents 2f55dc5 + d64931a
commit e0badaf
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/CHANGELOG-4.0.md b/CHANGELOG-4.0.md
@@ -2,6 +2,7 @@
 ## Fixed
 - Fixed `Phalcon\Helper\Str::includes` to return correct result [#14301](https://github.com/phalcon/cphalcon/issues/14301)
 - Fixed `Phalcon\Logger` moved to correct namespace [#14263](https://github.com/phalcon/cphalcon/issues/14263)
+- Fixed `Phalcon\Session\Adapter\AbstractAdapter::read()` to return ""(empty string) when `Session/Adapter/*::get()` returns null [#14314](https://github.com/phalcon/cphalcon/issues/14314)
 
 # [4.0.0-beta.2](https://github.com/phalcon/cphalcon/releases/tag/v4.0.0-beta.2) (2019-08-18)
 

diff --git a/phalcon/Session/Adapter/AbstractAdapter.zep b/phalcon/Session/Adapter/AbstractAdapter.zep
@@ -53,7 +53,10 @@ abstract class AbstractAdapter implements SessionHandlerInterface
      */
     public function read(var id) -> string
     {
-        return this->adapter->get(id);
+        var data;
+        let data = this->adapter->get(id);
+
+        return null === data ? "" : data;
     }
 
     /**

diff --git a/tests/integration/Session/Adapter/Libmemcached/ReadCest.php b/tests/integration/Session/Adapter/Libmemcached/ReadCest.php
@@ -49,5 +49,9 @@ public function sessionAdapterLibmemcachedRead(IntegrationTester $I)
         );
 
         $I->removeFromLibmemcached('sess-memc-test1');
+
+        $I->assertNotNull(
+            $adapter->read('test1')
+        );
     }
 }
diff --git a/tests/integration/Session/Adapter/Redis/ReadCest.php b/tests/integration/Session/Adapter/Redis/ReadCest.php
@@ -28,14 +28,14 @@ public function _before(IntegrationTester $I)
     }
 
     /**
-     * Tests Phalcon\Session\Adapter\Redis :: write()
+     * Tests Phalcon\Session\Adapter\Redis :: read()
      *
      * @author Phalcon Team <team@phalconphp.com>
      * @since  2018-11-13
      */
     public function sessionAdapterRedisRead(IntegrationTester $I)
     {
-        $I->wantToTest('Session\Adapter\Redis - write()');
+        $I->wantToTest('Session\Adapter\Redis - read()');
         $adapter = $this->getSessionRedis();
         $value   = uniqid();
 
@@ -45,5 +45,9 @@ public function sessionAdapterRedisRead(IntegrationTester $I)
         $actual   = $adapter->read('test1');
         $I->assertEquals($expected, $actual);
         $I->sendCommandToRedis('del', 'sess-reds-test1');
+
+        $I->assertNotNull(
+            $adapter->read('test1')
+        );
     }
 }