From bf7e5a3f9bdb0da19de64bd67ff6b10e0b2856ce Mon Sep 17 00:00:00 2001 From: Bruce Weirdan Date: Wed, 22 Feb 2023 19:53:19 -0400 Subject: [PATCH] Fixed `count`/`sizeof` mismatches in callmaps `sizeof` is an alias for `count`, so their signatures must always match. --- dictionaries/CallMap.php | 2 +- dictionaries/CallMap_80_delta.php | 4 ++++ dictionaries/CallMap_historical.php | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php index 2c801dec9..4cd4dfc3d 100644 --- a/dictionaries/CallMap.php +++ b/dictionaries/CallMap.php @@ -11334,7 +11334,7 @@ return [ 'SimpleXMLElement::xpath' => ['SimpleXMLElement[]|false', 'path'=>'string'], 'sin' => ['float', 'num'=>'float'], 'sinh' => ['float', 'num'=>'float'], -'sizeof' => ['int', 'value'=>'Countable|array', 'mode='=>'int'], +'sizeof' => ['int<0, max>', 'value'=>'Countable|array', 'mode='=>'int'], 'sleep' => ['int', 'seconds'=>'0|positive-int'], 'snmp2_get' => ['string|false', 'hostname'=>'string', 'community'=>'string', 'object_id'=>'string', 'timeout='=>'int', 'retries='=>'int'], 'snmp2_getnext' => ['string|false', 'hostname'=>'string', 'community'=>'string', 'object_id'=>'string', 'timeout='=>'int', 'retries='=>'int'], diff --git a/dictionaries/CallMap_80_delta.php b/dictionaries/CallMap_80_delta.php index b2cc5c427..9f3727636 100644 --- a/dictionaries/CallMap_80_delta.php +++ b/dictionaries/CallMap_80_delta.php @@ -497,6 +497,10 @@ return [ 'old' => ['int<0, max>', 'value'=>'Countable|array|SimpleXMLElement', 'mode='=>'int'], 'new' => ['int<0, max>', 'value'=>'Countable|array', 'mode='=>'int'], ], + 'sizeof' => [ + 'old' => ['int<0, max>', 'value'=>'Countable|array|SimpleXMLElement', 'mode='=>'int'], + 'new' => ['int<0, max>', 'value'=>'Countable|array', 'mode='=>'int'], + ], 'count_chars' => [ 'old' => ['array|false', 'input'=>'string', 'mode='=>'0|1|2'], 'new' => ['array', 'input'=>'string', 'mode='=>'0|1|2'], diff --git a/dictionaries/CallMap_historical.php b/dictionaries/CallMap_historical.php index ca5028008..c58cb3d06 100644 --- a/dictionaries/CallMap_historical.php +++ b/dictionaries/CallMap_historical.php @@ -14030,7 +14030,7 @@ return [ 'simplexml_load_string' => ['SimpleXMLElement|false', 'data'=>'string', 'class_name='=>'?string', 'options='=>'int', 'namespace_or_prefix='=>'string', 'is_prefix='=>'bool'], 'sin' => ['float', 'num'=>'float'], 'sinh' => ['float', 'num'=>'float'], - 'sizeof' => ['int', 'value'=>'Countable|array', 'mode='=>'int'], + 'sizeof' => ['int<0, max>', 'value'=>'Countable|array|SimpleXMLElement', 'mode='=>'int'], 'sleep' => ['int|false', 'seconds'=>'0|positive-int'], 'snmp2_get' => ['string|false', 'hostname'=>'string', 'community'=>'string', 'object_id'=>'string', 'timeout='=>'int', 'retries='=>'int'], 'snmp2_getnext' => ['string|false', 'hostname'=>'string', 'community'=>'string', 'object_id'=>'string', 'timeout='=>'int', 'retries='=>'int'],