PHPC-2401: Support QEv2 range protocol

Existing RANGE_PREVIEW constants are deprecated in favor of new RANGE constants introduced in libmongoc 1.28.0

Author: jmikola

src/MongoDB/ClientEncryption.stub.php

@@ -34,6 +34,13 @@ final class ClientEncryption
     public const ALGORITHM_UNINDEXED = UNKNOWN;
 
     /**
+     * @var string
+     * @cvalue MONGOC_ENCRYPT_ALGORITHM_RANGE
+     */
+    public const ALGORITHM_RANGE = UNKNOWN;
+
+    /**
+     * @deprecated
      * @var string
      * @cvalue MONGOC_ENCRYPT_ALGORITHM_RANGEPREVIEW
      */
@@ -46,6 +53,13 @@ final class ClientEncryption
     public const QUERY_TYPE_EQUALITY = UNKNOWN;
 
     /**
+     * @var string
+     * @cvalue MONGOC_ENCRYPT_QUERY_TYPE_RANGE
+     */
+    public const QUERY_TYPE_RANGE = UNKNOWN;
+
+    /**
+     * @deprecated
      * @var string
      * @cvalue MONGOC_ENCRYPT_QUERY_TYPE_RANGEPREVIEW
      */

src/MongoDB/ClientEncryption_arginfo.h

@@ -7,8 +7,10 @@ var_dump(MongoDB\Driver\ClientEncryption::AEAD_AES_256_CBC_HMAC_SHA_512_DETERMIN
 var_dump(MongoDB\Driver\ClientEncryption::AEAD_AES_256_CBC_HMAC_SHA_512_RANDOM);
 var_dump(MongoDB\Driver\ClientEncryption::ALGORITHM_INDEXED);
 var_dump(MongoDB\Driver\ClientEncryption::ALGORITHM_UNINDEXED);
+var_dump(MongoDB\Driver\ClientEncryption::ALGORITHM_RANGE);
 var_dump(MongoDB\Driver\ClientEncryption::ALGORITHM_RANGE_PREVIEW);
 var_dump(MongoDB\Driver\ClientEncryption::QUERY_TYPE_EQUALITY);
+var_dump(MongoDB\Driver\ClientEncryption::QUERY_TYPE_RANGE);
 var_dump(MongoDB\Driver\ClientEncryption::QUERY_TYPE_RANGE_PREVIEW);
 
 ?>
@@ -19,7 +21,9 @@ string(43) "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
 string(36) "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
 string(7) "Indexed"
 string(9) "Unindexed"
+string(5) "Range"
 string(12) "RangePreview"
 string(8) "equality"
+string(5) "range"
 string(12) "rangePreview"
 ===DONE===

tests/clientEncryption/clientEncryption-constants.phpt

@@ -22,8 +22,8 @@ $keyId = $clientEncryption->createDataKey('local');
 
 $encryptOpts = [
     'keyId' => $keyId,
-    'algorithm' => MongoDB\Driver\ClientEncryption::ALGORITHM_RANGE_PREVIEW,
-    'queryType' => MongoDB\Driver\ClientEncryption::QUERY_TYPE_RANGE_PREVIEW,
+    'algorithm' => MongoDB\Driver\ClientEncryption::ALGORITHM_RANGE,
+    'queryType' => MongoDB\Driver\ClientEncryption::QUERY_TYPE_RANGE,
     'contentionFactor' => 0,
     'rangeOpts' => ['min' => 0, 'max' => 200, 'sparsity' => 1],
 ];

tests/clientEncryption/clientEncryption-encryptExpression-001.phpt

@@ -22,8 +22,8 @@ $keyId = $clientEncryption->createDataKey('local');
 
 $encryptOpts = [
     'keyId' => $keyId,
-    'algorithm' => MongoDB\Driver\ClientEncryption::ALGORITHM_RANGE_PREVIEW,
-    'queryType' => MongoDB\Driver\ClientEncryption::QUERY_TYPE_RANGE_PREVIEW,
+    'algorithm' => MongoDB\Driver\ClientEncryption::ALGORITHM_RANGE,
+    'queryType' => MongoDB\Driver\ClientEncryption::QUERY_TYPE_RANGE,
     'contentionFactor' => 0,
     'rangeOpts' => ['min' => 0, 'max' => 200, 'sparsity' => 1],
 ];