[HttpFoundation] Add ability to force the lifetime (allows update of session cookie expiry-time)

Drak · Drak · commit 39141e865b99 · 2012-03-31T19:12:22.000+05:45
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MetaBag.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MetaBag.php
@@ -80,9 +80,12 @@ public function getLifetime()
         return $this->meta['lifetime'];
     }
 
-    public function stampNew()
+    /**
+     * Stamps a new session's meta.
+     */
+    public function stampNew($lifetime = null)
     {
-        $this->stampCreated();
+        $this->stampCreated($lifetime);
     }
 
     /**
@@ -134,10 +137,10 @@ public function setName($name)
         $this->name = $name;
     }
 
-    private function stampCreated()
+    private function stampCreated($lifetime = null)
     {
-        $timeStamp = time();//(null === $timeStamp) ? time() : $timeStamp;
+        $timeStamp = time();
         $this->meta['created'] = $this->meta['lastused'] = $this->lastUsed = $timeStamp;
-        $this->meta['lifetime'] = ini_get('session.cookie_lifetime');
+        $this->meta['lifetime'] = (null === $lifetime) ? ini_get('session.cookie_lifetime') : $lifetime;
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MetaBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MetaBagTest.php
@@ -96,5 +96,4 @@ public function testClear()
     {
         $this->bag->clear();
     }
-
 }

Original file line number	Diff line number	Diff line change
`@@ -80,9 +80,12 @@ public function getLifetime()`
`80`	`80`	`return $this->meta['lifetime'];`
`81`	`81`	`}`
`82`	`82`
`83`		`- public function stampNew()`
	`83`	`+ /**`
	`84`	`+ * Stamps a new session's meta.`
	`85`	`+ */`
	`86`	`+ public function stampNew($lifetime = null)`
`84`	`87`	`{`
`85`		`- $this->stampCreated();`
	`88`	`+ $this->stampCreated($lifetime);`
`86`	`89`	`}`
`87`	`90`
`88`	`91`	`/**`
`@@ -134,10 +137,10 @@ public function setName($name)`
`134`	`137`	`$this->name = $name;`
`135`	`138`	`}`
`136`	`139`
`137`		`- private function stampCreated()`
	`140`	`+ private function stampCreated($lifetime = null)`
`138`	`141`	`{`
`139`		`- $timeStamp = time();//(null === $timeStamp) ? time() : $timeStamp;`
	`142`	`+ $timeStamp = time();`
`140`	`143`	`$this->meta['created'] = $this->meta['lastused'] = $this->lastUsed = $timeStamp;`
`141`		`- $this->meta['lifetime'] = ini_get('session.cookie_lifetime');`
	`144`	`+ $this->meta['lifetime'] = (null === $lifetime) ? ini_get('session.cookie_lifetime') : $lifetime;`
`142`	`145`	`}`
`143`	`146`	`}`