FIxed tests (new error message - E_DEPRECATED)

diff --git a/ext/json/tests/bug41403.phpt b/ext/json/tests/bug41403.phpt
index 67febcbf12bd7f603a78112030525fc49cfe4458..86f47be740dff2c8a898432563195540dce16c8d 100644 (file)
--- a/ext/json/tests/bug41403.phpt
+++ b/ext/json/tests/bug41403.phpt
@@ -43,7 +43,7 @@ array(2) {
 }
 Done
 --UEXPECTF--
-Strict Standards: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d
+Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d
 array(1) {
   [0]=>
   float(2,1)

diff --git a/ext/standard/tests/array/locale_sort.phpt b/ext/standard/tests/array/locale_sort.phpt
index 457d3ad21469257d104e8a2bd9f3f2e7755b1fca..e12540e905bd77857d65a05a5127e041b7c66a2b 100644 (file)
--- a/ext/standard/tests/array/locale_sort.phpt
+++ b/ext/standard/tests/array/locale_sort.phpt
@@ -58,7 +58,7 @@ array(13) {
   string(25) "Territoires du Nord-Ouest"
 }
 --UEXPECTF--
-Strict Standards: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d
+Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d
 array(13) {
   [u"AB"]=>
   unicode(7) "Alberta"

diff --git a/ext/standard/tests/strings/bug39873.phpt b/ext/standard/tests/strings/bug39873.phpt
index 68a5852fca7eef3487de699f3f7aee488c254a06..10baebe8decb58a563e8047809f498002b7ba860 100644 (file)
--- a/ext/standard/tests/strings/bug39873.phpt
+++ b/ext/standard/tests/strings/bug39873.phpt
@@ -16,5 +16,5 @@ if (!setlocale(LC_ALL, "ita","it","Italian","it_IT","it_IT.ISO8859-1","it_IT.ISO
 --EXPECT--
 1,234.56
 --UEXPECTF--
-Strict Standards: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d
+Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d
 1,234.56

diff --git a/ext/standard/tests/strings/htmlentities.phpt b/ext/standard/tests/strings/htmlentities.phpt
index 6c7ecaa82ccca08f5697a61e971e60ce24681a6c..bce9ac9bc4b6e16da86341813949111b87301562 100644 (file)
--- a/ext/standard/tests/strings/htmlentities.phpt
+++ b/ext/standard/tests/strings/htmlentities.phpt
@@ -20,7 +20,7 @@ echo html_entity_decode($ent_encoded);
 <>"&åÄ
 <>"&åÄ
 --UEXPECTF--
-Strict Standards: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d
+Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d
 &lt;&gt;&quot;&amp;åÄ
 &lt;&gt;&quot;&amp;&aring;&Auml;
 <>"&åÄ

diff --git a/ext/standard/tests/strings/moneyformat.phpt b/ext/standard/tests/strings/moneyformat.phpt
index 0cf9d6d34cf90073ab853f219ac15dc5fea5052d..3e7c2f117e4b199c40a6543e097842559b4366e6 100755 (executable)
--- a/ext/standard/tests/strings/moneyformat.phpt
+++ b/ext/standard/tests/strings/moneyformat.phpt
@@ -22,7 +22,7 @@ string(7) "X$3.14Y"
 Warning: money_format(): Only a single %ci or %cn token can be used in %s on line %d
 bool(false)
 --UEXPECTF--
-Strict Standards: setlocale(): deprecated in Unicode mode, please use ICU locale functions in /home/jani/src/php6/ext/standard/tests/strings/moneyformat.php on line 2
+Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in /home/jani/src/php6/ext/standard/tests/strings/moneyformat.php on line 2
 unicode(7) "X$3.14Y"
 
 Warning: money_format(): Only a single %i or %n token can be used in /home/jani/src/php6/ext/standard/tests/strings/moneyformat.php on line 4

diff --git a/ext/standard/tests/strings/strtotitle.phpt b/ext/standard/tests/strings/strtotitle.phpt
index e302c0329f5a1bd5db23a1c541e5a08f831ace52..bc21d2a622eef1d9e6efb0e0fc87ff76681835fb 100644 (file)
--- a/ext/standard/tests/strings/strtotitle.phpt
+++ b/ext/standard/tests/strings/strtotitle.phpt
@@ -30,7 +30,7 @@ foreach( $strings as $string )
 Året ßen
 Året ßen
 --UEXPECTF--
-Strict Standards: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d
+Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d
 SSen
 Ssen
 Året

diff --git a/ext/standard/tests/strings/strtoupper.phpt b/ext/standard/tests/strings/strtoupper.phpt
index 59695bf5279d20abf44d97c2710389f53b823c3f..2042b0a06a67a949164cc3801f81ad761264200c 100644 (file)
--- a/ext/standard/tests/strings/strtoupper.phpt
+++ b/ext/standard/tests/strings/strtoupper.phpt
@@ -22,5 +22,5 @@ echo strtoupper($chars)."\n";
 --EXPECT--
 ÄÖÜ
 --UEXPECTF--
-Strict Standards: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d
+Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d
 ÄÖÜ