diff options
Diffstat (limited to 'ext/ldap')
71 files changed, 677 insertions, 677 deletions
diff --git a/ext/ldap/tests/bug48441.phpt b/ext/ldap/tests/bug48441.phpt index fa2f2ee023..c4b224c7a7 100644 --- a/ext/ldap/tests/bug48441.phpt +++ b/ext/ldap/tests/bug48441.phpt @@ -18,16 +18,16 @@ $dn = "$base"; $filter = "(objectclass=person)"; var_dump( - $result = ldap_search($link, $dn, $filter, array('sn')), - ldap_get_entries($link, $result) + $result = ldap_search($link, $dn, $filter, array('sn')), + ldap_get_entries($link, $result) ); var_dump( - $result = ldap_search($link, $dn, $filter, array('sn'), 1, 1, 1, LDAP_DEREF_ALWAYS), - ldap_get_entries($link, $result) + $result = ldap_search($link, $dn, $filter, array('sn'), 1, 1, 1, LDAP_DEREF_ALWAYS), + ldap_get_entries($link, $result) ); var_dump( - $result = ldap_search($link, $dn, $filter, array('sn')), - ldap_get_entries($link, $result) + $result = ldap_search($link, $dn, $filter, array('sn')), + ldap_get_entries($link, $result) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/bug73933.phpt b/ext/ldap/tests/bug73933.phpt index ac934a8dd8..8e50a750e2 100644 --- a/ext/ldap/tests/bug73933.phpt +++ b/ext/ldap/tests/bug73933.phpt @@ -10,15 +10,15 @@ require_once('skipif.inc'); $ldap = ldap_connect('127.0.0.1', 3333); ldap_mod_replace($ldap, null, array( - 'lockoutTime' => array(0), + 'lockoutTime' => array(0), )); ldap_modify_batch($ldap, null, array( [ - "attrib" => "mail", - "modtype" => LDAP_MODIFY_BATCH_ADD, - "values" => [ - "test@example.com", - "test-2@example.com", ]])); + "attrib" => "mail", + "modtype" => LDAP_MODIFY_BATCH_ADD, + "values" => [ + "test@example.com", + "test-2@example.com", ]])); ldap_close($ldap); diff --git a/ext/ldap/tests/bug77958.phpt b/ext/ldap/tests/bug77958.phpt index a19561740b..b370b40eda 100644 --- a/ext/ldap/tests/bug77958.phpt +++ b/ext/ldap/tests/bug77958.phpt @@ -13,23 +13,23 @@ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); insert_dummy_data($link, $base); $mods = array( - array( - "attrib" => "telephoneNumber", - "modtype" => LDAP_MODIFY_BATCH_ADD, - "values" => array( - 123456 - ) - ), - array( - "attrib" => "description", - "modtype" => LDAP_MODIFY_BATCH_REMOVE_ALL - ) + array( + "attrib" => "telephoneNumber", + "modtype" => LDAP_MODIFY_BATCH_ADD, + "values" => array( + 123456 + ) + ), + array( + "attrib" => "description", + "modtype" => LDAP_MODIFY_BATCH_REMOVE_ALL + ) ); var_dump( - ldap_modify_batch($link, "cn=userA,$base", $mods), - $entry = ldap_first_entry($link, ldap_read($link, "cn=userA,$base", "(telephoneNumber=*)")), - ldap_get_values($link, $entry, "telephoneNumber") + ldap_modify_batch($link, "cn=userA,$base", $mods), + $entry = ldap_first_entry($link, ldap_read($link, "cn=userA,$base", "(telephoneNumber=*)")), + ldap_get_values($link, $entry, "telephoneNumber") ); ?> --CLEAN-- diff --git a/ext/ldap/tests/connect.inc b/ext/ldap/tests/connect.inc index de41cca63c..bd6a144d2e 100644 --- a/ext/ldap/tests/connect.inc +++ b/ext/ldap/tests/connect.inc @@ -15,74 +15,74 @@ $protocol_version = getenv("LDAP_TEST_OPT_PROTOCOL_VERSION") ?: 3; $skip_on_bind_failure = getenv("LDAP_TEST_SKIP_BIND_FAILURE") ?: true; function ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version) { - $link = ldap_connect($host, $port); - ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version); - ldap_bind($link, $user, $passwd); - return $link; + $link = ldap_connect($host, $port); + ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version); + ldap_bind($link, $user, $passwd); + return $link; } function test_bind($host, $port, $user, $passwd, $protocol_version) { - $link = ldap_connect($host, $port); - ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version); - return ldap_bind($link, $user, $passwd); + $link = ldap_connect($host, $port); + ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version); + return ldap_bind($link, $user, $passwd); } function insert_dummy_data($link, $base) { - // Create root if not there - $testBase = ldap_read($link, $base, '(objectClass=*)', array('objectClass')); - if (ldap_count_entries($link, $testBase) < 1) { - ldap_add( - $link, "$base", array( - "objectClass" => array( - "top", - "organization", - "dcObject" - ), - "o" => "php ldap tests" - ) - ); - } - ldap_add($link, "o=test,$base", array( - "objectClass" => array( + // Create root if not there + $testBase = ldap_read($link, $base, '(objectClass=*)', array('objectClass')); + if (ldap_count_entries($link, $testBase) < 1) { + ldap_add( + $link, "$base", array( + "objectClass" => array( + "top", + "organization", + "dcObject" + ), + "o" => "php ldap tests" + ) + ); + } + ldap_add($link, "o=test,$base", array( + "objectClass" => array( "top", "organization"), - "o" => "test", - )); - ldap_add($link, "cn=userA,$base", array( - "objectclass" => "person", - "cn" => "userA", - "sn" => "testSN1", - "userPassword" => "oops", - "telephoneNumber" => "xx-xx-xx-xx-xx", - "description" => "user A", - )); - ldap_add($link, "cn=userB,$base", array( - "objectclass" => "person", - "cn" => "userB", - "sn" => "testSN2", - "userPassword" => "oopsIDitItAgain", - "description" => "user B", - )); - ldap_add($link, "cn=userC,cn=userB,$base", array( - "objectclass" => "person", - "cn" => "userC", - "sn" => "testSN3", - "userPassword" => "0r1g1na1 passw0rd", - )); - ldap_add($link, "o=test2,$base", array( - "objectClass" => array( + "o" => "test", + )); + ldap_add($link, "cn=userA,$base", array( + "objectclass" => "person", + "cn" => "userA", + "sn" => "testSN1", + "userPassword" => "oops", + "telephoneNumber" => "xx-xx-xx-xx-xx", + "description" => "user A", + )); + ldap_add($link, "cn=userB,$base", array( + "objectclass" => "person", + "cn" => "userB", + "sn" => "testSN2", + "userPassword" => "oopsIDitItAgain", + "description" => "user B", + )); + ldap_add($link, "cn=userC,cn=userB,$base", array( + "objectclass" => "person", + "cn" => "userC", + "sn" => "testSN3", + "userPassword" => "0r1g1na1 passw0rd", + )); + ldap_add($link, "o=test2,$base", array( + "objectClass" => array( "top", "organization"), - "o" => "test2", - "l" => array("here", "there", "Antarctica"), - )); + "o" => "test2", + "l" => array("here", "there", "Antarctica"), + )); } function remove_dummy_data($link, $base) { - ldap_delete($link, "cn=userC,cn=userB,$base"); - ldap_delete($link, "cn=userA,$base"); - ldap_delete($link, "cn=userB,$base"); - ldap_delete($link, "o=test,$base"); - ldap_delete($link, "o=test2,$base"); + ldap_delete($link, "cn=userC,cn=userB,$base"); + ldap_delete($link, "cn=userA,$base"); + ldap_delete($link, "cn=userB,$base"); + ldap_delete($link, "o=test,$base"); + ldap_delete($link, "o=test2,$base"); } ?> diff --git a/ext/ldap/tests/ldap_add_basic.phpt b/ext/ldap/tests/ldap_add_basic.phpt index 7e7a255c91..b247901d73 100644 --- a/ext/ldap/tests/ldap_add_basic.phpt +++ b/ext/ldap/tests/ldap_add_basic.phpt @@ -13,18 +13,18 @@ require "connect.inc"; $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); var_dump( - ldap_add($link, "dc=my-domain,$base", array( - "objectClass" => array( - "top", - "dcObject", - "organization"), - "dc" => "my-domain", - "o" => "my-domain", - )), - ldap_get_entries( - $link, - ldap_search($link, "$base", "(o=my-domain)") - ) + ldap_add($link, "dc=my-domain,$base", array( + "objectClass" => array( + "top", + "dcObject", + "organization"), + "dc" => "my-domain", + "o" => "my-domain", + )), + ldap_get_entries( + $link, + ldap_search($link, "$base", "(o=my-domain)") + ) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_add_error.phpt b/ext/ldap/tests/ldap_add_error.phpt index d7271461ce..61b4d2808d 100644 --- a/ext/ldap/tests/ldap_add_error.phpt +++ b/ext/ldap/tests/ldap_add_error.phpt @@ -16,16 +16,16 @@ var_dump(ldap_add($link, "$base", array())); // Invalid DN var_dump( - ldap_add($link, "weirdAttribute=val", array( - "weirdAttribute" => "val", - )), - ldap_error($link), - ldap_errno($link) + ldap_add($link, "weirdAttribute=val", array( + "weirdAttribute" => "val", + )), + ldap_error($link), + ldap_errno($link) ); // Duplicate entry for ($i = 0; $i < 2; $i++) - var_dump( + var_dump( ldap_add($link, "dc=my-domain,$base", array( "objectClass" => array( "top", @@ -34,49 +34,49 @@ for ($i = 0; $i < 2; $i++) "dc" => "my-domain", "o" => "my-domain", )) - ); + ); var_dump(ldap_error($link), ldap_errno($link)); // Wrong array indexes var_dump( - ldap_add($link, "dc=my-domain2,dc=com", array( - "objectClass" => array( - 0 => "top", - 2 => "dcObject", - 5 => "organization"), - "dc" => "my-domain", - "o" => "my-domain", - )) - /* Is this correct behaviour to still have "Already exists" as error/errno? - , - ldap_error($link), - ldap_errno($link) - */ + ldap_add($link, "dc=my-domain2,dc=com", array( + "objectClass" => array( + 0 => "top", + 2 => "dcObject", + 5 => "organization"), + "dc" => "my-domain", + "o" => "my-domain", + )) + /* Is this correct behaviour to still have "Already exists" as error/errno? + , + ldap_error($link), + ldap_errno($link) + */ ); // Invalid attribute var_dump( - ldap_add($link, "$base", array( - "objectClass" => array( - "top", - "dcObject", - "organization"), - "dc" => "my-domain", - "o" => "my-domain", - "weirdAttr" => "weirdVal", - )), - ldap_error($link), - ldap_errno($link) + ldap_add($link, "$base", array( + "objectClass" => array( + "top", + "dcObject", + "organization"), + "dc" => "my-domain", + "o" => "my-domain", + "weirdAttr" => "weirdVal", + )), + ldap_error($link), + ldap_errno($link) ); var_dump( - ldap_add($link, "$base", array(array( "Oops" - ))) - /* Is this correct behaviour to still have "Undefined attribute type" as error/errno? - , - ldap_error($link), - ldap_errno($link) - */ + ldap_add($link, "$base", array(array( "Oops" + ))) + /* Is this correct behaviour to still have "Undefined attribute type" as error/errno? + , + ldap_error($link), + ldap_errno($link) + */ ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_add_ext.phpt b/ext/ldap/tests/ldap_add_ext.phpt index 7363614585..fbcaff523b 100644 --- a/ext/ldap/tests/ldap_add_ext.phpt +++ b/ext/ldap/tests/ldap_add_ext.phpt @@ -16,20 +16,20 @@ require "connect.inc"; $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); var_dump( - $result = ldap_add_ext($link, "o=test_ldap_add_ext,$base", array( - "objectClass" => array( - "top", - "organization"), - "o" => "test_ldap_add_ext", - ), [['oid' => LDAP_CONTROL_POST_READ, 'iscritical' => TRUE, 'value' => ['attrs' => ['o']]]]), - ldap_parse_result($link, $result, $errcode, $matcheddn, $errmsg, $referrals, $ctrls), - $errcode, - $errmsg, - $ctrls[LDAP_CONTROL_POST_READ], - ldap_get_entries( - $link, - ldap_search($link, "$base", "(o=test_ldap_add_ext)") - ) + $result = ldap_add_ext($link, "o=test_ldap_add_ext,$base", array( + "objectClass" => array( + "top", + "organization"), + "o" => "test_ldap_add_ext", + ), [['oid' => LDAP_CONTROL_POST_READ, 'iscritical' => TRUE, 'value' => ['attrs' => ['o']]]]), + ldap_parse_result($link, $result, $errcode, $matcheddn, $errmsg, $referrals, $ctrls), + $errcode, + $errmsg, + $ctrls[LDAP_CONTROL_POST_READ], + ldap_get_entries( + $link, + ldap_search($link, "$base", "(o=test_ldap_add_ext)") + ) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_bind_ext.phpt b/ext/ldap/tests/ldap_bind_ext.phpt index 0e8fb52d02..685b0588ce 100644 --- a/ext/ldap/tests/ldap_bind_ext.phpt +++ b/ext/ldap/tests/ldap_bind_ext.phpt @@ -17,30 +17,30 @@ $link = ldap_connect($host, $port); ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version); var_dump( - $result = ldap_bind_ext($link, $user, $passwd), - ldap_parse_result($link, $result, $errcode, $matcheddn, $errmsg, $referrals, $ctrls), - $errcode, - $errmsg, - $ctrls, - $result = ldap_bind_ext($link, $user, $passwd, [['oid' => LDAP_CONTROL_PASSWORDPOLICYREQUEST]]), - ldap_parse_result($link, $result, $errcode, $matcheddn, $errmsg, $referrals, $ctrls), - $errcode, - $errmsg, - $ctrls + $result = ldap_bind_ext($link, $user, $passwd), + ldap_parse_result($link, $result, $errcode, $matcheddn, $errmsg, $referrals, $ctrls), + $errcode, + $errmsg, + $ctrls, + $result = ldap_bind_ext($link, $user, $passwd, [['oid' => LDAP_CONTROL_PASSWORDPOLICYREQUEST]]), + ldap_parse_result($link, $result, $errcode, $matcheddn, $errmsg, $referrals, $ctrls), + $errcode, + $errmsg, + $ctrls ); /* Failures */ var_dump( - $result = ldap_bind_ext($link, $user, "wrongPassword", [['oid' => LDAP_CONTROL_PASSWORDPOLICYREQUEST]]), - ldap_parse_result($link, $result, $errcode, $matcheddn, $errmsg, $referrals, $ctrls), - $errcode, - $errmsg, - $ctrls, - $result = ldap_bind_ext($link, "unexistingProperty=weirdValue,$user", $passwd, [['oid' => LDAP_CONTROL_PASSWORDPOLICYREQUEST]]), - ldap_parse_result($link, $result, $errcode, $matcheddn, $errmsg, $referrals, $ctrls), - $errcode, - $errmsg, - $ctrls + $result = ldap_bind_ext($link, $user, "wrongPassword", [['oid' => LDAP_CONTROL_PASSWORDPOLICYREQUEST]]), + ldap_parse_result($link, $result, $errcode, $matcheddn, $errmsg, $referrals, $ctrls), + $errcode, + $errmsg, + $ctrls, + $result = ldap_bind_ext($link, "unexistingProperty=weirdValue,$user", $passwd, [['oid' => LDAP_CONTROL_PASSWORDPOLICYREQUEST]]), + ldap_parse_result($link, $result, $errcode, $matcheddn, $errmsg, $referrals, $ctrls), + $errcode, + $errmsg, + $ctrls ); ?> --EXPECTF-- diff --git a/ext/ldap/tests/ldap_compare_basic.phpt b/ext/ldap/tests/ldap_compare_basic.phpt index a8b8c2b7b1..32f6ccf78f 100644 --- a/ext/ldap/tests/ldap_compare_basic.phpt +++ b/ext/ldap/tests/ldap_compare_basic.phpt @@ -13,8 +13,8 @@ require "connect.inc"; $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); insert_dummy_data($link, $base); var_dump( - ldap_compare($link, "cn=userA,$base", "sn", "testSN1"), - ldap_compare($link, "cn=userA,$base", "telephoneNumber", "yy-yy-yy-yy-yy") + ldap_compare($link, "cn=userA,$base", "sn", "testSN1"), + ldap_compare($link, "cn=userA,$base", "telephoneNumber", "yy-yy-yy-yy-yy") ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_compare_error.phpt b/ext/ldap/tests/ldap_compare_error.phpt index b6b85c43c2..1b1231b6f9 100644 --- a/ext/ldap/tests/ldap_compare_error.phpt +++ b/ext/ldap/tests/ldap_compare_error.phpt @@ -14,9 +14,9 @@ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); insert_dummy_data($link, $base); var_dump( - ldap_compare($link, "cn=userNotAvailable,$base", "sn", "testSN1"), - ldap_error($link), - ldap_errno($link) + ldap_compare($link, "cn=userNotAvailable,$base", "sn", "testSN1"), + ldap_error($link), + ldap_errno($link) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_control_paged_results_variation1.phpt b/ext/ldap/tests/ldap_control_paged_results_variation1.phpt index fa5af01bd6..75d147e0be 100644 --- a/ext/ldap/tests/ldap_control_paged_results_variation1.phpt +++ b/ext/ldap/tests/ldap_control_paged_results_variation1.phpt @@ -17,9 +17,9 @@ insert_dummy_data($link, $base); $dn = "$base"; $filter = "(cn=user*)"; var_dump( - ldap_control_paged_result($link, 1), - $result = ldap_search($link, $dn, $filter, array('cn')), - ldap_get_entries($link, $result) + ldap_control_paged_result($link, 1), + $result = ldap_search($link, $dn, $filter, array('cn')), + ldap_get_entries($link, $result) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_control_paged_results_variation2.phpt b/ext/ldap/tests/ldap_control_paged_results_variation2.phpt index 02f5b9028c..b0b6e62aff 100644 --- a/ext/ldap/tests/ldap_control_paged_results_variation2.phpt +++ b/ext/ldap/tests/ldap_control_paged_results_variation2.phpt @@ -17,9 +17,9 @@ insert_dummy_data($link, $base); $dn = "$base"; $filter = "(cn=user*)"; var_dump( - ldap_control_paged_result($link, 2), - $result = ldap_search($link, $dn, $filter, array('cn')), - ldap_get_entries($link, $result) + ldap_control_paged_result($link, 2), + $result = ldap_search($link, $dn, $filter, array('cn')), + ldap_get_entries($link, $result) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_control_paged_results_variation3.phpt b/ext/ldap/tests/ldap_control_paged_results_variation3.phpt index e7cc896585..de904f051f 100644 --- a/ext/ldap/tests/ldap_control_paged_results_variation3.phpt +++ b/ext/ldap/tests/ldap_control_paged_results_variation3.phpt @@ -18,13 +18,13 @@ $dn = "$base"; $filter = "(cn=user*)"; $cookie = ''; var_dump( - ldap_control_paged_result($link, 2, true, $cookie), - $result = ldap_search($link, $dn, $filter, array('cn')), - ldap_get_entries($link, $result), - ldap_control_paged_result_response($link, $result, $cookie), - ldap_control_paged_result($link, 20, true, $cookie), - $result = ldap_search($link, $dn, $filter, array('cn')), - ldap_get_entries($link, $result) + ldap_control_paged_result($link, 2, true, $cookie), + $result = ldap_search($link, $dn, $filter, array('cn')), + ldap_get_entries($link, $result), + ldap_control_paged_result_response($link, $result, $cookie), + ldap_control_paged_result($link, 20, true, $cookie), + $result = ldap_search($link, $dn, $filter, array('cn')), + ldap_get_entries($link, $result) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_controls.phpt b/ext/ldap/tests/ldap_controls.phpt index 8b2e3e8174..e6e0ab6164 100644 --- a/ext/ldap/tests/ldap_controls.phpt +++ b/ext/ldap/tests/ldap_controls.phpt @@ -19,35 +19,35 @@ insert_dummy_data($link, $base); /* Test assertion control */ var_dump( - $result = ldap_search($link, "o=test,$base", "objectClass=*", array('o'), 0, 0, 0, LDAP_DEREF_NEVER, - [['oid' => LDAP_CONTROL_ASSERT, 'iscritical' => TRUE, 'value' => ['filter' => '(objectClass=organization)']]]), - ldap_get_entries($link, $result), - $result = ldap_search($link, "o=test,$base", "objectClass=*", array('o'), 0, 0, 0, LDAP_DEREF_NEVER, - [['oid' => LDAP_CONTROL_ASSERT, 'iscritical' => TRUE, 'value' => ['filter' => '(objectClass=organizationalUnit)']]]), - ldap_modify($link, "o=test,$base", ['description' => 'desc'], - [['oid' => LDAP_CONTROL_ASSERT, 'iscritical' => TRUE, 'value' => ['filter' => '(!(description=*))']]]), - $result = ldap_read($link, "o=test,$base", "objectClass=*", array('description')), - ldap_get_entries($link, $result), - ldap_modify($link, "o=test,$base", ['description' => 'desc2'], - [['oid' => LDAP_CONTROL_ASSERT, 'iscritical' => TRUE, 'value' => ['filter' => '(!(description=*))']]]), - $result = ldap_read($link, "o=test,$base", "objectClass=*", array('description')), - ldap_get_entries($link, $result), - ldap_delete($link, "o=test,$base", [['oid' => LDAP_CONTROL_ASSERT, 'iscritical' => TRUE, 'value' => ['filter' => '(description=desc2)']]]), - ldap_errno($link), - ldap_error($link), - ldap_rename($link, "o=test,$base", "o=test2", "", TRUE, [['oid' => LDAP_CONTROL_ASSERT, 'iscritical' => TRUE, 'value' => ['filter' => '(description=desc2)']]]), - ldap_compare($link, "o=test,$base", "o", "test"), - ldap_compare($link, "o=test,$base", "o", "test", [['oid' => LDAP_CONTROL_ASSERT, 'iscritical' => TRUE, 'value' => ['filter' => '(description=desc2)']]]), - ldap_compare($link, "o=test,$base", "o", "test", [['oid' => LDAP_CONTROL_ASSERT, 'iscritical' => TRUE, 'value' => ['filter' => '(description=desc)']]]) + $result = ldap_search($link, "o=test,$base", "objectClass=*", array('o'), 0, 0, 0, LDAP_DEREF_NEVER, + [['oid' => LDAP_CONTROL_ASSERT, 'iscritical' => TRUE, 'value' => ['filter' => '(objectClass=organization)']]]), + ldap_get_entries($link, $result), + $result = ldap_search($link, "o=test,$base", "objectClass=*", array('o'), 0, 0, 0, LDAP_DEREF_NEVER, + [['oid' => LDAP_CONTROL_ASSERT, 'iscritical' => TRUE, 'value' => ['filter' => '(objectClass=organizationalUnit)']]]), + ldap_modify($link, "o=test,$base", ['description' => 'desc'], + [['oid' => LDAP_CONTROL_ASSERT, 'iscritical' => TRUE, 'value' => ['filter' => '(!(description=*))']]]), + $result = ldap_read($link, "o=test,$base", "objectClass=*", array('description')), + ldap_get_entries($link, $result), + ldap_modify($link, "o=test,$base", ['description' => 'desc2'], + [['oid' => LDAP_CONTROL_ASSERT, 'iscritical' => TRUE, 'value' => ['filter' => '(!(description=*))']]]), + $result = ldap_read($link, "o=test,$base", "objectClass=*", array('description')), + ldap_get_entries($link, $result), + ldap_delete($link, "o=test,$base", [['oid' => LDAP_CONTROL_ASSERT, 'iscritical' => TRUE, 'value' => ['filter' => '(description=desc2)']]]), + ldap_errno($link), + ldap_error($link), + ldap_rename($link, "o=test,$base", "o=test2", "", TRUE, [['oid' => LDAP_CONTROL_ASSERT, 'iscritical' => TRUE, 'value' => ['filter' => '(description=desc2)']]]), + ldap_compare($link, "o=test,$base", "o", "test"), + ldap_compare($link, "o=test,$base", "o", "test", [['oid' => LDAP_CONTROL_ASSERT, 'iscritical' => TRUE, 'value' => ['filter' => '(description=desc2)']]]), + ldap_compare($link, "o=test,$base", "o", "test", [['oid' => LDAP_CONTROL_ASSERT, 'iscritical' => TRUE, 'value' => ['filter' => '(description=desc)']]]) ); /* Test valuesreturnfilter control */ var_dump( - $result = ldap_read($link, "o=test2,$base", "objectClass=*", ["l"]), - ldap_get_entries($link, $result)[0]['l'], - $result = ldap_read($link, "o=test2,$base", "objectClass=*", ["l"], 0, 0, 0, LDAP_DEREF_NEVER, - [['oid' => LDAP_CONTROL_VALUESRETURNFILTER, 'iscritical' => TRUE, 'value' => ['filter' => '(l=*here)']]]), - ldap_get_entries($link, $result)[0]['l'] + $result = ldap_read($link, "o=test2,$base", "objectClass=*", ["l"]), + ldap_get_entries($link, $result)[0]['l'], + $result = ldap_read($link, "o=test2,$base", "objectClass=*", ["l"], 0, 0, 0, LDAP_DEREF_NEVER, + [['oid' => LDAP_CONTROL_VALUESRETURNFILTER, 'iscritical' => TRUE, 'value' => ['filter' => '(l=*here)']]]), + ldap_get_entries($link, $result)[0]['l'] ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_delete_basic.phpt b/ext/ldap/tests/ldap_delete_basic.phpt index 65331771fb..046b141407 100644 --- a/ext/ldap/tests/ldap_delete_basic.phpt +++ b/ext/ldap/tests/ldap_delete_basic.phpt @@ -12,17 +12,17 @@ require "connect.inc"; $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); ldap_add($link, "dc=my-domain,$base", array( - "objectClass" => array( - "top", - "dcObject", - "organization"), - "dc" => "my-domain", - "o" => "my-domain", + "objectClass" => array( + "top", + "dcObject", + "organization"), + "dc" => "my-domain", + "o" => "my-domain", )); var_dump( - ldap_delete($link, "dc=my-domain,$base"), - @ldap_search($link, "dc=my-domain,$base", "(o=my-domain)") + ldap_delete($link, "dc=my-domain,$base"), + @ldap_search($link, "dc=my-domain,$base", "(o=my-domain)") ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_delete_error.phpt b/ext/ldap/tests/ldap_delete_error.phpt index 3faabcc60f..e924c3b59a 100644 --- a/ext/ldap/tests/ldap_delete_error.phpt +++ b/ext/ldap/tests/ldap_delete_error.phpt @@ -14,16 +14,16 @@ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); // Invalid DN var_dump( - ldap_delete($link, "weirdAttribute=val"), - ldap_error($link), - ldap_errno($link) + ldap_delete($link, "weirdAttribute=val"), + ldap_error($link), + ldap_errno($link) ); // Deleting unexisting data var_dump( - ldap_delete($link, "dc=my-domain,$base"), - ldap_error($link), - ldap_errno($link) + ldap_delete($link, "dc=my-domain,$base"), + ldap_error($link), + ldap_errno($link) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_delete_ext.phpt b/ext/ldap/tests/ldap_delete_ext.phpt index ab0c1baffd..bcdc15ba51 100644 --- a/ext/ldap/tests/ldap_delete_ext.phpt +++ b/ext/ldap/tests/ldap_delete_ext.phpt @@ -15,23 +15,23 @@ require "connect.inc"; $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); ldap_add($link, "dc=my-domain,$base", array( - "objectClass" => array( - "top", - "dcObject", - "organization"), - "dc" => "my-domain", - "o" => "my-domain", + "objectClass" => array( + "top", + "dcObject", + "organization"), + "dc" => "my-domain", + "o" => "my-domain", )); var_dump( - $result = ldap_delete_ext($link, "dc=my-domain,$base", - [['oid' => LDAP_CONTROL_PRE_READ, 'iscritical' => TRUE, 'value' => ['attrs' => ['dc', 'o']]]] - ), - ldap_parse_result($link, $result, $errcode, $matcheddn, $errmsg, $referrals, $ctrls), - $errcode, - $errmsg, - $ctrls[LDAP_CONTROL_PRE_READ], - @ldap_search($link, "dc=my-domain,$base", "(o=my-domain)") + $result = ldap_delete_ext($link, "dc=my-domain,$base", + [['oid' => LDAP_CONTROL_PRE_READ, 'iscritical' => TRUE, 'value' => ['attrs' => ['dc', 'o']]]] + ), + ldap_parse_result($link, $result, $errcode, $matcheddn, $errmsg, $referrals, $ctrls), + $errcode, + $errmsg, + $ctrls[LDAP_CONTROL_PRE_READ], + @ldap_search($link, "dc=my-domain,$base", "(o=my-domain)") ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_errno_basic.phpt b/ext/ldap/tests/ldap_errno_basic.phpt index 9d2099c6e3..535bb290ac 100644 --- a/ext/ldap/tests/ldap_errno_basic.phpt +++ b/ext/ldap/tests/ldap_errno_basic.phpt @@ -12,16 +12,16 @@ require "connect.inc"; $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); @ldap_add($link, "badDN $base", array( - "objectClass" => array( - "top", - "dcObject", - "organization"), - "dc" => "my-domain", - "o" => "my-domain", + "objectClass" => array( + "top", + "dcObject", + "organization"), + "dc" => "my-domain", + "o" => "my-domain", )); var_dump( - ldap_errno($link) + ldap_errno($link) ); ?> --EXPECT-- diff --git a/ext/ldap/tests/ldap_error_basic.phpt b/ext/ldap/tests/ldap_error_basic.phpt index 4d866d5a44..442936c3ae 100644 --- a/ext/ldap/tests/ldap_error_basic.phpt +++ b/ext/ldap/tests/ldap_error_basic.phpt @@ -12,16 +12,16 @@ require "connect.inc"; $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); @ldap_add($link, "badDN $base", array( - "objectClass" => array( - "top", - "dcObject", - "organization"), - "dc" => "my-domain", - "o" => "my-domain", + "objectClass" => array( + "top", + "dcObject", + "organization"), + "dc" => "my-domain", + "o" => "my-domain", )); var_dump( - ldap_error($link) + ldap_error($link) ); ?> --EXPECT-- diff --git a/ext/ldap/tests/ldap_exop.phpt b/ext/ldap/tests/ldap_exop.phpt index 7d47a9812c..abb63e877f 100644 --- a/ext/ldap/tests/ldap_exop.phpt +++ b/ext/ldap/tests/ldap_exop.phpt @@ -14,24 +14,24 @@ insert_dummy_data($link, $base); function build_reqdata_passwd($user, $oldpw, $newpw) { - // This is basic and will only work for small strings - $hex = ''; - if (!empty($user)) { - $hex .= '80'.sprintf("%'.02x", strlen($user)).bin2hex($user); - } - if (!empty($oldpw)) { - $hex .= '81'.sprintf("%'.02x", strlen($oldpw)).bin2hex($oldpw); - } - if (!empty($newpw)) { - $hex .= '82'.sprintf("%'.02x", strlen($newpw)).bin2hex($newpw); - } - return hex2bin('30'.sprintf("%'.02x", strlen($hex)/2).$hex); + // This is basic and will only work for small strings + $hex = ''; + if (!empty($user)) { + $hex .= '80'.sprintf("%'.02x", strlen($user)).bin2hex($user); + } + if (!empty($oldpw)) { + $hex .= '81'.sprintf("%'.02x", strlen($oldpw)).bin2hex($oldpw); + } + if (!empty($newpw)) { + $hex .= '82'.sprintf("%'.02x", strlen($newpw)).bin2hex($newpw); + } + return hex2bin('30'.sprintf("%'.02x", strlen($hex)/2).$hex); } function extract_genpw($retdata) { - // Only works for small strings as well - return hex2bin(substr(bin2hex($retdata), 4*2)); + // Only works for small strings as well + return hex2bin(substr(bin2hex($retdata), 4*2)); } $userAPassword = "oops"; @@ -39,20 +39,20 @@ $userAPassword = "oops"; // ldap_exop(resource link, string reqoid [, string reqdata [, array servercontrols [, string &retdata [, string &retoid]]]]) // bool ldap_parse_exop(resource link, resource result [, string &retdata [, string &retoid]]) var_dump( - ldap_exop($link, LDAP_EXOP_WHO_AM_I, NULL, NULL, $retdata, $retoid), - $retdata, - $retoid, - ldap_exop($link, LDAP_EXOP_WHO_AM_I, NULL, [['oid' => LDAP_CONTROL_PROXY_AUTHZ, 'value' => "dn:cn=userA,$base"]], $retdata), - $retdata, - $r = ldap_exop($link, LDAP_EXOP_WHO_AM_I), - ldap_parse_exop($link, $r, $retdata2), - $retdata2, - test_bind($host, $port, "cn=userA,$base", $userAPassword, $protocol_version), - $r = ldap_exop($link, LDAP_EXOP_MODIFY_PASSWD, build_reqdata_passwd("cn=userA,$base", $userAPassword, "")), - ldap_parse_exop($link, $r, $retpwdata, $retpwoid), - $genpw = extract_genpw($retpwdata), - $retpwoid, - test_bind($host, $port, "cn=userA,$base", $genpw, $protocol_version) + ldap_exop($link, LDAP_EXOP_WHO_AM_I, NULL, NULL, $retdata, $retoid), + $retdata, + $retoid, + ldap_exop($link, LDAP_EXOP_WHO_AM_I, NULL, [['oid' => LDAP_CONTROL_PROXY_AUTHZ, 'value' => "dn:cn=userA,$base"]], $retdata), + $retdata, + $r = ldap_exop($link, LDAP_EXOP_WHO_AM_I), + ldap_parse_exop($link, $r, $retdata2), + $retdata2, + test_bind($host, $port, "cn=userA,$base", $userAPassword, $protocol_version), + $r = ldap_exop($link, LDAP_EXOP_MODIFY_PASSWD, build_reqdata_passwd("cn=userA,$base", $userAPassword, "")), + ldap_parse_exop($link, $r, $retpwdata, $retpwoid), + $genpw = extract_genpw($retpwdata), + $retpwoid, + test_bind($host, $port, "cn=userA,$base", $genpw, $protocol_version) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_exop_refresh.phpt b/ext/ldap/tests/ldap_exop_refresh.phpt index 80660499af..b90a92bc00 100644 --- a/ext/ldap/tests/ldap_exop_refresh.phpt +++ b/ext/ldap/tests/ldap_exop_refresh.phpt @@ -21,12 +21,12 @@ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); insert_dummy_data($link, $base); ldap_add($link, "cn=tmp,$base", array( - "objectclass" => array("person", "dynamicObject"), - "cn" => "tmp", - "sn" => "tmp" + "objectclass" => array("person", "dynamicObject"), + "cn" => "tmp", + "sn" => "tmp" )); var_dump( - ldap_exop_refresh($link, "cn=tmp,$base", 1234) + ldap_exop_refresh($link, "cn=tmp,$base", 1234) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_first_attribute_basic.phpt b/ext/ldap/tests/ldap_first_attribute_basic.phpt index e87b70c474..81bc538aea 100644 --- a/ext/ldap/tests/ldap_first_attribute_basic.phpt +++ b/ext/ldap/tests/ldap_first_attribute_basic.phpt @@ -15,7 +15,7 @@ insert_dummy_data($link, $base); $result = ldap_search($link, "$base", "(objectclass=organization)", array("objectClass")); $entry = ldap_first_entry($link, $result); var_dump( - ldap_first_attribute($link, $entry) + ldap_first_attribute($link, $entry) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_first_entry_basic.phpt b/ext/ldap/tests/ldap_first_entry_basic.phpt index 99b79e4d29..94d46d6d87 100644 --- a/ext/ldap/tests/ldap_first_entry_basic.phpt +++ b/ext/ldap/tests/ldap_first_entry_basic.phpt @@ -14,8 +14,8 @@ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); insert_dummy_data($link, $base); $result = ldap_search($link, "$base", "(objectclass=person)"); var_dump( - $entry = ldap_first_entry($link, $result), - ldap_get_values($link, $entry, 'sn') + $entry = ldap_first_entry($link, $result), + ldap_get_values($link, $entry, 'sn') ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_get_attributes_basic.phpt b/ext/ldap/tests/ldap_get_attributes_basic.phpt index 8cb374b27f..0d11bce706 100644 --- a/ext/ldap/tests/ldap_get_attributes_basic.phpt +++ b/ext/ldap/tests/ldap_get_attributes_basic.phpt @@ -15,7 +15,7 @@ insert_dummy_data($link, $base); $result = ldap_search($link, "$base", "(o=test)"); $entry = ldap_first_entry($link, $result); var_dump( - ldap_get_attributes($link, $entry) + ldap_get_attributes($link, $entry) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_get_dn_basic.phpt b/ext/ldap/tests/ldap_get_dn_basic.phpt index 0cb6c833a6..14865ffe3c 100644 --- a/ext/ldap/tests/ldap_get_dn_basic.phpt +++ b/ext/ldap/tests/ldap_get_dn_basic.phpt @@ -15,7 +15,7 @@ insert_dummy_data($link, $base); $result = ldap_search($link, "$base", "(objectclass=organization)"); $entry = ldap_first_entry($link, $result); var_dump( - ldap_get_dn($link, $entry) + ldap_get_dn($link, $entry) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_get_entries_basic.phpt b/ext/ldap/tests/ldap_get_entries_basic.phpt index e1806fca69..bba2f08c69 100644 --- a/ext/ldap/tests/ldap_get_entries_basic.phpt +++ b/ext/ldap/tests/ldap_get_entries_basic.phpt @@ -14,10 +14,10 @@ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); insert_dummy_data($link, $base); var_dump( - ldap_get_entries( - $link, - ldap_search($link, "$base", "(o=test)") - ) + ldap_get_entries( + $link, + ldap_search($link, "$base", "(o=test)") + ) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_get_entries_variation.phpt b/ext/ldap/tests/ldap_get_entries_variation.phpt index 767f9dcd08..9dd45b6282 100644 --- a/ext/ldap/tests/ldap_get_entries_variation.phpt +++ b/ext/ldap/tests/ldap_get_entries_variation.phpt @@ -14,10 +14,10 @@ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); insert_dummy_data($link, $base); var_dump( - ldap_get_entries( - $link, - ldap_search($link, "$base", "(o=my-unexisting-domain)") - ) + ldap_get_entries( + $link, + ldap_search($link, "$base", "(o=my-unexisting-domain)") + ) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_get_option_basic.phpt b/ext/ldap/tests/ldap_get_option_basic.phpt index 9bbaf3e41d..e9aa7cfc4f 100644 --- a/ext/ldap/tests/ldap_get_option_basic.phpt +++ b/ext/ldap/tests/ldap_get_option_basic.phpt @@ -14,8 +14,8 @@ $option = null; ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version); var_dump( - ldap_get_option($link, LDAP_OPT_PROTOCOL_VERSION, $option), - $option + ldap_get_option($link, LDAP_OPT_PROTOCOL_VERSION, $option), + $option ); ?> --EXPECT-- diff --git a/ext/ldap/tests/ldap_get_option_controls.phpt b/ext/ldap/tests/ldap_get_option_controls.phpt index 1a6e18c4c4..813f33e069 100644 --- a/ext/ldap/tests/ldap_get_option_controls.phpt +++ b/ext/ldap/tests/ldap_get_option_controls.phpt @@ -16,46 +16,46 @@ insert_dummy_data($link, $base); function build_ctrl_paged_value($int, $cookie) { - // This is basic and will only work for small values - $hex = ''; - if (!empty($int)) { - $str = sprintf("%'.02x", $int); - $hex .= '02'.sprintf("%'.02x%s", strlen($str)/2, $str); - } - $hex .= '04'.sprintf("%'.02x", strlen($cookie)).bin2hex($cookie); - return hex2bin('30'.sprintf("%'.02x", strlen($hex)/2).$hex); + // This is basic and will only work for small values + $hex = ''; + if (!empty($int)) { + $str = sprintf("%'.02x", $int); + $hex .= '02'.sprintf("%'.02x%s", strlen($str)/2, $str); + } + $hex .= '04'.sprintf("%'.02x", strlen($cookie)).bin2hex($cookie); + return hex2bin('30'.sprintf("%'.02x", strlen($hex)/2).$hex); } $controls_set = array( - array( - 'oid' => LDAP_CONTROL_PAGEDRESULTS, - 'iscritical' => TRUE, - 'value' => build_ctrl_paged_value(1, 'opaque') - ) + array( + 'oid' => LDAP_CONTROL_PAGEDRESULTS, + 'iscritical' => TRUE, + 'value' => build_ctrl_paged_value(1, 'opaque') + ) ); $controls_set2 = array( - array( - 'oid' => LDAP_CONTROL_PAGEDRESULTS, - 'iscritical' => TRUE, - 'value' => array( - 'size' => 1, - 'cookie' => '', - ) - ) + array( + 'oid' => LDAP_CONTROL_PAGEDRESULTS, + 'iscritical' => TRUE, + 'value' => array( + 'size' => 1, + 'cookie' => '', + ) + ) ); var_dump( - bin2hex($controls_set[0]['value']), - ldap_get_option($link, LDAP_OPT_SERVER_CONTROLS, $controls_get), - ldap_set_option($link, LDAP_OPT_SERVER_CONTROLS, $controls_set), - ldap_get_option($link, LDAP_OPT_SERVER_CONTROLS, $controls_get), - $controls_get, - 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')), - 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) + bin2hex($controls_set[0]['value']), + ldap_get_option($link, LDAP_OPT_SERVER_CONTROLS, $controls_get), + ldap_set_option($link, LDAP_OPT_SERVER_CONTROLS, $controls_set), + ldap_get_option($link, LDAP_OPT_SERVER_CONTROLS, $controls_get), + $controls_get, + 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')), + 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) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_get_option_variation.phpt b/ext/ldap/tests/ldap_get_option_variation.phpt index 6852af3b3d..80384475b4 100644 --- a/ext/ldap/tests/ldap_get_option_variation.phpt +++ b/ext/ldap/tests/ldap_get_option_variation.phpt @@ -13,8 +13,8 @@ $link = ldap_connect($host, $port); $option = null; $controls = array( - array("oid" => "1.2.752.58.10.1", "iscritical" => true), - array("oid" => "1.2.752.58.1.10", "value" => "magic"), + array("oid" => "1.2.752.58.10.1", "iscritical" => true), + array("oid" => "1.2.752.58.1.10", "value" => "magic"), ); ldap_set_option($link, LDAP_OPT_DEREF, LDAP_DEREF_NEVER); @@ -28,24 +28,24 @@ ldap_set_option($link, LDAP_OPT_CLIENT_CONTROLS, $controls); ldap_set_option($link, LDAP_OPT_RESTART, false); var_dump( - ldap_get_option($link, LDAP_OPT_DEREF, $option), - $option, - ldap_get_option($link, LDAP_OPT_SIZELIMIT, $option), - $option, - ldap_get_option($link, LDAP_OPT_TIMELIMIT, $option), - $option, - ldap_get_option($link, LDAP_OPT_NETWORK_TIMEOUT, $option), - $option, - ldap_get_option($link, LDAP_OPT_TIMEOUT, $option), - $option, - ldap_get_option($link, LDAP_OPT_REFERRALS, $option), - $option, - ldap_get_option($link, LDAP_OPT_RESTART, $option), - $option, - ldap_get_option($link, LDAP_OPT_SERVER_CONTROLS, $option), - $option, - ldap_get_option($link, LDAP_OPT_CLIENT_CONTROLS, $option), - $option + ldap_get_option($link, LDAP_OPT_DEREF, $option), + $option, + ldap_get_option($link, LDAP_OPT_SIZELIMIT, $option), + $option, + ldap_get_option($link, LDAP_OPT_TIMELIMIT, $option), + $option, + ldap_get_option($link, LDAP_OPT_NETWORK_TIMEOUT, $option), + $option, + ldap_get_option($link, LDAP_OPT_TIMEOUT, $option), + $option, + ldap_get_option($link, LDAP_OPT_REFERRALS, $option), + $option, + ldap_get_option($link, LDAP_OPT_RESTART, $option), + $option, + ldap_get_option($link, LDAP_OPT_SERVER_CONTROLS, $option), + $option, + ldap_get_option($link, LDAP_OPT_CLIENT_CONTROLS, $option), + $option ); ?> --EXPECT-- diff --git a/ext/ldap/tests/ldap_get_values_len_basic.phpt b/ext/ldap/tests/ldap_get_values_len_basic.phpt index af3fcd60ce..eaf66c0fbc 100644 --- a/ext/ldap/tests/ldap_get_values_len_basic.phpt +++ b/ext/ldap/tests/ldap_get_values_len_basic.phpt @@ -15,7 +15,7 @@ insert_dummy_data($link, $base); $result = ldap_search($link, "$base", "(o=test)"); $entry = ldap_first_entry($link, $result); var_dump( - ldap_get_values_len($link, $entry, "o") + ldap_get_values_len($link, $entry, "o") ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_list_basic.phpt b/ext/ldap/tests/ldap_list_basic.phpt index 840183623a..f4d8bda31b 100644 --- a/ext/ldap/tests/ldap_list_basic.phpt +++ b/ext/ldap/tests/ldap_list_basic.phpt @@ -16,8 +16,8 @@ include "connect.inc"; $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); insert_dummy_data($link, $base); var_dump( - $result = ldap_list($link, "$base", "(objectClass=person)"), - ldap_get_entries($link, $result) + $result = ldap_list($link, "$base", "(objectClass=person)"), + ldap_get_entries($link, $result) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_mod_add_basic.phpt b/ext/ldap/tests/ldap_mod_add_basic.phpt index 631e57ecdd..9096f3eb63 100644 --- a/ext/ldap/tests/ldap_mod_add_basic.phpt +++ b/ext/ldap/tests/ldap_mod_add_basic.phpt @@ -14,15 +14,15 @@ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); insert_dummy_data($link, $base); $entry = array( - "description" => "Domain description", + "description" => "Domain description", ); var_dump( - ldap_mod_add($link, "o=test,$base", $entry), - ldap_get_entries( - $link, - ldap_search($link, "o=test,$base", "(Description=Domain description)") - ) + ldap_mod_add($link, "o=test,$base", $entry), + ldap_get_entries( + $link, + ldap_search($link, "o=test,$base", "(Description=Domain description)") + ) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_mod_add_error.phpt b/ext/ldap/tests/ldap_mod_add_error.phpt index 561f1633f3..7dd26616dc 100644 --- a/ext/ldap/tests/ldap_mod_add_error.phpt +++ b/ext/ldap/tests/ldap_mod_add_error.phpt @@ -19,12 +19,12 @@ var_dump(ldap_mod_add($link, "dc=my-domain,$base", array())); var_dump(ldap_mod_add($link, "weirdAttribute=val", array())); $entry = array( - "objectClass" => array( - "top", - "dcObject", - "organization"), - "dc" => "my-domain", - "o" => "my-domain", + "objectClass" => array( + "top", + "dcObject", + "organization"), + "dc" => "my-domain", + "o" => "my-domain", ); ldap_add($link, "dc=my-domain,$base", $entry); diff --git a/ext/ldap/tests/ldap_mod_del_basic.phpt b/ext/ldap/tests/ldap_mod_del_basic.phpt index fee0c8d4aa..bafc190968 100644 --- a/ext/ldap/tests/ldap_mod_del_basic.phpt +++ b/ext/ldap/tests/ldap_mod_del_basic.phpt @@ -14,15 +14,15 @@ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); insert_dummy_data($link, $base); $entry = array( - "description" => "user A" + "description" => "user A" ); var_dump( - ldap_mod_del($link, "cn=userA,$base", $entry), - ldap_get_entries( - $link, - ldap_search($link, "$base", "(description=user A)") - ) + ldap_mod_del($link, "cn=userA,$base", $entry), + ldap_get_entries( + $link, + ldap_search($link, "$base", "(description=user A)") + ) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_mod_ext.phpt b/ext/ldap/tests/ldap_mod_ext.phpt index f27e05100d..0ca091fed8 100644 --- a/ext/ldap/tests/ldap_mod_ext.phpt +++ b/ext/ldap/tests/ldap_mod_ext.phpt @@ -19,38 +19,38 @@ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); insert_dummy_data($link, $base); $entry = array( - "description" => "Domain description", + "description" => "Domain description", ); var_dump( - $result = ldap_mod_add_ext($link, "o=test,$base", $entry, - [ - ['oid' => LDAP_CONTROL_PRE_READ, 'iscritical' => TRUE, 'value' => ['attrs' => ['description']]], - ['oid' => LDAP_CONTROL_POST_READ, 'iscritical' => TRUE, 'value' => ['attrs' => ['description']]], - ] - ), - ldap_parse_result($link, $result, $errcode, $matcheddn, $errmsg, $referrals, $ctrls), - $errcode, - $errmsg, - $ctrls, - ldap_get_entries( - $link, - ldap_search($link, "o=test,$base", "(Description=Domain description)") - ), - $result = ldap_mod_del_ext($link, "o=test,$base", $entry, - [ - ['oid' => LDAP_CONTROL_PRE_READ, 'iscritical' => TRUE, 'value' => ['attrs' => ['description']]], - ['oid' => LDAP_CONTROL_POST_READ, 'iscritical' => TRUE, 'value' => ['attrs' => ['description']]], - ] - ), - ldap_parse_result($link, $result, $errcode, $matcheddn, $errmsg, $referrals, $ctrls), - $errcode, - $errmsg, - $ctrls, - ldap_get_entries( - $link, - ldap_search($link, "o=test,$base", "(Description=Domain description)") - ) + $result = ldap_mod_add_ext($link, "o=test,$base", $entry, + [ + ['oid' => LDAP_CONTROL_PRE_READ, 'iscritical' => TRUE, 'value' => ['attrs' => ['description']]], + ['oid' => LDAP_CONTROL_POST_READ, 'iscritical' => TRUE, 'value' => ['attrs' => ['description']]], + ] + ), + ldap_parse_result($link, $result, $errcode, $matcheddn, $errmsg, $referrals, $ctrls), + $errcode, + $errmsg, + $ctrls, + ldap_get_entries( + $link, + ldap_search($link, "o=test,$base", "(Description=Domain description)") + ), + $result = ldap_mod_del_ext($link, "o=test,$base", $entry, + [ + ['oid' => LDAP_CONTROL_PRE_READ, 'iscritical' => TRUE, 'value' => ['attrs' => ['description']]], + ['oid' => LDAP_CONTROL_POST_READ, 'iscritical' => TRUE, 'value' => ['attrs' => ['description']]], + ] + ), + ldap_parse_result($link, $result, $errcode, $matcheddn, $errmsg, $referrals, $ctrls), + $errcode, + $errmsg, + $ctrls, + ldap_get_entries( + $link, + ldap_search($link, "o=test,$base", "(Description=Domain description)") + ) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_mod_replace_basic.phpt b/ext/ldap/tests/ldap_mod_replace_basic.phpt index 6e47158db1..0dd9f2b1ea 100644 --- a/ext/ldap/tests/ldap_mod_replace_basic.phpt +++ b/ext/ldap/tests/ldap_mod_replace_basic.phpt @@ -14,15 +14,15 @@ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); insert_dummy_data($link, $base); $entry = array( - "description" => "user X" + "description" => "user X" ); var_dump( - ldap_mod_replace($link, "cn=userA,$base", $entry), - ldap_get_entries( - $link, - ldap_search($link, "$base", "(description=user X)", array("description")) - ) + ldap_mod_replace($link, "cn=userA,$base", $entry), + ldap_get_entries( + $link, + ldap_search($link, "$base", "(description=user X)", array("description")) + ) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_modify_basic.phpt b/ext/ldap/tests/ldap_modify_basic.phpt index 487ec753a0..2589953147 100644 --- a/ext/ldap/tests/ldap_modify_basic.phpt +++ b/ext/ldap/tests/ldap_modify_basic.phpt @@ -14,19 +14,19 @@ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); insert_dummy_data($link, $base); $entry = array( - "objectClass" => array( - "top", - "organization"), - "o" => "test", - "description" => "Domain description", + "objectClass" => array( + "top", + "organization"), + "o" => "test", + "description" => "Domain description", ); var_dump( - ldap_modify($link, "o=test,$base", $entry), - ldap_get_entries( - $link, - ldap_search($link, "$base", "(Description=Domain description)") - ) + ldap_modify($link, "o=test,$base", $entry), + ldap_get_entries( + $link, + ldap_search($link, "$base", "(Description=Domain description)") + ) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_modify_batch_basic.phpt b/ext/ldap/tests/ldap_modify_batch_basic.phpt index 96fadb44c3..41d7c0f15f 100644 --- a/ext/ldap/tests/ldap_modify_batch_basic.phpt +++ b/ext/ldap/tests/ldap_modify_batch_basic.phpt @@ -14,27 +14,27 @@ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); insert_dummy_data($link, $base); $mods = array( - array( - "attrib" => "telephoneNumber", - "modtype" => LDAP_MODIFY_BATCH_ADD, - "values" => array( - "+1 555 5551717" - ) - ), - array( - "attrib" => "sn", - "modtype" => LDAP_MODIFY_BATCH_REPLACE, - "values" => array("Brown-Smith") - ), - array( - "attrib" => "description", - "modtype" => LDAP_MODIFY_BATCH_REMOVE_ALL - ) + array( + "attrib" => "telephoneNumber", + "modtype" => LDAP_MODIFY_BATCH_ADD, + "values" => array( + "+1 555 5551717" + ) + ), + array( + "attrib" => "sn", + "modtype" => LDAP_MODIFY_BATCH_REPLACE, + "values" => array("Brown-Smith") + ), + array( + "attrib" => "description", + "modtype" => LDAP_MODIFY_BATCH_REMOVE_ALL + ) ); var_dump( - ldap_modify_batch($link, "cn=userA,$base", $mods), - ldap_get_entries($link, ldap_search($link, "$base", "(sn=Brown-Smith)")) + ldap_modify_batch($link, "cn=userA,$base", $mods), + ldap_get_entries($link, ldap_search($link, "$base", "(sn=Brown-Smith)")) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_modify_batch_error.phpt b/ext/ldap/tests/ldap_modify_batch_error.phpt index d18bd6729d..627d116d97 100644 --- a/ext/ldap/tests/ldap_modify_batch_error.phpt +++ b/ext/ldap/tests/ldap_modify_batch_error.phpt @@ -13,11 +13,11 @@ require "connect.inc"; $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); $addGivenName = array( - array( - "attrib" => "givenName", - "modtype" => LDAP_MODIFY_BATCH_ADD, - "values" => array("Jack") - ) + array( + "attrib" => "givenName", + "modtype" => LDAP_MODIFY_BATCH_ADD, + "values" => array("Jack") + ) ); // DN not found @@ -28,34 +28,34 @@ var_dump(ldap_modify_batch($link, "weirdAttribute=val", $addGivenName)); // prepare $entry = array( - "objectClass" => array( - "top", - "dcObject", - "organization"), - "dc" => "my-domain", - "o" => "my-domain", + "objectClass" => array( + "top", + "dcObject", + "organization"), + "dc" => "my-domain", + "o" => "my-domain", ); ldap_add($link, "dc=my-domain,$base", $entry); // invalid domain $mods = array( - array( - "attrib" => "dc", - "modtype" => LDAP_MODIFY_BATCH_REPLACE, - "values" => array("Wrong Domain") - ) + array( + "attrib" => "dc", + "modtype" => LDAP_MODIFY_BATCH_REPLACE, + "values" => array("Wrong Domain") + ) ); var_dump(ldap_modify_batch($link, "dc=my-domain,$base", $mods)); // invalid attribute $mods = array( - array( - "attrib" => "weirdAttribute", - "modtype" => LDAP_MODIFY_BATCH_ADD, - "values" => array("weirdVal", "anotherWeirdval") - ) + array( + "attrib" => "weirdAttribute", + "modtype" => LDAP_MODIFY_BATCH_ADD, + "values" => array("weirdVal", "anotherWeirdval") + ) ); var_dump(ldap_modify_batch($link, "dc=my-domain,$base", $mods)); diff --git a/ext/ldap/tests/ldap_modify_error.phpt b/ext/ldap/tests/ldap_modify_error.phpt index b4e29a58c6..682abf7504 100644 --- a/ext/ldap/tests/ldap_modify_error.phpt +++ b/ext/ldap/tests/ldap_modify_error.phpt @@ -19,12 +19,12 @@ var_dump(ldap_modify($link, "cn=not-found,$base", array())); var_dump(ldap_modify($link, "weirdAttribute=val", array())); $entry = array( - "objectClass" => array( - "top", - "dcObject", - "organization"), - "dc" => "my-domain", - "o" => "my-domain", + "objectClass" => array( + "top", + "dcObject", + "organization"), + "dc" => "my-domain", + "o" => "my-domain", ); ldap_add($link, "dc=my-domain,$base", $entry); diff --git a/ext/ldap/tests/ldap_next_attribute_basic.phpt b/ext/ldap/tests/ldap_next_attribute_basic.phpt index d6c753c4a4..4c9584ee0b 100644 --- a/ext/ldap/tests/ldap_next_attribute_basic.phpt +++ b/ext/ldap/tests/ldap_next_attribute_basic.phpt @@ -16,10 +16,10 @@ $result = ldap_search($link, "$base", "(cn=userC)"); $entry = ldap_first_entry($link, $result); $attribute = ldap_first_attribute($link, $entry); var_dump( - ldap_next_attribute($link, $entry), - ldap_next_attribute($link, $entry), - ldap_next_attribute($link, $entry), - ldap_next_attribute($link, $entry) + ldap_next_attribute($link, $entry), + ldap_next_attribute($link, $entry), + ldap_next_attribute($link, $entry), + ldap_next_attribute($link, $entry) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_next_attribute_error.phpt b/ext/ldap/tests/ldap_next_attribute_error.phpt index 94f7cfd475..ffe1222626 100644 --- a/ext/ldap/tests/ldap_next_attribute_error.phpt +++ b/ext/ldap/tests/ldap_next_attribute_error.phpt @@ -15,7 +15,7 @@ insert_dummy_data($link, $base); $result = ldap_search($link, "$base", "(objectclass=organization)"); $entry = ldap_first_entry($link, $result); var_dump( - ldap_next_attribute($link, $entry) + ldap_next_attribute($link, $entry) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_next_entry_basic.phpt b/ext/ldap/tests/ldap_next_entry_basic.phpt index 9a7cc456b1..d8f03ce291 100644 --- a/ext/ldap/tests/ldap_next_entry_basic.phpt +++ b/ext/ldap/tests/ldap_next_entry_basic.phpt @@ -15,9 +15,9 @@ insert_dummy_data($link, $base); $result = ldap_list($link, "$base", "(objectClass=person)"); $entry = ldap_first_entry($link, $result); var_dump( - $entry = ldap_next_entry($link, $entry), - ldap_get_values($link, $entry, 'sn'), - $entry = ldap_next_entry($link, $entry) + $entry = ldap_next_entry($link, $entry), + ldap_get_values($link, $entry, 'sn'), + $entry = ldap_next_entry($link, $entry) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_parse_reference_basic.phpt b/ext/ldap/tests/ldap_parse_reference_basic.phpt index 27b43cc084..d5aeef8a59 100644 --- a/ext/ldap/tests/ldap_parse_reference_basic.phpt +++ b/ext/ldap/tests/ldap_parse_reference_basic.phpt @@ -21,8 +21,8 @@ $result = ldap_search($link, "$base", "(cn=*)"); $ref = ldap_first_reference($link, $result); $refs = null; var_dump( - ldap_parse_reference($link, $ref, $refs), - $refs + ldap_parse_reference($link, $ref, $refs), + $refs ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_parse_result_basic.phpt b/ext/ldap/tests/ldap_parse_result_basic.phpt index c9bdc6cbca..ed7047164b 100644 --- a/ext/ldap/tests/ldap_parse_result_basic.phpt +++ b/ext/ldap/tests/ldap_parse_result_basic.phpt @@ -20,8 +20,8 @@ ldap_add($link, "cn=userref,$base", array( $result = ldap_search($link, "cn=userref,$base", "(cn=user*)"); $errcode = $dn = $errmsg = $refs = null; var_dump( - ldap_parse_result($link, $result, $errcode, $dn, $errmsg, $refs), - $errcode, $dn, $errmsg, $refs + ldap_parse_result($link, $result, $errcode, $dn, $errmsg, $refs), + $errcode, $dn, $errmsg, $refs ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_parse_result_controls.phpt b/ext/ldap/tests/ldap_parse_result_controls.phpt index 76dc2fcb15..63ef9e69d7 100644 --- a/ext/ldap/tests/ldap_parse_result_controls.phpt +++ b/ext/ldap/tests/ldap_parse_result_controls.phpt @@ -19,13 +19,13 @@ insert_dummy_data($link, $base); $dn = "$base"; $filter = "(cn=user*)"; var_dump( - ldap_control_paged_result($link, 1), - $result = ldap_search($link, $dn, $filter, array('cn')), - ldap_parse_result($link, $result, $errcode, $dn, $errmsg, $refs, $ctrls), - $ctrls[LDAP_CONTROL_PAGEDRESULTS]['oid'], - $ctrls[LDAP_CONTROL_PAGEDRESULTS]['value']['size'], - bin2hex($ctrls[LDAP_CONTROL_PAGEDRESULTS]['value']['cookie']), - ldap_get_entries($link, $result)['count'] + ldap_control_paged_result($link, 1), + $result = ldap_search($link, $dn, $filter, array('cn')), + ldap_parse_result($link, $result, $errcode, $dn, $errmsg, $refs, $ctrls), + $ctrls[LDAP_CONTROL_PAGEDRESULTS]['oid'], + $ctrls[LDAP_CONTROL_PAGEDRESULTS]['value']['size'], + bin2hex($ctrls[LDAP_CONTROL_PAGEDRESULTS]['value']['cookie']), + ldap_get_entries($link, $result)['count'] ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_read_basic.phpt b/ext/ldap/tests/ldap_read_basic.phpt index 75d3693bce..596c02a71e 100644 --- a/ext/ldap/tests/ldap_read_basic.phpt +++ b/ext/ldap/tests/ldap_read_basic.phpt @@ -16,8 +16,8 @@ include "connect.inc"; $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); insert_dummy_data($link, $base); var_dump( - $result = ldap_read($link, "o=test,$base", "(o=*)"), - ldap_get_entries($link, $result) + $result = ldap_read($link, "o=test,$base", "(o=*)"), + ldap_get_entries($link, $result) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_rename_basic.phpt b/ext/ldap/tests/ldap_rename_basic.phpt index c083b7a03f..f985630ac6 100644 --- a/ext/ldap/tests/ldap_rename_basic.phpt +++ b/ext/ldap/tests/ldap_rename_basic.phpt @@ -13,7 +13,7 @@ require "connect.inc"; $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); insert_dummy_data($link, $base); var_dump( - ldap_rename($link, "cn=userA,$base", "cn=userZ", "$base", true) + ldap_rename($link, "cn=userA,$base", "cn=userZ", "$base", true) ); $result = ldap_search($link, "$base", "(cn=userA)", array("cn", "sn")); $result = ldap_search($link, "$base", "(cn=userZ)", array("cn", "sn")); diff --git a/ext/ldap/tests/ldap_rename_ext.phpt b/ext/ldap/tests/ldap_rename_ext.phpt index 009a7f32c5..e4f7d8364e 100644 --- a/ext/ldap/tests/ldap_rename_ext.phpt +++ b/ext/ldap/tests/ldap_rename_ext.phpt @@ -18,19 +18,19 @@ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); insert_dummy_data($link, $base); var_dump( - $result = ldap_rename_ext($link, "cn=userA,$base", "cn=userZ", "$base", TRUE, - [ - ['oid' => LDAP_CONTROL_PRE_READ, 'iscritical' => TRUE, 'value' => ['attrs' => ['cn']]], - ['oid' => LDAP_CONTROL_POST_READ, 'iscritical' => TRUE, 'value' => ['attrs' => ['cn']]] - ] - ), - ldap_parse_result($link, $result, $errcode, $matcheddn, $errmsg, $referrals, $ctrls), - $errcode, - $errmsg, - $ctrls[LDAP_CONTROL_PRE_READ], - $ctrls[LDAP_CONTROL_POST_READ], - ldap_count_entries($link, ldap_search($link, "$base", "(cn=userA)", array("cn"))), - ldap_count_entries($link, ldap_search($link, "$base", "(cn=userZ)", array("cn"))) + $result = ldap_rename_ext($link, "cn=userA,$base", "cn=userZ", "$base", TRUE, + [ + ['oid' => LDAP_CONTROL_PRE_READ, 'iscritical' => TRUE, 'value' => ['attrs' => ['cn']]], + ['oid' => LDAP_CONTROL_POST_READ, 'iscritical' => TRUE, 'value' => ['attrs' => ['cn']]] + ] + ), + ldap_parse_result($link, $result, $errcode, $matcheddn, $errmsg, $referrals, $ctrls), + $errcode, + $errmsg, + $ctrls[LDAP_CONTROL_PRE_READ], + $ctrls[LDAP_CONTROL_POST_READ], + ldap_count_entries($link, ldap_search($link, "$base", "(cn=userA)", array("cn"))), + ldap_count_entries($link, ldap_search($link, "$base", "(cn=userZ)", array("cn"))) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_search_basic.phpt b/ext/ldap/tests/ldap_search_basic.phpt index 8c77a63e8a..f7ed449c16 100644 --- a/ext/ldap/tests/ldap_search_basic.phpt +++ b/ext/ldap/tests/ldap_search_basic.phpt @@ -17,8 +17,8 @@ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); insert_dummy_data($link, $base); var_dump( - $result = ldap_search($link, "$base", "(objectClass=person)"), - ldap_get_entries($link, $result) + $result = ldap_search($link, "$base", "(objectClass=person)"), + ldap_get_entries($link, $result) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_search_overrides.phpt b/ext/ldap/tests/ldap_search_overrides.phpt index e2d51079f4..5bd351a741 100644 --- a/ext/ldap/tests/ldap_search_overrides.phpt +++ b/ext/ldap/tests/ldap_search_overrides.phpt @@ -20,18 +20,18 @@ ldap_set_option($link, LDAP_OPT_NETWORK_TIMEOUT, 44); insert_dummy_data($link, $base); var_dump( - $result = ldap_search($link, "$base", "(objectClass=person)", array(), null, 111, 22, LDAP_DEREF_NEVER), - ldap_get_entries($link, $result) + $result = ldap_search($link, "$base", "(objectClass=person)", array(), null, 111, 22, LDAP_DEREF_NEVER), + ldap_get_entries($link, $result) ); var_dump( - ldap_get_option($link, LDAP_OPT_DEREF, $option), - $option, - ldap_get_option($link, LDAP_OPT_SIZELIMIT, $option), - $option, - ldap_get_option($link, LDAP_OPT_TIMELIMIT, $option), - $option, - ldap_get_option($link, LDAP_OPT_NETWORK_TIMEOUT, $option), - $option + ldap_get_option($link, LDAP_OPT_DEREF, $option), + $option, + ldap_get_option($link, LDAP_OPT_SIZELIMIT, $option), + $option, + ldap_get_option($link, LDAP_OPT_TIMELIMIT, $option), + $option, + ldap_get_option($link, LDAP_OPT_NETWORK_TIMEOUT, $option), + $option ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_search_paged_result_controls.phpt b/ext/ldap/tests/ldap_search_paged_result_controls.phpt index 04825a9ecd..f60acd3e0c 100644 --- a/ext/ldap/tests/ldap_search_paged_result_controls.phpt +++ b/ext/ldap/tests/ldap_search_paged_result_controls.phpt @@ -19,13 +19,13 @@ insert_dummy_data($link, $base); $dn = "$base"; $filter = "(cn=user*)"; var_dump( - $result = ldap_search($link, $dn, $filter, array('cn'), 0, 0, 0, LDAP_DEREF_NEVER, - [['oid' => LDAP_CONTROL_PAGEDRESULTS, 'value' => ['size' => 2]]]), - ldap_get_entries($link, $result), - ldap_parse_result($link, $result, $errcode , $matcheddn , $errmsg , $referrals, $controls), - $result = ldap_search($link, $dn, $filter, array('cn'), 0, 0, 0, LDAP_DEREF_NEVER, - [['oid' => LDAP_CONTROL_PAGEDRESULTS, 'value' => ['size' => 20, 'cookie' => $controls[LDAP_CONTROL_PAGEDRESULTS]['value']['cookie']]]]), - ldap_get_entries($link, $result) + $result = ldap_search($link, $dn, $filter, array('cn'), 0, 0, 0, LDAP_DEREF_NEVER, + [['oid' => LDAP_CONTROL_PAGEDRESULTS, 'value' => ['size' => 2]]]), + ldap_get_entries($link, $result), + ldap_parse_result($link, $result, $errcode , $matcheddn , $errmsg , $referrals, $controls), + $result = ldap_search($link, $dn, $filter, array('cn'), 0, 0, 0, LDAP_DEREF_NEVER, + [['oid' => LDAP_CONTROL_PAGEDRESULTS, 'value' => ['size' => 20, 'cookie' => $controls[LDAP_CONTROL_PAGEDRESULTS]['value']['cookie']]]]), + ldap_get_entries($link, $result) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_search_sort_controls.phpt b/ext/ldap/tests/ldap_search_sort_controls.phpt index b7533e54f7..f55faf4930 100644 --- a/ext/ldap/tests/ldap_search_sort_controls.phpt +++ b/ext/ldap/tests/ldap_search_sort_controls.phpt @@ -19,55 +19,55 @@ insert_dummy_data($link, $base); /* First test with only SORT control */ var_dump( - $result = ldap_search($link, $base, '(cn=*)', array('cn'), 0, 0, 0, LDAP_DEREF_NEVER, - [ - [ - 'oid' => LDAP_CONTROL_SORTREQUEST, - 'iscritical' => TRUE, - 'value' => [ - ['attr' => 'cn', 'oid' => '2.5.13.3' /* caseIgnoreOrderingMatch */, 'reverse' => TRUE] - ] - ] - ] - ), - ldap_get_entries($link, $result), - ldap_parse_result($link, $result, $errcode , $matcheddn , $errmsg , $referrals, $controls), - $errcode, - $errmsg, - $controls + $result = ldap_search($link, $base, '(cn=*)', array('cn'), 0, 0, 0, LDAP_DEREF_NEVER, + [ + [ + 'oid' => LDAP_CONTROL_SORTREQUEST, + 'iscritical' => TRUE, + 'value' => [ + ['attr' => 'cn', 'oid' => '2.5.13.3' /* caseIgnoreOrderingMatch */, 'reverse' => TRUE] + ] + ] + ] + ), + ldap_get_entries($link, $result), + ldap_parse_result($link, $result, $errcode , $matcheddn , $errmsg , $referrals, $controls), + $errcode, + $errmsg, + $controls ); /* Then with VLV control */ var_dump( - $result = ldap_search($link, $base, '(cn=*)', array('cn'), 0, 0, 0, LDAP_DEREF_NEVER, - [ - [ - 'oid' => LDAP_CONTROL_SORTREQUEST, - 'iscritical' => TRUE, - 'value' => [ - ['attr' => 'cn', 'oid' => '2.5.13.3' /* caseIgnoreOrderingMatch */, 'reverse' => TRUE] - ] - ], - [ - 'oid' => LDAP_CONTROL_VLVREQUEST, - 'iscritical' => TRUE, - 'value' => [ - 'before' => 0, // Return 0 entry before target - 'after' => 1, // Return 1 entry after target - 'offset' => 2, // Target entry is the second one - 'count' => 0, // We have no idea how many entries there are - ] - ] - ] - ), - ldap_get_entries($link, $result), - ldap_parse_result($link, $result, $errcode , $matcheddn , $errmsg , $referrals, $controls), - array_keys($controls), - $controls[LDAP_CONTROL_SORTRESPONSE], - $controls[LDAP_CONTROL_VLVRESPONSE]['value']['target'], - $controls[LDAP_CONTROL_VLVRESPONSE]['value']['count'], - $controls[LDAP_CONTROL_VLVRESPONSE]['value']['errcode'], - bin2hex($controls[LDAP_CONTROL_VLVRESPONSE]['value']['context']) + $result = ldap_search($link, $base, '(cn=*)', array('cn'), 0, 0, 0, LDAP_DEREF_NEVER, + [ + [ + 'oid' => LDAP_CONTROL_SORTREQUEST, + 'iscritical' => TRUE, + 'value' => [ + ['attr' => 'cn', 'oid' => '2.5.13.3' /* caseIgnoreOrderingMatch */, 'reverse' => TRUE] + ] + ], + [ + 'oid' => LDAP_CONTROL_VLVREQUEST, + 'iscritical' => TRUE, + 'value' => [ + 'before' => 0, // Return 0 entry before target + 'after' => 1, // Return 1 entry after target + 'offset' => 2, // Target entry is the second one + 'count' => 0, // We have no idea how many entries there are + ] + ] + ] + ), + ldap_get_entries($link, $result), + ldap_parse_result($link, $result, $errcode , $matcheddn , $errmsg , $referrals, $controls), + array_keys($controls), + $controls[LDAP_CONTROL_SORTRESPONSE], + $controls[LDAP_CONTROL_VLVRESPONSE]['value']['target'], + $controls[LDAP_CONTROL_VLVRESPONSE]['value']['count'], + $controls[LDAP_CONTROL_VLVRESPONSE]['value']['errcode'], + bin2hex($controls[LDAP_CONTROL_VLVRESPONSE]['value']['context']) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_search_variation1.phpt b/ext/ldap/tests/ldap_search_variation1.phpt index 5fa30b4c7a..88eb79aa77 100644 --- a/ext/ldap/tests/ldap_search_variation1.phpt +++ b/ext/ldap/tests/ldap_search_variation1.phpt @@ -19,8 +19,8 @@ insert_dummy_data($link, $base); $dn = "$base"; $filter = "(dc=*)"; var_dump( - $result = ldap_search($link, "o=test,$base", "(o=*)", array('o')), - ldap_get_entries($link, $result) + $result = ldap_search($link, "o=test,$base", "(o=*)", array('o')), + ldap_get_entries($link, $result) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_search_variation2.phpt b/ext/ldap/tests/ldap_search_variation2.phpt index c06afbaac0..8b130aaa08 100644 --- a/ext/ldap/tests/ldap_search_variation2.phpt +++ b/ext/ldap/tests/ldap_search_variation2.phpt @@ -17,8 +17,8 @@ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); insert_dummy_data($link, $base); var_dump( - $result = ldap_search($link, "$base", "(objectclass=person)", array('sn'), 1), - ldap_get_entries($link, $result) + $result = ldap_search($link, "$base", "(objectclass=person)", array('sn'), 1), + ldap_get_entries($link, $result) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_search_variation3.phpt b/ext/ldap/tests/ldap_search_variation3.phpt index 2a07654e4f..d0b6ec5cad 100644 --- a/ext/ldap/tests/ldap_search_variation3.phpt +++ b/ext/ldap/tests/ldap_search_variation3.phpt @@ -19,13 +19,13 @@ insert_dummy_data($link, $base); $dn = "$base"; $filter = "(objectclass=person)"; var_dump( - $result = ldap_search($link, $dn, $filter, array('sn'), 1, 3), - ldap_get_entries($link, $result) + $result = ldap_search($link, $dn, $filter, array('sn'), 1, 3), + ldap_get_entries($link, $result) ); var_dump( - $result = ldap_search($link, $dn, $filter, array('sn'), 1, 1), - ldap_get_entries($link, $result) + $result = ldap_search($link, $dn, $filter, array('sn'), 1, 1), + ldap_get_entries($link, $result) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_search_variation4.phpt b/ext/ldap/tests/ldap_search_variation4.phpt index 298777263e..694840b397 100644 --- a/ext/ldap/tests/ldap_search_variation4.phpt +++ b/ext/ldap/tests/ldap_search_variation4.phpt @@ -19,8 +19,8 @@ insert_dummy_data($link, $base); $dn = "$base"; $filter = "(objectclass=person)"; var_dump( - $result = ldap_search($link, $dn, $filter, array('sn'), 1, 1, 3), - ldap_get_entries($link, $result) + $result = ldap_search($link, $dn, $filter, array('sn'), 1, 1, 3), + ldap_get_entries($link, $result) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_search_variation5.phpt b/ext/ldap/tests/ldap_search_variation5.phpt index e6ac54e21d..211df9a128 100644 --- a/ext/ldap/tests/ldap_search_variation5.phpt +++ b/ext/ldap/tests/ldap_search_variation5.phpt @@ -19,16 +19,16 @@ insert_dummy_data($link, $base); $dn = "$base"; $filter = "(objectclass=person)"; var_dump( - $result = ldap_search($link, $dn, $filter, array('sn'), 1, 1, 3, LDAP_DEREF_SEARCHING), - ldap_get_entries($link, $result) + $result = ldap_search($link, $dn, $filter, array('sn'), 1, 1, 3, LDAP_DEREF_SEARCHING), + ldap_get_entries($link, $result) ); var_dump( - $result = ldap_search($link, $dn, $filter, array('sn'), 1, 1, 3, LDAP_DEREF_FINDING), - ldap_get_entries($link, $result) + $result = ldap_search($link, $dn, $filter, array('sn'), 1, 1, 3, LDAP_DEREF_FINDING), + ldap_get_entries($link, $result) ); var_dump( - $result = ldap_search($link, $dn, $filter, array('sn'), 1, 1, 3, LDAP_DEREF_ALWAYS), - ldap_get_entries($link, $result) + $result = ldap_search($link, $dn, $filter, array('sn'), 1, 1, 3, LDAP_DEREF_ALWAYS), + ldap_get_entries($link, $result) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_search_variation6.phpt b/ext/ldap/tests/ldap_search_variation6.phpt index 5938041367..6451c2930b 100644 --- a/ext/ldap/tests/ldap_search_variation6.phpt +++ b/ext/ldap/tests/ldap_search_variation6.phpt @@ -20,19 +20,19 @@ $dn = "$base"; $filter = "(objectclass=person)"; var_dump( - $result = ldap_search(array($link, $link), $dn, $filter), - $result0 = ldap_get_entries($link, $result[0]), - ldap_get_entries($link, $result[1]) === $result0 + $result = ldap_search(array($link, $link), $dn, $filter), + $result0 = ldap_get_entries($link, $result[0]), + ldap_get_entries($link, $result[1]) === $result0 ); var_dump( - $result = ldap_search(array($link, $link), "", $filter), - ldap_get_entries($link, $result[0]), - ldap_get_entries($link, $result[1]) + $result = ldap_search(array($link, $link), "", $filter), + ldap_get_entries($link, $result[0]), + ldap_get_entries($link, $result[1]) ); var_dump( - $result = ldap_search(array($link, $link), "", array($filter, $filter)), - ldap_get_entries($link, $result[0]), - ldap_get_entries($link, $result[1]) + $result = ldap_search(array($link, $link), "", array($filter, $filter)), + ldap_get_entries($link, $result[0]), + ldap_get_entries($link, $result[1]) ); ?> --CLEAN-- diff --git a/ext/ldap/tests/ldap_set_option_cafiles_basic.phpt b/ext/ldap/tests/ldap_set_option_cafiles_basic.phpt index 492df3bc8b..945216d1c0 100644 --- a/ext/ldap/tests/ldap_set_option_cafiles_basic.phpt +++ b/ext/ldap/tests/ldap_set_option_cafiles_basic.phpt @@ -10,18 +10,18 @@ require "connect.inc"; $link = ldap_connect($host, $port); foreach([ - LDAP_OPT_X_TLS_CACERTDIR, - LDAP_OPT_X_TLS_CACERTFILE, - LDAP_OPT_X_TLS_CERTFILE, - LDAP_OPT_X_TLS_KEYFILE, - LDAP_OPT_X_TLS_CRLFILE, - LDAP_OPT_X_TLS_DHFILE, + LDAP_OPT_X_TLS_CACERTDIR, + LDAP_OPT_X_TLS_CACERTFILE, + LDAP_OPT_X_TLS_CERTFILE, + LDAP_OPT_X_TLS_KEYFILE, + LDAP_OPT_X_TLS_CRLFILE, + LDAP_OPT_X_TLS_DHFILE, ] as $option) { - $result = ldap_set_option($link, $option, '/foo/bar'); - var_dump($result); + $result = ldap_set_option($link, $option, '/foo/bar'); + var_dump($result); - ldap_get_option($link, $option, $optionval); - var_dump($optionval); + ldap_get_option($link, $option, $optionval); + var_dump($optionval); } ?> --EXPECT-- diff --git a/ext/ldap/tests/ldap_set_option_crlcheck_basic.phpt b/ext/ldap/tests/ldap_set_option_crlcheck_basic.phpt index f8e3c8cf40..eff51c785e 100644 --- a/ext/ldap/tests/ldap_set_option_crlcheck_basic.phpt +++ b/ext/ldap/tests/ldap_set_option_crlcheck_basic.phpt @@ -18,15 +18,15 @@ require "connect.inc"; $link = ldap_connect($host, $port); foreach([ - LDAP_OPT_X_TLS_CRL_NONE, - LDAP_OPT_X_TLS_CRL_PEER, - LDAP_OPT_X_TLS_CRL_ALL, + LDAP_OPT_X_TLS_CRL_NONE, + LDAP_OPT_X_TLS_CRL_PEER, + LDAP_OPT_X_TLS_CRL_ALL, ] as $option) { - $result = ldap_set_option($link, LDAP_OPT_X_TLS_CRLCHECK, $option); - var_dump($result); + $result = ldap_set_option($link, LDAP_OPT_X_TLS_CRLCHECK, $option); + var_dump($result); - ldap_get_option($link, LDAP_OPT_X_TLS_CRLCHECK, $optionval); - var_dump($optionval); + ldap_get_option($link, LDAP_OPT_X_TLS_CRLCHECK, $optionval); + var_dump($optionval); } ?> --EXPECT-- diff --git a/ext/ldap/tests/ldap_set_option_error.phpt b/ext/ldap/tests/ldap_set_option_error.phpt index e7ef6bac6b..079c63577d 100644 --- a/ext/ldap/tests/ldap_set_option_error.phpt +++ b/ext/ldap/tests/ldap_set_option_error.phpt @@ -11,22 +11,22 @@ require "connect.inc"; $link = ldap_connect($host, $port); $controls = array( - array( - array("xid" => "1.2.752.58.10.1", "iscritical" => true), - array("xid" => "1.2.752.58.1.10", "value" => "magic"), - ), - array( - array("oid" => "1.2.752.58.10.1", "iscritical" => true), - array("oid" => "1.2.752.58.1.10", "value" => "magic"), - "weird" - ), - "notanarray" + array( + array("xid" => "1.2.752.58.10.1", "iscritical" => true), + array("xid" => "1.2.752.58.1.10", "value" => "magic"), + ), + array( + array("oid" => "1.2.752.58.10.1", "iscritical" => true), + array("oid" => "1.2.752.58.1.10", "value" => "magic"), + "weird" + ), + "notanarray" ); var_dump(ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, 10)); foreach ($controls as $control) - var_dump(ldap_set_option($link, LDAP_OPT_SERVER_CONTROLS, $control)); + var_dump(ldap_set_option($link, LDAP_OPT_SERVER_CONTROLS, $control)); var_dump(ldap_set_option($link, 999999, 999999)); ?> diff --git a/ext/ldap/tests/ldap_set_option_keepalive_basic.phpt b/ext/ldap/tests/ldap_set_option_keepalive_basic.phpt index 865345dc4d..f00e885ebe 100644 --- a/ext/ldap/tests/ldap_set_option_keepalive_basic.phpt +++ b/ext/ldap/tests/ldap_set_option_keepalive_basic.phpt @@ -10,15 +10,15 @@ require "connect.inc"; $link = ldap_connect($host, $port); foreach([ - LDAP_OPT_X_KEEPALIVE_IDLE, - LDAP_OPT_X_KEEPALIVE_PROBES, - LDAP_OPT_X_KEEPALIVE_INTERVAL, + LDAP_OPT_X_KEEPALIVE_IDLE, + LDAP_OPT_X_KEEPALIVE_PROBES, + LDAP_OPT_X_KEEPALIVE_INTERVAL, ] as $option) { - $result = ldap_set_option($link, $option, 5); - var_dump($result); + $result = ldap_set_option($link, $option, 5); + var_dump($result); - ldap_get_option($link, $option, $optionval); - var_dump($optionval); + ldap_get_option($link, $option, $optionval); + var_dump($optionval); } ?> --EXPECT-- diff --git a/ext/ldap/tests/ldap_set_option_reqcert_basic.phpt b/ext/ldap/tests/ldap_set_option_reqcert_basic.phpt index 220bb2ff31..d087dbf88c 100644 --- a/ext/ldap/tests/ldap_set_option_reqcert_basic.phpt +++ b/ext/ldap/tests/ldap_set_option_reqcert_basic.phpt @@ -10,17 +10,17 @@ require "connect.inc"; $link = ldap_connect($host, $port); foreach([ - LDAP_OPT_X_TLS_NEVER, - LDAP_OPT_X_TLS_HARD, - LDAP_OPT_X_TLS_DEMAND, - LDAP_OPT_X_TLS_ALLOW, - LDAP_OPT_X_TLS_TRY, + LDAP_OPT_X_TLS_NEVER, + LDAP_OPT_X_TLS_HARD, + LDAP_OPT_X_TLS_DEMAND, + LDAP_OPT_X_TLS_ALLOW, + LDAP_OPT_X_TLS_TRY, ] as $option) { - $result = ldap_set_option($link, LDAP_OPT_X_TLS_REQUIRE_CERT, $option); - var_dump($result); + $result = ldap_set_option($link, LDAP_OPT_X_TLS_REQUIRE_CERT, $option); + var_dump($result); - ldap_get_option($link, LDAP_OPT_X_TLS_REQUIRE_CERT, $optionval); - var_dump($optionval); + ldap_get_option($link, LDAP_OPT_X_TLS_REQUIRE_CERT, $optionval); + var_dump($optionval); } ?> --EXPECT-- diff --git a/ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt b/ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt index 796cb8c7e1..782ea24992 100644 --- a/ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt +++ b/ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt @@ -10,17 +10,17 @@ require "connect.inc"; $link = ldap_connect($host, $port); foreach([ - LDAP_OPT_X_TLS_PROTOCOL_SSL2, - LDAP_OPT_X_TLS_PROTOCOL_SSL3, - LDAP_OPT_X_TLS_PROTOCOL_TLS1_0, - LDAP_OPT_X_TLS_PROTOCOL_TLS1_1, - LDAP_OPT_X_TLS_PROTOCOL_TLS1_2, + LDAP_OPT_X_TLS_PROTOCOL_SSL2, + LDAP_OPT_X_TLS_PROTOCOL_SSL3, + LDAP_OPT_X_TLS_PROTOCOL_TLS1_0, + LDAP_OPT_X_TLS_PROTOCOL_TLS1_1, + LDAP_OPT_X_TLS_PROTOCOL_TLS1_2, ] as $option) { - $result = ldap_set_option($link, LDAP_OPT_X_TLS_PROTOCOL_MIN, $option); - var_dump($result); + $result = ldap_set_option($link, LDAP_OPT_X_TLS_PROTOCOL_MIN, $option); + var_dump($result); - ldap_get_option($link, LDAP_OPT_X_TLS_PROTOCOL_MIN, $optionval); - var_dump($optionval); + ldap_get_option($link, LDAP_OPT_X_TLS_PROTOCOL_MIN, $optionval); + var_dump($optionval); } ?> --EXPECT-- diff --git a/ext/ldap/tests/ldap_set_option_variation.phpt b/ext/ldap/tests/ldap_set_option_variation.phpt index f31473ef7a..4f1e8626d7 100644 --- a/ext/ldap/tests/ldap_set_option_variation.phpt +++ b/ext/ldap/tests/ldap_set_option_variation.phpt @@ -13,50 +13,50 @@ $link = ldap_connect($host, $port); $option = null; $controls = array( - array("oid" => "1.2.752.58.10.1", "iscritical" => true), - array("oid" => "1.2.752.58.1.10", "value" => "magic"), + array("oid" => "1.2.752.58.10.1", "iscritical" => true), + array("oid" => "1.2.752.58.1.10", "value" => "magic"), ); var_dump(ldap_set_option($link, LDAP_OPT_DEREF, LDAP_DEREF_ALWAYS)); ldap_get_option($link, LDAP_OPT_DEREF, $option); var_dump( - $option === LDAP_DEREF_ALWAYS, - ldap_set_option($link, LDAP_OPT_SIZELIMIT, 123) + $option === LDAP_DEREF_ALWAYS, + ldap_set_option($link, LDAP_OPT_SIZELIMIT, 123) ); ldap_get_option($link, LDAP_OPT_SIZELIMIT, $option); var_dump( - $option, - ldap_set_option($link, LDAP_OPT_TIMELIMIT, 33) + $option, + ldap_set_option($link, LDAP_OPT_TIMELIMIT, 33) ); ldap_get_option($link, LDAP_OPT_TIMELIMIT, $option); var_dump( - $option, - ldap_set_option($link, LDAP_OPT_NETWORK_TIMEOUT, 44) + $option, + ldap_set_option($link, LDAP_OPT_NETWORK_TIMEOUT, 44) ); ldap_get_option($link, LDAP_OPT_NETWORK_TIMEOUT, $option); var_dump( - $option, - ldap_set_option($link, LDAP_OPT_REFERRALS, true) + $option, + ldap_set_option($link, LDAP_OPT_REFERRALS, true) ); ldap_get_option($link, LDAP_OPT_REFERRALS, $option); var_dump( - (bool) $option, - ldap_set_option($link, LDAP_OPT_RESTART, false) + (bool) $option, + ldap_set_option($link, LDAP_OPT_RESTART, false) ); ldap_get_option($link, LDAP_OPT_RESTART, $option); var_dump( - (bool) $option, - ldap_set_option($link, LDAP_OPT_SERVER_CONTROLS, $controls) + (bool) $option, + ldap_set_option($link, LDAP_OPT_SERVER_CONTROLS, $controls) ); ldap_get_option($link, LDAP_OPT_SERVER_CONTROLS, $option); var_dump( - $option, - ldap_set_option($link, LDAP_OPT_CLIENT_CONTROLS, $controls) + $option, + ldap_set_option($link, LDAP_OPT_CLIENT_CONTROLS, $controls) ); ldap_get_option($link, LDAP_OPT_CLIENT_CONTROLS, $option); var_dump( - $option, - ldap_set_option($link, LDAP_OPT_MATCHED_DN, "dc=test,dc=com") + $option, + ldap_set_option($link, LDAP_OPT_MATCHED_DN, "dc=test,dc=com") ); ldap_get_option($link, LDAP_OPT_MATCHED_DN, $option); var_dump($option); diff --git a/ext/ldap/tests/ldap_unbind_variation.phpt b/ext/ldap/tests/ldap_unbind_variation.phpt index 3233e90b6f..0c933543eb 100644 --- a/ext/ldap/tests/ldap_unbind_variation.phpt +++ b/ext/ldap/tests/ldap_unbind_variation.phpt @@ -11,16 +11,16 @@ Patrick Allaert <patrickallaert@php.net> require "connect.inc"; function rebind_proc ($ds, $ldap_url) { - global $user; - global $passwd; - global $protocol_version; + global $user; + global $passwd; + global $protocol_version; - // required by most modern LDAP servers, use LDAPv3 - ldap_set_option($a, LDAP_OPT_PROTOCOL_VERSION, $protocol_version); + // required by most modern LDAP servers, use LDAPv3 + ldap_set_option($a, LDAP_OPT_PROTOCOL_VERSION, $protocol_version); - if (!ldap_bind($a, $user, $passwd)) { - print "Cannot bind"; - } + if (!ldap_bind($a, $user, $passwd)) { + print "Cannot bind"; + } } $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); diff --git a/ext/ldap/tests/skipif.inc b/ext/ldap/tests/skipif.inc index d3494284b0..dc016787da 100644 --- a/ext/ldap/tests/skipif.inc +++ b/ext/ldap/tests/skipif.inc @@ -1,5 +1,5 @@ <?php if (!extension_loaded('ldap')){ - die('skip ldap extension not available'); + die('skip ldap extension not available'); } ?> diff --git a/ext/ldap/tests/skipifbindfailure.inc b/ext/ldap/tests/skipifbindfailure.inc index f79bb9d690..8f66c6cb96 100644 --- a/ext/ldap/tests/skipifbindfailure.inc +++ b/ext/ldap/tests/skipifbindfailure.inc @@ -3,11 +3,11 @@ require_once 'connect.inc'; if ($skip_on_bind_failure) { - $link = ldap_connect($host, $port); - ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version); - if (!@ldap_bind($link, $user, $passwd)) - die(sprintf("skip Can't bind to LDAP Server - [%d] %s", ldap_errno($link), ldap_error($link))); + $link = ldap_connect($host, $port); + ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version); + if (!@ldap_bind($link, $user, $passwd)) + die(sprintf("skip Can't bind to LDAP Server - [%d] %s", ldap_errno($link), ldap_error($link))); - ldap_unbind($link); + ldap_unbind($link); } ?> diff --git a/ext/ldap/tests/skipifcontrol.inc b/ext/ldap/tests/skipifcontrol.inc index ae551d6add..ff690068ae 100644 --- a/ext/ldap/tests/skipifcontrol.inc +++ b/ext/ldap/tests/skipifcontrol.inc @@ -3,11 +3,11 @@ require_once 'connect.inc'; function skipifunsupportedcontrol($oid) { - global $host, $port, $user, $passwd, $protocol_version, $base; - $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); - $result = ldap_read($link, '', '(objectClass=*)', ['supportedControl']); - if (!in_array($oid, ldap_get_entries($link, $result)[0]['supportedcontrol'])) { - die(sprintf("skip Unsupported control %s", $oid)); - } + global $host, $port, $user, $passwd, $protocol_version, $base; + $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); + $result = ldap_read($link, '', '(objectClass=*)', ['supportedControl']); + if (!in_array($oid, ldap_get_entries($link, $result)[0]['supportedcontrol'])) { + die(sprintf("skip Unsupported control %s", $oid)); + } } ?> |