Skip to content

Commit 7169688

Browse files
heiglandreascmb69
heiglandreas
authored and
cmb69
committed
Modify all ldap-tests to use ldap_connect right
All tests are using ldap_connect now with an URI and not with host and port as two separarte parameters.
1 parent 3c56199 commit 7169688

File tree

99 files changed

+173
-194
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+173
-194
lines changed

‎ext/ldap/tests/bug48441.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require_once('skipifbindfailure.inc');
1212
<?php
1313
include "connect.inc";
1414

15-
$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
15+
$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
1616
insert_dummy_data($link, $base);
1717

1818
$dn = "$base";
@@ -35,7 +35,7 @@ var_dump(
3535
<?php
3636
include "connect.inc";
3737

38-
$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
38+
$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
3939
remove_dummy_data($link, $base);
4040
?>
4141
--EXPECTF--

‎ext/ldap/tests/bug73933.phpt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ldap
55
--FILE--
66
<?php
77
/* We are assuming 3333 is not connectable */
8-
$ldap = ldap_connect('127.0.0.1', 3333);
8+
$ldap = ldap_connect('ldap://127.0.0.1:3333');
99

1010
ldap_mod_replace($ldap, '', array(
1111
'lockoutTime' => array(0),
@@ -22,8 +22,6 @@ ldap_close($ldap);
2222

2323
?>
2424
--EXPECTF--
25-
Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
26-
2725
Warning: ldap_mod_replace(): Modify: Can't contact LDAP server in %sbug73933.php on line %d
2826

2927
Warning: ldap_modify_batch(): Batch Modify: Can't contact LDAP server in %sbug73933.php on line %d

‎ext/ldap/tests/bug77958.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ldap
1010
<?php
1111
require "connect.inc";
1212

13-
$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
13+
$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
1414
insert_dummy_data($link, $base);
1515

1616
$mods = array(
@@ -37,7 +37,7 @@ var_dump(
3737
<?php
3838
require "connect.inc";
3939

40-
$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
40+
$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
4141

4242
remove_dummy_data($link, $base);
4343
?>

‎ext/ldap/tests/connect.inc

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Change the LDAP_TEST_* environment values if you want to use another configurati
77

88
$host = getenv("LDAP_TEST_HOST") ?: "localhost";
99
$port = getenv("LDAP_TEST_PORT") ?: 389;
10+
$uri = getenv("LDAP_TEST_URI") ?: 'ldap://localhost:389';
1011
$base = getenv("LDAP_TEST_BASE") ?: "dc=my-domain,dc=com";
1112
$user = getenv("LDAP_TEST_USER") ?: "cn=Manager,$base";
1213
$passwd = getenv("LDAP_TEST_PASSWD") ?: "secret";
@@ -15,15 +16,15 @@ $sasl_passwd = getenv("LDAP_TEST_SASL_PASSWD") ?: "oops";
1516
$protocol_version = getenv("LDAP_TEST_OPT_PROTOCOL_VERSION") ?: 3;
1617
$skip_on_bind_failure = getenv("LDAP_TEST_SKIP_BIND_FAILURE") ?: true;
1718

18-
function ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version) {
19-
$link = ldap_connect($host, $port);
19+
function ldap_connect_and_bind($uri, $user, $passwd, $protocol_version) {
20+
$link = ldap_connect($uri);
2021
ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
2122
ldap_bind($link, $user, $passwd);
2223
return $link;
2324
}
2425

25-
function test_bind($host, $port, $user, $passwd, $protocol_version) {
26-
$link = ldap_connect($host, $port);
26+
function test_bind($uri, $user, $passwd, $protocol_version) {
27+
$link = ldap_connect($uri);
2728
ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
2829
return ldap_bind($link, $user, $passwd);
2930
}

‎ext/ldap/tests/ldap_add_basic.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ldap
1111
<?php
1212
require "connect.inc";
1313

14-
$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
14+
$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
1515

1616
var_dump(
1717
ldap_add($link, "dc=my-domain,$base", array(
@@ -32,7 +32,7 @@ var_dump(
3232
<?php
3333
require "connect.inc";
3434

35-
$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
35+
$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
3636

3737
ldap_delete($link, "dc=my-domain,$base");
3838
?>

‎ext/ldap/tests/ldap_add_error.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ldap
1111
<?php
1212
require "connect.inc";
1313

14-
$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
14+
$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
1515

1616
var_dump(ldap_add($link, "$base", array()));
1717

@@ -86,7 +86,7 @@ var_dump(
8686
<?php
8787
require "connect.inc";
8888

89-
$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
89+
$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
9090

9191
ldap_delete($link, "dc=my-domain,$base");
9292
?>

‎ext/ldap/tests/ldap_add_ext.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ skipifunsupportedcontrol(LDAP_CONTROL_POST_READ);
1414
<?php
1515
require "connect.inc";
1616

17-
$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
17+
$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
1818

1919
var_dump(
2020
$result = ldap_add_ext($link, "o=test_ldap_add_ext,$base", array(
@@ -37,7 +37,7 @@ var_dump(
3737
<?php
3838
require "connect.inc";
3939

40-
$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
40+
$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
4141

4242
ldap_delete($link, "o=test_ldap_add_ext,$base");
4343
?>

‎ext/ldap/tests/ldap_bind_basic.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ldap
1111
<?php
1212
require "connect.inc";
1313

14-
$link = ldap_connect($host, $port);
14+
$link = ldap_connect($uri);
1515
ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
1616
var_dump(ldap_bind($link));
1717
?>

‎ext/ldap/tests/ldap_bind_error.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ldap
1111
<?php
1212
require "connect.inc";
1313

14-
$link = ldap_connect($host, $port);
14+
$link = ldap_connect($uri);
1515
ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
1616

1717
// Invalid password

‎ext/ldap/tests/ldap_bind_ext.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ skipifunsupportedcontrol(LDAP_CONTROL_PASSWORDPOLICYREQUEST);
1414
<?php
1515
require "connect.inc";
1616

17-
$link = ldap_connect($host, $port);
17+
$link = ldap_connect($uri);
1818
ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
1919

2020
var_dump(

‎ext/ldap/tests/ldap_bind_variation.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ldap
1111
<?php
1212
require "connect.inc";
1313

14-
$link = ldap_connect($host, $port);
14+
$link = ldap_connect($uri);
1515
ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
1616
var_dump(ldap_bind($link, $user, $passwd));
1717
?>

‎ext/ldap/tests/ldap_compare_basic.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ldap
1111
<?php
1212
require "connect.inc";
1313

14-
$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
14+
$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
1515
insert_dummy_data($link, $base);
1616
var_dump(
1717
ldap_compare($link, "cn=userA,$base", "sn", "testSN1"),
@@ -22,7 +22,7 @@ var_dump(
2222
<?php
2323
include "connect.inc";
2424

25-
$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
25+
$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
2626
remove_dummy_data($link, $base);
2727
?>
2828
--EXPECT--

‎ext/ldap/tests/ldap_compare_error.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ldap
1111
<?php
1212
require "connect.inc";
1313

14-
$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
14+
$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
1515
insert_dummy_data($link, $base);
1616

1717
var_dump(
@@ -24,7 +24,7 @@ var_dump(
2424
<?php
2525
include "connect.inc";
2626

27-
$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
27+
$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
2828
remove_dummy_data($link, $base);
2929
?>
3030
--EXPECTF--

‎ext/ldap/tests/ldap_connect_basic.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ ldap
99
<?php
1010
require "connect.inc";
1111

12-
$link = ldap_connect($host, $port);
12+
$link = ldap_connect($uri);
1313
var_dump($link);
1414
?>
1515
--EXPECTF--
16-
Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
1716
object(LDAP\Connection)#%d (0) {
1817
}

‎ext/ldap/tests/ldap_connect_error.phpt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,11 @@ require "connect.inc";
1515
var_dump(ldap_connect("ldap://$host:$port/$base"));
1616

1717
$links = array();
18-
$links[0] = ldap_connect($host, $port);
19-
$links[1] = ldap_connect($host, $port);
18+
$links[0] = ldap_connect($uri);
19+
$links[1] = ldap_connect($uri);
2020
?>
2121
--EXPECTF--
2222
Warning: ldap_connect(): Could not create session handle: %s in %s on line %d
2323
bool(false)
2424

25-
Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
26-
27-
Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
28-
2925
Warning: ldap_connect(): Too many open links (1) in %s on line %d

‎ext/ldap/tests/ldap_control_paged_results_variation1.phpt

Whitespace-only changes.

‎ext/ldap/tests/ldap_controls.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ skipifunsupportedcontrol(LDAP_CONTROL_VALUESRETURNFILTER);
1515
<?php
1616
include "connect.inc";
1717

18-
$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
18+
$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
1919
insert_dummy_data($link, $base);
2020

2121
/* Test assertion control */
@@ -55,7 +55,7 @@ var_dump(
5555
<?php
5656
include "connect.inc";
5757

58-
$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
58+
$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
5959
remove_dummy_data($link, $base);
6060
?>
6161
--EXPECTF--

‎ext/ldap/tests/ldap_count_entries_basic.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ldap
1111
<?php
1212
require "connect.inc";
1313

14-
$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
14+
$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
1515
insert_dummy_data($link, $base);
1616
$result = ldap_search($link, "$base", "(objectclass=person)");
1717
var_dump(ldap_count_entries($link, $result));
@@ -20,7 +20,7 @@ var_dump(ldap_count_entries($link, $result));
2020
<?php
2121
include "connect.inc";
2222

23-
$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
23+
$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
2424
remove_dummy_data($link, $base);
2525
?>
2626
--EXPECT--

‎ext/ldap/tests/ldap_delete_basic.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ldap
1111
<?php
1212
require "connect.inc";
1313

14-
$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
14+
$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
1515
ldap_add($link, "dc=my-domain,$base", array(
1616
"objectClass" => array(
1717
"top",
@@ -30,7 +30,7 @@ var_dump(
3030
<?php
3131
require "connect.inc";
3232

33-
$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
33+
$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
3434

3535
@ldap_delete($link, "dc=my-domain,$base");
3636
?>

‎ext/ldap/tests/ldap_delete_error.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ldap
1111
<?php
1212
require "connect.inc";
1313

14-
$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
14+
$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
1515

1616
// Invalid DN
1717
var_dump(
@@ -31,7 +31,7 @@ var_dump(
3131
<?php
3232
require "connect.inc";
3333

34-
$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
34+
$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
3535
?>
3636
--EXPECTF--
3737
Warning: ldap_delete(): Delete: Invalid DN syntax in %s on line %d

‎ext/ldap/tests/ldap_delete_ext.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ skipifunsupportedcontrol(LDAP_CONTROL_PRE_READ);
1414
<?php
1515
require "connect.inc";
1616

17-
$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
17+
$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
1818
ldap_add($link, "dc=my-domain,$base", array(
1919
"objectClass" => array(
2020
"top",
@@ -39,7 +39,7 @@ var_dump(
3939
<?php
4040
require "connect.inc";
4141

42-
$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
42+
$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
4343

4444
@ldap_delete($link, "dc=my-domain,$base");
4545
?>

‎ext/ldap/tests/ldap_errno_basic.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ldap
1111
<?php
1212
require "connect.inc";
1313

14-
$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
14+
$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
1515
@ldap_add($link, "badDN $base", array(
1616
"objectClass" => array(
1717
"top",

‎ext/ldap/tests/ldap_error_basic.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ldap
1111
<?php
1212
require "connect.inc";
1313

14-
$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
14+
$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
1515
@ldap_add($link, "badDN $base", array(
1616
"objectClass" => array(
1717
"top",

‎ext/ldap/tests/ldap_exop.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ldap
1010
<?php
1111
require "connect.inc";
1212

13-
$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
13+
$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
1414
insert_dummy_data($link, $base);
1515

1616
function build_reqdata_passwd($user, $oldpw, $newpw)
@@ -46,19 +46,19 @@ var_dump(
4646
$r = ldap_exop($link, LDAP_EXOP_WHO_AM_I),
4747
ldap_parse_exop($link, $r, $retdata2),
4848
$retdata2,
49-
test_bind($host, $port, "cn=userA,$base", $userAPassword, $protocol_version),
49+
test_bind($uri, "cn=userA,$base", $userAPassword, $protocol_version),
5050
$r = ldap_exop($link, LDAP_EXOP_MODIFY_PASSWD, build_reqdata_passwd("cn=userA,$base", $userAPassword, "")),
5151
ldap_parse_exop($link, $r, $retpwdata, $retpwoid),
5252
$genpw = extract_genpw($retpwdata),
5353
$retpwoid,
54-
test_bind($host, $port, "cn=userA,$base", $genpw, $protocol_version)
54+
test_bind($uri, "cn=userA,$base", $genpw, $protocol_version)
5555
);
5656
?>
5757
--CLEAN--
5858
<?php
5959
require "connect.inc";
6060

61-
$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
61+
$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
6262

6363
remove_dummy_data($link, $base);
6464
?>

0 commit comments

Comments
 (0)