Skip to content

Commit 018fbd0

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: Fix GH-10112: LDAP\Connection::__construct() refers to ldap_create()
2 parents 6aa5e58 + b8ac207 commit 018fbd0

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

NEWS

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ PHP NEWS
22
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
33
?? ??? ????, PHP 8.2.2
44

5+
- LDAP:
6+
. Fixed bug GH-10112 (LDAP\Connection::__construct() refers to ldap_create()).
7+
(cmb)
58

69
05 Jan 2023, PHP 8.2.1
710

ext/ldap/ldap.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ static zend_object *ldap_link_create_object(zend_class_entry *class_type) {
121121
}
122122

123123
static zend_function *ldap_link_get_constructor(zend_object *object) {
124-
zend_throw_error(NULL, "Cannot directly construct LDAP\\Connection, use ldap_create() instead");
124+
zend_throw_error(NULL, "Cannot directly construct LDAP\\Connection, use ldap_connect() instead");
125125
return NULL;
126126
}
127127

ext/ldap/tests/ldap_constructor.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ try {
1111
echo "Exception: ", $ex->getMessage(), "\n";
1212
}
1313
--EXPECT--
14-
Exception: Cannot directly construct LDAP\Connection, use ldap_create() instead
14+
Exception: Cannot directly construct LDAP\Connection, use ldap_connect() instead

0 commit comments

Comments
 (0)