Prose test 22.4 and 22.5

Author: jmikola

tests/SpecTests/ClientSideEncryption/Prose22_RangeExplicitEncryptionTest.php

@@ -285,6 +285,67 @@ public function testCase3_CanFindEncryptedRangeAndReturnTheMinimum(string $type,
         $this->assertMultipleDocumentsMatch($expectedDocuments, $cursor);
     }
 
+    /**
+     * @see https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/tests/README.rst#case-4-can-find-encrypted-range-with-an-open-range-query
+     * @dataProvider provideTypeAndRangeOpts
+     */
+    public function testCase4_CanFindEncryptedRangeWithAnOpenRangeQuery(string $type, array $rangeOpts): void
+    {
+        $this->setUpWithTypeAndRangeOpts($type, $rangeOpts);
+
+        $encryptOpts = [
+            'keyId' => $this->key1Id,
+            'algorithm' => ClientEncryption::ALGORITHM_RANGE_PREVIEW,
+            'queryType' => ClientEncryption::QUERY_TYPE_RANGE_PREVIEW,
+            'contentionFactor' => 0,
+            'rangeOpts' => $rangeOpts,
+        ];
+
+        $cast = self::getCastCallableForType($type);
+        $fieldName = 'encrypted' . $type;
+
+        $expr = ['$and' => [[$fieldName => ['$gt' => $cast(30)]]]];
+
+        $encryptedExpr = $this->clientEncryption->encryptExpression($expr, $encryptOpts);
+        $cursor = $this->collection->find($encryptedExpr, ['sort' => ['_id' => 1]]);
+        $expectedDocuments = [['_id' => 3, $fieldName => $cast(200)]];
+
+        $this->assertMultipleDocumentsMatch($expectedDocuments, $cursor);
+    }
+
+    /**
+     * @see https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/tests/README.rst#case-5-can-run-an-aggregation-expression-inside-expr
+     * @dataProvider provideTypeAndRangeOpts
+     */
+    public function testCase5_CanRunAnAggregationExpressionInsideExpr(string $type, array $rangeOpts): void
+    {
+        $this->setUpWithTypeAndRangeOpts($type, $rangeOpts);
+
+        $encryptOpts = [
+            'keyId' => $this->key1Id,
+            'algorithm' => ClientEncryption::ALGORITHM_RANGE_PREVIEW,
+            'queryType' => ClientEncryption::QUERY_TYPE_RANGE_PREVIEW,
+            'contentionFactor' => 0,
+            'rangeOpts' => $rangeOpts,
+        ];
+
+        $cast = self::getCastCallableForType($type);
+        $fieldName = 'encrypted' . $type;
+        $fieldPath = '$' . $fieldName;
+
+        $expr = ['$and' => [['$lt' => [$fieldPath, $cast(30)]]]];
+
+        $encryptedExpr = $this->clientEncryption->encryptExpression($expr, $encryptOpts);
+        $cursor = $this->collection->find(['$expr' => $encryptedExpr], ['sort' => ['_id' => 1]]);
+
+        $expectedDocuments = [
+            ['_id' => 0, $fieldName => $cast(0)],
+            ['_id' => 1, $fieldName => $cast(6)],
+        ];
+
+        $this->assertMultipleDocumentsMatch($expectedDocuments, $cursor);
+    }
+
     private function assertMultipleDocumentsMatch(array $expectedDocuments, Iterator $actualDocuments): void
     {
         $mi = new MultipleIterator(MultipleIterator::MIT_NEED_ANY);