com php-src: Fixes ldap_sort-tests: ext/ldap/tests/ldap _sort_basic.phpt ext/ldap/tests/ldap_sort_error.p hpt ext/ldap/tests/ldap_sort_variation.phpt

Commit: 6e84f8e95e4f115bb5944e09aca4f77621711a37 Author: Andreas Heigl <andreas@heigl.org> Mon, 29 Jun 2015 10:18:44 +0200 Committer: Côme Bernigaud <mcmic@php.net> Mon, 29 Jun 2015 11:11:11 +0200 Parents: 85aabd3e8593b9399db49aaeee9808454e811f80 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6e84f8e95e4f115bb5944e09aca4f77621711a37 Log: Fixes ldap_sort-tests Thanks to Côme Bernigaud for fixing! Changed paths: M ext/ldap/tests/ldap_sort_basic.phpt M ext/ldap/tests/ldap_sort_error.phpt M ext/ldap/tests/ldap_sort_variation.phpt Diff: diff --git a/ext/ldap/tests/ldap_sort_basic.phpt b/ext/ldap/tests/ldap_sort_basic.phpt index 9744468..25fec5e 100644 --- a/ext/ldap/tests/ldap_sort_basic.phpt +++ b/ext/ldap/tests/ldap_sort_basic.phpt @@ -51,6 +51,7 @@ ldap_delete($link, "cn=userE,$base"); remove_dummy_data($link, $base); ?> --EXPECTF-- +Deprecated: ldap_sort(): Usage of ldap_sort is deprecated and will be removed in one of the next PHP-versions in %s.php on line %d bool(true) array(7) { ["count"]=> diff --git a/ext/ldap/tests/ldap_sort_error.phpt b/ext/ldap/tests/ldap_sort_error.phpt index 6eb4090..59d3632 100644 --- a/ext/ldap/tests/ldap_sort_error.phpt +++ b/ext/ldap/tests/ldap_sort_error.phpt @@ -18,18 +18,28 @@ var_dump(ldap_sort($link, $link, "sn")); ?> ===DONE=== --EXPECTF-- +Deprecated: ldap_sort(): Usage of ldap_sort is deprecated and will be removed in one of the next PHP-versions in %s.php on line %d + Warning: ldap_sort() expects exactly 3 parameters, 1 given in %s on line %d bool(false) +Deprecated: ldap_sort(): Usage of ldap_sort is deprecated and will be removed in one of the next PHP-versions in %s.php on line %d + Warning: ldap_sort() expects exactly 3 parameters, 2 given in %s on line %d bool(false) +Deprecated: ldap_sort(): Usage of ldap_sort is deprecated and will be removed in one of the next PHP-versions in %s.php on line %d + Warning: ldap_sort() expects exactly 3 parameters, 4 given in %s on line %d bool(false) +Deprecated: ldap_sort(): Usage of ldap_sort is deprecated and will be removed in one of the next PHP-versions in %s.php on line %d + Warning: ldap_sort() expects parameter 3 to be %binary_string_optional%, resource given in %s on line %d bool(false) +Deprecated: ldap_sort(): Usage of ldap_sort is deprecated and will be removed in one of the next PHP-versions 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 index e8f0034..501f429 100644 --- a/ext/ldap/tests/ldap_sort_variation.phpt +++ b/ext/ldap/tests/ldap_sort_variation.phpt @@ -51,6 +51,7 @@ ldap_delete($link, "cn=userE,$base"); remove_dummy_data($link, $base); ?> --EXPECTF-- +Deprecated: ldap_sort(): Usage of ldap_sort is deprecated and will be removed in one of the next PHP-versions in %s.php on line %d bool(true) array(7) { ["count"]=>