Revert "write closure to function"

This reverts commit d483b81.
krakjoe · Jan 21, 2019 · ab3632d · ab3632d
1 parent d483b81
commit ab3632d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 22 deletions.
diff --git a/src/function.c b/src/function.c
@@ -130,15 +130,6 @@ PHP_METHOD(InspectorFunction, __construct)
 		}
 
 		zend_string_release(name);
-	} else if (Z_TYPE_P(function) == IS_OBJECT && instanceof_function(Z_OBJCE_P(function), zend_ce_closure)) {
-		zval k;
-
-		ZVAL_STR(&k, PHP_INSPECTOR_STRING_CLOSURE);
-
-		zend_std_write_property(
-			getThis(), &k, &function, NULL);
-
-		Z_ADDREF_P(function);
 	}
 
 	zend_call_method_with_1_params(getThis(), Z_OBJCE_P(getThis()), &EX(func)->common.scope->parent->constructor, "__construct", return_value, function);
@@ -470,9 +461,6 @@ PHP_MINIT_FUNCTION(inspector_function) {
 	zend_declare_property_null(
 		php_inspector_function_ce, 
 		ZEND_STRL("instructionCache"), ZEND_ACC_PROTECTED);
-	zend_declare_property_null(
-		php_inspector_function_ce, 
-		ZEND_STRL("closure"),         ZEND_ACC_PROTECTED);
 
 	php_inspector_function_trace_id = zend_get_resource_handle(&dummy);	
 

diff --git a/src/strings.c b/src/strings.c
@@ -45,7 +45,6 @@ static const php_inspector_string php_inspector_strings[] = {
 	php_inspector_string_init(PHP_INSPECTOR_STR_HIT, "hit"),
 	php_inspector_string_init(PHP_INSPECTOR_STR_NAME, "name"),
 	php_inspector_string_init(PHP_INSPECTOR_STR_CLASS, "class"),
-	php_inspector_string_init(PHP_INSPECTOR_STR_CLOSURE, "closure"),
 	php_inspector_string_init(PHP_INSPECTOR_STR_ONRESOLVE, "onresolve"),
 	php_inspector_string_init(PHP_INSPECTOR_STR_ONTRACE, "ontrace"),
 	php_inspector_string_init(PHP_INSPECTOR_STR_INSTRUCTION_CACHE, "instructionCache"),

diff --git a/src/strings.h b/src/strings.h
@@ -23,10 +23,9 @@ typedef enum _php_inspector_string_t {
 	PHP_INSPECTOR_STR_HIT = -1,
 	PHP_INSPECTOR_STR_NAME = -2,
 	PHP_INSPECTOR_STR_CLASS = -3,
-	PHP_INSPECTOR_STR_CLOSURE = -4,
-	PHP_INSPECTOR_STR_ONRESOLVE = -5,
-	PHP_INSPECTOR_STR_ONTRACE = -6,
-	PHP_INSPECTOR_STR_INSTRUCTION_CACHE = -7,
+	PHP_INSPECTOR_STR_ONRESOLVE = -4,
+	PHP_INSPECTOR_STR_ONTRACE = -5,
+	PHP_INSPECTOR_STR_INSTRUCTION_CACHE = -6,
 } php_inspector_string_t;
 
 PHP_MINIT_FUNCTION(inspector_strings);
@@ -36,12 +35,11 @@ zend_string* php_inspector_strings_fetch(php_inspector_string_t id);
 void php_inspector_strings_register_opcode(zend_uchar opcode, const char *name);
 void php_inspector_strings_register_long(zend_long, const char *name);
 
-#define PHP_INSPECTOR_STRING_HIT         	 php_inspector_strings_fetch(PHP_INSPECTOR_STR_HIT)
-#define PHP_INSPECTOR_STRING_NAME        	 php_inspector_strings_fetch(PHP_INSPECTOR_STR_NAME)
-#define PHP_INSPECTOR_STRING_CLASS       	 php_inspector_strings_fetch(PHP_INSPECTOR_STR_CLASS)
-#define PHP_INSPECTOR_STRING_CLOSURE       	 php_inspector_strings_fetch(PHP_INSPECTOR_STR_CLOSURE)
+#define PHP_INSPECTOR_STRING_HIT         	php_inspector_strings_fetch(PHP_INSPECTOR_STR_HIT)
+#define PHP_INSPECTOR_STRING_NAME        	php_inspector_strings_fetch(PHP_INSPECTOR_STR_NAME)
+#define PHP_INSPECTOR_STRING_CLASS       	php_inspector_strings_fetch(PHP_INSPECTOR_STR_CLASS)
 #define PHP_INSPECTOR_STRING_ONRESOLVE  	 php_inspector_strings_fetch(PHP_INSPECTOR_STR_ONRESOLVE)
-#define PHP_INSPECTOR_STRING_ONTRACE  	 	 php_inspector_strings_fetch(PHP_INSPECTOR_STR_ONTRACE)
+#define PHP_INSPECTOR_STRING_ONTRACE  	 	php_inspector_strings_fetch(PHP_INSPECTOR_STR_ONTRACE)
 #define PHP_INSPECTOR_STRING_INSTRUCTION_CACHE   php_inspector_strings_fetch(PHP_INSPECTOR_STR_INSTRUCTION_CACHE)
 
 #endif