Skip to content

Fix uouv in array_column #11747

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 31, 2023
Merged

Fix uouv in array_column #11747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
66c770b
Fix uouv in array_column
iluuu1994 Jul 19, 2023
cb7fca8
Fix uouv in password_needs_rehash() and password_hash()
iluuu1994 Jul 20, 2023
11c46f4
Fix various uouv in intl
iluuu1994 Jul 31, 2023
b11db82
Fix some uouv in ext/pgsql
iluuu1994 Jul 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ext/intl/uchar/uchar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ IC_METHOD(hasBinaryProperty) {
UChar32 cp;
zend_long prop;
zend_string *string_codepoint;
zend_long int_codepoint;
zend_long int_codepoint = 0;

ZEND_PARSE_PARAMETERS_START(2, 2)
Z_PARAM_STR_OR_LONG(string_codepoint, int_codepoint)
Expand All @@ -106,7 +106,7 @@ IC_METHOD(getIntPropertyValue) {
UChar32 cp;
zend_long prop;
zend_string *string_codepoint;
zend_long int_codepoint;
zend_long int_codepoint = 0;

ZEND_PARSE_PARAMETERS_START(2, 2)
Z_PARAM_STR_OR_LONG(string_codepoint, int_codepoint)
Expand Down Expand Up @@ -214,7 +214,7 @@ IC_METHOD(getBlockCode) {
IC_METHOD(charName) {
UChar32 cp;
zend_string *string_codepoint;
zend_long int_codepoint;
zend_long int_codepoint = 0;
UErrorCode error = U_ZERO_ERROR;
zend_long nameChoice = U_UNICODE_CHAR_NAME;
zend_string *buffer = NULL;
Expand Down Expand Up @@ -294,7 +294,7 @@ static UBool enumCharNames_callback(enumCharNames_data *context,
IC_METHOD(enumCharNames) {
UChar32 start, limit;
zend_string *string_start, *string_limit;
zend_long int_start, int_limit;
zend_long int_start = 0, int_limit = 0;
enumCharNames_data context;
zend_long nameChoice = U_UNICODE_CHAR_NAME;
UErrorCode error = U_ZERO_ERROR;
Expand Down Expand Up @@ -391,7 +391,7 @@ IC_METHOD(foldCase) {
UChar32 cp, ret;
zend_long options = U_FOLD_CASE_DEFAULT;
zend_string *string_codepoint;
zend_long int_codepoint;
zend_long int_codepoint = 0;

ZEND_PARSE_PARAMETERS_START(2, 2)
Z_PARAM_STR_OR_LONG(string_codepoint, int_codepoint)
Expand Down Expand Up @@ -421,7 +421,7 @@ IC_METHOD(digit) {
zend_long radix = 10;
int ret;
zend_string *string_codepoint;
zend_long int_codepoint;
zend_long int_codepoint = 0;

ZEND_PARSE_PARAMETERS_START(1, 2)
Z_PARAM_STR_OR_LONG(string_codepoint, int_codepoint)
Expand Down
4 changes: 2 additions & 2 deletions ext/pgsql/pgsql.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1693,7 +1693,7 @@ PHP_FUNCTION(pg_fetch_result)
{
zval *result;
zend_string *field_name;
zend_long row, field_offset;
zend_long row, field_offset = 0;
bool row_is_null = false;
PGresult *pgsql_result;
pgsql_result_handle *pg_result;
Expand Down Expand Up @@ -2004,7 +2004,7 @@ static void php_pgsql_data_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type, bo
{
zval *result;
zend_string *field_name;
zend_long row, field_offset;
zend_long row, field_offset = 0;
bool row_is_null = false;
PGresult *pgsql_result;
pgsql_result_handle *pg_result;
Expand Down
4 changes: 2 additions & 2 deletions ext/standard/array.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4513,10 +4513,10 @@ PHP_FUNCTION(array_column)
HashTable *input;
zval *colval, *data, rv;
zend_string *column_str = NULL;
zend_long column_long;
zend_long column_long = 0;
bool column_is_null = 0;
zend_string *index_str = NULL;
zend_long index_long;
zend_long index_long = 0;
bool index_is_null = 1;

ZEND_PARSE_PARAMETERS_START(2, 3)
Expand Down
6 changes: 3 additions & 3 deletions ext/standard/password.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,9 +589,9 @@ PHP_FUNCTION(password_needs_rehash)
const php_password_algo *old_algo, *new_algo;
zend_string *hash;
zend_string *new_algo_str;
zend_long new_algo_long;
zend_long new_algo_long = 0;
bool new_algo_is_null;
zend_array *options = 0;
zend_array *options = NULL;

ZEND_PARSE_PARAMETERS_START(2, 3)
Z_PARAM_STR(hash)
Expand Down Expand Up @@ -637,7 +637,7 @@ PHP_FUNCTION(password_hash)
{
zend_string *password, *digest = NULL;
zend_string *algo_str;
zend_long algo_long;
zend_long algo_long = 0;
bool algo_is_null;
const php_password_algo *algo;
zend_array *options = NULL;
Expand Down