Skip to content

Commit cac6520

Browse files
kocsismatekocsismate
committed
Fix UNKNOWN default values in various extensions
1 parent ffcc813 commit cac6520

25 files changed

+94
-94
lines changed

‎Zend/zend_API.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1556,6 +1556,9 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_value_error(uint32_t arg_num
15561556
#define Z_PARAM_STR(dest) \
15571557
Z_PARAM_STR_EX(dest, 0, 0)
15581558

1559+
#define Z_PARAM_STR_OR_NULL(dest) \
1560+
Z_PARAM_STR_EX(dest, 1, 0)
1561+
15591562
/* old "z" */
15601563
#define Z_PARAM_ZVAL_EX2(dest, check_null, deref, separate) \
15611564
Z_PARAM_PROLOGUE(deref, separate); \

‎ext/dom/php_dom.stub.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,10 @@ public function getFeature(string $feature, string $version) {}
103103
public function hasFeature(string $feature, string $version) {}
104104

105105
/** @return DOMDocumentType|false */
106-
public function createDocumentType(
107-
string $qualifiedName, string $publicId = "", string $systemId = "") {}
106+
public function createDocumentType(string $qualifiedName, string $publicId = "", string $systemId = "") {}
108107

109108
/** @return DOMDocument|false */
110-
public function createDocument(string $namespaceURI = "", string $qualifiedName = "", DOMDocumentType $doctype = UNKNOWN) {}
109+
public function createDocument(string $namespaceURI = "", string $qualifiedName = "", ?DOMDocumentType $doctype = null) {}
111110
}
112111

113112
class DOMDocumentFragment implements DOMParentNode
@@ -248,7 +247,7 @@ public function prepend(...$nodes): void {}
248247

249248
class DOMDocument implements DOMParentNode
250249
{
251-
public function __construct(string $version = "1.0", string $encoding = UNKNOWN) {}
250+
public function __construct(string $version = "1.0", string $encoding = "") {}
252251

253252
/** @return DOMAttr|false */
254253
public function createAttribute(string $name) {}

‎ext/dom/php_dom_arginfo.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ ZEND_END_ARG_INFO()
107107
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMImplementation_createDocument, 0, 0, 0)
108108
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, namespaceURI, IS_STRING, 0, "\"\"")
109109
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, qualifiedName, IS_STRING, 0, "\"\"")
110-
ZEND_ARG_OBJ_INFO(0, doctype, DOMDocumentType, 0)
110+
ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(0, doctype, DOMDocumentType, 1, "null")
111111
ZEND_END_ARG_INFO()
112112

113113
#define arginfo_class_DOMDocumentFragment___construct arginfo_class_DOMNode_getLineNo
@@ -244,7 +244,7 @@ ZEND_END_ARG_INFO()
244244

245245
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_DOMDocument___construct, 0, 0, 0)
246246
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, version, IS_STRING, 0, "\"1.0\"")
247-
ZEND_ARG_TYPE_INFO(0, encoding, IS_STRING, 0)
247+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, encoding, IS_STRING, 0, "\"\"")
248248
ZEND_END_ARG_INFO()
249249

250250
#define arginfo_class_DOMDocument_createAttribute arginfo_class_DOMElement_getAttribute

‎ext/enchant/enchant.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ PHP_FUNCTION(enchant_dict_quick_check)
626626
size_t wordlen;
627627
enchant_dict *pdict;
628628

629-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs|z", &dict, &word, &wordlen, &sugg) == FAILURE) {
629+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs|z!", &dict, &word, &wordlen, &sugg) == FAILURE) {
630630
RETURN_THROWS();
631631
}
632632

@@ -643,7 +643,7 @@ PHP_FUNCTION(enchant_dict_quick_check)
643643
size_t n_sugg;
644644
char **suggs;
645645

646-
if (!sugg && ZEND_NUM_ARGS() == 2) {
646+
if (!sugg) {
647647
RETURN_FALSE;
648648
}
649649

@@ -656,9 +656,9 @@ PHP_FUNCTION(enchant_dict_quick_check)
656656
enchant_dict_free_string_list(pdict->pdict, suggs);
657657
}
658658

659-
660659
RETURN_FALSE;
661660
}
661+
662662
RETURN_TRUE;
663663
}
664664
/* }}} */

‎ext/enchant/enchant.stub.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ function enchant_broker_set_ordering($broker, string $tag, string $ordering): bo
5454
function enchant_broker_describe($broker): array {}
5555

5656
/** @param resource $dict */
57-
function enchant_dict_quick_check($dict, string $word, &$suggestions = UNKNOWN): bool {}
57+
function enchant_dict_quick_check($dict, string $word, &$suggestions = null): bool {}
5858

5959
/** @param resource $dict */
6060
function enchant_dict_check($dict, string $word): bool {}

‎ext/enchant/enchant_arginfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ ZEND_END_ARG_INFO()
5656
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_enchant_dict_quick_check, 0, 2, _IS_BOOL, 0)
5757
ZEND_ARG_INFO(0, dict)
5858
ZEND_ARG_TYPE_INFO(0, word, IS_STRING, 0)
59-
ZEND_ARG_INFO(1, suggestions)
59+
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, suggestions, "null")
6060
ZEND_END_ARG_INFO()
6161

6262
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_enchant_dict_check, 0, 2, _IS_BOOL, 0)

‎ext/ffi/ffi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2834,8 +2834,8 @@ ZEND_METHOD(FFI, cdef) /* {{{ */
28342834
ZEND_FFI_VALIDATE_API_RESTRICTION();
28352835
ZEND_PARSE_PARAMETERS_START(0, 2)
28362836
Z_PARAM_OPTIONAL
2837-
Z_PARAM_STR(code)
2838-
Z_PARAM_STR(lib)
2837+
Z_PARAM_STR_OR_NULL(code)
2838+
Z_PARAM_STR_OR_NULL(lib)
28392839
ZEND_PARSE_PARAMETERS_END();
28402840

28412841
if (lib) {

‎ext/ffi/ffi.stub.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
final class FFI
66
{
7-
public static function cdef(string $code = UNKNOWN, string $lib = UNKNOWN): FFI {}
7+
public static function cdef(?string $code = null, ?string $lib = null): FFI {}
88

99
public static function load(string $filename): ?FFI {}
1010

‎ext/ffi/ffi_arginfo.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* This is a generated file, edit the .stub.php file instead. */
22

33
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_FFI_cdef, 0, 0, FFI, 0)
4-
ZEND_ARG_TYPE_INFO(0, code, IS_STRING, 0)
5-
ZEND_ARG_TYPE_INFO(0, lib, IS_STRING, 0)
4+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, code, IS_STRING, 1, "null")
5+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, lib, IS_STRING, 1, "null")
66
ZEND_END_ARG_INFO()
77

88
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_FFI_load, 0, 1, FFI, 1)

‎ext/ftp/ftp.stub.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ function ftp_rmdir($ftp, string $directory): bool {}
3838
function ftp_chmod($ftp, int $mode, string $filename): int|false {}
3939

4040
/** @param resource $ftp */
41-
function ftp_alloc($ftp, int $size, &$response = UNKNOWN): bool {}
41+
function ftp_alloc($ftp, int $size, &$response = null): bool {}
4242

4343
/** @param resource $ftp */
4444
function ftp_nlist($ftp, string $directory): array|false {}

‎ext/ftp/ftp_arginfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ ZEND_END_ARG_INFO()
5959
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ftp_alloc, 0, 2, _IS_BOOL, 0)
6060
ZEND_ARG_INFO(0, ftp)
6161
ZEND_ARG_TYPE_INFO(0, size, IS_LONG, 0)
62-
ZEND_ARG_INFO(1, response)
62+
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, response, "null")
6363
ZEND_END_ARG_INFO()
6464

6565
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ftp_nlist, 0, 2, MAY_BE_ARRAY|MAY_BE_FALSE)

‎ext/ftp/php_ftp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ PHP_FUNCTION(ftp_alloc)
427427
zend_long size, ret;
428428
zend_string *response = NULL;
429429

430-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rl|z", &z_ftp, &size, &zresponse) == FAILURE) {
430+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rl|z!", &z_ftp, &size, &zresponse) == FAILURE) {
431431
RETURN_THROWS();
432432
}
433433

‎ext/hash/hash.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -481,19 +481,22 @@ PHP_FUNCTION(hash_update_file)
481481
{
482482
zval *zhash, *zcontext = NULL;
483483
php_hashcontext_object *hash;
484-
php_stream_context *context;
484+
php_stream_context *context = NULL;
485485
php_stream *stream;
486486
zend_string *filename;
487487
char buf[1024];
488488
ssize_t n;
489489

490-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "OP|r", &zhash, php_hashcontext_ce, &filename, &zcontext) == FAILURE) {
490+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "OP|r!", &zhash, php_hashcontext_ce, &filename, &zcontext) == FAILURE) {
491491
RETURN_THROWS();
492492
}
493493

494494
hash = php_hashcontext_from_object(Z_OBJ_P(zhash));
495495
PHP_HASHCONTEXT_VERIFY(hash);
496-
context = php_stream_context_from_zval(zcontext, 0);
496+
497+
if (zcontext) {
498+
context = php_stream_context_from_zval(zcontext, 0);
499+
}
497500

498501
stream = php_stream_open_wrapper_ex(ZSTR_VAL(filename), "rb", REPORT_ERRORS, NULL, context);
499502
if (!stream) {

‎ext/hash/hash.stub.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ function hash_hmac(string $algo, string $data, string $key, bool $raw_output = f
1010

1111
function hash_hmac_file(string $algo, string $data, string $key, bool $raw_output = false): string|false {}
1212

13-
function hash_init(string $algo, int $options = 0, string $key = UNKNOWN): HashContext {}
13+
function hash_init(string $algo, int $options = 0, string $key = ""): HashContext {}
1414

1515
function hash_update(HashContext $context, string $data): bool {}
1616

1717
/** @param resource $handle */
1818
function hash_update_stream(HashContext $context, $handle, int $length = -1): int {}
1919

2020
/** @param resource $stream_context */
21-
function hash_update_file(HashContext $context, string $filename, $stream_context = UNKNOWN): bool {}
21+
function hash_update_file(HashContext $context, string $filename, $stream_context = null): bool {}
2222

2323
function hash_final(HashContext $context, bool $raw_output = false): string {}
2424

‎ext/hash/hash_arginfo.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ZEND_END_ARG_INFO()
2424
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_hash_init, 0, 1, HashContext, 0)
2525
ZEND_ARG_TYPE_INFO(0, algo, IS_STRING, 0)
2626
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0")
27-
ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
27+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, key, IS_STRING, 0, "\"\"")
2828
ZEND_END_ARG_INFO()
2929

3030
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_hash_update, 0, 2, _IS_BOOL, 0)
@@ -41,7 +41,7 @@ ZEND_END_ARG_INFO()
4141
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_hash_update_file, 0, 2, _IS_BOOL, 0)
4242
ZEND_ARG_OBJ_INFO(0, context, HashContext, 0)
4343
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
44-
ZEND_ARG_INFO(0, stream_context)
44+
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(0, stream_context, "null")
4545
ZEND_END_ARG_INFO()
4646

4747
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_hash_final, 0, 1, IS_STRING, 0)

‎ext/iconv/iconv.c

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1826,7 +1826,7 @@ static void _php_iconv_show_error(php_iconv_err_t err, const char *out_charset,
18261826
Returns the character count of str */
18271827
PHP_FUNCTION(iconv_strlen)
18281828
{
1829-
const char *charset = get_internal_encoding();
1829+
const char *charset;
18301830
size_t charset_len = 0;
18311831
zend_string *str;
18321832

@@ -1839,7 +1839,9 @@ PHP_FUNCTION(iconv_strlen)
18391839
RETURN_THROWS();
18401840
}
18411841

1842-
if (charset_len >= ICONV_CSNMAXLEN) {
1842+
if (charset_len == 0) {
1843+
charset = get_internal_encoding();
1844+
} else if (charset_len >= ICONV_CSNMAXLEN) {
18431845
php_error_docref(NULL, E_WARNING, "Charset parameter exceeds the maximum allowed length of %d characters", ICONV_CSNMAXLEN);
18441846
RETURN_FALSE;
18451847
}
@@ -1858,7 +1860,7 @@ PHP_FUNCTION(iconv_strlen)
18581860
Returns specified part of a string */
18591861
PHP_FUNCTION(iconv_substr)
18601862
{
1861-
const char *charset = get_internal_encoding();
1863+
const char *charset;
18621864
size_t charset_len = 0;
18631865
zend_string *str;
18641866
zend_long offset, length = 0;
@@ -1874,7 +1876,9 @@ PHP_FUNCTION(iconv_substr)
18741876
RETURN_THROWS();
18751877
}
18761878

1877-
if (charset_len >= ICONV_CSNMAXLEN) {
1879+
if (charset_len == 0) {
1880+
charset = get_internal_encoding();
1881+
} else if (charset_len >= ICONV_CSNMAXLEN) {
18781882
php_error_docref(NULL, E_WARNING, "Charset parameter exceeds the maximum allowed length of %d characters", ICONV_CSNMAXLEN);
18791883
RETURN_FALSE;
18801884
}
@@ -1898,7 +1902,7 @@ PHP_FUNCTION(iconv_substr)
18981902
Finds position of first occurrence of needle within part of haystack beginning with offset */
18991903
PHP_FUNCTION(iconv_strpos)
19001904
{
1901-
const char *charset = get_internal_encoding();
1905+
const char *charset;
19021906
size_t charset_len = 0, haystk_len;
19031907
zend_string *haystk;
19041908
zend_string *ndl;
@@ -1914,7 +1918,9 @@ PHP_FUNCTION(iconv_strpos)
19141918
RETURN_THROWS();
19151919
}
19161920

1917-
if (charset_len >= ICONV_CSNMAXLEN) {
1921+
if (charset_len == 0) {
1922+
charset = get_internal_encoding();
1923+
} else if (charset_len >= ICONV_CSNMAXLEN) {
19181924
php_error_docref(NULL, E_WARNING, "Charset parameter exceeds the maximum allowed length of %d characters", ICONV_CSNMAXLEN);
19191925
RETURN_FALSE;
19201926
}
@@ -1953,7 +1959,7 @@ PHP_FUNCTION(iconv_strpos)
19531959
Finds position of last occurrence of needle within part of haystack beginning with offset */
19541960
PHP_FUNCTION(iconv_strrpos)
19551961
{
1956-
const char *charset = get_internal_encoding();
1962+
const char *charset;
19571963
size_t charset_len = 0;
19581964
zend_string *haystk;
19591965
zend_string *ndl;
@@ -1972,7 +1978,9 @@ PHP_FUNCTION(iconv_strrpos)
19721978
RETURN_FALSE;
19731979
}
19741980

1975-
if (charset_len >= ICONV_CSNMAXLEN) {
1981+
if (charset_len == 0) {
1982+
charset = get_internal_encoding();
1983+
} else if (charset_len >= ICONV_CSNMAXLEN) {
19761984
php_error_docref(NULL, E_WARNING, "Charset parameter exceeds the maximum allowed length of %d characters", ICONV_CSNMAXLEN);
19771985
RETURN_FALSE;
19781986
}
@@ -2097,7 +2105,7 @@ PHP_FUNCTION(iconv_mime_encode)
20972105
PHP_FUNCTION(iconv_mime_decode)
20982106
{
20992107
zend_string *encoded_str;
2100-
const char *charset = get_internal_encoding();
2108+
const char *charset;
21012109
size_t charset_len = 0;
21022110
zend_long mode = 0;
21032111

@@ -2111,7 +2119,9 @@ PHP_FUNCTION(iconv_mime_decode)
21112119
RETURN_THROWS();
21122120
}
21132121

2114-
if (charset_len >= ICONV_CSNMAXLEN) {
2122+
if (charset_len == 0) {
2123+
charset = get_internal_encoding();
2124+
} else if (charset_len >= ICONV_CSNMAXLEN) {
21152125
php_error_docref(NULL, E_WARNING, "Charset parameter exceeds the maximum allowed length of %d characters", ICONV_CSNMAXLEN);
21162126
RETURN_FALSE;
21172127
}
@@ -2137,7 +2147,7 @@ PHP_FUNCTION(iconv_mime_decode)
21372147
PHP_FUNCTION(iconv_mime_decode_headers)
21382148
{
21392149
zend_string *encoded_str;
2140-
const char *charset = get_internal_encoding();
2150+
const char *charset;
21412151
size_t charset_len = 0;
21422152
zend_long mode = 0;
21432153
char *enc_str_tmp;
@@ -2151,7 +2161,9 @@ PHP_FUNCTION(iconv_mime_decode_headers)
21512161
RETURN_THROWS();
21522162
}
21532163

2154-
if (charset_len >= ICONV_CSNMAXLEN) {
2164+
if (charset_len == 0) {
2165+
charset = get_internal_encoding();
2166+
} else if (charset_len >= ICONV_CSNMAXLEN) {
21552167
php_error_docref(NULL, E_WARNING, "Charset parameter exceeds the maximum allowed length of %d characters", ICONV_CSNMAXLEN);
21562168
RETURN_FALSE;
21572169
}

‎ext/iconv/iconv.stub.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
22

33
/** @generate-function-entries */
44

5-
function iconv_strlen(string $str, string $charset = UNKNOWN): int|false {}
5+
function iconv_strlen(string $str, string $charset = ""): int|false {}
66

7-
function iconv_substr(string $str, int $offset, ?int $length = null, string $charset = UNKNOWN): string|false {}
7+
function iconv_substr(string $str, int $offset, ?int $length = null, string $charset = ""): string|false {}
88

9-
function iconv_strpos(string $haystack, string $needle, int $offset = 0, string $charset = UNKNOWN): int|false {}
9+
function iconv_strpos(string $haystack, string $needle, int $offset = 0, string $charset = ""): int|false {}
1010

11-
function iconv_strrpos(string $haystack, string $needle, string $charset = UNKNOWN): int|false {}
11+
function iconv_strrpos(string $haystack, string $needle, string $charset = ""): int|false {}
1212

1313
function iconv_mime_encode(string $field_name, string $field_value, array $preference = []): string|false {}
1414

15-
function iconv_mime_decode(string $encoded_string, int $mode = 0, string $charset = UNKNOWN): string|false {}
15+
function iconv_mime_decode(string $encoded_string, int $mode = 0, string $charset = ""): string|false {}
1616

17-
function iconv_mime_decode_headers(string $headers, int $mode = 0, string $charset = UNKNOWN): array|false {}
17+
function iconv_mime_decode_headers(string $headers, int $mode = 0, string $charset = ""): array|false {}
1818

1919
function iconv(string $in_charset, string $out_charset, string $str): string|false {}
2020

2121
function iconv_set_encoding(string $type, string $charset): bool {}
2222

23-
function iconv_get_encoding(string $type = 'all'): array|string|false {}
23+
function iconv_get_encoding(string $type = "all"): array|string|false {}

0 commit comments

Comments
 (0)