From 51b66b3753b3bb40d17ca81dbab3194b24747221 Mon Sep 17 00:00:00 2001 From: levon80999 Date: Tue, 6 Sep 2022 19:17:53 +0400 Subject: [PATCH] PHPLIB-678: Remove obsolete handling of options arg for insertMany --- tests/UnifiedSpecTests/Operation.php | 6 +----- tests/UnifiedSpecTests/Util.php | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/UnifiedSpecTests/Operation.php b/tests/UnifiedSpecTests/Operation.php index ca13f32e5..54f634b02 100644 --- a/tests/UnifiedSpecTests/Operation.php +++ b/tests/UnifiedSpecTests/Operation.php @@ -507,16 +507,12 @@ static function ($request) { ); case 'insertMany': - // Merge nested and top-level options (see: SPEC-1158) - $options = isset($args['options']) ? (array) $args['options'] : []; - $options += array_diff_key($args, ['documents' => 1]); - assertArrayHasKey('documents', $args); assertIsArray($args['documents']); return $collection->insertMany( $args['documents'], - $options + array_diff_key($args, ['documents' => 1]) ); case 'insertOne': diff --git a/tests/UnifiedSpecTests/Util.php b/tests/UnifiedSpecTests/Util.php index 1572e16d4..1c0c249e7 100644 --- a/tests/UnifiedSpecTests/Util.php +++ b/tests/UnifiedSpecTests/Util.php @@ -104,7 +104,7 @@ final class Util 'findOneAndUpdate' => ['let', 'returnDocument', 'filter', 'update', 'session', 'upsert', 'projection', 'remove', 'arrayFilters', 'bypassDocumentValidation', 'collation', 'hint', 'maxTimeMS', 'sort', 'comment'], 'updateMany' => ['let', 'filter', 'update', 'session', 'upsert', 'arrayFilters', 'bypassDocumentValidation', 'collation', 'hint', 'comment'], 'updateOne' => ['let', 'filter', 'update', 'session', 'upsert', 'arrayFilters', 'bypassDocumentValidation', 'collation', 'hint', 'comment'], - 'insertMany' => ['options', 'documents', 'session', 'ordered', 'bypassDocumentValidation', 'comment'], + 'insertMany' => ['documents', 'session', 'ordered', 'bypassDocumentValidation', 'comment'], 'insertOne' => ['document', 'session', 'bypassDocumentValidation', 'comment'], 'listIndexes' => ['session', 'maxTimeMS', 'comment'], 'mapReduce' => ['map', 'reduce', 'out', 'session', 'bypassDocumentValidation', 'collation', 'finalize', 'jsMode', 'limit', 'maxTimeMS', 'query', 'scope', 'sort', 'verbose', 'comment'],