PHPLIB-1680: Remove pre-4.2 wire version checks and test code

psalm-baseline.xml

@@ -813,9 +813,6 @@
     </PossiblyInvalidArgument>
   </file>
   <file src="src/Operation/Update.php">
-    <MixedArgument>
-      <code><![CDATA[$this->options['writeConcern']]]></code>
-    </MixedArgument>
     <MixedAssignment>
       <code><![CDATA[$cmd['bypassDocumentValidation']]]></code>
       <code><![CDATA[$options[$option]]]></code>

src/Collection.php

@@ -87,8 +87,6 @@ class Collection implements Stringable
         'root' => BSONDocument::class,
     ];
 
-    private const WIRE_VERSION_FOR_READ_CONCERN_WITH_WRITE_STAGE = 8;
-
     /** @psalm-var Encoder<array|stdClass|Document|PackedArray, mixed> */
     private readonly Encoder $builderEncoder;
 
@@ -236,24 +234,17 @@ public function aggregate(array|Pipeline $pipeline, array $options = []): Cursor
         $hasWriteStage = is_last_pipeline_operator_write($pipeline);
 
         $options = $this->inheritReadPreference($options);
-
-        $server = $hasWriteStage
-            ? select_server_for_aggregate_write_stage($this->manager, $options)
-            : select_server($this->manager, $options);
-
-        /* MongoDB 4.2 and later supports a read concern when an $out stage is
-         * being used, but earlier versions do not.
-         */
-        if (! $hasWriteStage || server_supports_feature($server, self::WIRE_VERSION_FOR_READ_CONCERN_WITH_WRITE_STAGE)) {
-            $options = $this->inheritReadConcern($options);
-        }
-
+        $options = $this->inheritReadConcern($options);
         $options = $this->inheritCodecOrTypeMap($options);
 
         if ($hasWriteStage) {
             $options = $this->inheritWriteOptions($options);
         }
 
+        $server = $hasWriteStage
+            ? select_server_for_aggregate_write_stage($this->manager, $options)
+            : select_server($this->manager, $options);
+
         $operation = new Aggregate($this->databaseName, $this->collectionName, $pipeline, $options);
 
         return $operation->execute($server);

src/Database.php

@@ -66,8 +66,6 @@ class Database implements Stringable
         'root' => BSONDocument::class,
     ];
 
-    private const WIRE_VERSION_FOR_READ_CONCERN_WITH_WRITE_STAGE = 8;
-
     /** @psalm-var Encoder<array|stdClass|Document|PackedArray, mixed> */
     private readonly Encoder $builderEncoder;
 
@@ -229,8 +227,7 @@ public function aggregate(array|Pipeline $pipeline, array $options = []): Cursor
          */
         if (
             ! isset($options['readConcern']) &&
-            ! is_in_transaction($options) &&
-            ( ! $hasWriteStage || server_supports_feature($server, self::WIRE_VERSION_FOR_READ_CONCERN_WITH_WRITE_STAGE))
+            ! is_in_transaction($options)
         ) {
             $options['readConcern'] = $this->readConcern;
         }

src/Operation/FindAndModify.php

@@ -55,8 +55,6 @@ final class FindAndModify implements Explainable
 {
     private const WIRE_VERSION_FOR_HINT = 9;
 
-    private const WIRE_VERSION_FOR_UNSUPPORTED_OPTION_SERVER_SIDE_ERROR = 8;
-
     private array $options;
 
     /**
@@ -227,12 +225,6 @@ public function __construct(private string $databaseName, private string $collec
      */
     public function execute(Server $server): array|object|null
     {
-        /* Server versions >= 4.2.0 raise errors for unsupported update options.
-         * For previous versions, the CRUD spec requires a client-side error. */
-        if (isset($this->options['hint']) && ! server_supports_feature($server, self::WIRE_VERSION_FOR_UNSUPPORTED_OPTION_SERVER_SIDE_ERROR)) {
-            throw UnsupportedException::hintNotSupported();
-        }
-
         /* CRUD spec requires a client-side error when using "hint" with an
          * unacknowledged write concern on an unsupported server. */
         if (

src/Operation/Update.php

@@ -32,8 +32,6 @@
 use function MongoDB\is_document;
 use function MongoDB\is_first_key_operator;
 use function MongoDB\is_pipeline;
-use function MongoDB\is_write_concern_acknowledged;
-use function MongoDB\server_supports_feature;
 
 /**
  * Operation for the update command.
@@ -46,8 +44,6 @@
  */
 final class Update implements Explainable
 {
-    private const WIRE_VERSION_FOR_HINT = 8;
-
     private array $options;
 
     /**
@@ -176,15 +172,6 @@ public function __construct(private string $databaseName, private string $collec
      */
     public function execute(Server $server): UpdateResult
     {
-        /* CRUD spec requires a client-side error when using "hint" with an
-         * unacknowledged write concern on an unsupported server. */
-        if (
-            isset($this->options['writeConcern']) && ! is_write_concern_acknowledged($this->options['writeConcern']) &&
-            isset($this->options['hint']) && ! server_supports_feature($server, self::WIRE_VERSION_FOR_HINT)
-        ) {
-            throw UnsupportedException::hintNotSupported();
-        }
-
         $inTransaction = isset($this->options['session']) && $this->options['session']->isInTransaction();
         if ($inTransaction && isset($this->options['writeConcern'])) {
             throw UnsupportedException::writeConcernNotSupportedInTransaction();

tests/Collection/BuilderCollectionFunctionalTest.php

@@ -231,8 +231,6 @@ public function testUpdateOne(): void
 
     public function testUpdateWithPipeline(): void
     {
-        $this->skipIfServerVersion('<', '4.2.0', 'Pipeline-style updates are not supported');
-
         $result = $this->collection->updateOne(
             Query::query(x: Query::lt(2)),
             new Pipeline(
@@ -259,8 +257,6 @@ public function testUpdateMany(): void
 
     public function testUpdateManyWithPipeline(): void
     {
-        $this->skipIfServerVersion('<', '4.2.0', 'Pipeline-style updates are not supported');
-
         $result = $this->collection->updateMany(
             Query::query(x: Query::gt(1)),
             new Pipeline(

tests/FunctionalTestCase.php

@@ -469,10 +469,6 @@ protected function skipIfCausalConsistencyIsNotSupported(): void
 
     protected function skipIfClientSideEncryptionIsNotSupported(): void
     {
-        if (version_compare($this->getFeatureCompatibilityVersion(), '4.2', '<')) {
-            $this->markTestSkipped('Client Side Encryption only supported on FCV 4.2 or higher');
-        }
-
         if (static::getModuleInfo('libmongocrypt') === 'disabled') {
             $this->markTestSkipped('Client Side Encryption is not enabled in the MongoDB extension');
         }
@@ -495,10 +491,6 @@ protected function skipIfTransactionsAreNotSupported(): void
             $this->markTestSkipped('Transactions are not supported on standalone servers');
         }
 
-        if ($this->isShardedCluster()) {
-            $this->markTestSkipped('Transactions are only supported on FCV 4.2 or higher');
-        }
-
         if ($this->getServerStorageEngine() !== 'wiredTiger') {
             $this->markTestSkipped('Transactions require WiredTiger storage engine');
         }

tests/Operation/BulkWriteFunctionalTest.php

@@ -18,7 +18,7 @@
 use PHPUnit\Framework\Attributes\Depends;
 use stdClass;
 
 use function is_array;
 
 class BulkWriteFunctionalTest extends FunctionalTestCase
 {
@@ -198,10 +198,6 @@
     #[DataProvider('provideUpdatePipelines')]
     public function testUpdateDocuments($update, $expectedUpdate): void
     {
-        if (is_array($expectedUpdate)) {
-            $this->skipIfServerVersion('<', '4.2.0', 'Pipeline-style updates are not supported');
-        }
-
         (new CommandObserver())->observe(
             function () use ($update): void {
                 $operation = new BulkWrite(
@@ -423,8 +419,6 @@
 
     public function testBulkWriteWithPipelineUpdates(): void
     {
-        $this->skipIfServerVersion('<', '4.2.0', 'Pipeline-style updates are not supported');
-
         $this->createFixtures(4);
 
         $ops = [

tests/Operation/ExplainFunctionalTest.php

@@ -322,8 +322,6 @@ public function testAggregate(): void
     #[DataProvider('provideVerbosityInformation')]
     public function testAggregateOptimizedToQuery($verbosity, $executionStatsExpected, $allPlansExecutionExpected): void
     {
-        $this->skipIfServerVersion('<', '4.2.0', 'MongoDB < 4.2 does not optimize simple aggregation pipelines');
-
         $this->createFixtures(3);
 
         $pipeline = [['$match' => ['_id' => ['$ne' => 2]]]];

tests/Operation/FindAndModifyFunctionalTest.php

@@ -126,22 +126,6 @@ function (array $event): void {
         );
     }
 
-    public function testHintOptionUnsupportedClientSideError(): void
-    {
-        $this->skipIfServerVersion('>=', '4.2.0', 'server reports error for unsupported findAndModify options');
-
-        $operation = new FindAndModify(
-            $this->getDatabaseName(),
-            $this->getCollectionName(),
-            ['remove' => true, 'hint' => '_id_'],
-        );
-
-        $this->expectException(UnsupportedException::class);
-        $this->expectExceptionMessage('Hint is not supported by the server executing this operation');
-
-        $operation->execute($this->getPrimaryServer());
-    }
-
     public function testHintOptionAndUnacknowledgedWriteConcernUnsupportedClientSideError(): void
     {
         $this->skipIfServerVersion('>=', '4.4.0', 'hint is supported');

tests/Operation/UpdateFunctionalTest.php

@@ -7,7 +7,7 @@
 use MongoDB\Driver\BulkWrite;
 use MongoDB\Driver\Exception\LogicException;
 use MongoDB\Driver\WriteConcern;
 use MongoDB\Exception\UnsupportedException;
 use MongoDB\Operation\Update;
 use MongoDB\Tests\CommandObserver;
 use MongoDB\UpdateResult;
@@ -15,7 +15,7 @@
 use PHPUnit\Framework\Attributes\Depends;
 use stdClass;
 
 use function is_array;
 
 class UpdateFunctionalTest extends FunctionalTestCase
 {
@@ -54,10 +54,6 @@
     #[DataProvider('provideReplacementDocumentLikePipeline')]
     public function testUpdateDocuments($update, $expectedUpdate): void
     {
-        if (is_array($expectedUpdate)) {
-            $this->skipIfServerVersion('<', '4.2.0', 'Pipeline-style updates are not supported');
-        }
-
         (new CommandObserver())->observe(
             function () use ($update): void {
                 $operation = new Update(
@@ -148,24 +144,6 @@
         );
     }
 
-    public function testHintOptionAndUnacknowledgedWriteConcernUnsupportedClientSideError(): void
-    {
-        $this->skipIfServerVersion('>=', '4.2.0', 'hint is supported');
-
-        $operation = new Update(
-            $this->getDatabaseName(),
-            $this->getCollectionName(),
-            ['_id' => 1],
-            ['$inc' => ['x' => 1]],
-            ['hint' => '_id_', 'writeConcern' => new WriteConcern(0)],
-        );
-
-        $this->expectException(UnsupportedException::class);
-        $this->expectExceptionMessage('Hint is not supported by the server executing this operation');
-
-        $operation->execute($this->getPrimaryServer());
-    }
-
     public function testUpdateOne(): void
     {
         $this->createFixtures(3);

tests/SpecTests/PrimaryStepDownSpecTest.php

@@ -72,43 +72,6 @@ public function testNotPrimaryKeepsConnectionPool(): void
         $this->assertSame($totalConnectionsCreated, $this->getTotalConnectionsCreated());
     }
 
-    /** @see https://github.com/mongodb/specifications/tree/master/source/connections-survive-step-down/tests#not-primary-reset-connection-pool */
-    public function testNotPrimaryResetConnectionPool(): void
-    {
-        $runOn = [(object) ['minServerVersion' => '4.0.0', 'maxServerVersion' => '4.0.999', 'topology' => [self::TOPOLOGY_REPLICASET]]];
-        $this->checkServerRequirements($runOn);
-
-        // Set a fail point
-        $this->configureFailPoint([
-            'configureFailPoint' => 'failCommand',
-            'mode' => ['times' => 1],
-            'data' => [
-                'failCommands' => ['insert'],
-                'errorCode' => self::NOT_PRIMARY,
-            ],
-        ]);
-
-        $totalConnectionsCreated = $this->getTotalConnectionsCreated();
-
-        // Execute an insert into the test collection of a {test: 1} document.
-        try {
-            $this->insertDocuments(1);
-        } catch (BulkWriteException $e) {
-            // Verify that the insert failed with an operation failure with 10107 code.
-            $this->assertSame(self::NOT_PRIMARY, $e->getCode());
-        }
-
-        /* Verify that the connection pool has been cleared and that a new
-         * connection has been created. Use ">=" to allow for the possibility
-         * that the server created additional connections unrelated to this
-         * test. */
-        $this->assertGreaterThanOrEqual($totalConnectionsCreated + 1, $this->getTotalConnectionsCreated());
-
-        // Execute an insert into the test collection of a {test: 1} document and verify that it succeeds.
-        $result = $this->insertDocuments(1);
-        $this->assertSame(1, $result->getInsertedCount());
-    }
-
     /** @see https://github.com/mongodb/specifications/tree/master/source/connections-survive-step-down/tests#shutdown-in-progress-reset-connection-pool */
     public function testShutdownResetConnectionPool(): void
     {

tests/UnifiedSpecTests/UnifiedTestRunner.php

@@ -337,12 +337,6 @@ private function isAuthenticated(): bool
      */
     private function isClientSideEncryptionSupported(): bool
     {
-        /* CSFLE technically requires FCV 4.2+ but this is sufficient since we
-         * do not test on mixed-version clusters. */
-        if (version_compare($this->getServerVersion(), '4.2', '<')) {
-            return false;
-        }
-
         if (FunctionalTestCase::getModuleInfo('libmongocrypt') === 'disabled') {
             return false;
         }