update to 3.2.0

drop patch merged upstream
raise dependency on libcouchbase 3.2

5 files changed, 1519 insertions, 69 deletions

diff --git a/32.patch b/32.patch
index d21d44f..7bd8db9 100644
--- a/32.patch
+++ b/32.patch
@@ -13,7 +13,7 @@ diff --git a/src/couchbase/cluster.c b/src/couchbase/cluster.c
 index 478cc3a..0c64366 100644
 --- a/src/couchbase/cluster.c
 +++ b/src/couchbase/cluster.c
-@@ -63,7 +63,11 @@ static void pcbc_cluster_connection_init(zval *return_value, pcbc_cluster_t *clu
+@@ -66,7 +66,11 @@ static void pcbc_cluster_connection_init(zval *return_value, pcbc_cluster_t *clu
      if (PCBCG(allow_fallback_to_bucket)) {
          url = php_url_parse(cluster->connstr);
          if (url && url->path) {
@@ -29,7 +29,7 @@ diff --git a/src/couchbase/pool.c b/src/couchbase/pool.c
 index 9dfac11..3f5d8bd 100644
 --- a/src/couchbase/pool.c
 +++ b/src/couchbase/pool.c
-@@ -151,11 +151,19 @@ static lcb_STATUS pcbc_normalize_connstr(lcb_INSTANCE_TYPE type, char *connstr,
+@@ -265,11 +265,19 @@ static lcb_STATUS pcbc_normalize_connstr(lcb_INSTANCE_TYPE type, char *connstr,
              // rebuild connection string with username as the bucket
              smart_str buf = {0};
              if (url->scheme) {
@@ -49,7 +49,7 @@ index 9dfac11..3f5d8bd 100644
              }
              if (url->port) {
                  smart_str_appendc(&buf, ':');
-@@ -165,7 +173,11 @@ static lcb_STATUS pcbc_normalize_connstr(lcb_INSTANCE_TYPE type, char *connstr,
+@@ -279,7 +287,11 @@ static lcb_STATUS pcbc_normalize_connstr(lcb_INSTANCE_TYPE type, char *connstr,
              smart_str_appends(&buf, bucketname);
              if (url->query) {
                  smart_str_appendc(&buf, '?');
@@ -61,7 +61,7 @@ index 9dfac11..3f5d8bd 100644
              }
              smart_str_0(&buf);
              PCBC_SMARTSTR_DUP(buf, *normalized);
-@@ -176,15 +188,27 @@ static lcb_STATUS pcbc_normalize_connstr(lcb_INSTANCE_TYPE type, char *connstr,
+@@ -290,15 +302,27 @@ static lcb_STATUS pcbc_normalize_connstr(lcb_INSTANCE_TYPE type, char *connstr,
          }
          break;
      case LCB_TYPE_CLUSTER:
@@ -89,7 +89,7 @@ index 9dfac11..3f5d8bd 100644
              }
              if (url->port) {
                  smart_str_appendc(&buf, ':');
-@@ -192,7 +216,11 @@ static lcb_STATUS pcbc_normalize_connstr(lcb_INSTANCE_TYPE type, char *connstr,
+@@ -306,7 +330,11 @@ static lcb_STATUS pcbc_normalize_connstr(lcb_INSTANCE_TYPE type, char *connstr,
              }
              if (url->query) {
                  smart_str_appendc(&buf, '?');
@@ -101,7 +101,7 @@ index 9dfac11..3f5d8bd 100644
              }
              smart_str_0(&buf);
              PCBC_SMARTSTR_DUP(buf, *normalized);
-@@ -246,7 +274,11 @@ static lcb_STATUS pcbc_connection_cache(smart_str *plist_key, pcbc_connection_t
+@@ -360,7 +388,11 @@ static lcb_STATUS pcbc_connection_cache(smart_str *plist_key, pcbc_connection_t
      zend_resource res;
      res.type = pcbc_res_couchbase;
      res.ptr = conn;
diff --git a/33.patch b/33.patch
deleted file mode 100644
index 45a7ed4..0000000
--- a/33.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 151df28b1b6d545ad71846f11a3a3af65bb1f3be Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Wed, 21 Jul 2021 08:32:57 +0200
-Subject: [PATCH] fix for 8.1.0beta1
-
----
- couchbase.h | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/couchbase.h b/couchbase.h
-index bc93c10..9748205 100644
---- a/couchbase.h
-+++ b/couchbase.h
-@@ -243,11 +243,18 @@ void pcbc_exception_init(zval *return_value, long code, const char *message);
- #define PCBC_ALLOC_OBJECT_T(obj_t, class_type)                                                                         \
-     (obj_t *)ecalloc(1, sizeof(obj_t) + zend_object_properties_size(class_type))
- 
-+#if PHP_VERSION_ID < 80100
- #define PCBC_CE_DISABLE_SERIALIZATION(ce)                                                                              \
-     do {                                                                                                               \
-         ce->serialize = zend_class_serialize_deny;                                                                     \
-         ce->unserialize = zend_class_unserialize_deny;                                                                 \
-     } while (0);
-+#else
-+#define PCBC_CE_DISABLE_SERIALIZATION(ce)                                                                              \
-+    do {                                                                                                               \
-+        ce->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE;                                                                        \
-+    } while (0);
-+#endif
- 
- #define PCBC_STRLEN_P(__pcbc_zval) Z_STRLEN((__pcbc_zval))
- #define PCBC_STRVAL_P(__pcbc_zval) Z_STRVAL((__pcbc_zval))
diff --git a/PHPINFO b/PHPINFO
index 558db8e..6193fda 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,9 +2,9 @@
 couchbase
 
 couchbase support => enabled
-extension version => 3.1.2
-libcouchbase runtime version => 3.1.3 (git: 7739e685e579fb981eda1fdf89f7d6fcd5b2ebc9)
-libcouchbase headers version => 3.1.3 (git: 7739e685e579fb981eda1fdf89f7d6fcd5b2ebc9)
+extension version => 3.2.0
+libcouchbase runtime version => 3.2.0 (git: c712686af5825f2f05c89112e555cd09906aa727)
+libcouchbase headers version => 3.2.0 (git: c712686af5825f2f05c89112e555cd09906aa727)
 zlib compressor => enabled
 
 Directive => Local Value => Master Value
diff --git a/REFLECTION b/REFLECTION
index fe49541..0b6fd2a 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #118 couchbase version 3.1.2 ] {
+Extension [ <persistent> extension #122 couchbase version 3.2.0 ] {
 
   - Dependencies {
     Dependency [ json (Required) ]
@@ -350,7 +350,7 @@ Extension [ <persistent> extension #118 couchbase version 3.1.2 ] {
     }
   }
 
-  - Classes [203] {
+  - Classes [237] {
     Interface [ <internal:couchbase> interface Couchbase\MutationToken ] {
 
       - Constants [0] {
@@ -5740,7 +5740,7 @@ Extension [ <persistent> extension #118 couchbase version 3.1.2 ] {
       - Properties [0] {
       }
 
-      - Methods [9] {
+      - Methods [10] {
         Method [ <internal:couchbase, ctor> public method __construct ] {
 
           - Parameters [2] {
@@ -5771,6 +5771,13 @@ Extension [ <persistent> extension #118 couchbase version 3.1.2 ] {
           - Return [ Couchbase\UserManager ]
         }
 
+        Method [ <internal:couchbase> public method analyticsIndexes ] {
+
+          - Parameters [0] {
+          }
+          - Return [ Couchbase\AnalyticsIndexManager ]
+        }
+
         Method [ <internal:couchbase> public method queryIndexes ] {
 
           - Parameters [0] {
@@ -6074,7 +6081,7 @@ Extension [ <persistent> extension #118 couchbase version 3.1.2 ] {
         Property [ <default> private $name ]
       }
 
-      - Methods [4] {
+      - Methods [5] {
         Method [ <internal:couchbase, ctor> public method __construct ] {
 
           - Parameters [2] {
@@ -6106,6 +6113,15 @@ Extension [ <persistent> extension #118 couchbase version 3.1.2 ] {
           }
           - Return [ Couchbase\QueryResult ]
         }
+
+        Method [ <internal:couchbase> public method analyticsQuery ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> string $statement ]
+            Parameter #1 [ <optional> Couchbase\AnalyticsOptions or NULL $queryOptions ]
+          }
+          - Return [ Couchbase\AnalyticsResult ]
+        }
       }
     }
 
@@ -7107,7 +7123,7 @@ Extension [ <persistent> extension #118 couchbase version 3.1.2 ] {
       }
 
       - Methods [6] {
-        Method [ <internal:couchbase> public method getScope ] {
+        Method [ <internal, deprecated:couchbase> public method getScope ] {
 
           - Parameters [1] {
             Parameter #0 [ <required> string $name ]
@@ -7236,6 +7252,996 @@ Extension [ <persistent> extension #118 couchbase version 3.1.2 ] {
       }
     }
 
+    Class [ <internal:couchbase> class Couchbase\AnalyticsIndexManager ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [1] {
+        Property [ <default> private $cluster ]
+      }
+
+      - Methods [15] {
+        Method [ <internal:couchbase> public method createDataverse ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> string $dataverseName ]
+            Parameter #1 [ <optional> Couchbase\CreateAnalyticsDataverseOptions or NULL $options ]
+          }
+        }
+
+        Method [ <internal:couchbase> public method dropDataverse ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> string $dataverseName ]
+            Parameter #1 [ <optional> Couchbase\DropAnalyticsDataverseOptions or NULL $options ]
+          }
+        }
+
+        Method [ <internal:couchbase> public method createDataset ] {
+
+          - Parameters [3] {
+            Parameter #0 [ <required> string $datasetName ]
+            Parameter #1 [ <required> string $bucketName ]
+            Parameter #2 [ <optional> Couchbase\CreateAnalyticsDatasetOptions or NULL $options ]
+          }
+        }
+
+        Method [ <internal:couchbase> public method dropDataset ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> string $datasetName ]
+            Parameter #1 [ <optional> Couchbase\DropAnalyticsDatasetOptions or NULL $options ]
+          }
+        }
+
+        Method [ <internal:couchbase> public method getAllDatasets ] {
+
+          - Parameters [0] {
+          }
+          - Return [ array ]
+        }
+
+        Method [ <internal:couchbase> public method createIndex ] {
+
+          - Parameters [4] {
+            Parameter #0 [ <required> string $datasetName ]
+            Parameter #1 [ <required> string $indexName ]
+            Parameter #2 [ <required> array $fields ]
+            Parameter #3 [ <optional> Couchbase\CreateAnalyticsIndexOptions or NULL $options ]
+          }
+        }
+
+        Method [ <internal:couchbase> public method dropIndex ] {
+
+          - Parameters [3] {
+            Parameter #0 [ <required> string $datasetName ]
+            Parameter #1 [ <required> string $indexName ]
+            Parameter #2 [ <required> Couchbase\DropAnalyticsIndexOptions or NULL $options ]
+          }
+        }
+
+        Method [ <internal:couchbase> public method getAllIndexes ] {
+
+          - Parameters [0] {
+          }
+          - Return [ array ]
+        }
+
+        Method [ <internal:couchbase> public method connectLink ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <optional> Couchbase\ConnectAnalyticsLinkOptions or NULL $options ]
+          }
+        }
+
+        Method [ <internal:couchbase> public method disconnectLink ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <optional> Couchbase\DisconnectAnalyticsLinkOptions or NULL $options ]
+          }
+        }
+
+        Method [ <internal:couchbase> public method getPendingMutations ] {
+
+          - Parameters [0] {
+          }
+          - Return [ array ]
+        }
+
+        Method [ <internal:couchbase> public method createLink ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> Couchbase\AnalyticsLink $link ]
+            Parameter #1 [ <optional> Couchbase\CreateAnalyticsLinkOptions or NULL $options ]
+          }
+        }
+
+        Method [ <internal:couchbase> public method replaceLink ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> Couchbase\AnalyticsLink $link ]
+            Parameter #1 [ <optional> Couchbase\ReplaceAnalyticsLinkOptions or NULL $options ]
+          }
+        }
+
+        Method [ <internal:couchbase> public method dropLink ] {
+
+          - Parameters [3] {
+            Parameter #0 [ <required> string $linkName ]
+            Parameter #1 [ <required> Couchbase\AnalyticsLink $dataverseName ]
+            Parameter #2 [ <optional> Couchbase\DropAnalyticsLinkOptions or NULL $options ]
+          }
+        }
+
+        Method [ <internal:couchbase> public method getLinks ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> Couchbase\GetAnalyticsLinksOptions or NULL $options ]
+          }
+        }
+      }
+    }
+
+    Class [ <internal:couchbase> class Couchbase\AnalyticsDataset ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [4] {
+        Property [ <default> private $name ]
+        Property [ <default> private $dataverse_name ]
+        Property [ <default> private $link_name ]
+        Property [ <default> private $bucket_name ]
+      }
+
+      - Methods [4] {
+        Method [ <internal:couchbase> public method name ] {
+
+          - Parameters [0] {
+          }
+          - Return [ string ]
+        }
+
+        Method [ <internal:couchbase> public method dataverseName ] {
+
+          - Parameters [0] {
+          }
+          - Return [ string ]
+        }
+
+        Method [ <internal:couchbase> public method linkName ] {
+
+          - Parameters [0] {
+          }
+          - Return [ string ]
+        }
+
+        Method [ <internal:couchbase> public method bucketName ] {
+
+          - Parameters [0] {
+          }
+          - Return [ string ]
+        }
+      }
+    }
+
+    Class [ <internal:couchbase> class Couchbase\AnalyticsIndex ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [4] {
+        Property [ <default> private $name ]
+        Property [ <default> private $dataverse_name ]
+        Property [ <default> private $link_name ]
+        Property [ <default> private $is_primary ]
+      }
+
+      - Methods [4] {
+        Method [ <internal:couchbase> public method name ] {
+
+          - Parameters [0] {
+          }
+          - Return [ string ]
+        }
+
+        Method [ <internal:couchbase> public method datasetName ] {
+
+          - Parameters [0] {
+          }
+          - Return [ string ]
+        }
+
+        Method [ <internal:couchbase> public method dataverseName ] {
+
+          - Parameters [0] {
+          }
+          - Return [ string ]
+        }
+
+        Method [ <internal:couchbase> public method isPrimary ] {
+
+          - Parameters [0] {
+          }
+          - Return [ bool ]
+        }
+      }
+    }
+
+    Class [ <internal:couchbase> class Couchbase\CreateAnalyticsDataverseOptions ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [1] {
+        Property [ <default> private $ignore_if_exists ]
+      }
+
+      - Methods [1] {
+        Method [ <internal:couchbase> public method ignoreIfExists ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> bool $shouldIgnore ]
+          }
+          - Return [ Couchbase\CreateAnalyticsDataverseOptions ]
+        }
+      }
+    }
+
+    Class [ <internal:couchbase> class Couchbase\DropAnalyticsDataverseOptions ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [1] {
+        Property [ <default> private $ignore_if_not_exists ]
+      }
+
+      - Methods [1] {
+        Method [ <internal:couchbase> public method ignoreIfNotExists ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> bool $shouldIgnore ]
+          }
+          - Return [ Couchbase\DropAnalyticsDataverseOptions ]
+        }
+      }
+    }
+
+    Class [ <internal:couchbase> class Couchbase\CreateAnalyticsDatasetOptions ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [3] {
+        Property [ <default> private $ignore_if_exists ]
+        Property [ <default> private $condition ]
+        Property [ <default> private $dataverse_name ]
+      }
+
+      - Methods [3] {
+        Method [ <internal:couchbase> public method ignoreIfExists ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> bool $shouldIgnore ]
+          }
+          - Return [ Couchbase\CreateAnalyticsDatasetOptions ]
+        }
+
+        Method [ <internal:couchbase> public method condition ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $condition ]
+          }
+          - Return [ Couchbase\CreateAnalyticsDatasetOptions ]
+        }
+
+        Method [ <internal:couchbase> public method dataverseName ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $dataverseName ]
+          }
+          - Return [ Couchbase\CreateAnalyticsDatasetOptions ]
+        }
+      }
+    }
+
+    Class [ <internal:couchbase> class Couchbase\DropAnalyticsDatasetOptions ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [2] {
+        Property [ <default> private $ignore_if_not_exists ]
+        Property [ <default> private $dataverse_name ]
+      }
+
+      - Methods [2] {
+        Method [ <internal:couchbase> public method ignoreIfNotExists ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> bool $shouldIgnore ]
+          }
+          - Return [ Couchbase\DropAnalyticsDatasetOptions ]
+        }
+
+        Method [ <internal:couchbase> public method dataverseName ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $dataverseName ]
+          }
+          - Return [ Couchbase\DropAnalyticsDatasetOptions ]
+        }
+      }
+    }
+
+    Class [ <internal:couchbase> class Couchbase\CreateAnalyticsIndexOptions ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [2] {
+        Property [ <default> private $ignore_if_exists ]
+        Property [ <default> private $dataverse_name ]
+      }
+
+      - Methods [2] {
+        Method [ <internal:couchbase> public method ignoreIfExists ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> bool $shouldIgnore ]
+          }
+          - Return [ Couchbase\CreateAnalyticsIndexOptions ]
+        }
+
+        Method [ <internal:couchbase> public method dataverseName ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $dataverseName ]
+          }
+          - Return [ Couchbase\CreateAnalyticsIndexOptions ]
+        }
+      }
+    }
+
+    Class [ <internal:couchbase> class Couchbase\DropAnalyticsIndexOptions ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [2] {
+        Property [ <default> private $ignore_if_not_exists ]
+        Property [ <default> private $dataverse_name ]
+      }
+
+      - Methods [2] {
+        Method [ <internal:couchbase> public method ignoreIfNotExists ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> bool $shouldIgnore ]
+          }
+          - Return [ Couchbase\DropAnalyticsIndexOptions ]
+        }
+
+        Method [ <internal:couchbase> public method dataverseName ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $dataverseName ]
+          }
+          - Return [ Couchbase\DropAnalyticsIndexOptions ]
+        }
+      }
+    }
+
+    Class [ <internal:couchbase> class Couchbase\ConnectAnalyticsLinkOptions ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [2] {
+        Property [ <default> private $link_name ]
+        Property [ <default> private $dataverse_name ]
+      }
+
+      - Methods [2] {
+        Method [ <internal:couchbase> public method dataverseName ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $dataverseName ]
+          }
+          - Return [ Couchbase\ConnectAnalyticsLinkOptions ]
+        }
+
+        Method [ <internal:couchbase> public method linkName ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $linkName ]
+          }
+          - Return [ Couchbase\ConnectAnalyticsLinkOptions ]
+        }
+      }
+    }
+
+    Class [ <internal:couchbase> class Couchbase\DisconnectAnalyticsLinkOptions ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [2] {
+        Property [ <default> private $link_name ]
+        Property [ <default> private $dataverse_name ]
+      }
+
+      - Methods [2] {
+        Method [ <internal:couchbase> public method dataverseName ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $dataverseName ]
+          }
+          - Return [ Couchbase\DisconnectAnalyticsLinkOptions ]
+        }
+
+        Method [ <internal:couchbase> public method linkName ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $linkName ]
+          }
+          - Return [ Couchbase\DisconnectAnalyticsLinkOptions ]
+        }
+      }
+    }
+
+    Class [ <internal:couchbase> class Couchbase\EncryptionSettings ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [4] {
+        Property [ <default> private $level ]
+        Property [ <default> private $certificate ]
+        Property [ <default> private $client_certificate ]
+        Property [ <default> private $client_key ]
+      }
+
+      - Methods [4] {
+        Method [ <internal:couchbase> public method level ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $level ]
+          }
+          - Return [ Couchbase\EncryptionSettings ]
+        }
+
+        Method [ <internal:couchbase> public method certificate ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $certificate ]
+          }
+          - Return [ Couchbase\EncryptionSettings ]
+        }
+
+        Method [ <internal:couchbase> public method clientCertificate ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $certificate ]
+          }
+          - Return [ Couchbase\EncryptionSettings ]
+        }
+
+        Method [ <internal:couchbase> public method clientKey ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $key ]
+          }
+          - Return [ Couchbase\EncryptionSettings ]
+        }
+      }
+    }
+
+    Interface [ <internal:couchbase> interface Couchbase\AnalyticsLink ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [0] {
+      }
+
+      - Methods [0] {
+      }
+    }
+
+    Class [ <internal:couchbase> class Couchbase\CouchbaseRemoteAnalyticsLink implements Couchbase\AnalyticsLink ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [6] {
+        Property [ <default> private $name ]
+        Property [ <default> private $dataverse ]
+        Property [ <default> private $hostname ]
+        Property [ <default> private $username ]
+        Property [ <default> private $password ]
+        Property [ <default> private $encryption ]
+      }
+
+      - Methods [6] {
+        Method [ <internal:couchbase> public method name ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $name ]
+          }
+          - Return [ Couchbase\CouchbaseRemoteAnalyticsLink ]
+        }
+
+        Method [ <internal:couchbase> public method dataverse ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $dataverse ]
+          }
+          - Return [ Couchbase\CouchbaseRemoteAnalyticsLink ]
+        }
+
+        Method [ <internal:couchbase> public method hostname ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $hostname ]
+          }
+          - Return [ Couchbase\CouchbaseRemoteAnalyticsLink ]
+        }
+
+        Method [ <internal:couchbase> public method username ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $username ]
+          }
+          - Return [ Couchbase\CouchbaseRemoteAnalyticsLink ]
+        }
+
+        Method [ <internal:couchbase> public method password ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $password ]
+          }
+          - Return [ Couchbase\CouchbaseRemoteAnalyticsLink ]
+        }
+
+        Method [ <internal:couchbase> public method encryption ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> Couchbase\EncryptionSettings $settings ]
+          }
+          - Return [ Couchbase\CouchbaseRemoteAnalyticsLink ]
+        }
+      }
+    }
+
+    Class [ <internal:couchbase> class Couchbase\AzureBlobExternalAnalyticsLink implements Couchbase\AnalyticsLink ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [8] {
+        Property [ <default> private $name ]
+        Property [ <default> private $dataverse ]
+        Property [ <default> private $connection_string ]
+        Property [ <default> private $account_name ]
+        Property [ <default> private $account_key ]
+        Property [ <default> private $shared_access_signature ]
+        Property [ <default> private $blob_endpoint ]
+        Property [ <default> private $endpoint_suffix ]
+      }
+
+      - Methods [8] {
+        Method [ <internal:couchbase> public method name ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $name ]
+          }
+          - Return [ Couchbase\AzureBlobExternalAnalyticsLink ]
+        }
+
+        Method [ <internal:couchbase> public method dataverse ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $dataverse ]
+          }
+          - Return [ Couchbase\AzureBlobExternalAnalyticsLink ]
+        }
+
+        Method [ <internal:couchbase> public method connectionString ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $connectionString ]
+          }
+          - Return [ Couchbase\AzureBlobExternalAnalyticsLink ]
+        }
+
+        Method [ <internal:couchbase> public method accountName ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $accountName ]
+          }
+          - Return [ Couchbase\AzureBlobExternalAnalyticsLink ]
+        }
+
+        Method [ <internal:couchbase> public method accountKey ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $accountKey ]
+          }
+          - Return [ Couchbase\AzureBlobExternalAnalyticsLink ]
+        }
+
+        Method [ <internal:couchbase> public method sharedAccessSignature ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $signature ]
+          }
+          - Return [ Couchbase\AzureBlobExternalAnalyticsLink ]
+        }
+
+        Method [ <internal:couchbase> public method blobEndpoint ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $blobEndpoint ]
+          }
+          - Return [ Couchbase\AzureBlobExternalAnalyticsLink ]
+        }
+
+        Method [ <internal:couchbase> public method endpointSuffix ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $endpointSuffix ]
+          }
+          - Return [ Couchbase\AzureBlobExternalAnalyticsLink ]
+        }
+      }
+    }
+
+    Class [ <internal:couchbase> class Couchbase\S3ExternalAnalyticsLink implements Couchbase\AnalyticsLink ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [7] {
+        Property [ <default> private $name ]
+        Property [ <default> private $dataverse ]
+        Property [ <default> private $access_key_id ]
+        Property [ <default> private $secret_access_key ]
+        Property [ <default> private $region ]
+        Property [ <default> private $session_token ]
+        Property [ <default> private $service_endpoint ]
+      }
+
+      - Methods [7] {
+        Method [ <internal:couchbase> public method name ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $name ]
+          }
+          - Return [ Couchbase\S3ExternalAnalyticsLink ]
+        }
+
+        Method [ <internal:couchbase> public method dataverse ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $dataverse ]
+          }
+          - Return [ Couchbase\S3ExternalAnalyticsLink ]
+        }
+
+        Method [ <internal:couchbase> public method accessKeyId ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $accessKeyId ]
+          }
+          - Return [ Couchbase\S3ExternalAnalyticsLink ]
+        }
+
+        Method [ <internal:couchbase> public method secretAccessKey ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $secretAccessKey ]
+          }
+          - Return [ Couchbase\S3ExternalAnalyticsLink ]
+        }
+
+        Method [ <internal:couchbase> public method region ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $region ]
+          }
+          - Return [ Couchbase\S3ExternalAnalyticsLink ]
+        }
+
+        Method [ <internal:couchbase> public method sessionToken ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $sessionToken ]
+          }
+          - Return [ Couchbase\S3ExternalAnalyticsLink ]
+        }
+
+        Method [ <internal:couchbase> public method serviceEndpoint ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $serviceEndpoint ]
+          }
+          - Return [ Couchbase\S3ExternalAnalyticsLink ]
+        }
+      }
+    }
+
+    Class [ <internal:couchbase> class Couchbase\CreateAnalyticsLinkOptions ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [1] {
+        Property [ <default> private $timeout ]
+      }
+
+      - Methods [1] {
+        Method [ <internal:couchbase> public method timeout ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $timeout ]
+          }
+          - Return [ Couchbase\CreateAnalyticsLinkOptions ]
+        }
+      }
+    }
+
+    Class [ <internal:couchbase> class Couchbase\ReplaceAnalyticLinkOptions ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [1] {
+        Property [ <default> private $timeout ]
+      }
+
+      - Methods [1] {
+        Method [ <internal:couchbase> public method timeout ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $timeout ]
+          }
+          - Return [ Couchbase\ReplaceAnalyticsLinkOptions ]
+        }
+      }
+    }
+
+    Class [ <internal:couchbase> class Couchbase\DropAnalyticsLinkOptions ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [1] {
+        Property [ <default> private $timeout ]
+      }
+
+      - Methods [1] {
+        Method [ <internal:couchbase> public method timeout ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $timeout ]
+          }
+          - Return [ Couchbase\DropAnalyticsLinkOptions ]
+        }
+      }
+    }
+
+    Class [ <internal:couchbase> class Couchbase\GetAnalyticsLinksOptions ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [4] {
+        Property [ <default> private $timeout ]
+        Property [ <default> private $link_type ]
+        Property [ <default> private $dataverse ]
+        Property [ <default> private $name ]
+      }
+
+      - Methods [4] {
+        Method [ <internal:couchbase> public method timeout ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $timeout ]
+          }
+          - Return [ Couchbase\GetAnalyticsLinksOptions ]
+        }
+
+        Method [ <internal:couchbase> public method linkType ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $type ]
+          }
+          - Return [ Couchbase\GetAnalyticsLinksOptions ]
+        }
+
+        Method [ <internal:couchbase> public method dataverse ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $dataverse ]
+          }
+          - Return [ Couchbase\GetAnalyticsLinksOptions ]
+        }
+
+        Method [ <internal:couchbase> public method name ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $name ]
+          }
+          - Return [ Couchbase\GetAnalyticsLinksOptions ]
+        }
+      }
+    }
+
+    Interface [ <internal:couchbase> interface Couchbase\AnalyticsLinkType ] {
+
+      - Constants [3] {
+        Constant [ public string COUCHBASE ] { couchbase }
+        Constant [ public string S3 ] { s3 }
+        Constant [ public string AZURE_BLOB ] { azureblob }
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [0] {
+      }
+
+      - Methods [0] {
+      }
+    }
+
+    Interface [ <internal:couchbase> interface Couchbase\AnalyticsEncryptionLevel ] {
+
+      - Constants [3] {
+        Constant [ public string NONE ] { none }
+        Constant [ public string HALF ] { half }
+        Constant [ public string FULL ] { full }
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [0] {
+      }
+
+      - Methods [0] {
+      }
+    }
+
     Class [ <internal:couchbase> class Couchbase\QueryIndexManager ] {
 
       - Constants [0] {
@@ -7325,7 +8331,7 @@ Extension [ <persistent> extension #118 couchbase version 3.1.2 ] {
       - Static methods [0] {
       }
 
-      - Properties [7] {
+      - Properties [8] {
         Property [ <default> private $name ]
         Property [ <default> private $is_primary ]
         Property [ <default> private $type ]
@@ -7333,6 +8339,7 @@ Extension [ <persistent> extension #118 couchbase version 3.1.2 ] {
         Property [ <default> private $keyspace ]
         Property [ <default> private $index_key ]
         Property [ <default> private $condition ]
+        Property [ <default> private $partition ]
       }
 
       - Methods [7] {
@@ -7701,7 +8708,7 @@ Extension [ <persistent> extension #118 couchbase version 3.1.2 ] {
       - Static methods [0] {
       }
 
-      - Properties [8] {
+      - Properties [10] {
         Property [ <default> private $timeout ]
         Property [ <default> private $positional_params ]
         Property [ <default> private $named_params ]
@@ -7710,9 +8717,11 @@ Extension [ <persistent> extension #118 couchbase version 3.1.2 ] {
         Property [ <default> private $priority ]
         Property [ <default> private $readonly ]
         Property [ <default> private $client_context_id ]
+        Property [ <default> private $scope_name ]
+        Property [ <default> private $scope_qualifier ]
       }
 
-      - Methods [8] {
+      - Methods [10] {
         Method [ <internal:couchbase> public method timeout ] {
 
           - Parameters [1] {
@@ -7777,6 +8786,22 @@ Extension [ <persistent> extension #118 couchbase version 3.1.2 ] {
           }
           - Return [ Couchbase\AnalyticsOptions ]
         }
+
+        Method [ <internal:couchbase> public method scopeName ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $value ]
+          }
+          - Return [ Couchbase\AnalyticsOptions ]
+        }
+
+        Method [ <internal:couchbase> public method scopeQualifier ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> string $value ]
+          }
+          - Return [ Couchbase\AnalyticsOptions ]
+        }
       }
     }
 
@@ -8195,7 +9220,7 @@ Extension [ <persistent> extension #118 couchbase version 3.1.2 ] {
       - Static methods [0] {
       }
 
-      - Properties [11] {
+      - Properties [12] {
         Property [ <default> private $timeout ]
         Property [ <default> private $limit ]
         Property [ <default> private $skip ]
@@ -8207,9 +9232,10 @@ Extension [ <persistent> extension #118 couchbase version 3.1.2 ] {
         Property [ <default> private $highlight_style ]
         Property [ <default> private $highlight_fields ]
         Property [ <default> private $disable_scoring ]
+        Property [ <default> private $collections ]
       }
 
-      - Methods [11] {
+      - Methods [12] {
         Method [ <internal:couchbase, prototype JsonSerializable> public method jsonSerialize ] {
 
           - Parameters [0] {
@@ -8297,6 +9323,14 @@ Extension [ <persistent> extension #118 couchbase version 3.1.2 ] {
           }
           - Return [ Couchbase\SearchOptions ]
         }
+
+        Method [ <internal:couchbase> public method collections ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> array $collections ]
+          }
+          - Return [ Couchbase\SearchOptions ]
+        }
       }
     }
 
@@ -10458,15 +11492,16 @@ Extension [ <persistent> extension #118 couchbase version 3.1.2 ] {
       - Static methods [0] {
       }
 
-      - Properties [5] {
+      - Properties [6] {
         Property [ <default> private $cas ]
         Property [ <default> private $timeout ]
         Property [ <default> private $expiry ]
+        Property [ <default> private $preserve_expiry ]
         Property [ <default> private $durability_level ]
         Property [ <default> private $encoder ]
       }
 
-      - Methods [5] {
+      - Methods [6] {
         Method [ <internal, deprecated:couchbase> public method cas ] {
 
           - Parameters [1] {
@@ -10491,6 +11526,14 @@ Extension [ <persistent> extension #118 couchbase version 3.1.2 ] {
           - Return [ Couchbase\UpsertOptions ]
         }
 
+        Method [ <internal:couchbase> public method preserveExpiry ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> bool $shouldPreserve ]
+          }
+          - Return [ Couchbase\UpsertOptions ]
+        }
+
         Method [ <internal:couchbase> public method durabilityLevel ] {
 
           - Parameters [1] {
@@ -10520,15 +11563,16 @@ Extension [ <persistent> extension #118 couchbase version 3.1.2 ] {
       - Static methods [0] {
       }
 
-      - Properties [5] {
+      - Properties [6] {
         Property [ <default> private $cas ]
         Property [ <default> private $timeout ]
         Property [ <default> private $expiry ]
+        Property [ <default> private $preserve_expiry ]
         Property [ <default> private $durability_level ]
         Property [ <default> private $encoder ]
       }
 
-      - Methods [5] {
+      - Methods [6] {
         Method [ <internal:couchbase> public method cas ] {
 
           - Parameters [1] {
@@ -10553,6 +11597,14 @@ Extension [ <persistent> extension #118 couchbase version 3.1.2 ] {
           - Return [ Couchbase\ReplaceOptions ]
         }
 
+        Method [ <internal:couchbase> public method preserveExpiry ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> bool $shouldPreserve ]
+          }
+          - Return [ Couchbase\ReplaceOptions ]
+        }
+
         Method [ <internal:couchbase> public method durabilityLevel ] {
 
           - Parameters [1] {
@@ -10718,13 +11770,12 @@ Extension [ <persistent> extension #118 couchbase version 3.1.2 ] {
       - Static methods [0] {
       }
 
-      - Properties [6] {
+      - Properties [5] {
         Property [ <default> private $timeout ]
         Property [ <default> private $expiry ]
         Property [ <default> private $durability_level ]
         Property [ <default> private $delta ]
         Property [ <default> private $initial ]
-        Property [ <default> private $cas ]
       }
 
       - Methods [6] {
@@ -10789,13 +11840,12 @@ Extension [ <persistent> extension #118 couchbase version 3.1.2 ] {
       - Static methods [0] {
       }
 
-      - Properties [6] {
+      - Properties [5] {
         Property [ <default> private $timeout ]
         Property [ <default> private $expiry ]
         Property [ <default> private $durability_level ]
         Property [ <default> private $delta ]
         Property [ <default> private $initial ]
-        Property [ <default> private $cas ]
       }
 
       - Methods [6] {
@@ -10939,15 +11989,16 @@ Extension [ <persistent> extension #118 couchbase version 3.1.2 ] {
       - Static methods [0] {
       }
 
-      - Properties [5] {
+      - Properties [6] {
         Property [ <default> private $cas ]
         Property [ <default> private $timeout ]
         Property [ <default> private $expiry ]
+        Property [ <default> private $preserve_expiry ]
         Property [ <default> private $durability_level ]
         Property [ <default> private $store_semantics ]
       }
 
-      - Methods [5] {
+      - Methods [6] {
         Method [ <internal:couchbase> public method cas ] {
 
           - Parameters [1] {
@@ -10972,6 +12023,14 @@ Extension [ <persistent> extension #118 couchbase version 3.1.2 ] {
           - Return [ Couchbase\MutateInOptions ]
         }
 
+        Method [ <internal:couchbase> public method preserveExpiry ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> bool $shouldPreserve ]
+          }
+          - Return [ Couchbase\MutateInOptions ]
+        }
+
         Method [ <internal:couchbase> public method durabilityLevel ] {
 
           - Parameters [1] {
@@ -11592,12 +12651,14 @@ Extension [ <persistent> extension #118 couchbase version 3.1.2 ] {
       - Static methods [0] {
       }
 
-      - Properties [2] {
+      - Properties [4] {
         Property [ <default> private $username ]
         Property [ <default> private $password ]
+        Property [ <default> private $meter ]
+        Property [ <default> private $tracer ]
       }
 
-      - Methods [1] {
+      - Methods [3] {
         Method [ <internal:couchbase> public method credentials ] {
 
           - Parameters [2] {
@@ -11606,6 +12667,424 @@ Extension [ <persistent> extension #118 couchbase version 3.1.2 ] {
           }
           - Return [ Couchbase\ClusterOptions ]
         }
+
+        Method [ <internal:couchbase> public method meter ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> Couchbase\Meter $meter ]
+          }
+          - Return [ Couchbase\ClusterOptions ]
+        }
+
+        Method [ <internal:couchbase> public method tracer ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> Couchbase\RequestTracer $tracer ]
+          }
+          - Return [ Couchbase\ClusterOptions ]
+        }
+      }
+    }
+
+    Interface [ <internal:couchbase> interface Couchbase\ValueRecorder ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [0] {
+      }
+
+      - Methods [1] {
+        Method [ <internal:couchbase> abstract public method recordValue ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> int $value ]
+          }
+          - Return [ void ]
+        }
+      }
+    }
+
+    Interface [ <internal:couchbase> interface Couchbase\Meter ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [0] {
+      }
+
+      - Methods [1] {
+        Method [ <internal:couchbase> abstract public method valueRecorder ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> string $name ]
+            Parameter #1 [ <required> array $tags ]
+          }
+          - Return [ Couchbase\ValueRecorder ]
+        }
+      }
+    }
+
+    Class [ <internal:couchbase> class Couchbase\LoggingValueRecorder implements Couchbase\ValueRecorder ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [0] {
+      }
+
+      - Methods [1] {
+        Method [ <internal:couchbase, prototype Couchbase\ValueRecorder> public method recordValue ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> int $value ]
+          }
+          - Return [ void ]
+        }
+      }
+    }
+
+    Class [ <internal:couchbase> class Couchbase\LoggingMeter implements Couchbase\Meter ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [1] {
+        Property [ <default> private $flush_interval ]
+      }
+
+      - Methods [2] {
+        Method [ <internal:couchbase, prototype Couchbase\Meter> public method valueRecorder ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> string $name ]
+            Parameter #1 [ <required> array $tags ]
+          }
+          - Return [ Couchbase\ValueRecorder ]
+        }
+
+        Method [ <internal:couchbase> public method flushInterval ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> int $duration ]
+          }
+          - Return [ Couchbase\LoggingMeter ]
+        }
+      }
+    }
+
+    Class [ <internal:couchbase> class Couchbase\NoopValueRecorder implements Couchbase\ValueRecorder ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [0] {
+      }
+
+      - Methods [1] {
+        Method [ <internal:couchbase, prototype Couchbase\ValueRecorder> public method recordValue ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> int $value ]
+          }
+          - Return [ void ]
+        }
+      }
+    }
+
+    Class [ <internal:couchbase> class Couchbase\NoopMeter implements Couchbase\Meter ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [0] {
+      }
+
+      - Methods [1] {
+        Method [ <internal:couchbase, prototype Couchbase\Meter> public method valueRecorder ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> string $name ]
+            Parameter #1 [ <required> array $tags ]
+          }
+          - Return [ Couchbase\ValueRecorder ]
+        }
+      }
+    }
+
+    Interface [ <internal:couchbase> interface Couchbase\RequestSpan ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [0] {
+      }
+
+      - Methods [2] {
+        Method [ <internal:couchbase> abstract public method addTag ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> string $key ]
+            Parameter #1 [ <required> $value ]
+          }
+          - Return [ void ]
+        }
+
+        Method [ <internal:couchbase> abstract public method end ] {
+
+          - Parameters [0] {
+          }
+          - Return [ void ]
+        }
+      }
+    }
+
+    Interface [ <internal:couchbase> interface Couchbase\RequestTracer ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [0] {
+      }
+
+      - Methods [1] {
+        Method [ <internal:couchbase> abstract public method requestSpan ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> string $name ]
+            Parameter #1 [ <required> Couchbase\RequestSpan or NULL $parent ]
+          }
+          - Return [ Couchbase\RequestSpan ]
+        }
+      }
+    }
+
+    Class [ <internal:couchbase> class Couchbase\LoggingRequestSpan implements Couchbase\RequestSpan ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [0] {
+      }
+
+      - Methods [2] {
+        Method [ <internal:couchbase, prototype Couchbase\RequestSpan> public method addTag ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> string $key ]
+            Parameter #1 [ <required> $value ]
+          }
+          - Return [ void ]
+        }
+
+        Method [ <internal:couchbase, prototype Couchbase\RequestSpan> public method end ] {
+
+          - Parameters [0] {
+          }
+          - Return [ void ]
+        }
+      }
+    }
+
+    Class [ <internal:couchbase> class Couchbase\ThresholdLoggingTracer implements Couchbase\RequestTracer ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [7] {
+        Property [ <default> private $emit_interval ]
+        Property [ <default> private $kv_threshold ]
+        Property [ <default> private $query_threshold ]
+        Property [ <default> private $views_threshold ]
+        Property [ <default> private $search_threshold ]
+        Property [ <default> private $analytics_threshold ]
+        Property [ <default> private $sample_size ]
+      }
+
+      - Methods [8] {
+        Method [ <internal:couchbase, prototype Couchbase\RequestTracer> public method requestSpan ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> string $name ]
+            Parameter #1 [ <required> Couchbase\RequestSpan or NULL $parent ]
+          }
+          - Return [ Couchbase\RequestSpan ]
+        }
+
+        Method [ <internal:couchbase> public method emitInterval ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> int $duration ]
+          }
+          - Return [ Couchbase\ThresholdLoggingTracer ]
+        }
+
+        Method [ <internal:couchbase> public method kvThreshold ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> int $threshold ]
+          }
+          - Return [ Couchbase\ThresholdLoggingTracer ]
+        }
+
+        Method [ <internal:couchbase> public method queryThreshold ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> int $threshold ]
+          }
+          - Return [ Couchbase\ThresholdLoggingTracer ]
+        }
+
+        Method [ <internal:couchbase> public method viewsThreshold ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> int $threshold ]
+          }
+          - Return [ Couchbase\ThresholdLoggingTracer ]
+        }
+
+        Method [ <internal:couchbase> public method searchThreshold ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> int $threshold ]
+          }
+          - Return [ Couchbase\ThresholdLoggingTracer ]
+        }
+
+        Method [ <internal:couchbase> public method analyticsThreshold ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> int $threshold ]
+          }
+          - Return [ Couchbase\ThresholdLoggingTracer ]
+        }
+
+        Method [ <internal:couchbase> public method sampleSize ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> int $size ]
+          }
+          - Return [ Couchbase\ThresholdLoggingTracer ]
+        }
+      }
+    }
+
+    Class [ <internal:couchbase> class Couchbase\NoopRequestSpan implements Couchbase\RequestSpan ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [0] {
+      }
+
+      - Methods [2] {
+        Method [ <internal:couchbase, prototype Couchbase\RequestSpan> public method addTag ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> string $key ]
+            Parameter #1 [ <required> $value ]
+          }
+          - Return [ void ]
+        }
+
+        Method [ <internal:couchbase, prototype Couchbase\RequestSpan> public method end ] {
+
+          - Parameters [0] {
+          }
+          - Return [ void ]
+        }
+      }
+    }
+
+    Class [ <internal:couchbase> class Couchbase\NoopTracer implements Couchbase\RequestTracer ] {
+
+      - Constants [0] {
+      }
+
+      - Static properties [0] {
+      }
+
+      - Static methods [0] {
+      }
+
+      - Properties [0] {
+      }
+
+      - Methods [1] {
+        Method [ <internal:couchbase, prototype Couchbase\RequestTracer> public method requestSpan ] {
+
+          - Parameters [2] {
+            Parameter #0 [ <required> string $name ]
+            Parameter #1 [ <required> Couchbase\RequestSpan or NULL $parent ]
+          }
+          - Return [ Couchbase\RequestSpan ]
+        }
       }
     }
   }
diff --git a/php-pecl-couchbase3.spec b/php-pecl-couchbase3.spec
index 8ccb59e..90c9e7b 100644
--- a/php-pecl-couchbase3.spec
+++ b/php-pecl-couchbase3.spec
@@ -25,14 +25,13 @@
 
 Summary:       Couchbase Server PHP extension
 Name:          %{?sub_prefix}php-pecl-couchbase3
-Version:       3.1.2
-Release:       2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version:       3.2.0
+Release:       1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:       PHP
 URL:           https://pecl.php.net/package/couchbase
 Source0:       https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
 
 Patch0:        https://patch-diff.githubusercontent.com/raw/couchbase/php-couchbase/pull/32.patch
-Patch1:        https://patch-diff.githubusercontent.com/raw/couchbase/php-couchbase/pull/33.patch
 
 BuildRequires: make
 BuildRequires: %{?dtsprefix}gcc
@@ -41,8 +40,8 @@ BuildRequires: %{?scl_prefix}php-devel >= 7.2
 BuildRequires: %{?scl_prefix}php-pear
 BuildRequires: %{?scl_prefix}php-json
 BuildRequires: %{?scl_prefix}php-tokenizer
-# ensure we use the latest version (upstream requires 3.1.3)
-BuildRequires: pkgconfig(libcouchbase) >= 3.1.3
+# ensure we use the latest version (upstream requires 3.2.0)
+BuildRequires: pkgconfig(libcouchbase) >= 3.2.0
 BuildRequires: fastlz-devel
 BuildRequires: zlib-devel
 
@@ -111,7 +110,6 @@ mv %{pecl_name}-%{version}%{?prever} NTS
 
 cd NTS
 %patch0 -p1 -b .pr32
-%patch1 -p1 -b .pr33
 
 # Drop bundled library
 sed -e '/fastlz/d' -i ../package.xml
@@ -246,6 +244,11 @@ fi
 
 
 %changelog
+* Wed Jul 28 2021 Remi Collet <remi@remirepo.net> - 3.2.0-1
+- update to 3.2.0
+- drop patch merged upstream
+- raise dependency on libcouchbase 3.2
+
 * Wed Jul 21 2021 Remi Collet <remi@remirepo.net> - 3.1.2-2
 - add patch for PHP 8.1.0beta1 from
   https://github.com/couchbase/php-couchbase/pull/33