Merge branch '2.3' into 2.7

Tobion · Tobion · commit 9ea4bce052e1 · 2015-10-29T11:45:39.000+01:00
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
@@ -34,6 +34,7 @@ protected function setUp()
         $mongoClass = version_compare(phpversion('mongo'), '1.3.0', '<') ? 'Mongo' : 'MongoClient';
 
         $this->mongo = $this->getMockBuilder($mongoClass)
+            ->disableOriginalConstructor()
             ->getMock();
 
         $this->options = array(
@@ -241,13 +242,8 @@ public function testGc()
 
     private function createMongoCollectionMock()
     {
-        $mongoClient = $this->getMockBuilder('MongoClient')
-            ->getMock();
-        $mongoDb = $this->getMockBuilder('MongoDB')
-            ->setConstructorArgs(array($mongoClient, 'database-name'))
-            ->getMock();
         $collection = $this->getMockBuilder('MongoCollection')
-            ->setConstructorArgs(array($mongoDb, 'collection-name'))
+            ->disableOriginalConstructor()
             ->getMock();
 
         return $collection;
