Skip to content

Commit 22e88c1

Browse files
committed
Fix imprecise %s placeholders in phpt test expectations
1 parent bba2dc3 commit 22e88c1

132 files changed

Lines changed: 315 additions & 315 deletions

File tree

Some content is hidden

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

Zend/tests/attributes/008_wrong_attribution.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ Attributes: Prevent Attribute on non classes
77
function foo() {}
88
?>
99
--EXPECTF--
10-
Fatal error: Attribute "Attribute" cannot target function (allowed targets: class) in %s
10+
Fatal error: Attribute "Attribute" cannot target function (allowed targets: class) in %s on line %d

Zend/tests/attributes/010_unsupported_const_expression.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ class C1 { }
88

99
?>
1010
--EXPECTF--
11-
Fatal error: Constant expression contains invalid operations in %s
11+
Fatal error: Constant expression contains invalid operations in %s on line %d

Zend/tests/attributes/016_custom_attribute_validation.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ function foo() {
1010
}
1111
?>
1212
--EXPECTF--
13-
Fatal error: Only classes can be marked with #[ZendTestAttribute] in %s
13+
Fatal error: Only classes can be marked with #[ZendTestAttribute] in %s on line %d

Zend/tests/attributes/024_internal_target_validation.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ function a1() { }
88

99
?>
1010
--EXPECTF--
11-
Fatal error: Attribute "Attribute" cannot target function (allowed targets: class) in %s
11+
Fatal error: Attribute "Attribute" cannot target function (allowed targets: class) in %s on line %d

Zend/tests/attributes/025_internal_repeatable_validation.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ class A1 { }
99

1010
?>
1111
--EXPECTF--
12-
Fatal error: Attribute "Attribute" must not be repeated in %s
12+
Fatal error: Attribute "Attribute" must not be repeated in %s on line %d

Zend/tests/attributes/deprecated/functions/001.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,17 @@ new Constructor();
5555

5656
?>
5757
--EXPECTF--
58-
Deprecated: Function test() is deprecated in %s
58+
Deprecated: Function test() is deprecated in %s on line %d
5959

6060
Deprecated: Function test2() is deprecated, use test() instead in %s on line %d
6161

6262
Deprecated: Function test() is deprecated in %s on line %d
6363

64-
Deprecated: Method Clazz::test() is deprecated in %s
64+
Deprecated: Method Clazz::test() is deprecated in %s on line %d
6565

66-
Deprecated: Method Clazz::test2() is deprecated, use test() instead in %s
66+
Deprecated: Method Clazz::test2() is deprecated, use test() instead in %s on line %d
6767

68-
Deprecated: Method Clazz::test() is deprecated in %s
68+
Deprecated: Method Clazz::test() is deprecated in %s on line %d
6969

7070
Deprecated: Function {closure:%s:%d}() is deprecated in %s on line %d
7171

Zend/tests/attributes/deprecated/functions/magic_call.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ Clazz::test2();
1919

2020
?>
2121
--EXPECTF--
22-
Deprecated: Method Clazz::test() is deprecated in %s
22+
Deprecated: Method Clazz::test() is deprecated in %s on line %d
2323

2424
Deprecated: Method Clazz::test2() is deprecated, due to some reason in %s on line %d

Zend/tests/autoload/bug39003.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ test($obj);
2020
echo "Done\n";
2121
?>
2222
--EXPECTF--
23-
Fatal error: Uncaught TypeError: test(): Argument #1 ($object) must be of type OtherClassName, ClassName given, called in %s:%d
23+
Fatal error: Uncaught TypeError: test(): Argument #1 ($object) must be of type OtherClassName, ClassName given, called in %s on line %d and defined in %s:%d
2424
Stack trace:
2525
#0 %s(%d): test(Object(ClassName))
2626
#1 {main}

Zend/tests/backtrace/debug_backtrace_with_include_and_this.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ try {
3333
ERR#2: include(class://non.existent.Class): Failed to open stream: "CLWrapper::stream_open" call failed @ include
3434
ERR#2: include(): Failed opening 'class://non.existent.Class' for inclusion (include_path='%s') @ include
3535

36-
Fatal error: Uncaught Exception: Failed loading class://non.existent.Class in %s
36+
Fatal error: Uncaught Exception: Failed loading class://non.existent.Class in %s:%d
3737
Stack trace:
3838
#0 %s(%d): CL->load('class://non.exi...')
3939
#1 {main}

Zend/tests/bug73954.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ takes_int(log(tan(3.14)));
1616
float(NAN)
1717
bool(true)
1818

19-
Fatal error: Uncaught TypeError: takes_int(): Argument #1 ($int) must be of type int, float given, called in %s:%d
19+
Fatal error: Uncaught TypeError: takes_int(): Argument #1 ($int) must be of type int, float given, called in %s on line %d and defined in %s:%d
2020
Stack trace:
2121
#0 %s(9): takes_int(NAN)
2222
#1 {main}

0 commit comments

Comments
 (0)