refactor code for testing

codeigniter4 · Sep 26, 2023 · 223d5fe · 223d5fe
1 parent 49fd2c1
commit 223d5fe
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
@@ -1063,14 +1063,18 @@ public function storePreviousURL($uri)
             $uri = new URI($uri);
         }
 
-        if (isset($_SESSION)) {
-            session()->set('_ci_previous_url', URI::createURIString(
-                $uri->getScheme(),
-                $uri->getAuthority(),
-                $uri->getPath(),
-                $uri->getQuery(),
-                $uri->getFragment()
-            ));
+        $previousUrl = URI::createURIString(
+            $uri->getScheme(),
+            $uri->getAuthority(),
+            $uri->getPath(),
+            $uri->getQuery(),
+            $uri->getFragment()
+        );
+
+        if (ENVIRONMENT === 'testing') {
+            $_SESSION['_ci_previous_url'] = $previousUrl;
+        } elseif (session_status() === PHP_SESSION_ACTIVE) {
+            session()->set('_ci_previous_url', $previousUrl);
         }
     }
 

diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
@@ -833,7 +833,7 @@ public function getOldInput(string $key)
         }
 
         // Get previously saved in session
-        $old = session('_ci_old_input');
+        $old = ENVIRONMENT === 'testing' ? $_SESSION['_ci_old_input'] ?? null : session('_ci_old_input');
 
         // If no data was previously saved, we're done.
         if ($old === null) {

diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php
@@ -88,9 +88,7 @@ function previous_url(bool $returnObject = false)
     {
         // Grab from the session first, if we have it,
         // since it's more reliable and safer.
-        if (isset($_SESSION)) {
-            $referer = session('_ci_previous_url');
-        }
+        $referer = ENVIRONMENT === 'testing' ? $_SESSION['_ci_previous_url'] ?? null : session('_ci_previous_url');
 
         // Otherwise, grab a sanitized version from $_SERVER.
         $referer ??= Services::request()->getServer('HTTP_REFERER', FILTER_SANITIZE_URL);