Fixed integration test with session data due to refactor in [3.4.0], …

…now the Session object is shared from the Request instead of creating a new one.
originphp · Aug 24, 2020 · ab46e56 · ab46e56
1 parent 4735859
commit ab46e56
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [3.4.1] - 2020-08-24
+
+### Fixed
+
+- Fixed integration test with session data due to refactor in [3.4.0], now the Session object is shared from the Request instead of creating a new one.
+
 ## [3.4.0] - 2020-08-22
 
 ### Added

diff --git a/src/Http/Controller/Component/SessionComponent.php b/src/Http/Controller/Component/SessionComponent.php
@@ -31,17 +31,13 @@ class SessionComponent extends Component
     protected $session = null;
 
     /**
-     * Lazy loads the session object
+     * Gets the Session object from the Request
      *
      * @return \Origin\Http\Session
      */
     protected function session(): Session
     {
-        if ($this->session === null) {
-            $this->session = new Session();
-        }
-
-        return $this->session;
+        return $this->request()->session();
     }
     /**
      * Reads a value of a session

diff --git a/src/Http/Request.php b/src/Http/Request.php
@@ -684,7 +684,7 @@ public function headers($header = null)
     /**
      * Returns the session object
      *
-     * @return Session
+     * @return \Origin\Http\Session
      */
     public function session(): Session
     {

diff --git a/src/Http/View/Helper/SessionHelper.php b/src/Http/View/Helper/SessionHelper.php
@@ -30,17 +30,13 @@ class SessionHelper extends Helper
     protected $session = null;
 
     /**
-     * Lazy loads the session object
+     * Gets the Session object from the Request
      *
      * @return \Origin\Http\Session
      */
     protected function session(): Session
     {
-        if ($this->session === null) {
-            $this->session = new Session();
-        }
-
-        return $this->session;
+        return $this->request()->session();
     }
 
     /**

diff --git a/src/TestSuite/IntegrationTestTrait.php b/src/TestSuite/IntegrationTestTrait.php
@@ -319,8 +319,7 @@ protected function sendRequest(string $method, $url, array $data = [])
         }
 
         $this->request = new Request($url);
-        $this->request->session()->destroy();
-
+
         $this->response = $this->getMockBuilder(Response::class)
             ->setMethods(['send','stop'])
             ->getMock();
@@ -329,7 +328,7 @@ protected function sendRequest(string $method, $url, array $data = [])
         foreach ($this->session as $key => $value) {
             $this->request->session()->write($key, $value);
         }
-
+        
         // Send Headers
         foreach ($this->headers as $header => $value) {
             $this->response->header($header, $value);