From 1cbf45025cb5474c7d598d53cb6422dbf1b087d7 Mon Sep 17 00:00:00 2001 From: Alies Lapatsin Date: Fri, 9 Dec 2022 11:35:30 +0100 Subject: [PATCH 1/2] Add libxml_get_external_entity_loader to CallMap (PHP 8.2) https://www.php.net/manual/en/function.libxml-get-external-entity-loader.php --- dictionaries/CallMap.php | 3 ++- dictionaries/CallMap_82_delta.php | 1 + dictionaries/CallMap_historical.php | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php index f8326105b00..c7ff5779d93 100644 --- a/dictionaries/CallMap.php +++ b/dictionaries/CallMap.php @@ -6865,7 +6865,8 @@ 'libxml_disable_entity_loader' => ['bool', 'disable='=>'bool'], 'libxml_get_errors' => ['array'], 'libxml_get_last_error' => ['LibXMLError|false'], -'libxml_set_external_entity_loader' => ['bool', 'resolver_function'=>'callable'], +'libxml_get_external_entity_loader' => ['(callable(string,string,array):(resource|string|null))|null'], +'libxml_set_external_entity_loader' => ['bool', 'resolver_function'=>'(callable(string,string,array):(resource|string|null))|null'], 'libxml_set_streams_context' => ['void', 'context'=>'resource'], 'libxml_use_internal_errors' => ['bool', 'use_errors='=>'bool'], 'LimitIterator::__construct' => ['void', 'iterator'=>'Iterator', 'offset='=>'int', 'count='=>'int'], diff --git a/dictionaries/CallMap_82_delta.php b/dictionaries/CallMap_82_delta.php index ecbff9d3972..a1936ce2a9c 100644 --- a/dictionaries/CallMap_82_delta.php +++ b/dictionaries/CallMap_82_delta.php @@ -21,6 +21,7 @@ 'openssl_cipher_key_length' => ['positive-int|false', 'cipher_algo'=>'non-empty-string'], 'curl_upkeep' => ['bool', 'handle'=>'CurlHandle'], 'ini_parse_quantity' => ['int', 'shorthand'=>'non-empty-string'], + 'libxml_get_external_entity_loader' => ['(callable(string,string,array):(resource|string|null))|null'], 'memory_reset_peak_usage' => ['void'], ], diff --git a/dictionaries/CallMap_historical.php b/dictionaries/CallMap_historical.php index 142f58167f8..6efbc7fb587 100644 --- a/dictionaries/CallMap_historical.php +++ b/dictionaries/CallMap_historical.php @@ -12626,7 +12626,7 @@ 'libxml_disable_entity_loader' => ['bool', 'disable='=>'bool'], 'libxml_get_errors' => ['array'], 'libxml_get_last_error' => ['LibXMLError|false'], - 'libxml_set_external_entity_loader' => ['bool', 'resolver_function'=>'callable'], + 'libxml_set_external_entity_loader' => ['bool', 'resolver_function'=>'(callable(string,string,array):resource|string|null)|null'], 'libxml_set_streams_context' => ['void', 'context'=>'resource'], 'libxml_use_internal_errors' => ['bool', 'use_errors='=>'bool'], 'lineObj::__construct' => ['void'], From aced00313b0cfd0b9113b3d149bbfb7297f586d4 Mon Sep 17 00:00:00 2001 From: Alies Lapatsin Date: Fri, 9 Dec 2022 12:02:03 +0100 Subject: [PATCH 2/2] Add array shape for libxml_*et_external_entity_loader functions --- dictionaries/CallMap.php | 4 ++-- dictionaries/CallMap_82_delta.php | 2 +- dictionaries/CallMap_historical.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php index c7ff5779d93..eeaaf7f01d8 100644 --- a/dictionaries/CallMap.php +++ b/dictionaries/CallMap.php @@ -6865,8 +6865,8 @@ 'libxml_disable_entity_loader' => ['bool', 'disable='=>'bool'], 'libxml_get_errors' => ['array'], 'libxml_get_last_error' => ['LibXMLError|false'], -'libxml_get_external_entity_loader' => ['(callable(string,string,array):(resource|string|null))|null'], -'libxml_set_external_entity_loader' => ['bool', 'resolver_function'=>'(callable(string,string,array):(resource|string|null))|null'], +'libxml_get_external_entity_loader' => ['(callable(string,string,array{directory:?string,intSubName:?string,extSubURI:?string,extSubSystem:?string}):(resource|string|null))|null'], +'libxml_set_external_entity_loader' => ['bool', 'resolver_function'=>'(callable(string,string,array{directory:?string,intSubName:?string,extSubURI:?string,extSubSystem:?string}):(resource|string|null))|null'], 'libxml_set_streams_context' => ['void', 'context'=>'resource'], 'libxml_use_internal_errors' => ['bool', 'use_errors='=>'bool'], 'LimitIterator::__construct' => ['void', 'iterator'=>'Iterator', 'offset='=>'int', 'count='=>'int'], diff --git a/dictionaries/CallMap_82_delta.php b/dictionaries/CallMap_82_delta.php index a1936ce2a9c..2cfe3d3af3a 100644 --- a/dictionaries/CallMap_82_delta.php +++ b/dictionaries/CallMap_82_delta.php @@ -21,7 +21,7 @@ 'openssl_cipher_key_length' => ['positive-int|false', 'cipher_algo'=>'non-empty-string'], 'curl_upkeep' => ['bool', 'handle'=>'CurlHandle'], 'ini_parse_quantity' => ['int', 'shorthand'=>'non-empty-string'], - 'libxml_get_external_entity_loader' => ['(callable(string,string,array):(resource|string|null))|null'], + 'libxml_get_external_entity_loader' => ['(callable(string,string,array{directory:?string,intSubName:?string,extSubURI:?string,extSubSystem:?string}):(resource|string|null))|null'], 'memory_reset_peak_usage' => ['void'], ], diff --git a/dictionaries/CallMap_historical.php b/dictionaries/CallMap_historical.php index 6efbc7fb587..31f5a7d80df 100644 --- a/dictionaries/CallMap_historical.php +++ b/dictionaries/CallMap_historical.php @@ -12626,7 +12626,7 @@ 'libxml_disable_entity_loader' => ['bool', 'disable='=>'bool'], 'libxml_get_errors' => ['array'], 'libxml_get_last_error' => ['LibXMLError|false'], - 'libxml_set_external_entity_loader' => ['bool', 'resolver_function'=>'(callable(string,string,array):resource|string|null)|null'], + 'libxml_set_external_entity_loader' => ['bool', 'resolver_function'=>'(callable(string,string,array{directory:?string,intSubName:?string,extSubURI:?string,extSubSystem:?string}):(resource|string|null))|null'], 'libxml_set_streams_context' => ['void', 'context'=>'resource'], 'libxml_use_internal_errors' => ['bool', 'use_errors='=>'bool'], 'lineObj::__construct' => ['void'],