Skip to content

Commit 2fafff4

Browse files
heiglandreasheiglandreas
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 4f6c414 commit 2fafff4

File tree

101 files changed

+180
-201
lines changed

Some content is hidden

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

101 files changed

+180
-201
lines changed

‎ext/ldap/tests/bug48441.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require_once('skipifbindfailure.inc');
1111
<?php
1212
include "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
$dn = "$base";
@@ -34,7 +34,7 @@ var_dump(
3434
<?php
3535
include "connect.inc";
3636

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

‎ext/ldap/tests/bug73933.phpt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require_once('skipif.inc');
77
--FILE--
88
<?php
99
/* We are assuming 3333 is not connectable */
10-
$ldap = ldap_connect('127.0.0.1', 3333);
10+
$ldap = ldap_connect('ldap://127.0.0.1:3333');
1111

1212
ldap_mod_replace($ldap, null, array(
1313
'lockoutTime' => array(0),
@@ -25,8 +25,6 @@ ldap_close($ldap);
2525

2626
?>
2727
--EXPECTF--
28-
Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
29-
3028
Warning: ldap_mod_replace(): Modify: Can't contact LDAP server in %sbug73933.php on line %d
3129

3230
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
@@ -9,7 +9,7 @@ Côme Chilliet <mcmic@php.net>
99
<?php
1010
require "connect.inc";
1111

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

1515
$mods = array(
@@ -36,7 +36,7 @@ var_dump(
3636
<?php
3737
require "connect.inc";
3838

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

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

‎ext/ldap/tests/connect.inc

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,23 @@ 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
$sasl_user = getenv("LDAP_TEST_SASL_USER") ?: "Manager";
1314
$passwd = getenv("LDAP_TEST_PASSWD") ?: "secret";
1415
$protocol_version = getenv("LDAP_TEST_OPT_PROTOCOL_VERSION") ?: 3;
1516
$skip_on_bind_failure = getenv("LDAP_TEST_SKIP_BIND_FAILURE") ?: true;
1617

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

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

‎ext/ldap/tests/ldap_add_basic.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Patrick Allaert <patrickallaert@php.net>
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

1515
var_dump(
1616
ldap_add($link, "dc=my-domain,$base", array(
@@ -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
ldap_delete($link, "dc=my-domain,$base");
3737
?>

‎ext/ldap/tests/ldap_add_error.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Patrick Allaert <patrickallaert@php.net>
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

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

@@ -83,7 +83,7 @@ var_dump(
8383
<?php
8484
require "connect.inc";
8585

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

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

‎ext/ldap/tests/ldap_add_ext.phpt

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

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

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

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

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

‎ext/ldap/tests/ldap_bind_basic.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Patrick Allaert <patrickallaert@php.net>
1010
<?php
1111
require "connect.inc";
1212

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

‎ext/ldap/tests/ldap_bind_error.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Patrick Allaert <patrickallaert@php.net>
1010
<?php
1111
require "connect.inc";
1212

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

1616
// Invalid password

‎ext/ldap/tests/ldap_bind_ext.phpt

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

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

1919
var_dump(

‎ext/ldap/tests/ldap_bind_variation.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Patrick Allaert <patrickallaert@php.net>
1010
<?php
1111
require "connect.inc";
1212

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

‎ext/ldap/tests/ldap_compare_basic.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Patrick Allaert <patrickallaert@php.net>
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
var_dump(
1616
ldap_compare($link, "cn=userA,$base", "sn", "testSN1"),
@@ -21,7 +21,7 @@ var_dump(
2121
<?php
2222
include "connect.inc";
2323

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

‎ext/ldap/tests/ldap_compare_error.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Patrick Allaert <patrickallaert@php.net>
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
var_dump(
@@ -23,7 +23,7 @@ var_dump(
2323
<?php
2424
include "connect.inc";
2525

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

‎ext/ldap/tests/ldap_connect_basic.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ Patrick Allaert <patrickallaert@php.net>
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
resource(%d) of type (ldap link)

‎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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require_once('skipifbindfailure.inc');
1111
<?php
1212
include "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
$dn = "$base";
@@ -26,7 +26,7 @@ var_dump(
2626
<?php
2727
include "connect.inc";
2828

29-
$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
29+
$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
3030
remove_dummy_data($link, $base);
3131
?>
3232
--EXPECTF--

‎ext/ldap/tests/ldap_control_paged_results_variation2.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require_once('skipifbindfailure.inc');
1111
<?php
1212
include "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
$dn = "$base";
@@ -26,7 +26,7 @@ var_dump(
2626
<?php
2727
include "connect.inc";
2828

29-
$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
29+
$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
3030
remove_dummy_data($link, $base);
3131
?>
3232
--EXPECTF--

‎ext/ldap/tests/ldap_control_paged_results_variation3.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require_once('skipifbindfailure.inc');
1111
<?php
1212
include "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
$dn = "$base";
@@ -31,7 +31,7 @@ var_dump(
3131
<?php
3232
include "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
remove_dummy_data($link, $base);
3636
?>
3737
--EXPECTF--

‎ext/ldap/tests/ldap_controls.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ skipifunsupportedcontrol(LDAP_CONTROL_VALUESRETURNFILTER);
1414
<?php
1515
include "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
insert_dummy_data($link, $base);
1919

2020
/* Test assertion control */
@@ -54,7 +54,7 @@ var_dump(
5454
<?php
5555
include "connect.inc";
5656

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

‎ext/ldap/tests/ldap_count_entries_basic.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Patrick Allaert <patrickallaert@php.net>
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
$result = ldap_search($link, "$base", "(objectclass=person)");
1616
var_dump(ldap_count_entries($link, $result));
@@ -19,7 +19,7 @@ var_dump(ldap_count_entries($link, $result));
1919
<?php
2020
include "connect.inc";
2121

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

‎ext/ldap/tests/ldap_delete_basic.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Patrick Allaert <patrickallaert@php.net>
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
ldap_add($link, "dc=my-domain,$base", array(
1515
"objectClass" => array(
1616
"top",
@@ -29,7 +29,7 @@ var_dump(
2929
<?php
3030
require "connect.inc";
3131

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

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

‎ext/ldap/tests/ldap_delete_error.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Patrick Allaert <patrickallaert@php.net>
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

1515
// Invalid DN
1616
var_dump(
@@ -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
--EXPECTF--
3636
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
@@ -13,7 +13,7 @@ skipifunsupportedcontrol(LDAP_CONTROL_PRE_READ);
1313
<?php
1414
require "connect.inc";
1515

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

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

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

‎ext/ldap/tests/ldap_errno_basic.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Patrick Allaert <patrickallaert@php.net>
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
@ldap_add($link, "badDN $base", array(
1515
"objectClass" => array(
1616
"top",

‎ext/ldap/tests/ldap_error_basic.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Patrick Allaert <patrickallaert@php.net>
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
@ldap_add($link, "badDN $base", array(
1515
"objectClass" => array(
1616
"top",

0 commit comments

Comments
 (0)