Skip to content

Commit a602268

Browse files
alexandre-dauboisalexandre-daubois
committed
Deprecate using null as an array offset and when calling array_key_exists() 
1 parent 0bf2959 commit a602268

17 files changed

+284
-30
lines changed

‎Zend/tests/assign_dim_op_undef.phpt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Warning: Undefined variable $a in %s on line %d
1010

1111
Warning: Undefined variable $b in %s on line %d
1212

13+
Deprecated: Using null as an array offset is deprecated, use an empty string instead in %s on line %d
14+
1315
Warning: Undefined array key "" in %s on line %d
1416
array(1) {
1517
[""]=>

‎Zend/tests/bug72543_2.phpt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ unset($ref);
99
$arr[0][$arr[0]] = null;
1010
var_dump($arr);
1111
?>
12-
--EXPECT--
12+
--EXPECTF--
13+
Deprecated: Using null as an array offset is deprecated, use an empty string instead in %s on line %d
1314
array(1) {
1415
[0]=>
1516
array(1) {

‎Zend/tests/gc/bug67314.phpt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ echo "ok\n";
1717
?>
1818
--EXPECTF--
1919
Warning: Undefined variable $i in %s on line %d
20+
21+
Deprecated: Using null as an array offset is deprecated, use an empty string instead in %s on line %d
2022
made it once
2123

2224
Warning: Undefined variable $i in %s on line %d
25+
26+
Deprecated: Using null as an array offset is deprecated, use an empty string instead in %s on line %d
2327
ok

‎Zend/tests/list/list_keyed_conversions.phpt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ list(STDIN => $resource) = [];
2121

2222
?>
2323
--EXPECTF--
24+
Deprecated: Using null as an array offset is deprecated, use an empty string instead in %s on line %d
25+
2426
Deprecated: Implicit conversion from float 1.5 to int loses precision in %s on line %d
2527
string(0) ""
2628
int(1)

‎Zend/tests/nullsafe_operator/013.phpt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,7 @@ array(1) {
7272
[0]=>
7373
string(3) "foo"
7474
}
75+
76+
Deprecated: Using null as an array offset is deprecated, use an empty string instead in %s on line %d
7577
bool(false)
7678
string(74) "array_key_exists(): Argument #2 ($array) must be of type array, null given"

‎Zend/tests/offset_array.phpt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ int(2)
3838
Deprecated: Implicit conversion from float 0.0836 to int loses precision in %s on line %d
3939
int(1)
4040

41+
Deprecated: Using null as an array offset is deprecated, use an empty string instead in %s on line %d
42+
4143
Warning: Undefined array key "" in %s on line %d
4244
NULL
4345

‎Zend/tests/offsets/array_container_offset_behaviour.phpt‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,81 @@ OUTPUT;
132132

133133
$EXPECTED_OUTPUT_FLOAT_OFFSETS_REGEX = '/^' . expectf_to_regex(EXPECTF_OUTPUT_FLOAT_OFFSETS) . '$/s';
134134

135+
const EXPECTED_OUTPUT_NULL_OFFSETS = <<<OUTPUT
136+
Read before write:
137+
138+
Deprecated: Using null as an array offset is deprecated, use an empty string instead in %s on line %d
139+
140+
Warning: Undefined array key "" in %s on line %d
141+
NULL
142+
Write:
143+
144+
Deprecated: Using null as an array offset is deprecated, use an empty string instead in %s on line %d
145+
Read:
146+
147+
Deprecated: Using null as an array offset is deprecated, use an empty string instead in %s on line %d
148+
int(5)
149+
Read-Write:
150+
151+
Deprecated: Using null as an array offset is deprecated, use an empty string instead in %s on line %d
152+
isset():
153+
bool(true)
154+
empty():
155+
bool(false)
156+
null coalesce:
157+
158+
Deprecated: Using null as an array offset is deprecated, use an empty string instead in %s on line %d
159+
int(25)
160+
Reference to dimension:
161+
162+
Deprecated: Using null as an array offset is deprecated, use an empty string instead in %s on line %d
163+
Value of reference:
164+
int(25)
165+
Value of container dimension after write to reference (should be int(100) if successful):
166+
167+
Deprecated: Using null as an array offset is deprecated, use an empty string instead in %s on line %d
168+
int(100)
169+
unset():
170+
Nested read:
171+
172+
Deprecated: Using null as an array offset is deprecated, use an empty string instead in %s on line %d
173+
174+
Warning: Undefined array key "" in %s on line %d
175+
176+
Warning: Trying to access array offset on null in %s on line %d
177+
NULL
178+
Nested write:
179+
180+
Deprecated: Using null as an array offset is deprecated, use an empty string instead in %s on line %d
181+
182+
Deprecated: Using null as an array offset is deprecated, use an empty string instead in %s on line %d
183+
Nested Read-Write:
184+
185+
Deprecated: Using null as an array offset is deprecated, use an empty string instead in %s on line %d
186+
187+
Deprecated: Using null as an array offset is deprecated, use an empty string instead in %s on line %d
188+
Nested isset():
189+
190+
Deprecated: Using null as an array offset is deprecated, use an empty string instead in %s on line %d
191+
bool(true)
192+
Nested empty():
193+
194+
Deprecated: Using null as an array offset is deprecated, use an empty string instead in %s on line %d
195+
bool(false)
196+
Nested null coalesce:
197+
198+
Deprecated: Using null as an array offset is deprecated, use an empty string instead in %s on line %d
199+
200+
Deprecated: Using null as an array offset is deprecated, use an empty string instead in %s on line %d
201+
int(30)
202+
Nested unset():
203+
204+
Deprecated: Using null as an array offset is deprecated, use an empty string instead in %s on line %d
205+
206+
OUTPUT;
207+
208+
$EXPECTED_OUTPUT_NULL_OFFSETS_REGEX = '/^' . expectf_to_regex(EXPECTED_OUTPUT_NULL_OFFSETS) . '$/s';
209+
135210
const EXPECTED_OUTPUT_INVALID_OFFSETS = <<<OUTPUT
136211
Read before write:
137212
Cannot access offset of type %s on array
@@ -273,6 +348,7 @@ foreach ($offsets as $dimension) {
273348
!preg_match($EXPECTED_OUTPUT_VALID_OFFSETS_REGEX, $varOutput)
274349
&& !preg_match($EXPECTED_OUTPUT_INVALID_OFFSETS_REGEX, $varOutput)
275350
&& !preg_match($EXPECTED_OUTPUT_FLOAT_OFFSETS_REGEX, $varOutput)
351+
&& !preg_match($EXPECTED_OUTPUT_NULL_OFFSETS_REGEX, $varOutput)
276352
&& $varOutput !== EXPECTED_OUTPUT_RESOURCE_STDERR_OFFSETS
277353
) {
278354
file_put_contents(__DIR__ . DIRECTORY_SEPARATOR . "debug_array_container_{$failuresNb}.txt", $varOutput);
@@ -300,6 +376,7 @@ foreach ($offsets as $offset) {
300376
!preg_match($EXPECTED_OUTPUT_VALID_OFFSETS_REGEX, $varOutput)
301377
&& !preg_match($EXPECTED_OUTPUT_INVALID_OFFSETS_REGEX, $varOutput)
302378
&& !preg_match($EXPECTED_OUTPUT_FLOAT_OFFSETS_REGEX, $varOutput)
379+
&& !preg_match($EXPECTED_OUTPUT_NULL_OFFSETS_REGEX, $varOutput)
303380
&& $varOutput !== EXPECTED_OUTPUT_RESOURCE_STDERR_OFFSETS
304381
) {
305382
file_put_contents(__DIR__ . DIRECTORY_SEPARATOR . "debug_array_container_{$failuresNb}.txt", $varOutput);

‎Zend/zend_execute.c‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2629,6 +2629,7 @@ static zend_never_inline uint8_t slow_index_convert(HashTable *ht, const zval *d
26292629
ZEND_FALLTHROUGH;
26302630
}
26312631
case IS_NULL:
2632+
zend_error(E_DEPRECATED, "Using null as an array offset is deprecated, use an empty string instead");
26322633
value->str = ZSTR_EMPTY_ALLOC();
26332634
return IS_STRING;
26342635
case IS_DOUBLE:
@@ -2699,6 +2700,7 @@ static zend_never_inline uint8_t slow_index_convert_w(HashTable *ht, const zval
26992700
ZEND_FALLTHROUGH;
27002701
}
27012702
case IS_NULL:
2703+
zend_error(E_DEPRECATED, "Using null as an array offset is deprecated, use an empty string instead");
27022704
value->str = ZSTR_EMPTY_ALLOC();
27032705
return IS_STRING;
27042706
case IS_DOUBLE:
@@ -3324,6 +3326,9 @@ static zend_never_inline bool ZEND_FASTCALL zend_array_key_exists_fast(HashTable
33243326
} else if (Z_TYPE_P(key) <= IS_NULL) {
33253327
if (UNEXPECTED(Z_TYPE_P(key) == IS_UNDEF)) {
33263328
ZVAL_UNDEFINED_OP1();
3329+
} else {
3330+
ZEND_ASSERT(Z_TYPE_P(key) == IS_NULL);
3331+
zend_error(E_DEPRECATED, "Using null as an array offset is deprecated, use an empty string instead");
33273332
}
33283333
str = ZSTR_EMPTY_ALLOC();
33293334
goto str_key;

‎ext/opcache/tests/jit/copy_tmp_001.phpt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ $a = [];
1515
$a[test()] ??= 1;
1616
var_dump($a);
1717
?>
18-
--EXPECT--
18+
--EXPECTF--
19+
Deprecated: Using null as an array offset is deprecated, use an empty string instead in %s on line %d
20+
21+
Deprecated: Using null as an array offset is deprecated, use an empty string instead in %s on line %d
1922
array(1) {
2023
[""]=>
2124
int(1)

‎ext/opcache/tests/jit/fetch_dim_r_002.phpt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,16 @@ $x=2;
3030
$y="x";
3131
foo($x.$y);
3232
?>
33-
--EXPECT--
33+
--EXPECTF--
3434
int(1)
3535
int(3)
3636
int(2)
3737
int(1)
3838
int(3)
3939
int(1)
4040
int(2)
41+
42+
Deprecated: Using null as an array offset is deprecated, use an empty string instead in %s on line %d
4143
int(4)
4244
int(5)
4345
int(5)

0 commit comments

Comments
 (0)