diff options
Diffstat (limited to 'ext/ldap')
29 files changed, 10 insertions, 1007 deletions
diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4 index 1812cb0e0b..204aeb6085 100644 --- a/ext/ldap/config.m4 +++ b/ext/ldap/config.m4 @@ -99,7 +99,7 @@ PHP_ARG_WITH([ldap-sasl], if test "$PHP_LDAP" != "no"; then - PHP_NEW_EXTENSION(ldap, ldap.c, $ext_shared,,-DLDAP_DEPRECATED=1 -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) + PHP_NEW_EXTENSION(ldap, ldap.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) if test "$PHP_LDAP" = "yes"; then for i in /usr/local /usr; do diff --git a/ext/ldap/config.w32 b/ext/ldap/config.w32 index 49f740bd65..59aff718bf 100644 --- a/ext/ldap/config.w32 +++ b/ext/ldap/config.w32 @@ -18,7 +18,6 @@ if (PHP_LDAP != "no") { AC_DEFINE('HAVE_LDAP', 1); AC_DEFINE('HAVE_LDAP_SASL', 1); AC_DEFINE('HAVE_LDAP_SASL_SASL_H', 1); - AC_DEFINE('LDAP_DEPRECATED', 1); AC_DEFINE('HAVE_LDAP_CONTROL_FIND', 1); AC_DEFINE('HAVE_LDAP_PARSE_EXTENDED_RESULT', 1); AC_DEFINE('HAVE_LDAP_EXTENDED_OPERATION_S', 1); diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index 8a91e5060c..411c289894 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -2945,39 +2945,6 @@ cleanup: } /* }}} */ -/* {{{ proto bool ldap_sort(resource link, resource result, string sortfilter) - Sort LDAP result entries */ -PHP_FUNCTION(ldap_sort) -{ - zval *link, *result; - ldap_linkdata *ld; - char *sortfilter; - size_t sflen; - zend_resource *le; - - if (zend_parse_parameters(ZEND_NUM_ARGS(), "rrs", &link, &result, &sortfilter, &sflen) != SUCCESS) { - RETURN_FALSE; - } - - if ((ld = (ldap_linkdata *)zend_fetch_resource(Z_RES_P(link), "ldap link", le_link)) == NULL) { - RETURN_FALSE; - } - - le = Z_RES_P(result); - if (le->type != le_result) { - php_error_docref(NULL, E_WARNING, "Supplied resource is not a valid ldap result resource"); - RETURN_FALSE; - } - - if (ldap_sort_entries(ld->link, (LDAPMessage **) &le->ptr, sflen ? sortfilter : NULL, strcmp) != LDAP_SUCCESS) { - php_error_docref(NULL, E_WARNING, "%s", ldap_err2string(errno)); - RETURN_FALSE; - } - - RETURN_TRUE; -} -/* }}} */ - #if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP /* {{{ proto bool ldap_get_option(resource link, int option, mixed retval) Get the current value of various session-wide parameters */ @@ -4621,12 +4588,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_compare, 0, 0, 4) ZEND_ARG_INFO(0, servercontrols) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_sort, 0, 0, 3) - ZEND_ARG_INFO(0, link) - ZEND_ARG_INFO(0, result) - ZEND_ARG_INFO(0, sortfilter) -ZEND_END_ARG_INFO() - #ifdef LDAP_CONTROL_PAGEDRESULTS ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_control_paged_result, 0, 0, 2) ZEND_ARG_INFO(0, link) @@ -4825,7 +4786,6 @@ static const zend_function_entry ldap_functions[] = { PHP_FE(ldap_err2str, arginfo_ldap_err2str) PHP_FE(ldap_error, arginfo_ldap_resource) PHP_FE(ldap_compare, arginfo_ldap_compare) - PHP_DEP_FE(ldap_sort, arginfo_ldap_sort) #if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP PHP_FE(ldap_rename, arginfo_ldap_rename) diff --git a/ext/ldap/tests/ldap_connect_error.phpt b/ext/ldap/tests/ldap_connect_error.phpt index b93375c39e..24561e1576 100644 --- a/ext/ldap/tests/ldap_connect_error.phpt +++ b/ext/ldap/tests/ldap_connect_error.phpt @@ -12,7 +12,6 @@ ldap.max_links=1 require "connect.inc"; // too many arguments -var_dump(ldap_connect(null, null, null)); var_dump(ldap_connect("ldap://$host:$port/$base")); $links = array(); @@ -21,9 +20,6 @@ $links[1] = ldap_connect($host, $port); ?> ===DONE=== --EXPECTF-- -Warning: ldap_connect() expects at most 2 parameters, 3 given in %s on line %d -bool(false) - Warning: ldap_connect(): Could not create session handle: %s in %s on line %d bool(false) diff --git a/ext/ldap/tests/ldap_count_entries_error.phpt b/ext/ldap/tests/ldap_count_entries_error.phpt deleted file mode 100644 index 552625a7eb..0000000000 --- a/ext/ldap/tests/ldap_count_entries_error.phpt +++ /dev/null @@ -1,23 +0,0 @@ ---TEST-- -ldap_count_entries() - Testing counting LDAP entries that should fail ---CREDITS-- -Patrick Allaert <patrickallaert@php.net> -# Belgian PHP Testfest 2009 ---SKIPIF-- -<?php require_once('skipif.inc'); ?> ---FILE-- -<?php -require "connect.inc"; - -$link = ldap_connect($host, $port); -var_dump(ldap_count_entries($link)); -var_dump(ldap_count_entries($link, $link)); -?> -===DONE=== ---EXPECTF-- -Warning: ldap_count_entries() expects exactly 2 parameters, 1 given in %s on line %d -NULL - -Warning: ldap_count_entries(): supplied resource is not a valid ldap result resource in %s on line %d -bool(false) -===DONE=== diff --git a/ext/ldap/tests/ldap_dn2ufn.phpt b/ext/ldap/tests/ldap_dn2ufn.phpt index 8082e97809..54c90658cf 100644 --- a/ext/ldap/tests/ldap_dn2ufn.phpt +++ b/ext/ldap/tests/ldap_dn2ufn.phpt @@ -14,20 +14,15 @@ var_dump(ldap_dn2ufn("cn=bob,ou=users,dc=example,dc=com")); /* Convert DN with < > characters */ var_dump(ldap_dn2ufn("cn=<bob>,dc=example,dc=com")); -/* Too many parameters */ -ldap_dn2ufn("cn=bob,dc=example,dc=com", 1); - /* Bad DN value */ var_dump(ldap_dn2ufn("bob,dc=example,dc=com")); echo "Done\n"; ?> ---EXPECTF-- +--EXPECT-- string(16) "bob, example.com" string(23) "bob, users, example.com" bool(false) - -Warning: ldap_dn2ufn() expects exactly 1 parameter, 2 given in %s on line %d bool(false) Done diff --git a/ext/ldap/tests/ldap_err2str_error.phpt b/ext/ldap/tests/ldap_err2str_error.phpt deleted file mode 100644 index 0963ac4101..0000000000 --- a/ext/ldap/tests/ldap_err2str_error.phpt +++ /dev/null @@ -1,28 +0,0 @@ ---TEST-- -ldap_err2str() - Incorrect usage of number to string conversion ---CREDITS-- -Patrick Allaert <patrickallaert@php.net> -# Belgian PHP Testfest 2009 ---SKIPIF-- -<?php require_once('skipif.inc'); ?> ---FILE-- -<?php -// Too few args -var_dump(ldap_err2str()); - -// Too many args -var_dump(ldap_err2str(1, "Additional data")); - -var_dump(ldap_err2str("weird")); -?> -===DONE=== ---EXPECTF-- -Warning: ldap_err2str() expects exactly 1 parameter, 0 given in %s on line %d -NULL - -Warning: ldap_err2str() expects exactly 1 parameter, 2 given in %s on line %d -NULL - -Warning: ldap_err2str() expects parameter 1 to be int, string given in %s on line %d -NULL -===DONE=== diff --git a/ext/ldap/tests/ldap_errno_error.phpt b/ext/ldap/tests/ldap_errno_error.phpt deleted file mode 100644 index a05876c88e..0000000000 --- a/ext/ldap/tests/ldap_errno_error.phpt +++ /dev/null @@ -1,23 +0,0 @@ ---TEST-- -ldap_errno() - ldap_errno() operation that should fail ---CREDITS-- -Patrick Allaert <patrickallaert@php.net> -# Belgian PHP Testfest 2009 ---SKIPIF-- -<?php require_once('skipif.inc'); ?> ---FILE-- -<?php -// Too few parameters -var_dump(ldap_errno()); - -// Too many parameters -var_dump(ldap_errno(null, null)); -?> -===DONE=== ---EXPECTF-- -Warning: ldap_errno() expects exactly 1 parameter, 0 given in %s on line %d -NULL - -Warning: ldap_errno() expects exactly 1 parameter, 2 given in %s on line %d -NULL -===DONE=== diff --git a/ext/ldap/tests/ldap_error_error.phpt b/ext/ldap/tests/ldap_error_error.phpt deleted file mode 100644 index e74eacf008..0000000000 --- a/ext/ldap/tests/ldap_error_error.phpt +++ /dev/null @@ -1,23 +0,0 @@ ---TEST-- -ldap_error() - ldap_error() operation that should fail ---CREDITS-- -Patrick Allaert <patrickallaert@php.net> -# Belgian PHP Testfest 2009 ---SKIPIF-- -<?php require_once('skipif.inc'); ?> ---FILE-- -<?php -// Too few parameters -var_dump(ldap_error()); - -// Too many parameters -var_dump(ldap_error(null, null)); -?> -===DONE=== ---EXPECTF-- -Warning: ldap_error() expects exactly 1 parameter, 0 given in %s on line %d -NULL - -Warning: ldap_error() expects exactly 1 parameter, 2 given in %s on line %d -NULL -===DONE=== diff --git a/ext/ldap/tests/ldap_explode_dn.phpt b/ext/ldap/tests/ldap_explode_dn.phpt index 2337ac9eff..aa8ab10088 100644 --- a/ext/ldap/tests/ldap_explode_dn.phpt +++ b/ext/ldap/tests/ldap_explode_dn.phpt @@ -23,12 +23,6 @@ var_dump(ldap_explode_dn("cn=<bob>,dc=example,dc=com", 0)); /* Explode without attributes and < > characters */ var_dump(ldap_explode_dn("cn=<bob>,dc=example,dc=com", 1)); -/* Too few parameters */ -ldap_explode_dn("cn=bob,dc=example,dc=com"); - -/* Too many parameters */ -ldap_explode_dn("cn=bob,dc=example,dc=com", 1, 1); - /* Bad DN value with attributes */ var_dump(ldap_explode_dn("bob,dc=example,dc=com", 0)); @@ -85,10 +79,6 @@ array(5) { } bool(false) bool(false) - -Warning: ldap_explode_dn() expects exactly 2 parameters, 1 given in %s on line %d - -Warning: ldap_explode_dn() expects exactly 2 parameters, 3 given in %s on line %d bool(false) bool(false) Done diff --git a/ext/ldap/tests/ldap_first_attribute_error.phpt b/ext/ldap/tests/ldap_first_attribute_error.phpt index f7016c539f..9737df96c6 100644 --- a/ext/ldap/tests/ldap_first_attribute_error.phpt +++ b/ext/ldap/tests/ldap_first_attribute_error.phpt @@ -10,14 +10,13 @@ Patrick Allaert <patrickallaert@php.net> require "connect.inc"; $link = ldap_connect($host, $port); -var_dump(ldap_first_attribute($link)); -var_dump(ldap_first_attribute($link, $link)); +try { + var_dump(ldap_first_attribute($link, $link)); +} catch (TypeError $e) { + echo $e->getMessage(), "\n"; +} ?> ===DONE=== ---EXPECTF-- -Warning: ldap_first_attribute() expects %s 2 parameters, 1 given in %s on line %d -NULL - -Warning: ldap_first_attribute(): supplied resource is not a valid ldap result entry resource in %s on line %d -bool(false) +--EXPECT-- +ldap_first_attribute(): supplied resource is not a valid ldap result entry resource ===DONE=== diff --git a/ext/ldap/tests/ldap_first_entry_error.phpt b/ext/ldap/tests/ldap_first_entry_error.phpt deleted file mode 100644 index 9f232e0e8f..0000000000 --- a/ext/ldap/tests/ldap_first_entry_error.phpt +++ /dev/null @@ -1,27 +0,0 @@ ---TEST-- -ldap_first_entry() - Testing ldap_first_entry() that should fail ---CREDITS-- -Patrick Allaert <patrickallaert@php.net> -# Belgian PHP Testfest 2009 ---SKIPIF-- -<?php require_once('skipif.inc'); ?> ---FILE-- -<?php -require "connect.inc"; - -$link = ldap_connect($host, $port); -var_dump(ldap_first_entry($link)); -var_dump(ldap_first_entry($link, $link, "Additional data")); -var_dump(ldap_first_entry($link, $link)); -?> -===DONE=== ---EXPECTF-- -Warning: ldap_first_entry() expects exactly 2 parameters, 1 given in %s on line %d -NULL - -Warning: ldap_first_entry() expects exactly 2 parameters, 3 given in %s on line %d -NULL - -Warning: ldap_first_entry(): supplied resource is not a valid ldap result resource in %s on line %d -bool(false) -===DONE=== diff --git a/ext/ldap/tests/ldap_first_reference_error.phpt b/ext/ldap/tests/ldap_first_reference_error.phpt deleted file mode 100644 index d5541e10fc..0000000000 --- a/ext/ldap/tests/ldap_first_reference_error.phpt +++ /dev/null @@ -1,27 +0,0 @@ ---TEST-- -ldap_first_reference() - Testing ldap_first_reference() that should fail ---CREDITS-- -Patrick Allaert <patrickallaert@php.net> -# Belgian PHP Testfest 2009 ---SKIPIF-- -<?php require_once('skipif.inc'); ?> ---FILE-- -<?php -require "connect.inc"; - -$link = ldap_connect($host, $port); -var_dump(ldap_first_reference($link)); -var_dump(ldap_first_reference($link, $link, "Additional data")); -var_dump(ldap_first_reference($link, $link)); -?> -===DONE=== ---EXPECTF-- -Warning: ldap_first_reference() expects exactly 2 parameters, 1 given in %s on line %d -NULL - -Warning: ldap_first_reference() expects exactly 2 parameters, 3 given in %s on line %d -NULL - -Warning: ldap_first_reference(): supplied resource is not a valid ldap result resource in %s on line %d -bool(false) -===DONE=== diff --git a/ext/ldap/tests/ldap_free_result_error.phpt b/ext/ldap/tests/ldap_free_result_error.phpt deleted file mode 100644 index 05623d62d0..0000000000 --- a/ext/ldap/tests/ldap_free_result_error.phpt +++ /dev/null @@ -1,23 +0,0 @@ ---TEST-- -ldap_free_result() - Testing ldap_free_result() that should fail ---CREDITS-- -Patrick Allaert <patrickallaert@php.net> -# Belgian PHP Testfest 2009 ---SKIPIF-- -<?php require_once('skipif.inc'); ?> ---FILE-- -<?php -require "connect.inc"; - -$link = ldap_connect($host, $port); -var_dump(ldap_free_result($link)); -var_dump(ldap_free_result($link, "Additional data")); -?> -===DONE=== ---EXPECTF-- -Warning: ldap_free_result(): supplied resource is not a valid ldap result resource in %s on line %d -bool(false) - -Warning: ldap_free_result() expects exactly 1 parameter, 2 given in %s on line %d -NULL -===DONE=== diff --git a/ext/ldap/tests/ldap_get_attributes_error.phpt b/ext/ldap/tests/ldap_get_attributes_error.phpt deleted file mode 100644 index 465ba4fd72..0000000000 --- a/ext/ldap/tests/ldap_get_attributes_error.phpt +++ /dev/null @@ -1,23 +0,0 @@ ---TEST-- -ldap_get_attributes() - Testing ldap_get_attributes() that should fail ---CREDITS-- -Patrick Allaert <patrickallaert@php.net> -# Belgian PHP Testfest 2009 ---SKIPIF-- -<?php require_once('skipif.inc'); ?> ---FILE-- -<?php -require "connect.inc"; - -$link = ldap_connect($host, $port); -var_dump(ldap_get_attributes($link)); -var_dump(ldap_get_attributes($link, $link)); -?> -===DONE=== ---EXPECTF-- -Warning: ldap_get_attributes() expects exactly 2 parameters, 1 given in %s on line %d -NULL - -Warning: ldap_get_attributes(): supplied resource is not a valid ldap result entry resource in %s on line %d -bool(false) -===DONE=== diff --git a/ext/ldap/tests/ldap_get_dn_error.phpt b/ext/ldap/tests/ldap_get_dn_error.phpt deleted file mode 100644 index 71df6a3da1..0000000000 --- a/ext/ldap/tests/ldap_get_dn_error.phpt +++ /dev/null @@ -1,23 +0,0 @@ ---TEST-- -ldap_get_dn() - Testing ldap_get_dn() that should fail ---CREDITS-- -Patrick Allaert <patrickallaert@php.net> -# Belgian PHP Testfest 2009 ---SKIPIF-- -<?php require_once('skipif.inc'); ?> ---FILE-- -<?php -require "connect.inc"; - -$link = ldap_connect($host, $port); -var_dump(ldap_get_dn($link)); -var_dump(ldap_get_dn($link, $link)); -?> -===DONE=== ---EXPECTF-- -Warning: ldap_get_dn() expects exactly 2 parameters, 1 given in %s on line %d -NULL - -Warning: ldap_get_dn(): supplied resource is not a valid ldap result entry resource in %s on line %d -bool(false) -===DONE=== diff --git a/ext/ldap/tests/ldap_get_entries_error.phpt b/ext/ldap/tests/ldap_get_entries_error.phpt deleted file mode 100644 index 7e0f4c0b98..0000000000 --- a/ext/ldap/tests/ldap_get_entries_error.phpt +++ /dev/null @@ -1,33 +0,0 @@ ---TEST-- -ldap_get_entries() - ldap_get_entries() operation that should fail ---CREDITS-- -Patrick Allaert <patrickallaert@php.net> -# Belgian PHP Testfest 2009 ---SKIPIF-- -<?php require_once('skipif.inc'); ?> ---FILE-- -<?php -require "connect.inc"; - -$link = ldap_connect($host, $port); - -// Too few parameters -var_dump(ldap_get_entries($link)); - -// Too many parameters -var_dump(ldap_get_entries($link, $link, "Additional data")); - -// Bad parameter -var_dump(ldap_get_entries($link, "string")); -?> -===DONE=== ---EXPECTF-- -Warning: ldap_get_entries() expects exactly 2 parameters, 1 given in %s on line %d -NULL - -Warning: ldap_get_entries() expects exactly 2 parameters, 3 given in %s on line %d -NULL - -Warning: ldap_get_entries() expects parameter 2 to be resource, string given in %s on line %d -NULL -===DONE=== diff --git a/ext/ldap/tests/ldap_get_option_error.phpt b/ext/ldap/tests/ldap_get_option_error.phpt deleted file mode 100644 index cf7a0e5d49..0000000000 --- a/ext/ldap/tests/ldap_get_option_error.phpt +++ /dev/null @@ -1,40 +0,0 @@ ---TEST-- -ldap_get_option() - ldap_get_option() operation that should fail ---CREDITS-- -Patrick Allaert <patrickallaert@php.net> -# Belgian PHP Testfest 2009 ---SKIPIF-- -<?php require_once('skipif.inc'); ?> ---FILE-- -<?php -require "connect.inc"; - -$link = ldap_connect($host, $port); -$option = null; - -// Too few parameters -var_dump(ldap_get_option()); -var_dump(ldap_get_option($link)); -var_dump(ldap_get_option($link, LDAP_OPT_PROTOCOL_VERSION)); - -// Too many parameters -var_dump( - ldap_get_option($link, LDAP_OPT_PROTOCOL_VERSION, $option, "Additional data"), - $option -); -?> -===DONE=== ---EXPECTF-- -Warning: ldap_get_option() expects exactly 3 parameters, 0 given in %s on line %d -NULL - -Warning: ldap_get_option() expects exactly 3 parameters, 1 given in %s on line %d -NULL - -Warning: ldap_get_option() expects exactly 3 parameters, 2 given in %s on line %d -NULL - -Warning: ldap_get_option() expects exactly 3 parameters, 4 given in %s on line %d -NULL -NULL -===DONE=== diff --git a/ext/ldap/tests/ldap_list_error.phpt b/ext/ldap/tests/ldap_list_error.phpt deleted file mode 100644 index 817622e725..0000000000 --- a/ext/ldap/tests/ldap_list_error.phpt +++ /dev/null @@ -1,35 +0,0 @@ ---TEST-- -ldap_list() - operation that should fail ---CREDITS-- -Patrick Allaert <patrickallaert@php.net> -# Belgian PHP Testfest 2009 ---SKIPIF-- -<?php require_once('skipif.inc'); ?> ---FILE-- -<?php -include "connect.inc"; - -$link = ldap_connect($host, $port); - -// Too few parameters -var_dump(ldap_list()); -var_dump(ldap_list($link)); -var_dump(ldap_list($link, $link)); - -// Too many parameters -var_dump(ldap_list($link, "$base", "(objectClass=*)", array(), 0, 0, 0, 0, [], "Additional data")); -?> -===DONE=== ---EXPECTF-- -Warning: ldap_list() expects at least 3 parameters, 0 given in %s on line %d -NULL - -Warning: ldap_list() expects at least 3 parameters, 1 given in %s on line %d -NULL - -Warning: ldap_list() expects at least 3 parameters, 2 given in %s on line %d -NULL - -Warning: ldap_list() expects at most 9 parameters, 10 given in %s on line %d -NULL -===DONE=== diff --git a/ext/ldap/tests/ldap_next_entry_error.phpt b/ext/ldap/tests/ldap_next_entry_error.phpt deleted file mode 100644 index 59e9cdcab5..0000000000 --- a/ext/ldap/tests/ldap_next_entry_error.phpt +++ /dev/null @@ -1,27 +0,0 @@ ---TEST-- -ldap_next_entry() - Testing ldap_next_entry() that should fail ---CREDITS-- -Patrick Allaert <patrickallaert@php.net> -# Belgian PHP Testfest 2009 ---SKIPIF-- -<?php require_once('skipif.inc'); ?> ---FILE-- -<?php -require "connect.inc"; - -$link = ldap_connect($host, $port); -var_dump(ldap_next_entry($link)); -var_dump(ldap_next_entry($link, $link, "Additional data")); -var_dump(ldap_next_entry($link, $link)); -?> -===DONE=== ---EXPECTF-- -Warning: ldap_next_entry() expects exactly 2 parameters, 1 given in %s on line %d -NULL - -Warning: ldap_next_entry() expects exactly 2 parameters, 3 given in %s on line %d -NULL - -Warning: ldap_next_entry(): supplied resource is not a valid ldap result entry resource in %s on line %d -bool(false) -===DONE=== diff --git a/ext/ldap/tests/ldap_next_reference_error.phpt b/ext/ldap/tests/ldap_next_reference_error.phpt deleted file mode 100644 index 0e47c5ef5c..0000000000 --- a/ext/ldap/tests/ldap_next_reference_error.phpt +++ /dev/null @@ -1,27 +0,0 @@ ---TEST-- -ldap_next_reference() - Testing ldap_next_reference() that should fail ---CREDITS-- -Patrick Allaert <patrickallaert@php.net> -# Belgian PHP Testfest 2009 ---SKIPIF-- -<?php require_once('skipif.inc'); ?> ---FILE-- -<?php -require "connect.inc"; - -$link = ldap_connect($host, $port); -var_dump(ldap_next_reference($link)); -var_dump(ldap_next_reference($link, $link, "Additional data")); -var_dump(ldap_next_reference($link, $link)); -?> -===DONE=== ---EXPECTF-- -Warning: ldap_next_reference() expects exactly 2 parameters, 1 given in %s on line %d -NULL - -Warning: ldap_next_reference() expects exactly 2 parameters, 3 given in %s on line %d -NULL - -Warning: ldap_next_reference(): supplied resource is not a valid ldap result entry resource in %s on line %d -bool(false) -===DONE=== diff --git a/ext/ldap/tests/ldap_parse_reference_error.phpt b/ext/ldap/tests/ldap_parse_reference_error.phpt deleted file mode 100644 index 9d180e717d..0000000000 --- a/ext/ldap/tests/ldap_parse_reference_error.phpt +++ /dev/null @@ -1,31 +0,0 @@ ---TEST-- -ldap_parse_reference() - ldap_parse_reference() operations that should fail ---CREDITS-- -Patrick Allaert <patrickallaert@php.net> -# Belgian PHP Testfest 2009 ---SKIPIF-- -<?php require_once('skipif.inc'); ?> ---FILE-- -<?php -require "connect.inc"; -$link = ldap_connect($host, $port); -$refs = null; -var_dump( - ldap_parse_reference($link, $link), - ldap_parse_reference($link, $link, $refs), - ldap_parse_reference($link, $refs, $refs, "Additional data"), - $refs -); -?> -===DONE=== ---EXPECTF-- -Warning: ldap_parse_reference() expects exactly 3 parameters, 2 given in %s on line %d - -Warning: ldap_parse_reference(): supplied resource is not a valid ldap result entry resource in %s on line %d - -Warning: ldap_parse_reference() expects exactly 3 parameters, 4 given in %s on line %d -NULL -bool(false) -NULL -NULL -===DONE=== diff --git a/ext/ldap/tests/ldap_parse_result_error.phpt b/ext/ldap/tests/ldap_parse_result_error.phpt deleted file mode 100644 index 33f86f40b9..0000000000 --- a/ext/ldap/tests/ldap_parse_result_error.phpt +++ /dev/null @@ -1,17 +0,0 @@ ---TEST-- -ldap_parse_result() - Testing ldap_parse_result() that should fail ---CREDITS-- -Patrick Allaert <patrickallaert@php.net> -# Belgian PHP Testfest 2009 ---SKIPIF-- -<?php require_once('skipif.inc'); ?> ---FILE-- -<?php -require "connect.inc"; -var_dump(ldap_parse_result(null, null)); -?> -===DONE=== ---EXPECTF-- -Warning: ldap_parse_result() expects at least 3 parameters, 2 given in %s on line %d -NULL -===DONE=== diff --git a/ext/ldap/tests/ldap_read_error.phpt b/ext/ldap/tests/ldap_read_error.phpt deleted file mode 100644 index 08f6280490..0000000000 --- a/ext/ldap/tests/ldap_read_error.phpt +++ /dev/null @@ -1,35 +0,0 @@ ---TEST-- -ldap_read() - operation that should fail ---CREDITS-- -Patrick Allaert <patrickallaert@php.net> -# Belgian PHP Testfest 2009 ---SKIPIF-- -<?php require_once('skipif.inc'); ?> ---FILE-- -<?php -include "connect.inc"; - -$link = ldap_connect($host, $port); - -// Too few parameters -var_dump(ldap_read()); -var_dump(ldap_read($link)); -var_dump(ldap_read($link, $link)); - -// Too many parameters -var_dump(ldap_read($link, "$base", "(objectClass=*)", array(), 0, 0, 0, 0, [], "Additional data")); -?> -===DONE=== ---EXPECTF-- -Warning: ldap_read() expects at least 3 parameters, 0 given in %s on line %d -NULL - -Warning: ldap_read() expects at least 3 parameters, 1 given in %s on line %d -NULL - -Warning: ldap_read() expects at least 3 parameters, 2 given in %s on line %d -NULL - -Warning: ldap_read() expects at most 9 parameters, 10 given in %s on line %d -NULL -===DONE=== diff --git a/ext/ldap/tests/ldap_rename_error.phpt b/ext/ldap/tests/ldap_rename_error.phpt index 8a580e5c34..57c2e03e71 100644 --- a/ext/ldap/tests/ldap_rename_error.phpt +++ b/ext/ldap/tests/ldap_rename_error.phpt @@ -10,12 +10,7 @@ Patrick Allaert <patrickallaert@php.net> require "connect.inc"; $link = ldap_connect($host, $port); -var_dump(ldap_rename($link)); var_dump(ldap_rename($link, "cn=userNotFound,$base", "cn=userZ", "$base", true)); ?> -===DONE=== ---EXPECTF-- -Warning: ldap_rename() expects at least 5 parameters, 1 given in %s on line %d -NULL +--EXPECT-- bool(false) -===DONE=== diff --git a/ext/ldap/tests/ldap_set_option_error.phpt b/ext/ldap/tests/ldap_set_option_error.phpt index 3ea49cbc7e..a67f972293 100644 --- a/ext/ldap/tests/ldap_set_option_error.phpt +++ b/ext/ldap/tests/ldap_set_option_error.phpt @@ -23,14 +23,6 @@ $controls = array( "notanarray" ); -// Too few parameters -var_dump(ldap_set_option()); -var_dump(ldap_set_option($link)); -var_dump(ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION)); - -// Too many parameters -var_dump(ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, 3, "Additional data")); - var_dump(ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, 10)); foreach ($controls as $control) @@ -40,17 +32,6 @@ var_dump(ldap_set_option($link, 999999, 999999)); ?> ===DONE=== --EXPECTF-- -Warning: ldap_set_option() expects exactly 3 parameters, 0 given in %s on line %d -NULL - -Warning: ldap_set_option() expects exactly 3 parameters, 1 given in %s on line %d -NULL - -Warning: ldap_set_option() expects exactly 3 parameters, 2 given in %s on line %d -NULL - -Warning: ldap_set_option() expects exactly 3 parameters, 4 given in %s on line %d -NULL bool(false) Warning: ldap_set_option(): Control must have an oid key in %s on line %d diff --git a/ext/ldap/tests/ldap_sort_basic.phpt b/ext/ldap/tests/ldap_sort_basic.phpt deleted file mode 100644 index e14381f8c7..0000000000 --- a/ext/ldap/tests/ldap_sort_basic.phpt +++ /dev/null @@ -1,201 +0,0 @@ ---TEST-- -ldap_sort() - Basic ldap_sort test ---CREDITS-- -Patrick Allaert <patrickallaert@php.net> -# Belgian PHP Testfest 2009 ---SKIPIF-- -<?php require_once('skipif.inc'); ?> -<?php require_once('skipifbindfailure.inc'); ?> ---FILE-- -<?php -require "connect.inc"; - -$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); -insert_dummy_data($link, $base); -ldap_add($link, "cn=userC,$base", array( - "objectclass" => "person", - "cn" => "userC", - "sn" => "zzz", - "userPassword" => "oops", - "description" => "a user", -)); -ldap_add($link, "cn=userD,$base", array( - "objectclass" => "person", - "cn" => "userD", - "sn" => "aaa", - "userPassword" => "oops", - "description" => "another user", -)); -ldap_add($link, "cn=userE,$base", array( - "objectclass" => "person", - "cn" => "userE", - "sn" => "a", - "userPassword" => "oops", - "description" => "yet another user", -)); -$result = ldap_search($link, "$base", "(objectclass=person)", array("sn", "description")); -var_dump( - ldap_sort($link, $result, "sn"), - ldap_get_entries($link, $result) -); -?> -===DONE=== ---CLEAN-- -<?php -include "connect.inc"; - -$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); -ldap_delete($link, "cn=userC,$base"); -ldap_delete($link, "cn=userD,$base"); -ldap_delete($link, "cn=userE,$base"); -remove_dummy_data($link, $base); -?> ---EXPECTF-- -Deprecated: Function ldap_sort() is deprecated in %s.php on line %d -bool(true) -array(7) { - ["count"]=> - int(6) - [0]=> - array(6) { - ["sn"]=> - array(2) { - ["count"]=> - int(1) - [0]=> - string(1) "a" - } - [0]=> - string(2) "sn" - ["description"]=> - array(2) { - ["count"]=> - int(1) - [0]=> - string(16) "yet another user" - } - [1]=> - string(11) "description" - ["count"]=> - int(2) - ["dn"]=> - string(%d) "cn=userE,%s" - } - [1]=> - array(6) { - ["sn"]=> - array(2) { - ["count"]=> - int(1) - [0]=> - string(3) "aaa" - } - [0]=> - string(2) "sn" - ["description"]=> - array(2) { - ["count"]=> - int(1) - [0]=> - string(12) "another user" - } - [1]=> - string(11) "description" - ["count"]=> - int(2) - ["dn"]=> - string(%d) "cn=userD,%s" - } - [2]=> - array(6) { - ["sn"]=> - array(2) { - ["count"]=> - int(1) - [0]=> - string(7) "testSN1" - } - [0]=> - string(2) "sn" - ["description"]=> - array(2) { - ["count"]=> - int(1) - [0]=> - string(6) "user A" - } - [1]=> - string(11) "description" - ["count"]=> - int(2) - ["dn"]=> - string(%d) "cn=userA,%s" - } - [3]=> - array(6) { - ["sn"]=> - array(2) { - ["count"]=> - int(1) - [0]=> - string(7) "testSN2" - } - [0]=> - string(2) "sn" - ["description"]=> - array(2) { - ["count"]=> - int(1) - [0]=> - string(6) "user B" - } - [1]=> - string(11) "description" - ["count"]=> - int(2) - ["dn"]=> - string(%d) "cn=userB,%s" - } - [4]=> - array(4) { - ["sn"]=> - array(2) { - ["count"]=> - int(1) - [0]=> - string(7) "testSN3" - } - [0]=> - string(2) "sn" - ["count"]=> - int(1) - ["dn"]=> - string(%d) "cn=userC,cn=userB,%s" - } - [5]=> - array(6) { - ["sn"]=> - array(2) { - ["count"]=> - int(1) - [0]=> - string(3) "zzz" - } - [0]=> - string(2) "sn" - ["description"]=> - array(2) { - ["count"]=> - int(1) - [0]=> - string(6) "a user" - } - [1]=> - string(11) "description" - ["count"]=> - int(2) - ["dn"]=> - string(%d) "cn=userC,%s" - } -} -===DONE=== diff --git a/ext/ldap/tests/ldap_sort_error.phpt b/ext/ldap/tests/ldap_sort_error.phpt deleted file mode 100644 index c41b56ab51..0000000000 --- a/ext/ldap/tests/ldap_sort_error.phpt +++ /dev/null @@ -1,45 +0,0 @@ ---TEST-- -ldap_sort() - Testing ldap_sort() that should fail ---CREDITS-- -Patrick Allaert <patrickallaert@php.net> -# Belgian PHP Testfest 2009 ---SKIPIF-- -<?php require_once('skipif.inc'); ?> ---FILE-- -<?php -require "connect.inc"; - -$link = ldap_connect($host, $port); -var_dump(ldap_sort($link)); -var_dump(ldap_sort($link, $link)); -var_dump(ldap_sort($link, $link, $link, $link)); -var_dump(ldap_sort($link, $link, $link)); -var_dump(ldap_sort($link, $link, "sn")); -?> -===DONE=== ---EXPECTF-- -Deprecated: Function ldap_sort() is deprecated in %s.php on line %d - -Warning: ldap_sort() expects exactly 3 parameters, 1 given in %s on line %d -bool(false) - -Deprecated: Function ldap_sort() is deprecated in %s.php on line %d - -Warning: ldap_sort() expects exactly 3 parameters, 2 given in %s on line %d -bool(false) - -Deprecated: Function ldap_sort() is deprecated in %s.php on line %d - -Warning: ldap_sort() expects exactly 3 parameters, 4 given in %s on line %d -bool(false) - -Deprecated: Function ldap_sort() is deprecated in %s.php on line %d - -Warning: ldap_sort() expects parameter 3 to be string, resource given in %s on line %d -bool(false) - -Deprecated: Function ldap_sort() is deprecated in %s.php on line %d - -Warning: ldap_sort(): Supplied resource is not a valid ldap result resource in %s on line %d -bool(false) -===DONE=== diff --git a/ext/ldap/tests/ldap_sort_variation.phpt b/ext/ldap/tests/ldap_sort_variation.phpt deleted file mode 100644 index bb121b63cb..0000000000 --- a/ext/ldap/tests/ldap_sort_variation.phpt +++ /dev/null @@ -1,201 +0,0 @@ ---TEST-- -ldap_sort() - Basic ldap_sort test ---CREDITS-- -Patrick Allaert <patrickallaert@php.net> -# Belgian PHP Testfest 2009 ---SKIPIF-- -<?php require_once('skipif.inc'); ?> -<?php require_once('skipifbindfailure.inc'); ?> ---FILE-- -<?php -require "connect.inc"; - -$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); -insert_dummy_data($link, $base); -ldap_add($link, "cn=userC,$base", array( - "objectclass" => "person", - "cn" => "userC", - "sn" => "zzz", - "userPassword" => "oops", - "description" => "a user", -)); -ldap_add($link, "cn=userD,$base", array( - "objectclass" => "person", - "cn" => "userD", - "sn" => "aaa", - "userPassword" => "oops", - "description" => "another user", -)); -ldap_add($link, "cn=userE,$base", array( - "objectclass" => "person", - "cn" => "userE", - "sn" => "a", - "userPassword" => "oops", - "description" => "yet another user", -)); -$result = ldap_search($link, "$base", "(objectclass=person)", array("sn", "description")); -var_dump( - ldap_sort($link, $result, "description"), - ldap_get_entries($link, $result) -); -?> -===DONE=== ---CLEAN-- -<?php -include "connect.inc"; - -$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); -ldap_delete($link, "cn=userC,$base"); -ldap_delete($link, "cn=userD,$base"); -ldap_delete($link, "cn=userE,$base"); -remove_dummy_data($link, $base); -?> ---EXPECTF-- -Deprecated: Function ldap_sort() is deprecated in %s.php on line %d -bool(true) -array(7) { - ["count"]=> - int(6) - [0]=> - array(4) { - ["sn"]=> - array(2) { - ["count"]=> - int(1) - [0]=> - string(7) "testSN3" - } - [0]=> - string(2) "sn" - ["count"]=> - int(1) - ["dn"]=> - string(%d) "cn=userC,cn=userB,%s" - } - [1]=> - array(6) { - ["sn"]=> - array(2) { - ["count"]=> - int(1) - [0]=> - string(3) "zzz" - } - [0]=> - string(2) "sn" - ["description"]=> - array(2) { - ["count"]=> - int(1) - [0]=> - string(6) "a user" - } - [1]=> - string(11) "description" - ["count"]=> - int(2) - ["dn"]=> - string(%d) "cn=userC,%s" - } - [2]=> - array(6) { - ["sn"]=> - array(2) { - ["count"]=> - int(1) - [0]=> - string(3) "aaa" - } - [0]=> - string(2) "sn" - ["description"]=> - array(2) { - ["count"]=> - int(1) - [0]=> - string(12) "another user" - } - [1]=> - string(11) "description" - ["count"]=> - int(2) - ["dn"]=> - string(%d) "cn=userD,%s" - } - [3]=> - array(6) { - ["sn"]=> - array(2) { - ["count"]=> - int(1) - [0]=> - string(7) "testSN1" - } - [0]=> - string(2) "sn" - ["description"]=> - array(2) { - ["count"]=> - int(1) - [0]=> - string(6) "user A" - } - [1]=> - string(11) "description" - ["count"]=> - int(2) - ["dn"]=> - string(%d) "cn=userA,%s" - } - [4]=> - array(6) { - ["sn"]=> - array(2) { - ["count"]=> - int(1) - [0]=> - string(7) "testSN2" - } - [0]=> - string(2) "sn" - ["description"]=> - array(2) { - ["count"]=> - int(1) - [0]=> - string(6) "user B" - } - [1]=> - string(11) "description" - ["count"]=> - int(2) - ["dn"]=> - string(%d) "cn=userB,%s" - } - [5]=> - array(6) { - ["sn"]=> - array(2) { - ["count"]=> - int(1) - [0]=> - string(1) "a" - } - [0]=> - string(2) "sn" - ["description"]=> - array(2) { - ["count"]=> - int(1) - [0]=> - string(16) "yet another user" - } - [1]=> - string(11) "description" - ["count"]=> - int(2) - ["dn"]=> - string(%d) "cn=userE,%s" - } -} -===DONE=== |