Skip to content

Commit 20e983d

Browse files
nikicnikic
committed
Merge branch 'PHP-7.4'
2 parents 4d8e0d4 + 3f19f51 commit 20e983d

File tree

9 files changed

+27
-37
lines changed

9 files changed

+27
-37
lines changed

‎Zend/zend_API.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -610,6 +610,7 @@ END_EXTERN_C()
610610
#define RETVAL_EMPTY_STRING() ZVAL_EMPTY_STRING(return_value)
611611
#define RETVAL_RES(r) ZVAL_RES(return_value, r)
612612
#define RETVAL_ARR(r) ZVAL_ARR(return_value, r)
613+
#define RETVAL_EMPTY_ARRAY(r) ZVAL_EMPTY_ARRAY(return_value)
613614
#define RETVAL_OBJ(r) ZVAL_OBJ(return_value, r)
614615
#define RETVAL_ZVAL(zv, copy, dtor) ZVAL_ZVAL(return_value, zv, copy, dtor)
615616
#define RETVAL_FALSE ZVAL_FALSE(return_value)
@@ -628,6 +629,7 @@ END_EXTERN_C()
628629
#define RETURN_EMPTY_STRING() { RETVAL_EMPTY_STRING(); return; }
629630
#define RETURN_RES(r) { RETVAL_RES(r); return; }
630631
#define RETURN_ARR(r) { RETVAL_ARR(r); return; }
632+
#define RETURN_EMPTY_ARRAY(r) { RETVAL_EMPTY_ARRAY(r); return; }
631633
#define RETURN_OBJ(r) { RETVAL_OBJ(r); return; }
632634
#define RETURN_ZVAL(zv, copy, dtor) { RETVAL_ZVAL(zv, copy, dtor); return; }
633635
#define RETURN_FALSE { RETVAL_FALSE; return; }

‎Zend/zend_builtin_functions.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ ZEND_FUNCTION(func_get_args)
553553
} ZEND_HASH_FILL_END();
554554
Z_ARRVAL_P(return_value)->nNumOfElements = arg_count;
555555
} else {
556-
ZVAL_EMPTY_ARRAY(return_value);
556+
RETURN_EMPTY_ARRAY();
557557
}
558558
}
559559
/* }}} */

‎ext/libxml/libxml.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1060,7 +1060,7 @@ static PHP_FUNCTION(libxml_get_errors)
10601060
error = zend_llist_get_next(LIBXML(error_list));
10611061
}
10621062
} else {
1063-
ZVAL_EMPTY_ARRAY(return_value);
1063+
RETURN_EMPTY_ARRAY();
10641064
}
10651065
}
10661066
/* }}} */

‎ext/mysqli/mysqli_nonapi.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ PHP_FUNCTION(mysqli_error_list)
422422
add_next_index_zval(return_value, &single_error);
423423
}
424424
} else {
425-
ZVAL_EMPTY_ARRAY(return_value);
425+
RETURN_EMPTY_ARRAY();
426426
}
427427
#else
428428
if (mysql_errno(mysql->mysql)) {
@@ -434,7 +434,7 @@ PHP_FUNCTION(mysqli_error_list)
434434
add_assoc_string_ex(&single_error, "error", sizeof("error") - 1, mysql_error(mysql->mysql));
435435
add_next_index_zval(return_value, &single_error);
436436
} else {
437-
ZVAL_EMPTY_ARRAY(return_value);
437+
RETURN_EMPTY_ARRAY();
438438
}
439439
#endif
440440
}
@@ -468,7 +468,7 @@ PHP_FUNCTION(mysqli_stmt_error_list)
468468
add_next_index_zval(return_value, &single_error);
469469
}
470470
} else {
471-
ZVAL_EMPTY_ARRAY(return_value);
471+
RETURN_EMPTY_ARRAY();
472472
}
473473
#else
474474
if (mysql_stmt_errno(stmt->stmt)) {
@@ -480,7 +480,7 @@ PHP_FUNCTION(mysqli_stmt_error_list)
480480
add_assoc_string_ex(&single_error, "error", sizeof("error") - 1, mysql_stmt_error(stmt->stmt));
481481
add_next_index_zval(return_value, &single_error);
482482
} else {
483-
ZVAL_EMPTY_ARRAY(return_value);
483+
RETURN_EMPTY_ARRAY();
484484
}
485485
#endif
486486
}

‎ext/reflection/php_reflection.c

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1789,7 +1789,7 @@ ZEND_METHOD(reflection_function, getStaticVariables)
17891789
} ZEND_HASH_FOREACH_END();
17901790
zend_hash_copy(Z_ARRVAL_P(return_value), ht, zval_add_ref);
17911791
} else {
1792-
ZVAL_EMPTY_ARRAY(return_value);
1792+
RETURN_EMPTY_ARRAY();
17931793
}
17941794
}
17951795
/* }}} */
@@ -1977,8 +1977,7 @@ ZEND_METHOD(reflection_function, getParameters)
19771977
}
19781978

19791979
if (!num_args) {
1980-
ZVAL_EMPTY_ARRAY(return_value);
1981-
return;
1980+
RETURN_EMPTY_ARRAY();
19821981
}
19831982

19841983
array_init(return_value);
@@ -4788,7 +4787,7 @@ ZEND_METHOD(reflection_class, getInterfaces)
47884787
zend_hash_update(Z_ARRVAL_P(return_value), ce->interfaces[i]->name, &interface);
47894788
}
47904789
} else {
4791-
ZVAL_EMPTY_ARRAY(return_value);
4790+
RETURN_EMPTY_ARRAY();
47924791
}
47934792
}
47944793
/* }}} */
@@ -4808,8 +4807,7 @@ ZEND_METHOD(reflection_class, getInterfaceNames)
48084807

48094808
if (!ce->num_interfaces) {
48104809
/* Return an empty array if this class implements no interfaces */
4811-
ZVAL_EMPTY_ARRAY(return_value);
4812-
return;
4810+
RETURN_EMPTY_ARRAY();
48134811
}
48144812

48154813
ZEND_ASSERT(ce->ce_flags & ZEND_ACC_LINKED);
@@ -4835,8 +4833,7 @@ ZEND_METHOD(reflection_class, getTraits)
48354833
GET_REFLECTION_OBJECT_PTR(ce);
48364834

48374835
if (!ce->num_traits) {
4838-
ZVAL_EMPTY_ARRAY(return_value);
4839-
return;
4836+
RETURN_EMPTY_ARRAY();
48404837
}
48414838

48424839
array_init(return_value);
@@ -4868,8 +4865,7 @@ ZEND_METHOD(reflection_class, getTraitNames)
48684865
GET_REFLECTION_OBJECT_PTR(ce);
48694866

48704867
if (!ce->num_traits) {
4871-
ZVAL_EMPTY_ARRAY(return_value);
4872-
return;
4868+
RETURN_EMPTY_ARRAY();
48734869
}
48744870

48754871
array_init(return_value);
@@ -4910,7 +4906,7 @@ ZEND_METHOD(reflection_class, getTraitAliases)
49104906
i++;
49114907
}
49124908
} else {
4913-
ZVAL_EMPTY_ARRAY(return_value);
4909+
RETURN_EMPTY_ARRAY();
49144910
}
49154911
}
49164912
/* }}} */
@@ -5882,8 +5878,7 @@ ZEND_METHOD(reflection_extension, getDependencies)
58825878

58835879
if (!dep)
58845880
{
5885-
ZVAL_EMPTY_ARRAY(return_value);
5886-
return;
5881+
RETURN_EMPTY_ARRAY();
58875882
}
58885883

58895884
array_init(return_value);

‎ext/simplexml/simplexml.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1368,7 +1368,7 @@ SXE_METHOD(xpath)
13681368
}
13691369
}
13701370
} else {
1371-
ZVAL_EMPTY_ARRAY(return_value);
1371+
RETVAL_EMPTY_ARRAY();
13721372
}
13731373

13741374
xmlXPathFreeObject(retval);

‎ext/spl/spl_fixedarray.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ SPL_METHOD(SplFixedArray, toArray)
638638
}
639639
}
640640
} else {
641-
ZVAL_EMPTY_ARRAY(return_value);
641+
RETURN_EMPTY_ARRAY();
642642
}
643643
}
644644
/* }}} */

‎ext/sqlite3/sqlite3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ PHP_METHOD(sqlite3, querySingle)
679679
if (!entire_row) {
680680
RETVAL_NULL();
681681
} else {
682-
ZVAL_EMPTY_ARRAY(return_value);
682+
RETVAL_EMPTY_ARRAY();
683683
}
684684
break;
685685
}

‎ext/standard/array.c

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2654,8 +2654,7 @@ PHP_FUNCTION(array_fill)
26542654
}
26552655
}
26562656
} else if (EXPECTED(num == 0)) {
2657-
ZVAL_EMPTY_ARRAY(return_value);
2658-
return;
2657+
RETURN_EMPTY_ARRAY();
26592658
} else {
26602659
php_error_docref(NULL, E_WARNING, "Number of elements can't be negative");
26612660
RETURN_FALSE;
@@ -3490,8 +3489,7 @@ PHP_FUNCTION(array_slice)
34903489

34913490
/* Clamp the offset.. */
34923491
if (offset > (zend_long) num_in) {
3493-
ZVAL_EMPTY_ARRAY(return_value);
3494-
return;
3492+
RETURN_EMPTY_ARRAY();
34953493
} else if (offset < 0 && (offset = (num_in + offset)) < 0) {
34963494
offset = 0;
34973495
}
@@ -3504,8 +3502,7 @@ PHP_FUNCTION(array_slice)
35043502
}
35053503

35063504
if (length <= 0) {
3507-
ZVAL_EMPTY_ARRAY(return_value);
3508-
return;
3505+
RETURN_EMPTY_ARRAY();
35093506
}
35103507

35113508
/* Initialize returned array */
@@ -4037,8 +4034,7 @@ PHP_FUNCTION(array_values)
40374034
/* Return empty input as is */
40384035
arrlen = zend_hash_num_elements(arrval);
40394036
if (!arrlen) {
4040-
ZVAL_EMPTY_ARRAY(return_value);
4041-
return;
4037+
RETURN_EMPTY_ARRAY();
40424038
}
40434039

40444040
/* Return vector-like packed arrays as-is */
@@ -5447,8 +5443,7 @@ PHP_FUNCTION(array_diff)
54475443
RETURN_NULL();
54485444
}
54495445
}
5450-
ZVAL_EMPTY_ARRAY(return_value);
5451-
return;
5446+
RETURN_EMPTY_ARRAY();
54525447
} else if (num == 1) {
54535448
int found = 0;
54545449
zend_string *search_str, *tmp_search_str;
@@ -5465,8 +5460,7 @@ PHP_FUNCTION(array_diff)
54655460
RETURN_NULL();
54665461
}
54675462
}
5468-
ZVAL_EMPTY_ARRAY(return_value);
5469-
return;
5463+
RETURN_EMPTY_ARRAY();
54705464
}
54715465

54725466
search_str = zval_get_tmp_string(value, &tmp_search_str);
@@ -5492,7 +5486,7 @@ PHP_FUNCTION(array_diff)
54925486
zend_tmp_string_release(tmp_search_str);
54935487

54945488
if (found) {
5495-
ZVAL_EMPTY_ARRAY(return_value);
5489+
RETVAL_EMPTY_ARRAY();
54965490
} else {
54975491
ZVAL_COPY(return_value, &args[0]);
54985492
}
@@ -6426,8 +6420,7 @@ PHP_FUNCTION(array_combine)
64266420
}
64276421

64286422
if (!num_keys) {
6429-
ZVAL_EMPTY_ARRAY(return_value);
6430-
return;
6423+
RETURN_EMPTY_ARRAY();
64316424
}
64326425

64336426
array_init_size(return_value, num_keys);

0 commit comments

Comments
 (0)