From eee245fbdc47ff950c59ca8e8adaf3789a88b389 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Sun, 15 Mar 2020 17:33:57 +0100 Subject: [PATCH 1/3] Make test expectations more liberal wrt. error locations We should not assume details regarding the error locations which are shown in the messages, since this makes the tests brittle regarding minor modifications, and won't work for systems which do not use a slash as `DIRECTORY_SEPARATOR`. This is also in line with bless-tests.php. --- tests/arrays/arrays.phpt | 8 +- tests/classes/dynamic_properties2.phpt | 2 +- tests/classes/dynamic_properties3.phpt | 2 +- tests/classes/overloading_2.phpt | 2 +- tests/classes/overloading_play.phpt | 2 +- tests/classes/overloading_properties2.phpt | 2 +- tests/classes/sleep_and_wakeup.phpt | Bin 6061 -> 6001 bytes tests/constants/constants.phpt | 12 +- .../array_concatenation.phpt | 36 +-- .../equality_operators/comparisons.phpt | 260 +++++++++--------- .../error_control_operator/error_control.phpt | 2 +- .../member_selection_operator.phpt | 4 +- .../postfix_operators/subscripting.phpt | 22 +- .../postfix_operators/subscripting_2.phpt | 10 +- .../primary_expressions/intrinsics_list.phpt | 12 +- .../relational_operators/comparisons1.phpt | 64 ++--- .../relational_operators/comparisons3.phpt | 128 ++++----- .../relational_operators/comparisons4.phpt | 64 ++--- .../source_file_inclusion/include.phpt | 4 +- .../source_file_inclusion/require.phpt | 4 +- tests/functions/basics.phpt | 2 +- tests/functions/byrefs.phpt | 6 +- tests/functions/passing_arguments.phpt | 22 +- .../tokens/string_literals.phpt | 26 +- tests/statements/iteration/while.phpt | 8 +- tests/statements/selection/if.phpt | 2 +- tests/types/resource/resource_from_fopen.phpt | 4 +- tests/types/string/numeric_strings.phpt | 4 +- tests/variables/unsetting_variables.phpt | 4 +- tests/variables/variable_variables.phpt | 2 +- 30 files changed, 360 insertions(+), 360 deletions(-) diff --git a/tests/arrays/arrays.phpt b/tests/arrays/arrays.phpt index bbc3a29c..3a2be425 100644 --- a/tests/arrays/arrays.phpt +++ b/tests/arrays/arrays.phpt @@ -398,16 +398,16 @@ array(3) { } 123 6 13 -Notice: Undefined %s: 1 in %s/arrays/arrays.php on line 108 +Notice: Undefined %s: 1 in %s on line %d $v[1] is >< -Notice: Undefined variable: v1 in %s/arrays/arrays.php on line 108 +Notice: Undefined variable: v1 in %s on line %d NULL -Notice: Undefined %s: 4 in %s/arrays/arrays.php on line 109 +Notice: Undefined %s: 4 in %s on line %d $v[4] is >< -Notice: Undefined variable: v1 in %s/arrays/arrays.php on line 109 +Notice: Undefined variable: v1 in %s on line %d NULL array(5) { [7]=> diff --git a/tests/classes/dynamic_properties2.phpt b/tests/classes/dynamic_properties2.phpt index 960b8958..7b8daa6b 100644 --- a/tests/classes/dynamic_properties2.phpt +++ b/tests/classes/dynamic_properties2.phpt @@ -19,5 +19,5 @@ unset($p->color); // remove the property "color" --EXPECTF-- bool(false) -Notice: Undefined property: Point::$color in %s/classes/dynamic_properties2.php on line 9 +Notice: Undefined property: Point::$color in %s on line %d NULL diff --git a/tests/classes/dynamic_properties3.phpt b/tests/classes/dynamic_properties3.phpt index 282e65dc..6d263181 100644 --- a/tests/classes/dynamic_properties3.phpt +++ b/tests/classes/dynamic_properties3.phpt @@ -43,7 +43,7 @@ var_dump($c); --EXPECTF-- get -Notice: Undefined property: C::$prop in %s/classes/dynamic_properties3.php on line 15 +Notice: Undefined property: C::$prop in %s on line %d set int(123) object(C)#1 (1) { diff --git a/tests/classes/overloading_2.phpt b/tests/classes/overloading_2.phpt index 44a38826..4bc65135 100644 --- a/tests/classes/overloading_2.phpt +++ b/tests/classes/overloading_2.phpt @@ -19,5 +19,5 @@ unset($p->color); // remove the property "color" --EXPECTF-- bool(false) -Notice: Undefined property: Point::$color in %s/classes/overloading_2.php on line 9 +Notice: Undefined property: Point::$color in %s on line %d NULL diff --git a/tests/classes/overloading_play.phpt b/tests/classes/overloading_play.phpt index 6bc2ba66..11c8f9b6 100644 --- a/tests/classes/overloading_play.phpt +++ b/tests/classes/overloading_play.phpt @@ -101,7 +101,7 @@ declared: 987 ---------------------- Getting 'hidden' -Notice: Undefined property via __get(): hidden in %s/classes/overloading_play.php on line 71 in %s/classes/overloading_play.php on line 34 +Notice: Undefined property via __get(): hidden in %s on line %d in %s on line %d NULL ---------------------- Is 'hidden' set? diff --git a/tests/classes/overloading_properties2.phpt b/tests/classes/overloading_properties2.phpt index 32d69702..d22de6df 100644 --- a/tests/classes/overloading_properties2.phpt +++ b/tests/classes/overloading_properties2.phpt @@ -19,5 +19,5 @@ unset($p->color); // remove the property "color" --EXPECTF-- bool(false) -Notice: Undefined property: Point::$color in %s/classes/overloading_properties2.php on line 9 +Notice: Undefined property: Point::$color in %s on line %d NULL diff --git a/tests/classes/sleep_and_wakeup.phpt b/tests/classes/sleep_and_wakeup.phpt index 6c1d5dc4bd621cc1393db9086a1ce1454a688a51..617c67d5614b02d2fcd7b1be9539cd2573050e99 100644 GIT binary patch delta 40 lcmZ3h|50y)s3^BWex5>3W?rg-YRY6g(KuxO=A)u77y%K`4T1mw delta 48 qcmeyUw^o0HsOUs>SssP_JcXRhyi^54bHm9BqH*YAn>$5cFaiK{4i5AH diff --git a/tests/constants/constants.phpt b/tests/constants/constants.phpt index 23f3324b..ccedb373 100644 --- a/tests/constants/constants.phpt +++ b/tests/constants/constants.phpt @@ -204,24 +204,24 @@ define CON22 succeeded; value is >65.3< define 36ABC succeeded; value is >100< define #%& succeeded; value is >200< -Notice: Constant MY_COLOR already defined in %s/constants/constants.php on line 13 +Notice: Constant MY_COLOR already defined in %s on line %d define MY_COLOR failed; value is >red< -Notice: Constant TRUE already defined in %s/constants/constants.php on line 13 +Notice: Constant TRUE already defined in %s on line %d define TRUE failed; value is >1< TRUE's value:1 define COLORS succeeded -Notice: Array to string conversion in %s/constants/constants.php on line 16 +Notice: Array to string conversion in %s on line %d ; value is >Array< -Warning: Constants may only evaluate to scalar values, arrays or resources in %s/constants/constants.php on line 13 +Warning: Constants may only evaluate to scalar values, arrays or resources in %s on line %d define MY_OBJECT failed; not defined -Warning: fopen(Testfile.txt): failed to open stream: No such file or directory in %s/constants/constants.php on line 90 +Warning: fopen(Testfile.txt): failed to open stream: No such file or directory in %s on line %d Can't open file define MY_RESOURCE succeeded; value is >< -Notice: Constant MY_RESOURCE already defined in %s/constants/constants.php on line 13 +Notice: Constant MY_RESOURCE already defined in %s on line %d define MY_RESOURCE failed; value is >< define CON61 succeeded; value is >321< define CON63 succeeded; value is >321< diff --git a/tests/expressions/additive_operators/array_concatenation.phpt b/tests/expressions/additive_operators/array_concatenation.phpt index 74eb0830..4508bfba 100644 --- a/tests/expressions/additive_operators/array_concatenation.phpt +++ b/tests/expressions/additive_operators/array_concatenation.phpt @@ -63,9 +63,9 @@ var_dump($a1); var_dump($a2); //*/ --EXPECTF-- -Notice: Array to string conversion in %s/expressions/additive_operators/array_concatenation.php on line 18 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/additive_operators/array_concatenation.php on line 18 +Notice: Array to string conversion in %s on line %d >Array< + >Array<, result: array(3) { [0]=> int(1) @@ -75,9 +75,9 @@ Notice: Array to string conversion in %s/expressions/additive_operators/array_co string(3) "red" } -Notice: Array to string conversion in %s/expressions/additive_operators/array_concatenation.php on line 18 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/additive_operators/array_concatenation.php on line 18 +Notice: Array to string conversion in %s on line %d >Array< + >Array<, result: array(3) { [0]=> int(1) @@ -87,9 +87,9 @@ Notice: Array to string conversion in %s/expressions/additive_operators/array_co string(3) "red" } -Notice: Array to string conversion in %s/expressions/additive_operators/array_concatenation.php on line 18 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/additive_operators/array_concatenation.php on line 18 +Notice: Array to string conversion in %s on line %d >Array< + >Array<, result: array(4) { [0]=> int(1) @@ -102,9 +102,9 @@ Notice: Array to string conversion in %s/expressions/additive_operators/array_co } ------------------------------------- -Notice: Array to string conversion in %s/expressions/additive_operators/array_concatenation.php on line 18 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/additive_operators/array_concatenation.php on line 18 +Notice: Array to string conversion in %s on line %d >Array< + >Array<, result: array(3) { [0]=> NULL @@ -114,17 +114,17 @@ Notice: Array to string conversion in %s/expressions/additive_operators/array_co string(3) "red" } -Notice: Array to string conversion in %s/expressions/additive_operators/array_concatenation.php on line 18 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/additive_operators/array_concatenation.php on line 18 +Notice: Array to string conversion in %s on line %d >Array< + >Array<, result: array(1) { [0]=> NULL } -Notice: Array to string conversion in %s/expressions/additive_operators/array_concatenation.php on line 18 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/additive_operators/array_concatenation.php on line 18 +Notice: Array to string conversion in %s on line %d >Array< + >Array<, result: array(3) { [0]=> NULL @@ -135,9 +135,9 @@ Notice: Array to string conversion in %s/expressions/additive_operators/array_co } ------------------------------------- -Notice: Array to string conversion in %s/expressions/additive_operators/array_concatenation.php on line 18 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/additive_operators/array_concatenation.php on line 18 +Notice: Array to string conversion in %s on line %d >Array< + >Array<, result: array(4) { [4]=> int(-5) @@ -149,9 +149,9 @@ Notice: Array to string conversion in %s/expressions/additive_operators/array_co string(3) "red" } -Notice: Array to string conversion in %s/expressions/additive_operators/array_concatenation.php on line 18 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/additive_operators/array_concatenation.php on line 18 +Notice: Array to string conversion in %s on line %d >Array< + >Array<, result: array(3) { [4]=> int(-5) @@ -161,9 +161,9 @@ Notice: Array to string conversion in %s/expressions/additive_operators/array_co NULL } -Notice: Array to string conversion in %s/expressions/additive_operators/array_concatenation.php on line 18 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/additive_operators/array_concatenation.php on line 18 +Notice: Array to string conversion in %s on line %d >Array< + >Array<, result: array(2) { [4]=> int(-5) diff --git a/tests/expressions/equality_operators/comparisons.phpt b/tests/expressions/equality_operators/comparisons.phpt index 4cd18d6a..fce3a0a2 100644 --- a/tests/expressions/equality_operators/comparisons.phpt +++ b/tests/expressions/equality_operators/comparisons.phpt @@ -198,35 +198,35 @@ bool(false) !== abc result: bool(true) ======= -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 37 +Notice: Array to string conversion in %s on line %d == Array result: bool(true) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 38 +Notice: Array to string conversion in %s on line %d != Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 39 +Notice: Array to string conversion in %s on line %d <> Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 40 +Notice: Array to string conversion in %s on line %d === Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 41 +Notice: Array to string conversion in %s on line %d !== Array result: bool(true) ======= -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 37 +Notice: Array to string conversion in %s on line %d == Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 38 +Notice: Array to string conversion in %s on line %d != Array result: bool(true) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 39 +Notice: Array to string conversion in %s on line %d <> Array result: bool(true) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 40 +Notice: Array to string conversion in %s on line %d === Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 41 +Notice: Array to string conversion in %s on line %d !== Array result: bool(true) ======= ------------------------------------- @@ -364,35 +364,35 @@ aa !== AB result: bool(true) 1 !== abc result: bool(true) ======= -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 81 +Notice: Array to string conversion in %s on line %d 1 == Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 82 +Notice: Array to string conversion in %s on line %d 1 != Array result: bool(true) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 83 +Notice: Array to string conversion in %s on line %d 1 <> Array result: bool(true) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 84 +Notice: Array to string conversion in %s on line %d 1 === Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 85 +Notice: Array to string conversion in %s on line %d 1 !== Array result: bool(true) ======= -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 81 +Notice: Array to string conversion in %s on line %d 1 == Array result: bool(true) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 82 +Notice: Array to string conversion in %s on line %d 1 != Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 83 +Notice: Array to string conversion in %s on line %d 1 <> Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 84 +Notice: Array to string conversion in %s on line %d 1 === Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 85 +Notice: Array to string conversion in %s on line %d 1 !== Array result: bool(true) ======= ------------------------------------- @@ -451,35 +451,35 @@ Notice: Array to string conversion in %s/expressions/equality_operators/comparis !== abc result: bool(true) ======= -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 81 +Notice: Array to string conversion in %s on line %d == Array result: bool(true) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 82 +Notice: Array to string conversion in %s on line %d != Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 83 +Notice: Array to string conversion in %s on line %d <> Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 84 +Notice: Array to string conversion in %s on line %d === Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 85 +Notice: Array to string conversion in %s on line %d !== Array result: bool(true) ======= -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 81 +Notice: Array to string conversion in %s on line %d == Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 82 +Notice: Array to string conversion in %s on line %d != Array result: bool(true) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 83 +Notice: Array to string conversion in %s on line %d <> Array result: bool(true) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 84 +Notice: Array to string conversion in %s on line %d === Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 85 +Notice: Array to string conversion in %s on line %d !== Array result: bool(true) ======= ------------------------------------- @@ -540,35 +540,35 @@ Notice: Array to string conversion in %s/expressions/equality_operators/comparis 10 !== abc result: bool(true) ======= -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 103 +Notice: Array to string conversion in %s on line %d 10 == Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 104 +Notice: Array to string conversion in %s on line %d 10 != Array result: bool(true) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 105 +Notice: Array to string conversion in %s on line %d 10 <> Array result: bool(true) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 106 +Notice: Array to string conversion in %s on line %d 10 === Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 107 +Notice: Array to string conversion in %s on line %d 10 !== Array result: bool(true) ======= -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 103 +Notice: Array to string conversion in %s on line %d 10 == Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 104 +Notice: Array to string conversion in %s on line %d 10 != Array result: bool(true) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 105 +Notice: Array to string conversion in %s on line %d 10 <> Array result: bool(true) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 106 +Notice: Array to string conversion in %s on line %d 10 === Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 107 +Notice: Array to string conversion in %s on line %d 10 !== Array result: bool(true) ======= ------------------------------------- @@ -627,247 +627,247 @@ Notice: Array to string conversion in %s/expressions/equality_operators/comparis -5.1 !== abc result: bool(true) ======= -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 103 +Notice: Array to string conversion in %s on line %d -5.1 == Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 104 +Notice: Array to string conversion in %s on line %d -5.1 != Array result: bool(true) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 105 +Notice: Array to string conversion in %s on line %d -5.1 <> Array result: bool(true) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 106 +Notice: Array to string conversion in %s on line %d -5.1 === Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 107 +Notice: Array to string conversion in %s on line %d -5.1 !== Array result: bool(true) ======= -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 103 +Notice: Array to string conversion in %s on line %d -5.1 == Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 104 +Notice: Array to string conversion in %s on line %d -5.1 != Array result: bool(true) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 105 +Notice: Array to string conversion in %s on line %d -5.1 <> Array result: bool(true) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 106 +Notice: Array to string conversion in %s on line %d -5.1 === Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 107 +Notice: Array to string conversion in %s on line %d -5.1 !== Array result: bool(true) ======= ------------------------------------- +++++++++++++++++++++++++++++++++++++++++++++++++++++ -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 125 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 125 +Notice: Array to string conversion in %s on line %d Array == Array result: bool(true) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 126 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 126 +Notice: Array to string conversion in %s on line %d Array != Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 127 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 127 +Notice: Array to string conversion in %s on line %d Array <> Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 128 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 128 +Notice: Array to string conversion in %s on line %d Array === Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 129 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 129 +Notice: Array to string conversion in %s on line %d Array !== Array result: bool(true) ======= -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 125 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 125 +Notice: Array to string conversion in %s on line %d Array == Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 126 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 126 +Notice: Array to string conversion in %s on line %d Array != Array result: bool(true) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 127 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 127 +Notice: Array to string conversion in %s on line %d Array <> Array result: bool(true) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 128 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 128 +Notice: Array to string conversion in %s on line %d Array === Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 129 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 129 +Notice: Array to string conversion in %s on line %d Array !== Array result: bool(true) ======= -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 125 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 125 +Notice: Array to string conversion in %s on line %d Array == Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 126 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 126 +Notice: Array to string conversion in %s on line %d Array != Array result: bool(true) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 127 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 127 +Notice: Array to string conversion in %s on line %d Array <> Array result: bool(true) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 128 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 128 +Notice: Array to string conversion in %s on line %d Array === Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 129 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 129 +Notice: Array to string conversion in %s on line %d Array !== Array result: bool(true) ======= -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 125 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 125 +Notice: Array to string conversion in %s on line %d Array == Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 126 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 126 +Notice: Array to string conversion in %s on line %d Array != Array result: bool(true) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 127 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 127 +Notice: Array to string conversion in %s on line %d Array <> Array result: bool(true) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 128 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 128 +Notice: Array to string conversion in %s on line %d Array === Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 129 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 129 +Notice: Array to string conversion in %s on line %d Array !== Array result: bool(true) ======= ------------------------------------- -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 125 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 125 +Notice: Array to string conversion in %s on line %d Array == Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 126 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 126 +Notice: Array to string conversion in %s on line %d Array != Array result: bool(true) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 127 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 127 +Notice: Array to string conversion in %s on line %d Array <> Array result: bool(true) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 128 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 128 +Notice: Array to string conversion in %s on line %d Array === Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 129 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 129 +Notice: Array to string conversion in %s on line %d Array !== Array result: bool(true) ======= -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 125 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 125 +Notice: Array to string conversion in %s on line %d Array == Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 126 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 126 +Notice: Array to string conversion in %s on line %d Array != Array result: bool(true) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 127 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 127 +Notice: Array to string conversion in %s on line %d Array <> Array result: bool(true) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 128 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 128 +Notice: Array to string conversion in %s on line %d Array === Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 129 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 129 +Notice: Array to string conversion in %s on line %d Array !== Array result: bool(true) ======= -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 125 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 125 +Notice: Array to string conversion in %s on line %d Array == Array result: bool(true) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 126 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 126 +Notice: Array to string conversion in %s on line %d Array != Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 127 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 127 +Notice: Array to string conversion in %s on line %d Array <> Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 128 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 128 +Notice: Array to string conversion in %s on line %d Array === Array result: bool(true) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 129 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 129 +Notice: Array to string conversion in %s on line %d Array !== Array result: bool(false) ======= -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 125 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 125 +Notice: Array to string conversion in %s on line %d Array == Array result: bool(true) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 126 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 126 +Notice: Array to string conversion in %s on line %d Array != Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 127 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 127 +Notice: Array to string conversion in %s on line %d Array <> Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 128 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 128 +Notice: Array to string conversion in %s on line %d Array === Array result: bool(false) -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 129 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/expressions/equality_operators/comparisons.php on line 129 +Notice: Array to string conversion in %s on line %d Array !== Array result: bool(true) ======= ------------------------------------- diff --git a/tests/expressions/error_control_operator/error_control.phpt b/tests/expressions/error_control_operator/error_control.phpt index 0e38c03a..ab86e544 100644 --- a/tests/expressions/error_control_operator/error_control.phpt +++ b/tests/expressions/error_control_operator/error_control.phpt @@ -44,6 +44,6 @@ echo "Done\n"; int(-1) int(-1) -Notice: Undefined variable: y in %s/expressions/error_control_operator/error_control.php on line 14 +Notice: Undefined variable: y in %s on line %d int(-1) Done diff --git a/tests/expressions/postfix_operators/member_selection_operator.phpt b/tests/expressions/postfix_operators/member_selection_operator.phpt index 95ca7598..97c1b3a5 100644 --- a/tests/expressions/postfix_operators/member_selection_operator.phpt +++ b/tests/expressions/postfix_operators/member_selection_operator.phpt @@ -123,10 +123,10 @@ string(3) "red" int(555) int(123) -%ANotice: Undefined property: Point::$psProp in %s/expressions/postfix_operators/member_selection_operator.php on line 74 +%ANotice: Undefined property: Point::$psProp in %s on line %d NULL -Notice: Undefined property: Point::$MYPI in %s/expressions/postfix_operators/member_selection_operator.php on line 78 +Notice: Undefined property: Point::$MYPI in %s on line %d NULL int(123) int(999) diff --git a/tests/expressions/postfix_operators/subscripting.phpt b/tests/expressions/postfix_operators/subscripting.phpt index 1f8fe603..57a22b8a 100644 --- a/tests/expressions/postfix_operators/subscripting.phpt +++ b/tests/expressions/postfix_operators/subscripting.phpt @@ -242,9 +242,9 @@ key: 0, value: 10 key: 1, value: 20 key: 2, value: 30 -Notice: Undefined offset: 7 in %s/expressions/postfix_operators/subscripting.php on line 28 +Notice: Undefined offset: 7 in %s on line %d -Notice: Undefined offset: 12 in %s/expressions/postfix_operators/subscripting.php on line 29 +Notice: Undefined offset: 12 in %s on line %d [7] contains >NULL<, [12] contains >NULL< array(5) { [0]=> @@ -317,25 +317,25 @@ array(3) { } } -Notice: Array to string conversion in %s/expressions/postfix_operators/subscripting.php on line 57 +Notice: Array to string conversion in %s on line %d outer key: 0, outer value: Array inner key: 0, inner value: 2 inner key: 1, inner value: 4 inner key: 2, inner value: 6 inner key: 3, inner value: 8 -Notice: Array to string conversion in %s/expressions/postfix_operators/subscripting.php on line 57 +Notice: Array to string conversion in %s on line %d outer key: 1, outer value: Array inner key: 0, inner value: 5 inner key: 1, inner value: 10 -Notice: Array to string conversion in %s/expressions/postfix_operators/subscripting.php on line 57 +Notice: Array to string conversion in %s on line %d outer key: 2, outer value: Array inner key: 0, inner value: 100 inner key: 1, inner value: 200 inner key: 2, inner value: 300 -Notice: Array to string conversion in %s/expressions/postfix_operators/subscripting.php on line 64 +Notice: Array to string conversion in %s on line %d [0]: Array [0][2]: 6 [1][1]: 10 @@ -362,14 +362,14 @@ NULL NULL string(1) "e" -Notice: String offset cast occurred in %s/expressions/postfix_operators/subscripting.php on line 143 +Notice: String offset cast occurred in %s on line %d string(1) "e" string(1) "d" -Notice: Uninitialized string offset: 10 in %s/expressions/postfix_operators/subscripting.php on line 145 +Notice: Uninitialized string offset: 10 in %s on line %d string(0) "" -Warning: Illegal string offset 'abc' in %s/expressions/postfix_operators/subscripting.php on line 146 +Warning: Illegal string offset 'abc' in %s on line %d string(1) "r" string(1) "r" string(1) "r" @@ -378,7 +378,7 @@ string(1) "r" string(3) "red" string(3) "rXd" -Warning: Illegal string offset: -5 in %s/expressions/postfix_operators/subscripting.php on line 161 +Warning: Illegal string offset: -5 in %s on line %d string(3) "rXd" string(6) "rXd Z" >d< @@ -395,7 +395,7 @@ string(6) "MXd Z" Warning: Cannot assign an empty string to a string offset in %s string(6) "MXd Z" -Warning: Illegal string offset 'zz' in %s/expressions/postfix_operators/subscripting.php on line 181 +Warning: Illegal string offset 'zz' in %s on line %d string(6) "QXd Z" -------------------- array(7) { diff --git a/tests/expressions/postfix_operators/subscripting_2.phpt b/tests/expressions/postfix_operators/subscripting_2.phpt index a269350d..55524ce1 100644 --- a/tests/expressions/postfix_operators/subscripting_2.phpt +++ b/tests/expressions/postfix_operators/subscripting_2.phpt @@ -325,14 +325,14 @@ int(107) Inside C10::offsetGet int(1000) -Notice: Indirect modification of overloaded element of C10 has no effect in %s/expressions/postfix_operators/subscripting_2.php on line 117 +Notice: Indirect modification of overloaded element of C10 has no effect in %s on line %d int(100) ------ Inside C10::offsetGet int(1000) -Notice: Indirect modification of overloaded element of C10 has no effect in %s/expressions/postfix_operators/subscripting_2.php on line 119 +Notice: Indirect modification of overloaded element of C10 has no effect in %s on line %d int(99) ====== object without index; simple assignment ========= @@ -387,19 +387,19 @@ object(C10)#1 (0) { Inside C10::offsetGet NULL -Notice: Indirect modification of overloaded element of C10 has no effect in %s/expressions/postfix_operators/subscripting_2.php on line 146 +Notice: Indirect modification of overloaded element of C10 has no effect in %s on line %d int(100) ------ Inside C10::offsetGet NULL -Notice: Indirect modification of overloaded element of C10 has no effect in %s/expressions/postfix_operators/subscripting_2.php on line 148 +Notice: Indirect modification of overloaded element of C10 has no effect in %s on line %d int(101) ------ Inside C10::offsetGet NULL -Notice: Indirect modification of overloaded element of C10 has no effect in %s/expressions/postfix_operators/subscripting_2.php on line 151 +Notice: Indirect modification of overloaded element of C10 has no effect in %s on line %d int(99) diff --git a/tests/expressions/primary_expressions/intrinsics_list.phpt b/tests/expressions/primary_expressions/intrinsics_list.phpt index 61521b38..70e4ac01 100644 --- a/tests/expressions/primary_expressions/intrinsics_list.phpt +++ b/tests/expressions/primary_expressions/intrinsics_list.phpt @@ -181,7 +181,7 @@ int(100) bool(true) int(67) -Notice: Undefined %s: 2 in %s/expressions/primary_expressions/intrinsics_list.php on line 57 +Notice: Undefined %s: 2 in %s on line %d $min: 100, $max: 500, $avg: Array ( @@ -196,7 +196,7 @@ bool(false) NULL --------- test with sufficient array elements but not consecutive keys ------------- -Notice: Undefined %s: 1 in %s/expressions/primary_expressions/intrinsics_list.php on line 70 +Notice: Undefined %s: 1 in %s on line %d $min: 0, $max: , $avg: 100 Array ( @@ -224,11 +224,11 @@ Array ) --------- test with non-numeric array ------------- -Notice: Undefined %s: 0 in %s/expressions/primary_expressions/intrinsics_list.php on line 96 +Notice: Undefined %s: 0 in %s on line %d -Notice: Undefined %s: 1 in %s/expressions/primary_expressions/intrinsics_list.php on line 96 +Notice: Undefined %s: 1 in %s on line %d -Notice: Undefined %s: 2 in %s/expressions/primary_expressions/intrinsics_list.php on line 96 +Notice: Undefined %s: 2 in %s on line %d $min: , $max: , $avg: Array ( @@ -241,7 +241,7 @@ bool(false) bool(false) --------- test with array element being an array ------------- -Notice: Undefined %s: 2 in %s/expressions/primary_expressions/intrinsics_list.php on line 107 +Notice: Undefined %s: 2 in %s on line %d Array ( [0] => 0 diff --git a/tests/expressions/relational_operators/comparisons1.phpt b/tests/expressions/relational_operators/comparisons1.phpt index ab2a4941..ca0da541 100644 --- a/tests/expressions/relational_operators/comparisons1.phpt +++ b/tests/expressions/relational_operators/comparisons1.phpt @@ -246,107 +246,107 @@ abc > result: bool(true) abc > (bool) result: bool(true) ======= -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 36 +Notice: Array to string conversion in %s on line %d > Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 37 +Notice: Array to string conversion in %s on line %d > (bool)Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 38 +Notice: Array to string conversion in %s on line %d Array <= result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 39 +Notice: Array to string conversion in %s on line %d Array <= (bool) result: bool(true) --- -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 41 +Notice: Array to string conversion in %s on line %d >= Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 42 +Notice: Array to string conversion in %s on line %d >= (bool)Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 43 +Notice: Array to string conversion in %s on line %d Array < result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 44 +Notice: Array to string conversion in %s on line %d Array < (bool) result: bool(false) --- -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 46 +Notice: Array to string conversion in %s on line %d < Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 47 +Notice: Array to string conversion in %s on line %d < (bool)Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 48 +Notice: Array to string conversion in %s on line %d Array >= result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 49 +Notice: Array to string conversion in %s on line %d Array >= (bool) result: bool(true) --- -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 51 +Notice: Array to string conversion in %s on line %d <= Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 52 +Notice: Array to string conversion in %s on line %d <= (bool)Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 53 +Notice: Array to string conversion in %s on line %d Array > result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 54 +Notice: Array to string conversion in %s on line %d Array > (bool) result: bool(false) ======= -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 36 +Notice: Array to string conversion in %s on line %d > Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 37 +Notice: Array to string conversion in %s on line %d > (bool)Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 38 +Notice: Array to string conversion in %s on line %d Array <= result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 39 +Notice: Array to string conversion in %s on line %d Array <= (bool) result: bool(false) --- -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 41 +Notice: Array to string conversion in %s on line %d >= Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 42 +Notice: Array to string conversion in %s on line %d >= (bool)Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 43 +Notice: Array to string conversion in %s on line %d Array < result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 44 +Notice: Array to string conversion in %s on line %d Array < (bool) result: bool(false) --- -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 46 +Notice: Array to string conversion in %s on line %d < Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 47 +Notice: Array to string conversion in %s on line %d < (bool)Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 48 +Notice: Array to string conversion in %s on line %d Array >= result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 49 +Notice: Array to string conversion in %s on line %d Array >= (bool) result: bool(true) --- -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 51 +Notice: Array to string conversion in %s on line %d <= Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 52 +Notice: Array to string conversion in %s on line %d <= (bool)Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 53 +Notice: Array to string conversion in %s on line %d Array > result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons1.php on line 54 +Notice: Array to string conversion in %s on line %d Array > (bool) result: bool(true) ======= ------------------------------------- diff --git a/tests/expressions/relational_operators/comparisons3.phpt b/tests/expressions/relational_operators/comparisons3.phpt index 8fa0540e..886b1fed 100644 --- a/tests/expressions/relational_operators/comparisons3.phpt +++ b/tests/expressions/relational_operators/comparisons3.phpt @@ -227,107 +227,107 @@ abc > 1 result: bool(false) abc > (bool)1 result: bool(false) ======= -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 22 +Notice: Array to string conversion in %s on line %d 1 > Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 23 +Notice: Array to string conversion in %s on line %d 1 > (bool)Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 24 +Notice: Array to string conversion in %s on line %d Array <= 1 result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 25 +Notice: Array to string conversion in %s on line %d Array <= (bool)1 result: bool(true) --- -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 27 +Notice: Array to string conversion in %s on line %d 1 >= Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 28 +Notice: Array to string conversion in %s on line %d 1 >= (bool)Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 29 +Notice: Array to string conversion in %s on line %d Array < 1 result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 30 +Notice: Array to string conversion in %s on line %d Array < (bool)1 result: bool(true) --- -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 32 +Notice: Array to string conversion in %s on line %d 1 < Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 33 +Notice: Array to string conversion in %s on line %d 1 < (bool)Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 34 +Notice: Array to string conversion in %s on line %d Array >= 1 result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 35 +Notice: Array to string conversion in %s on line %d Array >= (bool)1 result: bool(false) --- -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 37 +Notice: Array to string conversion in %s on line %d 1 <= Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 38 +Notice: Array to string conversion in %s on line %d 1 <= (bool)Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 39 +Notice: Array to string conversion in %s on line %d Array > 1 result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 40 +Notice: Array to string conversion in %s on line %d Array > (bool)1 result: bool(false) ======= -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 22 +Notice: Array to string conversion in %s on line %d 1 > Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 23 +Notice: Array to string conversion in %s on line %d 1 > (bool)Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 24 +Notice: Array to string conversion in %s on line %d Array <= 1 result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 25 +Notice: Array to string conversion in %s on line %d Array <= (bool)1 result: bool(true) --- -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 27 +Notice: Array to string conversion in %s on line %d 1 >= Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 28 +Notice: Array to string conversion in %s on line %d 1 >= (bool)Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 29 +Notice: Array to string conversion in %s on line %d Array < 1 result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 30 +Notice: Array to string conversion in %s on line %d Array < (bool)1 result: bool(false) --- -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 32 +Notice: Array to string conversion in %s on line %d 1 < Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 33 +Notice: Array to string conversion in %s on line %d 1 < (bool)Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 34 +Notice: Array to string conversion in %s on line %d Array >= 1 result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 35 +Notice: Array to string conversion in %s on line %d Array >= (bool)1 result: bool(true) --- -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 37 +Notice: Array to string conversion in %s on line %d 1 <= Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 38 +Notice: Array to string conversion in %s on line %d 1 <= (bool)Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 39 +Notice: Array to string conversion in %s on line %d Array > 1 result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 40 +Notice: Array to string conversion in %s on line %d Array > (bool)1 result: bool(false) ======= ------------------------------------- @@ -512,107 +512,107 @@ abc > result: bool(true) abc > (bool) result: bool(true) ======= -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 22 +Notice: Array to string conversion in %s on line %d > Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 23 +Notice: Array to string conversion in %s on line %d > (bool)Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 24 +Notice: Array to string conversion in %s on line %d Array <= result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 25 +Notice: Array to string conversion in %s on line %d Array <= (bool) result: bool(true) --- -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 27 +Notice: Array to string conversion in %s on line %d >= Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 28 +Notice: Array to string conversion in %s on line %d >= (bool)Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 29 +Notice: Array to string conversion in %s on line %d Array < result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 30 +Notice: Array to string conversion in %s on line %d Array < (bool) result: bool(false) --- -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 32 +Notice: Array to string conversion in %s on line %d < Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 33 +Notice: Array to string conversion in %s on line %d < (bool)Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 34 +Notice: Array to string conversion in %s on line %d Array >= result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 35 +Notice: Array to string conversion in %s on line %d Array >= (bool) result: bool(true) --- -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 37 +Notice: Array to string conversion in %s on line %d <= Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 38 +Notice: Array to string conversion in %s on line %d <= (bool)Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 39 +Notice: Array to string conversion in %s on line %d Array > result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 40 +Notice: Array to string conversion in %s on line %d Array > (bool) result: bool(false) ======= -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 22 +Notice: Array to string conversion in %s on line %d > Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 23 +Notice: Array to string conversion in %s on line %d > (bool)Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 24 +Notice: Array to string conversion in %s on line %d Array <= result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 25 +Notice: Array to string conversion in %s on line %d Array <= (bool) result: bool(false) --- -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 27 +Notice: Array to string conversion in %s on line %d >= Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 28 +Notice: Array to string conversion in %s on line %d >= (bool)Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 29 +Notice: Array to string conversion in %s on line %d Array < result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 30 +Notice: Array to string conversion in %s on line %d Array < (bool) result: bool(false) --- -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 32 +Notice: Array to string conversion in %s on line %d < Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 33 +Notice: Array to string conversion in %s on line %d < (bool)Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 34 +Notice: Array to string conversion in %s on line %d Array >= result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 35 +Notice: Array to string conversion in %s on line %d Array >= (bool) result: bool(true) --- -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 37 +Notice: Array to string conversion in %s on line %d <= Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 38 +Notice: Array to string conversion in %s on line %d <= (bool)Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 39 +Notice: Array to string conversion in %s on line %d Array > result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons3.php on line 40 +Notice: Array to string conversion in %s on line %d Array > (bool) result: bool(true) ======= ------------------------------------- diff --git a/tests/expressions/relational_operators/comparisons4.phpt b/tests/expressions/relational_operators/comparisons4.phpt index d22935af..4130a6cd 100644 --- a/tests/expressions/relational_operators/comparisons4.phpt +++ b/tests/expressions/relational_operators/comparisons4.phpt @@ -147,59 +147,59 @@ abc >= 10 result: bool(true) abc > 10 result: bool(true) ======= -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 22 +Notice: Array to string conversion in %s on line %d 10 > Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 23 +Notice: Array to string conversion in %s on line %d Array <= 10 result: bool(false) --- -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 25 +Notice: Array to string conversion in %s on line %d 10 >= Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 26 +Notice: Array to string conversion in %s on line %d Array < 10 result: bool(false) --- -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 28 +Notice: Array to string conversion in %s on line %d 10 < Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 29 +Notice: Array to string conversion in %s on line %d Array >= 10 result: bool(true) --- -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 31 +Notice: Array to string conversion in %s on line %d 10 <= Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 32 +Notice: Array to string conversion in %s on line %d Array > 10 result: bool(true) ======= -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 22 +Notice: Array to string conversion in %s on line %d 10 > Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 23 +Notice: Array to string conversion in %s on line %d Array <= 10 result: bool(false) --- -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 25 +Notice: Array to string conversion in %s on line %d 10 >= Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 26 +Notice: Array to string conversion in %s on line %d Array < 10 result: bool(false) --- -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 28 +Notice: Array to string conversion in %s on line %d 10 < Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 29 +Notice: Array to string conversion in %s on line %d Array >= 10 result: bool(true) --- -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 31 +Notice: Array to string conversion in %s on line %d 10 <= Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 32 +Notice: Array to string conversion in %s on line %d Array > 10 result: bool(true) ======= ------------------------------------- @@ -312,59 +312,59 @@ abc >= -5.1 result: bool(true) abc > -5.1 result: bool(true) ======= -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 22 +Notice: Array to string conversion in %s on line %d -5.1 > Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 23 +Notice: Array to string conversion in %s on line %d Array <= -5.1 result: bool(false) --- -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 25 +Notice: Array to string conversion in %s on line %d -5.1 >= Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 26 +Notice: Array to string conversion in %s on line %d Array < -5.1 result: bool(false) --- -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 28 +Notice: Array to string conversion in %s on line %d -5.1 < Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 29 +Notice: Array to string conversion in %s on line %d Array >= -5.1 result: bool(true) --- -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 31 +Notice: Array to string conversion in %s on line %d -5.1 <= Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 32 +Notice: Array to string conversion in %s on line %d Array > -5.1 result: bool(true) ======= -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 22 +Notice: Array to string conversion in %s on line %d -5.1 > Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 23 +Notice: Array to string conversion in %s on line %d Array <= -5.1 result: bool(false) --- -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 25 +Notice: Array to string conversion in %s on line %d -5.1 >= Array result: bool(false) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 26 +Notice: Array to string conversion in %s on line %d Array < -5.1 result: bool(false) --- -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 28 +Notice: Array to string conversion in %s on line %d -5.1 < Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 29 +Notice: Array to string conversion in %s on line %d Array >= -5.1 result: bool(true) --- -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 31 +Notice: Array to string conversion in %s on line %d -5.1 <= Array result: bool(true) -Notice: Array to string conversion in %s/expressions/relational_operators/comparisons4.php on line 32 +Notice: Array to string conversion in %s on line %d Array > -5.1 result: bool(true) ======= ------------------------------------- diff --git a/tests/expressions/source_file_inclusion/include.phpt b/tests/expressions/source_file_inclusion/include.phpt index 89fc0c02..9c8e570b 100644 --- a/tests/expressions/source_file_inclusion/include.phpt +++ b/tests/expressions/source_file_inclusion/include.phpt @@ -146,9 +146,9 @@ int(1) Inside file >%s/expressions/source_file_inclusion/include.php< at line >95< Inside test() in %s/expressions/source_file_inclusion/test.inc -Notice: Undefined variable: v1 in %s/expressions/source_file_inclusion/test.inc on line 14 +Notice: Undefined variable: v1 in %s on line %d -Notice: Undefined variable: v2 in %s/expressions/source_file_inclusion/test.inc on line 14 +Notice: Undefined variable: v2 in %s on line %d $v1: , $v2: $local1: 100 Inside file >%s/expressions/source_file_inclusion/include.php< at line >99< diff --git a/tests/expressions/source_file_inclusion/require.phpt b/tests/expressions/source_file_inclusion/require.phpt index a357d3d1..c9a36b29 100644 --- a/tests/expressions/source_file_inclusion/require.phpt +++ b/tests/expressions/source_file_inclusion/require.phpt @@ -143,9 +143,9 @@ int(1) Inside file >%s/expressions/source_file_inclusion/require.php< at line >95< Inside test() in %s/expressions/source_file_inclusion/test.inc -Notice: Undefined variable: v1 in %s/expressions/source_file_inclusion/test.inc on line 14 +Notice: Undefined variable: v1 in %s on line %d -Notice: Undefined variable: v2 in %s/expressions/source_file_inclusion/test.inc on line 14 +Notice: Undefined variable: v2 in %s on line %d $v1: , $v2: $local1: 100 Inside file >%s/expressions/source_file_inclusion/require.php< at line >99< diff --git a/tests/functions/basics.phpt b/tests/functions/basics.phpt index 2a3bc2c8..c366b7bb 100644 --- a/tests/functions/basics.phpt +++ b/tests/functions/basics.phpt @@ -91,7 +91,7 @@ f1: # arguments passed is 3 arg[0] = >23.45< arg[1] = >< -Notice: Array to string conversion in %s/functions/basics.php on line 25 +Notice: Array to string conversion in %s on line %d arg[2] = >Array< Too few arguments to function f2(), 0 passed in %s on line %d and exactly 2 expected Too few arguments to function f2(), 1 passed in %s on line %d and exactly 2 expected diff --git a/tests/functions/byrefs.phpt b/tests/functions/byrefs.phpt index 64be343d..32f0e53d 100644 --- a/tests/functions/byrefs.phpt +++ b/tests/functions/byrefs.phpt @@ -160,11 +160,11 @@ int(1234) int(1234) -Notice: Undefined variable: c in %s/functions/byrefs.php on line 53 +Notice: Undefined variable: c in %s on line %d NULL -Notice: Undefined variable: a in %s/functions/byrefs.php on line 65 +Notice: Undefined variable: a in %s on line %d NULL object(C)#1 (1) { ["m"]=> @@ -194,7 +194,7 @@ object(C)#1 (1) { } -Notice: Undefined variable: a in %s/functions/byrefs.php on line 84 +Notice: Undefined variable: a in %s on line %d NULL object(C)#1 (1) { ["m"]=> diff --git a/tests/functions/passing_arguments.phpt b/tests/functions/passing_arguments.phpt index 4f427bf1..2208aa06 100644 --- a/tests/functions/passing_arguments.phpt +++ b/tests/functions/passing_arguments.phpt @@ -183,7 +183,7 @@ object(C)#1 (1) { int(200) } -Notice: Only variables should be passed by reference in %s/functions/passing_arguments.php on line 60 +Notice: Only variables should be passed by reference in %s on line %d g In: $p1: 1 g Out: $p1: 200 bool(true) @@ -191,7 +191,7 @@ g In: $p1: 1 g Out: $p1: 200 int(200) -Notice: Only variables should be passed by reference in %s/functions/passing_arguments.php on line 73 +Notice: Only variables should be passed by reference in %s on line %d g In: $p1: -123 g Out: $p1: 200 int(-123) @@ -199,7 +199,7 @@ g In: $p1: -123 g Out: $p1: 200 int(200) -Notice: Only variables should be passed by reference in %s/functions/passing_arguments.php on line 79 +Notice: Only variables should be passed by reference in %s on line %d g In: $p1: 1230 g Out: $p1: 200 float(1230) @@ -207,7 +207,7 @@ g In: $p1: 1230 g Out: $p1: 200 int(200) -Notice: Only variables should be passed by reference in %s/functions/passing_arguments.php on line 85 +Notice: Only variables should be passed by reference in %s on line %d g In: $p1: g Out: $p1: 200 NULL @@ -215,7 +215,7 @@ g In: $p1: g Out: $p1: 200 int(200) -Notice: Only variables should be passed by reference in %s/functions/passing_arguments.php on line 91 +Notice: Only variables should be passed by reference in %s on line %d g In: $p1: abc g Out: $p1: 200 string(3) "abc" @@ -223,9 +223,9 @@ g In: $p1: abc g Out: $p1: 200 int(200) -Notice: Only variables should be passed by reference in %s/functions/passing_arguments.php on line 97 +Notice: Only variables should be passed by reference in %s on line %d -Notice: Array to string conversion in %s/functions/passing_arguments.php on line 51 +Notice: Array to string conversion in %s on line %d g In: $p1: Array g Out: $p1: 200 array(3) { @@ -237,7 +237,7 @@ array(3) { int(3) } -Notice: Array to string conversion in %s/functions/passing_arguments.php on line 51 +Notice: Array to string conversion in %s on line %d g In: $p1: Array g Out: $p1: 200 int(200) @@ -245,17 +245,17 @@ g In: $p1: 10 g Out: $p1: 200 int(200) -Notice: Only variables should be passed by reference in %s/functions/passing_arguments.php on line 119 +Notice: Only variables should be passed by reference in %s on line %d g In: $p1: 198 g Out: $p1: 200 int(198) -Notice: Only variables should be passed by reference in %s/functions/passing_arguments.php on line 124 +Notice: Only variables should be passed by reference in %s on line %d g In: $p1: 196 g Out: $p1: 200 int(196) -Notice: Only variables should be passed by reference in %s/functions/passing_arguments.php on line 129 +Notice: Only variables should be passed by reference in %s on line %d g In: $p1: 195 g Out: $p1: 200 int(195) diff --git a/tests/lexical_structure/tokens/string_literals.phpt b/tests/lexical_structure/tokens/string_literals.phpt index 5d5ea075..adf50b79 100644 --- a/tests/lexical_structure/tokens/string_literals.phpt +++ b/tests/lexical_structure/tokens/string_literals.phpt @@ -198,45 +198,45 @@ string(8) "blue sky" >NAN<--- o/p from string substition >NaN<--- using o/p from sprintf with hard-coded precision -Notice: Undefined variable: zX in %s/lexical_structure/tokens/string_literals.php on line 88 +Notice: Undefined variable: zX in %s on line %d -Notice: Undefined variable: zz_ in %s/lexical_structure/tokens/string_literals.php on line 88 +Notice: Undefined variable: zz_ in %s on line %d -Notice: Undefined variable: zzz3 in %s/lexical_structure/tokens/string_literals.php on line 88 +Notice: Undefined variable: zzz3 in %s on line %d >|-34 X||ABC _||1 3|5.67E+14+|5.67E+14 +< -Notice: Undefined variable: zX in %s/lexical_structure/tokens/string_literals.php on line 90 +Notice: Undefined variable: zX in %s on line %d string(0) "" -Notice: Undefined variable: zz_ in %s/lexical_structure/tokens/string_literals.php on line 91 +Notice: Undefined variable: zz_ in %s on line %d string(0) "" -Notice: Undefined variable: zzz3 in %s/lexical_structure/tokens/string_literals.php on line 92 +Notice: Undefined variable: zzz3 in %s on line %d string(0) "" string(9) "5.67E+14+" >$1|$&< -Notice: Array to string conversion in %s/lexical_structure/tokens/string_literals.php on line 103 +Notice: Array to string conversion in %s on line %d \colors contains >Array< \colors[1] contains >white< -Notice: Array to string conversion in %s/lexical_structure/tokens/string_literals.php on line 105 +Notice: Array to string conversion in %s on line %d \colors[1] contains >Array [1]< string(5) "white" -Notice: Undefined index: 01 in %s/lexical_structure/tokens/string_literals.php on line 109 +Notice: Undefined index: 01 in %s on line %d string(0) "" -Notice: Undefined index: 0x1 in %s/lexical_structure/tokens/string_literals.php on line 110 +Notice: Undefined index: 0x1 in %s on line %d string(0) "" -Notice: Undefined index: 0X1 in %s/lexical_structure/tokens/string_literals.php on line 111 +Notice: Undefined index: 0X1 in %s on line %d string(0) "" $colors[2] contains >blue< -Notice: Array to string conversion in %s/lexical_structure/tokens/string_literals.php on line 123 +Notice: Array to string conversion in %s on line %d -Notice: Array to string conversion in %s/lexical_structure/tokens/string_literals.php on line 123 +Notice: Array to string conversion in %s on line %d >Array|Array< $myC->p1 = >2< >-34X|-34 X|ABC_|ABC _|13|1 3|5.67E+14+|5.67E+14 +< diff --git a/tests/statements/iteration/while.phpt b/tests/statements/iteration/while.phpt index d4508ebd..5ead193d 100644 --- a/tests/statements/iteration/while.phpt +++ b/tests/statements/iteration/while.phpt @@ -58,14 +58,14 @@ while (TRUE) 10 100 1 -Notice: Undefined variable: done in %s/statements/iteration/while.php on line 3%d +Notice: Undefined variable: done in %s on line %d%d 2 -Notice: Undefined variable: done in %s/statements/iteration/while.php on line 3%d +Notice: Undefined variable: done in %s on line %d%d 3 -Notice: Undefined variable: done in %s/statements/iteration/while.php on line 3%d +Notice: Undefined variable: done in %s on line %d%d 4 -Notice: Undefined variable: done in %s/statements/iteration/while.php on line 3%d +Notice: Undefined variable: done in %s on line %d%d 5 diff --git a/tests/statements/selection/if.phpt b/tests/statements/selection/if.phpt index a47d21b7..87087dd4 100644 --- a/tests/statements/selection/if.phpt +++ b/tests/statements/selection/if.phpt @@ -150,7 +150,7 @@ Line 2 >xx< is TRUE string(2) "xx" >< is FALSE string(0) "" -Notice: Array to string conversion in %s/statements/selection/if.php on line 41 +Notice: Array to string conversion in %s on line %d >Array< is TRUE array(3) { [0]=> string(3) "red" diff --git a/tests/types/resource/resource_from_fopen.phpt b/tests/types/resource/resource_from_fopen.phpt index 2c64da24..c2658d29 100644 --- a/tests/types/resource/resource_from_fopen.phpt +++ b/tests/types/resource/resource_from_fopen.phpt @@ -23,11 +23,11 @@ var_dump($infile); $infile = @fopen("NoSuchFile.txt", 'r'); var_dump($infile); --EXPECTF-- -Warning:%sNo such file or directory in %s/types/resource/resource_from_fopen.php on line 11 +Warning:%sNo such file or directory in %s on line %d bool(false) -Warning:%sNo such file or directory in %s/types/resource/resource_from_fopen.php on line 17 +Warning:%sNo such file or directory in %s on line %d bool(false) bool(false) diff --git a/tests/types/string/numeric_strings.phpt b/tests/types/string/numeric_strings.phpt index e36190c1..d334d6b1 100644 --- a/tests/types/string/numeric_strings.phpt +++ b/tests/types/string/numeric_strings.phpt @@ -112,9 +112,9 @@ bool(false) >naN< is not numeric >nan< is not numeric -Notice: Undefined variable: t in %s/types/string/numeric_strings.php on line 38 +Notice: Undefined variable: t in %s on line %d -Notice: Undefined variable: t in %s/types/string/numeric_strings.php on line 39 +Notice: Undefined variable: t in %s on line %d NULL string(3) "INF" string(4) "-INF" diff --git a/tests/variables/unsetting_variables.phpt b/tests/variables/unsetting_variables.phpt index dddd39f1..6ee8fe1d 100644 --- a/tests/variables/unsetting_variables.phpt +++ b/tests/variables/unsetting_variables.phpt @@ -149,13 +149,13 @@ f:1 $gVar1 = 25 --- Back at top-level --- Inside f, block-level 1 -Notice: Constant CON3 already defined in %s/variables/unsetting_variables.php on line 47 +Notice: Constant CON3 already defined in %s on line %d f:1 CON1 = 1 f:1 CON2 = 2 f:1 CON3 = 3 --- Inside f, block-level 2 -Notice: Constant CON4 already defined in %s/variables/unsetting_variables.php on line 56 +Notice: Constant CON4 already defined in %s on line %d f:2 CON1 = 1 f:2 CON2 = 2 f:2 CON3 = 3 diff --git a/tests/variables/variable_variables.phpt b/tests/variables/variable_variables.phpt index b287377a..44903ae8 100644 --- a/tests/variables/variable_variables.phpt +++ b/tests/variables/variable_variables.phpt @@ -261,6 +261,6 @@ object(C1)#1 (1) { string(1) "v" } -Warning: Creating default object from empty value in %s/variables/variable_variables.php on line 183 +Warning: Creating default object from empty value in %s on line %d ---------------------- $xxx = 777 From 4122e20e164a223f77a4510c1db02dcf04e2edb5 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Sun, 15 Mar 2020 17:34:15 +0100 Subject: [PATCH 2/3] Replace hard-coded directory separators with %e pattern --- .../constants/core_predefined_constants.phpt | 10 +-- tests/exception_handling/exception_class.phpt | 64 +++++++++---------- .../exception_class_experiment_1.phpt | 64 +++++++++---------- .../exception_class_from_within_a_class.phpt | 64 +++++++++---------- ...ion_class_using_conditional_functions.phpt | 64 +++++++++---------- .../myrangeexception_test1.phpt | 4 +- .../set_exception_handler.phpt | 12 ++-- .../source_file_inclusion/include.phpt | 46 ++++++------- .../source_file_inclusion/include_once.phpt | 8 +-- .../source_file_inclusion/require.phpt | 46 ++++++------- .../source_file_inclusion/require_once.phpt | 8 +-- tests/expressions/unary_operators/cast.phpt | 6 +- tests/variables/predefined_variables.phpt | 2 +- tests/variables/variable_names.phpt | 2 +- 14 files changed, 200 insertions(+), 200 deletions(-) diff --git a/tests/constants/core_predefined_constants.phpt b/tests/constants/core_predefined_constants.phpt index 832d0a63..7034a87c 100644 --- a/tests/constants/core_predefined_constants.phpt +++ b/tests/constants/core_predefined_constants.phpt @@ -141,9 +141,9 @@ $datePlus1->xx(); include_once('includefile.inc'); --EXPECTF-- __LINE__: int(17) -__FILE__: string(%d) "%s/constants/core_predefined_constants.php" -__DIR__: string(%d) "%s/constants" -string(%d) "%s/constants" +__FILE__: string(%d) "%s%econstants%ecore_predefined_constants.php" +__DIR__: string(%d) "%s%econstants" +string(%d) "%s%econstants" __LINE__: int(24) __NAMESPACE__: string(0) "" ----------------------------------------- @@ -191,8 +191,8 @@ __CLASS__: string(8) "DatePlus" Inside DatePlus::xx __FUNCTION__: string(2) "xx" Inside includefile.php -string(%d) "%s/constants/includefile.inc" -string(%d) "%s/constants" +string(%d) "%s%econstants%eincludefile.inc" +string(%d) "%s%econstants" Inside Date::__destruct __FUNCTION__: string(10) "__destruct" Inside Date::__destruct diff --git a/tests/exception_handling/exception_class.phpt b/tests/exception_handling/exception_class.phpt index 95f38ee0..ba8e2ee5 100644 --- a/tests/exception_handling/exception_class.phpt +++ b/tests/exception_handling/exception_class.phpt @@ -145,13 +145,13 @@ fL1(10); --EXPECTF-- L0: In try-block L0: In catch-block -$e = >Exception: L0 Message in %s/exception_handling/exception_class.php:127 +$e = >Exception: L0 Message in %s%eexception_handling%eexception_class.php:127 Stack trace: #0 {main}< getMessage: >L0 Message< getCode: >-1< getPrevious: >< -getFile: >%s/exception_handling/exception_class.php< +getFile: >%s%eexception_handling%eexception_class.php< getLine: >127< getTraceAsString: >#0 {main}< array(0) { @@ -163,22 +163,22 @@ L0: Beyond try/catch/finally blocks L0: Calling fL1 fL1: In try-block fL1: In catch-block -$e = >Exception: fL1 Message in %s/exception_handling/exception_class.php:55 +$e = >Exception: fL1 Message in %s%eexception_handling%eexception_class.php:55 Stack trace: -#0 %s/exception_handling/exception_class.php(140): fL1(10) +#0 %s%eexception_handling%eexception_class.php(140): fL1(10) #1 {main}< getMessage: >fL1 Message< getCode: >123< getPrevious: >< -getFile: >%s/exception_handling/exception_class.php< +getFile: >%s%eexception_handling%eexception_class.php< getLine: >55< -getTraceAsString: >#0 %s/exception_handling/exception_class.php(140): fL1(10) +getTraceAsString: >#0 %s%eexception_handling%eexception_class.php(140): fL1(10) #1 {main}< array(1) { [0]=> array(4) { ["file"]=> - string(%d) "%s/exception_handling/exception_class.php" + string(%d) "%s%eexception_handling%eexception_class.php" ["line"]=> int(140) ["function"]=> @@ -192,7 +192,7 @@ array(1) { } Trace Info: Key[0]: - Key[file] => >%s/exception_handling/exception_class.php< + Key[file] => >%s%eexception_handling%eexception_class.php< Key[line] => >140< Key[function] => >fL1< Key[args]: @@ -203,24 +203,24 @@ fL1: Beyond try/catch/finally blocks fL1: Calling fL2 fL2: In try-block fL2: In catch-block -$e = >Exception: fL2 Message in %s/exception_handling/exception_class.php:81 +$e = >Exception: fL2 Message in %s%eexception_handling%eexception_class.php:81 Stack trace: -#0 %s/exception_handling/exception_class.php(69): fL2(2.3, -4.5) -#1 %s/exception_handling/exception_class.php(140): fL1(10) +#0 %s%eexception_handling%eexception_class.php(69): fL2(2.3, -4.5) +#1 %s%eexception_handling%eexception_class.php(140): fL1(10) #2 {main}< getMessage: >fL2 Message< getCode: >234< getPrevious: >< -getFile: >%s/exception_handling/exception_class.php< +getFile: >%s%eexception_handling%eexception_class.php< getLine: >81< -getTraceAsString: >#0 %s/exception_handling/exception_class.php(69): fL2(2.3, -4.5) -#1 %s/exception_handling/exception_class.php(140): fL1(10) +getTraceAsString: >#0 %s%eexception_handling%eexception_class.php(69): fL2(2.3, -4.5) +#1 %s%eexception_handling%eexception_class.php(140): fL1(10) #2 {main}< array(2) { [0]=> array(4) { ["file"]=> - string(%d) "%s/exception_handling/exception_class.php" + string(%d) "%s%eexception_handling%eexception_class.php" ["line"]=> int(69) ["function"]=> @@ -236,7 +236,7 @@ array(2) { [1]=> array(4) { ["file"]=> - string(%d) "%s/exception_handling/exception_class.php" + string(%d) "%s%eexception_handling%eexception_class.php" ["line"]=> int(140) ["function"]=> @@ -250,14 +250,14 @@ array(2) { } Trace Info: Key[0]: - Key[file] => >%s/exception_handling/exception_class.php< + Key[file] => >%s%eexception_handling%eexception_class.php< Key[line] => >69< Key[function] => >fL2< Key[args]: Key[0] => >2.3< Key[1] => >-4.5< Key[1]: - Key[file] => >%s/exception_handling/exception_class.php< + Key[file] => >%s%eexception_handling%eexception_class.php< Key[line] => >140< Key[function] => >fL1< Key[args]: @@ -268,26 +268,26 @@ fL2: Beyond try/catch/finally blocks fL2: Calling fL3 fL3: In try-block fL3: In catch-block -$e = >Exception: fL3 Message in %s/exception_handling/exception_class.php:107 +$e = >Exception: fL3 Message in %s%eexception_handling%eexception_class.php:107 Stack trace: -#0 %s/exception_handling/exception_class.php(95): fL3('xyz', NULL, true) -#1 %s/exception_handling/exception_class.php(69): fL2(2.3, -4.5) -#2 %s/exception_handling/exception_class.php(140): fL1(10) +#0 %s%eexception_handling%eexception_class.php(95): fL3('xyz', NULL, true) +#1 %s%eexception_handling%eexception_class.php(69): fL2(2.3, -4.5) +#2 %s%eexception_handling%eexception_class.php(140): fL1(10) #3 {main}< getMessage: >fL3 Message< getCode: >345< getPrevious: >< -getFile: >%s/exception_handling/exception_class.php< +getFile: >%s%eexception_handling%eexception_class.php< getLine: >107< -getTraceAsString: >#0 %s/exception_handling/exception_class.php(95): fL3('xyz', NULL, true) -#1 %s/exception_handling/exception_class.php(69): fL2(2.3, -4.5) -#2 %s/exception_handling/exception_class.php(140): fL1(10) +getTraceAsString: >#0 %s%eexception_handling%eexception_class.php(95): fL3('xyz', NULL, true) +#1 %s%eexception_handling%eexception_class.php(69): fL2(2.3, -4.5) +#2 %s%eexception_handling%eexception_class.php(140): fL1(10) #3 {main}< array(3) { [0]=> array(4) { ["file"]=> - string(%d) "%s/exception_handling/exception_class.php" + string(%d) "%s%eexception_handling%eexception_class.php" ["line"]=> int(95) ["function"]=> @@ -305,7 +305,7 @@ array(3) { [1]=> array(4) { ["file"]=> - string(%d) "%s/exception_handling/exception_class.php" + string(%d) "%s%eexception_handling%eexception_class.php" ["line"]=> int(69) ["function"]=> @@ -321,7 +321,7 @@ array(3) { [2]=> array(4) { ["file"]=> - string(%d) "%s/exception_handling/exception_class.php" + string(%d) "%s%eexception_handling%eexception_class.php" ["line"]=> int(140) ["function"]=> @@ -335,7 +335,7 @@ array(3) { } Trace Info: Key[0]: - Key[file] => >%s/exception_handling/exception_class.php< + Key[file] => >%s%eexception_handling%eexception_class.php< Key[line] => >95< Key[function] => >fL3< Key[args]: @@ -343,14 +343,14 @@ Key[0]: Key[1] => >< Key[2] => >1< Key[1]: - Key[file] => >%s/exception_handling/exception_class.php< + Key[file] => >%s%eexception_handling%eexception_class.php< Key[line] => >69< Key[function] => >fL2< Key[args]: Key[0] => >2.3< Key[1] => >-4.5< Key[2]: - Key[file] => >%s/exception_handling/exception_class.php< + Key[file] => >%s%eexception_handling%eexception_class.php< Key[line] => >140< Key[function] => >fL1< Key[args]: diff --git a/tests/exception_handling/exception_class_experiment_1.phpt b/tests/exception_handling/exception_class_experiment_1.phpt index 62ae23a8..3c93fc93 100644 --- a/tests/exception_handling/exception_class_experiment_1.phpt +++ b/tests/exception_handling/exception_class_experiment_1.phpt @@ -157,13 +157,13 @@ fL1(10); --EXPECTF-- L0: In try-block L0: In catch-block -$e = >Exception: L0 Message in %s/exception_handling/exception_class_experiment_1.php:139 +$e = >Exception: L0 Message in %s%eexception_handling%eexception_class_experiment_1.php:139 Stack trace: #0 {main}< getMessage: >L0 Message< getCode: >-1< getPrevious: >< -getFile: >%s/exception_handling/exception_class_experiment_1.php< +getFile: >%s%eexception_handling%eexception_class_experiment_1.php< getLine: >139< getTraceAsString: >#0 {main}< array(0) { @@ -175,22 +175,22 @@ L0: Beyond try/catch/finally blocks L0: Calling fL1 fL1: In try-block fL1: In catch-block -$e = >MyEx in %s/exception_handling/exception_class_experiment_1.php:66 +$e = >MyEx in %s%eexception_handling%eexception_class_experiment_1.php:66 Stack trace: -#0 %s/exception_handling/exception_class_experiment_1.php(152): fL1(10) +#0 %s%eexception_handling%eexception_class_experiment_1.php(152): fL1(10) #1 {main}< getMessage: >< getCode: >0< getPrevious: >< -getFile: >%s/exception_handling/exception_class_experiment_1.php< +getFile: >%s%eexception_handling%eexception_class_experiment_1.php< getLine: >66< -getTraceAsString: >#0 %s/exception_handling/exception_class_experiment_1.php(152): fL1(10) +getTraceAsString: >#0 %s%eexception_handling%eexception_class_experiment_1.php(152): fL1(10) #1 {main}< array(1) { [0]=> array(4) { ["file"]=> - string(%d) "%s/exception_handling/exception_class_experiment_1.php" + string(%d) "%s%eexception_handling%eexception_class_experiment_1.php" ["line"]=> int(152) ["function"]=> @@ -204,7 +204,7 @@ array(1) { } Trace Info: Key[0]: - Key[file] => >%s/exception_handling/exception_class_experiment_1.php< + Key[file] => >%s%eexception_handling%eexception_class_experiment_1.php< Key[line] => >152< Key[function] => >fL1< Key[args]: @@ -215,24 +215,24 @@ fL1: Beyond try/catch/finally blocks fL1: Calling fL2 fL2: In try-block fL2: In catch-block -$e = >Exception: fL2 Message in %s/exception_handling/exception_class_experiment_1.php:93 +$e = >Exception: fL2 Message in %s%eexception_handling%eexception_class_experiment_1.php:93 Stack trace: -#0 %s/exception_handling/exception_class_experiment_1.php(81): fL2(2.3, -4.5) -#1 %s/exception_handling/exception_class_experiment_1.php(152): fL1(10) +#0 %s%eexception_handling%eexception_class_experiment_1.php(81): fL2(2.3, -4.5) +#1 %s%eexception_handling%eexception_class_experiment_1.php(152): fL1(10) #2 {main}< getMessage: >fL2 Message< getCode: >234< getPrevious: >< -getFile: >%s/exception_handling/exception_class_experiment_1.php< +getFile: >%s%eexception_handling%eexception_class_experiment_1.php< getLine: >93< -getTraceAsString: >#0 %s/exception_handling/exception_class_experiment_1.php(81): fL2(2.3, -4.5) -#1 %s/exception_handling/exception_class_experiment_1.php(152): fL1(10) +getTraceAsString: >#0 %s%eexception_handling%eexception_class_experiment_1.php(81): fL2(2.3, -4.5) +#1 %s%eexception_handling%eexception_class_experiment_1.php(152): fL1(10) #2 {main}< array(2) { [0]=> array(4) { ["file"]=> - string(%d) "%s/exception_handling/exception_class_experiment_1.php" + string(%d) "%s%eexception_handling%eexception_class_experiment_1.php" ["line"]=> int(81) ["function"]=> @@ -248,7 +248,7 @@ array(2) { [1]=> array(4) { ["file"]=> - string(%d) "%s/exception_handling/exception_class_experiment_1.php" + string(%d) "%s%eexception_handling%eexception_class_experiment_1.php" ["line"]=> int(152) ["function"]=> @@ -262,14 +262,14 @@ array(2) { } Trace Info: Key[0]: - Key[file] => >%s/exception_handling/exception_class_experiment_1.php< + Key[file] => >%s%eexception_handling%eexception_class_experiment_1.php< Key[line] => >81< Key[function] => >fL2< Key[args]: Key[0] => >2.3< Key[1] => >-4.5< Key[1]: - Key[file] => >%s/exception_handling/exception_class_experiment_1.php< + Key[file] => >%s%eexception_handling%eexception_class_experiment_1.php< Key[line] => >152< Key[function] => >fL1< Key[args]: @@ -280,26 +280,26 @@ fL2: Beyond try/catch/finally blocks fL2: Calling fL3 fL3: In try-block fL3: In catch-block -$e = >Exception: fL3 Message in %s/exception_handling/exception_class_experiment_1.php:119 +$e = >Exception: fL3 Message in %s%eexception_handling%eexception_class_experiment_1.php:119 Stack trace: -#0 %s/exception_handling/exception_class_experiment_1.php(107): fL3('xyz', NULL, true) -#1 %s/exception_handling/exception_class_experiment_1.php(81): fL2(2.3, -4.5) -#2 %s/exception_handling/exception_class_experiment_1.php(152): fL1(10) +#0 %s%eexception_handling%eexception_class_experiment_1.php(107): fL3('xyz', NULL, true) +#1 %s%eexception_handling%eexception_class_experiment_1.php(81): fL2(2.3, -4.5) +#2 %s%eexception_handling%eexception_class_experiment_1.php(152): fL1(10) #3 {main}< getMessage: >fL3 Message< getCode: >345< getPrevious: >< -getFile: >%s/exception_handling/exception_class_experiment_1.php< +getFile: >%s%eexception_handling%eexception_class_experiment_1.php< getLine: >119< -getTraceAsString: >#0 %s/exception_handling/exception_class_experiment_1.php(107): fL3('xyz', NULL, true) -#1 %s/exception_handling/exception_class_experiment_1.php(81): fL2(2.3, -4.5) -#2 %s/exception_handling/exception_class_experiment_1.php(152): fL1(10) +getTraceAsString: >#0 %s%eexception_handling%eexception_class_experiment_1.php(107): fL3('xyz', NULL, true) +#1 %s%eexception_handling%eexception_class_experiment_1.php(81): fL2(2.3, -4.5) +#2 %s%eexception_handling%eexception_class_experiment_1.php(152): fL1(10) #3 {main}< array(3) { [0]=> array(4) { ["file"]=> - string(%d) "%s/exception_handling/exception_class_experiment_1.php" + string(%d) "%s%eexception_handling%eexception_class_experiment_1.php" ["line"]=> int(107) ["function"]=> @@ -317,7 +317,7 @@ array(3) { [1]=> array(4) { ["file"]=> - string(%d) "%s/exception_handling/exception_class_experiment_1.php" + string(%d) "%s%eexception_handling%eexception_class_experiment_1.php" ["line"]=> int(81) ["function"]=> @@ -333,7 +333,7 @@ array(3) { [2]=> array(4) { ["file"]=> - string(%d) "%s/exception_handling/exception_class_experiment_1.php" + string(%d) "%s%eexception_handling%eexception_class_experiment_1.php" ["line"]=> int(152) ["function"]=> @@ -347,7 +347,7 @@ array(3) { } Trace Info: Key[0]: - Key[file] => >%s/exception_handling/exception_class_experiment_1.php< + Key[file] => >%s%eexception_handling%eexception_class_experiment_1.php< Key[line] => >107< Key[function] => >fL3< Key[args]: @@ -355,14 +355,14 @@ Key[0]: Key[1] => >< Key[2] => >1< Key[1]: - Key[file] => >%s/exception_handling/exception_class_experiment_1.php< + Key[file] => >%s%eexception_handling%eexception_class_experiment_1.php< Key[line] => >81< Key[function] => >fL2< Key[args]: Key[0] => >2.3< Key[1] => >-4.5< Key[2]: - Key[file] => >%s/exception_handling/exception_class_experiment_1.php< + Key[file] => >%s%eexception_handling%eexception_class_experiment_1.php< Key[line] => >152< Key[function] => >fL1< Key[args]: diff --git a/tests/exception_handling/exception_class_from_within_a_class.phpt b/tests/exception_handling/exception_class_from_within_a_class.phpt index 0f4df730..9f027f0c 100644 --- a/tests/exception_handling/exception_class_from_within_a_class.phpt +++ b/tests/exception_handling/exception_class_from_within_a_class.phpt @@ -151,13 +151,13 @@ $o->fL1(10); --EXPECTF-- L0: In try-block L0: In catch-block -$e = >Exception: L0 Message in %s/exception_handling/exception_class_from_within_a_class.php:131 +$e = >Exception: L0 Message in %s%eexception_handling%eexception_class_from_within_a_class.php:131 Stack trace: #0 {main}< getMessage: >L0 Message< getCode: >-1< getPrevious: >< -getFile: >%s/exception_handling/exception_class_from_within_a_class.php< +getFile: >%s%eexception_handling%eexception_class_from_within_a_class.php< getLine: >131< getTraceAsString: >#0 {main}< array(0) { @@ -169,22 +169,22 @@ L0: Beyond try/catch/finally blocks L0: Calling fL1 fL1: In try-block fL1: In catch-block -$e = >Exception: fL1 Message in %s/exception_handling/exception_class_from_within_a_class.php:57 +$e = >Exception: fL1 Message in %s%eexception_handling%eexception_class_from_within_a_class.php:57 Stack trace: -#0 %s/exception_handling/exception_class_from_within_a_class.php(146): MyClass->fL1(10) +#0 %s%eexception_handling%eexception_class_from_within_a_class.php(146): MyClass->fL1(10) #1 {main}< getMessage: >fL1 Message< getCode: >123< getPrevious: >< -getFile: >%s/exception_handling/exception_class_from_within_a_class.php< +getFile: >%s%eexception_handling%eexception_class_from_within_a_class.php< getLine: >57< -getTraceAsString: >#0 %s/exception_handling/exception_class_from_within_a_class.php(146): MyClass->fL1(10) +getTraceAsString: >#0 %s%eexception_handling%eexception_class_from_within_a_class.php(146): MyClass->fL1(10) #1 {main}< array(1) { [0]=> array(6) { ["file"]=> - string(%d) "%s/exception_handling/exception_class_from_within_a_class.php" + string(%d) "%s%eexception_handling%eexception_class_from_within_a_class.php" ["line"]=> int(146) ["function"]=> @@ -202,7 +202,7 @@ array(1) { } Trace Info: Key[0]: - Key[file] => >%s/exception_handling/exception_class_from_within_a_class.php< + Key[file] => >%s%eexception_handling%eexception_class_from_within_a_class.php< Key[line] => >146< Key[function] => >fL1< Key[class] => >MyClass< @@ -215,24 +215,24 @@ fL1: Beyond try/catch/finally blocks fL1: Calling fL2 fL2: In try-block fL2: In catch-block -$e = >Exception: fL2 Message in %s/exception_handling/exception_class_from_within_a_class.php:83 +$e = >Exception: fL2 Message in %s%eexception_handling%eexception_class_from_within_a_class.php:83 Stack trace: -#0 %s/exception_handling/exception_class_from_within_a_class.php(71): MyClass->fL2(2.3, -4.5) -#1 %s/exception_handling/exception_class_from_within_a_class.php(146): MyClass->fL1(10) +#0 %s%eexception_handling%eexception_class_from_within_a_class.php(71): MyClass->fL2(2.3, -4.5) +#1 %s%eexception_handling%eexception_class_from_within_a_class.php(146): MyClass->fL1(10) #2 {main}< getMessage: >fL2 Message< getCode: >234< getPrevious: >< -getFile: >%s/exception_handling/exception_class_from_within_a_class.php< +getFile: >%s%eexception_handling%eexception_class_from_within_a_class.php< getLine: >83< -getTraceAsString: >#0 %s/exception_handling/exception_class_from_within_a_class.php(71): MyClass->fL2(2.3, -4.5) -#1 %s/exception_handling/exception_class_from_within_a_class.php(146): MyClass->fL1(10) +getTraceAsString: >#0 %s%eexception_handling%eexception_class_from_within_a_class.php(71): MyClass->fL2(2.3, -4.5) +#1 %s%eexception_handling%eexception_class_from_within_a_class.php(146): MyClass->fL1(10) #2 {main}< array(2) { [0]=> array(6) { ["file"]=> - string(%d) "%s/exception_handling/exception_class_from_within_a_class.php" + string(%d) "%s%eexception_handling%eexception_class_from_within_a_class.php" ["line"]=> int(71) ["function"]=> @@ -252,7 +252,7 @@ array(2) { [1]=> array(6) { ["file"]=> - string(%d) "%s/exception_handling/exception_class_from_within_a_class.php" + string(%d) "%s%eexception_handling%eexception_class_from_within_a_class.php" ["line"]=> int(146) ["function"]=> @@ -270,7 +270,7 @@ array(2) { } Trace Info: Key[0]: - Key[file] => >%s/exception_handling/exception_class_from_within_a_class.php< + Key[file] => >%s%eexception_handling%eexception_class_from_within_a_class.php< Key[line] => >71< Key[function] => >fL2< Key[class] => >MyClass< @@ -279,7 +279,7 @@ Key[0]: Key[0] => >2.3< Key[1] => >-4.5< Key[1]: - Key[file] => >%s/exception_handling/exception_class_from_within_a_class.php< + Key[file] => >%s%eexception_handling%eexception_class_from_within_a_class.php< Key[line] => >146< Key[function] => >fL1< Key[class] => >MyClass< @@ -292,26 +292,26 @@ fL2: Beyond try/catch/finally blocks fL2: Calling fL3 fL3: In try-block fL3: In catch-block -$e = >Exception: fL3 Message in %s/exception_handling/exception_class_from_within_a_class.php:109 +$e = >Exception: fL3 Message in %s%eexception_handling%eexception_class_from_within_a_class.php:109 Stack trace: -#0 %s/exception_handling/exception_class_from_within_a_class.php(97): MyClass->fL3('xyz', NULL, true) -#1 %s/exception_handling/exception_class_from_within_a_class.php(71): MyClass->fL2(2.3, -4.5) -#2 %s/exception_handling/exception_class_from_within_a_class.php(146): MyClass->fL1(10) +#0 %s%eexception_handling%eexception_class_from_within_a_class.php(97): MyClass->fL3('xyz', NULL, true) +#1 %s%eexception_handling%eexception_class_from_within_a_class.php(71): MyClass->fL2(2.3, -4.5) +#2 %s%eexception_handling%eexception_class_from_within_a_class.php(146): MyClass->fL1(10) #3 {main}< getMessage: >fL3 Message< getCode: >345< getPrevious: >< -getFile: >%s/exception_handling/exception_class_from_within_a_class.php< +getFile: >%s%eexception_handling%eexception_class_from_within_a_class.php< getLine: >109< -getTraceAsString: >#0 %s/exception_handling/exception_class_from_within_a_class.php(97): MyClass->fL3('xyz', NULL, true) -#1 %s/exception_handling/exception_class_from_within_a_class.php(71): MyClass->fL2(2.3, -4.5) -#2 %s/exception_handling/exception_class_from_within_a_class.php(146): MyClass->fL1(10) +getTraceAsString: >#0 %s%eexception_handling%eexception_class_from_within_a_class.php(97): MyClass->fL3('xyz', NULL, true) +#1 %s%eexception_handling%eexception_class_from_within_a_class.php(71): MyClass->fL2(2.3, -4.5) +#2 %s%eexception_handling%eexception_class_from_within_a_class.php(146): MyClass->fL1(10) #3 {main}< array(3) { [0]=> array(6) { ["file"]=> - string(%d) "%s/exception_handling/exception_class_from_within_a_class.php" + string(%d) "%s%eexception_handling%eexception_class_from_within_a_class.php" ["line"]=> int(97) ["function"]=> @@ -333,7 +333,7 @@ array(3) { [1]=> array(6) { ["file"]=> - string(%d) "%s/exception_handling/exception_class_from_within_a_class.php" + string(%d) "%s%eexception_handling%eexception_class_from_within_a_class.php" ["line"]=> int(71) ["function"]=> @@ -353,7 +353,7 @@ array(3) { [2]=> array(6) { ["file"]=> - string(%d) "%s/exception_handling/exception_class_from_within_a_class.php" + string(%d) "%s%eexception_handling%eexception_class_from_within_a_class.php" ["line"]=> int(146) ["function"]=> @@ -371,7 +371,7 @@ array(3) { } Trace Info: Key[0]: - Key[file] => >%s/exception_handling/exception_class_from_within_a_class.php< + Key[file] => >%s%eexception_handling%eexception_class_from_within_a_class.php< Key[line] => >97< Key[function] => >fL3< Key[class] => >MyClass< @@ -381,7 +381,7 @@ Key[0]: Key[1] => >< Key[2] => >1< Key[1]: - Key[file] => >%s/exception_handling/exception_class_from_within_a_class.php< + Key[file] => >%s%eexception_handling%eexception_class_from_within_a_class.php< Key[line] => >71< Key[function] => >fL2< Key[class] => >MyClass< @@ -390,7 +390,7 @@ Key[1]: Key[0] => >2.3< Key[1] => >-4.5< Key[2]: - Key[file] => >%s/exception_handling/exception_class_from_within_a_class.php< + Key[file] => >%s%eexception_handling%eexception_class_from_within_a_class.php< Key[line] => >146< Key[function] => >fL1< Key[class] => >MyClass< diff --git a/tests/exception_handling/exception_class_using_conditional_functions.phpt b/tests/exception_handling/exception_class_using_conditional_functions.phpt index ef5590d5..b3fca692 100644 --- a/tests/exception_handling/exception_class_using_conditional_functions.phpt +++ b/tests/exception_handling/exception_class_using_conditional_functions.phpt @@ -151,13 +151,13 @@ fL1(10); --EXPECTF-- L0: In try-block L0: In catch-block -$e = >Exception: L0 Message in %s/exception_handling/exception_class_using_conditional_functions.php:133 +$e = >Exception: L0 Message in %s%eexception_handling%eexception_class_using_conditional_functions.php:133 Stack trace: #0 {main}< getMessage: >L0 Message< getCode: >-1< getPrevious: >< -getFile: >%s/exception_handling/exception_class_using_conditional_functions.php< +getFile: >%s%eexception_handling%eexception_class_using_conditional_functions.php< getLine: >133< getTraceAsString: >#0 {main}< array(0) { @@ -169,22 +169,22 @@ L0: Beyond try/catch/finally blocks L0: Calling fL1 fL1: In try-block fL1: In catch-block -$e = >Exception: fL1 Message in %s/exception_handling/exception_class_using_conditional_functions.php:107 +$e = >Exception: fL1 Message in %s%eexception_handling%eexception_class_using_conditional_functions.php:107 Stack trace: -#0 %s/exception_handling/exception_class_using_conditional_functions.php(146): fL1(10) +#0 %s%eexception_handling%eexception_class_using_conditional_functions.php(146): fL1(10) #1 {main}< getMessage: >fL1 Message< getCode: >123< getPrevious: >< -getFile: >%s/exception_handling/exception_class_using_conditional_functions.php< +getFile: >%s%eexception_handling%eexception_class_using_conditional_functions.php< getLine: >107< -getTraceAsString: >#0 %s/exception_handling/exception_class_using_conditional_functions.php(146): fL1(10) +getTraceAsString: >#0 %s%eexception_handling%eexception_class_using_conditional_functions.php(146): fL1(10) #1 {main}< array(1) { [0]=> array(4) { ["file"]=> - string(%d) "%s/exception_handling/exception_class_using_conditional_functions.php" + string(%d) "%s%eexception_handling%eexception_class_using_conditional_functions.php" ["line"]=> int(146) ["function"]=> @@ -198,7 +198,7 @@ array(1) { } Trace Info: Key[0]: - Key[file] => >%s/exception_handling/exception_class_using_conditional_functions.php< + Key[file] => >%s%eexception_handling%eexception_class_using_conditional_functions.php< Key[line] => >146< Key[function] => >fL1< Key[args]: @@ -209,24 +209,24 @@ fL1: Beyond try/catch/finally blocks fL1: Calling fL2 fL2: In try-block fL2: In catch-block -$e = >Exception: fL2 Message in %s/exception_handling/exception_class_using_conditional_functions.php:83 +$e = >Exception: fL2 Message in %s%eexception_handling%eexception_class_using_conditional_functions.php:83 Stack trace: -#0 %s/exception_handling/exception_class_using_conditional_functions.php(123): fL2(2.3, -4.5) -#1 %s/exception_handling/exception_class_using_conditional_functions.php(146): fL1(10) +#0 %s%eexception_handling%eexception_class_using_conditional_functions.php(123): fL2(2.3, -4.5) +#1 %s%eexception_handling%eexception_class_using_conditional_functions.php(146): fL1(10) #2 {main}< getMessage: >fL2 Message< getCode: >234< getPrevious: >< -getFile: >%s/exception_handling/exception_class_using_conditional_functions.php< +getFile: >%s%eexception_handling%eexception_class_using_conditional_functions.php< getLine: >83< -getTraceAsString: >#0 %s/exception_handling/exception_class_using_conditional_functions.php(123): fL2(2.3, -4.5) -#1 %s/exception_handling/exception_class_using_conditional_functions.php(146): fL1(10) +getTraceAsString: >#0 %s%eexception_handling%eexception_class_using_conditional_functions.php(123): fL2(2.3, -4.5) +#1 %s%eexception_handling%eexception_class_using_conditional_functions.php(146): fL1(10) #2 {main}< array(2) { [0]=> array(4) { ["file"]=> - string(%d) "%s/exception_handling/exception_class_using_conditional_functions.php" + string(%d) "%s%eexception_handling%eexception_class_using_conditional_functions.php" ["line"]=> int(123) ["function"]=> @@ -242,7 +242,7 @@ array(2) { [1]=> array(4) { ["file"]=> - string(%d) "%s/exception_handling/exception_class_using_conditional_functions.php" + string(%d) "%s%eexception_handling%eexception_class_using_conditional_functions.php" ["line"]=> int(146) ["function"]=> @@ -256,14 +256,14 @@ array(2) { } Trace Info: Key[0]: - Key[file] => >%s/exception_handling/exception_class_using_conditional_functions.php< + Key[file] => >%s%eexception_handling%eexception_class_using_conditional_functions.php< Key[line] => >123< Key[function] => >fL2< Key[args]: Key[0] => >2.3< Key[1] => >-4.5< Key[1]: - Key[file] => >%s/exception_handling/exception_class_using_conditional_functions.php< + Key[file] => >%s%eexception_handling%eexception_class_using_conditional_functions.php< Key[line] => >146< Key[function] => >fL1< Key[args]: @@ -274,26 +274,26 @@ fL2: Beyond try/catch/finally blocks fL2: Calling fL3 fL3: In try-block fL3: In catch-block -$e = >Exception: fL3 Message in %s/exception_handling/exception_class_using_conditional_functions.php:65 +$e = >Exception: fL3 Message in %s%eexception_handling%eexception_class_using_conditional_functions.php:65 Stack trace: -#0 %s/exception_handling/exception_class_using_conditional_functions.php(99): fL3('xyz', NULL, true) -#1 %s/exception_handling/exception_class_using_conditional_functions.php(123): fL2(2.3, -4.5) -#2 %s/exception_handling/exception_class_using_conditional_functions.php(146): fL1(10) +#0 %s%eexception_handling%eexception_class_using_conditional_functions.php(99): fL3('xyz', NULL, true) +#1 %s%eexception_handling%eexception_class_using_conditional_functions.php(123): fL2(2.3, -4.5) +#2 %s%eexception_handling%eexception_class_using_conditional_functions.php(146): fL1(10) #3 {main}< getMessage: >fL3 Message< getCode: >345< getPrevious: >< -getFile: >%s/exception_handling/exception_class_using_conditional_functions.php< +getFile: >%s%eexception_handling%eexception_class_using_conditional_functions.php< getLine: >65< -getTraceAsString: >#0 %s/exception_handling/exception_class_using_conditional_functions.php(99): fL3('xyz', NULL, true) -#1 %s/exception_handling/exception_class_using_conditional_functions.php(123): fL2(2.3, -4.5) -#2 %s/exception_handling/exception_class_using_conditional_functions.php(146): fL1(10) +getTraceAsString: >#0 %s%eexception_handling%eexception_class_using_conditional_functions.php(99): fL3('xyz', NULL, true) +#1 %s%eexception_handling%eexception_class_using_conditional_functions.php(123): fL2(2.3, -4.5) +#2 %s%eexception_handling%eexception_class_using_conditional_functions.php(146): fL1(10) #3 {main}< array(3) { [0]=> array(4) { ["file"]=> - string(%d) "%s/exception_handling/exception_class_using_conditional_functions.php" + string(%d) "%s%eexception_handling%eexception_class_using_conditional_functions.php" ["line"]=> int(99) ["function"]=> @@ -311,7 +311,7 @@ array(3) { [1]=> array(4) { ["file"]=> - string(%d) "%s/exception_handling/exception_class_using_conditional_functions.php" + string(%d) "%s%eexception_handling%eexception_class_using_conditional_functions.php" ["line"]=> int(123) ["function"]=> @@ -327,7 +327,7 @@ array(3) { [2]=> array(4) { ["file"]=> - string(%d) "%s/exception_handling/exception_class_using_conditional_functions.php" + string(%d) "%s%eexception_handling%eexception_class_using_conditional_functions.php" ["line"]=> int(146) ["function"]=> @@ -341,7 +341,7 @@ array(3) { } Trace Info: Key[0]: - Key[file] => >%s/exception_handling/exception_class_using_conditional_functions.php< + Key[file] => >%s%eexception_handling%eexception_class_using_conditional_functions.php< Key[line] => >99< Key[function] => >fL3< Key[args]: @@ -349,14 +349,14 @@ Key[0]: Key[1] => >< Key[2] => >1< Key[1]: - Key[file] => >%s/exception_handling/exception_class_using_conditional_functions.php< + Key[file] => >%s%eexception_handling%eexception_class_using_conditional_functions.php< Key[line] => >123< Key[function] => >fL2< Key[args]: Key[0] => >2.3< Key[1] => >-4.5< Key[2]: - Key[file] => >%s/exception_handling/exception_class_using_conditional_functions.php< + Key[file] => >%s%eexception_handling%eexception_class_using_conditional_functions.php< Key[line] => >146< Key[function] => >fL1< Key[args]: diff --git a/tests/exception_handling/myrangeexception_test1.phpt b/tests/exception_handling/myrangeexception_test1.phpt index 642122a8..a6f945cf 100644 --- a/tests/exception_handling/myrangeexception_test1.phpt +++ b/tests/exception_handling/myrangeexception_test1.phpt @@ -34,7 +34,7 @@ object(MyRangeException)#1 (10) { ["code":protected]=> int(0) ["file":protected]=> - string(%d) "%s/exception_handling/myrangeexception_test1.php" + string(%d) "%s%eexception_handling%emyrangeexception_test1.php" ["line":protected]=> int(13) ["trace":"Exception":private]=> @@ -44,6 +44,6 @@ object(MyRangeException)#1 (10) { NULL } ======= -$re = >MyRangeException: xxx in %s/exception_handling/myrangeexception_test1.php:13 +$re = >MyRangeException: xxx in %s%eexception_handling%emyrangeexception_test1.php:13 Stack trace: #0 {main}, badValue: 5, lowerValue: 20, upperValue: 30< diff --git a/tests/exception_handling/set_exception_handler.phpt b/tests/exception_handling/set_exception_handler.phpt index d4f60e9f..a610e131 100644 --- a/tests/exception_handling/set_exception_handler.phpt +++ b/tests/exception_handling/set_exception_handler.phpt @@ -99,22 +99,22 @@ About to call f In try-block In finally-block In MyDefExHandler -$e = >Exception: Watson, come here! in %s/exception_handling/set_exception_handler.php:73 +$e = >Exception: Watson, come here! in %s%eexception_handling%eset_exception_handler.php:73 Stack trace: -#0 %s/exception_handling/set_exception_handler.php(90): f(10, true) +#0 %s%eexception_handling%eset_exception_handler.php(90): f(10, true) #1 {main}< getMessage: >Watson, come here!< getCode: >1234< getPrevious: >< -getFile: >%s/exception_handling/set_exception_handler.php< +getFile: >%s%eexception_handling%eset_exception_handler.php< getLine: >73< -getTraceAsString: >#0 %s/exception_handling/set_exception_handler.php(90): f(10, true) +getTraceAsString: >#0 %s%eexception_handling%eset_exception_handler.php(90): f(10, true) #1 {main}< array(1) { [0]=> array(4) { ["file"]=> - string(%d) "%s/exception_handling/set_exception_handler.php" + string(%d) "%s%eexception_handling%eset_exception_handler.php" ["line"]=> int(90) ["function"]=> @@ -130,7 +130,7 @@ array(1) { } Trace Info: Key[0]: - Key[file] => >%s/exception_handling/set_exception_handler.php< + Key[file] => >%s%eexception_handling%eset_exception_handler.php< Key[line] => >90< Key[function] => >f< Key[args]: diff --git a/tests/expressions/source_file_inclusion/include.phpt b/tests/expressions/source_file_inclusion/include.phpt index 9c8e570b..a54e9585 100644 --- a/tests/expressions/source_file_inclusion/include.phpt +++ b/tests/expressions/source_file_inclusion/include.phpt @@ -107,17 +107,17 @@ echo "----------------------------------\n"; print_r(get_included_files()); --EXPECTF-- -Inside file >%s/expressions/source_file_inclusion/include.php< at line >11< with namespace >< +Inside file >%s%eexpressions%esource_file_inclusion%einclude.php< at line >11< with namespace >< Warning: %a include file does not exist ================= xxx ================= -Inside file >%s/expressions/source_file_inclusion/limits.inc< at line >14< with namespace >MyInclude< +Inside file >%s%eexpressions%esource_file_inclusion%elimits.inc< at line >14< with namespace >MyInclude< int(1) -Inside file >%s/expressions/source_file_inclusion/include.php< at line >29< with namespace >< -Inside file >%s/expressions/source_file_inclusion/mycolors.inc< at line >13< with namespace >MyColors< +Inside file >%s%eexpressions%esource_file_inclusion%einclude.php< at line >29< with namespace >< +Inside file >%s%eexpressions%esource_file_inclusion%emycolors.inc< at line >13< with namespace >MyColors< int(1) -Inside file >%s/expressions/source_file_inclusion/include.php< at line >37< with namespace >< +Inside file >%s%eexpressions%esource_file_inclusion%einclude.php< at line >37< with namespace >< ---------------------------------- MY_MIN is not defined ---------------------------------- @@ -126,40 +126,40 @@ NULL int(987) ---------------------------------- ---------------------------------- -Inside file >%s/expressions/source_file_inclusion/include.php< at line >86< +Inside file >%s%eexpressions%esource_file_inclusion%einclude.php< at line >86< ---------------------------------- int(100) ==== Array ( - [0] => %s/expressions/source_file_inclusion/include.php - [1] => %s/expressions/source_file_inclusion/limits.inc - [2] => %s/expressions/source_file_inclusion/mycolors.inc - [3] => %s/expressions/source_file_inclusion/return_none.inc - [4] => %s/expressions/source_file_inclusion/return_without_value.inc - [5] => %s/expressions/source_file_inclusion/return_with_value.inc - [6] => %s/expressions/source_file_inclusion/test.inc + [0] => %s%eexpressions%esource_file_inclusion%einclude.php + [1] => %s%eexpressions%esource_file_inclusion%elimits.inc + [2] => %s%eexpressions%esource_file_inclusion%emycolors.inc + [3] => %s%eexpressions%esource_file_inclusion%ereturn_none.inc + [4] => %s%eexpressions%esource_file_inclusion%ereturn_without_value.inc + [5] => %s%eexpressions%esource_file_inclusion%ereturn_with_value.inc + [6] => %s%eexpressions%esource_file_inclusion%etest.inc ) ==== int(1) ---------------------------------- -Inside file >%s/expressions/source_file_inclusion/include.php< at line >95< -Inside test() in %s/expressions/source_file_inclusion/test.inc +Inside file >%s%eexpressions%esource_file_inclusion%einclude.php< at line >95< +Inside test() in %s%eexpressions%esource_file_inclusion%etest.inc Notice: Undefined variable: v1 in %s on line %d Notice: Undefined variable: v2 in %s on line %d $v1: , $v2: $local1: 100 -Inside file >%s/expressions/source_file_inclusion/include.php< at line >99< +Inside file >%s%eexpressions%esource_file_inclusion%einclude.php< at line >99< ---------------------------------- Array ( - [0] => %s/expressions/source_file_inclusion/include.php - [1] => %s/expressions/source_file_inclusion/limits.inc - [2] => %s/expressions/source_file_inclusion/mycolors.inc - [3] => %s/expressions/source_file_inclusion/return_none.inc - [4] => %s/expressions/source_file_inclusion/return_without_value.inc - [5] => %s/expressions/source_file_inclusion/return_with_value.inc - [6] => %s/expressions/source_file_inclusion/test.inc + [0] => %s%eexpressions%esource_file_inclusion%einclude.php + [1] => %s%eexpressions%esource_file_inclusion%elimits.inc + [2] => %s%eexpressions%esource_file_inclusion%emycolors.inc + [3] => %s%eexpressions%esource_file_inclusion%ereturn_none.inc + [4] => %s%eexpressions%esource_file_inclusion%ereturn_without_value.inc + [5] => %s%eexpressions%esource_file_inclusion%ereturn_with_value.inc + [6] => %s%eexpressions%esource_file_inclusion%etest.inc ) diff --git a/tests/expressions/source_file_inclusion/include_once.phpt b/tests/expressions/source_file_inclusion/include_once.phpt index 2dd96ded..abd7df35 100644 --- a/tests/expressions/source_file_inclusion/include_once.phpt +++ b/tests/expressions/source_file_inclusion/include_once.phpt @@ -74,8 +74,8 @@ int(1) ---------------------------------- Array ( - [0] => %s/expressions/source_file_inclusion/include_once.php - [1] => %s/expressions/source_file_inclusion/Positions.inc - [2] => %s/expressions/source_file_inclusion/Point.inc - [3] => %s/expressions/source_file_inclusion/Circle.inc + [0] => %s%eexpressions%esource_file_inclusion%einclude_once.php + [1] => %s%eexpressions%esource_file_inclusion%ePositions.inc + [2] => %s%eexpressions%esource_file_inclusion%ePoint.inc + [3] => %s%eexpressions%esource_file_inclusion%eCircle.inc ) diff --git a/tests/expressions/source_file_inclusion/require.phpt b/tests/expressions/source_file_inclusion/require.phpt index c9a36b29..f50dd6e8 100644 --- a/tests/expressions/source_file_inclusion/require.phpt +++ b/tests/expressions/source_file_inclusion/require.phpt @@ -107,14 +107,14 @@ echo "----------------------------------\n"; print_r(get_included_files()); --EXPECTF-- -Inside file >%s/expressions/source_file_inclusion/require.php< at line >11< with namespace >< +Inside file >%s%eexpressions%esource_file_inclusion%erequire.php< at line >11< with namespace >< ================= xxx ================= -Inside file >%s/expressions/source_file_inclusion/limits.inc< at line >14< with namespace >MyInclude< +Inside file >%s%eexpressions%esource_file_inclusion%elimits.inc< at line >14< with namespace >MyInclude< int(1) -Inside file >%s/expressions/source_file_inclusion/require.php< at line >29< with namespace >< -Inside file >%s/expressions/source_file_inclusion/mycolors.inc< at line >13< with namespace >MyColors< +Inside file >%s%eexpressions%esource_file_inclusion%erequire.php< at line >29< with namespace >< +Inside file >%s%eexpressions%esource_file_inclusion%emycolors.inc< at line >13< with namespace >MyColors< int(1) -Inside file >%s/expressions/source_file_inclusion/require.php< at line >37< with namespace >< +Inside file >%s%eexpressions%esource_file_inclusion%erequire.php< at line >37< with namespace >< ---------------------------------- MY_MIN is not defined ---------------------------------- @@ -123,40 +123,40 @@ NULL int(987) ---------------------------------- ---------------------------------- -Inside file >%s/expressions/source_file_inclusion/require.php< at line >86< +Inside file >%s%eexpressions%esource_file_inclusion%erequire.php< at line >86< ---------------------------------- int(100) ==== Array ( - [0] => %s/expressions/source_file_inclusion/require.php - [1] => %s/expressions/source_file_inclusion/limits.inc - [2] => %s/expressions/source_file_inclusion/mycolors.inc - [3] => %s/expressions/source_file_inclusion/return_none.inc - [4] => %s/expressions/source_file_inclusion/return_without_value.inc - [5] => %s/expressions/source_file_inclusion/return_with_value.inc - [6] => %s/expressions/source_file_inclusion/test.inc + [0] => %s%eexpressions%esource_file_inclusion%erequire.php + [1] => %s%eexpressions%esource_file_inclusion%elimits.inc + [2] => %s%eexpressions%esource_file_inclusion%emycolors.inc + [3] => %s%eexpressions%esource_file_inclusion%ereturn_none.inc + [4] => %s%eexpressions%esource_file_inclusion%ereturn_without_value.inc + [5] => %s%eexpressions%esource_file_inclusion%ereturn_with_value.inc + [6] => %s%eexpressions%esource_file_inclusion%etest.inc ) ==== int(1) ---------------------------------- -Inside file >%s/expressions/source_file_inclusion/require.php< at line >95< -Inside test() in %s/expressions/source_file_inclusion/test.inc +Inside file >%s%eexpressions%esource_file_inclusion%erequire.php< at line >95< +Inside test() in %s%eexpressions%esource_file_inclusion%etest.inc Notice: Undefined variable: v1 in %s on line %d Notice: Undefined variable: v2 in %s on line %d $v1: , $v2: $local1: 100 -Inside file >%s/expressions/source_file_inclusion/require.php< at line >99< +Inside file >%s%eexpressions%esource_file_inclusion%erequire.php< at line >99< ---------------------------------- Array ( - [0] => %s/expressions/source_file_inclusion/require.php - [1] => %s/expressions/source_file_inclusion/limits.inc - [2] => %s/expressions/source_file_inclusion/mycolors.inc - [3] => %s/expressions/source_file_inclusion/return_none.inc - [4] => %s/expressions/source_file_inclusion/return_without_value.inc - [5] => %s/expressions/source_file_inclusion/return_with_value.inc - [6] => %s/expressions/source_file_inclusion/test.inc + [0] => %s%eexpressions%esource_file_inclusion%erequire.php + [1] => %s%eexpressions%esource_file_inclusion%elimits.inc + [2] => %s%eexpressions%esource_file_inclusion%emycolors.inc + [3] => %s%eexpressions%esource_file_inclusion%ereturn_none.inc + [4] => %s%eexpressions%esource_file_inclusion%ereturn_without_value.inc + [5] => %s%eexpressions%esource_file_inclusion%ereturn_with_value.inc + [6] => %s%eexpressions%esource_file_inclusion%etest.inc ) diff --git a/tests/expressions/source_file_inclusion/require_once.phpt b/tests/expressions/source_file_inclusion/require_once.phpt index e3a6aaad..5ddee89f 100644 --- a/tests/expressions/source_file_inclusion/require_once.phpt +++ b/tests/expressions/source_file_inclusion/require_once.phpt @@ -72,8 +72,8 @@ int(1) ---------------------------------- Array ( - [0] => %s/expressions/source_file_inclusion/require_once.php - [1] => %s/expressions/source_file_inclusion/Positions.inc - [2] => %s/expressions/source_file_inclusion/Point.inc - [3] => %s/expressions/source_file_inclusion/Circle.inc + [0] => %s%eexpressions%esource_file_inclusion%erequire_once.php + [1] => %s%eexpressions%esource_file_inclusion%ePositions.inc + [2] => %s%eexpressions%esource_file_inclusion%ePoint.inc + [3] => %s%eexpressions%esource_file_inclusion%eCircle.inc ) diff --git a/tests/expressions/unary_operators/cast.phpt b/tests/expressions/unary_operators/cast.phpt index 9c714384..df53d70d 100644 --- a/tests/expressions/unary_operators/cast.phpt +++ b/tests/expressions/unary_operators/cast.phpt @@ -455,7 +455,7 @@ array(2) { int(1) float(1) -Notice: Array to string conversion in %s/expressions/unary_operators/cast.php on line %d +Notice: Array to string conversion in %s%eexpressions%eunary_operators%ecast.php on line %d string(5) "Array" array(2) { [5]=> @@ -484,7 +484,7 @@ array(4) { int(1) float(1) -Notice: Array to string conversion in %s/expressions/unary_operators/cast.php on line %d +Notice: Array to string conversion in %s%eexpressions%eunary_operators%ecast.php on line %d string(5) "Array" array(4) { [0]=> @@ -554,7 +554,7 @@ object(E)#3 (3) { $key: >Epriv_prop<, len: 12, $val: >< $key: >*prot_prop<, len: 12, $val: >12.345< -Notice: Array to string conversion in %s/expressions/unary_operators/cast.php on line %d +Notice: Array to string conversion in %s%eexpressions%eunary_operators%ecast.php on line %d $key: >publ_prop<, len: 9, $val: >Array< --------------- resource(1) of type (stream) diff --git a/tests/variables/predefined_variables.phpt b/tests/variables/predefined_variables.phpt index 59fec835..e805c6f1 100644 --- a/tests/variables/predefined_variables.phpt +++ b/tests/variables/predefined_variables.phpt @@ -19,7 +19,7 @@ var_dump($GLOBALS); int(1) array(1) { [0]=> - string(%d) "%s/variables/predefined_variables.php" + string(%d) "%s%evariables%epredefined_variables.php" } array(%d) {%a} array(%d) {%a} diff --git a/tests/variables/variable_names.phpt b/tests/variables/variable_names.phpt index d236317d..7a707c49 100644 --- a/tests/variables/variable_names.phpt +++ b/tests/variables/variable_names.phpt @@ -77,6 +77,6 @@ array(11) { ["argv"]=> array(1) { [0]=> - string(%d) "%s/tests/variables/variable_names.php" + string(%d) "%s%etests%evariables%evariable_names.php" } } From 8363acd2777df50d45b40edd14cfc9e9a15c73e5 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Sun, 15 Mar 2020 17:34:31 +0100 Subject: [PATCH 3/3] Make tests portable --- tests/constants/core_predefined_constants2.phpt | 4 ++-- .../execution_operator/execution_operator.phpt | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/constants/core_predefined_constants2.phpt b/tests/constants/core_predefined_constants2.phpt index 38028c35..ae32df9b 100644 --- a/tests/constants/core_predefined_constants2.phpt +++ b/tests/constants/core_predefined_constants2.phpt @@ -75,7 +75,7 @@ PHP_DEBUG: %s PHP_MAXPATHLEN: int(%d) PHP_OS: string(%d) "%s" PHP_SAPI: string(3) "cli" -PHP_EOL: string(1) " +PHP_EOL: string(%d) " " DEFAULT_INCLUDE_PATH: string(%d) "%S" PEAR_INSTALL_DIR: string(%d) "%S" @@ -88,7 +88,7 @@ PHP_DATADIR: string(%d) "%S" PHP_SYSCONFDIR: string(%d) "%S" PHP_CONFIG_FILE_PATH: string(%d) "%S" PHP_CONFIG_FILE_SCAN_DIR: string(%d) "%S" -PHP_SHLIB_SUFFIX: string(2) "so" +PHP_SHLIB_SUFFIX: string(%d) "%S" E_ERROR: int(1) E_WARNING: int(2) E_PARSE: int(4) diff --git a/tests/expressions/execution_operator/execution_operator.phpt b/tests/expressions/execution_operator/execution_operator.phpt index bd839de6..1e055d3a 100644 --- a/tests/expressions/execution_operator/execution_operator.phpt +++ b/tests/expressions/execution_operator/execution_operator.phpt @@ -11,15 +11,17 @@ PHP Spec test generated from ./expressions/execution_operator/execution_operator error_reporting(-1); +$ls = (substr(PHP_OS, 0, 3) != 'WIN') ? 'ls' : 'dir'; + ///* // $result = `dir *.*`; -$result = `ls`; +$result = `$ls`; var_dump($result); //*/ ///* // $result = `dir *.* >dirlist.txt`; -$result = `ls >dirlist.txt`; +$result = `$ls >dirlist.txt`; var_dump($result); unlink('dirlist.txt'); //*/ @@ -28,7 +30,7 @@ unlink('dirlist.txt'); $d = "dir"; $f = "*.*"; // $result = `$d {$f}`; -$result = `ls`; +$result = `$ls`; var_dump($result); //*/