From cb1e77e78b11030abbf7491fece7e4a74cdee094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= Date: Sat, 28 Oct 2023 11:04:12 +0200 Subject: [PATCH 1/5] Synchronize ext/dom with the stubs based on the PHP 8.3 changes --- reference/dom/domattr.xml | 5 + reference/dom/domcdatasection.xml | 5 + reference/dom/domcharacterdata.xml | 5 + reference/dom/domcomment.xml | 5 + reference/dom/domdocument.xml | 6 +- reference/dom/domdocumentfragment.xml | 5 + reference/dom/domdocumenttype.xml | 5 + reference/dom/domelement.xml | 27 +++++ reference/dom/domentity.xml | 5 + reference/dom/domentityreference.xml | 5 + reference/dom/domnode.xml | 130 +++++++++++++++++++++ reference/dom/domnotation.xml | 5 + reference/dom/domprocessinginstruction.xml | 5 + reference/dom/domtext.xml | 5 + 14 files changed, 217 insertions(+), 1 deletion(-) diff --git a/reference/dom/domattr.xml b/reference/dom/domattr.xml index 3153893c142e..c5187bdf042f 100644 --- a/reference/dom/domattr.xml +++ b/reference/dom/domattr.xml @@ -30,6 +30,11 @@ DOMNode + &InheritedConstants; + + + + &Properties; public diff --git a/reference/dom/domcdatasection.xml b/reference/dom/domcdatasection.xml index 5b3853ffd083..3e7dab38a4bb 100644 --- a/reference/dom/domcdatasection.xml +++ b/reference/dom/domcdatasection.xml @@ -32,6 +32,11 @@ DOMText + &InheritedConstants; + + + + &InheritedProperties; diff --git a/reference/dom/domcharacterdata.xml b/reference/dom/domcharacterdata.xml index b87a9fab7d60..51fa5ec1e150 100644 --- a/reference/dom/domcharacterdata.xml +++ b/reference/dom/domcharacterdata.xml @@ -35,6 +35,11 @@ DOMChildNode + &InheritedConstants; + + + + &Properties; public diff --git a/reference/dom/domcomment.xml b/reference/dom/domcomment.xml index efc355803b12..c36d34f58ecb 100644 --- a/reference/dom/domcomment.xml +++ b/reference/dom/domcomment.xml @@ -30,6 +30,11 @@ DOMCharacterData + &InheritedConstants; + + + + &InheritedProperties; diff --git a/reference/dom/domdocument.xml b/reference/dom/domdocument.xml index 0e0073d0a823..1e2209619487 100644 --- a/reference/dom/domdocument.xml +++ b/reference/dom/domdocument.xml @@ -35,6 +35,11 @@ DOMParentNode + &InheritedConstants; + + + + &Properties; public @@ -106,7 +111,6 @@ readonly mixed config - null public diff --git a/reference/dom/domdocumentfragment.xml b/reference/dom/domdocumentfragment.xml index c007f1f4267e..9922b915d77e 100644 --- a/reference/dom/domdocumentfragment.xml +++ b/reference/dom/domdocumentfragment.xml @@ -36,6 +36,11 @@ DOMParentNode + &InheritedConstants; + + + + &Properties; public diff --git a/reference/dom/domdocumenttype.xml b/reference/dom/domdocumenttype.xml index 01dc8109bd4a..eb5bfd92c9da 100644 --- a/reference/dom/domdocumenttype.xml +++ b/reference/dom/domdocumenttype.xml @@ -30,6 +30,11 @@ DOMNode + &InheritedConstants; + + + + &Properties; public diff --git a/reference/dom/domelement.xml b/reference/dom/domelement.xml index 42184706497d..7b33d15ab106 100644 --- a/reference/dom/domelement.xml +++ b/reference/dom/domelement.xml @@ -40,6 +40,11 @@ DOMChildNode + &InheritedConstants; + + + + &Properties; public @@ -47,6 +52,16 @@ string tagName + + public + string + className + + + public + string + id + public readonly @@ -153,6 +168,18 @@ The element name + + className + + The element class name + + + + id + + The element ID + + diff --git a/reference/dom/domentity.xml b/reference/dom/domentity.xml index 17b8a2e5fc79..7bf5782520da 100644 --- a/reference/dom/domentity.xml +++ b/reference/dom/domentity.xml @@ -29,6 +29,11 @@ DOMNode + &InheritedConstants; + + + + &Properties; public diff --git a/reference/dom/domentityreference.xml b/reference/dom/domentityreference.xml index b37aa2de1c5d..ce58fd93ee7b 100644 --- a/reference/dom/domentityreference.xml +++ b/reference/dom/domentityreference.xml @@ -39,6 +39,11 @@ Remove me once you perform substitutions DOMNode + &InheritedConstants; + + + + &InheritedProperties; diff --git a/reference/dom/domnode.xml b/reference/dom/domnode.xml index dff0f7919fd4..6616cc03a0e2 100644 --- a/reference/dom/domnode.xml +++ b/reference/dom/domnode.xml @@ -24,6 +24,50 @@ DOMNode + &Constants; + + public + const + int + DOMNode::DOCUMENT_POSITION_DISCONNECTED + 0x1 + + + public + const + int + DOMNode::DOCUMENT_POSITION_PRECEDING + 0x2 + + + public + const + int + DOMNode::DOCUMENT_POSITION_FOLLOWING + 0x4 + + + public + const + int + DOMNode::DOCUMENT_POSITION_CONTAINS + 0x8 + + + public + const + int + DOMNode::DOCUMENT_POSITION_CONTAINED_BY + 0x10 + + + public + const + int + DOMNode::DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC + 0x20 + + &Properties; public @@ -48,6 +92,12 @@ DOMNodenull parentNode + + public + readonly + DOMElementnull + parentElement + public readonly @@ -84,6 +134,12 @@ DOMNamedNodeMapnull attributes + + public + readonly + bool + isConnected + public readonly @@ -129,6 +185,48 @@ +
+ &reftitle.constants; + + + DOMNode::DOCUMENT_POSITION_DISCONNECTED + + + + + + DOMNode::DOCUMENT_POSITION_PRECEDING + + + + + + DOMNode::DOCUMENT_POSITION_FOLLOWING + + + + + + DOMNode::DOCUMENT_POSITION_CONTAINS + + + + + + DOMNode::DOCUMENT_POSITION_CONTAINED_BY + + + + + + DOMNode::DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC + + + + + +
+
&reftitle.properties; @@ -161,6 +259,12 @@ The parent of this node. If there is no such node, this returns &null;. + + parentElement + + The parent of this element. If there is no such element, this returns &null;. + + childNodes @@ -214,6 +318,12 @@ + + isConnected + + + + ownerDocument @@ -268,6 +378,26 @@ + + 8.3.0 + + Constants DOMNode::DOCUMENT_POSITION_DISCONNECTED, + DOMNode::DOCUMENT_POSITION_PRECEDING, + DOMNode::DOCUMENT_POSITION_FOLLOWING, + DOMNode::DOCUMENT_POSITION_CONTAINS, + DOMNode::DOCUMENT_POSITION_CONTAINED_BY, + and + DOMNode::DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC + have been added. + + + + 8.3.0 + + Properties DOMNode::$parentElement, and + DOMNode::$isConnected have been added. + + 8.0.0 diff --git a/reference/dom/domnotation.xml b/reference/dom/domnotation.xml index 1ea8eba22378..751815ceb4e4 100644 --- a/reference/dom/domnotation.xml +++ b/reference/dom/domnotation.xml @@ -40,6 +40,11 @@ Remove me once you perform substitutions DOMNode + &InheritedConstants; + + + + &Properties; public diff --git a/reference/dom/domprocessinginstruction.xml b/reference/dom/domprocessinginstruction.xml index 13cd094553fb..06d5a9c5a0ac 100644 --- a/reference/dom/domprocessinginstruction.xml +++ b/reference/dom/domprocessinginstruction.xml @@ -31,6 +31,11 @@ DOMNode + &InheritedConstants; + + + + &Properties; public diff --git a/reference/dom/domtext.xml b/reference/dom/domtext.xml index d01685b103b7..a9c163a81253 100644 --- a/reference/dom/domtext.xml +++ b/reference/dom/domtext.xml @@ -32,6 +32,11 @@ DOMCharacterData + &InheritedConstants; + + + + &Properties; public From f343816a875c0a3fc863b1645d716a6ddd88ab95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= Date: Sun, 29 Oct 2023 10:59:28 +0100 Subject: [PATCH 2/5] Update reference/dom/domnode.xml Co-authored-by: Niels Dossche <7771979+nielsdos@users.noreply.github.com> --- reference/dom/domnode.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/dom/domnode.xml b/reference/dom/domnode.xml index 6616cc03a0e2..01e049ec09a4 100644 --- a/reference/dom/domnode.xml +++ b/reference/dom/domnode.xml @@ -262,7 +262,7 @@ parentElement - The parent of this element. If there is no such element, this returns &null;. + The parent element of this element. If there is no such element, this returns &null;. From c2a34601e56797239856b1ff1007c320ee57a71a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= Date: Sun, 29 Oct 2023 10:59:36 +0100 Subject: [PATCH 3/5] Update reference/dom/domelement.xml Co-authored-by: Niels Dossche <7771979+nielsdos@users.noreply.github.com> --- reference/dom/domelement.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/dom/domelement.xml b/reference/dom/domelement.xml index 7b33d15ab106..f4a6ef9be42f 100644 --- a/reference/dom/domelement.xml +++ b/reference/dom/domelement.xml @@ -171,7 +171,7 @@ className - The element class name + A string representing the classes of the element separated by spaces From dff799ae3feb1d9e3e8c0faa1738396b74566b7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= Date: Sun, 29 Oct 2023 10:59:44 +0100 Subject: [PATCH 4/5] Update reference/dom/domnode.xml Co-authored-by: Niels Dossche <7771979+nielsdos@users.noreply.github.com> --- reference/dom/domnode.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/dom/domnode.xml b/reference/dom/domnode.xml index 01e049ec09a4..5bf49dbfe6c5 100644 --- a/reference/dom/domnode.xml +++ b/reference/dom/domnode.xml @@ -321,7 +321,7 @@ isConnected - + Whether the node is connected to a document From 8ab84b1652186925d91ea8d6f98dc051e9f04bdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= Date: Sun, 29 Oct 2023 11:01:42 +0100 Subject: [PATCH 5/5] Remove constants introduced in PHP 8.4 --- reference/dom/domattr.xml | 5 -- reference/dom/domcdatasection.xml | 5 -- reference/dom/domcharacterdata.xml | 5 -- reference/dom/domcomment.xml | 5 -- reference/dom/domdocument.xml | 5 -- reference/dom/domdocumentfragment.xml | 5 -- reference/dom/domdocumenttype.xml | 5 -- reference/dom/domelement.xml | 5 -- reference/dom/domentity.xml | 5 -- reference/dom/domentityreference.xml | 5 -- reference/dom/domnode.xml | 99 ---------------------- reference/dom/domnotation.xml | 5 -- reference/dom/domprocessinginstruction.xml | 5 -- reference/dom/domtext.xml | 5 -- 14 files changed, 164 deletions(-) diff --git a/reference/dom/domattr.xml b/reference/dom/domattr.xml index c5187bdf042f..3153893c142e 100644 --- a/reference/dom/domattr.xml +++ b/reference/dom/domattr.xml @@ -30,11 +30,6 @@ DOMNode - &InheritedConstants; - - - - &Properties; public diff --git a/reference/dom/domcdatasection.xml b/reference/dom/domcdatasection.xml index 3e7dab38a4bb..5b3853ffd083 100644 --- a/reference/dom/domcdatasection.xml +++ b/reference/dom/domcdatasection.xml @@ -32,11 +32,6 @@ DOMText - &InheritedConstants; - - - - &InheritedProperties; diff --git a/reference/dom/domcharacterdata.xml b/reference/dom/domcharacterdata.xml index 51fa5ec1e150..b87a9fab7d60 100644 --- a/reference/dom/domcharacterdata.xml +++ b/reference/dom/domcharacterdata.xml @@ -35,11 +35,6 @@ DOMChildNode - &InheritedConstants; - - - - &Properties; public diff --git a/reference/dom/domcomment.xml b/reference/dom/domcomment.xml index c36d34f58ecb..efc355803b12 100644 --- a/reference/dom/domcomment.xml +++ b/reference/dom/domcomment.xml @@ -30,11 +30,6 @@ DOMCharacterData - &InheritedConstants; - - - - &InheritedProperties; diff --git a/reference/dom/domdocument.xml b/reference/dom/domdocument.xml index 1e2209619487..3e5906bc44d7 100644 --- a/reference/dom/domdocument.xml +++ b/reference/dom/domdocument.xml @@ -35,11 +35,6 @@ DOMParentNode - &InheritedConstants; - - - - &Properties; public diff --git a/reference/dom/domdocumentfragment.xml b/reference/dom/domdocumentfragment.xml index 9922b915d77e..c007f1f4267e 100644 --- a/reference/dom/domdocumentfragment.xml +++ b/reference/dom/domdocumentfragment.xml @@ -36,11 +36,6 @@ DOMParentNode - &InheritedConstants; - - - - &Properties; public diff --git a/reference/dom/domdocumenttype.xml b/reference/dom/domdocumenttype.xml index eb5bfd92c9da..01dc8109bd4a 100644 --- a/reference/dom/domdocumenttype.xml +++ b/reference/dom/domdocumenttype.xml @@ -30,11 +30,6 @@ DOMNode - &InheritedConstants; - - - - &Properties; public diff --git a/reference/dom/domelement.xml b/reference/dom/domelement.xml index f4a6ef9be42f..a5eebdc6a527 100644 --- a/reference/dom/domelement.xml +++ b/reference/dom/domelement.xml @@ -40,11 +40,6 @@ DOMChildNode - &InheritedConstants; - - - - &Properties; public diff --git a/reference/dom/domentity.xml b/reference/dom/domentity.xml index 7bf5782520da..17b8a2e5fc79 100644 --- a/reference/dom/domentity.xml +++ b/reference/dom/domentity.xml @@ -29,11 +29,6 @@ DOMNode - &InheritedConstants; - - - - &Properties; public diff --git a/reference/dom/domentityreference.xml b/reference/dom/domentityreference.xml index ce58fd93ee7b..b37aa2de1c5d 100644 --- a/reference/dom/domentityreference.xml +++ b/reference/dom/domentityreference.xml @@ -39,11 +39,6 @@ Remove me once you perform substitutions DOMNode - &InheritedConstants; - - - - &InheritedProperties; diff --git a/reference/dom/domnode.xml b/reference/dom/domnode.xml index 5bf49dbfe6c5..de8d563bce2b 100644 --- a/reference/dom/domnode.xml +++ b/reference/dom/domnode.xml @@ -24,50 +24,6 @@ DOMNode - &Constants; - - public - const - int - DOMNode::DOCUMENT_POSITION_DISCONNECTED - 0x1 - - - public - const - int - DOMNode::DOCUMENT_POSITION_PRECEDING - 0x2 - - - public - const - int - DOMNode::DOCUMENT_POSITION_FOLLOWING - 0x4 - - - public - const - int - DOMNode::DOCUMENT_POSITION_CONTAINS - 0x8 - - - public - const - int - DOMNode::DOCUMENT_POSITION_CONTAINED_BY - 0x10 - - - public - const - int - DOMNode::DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC - 0x20 - - &Properties; public @@ -185,48 +141,6 @@
-
- &reftitle.constants; - - - DOMNode::DOCUMENT_POSITION_DISCONNECTED - - - - - - DOMNode::DOCUMENT_POSITION_PRECEDING - - - - - - DOMNode::DOCUMENT_POSITION_FOLLOWING - - - - - - DOMNode::DOCUMENT_POSITION_CONTAINS - - - - - - DOMNode::DOCUMENT_POSITION_CONTAINED_BY - - - - - - DOMNode::DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC - - - - - -
-
&reftitle.properties; @@ -378,19 +292,6 @@ - - 8.3.0 - - Constants DOMNode::DOCUMENT_POSITION_DISCONNECTED, - DOMNode::DOCUMENT_POSITION_PRECEDING, - DOMNode::DOCUMENT_POSITION_FOLLOWING, - DOMNode::DOCUMENT_POSITION_CONTAINS, - DOMNode::DOCUMENT_POSITION_CONTAINED_BY, - and - DOMNode::DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC - have been added. - - 8.3.0 diff --git a/reference/dom/domnotation.xml b/reference/dom/domnotation.xml index 751815ceb4e4..1ea8eba22378 100644 --- a/reference/dom/domnotation.xml +++ b/reference/dom/domnotation.xml @@ -40,11 +40,6 @@ Remove me once you perform substitutions DOMNode - &InheritedConstants; - - - - &Properties; public diff --git a/reference/dom/domprocessinginstruction.xml b/reference/dom/domprocessinginstruction.xml index 06d5a9c5a0ac..13cd094553fb 100644 --- a/reference/dom/domprocessinginstruction.xml +++ b/reference/dom/domprocessinginstruction.xml @@ -31,11 +31,6 @@ DOMNode - &InheritedConstants; - - - - &Properties; public diff --git a/reference/dom/domtext.xml b/reference/dom/domtext.xml index a9c163a81253..d01685b103b7 100644 --- a/reference/dom/domtext.xml +++ b/reference/dom/domtext.xml @@ -32,11 +32,6 @@ DOMCharacterData - &InheritedConstants; - - - - &Properties; public