Fix sw_zend_is_callable_at_frame() (#3868)

* Fix sw_zend_is_callable_at_frame() * Require PHP 8.0.1
swoole · Nov 22, 2020 · 9ab8f1d · 9ab8f1d
1 parent 319bdee
commit 9ab8f1d
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/ext-src/php_swoole.h b/ext-src/php_swoole.h
@@ -912,10 +912,11 @@ static sw_inline zend_bool sw_zend_is_callable_at_frame(zval *zcallable, zval *z
 {
     zend_string *name;
     zend_bool ret;
-#if PHP_VERSION_ID < 80000
+#if PHP_VERSION_ID < 80001
     ret = zend_is_callable_ex(zcallable, zobject ? Z_OBJ_P(zobject) : NULL, check_flags, &name, fci_cache, error);
 #else
-    ret = zend_is_callable_at_frame(zcallable, zobject ? Z_OBJ_P(zobject) : NULL, frame, check_flags, &name, fci_cache, error);
+    ret = zend_is_callable_at_frame(zcallable, zobject ? Z_OBJ_P(zobject) : NULL, frame, check_flags, fci_cache, error);
+    name = zend_get_callable_name_ex(zcallable, zobject);
 #endif
     if (callable_name)
     {