Merge branch 'hotfix/3220' into develop

Forward port zendframework/zendframework#3220

src/Writer/MongoDB.php

@@ -13,6 +13,7 @@
 
 use DateTime;
 use Mongo;
+use MongoClient;
 use MongoDate;
 use Traversable;
 use Zend\Log\Exception;
@@ -45,7 +46,7 @@ class MongoDB extends AbstractWriter
     /**
      * Constructor
      *
-     * @param Mongo|array|Traversable $mongo
+     * @param Mongo|MongoClient|array|Traversable $mongo
      * @param string|MongoDB $database
      * @param string $collection
      * @param array $saveOptions
@@ -77,9 +78,9 @@ public function __construct($mongo, $database = null, $collection = null, array
             );
         }
 
-        if (!($mongo instanceof Mongo)) {
+        if (!($mongo instanceof MongoClient || $mongo instanceof Mongo)) {
             throw new Exception\InvalidArgumentException(
-                'Parameter of type %s is invalid; must be Mongo',
+                'Parameter of type %s is invalid; must be MongoClient or Mongo',
                 (is_object($mongo) ? get_class($mongo) : gettype($mongo))
             );
         }

test/Writer/MongoDBTest.php

@@ -32,7 +32,9 @@ public function setUp()
         $this->database = 'zf2_test';
         $this->collection = 'logs';
 
-        $this->mongo = $this->getMockBuilder('Mongo')
+        $mongoClass = (version_compare(phpversion('mongo'), '1.3.0', '<')) ? 'Mongo' : 'MongoClient';
+
+        $this->mongo = $this->getMockBuilder($mongoClass)
             ->disableOriginalConstructor()
             ->setMethods(array('selectCollection'))
             ->getMock();