PHPLIB-887: Allow extra fields in find results

Most operations that use ASSERT_SAME_DOCUMENT and ASSERT_SAME_DOCUMENTS should technically use ASSERT_MATCHES_DOCUMENT and ASSERT_DOCUMENTS_MATCH, respectively; however, this is the minimum change needed to satisfy new CSFLE spec tests.

Author: jmikola

tests/SpecTests/FunctionalTestCase.php

@@ -89,7 +89,7 @@ public static function assertCommandReplyMatches(stdClass $expected, stdClass $a
      * @param array|object $actualDocument
      * @param string       $message
      */
-    protected static function assertDocumentsMatch($expectedDocument, $actualDocument, string $message = ''): void
+    public static function assertDocumentsMatch($expectedDocument, $actualDocument, string $message = ''): void
     {
         $constraint = new DocumentsMatchConstraint($expectedDocument, true, true);
 

tests/SpecTests/Operation.php

@@ -774,10 +774,10 @@ private function getResultAssertionTypeForCollection()
             case 'findOneAndDelete':
             case 'findOneAndReplace':
             case 'findOneAndUpdate':
-                return ResultExpectation::ASSERT_SAME_DOCUMENT;
+                return ResultExpectation::ASSERT_MATCHES_DOCUMENT;
 
             case 'find':
-                return ResultExpectation::ASSERT_SAME_DOCUMENTS;
+                return ResultExpectation::ASSERT_DOCUMENTS_MATCH;
 
             case 'insertMany':
                 return ResultExpectation::ASSERT_INSERTMANY;