Skip to content

Commit 8858ca7

Browse files
author
Mark Randall
committed
Lowercase this at request of CMB
1 parent e0a29f5 commit 8858ca7

30 files changed

+99
-99
lines changed

‎Zend/tests/bug61767.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ register_shutdown_function(function(){
1616
$undefined->foo();
1717
?>
1818
--EXPECTF--
19-
Error handler called (Undefined variable $undefined (This will become an error in PHP 9.0))
19+
Error handler called (Undefined variable $undefined (this will become an error in PHP 9.0))
2020

2121
Fatal error: Uncaught ErrorException: Undefined variable $undefined (this will become an error in PHP 9.0) in %sbug61767.php:%d
2222
Stack trace:

‎Zend/tests/bug79599.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ try{
2323
}
2424
?>
2525
--EXPECT--
26-
string(60) "Undefined variable $b (This will become an error in PHP 9.0)"
27-
string(60) "Undefined variable $c (This will become an error in PHP 9.0)"
26+
string(60) "Undefined variable $b (this will become an error in PHP 9.0)"
27+
string(60) "Undefined variable $c (this will become an error in PHP 9.0)"

‎Zend/tests/exception_before_fatal.phpt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ try {
5555
}
5656
?>
5757
--EXPECT--
58-
string(62) "Undefined variable $foo (This will become an error in PHP 9.0)"
59-
string(62) "Undefined variable $foo (This will become an error in PHP 9.0)"
60-
string(62) "Undefined variable $foo (This will become an error in PHP 9.0)"
61-
string(62) "Undefined variable $foo (This will become an error in PHP 9.0)"
62-
string(62) "Undefined variable $foo (This will become an error in PHP 9.0)"
63-
string(62) "Undefined variable $foo (This will become an error in PHP 9.0)"
64-
string(62) "Undefined variable $foo (This will become an error in PHP 9.0)"
58+
string(62) "Undefined variable $foo (this will become an error in PHP 9.0)"
59+
string(62) "Undefined variable $foo (this will become an error in PHP 9.0)"
60+
string(62) "Undefined variable $foo (this will become an error in PHP 9.0)"
61+
string(62) "Undefined variable $foo (this will become an error in PHP 9.0)"
62+
string(62) "Undefined variable $foo (this will become an error in PHP 9.0)"
63+
string(62) "Undefined variable $foo (this will become an error in PHP 9.0)"
64+
string(62) "Undefined variable $foo (this will become an error in PHP 9.0)"

‎Zend/tests/incdec_undef.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ unset($x);
1515
var_dump(++$x);
1616
?>
1717
--EXPECT--
18-
Undefined variable $x (This will become an error in PHP 9.0)
18+
Undefined variable $x (this will become an error in PHP 9.0)
1919
NULL
20-
Undefined variable $x (This will become an error in PHP 9.0)
20+
Undefined variable $x (this will become an error in PHP 9.0)
2121
NULL
22-
Undefined variable $x (This will become an error in PHP 9.0)
22+
Undefined variable $x (this will become an error in PHP 9.0)
2323
NULL
24-
Undefined variable $x (This will become an error in PHP 9.0)
24+
Undefined variable $x (this will become an error in PHP 9.0)
2525
int(1)

‎Zend/tests/nullsafe_operator/039.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ try {
1515

1616
?>
1717
--EXPECT--
18-
Undefined variable $foo (This will become an error in PHP 9.0)
18+
Undefined variable $foo (this will become an error in PHP 9.0)

‎Zend/tests/str_offset_006.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ $a[$y]=$a.=($y);
1010
var_dump($a);
1111
?>
1212
--EXPECT--
13-
Err: Undefined variable $y (This will become an error in PHP 9.0)
14-
Err: Undefined variable $y (This will become an error in PHP 9.0)
13+
Err: Undefined variable $y (this will become an error in PHP 9.0)
14+
Err: Undefined variable $y (this will become an error in PHP 9.0)
1515
Err: String offset cast occurred
1616
NULL

‎Zend/tests/str_offset_007.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ $a[0][$d]='b';
1111
var_dump($a);
1212
?>
1313
--EXPECT--
14-
Err: Undefined variable $d (This will become an error in PHP 9.0)
14+
Err: Undefined variable $d (this will become an error in PHP 9.0)
1515
Err: String offset cast occurred
1616
string(0) ""

‎Zend/tests/str_offset_008.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ var_dump($a[0][$b]);
1212
var_dump($a);
1313
?>
1414
--EXPECT--
15-
Err: Undefined variable $b (This will become an error in PHP 9.0)
15+
Err: Undefined variable $b (this will become an error in PHP 9.0)
1616
Err: String offset cast occurred
1717
string(1) "x"
1818
int(8)

‎Zend/tests/undef_index_to_exception.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@ array(0) {
4242
Undefined array key "key"
4343
array(0) {
4444
}
45-
Undefined global variable $test (This will become an error in PHP 9.0)
46-
Undefined variable $test (This will become an error in PHP 9.0)
45+
Undefined global variable $test (this will become an error in PHP 9.0)
46+
Undefined variable $test (this will become an error in PHP 9.0)

‎Zend/zend_vm_def.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1748,7 +1748,7 @@ ZEND_VM_C_LABEL(fetch_this):
17481748
} else if (type == BP_VAR_IS || type == BP_VAR_UNSET) {
17491749
retval = &EG(uninitialized_zval);
17501750
} else {
1751-
zend_error(E_WARNING, "Undefined %svariable $%s (This will become an error in PHP 9.0)",
1751+
zend_error(E_WARNING, "Undefined %svariable $%s (this will become an error in PHP 9.0)",
17521752
(opline->extended_value & ZEND_FETCH_GLOBAL ? "global " : ""), ZSTR_VAL(name));
17531753
if (type == BP_VAR_RW && !EG(exception)) {
17541754
retval = zend_hash_update(target_symbol_table, name, &EG(uninitialized_zval));
@@ -1768,7 +1768,7 @@ ZEND_VM_C_LABEL(fetch_this):
17681768
} else if (type == BP_VAR_IS || type == BP_VAR_UNSET) {
17691769
retval = &EG(uninitialized_zval);
17701770
} else {
1771-
zend_error(E_WARNING, "Undefined %svariable $%s (This will become an error in PHP 9.0)",
1771+
zend_error(E_WARNING, "Undefined %svariable $%s (this will become an error in PHP 9.0)",
17721772
(opline->extended_value & ZEND_FETCH_GLOBAL ? "global " : ""), ZSTR_VAL(name));
17731773
if (type == BP_VAR_RW && !EG(exception)) {
17741774
ZVAL_NULL(retval);

‎Zend/zend_vm_execute.h

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ try {
1919
}
2020
?>
2121
--EXPECT--
22-
Undefined variable $b (This will become an error in PHP 9.0)
22+
Undefined variable $b (this will become an error in PHP 9.0)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ $a[$c] = 'x' ;
1717
var_dump($a);
1818
?>
1919
--EXPECT--
20-
Error: Undefined variable $c (This will become an error in PHP 9.0)
21-
Error: Undefined variable $c (This will become an error in PHP 9.0)
20+
Error: Undefined variable $c (this will become an error in PHP 9.0)
21+
Error: Undefined variable $c (this will become an error in PHP 9.0)
2222
NULL

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ $a[$y] = function(){};
1515
?>
1616
DONE
1717
--EXPECT--
18-
Error: Undefined variable $y (This will become an error in PHP 9.0)
18+
Error: Undefined variable $y (this will become an error in PHP 9.0)
1919
DONE

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ $my_var[] = $y;
1515
?>
1616
DONE
1717
--EXPECT--
18-
Error: Undefined variable $y (This will become an error in PHP 9.0)
18+
Error: Undefined variable $y (this will become an error in PHP 9.0)
1919
DONE

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ try {
2828
}
2929
?>
3030
--EXPECT--
31-
Undefined variable $undef (This will become an error in PHP 9.0)
32-
Undefined variable $a (This will become an error in PHP 9.0)
31+
Undefined variable $undef (this will become an error in PHP 9.0)
32+
Undefined variable $a (this will become an error in PHP 9.0)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ try {
3434
}
3535
?>
3636
--EXPECT--
37-
Undefined variable $undef (This will become an error in PHP 9.0)
38-
Undefined variable $undef (This will become an error in PHP 9.0)
37+
Undefined variable $undef (this will become an error in PHP 9.0)
38+
Undefined variable $undef (this will become an error in PHP 9.0)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ try {
1919
}
2020
?>
2121
--EXPECT--
22-
Undefined variable $b (This will become an error in PHP 9.0)
22+
Undefined variable $b (this will become an error in PHP 9.0)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ try {
2222
}
2323
?>
2424
--EXPECT--
25-
Exception: Undefined variable $a (This will become an error in PHP 9.0)
25+
Exception: Undefined variable $a (this will become an error in PHP 9.0)

‎ext/standard/tests/class_object/get_class_methods_variation_001.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ echo "Done";
8080
?>
8181
--EXPECT--
8282
*** Testing get_class_methods() : usage variations ***
83-
Error: 2 - Undefined variable $undefined_var (This will become an error in PHP 9.0)
84-
Error: 2 - Undefined variable $unset_var (This will become an error in PHP 9.0)
83+
Error: 2 - Undefined variable $undefined_var (this will become an error in PHP 9.0)
84+
Error: 2 - Undefined variable $unset_var (this will become an error in PHP 9.0)
8585

8686
Arg value 0
8787
get_class_methods(): Argument #1 ($object_or_class) must be an object or a valid class name, int given

‎ext/standard/tests/class_object/get_parent_class_variation_002.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ echo "Done";
8383
?>
8484
--EXPECT--
8585
*** Testing get_parent_class() : usage variations ***
86-
Error: 2 - Undefined variable $undefined_var (This will become an error in PHP 9.0)
87-
Error: 2 - Undefined variable $unset_var (This will become an error in PHP 9.0)
86+
Error: 2 - Undefined variable $undefined_var (this will become an error in PHP 9.0)
87+
Error: 2 - Undefined variable $unset_var (this will become an error in PHP 9.0)
8888

8989
Arg value 0
9090
get_parent_class(): Argument #1 ($object_or_class) must be an object or a valid class name, int given

‎ext/standard/tests/class_object/is_subclass_of_variation_001.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ echo "Done";
8181
?>
8282
--EXPECT--
8383
*** Testing is_subclass_of() : usage variations ***
84-
Error: 2 - Undefined variable $undefined_var (This will become an error in PHP 9.0)
85-
Error: 2 - Undefined variable $unset_var (This will become an error in PHP 9.0)
84+
Error: 2 - Undefined variable $undefined_var (this will become an error in PHP 9.0)
85+
Error: 2 - Undefined variable $unset_var (this will become an error in PHP 9.0)
8686

8787
Arg value 0
8888
bool(false)

‎ext/standard/tests/class_object/is_subclass_of_variation_004.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ echo "Done";
8181
?>
8282
--EXPECT--
8383
*** Testing is_subclass_of() : usage variations ***
84-
Error: 2 - Undefined variable $undefined_var (This will become an error in PHP 9.0)
85-
Error: 2 - Undefined variable $unset_var (This will become an error in PHP 9.0)
84+
Error: 2 - Undefined variable $undefined_var (this will become an error in PHP 9.0)
85+
Error: 2 - Undefined variable $unset_var (this will become an error in PHP 9.0)
8686

8787
Arg value 0
8888
bool(false)

‎ext/standard/tests/class_object/method_exists_variation_001.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ echo "Done";
8383
?>
8484
--EXPECT--
8585
*** Testing method_exists() : usage variations ***
86-
Error: 2 - Undefined variable $undefined_var (This will become an error in PHP 9.0)
87-
Error: 2 - Undefined variable $unset_var (This will become an error in PHP 9.0)
86+
Error: 2 - Undefined variable $undefined_var (this will become an error in PHP 9.0)
87+
Error: 2 - Undefined variable $unset_var (this will become an error in PHP 9.0)
8888

8989
Arg value 0
9090
method_exists(): Argument #1 ($object_or_class) must be of type object|string, int given

‎ext/standard/tests/general_functions/error_clear_last.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ array(4) {
2222
["type"]=>
2323
int(2)
2424
["message"]=>
25-
string(60) "Undefined variable $b (This will become an error in PHP 9.0)"
25+
string(60) "Undefined variable $b (this will become an error in PHP 9.0)"
2626
["file"]=>
2727
string(%d) "%s"
2828
["line"]=>

‎ext/standard/tests/general_functions/error_get_last.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ array(4) {
2727
["type"]=>
2828
int(2)
2929
["message"]=>
30-
string(60) "Undefined variable $b (This will become an error in PHP 9.0)"
30+
string(60) "Undefined variable $b (this will become an error in PHP 9.0)"
3131
["file"]=>
3232
string(%d) "%s"
3333
["line"]=>

‎ext/standard/tests/image/getimagesize_variation2.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ foreach($values as $key => $value) {
7474
?>
7575
--EXPECT--
7676
*** Testing getimagesize() : usage variations ***
77-
Error: 2 - Undefined variable $undefined_var (This will become an error in PHP 9.0)
78-
Error: 2 - Undefined variable $unset_var (This will become an error in PHP 9.0)
77+
Error: 2 - Undefined variable $undefined_var (this will become an error in PHP 9.0)
78+
Error: 2 - Undefined variable $unset_var (this will become an error in PHP 9.0)
7979

8080
-- Arg value 0 --
8181
string(28) "4a46494600010201006000600000"

‎ext/standard/tests/strings/strcasecmp.phpt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -120,44 +120,44 @@ Array
120120
(
121121
[0] => a
122122
[1] => A
123-
[2] => �
124-
[3] => �
123+
[2] => €
124+
[3] => ÿ
125125
[4] => %0
126126
)
127127

128128
Iteration 0
129129
- strcasecmp of 'a' and 'a' is => int(0)
130130
- strcasecmp of 'a' and 'A' is => int(0)
131-
- strcasecmp of 'a' and '�' is => int(-%d)
132-
- strcasecmp of 'a' and '�' is => int(-%d)
131+
- strcasecmp of 'a' and '€' is => int(-%d)
132+
- strcasecmp of 'a' and 'ÿ' is => int(-%d)
133133
- strcasecmp of 'a' and '%0' is => int(%d)
134134

135135
Iteration 1
136136
- strcasecmp of 'A' and 'a' is => int(0)
137137
- strcasecmp of 'A' and 'A' is => int(0)
138-
- strcasecmp of 'A' and '�' is => int(-%d)
139-
- strcasecmp of 'A' and '�' is => int(-%d)
138+
- strcasecmp of 'A' and '€' is => int(-%d)
139+
- strcasecmp of 'A' and 'ÿ' is => int(-%d)
140140
- strcasecmp of 'A' and '%0' is => int(%d)
141141

142142
Iteration 2
143-
- strcasecmp of '�' and 'a' is => int(%d)
144-
- strcasecmp of '�' and 'A' is => int(%d)
145-
- strcasecmp of '�' and '�' is => int(0)
146-
- strcasecmp of '�' and '�' is => int(-%d)
147-
- strcasecmp of '�' and '%0' is => int(%d)
143+
- strcasecmp of '€' and 'a' is => int(%d)
144+
- strcasecmp of '€' and 'A' is => int(%d)
145+
- strcasecmp of '€' and '€' is => int(0)
146+
- strcasecmp of '€' and 'ÿ' is => int(-%d)
147+
- strcasecmp of '€' and '%0' is => int(%d)
148148

149149
Iteration 3
150-
- strcasecmp of '�' and 'a' is => int(%d)
151-
- strcasecmp of '�' and 'A' is => int(%d)
152-
- strcasecmp of '�' and '�' is => int(%d)
153-
- strcasecmp of '�' and '�' is => int(0)
154-
- strcasecmp of '�' and '%0' is => int(%d)
150+
- strcasecmp of 'ÿ' and 'a' is => int(%d)
151+
- strcasecmp of 'ÿ' and 'A' is => int(%d)
152+
- strcasecmp of 'ÿ' and '€' is => int(%d)
153+
- strcasecmp of 'ÿ' and 'ÿ' is => int(0)
154+
- strcasecmp of 'ÿ' and '%0' is => int(%d)
155155

156156
Iteration 4
157157
- strcasecmp of '%0' and 'a' is => int(-%d)
158158
- strcasecmp of '%0' and 'A' is => int(-%d)
159-
- strcasecmp of '%0' and '�' is => int(-%d)
160-
- strcasecmp of '%0' and '�' is => int(-%d)
159+
- strcasecmp of '%0' and '€' is => int(-%d)
160+
- strcasecmp of '%0' and 'ÿ' is => int(-%d)
161161
- strcasecmp of '%0' and '%0' is => int(0)
162162

163163
*** comparing the strings in an

0 commit comments

Comments
 (0)