Fixed tests (new error message - E_DEPRECATED)

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 bc956f4a8961084480812d97970ed11300badab5..e485556909fc02ee1e9919c6769a4ec0e8b3bacd 100644 (file)
--- 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 735e588d6d30a5f12a7442201a660189535acf1a..a9c7b32a32d1eb9668d11cf511b32e923942da92 100644 (file)
--- 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 8ee9fea0a393d4d7f7c48e75b9f8d7e3a950cc3d..06f43c6a4d6c36e8e8c594a5a2b888ddd7cecc3c 100644 (file)
--- 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 71ab6ea20f53b2e7b1a176f36d1d17e4f7647aef..b1c54315e111e01edbd2958b2c410437c2a94baf 100644 (file)
--- 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 f5959f779a45fa8dec5d73d22bd8f3e3bace3790..1a6705a6236e7850dec756808751de47a94fa061 100644 (file)
--- 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 4d7c560cd10a17a0071d831ca8f3f9be87668818..5ce82f3f950c0b908f70a09aad16ae4f5c60cc6e 100644 (file)
--- 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 00676e89d5151bc28ac5a6dc66fe1693a6d5b5f2..a91f11cc555f1679e91c4b37f03ca03839caea65 100755 (executable)
--- 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--
 <?php
 function ref_map(&$item) {
@@ -24,9 +24,9 @@ echo 'Array: '; print_r($a);
 echo 'Return: '; print_r($ret);
 ?>
 --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 18bbf418da5127fe9025f7bb164d3fe3a1b7246c..1ddb8f36dc404a6d16e4a1515614fbf06421e8c7 100644 (file)
--- 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 be32757f10d81d728ddf0ae26dd6f0b67ffc122f..e6297d830998988fb8c97c33259fcc9225783160 100644 (file)
--- 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