Merge pull request #14336 from ruudboon/4.0.x

Fixed issue #14265
phalcon · Aug 27, 2019 · 8ed84b0 · 8ed84b0
2 parents 30d85ac + b6132ee
commit 8ed84b0
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 8 deletions.
diff --git a/CHANGELOG-4.0.md b/CHANGELOG-4.0.md
@@ -11,6 +11,7 @@
 - Fixed `Phalcon\Cache\InvalidArgumentException` to extend Phalcon\Exception
 - Fixed `Phalcon\Collection\Exception` to extend Phalcon\Exception
 - Fixed `Phalcon\Storage\Adapter\AbstractAdapter::initSerializer` to throw exception if `null === $this->serializerFactory && null === $this->serializer` [#14324](https://github.com/phalcon/cphalcon/issues/14324)
+- Fixed `Phalcon\Session\Adapter\Stream` to not override configured save path [#14265](https://github.com/phalcon/cphalcon/issues/14265)
 
 # [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/Stream.zep b/phalcon/Session/Adapter/Stream.zep
@@ -94,16 +94,13 @@ class Stream extends Noop
         return true;
     }
 
+    /**
+    * Ignore the savePath and use local defined path
+    *
+    * @return bool
+    */
     public function open(var savePath, var sessionName) -> bool
     {
-        var path;
-
-        if true !== ends_with(savePath, "/") {
-            let path = savePath . "/";
-        }
-
-        let this->path = path;
-
         return true;
     }
 

diff --git a/tests/integration/Session/Adapter/Stream/OpenCest.php b/tests/integration/Session/Adapter/Stream/OpenCest.php
@@ -15,6 +15,8 @@
 use IntegrationTester;
 use Phalcon\Test\Fixtures\Traits\DiTrait;
 use Phalcon\Test\Fixtures\Traits\SessionTrait;
+use Phalcon\Session\Manager;
+use Phalcon\Session\Adapter\Stream;
 
 class OpenCest
 {
@@ -45,4 +47,27 @@ public function sessionAdapterStreamOpen(IntegrationTester $I)
             )
         );
     }
+
+    /**
+     * Tests Phalcon\Session\Adapter\Stream :: open()
+     *
+     * @author Phalcon Team <[email protected]>
+     * @since  2019-08-06
+     */
+    public function issue14265(IntegrationTester $I)
+    {
+        $I->wantToTest('Session\Adapter\Stream - open() for issue 14265');
+        $session = new Manager();
+        $stream = new Stream(getOptionsSessionStream());
+        $session->setHandler($stream);
+        $I->assertTrue(
+            $session->start()
+        );
+        $value   = uniqid();
+        $stream->write('test1', $value);
+        $I->amInPath(cacheDir('sessions'));
+        $I->seeFileFound('test1');
+        $I->seeInThisFile($value);
+        $I->safeDeleteFile(cacheDir('sessions/test1'));
+    }
 }