bug #24448 [Session] fix MongoDb session handler to gc all expired sessions (Tobion)

fabpot · fabpot · commit f961aa024fd6 · 2017-10-05T15:34:50.000-07:00
This PR was merged into the 2.7 branch. Discussion ---------- [Session] fix MongoDb session handler to gc all expired sessions | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no  | BC breaks? | no | Deprecations? | no  | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | MongoDB session handler `gc` wrongly only deleted one random expired session instead of all of them. Care when merging to master as this will conflict with #24447 Commits ------- e6895bf [Session] fix MongoDb session handler to gc all expired sessions
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
@@ -118,7 +118,7 @@ public function destroy($sessionId)
      */
     public function gc($maxlifetime)
     {
-        $methodName = $this->mongo instanceof \MongoDB\Client ? 'deleteOne' : 'remove';
+        $methodName = $this->mongo instanceof \MongoDB\Client ? 'deleteMany' : 'remove';
 
         $this->getCollection()->$methodName(array(
             $this->options['expiry_field'] => array('$lt' => $this->createDateTime()),
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
@@ -291,7 +291,7 @@ public function testGc()
 
         $that = $this;
 
-        $methodName = phpversion('mongodb') ? 'deleteOne' : 'remove';
+        $methodName = phpversion('mongodb') ? 'deleteMany' : 'remove';
 
         $collection->expects($this->once())
             ->method($methodName)

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public function destroy($sessionId)`
`118`	`118`	`*/`
`119`	`119`	`public function gc($maxlifetime)`
`120`	`120`	`{`
`121`		`- $methodName = $this->mongo instanceof \MongoDB\Client ? 'deleteOne' : 'remove';`
	`121`	`+ $methodName = $this->mongo instanceof \MongoDB\Client ? 'deleteMany' : 'remove';`
`122`	`122`
`123`	`123`	`$this->getCollection()->$methodName(array(`
`124`	`124`	`$this->options['expiry_field'] => array('$lt' => $this->createDateTime()),`