From 482e4f2348a1f4f25d72fce2061b76b0641bd8b4 Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Sat, 23 Feb 2008 19:17:41 +0000 Subject: [PATCH] Fixed tests (new error message - E_DEPRECATED) --- .../array_change_key_case_variation7.phpt | 6 ++-- .../array/array_key_exists_variation4.phpt | 14 ++++----- .../tests/array/array_merge_variation9.phpt | 6 ++-- .../tests/array/array_push_variation4.phpt | 30 +++++++++---------- .../tests/array/array_slice_variation9.phpt | 6 ++-- .../tests/array/array_values_variation6.phpt | 6 ++-- ext/standard/tests/array/bug33940.phpt | 6 ++-- ext/standard/tests/array/each_variation4.phpt | 6 ++-- .../tests/array/rsort_variation4.phpt | 6 ++-- 9 files changed, 43 insertions(+), 43 deletions(-) diff --git a/ext/standard/tests/array/array_change_key_case_variation7.phpt b/ext/standard/tests/array/array_change_key_case_variation7.phpt index bc956f4a89..e485556909 100644 --- a/ext/standard/tests/array/array_change_key_case_variation7.phpt +++ b/ext/standard/tests/array/array_change_key_case_variation7.phpt @@ -36,7 +36,7 @@ echo "Done"; ?> --EXPECTF-- -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d *** Testing array_change_key_case() : usage variations *** -- $input argument is a reference to array -- @@ -89,7 +89,7 @@ array(3) { } Done --UEXPECTF-- -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d *** Testing array_change_key_case() : usage variations *** -- $input argument is a reference to array -- @@ -140,4 +140,4 @@ array(3) { [u"ABC"]=> unicode(3) "xyz" } -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_key_exists_variation4.phpt b/ext/standard/tests/array/array_key_exists_variation4.phpt index 735e588d6d..a9c7b32a32 100644 --- a/ext/standard/tests/array/array_key_exists_variation4.phpt +++ b/ext/standard/tests/array/array_key_exists_variation4.phpt @@ -31,11 +31,11 @@ echo "Done"; ?> --EXPECTF-- -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d *** Testing array_key_exists() : usage variations *** -- $search is a reference to $array -- @@ -48,11 +48,11 @@ bool(true) bool(true) Done --UEXPECTF-- -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d *** Testing array_key_exists() : usage variations *** -- $search is a reference to $array -- @@ -63,4 +63,4 @@ bool(true) -- Both arguments are referenced variables -- bool(true) -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_merge_variation9.phpt b/ext/standard/tests/array/array_merge_variation9.phpt index 8ee9fea0a3..06f43c6a4d 100644 --- a/ext/standard/tests/array/array_merge_variation9.phpt +++ b/ext/standard/tests/array/array_merge_variation9.phpt @@ -38,7 +38,7 @@ echo "Done"; ?> --EXPECTF-- -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d *** Testing array_merge() : usage variations *** -- Merge an array made up of referenced variables to an assoc. array -- @@ -112,7 +112,7 @@ array(3) { } Done --UEXPECTF-- -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d *** Testing array_merge() : usage variations *** -- Merge an array made up of referenced variables to an assoc. array -- @@ -184,4 +184,4 @@ array(3) { [u"key3"]=> unicode(4) "val3" } -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_push_variation4.phpt b/ext/standard/tests/array/array_push_variation4.phpt index 71ab6ea20f..b1c54315e1 100644 --- a/ext/standard/tests/array/array_push_variation4.phpt +++ b/ext/standard/tests/array/array_push_variation4.phpt @@ -36,19 +36,19 @@ var_dump($array); echo "Done"; ?> --EXPECTF-- -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d *** Testing array_push() : usage variations *** -- Pass array_push referenced varialbes as $var arguments -- @@ -142,19 +142,19 @@ array(10) { } Done --UEXPECTF-- -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d *** Testing array_push() : usage variations *** -- Pass array_push referenced varialbes as $var arguments -- @@ -246,4 +246,4 @@ array(10) { } } } -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_slice_variation9.phpt b/ext/standard/tests/array/array_slice_variation9.phpt index f5959f779a..1a6705a623 100644 --- a/ext/standard/tests/array/array_slice_variation9.phpt +++ b/ext/standard/tests/array/array_slice_variation9.phpt @@ -37,7 +37,7 @@ echo "Done"; ?> --EXPECTF-- -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d *** Testing array_slice() : usage variations *** -- Array of referenced variables ($preserve_keys = default) -- @@ -73,7 +73,7 @@ array(3) { } Done --UEXPECTF-- -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d *** Testing array_slice() : usage variations *** -- Array of referenced variables ($preserve_keys = default) -- @@ -107,4 +107,4 @@ array(3) { [2]=> int(3) } -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/array/array_values_variation6.phpt b/ext/standard/tests/array/array_values_variation6.phpt index 4d7c560cd1..5ce82f3f95 100644 --- a/ext/standard/tests/array/array_values_variation6.phpt +++ b/ext/standard/tests/array/array_values_variation6.phpt @@ -35,7 +35,7 @@ echo "Done"; ?> --EXPECTF-- -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d *** Testing array_values() : usage variations *** -- $input is an array made up of referenced variables: -- @@ -68,7 +68,7 @@ array(3) { } Done --UEXPECTF-- -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d *** Testing array_values() : usage variations *** -- $input is an array made up of referenced variables: -- @@ -99,4 +99,4 @@ array(3) { [2]=> int(3) } -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/array/bug33940.phpt b/ext/standard/tests/array/bug33940.phpt index 00676e89d5..a91f11cc55 100755 --- a/ext/standard/tests/array/bug33940.phpt +++ b/ext/standard/tests/array/bug33940.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #33940 (array_map() fails to pass by reference when called recursively) --INI-- -error_reporting=4095 +error_reporting=16383 --FILE-- --EXPECTF-- -Strict Standards: Call-time pass-by-reference has been deprecated in %sbug33940.php on line 7 +Deprecated: Call-time pass-by-reference has been deprecated in %sbug33940.php on line 7 -Strict Standards: Call-time pass-by-reference has been deprecated in %sbug33940.php on line 17 +Deprecated: Call-time pass-by-reference has been deprecated in %sbug33940.php on line 17 Array: Array ( [0] => Array diff --git a/ext/standard/tests/array/each_variation4.phpt b/ext/standard/tests/array/each_variation4.phpt index 18bbf418da..1ddb8f36dc 100644 --- a/ext/standard/tests/array/each_variation4.phpt +++ b/ext/standard/tests/array/each_variation4.phpt @@ -39,7 +39,7 @@ echo "Done"; ?> --EXPECTF-- -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d *** Testing each() : usage variations *** -- Array made up of referenced variables: -- @@ -88,7 +88,7 @@ array(3) { } Done --UEXPECTF-- -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d *** Testing each() : usage variations *** -- Array made up of referenced variables: -- @@ -135,4 +135,4 @@ array(3) { [2]=> unicode(3) "two" } -Done \ No newline at end of file +Done diff --git a/ext/standard/tests/array/rsort_variation4.phpt b/ext/standard/tests/array/rsort_variation4.phpt index be32757f10..e6297d8309 100644 --- a/ext/standard/tests/array/rsort_variation4.phpt +++ b/ext/standard/tests/array/rsort_variation4.phpt @@ -41,7 +41,7 @@ var_dump( $temp_array); echo "Done"; ?> --EXPECTF-- -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d *** Testing rsort() : variation *** -- 'flag' value is defualt -- @@ -78,7 +78,7 @@ array(3) { } Done --UEXPECTF-- -Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d +Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d *** Testing rsort() : variation *** -- 'flag' value is defualt -- @@ -113,4 +113,4 @@ array(3) { [2]=> &int(33) } -Done \ No newline at end of file +Done -- 2.50.1