From 3c561995e0243c171bd6c68194d5594df9279303 Mon Sep 17 00:00:00 2001
From: Andreas Heigl <andreas@heigl.org>
Date: Wed, 12 Feb 2020 21:37:23 +0100
Subject: [PATCH 1/8] Deprecate ldap_connect with two parameters

ldap_connect should be called with an LDAP-URI as parameter and not with
2 parameters as that allows much more flexibility like differentiating
between ldap and ldaps or setting multiple ldap-servers.

This change requires one to add null as second parameter in case the
underlying library is Oracle and one wants to add wallet-details.
---
 ext/ldap/ldap.c                                            | 4 ++++
 ext/ldap/tests/bug73933.phpt                               | 2 ++
 ext/ldap/tests/ldap_connect_basic.phpt                     | 3 ++-
 ext/ldap/tests/ldap_connect_error.phpt                     | 4 ++++
 ext/ldap/tests/ldap_first_attribute_error.phpt             | 1 +
 ext/ldap/tests/ldap_get_option_basic.phpt                  | 3 ++-
 ext/ldap/tests/ldap_get_option_package_basic.phpt          | 3 ++-
 ext/ldap/tests/ldap_get_option_variation.phpt              | 3 ++-
 ext/ldap/tests/ldap_rename_error.phpt                      | 3 ++-
 ext/ldap/tests/ldap_set_option_basic.phpt                  | 3 ++-
 ext/ldap/tests/ldap_set_option_cafiles_basic.phpt          | 3 ++-
 ext/ldap/tests/ldap_set_option_ciphersuite_basic.phpt      | 3 ++-
 ext/ldap/tests/ldap_set_option_crlcheck_error.phpt         | 3 ++-
 ext/ldap/tests/ldap_set_option_error.phpt                  | 1 +
 ext/ldap/tests/ldap_set_option_keepalive_basic.phpt        | 3 ++-
 ext/ldap/tests/ldap_set_option_reqcert_basic.phpt          | 3 ++-
 ext/ldap/tests/ldap_set_option_reqcert_error.phpt          | 3 ++-
 ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt | 3 ++-
 ext/ldap/tests/ldap_set_option_variation.phpt              | 3 ++-
 19 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index b8fb4274215f..8374e23d8f9e 100644
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -925,6 +925,10 @@ PHP_FUNCTION(ldap_connect)
 	ldap_linkdata *ld;
 	LDAP *ldap = NULL;
 
+	if (ZEND_NUM_ARGS() == 2) {
+	    zend_error(E_DEPRECATED, "Usage of ldap_connect with two arguments is deprecated.");
+	}
+
 #ifdef HAVE_ORALDAP
 	if (ZEND_NUM_ARGS() == 3 || ZEND_NUM_ARGS() == 4) {
 		WRONG_PARAM_COUNT;
diff --git a/ext/ldap/tests/bug73933.phpt b/ext/ldap/tests/bug73933.phpt
index 0445b7ec2799..a987e6490502 100644
--- a/ext/ldap/tests/bug73933.phpt
+++ b/ext/ldap/tests/bug73933.phpt
@@ -22,6 +22,8 @@ ldap_close($ldap);
 
 ?>
 --EXPECTF--
+Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
+
 Warning: ldap_mod_replace(): Modify: Can't contact LDAP server in %sbug73933.php on line %d
 
 Warning: ldap_modify_batch(): Batch Modify: Can't contact LDAP server in %sbug73933.php on line %d
diff --git a/ext/ldap/tests/ldap_connect_basic.phpt b/ext/ldap/tests/ldap_connect_basic.phpt
index 9e85774ead09..6baa7f0f4a08 100644
--- a/ext/ldap/tests/ldap_connect_basic.phpt
+++ b/ext/ldap/tests/ldap_connect_basic.phpt
@@ -13,5 +13,6 @@ $link = ldap_connect($host, $port);
 var_dump($link);
 ?>
 --EXPECTF--
+Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 object(LDAP\Connection)#%d (0) {
-}
+}
\ No newline at end of file
diff --git a/ext/ldap/tests/ldap_connect_error.phpt b/ext/ldap/tests/ldap_connect_error.phpt
index e44f2c38a49f..944e0a4cc0f2 100644
--- a/ext/ldap/tests/ldap_connect_error.phpt
+++ b/ext/ldap/tests/ldap_connect_error.phpt
@@ -22,4 +22,8 @@ $links[1] = ldap_connect($host, $port);
 Warning: ldap_connect(): Could not create session handle: %s in %s on line %d
 bool(false)
 
+Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
+
+Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
+
 Warning: ldap_connect(): Too many open links (1) in %s on line %d
diff --git a/ext/ldap/tests/ldap_first_attribute_error.phpt b/ext/ldap/tests/ldap_first_attribute_error.phpt
index 0d1175e8f94b..91e243575a52 100644
--- a/ext/ldap/tests/ldap_first_attribute_error.phpt
+++ b/ext/ldap/tests/ldap_first_attribute_error.phpt
@@ -17,4 +17,5 @@ try {
 }
 ?>
 --EXPECT--
+Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 ldap_first_attribute(): Argument #2 ($entry) must be of type LDAP\ResultEntry, LDAP\Connection given
diff --git a/ext/ldap/tests/ldap_get_option_basic.phpt b/ext/ldap/tests/ldap_get_option_basic.phpt
index 1dea64fde949..09cd18cd9b44 100644
--- a/ext/ldap/tests/ldap_get_option_basic.phpt
+++ b/ext/ldap/tests/ldap_get_option_basic.phpt
@@ -18,6 +18,7 @@ var_dump(
     $option
 );
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 bool(true)
 int(3)
diff --git a/ext/ldap/tests/ldap_get_option_package_basic.phpt b/ext/ldap/tests/ldap_get_option_package_basic.phpt
index 1dbbbd206e60..77b6dee649d9 100644
--- a/ext/ldap/tests/ldap_get_option_package_basic.phpt
+++ b/ext/ldap/tests/ldap_get_option_package_basic.phpt
@@ -14,6 +14,7 @@ var_dump(in_array($optionval, ['GnuTLS', 'OpenSSL', 'MozNSS']));
 // This is a read-only option.
 var_dump(ldap_set_option($link, LDAP_OPT_X_TLS_PACKAGE, 'foo'));
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 bool(true)
 bool(false)
diff --git a/ext/ldap/tests/ldap_get_option_variation.phpt b/ext/ldap/tests/ldap_get_option_variation.phpt
index 3af058b20894..e8b3248e1f41 100644
--- a/ext/ldap/tests/ldap_get_option_variation.phpt
+++ b/ext/ldap/tests/ldap_get_option_variation.phpt
@@ -48,7 +48,8 @@ var_dump(
     $option
 );
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 bool(true)
 int(0)
 bool(true)
diff --git a/ext/ldap/tests/ldap_rename_error.phpt b/ext/ldap/tests/ldap_rename_error.phpt
index 833f009bba05..0ca179965eaf 100644
--- a/ext/ldap/tests/ldap_rename_error.phpt
+++ b/ext/ldap/tests/ldap_rename_error.phpt
@@ -12,5 +12,6 @@ require "connect.inc";
 $link = ldap_connect($host, $port);
 var_dump(ldap_rename($link, "cn=userNotFound,$base", "cn=userZ", "$base", true));
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 bool(false)
diff --git a/ext/ldap/tests/ldap_set_option_basic.phpt b/ext/ldap/tests/ldap_set_option_basic.phpt
index 64ffb1627451..00368fb10c46 100644
--- a/ext/ldap/tests/ldap_set_option_basic.phpt
+++ b/ext/ldap/tests/ldap_set_option_basic.phpt
@@ -16,6 +16,7 @@ var_dump(ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version));
 ldap_get_option($link, LDAP_OPT_PROTOCOL_VERSION, $option);
 var_dump($option);
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 bool(true)
 int(3)
diff --git a/ext/ldap/tests/ldap_set_option_cafiles_basic.phpt b/ext/ldap/tests/ldap_set_option_cafiles_basic.phpt
index 29f0e45be23b..893088e7778c 100644
--- a/ext/ldap/tests/ldap_set_option_cafiles_basic.phpt
+++ b/ext/ldap/tests/ldap_set_option_cafiles_basic.phpt
@@ -24,7 +24,8 @@ foreach([
     var_dump($optionval);
 }
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 bool(true)
 string(8) "/foo/bar"
 bool(true)
diff --git a/ext/ldap/tests/ldap_set_option_ciphersuite_basic.phpt b/ext/ldap/tests/ldap_set_option_ciphersuite_basic.phpt
index 58c132d8858e..0f7bab512c52 100644
--- a/ext/ldap/tests/ldap_set_option_ciphersuite_basic.phpt
+++ b/ext/ldap/tests/ldap_set_option_ciphersuite_basic.phpt
@@ -15,6 +15,7 @@ var_dump($result);
 ldap_get_option($link, LDAP_OPT_X_TLS_CIPHER_SUITE, $optionval);
 var_dump($optionval);
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 bool(true)
 string(4) "3DES"
diff --git a/ext/ldap/tests/ldap_set_option_crlcheck_error.phpt b/ext/ldap/tests/ldap_set_option_crlcheck_error.phpt
index a40ba69d79ea..86bf8374fb56 100644
--- a/ext/ldap/tests/ldap_set_option_crlcheck_error.phpt
+++ b/ext/ldap/tests/ldap_set_option_crlcheck_error.phpt
@@ -11,5 +11,6 @@ $link = ldap_connect($host, $port);
 $result = ldap_set_option($link, LDAP_OPT_X_TLS_CRLCHECK, 9001);
 var_dump($result);
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 bool(false)
diff --git a/ext/ldap/tests/ldap_set_option_error.phpt b/ext/ldap/tests/ldap_set_option_error.phpt
index 04603a4e1905..de14ac01cbef 100644
--- a/ext/ldap/tests/ldap_set_option_error.phpt
+++ b/ext/ldap/tests/ldap_set_option_error.phpt
@@ -36,6 +36,7 @@ foreach ($controls as $control) {
 var_dump(ldap_set_option($link, 999999, 999999));
 ?>
 --EXPECT--
+Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 bool(false)
 ValueError: ldap_set_option(): Control must have an "oid" key
 TypeError: ldap_set_option(): Argument #3 ($value) must contain only arrays, where each array is a control
diff --git a/ext/ldap/tests/ldap_set_option_keepalive_basic.phpt b/ext/ldap/tests/ldap_set_option_keepalive_basic.phpt
index 54cf648648af..a04d8db8d9fa 100644
--- a/ext/ldap/tests/ldap_set_option_keepalive_basic.phpt
+++ b/ext/ldap/tests/ldap_set_option_keepalive_basic.phpt
@@ -21,7 +21,8 @@ foreach([
     var_dump($optionval);
 }
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 bool(true)
 int(5)
 bool(true)
diff --git a/ext/ldap/tests/ldap_set_option_reqcert_basic.phpt b/ext/ldap/tests/ldap_set_option_reqcert_basic.phpt
index c97f518e6ae4..0baf92251d94 100644
--- a/ext/ldap/tests/ldap_set_option_reqcert_basic.phpt
+++ b/ext/ldap/tests/ldap_set_option_reqcert_basic.phpt
@@ -23,7 +23,8 @@ foreach([
     var_dump($optionval);
 }
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 bool(true)
 int(0)
 bool(true)
diff --git a/ext/ldap/tests/ldap_set_option_reqcert_error.phpt b/ext/ldap/tests/ldap_set_option_reqcert_error.phpt
index fd41a3a3c5b8..89920ca64f89 100644
--- a/ext/ldap/tests/ldap_set_option_reqcert_error.phpt
+++ b/ext/ldap/tests/ldap_set_option_reqcert_error.phpt
@@ -11,5 +11,6 @@ $link = ldap_connect($host, $port);
 $result = ldap_set_option($link, LDAP_OPT_X_TLS_REQUIRE_CERT, 9001);
 var_dump($result);
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 bool(false)
diff --git a/ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt b/ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt
index 92f99e66d671..3a2b4b6d22c4 100644
--- a/ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt
+++ b/ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt
@@ -23,7 +23,8 @@ foreach([
     var_dump($optionval);
 }
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 bool(true)
 int(512)
 bool(true)
diff --git a/ext/ldap/tests/ldap_set_option_variation.phpt b/ext/ldap/tests/ldap_set_option_variation.phpt
index bc0239da5a32..3bb9233c6874 100644
--- a/ext/ldap/tests/ldap_set_option_variation.phpt
+++ b/ext/ldap/tests/ldap_set_option_variation.phpt
@@ -61,7 +61,8 @@ var_dump(
 ldap_get_option($link, LDAP_OPT_MATCHED_DN, $option);
 var_dump($option);
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 bool(true)
 bool(true)
 bool(true)

From 7169688a9df8674e3aca6a1e89e0dab542b554d4 Mon Sep 17 00:00:00 2001
From: Andreas Heigl <andreas@heigl.org>
Date: Thu, 13 Feb 2020 15:01:30 +0100
Subject: [PATCH 2/8] 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.
---
 ext/ldap/tests/bug48441.phpt                             | 4 ++--
 ext/ldap/tests/bug73933.phpt                             | 4 +---
 ext/ldap/tests/bug77958.phpt                             | 4 ++--
 ext/ldap/tests/connect.inc                               | 9 +++++----
 ext/ldap/tests/ldap_add_basic.phpt                       | 4 ++--
 ext/ldap/tests/ldap_add_error.phpt                       | 4 ++--
 ext/ldap/tests/ldap_add_ext.phpt                         | 4 ++--
 ext/ldap/tests/ldap_bind_basic.phpt                      | 2 +-
 ext/ldap/tests/ldap_bind_error.phpt                      | 2 +-
 ext/ldap/tests/ldap_bind_ext.phpt                        | 2 +-
 ext/ldap/tests/ldap_bind_variation.phpt                  | 2 +-
 ext/ldap/tests/ldap_compare_basic.phpt                   | 4 ++--
 ext/ldap/tests/ldap_compare_error.phpt                   | 4 ++--
 ext/ldap/tests/ldap_connect_basic.phpt                   | 3 +--
 ext/ldap/tests/ldap_connect_error.phpt                   | 8 ++------
 .../tests/ldap_control_paged_results_variation1.phpt     | 0
 ext/ldap/tests/ldap_controls.phpt                        | 4 ++--
 ext/ldap/tests/ldap_count_entries_basic.phpt             | 4 ++--
 ext/ldap/tests/ldap_delete_basic.phpt                    | 4 ++--
 ext/ldap/tests/ldap_delete_error.phpt                    | 4 ++--
 ext/ldap/tests/ldap_delete_ext.phpt                      | 4 ++--
 ext/ldap/tests/ldap_errno_basic.phpt                     | 2 +-
 ext/ldap/tests/ldap_error_basic.phpt                     | 2 +-
 ext/ldap/tests/ldap_exop.phpt                            | 8 ++++----
 ext/ldap/tests/ldap_exop_passwd.phpt                     | 8 ++++----
 ext/ldap/tests/ldap_exop_passwd_error.phpt               | 6 +++---
 ext/ldap/tests/ldap_exop_refresh.phpt                    | 6 +++---
 ext/ldap/tests/ldap_exop_whoami.phpt                     | 4 ++--
 ext/ldap/tests/ldap_first_attribute_basic.phpt           | 4 ++--
 ext/ldap/tests/ldap_first_attribute_error.phpt           | 3 +--
 ext/ldap/tests/ldap_first_entry_basic.phpt               | 4 ++--
 ext/ldap/tests/ldap_first_reference_basic.phpt           | 4 ++--
 ext/ldap/tests/ldap_free_result_basic.phpt               | 4 ++--
 ext/ldap/tests/ldap_get_attributes_basic.phpt            | 4 ++--
 ext/ldap/tests/ldap_get_dn_basic.phpt                    | 4 ++--
 ext/ldap/tests/ldap_get_entries_basic.phpt               | 4 ++--
 ext/ldap/tests/ldap_get_entries_variation.phpt           | 4 ++--
 ext/ldap/tests/ldap_get_option_basic.phpt                | 3 +--
 ext/ldap/tests/ldap_get_option_controls.phpt             | 4 ++--
 ext/ldap/tests/ldap_get_option_package_basic.phpt        | 3 +--
 ext/ldap/tests/ldap_get_option_variation.phpt            | 3 +--
 ext/ldap/tests/ldap_get_values_len_basic.phpt            | 4 ++--
 ext/ldap/tests/ldap_get_values_len_error.phpt            | 4 ++--
 ext/ldap/tests/ldap_list_basic.phpt                      | 4 ++--
 ext/ldap/tests/ldap_mod_add_basic.phpt                   | 4 ++--
 ext/ldap/tests/ldap_mod_add_error.phpt                   | 4 ++--
 ext/ldap/tests/ldap_mod_del_basic.phpt                   | 4 ++--
 ext/ldap/tests/ldap_mod_del_error.phpt                   | 4 ++--
 ext/ldap/tests/ldap_mod_ext.phpt                         | 4 ++--
 ext/ldap/tests/ldap_mod_replace_basic.phpt               | 4 ++--
 ext/ldap/tests/ldap_mod_replace_error.phpt               | 4 ++--
 ext/ldap/tests/ldap_modify_basic.phpt                    | 4 ++--
 ext/ldap/tests/ldap_modify_batch_basic.phpt              | 4 ++--
 ext/ldap/tests/ldap_modify_batch_error.phpt              | 4 ++--
 ext/ldap/tests/ldap_modify_error.phpt                    | 4 ++--
 ext/ldap/tests/ldap_next_attribute_basic.phpt            | 4 ++--
 ext/ldap/tests/ldap_next_attribute_error.phpt            | 4 ++--
 ext/ldap/tests/ldap_next_entry_basic.phpt                | 4 ++--
 ext/ldap/tests/ldap_next_reference_basic.phpt            | 4 ++--
 ext/ldap/tests/ldap_option_reqcert_basic.phpt            | 2 +-
 ext/ldap/tests/ldap_option_reqcert_error.phpt            | 2 +-
 ext/ldap/tests/ldap_parse_reference_basic.phpt           | 4 ++--
 ext/ldap/tests/ldap_parse_result_basic.phpt              | 4 ++--
 ext/ldap/tests/ldap_parse_result_controls.phpt           | 4 ++--
 ext/ldap/tests/ldap_read_basic.phpt                      | 4 ++--
 ext/ldap/tests/ldap_rename_basic.phpt                    | 4 ++--
 ext/ldap/tests/ldap_rename_error.phpt                    | 3 +--
 ext/ldap/tests/ldap_rename_ext.phpt                      | 4 ++--
 ext/ldap/tests/ldap_sasl_bind_basic.phpt                 | 4 ++--
 ext/ldap/tests/ldap_sasl_bind_error.phpt                 | 2 +-
 ext/ldap/tests/ldap_search_basic.phpt                    | 4 ++--
 ext/ldap/tests/ldap_search_error.phpt                    | 2 +-
 ext/ldap/tests/ldap_search_overrides.phpt                | 4 ++--
 ext/ldap/tests/ldap_search_paged_result_controls.phpt    | 4 ++--
 ext/ldap/tests/ldap_search_sort_controls.phpt            | 4 ++--
 ext/ldap/tests/ldap_search_variation1.phpt               | 4 ++--
 ext/ldap/tests/ldap_search_variation2.phpt               | 4 ++--
 ext/ldap/tests/ldap_search_variation3.phpt               | 4 ++--
 ext/ldap/tests/ldap_search_variation4.phpt               | 4 ++--
 ext/ldap/tests/ldap_search_variation5.phpt               | 4 ++--
 ext/ldap/tests/ldap_search_variation6.phpt               | 4 ++--
 ext/ldap/tests/ldap_set_option_basic.phpt                | 3 +--
 ext/ldap/tests/ldap_set_option_cafiles_basic.phpt        | 3 +--
 ext/ldap/tests/ldap_set_option_ciphersuite_basic.phpt    | 3 +--
 ext/ldap/tests/ldap_set_option_crlcheck_basic.phpt       | 4 ++--
 ext/ldap/tests/ldap_set_option_crlcheck_error.phpt       | 3 +--
 ext/ldap/tests/ldap_set_option_error.phpt                | 3 +--
 ext/ldap/tests/ldap_set_option_keepalive_basic.phpt      | 3 +--
 ext/ldap/tests/ldap_set_option_reqcert_basic.phpt        | 3 +--
 ext/ldap/tests/ldap_set_option_reqcert_error.phpt        | 3 +--
 .../tests/ldap_set_option_tls_protocol_min_basic.phpt    | 3 +--
 ext/ldap/tests/ldap_set_option_variation.phpt            | 3 +--
 ext/ldap/tests/ldap_set_rebind_proc_basic.phpt           | 2 +-
 ext/ldap/tests/ldap_set_rebind_proc_error.phpt           | 4 ++--
 ext/ldap/tests/ldap_start_tls_basic.phpt                 | 2 +-
 ext/ldap/tests/ldap_unbind_basic.phpt                    | 2 +-
 ext/ldap/tests/ldap_unbind_variation.phpt                | 2 +-
 ext/ldap/tests/skipifbindfailure.inc                     | 2 +-
 ext/ldap/tests/skipifcontrol.inc                         | 4 ++--
 99 files changed, 173 insertions(+), 194 deletions(-)
 create mode 100644 ext/ldap/tests/ldap_control_paged_results_variation1.phpt

diff --git a/ext/ldap/tests/bug48441.phpt b/ext/ldap/tests/bug48441.phpt
index 576ec2df1e18..d3b5dcbef018 100644
--- a/ext/ldap/tests/bug48441.phpt
+++ b/ext/ldap/tests/bug48441.phpt
@@ -12,7 +12,7 @@ require_once('skipifbindfailure.inc');
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 
 $dn = "$base";
@@ -35,7 +35,7 @@ var_dump(
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECTF--
diff --git a/ext/ldap/tests/bug73933.phpt b/ext/ldap/tests/bug73933.phpt
index a987e6490502..d5110da07cc7 100644
--- a/ext/ldap/tests/bug73933.phpt
+++ b/ext/ldap/tests/bug73933.phpt
@@ -5,7 +5,7 @@ ldap
 --FILE--
 <?php
 /* We are assuming 3333 is not connectable */
-$ldap = ldap_connect('127.0.0.1', 3333);
+$ldap = ldap_connect('ldap://127.0.0.1:3333');
 
 ldap_mod_replace($ldap, '', array(
     'lockoutTime' => array(0),
@@ -22,8 +22,6 @@ ldap_close($ldap);
 
 ?>
 --EXPECTF--
-Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
-
 Warning: ldap_mod_replace(): Modify: Can't contact LDAP server in %sbug73933.php on line %d
 
 Warning: ldap_modify_batch(): Batch Modify: Can't contact LDAP server in %sbug73933.php on line %d
diff --git a/ext/ldap/tests/bug77958.phpt b/ext/ldap/tests/bug77958.phpt
index da6edca348b7..c8ecc9bbc02d 100644
--- a/ext/ldap/tests/bug77958.phpt
+++ b/ext/ldap/tests/bug77958.phpt
@@ -10,7 +10,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 
 $mods = array(
@@ -37,7 +37,7 @@ var_dump(
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 remove_dummy_data($link, $base);
 ?>
diff --git a/ext/ldap/tests/connect.inc b/ext/ldap/tests/connect.inc
index e3a9d1c777dc..888c4da56d57 100644
--- a/ext/ldap/tests/connect.inc
+++ b/ext/ldap/tests/connect.inc
@@ -7,6 +7,7 @@ Change the LDAP_TEST_* environment values if you want to use another configurati
 
 $host			= getenv("LDAP_TEST_HOST")	?: "localhost";
 $port			= getenv("LDAP_TEST_PORT")	?: 389;
+$uri            = getenv("LDAP_TEST_URI") ?: 'ldap://localhost:389';
 $base			= getenv("LDAP_TEST_BASE")	?: "dc=my-domain,dc=com";
 $user			= getenv("LDAP_TEST_USER")	?: "cn=Manager,$base";
 $passwd			= getenv("LDAP_TEST_PASSWD")	?: "secret";
@@ -15,15 +16,15 @@ $sasl_passwd    = getenv("LDAP_TEST_SASL_PASSWD")   ?: "oops";
 $protocol_version	= getenv("LDAP_TEST_OPT_PROTOCOL_VERSION")	?: 3;
 $skip_on_bind_failure	= getenv("LDAP_TEST_SKIP_BIND_FAILURE") ?: true;
 
-function ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version) {
-    $link = ldap_connect($host, $port);
+function ldap_connect_and_bind($uri, $user, $passwd, $protocol_version) {
+    $link = ldap_connect($uri);
     ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
     ldap_bind($link, $user, $passwd);
     return $link;
 }
 
-function test_bind($host, $port, $user, $passwd, $protocol_version) {
-    $link = ldap_connect($host, $port);
+function test_bind($uri, $user, $passwd, $protocol_version) {
+    $link = ldap_connect($uri);
     ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
     return ldap_bind($link, $user, $passwd);
 }
diff --git a/ext/ldap/tests/ldap_add_basic.phpt b/ext/ldap/tests/ldap_add_basic.phpt
index 551dea60836d..7c3261b8c89d 100644
--- a/ext/ldap/tests/ldap_add_basic.phpt
+++ b/ext/ldap/tests/ldap_add_basic.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 var_dump(
     ldap_add($link, "dc=my-domain,$base", array(
@@ -32,7 +32,7 @@ var_dump(
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 ldap_delete($link, "dc=my-domain,$base");
 ?>
diff --git a/ext/ldap/tests/ldap_add_error.phpt b/ext/ldap/tests/ldap_add_error.phpt
index 8f75933d6f50..d78276eca3e5 100644
--- a/ext/ldap/tests/ldap_add_error.phpt
+++ b/ext/ldap/tests/ldap_add_error.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 var_dump(ldap_add($link, "$base", array()));
 
@@ -86,7 +86,7 @@ var_dump(
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 ldap_delete($link, "dc=my-domain,$base");
 ?>
diff --git a/ext/ldap/tests/ldap_add_ext.phpt b/ext/ldap/tests/ldap_add_ext.phpt
index d60b6aa65eb7..fa02e296d00f 100644
--- a/ext/ldap/tests/ldap_add_ext.phpt
+++ b/ext/ldap/tests/ldap_add_ext.phpt
@@ -14,7 +14,7 @@ skipifunsupportedcontrol(LDAP_CONTROL_POST_READ);
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 var_dump(
     $result = ldap_add_ext($link, "o=test_ldap_add_ext,$base", array(
@@ -37,7 +37,7 @@ var_dump(
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 ldap_delete($link, "o=test_ldap_add_ext,$base");
 ?>
diff --git a/ext/ldap/tests/ldap_bind_basic.phpt b/ext/ldap/tests/ldap_bind_basic.phpt
index ad4090ee0895..eaf22b096c1d 100644
--- a/ext/ldap/tests/ldap_bind_basic.phpt
+++ b/ext/ldap/tests/ldap_bind_basic.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect($host, $port);
+$link = ldap_connect($uri);
 ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
 var_dump(ldap_bind($link));
 ?>
diff --git a/ext/ldap/tests/ldap_bind_error.phpt b/ext/ldap/tests/ldap_bind_error.phpt
index b4465be3db71..7567ce86da12 100644
--- a/ext/ldap/tests/ldap_bind_error.phpt
+++ b/ext/ldap/tests/ldap_bind_error.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect($host, $port);
+$link = ldap_connect($uri);
 ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
 
 // Invalid password
diff --git a/ext/ldap/tests/ldap_bind_ext.phpt b/ext/ldap/tests/ldap_bind_ext.phpt
index 2b1a05affc01..b6b3b3da0c37 100644
--- a/ext/ldap/tests/ldap_bind_ext.phpt
+++ b/ext/ldap/tests/ldap_bind_ext.phpt
@@ -14,7 +14,7 @@ skipifunsupportedcontrol(LDAP_CONTROL_PASSWORDPOLICYREQUEST);
 <?php
 require "connect.inc";
 
-$link = ldap_connect($host, $port);
+$link = ldap_connect($uri);
 ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
 
 var_dump(
diff --git a/ext/ldap/tests/ldap_bind_variation.phpt b/ext/ldap/tests/ldap_bind_variation.phpt
index dc6aaf27269d..28f799305bc7 100644
--- a/ext/ldap/tests/ldap_bind_variation.phpt
+++ b/ext/ldap/tests/ldap_bind_variation.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect($host, $port);
+$link = ldap_connect($uri);
 ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
 var_dump(ldap_bind($link, $user, $passwd));
 ?>
diff --git a/ext/ldap/tests/ldap_compare_basic.phpt b/ext/ldap/tests/ldap_compare_basic.phpt
index b99e709a4936..b276ba5706f0 100644
--- a/ext/ldap/tests/ldap_compare_basic.phpt
+++ b/ext/ldap/tests/ldap_compare_basic.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 var_dump(
     ldap_compare($link, "cn=userA,$base", "sn", "testSN1"),
@@ -22,7 +22,7 @@ var_dump(
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECT--
diff --git a/ext/ldap/tests/ldap_compare_error.phpt b/ext/ldap/tests/ldap_compare_error.phpt
index bc9389f655cd..63383dfaf536 100644
--- a/ext/ldap/tests/ldap_compare_error.phpt
+++ b/ext/ldap/tests/ldap_compare_error.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 
 var_dump(
@@ -24,7 +24,7 @@ var_dump(
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECTF--
diff --git a/ext/ldap/tests/ldap_connect_basic.phpt b/ext/ldap/tests/ldap_connect_basic.phpt
index 6baa7f0f4a08..4aa6f21e6bcf 100644
--- a/ext/ldap/tests/ldap_connect_basic.phpt
+++ b/ext/ldap/tests/ldap_connect_basic.phpt
@@ -9,10 +9,9 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect($host, $port);
+$link = ldap_connect($uri);
 var_dump($link);
 ?>
 --EXPECTF--
-Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 object(LDAP\Connection)#%d (0) {
 }
\ No newline at end of file
diff --git a/ext/ldap/tests/ldap_connect_error.phpt b/ext/ldap/tests/ldap_connect_error.phpt
index 944e0a4cc0f2..8efecaee072b 100644
--- a/ext/ldap/tests/ldap_connect_error.phpt
+++ b/ext/ldap/tests/ldap_connect_error.phpt
@@ -15,15 +15,11 @@ require "connect.inc";
 var_dump(ldap_connect("ldap://$host:$port/$base"));
 
 $links = array();
-$links[0] = ldap_connect($host, $port);
-$links[1] = ldap_connect($host, $port);
+$links[0] = ldap_connect($uri);
+$links[1] = ldap_connect($uri);
 ?>
 --EXPECTF--
 Warning: ldap_connect(): Could not create session handle: %s in %s on line %d
 bool(false)
 
-Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
-
-Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
-
 Warning: ldap_connect(): Too many open links (1) in %s on line %d
diff --git a/ext/ldap/tests/ldap_control_paged_results_variation1.phpt b/ext/ldap/tests/ldap_control_paged_results_variation1.phpt
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/ext/ldap/tests/ldap_controls.phpt b/ext/ldap/tests/ldap_controls.phpt
index f79b7ff7bc2e..fc5482278c33 100644
--- a/ext/ldap/tests/ldap_controls.phpt
+++ b/ext/ldap/tests/ldap_controls.phpt
@@ -15,7 +15,7 @@ skipifunsupportedcontrol(LDAP_CONTROL_VALUESRETURNFILTER);
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 
 /* Test assertion control */
@@ -55,7 +55,7 @@ var_dump(
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECTF--
diff --git a/ext/ldap/tests/ldap_count_entries_basic.phpt b/ext/ldap/tests/ldap_count_entries_basic.phpt
index 80f21996e267..297e50a3a7fa 100644
--- a/ext/ldap/tests/ldap_count_entries_basic.phpt
+++ b/ext/ldap/tests/ldap_count_entries_basic.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 $result = ldap_search($link, "$base", "(objectclass=person)");
 var_dump(ldap_count_entries($link, $result));
@@ -20,7 +20,7 @@ var_dump(ldap_count_entries($link, $result));
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECT--
diff --git a/ext/ldap/tests/ldap_delete_basic.phpt b/ext/ldap/tests/ldap_delete_basic.phpt
index 491c12f6fdfc..fad69f60c84b 100644
--- a/ext/ldap/tests/ldap_delete_basic.phpt
+++ b/ext/ldap/tests/ldap_delete_basic.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 ldap_add($link, "dc=my-domain,$base", array(
     "objectClass"	=> array(
         "top",
@@ -30,7 +30,7 @@ var_dump(
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 @ldap_delete($link, "dc=my-domain,$base");
 ?>
diff --git a/ext/ldap/tests/ldap_delete_error.phpt b/ext/ldap/tests/ldap_delete_error.phpt
index 6333692088ab..7323129e14c1 100644
--- a/ext/ldap/tests/ldap_delete_error.phpt
+++ b/ext/ldap/tests/ldap_delete_error.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 // Invalid DN
 var_dump(
@@ -31,7 +31,7 @@ var_dump(
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 ?>
 --EXPECTF--
 Warning: ldap_delete(): Delete: Invalid DN syntax in %s on line %d
diff --git a/ext/ldap/tests/ldap_delete_ext.phpt b/ext/ldap/tests/ldap_delete_ext.phpt
index 41800cd53686..a7f7bff83921 100644
--- a/ext/ldap/tests/ldap_delete_ext.phpt
+++ b/ext/ldap/tests/ldap_delete_ext.phpt
@@ -14,7 +14,7 @@ skipifunsupportedcontrol(LDAP_CONTROL_PRE_READ);
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 ldap_add($link, "dc=my-domain,$base", array(
     "objectClass"	=> array(
         "top",
@@ -39,7 +39,7 @@ var_dump(
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 @ldap_delete($link, "dc=my-domain,$base");
 ?>
diff --git a/ext/ldap/tests/ldap_errno_basic.phpt b/ext/ldap/tests/ldap_errno_basic.phpt
index 78f9a83f50a4..feaef65d4b23 100644
--- a/ext/ldap/tests/ldap_errno_basic.phpt
+++ b/ext/ldap/tests/ldap_errno_basic.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 @ldap_add($link, "badDN $base", array(
     "objectClass"	=> array(
         "top",
diff --git a/ext/ldap/tests/ldap_error_basic.phpt b/ext/ldap/tests/ldap_error_basic.phpt
index 903196090588..37bbc37891ca 100644
--- a/ext/ldap/tests/ldap_error_basic.phpt
+++ b/ext/ldap/tests/ldap_error_basic.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 @ldap_add($link, "badDN $base", array(
     "objectClass"	=> array(
         "top",
diff --git a/ext/ldap/tests/ldap_exop.phpt b/ext/ldap/tests/ldap_exop.phpt
index 80ce87139930..92d85e7d9797 100644
--- a/ext/ldap/tests/ldap_exop.phpt
+++ b/ext/ldap/tests/ldap_exop.phpt
@@ -10,7 +10,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 
 function build_reqdata_passwd($user, $oldpw, $newpw)
@@ -46,19 +46,19 @@ var_dump(
     $r = ldap_exop($link, LDAP_EXOP_WHO_AM_I),
     ldap_parse_exop($link, $r, $retdata2),
     $retdata2,
-    test_bind($host, $port, "cn=userA,$base", $userAPassword, $protocol_version),
+    test_bind($uri, "cn=userA,$base", $userAPassword, $protocol_version),
     $r = ldap_exop($link, LDAP_EXOP_MODIFY_PASSWD, build_reqdata_passwd("cn=userA,$base", $userAPassword, "")),
     ldap_parse_exop($link, $r, $retpwdata, $retpwoid),
     $genpw = extract_genpw($retpwdata),
     $retpwoid,
-    test_bind($host, $port, "cn=userA,$base", $genpw, $protocol_version)
+    test_bind($uri, "cn=userA,$base", $genpw, $protocol_version)
 );
 ?>
 --CLEAN--
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 remove_dummy_data($link, $base);
 ?>
diff --git a/ext/ldap/tests/ldap_exop_passwd.phpt b/ext/ldap/tests/ldap_exop_passwd.phpt
index 5ce1d0338de4..0bb20e676955 100644
--- a/ext/ldap/tests/ldap_exop_passwd.phpt
+++ b/ext/ldap/tests/ldap_exop_passwd.phpt
@@ -10,7 +10,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 
 // ldap_exop_passwd() allows to pass the DN, OLD and NEW passwords,
@@ -19,16 +19,16 @@ var_dump(
   $genpw = ldap_exop_passwd($link, "cn=userA,$base", "oops", "", $ctrls),
   $ctrls,
   $genpw = ldap_exop_passwd($link, "cn=userA,$base"),
-  test_bind($host, $port, "cn=userA,$base", $genpw, $protocol_version),
+  test_bind($uri, "cn=userA,$base", $genpw, $protocol_version),
   ldap_exop_passwd($link, "cn=userA,$base", $genpw, "newPassword"),
-  test_bind($host, $port, "cn=userA,$base", "newPassword", $protocol_version)
+  test_bind($uri, "cn=userA,$base", "newPassword", $protocol_version)
 );
 ?>
 --CLEAN--
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 remove_dummy_data($link, $base);
 ?>
diff --git a/ext/ldap/tests/ldap_exop_passwd_error.phpt b/ext/ldap/tests/ldap_exop_passwd_error.phpt
index 95ade778594d..1eba053c66a2 100644
--- a/ext/ldap/tests/ldap_exop_passwd_error.phpt
+++ b/ext/ldap/tests/ldap_exop_passwd_error.phpt
@@ -10,20 +10,20 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 
 var_dump(ldap_exop_passwd($link, "cn=userA,$base", "wrongPassword", "newPassword", $ctrls));
 var_dump($ctrls);
 var_dump(ldap_error($link));
 var_dump(ldap_errno($link));
-var_dump(test_bind($host, $port, "cn=userA,$base", "newPassword", $protocol_version));
+var_dump(test_bind($uri, "cn=userA,$base", "newPassword", $protocol_version));
 ?>
 --CLEAN--
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 remove_dummy_data($link, $base);
 ?>
diff --git a/ext/ldap/tests/ldap_exop_refresh.phpt b/ext/ldap/tests/ldap_exop_refresh.phpt
index 8d3c614a65b9..7a77e6663b24 100644
--- a/ext/ldap/tests/ldap_exop_refresh.phpt
+++ b/ext/ldap/tests/ldap_exop_refresh.phpt
@@ -7,7 +7,7 @@ ldap
 --SKIPIF--
 <?php require_once('skipifbindfailure.inc'); ?>
 <?php
-    $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+    $link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
     $r = ldap_read($link, '', 'objectClass=*', array('dynamicsubtrees'));
     $info = ldap_get_entries($link, $r)[0];
     if (!isset($info['dynamicsubtrees'])) {
@@ -18,7 +18,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 insert_dummy_data($link, $base);
 ldap_add($link, "cn=tmp,$base", array(
@@ -34,7 +34,7 @@ var_dump(
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 ldap_delete($link, "cn=tmp,$base");
 remove_dummy_data($link, $base);
 ?>
diff --git a/ext/ldap/tests/ldap_exop_whoami.phpt b/ext/ldap/tests/ldap_exop_whoami.phpt
index ef6cc568b043..3c17ed099768 100644
--- a/ext/ldap/tests/ldap_exop_whoami.phpt
+++ b/ext/ldap/tests/ldap_exop_whoami.phpt
@@ -10,7 +10,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 
 var_dump(
@@ -21,7 +21,7 @@ var_dump(
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 remove_dummy_data($link, $base);
 ?>
diff --git a/ext/ldap/tests/ldap_first_attribute_basic.phpt b/ext/ldap/tests/ldap_first_attribute_basic.phpt
index e9552ce547c3..adde35f3d9d9 100644
--- a/ext/ldap/tests/ldap_first_attribute_basic.phpt
+++ b/ext/ldap/tests/ldap_first_attribute_basic.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 $result = ldap_search($link, "$base", "(objectclass=organization)", array("objectClass"));
 $entry = ldap_first_entry($link, $result);
@@ -23,7 +23,7 @@ var_dump(
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECT--
diff --git a/ext/ldap/tests/ldap_first_attribute_error.phpt b/ext/ldap/tests/ldap_first_attribute_error.phpt
index 91e243575a52..2776838501d3 100644
--- a/ext/ldap/tests/ldap_first_attribute_error.phpt
+++ b/ext/ldap/tests/ldap_first_attribute_error.phpt
@@ -9,7 +9,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect($host, $port);
+$link = ldap_connect($uri);
 try {
     var_dump(ldap_first_attribute($link, $link));
 } catch (TypeError $e) {
@@ -17,5 +17,4 @@ try {
 }
 ?>
 --EXPECT--
-Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 ldap_first_attribute(): Argument #2 ($entry) must be of type LDAP\ResultEntry, LDAP\Connection given
diff --git a/ext/ldap/tests/ldap_first_entry_basic.phpt b/ext/ldap/tests/ldap_first_entry_basic.phpt
index a69165997d25..29f6d9220feb 100644
--- a/ext/ldap/tests/ldap_first_entry_basic.phpt
+++ b/ext/ldap/tests/ldap_first_entry_basic.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 $result = ldap_search($link, "$base", "(objectclass=person)");
 var_dump(
@@ -23,7 +23,7 @@ var_dump(
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECTF--
diff --git a/ext/ldap/tests/ldap_first_reference_basic.phpt b/ext/ldap/tests/ldap_first_reference_basic.phpt
index 7c4cb5fec5e5..486f5f8c6eee 100644
--- a/ext/ldap/tests/ldap_first_reference_basic.phpt
+++ b/ext/ldap/tests/ldap_first_reference_basic.phpt
@@ -10,7 +10,7 @@ ldap
 --FILE--
 <?php
 require "connect.inc";
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 ldap_add($link, "cn=userref,$base", array(
         "objectClass" => array("extensibleObject", "referral"),
@@ -28,7 +28,7 @@ var_dump($refs);
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 // Referral can only be removed with Manage DSA IT Control
 ldap_delete($link, "cn=userref,$base", [['oid' => LDAP_CONTROL_MANAGEDSAIT, 'iscritical' => TRUE]]);
 remove_dummy_data($link, $base);
diff --git a/ext/ldap/tests/ldap_free_result_basic.phpt b/ext/ldap/tests/ldap_free_result_basic.phpt
index 788a81221e31..cae61ca2775b 100644
--- a/ext/ldap/tests/ldap_free_result_basic.phpt
+++ b/ext/ldap/tests/ldap_free_result_basic.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 $result = ldap_search($link, "$base", "(objectclass=person)");
 var_dump(ldap_free_result($result));
@@ -20,7 +20,7 @@ var_dump(ldap_free_result($result));
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECT--
diff --git a/ext/ldap/tests/ldap_get_attributes_basic.phpt b/ext/ldap/tests/ldap_get_attributes_basic.phpt
index 3c786edac746..abfca7227856 100644
--- a/ext/ldap/tests/ldap_get_attributes_basic.phpt
+++ b/ext/ldap/tests/ldap_get_attributes_basic.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 $result = ldap_search($link, "$base", "(o=test)");
 $entry = ldap_first_entry($link, $result);
@@ -23,7 +23,7 @@ var_dump(
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECT--
diff --git a/ext/ldap/tests/ldap_get_dn_basic.phpt b/ext/ldap/tests/ldap_get_dn_basic.phpt
index 2f2daa173ca4..16971af18314 100644
--- a/ext/ldap/tests/ldap_get_dn_basic.phpt
+++ b/ext/ldap/tests/ldap_get_dn_basic.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 $result = ldap_search($link, "$base", "(objectclass=organization)");
 $entry = ldap_first_entry($link, $result);
@@ -23,7 +23,7 @@ var_dump(
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECTF--
diff --git a/ext/ldap/tests/ldap_get_entries_basic.phpt b/ext/ldap/tests/ldap_get_entries_basic.phpt
index 0807519b60e4..4f86c5d8e3ca 100644
--- a/ext/ldap/tests/ldap_get_entries_basic.phpt
+++ b/ext/ldap/tests/ldap_get_entries_basic.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 
 var_dump(
@@ -25,7 +25,7 @@ var_dump(
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECTF--
diff --git a/ext/ldap/tests/ldap_get_entries_variation.phpt b/ext/ldap/tests/ldap_get_entries_variation.phpt
index c078dc24a5a1..230f56680da1 100644
--- a/ext/ldap/tests/ldap_get_entries_variation.phpt
+++ b/ext/ldap/tests/ldap_get_entries_variation.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 
 var_dump(
@@ -25,7 +25,7 @@ var_dump(
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECT--
diff --git a/ext/ldap/tests/ldap_get_option_basic.phpt b/ext/ldap/tests/ldap_get_option_basic.phpt
index 09cd18cd9b44..c4a612843105 100644
--- a/ext/ldap/tests/ldap_get_option_basic.phpt
+++ b/ext/ldap/tests/ldap_get_option_basic.phpt
@@ -9,7 +9,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect($host, $port);
+$link = ldap_connect($uri);
 $option = null;
 ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
 
@@ -19,6 +19,5 @@ var_dump(
 );
 ?>
 --EXPECTF--
-Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 bool(true)
 int(3)
diff --git a/ext/ldap/tests/ldap_get_option_controls.phpt b/ext/ldap/tests/ldap_get_option_controls.phpt
index 8a348baaa8eb..4542cbb4bc97 100644
--- a/ext/ldap/tests/ldap_get_option_controls.phpt
+++ b/ext/ldap/tests/ldap_get_option_controls.phpt
@@ -12,7 +12,7 @@ require_once('skipifbindfailure.inc');
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 
 function build_ctrl_paged_value($int, $cookie)
@@ -63,7 +63,7 @@ var_dump(
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECTF--
diff --git a/ext/ldap/tests/ldap_get_option_package_basic.phpt b/ext/ldap/tests/ldap_get_option_package_basic.phpt
index 77b6dee649d9..3899e824612b 100644
--- a/ext/ldap/tests/ldap_get_option_package_basic.phpt
+++ b/ext/ldap/tests/ldap_get_option_package_basic.phpt
@@ -7,7 +7,7 @@ ldap
 --FILE--
 <?php
 require "connect.inc";
-$link = ldap_connect($host, $port);
+$link = ldap_connect($uri);
 
 $result = ldap_get_option($link, LDAP_OPT_X_TLS_PACKAGE, $optionval);
 var_dump(in_array($optionval, ['GnuTLS', 'OpenSSL', 'MozNSS']));
@@ -15,6 +15,5 @@ var_dump(in_array($optionval, ['GnuTLS', 'OpenSSL', 'MozNSS']));
 var_dump(ldap_set_option($link, LDAP_OPT_X_TLS_PACKAGE, 'foo'));
 ?>
 --EXPECTF--
-Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 bool(true)
 bool(false)
diff --git a/ext/ldap/tests/ldap_get_option_variation.phpt b/ext/ldap/tests/ldap_get_option_variation.phpt
index e8b3248e1f41..6cd9708e1e5a 100644
--- a/ext/ldap/tests/ldap_get_option_variation.phpt
+++ b/ext/ldap/tests/ldap_get_option_variation.phpt
@@ -9,7 +9,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect($host, $port);
+$link = ldap_connect($uri);
 $option = null;
 
 $controls = array(
@@ -49,7 +49,6 @@ var_dump(
 );
 ?>
 --EXPECTF--
-Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 bool(true)
 int(0)
 bool(true)
diff --git a/ext/ldap/tests/ldap_get_values_len_basic.phpt b/ext/ldap/tests/ldap_get_values_len_basic.phpt
index 4d4c43bbfd36..99328a712b25 100644
--- a/ext/ldap/tests/ldap_get_values_len_basic.phpt
+++ b/ext/ldap/tests/ldap_get_values_len_basic.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 $result = ldap_search($link, "$base", "(o=test)");
 $entry = ldap_first_entry($link, $result);
@@ -23,7 +23,7 @@ var_dump(
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECT--
diff --git a/ext/ldap/tests/ldap_get_values_len_error.phpt b/ext/ldap/tests/ldap_get_values_len_error.phpt
index 3b99e20a2364..eb18f5adf466 100644
--- a/ext/ldap/tests/ldap_get_values_len_error.phpt
+++ b/ext/ldap/tests/ldap_get_values_len_error.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 $result = ldap_search($link, "$base", "(objectclass=organization)");
 $entry = ldap_first_entry($link, $result);
@@ -22,7 +22,7 @@ var_dump(ldap_get_values_len($link, $entry, "inexistentAttribute"));
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECTF--
diff --git a/ext/ldap/tests/ldap_list_basic.phpt b/ext/ldap/tests/ldap_list_basic.phpt
index 704a1d712c2c..cba341f2b2a9 100644
--- a/ext/ldap/tests/ldap_list_basic.phpt
+++ b/ext/ldap/tests/ldap_list_basic.phpt
@@ -14,7 +14,7 @@ require_once('skipifbindfailure.inc');
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 var_dump(
     $result = ldap_list($link, "$base", "(objectClass=person)"),
@@ -25,7 +25,7 @@ var_dump(
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECTF--
diff --git a/ext/ldap/tests/ldap_mod_add_basic.phpt b/ext/ldap/tests/ldap_mod_add_basic.phpt
index 437a2103c407..ec2e5a3066ea 100644
--- a/ext/ldap/tests/ldap_mod_add_basic.phpt
+++ b/ext/ldap/tests/ldap_mod_add_basic.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 
 $entry = array(
@@ -30,7 +30,7 @@ var_dump(
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 remove_dummy_data($link, $base);
 ?>
diff --git a/ext/ldap/tests/ldap_mod_add_error.phpt b/ext/ldap/tests/ldap_mod_add_error.phpt
index bbd9faf86b00..47aafb01612a 100644
--- a/ext/ldap/tests/ldap_mod_add_error.phpt
+++ b/ext/ldap/tests/ldap_mod_add_error.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 // DN not found
 var_dump(ldap_mod_add($link, "dc=my-domain,$base", array()));
@@ -44,7 +44,7 @@ var_dump(ldap_mod_add($link, "dc=my-domain,$base", $entry2));
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 ldap_delete($link, "dc=my-domain,$base");
 ?>
diff --git a/ext/ldap/tests/ldap_mod_del_basic.phpt b/ext/ldap/tests/ldap_mod_del_basic.phpt
index 6972bc3dd9e0..1888bde25b4a 100644
--- a/ext/ldap/tests/ldap_mod_del_basic.phpt
+++ b/ext/ldap/tests/ldap_mod_del_basic.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 
 $entry = array(
@@ -30,7 +30,7 @@ var_dump(
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 remove_dummy_data($link, $base);
 ?>
diff --git a/ext/ldap/tests/ldap_mod_del_error.phpt b/ext/ldap/tests/ldap_mod_del_error.phpt
index 9e6af834cb2f..2a6e81ba1492 100644
--- a/ext/ldap/tests/ldap_mod_del_error.phpt
+++ b/ext/ldap/tests/ldap_mod_del_error.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 // DN not found
 var_dump(ldap_mod_del($link, "dc=my-domain,$base", array()));
@@ -26,7 +26,7 @@ var_dump(ldap_mod_del($link, "$base", array('dc')));
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 @ldap_delete($link, "dc=my-domain,$base");
 ?>
diff --git a/ext/ldap/tests/ldap_mod_ext.phpt b/ext/ldap/tests/ldap_mod_ext.phpt
index ae86f6ce005c..23065c251322 100644
--- a/ext/ldap/tests/ldap_mod_ext.phpt
+++ b/ext/ldap/tests/ldap_mod_ext.phpt
@@ -16,7 +16,7 @@ skipifunsupportedcontrol(LDAP_CONTROL_POST_READ);
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 
 $entry = array(
@@ -58,7 +58,7 @@ var_dump(
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 remove_dummy_data($link, $base);
 ?>
diff --git a/ext/ldap/tests/ldap_mod_replace_basic.phpt b/ext/ldap/tests/ldap_mod_replace_basic.phpt
index c871f51c0757..afe65b7b652e 100644
--- a/ext/ldap/tests/ldap_mod_replace_basic.phpt
+++ b/ext/ldap/tests/ldap_mod_replace_basic.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 
 $entry = array(
@@ -30,7 +30,7 @@ var_dump(
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 remove_dummy_data($link, $base);
 ?>
diff --git a/ext/ldap/tests/ldap_mod_replace_error.phpt b/ext/ldap/tests/ldap_mod_replace_error.phpt
index c6228f451ac3..78599d224098 100644
--- a/ext/ldap/tests/ldap_mod_replace_error.phpt
+++ b/ext/ldap/tests/ldap_mod_replace_error.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 // DN not found
 var_dump(ldap_mod_replace($link, "dc=my-domain,$base", array()));
@@ -26,7 +26,7 @@ var_dump(ldap_mod_replace($link, "$base", array('dc')));
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 ?>
 --EXPECTF--
 Warning: ldap_mod_replace(): Modify: No such object in %s on line %d
diff --git a/ext/ldap/tests/ldap_modify_basic.phpt b/ext/ldap/tests/ldap_modify_basic.phpt
index cbb1866840cc..fcd96da7f754 100644
--- a/ext/ldap/tests/ldap_modify_basic.phpt
+++ b/ext/ldap/tests/ldap_modify_basic.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 
 $entry = array(
@@ -34,7 +34,7 @@ var_dump(
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 remove_dummy_data($link, $base);
 ?>
diff --git a/ext/ldap/tests/ldap_modify_batch_basic.phpt b/ext/ldap/tests/ldap_modify_batch_basic.phpt
index 193deb770013..5f5cf4ca2ade 100644
--- a/ext/ldap/tests/ldap_modify_batch_basic.phpt
+++ b/ext/ldap/tests/ldap_modify_batch_basic.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 
 $mods = array(
@@ -42,7 +42,7 @@ var_dump(
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 remove_dummy_data($link, $base);
 ?>
diff --git a/ext/ldap/tests/ldap_modify_batch_error.phpt b/ext/ldap/tests/ldap_modify_batch_error.phpt
index cabd42b9fcb8..bce62cafb279 100644
--- a/ext/ldap/tests/ldap_modify_batch_error.phpt
+++ b/ext/ldap/tests/ldap_modify_batch_error.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 $addGivenName = array(
     array(
@@ -65,7 +65,7 @@ var_dump(ldap_modify_batch($link, "dc=my-domain,$base", $mods));
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 ldap_delete($link, "dc=my-domain,$base");
 ?>
diff --git a/ext/ldap/tests/ldap_modify_error.phpt b/ext/ldap/tests/ldap_modify_error.phpt
index ec4f1c93af55..a4807dfd8acc 100644
--- a/ext/ldap/tests/ldap_modify_error.phpt
+++ b/ext/ldap/tests/ldap_modify_error.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 // DN not found
 var_dump(ldap_modify($link, "cn=not-found,$base", array()));
@@ -44,7 +44,7 @@ var_dump(ldap_modify($link, "dc=my-domain,$base", $entry2));
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 ldap_delete($link, "dc=my-domain,$base");
 ?>
diff --git a/ext/ldap/tests/ldap_next_attribute_basic.phpt b/ext/ldap/tests/ldap_next_attribute_basic.phpt
index af070b9133e4..56dfcee1e915 100644
--- a/ext/ldap/tests/ldap_next_attribute_basic.phpt
+++ b/ext/ldap/tests/ldap_next_attribute_basic.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 $result = ldap_search($link, "$base", "(cn=userC)");
 $entry = ldap_first_entry($link, $result);
@@ -27,7 +27,7 @@ var_dump(
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECTF--
diff --git a/ext/ldap/tests/ldap_next_attribute_error.phpt b/ext/ldap/tests/ldap_next_attribute_error.phpt
index 1a613b9bcd5a..46ea48fd059d 100644
--- a/ext/ldap/tests/ldap_next_attribute_error.phpt
+++ b/ext/ldap/tests/ldap_next_attribute_error.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 $result = ldap_search($link, "$base", "(objectclass=organization)");
 $entry = ldap_first_entry($link, $result);
@@ -23,7 +23,7 @@ var_dump(
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECTF--
diff --git a/ext/ldap/tests/ldap_next_entry_basic.phpt b/ext/ldap/tests/ldap_next_entry_basic.phpt
index 7404ce1ba37e..2a460ad26520 100644
--- a/ext/ldap/tests/ldap_next_entry_basic.phpt
+++ b/ext/ldap/tests/ldap_next_entry_basic.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 $result = ldap_list($link, "$base", "(objectClass=person)");
 $entry = ldap_first_entry($link, $result);
@@ -25,7 +25,7 @@ var_dump(
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECTF--
diff --git a/ext/ldap/tests/ldap_next_reference_basic.phpt b/ext/ldap/tests/ldap_next_reference_basic.phpt
index fc1d08f0aaf3..e645752faf53 100644
--- a/ext/ldap/tests/ldap_next_reference_basic.phpt
+++ b/ext/ldap/tests/ldap_next_reference_basic.phpt
@@ -10,7 +10,7 @@ ldap
 --FILE--
 <?php
 require "connect.inc";
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 ldap_add($link, "cn=userref,$base", array(
         "objectClass" => array("extensibleObject", "referral"),
@@ -33,7 +33,7 @@ var_dump($refs);
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 // Referral can only be removed with Manage DSA IT Control
 ldap_delete($link, "cn=userref,$base", [['oid' => LDAP_CONTROL_MANAGEDSAIT, 'iscritical' => TRUE]]);
 ldap_delete($link, "cn=userref2,$base", [['oid' => LDAP_CONTROL_MANAGEDSAIT, 'iscritical' => TRUE]]);
diff --git a/ext/ldap/tests/ldap_option_reqcert_basic.phpt b/ext/ldap/tests/ldap_option_reqcert_basic.phpt
index 467c9d9e0936..0240d8a77b9b 100644
--- a/ext/ldap/tests/ldap_option_reqcert_basic.phpt
+++ b/ext/ldap/tests/ldap_option_reqcert_basic.phpt
@@ -14,7 +14,7 @@ require "connect.inc";
 
 ldap_set_option(null, LDAP_OPT_X_TLS_REQUIRE_CERT, LDAP_OPT_X_TLS_NEVER);
 
-$link = ldap_connect($host, $port);
+$link = ldap_connect($uri);
 ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
 
 var_dump(@ldap_bind($link, $user, $passwd));
diff --git a/ext/ldap/tests/ldap_option_reqcert_error.phpt b/ext/ldap/tests/ldap_option_reqcert_error.phpt
index a00476e48968..5f75ba0bc961 100644
--- a/ext/ldap/tests/ldap_option_reqcert_error.phpt
+++ b/ext/ldap/tests/ldap_option_reqcert_error.phpt
@@ -14,7 +14,7 @@ require "connect.inc";
 
 ldap_set_option(null, LDAP_OPT_X_TLS_REQUIRE_CERT, LDAP_OPT_X_TLS_HARD);
 
-$link = ldap_connect($host, $port);
+$link = ldap_connect($uri);
 ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
 
 var_dump(@ldap_bind($link, $user, $passwd));
diff --git a/ext/ldap/tests/ldap_parse_reference_basic.phpt b/ext/ldap/tests/ldap_parse_reference_basic.phpt
index 310f1f09384a..1b863c3ddf15 100644
--- a/ext/ldap/tests/ldap_parse_reference_basic.phpt
+++ b/ext/ldap/tests/ldap_parse_reference_basic.phpt
@@ -10,7 +10,7 @@ ldap
 --FILE--
 <?php
 require "connect.inc";
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 ldap_add($link, "cn=userref,$base", array(
         "objectClass" => array("extensibleObject", "referral"),
@@ -30,7 +30,7 @@ var_dump(
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 // Referral can only be removed with Manage DSA IT Control
 ldap_set_option($link, LDAP_OPT_SERVER_CONTROLS, array(array("oid" => "2.16.840.1.113730.3.4.2")));
 ldap_delete($link, "cn=userref,$base");
diff --git a/ext/ldap/tests/ldap_parse_result_basic.phpt b/ext/ldap/tests/ldap_parse_result_basic.phpt
index cc93a9f9ef65..46b98ae6d9ee 100644
--- a/ext/ldap/tests/ldap_parse_result_basic.phpt
+++ b/ext/ldap/tests/ldap_parse_result_basic.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 ldap_add($link, "cn=userref,$base", array(
         "objectClass" => array("extensibleObject", "referral"),
@@ -29,7 +29,7 @@ var_dump(
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 // Referral can only be removed with Manage DSA IT Control
 ldap_delete($link, "cn=userref,$base", [['oid' => LDAP_CONTROL_MANAGEDSAIT, 'iscritical' => TRUE]]);
 remove_dummy_data($link, $base);
diff --git a/ext/ldap/tests/ldap_parse_result_controls.phpt b/ext/ldap/tests/ldap_parse_result_controls.phpt
index b6cd5a3bcb1a..1dcfc7f86f83 100644
--- a/ext/ldap/tests/ldap_parse_result_controls.phpt
+++ b/ext/ldap/tests/ldap_parse_result_controls.phpt
@@ -14,7 +14,7 @@ skipifunsupportedcontrol(LDAP_CONTROL_PAGEDRESULTS);
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 
 $dn = "$base";
@@ -33,7 +33,7 @@ var_dump(
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECTF--
diff --git a/ext/ldap/tests/ldap_read_basic.phpt b/ext/ldap/tests/ldap_read_basic.phpt
index 86d790a82a67..9953e2955c96 100644
--- a/ext/ldap/tests/ldap_read_basic.phpt
+++ b/ext/ldap/tests/ldap_read_basic.phpt
@@ -14,7 +14,7 @@ require_once('skipifbindfailure.inc');
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 var_dump(
     $result = ldap_read($link, "o=test,$base", "(o=*)"),
@@ -25,7 +25,7 @@ var_dump(
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECTF--
diff --git a/ext/ldap/tests/ldap_rename_basic.phpt b/ext/ldap/tests/ldap_rename_basic.phpt
index 1a6f0626c0f2..26404ce12bb0 100644
--- a/ext/ldap/tests/ldap_rename_basic.phpt
+++ b/ext/ldap/tests/ldap_rename_basic.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 var_dump(
     ldap_rename($link, "cn=userA,$base", "cn=userZ", "$base", true)
@@ -24,7 +24,7 @@ var_dump(ldap_get_entries($link, $result));
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 ldap_rename($link, "cn=userZ,$base", "cn=userA", "$base", true);
 remove_dummy_data($link, $base);
 ?>
diff --git a/ext/ldap/tests/ldap_rename_error.phpt b/ext/ldap/tests/ldap_rename_error.phpt
index 0ca179965eaf..257f844ab268 100644
--- a/ext/ldap/tests/ldap_rename_error.phpt
+++ b/ext/ldap/tests/ldap_rename_error.phpt
@@ -9,9 +9,8 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect($host, $port);
+$link = ldap_connect($uri);
 var_dump(ldap_rename($link, "cn=userNotFound,$base", "cn=userZ", "$base", true));
 ?>
 --EXPECTF--
-Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 bool(false)
diff --git a/ext/ldap/tests/ldap_rename_ext.phpt b/ext/ldap/tests/ldap_rename_ext.phpt
index f8b80a7f2552..583346a35061 100644
--- a/ext/ldap/tests/ldap_rename_ext.phpt
+++ b/ext/ldap/tests/ldap_rename_ext.phpt
@@ -15,7 +15,7 @@ skipifunsupportedcontrol(LDAP_CONTROL_POST_READ);
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 
 var_dump(
@@ -38,7 +38,7 @@ var_dump(
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 ldap_rename($link, "cn=userZ,$base", "cn=userA", "$base", true);
 remove_dummy_data($link, $base);
 ?>
diff --git a/ext/ldap/tests/ldap_sasl_bind_basic.phpt b/ext/ldap/tests/ldap_sasl_bind_basic.phpt
index 205b8992cc7d..03fffb84c0dc 100644
--- a/ext/ldap/tests/ldap_sasl_bind_basic.phpt
+++ b/ext/ldap/tests/ldap_sasl_bind_basic.phpt
@@ -9,7 +9,7 @@ ldap
 <?php if (!function_exists("ldap_sasl_bind")) die("skip LDAP extension not compiled with SASL support"); ?>
 <?php
     require "connect.inc";
-    $link = @fsockopen($host, $port);
+    $link = @fsockopen($uri);
     if (!$link) {
         die("skip no server listening");
     }
@@ -22,7 +22,7 @@ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 ldap_unbind($link);
 
-$link = ldap_connect($host, $port);
+$link = ldap_connect($uri);
 ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
 var_dump(ldap_sasl_bind($link, null, $sasl_passwd, 'DIGEST-MD5', 'realm', $sasl_user));
 ?>
diff --git a/ext/ldap/tests/ldap_sasl_bind_error.phpt b/ext/ldap/tests/ldap_sasl_bind_error.phpt
index 79fbf323b430..348a2345f5f1 100644
--- a/ext/ldap/tests/ldap_sasl_bind_error.phpt
+++ b/ext/ldap/tests/ldap_sasl_bind_error.phpt
@@ -16,7 +16,7 @@ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 ldap_unbind($link);
 
-$link = ldap_connect($host, $port);
+$link = ldap_connect($uri);
 ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
 
 // Invalid DN
diff --git a/ext/ldap/tests/ldap_search_basic.phpt b/ext/ldap/tests/ldap_search_basic.phpt
index 809b18dcd8e7..19314533ad47 100644
--- a/ext/ldap/tests/ldap_search_basic.phpt
+++ b/ext/ldap/tests/ldap_search_basic.phpt
@@ -14,7 +14,7 @@ require_once('skipifbindfailure.inc');
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 insert_dummy_data($link, $base);
 var_dump(
@@ -26,7 +26,7 @@ var_dump(
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECTF--
diff --git a/ext/ldap/tests/ldap_search_error.phpt b/ext/ldap/tests/ldap_search_error.phpt
index 63d49eeac70c..659b8a6c0664 100644
--- a/ext/ldap/tests/ldap_search_error.phpt
+++ b/ext/ldap/tests/ldap_search_error.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 include "connect.inc";
 
-$link = ldap_connect($host, $port);
+$link = ldap_connect($uri);
 
 $dn = "dc=not-found,$base";
 $filter = "(dc=*)";
diff --git a/ext/ldap/tests/ldap_search_overrides.phpt b/ext/ldap/tests/ldap_search_overrides.phpt
index 7318dccc84c5..928418df2fd6 100644
--- a/ext/ldap/tests/ldap_search_overrides.phpt
+++ b/ext/ldap/tests/ldap_search_overrides.phpt
@@ -13,7 +13,7 @@ require_once('skipifbindfailure.inc');
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 ldap_set_option($link, LDAP_OPT_DEREF, LDAP_DEREF_SEARCHING);
 ldap_set_option($link, LDAP_OPT_SIZELIMIT, 123);
 ldap_set_option($link, LDAP_OPT_TIMELIMIT, 33);
@@ -39,7 +39,7 @@ var_dump(
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECTF--
diff --git a/ext/ldap/tests/ldap_search_paged_result_controls.phpt b/ext/ldap/tests/ldap_search_paged_result_controls.phpt
index 09865f9071b5..c6f2baf8e11d 100644
--- a/ext/ldap/tests/ldap_search_paged_result_controls.phpt
+++ b/ext/ldap/tests/ldap_search_paged_result_controls.phpt
@@ -14,7 +14,7 @@ skipifunsupportedcontrol(LDAP_CONTROL_PAGEDRESULTS);
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 
 $dn = "$base";
@@ -33,7 +33,7 @@ var_dump(
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECTF--
diff --git a/ext/ldap/tests/ldap_search_sort_controls.phpt b/ext/ldap/tests/ldap_search_sort_controls.phpt
index b19364e18fb3..0b39c02c6613 100644
--- a/ext/ldap/tests/ldap_search_sort_controls.phpt
+++ b/ext/ldap/tests/ldap_search_sort_controls.phpt
@@ -15,7 +15,7 @@ skipifunsupportedcontrol(LDAP_CONTROL_VLVREQUEST);
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 
 /* First test with only SORT control */
@@ -75,7 +75,7 @@ var_dump(
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECTF--
diff --git a/ext/ldap/tests/ldap_search_variation1.phpt b/ext/ldap/tests/ldap_search_variation1.phpt
index 3e9a9568308b..01f7fddff3af 100644
--- a/ext/ldap/tests/ldap_search_variation1.phpt
+++ b/ext/ldap/tests/ldap_search_variation1.phpt
@@ -14,7 +14,7 @@ require_once('skipifbindfailure.inc');
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 
 $dn = "$base";
@@ -28,7 +28,7 @@ var_dump(
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECTF--
diff --git a/ext/ldap/tests/ldap_search_variation2.phpt b/ext/ldap/tests/ldap_search_variation2.phpt
index 25e021b9414b..eebecb0713fc 100644
--- a/ext/ldap/tests/ldap_search_variation2.phpt
+++ b/ext/ldap/tests/ldap_search_variation2.phpt
@@ -14,7 +14,7 @@ require_once('skipifbindfailure.inc');
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 
 var_dump(
@@ -26,7 +26,7 @@ var_dump(
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECTF--
diff --git a/ext/ldap/tests/ldap_search_variation3.phpt b/ext/ldap/tests/ldap_search_variation3.phpt
index f4111aa8636e..d8603a517644 100644
--- a/ext/ldap/tests/ldap_search_variation3.phpt
+++ b/ext/ldap/tests/ldap_search_variation3.phpt
@@ -14,7 +14,7 @@ require_once('skipifbindfailure.inc');
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 
 $dn = "$base";
@@ -33,7 +33,7 @@ var_dump(
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECTF--
diff --git a/ext/ldap/tests/ldap_search_variation4.phpt b/ext/ldap/tests/ldap_search_variation4.phpt
index bfd758e04be2..a98be97d9695 100644
--- a/ext/ldap/tests/ldap_search_variation4.phpt
+++ b/ext/ldap/tests/ldap_search_variation4.phpt
@@ -14,7 +14,7 @@ require_once('skipifbindfailure.inc');
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 
 $dn = "$base";
@@ -28,7 +28,7 @@ var_dump(
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECTF--
diff --git a/ext/ldap/tests/ldap_search_variation5.phpt b/ext/ldap/tests/ldap_search_variation5.phpt
index bb7fd78627a8..6552aac93158 100644
--- a/ext/ldap/tests/ldap_search_variation5.phpt
+++ b/ext/ldap/tests/ldap_search_variation5.phpt
@@ -14,7 +14,7 @@ require_once('skipifbindfailure.inc');
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 
 $dn = "$base";
@@ -36,7 +36,7 @@ var_dump(
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECTF--
diff --git a/ext/ldap/tests/ldap_search_variation6.phpt b/ext/ldap/tests/ldap_search_variation6.phpt
index 1b55325edd71..96b792889eee 100644
--- a/ext/ldap/tests/ldap_search_variation6.phpt
+++ b/ext/ldap/tests/ldap_search_variation6.phpt
@@ -14,7 +14,7 @@ require_once('skipifbindfailure.inc');
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 
 $dn = "$base";
@@ -40,7 +40,7 @@ var_dump(
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECTF--
diff --git a/ext/ldap/tests/ldap_set_option_basic.phpt b/ext/ldap/tests/ldap_set_option_basic.phpt
index 00368fb10c46..cbc3b3addbd2 100644
--- a/ext/ldap/tests/ldap_set_option_basic.phpt
+++ b/ext/ldap/tests/ldap_set_option_basic.phpt
@@ -9,7 +9,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect($host, $port);
+$link = ldap_connect($uri);
 $option = null;
 
 var_dump(ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version));
@@ -17,6 +17,5 @@ ldap_get_option($link, LDAP_OPT_PROTOCOL_VERSION, $option);
 var_dump($option);
 ?>
 --EXPECTF--
-Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 bool(true)
 int(3)
diff --git a/ext/ldap/tests/ldap_set_option_cafiles_basic.phpt b/ext/ldap/tests/ldap_set_option_cafiles_basic.phpt
index 893088e7778c..8d1e71af9013 100644
--- a/ext/ldap/tests/ldap_set_option_cafiles_basic.phpt
+++ b/ext/ldap/tests/ldap_set_option_cafiles_basic.phpt
@@ -7,7 +7,7 @@ ldap
 --FILE--
 <?php
 require "connect.inc";
-$link = ldap_connect($host, $port);
+$link = ldap_connect($uri);
 
 foreach([
     LDAP_OPT_X_TLS_CACERTDIR,
@@ -25,7 +25,6 @@ foreach([
 }
 ?>
 --EXPECTF--
-Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 bool(true)
 string(8) "/foo/bar"
 bool(true)
diff --git a/ext/ldap/tests/ldap_set_option_ciphersuite_basic.phpt b/ext/ldap/tests/ldap_set_option_ciphersuite_basic.phpt
index 0f7bab512c52..87a6a61d5d6d 100644
--- a/ext/ldap/tests/ldap_set_option_ciphersuite_basic.phpt
+++ b/ext/ldap/tests/ldap_set_option_ciphersuite_basic.phpt
@@ -7,7 +7,7 @@ ldap
 --FILE--
 <?php
 require "connect.inc";
-$link = ldap_connect($host, $port);
+$link = ldap_connect($uri);
 
 $result = ldap_set_option($link, LDAP_OPT_X_TLS_CIPHER_SUITE, '3DES');
 var_dump($result);
@@ -16,6 +16,5 @@ ldap_get_option($link, LDAP_OPT_X_TLS_CIPHER_SUITE, $optionval);
 var_dump($optionval);
 ?>
 --EXPECTF--
-Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 bool(true)
 string(4) "3DES"
diff --git a/ext/ldap/tests/ldap_set_option_crlcheck_basic.phpt b/ext/ldap/tests/ldap_set_option_crlcheck_basic.phpt
index 584476632891..38f81bbcddab 100644
--- a/ext/ldap/tests/ldap_set_option_crlcheck_basic.phpt
+++ b/ext/ldap/tests/ldap_set_option_crlcheck_basic.phpt
@@ -7,7 +7,7 @@ ldap
 --SKIPIF--
 <?php
     require "connect.inc";
-    $link = ldap_connect($host, $port);
+    $link = ldap_connect($uri);
     ldap_get_option($link, LDAP_OPT_X_TLS_PACKAGE, $package);
     if ($package != 'OpenSSL') {
         die("skip OpenSSL required for CRL check options, got: $package");
@@ -16,7 +16,7 @@ ldap
 --FILE--
 <?php
 require "connect.inc";
-$link = ldap_connect($host, $port);
+$link = ldap_connect($uri);
 
 foreach([
     LDAP_OPT_X_TLS_CRL_NONE,
diff --git a/ext/ldap/tests/ldap_set_option_crlcheck_error.phpt b/ext/ldap/tests/ldap_set_option_crlcheck_error.phpt
index 86bf8374fb56..528099cc2634 100644
--- a/ext/ldap/tests/ldap_set_option_crlcheck_error.phpt
+++ b/ext/ldap/tests/ldap_set_option_crlcheck_error.phpt
@@ -7,10 +7,9 @@ ldap
 --FILE--
 <?php
 require "connect.inc";
-$link = ldap_connect($host, $port);
+$link = ldap_connect($uri);
 $result = ldap_set_option($link, LDAP_OPT_X_TLS_CRLCHECK, 9001);
 var_dump($result);
 ?>
 --EXPECTF--
-Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 bool(false)
diff --git a/ext/ldap/tests/ldap_set_option_error.phpt b/ext/ldap/tests/ldap_set_option_error.phpt
index de14ac01cbef..fa66e348c46b 100644
--- a/ext/ldap/tests/ldap_set_option_error.phpt
+++ b/ext/ldap/tests/ldap_set_option_error.phpt
@@ -9,7 +9,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect($host, $port);
+$link = ldap_connect($uri);
 $controls = array(
     array(
         array("xid" => "1.2.752.58.10.1", "iscritical" => true),
@@ -36,7 +36,6 @@ foreach ($controls as $control) {
 var_dump(ldap_set_option($link, 999999, 999999));
 ?>
 --EXPECT--
-Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 bool(false)
 ValueError: ldap_set_option(): Control must have an "oid" key
 TypeError: ldap_set_option(): Argument #3 ($value) must contain only arrays, where each array is a control
diff --git a/ext/ldap/tests/ldap_set_option_keepalive_basic.phpt b/ext/ldap/tests/ldap_set_option_keepalive_basic.phpt
index a04d8db8d9fa..b2d1e89b4a1c 100644
--- a/ext/ldap/tests/ldap_set_option_keepalive_basic.phpt
+++ b/ext/ldap/tests/ldap_set_option_keepalive_basic.phpt
@@ -7,7 +7,7 @@ ldap
 --FILE--
 <?php
 require "connect.inc";
-$link = ldap_connect($host, $port);
+$link = ldap_connect($uri);
 
 foreach([
     LDAP_OPT_X_KEEPALIVE_IDLE,
@@ -22,7 +22,6 @@ foreach([
 }
 ?>
 --EXPECTF--
-Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 bool(true)
 int(5)
 bool(true)
diff --git a/ext/ldap/tests/ldap_set_option_reqcert_basic.phpt b/ext/ldap/tests/ldap_set_option_reqcert_basic.phpt
index 0baf92251d94..66087bda8c73 100644
--- a/ext/ldap/tests/ldap_set_option_reqcert_basic.phpt
+++ b/ext/ldap/tests/ldap_set_option_reqcert_basic.phpt
@@ -7,7 +7,7 @@ Edwin Hoksberg <edwin@edwinhoksberg.nl>
 --FILE--
 <?php
 require "connect.inc";
-$link = ldap_connect($host, $port);
+$link = ldap_connect($uri);
 
 foreach([
     LDAP_OPT_X_TLS_NEVER,
@@ -24,7 +24,6 @@ foreach([
 }
 ?>
 --EXPECTF--
-Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 bool(true)
 int(0)
 bool(true)
diff --git a/ext/ldap/tests/ldap_set_option_reqcert_error.phpt b/ext/ldap/tests/ldap_set_option_reqcert_error.phpt
index 89920ca64f89..7d019d7cde2c 100644
--- a/ext/ldap/tests/ldap_set_option_reqcert_error.phpt
+++ b/ext/ldap/tests/ldap_set_option_reqcert_error.phpt
@@ -7,10 +7,9 @@ ldap
 --FILE--
 <?php
 require "connect.inc";
-$link = ldap_connect($host, $port);
+$link = ldap_connect($uri);
 $result = ldap_set_option($link, LDAP_OPT_X_TLS_REQUIRE_CERT, 9001);
 var_dump($result);
 ?>
 --EXPECTF--
-Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 bool(false)
diff --git a/ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt b/ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt
index 3a2b4b6d22c4..9392b11b3c21 100644
--- a/ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt
+++ b/ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt
@@ -7,7 +7,7 @@ ldap
 --FILE--
 <?php
 require "connect.inc";
-$link = ldap_connect($host, $port);
+$link = ldap_connect($uri);
 
 foreach([
     LDAP_OPT_X_TLS_PROTOCOL_SSL2,
@@ -24,7 +24,6 @@ foreach([
 }
 ?>
 --EXPECTF--
-Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 bool(true)
 int(512)
 bool(true)
diff --git a/ext/ldap/tests/ldap_set_option_variation.phpt b/ext/ldap/tests/ldap_set_option_variation.phpt
index 3bb9233c6874..8fe9c631afb2 100644
--- a/ext/ldap/tests/ldap_set_option_variation.phpt
+++ b/ext/ldap/tests/ldap_set_option_variation.phpt
@@ -9,7 +9,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect($host, $port);
+$link = ldap_connect($uri);
 $option = null;
 
 $controls = array(
@@ -62,7 +62,6 @@ ldap_get_option($link, LDAP_OPT_MATCHED_DN, $option);
 var_dump($option);
 ?>
 --EXPECTF--
-Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 bool(true)
 bool(true)
 bool(true)
diff --git a/ext/ldap/tests/ldap_set_rebind_proc_basic.phpt b/ext/ldap/tests/ldap_set_rebind_proc_basic.phpt
index 09c0d06d81fd..00c7bb81d9dd 100644
--- a/ext/ldap/tests/ldap_set_rebind_proc_basic.phpt
+++ b/ext/ldap/tests/ldap_set_rebind_proc_basic.phpt
@@ -24,7 +24,7 @@ function rebind_proc ($ds, $ldap_url) {
   }
 }
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 var_dump(ldap_set_rebind_proc($link, "rebind_proc"));
 var_dump(ldap_set_rebind_proc($link, null));
 ?>
diff --git a/ext/ldap/tests/ldap_set_rebind_proc_error.phpt b/ext/ldap/tests/ldap_set_rebind_proc_error.phpt
index a0e2c7647950..9a4fdd5cbb2e 100644
--- a/ext/ldap/tests/ldap_set_rebind_proc_error.phpt
+++ b/ext/ldap/tests/ldap_set_rebind_proc_error.phpt
@@ -11,7 +11,7 @@ ldap
         die("skip ldap_set_rebind_proc() does not exist");
     }
     require "connect.inc";
-    $link = @fsockopen($host, $port);
+    $link = @fsockopen($uri);
     if (!$link) {
         die("skip no server listening");
     }
@@ -33,7 +33,7 @@ function rebind_proc ($ds, $ldap_url) {
   }
 }
 
-$link = ldap_connect($host, $port);
+$link = ldap_connect($uri);
 try {
     $result = ldap_set_rebind_proc($link, "rebind_proc_inexistent");
 } catch(\TypeError $error) {
diff --git a/ext/ldap/tests/ldap_start_tls_basic.phpt b/ext/ldap/tests/ldap_start_tls_basic.phpt
index bcf93cf3fcc6..4dbdce034369 100644
--- a/ext/ldap/tests/ldap_start_tls_basic.phpt
+++ b/ext/ldap/tests/ldap_start_tls_basic.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect($host, $port);
+$link = ldap_connect($uri);
 ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
 var_dump(ldap_start_tls($link));
 ?>
diff --git a/ext/ldap/tests/ldap_unbind_basic.phpt b/ext/ldap/tests/ldap_unbind_basic.phpt
index d16325a7c3e0..76333ecf9b92 100644
--- a/ext/ldap/tests/ldap_unbind_basic.phpt
+++ b/ext/ldap/tests/ldap_unbind_basic.phpt
@@ -11,7 +11,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 
 var_dump(ldap_unbind($link));
 ?>
diff --git a/ext/ldap/tests/ldap_unbind_variation.phpt b/ext/ldap/tests/ldap_unbind_variation.phpt
index 896821785ca5..f4ea91bbc1af 100644
--- a/ext/ldap/tests/ldap_unbind_variation.phpt
+++ b/ext/ldap/tests/ldap_unbind_variation.phpt
@@ -24,7 +24,7 @@ function rebind_proc ($ds, $ldap_url) {
     }
 }
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 ldap_set_rebind_proc($link, "rebind_proc");
 
 var_dump(ldap_unbind($link));
diff --git a/ext/ldap/tests/skipifbindfailure.inc b/ext/ldap/tests/skipifbindfailure.inc
index 8f66c6cb9683..1a0d0c6d1998 100644
--- a/ext/ldap/tests/skipifbindfailure.inc
+++ b/ext/ldap/tests/skipifbindfailure.inc
@@ -3,7 +3,7 @@ require_once 'connect.inc';
 
 if ($skip_on_bind_failure) {
 
-    $link = ldap_connect($host, $port);
+    $link = ldap_connect($uri);
     ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version);
     if (!@ldap_bind($link, $user, $passwd))
         die(sprintf("skip Can't bind to LDAP Server - [%d] %s", ldap_errno($link), ldap_error($link)));
diff --git a/ext/ldap/tests/skipifcontrol.inc b/ext/ldap/tests/skipifcontrol.inc
index ff690068aeeb..26a2b78e85da 100644
--- a/ext/ldap/tests/skipifcontrol.inc
+++ b/ext/ldap/tests/skipifcontrol.inc
@@ -3,8 +3,8 @@ require_once 'connect.inc';
 
 function skipifunsupportedcontrol($oid)
 {
-    global $host, $port, $user, $passwd, $protocol_version, $base;
-    $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+    global $uri, $user, $passwd, $protocol_version, $base;
+    $link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
     $result = ldap_read($link, '', '(objectClass=*)', ['supportedControl']);
     if (!in_array($oid, ldap_get_entries($link, $result)[0]['supportedcontrol'])) {
         die(sprintf("skip Unsupported control %s", $oid));

From ba0cdd8bb4e1dcfd10a73754b6a3f14674d3564e Mon Sep 17 00:00:00 2001
From: Andreas Heigl <andreas@heigl.org>
Date: Thu, 13 Feb 2020 15:07:31 +0100
Subject: [PATCH 3/8] Verify deprecation of ldap_connect w/h 2 params

This adds a test to verify that calling ldap_connect with 2 parameters
triggers a deprecation notice
---
 .../ldap_deprectate_connect_with_two_parameters.phpt | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 ext/ldap/tests/ldap_deprectate_connect_with_two_parameters.phpt

diff --git a/ext/ldap/tests/ldap_deprectate_connect_with_two_parameters.phpt b/ext/ldap/tests/ldap_deprectate_connect_with_two_parameters.phpt
new file mode 100644
index 000000000000..bb3a9a855b35
--- /dev/null
+++ b/ext/ldap/tests/ldap_deprectate_connect_with_two_parameters.phpt
@@ -0,0 +1,12 @@
+--TEST--
+ldap_connect() - With two parameters is marked as deprecated
+--CREDITS--
+Andreas Heigl <heiglandreas@php.net>
+--FILE--
+<?php
+require "connect.inc";
+
+ldap_connect('foobar', 123);
+?>
+--EXPECTF--
+Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d

From 82bd708c965d4be4bff9aa9de858ab64d4840942 Mon Sep 17 00:00:00 2001
From: Andreas Heigl <andreas@heigl.org>
Date: Wed, 1 Jun 2022 08:21:02 +0200
Subject: [PATCH 4/8] Fix issues from merge-conflicts

---
 ext/ldap/tests/ldap_count_references_basic.phpt | 4 ++--
 ext/ldap/tests/ldap_sasl_bind_basic.phpt        | 4 ++--
 ext/ldap/tests/ldap_sasl_bind_error.phpt        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ext/ldap/tests/ldap_count_references_basic.phpt b/ext/ldap/tests/ldap_count_references_basic.phpt
index 930ae09e5042..eab0af440c9e 100644
--- a/ext/ldap/tests/ldap_count_references_basic.phpt
+++ b/ext/ldap/tests/ldap_count_references_basic.phpt
@@ -7,7 +7,7 @@ ldap
 --FILE--
 <?php
 require "connect.inc";
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 ldap_add($link, "cn=userref,$base", array(
         "objectClass" => array("extensibleObject", "referral"),
@@ -27,7 +27,7 @@ var_dump(ldap_count_references($link, $result));
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 // Referral can only be removed with Manage DSA IT Control
 ldap_delete($link, "cn=userref,$base", [['oid' => LDAP_CONTROL_MANAGEDSAIT, 'iscritical' => TRUE]]);
 ldap_delete($link, "cn=userref2,$base", [['oid' => LDAP_CONTROL_MANAGEDSAIT, 'iscritical' => TRUE]]);
diff --git a/ext/ldap/tests/ldap_sasl_bind_basic.phpt b/ext/ldap/tests/ldap_sasl_bind_basic.phpt
index 03fffb84c0dc..6e2be4e6fb4e 100644
--- a/ext/ldap/tests/ldap_sasl_bind_basic.phpt
+++ b/ext/ldap/tests/ldap_sasl_bind_basic.phpt
@@ -18,7 +18,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 ldap_unbind($link);
 
@@ -30,7 +30,7 @@ var_dump(ldap_sasl_bind($link, null, $sasl_passwd, 'DIGEST-MD5', 'realm', $sasl_
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECT--
diff --git a/ext/ldap/tests/ldap_sasl_bind_error.phpt b/ext/ldap/tests/ldap_sasl_bind_error.phpt
index 348a2345f5f1..3c43f77096bc 100644
--- a/ext/ldap/tests/ldap_sasl_bind_error.phpt
+++ b/ext/ldap/tests/ldap_sasl_bind_error.phpt
@@ -12,7 +12,7 @@ ldap
 <?php
 require "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 insert_dummy_data($link, $base);
 ldap_unbind($link);
 
@@ -37,7 +37,7 @@ var_dump(ldap_sasl_bind($link, "unexistingProperty=weirdValue,$user", $sasl_pass
 <?php
 include "connect.inc";
 
-$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+$link = ldap_connect_and_bind($uri, $user, $passwd, $protocol_version);
 remove_dummy_data($link, $base);
 ?>
 --EXPECTF--

From 8a3c0edfa3e80ac6ab219a10a061fe577bc2289c Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Sat, 25 Jun 2022 13:27:57 +0200
Subject: [PATCH 5/8] Remove empty test

`ldap_control_paged_result()` is removed as of PHP 8.0.0, so this test
needs to be removed as well.
---
 ext/ldap/tests/ldap_control_paged_results_variation1.phpt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 ext/ldap/tests/ldap_control_paged_results_variation1.phpt

diff --git a/ext/ldap/tests/ldap_control_paged_results_variation1.phpt b/ext/ldap/tests/ldap_control_paged_results_variation1.phpt
deleted file mode 100644
index e69de29bb2d1..000000000000

From 77815498b37e889ecb28ee6c336353eb69758fae Mon Sep 17 00:00:00 2001
From: Andreas Heigl <github@heigl.org>
Date: Fri, 7 Jul 2023 13:04:53 +0200
Subject: [PATCH 6/8] Update ext/ldap/ldap.c
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Tim Düsterhus <timwolla@googlemail.com>
---
 ext/ldap/ldap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index 8374e23d8f9e..5cc8b1282925 100644
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -926,7 +926,7 @@ PHP_FUNCTION(ldap_connect)
 	LDAP *ldap = NULL;
 
 	if (ZEND_NUM_ARGS() == 2) {
-	    zend_error(E_DEPRECATED, "Usage of ldap_connect with two arguments is deprecated.");
+	    zend_error(E_DEPRECATED, "Usage of ldap_connect with two arguments is deprecated");
 	}
 
 #ifdef HAVE_ORALDAP

From 6da02452983473bfbb0aacc68b10894ee7f44740 Mon Sep 17 00:00:00 2001
From: Andreas Heigl <github@heigl.org>
Date: Fri, 7 Jul 2023 13:50:25 +0200
Subject: [PATCH 7/8] Apply suggestions from code review

Thanks @cmb69

Co-authored-by: Christoph M. Becker <cmbecker69@gmx.de>
---
 .../tests/ldap_deprectate_connect_with_two_parameters.phpt  | 6 +++---
 ext/ldap/tests/ldap_get_option_basic.phpt                   | 2 +-
 ext/ldap/tests/ldap_get_option_package_basic.phpt           | 2 +-
 ext/ldap/tests/ldap_get_option_variation.phpt               | 2 +-
 ext/ldap/tests/ldap_rename_error.phpt                       | 2 +-
 ext/ldap/tests/ldap_set_option_basic.phpt                   | 2 +-
 ext/ldap/tests/ldap_set_option_cafiles_basic.phpt           | 2 +-
 ext/ldap/tests/ldap_set_option_ciphersuite_basic.phpt       | 2 +-
 ext/ldap/tests/ldap_set_option_crlcheck_error.phpt          | 2 +-
 ext/ldap/tests/ldap_set_option_keepalive_basic.phpt         | 2 +-
 ext/ldap/tests/ldap_set_option_reqcert_basic.phpt           | 2 +-
 ext/ldap/tests/ldap_set_option_reqcert_error.phpt           | 2 +-
 ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt  | 2 +-
 ext/ldap/tests/ldap_set_option_variation.phpt               | 2 +-
 14 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/ext/ldap/tests/ldap_deprectate_connect_with_two_parameters.phpt b/ext/ldap/tests/ldap_deprectate_connect_with_two_parameters.phpt
index bb3a9a855b35..b022579c5762 100644
--- a/ext/ldap/tests/ldap_deprectate_connect_with_two_parameters.phpt
+++ b/ext/ldap/tests/ldap_deprectate_connect_with_two_parameters.phpt
@@ -1,7 +1,7 @@
 --TEST--
 ldap_connect() - With two parameters is marked as deprecated
---CREDITS--
-Andreas Heigl <heiglandreas@php.net>
+--EXTENSIONS--
+ldap
 --FILE--
 <?php
 require "connect.inc";
@@ -9,4 +9,4 @@ require "connect.inc";
 ldap_connect('foobar', 123);
 ?>
 --EXPECTF--
-Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
+Deprecated: Usage of ldap_connect with two arguments is deprecated in %s on line %d
diff --git a/ext/ldap/tests/ldap_get_option_basic.phpt b/ext/ldap/tests/ldap_get_option_basic.phpt
index c4a612843105..8facfdc05bd1 100644
--- a/ext/ldap/tests/ldap_get_option_basic.phpt
+++ b/ext/ldap/tests/ldap_get_option_basic.phpt
@@ -18,6 +18,6 @@ var_dump(
     $option
 );
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 int(3)
diff --git a/ext/ldap/tests/ldap_get_option_package_basic.phpt b/ext/ldap/tests/ldap_get_option_package_basic.phpt
index 3899e824612b..6424a1c5d104 100644
--- a/ext/ldap/tests/ldap_get_option_package_basic.phpt
+++ b/ext/ldap/tests/ldap_get_option_package_basic.phpt
@@ -14,6 +14,6 @@ var_dump(in_array($optionval, ['GnuTLS', 'OpenSSL', 'MozNSS']));
 // This is a read-only option.
 var_dump(ldap_set_option($link, LDAP_OPT_X_TLS_PACKAGE, 'foo'));
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(false)
diff --git a/ext/ldap/tests/ldap_get_option_variation.phpt b/ext/ldap/tests/ldap_get_option_variation.phpt
index 6cd9708e1e5a..e925e2410b78 100644
--- a/ext/ldap/tests/ldap_get_option_variation.phpt
+++ b/ext/ldap/tests/ldap_get_option_variation.phpt
@@ -48,7 +48,7 @@ var_dump(
     $option
 );
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 int(0)
 bool(true)
diff --git a/ext/ldap/tests/ldap_rename_error.phpt b/ext/ldap/tests/ldap_rename_error.phpt
index 257f844ab268..3acd6f8ed7dc 100644
--- a/ext/ldap/tests/ldap_rename_error.phpt
+++ b/ext/ldap/tests/ldap_rename_error.phpt
@@ -12,5 +12,5 @@ require "connect.inc";
 $link = ldap_connect($uri);
 var_dump(ldap_rename($link, "cn=userNotFound,$base", "cn=userZ", "$base", true));
 ?>
---EXPECTF--
+--EXPECT--
 bool(false)
diff --git a/ext/ldap/tests/ldap_set_option_basic.phpt b/ext/ldap/tests/ldap_set_option_basic.phpt
index cbc3b3addbd2..1b552dc4a890 100644
--- a/ext/ldap/tests/ldap_set_option_basic.phpt
+++ b/ext/ldap/tests/ldap_set_option_basic.phpt
@@ -16,6 +16,6 @@ var_dump(ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version));
 ldap_get_option($link, LDAP_OPT_PROTOCOL_VERSION, $option);
 var_dump($option);
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 int(3)
diff --git a/ext/ldap/tests/ldap_set_option_cafiles_basic.phpt b/ext/ldap/tests/ldap_set_option_cafiles_basic.phpt
index 8d1e71af9013..f3eec8e63f61 100644
--- a/ext/ldap/tests/ldap_set_option_cafiles_basic.phpt
+++ b/ext/ldap/tests/ldap_set_option_cafiles_basic.phpt
@@ -24,7 +24,7 @@ foreach([
     var_dump($optionval);
 }
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 string(8) "/foo/bar"
 bool(true)
diff --git a/ext/ldap/tests/ldap_set_option_ciphersuite_basic.phpt b/ext/ldap/tests/ldap_set_option_ciphersuite_basic.phpt
index 87a6a61d5d6d..e114de130e79 100644
--- a/ext/ldap/tests/ldap_set_option_ciphersuite_basic.phpt
+++ b/ext/ldap/tests/ldap_set_option_ciphersuite_basic.phpt
@@ -15,6 +15,6 @@ var_dump($result);
 ldap_get_option($link, LDAP_OPT_X_TLS_CIPHER_SUITE, $optionval);
 var_dump($optionval);
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 string(4) "3DES"
diff --git a/ext/ldap/tests/ldap_set_option_crlcheck_error.phpt b/ext/ldap/tests/ldap_set_option_crlcheck_error.phpt
index 528099cc2634..ef88e32cc8b9 100644
--- a/ext/ldap/tests/ldap_set_option_crlcheck_error.phpt
+++ b/ext/ldap/tests/ldap_set_option_crlcheck_error.phpt
@@ -11,5 +11,5 @@ $link = ldap_connect($uri);
 $result = ldap_set_option($link, LDAP_OPT_X_TLS_CRLCHECK, 9001);
 var_dump($result);
 ?>
---EXPECTF--
+--EXPECT--
 bool(false)
diff --git a/ext/ldap/tests/ldap_set_option_keepalive_basic.phpt b/ext/ldap/tests/ldap_set_option_keepalive_basic.phpt
index b2d1e89b4a1c..e4d2199df6a8 100644
--- a/ext/ldap/tests/ldap_set_option_keepalive_basic.phpt
+++ b/ext/ldap/tests/ldap_set_option_keepalive_basic.phpt
@@ -21,7 +21,7 @@ foreach([
     var_dump($optionval);
 }
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 int(5)
 bool(true)
diff --git a/ext/ldap/tests/ldap_set_option_reqcert_basic.phpt b/ext/ldap/tests/ldap_set_option_reqcert_basic.phpt
index 66087bda8c73..c87055fa9e93 100644
--- a/ext/ldap/tests/ldap_set_option_reqcert_basic.phpt
+++ b/ext/ldap/tests/ldap_set_option_reqcert_basic.phpt
@@ -23,7 +23,7 @@ foreach([
     var_dump($optionval);
 }
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 int(0)
 bool(true)
diff --git a/ext/ldap/tests/ldap_set_option_reqcert_error.phpt b/ext/ldap/tests/ldap_set_option_reqcert_error.phpt
index 7d019d7cde2c..ddefafdfe218 100644
--- a/ext/ldap/tests/ldap_set_option_reqcert_error.phpt
+++ b/ext/ldap/tests/ldap_set_option_reqcert_error.phpt
@@ -11,5 +11,5 @@ $link = ldap_connect($uri);
 $result = ldap_set_option($link, LDAP_OPT_X_TLS_REQUIRE_CERT, 9001);
 var_dump($result);
 ?>
---EXPECTF--
+--EXPECT--
 bool(false)
diff --git a/ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt b/ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt
index 9392b11b3c21..44abaeb9d9a3 100644
--- a/ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt
+++ b/ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt
@@ -23,7 +23,7 @@ foreach([
     var_dump($optionval);
 }
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 int(512)
 bool(true)
diff --git a/ext/ldap/tests/ldap_set_option_variation.phpt b/ext/ldap/tests/ldap_set_option_variation.phpt
index 8fe9c631afb2..17a5cfd218e2 100644
--- a/ext/ldap/tests/ldap_set_option_variation.phpt
+++ b/ext/ldap/tests/ldap_set_option_variation.phpt
@@ -61,7 +61,7 @@ var_dump(
 ldap_get_option($link, LDAP_OPT_MATCHED_DN, $option);
 var_dump($option);
 ?>
---EXPECTF--
+--EXPECT--
 bool(true)
 bool(true)
 bool(true)

From 89ef8ff71f236a4da89d192795d3840630df9c0b Mon Sep 17 00:00:00 2001
From: Andreas Heigl <github@heigl.org>
Date: Mon, 10 Jul 2023 10:16:21 +0200
Subject: [PATCH 8/8] Reintroduce lost newline

---
 ext/ldap/tests/ldap_connect_basic.phpt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/ldap/tests/ldap_connect_basic.phpt b/ext/ldap/tests/ldap_connect_basic.phpt
index 4aa6f21e6bcf..a8a5cb6977a8 100644
--- a/ext/ldap/tests/ldap_connect_basic.phpt
+++ b/ext/ldap/tests/ldap_connect_basic.phpt
@@ -14,4 +14,4 @@ var_dump($link);
 ?>
 --EXPECTF--
 object(LDAP\Connection)#%d (0) {
-}
\ No newline at end of file
+}