symfony
diff --git a/‎src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
Lines changed: 7 additions & 2 deletions b/‎src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
Lines changed: 7 additions & 2 deletions
diff --git a/‎src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
Lines changed: 21 additions & 3 deletions b/‎src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
Lines changed: 21 additions & 3 deletions
@@ -36,13 +36,18 @@ class MongoDbSessionHandler implements \SessionHandlerInterface
     /**
      * Constructor.
      *
-     * @param \Mongo $mongo   A "Mongo" instance
+     * @param object $mongo   A MongoClient or Mongo instance
      * @param array  $options An associative array of field options
      *
+     * @throws \InvalidArgumentException When MongoClient or Mongo instance not provided
      * @throws \InvalidArgumentException When "database" or "collection" not provided
      */
-    public function __construct(\Mongo $mongo, array $options)
+    public function __construct($mongo, array $options)
     {
+        if (!($mongo instanceof \MongoClient || $mongo instanceof \Mongo)) {
+            throw new \InvalidArgumentException('MongoClient or Mongo instance required');
+        }
+
         if (!isset($options['database']) || !isset($options['collection'])) {
             throw new \InvalidArgumentException('You must provide the "database" and "collection" option for MongoDBSessionHandler');
         }
 
@@ -27,11 +27,13 @@ class MongoDbSessionHandlerTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        if (!class_exists('\Mongo')) {
-            $this->markTestSkipped('MongoDbSessionHandler requires the php "mongo" extension');
+        if (!extension_loaded('mongo')) {
+            $this->markTestSkipped('MongoDbSessionHandler requires the PHP "mongo" extension.');
         }
 
-        $this->mongo = $this->getMockBuilder('Mongo')
+        $mongoClass = (version_compare(phpversion('mongo'), '1.3.0', '<')) ? 'Mongo' : 'MongoClient';
+
+        $this->mongo = $this->getMockBuilder($mongoClass)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -46,6 +48,22 @@ protected function setUp()
         $this->storage = new MongoDbSessionHandler($this->mongo, $this->options);
     }
 
+    /**
+     * @expectedException InvalidArgumentException
+     */
+    public function testConstructorShouldThrowExceptionForInvalidMongo()
+    {
+        new MongoDbSessionHandler(new \stdClass(), $this->options);
+    }
+
+    /**
+     * @expectedException InvalidArgumentException
+     */
+    public function testConstructorShouldThrowExceptionForMissingOptions()
+    {
+        new MongoDbSessionHandler($this->mongo, array());
+    }
+
     public function testOpenMethodAlwaysReturnTrue()
     {
         $this->assertTrue($this->storage->open('test', 'test'), 'The "open" method should always return true');
Original file line number	Diff line number	Diff line change
`@@ -36,13 +36,18 @@ class MongoDbSessionHandler implements \SessionHandlerInterface`
`36`	`36`	`/**`
`37`	`37`	`* Constructor.`
`38`	`38`	`*`
`39`		`- * @param \Mongo $mongo A "Mongo" instance`
	`39`	`+ * @param object $mongo A MongoClient or Mongo instance`
`40`	`40`	`* @param array $options An associative array of field options`
`41`	`41`	`*`
	`42`	`+ * @throws \InvalidArgumentException When MongoClient or Mongo instance not provided`
`42`	`43`	`* @throws \InvalidArgumentException When "database" or "collection" not provided`
`43`	`44`	`*/`
`44`		`- public function __construct(\Mongo $mongo, array $options)`
	`45`	`+ public function __construct($mongo, array $options)`
`45`	`46`	`{`
	`47`	`+ if (!($mongo instanceof \MongoClient \|\| $mongo instanceof \Mongo)) {`
	`48`	`+ throw new \InvalidArgumentException('MongoClient or Mongo instance required');`
	`49`	`+ }`
	`50`	`+`
`46`	`51`	`if (!isset($options['database']) \|\| !isset($options['collection'])) {`
`47`	`52`	`throw new \InvalidArgumentException('You must provide the "database" and "collection" option for MongoDBSessionHandler');`
`48`	`53`	`}`