From 56f195c250f2cf2782935789d30183bdd0857465 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 14 Oct 2020 17:55:14 +0200 Subject: [PATCH 1/2] Test ldap behavior --- ext/ldap/tests/ldap_get_option_controls.phpt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/ldap/tests/ldap_get_option_controls.phpt b/ext/ldap/tests/ldap_get_option_controls.phpt index 813f33e069da7..5860b6cef8716 100644 --- a/ext/ldap/tests/ldap_get_option_controls.phpt +++ b/ext/ldap/tests/ldap_get_option_controls.phpt @@ -52,7 +52,7 @@ var_dump( ldap_set_option($link, LDAP_OPT_SERVER_CONTROLS, $controls_set2), ldap_get_option($link, LDAP_OPT_SERVER_CONTROLS, $controls_get), $controls_get, - $result = ldap_search($link, $base, "(objectClass=person)", array('cn')), + $result = ldap_search($link, $base, "(objectClass=person)", array('cn'), 0, -1, -1, LDAP_DEREF_NEVER), ldap_get_entries($link, $result)['count'], ldap_set_option($link, LDAP_OPT_SERVER_CONTROLS, array()), ldap_get_option($link, LDAP_OPT_SERVER_CONTROLS, $controls_get) From 800f6bda8eedcae85bc316c0f71a55bc438434ea Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 14 Oct 2020 20:17:42 +0200 Subject: [PATCH 2/2] Pass [] as controls --- ext/ldap/tests/ldap_get_option_controls.phpt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/ldap/tests/ldap_get_option_controls.phpt b/ext/ldap/tests/ldap_get_option_controls.phpt index 5860b6cef8716..07e8372ad4e0b 100644 --- a/ext/ldap/tests/ldap_get_option_controls.phpt +++ b/ext/ldap/tests/ldap_get_option_controls.phpt @@ -52,7 +52,7 @@ var_dump( ldap_set_option($link, LDAP_OPT_SERVER_CONTROLS, $controls_set2), ldap_get_option($link, LDAP_OPT_SERVER_CONTROLS, $controls_get), $controls_get, - $result = ldap_search($link, $base, "(objectClass=person)", array('cn'), 0, -1, -1, LDAP_DEREF_NEVER), + $result = ldap_search($link, $base, "(objectClass=person)", array('cn'), 0, -1, -1, LDAP_DEREF_NEVER, []), ldap_get_entries($link, $result)['count'], ldap_set_option($link, LDAP_OPT_SERVER_CONTROLS, array()), ldap_get_option($link, LDAP_OPT_SERVER_CONTROLS, $controls_get)