Merge v1.x into v2.x (#1474)

Author: mongodb-php-bot

src/Client.php

@@ -50,6 +50,10 @@
 use function array_diff_key;
 use function is_array;
 use function is_string;
+use function sprintf;
+use function trigger_error;
+
+use const E_USER_DEPRECATED;
 
 class Client
 {
@@ -223,6 +227,8 @@ public function dropDatabase(string $databaseName, array $options = []): array|o
     {
         if (! isset($options['typeMap'])) {
             $options['typeMap'] = $this->typeMap;
+        } else {
+            @trigger_error(sprintf('The function %s() will return nothing in mongodb/mongodb v2.0, the "typeMap" option is deprecated', __FUNCTION__), E_USER_DEPRECATED);
         }
 
         $server = select_server_for_write($this->manager, $options);

src/Collection.php

@@ -516,7 +516,7 @@ public function distinct(string $fieldName, array|object $filter = [], array $op
     public function drop(array $options = []): array|object
     {
         $options = $this->inheritWriteOptions($options);
-        $options = $this->inheritTypeMap($options);
+        $options = $this->inheritTypeMap($options, __FUNCTION__);
 
         $server = select_server_for_write($this->manager, $options);
 
@@ -552,7 +552,7 @@ public function dropIndex(string|IndexInfo $indexName, array $options = []): arr
         }
 
         $options = $this->inheritWriteOptions($options);
-        $options = $this->inheritTypeMap($options);
+        $options = $this->inheritTypeMap($options, __FUNCTION__);
 
         $operation = new DropIndexes($this->databaseName, $this->collectionName, $indexName, $options);
 
@@ -572,7 +572,7 @@ public function dropIndex(string|IndexInfo $indexName, array $options = []): arr
     public function dropIndexes(array $options = []): array|object
     {
         $options = $this->inheritWriteOptions($options);
-        $options = $this->inheritTypeMap($options);
+        $options = $this->inheritTypeMap($options, __FUNCTION__);
 
         $operation = new DropIndexes($this->databaseName, $this->collectionName, '*', $options);
 
@@ -1176,8 +1176,12 @@ private function inheritReadPreference(array $options): array
         return $options;
     }
 
-    private function inheritTypeMap(array $options): array
+    private function inheritTypeMap(array $options, ?string $deprecatedFunction = null): array
     {
+        if ($deprecatedFunction !== null && isset($options['typeMap'])) {
+            @trigger_error(sprintf('The function %s() will return nothing in mongodb/mongodb v2.0, the "typeMap" option is deprecated', $deprecatedFunction), E_USER_DEPRECATED);
+        }
+
         // Only inherit the type map if no codec is used
         if (! isset($options['typeMap']) && ! isset($options['codec'])) {
             $options['typeMap'] = $this->typeMap;

src/Database.php

@@ -55,7 +55,11 @@
 use Throwable;
 
 use function is_array;
+use function sprintf;
 use function strlen;
+use function trigger_error;
+
+use const E_USER_DEPRECATED;
 
 class Database
 {
@@ -280,6 +284,8 @@ public function createCollection(string $collectionName, array $options = []): a
     {
         if (! isset($options['typeMap'])) {
             $options['typeMap'] = $this->typeMap;
+        } else {
+            @trigger_error(sprintf('The function %s() will return nothing in mongodb/mongodb v2.0, the "typeMap" option is deprecated', __FUNCTION__), E_USER_DEPRECATED);
         }
 
         if (! isset($options['writeConcern']) && ! is_in_transaction($options)) {
@@ -323,6 +329,8 @@ public function createEncryptedCollection(string $collectionName, ClientEncrypti
     {
         if (! isset($options['typeMap'])) {
             $options['typeMap'] = $this->typeMap;
+        } else {
+            @trigger_error(sprintf('The function %s() will return nothing in mongodb/mongodb v2.0, the "typeMap" option is deprecated', __FUNCTION__), E_USER_DEPRECATED);
         }
 
         if (! isset($options['writeConcern']) && ! is_in_transaction($options)) {
@@ -356,6 +364,8 @@ public function drop(array $options = []): array|object
     {
         if (! isset($options['typeMap'])) {
             $options['typeMap'] = $this->typeMap;
+        } else {
+            @trigger_error(sprintf('The function %s() will return nothing in mongodb/mongodb v2.0, the "typeMap" option is deprecated', __FUNCTION__), E_USER_DEPRECATED);
         }
 
         $server = select_server_for_write($this->manager, $options);
@@ -384,6 +394,8 @@ public function dropCollection(string $collectionName, array $options = []): arr
     {
         if (! isset($options['typeMap'])) {
             $options['typeMap'] = $this->typeMap;
+        } else {
+            @trigger_error(sprintf('The function %s() will return nothing in mongodb/mongodb v2.0, the "typeMap" option is deprecated', __FUNCTION__), E_USER_DEPRECATED);
         }
 
         $server = select_server_for_write($this->manager, $options);