Aggregate should check server support before returning a cursor

Author: jmikola

src/Operation/Aggregate.php

@@ -113,10 +113,12 @@ public function __construct($databaseName, $collectionName, array $pipeline, arr
      */
     public function execute(Server $server)
     {
-        $command = $this->createCommand($server);
+        $isCursorSupported = \MongoDB\server_supports_feature($server, self::$wireVersionForCursor);
+
+        $command = $this->createCommand($server, $isCursorSupported);
         $cursor = $server->executeCommand($this->databaseName, $command);
 
-        if ($this->options['useCursor']) {
+        if ($isCursorSupported && $this->options['useCursor']) {
             return $cursor;
         }
 
@@ -139,18 +141,19 @@ function (stdClass $document) { return (array) $document; },
     /**
      * Create the aggregate command.
      *
-     * @param Server $server
+     * @param Server  $server
+     * @param boolean $isCursorSupported
      * @return Command
      */
-    private function createCommand(Server $server)
+    private function createCommand(Server $server, $isCursorSupported)
     {
         $cmd = array(
             'aggregate' => $this->collectionName,
             'pipeline' => $this->pipeline,
         );
 
         // Servers < 2.6 do not support any command options
-        if ( ! \MongoDB\server_supports_feature($server, self::$wireVersionForCursor)) {
+        if ( ! $isCursorSupported) {
             return new Command($cmd);
         }