Merge branch 'hotfix/3221' into develop

Close zendframework/zendframework#3221

src/SaveHandler/MongoDB.php

@@ -54,12 +54,19 @@ class MongoDB implements SaveHandlerInterface
     /**
      * Constructor
      *
-     * @param Mongo $mongo
+     * @param Mongo|MongoClient $mongo
      * @param MongoDBOptions $options
      * @throws Zend\Session\Exception\InvalidArgumentException
      */
-    public function __construct(Mongo $mongo, MongoDBOptions $options)
+    public function __construct($mongo, MongoDBOptions $options)
     {
+        if (!($mongo instanceof \MongoClient || $mongo instanceof \Mongo)) {
+            throw new InvalidArgumentException(
+                'Parameter of type %s is invalid; must be MongoClient or Mongo',
+                (is_object($mongo) ? get_class($mongo) : gettype($mongo))
+            );
+        }
+
         if (null === ($database = $options->getDatabase())) {
             throw new InvalidArgumentException('The database option cannot be emtpy');
         }

test/SaveHandler/MongoDBTest.php

@@ -23,7 +23,7 @@
 class MongoDBTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var Mongo
+     * @var Mongo|MongoClient
      */
     protected $mongo;
 
@@ -55,7 +55,9 @@ public function setUp()
             'collection' => 'sessions',
         ));
 
-        $this->mongo = new Mongo();
+        $mongoClass = (version_compare(phpversion('mongo'), '1.3.0', '<')) ? '\Mongo' : '\MongoClient';
+
+        $this->mongo = new $mongoClass();
         $this->mongoCollection = $this->mongo->selectCollection($this->options->getDatabase(), $this->options->getCollection());
     }