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.

Author: heiglandreas

ext/ldap/ldap.c

@@ -997,6 +997,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;

ext/ldap/tests/bug73933.phpt

@@ -25,6 +25,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

ext/ldap/tests/ldap_connect_basic.phpt

@@ -13,4 +13,5 @@ $link = ldap_connect($host, $port);
 var_dump($link);
 ?>
 --EXPECTF--
+Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 resource(%d) of type (ldap link)

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

ext/ldap/tests/ldap_first_attribute_error.phpt

@@ -16,5 +16,6 @@ try {
     echo $e->getMessage(), "\n";
 }
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 ldap_first_attribute(): supplied resource is not a valid ldap result entry resource

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)

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)

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)

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)

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)

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)

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"

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)

ext/ldap/tests/ldap_set_option_error.phpt

@@ -31,6 +31,7 @@ foreach ($controls as $control)
 var_dump(ldap_set_option($link, 999999, 999999));
 ?>
 --EXPECTF--
+Deprecated: Usage of ldap_connect with two arguments is deprecated. in %s on line %d
 bool(false)
 
 Warning: ldap_set_option(): Control must have an oid key in %s on line %d

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)

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)

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)

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)

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)