Merge pull request #9 from twistersfury/master-session

Adjusting Session To Use Session Manager. @Fenikkusu thnx

Author: ruudboon

.env.example

@@ -3,3 +3,4 @@ DB_HOST=127.0.0.1
 DB_NAME=phalcon
 DB_USERNAME=root
 DB_PASSWORD=password
+DB_PORT=3306

src/Codeception/Lib/Connector/Phalcon4/MemorySession.php

@@ -295,4 +295,27 @@ private function generateId()
     {
         return md5(time());
     }
+
+    /**
+     * Dummy - We Don't Actually Read Anything
+     *
+     * @return string
+     */
+    public function read($id): string
+    {
+        return "";
+    }
+
+    /**
+     * Write - We Don't Actually Write Anything
+     *
+     * @param $id
+     * @param $data
+     *
+     * @return bool
+     */
+    public function write($id, $data): bool
+    {
+        return true;
+    }
 }

src/Codeception/Lib/Connector/Phalcon4/SessionManager.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Codeception\Lib\Connector\Phalcon4;
+
+use Phalcon\Session\Manager;
+
+class SessionManager extends Manager
+{
+    /**
+     * We have to override this as otherwise nothing working correctly in testing.
+     *
+     * @return bool
+     */
+    public function exists(): bool
+    {
+        return true;
+    }
+}

src/Codeception/Module/Phalcon4.php

@@ -12,13 +12,15 @@
 use Codeception\Lib\Interfaces\PartedModule;
 use Codeception\TestInterface;
 use Codeception\Util\ReflectionHelper;
+use Exception;
 use PDOException;
 use Phalcon\Di;
 use Phalcon\Di\Injectable;
 use Phalcon\DiInterface;
 use Phalcon\Mvc\Model as PhalconModel;
 use Phalcon\Mvc\Router\RouteInterface;
 use Phalcon\Mvc\RouterInterface;
+use Codeception\Lib\Connector\Phalcon4\SessionManager;
 use Phalcon\Url;
 
 /**
@@ -150,8 +152,14 @@ public function _before(TestInterface $test)
         Di::setDefault($this->di);
 
         if ($this->di->has('session')) {
+            /** @var Manager $manager */
+            $manager = $this->di->get(SessionManager::class);
+            $manager->setAdapter(
+                $this->di->get($this->config['session'])
+            );
+
             // Destroy existing sessions of previous tests
-            $this->di['session'] = $this->di->get($this->config['session']);
+            $this->di['session'] = $manager;
         }
 
         if ($this->di->has('cookies')) {
@@ -223,7 +231,7 @@ public function getApplication()
     public function haveInSession($key, $val)
     {
         $this->di->get('session')->set($key, $val);
-        $this->debugSection('Session', json_encode($this->di['session']->toArray()));
+        $this->debugSection('Session', json_encode($this->di['session']->getAdapter()->toArray()));
     }
 
     /**
@@ -242,7 +250,7 @@ public function haveInSession($key, $val)
      */
     public function seeInSession($key, $value = null)
     {
-        $this->debugSection('Session', json_encode($this->di['session']->toArray()));
+        $this->debugSection('Session', json_encode($this->di['session']->getAdapter()->toArray()));
 
         if (is_array($key)) {
             $this->seeSessionHasValues($key);

tests/_data/bootstrap-micro.php

@@ -1,3 +1,4 @@
 <?php
+
 $di = new \Phalcon\DI\FactoryDefault();
 return new \Phalcon\Mvc\Micro($di);

tests/_support/AcceptanceTester.php

@@ -1,8 +1,8 @@
 <?php
 
-
 /**
  * Inherited Methods
+ *
  * @method void wantToTest($text)
  * @method void wantTo($text)
  * @method void execute($callable)
@@ -16,6 +16,7 @@
  *
  * @SuppressWarnings(PHPMD)
 */
+
 class AcceptanceTester extends \Codeception\Actor
 {
     use _generated\AcceptanceTesterActions;

tests/_support/FunctionalTester.php

@@ -1,8 +1,8 @@
 <?php
 
-
 /**
  * Inherited Methods
+ *
  * @method void wantToTest($text)
  * @method void wantTo($text)
  * @method void execute($callable)
@@ -16,6 +16,7 @@
  *
  * @SuppressWarnings(PHPMD)
 */
+
 class FunctionalTester extends \Codeception\Actor
 {
     use _generated\FunctionalTesterActions;

tests/_support/UnitTester.php

@@ -1,8 +1,8 @@
 <?php
 
-
 /**
  * Inherited Methods
+ *
  * @method void wantToTest($text)
  * @method void wantTo($text)
  * @method void execute($callable)
@@ -16,6 +16,7 @@
  *
  * @SuppressWarnings(PHPMD)
 */
+
 class UnitTester extends \Codeception\Actor
 {
     use _generated\UnitTesterActions;

tests/unit/Phalcon4ModuleTest.php

@@ -140,7 +140,8 @@ public function testContainerMethods()
         $module->_before($test);
 
         $session = $module->grabServiceFromContainer('session');
-        $this->assertInstanceOf('Codeception\Lib\Connector\Phalcon4\MemorySession', $session);
+        $this->assertInstanceOf('Phalcon\Session\Manager', $session);
+        $this->assertInstanceOf('Codeception\Lib\Connector\Phalcon4\MemorySession', $session->getAdapter());
 
         $testService = $module->addServiceToContainer('std', function () {
             return new \stdClass();