Remove obsolete skips and tests for MongoDB 4.0

Author: alcaeus

tests/FunctionalTestCase.php

@@ -215,10 +215,6 @@ protected function assertSameObjectId($expectedObjectId, $actualObjectId): void
      */
     public function configureFailPoint(array|stdClass $command, ?Server $server = null): void
     {
-        if (! $this->isFailCommandSupported()) {
-            $this->markTestSkipped('failCommand is only supported on mongod >= 4.0.0 and mongos >= 4.1.5.');
-        }
-
         if (! $this->isFailCommandEnabled()) {
             $this->markTestSkipped('The enableTestCommands parameter is not enabled.');
         }
@@ -512,15 +508,7 @@ protected function skipIfTransactionsAreNotSupported(): void
         }
 
         if ($this->isShardedCluster()) {
-            if (version_compare($this->getFeatureCompatibilityVersion(), '4.2', '<')) {
-                $this->markTestSkipped('Transactions are only supported on FCV 4.2 or higher');
-            }
-
-            return;
-        }
-
-        if (version_compare($this->getFeatureCompatibilityVersion(), '4.0', '<')) {
-            $this->markTestSkipped('Transactions are only supported on FCV 4.0 or higher');
+            $this->markTestSkipped('Transactions are only supported on FCV 4.2 or higher');
         }
 
         if ($this->getServerStorageEngine() !== 'wiredTiger') {
@@ -698,16 +686,6 @@ private static function getUriWithoutMultipleMongoses(): string
         return $uri;
     }
 
-    /**
-     * Checks if the failCommand command is supported on this server version
-     */
-    private function isFailCommandSupported(): bool
-    {
-        $minVersion = $this->isShardedCluster() ? '4.1.5' : '4.0.0';
-
-        return version_compare($this->getServerVersion(), $minVersion, '>=');
-    }
-
     /**
      * Checks if the failCommand command is enabled by checking the enableTestCommands parameter
      */

tests/Operation/ExplainFunctionalTest.php

@@ -307,8 +307,6 @@ public function testUpdateOne($verbosity, $executionStatsExpected, $allPlansExec
 
     public function testAggregate(): void
     {
-        $this->skipIfServerVersion('<', '4.0.0', 'Explaining aggregate command requires server version >= 4.0');
-
         $this->createFixtures(3);
 
         // Use a $sort stage to ensure the aggregate does not get optimised to a query

tests/Operation/WatchFunctionalTest.php

@@ -6,7 +6,6 @@
 use Generator;
 use Iterator;
 use MongoDB\BSON\Document;
-use MongoDB\BSON\TimestampInterface;
 use MongoDB\ChangeStream;
 use MongoDB\Codec\DecodeIfSupported;
 use MongoDB\Codec\DocumentCodec;
@@ -106,44 +105,6 @@ public function encode($value): Document
         ];
     }
 
-    /**
-     * Prose test 1: "ChangeStream must continuously track the last seen
-     * resumeToken"
-     */
-    #[DataProvider('provideCodecOptions')]
-    public function testGetResumeToken(array $options, Closure $getIdentifier): void
-    {
-        $this->skipIfServerVersion('>=', '4.0.7', 'postBatchResumeToken is supported');
-
-        $operation = new Watch(
-            $this->manager,
-            $this->getDatabaseName(),
-            $this->getCollectionName(),
-            [],
-            $options + $this->defaultOptions,
-        );
-        $changeStream = $operation->execute($this->getPrimaryServer());
-
-        $changeStream->rewind();
-        $this->assertFalse($changeStream->valid());
-        $this->assertNull($changeStream->getResumeToken());
-
-        $this->insertDocument(['x' => 1]);
-        $this->insertDocument(['x' => 2]);
-
-        $this->advanceCursorUntilValid($changeStream);
-        $this->assertSameDocument($getIdentifier($changeStream->current()), $changeStream->getResumeToken());
-
-        $changeStream->next();
-        $this->assertTrue($changeStream->valid());
-        $this->assertSameDocument($getIdentifier($changeStream->current()), $changeStream->getResumeToken());
-
-        $this->insertDocument(['x' => 3]);
-
-        $this->advanceCursorUntilValid($changeStream);
-        $this->assertSameDocument($getIdentifier($changeStream->current()), $changeStream->getResumeToken());
-    }
-
     /**
      * Prose test 1: "ChangeStream must continuously track the last seen
      * resumeToken"
@@ -165,8 +126,6 @@ public function testGetResumeToken(array $options, Closure $getIdentifier): void
     #[DataProvider('provideCodecOptions')]
     public function testGetResumeTokenWithPostBatchResumeToken(array $options, Closure $getIdentifier): void
     {
-        $this->skipIfServerVersion('<', '4.0.7', 'postBatchResumeToken is not supported');
-
         $operation = new Watch(
             $this->manager,
             $this->getDatabaseName(),
@@ -267,8 +226,6 @@ function (array $event) use (&$commands): void {
 
     public function testResumeBeforeReceivingAnyResultsIncludesPostBatchResumeToken(): void
     {
-        $this->skipIfServerVersion('<', '4.0.7', 'postBatchResumeToken is not supported');
-
         $operation = new Watch($this->manager, $this->getDatabaseName(), $this->getCollectionName(), [], $this->defaultOptions);
 
         $events = [];
@@ -330,79 +287,6 @@ private function assertResumeAfter($expectedResumeToken, stdClass $command): voi
         $this->assertEquals($expectedResumeToken, $command->pipeline[0]->{'$changeStream'}->resumeAfter);
     }
 
-    /**
-     * Prose test 9: "$changeStream stage for ChangeStream against a server
-     * >=4.0 and <4.0.7 that has not received any results yet MUST include a
-     * startAtOperationTime option when resuming a changestream."
-     */
-    public function testResumeBeforeReceivingAnyResultsIncludesStartAtOperationTime(): void
-    {
-        $this->skipIfServerVersion('>=', '4.0.7', 'postBatchResumeToken takes precedence over startAtOperationTime');
-
-        $operation = new Watch($this->manager, $this->getDatabaseName(), $this->getCollectionName(), [], $this->defaultOptions);
-
-        $events = [];
-
-        (new CommandObserver())->observe(
-            function () use ($operation, &$changeStream): void {
-                $changeStream = $operation->execute($this->getPrimaryServer());
-            },
-            function (array $event) use (&$events): void {
-                $events[] = $event;
-            },
-        );
-
-        $this->assertCount(1, $events);
-        $this->assertSame('aggregate', $events[0]['started']->getCommandName());
-        $reply = $events[0]['succeeded']->getReply();
-        $this->assertObjectHasProperty('operationTime', $reply);
-        $operationTime = $reply->operationTime;
-        $this->assertInstanceOf(TimestampInterface::class, $operationTime);
-
-        $this->assertFalse($changeStream->valid());
-        $this->forceChangeStreamResume();
-
-        $this->assertNoCommandExecuted(function () use ($changeStream): void {
-            $changeStream->rewind();
-        });
-
-        $events = [];
-
-        (new CommandObserver())->observe(
-            function () use ($changeStream): void {
-                $changeStream->next();
-            },
-            function (array $event) use (&$events): void {
-                $events[] = $event;
-            },
-        );
-
-        $this->assertCount(3, $events);
-
-        $this->assertSame('getMore', $events[0]['started']->getCommandName());
-        $this->assertArrayHasKey('failed', $events[0]);
-
-        $this->assertSame('aggregate', $events[1]['started']->getCommandName());
-        $this->assertStartAtOperationTime($operationTime, $events[1]['started']->getCommand());
-        $this->assertArrayHasKey('succeeded', $events[1]);
-
-        // Original cursor is freed immediately after the change stream resumes
-        $this->assertSame('killCursors', $events[2]['started']->getCommandName());
-        $this->assertArrayHasKey('succeeded', $events[2]);
-
-        $this->assertFalse($changeStream->valid());
-    }
-
-    private function assertStartAtOperationTime(TimestampInterface $expectedOperationTime, stdClass $command): void
-    {
-        $this->assertObjectHasProperty('pipeline', $command);
-        $this->assertIsArray($command->pipeline);
-        $this->assertArrayHasKey(0, $command->pipeline);
-        $this->assertObjectHasProperty('$changeStream', $command->pipeline[0]);
-        $this->assertObjectHasProperty('startAtOperationTime', $command->pipeline[0]->{'$changeStream'});
-        $this->assertEquals($expectedOperationTime, $command->pipeline[0]->{'$changeStream'}->startAtOperationTime);
-    }
-
     public function testRewindMultipleTimesWithResults(): void
     {
         $this->skipIfIsShardedCluster('Cursor needs to be advanced multiple times and can\'t be rewound afterwards.');
@@ -1319,8 +1203,6 @@ function (array $aggregateCommand) {
      */
     public function testErrorDuringAggregateCommandDoesNotCauseResume(): void
     {
-        $this->skipIfServerVersion('<', '4.0.0', 'failCommand is not supported');
-
         $operation = new Watch($this->manager, $this->getDatabaseName(), $this->getCollectionName(), [], $this->defaultOptions);
 
         $commandCount = 0;
@@ -1382,39 +1264,6 @@ public function testOriginalReadPreferenceIsPreservedOnResume(): void
         self::assertTrue($cursor->getServer()->isSecondary());
     }
 
-    /**
-     * Prose test 12
-     * For a ChangeStream under these conditions:
-     * - Running against a server <4.0.7.
-     * - The batch is empty or has been iterated to the last document.
-     * Expected result:
-     * - getResumeToken must return the _id of the last document returned if one exists.
-     * - getResumeToken must return resumeAfter from the initial aggregate if the option was specified.
-     * - If resumeAfter was not specified, the getResumeToken result must be empty.
-     */
-    public function testGetResumeTokenReturnsOriginalResumeTokenOnEmptyBatch(): void
-    {
-        $this->skipIfServerVersion('>=', '4.0.7', 'postBatchResumeToken is supported');
-
-        $operation = new Watch($this->manager, $this->getDatabaseName(), $this->getCollectionName(), [], $this->defaultOptions);
-        $changeStream = $operation->execute($this->getPrimaryServer());
-
-        $this->assertNull($changeStream->getResumeToken());
-
-        $this->insertDocument(['x' => 1]);
-
-        $changeStream->next();
-        $this->assertTrue($changeStream->valid());
-        $resumeToken = $changeStream->getResumeToken();
-        $this->assertSame($resumeToken, $changeStream->current()->_id);
-
-        $options = ['resumeAfter' => $resumeToken] + $this->defaultOptions;
-        $operation = new Watch($this->manager, $this->getDatabaseName(), $this->getCollectionName(), [], $options);
-        $changeStream = $operation->execute($this->getPrimaryServer());
-
-        $this->assertSame($resumeToken, $changeStream->getResumeToken());
-    }
-
     /**
      * Prose test 14
      * For a ChangeStream under these conditions:
@@ -1429,7 +1278,6 @@ public function testGetResumeTokenReturnsOriginalResumeTokenOnEmptyBatch(): void
     #[DataProvider('provideCodecOptions')]
     public function testResumeTokenBehaviour(array $options, Closure $getIdentifier): void
     {
-        $this->skipIfServerVersion('<', '4.1.1', 'Testing resumeAfter and startAfter can only be tested on servers >= 4.1.1');
         $this->skipIfIsShardedCluster('Resume token behaviour can\'t be reliably tested on sharded clusters.');
 
         $operation = new Watch(