[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/iconv/tests/bug52941.phpt branches/PHP_5_4/ext/iconv/tests/bug52941.phpt trunk/ext/iconv/tests/bug52941.phpt

[Matteo Beccati]

mbeccati                                 Wed, 31 Aug 2011 22:38:20 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=315937

Log:
Fixed test. Apparently it was already fixed on PHP_5_3 98% of the cases and
the fix wasn't ported to trunk/PHP_5_4. However the very same test was failing
on my FreeBSD 6.2 box, that appears to also decode the "ks_c_5601-1987" parts,
so I've made the test more generic.

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/iconv/tests/bug52941.phpt
    U   php/php-src/branches/PHP_5_4/ext/iconv/tests/bug52941.phpt
    U   php/php-src/trunk/ext/iconv/tests/bug52941.phpt

Modified: php/php-src/branches/PHP_5_3/ext/iconv/tests/bug52941.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/iconv/tests/bug52941.phpt  2011-08-31 
22:12:53 UTC (rev 315936)
+++ php/php-src/branches/PHP_5_3/ext/iconv/tests/bug52941.phpt  2011-08-31 
22:38:20 UTC (rev 315937)
@@ -28,14 +28,14 @@
 var_dump($decoded['X-Bar']);
 var_dump($decoded['To']);
 ?>
---EXPECT--
+--EXPECTF--
 string(17) "<f...@example.com>"
-string(29) "=?ks_c_5601-1987?B?UkU6odk=?="
-string(33) "=?ks_c_5601-1987?B?UkU6odk=?= Foo"
-string(32) "=?ks_c_5601-1987?B?UkU6odk=?=Foo"
+string(%d) "%s"
+string(%d) "%sFoo"
+string(%d) "%sFoo"
 string(18) "<t...@example.com>"
 string(17) "<f...@example.com>"
-string(29) "=?ks_c_5601-1987?B?UkU6odk=?="
-string(33) "=?ks_c_5601-1987?B?UkU6odk=?= Foo"
-string(32) "=?ks_c_5601-1987?B?UkU6odk=?=Foo"
+string(%d) "%s"
+string(%d) "%sFoo"
+string(%d) "%sFoo"
 string(18) "<t...@example.com>"

Modified: php/php-src/branches/PHP_5_4/ext/iconv/tests/bug52941.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/iconv/tests/bug52941.phpt  2011-08-31 
22:12:53 UTC (rev 315936)
+++ php/php-src/branches/PHP_5_4/ext/iconv/tests/bug52941.phpt  2011-08-31 
22:38:20 UTC (rev 315937)
@@ -28,14 +28,14 @@
 var_dump($decoded['X-Bar']);
 var_dump($decoded['To']);
 ?>
---EXPECT--
+--EXPECTF--
 string(17) "<f...@example.com>"
-string(29) "=?ks_c_5601-1987?B?UkU6odk=?="
-string(33) "=?ks_c_5601-1987?B?UkU6odk=?= Foo"
-string(33) "=?ks_c_5601-1987?B?UkU6odk=?= Foo"
+string(%d) "%s"
+string(%d) "%sFoo"
+string(%d) "%sFoo"
 string(18) "<t...@example.com>"
 string(17) "<f...@example.com>"
-string(29) "=?ks_c_5601-1987?B?UkU6odk=?="
-string(33) "=?ks_c_5601-1987?B?UkU6odk=?= Foo"
-string(33) "=?ks_c_5601-1987?B?UkU6odk=?= Foo"
+string(%d) "%s"
+string(%d) "%sFoo"
+string(%d) "%sFoo"
 string(18) "<t...@example.com>"

Modified: php/php-src/trunk/ext/iconv/tests/bug52941.phpt
===================================================================
--- php/php-src/trunk/ext/iconv/tests/bug52941.phpt     2011-08-31 22:12:53 UTC 
(rev 315936)
+++ php/php-src/trunk/ext/iconv/tests/bug52941.phpt     2011-08-31 22:38:20 UTC 
(rev 315937)
@@ -28,14 +28,14 @@
 var_dump($decoded['X-Bar']);
 var_dump($decoded['To']);
 ?>
---EXPECT--
+--EXPECTF--
 string(17) "<f...@example.com>"
-string(29) "=?ks_c_5601-1987?B?UkU6odk=?="
-string(33) "=?ks_c_5601-1987?B?UkU6odk=?= Foo"
-string(33) "=?ks_c_5601-1987?B?UkU6odk=?= Foo"
+string(%d) "%s"
+string(%d) "%sFoo"
+string(%d) "%sFoo"
 string(18) "<t...@example.com>"
 string(17) "<f...@example.com>"
-string(29) "=?ks_c_5601-1987?B?UkU6odk=?="
-string(33) "=?ks_c_5601-1987?B?UkU6odk=?= Foo"
-string(33) "=?ks_c_5601-1987?B?UkU6odk=?= Foo"
+string(%d) "%s"
+string(%d) "%sFoo"
+string(%d) "%sFoo"
 string(18) "<t...@example.com>"


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php