Update code for properly work with mongodb 3.6-4.0

docker/php/init.sh

@@ -64,6 +64,8 @@ then
     if [[ ${PHP_VERSION:0:2} == "5." ]];
     then
         pecl install xdebug-2.5.5;
+        echo "mongo.native_long=0" >> /usr/local/etc/php/conf.d/mongo.ini
+        echo "mongo.long_as_object=1" >> /usr/local/etc/php/conf.d/mongo.ini
     else
         pecl install xdebug;
     fi

src/Collection.php

@@ -232,6 +232,12 @@ public function delete()
     {
         $status = $this->getMongoCollection()->drop();
 
+        // Drop function in mongodb >= 3.6 with unacknowledged write concern return empty result
+        if ($status === array()) {
+            $writeConcern = $this->getWriteConcern();
+            $status = ($writeConcern['w'] === 0 ? array('ok' => 1):array('ok' => 0, 'errmsg' => 'unknown error'));
+        }
+
         if ($status['ok'] != 1) {
             // check if collection exists
             if ('ns not found' !== $status['errmsg']) {
@@ -1038,6 +1044,18 @@ public function aggregate(
             } else {
                 throw new FeatureNotSupportedException('Aggregate cursor supported from driver version 1.5');
             }
+        } else {
+            if (
+                empty($options['explain']) &&
+                version_compare(\MongoClient::VERSION, '1.5.0', '>=') &&
+                version_compare($this->database->getClient()->getDbVersion(), '2.6', '>=')
+            ) {
+                try {
+                    return iterator_to_array($this->getMongoCollection()->aggregateCursor($pipeline, $options), false);
+                } catch (\Exception $e) {
+                    throw new Exception('Aggregate error: ' . $e->getMessage());
+                }
+            }
         }
 
         // prepare command

src/Cursor.php

@@ -765,17 +765,20 @@ public function findAndRemove()
      */
     public function findAndUpdate(Operator $operator, $upsert = false, $returnUpdated = true)
     {
+        $options = array(
+            'new' => $returnUpdated,
+            'upsert' => $upsert,
+        );
+        if ($this->sort) {
+            $options['sort'] = $this->sort;
+        }
         $mongoDocument = $this->collection
             ->getMongoCollection()
             ->findAndModify(
                 $this->expression->toArray(),
                 $operator ? $operator->toArray() : null,
                 $this->projection,
-                array(
-                    'new' => $returnUpdated,
-                    'sort' => $this->sort,
-                    'upsert' => $upsert,
-                )
+                $options
             );
 
         if (empty($mongoDocument)) {

tests/AggregatePipelineTest.php

@@ -361,21 +361,51 @@ public function testAggregate_ServerSideError()
             ))
             ->getMock();
 
-        $mongoDatabaseMock
-            ->expects($this->once())
-            ->method('command')
-            ->will($this->returnValue(array(
-                'ok' => (double) 0,
-                'errmsg' => 'some_error',
-                'code' => 1785342,
-            )));
-
         $database = new Database($this->collection->getDatabase()->getClient(), $mongoDatabaseMock);
-        $database
-            ->getCollection('phpmongo_test_collection')
-            ->aggregate(array(
-                array('$match' => array('field' => 'value'))
-            ));
+
+        $pipeline = array(
+            array('$match' => array('field' => 'value'))
+        );
+
+        if (
+            version_compare(\MongoClient::VERSION, '1.5.0', '>=') &&
+            version_compare($database->getClient()->getDbVersion(), '2.6', '>=')
+        ) {
+            $mongoCollectionMock = $this->getMockBuilder('\MongoCollection')
+                ->setMethods(['aggregateCursor'])
+                ->setConstructorArgs([$mongoDatabaseMock, 'phpmongo_test_collection'])
+                ->getMock()
+            ;
+            $mongoCollectionMock
+                ->method('aggregateCursor')
+                ->willThrowException(new \Exception('some_error'))
+            ;
+
+            $collectionMock = $this->getMockBuilder('Sokil\Mongo\Collection')
+                ->setMethods(['getMongoCollection'])
+                ->setConstructorArgs([$database, 'phpmongo_test_collection'])
+                ->getMock()
+            ;
+            $collectionMock
+                ->method('getMongoCollection')
+                ->willReturn($mongoCollectionMock)
+            ;
+
+            $collectionMock->aggregate($pipeline);
+        } else {
+            $mongoDatabaseMock
+                ->expects($this->once())
+                ->method('command')
+                ->willReturn(array(
+                    'ok' => (double)0,
+                    'errmsg' => 'some_error',
+                    'code' => 1785342,
+                ));
+
+            $database
+                ->getCollection('phpmongo_test_collection')
+                ->aggregate($pipeline);
+        }
     }
 
     public function testAggregate_ExplainOption()

tests/CollectionTest.php

@@ -533,6 +533,60 @@ public function testDeleteCollection_ExceptionOnCollectionDeleteError()
         $collection->delete();
     }
 
+    public function testDeleteCollection_WithUnacknowledgedWriteConcernAndEmptyResultStatus()
+    {
+        $this->collectionMock = $this
+            ->getMockBuilder('\MongoCollection')
+            ->setMethods(array('drop','getWriteConcern'))
+            ->setConstructorArgs(array(
+                $this->database->getMongoDB(),
+                'phpmongo_test_collection',
+            ))
+            ->getMock();
+
+        $this->collectionMock
+            ->expects($this->once())
+            ->method('drop')
+            ->willReturn(array());
+
+        $this->collectionMock
+            ->expects($this->once())
+            ->method('getWriteConcern')
+            ->willReturn(array('w' => 0));
+
+        $collection = new Collection($this->database, $this->collectionMock);
+        $collection->delete();
+    }
+
+    /**
+     * @expectedException \Sokil\Mongo\Exception
+     * @expectedExceptionMessage Error deleting collection phpmongo_test_collection: unknown error
+     */
+    public function testDeleteCollection_WithAcknowledgedWriteConcernAndEmptyResultStatus()
+    {
+        $this->collectionMock = $this
+            ->getMockBuilder('\MongoCollection')
+            ->setMethods(array('drop','getWriteConcern'))
+            ->setConstructorArgs(array(
+                $this->database->getMongoDB(),
+                'phpmongo_test_collection',
+            ))
+            ->getMock();
+
+        $this->collectionMock
+            ->expects($this->once())
+            ->method('drop')
+            ->willReturn(array());
+
+        $this->collectionMock
+            ->expects($this->once())
+            ->method('getWriteConcern')
+            ->willReturn(array('w' => 1));
+
+        $collection = new Collection($this->database, $this->collectionMock);
+        $collection->delete();
+    }
+
     public function testDeleteDocuments_ExpressionAsArray()
     {
         // add

tests/DocumentValidationTest.php

@@ -778,7 +778,7 @@ public function testIsValid_FieldEmail()
 
         try {
             // additional MX check on wrong email
-            $document->set('some-field-name-mx', 'user@example.com');
+            $document->set('some-field-name-mx', 'user@example');
             $this->assertFalse($document->isValid());
 
             // additional MX check on valid email