Merge branch 'v2.x' into merge-v1.x-into-v2.x-1727254882102

* v2.x:
  PHPLIB-954: Add return types to all methods (#1391)
  PHPLIB-797: Remove unused methods in UnsupportedException (#1436)
  Revert "Add final annotations to non-internal Operation classes (#1410)"
  PHPLIB-953 Make internal classes and Operation classes final (#1392)
  PHPLIB-1218 Remove deprecated fields from GridFS files (#1398)

Author: alcaeus

.evergreen/config.yml

@@ -71,5 +71,3 @@ include:
   - filename: .evergreen/config/generated/test/require-api-version.yml
   - filename: .evergreen/config/generated/test/csfle.yml
   - filename: .evergreen/config/generated/test-variant/modern-php-full.yml
-  - filename: .evergreen/config/generated/test-variant/phpc.yml
-  - filename: .evergreen/config/generated/test-variant/lowest.yml

.evergreen/config/generate-config.php

@@ -55,8 +55,9 @@
 
 // Test variants
 $allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'modern-php-full.yml', $supportedPhpVersions);
-$allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'phpc.yml', [$latestPhpVersion]);
-$allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'lowest.yml', [$lowestPhpVersion]);
+// TODO: Re-enable when 2.0.0 is released
+// $allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'phpc.yml', [$latestPhpVersion]);
+// $allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'lowest.yml', [$lowestPhpVersion]);
 
 echo "Generated config. Use the following list to import files:\n";
 echo implode("\n", array_map('getImportConfig', $allFiles)) . "\n";

.evergreen/config/generated/build/build-extension.yml

@@ -5,34 +5,38 @@
         vars:
           PHP_VERSION: "%phpVersion%"
       - func: "compile extension"
-      - func: "upload extension"
-  - name: "build-php-%phpVersion%-lowest"
-    tags: ["build", "php%phpVersion%", "lowest", "pr", "tag"]
-    commands:
-      - func: "locate PHP binaries"
-        vars:
-          PHP_VERSION: "%phpVersion%"
-      - func: "compile extension"
-        vars:
-          EXTENSION_VERSION: "1.20.0"
-      - func: "upload extension"
-  - name: "build-php-%phpVersion%-next-stable"
-    tags: ["build", "php%phpVersion%", "next-stable", "pr", "tag"]
-    commands:
-      - func: "locate PHP binaries"
-        vars:
-          PHP_VERSION: "%phpVersion%"
-      - func: "compile extension"
-        vars:
-          EXTENSION_BRANCH: "v1.20"
-      - func: "upload extension"
-  - name: "build-php-%phpVersion%-next-minor"
-    tags: ["build", "php%phpVersion%", "next-minor"]
-    commands:
-      - func: "locate PHP binaries"
-        vars:
-          PHP_VERSION: "%phpVersion%"
-      - func: "compile extension"
+        # TODO: remove once 2.0.0 is released
         vars:
-          EXTENSION_BRANCH: "v1.x"
+          EXTENSION_BRANCH: "v2.x"
       - func: "upload extension"
+  # TODO: re-enable once 2.0.0 is released
+#  - name: "build-php-%phpVersion%-lowest"
+#    tags: ["build", "php%phpVersion%", "lowest", "pr", "tag"]
+#    commands:
+#      - func: "locate PHP binaries"
+#        vars:
+#          PHP_VERSION: "%phpVersion%"
+#      - func: "compile extension"
+#        vars:
+#          EXTENSION_VERSION: "2.0.0"
+#      - func: "upload extension"
+#  - name: "build-php-%phpVersion%-next-stable"
+#    tags: ["build", "php%phpVersion%", "next-stable", "pr", "tag"]
+#    commands:
+#      - func: "locate PHP binaries"
+#        vars:
+#          PHP_VERSION: "%phpVersion%"
+#      - func: "compile extension"
+#        vars:
+#          EXTENSION_BRANCH: "v2.0"
+#      - func: "upload extension"
+#  - name: "build-php-%phpVersion%-next-minor"
+#    tags: ["build", "php%phpVersion%", "next-minor"]
+#    commands:
+#      - func: "locate PHP binaries"
+#        vars:
+#          PHP_VERSION: "%phpVersion%"
+#      - func: "compile extension"
+#        vars:
+#          EXTENSION_BRANCH: "v2.x"
+#      - func: "upload extension"

.evergreen/config/templates/build/build-extension.yml

@@ -13,7 +13,9 @@ on:
 
 env:
   PHP_VERSION: "8.2"
-  DRIVER_VERSION: "stable"
+  # TODO: change to "stable" once 2.0.0 is released
+  # DRIVER_VERSION: "stable"
+  DRIVER_VERSION: "mongodb/mongo-php-driver@v2.x"
 
 jobs:
   phpcs:

.github/workflows/coding-standards.yml

@@ -13,9 +13,9 @@ on:
 
 env:
   PHP_VERSION: "8.2"
-  # TODO: change to "stable" once 1.20.0 is released
+  # TODO: change to "stable" once 2.0.0 is released
   # DRIVER_VERSION: "stable"
-  DRIVER_VERSION: "mongodb/mongo-php-driver@v1.20"
+  DRIVER_VERSION: "mongodb/mongo-php-driver@v2.x"
 
 jobs:
   psalm:

.github/workflows/generator.yml

@@ -19,7 +19,9 @@ on:
 
 env:
   PHP_VERSION: "8.2"
-  DRIVER_VERSION: "stable"
+  # TODO: change to "stable" once 2.0.0 is released
+  # DRIVER_VERSION: "stable"
+  DRIVER_VERSION: "mongodb/mongo-php-driver@v2.x"
 
 jobs:
   psalm:

.github/workflows/static-analysis.yml

@@ -12,7 +12,9 @@ on:
       - "feature/*"
 
 env:
-  DRIVER_VERSION: "stable"
+  # TODO: change to "stable" once 2.0.0 is released
+  # DRIVER_VERSION: "stable"
+  DRIVER_VERSION: "mongodb/mongo-php-driver@v2.x"
 
 jobs:
   phpunit:

.github/workflows/tests.yml

@@ -0,0 +1,46 @@
+UPGRADE FROM 1.x to 2.0
+========================
+
+ * Classes in the namespace `MongoDB\Operation\` are `final`.
+ * All methods in interfaces and classes now define a return type.
+
+GridFS
+------
+
+ * The `md5` is no longer calculated when a file is uploaded to GridFS.
+   Applications that require a file digest should implement it outside GridFS
+   and store in metadata.
+
+   ```php
+   $hash = hash_file('sha256', $filename);
+   $bucket->openUploadStream($fileId, ['metadata' => ['hash' => $hash]]);
+   ```
+
+ * The fields `contentType` and `aliases` are no longer stored in the `files`
+   collection. Applications that require this information should store it in
+   metadata.
+
+   **Before:**
+   ```php
+   $bucket->openUploadStream($fileId, ['contentType' => 'image/png']);
+   ```
+
+   **After:**
+   ```php
+   $bucket->openUploadStream($fileId, ['metadata' => ['contentType' => 'image/png']]);
+   ```
+
+UnsupportedException method removals
+------------------------------------
+
+The following methods have been removed from the
+`MongoDB\Exception\UnsupportedException` class:
+ * `allowDiskUseNotSupported`
+ * `arrayFiltersNotSupported`
+ * `collationNotSupported`
+ * `explainNotSupported`
+ * `readConcernNotSupported`
+ * `writeConcernNotSupported`
+
+The remaining methods have been marked as internal and may be removed in a
+future minor version. Only the class itself is covered by the BC promise.

UPGRADE-2.0.md

@@ -11,9 +11,8 @@
     ],
     "require": {
         "php": "^8.1",
-        "ext-hash": "*",
         "ext-json": "*",
-        "ext-mongodb": "^1.20.0",
+        "ext-mongodb": "^2.0",
         "composer-runtime-api": "^2.0",
         "psr/log": "^1.1.4|^2|^3",
         "symfony/polyfill-php80": "^1.27",