Skip to content

Commit 97ff6ca

Browse files
committed
Improve more error messages
1 parent aff4ce2 commit 97ff6ca

File tree

118 files changed

+701
-688
lines changed

Some content is hidden

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

118 files changed

+701
-688
lines changed

Zend/tests/add_002.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ var_dump($c);
2020
echo "Done\n";
2121
?>
2222
--EXPECTF--
23-
Exception: Unsupported operand types: array + object
23+
Exception: Unsupported operand types: array + stdClass
2424

25-
Fatal error: Uncaught TypeError: Unsupported operand types: array + object in %s:%d
25+
Fatal error: Uncaught TypeError: Unsupported operand types: array + stdClass in %s:%d
2626
Stack trace:
2727
#0 {main}
2828
thrown in %s on line %d

Zend/tests/add_003.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ var_dump($c);
2020
echo "Done\n";
2121
?>
2222
--EXPECTF--
23-
Exception: Unsupported operand types: object + array
23+
Exception: Unsupported operand types: stdClass + array
2424

25-
Fatal error: Uncaught TypeError: Unsupported operand types: object + array in %s:%d
25+
Fatal error: Uncaught TypeError: Unsupported operand types: stdClass + array in %s:%d
2626
Stack trace:
2727
#0 {main}
2828
thrown in %s on line %d

Zend/tests/bug54305.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ try {
1616
}
1717
?>
1818
--EXPECT--
19-
Cannot increment object
19+
Cannot increment ReflectionMethod

Zend/tests/decrement_001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ float(1.5)
5656
NULL
5757
bool(true)
5858
bool(false)
59-
Cannot decrement object
59+
Cannot decrement stdClass
6060
object(stdClass)#%d (0) {
6161
}
6262
Cannot decrement array

Zend/tests/decrement_001_64bit.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ float(1.5)
5656
NULL
5757
bool(true)
5858
bool(false)
59-
Cannot decrement object
59+
Cannot decrement stdClass
6060
object(stdClass)#1 (0) {
6161
}
6262
Cannot decrement array

Zend/tests/exception_018.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ throw new Hello(new stdClass);
88

99
?>
1010
--EXPECTF--
11-
Fatal error: Uncaught TypeError: Exception::__construct(): Argument #1 ($message) must be of type string, object given in %s:%d
11+
Fatal error: Uncaught TypeError: Exception::__construct(): Argument #1 ($message) must be of type string, stdClass given in %s:%d
1212
Stack trace:
1313
#0 %sexception_018.php(%d): Exception->__construct(Object(stdClass))
1414
#1 {main}

Zend/tests/exception_019.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ throw new Exception(new stdClass);
77

88
?>
99
--EXPECTF--
10-
Fatal error: Uncaught TypeError: Exception::__construct(): Argument #1 ($message) must be of type string, object given in %s:%d
10+
Fatal error: Uncaught TypeError: Exception::__construct(): Argument #1 ($message) must be of type string, stdClass given in %s:%d
1111
Stack trace:
1212
#0 %sexception_019.php(%d): Exception->__construct(Object(stdClass))
1313
#1 {main}

Zend/tests/exception_020.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ throw new MyErrorException(new stdClass);
88

99
?>
1010
--EXPECTF--
11-
Fatal error: Uncaught TypeError: ErrorException::__construct(): Argument #1 ($message) must be of type string, object given in %s:%d
11+
Fatal error: Uncaught TypeError: ErrorException::__construct(): Argument #1 ($message) must be of type string, stdClass given in %s:%d
1212
Stack trace:
1313
#0 %sexception_020.php(%d): ErrorException->__construct(Object(stdClass))
1414
#1 {main}

Zend/tests/exception_021.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ throw new Hello(new stdClass);
88

99
?>
1010
--EXPECTF--
11-
Fatal error: Uncaught TypeError: Error::__construct(): Argument #1 ($message) must be of type string, object given in %s:%d
11+
Fatal error: Uncaught TypeError: Error::__construct(): Argument #1 ($message) must be of type string, stdClass given in %s:%d
1212
Stack trace:
1313
#0 %sexception_021.php(%d): Error->__construct(Object(stdClass))
1414
#1 {main}

Zend/tests/exception_022.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ throw new Error(new stdClass);
77

88
?>
99
--EXPECTF--
10-
Fatal error: Uncaught TypeError: Error::__construct(): Argument #1 ($message) must be of type string, object given in %s:%d
10+
Fatal error: Uncaught TypeError: Error::__construct(): Argument #1 ($message) must be of type string, stdClass given in %s:%d
1111
Stack trace:
1212
#0 %sexception_022.php(%d): Error->__construct(Object(stdClass))
1313
#1 {main}

0 commit comments

Comments
 (0)