Merge pull request #7489 from KevinVanSonsbeek/bugfix/#6151-typedoesn…

…otcontainnull-on-return-value-from-dom_import_simplexml Bugfix/#6151 typedoesnotcontainnull on return value from dom import simplexml
vimeo · Jan 27, 2022 · f6a8921 · f6a8921
2 parents 5cd5255 + 7507274
commit f6a8921
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git 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'],

diff --git 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|null', 'node'=>'SimpleXMLElement'],
+        'new' => ['DOMElement', 'node'=>'SimpleXMLElement'],
+    ],
     'explode' => [
       'old' => ['list<string>|false', 'separator'=>'string', 'string'=>'string', 'limit='=>'int'],
       'new' => ['list<string>', 'separator'=>'string', 'string'=>'string', 'limit='=>'int'],

diff --git 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'],