fix: Session::markAsTempdata() adding wrong TTL (#9536)

* fix: `Session::markAsTempdata()` adding wrong TTL

* Add changelog

Author: paulbalandan

system/Session/Session.php

@@ -804,39 +804,31 @@ public function removeTempdata(string $key)
      */
     public function markAsTempdata($key, int $ttl = 300): bool
     {
-        $ttl += Time::now()->getTimestamp();
-
-        if (is_array($key)) {
-            $temp = [];
-
-            foreach ($key as $k => $v) {
-                // Do we have a key => ttl pair, or just a key?
-                if (is_int($k)) {
-                    $k = $v;
-                    $v = $ttl;
-                } elseif (is_string($v)) {
-                    $v = Time::now()->getTimestamp() + $ttl;
-                } else {
-                    $v += Time::now()->getTimestamp();
-                }
-
-                if (! array_key_exists($k, $_SESSION)) {
-                    return false;
-                }
-
-                $temp[$k] = $v;
-            }
-
-            $_SESSION['__ci_vars'] = isset($_SESSION['__ci_vars']) ? array_merge($_SESSION['__ci_vars'], $temp) : $temp;
+        $time = Time::now()->getTimestamp();
+        $keys = is_array($key) ? $key : [$key];
 
-            return true;
+        if (array_is_list($keys)) {
+            $keys = array_fill_keys($keys, $ttl);
         }
 
-        if (! isset($_SESSION[$key])) {
-            return false;
+        $tempdata = [];
+
+        foreach ($keys as $sessionKey => $timeToLive) {
+            if (! array_key_exists($sessionKey, $_SESSION)) {
+                return false;
+            }
+
+            if (is_int($timeToLive)) {
+                $timeToLive += $time;
+            } else {
+                $timeToLive = $time + $ttl;
+            }
+
+            $tempdata[$sessionKey] = $timeToLive;
         }
 
-        $_SESSION['__ci_vars'][$key] = $ttl;
+        $_SESSION['__ci_vars'] ??= [];
+        $_SESSION['__ci_vars'] = [...$_SESSION['__ci_vars'], ...$tempdata];
 
         return true;
     }

tests/system/Session/SessionTest.php

@@ -476,6 +476,23 @@ public function testSetTempDataArraySingleTTL(): void
         $this->assertLessThanOrEqual($_SESSION['__ci_vars']['baz'], $time + 200);
     }
 
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/9534
+     */
+    public function testSetTempDataOnArrayData(): void
+    {
+        $session = $this->getInstance();
+        $session->start();
+
+        $time = time();
+
+        $session->setTempdata(['foo1' => 'bar1'], null, 200);
+        $session->setTempdata('foo2', 'bar2', 200);
+
+        $this->assertLessThanOrEqual($_SESSION['__ci_vars']['foo1'], $time + 200);
+        $this->assertLessThanOrEqual($_SESSION['__ci_vars']['foo2'], $time + 200);
+    }
+
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/pull/9536#discussion_r2051798869
      */

user_guide_src/source/changelogs/v4.6.1.rst

@@ -40,6 +40,7 @@ Bugs Fixed
 - **Database:** Fixed a bug in ``Postgre`` and ``SQLite3`` handlers where composite unique keys were not fully taken into account for ``upsert`` type of queries.
 - **Database:** Fixed a bug in the ``OCI8`` and ``SQLSRV`` drivers where ``getVersion()`` returned an empty string when the database connection was not yet established.
 - **Logger:** Fixed a bug where the ``{line}`` variable couldn't be used without specifying the ``{file}`` variable when logging the message.
+- **Session:** Fixed a bug where ``Session::markAsTempdata()`` would give the wrong TTL when array data is supplied to ``Session::setTempdata()``.
 - **Toolbar:** Fixed a bug where setting ``maxHistory`` to ``0`` would produce a JavaScript error in the Debug Toolbar.
 - **Toolbar:** Fixed a bug where setting ``maxHistory`` to ``0`` prevented log files from being properly cleared.