[HttpFoundation] fix session tracking counter

nicolas-grekas · nicolas-grekas · commit 26fc4e683f96 · 2018-06-27T13:36:49.000+02:00
diff --git a/src/Symfony/Component/HttpFoundation/Session/Session.php b/src/Symfony/Component/HttpFoundation/Session/Session.php
@@ -160,7 +160,9 @@ public function getUsageIndex()
      */
     public function isEmpty()
     {
-        ++$this->usageIndex;
+        if ($this->isStarted()) {
+            ++$this->usageIndex;
+        }
         foreach ($this->data as &$data) {
             if (!empty($data)) {
                 return false;
@@ -185,8 +187,6 @@ public function invalidate($lifetime = null)
      */
     public function migrate($destroy = false, $lifetime = null)
     {
-        ++$this->usageIndex;
-
         return $this->storage->regenerate($destroy, $lifetime);
     }
 
@@ -195,8 +195,6 @@ public function migrate($destroy = false, $lifetime = null)
      */
     public function save()
     {
-        ++$this->usageIndex;
-
         $this->storage->save();
     }
 
diff --git a/src/Symfony/Component/HttpFoundation/Session/SessionBagProxy.php b/src/Symfony/Component/HttpFoundation/Session/SessionBagProxy.php
@@ -44,8 +44,6 @@ public function getBag()
      */
     public function isEmpty()
     {
-        ++$this->usageIndex;
-
         return empty($this->data[$this->bag->getStorageKey()]);
     }
 
@@ -81,8 +79,6 @@ public function getStorageKey()
      */
     public function clear()
     {
-        ++$this->usageIndex;
-
         return $this->bag->clear();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,9 @@ public function getUsageIndex()`
`160`	`160`	`*/`
`161`	`161`	`public function isEmpty()`
`162`	`162`	`{`
`163`		`- ++$this->usageIndex;`
	`163`	`+ if ($this->isStarted()) {`
	`164`	`+ ++$this->usageIndex;`
	`165`	`+ }`
`164`	`166`	`foreach ($this->data as &$data) {`
`165`	`167`	`if (!empty($data)) {`
`166`	`168`	`return false;`
`@@ -185,8 +187,6 @@ public function invalidate($lifetime = null)`
`185`	`187`	`*/`
`186`	`188`	`public function migrate($destroy = false, $lifetime = null)`
`187`	`189`	`{`
`188`		`- ++$this->usageIndex;`
`189`		`-`
`190`	`190`	`return $this->storage->regenerate($destroy, $lifetime);`
`191`	`191`	`}`
`192`	`192`
`@@ -195,8 +195,6 @@ public function migrate($destroy = false, $lifetime = null)`
`195`	`195`	`*/`
`196`	`196`	`public function save()`
`197`	`197`	`{`
`198`		`- ++$this->usageIndex;`
`199`		`-`
`200`	`198`	`$this->storage->save();`
`201`	`199`	`}`
`202`	`200`
Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,6 @@ public function getBag()`
`44`	`44`	`*/`
`45`	`45`	`public function isEmpty()`
`46`	`46`	`{`
`47`		`- ++$this->usageIndex;`
`48`		`-`
`49`	`47`	`return empty($this->data[$this->bag->getStorageKey()]);`
`50`	`48`	`}`
`51`	`49`
`@@ -81,8 +79,6 @@ public function getStorageKey()`
`81`	`79`	`*/`
`82`	`80`	`public function clear()`
`83`	`81`	`{`
`84`		`- ++$this->usageIndex;`
`85`		`-`
`86`	`82`	`return $this->bag->clear();`
`87`	`83`	`}`
`88`	`84`	`}`