Skip to content

PHP 8.0 compatibility #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Totktonada merged 2 commits into from
Apr 11, 2022
Merged

PHP 8.0 compatibility #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
421d62e
PHP 8.0: define TSRMLS* macros as no-op
Mar 18, 2022
26ea492
PHP 8.0: fix array-list detection
Mar 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/php_tarantool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@
# define smart_string_free_ex(...) smart_str_free_ex(__VA_ARGS__)
#endif

#if PHP_VERSION_ID >= 80000
/* These macroses were removed in PHP 8. */
# define TSRMLS_CC
# define TSRMLS_DC
# define TSRMLS_FETCH()
#endif /* PHP_VERSION_ID >= 80000 */

#if PHP_VERSION_ID < 70300
# define GC_SET_REFCOUNT(p, rc) do { \
GC_REFCOUNT((p)) = (rc); \
Expand Down
5 changes: 4 additions & 1 deletion src/tarantool_msgpack.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,10 @@ void php_mp_pack_array(smart_string *str, size_t len) {
int php_mp_is_hash(zval *val) {
HashTable *ht = Z_ARRVAL_P(val);
int count = zend_hash_num_elements(ht);
if (count != ht->nNextFreeElement) {
if (count == 0) {
/* An empty array is considered as a list. */
return 0;
} else if (count != ht->nNextFreeElement) {
return 1;
} else {
HashPosition pos = {0};
Expand Down