Skip to content

Commit a16699e

Browse files
committed
Merge branch 'PHP-8.0'
* PHP-8.0: Fix null foreground in imagewbmp Mark ldap_exop() param as UNKNOWN
2 parents 1fc3197 + 187efc6 commit a16699e

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

ext/gd/gd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1956,7 +1956,7 @@ PHP_FUNCTION(imagewbmp)
19561956
gdIOCtx *ctx = NULL;
19571957
zval *to_zval = NULL;
19581958

1959-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|z!l!", &imgind, gd_image_ce, &to_zval, &foreground_color) == FAILURE) {
1959+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|z!l!", &imgind, gd_image_ce, &to_zval, &foreground_color, &foreground_color_is_null) == FAILURE) {
19601960
RETURN_THROWS();
19611961
}
19621962

ext/ldap/ldap.stub.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ function ldap_8859_to_t61(string $value): string|false {}
279279
* @param string $response_oid
280280
* @return resource|bool
281281
*/
282-
function ldap_exop($ldap, string $request_oid, ?string $request_data = null, ?array $controls = [], &$response_data = null, &$response_oid = null) {}
282+
function ldap_exop($ldap, string $request_oid, ?string $request_data = null, ?array $controls = [], &$response_data = UNKNOWN, &$response_oid = null) {}
283283
#endif
284284

285285
#ifdef HAVE_LDAP_PASSWD

ext/ldap/ldap_arginfo.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 42f7118d8380424cd4178759cae6cb47b6d9b44f */
2+
* Stub hash: 0c02f5e91a47e9664c8c41332bf8040e93592753 */
33

44
#if defined(HAVE_ORALDAP)
55
ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_connect, 0, 0, 0)
@@ -297,7 +297,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_exop, 0, 0, 2)
297297
ZEND_ARG_TYPE_INFO(0, request_oid, IS_STRING, 0)
298298
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, request_data, IS_STRING, 1, "null")
299299
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 1, "[]")
300-
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, response_data, "null")
300+
ZEND_ARG_INFO(1, response_data)
301301
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, response_oid, "null")
302302
ZEND_END_ARG_INFO()
303303
#endif

0 commit comments

Comments
 (0)