Fix tests

swoole · Dec 21, 2023 · 81eb3ff · 81eb3ff
1 parent f62c4a1
commit 81eb3ff
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/include/phpy.h b/include/phpy.h
@@ -138,6 +138,7 @@ bool ZendCallable_Check(PyObject *pv);
 void debug_dump(uint32_t i, zval *item);
 void debug_dump(uint32_t i, PyObject *pObj);
 void var_dump(zval *var);
+void debug_var_dump(zval *var);
 
 bool py_module_string_init(PyObject *m);
 bool py_module_object_init(PyObject *m);

diff --git a/src/bridge/core.cc b/src/bridge/core.cc
@@ -24,6 +24,8 @@ END_EXTERN_C()
 
 using phpy::CallObject;
 
+const int var_dump_level = 3;
+
 static void (*py2php_fn)(PyObject *pv, zval *zv);
 static void py2php_object_impl(PyObject *pv, zval *zv);
 static void py2php_scalar_impl(PyObject *pv, zval *zv);
@@ -332,7 +334,11 @@ void debug_dump(uint32_t i, PyObject *pObj) {
 }
 
 void var_dump(zval *var) {
-    php_var_dump(var, 3);
+    php_var_dump(var, var_dump_level);
+}
+
+void debug_var_dump(zval *var) {
+    php_debug_zval_dump(var, var_dump_level);
 }
 
 CallObject::CallObject(PyObject *_fn, zval *_return_value, uint32_t _argc, zval *_argv, zend_array *_kwargs) {

diff --git a/src/python/object.cc b/src/python/object.cc
@@ -130,7 +130,6 @@ static PyObject *Object_invoke(ZendObject *self, PyObject *args, PyObject *kwds)
     phpy::python::tuple2argv(argv, args, argc, 0);
     zend_result result = phpy::php::call_fn(NULL, &self->object, &retval, argc, argv);
     ON_SCOPE_EXIT {
-        zval_ptr_dtor(&retval);
         phpy::python::release_argv(argc, argv);
         delete[] argv;
     };