1
0
mirror of https://github.com/danog/psalm.git synced 2024-11-30 04:39:00 +01:00

Merge branch '4.x' into upstream-master

This commit is contained in:
Bruce Weirdan 2022-01-30 00:32:12 +02:00
commit 963b41d317
No known key found for this signature in database
GPG Key ID: CFC3AAB181751B0D
5 changed files with 11 additions and 3 deletions

4
.gitattributes vendored
View File

@ -6,6 +6,8 @@
/.circleci export-ignore
/CODE_OF_CONDUCT.md export-ignore
/CONTRIBUTING.md export-ignore
/UPGRADING.md export-ignore
/psalm-baseline.xml export-ignore
/dictionaries/scripts export-ignore
/docs export-ignore
/.editorconfig export-ignore
@ -24,3 +26,5 @@
/.scrutinizer.yml export-ignore
/tests export-ignore
/vendor-bin export-ignore
*.phpstub linguist-language=PHP

View File

@ -2051,7 +2051,7 @@ return [
'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'],

View File

@ -309,6 +309,10 @@ return [
'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'],

View File

@ -10391,7 +10391,7 @@ return [
'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'],

View File

@ -370,7 +370,7 @@ return [
],
'domnode' => [
'nodeName' => 'string',
'nodeValue' => 'string',
'nodeValue' => 'string|null',
'nodeType' => 'int',
'parentNode' => 'DOMNode|null',
'childNodes' => 'DomNodeList<DomNode>',