Merge pull request #403

tests/Operation/AggregateFunctionalTest.php

@@ -9,8 +9,6 @@ use stdClass;
 
 class AggregateFunctionalTest extends FunctionalTestCase
 {
-    private static $wireVersionForCursor = 2;
-
     public function testDefaultReadConcernIsOmitted()
     {
         (new CommandObserver)->observe(

tests/Operation/CreateIndexesFunctionalTest.php

@@ -164,7 +164,7 @@ class CreateIndexesFunctionalTest extends FunctionalTestCase
         /* Earlier server versions do not support the createIndexes command. Per
          * the Index Management specification, inserts on system.indexes must
          * use the write concern {w:1}. */
-        if (version_compare($this->getServerVersion(), '2.6.0', '<')) {
+        if ( ! \MongoDB\server_supports_feature($this->getPrimaryServer(), self::$wireVersionForCommand)) {
             $this->markTestSkipped('createIndexes command is not supported');
         }