Skip to content

Commit 63934ea

Browse files
carusogabrielkrakjoe
authored andcommitted
Fix #76131 some arginfo params are different from the documentation
1 parent cdf7252 commit 63934ea

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

NEWS

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,17 @@ PHP NEWS
22
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
33
?? ??? ????, PHP 7.1.17
44

5-
- Mbstring:
5+
- Date:
6+
. Fixed bug #76131 (mismatch arginfo for date_create). (carusogabriel)
7+
8+
- mbstring:
69
. Fixed bug #75944 (Wrong cp1251 detection). (dmk001)
710
. Fixed bug #76113 (mbstring does not build with Oniguruma 6.8.1).
811
(chrullrich, cmb)
912

13+
- SPL:
14+
. Fixed bug #76131 (mismatch arginfo for splarray constructor).
15+
(carusogabriel)
1016

1117
29 Mar 2018, PHP 7.1.16
1218

ext/date/php_date.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ ZEND_END_ARG_INFO()
161161

162162
ZEND_BEGIN_ARG_INFO_EX(arginfo_date_create, 0, 0, 0)
163163
ZEND_ARG_INFO(0, time)
164-
ZEND_ARG_INFO(0, object)
164+
ZEND_ARG_INFO(0, timezone)
165165
ZEND_END_ARG_INFO()
166166

167167
ZEND_BEGIN_ARG_INFO_EX(arginfo_date_create_from_format, 0, 0, 2)
@@ -2021,9 +2021,9 @@ static int date_interval_has_property(zval *object, zval *member, int type, void
20212021
}
20222022
return retval;
20232023
}
2024-
2024+
20252025
prop = date_interval_read_property(object, member, BP_VAR_IS, cache_slot, &rv);
2026-
2026+
20272027
if (prop != &EG(uninitialized_zval)) {
20282028
if (type == 2) {
20292029
retval = 1;
@@ -2041,7 +2041,7 @@ static int date_interval_has_property(zval *object, zval *member, int type, void
20412041
}
20422042

20432043
return retval;
2044-
2044+
20452045
}
20462046
/* }}} */
20472047

@@ -2390,7 +2390,7 @@ static HashTable *date_object_get_debug_info_timezone(zval *object, int *is_temp
23902390

23912391
*is_temp = 1;
23922392
ht = zend_array_dup(props);
2393-
2393+
23942394
ZVAL_LONG(&zv, tzobj->type);
23952395
zend_hash_str_update(ht, "timezone_type", sizeof("timezone_type")-1, &zv);
23962396

ext/spl/spl_array.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ static zend_always_inline uint32_t *spl_array_get_pos_ptr(HashTable *ht, spl_arr
153153
static void spl_array_object_free_storage(zend_object *object)
154154
{
155155
spl_array_object *intern = spl_array_from_obj(object);
156-
156+
157157
if (intern->ht_iter != (uint32_t) -1) {
158158
zend_hash_iterator_del(intern->ht_iter);
159159
}
@@ -1859,8 +1859,8 @@ SPL_METHOD(Array, unserialize)
18591859

18601860
/* {{{ arginfo and function table */
18611861
ZEND_BEGIN_ARG_INFO_EX(arginfo_array___construct, 0, 0, 0)
1862-
ZEND_ARG_INFO(0, array)
1863-
ZEND_ARG_INFO(0, ar_flags)
1862+
ZEND_ARG_INFO(0, input)
1863+
ZEND_ARG_INFO(0, flags)
18641864
ZEND_ARG_INFO(0, iterator_class)
18651865
ZEND_END_ARG_INFO()
18661866

0 commit comments

Comments
 (0)