--- embedaddon/php/Zend/tests/declare_001.phpt	2012/02/21 23:47:52	1.1.1.1
+++ embedaddon/php/Zend/tests/declare_001.phpt	2012/05/29 12:34:36	1.1.1.2
@@ -2,21 +2,29 @@
 Testing declare statement with several type values
 --SKIPIF--
 <?php
-if (in_array("detect_unicode", array_keys(ini_get_all()))) {
-  die("skip");
+if (!extension_loaded("mbstring")) {
+  die("skip Requires ext/mbstring");
 }
 ?>
+--INI--
+zend.multibyte=1
 --FILE--
 <?php
 
 declare(encoding = 1);
-declare(encoding = 1123131232131312321);
+declare(encoding = 112313123213131232100);
 declare(encoding = NULL);
-declare(encoding = M_PI);
 declare(encoding = 'utf-8');
+declare(encoding = M_PI);
 
 print 'DONE';
 
 ?>
---EXPECT--
-DONE
+--EXPECTF--
+Warning: Unsupported encoding [1] in %sdeclare_001.php on line %d
+
+Warning: Unsupported encoding [1.1231312321313E+20] 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