From 49114611bb60cc5fb0ec5e44f6b59638f0a3dac1 Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Sat, 23 Feb 2008 22:30:08 +0000 Subject: [PATCH] FIxed tests (new error message - E_DEPRECATED) --- ext/json/tests/bug41403.phpt | 2 +- ext/standard/tests/array/locale_sort.phpt | 2 +- ext/standard/tests/strings/bug39873.phpt | 2 +- ext/standard/tests/strings/htmlentities.phpt | 2 +- ext/standard/tests/strings/moneyformat.phpt | 2 +- ext/standard/tests/strings/strtotitle.phpt | 2 +- ext/standard/tests/strings/strtoupper.phpt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ext/json/tests/bug41403.phpt b/ext/json/tests/bug41403.phpt index 67febcbf12..86f47be740 100644 --- 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 457d3ad214..e12540e905 100644 --- 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 68a5852fca..10baebe8de 100644 --- 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 6c7ecaa82c..bce9ac9bc4 100644 --- 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 <>"&åÄ <>"&åÄ <>"&åÄ diff --git a/ext/standard/tests/strings/moneyformat.phpt b/ext/standard/tests/strings/moneyformat.phpt index 0cf9d6d34c..3e7c2f117e 100755 --- 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 e302c0329f..bc21d2a622 100644 --- 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 59695bf527..2042b0a06a 100644 --- 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 ÄÖÜ -- 2.50.1