Fix GH-10112: LDAP\Connection::__construct() refers to ldap_create()

cmb69 · cmb69 · commit b8ac2071b897 · 2022-12-16T14:36:30.000+01:00
There is no `ldap_create()`, but rather `ldap_connect()`. Closes GH-10115.
diff --git a/NEWS b/NEWS
@@ -5,6 +5,10 @@ PHP                                                                        NEWS
 - Apache:
   . Fixed bug GH-9949 (Partial content on incomplete POST request). (cmb)
 
+- LDAP:
+  . Fixed bug GH-10112 (LDAP\Connection::__construct() refers to ldap_create()).
+    (cmb)
+
 - TSRM:
   . Fixed Windows shmget() wrt. IPC_PRIVATE. (Tyson Andre)
 
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
@@ -119,7 +119,7 @@ static zend_object *ldap_link_create_object(zend_class_entry *class_type) {
 }
 
 static zend_function *ldap_link_get_constructor(zend_object *object) {
-	zend_throw_error(NULL, "Cannot directly construct LDAP\\Connection, use ldap_create() instead");
+	zend_throw_error(NULL, "Cannot directly construct LDAP\\Connection, use ldap_connect() instead");
 	return NULL;
 }
 
diff --git a/ext/ldap/tests/ldap_constructor.phpt b/ext/ldap/tests/ldap_constructor.phpt
@@ -11,4 +11,4 @@ try {
     echo "Exception: ", $ex->getMessage(), "\n";
 }
 --EXPECT--
-Exception: Cannot directly construct LDAP\Connection, use ldap_create() instead
+Exception: Cannot directly construct LDAP\Connection, use ldap_connect() instead

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ static zend_object ldap_link_create_object(zend_class_entry class_type) {`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`static zend_function ldap_link_get_constructor(zend_object object) {`
`122`		`- zend_throw_error(NULL, "Cannot directly construct LDAP\\Connection, use ldap_create() instead");`
	`122`	`+ zend_throw_error(NULL, "Cannot directly construct LDAP\\Connection, use ldap_connect() instead");`
`123`	`123`	`return NULL;`
`124`	`124`	`}`
`125`	`125`
Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,4 @@ try {`
`11`	`11`	`echo "Exception: ", $ex->getMessage(), "\n";`
`12`	`12`	`}`
`13`	`13`	`--EXPECT--`
`14`		`-Exception: Cannot directly construct LDAP\Connection, use ldap_create() instead`
	`14`	`+Exception: Cannot directly construct LDAP\Connection, use ldap_connect() instead`