PHPLIB-795, PHPLIB-796: Remove references to pre-3.6 servers (#893)

* Remove pre-3.6 server versions from Evergreen matrix

* Remove references to unsupported pre-3.6 features in docs

* Remove version checks for pre-3.6 servers

Preserve behavior for only sending bypassDocumentValidation if true.

This also removes a reference to an undeclared var in ModifyCollection (PHPLIB-796).

* Remove skipped tests for pre-3.6 servers

Author: jmikola

.evergreen/config.yml

@@ -575,18 +575,6 @@ axes:
         display_name: "3.6"
         variables:
            VERSION: "3.6"
-      - id: "3.4"
-        display_name: "3.4"
-        variables:
-           VERSION: "3.4"
-      - id: "3.2"
-        display_name: "3.2"
-        variables:
-           VERSION: "3.2"
-      - id: "3.0"
-        display_name: "3.0"
-        variables:
-           VERSION: "3.0"
 
   - id: edge-versions
     display_name: MongoDB Version
@@ -596,9 +584,9 @@ axes:
         variables:
           VERSION: "5.0"
       - id: "oldest-supported"
-        display_name: "3.0"
+        display_name: "3.6"
         variables:
-          VERSION: "3.0"
+          VERSION: "3.6"
 
   - id: driver-versions
     display_name: Driver Version

docs/includes/apiargs-MongoDBClient-common-option.yaml

@@ -4,9 +4,6 @@ type: :php:`MongoDB\\Driver\\ReadConcern <class.mongodb-driver-readconcern>`
 description: |
    :manual:`Read concern </reference/read-concern>` to use for the operation.
    Defaults to the client's read concern.
-
-   This is not supported for server versions prior to 3.2 and will result in an
-   exception at execution time if used.
 interface: phpmethod
 operation: ~
 optional: true

docs/includes/apiargs-MongoDBClient-method-dropDatabase-option.yaml

@@ -13,7 +13,4 @@ post: |
 source:
   file: apiargs-MongoDBClient-common-option.yaml
   ref: writeConcern
-post: |
-  This is not supported for server versions prior to 3.4 and will result in an
-  exception at execution time if used.
 ...

docs/includes/apiargs-MongoDBCollection-common-option.yaml

@@ -4,9 +4,6 @@ type: array
 description: |
    An array of filter documents that determines which array elements to modify
    for an update operation on an array field.
-
-   This is not supported for server versions prior to 3.6 and will result in an
-   exception at execution time if used.
 interface: phpmethod
 operation: ~
 optional: true
@@ -17,9 +14,6 @@ type: boolean
 description: |
    If ``true``, allows the write operation to circumvent document level
    validation. Defaults to ``false``.
-
-   This option is available in MongoDB 3.2+ and is ignored for older server
-   versions, which do not support document level validation.
 interface: phpmethod
 operation: ~
 optional: true
@@ -40,9 +34,6 @@ description: |
    :manual:`Read concern </reference/read-concern>` to use for the operation.
    Defaults to the collection's read concern.
 
-   This is not supported for server versions prior to 3.2 and will result in an
-   exception at execution time if used.
-
    It is not possible to specify a :manual:`read concern
    </reference/read-concern>` for individual operations as part of a
    transaction. Instead, set the ``readConcern`` option when starting the

docs/includes/apiargs-MongoDBCollection-method-aggregate-option.yaml

@@ -78,7 +78,4 @@ source:
 post: |
   This only applies when a :ref:`$out <agg-out>` or :ref:`$merge <agg-merge>`
   stage is specified.
-
-  This is not supported for server versions prior to 3.4 and will result in an
-  exception at execution time if used.
 ...

docs/includes/apiargs-MongoDBCollection-method-createIndex-option.yaml

@@ -105,7 +105,4 @@ post: |
 source:
   file: apiargs-MongoDBCollection-common-option.yaml
   ref: writeConcern
-post: |
-  This is not supported for server versions prior to 3.4 and will result in an
-  exception at execution time if used.
 ...

docs/includes/apiargs-MongoDBCollection-method-createIndexes-option.yaml

@@ -17,7 +17,4 @@ post: |
 source:
   file: apiargs-MongoDBCollection-common-option.yaml
   ref: writeConcern
-post: |
-  This is not supported for server versions prior to 3.4 and will result in an
-  exception at execution time if used.
 ...

docs/includes/apiargs-MongoDBCollection-method-drop-option.yaml

@@ -13,7 +13,4 @@ post: |
 source:
   file: apiargs-MongoDBCollection-common-option.yaml
   ref: writeConcern
-post: |
-  This is not supported for server versions prior to 3.4 and will result in an
-  exception at execution time if used.
 ...

docs/includes/apiargs-MongoDBCollection-method-dropIndex-option.yaml

@@ -19,7 +19,4 @@ post: |
 source:
   file: apiargs-MongoDBCollection-common-option.yaml
   ref: writeConcern
-post: |
-  This is not supported for server versions prior to 3.4 and will result in an
-  exception at execution time if used.
 ...

docs/includes/apiargs-MongoDBCollection-method-dropIndexes-option.yaml

@@ -17,7 +17,4 @@ post: |
 source:
   file: apiargs-MongoDBCollection-common-option.yaml
   ref: writeConcern
-post: |
-  This is not supported for server versions prior to 3.4 and will result in an
-  exception at execution time if used.
 ...

docs/includes/apiargs-MongoDBCollection-method-findOneAndDelete-option.yaml

@@ -38,7 +38,4 @@ post: |
 source:
   file: apiargs-MongoDBCollection-common-option.yaml
   ref: writeConcern
-post: |
-  This is not supported for server versions prior to 3.2 and will result in an
-  exception at execution time if used.
 ...

docs/includes/apiargs-MongoDBCollection-method-findOneAndReplace-option.yaml

@@ -59,7 +59,4 @@ source:
 source:
   file: apiargs-MongoDBCollection-common-option.yaml
   ref: writeConcern
-post: |
-  This is not supported for server versions prior to 3.2 and will result in an
-  exception at execution time if used.
 ...

docs/includes/apiargs-MongoDBCollection-method-findOneAndUpdate-option.yaml

@@ -65,7 +65,4 @@ source:
 source:
   file: apiargs-MongoDBCollection-common-option.yaml
   ref: writeConcern
-post: |
-  This is not supported for server versions prior to 3.2 and will result in an
-  exception at execution time if used.
 ...

docs/includes/apiargs-MongoDBCollection-method-rename-option.yaml

@@ -11,9 +11,6 @@ source:
 source:
   file: apiargs-MongoDBCollection-common-option.yaml
   ref: writeConcern
-post: |
-  This is not supported for server versions prior to 3.4 and will result in an
-  exception at execution time if used.
 ---
 arg_name: option
 name: dropTarget

docs/includes/apiargs-MongoDBDatabase-common-option.yaml

@@ -4,9 +4,6 @@ type: :php:`MongoDB\\Driver\\ReadConcern <class.mongodb-driver-readconcern>`
 description: |
    :manual:`Read concern </reference/read-concern>` to use for the operation.
    Defaults to the database's read concern.
-
-   This is not supported for server versions prior to 3.2 and will result in an
-   exception at execution time if used.
 interface: phpmethod
 operation: ~
 optional: true

docs/includes/apiargs-MongoDBDatabase-method-aggregate-option.yaml

@@ -54,7 +54,4 @@ source:
 post: |
   This only applies when a :ref:`$out <agg-out>` or :ref:`$merge <agg-merge>`
   stage is specified.
-
-  This is not supported for server versions prior to 3.4 and will result in an
-  exception at execution time if used.
 ...

docs/includes/apiargs-MongoDBDatabase-method-createCollection-option.yaml

@@ -265,7 +265,4 @@ optional: true
 source:
   file: apiargs-MongoDBDatabase-common-option.yaml
   ref: writeConcern
-post: |
-  This is not supported for server versions prior to 3.4 and will result in an
-  exception at execution time if used.
 ...

docs/includes/apiargs-MongoDBDatabase-method-drop-option.yaml

@@ -13,7 +13,4 @@ post: |
 source:
   file: apiargs-MongoDBDatabase-common-option.yaml
   ref: writeConcern
-post: |
-  This is not supported for server versions prior to 3.4 and will result in an
-  exception at execution time if used.
 ...

docs/includes/apiargs-MongoDBDatabase-method-dropCollection-option.yaml

@@ -13,7 +13,4 @@ post: |
 source:
   file: apiargs-MongoDBDatabase-common-option.yaml
   ref: writeConcern
-post: |
-  This is not supported for server versions prior to 3.4 and will result in an
-  exception at execution time if used.
 ...

docs/includes/apiargs-MongoDBDatabase-method-renameCollection-option.yaml

@@ -11,9 +11,6 @@ post: |
 source:
   file: apiargs-MongoDBDatabase-common-option.yaml
   ref: writeConcern
-post: |
-  This is not supported for server versions prior to 3.4 and will result in an
-  exception at execution time if used.
 ---
 arg_name: option
 name: dropTarget

docs/includes/apiargs-aggregate-option.yaml

@@ -25,9 +25,6 @@ source:
 post: |
   This only applies when using the :ref:`$out <agg-out>` and
   :ref:`$out <agg-merge>` stages.
-
-  Document validation requires MongoDB 3.2 or later: if you are using an earlier
-  version of MongoDB, this option will be ignored.
 ---
 arg_name: option
 name: comment

docs/includes/apiargs-common-option.yaml

@@ -8,9 +8,6 @@ description: |
    mandatory; all other collation fields are optional. For descriptions of the
    fields, see :manual:`Collation Document
    </reference/collation/#collation-document>`.
-
-   This option is available in MongoDB 3.4+ and will result in an exception at
-   execution time if specified for an older server version.
 interface: phpmethod
 operation: ~
 optional: true
@@ -68,8 +65,6 @@ name: session
 type: :php:`MongoDB\\Driver\\Session <class.mongodb-driver-session>`
 description: |
   Client session to associate with the operation.
-
-  Sessions are not supported for server versions prior to 3.6.
 interface: phpmethod
 operation: ~
 optional: true

docs/reference/exception-classes.txt

@@ -70,12 +70,6 @@ MongoDB\\Exception\\UnsupportedException
    selected server. It is used sparingly in cases where silently ignoring the
    unsupported option might otherwise lead to unexpected behavior.
 
-   For example, the ``collation`` option for
-   :phpmethod:`MongoDB\\Collection::deleteOne()` is only supported by
-   MongoDB 3.4+. Since collation determines how a document is matched, silently
-   ignoring the option for an older server version could result in an
-   unintended document being deleted.
-
    This class extends the library's :phpclass:`RuntimeException
    <MongoDB\\Exception\\RuntimeException>` class.
 

docs/reference/method/MongoDBCollection-count.txt

@@ -56,8 +56,7 @@ metadata. Even when provided with a query filter the ``count`` command can
 return inaccurate results with a sharded cluster if orphaned documents exist or
 if a chunk migration is in progress. The
 :phpmethod:`MongoDB\\Collection::countDocuments()` method avoids these sharded
-cluster problems entirely when used with MongoDB 3.6+, and when a primary read
-preference with older sharded clusters.
+cluster problems entirely.
 
 .. include:: /includes/extracts/note-bson-comparison.rst
 

docs/reference/method/MongoDBCollection-countDocuments.txt

@@ -77,7 +77,7 @@ Consider the following alternatives to these restricted operators:
      - :query:`$geoWithin` with :query:`$centerSphere`
 
    * - :query:`$where`
-     - :query:`$expr` (requires MongoDB 3.6+)
+     - :query:`$expr`
 
 .. include:: /includes/extracts/note-bson-comparison.rst
 

docs/reference/method/MongoDBDatabase-createCollection.txt

@@ -41,11 +41,9 @@ Definition
 
    .. include:: /includes/apiargs/MongoDBDatabase-method-createCollection-option.rst
 
-   Note that not all options are available on all versions of MongoDB. Document
-   validation, for example, was added in MongoDB 3.2; similarly, the WiredTiger
-   storage engine is available only for MongoDB 3.0 and later. Refer to the
-   :manual:`create </reference/command/create>` command reference in the MongoDB
-   manual for compatibility considerations.
+   Note that not all options are available on all versions of MongoDB. Refer to
+   the :manual:`create </reference/command/create>` command reference in the
+   MongoDB manual for compatibility considerations.
 
 Return Values
 -------------

src/Client.php

@@ -51,12 +51,6 @@ class Client
         'root' => BSONDocument::class,
     ];
 
-    /** @var integer */
-    private static $wireVersionForReadConcern = 4;
-
-    /** @var integer */
-    private static $wireVersionForWritableCommandWriteConcern = 5;
-
     /** @var string */
     private static $handshakeSeparator = ' / ';
 
@@ -215,7 +209,7 @@ public function dropDatabase($databaseName, array $options = [])
 
         $server = select_server($this->manager, $options);
 
-        if (! isset($options['writeConcern']) && server_supports_feature($server, self::$wireVersionForWritableCommandWriteConcern) && ! is_in_transaction($options)) {
+        if (! isset($options['writeConcern']) && ! is_in_transaction($options)) {
             $options['writeConcern'] = $this->writeConcern;
         }
 
@@ -372,7 +366,7 @@ public function watch(array $pipeline = [], array $options = [])
 
         $server = select_server($this->manager, $options);
 
-        if (! isset($options['readConcern']) && server_supports_feature($server, self::$wireVersionForReadConcern) && ! is_in_transaction($options)) {
+        if (! isset($options['readConcern']) && ! is_in_transaction($options)) {
             $options['readConcern'] = $this->readConcern;
         }