dmitry                                   Mon, 21 Sep 2009 14:32:20 +0000

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

Log:
Fixed tests ("none" is an alias of "false" and it can't be used as a string 
value of ini option)

Changed paths:
    U   
php/php-src/branches/PHP_5_2/ext/standard/tests/strings/htmlentities02.phpt
    U   
php/php-src/branches/PHP_5_2/ext/standard/tests/strings/htmlentities03.phpt
    U   
php/php-src/branches/PHP_5_2/ext/standard/tests/strings/htmlentities04.phpt
    U   
php/php-src/branches/PHP_5_2/ext/standard/tests/strings/htmlentities15.phpt
    U   
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/htmlentities02.phpt
    U   
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/htmlentities03.phpt
    U   
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/htmlentities04.phpt
    U   
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/htmlentities15.phpt
    U   php/php-src/trunk/ext/standard/tests/strings/htmlentities02.phpt
    U   php/php-src/trunk/ext/standard/tests/strings/htmlentities03.phpt
    U   php/php-src/trunk/ext/standard/tests/strings/htmlentities04.phpt
    U   php/php-src/trunk/ext/standard/tests/strings/htmlentities15.phpt

Modified: 
php/php-src/branches/PHP_5_2/ext/standard/tests/strings/htmlentities02.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/tests/strings/htmlentities02.phpt 
2009-09-21 14:20:05 UTC (rev 288531)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/strings/htmlentities02.phpt 
2009-09-21 14:32:20 UTC (rev 288532)
@@ -10,7 +10,7 @@
 --INI--
 output_handler=
 default_charset=
-mbstring.internal_encoding=none
+mbstring.internal_encoding=pass
 --FILE--
 <?php
        setlocale(LC_CTYPE, "fr_FR.ISO-8859-15", "fr_FR.ISO8859-15", 
'fr...@euro');

Modified: 
php/php-src/branches/PHP_5_2/ext/standard/tests/strings/htmlentities03.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/tests/strings/htmlentities03.phpt 
2009-09-21 14:20:05 UTC (rev 288531)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/strings/htmlentities03.phpt 
2009-09-21 14:32:20 UTC (rev 288532)
@@ -10,7 +10,7 @@
 --INI--
 output_handler=
 default_charset=
-mbstring.internal_encoding=none
+mbstring.internal_encoding=pass
 --FILE--
 <?php
        setlocale( LC_CTYPE, "de_DE.ISO-8859-1", "de_DE.ISO8859-1");

Modified: 
php/php-src/branches/PHP_5_2/ext/standard/tests/strings/htmlentities04.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/tests/strings/htmlentities04.phpt 
2009-09-21 14:20:05 UTC (rev 288531)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/strings/htmlentities04.phpt 
2009-09-21 14:32:20 UTC (rev 288532)
@@ -10,7 +10,7 @@
 --INI--
 output_handler=
 default_charset=
-mbstring.internal_encoding=none
+mbstring.internal_encoding=pass
 --FILE--
 <?php
        setlocale( LC_CTYPE, "ja_JP.EUC-JP", "ja_JP.eucJP" );

Modified: 
php/php-src/branches/PHP_5_2/ext/standard/tests/strings/htmlentities15.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/tests/strings/htmlentities15.phpt 
2009-09-21 14:20:05 UTC (rev 288531)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/strings/htmlentities15.phpt 
2009-09-21 14:32:20 UTC (rev 288532)
@@ -3,7 +3,7 @@
 --INI--
 output_handler=
 default_charset=
-mbstring.internal_encoding=none
+mbstring.internal_encoding=pass
 --SKIPIF--
 <?php
 $result = (bool)setlocale(LC_CTYPE, "ru_RU.koi8r", "ru_RU.KOI8-R");

Modified: 
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/htmlentities02.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/htmlentities02.phpt 
2009-09-21 14:20:05 UTC (rev 288531)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/htmlentities02.phpt 
2009-09-21 14:32:20 UTC (rev 288532)
@@ -10,7 +10,7 @@
 --INI--
 output_handler=
 default_charset=
-mbstring.internal_encoding=none
+mbstring.internal_encoding=pass
 --FILE--
 <?php
        setlocale(LC_CTYPE, "fr_FR.ISO-8859-15", "fr_FR.ISO8859-15", 
'fr...@euro');

Modified: 
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/htmlentities03.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/htmlentities03.phpt 
2009-09-21 14:20:05 UTC (rev 288531)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/htmlentities03.phpt 
2009-09-21 14:32:20 UTC (rev 288532)
@@ -10,7 +10,7 @@
 --INI--
 output_handler=
 default_charset=
-mbstring.internal_encoding=none
+mbstring.internal_encoding=pass
 --FILE--
 <?php
        setlocale( LC_CTYPE, "de_DE.ISO-8859-1", "de_DE.ISO8859-1");

Modified: 
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/htmlentities04.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/htmlentities04.phpt 
2009-09-21 14:20:05 UTC (rev 288531)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/htmlentities04.phpt 
2009-09-21 14:32:20 UTC (rev 288532)
@@ -10,7 +10,7 @@
 --INI--
 output_handler=
 default_charset=
-mbstring.internal_encoding=none
+mbstring.internal_encoding=pass
 --FILE--
 <?php
        setlocale( LC_CTYPE, "ja_JP.EUC-JP", "ja_JP.eucJP" );

Modified: 
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/htmlentities15.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/htmlentities15.phpt 
2009-09-21 14:20:05 UTC (rev 288531)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/htmlentities15.phpt 
2009-09-21 14:32:20 UTC (rev 288532)
@@ -3,7 +3,7 @@
 --INI--
 output_handler=
 default_charset=
-mbstring.internal_encoding=none
+mbstring.internal_encoding=pass
 --SKIPIF--
 <?php
 $result = (bool)setlocale(LC_CTYPE, "ru_RU.koi8r", "ru_RU.KOI8-R");

Modified: php/php-src/trunk/ext/standard/tests/strings/htmlentities02.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/strings/htmlentities02.phpt    
2009-09-21 14:20:05 UTC (rev 288531)
+++ php/php-src/trunk/ext/standard/tests/strings/htmlentities02.phpt    
2009-09-21 14:32:20 UTC (rev 288532)
@@ -10,7 +10,7 @@
 --INI--
 output_handler=
 default_charset=
-mbstring.internal_encoding=none
+mbstring.internal_encoding=pass
 --FILE--
 <?php
        setlocale(LC_CTYPE, "fr_FR.ISO-8859-15", "fr_FR.ISO8859-15", 
'fr...@euro');

Modified: php/php-src/trunk/ext/standard/tests/strings/htmlentities03.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/strings/htmlentities03.phpt    
2009-09-21 14:20:05 UTC (rev 288531)
+++ php/php-src/trunk/ext/standard/tests/strings/htmlentities03.phpt    
2009-09-21 14:32:20 UTC (rev 288532)
@@ -10,7 +10,7 @@
 --INI--
 output_handler=
 default_charset=
-mbstring.internal_encoding=none
+mbstring.internal_encoding=pass
 --FILE--
 <?php
        setlocale( LC_CTYPE, "de_DE.ISO-8859-1", "de_DE.ISO8859-1");

Modified: php/php-src/trunk/ext/standard/tests/strings/htmlentities04.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/strings/htmlentities04.phpt    
2009-09-21 14:20:05 UTC (rev 288531)
+++ php/php-src/trunk/ext/standard/tests/strings/htmlentities04.phpt    
2009-09-21 14:32:20 UTC (rev 288532)
@@ -10,7 +10,7 @@
 --INI--
 output_handler=
 default_charset=
-mbstring.internal_encoding=none
+mbstring.internal_encoding=pass
 --FILE--
 <?php
        setlocale( LC_CTYPE, "ja_JP.EUC-JP", "ja_JP.eucJP" );

Modified: php/php-src/trunk/ext/standard/tests/strings/htmlentities15.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/strings/htmlentities15.phpt    
2009-09-21 14:20:05 UTC (rev 288531)
+++ php/php-src/trunk/ext/standard/tests/strings/htmlentities15.phpt    
2009-09-21 14:32:20 UTC (rev 288532)
@@ -3,7 +3,7 @@
 --INI--
 output_handler=
 default_charset=
-mbstring.internal_encoding=none
+mbstring.internal_encoding=pass
 unicode.script_encoding=KOI-8
 unicode.output_encoding=KOI-8
 --SKIPIF--

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

Reply via email to