Merge pull request #222 from remicollet/issue-php81

Fix for PHP 8.1
zeromq · Nov 3, 2021 · ee5fbc6 · ee5fbc6
2 parents 43464c4 + 9af012e
commit ee5fbc6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/tests/053-z85.phpt b/tests/053-z85.phpt
@@ -41,12 +41,12 @@ for ($i = 4; $i <= 256; $i += 4) {
 
 // Incorrect length
 test_z85_encode('1234567', null);
-test_z85_encode(null, null);
+test_z85_encode('', null);
 
 test_z85_decode('1234567', null);
-test_z85_decode(null, null);
+test_z85_decode('', null);
 
 echo "OK";
 
 --EXPECT--
-OK
+OK
diff --git a/zmq_pollset.c b/zmq_pollset.c
@@ -169,10 +169,15 @@ static
 zend_string *s_create_key(zval *entry)
 {
 	if (Z_TYPE_P(entry) == IS_RESOURCE) {
-		return strpprintf(0, "r:%d", Z_RES_P(entry)->handle);
+		/* zend_long since 8.1.0 */
+		return strpprintf(0, "r:%ld", (long)Z_RES_P(entry)->handle);
 	}
 	else {
+#if PHP_VERSION_ID >= 80100
+		zend_string *hash = php_spl_object_hash(Z_OBJ_P(entry));
+#else
 		zend_string *hash = php_spl_object_hash(entry);
+#endif
 		zend_string *key = strpprintf(0, "o:%s", hash->val);
 		zend_string_release(hash);
 		return key;