Update code for mongodb 3.6-4.0 work properly

Author: MCubs

src/Collection.php

@@ -232,6 +232,11 @@ public function delete()
     {
         $status = $this->getMongoCollection()->drop();
 
+        if ($status === array()) {
+            $writeConcern = $this->getWriteConcern();
+            $status['ok'] = ($writeConcern['w'] === 0 ? 1:0);
+        }
+
         if ($status['ok'] != 1) {
             // check if collection exists
             if ('ns not found' !== $status['errmsg']) {
@@ -1038,6 +1043,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

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/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