Merge branch '2.8' into 3.3

fabpot · fabpot · commit 307ddb92a4c4 · 2017-10-05T16:10:23.000-07:00
* 2.8:
  bumped Symfony version to 2.7.36
  updated VERSION for 2.7.35
  update CONTRIBUTORS for 2.7.35
  updated CHANGELOG for 2.7.35
  [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
@@ -285,7 +285,7 @@ public function testGc()
             ->with($this->options['database'], $this->options['collection'])
             ->will($this->returnValue($collection));
 
-        $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()),`