From 00e8f089e2cf688844ebc7ded5707c6c4554078b Mon Sep 17 00:00:00 2001 From: Jeremy Mikola Date: Wed, 24 Mar 2021 15:05:58 -0400 Subject: [PATCH] PHPC-1793: Use zend_ce_countable for PHP 8.1+ compat zend_ce_countable was introduced in PHP 7.2 (see: php/php-src@27e7aea4124ffdecb6d40a2f5723e413a7b40562) and spl_ce_Countable was removed in PHP 8.1 (see: php/php-src@4f4c031f62e28ed53869a57264535a8739a010e9). --- src/MongoDB/BulkWrite.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/MongoDB/BulkWrite.c b/src/MongoDB/BulkWrite.c index 490dee324..6b797f14f 100644 --- a/src/MongoDB/BulkWrite.c +++ b/src/MongoDB/BulkWrite.c @@ -16,7 +16,6 @@ #include #include -#include #ifdef HAVE_CONFIG_H #include "config.h" @@ -27,6 +26,11 @@ #include "php_phongo.h" #include "php_bson.h" +#if PHP_VERSION_ID < 70200 +#include +#define zend_ce_countable spl_ce_Countable +#endif /* PHP_VERSION_ID < 70200 */ + #define PHONGO_BULKWRITE_BYPASS_UNSET -1 zend_class_entry* php_phongo_bulkwrite_ce; @@ -669,7 +673,7 @@ void php_phongo_bulkwrite_init_ce(INIT_FUNC_ARGS) /* {{{ */ php_phongo_handler_bulkwrite.free_obj = php_phongo_bulkwrite_free_object; php_phongo_handler_bulkwrite.offset = XtOffsetOf(php_phongo_bulkwrite_t, std); - zend_class_implements(php_phongo_bulkwrite_ce, 1, spl_ce_Countable); + zend_class_implements(php_phongo_bulkwrite_ce, 1, zend_ce_countable); } /* }}} */ /*