Merge branch 'PHP-8.2'

nielsdos · nielsdos · commit 88743849210f · 2023-08-01T17:35:10.000+02:00
* PHP-8.2:
  Fix json_encode result on DOMDocument
diff --git a/ext/dom/php_dom.stub.php b/ext/dom/php_dom.stub.php
@@ -707,7 +707,7 @@ class DOMDocument extends DOMNode implements DOMParentNode
      * @readonly
      * @deprecated
      */
-    public mixed $config = null;
+    public mixed $config;
 
     public bool $formatOutput;
 
diff --git a/ext/dom/php_dom_arginfo.h b/ext/dom/php_dom_arginfo.h
diff --git a/ext/dom/tests/DOMDocument_json_encode.phpt b/ext/dom/tests/DOMDocument_json_encode.phpt
@@ -0,0 +1,11 @@
+--TEST--
+JSON encoding a DOMDocument
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+$doc = new DOMDocument;
+echo json_encode($doc);
+?>
+--EXPECT--
+{}
diff --git a/ext/dom/tests/domobject_debug_handler.phpt b/ext/dom/tests/domobject_debug_handler.phpt
@@ -17,8 +17,6 @@ var_dump($d);
 --EXPECTF--
 Deprecated: Creation of dynamic property DOMDocument::$dynamicProperty is deprecated in %s on line %d
 object(DOMDocument)#1 (41) {
-  ["config"]=>
-  NULL
   ["dynamicProperty"]=>
   object(stdClass)#2 (0) {
   }
@@ -46,6 +44,8 @@ object(DOMDocument)#1 (41) {
   bool(true)
   ["documentURI"]=>
   string(%d) %s
+  ["config"]=>
+  NULL
   ["formatOutput"]=>
   bool(false)
   ["validateOnParse"]=>
