From a88bfff59a5f6bb79c8c1b7bcdffac2dcb6595da Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=B4me=20Chilliet?= Date: Tue, 18 Jun 2019 16:10:53 +0200 Subject: [PATCH] Remove ZPP tests from ext/ldap --- ext/ldap/tests/bug48696.phpt | 15 ------- ext/ldap/tests/ldap_add_error.phpt | 20 --------- ext/ldap/tests/ldap_bind_error.phpt | 6 --- ext/ldap/tests/ldap_compare_error.phpt | 20 --------- ext/ldap/tests/ldap_delete_error.phpt | 16 ------- ext/ldap/tests/ldap_get_values_len_error.phpt | 14 ------- ext/ldap/tests/ldap_mod_add_error.phpt | 20 --------- ext/ldap/tests/ldap_mod_del_error.phpt | 20 --------- ext/ldap/tests/ldap_mod_replace_error.phpt | 20 --------- ext/ldap/tests/ldap_modify_batch_error.phpt | 20 --------- ext/ldap/tests/ldap_modify_error.phpt | 20 --------- ext/ldap/tests/ldap_next_attribute_error.phpt | 8 ---- ext/ldap/tests/ldap_sasl_bind_error.phpt | 6 --- ext/ldap/tests/ldap_search_error.phpt | 12 ------ .../tests/ldap_set_rebind_proc_error.phpt | 8 ---- ext/ldap/tests/ldap_start_tls_error.phpt | 27 ------------ ext/ldap/tests/ldap_unbind_error.phpt | 42 ------------------- 17 files changed, 294 deletions(-) delete mode 100644 ext/ldap/tests/bug48696.phpt delete mode 100644 ext/ldap/tests/ldap_start_tls_error.phpt delete mode 100644 ext/ldap/tests/ldap_unbind_error.phpt diff --git a/ext/ldap/tests/bug48696.phpt b/ext/ldap/tests/bug48696.phpt deleted file mode 100644 index 8d25b67236..0000000000 --- a/ext/ldap/tests/bug48696.phpt +++ /dev/null @@ -1,15 +0,0 @@ ---TEST-- -Bug #48696 (ldap_read() segfaults with invalid parameters) ---SKIPIF-- - ---FILE-- - ---EXPECTF-- -Warning: ldap_read(): supplied argument is not a valid ldap link resource in %s on line %d diff --git a/ext/ldap/tests/ldap_add_error.phpt b/ext/ldap/tests/ldap_add_error.phpt index 533496a4b2..14476bb876 100644 --- a/ext/ldap/tests/ldap_add_error.phpt +++ b/ext/ldap/tests/ldap_add_error.phpt @@ -12,14 +12,6 @@ require "connect.inc"; $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); -// Too few parameters -var_dump(ldap_add()); -var_dump(ldap_add($link)); -var_dump(ldap_add($link, "$base")); - -// Too many parameters -var_dump(ldap_add($link, "$base", array(), [], "Additional data")); - var_dump(ldap_add($link, "$base", array())); // Invalid DN @@ -97,18 +89,6 @@ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); ldap_delete($link, "dc=my-domain,$base"); ?> --EXPECTF-- -Warning: ldap_add() expects at least 3 parameters, 0 given in %s on line %d -NULL - -Warning: ldap_add() expects at least 3 parameters, 1 given in %s on line %d -NULL - -Warning: ldap_add() expects at least 3 parameters, 2 given in %s on line %d -NULL - -Warning: ldap_add() expects at most 4 parameters, 5 given in %s on line %d -NULL - Warning: ldap_add(): Add: Protocol error in %s on line %d bool(false) diff --git a/ext/ldap/tests/ldap_bind_error.phpt b/ext/ldap/tests/ldap_bind_error.phpt index a569ce6922..ee16908b57 100644 --- a/ext/ldap/tests/ldap_bind_error.phpt +++ b/ext/ldap/tests/ldap_bind_error.phpt @@ -13,9 +13,6 @@ require "connect.inc"; $link = ldap_connect($host, $port); ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version); -// Invalid parameter count -var_dump(ldap_bind($link, $user, $passwd, null)); - // Invalid password var_dump(ldap_bind($link, $user, "ThisIsNotCorrect$passwd")); @@ -24,9 +21,6 @@ var_dump(ldap_bind($link, "unexistingProperty=weirdValue,$user", $passwd)); ?> ===DONE=== --EXPECTF-- -Warning: ldap_bind() expects at most 3 parameters, 4 given in %s on line %d -bool(false) - Warning: ldap_bind(): Unable to bind to server: Invalid credentials in %s on line %d bool(false) diff --git a/ext/ldap/tests/ldap_compare_error.phpt b/ext/ldap/tests/ldap_compare_error.phpt index 120dfab059..50e93d660f 100644 --- a/ext/ldap/tests/ldap_compare_error.phpt +++ b/ext/ldap/tests/ldap_compare_error.phpt @@ -13,14 +13,6 @@ require "connect.inc"; $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); insert_dummy_data($link, $base); -// Too few parameters -var_dump(ldap_compare($link)); -var_dump(ldap_compare($link, $link)); -var_dump(ldap_compare($link, $link, $link)); - -// Too many parameters -var_dump(ldap_compare($link, $link, $link, $link, [], "Additional data")); - var_dump( ldap_compare($link, "cn=userNotAvailable,$base", "sn", "testSN1"), ldap_error($link), @@ -36,18 +28,6 @@ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); remove_dummy_data($link, $base); ?> --EXPECTF-- -Warning: ldap_compare() expects at least 4 parameters, 1 given in %s on line %d -NULL - -Warning: ldap_compare() expects at least 4 parameters, 2 given in %s on line %d -NULL - -Warning: ldap_compare() expects at least 4 parameters, 3 given in %s on line %d -NULL - -Warning: ldap_compare() expects at most 5 parameters, 6 given in %s on line %d -NULL - Warning: ldap_compare(): Compare: No such object in %s on line %d int(-1) string(14) "No such object" diff --git a/ext/ldap/tests/ldap_delete_error.phpt b/ext/ldap/tests/ldap_delete_error.phpt index a34d7b39fe..30a4c2e277 100644 --- a/ext/ldap/tests/ldap_delete_error.phpt +++ b/ext/ldap/tests/ldap_delete_error.phpt @@ -12,13 +12,6 @@ require "connect.inc"; $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); -// Too few parameters -var_dump(ldap_delete()); -var_dump(ldap_delete($link)); - -// Too many parameters -var_dump(ldap_delete($link, "$base", [], "Additional data")); - // Invalid DN var_dump( ldap_delete($link, "weirdAttribute=val"), @@ -41,15 +34,6 @@ require "connect.inc"; $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); ?> --EXPECTF-- -Warning: ldap_delete() expects at least 2 parameters, 0 given in %s on line %d -NULL - -Warning: ldap_delete() expects at least 2 parameters, 1 given in %s on line %d -NULL - -Warning: ldap_delete() expects at most 3 parameters, 4 given in %s on line %d -NULL - Warning: ldap_delete(): Delete: Invalid DN syntax in %s on line %d bool(false) string(17) "Invalid DN syntax" diff --git a/ext/ldap/tests/ldap_get_values_len_error.phpt b/ext/ldap/tests/ldap_get_values_len_error.phpt index 8bcaee070f..8040dd6dab 100644 --- a/ext/ldap/tests/ldap_get_values_len_error.phpt +++ b/ext/ldap/tests/ldap_get_values_len_error.phpt @@ -15,11 +15,6 @@ insert_dummy_data($link, $base); $result = ldap_search($link, "$base", "(objectclass=organization)"); $entry = ldap_first_entry($link, $result); -// Too few parameters -var_dump(ldap_get_values_len($link)); -var_dump(ldap_get_values_len($link, $entry)); -var_dump(ldap_get_values_len($link, $entry, "weirdAttribute", "Additional data")); - var_dump(ldap_get_values_len($link, $entry, "inexistentAttribute")); ?> ===DONE=== @@ -31,15 +26,6 @@ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); remove_dummy_data($link, $base); ?> --EXPECTF-- -Warning: ldap_get_values_len() expects exactly 3 parameters, 1 given in %s on line %d -NULL - -Warning: ldap_get_values_len() expects exactly 3 parameters, 2 given in %s on line %d -NULL - -Warning: ldap_get_values_len() expects exactly 3 parameters, 4 given in %s on line %d -NULL - Warning: ldap_get_values_len(): Cannot get the value(s) of attribute %s in %s on line %d bool(false) ===DONE=== diff --git a/ext/ldap/tests/ldap_mod_add_error.phpt b/ext/ldap/tests/ldap_mod_add_error.phpt index 4bfbaa5551..4cf5ae5725 100644 --- a/ext/ldap/tests/ldap_mod_add_error.phpt +++ b/ext/ldap/tests/ldap_mod_add_error.phpt @@ -12,14 +12,6 @@ require "connect.inc"; $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); -// Too few parameters -var_dump(ldap_mod_add()); -var_dump(ldap_mod_add($link)); -var_dump(ldap_mod_add($link, "$base")); - -// Too many parameters -var_dump(ldap_mod_add($link, "$base", array(), [], "Additional data")); - // DN not found var_dump(ldap_mod_add($link, "dc=my-domain,$base", array())); @@ -57,18 +49,6 @@ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); ldap_delete($link, "dc=my-domain,$base"); ?> --EXPECTF-- -Warning: ldap_mod_add() expects at least 3 parameters, 0 given in %s on line %d -NULL - -Warning: ldap_mod_add() expects at least 3 parameters, 1 given in %s on line %d -NULL - -Warning: ldap_mod_add() expects at least 3 parameters, 2 given in %s on line %d -NULL - -Warning: ldap_mod_add() expects at most 4 parameters, 5 given in %s on line %d -NULL - Warning: ldap_mod_add(): Modify: No such object in %s on line %d bool(false) diff --git a/ext/ldap/tests/ldap_mod_del_error.phpt b/ext/ldap/tests/ldap_mod_del_error.phpt index 129d6472c1..1cdf18a0c5 100644 --- a/ext/ldap/tests/ldap_mod_del_error.phpt +++ b/ext/ldap/tests/ldap_mod_del_error.phpt @@ -12,14 +12,6 @@ require "connect.inc"; $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); -// Too few parameters -var_dump(ldap_mod_del()); -var_dump(ldap_mod_del($link)); -var_dump(ldap_mod_del($link, "$base")); - -// Too many parameters -var_dump(ldap_mod_del($link, "$base", array(), [], "Additional data")); - // DN not found var_dump(ldap_mod_del($link, "dc=my-domain,$base", array())); @@ -39,18 +31,6 @@ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); ldap_delete($link, "dc=my-domain,$base"); ?> --EXPECTF-- -Warning: ldap_mod_del() expects at least 3 parameters, 0 given in %s on line %d -NULL - -Warning: ldap_mod_del() expects at least 3 parameters, 1 given in %s on line %d -NULL - -Warning: ldap_mod_del() expects at least 3 parameters, 2 given in %s on line %d -NULL - -Warning: ldap_mod_del() expects at most 4 parameters, 5 given in %s on line %d -NULL - Warning: ldap_mod_del(): Modify: No such object in %s on line %d bool(false) diff --git a/ext/ldap/tests/ldap_mod_replace_error.phpt b/ext/ldap/tests/ldap_mod_replace_error.phpt index 4f435b13d2..b920ebafad 100644 --- a/ext/ldap/tests/ldap_mod_replace_error.phpt +++ b/ext/ldap/tests/ldap_mod_replace_error.phpt @@ -12,14 +12,6 @@ require "connect.inc"; $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); -// Too few parameters -var_dump(ldap_mod_replace()); -var_dump(ldap_mod_replace($link)); -var_dump(ldap_mod_replace($link, "$base")); - -// Too many parameters -var_dump(ldap_mod_replace($link, "$base", array(), [], "Additional data")); - // DN not found var_dump(ldap_mod_replace($link, "dc=my-domain,$base", array())); @@ -37,18 +29,6 @@ require "connect.inc"; $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); ?> --EXPECTF-- -Warning: ldap_mod_replace() expects at least 3 parameters, 0 given in %s on line %d -NULL - -Warning: ldap_mod_replace() expects at least 3 parameters, 1 given in %s on line %d -NULL - -Warning: ldap_mod_replace() expects at least 3 parameters, 2 given in %s on line %d -NULL - -Warning: ldap_mod_replace() expects at most 4 parameters, 5 given in %s on line %d -NULL - Warning: ldap_mod_replace(): Modify: No such object in %s on line %d bool(false) diff --git a/ext/ldap/tests/ldap_modify_batch_error.phpt b/ext/ldap/tests/ldap_modify_batch_error.phpt index a2d9ef9deb..e1806fdf11 100644 --- a/ext/ldap/tests/ldap_modify_batch_error.phpt +++ b/ext/ldap/tests/ldap_modify_batch_error.phpt @@ -20,14 +20,6 @@ $addGivenName = array( ) ); -// Too few parameters -var_dump(ldap_modify_batch()); -var_dump(ldap_modify_batch($link)); -var_dump(ldap_modify_batch($link, "$base")); - -// Too many parameters -var_dump(ldap_modify_batch($link, "$base", $addGivenName, [], "Invalid additional parameter")); - // DN not found var_dump(ldap_modify_batch($link, "cn=not-found,$base", $addGivenName)); @@ -78,18 +70,6 @@ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); ldap_delete($link, "dc=my-domain,$base"); ?> --EXPECTF-- -Warning: ldap_modify_batch() expects at least 3 parameters, 0 given in %s on line %d -NULL - -Warning: ldap_modify_batch() expects at least 3 parameters, 1 given in %s on line %d -NULL - -Warning: ldap_modify_batch() expects at least 3 parameters, 2 given in %s on line %d -NULL - -Warning: ldap_modify_batch() expects at most 4 parameters, 5 given in %s on line %d -NULL - Warning: ldap_modify_batch(): Batch Modify: No such object in %s on line %d bool(false) diff --git a/ext/ldap/tests/ldap_modify_error.phpt b/ext/ldap/tests/ldap_modify_error.phpt index 31069bb98c..4e10e77349 100644 --- a/ext/ldap/tests/ldap_modify_error.phpt +++ b/ext/ldap/tests/ldap_modify_error.phpt @@ -12,14 +12,6 @@ require "connect.inc"; $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); -// Too few parameters -var_dump(ldap_modify()); -var_dump(ldap_modify($link)); -var_dump(ldap_modify($link, "$base")); - -// Too many parameters -var_dump(ldap_modify($link, "$base", array(), [], "Additional data")); - // DN not found var_dump(ldap_modify($link, "cn=not-found,$base", array())); @@ -57,18 +49,6 @@ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); ldap_delete($link, "dc=my-domain,$base"); ?> --EXPECTF-- -Warning: ldap_modify() expects at least 3 parameters, 0 given in %s on line %d -NULL - -Warning: ldap_modify() expects at least 3 parameters, 1 given in %s on line %d -NULL - -Warning: ldap_modify() expects at least 3 parameters, 2 given in %s on line %d -NULL - -Warning: ldap_modify() expects at most 4 parameters, 5 given in %s on line %d -NULL - Warning: ldap_modify(): Modify: No such object in %s on line %d bool(false) diff --git a/ext/ldap/tests/ldap_next_attribute_error.phpt b/ext/ldap/tests/ldap_next_attribute_error.phpt index 0bedf8c33f..9d668d9c1b 100644 --- a/ext/ldap/tests/ldap_next_attribute_error.phpt +++ b/ext/ldap/tests/ldap_next_attribute_error.phpt @@ -15,8 +15,6 @@ insert_dummy_data($link, $base); $result = ldap_search($link, "$base", "(objectclass=organization)"); $entry = ldap_first_entry($link, $result); var_dump( - ldap_next_attribute($link), - ldap_next_attribute($link, $link), ldap_next_attribute($link, $entry) ); ?> @@ -29,12 +27,6 @@ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); remove_dummy_data($link, $base); ?> --EXPECTF-- -Warning: ldap_next_attribute() expects %s 2 parameters, 1 given in %s on line %d - -Warning: ldap_next_attribute(): supplied resource is not a valid ldap result entry resource in %s on line %d - Warning: ldap_next_attribute(): called before calling ldap_first_attribute() or no attributes found in result entry in %s on line %d -NULL -bool(false) bool(false) ===DONE=== diff --git a/ext/ldap/tests/ldap_sasl_bind_error.phpt b/ext/ldap/tests/ldap_sasl_bind_error.phpt index 180066bb2c..9feb912c7e 100644 --- a/ext/ldap/tests/ldap_sasl_bind_error.phpt +++ b/ext/ldap/tests/ldap_sasl_bind_error.phpt @@ -14,9 +14,6 @@ require "connect.inc"; $link = ldap_connect($host, $port); ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version); -// Invalid parameter count -var_dump(ldap_sasl_bind()); - // Invalid DN var_dump(ldap_sasl_bind($link, "Invalid DN", $passwd, 'DIGEST-MD5', 'realm', $sasl_user)); @@ -33,9 +30,6 @@ var_dump(ldap_sasl_bind($link, "unexistingProperty=weirdValue,$user", $passwd)); ?> ===DONE=== --EXPECTF-- -Warning: ldap_sasl_bind() expects at least 1 parameter, 0 given in %s on line %d -bool(false) - Warning: ldap_sasl_bind(): Unable to bind to server: Invalid DN syntax in %s on line %d bool(false) diff --git a/ext/ldap/tests/ldap_search_error.phpt b/ext/ldap/tests/ldap_search_error.phpt index 795edd3180..c2e9f32456 100644 --- a/ext/ldap/tests/ldap_search_error.phpt +++ b/ext/ldap/tests/ldap_search_error.phpt @@ -15,15 +15,9 @@ $link = ldap_connect($host, $port); $dn = "dc=not-found,$base"; $filter = "(dc=*)"; -$result = ldap_search(); -var_dump($result); - $result = ldap_search($link, $dn, $filter); var_dump($result); -$result = ldap_search($link, $dn, $filter, NULL); -var_dump($result); - $result = ldap_search($link, $dn, $filter, array(1 => 'top')); var_dump($result); @@ -38,15 +32,9 @@ var_dump($result); ?> ===DONE=== --EXPECTF-- -Warning: ldap_search() expects at least 3 parameters, 0 given in %s on line %d -NULL - Warning: ldap_search(): Search: No such object in %s on line %d bool(false) -Warning: ldap_search() expects parameter 4 to be array, null given in %s on line %d -NULL - Warning: ldap_search(): Array initialization wrong in %s on line %d bool(false) diff --git a/ext/ldap/tests/ldap_set_rebind_proc_error.phpt b/ext/ldap/tests/ldap_set_rebind_proc_error.phpt index c8c7985826..595fb5c206 100644 --- a/ext/ldap/tests/ldap_set_rebind_proc_error.phpt +++ b/ext/ldap/tests/ldap_set_rebind_proc_error.phpt @@ -33,18 +33,10 @@ function rebind_proc ($ds, $ldap_url) { } $link = ldap_connect($host, $port); -var_dump(ldap_set_rebind_proc($link)); -var_dump(ldap_set_rebind_proc($link, "rebind_proc", "Additional data")); var_dump(ldap_set_rebind_proc($link, "rebind_proc_inexistent")); ?> ===DONE=== --EXPECTF-- -Warning: ldap_set_rebind_proc() expects exactly 2 parameters, 1 given in %s on line %d -bool(false) - -Warning: ldap_set_rebind_proc() expects exactly 2 parameters, 3 given in %s on line %d -bool(false) - Warning: ldap_set_rebind_proc(): Two arguments expected for 'rebind_proc_inexistent' to be a valid callback in %s on line %d bool(false) ===DONE=== diff --git a/ext/ldap/tests/ldap_start_tls_error.phpt b/ext/ldap/tests/ldap_start_tls_error.phpt deleted file mode 100644 index 686f5331a8..0000000000 --- a/ext/ldap/tests/ldap_start_tls_error.phpt +++ /dev/null @@ -1,27 +0,0 @@ ---TEST-- -ldap_start_tls() - Binding that should fail ---CREDITS-- -Patrick Allaert -# Belgian PHP Testfest 2009 ---SKIPIF-- - - ---FILE-- - -===DONE=== ---EXPECTF-- -Warning: ldap_start_tls() expects exactly 1 parameter, 0 given in %s on line %d -NULL - -Warning: ldap_start_tls() expects exactly 1 parameter, 2 given in %s on line %d -NULL -===DONE=== diff --git a/ext/ldap/tests/ldap_unbind_error.phpt b/ext/ldap/tests/ldap_unbind_error.phpt deleted file mode 100644 index 85e586eb6f..0000000000 --- a/ext/ldap/tests/ldap_unbind_error.phpt +++ /dev/null @@ -1,42 +0,0 @@ ---TEST-- -ldap_unbind() - ldap_unbind() operations that should fail ---CREDITS-- -Patrick Allaert -# Belgian PHP Testfest 2009 ---SKIPIF-- - - ---FILE-- - -===DONE=== ---EXPECTF-- -Warning: ldap_unbind() expects exactly 1 parameter, 0 given in %s on line %d -bool(false) - -Warning: ldap_unbind() expects exactly 1 parameter, 2 given in %s on line %d -bool(false) - -Warning: ldap_unbind() expects parameter 1 to be resource, string given in %s on line %d -bool(false) -bool(true) - -Warning: ldap_unbind(): supplied resource is not a valid ldap link resource in %s on line %d -bool(false) -===DONE=== -- 2.40.0