From 5d154be2864ce9b1572119e2416a874e73c0ccc5 Mon Sep 17 00:00:00 2001 From: Aaron Stone <aaron@serendipity.cx> Date: Thu, 3 Oct 2019 16:25:36 -0700 Subject: [PATCH 1/2] Remove stray instances of TSRMLS_CC macro This macro was defined empty in PHP 7.x, and removed in PHP 8.x. --- php_memcached_session.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/php_memcached_session.c b/php_memcached_session.c index 6acd9d3e..ce9a46db 100644 --- a/php_memcached_session.c +++ b/php_memcached_session.c @@ -445,7 +445,7 @@ PS_READ_FUNC(memcached) *val = ZSTR_EMPTY_ALLOC(); return SUCCESS; } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "error getting session from memcached: %s", memcached_last_error_message(memc)); + php_error_docref(NULL, E_WARNING, "error getting session from memcached: %s", memcached_last_error_message(memc)); return FAILURE; } } @@ -475,7 +475,7 @@ PS_WRITE_FUNC(memcached) if (memcached_set(memc, key->val, key->len, val->val, val->len, expiration, 0) == MEMCACHED_SUCCESS) { return SUCCESS; } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "error saving session to memcached: %s", memcached_last_error_message(memc)); + php_error_docref(NULL, E_WARNING, "error saving session to memcached: %s", memcached_last_error_message(memc)); } } while (--retries > 0); From 26e38ccee6110a1491c5e36d297cdb12cb261a99 Mon Sep 17 00:00:00 2001 From: Aaron Stone <aaron@serendipity.cx> Date: Thu, 3 Oct 2019 16:46:23 -0700 Subject: [PATCH 2/2] Use temporary fork of igbinary for php-8 support --- .travis/travis.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis/travis.sh b/.travis/travis.sh index 81049355..090e3992 100755 --- a/.travis/travis.sh +++ b/.travis/travis.sh @@ -67,8 +67,9 @@ function install_libmemcached() { } function install_igbinary() { - git clone https://github.com/igbinary/igbinary.git + git clone https://github.com/sodabrew/igbinary.git pushd igbinary + git checkout php-8 phpize ./configure make