Declare tidy properties

Author: kocsismate

ext/tidy/tidy.c

@@ -122,13 +122,6 @@
 		zend_hash_str_update(_table, #_key, sizeof(#_key) - 1, &tmp); \
 	}
 
-#define ADD_PROPERTY_NULL(_table, _key) \
-	{ \
-		zval tmp; \
-		ZVAL_NULL(&tmp); \
-		zend_hash_str_update(_table, #_key, sizeof(#_key) - 1, &tmp); \
-	}
-
 #define ADD_PROPERTY_BOOL(_table, _key, _bool) \
 	{ \
 		zval tmp; \
@@ -585,35 +578,38 @@ static int tidy_node_cast_handler(zend_object *in, zval *out, int type)
 
 static void tidy_doc_update_properties(PHPTidyObj *obj)
 {
-
 	TidyBuffer output;
-	zval temp;
 
 	tidyBufInit(&output);
 	tidySaveBuffer (obj->ptdoc->doc, &output);
 
 	if (output.size) {
-		if (!obj->std.properties) {
-			rebuild_object_properties(&obj->std);
-		}
-		ZVAL_STRINGL(&temp, (char*)output.bp, output.size-1);
-		zend_hash_str_update(obj->std.properties, "value", sizeof("value") - 1, &temp);
+		zend_update_property_stringl(
+			tidy_ce_doc,
+			&obj->std,
+			"value",
+			sizeof("value") - 1,
+			(char*)output.bp,
+			output.size-1
+		);
 	}
 
 	tidyBufFree(&output);
 
 	if (obj->ptdoc->errbuf->size) {
-		if (!obj->std.properties) {
-			rebuild_object_properties(&obj->std);
-		}
-		ZVAL_STRINGL(&temp, (char*)obj->ptdoc->errbuf->bp, obj->ptdoc->errbuf->size-1);
-		zend_hash_str_update(obj->std.properties, "errorBuffer", sizeof("errorBuffer") - 1, &temp);
+		zend_update_property_stringl(
+			tidy_ce_doc,
+			&obj->std,
+			"errorBuffer",
+			sizeof("errorBuffer") - 1,
+			(char*)obj->ptdoc->errbuf->bp,
+			obj->ptdoc->errbuf->size-1
+		);
 	}
 }
 
 static void tidy_add_default_properties(PHPTidyObj *obj, tidy_obj_type type)
 {
-
 	TidyBuffer buf;
 	TidyAttr	tempattr;
 	TidyNode	tempnode;
@@ -690,14 +686,6 @@ static void tidy_add_default_properties(PHPTidyObj *obj, tidy_obj_type type)
 			zend_hash_str_update(obj->std.properties, "child", sizeof("child") - 1, &children);
 
 			break;
-
-		case is_doc:
-			if (!obj->std.properties) {
-				rebuild_object_properties(&obj->std);
-			}
-			ADD_PROPERTY_NULL(obj->std.properties, errorBuffer);
-			ADD_PROPERTY_NULL(obj->std.properties, value);
-			break;
 	}
 }
 

ext/tidy/tidy.stub.php

@@ -54,6 +54,9 @@ function tidy_get_body(tidy $tidy): ?tidyNode {}
 
 class tidy
 {
+    public ?string $errorBuffer = null;
+    public ?string $value = null;
+
     public function __construct(?string $filename = null, array|string|null $config = null, ?string $encoding = null, bool $useIncludePath = false) {}
 
     /**

ext/tidy/tidy_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 4e5f6c0e7c6b8a6939a13276e3e68d2614a73d7e */
+ * Stub hash: 7ec9389d5540e60e5bffeeca866168f0a6d6835c */
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_tidy_parse_string, 0, 1, tidy, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
@@ -303,6 +303,18 @@ static zend_class_entry *register_class_tidy(void)
 	INIT_CLASS_ENTRY(ce, "tidy", class_tidy_methods);
 	class_entry = zend_register_internal_class_ex(&ce, NULL);
 
+	zval property_errorBuffer_default_value;
+	ZVAL_NULL(&property_errorBuffer_default_value);
+	zend_string *property_errorBuffer_name = zend_string_init("errorBuffer", sizeof("errorBuffer") - 1, 1);
+	zend_declare_typed_property(class_entry, property_errorBuffer_name, &property_errorBuffer_default_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_STRING|MAY_BE_NULL));
+	zend_string_release(property_errorBuffer_name);
+
+	zval property_value_default_value;
+	ZVAL_NULL(&property_value_default_value);
+	zend_string *property_value_name = zend_string_init("value", sizeof("value") - 1, 1);
+	zend_declare_typed_property(class_entry, property_value_name, &property_value_default_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_STRING|MAY_BE_NULL));
+	zend_string_release(property_value_name);
+
 	return class_entry;
 }