svn: /php/php-src/trunk/Zend/tests/ declare_001.phpt ns_086.phpt
| From: | Felipe Pena | Date: | Tue, 04 Jan 2011 22:01:09 +0000 |
| Subject: | svn: /php/php-src/trunk/Zend/tests/ declare_001.phpt ns_086.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-64259@lists.php.net to get a copy of this message | ||
felipe Tue, 04 Jan 2011 22:01:09 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=307094
Log:
- Fixed tests
Changed paths:
U php/php-src/trunk/Zend/tests/declare_001.phpt
U php/php-src/trunk/Zend/tests/ns_086.phpt
Modified: php/php-src/trunk/Zend/tests/declare_001.phpt
===================================================================
--- php/php-src/trunk/Zend/tests/declare_001.phpt 2011-01-04 19:18:50 UTC (rev 307093)
+++ php/php-src/trunk/Zend/tests/declare_001.phpt 2011-01-04 22:01:09 UTC (rev 307094)
@@ -1,11 +1,7 @@
--TEST--
Testing declare statement with several type values
---SKIPIF--
-<?php
-if (ini_get("zend.multibyte")) {
- die("skip Requires zend.multibyte=0");
-}
-?>
+--INI--
+zend.multibyte=1
--FILE--
<?php
@@ -19,4 +15,10 @@
?>
--EXPECTF--
-Fatal error: Cannot use constants as encoding in %sdeclare_001.php on line 7
+Warning: Unsupported encoding [1] in %sdeclare_001.php on line %d
+
+Warning: Unsupported encoding [1.1231312321313E+18] in %sdeclare_001.php on line %d
+
+Warning: Unsupported encoding [] in %sdeclare_001.php on line %d
+
+Fatal error: Cannot use constants as encoding in %sdeclare_001.php on line %d
\ No newline at end of file
Modified: php/php-src/trunk/Zend/tests/ns_086.phpt
===================================================================
--- php/php-src/trunk/Zend/tests/ns_086.phpt 2011-01-04 19:18:50 UTC (rev 307093)
+++ php/php-src/trunk/Zend/tests/ns_086.phpt 2011-01-04 22:01:09 UTC (rev 307094)
@@ -1,5 +1,13 @@
--TEST--
086: bracketed namespace with encoding
+--SKIPIF--
+<?php
+if (!extension_loaded("mbstring")) {
+ die("skip Requires mbstring extension");
+}
+?>
+--INI--
+zend.multibyte=1
--FILE--
<?php
declare(encoding='utf-8');