Skip to content

Commit 7d197e8

Browse files
committed
Update jsonSerialize methods to stop deprecations errors in php 8.1
closes #34 Change-Id: I123f459a709d46055784f37c3db0ee0b7396f6b2 Reviewed-on: https://review.couchbase.org/c/php-couchbase/+/167016 Tested-by: Build Bot <[email protected]> Reviewed-by: Sergey Avseyev <[email protected]>
1 parent 8cc3a15 commit 7d197e8

33 files changed

+130
-1
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
*.lo
33
*.loT
44
*.o
5+
*.dep
56
*.swp
67
*~
78
.deps

bin/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ CB_PASSWORD=${CB_PASSWORD:-password}
3030
CB_PHPUNIT_PHAR=${CB_PHPUNIT_PHAR:-"${PROJECT_ROOT}/build/phpunit.phar"}
3131
if [ ! -f "${CB_PHPUNIT_PHAR}" ]
3232
then
33-
curl -L -o "${CB_PHPUNIT_PHAR}" https://phar.phpunit.de/phpunit-9.4.3.phar
33+
curl -L -o "${CB_PHPUNIT_PHAR}" https://phar.phpunit.de/phpunit-9.5.10.phar
3434
fi
3535

3636
${CB_PHP_PREFIX}/bin/php --version

src/couchbase/managers/search_index_manager.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -783,7 +783,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_SearchIndex_setSourceParams, 0, 1, Cou
783783
ZEND_ARG_TYPE_INFO(0, params, IS_ARRAY, 0)
784784
ZEND_END_ARG_INFO()
785785

786+
#if PHP_VERSION_ID < 80100
786787
ZEND_BEGIN_ARG_INFO_EX(ai_SearchIndex_jsonSerialize, 0, 0, 0)
788+
#else
789+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(ai_SearchIndex_jsonSerialize, 0, 0, IS_MIXED, 0)
790+
#endif
787791
ZEND_END_ARG_INFO()
788792

789793
// clang-format off

src/couchbase/managers/view_index_manager.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,11 @@ PHP_METHOD(DesignDocument, jsonSerialize)
298298
}
299299
}
300300

301+
#if PHP_VERSION_ID < 80100
301302
ZEND_BEGIN_ARG_INFO_EX(ai_DesignDocument_jsonSerialize, 0, 0, 0)
303+
#else
304+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(ai_DesignDocument_jsonSerialize, 0, 0, IS_MIXED, 0)
305+
#endif
302306
ZEND_END_ARG_INFO()
303307

304308
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO(ai_DesignDocument_name, IS_STRING, 0)

src/couchbase/search/boolean_field_query.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,11 @@ PHP_METHOD(BooleanFieldSearchQuery, jsonSerialize)
9393
}
9494
}
9595

96+
#if PHP_VERSION_ID < 80100
9697
ZEND_BEGIN_ARG_INFO_EX(ai_BooleanFieldSearchQuery_jsonSerialize, 0, 0, 0)
98+
#else
99+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(ai_BooleanFieldSearchQuery_jsonSerialize, 0, 0, IS_MIXED, 0)
100+
#endif
97101
ZEND_END_ARG_INFO()
98102

99103
ZEND_BEGIN_ARG_INFO_EX(ai_BooleanFieldSearchQuery_construct, 0, 0, 1)

src/couchbase/search/boolean_query.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,11 @@ PHP_METHOD(BooleanSearchQuery, jsonSerialize)
116116
}
117117
}
118118

119+
#if PHP_VERSION_ID < 80100
119120
ZEND_BEGIN_ARG_INFO_EX(ai_BooleanSearchQuery_none, 0, 0, 0)
121+
#else
122+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(ai_BooleanSearchQuery_none, 0, 0, IS_MIXED, 0)
123+
#endif
120124
ZEND_END_ARG_INFO()
121125

122126
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_BooleanSearchQuery_boost, 0, 1, Couchbase\\BooleanSearchQuery, 0)

src/couchbase/search/conjunction_query.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,11 @@ PHP_METHOD(ConjunctionSearchQuery, jsonSerialize)
122122
}
123123
}
124124

125+
#if PHP_VERSION_ID < 80100
125126
ZEND_BEGIN_ARG_INFO_EX(ai_ConjunctionSearchQuery_jsonSerialize, 0, 0, 0)
127+
#else
128+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(ai_ConjunctionSearchQuery_jsonSerialize, 0, 0, IS_MIXED, 0)
129+
#endif
126130
ZEND_END_ARG_INFO()
127131

128132
ZEND_BEGIN_ARG_INFO_EX(ai_ConjunctionSearchQuery_construct, 0, 0, 1)

src/couchbase/search/date_range_facet.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,11 @@ PHP_METHOD(DateRangeSearchFacet, jsonSerialize)
130130
}
131131
}
132132

133+
#if PHP_VERSION_ID < 80100
133134
ZEND_BEGIN_ARG_INFO_EX(ai_DateRangeSearchFacet_jsonSerialize, 0, 0, 0)
135+
#else
136+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(ai_DateRangeSearchFacet_jsonSerialize, 0, 0, IS_MIXED, 0)
137+
#endif
134138
ZEND_END_ARG_INFO()
135139

136140
ZEND_BEGIN_ARG_INFO_EX(ai_DateRangeSearchFacet_construct, 0, 0, 2)

src/couchbase/search/date_range_query.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,11 @@ PHP_METHOD(DateRangeSearchQuery, jsonSerialize)
192192
}
193193
}
194194

195+
#if PHP_VERSION_ID < 80100
195196
ZEND_BEGIN_ARG_INFO_EX(ai_DateRangeSearchQuery_none, 0, 0, 0)
197+
#else
198+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(ai_DateRangeSearchQuery_none, 0, 0, IS_MIXED, 0)
199+
#endif
196200
ZEND_END_ARG_INFO()
197201

198202
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(ai_DateRangeSearchQuery_field, 0, 1, Couchbase\\DateRangeSearchQuery, 0)

src/couchbase/search/disjunction_query.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,11 @@ PHP_METHOD(DisjunctionSearchQuery, jsonSerialize)
144144
}
145145
}
146146

147+
#if PHP_VERSION_ID < 80100
147148
ZEND_BEGIN_ARG_INFO_EX(ai_DisjunctionSearchQuery_jsonSerialize, 0, 0, 0)
149+
#else
150+
ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(ai_DisjunctionSearchQuery_jsonSerialize, 0, 0, IS_MIXED, 0)
151+
#endif
148152
ZEND_END_ARG_INFO()
149153

150154
ZEND_BEGIN_ARG_INFO_EX(ai_DisjunctionSearchQuery_construct, 0, 0, 1)

0 commit comments

Comments
 (0)