Merge branch 'PHP-8.2' into PHP-8.3

ndossche · ndossche · commit b1206ea965b0 · 2023-12-22T17:38:15.000+01:00
* PHP-8.2: Fix GH-12980: tidynode.props.attribute is missing "Boolean Attributes" and empty attributes
diff --git a/NEWS b/NEWS
@@ -57,6 +57,10 @@ PHP                                                                        NEWS
   . Fixed bug GH-12929 (SimpleXMLElement with stream_wrapper_register can
     segfault). (nielsdos)
 
+- Tidy:
+  . Fixed bug GH-12980 (tidynode.props.attribute is missing
+    "Boolean Attributes" and empty attributes). (nielsdos)
+
 07 Dec 2023, PHP 8.3.1RC1
 
 - Core:
diff --git a/ext/tidy/tests/gh12980.phpt b/ext/tidy/tests/gh12980.phpt
@@ -0,0 +1,34 @@
+--TEST--
+GH-12980 (tidynode.props.attribute is missing "Boolean Attributes" and empty attributes)
+--EXTENSIONS--
+tidy
+--FILE--
+<?php
+$html = '<!DOCTYPE html><html lang="en" boolean empty="" selected="selected"></html>';
+
+$tidy = new tidy();
+$tidy->ParseString($html);
+echo tidy_get_output($tidy), "\n";
+
+var_dump($tidy->root()->child[1]->attribute);
+
+?>
+--EXPECT--
+<!DOCTYPE html>
+<html lang="en" boolean="" empty="" selected="selected">
+<head>
+<title></title>
+</head>
+<body>
+</body>
+</html>
+array(4) {
+  ["lang"]=>
+  string(2) "en"
+  ["boolean"]=>
+  string(0) ""
+  ["empty"]=>
+  string(0) ""
+  ["selected"]=>
+  string(8) "selected"
+}
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
@@ -662,8 +662,12 @@ static void tidy_add_node_default_properties(PHPTidyObj *obj)
 		do {
 			name = (char *)tidyAttrName(tempattr);
 			val = (char *)tidyAttrValue(tempattr);
-			if (name && val) {
-				add_assoc_string(&attribute, name, val);
+			if (name) {
+				if (val) {
+					add_assoc_string(&attribute, name, val);
+				} else {
+					add_assoc_str(&attribute, name, zend_empty_string);
+				}
 			}
 		} while((tempattr = tidyAttrNext(tempattr)));
 	} else {
