Merge branch 'PHP-8.3' into PHP-8.4

ndossche · ndossche · commit 94b58239e887 · 2025-04-23T18:30:00.000+02:00
* PHP-8.3:
  Fix DOM tests for upcoming libxml2 serializer changes
diff --git a/ext/dom/tests/DOMElement_toggleAttribute.phpt b/ext/dom/tests/DOMElement_toggleAttribute.phpt
@@ -87,18 +87,18 @@ echo "Checking toggled namespace:\n";
 var_dump($dom->documentElement->getAttribute('xmlns:anotheron'));
 
 ?>
---EXPECT--
+--EXPECTF--
 Invalid Character Error
 --- Selected attribute tests (HTML) ---
 bool(false)
 <!DOCTYPE HTML>
 <html id="test"></html>
 bool(true)
 <!DOCTYPE HTML>
-<html id="test" selected></html>
+<html id="test" selected%r(="")?%r></html>
 bool(true)
 <!DOCTYPE HTML>
-<html id="test" selected></html>
+<html id="test" selected%r(="")?%r></html>
 bool(false)
 <!DOCTYPE HTML>
 <html id="test"></html>
diff --git a/ext/dom/tests/gh10234.phpt b/ext/dom/tests/gh10234.phpt
@@ -55,7 +55,7 @@ $document->documentElement->textContent = "quote 'test'";
 var_dump($document->documentElement->textContent);
 var_dump($document->saveHTML());
 ?>
---EXPECT--
+--EXPECTF--
 -- Attribute tests --
 string(38) "<element attribute="value"></element>
 "
@@ -67,10 +67,10 @@ string(13) "hello & world"
 string(50) "<element attribute="hello &amp; world"></element>
 "
 string(9) "<b>hi</b>"
-string(54) "<element attribute="&lt;b&gt;hi&lt;/b&gt;"></element>
+string(%d) "<element attribute=%r("&lt;b&gt;hi&lt;\/b&gt;"|"<b>hi<\/b>")%r></element>
 "
 string(12) "quote "test""
-string(45) "<element attribute='quote "test"'></element>
+string(%d) "<element attribute=%r('quote "test"'|"quote &quot;test&quot;")%r></element>
 "
 string(12) "quote 'test'"
 string(45) "<element attribute="quote 'test'"></element>

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ $document->documentElement->textContent = "quote 'test'";`
`55`	`55`	`var_dump($document->documentElement->textContent);`
`56`	`56`	`var_dump($document->saveHTML());`
`57`	`57`	`?>`
`58`		`---EXPECT--`
	`58`	`+--EXPECTF--`
`59`	`59`	`-- Attribute tests --`
`60`	`60`	`string(38) "<element attribute="value"></element>`
`61`	`61`	`"`
`@@ -67,10 +67,10 @@ string(13) "hello & world"`
`67`	`67`	`string(50) "<element attribute="hello & world"></element>`
`68`	`68`	`"`
`69`	`69`	`string(9) "<b>hi</b>"`
`70`		`-string(54) "<element attribute="<b>hi</b>"></element>`
	`70`	`+string(%d) "<element attribute=%r("<b>hi<\/b>"\|"<b>hi<\/b>")%r></element>`
`71`	`71`	`"`
`72`	`72`	`string(12) "quote "test""`
`73`		`-string(45) "<element attribute='quote "test"'></element>`
	`73`	`+string(%d) "<element attribute=%r('quote "test"'\|"quote "test"")%r></element>`
`74`	`74`	`"`
`75`	`75`	`string(12) "quote 'test'"`
`76`	`76`	`string(45) "<element attribute="quote 'test'"></element>`