Skip to content

Commit f421fe0

Browse files
committed
Revert some tests for list
1 parent 419ff5d commit f421fe0

File tree

5 files changed

+1
-21
lines changed

5 files changed

+1
-21
lines changed

Zend/tests/list_003.phpt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,6 @@ var_dump($a, $b, $c, $d, $e);
1717

1818
?>
1919
--EXPECTF--
20-
Notice: Variable of type %s does not accept array offsets in %s on line %d
21-
22-
Notice: Variable of type %s does not accept array offsets in %s on line %d
23-
24-
Notice: Variable of type %s does not accept array offsets in %s on line %d
25-
26-
Notice: Variable of type %s does not accept array offsets in %s on line %d
27-
28-
Notice: Variable of type %s does not accept array offsets in %s on line %d
2920
NULL
3021
NULL
3122
NULL

Zend/tests/list_005.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,10 @@ var_dump($a, $b, $c);
3535

3636
?>
3737
--EXPECTF-->
38-
Notice: Variable of type %s does not accept array offsets in %s on line %d
3938
NULL
4039
NULL
4140
NULL
4241
----
43-
44-
Notice: Variable of type %s does not accept array offsets in %s on line %d
4542
NULL
4643
NULL
4744
NULL

Zend/tests/list_006.phpt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,3 @@ list($a, list($b, list(list($d)))) = array();
1010
Notice: Undefined offset: 0 in %s on line %d
1111

1212
Notice: Undefined offset: 1 in %s on line %d
13-
14-
Notice: Variable of type null does not accept array offsets in %s on line %d
15-
16-
Notice: Variable of type null does not accept array offsets in %s on line %d
17-
18-
Notice: Variable of type null does not accept array offsets in %s on line %d

Zend/zend_execute.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1801,7 +1801,7 @@ static zend_always_inline int zend_fetch_dimension_address_read_valid_container(
18011801
if (EG(current_execute_data)->opline->opcode != ZEND_FETCH_LIST) {
18021802
if (EG(current_execute_data)->opline->op1_type != IS_VAR) {
18031803
return 0;
1804-
} else if ( Z_TYPE_P(container) != IS_UNDEF && Z_TYPE_P(container) != IS_NULL && support_strings && Z_TYPE_P(container) != IS_STRING) {
1804+
} else if (Z_TYPE_P(container) != IS_UNDEF && Z_TYPE_P(container) != IS_NULL && support_strings && Z_TYPE_P(container) != IS_STRING) {
18051805
return 0;
18061806
}
18071807
}

tests/lang/engine_assignExecutionOrder_002.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,6 @@ array(3) {
113113
int(3000)
114114
}
115115
L=100 M=200 N=300
116-
117-
Notice: Variable of type %s does not accept array offsets in %s on line %d
118116
O= and P=
119117
10 20 40 50 60 70 80
120118

0 commit comments

Comments
 (0)