From aa4f4eaf8b52607c434302899e3e0be5d06bdf16 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 31 Aug 2023 14:06:59 +0200 Subject: add patch for PHP 8.3 from https://github.com/couchbase/couchbase-php-client/pull/130 --- PHPINFO | 6 +- REFLECTION | 497 +++++++++++++++++++++++++++++++++-------------- php-pecl-couchbase4.spec | 44 +++-- 3 files changed, 378 insertions(+), 169 deletions(-) diff --git a/PHPINFO b/PHPINFO index 8fc4f8c..3c1e2bf 100644 --- a/PHPINFO +++ b/PHPINFO @@ -2,9 +2,9 @@ couchbase couchbase => enabled -couchbase_extension_version => 4.1.4 -couchbase_extension_revision => c4a662ad8b2ed5334884aac02b927f20287b8fef -couchbase_client_revision => adc416db2449283ccf33ed5cd525262900949441 +couchbase_extension_version => 4.1.5 +couchbase_extension_revision => 5b1b578f372738aed683a7286060229da4864106 +couchbase_client_revision => 43cf66a592d1f8112141a73e5a563d7187ee0ee6 Directive => Local Value => Master Value couchbase.max_persistent => -1 => -1 diff --git a/REFLECTION b/REFLECTION index f24e326..a86539b 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #122 couchbase version 4.1.4 ] { +Extension [ extension #125 couchbase version 4.1.5 ] { - Dependencies { Dependency [ json (Required) ] @@ -279,6 +279,48 @@ Extension [ extension #122 couchbase version 4.1.4 ] { Parameter #6 [ ?array $options = ] } } + Function [ function Couchbase\Extension\createDocumentScanResult ] { + + - Parameters [6] { + Parameter #0 [ $connection = ] + Parameter #1 [ string $bucket = ] + Parameter #2 [ string $scope = ] + Parameter #3 [ string $collection = ] + Parameter #4 [ array $scan_type = ] + Parameter #5 [ ?array $options = ] + } + - Return [ null ] + } + Function [ function Couchbase\Extension\documentScanNextItem ] { + + - Parameters [1] { + Parameter #0 [ $scan_result ] + } + } + Function [ function Couchbase\Extension\documentLookupInAnyReplica ] { + + - Parameters [7] { + Parameter #0 [ $connection ] + Parameter #1 [ string $bucket ] + Parameter #2 [ string $scope ] + Parameter #3 [ string $collection ] + Parameter #4 [ string $id ] + Parameter #5 [ array $specs ] + Parameter #6 [ ?array $options = ] + } + } + Function [ function Couchbase\Extension\documentLookupInAllReplicas ] { + + - Parameters [7] { + Parameter #0 [ $connection ] + Parameter #1 [ string $bucket ] + Parameter #2 [ string $scope ] + Parameter #3 [ string $collection ] + Parameter #4 [ string $id ] + Parameter #5 [ array $specs ] + Parameter #6 [ ?array $options = ] + } + } Function [ function Couchbase\Extension\documentGetMulti ] { - Parameters [6] { @@ -441,6 +483,21 @@ Extension [ extension #122 couchbase version 4.1.4 ] { Parameter #2 [ ?array $options = ] } } + Function [ function Couchbase\Extension\searchIndexGet ] { + + - Parameters [3] { + Parameter #0 [ $connection ] + Parameter #1 [ string $indexName ] + Parameter #2 [ ?array $options = ] + } + } + Function [ function Couchbase\Extension\searchIndexGetAll ] { + + - Parameters [2] { + Parameter #0 [ $connection ] + Parameter #1 [ ?array $options = ] + } + } Function [ function Couchbase\Extension\searchIndexUpsert ] { - Parameters [3] { @@ -449,6 +506,79 @@ Extension [ extension #122 couchbase version 4.1.4 ] { Parameter #2 [ ?array $options = ] } } + Function [ function Couchbase\Extension\searchIndexDrop ] { + + - Parameters [3] { + Parameter #0 [ $connection ] + Parameter #1 [ string $indexName ] + Parameter #2 [ ?array $options = ] + } + } + Function [ function Couchbase\Extension\searchIndexGetDocumentsCount ] { + + - Parameters [3] { + Parameter #0 [ $connection ] + Parameter #1 [ string $indexName ] + Parameter #2 [ ?array $options = ] + } + } + Function [ function Couchbase\Extension\searchIndexIngestPause ] { + + - Parameters [3] { + Parameter #0 [ $connection ] + Parameter #1 [ string $indexName ] + Parameter #2 [ ?array $options = ] + } + } + Function [ function Couchbase\Extension\searchIndexIngestResume ] { + + - Parameters [3] { + Parameter #0 [ $connection ] + Parameter #1 [ string $indexName ] + Parameter #2 [ ?array $options = ] + } + } + Function [ function Couchbase\Extension\searchIndexQueryingAllow ] { + + - Parameters [3] { + Parameter #0 [ $connection ] + Parameter #1 [ string $indexName ] + Parameter #2 [ ?array $options = ] + } + } + Function [ function Couchbase\Extension\searchIndexQueryingDisallow ] { + + - Parameters [3] { + Parameter #0 [ $connection ] + Parameter #1 [ string $indexName ] + Parameter #2 [ ?array $options = ] + } + } + Function [ function Couchbase\Extension\searchIndexPlanFreeze ] { + + - Parameters [3] { + Parameter #0 [ $connection ] + Parameter #1 [ string $indexName ] + Parameter #2 [ ?array $options = ] + } + } + Function [ function Couchbase\Extension\searchIndexPlanUnfreeze ] { + + - Parameters [3] { + Parameter #0 [ $connection ] + Parameter #1 [ string $indexName ] + Parameter #2 [ ?array $options = ] + } + } + Function [ function Couchbase\Extension\searchIndexDocumentAnalyze ] { + + - Parameters [4] { + Parameter #0 [ $connection ] + Parameter #1 [ string $indexName ] + Parameter #2 [ string $document ] + Parameter #3 [ ?array $options = ] + } + } Function [ function Couchbase\Extension\viewIndexUpsert ] { - Parameters [5] { @@ -771,12 +901,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -870,12 +1001,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -969,12 +1101,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -1068,12 +1201,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -1167,12 +1301,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -1266,12 +1401,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -1365,12 +1501,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -1464,12 +1601,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -1563,12 +1701,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -1662,12 +1801,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -1761,12 +1901,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -1860,12 +2001,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -1959,12 +2101,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -2058,12 +2201,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -2157,12 +2301,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -2256,12 +2401,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -2355,12 +2501,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -2454,12 +2601,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -2553,12 +2701,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -2652,12 +2801,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -2751,12 +2901,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -2850,12 +3001,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -2949,12 +3101,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -3048,12 +3201,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -3147,12 +3301,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -3246,12 +3401,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -3345,12 +3501,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -3444,12 +3601,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -3543,12 +3701,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -3642,12 +3801,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -3741,12 +3901,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -3840,12 +4001,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -3939,12 +4101,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -4038,12 +4201,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -4137,12 +4301,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -4236,12 +4401,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -4335,12 +4501,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -4434,12 +4601,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -4533,12 +4701,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -4632,12 +4801,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -4731,12 +4901,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -4830,12 +5001,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -4929,12 +5101,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -5028,12 +5201,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -5127,12 +5301,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -5226,12 +5401,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -5325,12 +5501,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -5424,12 +5601,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -5523,12 +5701,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -5622,12 +5801,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -5721,12 +5901,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -5820,12 +6001,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -5919,12 +6101,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -6018,12 +6201,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -6117,12 +6301,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -6216,12 +6401,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -6315,12 +6501,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -6414,12 +6601,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -6513,12 +6701,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -6612,12 +6801,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -6711,12 +6901,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -6810,12 +7001,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -6909,12 +7101,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -7008,12 +7201,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -7107,12 +7301,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -7206,12 +7401,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -7305,12 +7501,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -7404,12 +7601,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -7503,12 +7701,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -7602,12 +7801,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -7701,12 +7901,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -7800,12 +8001,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } @@ -7899,12 +8101,13 @@ Extension [ extension #122 couchbase version 4.1.4 ] { - Return [ array ] } - Method [ public method __construct ] { + Method [ public method __construct ] { - - Parameters [3] { + - Parameters [4] { Parameter #0 [ string $message = "" ] Parameter #1 [ int $code = 0 ] Parameter #2 [ ?Throwable $previous = null ] + Parameter #3 [ ?array $context = null ] } } diff --git a/php-pecl-couchbase4.spec b/php-pecl-couchbase4.spec index d6190c9..8634d13 100644 --- a/php-pecl-couchbase4.spec +++ b/php-pecl-couchbase4.spec @@ -9,27 +9,25 @@ # NOTICE: el-7 is not supported because of OpenSSL 1.0 -# we don't want -z defs linker flag -%undefine _strict_symbol_defs_build - # Disable RPATH check %global __arch_install_post /bin/true %global __brp_check_rpaths /bin/true -%if 0%{?scl:1} -%scl_package php-pecl-couchbase2 -%endif +%{?scl:%scl_package php-pecl-couchbase2} -%global pecl_name couchbase -%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} +%global pecl_name couchbase +%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} # After 20-tokenizer.ini, 40-igbinary and 40-json -%global ini_name 50-%{pecl_name}.ini -#global prever beta4 +%global ini_name 50-%{pecl_name}.ini +#global prever beta4 +%global sources %{pecl_name}-%{version}%{?prever} +%global _configure ../%{sources}/configure + Summary: Couchbase Server PHP extension Name: %{?scl_prefix}php-pecl-couchbase4 -Version: 4.1.4 -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 4.1.5 +Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} # Apache-2.0 # src # third_party/json/LICENSE.ryu @@ -50,7 +48,9 @@ Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_V # third_party/spdlog/LICENSE 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 +Source0: https://pecl.php.net/get/%{sources}.tgz + +Patch0: 0001-zend_bool-was-removed-from-8.3.patch BuildRequires: make BuildRequires: cmake >= 3.17 @@ -67,7 +67,6 @@ Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} Requires: %{?scl_prefix}php-json%{?_isa} Requires: %{?scl_prefix}php-tokenizer%{?_isa} -%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} Provides: %{?scl_prefix}php-%{pecl_name} = %{version} Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} @@ -117,7 +116,9 @@ sed -e '/LICENSE/s/role="doc"/role="src"/;/COPYING/s/role="doc"/role="src"/' -i : Collect license files mkdir lic -cd %{pecl_name}-%{version}%{?prever} +cd %{sources} +%patch -P0 -p1 -b .php83 + cp src/deps/couchbase-cxx-client/third_party/hdr_histogram_c/COPYING.txt ../lic/hdr_histogram_c_COPYING.txt cp src/deps/couchbase-cxx-client/third_party/snappy/COPYING ../lic/snappy_COPYING cp src/deps/couchbase-cxx-client/third_party/fmt/LICENSE.rst ../lic/fmt_LICENSE.rst @@ -170,12 +171,10 @@ mkdir ZTS %endif -%global _configure ../%{pecl_name}-%{version}%{?prever}/configure - %build %{?dtsenable} -cd %{pecl_name}-%{version}%{?prever} +cd %{sources} %{__phpize} cd ../NTS @@ -206,7 +205,7 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml # Test & Documentation -cd %{pecl_name}-%{version}%{?prever} +cd %{sources} for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//') do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done @@ -246,6 +245,13 @@ done %changelog +* Thu Aug 31 2023 Remi Collet - 4.1.5-2 +- add patch for PHP 8.3 from + https://github.com/couchbase/couchbase-php-client/pull/130 + +* Mon Aug 21 2023 Remi Collet - 4.1.5-1 +- update to 4.1.5 + * Fri May 26 2023 Remi Collet - 4.1.4-1 - update to 4.1.4 -- cgit