From 62d458bfe8e508973ed2ff19aa8eac0976fc6467 Mon Sep 17 00:00:00 2001 From: Kevin van Sonsbeek Date: Tue, 25 Jan 2022 23:12:52 +0100 Subject: [PATCH 1/3] Added the change to the delta callmap for php 8.0 --- dictionaries/CallMap_80_delta.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dictionaries/CallMap_80_delta.php b/dictionaries/CallMap_80_delta.php index 5453c3585b6..d989c96934c 100644 --- a/dictionaries/CallMap_80_delta.php +++ b/dictionaries/CallMap_80_delta.php @@ -309,6 +309,10 @@ 'old' => ['string|false', 'object'=>'DateTimeInterface', 'format'=>'string'], 'new' => ['string', 'object'=>'DateTimeInterface', 'format'=>'string'], ], + 'dom_import_simplexml' => [ + 'old' => ['DOMElement|false', 'node'=>'SimpleXMLElement'], + 'new' => ['DOMElement', 'node'=>'SimpleXMLElement'], + ], 'explode' => [ 'old' => ['list|false', 'separator'=>'string', 'string'=>'string', 'limit='=>'int'], 'new' => ['list', 'separator'=>'string', 'string'=>'string', 'limit='=>'int'], From 5a1ddf5e2d02b5844518ccafc24dab0a6c0abd80 Mon Sep 17 00:00:00 2001 From: Kevin van Sonsbeek Date: Tue, 25 Jan 2022 23:13:04 +0100 Subject: [PATCH 2/3] Fixed the return type in the callmap --- dictionaries/CallMap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php index 9857a3b7399..7c061338960 100644 --- a/dictionaries/CallMap.php +++ b/dictionaries/CallMap.php @@ -2051,7 +2051,7 @@ 'dom_document_schema_validate' => ['bool', 'source'=>'string', 'flags'=>'int'], 'dom_document_schema_validate_file' => ['bool', 'filename'=>'string', 'flags'=>'int'], 'dom_document_xinclude' => ['int', 'options'=>'int'], -'dom_import_simplexml' => ['DOMElement|false', 'node'=>'SimpleXMLElement'], +'dom_import_simplexml' => ['DOMElement', 'node'=>'SimpleXMLElement'], 'dom_xpath_evaluate' => ['', 'expr'=>'string', 'context'=>'DOMNode', 'registernodens'=>'bool'], 'dom_xpath_query' => ['DOMNodeList', 'expr'=>'string', 'context'=>'DOMNode', 'registernodens'=>'bool'], 'dom_xpath_register_ns' => ['bool', 'prefix'=>'string', 'uri'=>'string'], From 7507274b1c48b791d50291f488eaca4c0b06c7d5 Mon Sep 17 00:00:00 2001 From: Kevin van Sonsbeek Date: Wed, 26 Jan 2022 18:02:27 +0100 Subject: [PATCH 3/3] Fixed return type in the historical callmap, and the old state in the CallMap_80_delta.php --- dictionaries/CallMap_80_delta.php | 2 +- dictionaries/CallMap_historical.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dictionaries/CallMap_80_delta.php b/dictionaries/CallMap_80_delta.php index d989c96934c..77845ced038 100644 --- a/dictionaries/CallMap_80_delta.php +++ b/dictionaries/CallMap_80_delta.php @@ -310,7 +310,7 @@ 'new' => ['string', 'object'=>'DateTimeInterface', 'format'=>'string'], ], 'dom_import_simplexml' => [ - 'old' => ['DOMElement|false', 'node'=>'SimpleXMLElement'], + 'old' => ['DOMElement|null', 'node'=>'SimpleXMLElement'], 'new' => ['DOMElement', 'node'=>'SimpleXMLElement'], ], 'explode' => [ diff --git a/dictionaries/CallMap_historical.php b/dictionaries/CallMap_historical.php index 69b1b371df3..2e81f3d3334 100644 --- a/dictionaries/CallMap_historical.php +++ b/dictionaries/CallMap_historical.php @@ -10391,7 +10391,7 @@ 'dom_document_schema_validate' => ['bool', 'source'=>'string', 'flags'=>'int'], 'dom_document_schema_validate_file' => ['bool', 'filename'=>'string', 'flags'=>'int'], 'dom_document_xinclude' => ['int', 'options'=>'int'], - 'dom_import_simplexml' => ['DOMElement|false', 'node'=>'SimpleXMLElement'], + 'dom_import_simplexml' => ['DOMElement|null', 'node'=>'SimpleXMLElement'], 'dom_xpath_evaluate' => ['', 'expr'=>'string', 'context'=>'DOMNode', 'registernodens'=>'bool'], 'dom_xpath_query' => ['DOMNodeList', 'expr'=>'string', 'context'=>'DOMNode', 'registernodens'=>'bool'], 'dom_xpath_register_ns' => ['bool', 'prefix'=>'string', 'uri'=>'string'],