update to 4.1.0

drop patch merged upstream

4 files changed, 283 insertions, 650 deletions

diff --git a/32.patch b/32.patch
deleted file mode 100644
index b94ee3a..0000000
--- a/32.patch
+++ /dev/null
@@ -1,485 +0,0 @@
-From aa2e3d26a8c4a288b972041f5eed8aade1b88b1b Mon Sep 17 00:00:00 2001
-From: Sergey Avseyev <sergey.avseyev@gmail.com>
-Date: Thu, 12 May 2022 14:51:48 +0300
-Subject: [PATCH] fix argument info structure
-
-Apparently IS_RESOURCE cannot be used in argument info to tag
-resource arguments.
-
-The following command crashes after zend_type_to_string encounters
-IS_RESOURCE argument
-
-    php -d extension=couchbase --re couchbase
----
- src/php_couchbase.cxx | 122 +++++++++++++++++++++---------------------
- 1 file changed, 61 insertions(+), 61 deletions(-)
-
-diff --git a/src/php_couchbase.cxx b/src/php_couchbase.cxx
-index 4b8998c..64a615b 100644
---- a/src/php_couchbase.cxx
-+++ b/src/php_couchbase.cxx
-@@ -1756,7 +1756,7 @@ ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_version, 0, 0, 0)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_clusterVersion, 0, 0, 2)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucketName, IS_STRING, 0)
- ZEND_END_ARG_INFO()
- 
-@@ -1767,17 +1767,17 @@ ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 0)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_openBucket, 0, 0, 2)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucketName, IS_STRING, 0)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_closeBucket, 0, 0, 2)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucketName, IS_STRING, 0)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_documentUpsert, 0, 0, 7)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucket, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, scope, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, collection, IS_STRING, 0)
-@@ -1788,7 +1788,7 @@ ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_documentInsert, 0, 0, 7)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucket, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, scope, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, collection, IS_STRING, 0)
-@@ -1799,7 +1799,7 @@ ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_documentReplace, 0, 0, 7)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucket, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, scope, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, collection, IS_STRING, 0)
-@@ -1810,7 +1810,7 @@ ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_documentAppend, 0, 0, 6)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucket, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, scope, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, collection, IS_STRING, 0)
-@@ -1820,7 +1820,7 @@ ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_documentPrepend, 0, 0, 6)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucket, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, scope, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, collection, IS_STRING, 0)
-@@ -1830,7 +1830,7 @@ ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_documentIncrement, 0, 0, 5)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucket, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, scope, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, collection, IS_STRING, 0)
-@@ -1839,7 +1839,7 @@ ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_documentDecrement, 0, 0, 5)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucket, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, scope, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, collection, IS_STRING, 0)
-@@ -1848,7 +1848,7 @@ ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_documentGet, 0, 0, 5)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucket, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, scope, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, collection, IS_STRING, 0)
-@@ -1857,7 +1857,7 @@ ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_documentGetAndLock, 0, 0, 6)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucket, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, scope, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, collection, IS_STRING, 0)
-@@ -1867,7 +1867,7 @@ ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_documentGetAndTouch, 0, 0, 6)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucket, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, scope, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, collection, IS_STRING, 0)
-@@ -1877,7 +1877,7 @@ ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_documentUnlock, 0, 0, 6)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucket, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, scope, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, collection, IS_STRING, 0)
-@@ -1887,7 +1887,7 @@ ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_documentRemove, 0, 0, 5)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucket, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, scope, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, collection, IS_STRING, 0)
-@@ -1896,7 +1896,7 @@ ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_documentTouch, 0, 0, 6)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucket, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, scope, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, collection, IS_STRING, 0)
-@@ -1906,7 +1906,7 @@ ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_documentExists, 0, 0, 5)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucket, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, scope, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, collection, IS_STRING, 0)
-@@ -1915,7 +1915,7 @@ ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_documentMutateIn, 0, 0, 6)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucket, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, scope, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, collection, IS_STRING, 0)
-@@ -1925,7 +1925,7 @@ ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_documentLookupIn, 0, 0, 6)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucket, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, scope, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, collection, IS_STRING, 0)
-@@ -1935,7 +1935,7 @@ ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_documentGetMulti, 0, 0, 5)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucket, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, scope, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, collection, IS_STRING, 0)
-@@ -1944,7 +1944,7 @@ ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_documentRemoveMulti, 0, 0, 5)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucket, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, scope, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, collection, IS_STRING, 0)
-@@ -1953,7 +1953,7 @@ ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_documentUpsertMulti, 0, 0, 5)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucket, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, scope, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, collection, IS_STRING, 0)
-@@ -1962,19 +1962,19 @@ ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_query, 0, 0, 2)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, statement, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_analyticsQuery, 0, 0, 2)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, statement, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_viewQuery, 0, 0, 5)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucketName, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, designDocumentName, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, viewName, IS_STRING, 0)
-@@ -1983,31 +1983,31 @@ ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_searchQuery, 0, 0, 3)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, indexName, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, query, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_ping, 0, 0, 1)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_diagnostics, 0, 0, 2)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, reportId, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_searchIndexUpsert, 0, 0, 2)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, index, IS_ARRAY, 0)
- ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_viewIndexUpsert, 0, 0, 4)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucketName, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, index, IS_ARRAY, 0)
- ZEND_ARG_TYPE_INFO(0, nameSpace, IS_LONG, 0)
-@@ -2015,64 +2015,64 @@ ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_bucketCreate, 0, 0, 2)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucketSettings, IS_ARRAY, 0)
- ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_bucketUpdate, 0, 0, 2)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucketSettings, IS_ARRAY, 0)
- ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_bucketGet, 0, 0, 2)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_bucketGetAll, 0, 0, 1)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_bucketDrop, 0, 0, 2)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_bucketFlush, 0, 0, 2)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(ai_CouchbaseExtension_createTransactions, 0, 0, IS_RESOURCE, 1)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, configuration, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(ai_CouchbaseExtension_createTransactionContext, 0, 0, IS_RESOURCE, 1)
--ZEND_ARG_TYPE_INFO(0, transactions, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, transactions)
- ZEND_ARG_TYPE_INFO(0, configuration, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_transactionNewAttempt, 0, 0, 1)
--ZEND_ARG_TYPE_INFO(0, transaction, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, transactions)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_transactionCommit, 0, 0, 1)
--ZEND_ARG_TYPE_INFO(0, transaction, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, transactions)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_transactionRollback, 0, 0, 1)
--ZEND_ARG_TYPE_INFO(0, transaction, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, transactions)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_transactionGet, 0, 0, 5)
--ZEND_ARG_TYPE_INFO(0, transaction, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, transactions)
- ZEND_ARG_TYPE_INFO(0, bucketName, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, scopeName, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, collectionName, IS_STRING, 0)
-@@ -2080,7 +2080,7 @@ ZEND_ARG_TYPE_INFO(0, id, IS_STRING, 0)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_transactionInsert, 0, 0, 6)
--ZEND_ARG_TYPE_INFO(0, transaction, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, transactions)
- ZEND_ARG_TYPE_INFO(0, bucketName, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, scopeName, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, collectionName, IS_STRING, 0)
-@@ -2089,81 +2089,81 @@ ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_transactionReplace, 0, 0, 3)
--ZEND_ARG_TYPE_INFO(0, transaction, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, transactions)
- ZEND_ARG_TYPE_INFO(0, document, IS_ARRAY, 0)
- ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_transactionRemove, 0, 0, 2)
--ZEND_ARG_TYPE_INFO(0, transaction, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, transactions)
- ZEND_ARG_TYPE_INFO(0, document, IS_ARRAY, 0)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_transactionQuery, 0, 0, 2)
--ZEND_ARG_TYPE_INFO(0, transaction, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, transactions)
- ZEND_ARG_TYPE_INFO(0, statement, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_userUpsert, 0, 0, 2)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, user, IS_ARRAY, 0)
- ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_userGet, 0, 0, 2)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_userGetAll, 0, 0, 1)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_userDrop, 0, 0, 2)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_groupUpsert, 0, 0, 2)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, group, IS_ARRAY, 0)
- ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_groupGet, 0, 0, 2)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_groupGetAll, 0, 0, 1)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_groupDrop, 0, 0, 2)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_roleGetAll, 0, 0, 1)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_queryIndexGetAll, 0, 0, 2)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucketName, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_queryIndexCreate, 0, 0, 4)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucketName, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, indexName, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, fields, IS_ARRAY, 0)
-@@ -2171,26 +2171,26 @@ ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_queryIndexCreatePrimary, 0, 0, 2)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucketName, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_queryIndexDrop, 0, 0, 3)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucketName, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, indexName, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_queryIndexDropPrimary, 0, 0, 2)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucketName, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
- 
- ZEND_BEGIN_ARG_INFO_EX(ai_CouchbaseExtension_queryIndexBuildDeferred, 0, 0, 2)
--ZEND_ARG_TYPE_INFO(0, connection, IS_RESOURCE, 0)
-+ZEND_ARG_INFO(0, connection)
- ZEND_ARG_TYPE_INFO(0, bucketName, IS_STRING, 0)
- ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 1)
- ZEND_END_ARG_INFO()
diff --git a/PHPINFO b/PHPINFO
index 9bcb375..f87cdd3 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,12 +2,14 @@
 couchbase
 
 couchbase => enabled
-couchbase_extension_version => 4.0.0
-couchbase_extension_revision => 12ca305b72d36cc60ebffca0aa2c7e1cfc3ab803
-couchbase_client_revision => c8e08ab4170edd475040cd35cab8d9b8bd19d7eb
-couchbase_transactions_revision => b512466f7743f7cabc1b91d3340a05091f6e62e4
+couchbase_extension_version => 4.1.0
+couchbase_extension_revision => e32e8fc1f1d37d611d5e36cfafc9bb90adaf9cb1
+couchbase_client_revision => e6f82eca4388de9a062b719684d48b5d574a5096
 
 Directive => Local Value => Master Value
 couchbase.max_persistent => -1 => -1
 couchbase.persistent_timeout => -1 => -1
 couchbase.log_level => no value => no value
+couchbase.log_php_log_err => 1 => 1
+couchbase.log_stderr => 0 => 0
+couchbase.log_path => no value => no value
diff --git a/REFLECTION b/REFLECTION
index be91faf..31678e9 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
+Extension [ <persistent> extension #120 couchbase version 4.1.0 ] {
 
   - Dependencies {
     Dependency [ json (Required) ]
@@ -14,6 +14,15 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
     Entry [ couchbase.log_level <ALL> ]
       Current = ''
     }
+    Entry [ couchbase.log_php_log_err <SYSTEM> ]
+      Current = '1'
+    }
+    Entry [ couchbase.log_stderr <SYSTEM> ]
+      Current = '0'
+    }
+    Entry [ couchbase.log_path <SYSTEM> ]
+      Current = ''
+    }
   }
 
   - Functions {
@@ -29,6 +38,13 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
         Parameter #1 [ <required> string $bucketName ]
       }
     }
+    Function [ <internal:couchbase> function Couchbase\Extension\replicasConfiguredForBucket ] {
+
+      - Parameters [2] {
+        Parameter #0 [ <required> $connection ]
+        Parameter #1 [ <required> string $bucketName ]
+      }
+    }
     Function [ <internal:couchbase> function Couchbase\Extension\createConnection ] {
 
       - Parameters [3] {
@@ -147,6 +163,28 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
         Parameter #5 [ <optional> ?array $options = <default> ]
       }
     }
+    Function [ <internal:couchbase> function Couchbase\Extension\documentGetAnyReplica ] {
+
+      - Parameters [6] {
+        Parameter #0 [ <required> $connection ]
+        Parameter #1 [ <required> string $bucket ]
+        Parameter #2 [ <required> string $scope ]
+        Parameter #3 [ <required> string $collection ]
+        Parameter #4 [ <required> string $id ]
+        Parameter #5 [ <optional> ?array $options = <default> ]
+      }
+    }
+    Function [ <internal:couchbase> function Couchbase\Extension\documentGetAllReplicas ] {
+
+      - Parameters [6] {
+        Parameter #0 [ <required> $connection ]
+        Parameter #1 [ <required> string $bucket ]
+        Parameter #2 [ <required> string $scope ]
+        Parameter #3 [ <required> string $collection ]
+        Parameter #4 [ <required> string $id ]
+        Parameter #5 [ <optional> ?array $options = <default> ]
+      }
+    }
     Function [ <internal:couchbase> function Couchbase\Extension\documentGetAndTouch ] {
 
       - Parameters [7] {
@@ -605,8 +643,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [5] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
         Property [ private $context = NULL ]
       }
 
@@ -631,6 +669,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -704,8 +743,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -729,6 +768,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -802,8 +842,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -827,6 +867,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -900,8 +941,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -925,6 +966,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -998,8 +1040,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -1023,6 +1065,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -1096,8 +1139,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -1121,6 +1164,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -1194,8 +1238,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -1219,6 +1263,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -1292,8 +1337,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -1317,6 +1362,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -1390,8 +1436,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -1415,6 +1461,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -1488,8 +1535,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -1513,6 +1560,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -1586,8 +1634,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -1611,6 +1659,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -1684,8 +1733,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -1709,6 +1758,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -1782,8 +1832,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -1807,6 +1857,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -1880,8 +1931,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -1905,6 +1956,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -1978,8 +2030,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -2003,6 +2055,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -2076,8 +2129,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -2101,6 +2154,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -2174,8 +2228,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -2199,6 +2253,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -2272,8 +2327,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -2297,6 +2352,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -2370,8 +2426,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -2395,6 +2451,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -2468,8 +2525,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -2493,6 +2550,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -2566,8 +2624,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -2591,6 +2649,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -2664,8 +2723,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -2689,6 +2748,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -2762,8 +2822,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -2787,6 +2847,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -2860,8 +2921,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -2885,6 +2946,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -2958,8 +3020,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -2983,6 +3045,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -3056,8 +3119,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -3081,6 +3144,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -3154,8 +3218,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -3179,6 +3243,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -3252,8 +3317,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -3277,6 +3342,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -3350,8 +3416,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -3375,6 +3441,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -3448,8 +3515,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -3473,6 +3540,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -3546,8 +3614,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -3571,6 +3639,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -3644,8 +3713,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -3669,6 +3738,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -3742,8 +3812,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -3767,6 +3837,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -3840,8 +3911,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -3865,6 +3936,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -3938,8 +4010,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -3963,6 +4035,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -4036,8 +4109,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -4061,6 +4134,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -4134,8 +4208,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -4159,6 +4233,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -4232,8 +4307,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -4257,6 +4332,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -4330,8 +4406,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -4355,6 +4431,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -4428,8 +4505,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -4453,6 +4530,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -4526,8 +4604,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -4551,6 +4629,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -4624,8 +4703,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -4649,6 +4728,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -4722,8 +4802,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -4747,6 +4827,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -4820,8 +4901,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -4845,6 +4926,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -4918,8 +5000,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -4943,6 +5025,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -5016,8 +5099,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -5041,6 +5124,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -5114,8 +5198,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -5139,6 +5223,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -5212,8 +5297,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -5237,6 +5322,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -5310,8 +5396,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -5335,6 +5421,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -5408,8 +5495,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -5433,6 +5520,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -5506,8 +5594,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -5531,6 +5619,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -5604,8 +5693,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -5629,6 +5718,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -5702,8 +5792,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -5727,6 +5817,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -5800,8 +5891,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -5825,6 +5916,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -5898,8 +5990,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -5923,6 +6015,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -5996,8 +6089,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -6021,6 +6114,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -6094,8 +6188,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -6119,6 +6213,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -6192,8 +6287,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -6217,6 +6312,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -6290,8 +6386,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -6315,6 +6411,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -6388,8 +6485,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -6413,6 +6510,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -6486,8 +6584,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -6511,6 +6609,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -6584,8 +6683,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -6609,6 +6708,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -6682,8 +6782,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -6707,6 +6807,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -6780,8 +6881,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -6805,6 +6906,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -6878,8 +6980,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -6903,6 +7005,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -6976,8 +7079,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -7001,6 +7104,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -7074,8 +7178,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -7099,6 +7203,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -7172,8 +7277,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -7197,6 +7302,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -7270,8 +7376,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -7295,6 +7401,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -7368,8 +7475,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -7393,6 +7500,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -7466,8 +7574,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -7491,6 +7599,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -7564,8 +7673,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -7589,6 +7698,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -7662,8 +7772,8 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
       - Properties [4] {
         Property [ protected $message = '' ]
         Property [ protected $code = 0 ]
-        Property [ protected $file = NULL ]
-        Property [ protected $line = NULL ]
+        Property [ protected string $file = '' ]
+        Property [ protected int $line = 0 ]
       }
 
       - Methods [11] {
@@ -7687,6 +7797,7 @@ Extension [ <persistent> extension #120 couchbase version 4.0.0 ] {
 
           - Parameters [0] {
           }
+          - Tentative return [ void ]
         }
 
         Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
diff --git a/php-pecl-couchbase4.spec b/php-pecl-couchbase4.spec
index cc7a160..1955899 100644
--- a/php-pecl-couchbase4.spec
+++ b/php-pecl-couchbase4.spec
@@ -1,7 +1,7 @@
 # remirepo spec file for php-pecl-couchbase4
 #
-# Copyright (c) 2013-2022 Remi Collet
-# License: CC-BY-SA
+# Copyright (c) 2013-2023 Remi Collet
+# License: CC-BY-SA-4.0
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
@@ -26,16 +26,17 @@
 
 Summary:       Couchbase Server PHP extension
 Name:          %{?scl_prefix}php-pecl-couchbase4
-Version:       4.0.0
-Release:       1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
-# ASL 2.0
+Version:       4.1.0
+Release:       1%{?dist}
+# Apache-2.0
 # src
 # third_party/json/LICENSE.ryu
-## BSD
+## BSD-3-Clause
 # third_party/snappy/COPYING
+# third_party/json/LICENSE.double-conversion
+## BSD-2-Clause
 # third_party/hdr_histogram_c/LICENSE.txt
 # third_party/hdr_histogram_c/COPYING.txt
-# third_party/json/LICENSE.double-conversion
 ## MIT
 # third_party/fmt/LICENSE.rst
 # third_party/gsl/LICENSE
@@ -45,12 +46,10 @@ Release:       1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_V
 # third_party/json/LICENSE.itoa
 # third_party/jsonsl/LICENSE
 # third_party/spdlog/LICENSE
-License:       ASL 2.0 and BSD and MIT
+License:       Apache-2.0 AND BSD-3-Clause AND BSD-2-Clause AND MIT
 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/couchbase-php-client/pull/32.patch
-
 BuildRequires: make
 %if 0%{?rhel} == 7
 BuildRequires: cmake3 >= 3.17
@@ -118,7 +117,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 %setup -q -c
 mv %{pecl_name}-%{version}%{?prever} NTS
 
-%{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml}
+%{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/;/COPYING/s/role="doc"/role="src"/' -i package.xml}
 
 mkdir lic
 cp NTS/src/deps/couchbase-cxx-client/third_party/hdr_histogram_c/COPYING.txt    lic/hdr_histogram_c_COPYING.txt
@@ -137,7 +136,6 @@ cp NTS/src/deps/couchbase-cxx-client/third_party/spdlog/LICENSE
 cp NTS/src/deps/couchbase-cxx-client/LICENSE.txt                                lic/LICENSE.txt
 
 cd NTS
-%patch0 -p1
 %if 0%{?rhel} == 7
 sed -e 's/cmake/cmake3/' -i config.m4
 %endif
@@ -158,6 +156,9 @@ extension=%{pecl_name}.so
 ;couchbase.max_persistent = 1
 ;couchbase.persistent_timeout = -1
 ;couchbase.log_level =
+;couchbase.log_php_log_err = 1
+;couchbase.log_stderr = 0
+;couchbase.log_path =
 EOF
 
 %if 0%{?__ztsphp:1}
@@ -257,17 +258,21 @@ fi
 
 %config(noreplace) %{php_inidir}/%{ini_name}
 %{php_extdir}/%{pecl_name}.so
-%{php_extdir}/libcouchbase_php_core.so
+%{php_extdir}/libcouchbase_php_wrapper.so
 
 %if %{with_zts}
 %config(noreplace) %{php_ztsinidir}/%{ini_name}
 %{php_ztsextdir}/%{pecl_name}.so
-%{php_ztsextdir}/libcouchbase_php_core.so
+%{php_ztsextdir}/libcouchbase_php_wrapper.so
 %endif
 
 
 
 %changelog
+* Mon Jan 23 2023 Remi Collet <remi@remirepo.net> - 4.1.0-1
+- update to 4.1.0
+- drop patch merged upstream
+
 * Wed May 11 2022 Remi Collet <remi@remirepo.net> - 4.0.0-1
 - update to 4.0.0
 - drop dependency on libcouchbase