Skip to content

Commit c45684e

Browse files
GirgiasGirgias
committed
Fix wording/comments
1 parent 0efea86 commit c45684e

8 files changed

+33
-31
lines changed

‎Zend/tests/offsets/array_container_offset_behaviour.phpt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ isset():
1818
bool(true)
1919
empty():
2020
bool(false)
21-
Coalesce():
21+
null coalesce:
2222
string(7) "vappend"
2323
unset():
2424
@@ -51,13 +51,13 @@ empty():
5151
5252
Deprecated: Implicit conversion from float %F to int loses precision in %s on line 42
5353
bool(false)
54-
Coalesce():
54+
null coalesce:
5555
5656
Deprecated: Implicit conversion from float %F to int loses precision in %s on line 48
5757
string(7) "vappend"
5858
unset():
5959
60-
Deprecated: Implicit conversion from float %F to int loses precision in %s on line 54
60+
Deprecated: Implicit conversion from float %F to int loses precision in %s on line 55
6161
6262
OUTPUT;
6363

@@ -76,7 +76,7 @@ isset():
7676
Cannot access offset of type %s in isset or empty
7777
empty():
7878
Cannot access offset of type %s in isset or empty
79-
Coalesce():
79+
null coalesce:
8080
Cannot access offset of type %s on array
8181
unset():
8282
Cannot unset offset of type %s on array
@@ -110,13 +110,13 @@ empty():
110110
111111
Warning: Resource ID#3 used as offset, casting to integer (3) in %s on line 42
112112
bool(false)
113-
Coalesce():
113+
null coalesce:
114114
115115
Warning: Resource ID#3 used as offset, casting to integer (3) in %s on line 48
116116
string(7) "vappend"
117117
unset():
118118
119-
Warning: Resource ID#3 used as offset, casting to integer (3) in %s on line 54
119+
Warning: Resource ID#3 used as offset, casting to integer (3) in %s on line 55
120120
121121
OUTPUT;
122122

‎Zend/tests/offsets/false_container_offset_behaviour.phpt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ isset():
2020
bool(true)
2121
empty():
2222
bool(false)
23-
Coalesce():
23+
null coalesce:
2424
string(7) "vappend"
2525
unset():
2626
@@ -51,13 +51,13 @@ empty():
5151
5252
Deprecated: Implicit conversion from float %F to int loses precision in %s on line 42
5353
bool(false)
54-
Coalesce():
54+
null coalesce:
5555
5656
Deprecated: Implicit conversion from float %F to int loses precision in %s on line 48
5757
string(7) "vappend"
5858
unset():
5959
60-
Deprecated: Implicit conversion from float %F to int loses precision in %s on line 54
60+
Deprecated: Implicit conversion from float %F to int loses precision in %s on line 55
6161
6262
OUTPUT;
6363

@@ -80,7 +80,7 @@ isset():
8080
Cannot access offset of type %s in isset or empty
8181
empty():
8282
Cannot access offset of type %s in isset or empty
83-
Coalesce():
83+
null coalesce:
8484
Cannot access offset of type %s on array
8585
unset():
8686
Cannot unset offset of type %s on array
@@ -114,13 +114,13 @@ empty():
114114
115115
Warning: Resource ID#3 used as offset, casting to integer (3) in %s on line 42
116116
bool(false)
117-
Coalesce():
117+
null coalesce:
118118
119119
Warning: Resource ID#3 used as offset, casting to integer (3) in %s on line 48
120120
string(7) "vappend"
121121
unset():
122122
123-
Warning: Resource ID#3 used as offset, casting to integer (3) in %s on line 54
123+
Warning: Resource ID#3 used as offset, casting to integer (3) in %s on line 55
124124
125125
OUTPUT;
126126

‎Zend/tests/offsets/invalid_container_offset_behaviour.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ isset():
3434
bool(false)
3535
empty():
3636
bool(true)
37-
Coalesce():
37+
null coalesce:
3838
string(7) "default"
3939
unset():
4040
Cannot unset offset in a non-array variable

‎Zend/tests/offsets/null_container_offset_behaviour.phpt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ isset():
1818
bool(true)
1919
empty():
2020
bool(false)
21-
Coalesce():
21+
null coalesce:
2222
string(7) "vappend"
2323
unset():
2424
@@ -47,13 +47,13 @@ empty():
4747
4848
Deprecated: Implicit conversion from float %F to int loses precision in %s on line 42
4949
bool(false)
50-
Coalesce():
50+
null coalesce:
5151
5252
Deprecated: Implicit conversion from float %F to int loses precision in %s on line 48
5353
string(7) "vappend"
5454
unset():
5555
56-
Deprecated: Implicit conversion from float %F to int loses precision in %s on line 54
56+
Deprecated: Implicit conversion from float %F to int loses precision in %s on line 55
5757
5858
OUTPUT;
5959

@@ -74,7 +74,7 @@ isset():
7474
Cannot access offset of type %s in isset or empty
7575
empty():
7676
Cannot access offset of type %s in isset or empty
77-
Coalesce():
77+
null coalesce:
7878
Cannot access offset of type %s on array
7979
unset():
8080
Cannot unset offset of type %s on array
@@ -106,13 +106,13 @@ empty():
106106
107107
Warning: Resource ID#3 used as offset, casting to integer (3) in %s on line 42
108108
bool(false)
109-
Coalesce():
109+
null coalesce:
110110
111111
Warning: Resource ID#3 used as offset, casting to integer (3) in %s on line 48
112112
string(7) "vappend"
113113
unset():
114114
115-
Warning: Resource ID#3 used as offset, casting to integer (3) in %s on line 54
115+
Warning: Resource ID#3 used as offset, casting to integer (3) in %s on line 55
116116
117117
OUTPUT;
118118

‎Zend/tests/offsets/object_container_offset_behaviour.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ isset():
1818
Cannot use object of type stdClass as array
1919
empty():
2020
Cannot use object of type stdClass as array
21-
Coalesce():
21+
null coalesce:
2222
Cannot use object of type stdClass as array
2323
unset():
2424
Cannot use object of type stdClass as array

‎Zend/tests/offsets/runtime_compile_time_offset_access.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,12 @@ try {
6262
echo \$e->getMessage(), "\\n";
6363
}
6464
try {
65-
echo "Coalesce():\\n";
65+
echo "null coalesce:\\n";
6666
var_dump(\$container[$offset_p] ?? 'default');
6767
} catch (\Throwable \$e) {
6868
echo \$e->getMessage(), "\\n";
6969
}
70+
// Unset
7071
try {
7172
echo "unset():\\n";
7273
unset(\$container[$offset_p]);

‎Zend/tests/offsets/string_container_offset_behaviour.phpt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ isset():
1919
bool(true)
2020
empty():
2121
bool(false)
22-
Coalesce():
22+
null coalesce:
2323
string(1) "v"
2424
unset():
2525
Cannot unset string offsets
@@ -46,7 +46,7 @@ isset():
4646
bool(false)
4747
empty():
4848
bool(true)
49-
Coalesce():
49+
null coalesce:
5050
string(7) "default"
5151
unset():
5252
Cannot unset string offsets
@@ -77,7 +77,7 @@ isset():
7777
bool(true)
7878
empty():
7979
bool(false)
80-
Coalesce():
80+
null coalesce:
8181
string(1) "v"
8282
unset():
8383
Cannot unset string offsets
@@ -112,7 +112,7 @@ isset():
112112
bool(false)
113113
empty():
114114
bool(true)
115-
Coalesce():
115+
null coalesce:
116116
string(7) "default"
117117
unset():
118118
Cannot unset string offsets
@@ -147,7 +147,7 @@ empty():
147147
148148
Deprecated: Implicit conversion from float %F to int loses precision in %s on line 42
149149
bool(false)
150-
Coalesce():
150+
null coalesce:
151151
string(1) "v"
152152
unset():
153153
Cannot unset string offsets
@@ -186,7 +186,7 @@ empty():
186186
187187
Deprecated: Implicit conversion from float %F to int loses precision in %s on line 42
188188
bool(true)
189-
Coalesce():
189+
null coalesce:
190190
string(7) "default"
191191
unset():
192192
Cannot unset string offsets
@@ -208,7 +208,7 @@ isset():
208208
bool(false)
209209
empty():
210210
bool(true)
211-
Coalesce():
211+
null coalesce:
212212
Cannot access offset of type %s on string
213213
unset():
214214
Cannot unset string offsets
@@ -230,7 +230,7 @@ isset():
230230
bool(false)
231231
empty():
232232
bool(true)
233-
Coalesce():
233+
null coalesce:
234234
string(7) "default"
235235
unset():
236236
Cannot unset string offsets
@@ -259,7 +259,7 @@ isset():
259259
bool(false)
260260
empty():
261261
bool(true)
262-
Coalesce():
262+
null coalesce:
263263
264264
Warning: Illegal string offset %s in %s on line 48
265265
string(1) "v"

‎Zend/tests/offsets/test_variable_offsets.inc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,12 @@ try {
4444
echo $e->getMessage(), "\n";
4545
}
4646
try {
47-
echo "Coalesce():\n";
47+
echo "null coalesce:\n";
4848
var_dump($container[$dimension] ?? 'default');
4949
} catch (\Throwable $e) {
5050
echo $e->getMessage(), "\n";
5151
}
52+
// Unset
5253
try {
5354
echo "unset():\n";
5455
unset($container[$dimension]);

0 commit comments

Comments
 (0)