PHPLIB-1679 Call DocumentCodec::encode() only on objects

src/Operation/BulkWrite.php

@@ -35,6 +35,7 @@
 use function current;
 use function is_array;
 use function is_bool;
+use function is_object;
 use function key;
 use function MongoDB\is_document;
 use function MongoDB\is_first_key_operator;
@@ -305,7 +306,7 @@
                 case self::INSERT_ONE:
                     // $args[0] was already validated above. Since DocumentCodec::encode will always return a Document
                     // instance, there is no need to re-validate the returned value here.
-                    if ($codec) {
+                    if ($codec && is_object($args[0])) {
                         $operations[$i][$type][0] = $codec->encode($args[0]);
                     }
 
@@ -340,7 +341,7 @@
                         throw new InvalidArgumentException(sprintf('Missing second argument for $operations[%d]["%s"]', $i, $type));
                     }
 
-                    if ($codec) {
+                    if ($codec && is_object($args[1])) {
                         $operations[$i][$type][1] = $codec->encode($args[1]);
                     }
 
@@ -390,13 +391,13 @@
 
                 case self::UPDATE_MANY:
                 case self::UPDATE_ONE:
                     $operations[$i][$type][0] = $builderEncoder->encodeIfSupported($args[0]);
 
                     if (! isset($args[1]) && ! array_key_exists(1, $args)) {
                         throw new InvalidArgumentException(sprintf('Missing second argument for $operations[%d]["%s"]', $i, $type));
                     }
 
                     $operations[$i][$type][1] = $args[1] = $builderEncoder->encodeIfSupported($args[1]);
 
                     if ((! is_document($args[1]) || ! is_first_key_operator($args[1])) && ! is_pipeline($args[1])) {
                         throw new InvalidArgumentException(sprintf('Expected update operator(s) or non-empty pipeline for $operations[%d]["%s"][1]', $i, $type));

src/Operation/FindOneAndReplace.php

@@ -1,4 +1,4 @@
 <?php
 /*
  * Copyright 2015-present MongoDB, Inc.
  *
@@ -25,6 +25,7 @@
 
 use function array_key_exists;
 use function is_integer;
+use function is_object;
 use function MongoDB\is_document;
 use function MongoDB\is_first_key_operator;
 use function MongoDB\is_pipeline;
@@ -170,11 +171,9 @@
 
     private function validateReplacement(array|object $replacement, ?DocumentCodec $codec): array|object
     {
-        if (isset($codec)) {
+        if ($codec && is_object($replacement)) {
             $replacement = $codec->encode($replacement);
-        }
-
-        if (! is_document($replacement)) {
+        } elseif (! is_document($replacement)) {
             throw InvalidArgumentException::expectedDocumentType('$replacement', $replacement);
         }
 

src/Operation/InsertMany.php

@@ -1,4 +1,4 @@
 <?php
 /*
  * Copyright 2015-present MongoDB, Inc.
  *
@@ -29,6 +29,7 @@
 
 use function array_is_list;
 use function is_bool;
+use function is_object;
 use function MongoDB\is_document;
 use function sprintf;
 
@@ -189,11 +190,9 @@
         }
 
         foreach ($documents as $i => $document) {
-            if ($codec) {
-                $document = $documents[$i] = $codec->encode($document);
-            }
-
-            if (! is_document($document)) {
+            if ($codec && is_object($document)) {
+                $documents[$i] = $codec->encode($document);
+            } elseif (! is_document($document)) {
                 throw InvalidArgumentException::expectedDocumentType(sprintf('$documents[%d]', $i), $document);
             }
         }

src/Operation/InsertOne.php

@@ -1,4 +1,4 @@
 <?php
 /*
  * Copyright 2015-present MongoDB, Inc.
  *
@@ -28,6 +28,7 @@
 use MongoDB\InsertOneResult;
 
 use function is_bool;
+use function is_object;
 use function MongoDB\is_document;
 
 /**
@@ -156,11 +157,9 @@
 
     private function validateDocument(array|object $document, ?DocumentCodec $codec): array|object
     {
-        if ($codec) {
+        if ($codec && is_object($document)) {
             $document = $codec->encode($document);
-        }
-
-        if (! is_document($document)) {
+        } elseif (! is_document($document)) {
             throw InvalidArgumentException::expectedDocumentType('$document', $document);
         }
 

src/Operation/ReplaceOne.php

@@ -1,4 +1,4 @@
 <?php
 /*
  * Copyright 2015-present MongoDB, Inc.
  *
@@ -24,6 +24,7 @@
 use MongoDB\Exception\UnsupportedException;
 use MongoDB\UpdateResult;
 
+use function is_object;
 use function MongoDB\is_document;
 use function MongoDB\is_first_key_operator;
 use function MongoDB\is_pipeline;
@@ -119,11 +120,9 @@
 
     private function validateReplacement(array|object $replacement, ?DocumentCodec $codec): array|object
     {
-        if ($codec) {
+        if ($codec && is_object($replacement)) {
             $replacement = $codec->encode($replacement);
-        }
-
-        if (! is_document($replacement)) {
+        } elseif (! is_document($replacement)) {
             throw InvalidArgumentException::expectedDocumentType('$replacement', $replacement);
         }