Using new control syntax for MANAGEDSAIT control when deleting references

diff --git a/ext/ldap/tests/ldap_first_reference_basic.phpt b/ext/ldap/tests/ldap_first_reference_basic.phpt
index 312a81cc8072fb185c18ca69e6abe8850c33823a..9c83c9127d3575c7964d8781cd131eae9aaa0224 100644 (file)
--- a/ext/ldap/tests/ldap_first_reference_basic.phpt
+++ b/ext/ldap/tests/ldap_first_reference_basic.phpt
@@ -30,8 +30,7 @@ include "connect.inc";
 
 $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
 // Referral can only be removed with Manage DSA IT Control
-ldap_set_option($link, LDAP_OPT_SERVER_CONTROLS, array(array("oid" => LDAP_CONTROL_MANAGEDSAIT)));
-ldap_delete($link, "cn=userref,$base");
+ldap_delete($link, "cn=userref,$base", [['oid' => LDAP_CONTROL_MANAGEDSAIT, 'iscritical' => TRUE]]);
 remove_dummy_data($link, $base);
 ?>
 --EXPECTF--

diff --git a/ext/ldap/tests/ldap_next_reference_basic.phpt b/ext/ldap/tests/ldap_next_reference_basic.phpt
index d92f69de0a0be258143e1eb9b9f2d6d0c7130bb4..2476e02c5776c2e484049db6f722367d582dca80 100644 (file)
--- a/ext/ldap/tests/ldap_next_reference_basic.phpt
+++ b/ext/ldap/tests/ldap_next_reference_basic.phpt
@@ -35,9 +35,8 @@ include "connect.inc";
 
 $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
 // Referral can only be removed with Manage DSA IT Control
-ldap_set_option($link, LDAP_OPT_SERVER_CONTROLS, array(array("oid" => LDAP_CONTROL_MANAGEDSAIT)));
-ldap_delete($link, "cn=userref,$base");
-ldap_delete($link, "cn=userref2,$base");
+ldap_delete($link, "cn=userref,$base", [['oid' => LDAP_CONTROL_MANAGEDSAIT, 'iscritical' => TRUE]]);
+ldap_delete($link, "cn=userref2,$base", [['oid' => LDAP_CONTROL_MANAGEDSAIT, 'iscritical' => TRUE]]);
 remove_dummy_data($link, $base);
 ?>
 --EXPECTF--

diff --git a/ext/ldap/tests/ldap_parse_result_basic.phpt b/ext/ldap/tests/ldap_parse_result_basic.phpt
index a4c03ee19772acf2048ff21de4b9c990e2553171..e2a975d5b198c3886de405310535ec5374dd0c3c 100644 (file)
--- a/ext/ldap/tests/ldap_parse_result_basic.phpt
+++ b/ext/ldap/tests/ldap_parse_result_basic.phpt
@@ -31,8 +31,7 @@ include "connect.inc";
 
 $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
 // Referral can only be removed with Manage DSA IT Control
-ldap_set_option($link, LDAP_OPT_SERVER_CONTROLS, array(array("oid" => LDAP_CONTROL_MANAGEDSAIT)));
-ldap_delete($link, "cn=userref,$base");
+ldap_delete($link, "cn=userref,$base", [['oid' => LDAP_CONTROL_MANAGEDSAIT, 'iscritical' => TRUE]]);
 remove_dummy_data($link, $base);
 ?>
 --EXPECTF--