archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'PHP-8.1' into PHP-8.2

Browse source 
* PHP-8.1:
  Fix GH-10112: LDAP\Connection::__construct() refers to ldap_create()
This commit is contained in:
Christoph M. Becker 2022-12-16 14:37:17 +01:00
commit 018fbd0a68
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -2,6 +2,9 @@ PHP NEWS
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? ????, PHP 8.2.2 ?? ??? ????, PHP 8.2.2
- LDAP:
. Fixed bug GH-10112 (LDAP\Connection::__construct() refers to ldap_create()).
(cmb)
05 Jan 2023, PHP 8.2.1 05 Jan 2023, PHP 8.2.1

2
ext/ldap/ldap.c
View file

@ -121,7 +121,7 @@ static zend_object *ldap_link_create_object(zend_class_entry *class_type) {
} }
static zend_function *ldap_link_get_constructor(zend_object *object) { 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; return NULL;
} }

2
ext/ldap/tests/ldap_constructor.phpt
View file

@ -11,4 +11,4 @@ try {
echo "Exception: ", $ex->getMessage(), "\n"; echo "Exception: ", $ex->getMessage(), "\n";
} }
--EXPECT-- --EXPECT--
Exception: Cannot directly construct LDAP\Connection, use ldap_create() instead Exception: Cannot directly construct LDAP\Connection, use ldap_connect() instead