Merge pull request phacility#44 from skilld-labs/php8

Fix curl PHP 8 compatibility
FluentDevelopment · Aug 21, 2020 · 020c7f8 · 020c7f8
2 parents 8fbfcfa + 1cafd30
commit 020c7f8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 32 deletions.
diff --git a/extension/tests/xhprof_012.phpt b/extension/tests/xhprof_012.phpt
@@ -3,7 +3,6 @@ XHProf: Test Curl Additional Info
 Author: longxinhui
 --SKIPIF--
 <?php if (!extension_loaded("curl")) print 'skip'; ?>
-<?php if (PHP_VERSION_ID >= 80000) echo "skip test for php >= 8"; ?>
 --INI--
 xhprof.collect_additional_info = 1
 --FILE--

diff --git a/extension/tests/xhprof_012_8.phpt b/extension/tests/xhprof_012_8.phpt
diff --git a/extension/xhprof.c b/extension/xhprof.c
@@ -1516,7 +1516,11 @@ zend_string *hp_trace_callback_curl_exec(zend_string *symbol, zend_execute_data
     zval func, retval, *option;
     zval *arg = ZEND_CALL_ARG(data, 1);
 
+#if PHP_VERSION_ID < 80000
     if (arg == NULL || Z_TYPE_P(arg) != IS_RESOURCE) {
+#else
+    if (arg == NULL || Z_TYPE_P(arg) != IS_OBJECT) {
+#endif
         return symbol;
     }