diff --git a/language-snippets.ent b/language-snippets.ent index beb3bbfd3e..5696424acb 100644 --- a/language-snippets.ent +++ b/language-snippets.ent @@ -521,6 +521,7 @@ is inserted with (e.g.) domnode_ DOMNode->appendChild.'> +This method may be called statically, but will issue an E_STRICT error.'> The file pointer must be valid, and must point to diff --git a/reference/dom/domdocument/load.xml b/reference/dom/domdocument/load.xml index 72a97e2feb..77513c29b9 100644 --- a/reference/dom/domdocument/load.xml +++ b/reference/dom/domdocument/load.xml @@ -53,8 +53,7 @@ &reftitle.returnvalues; &return.success; If called statically, returns a - DOMDocument and issues E_STRICT - warning. + DOMDocument&return.falseforfailure;. @@ -65,6 +64,7 @@ is not generated by libxml and cannot be handled using libxml's error handling functions. + &dom.allowstatic; &reftitle.examples; diff --git a/reference/dom/domdocument/loadhtml.xml b/reference/dom/domdocument/loadhtml.xml index 1feb79a768..ee7d47b79f 100644 --- a/reference/dom/domdocument/loadhtml.xml +++ b/reference/dom/domdocument/loadhtml.xml @@ -41,8 +41,7 @@ &reftitle.returnvalues; &return.success; If called statically, returns a - DOMDocument and issues E_STRICT - warning. + DOMDocument&return.falseforfailure;. @@ -52,6 +51,7 @@ a warning will be generated. This warning is not generated by libxml and cannot be handled using libxml's error handling functions. + &dom.allowstatic; &reftitle.examples; diff --git a/reference/dom/domdocument/loadhtmlfile.xml b/reference/dom/domdocument/loadhtmlfile.xml index 326942157d..c587a13b8f 100644 --- a/reference/dom/domdocument/loadhtmlfile.xml +++ b/reference/dom/domdocument/loadhtmlfile.xml @@ -18,14 +18,6 @@ filename. Unlike loading XML, HTML does not have to be well-formed to load. - - Though not recommended, this function may also be called statically to load - and create a DOMDocument object. The static invocation - may be used when no DOMDocument properties need to be - set prior to loading. However, doing so will result an in - E_STRICT - error being generated. - &reftitle.parameters; @@ -46,8 +38,7 @@ &reftitle.returnvalues; &return.success; If called statically, returns a - DOMDocument and issues E_STRICT - warning. + DOMDocument&return.falseforfailure;. @@ -59,6 +50,7 @@ linkend="function.libxml-use-internal-errors">libxml's error handling functions. + &dom.allowstatic; &reftitle.examples; diff --git a/reference/dom/domdocument/loadxml.xml b/reference/dom/domdocument/loadxml.xml index 2f4bc457a0..e2d0329c12 100644 --- a/reference/dom/domdocument/loadxml.xml +++ b/reference/dom/domdocument/loadxml.xml @@ -17,12 +17,6 @@ Loads an XML document from a string. - - This method may also be called statically to load and create a - DOMDocument object. The static invocation may be - used when no DOMDocument properties need to be set - prior to loading. - &reftitle.parameters; @@ -53,8 +47,7 @@ &reftitle.returnvalues; &return.success; If called statically, returns a - DOMDocument and issues E_STRICT - warning. + DOMDocument&return.falseforfailure;. @@ -64,6 +57,7 @@ a warning will be generated. This warning is not generated by libxml and cannot be handled using libxml's error handling functions. + &dom.allowstatic; &reftitle.examples; @@ -87,6 +81,7 @@ echo $doc->saveXML(); '); echo $doc->saveXML(); ?> diff --git a/reference/dom/domimplementation/createdocument.xml b/reference/dom/domimplementation/createdocument.xml index 95d6775908..94eafa80fe 100644 --- a/reference/dom/domimplementation/createdocument.xml +++ b/reference/dom/domimplementation/createdocument.xml @@ -84,6 +84,7 @@ + &dom.allowstatic; &reftitle.seealso; diff --git a/reference/dom/domimplementation/createdocumenttype.xml b/reference/dom/domimplementation/createdocumenttype.xml index ee975d389b..c98ceffa44 100644 --- a/reference/dom/domimplementation/createdocumenttype.xml +++ b/reference/dom/domimplementation/createdocumenttype.xml @@ -59,6 +59,23 @@ ownerDocument set to &null;. + + &reftitle.errors; + + + + DOM_NAMESPACE_ERR + + + Raised if there is an error with the namespace, as determined by + qualifiedName. + + + + + + &dom.allowstatic; + &reftitle.examples; @@ -104,22 +121,6 @@ echo $dom->saveXML(); - - &reftitle.errors; - - - - DOM_NAMESPACE_ERR - - - Raised if there is an error with the namespace, as determined by - qualifiedName. - - - - - - &reftitle.seealso; diff --git a/reference/dom/domimplementation/hasfeature.xml b/reference/dom/domimplementation/hasfeature.xml index 01bbe6547a..75f3dd1e42 100644 --- a/reference/dom/domimplementation/hasfeature.xml +++ b/reference/dom/domimplementation/hasfeature.xml @@ -55,6 +55,10 @@ &return.success; + + &reftitle.errors; + &dom.allowstatic; + &reftitle.examples; diff --git a/reference/xmlreader/xmlreader/open.xml b/reference/xmlreader/xmlreader/open.xml index 5115f75d0a..3b21d1fe4f 100644 --- a/reference/xmlreader/xmlreader/open.xml +++ b/reference/xmlreader/xmlreader/open.xml @@ -56,10 +56,16 @@ &reftitle.returnvalues; - &return.success; + &return.success; If called statically, returns an + XMLReader&return.falseforfailure;. + + &reftitle.errors; + &dom.allowstatic; + + &reftitle.changelog; diff --git a/reference/xmlreader/xmlreader/xml.xml b/reference/xmlreader/xmlreader/xml.xml index 53e66b5b5b..a7d0c01345 100644 --- a/reference/xmlreader/xmlreader/xml.xml +++ b/reference/xmlreader/xmlreader/xml.xml @@ -56,10 +56,16 @@ &reftitle.returnvalues; - &return.success; + &return.success; If called statically, returns an + XMLReader&return.falseforfailure;. + + &reftitle.errors; + &dom.allowstatic; + + &reftitle.changelog;