Skip to content

Commit 4bef4d5

Browse files
committed
Fix GH-8329 Print true/false instead of bool in error and debug messages
1 parent 4bd7f4e commit 4bef4d5

File tree

94 files changed

+721
-719
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+721
-719
lines changed

Zend/tests/011.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ bool(false)
8989
property_exists(): Argument #1 ($object_or_class) must be of type object|string, array given
9090
property_exists(): Argument #1 ($object_or_class) must be of type object|string, int given
9191
property_exists(): Argument #1 ($object_or_class) must be of type object|string, float given
92-
property_exists(): Argument #1 ($object_or_class) must be of type object|string, bool given
92+
property_exists(): Argument #1 ($object_or_class) must be of type object|string, true given
9393
property_exists(): Argument #1 ($object_or_class) must be of type object|string, null given
9494
bool(true)
9595
bool(true)

Zend/tests/assign_dim_obj_null_return.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,5 @@ Cannot add element to the array as the next element is already occupied
7979
Illegal offset type
8080
Illegal offset type
8181
Cannot use a scalar value as an array
82-
Attempt to assign property "foo" on bool
83-
Attempt to assign property "foo" on bool
82+
Attempt to assign property "foo" on true
83+
Attempt to assign property "foo" on true

Zend/tests/bug44660.phpt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,22 +48,22 @@ var_dump($a);
4848
?>
4949
--EXPECTF--
5050
--> read access:
51-
Warning: Attempt to read property "p" on bool in %s on line %d
51+
Warning: Attempt to read property "p" on true in %s on line %d
5252

5353
--> direct assignment:
54-
Attempt to assign property "p" on bool
54+
Attempt to assign property "p" on true
5555

5656
--> increment:
57-
Attempt to increment/decrement property "p" on bool
57+
Attempt to increment/decrement property "p" on true
5858

5959
--> reference assignment:
60-
Attempt to modify property "p" on bool
60+
Attempt to modify property "p" on true
6161

6262
--> reference assignment:
63-
Attempt to modify property "p" on bool
63+
Attempt to modify property "p" on true
6464

6565
--> indexed assignment:
66-
Attempt to modify property "p" on bool
66+
Attempt to modify property "p" on true
6767

6868
--> Confirm assignments have had no impact:
6969
bool(true)

Zend/tests/nullsafe_operator/002.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ try {
3535

3636
?>
3737
--EXPECT--
38-
string(39) "Call to a member function bar() on bool"
38+
string(40) "Call to a member function bar() on false"
3939
string(40) "Call to a member function bar() on array"
4040
string(38) "Call to a member function bar() on int"
4141
string(40) "Call to a member function bar() on float"

Zend/tests/offset_bool.phpt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,30 +25,30 @@ var_dump($bool[$arr]);
2525
echo "Done\n";
2626
?>
2727
--EXPECTF--
28-
Warning: Trying to access array offset on value of type bool in %s on line %d
28+
Warning: Trying to access array offset on value of type true in %s on line %d
2929
NULL
3030

31-
Warning: Trying to access array offset on value of type bool in %s on line %d
31+
Warning: Trying to access array offset on value of type true in %s on line %d
3232
NULL
3333

34-
Warning: Trying to access array offset on value of type bool in %s on line %d
34+
Warning: Trying to access array offset on value of type true in %s on line %d
3535
NULL
3636

37-
Warning: Trying to access array offset on value of type bool in %s on line %d
37+
Warning: Trying to access array offset on value of type true in %s on line %d
3838
NULL
3939

40-
Warning: Trying to access array offset on value of type bool in %s on line %d
40+
Warning: Trying to access array offset on value of type true in %s on line %d
4141
NULL
4242

43-
Warning: Trying to access array offset on value of type bool in %s on line %d
43+
Warning: Trying to access array offset on value of type true in %s on line %d
4444
NULL
4545

46-
Warning: Trying to access array offset on value of type bool in %s on line %d
46+
Warning: Trying to access array offset on value of type true in %s on line %d
4747
NULL
4848

49-
Warning: Trying to access array offset on value of type bool in %s on line %d
49+
Warning: Trying to access array offset on value of type true in %s on line %d
5050
NULL
5151

52-
Warning: Trying to access array offset on value of type bool in %s on line %d
52+
Warning: Trying to access array offset on value of type true in %s on line %d
5353
NULL
5454
Done

0 commit comments

Comments
 (0)