Skip to content

Commit

Permalink
Merge pull request #7145 from villfa/fix/ldap_set_rebind_proc
Browse files Browse the repository at this point in the history
Fix ldap_set_rebind_proc signature
  • Loading branch information
orklah committed Dec 14, 2021
2 parents b2de778 + 53855f1 commit 2cd7b19
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion dictionaries/CallMap.php
Expand Up @@ -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'],
Expand Down
4 changes: 4 additions & 0 deletions dictionaries/CallMap_80_delta.php
Expand Up @@ -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'],
Expand Down
4 changes: 2 additions & 2 deletions dictionaries/CallMap_81_delta.php
Expand Up @@ -634,8 +634,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'],
Expand Down
2 changes: 1 addition & 1 deletion dictionaries/CallMap_historical.php
Expand Up @@ -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'],
Expand Down

0 comments on commit 2cd7b19

Please sign in to comment.