From 3bd9bbddc790bc25977ccd500e37241ecca6940c Mon Sep 17 00:00:00 2001 From: Fabien Villepinte Date: Mon, 13 Dec 2021 11:06:31 +0100 Subject: [PATCH 1/2] Fix ldap_set_rebind_proc signature --- dictionaries/CallMap.php | 2 +- dictionaries/CallMap_80_delta.php | 4 ++++ dictionaries/CallMap_81_delta.php | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php index e4695f2c742..7aee35bdf78 100644 --- a/dictionaries/CallMap.php +++ b/dictionaries/CallMap.php @@ -6824,7 +6824,7 @@ 'ldap_sasl_bind' => ['bool', 'ldap'=>'LDAP\Connection', 'dn='=>'string', 'password='=>'string', 'mech='=>'string', 'realm='=>'string', 'authc_id='=>'string', 'authz_id='=>'string', 'props='=>'string'], 'ldap_search' => ['LDAP\Connection|false', 'ldap'=>'LDAP\Connection|LDAP\Connection[]', 'base'=>'string', 'filter'=>'string', 'attributes='=>'array', 'attributes_only='=>'int', 'sizelimit='=>'int', 'timelimit='=>'int', 'deref='=>'int'], 'ldap_set_option' => ['bool', 'ldap'=>'LDAP\Connection|null', 'option'=>'int', 'value'=>'mixed'], -'ldap_set_rebind_proc' => ['bool', 'ldap'=>'LDAP\Connection', 'callback'=>'string'], +'ldap_set_rebind_proc' => ['bool', 'ldap'=>'LDAP\Connection', 'callback'=>'?callable'], 'ldap_start_tls' => ['bool', 'ldap'=>'resource'], 'ldap_t61_to_8859' => ['string', 'value'=>'string'], 'ldap_unbind' => ['bool', 'ldap'=>'resource'], diff --git a/dictionaries/CallMap_80_delta.php b/dictionaries/CallMap_80_delta.php index 9402f8b84a2..3c06da83f78 100644 --- a/dictionaries/CallMap_80_delta.php +++ b/dictionaries/CallMap_80_delta.php @@ -713,6 +713,10 @@ 'old' => ['bool|string', 'ldap'=>'resource', 'user='=>'string', 'old_password='=>'string', 'new_password='=>'string', '&w_controls='=>'array'], 'new' => ['bool|string', 'ldap'=>'resource', 'user='=>'string', 'old_password='=>'string', 'new_password='=>'string', '&w_controls='=>'array|null'], ], + 'ldap_set_rebind_proc' => [ + 'old' => ['bool', 'ldap'=>'resource', 'callback'=>'callable'], + 'new' => ['bool', 'ldap'=>'resource', 'callback'=>'?callable'], + ], 'mb_check_encoding' => [ 'old' => ['bool', 'value='=>'array|string', 'encoding='=>'string'], 'new' => ['bool', 'value='=>'array|string|null', 'encoding='=>'string|null'], diff --git a/dictionaries/CallMap_81_delta.php b/dictionaries/CallMap_81_delta.php index efa975bd3fc..d753a710bb2 100644 --- a/dictionaries/CallMap_81_delta.php +++ b/dictionaries/CallMap_81_delta.php @@ -633,8 +633,8 @@ 'new' => ['bool', 'ldap'=>'LDAP\Connection|null', 'option'=>'int', 'value'=>'mixed'], ], 'ldap_set_rebind_proc' => [ - 'old' => ['bool', 'ldap'=>'resource', 'callback'=>'string'], - 'new' => ['bool', 'ldap'=>'LDAP\Connection', 'callback'=>'string'], + 'old' => ['bool', 'ldap'=>'resource', 'callback'=>'?callable'], + 'new' => ['bool', 'ldap'=>'LDAP\Connection', 'callback'=>'?callable'], ], 'mysqli::connect' => [ 'old' => ['null|false', 'hostname='=>'string|null', 'username='=>'string|null', 'password='=>'string|null', 'database='=>'string|null', 'port='=>'int|null', 'socket='=>'string|null'], From 53855f19b0f62a8f3cbce0009093509509fdc814 Mon Sep 17 00:00:00 2001 From: Fabien Villepinte Date: Mon, 13 Dec 2021 13:02:56 +0100 Subject: [PATCH 2/2] Update ldap_set_rebind_proc in Callmap_historical --- dictionaries/CallMap_historical.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dictionaries/CallMap_historical.php b/dictionaries/CallMap_historical.php index c69ed589017..107247214f8 100644 --- a/dictionaries/CallMap_historical.php +++ b/dictionaries/CallMap_historical.php @@ -12525,7 +12525,7 @@ 'ldap_sasl_bind' => ['bool', 'ldap'=>'resource', 'dn='=>'string', 'password='=>'string', 'mech='=>'string', 'realm='=>'string', 'authc_id='=>'string', 'authz_id='=>'string', 'props='=>'string'], 'ldap_search' => ['resource|false', 'ldap'=>'resource|resource[]', 'base'=>'string', 'filter'=>'string', 'attributes='=>'array', 'attributes_only='=>'int', 'sizelimit='=>'int', 'timelimit='=>'int', 'deref='=>'int'], 'ldap_set_option' => ['bool', 'ldap'=>'resource|null', 'option'=>'int', 'value'=>'mixed'], - 'ldap_set_rebind_proc' => ['bool', 'ldap'=>'resource', 'callback'=>'string'], + 'ldap_set_rebind_proc' => ['bool', 'ldap'=>'resource', 'callback'=>'callable'], 'ldap_sort' => ['bool', 'link_identifier'=>'resource', 'result_identifier'=>'resource', 'sortfilter'=>'string'], 'ldap_start_tls' => ['bool', 'ldap'=>'resource'], 'ldap_t61_to_8859' => ['string', 'value'=>'string'],