Fix tests when running without mbstring

diff --git a/Zend/tests/declare_001.phpt b/Zend/tests/declare_001.phpt
index 007c01cdf04e17ff11ace7b44a591acd813af74f..d67209ee4dfa89c79f075289a73e286c4fd8534d 100644 (file)
--- a/Zend/tests/declare_001.phpt
+++ b/Zend/tests/declare_001.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Testing declare statement with several type values
+--SKIPIF--
+<?php
+if (!extension_loaded("mbstring")) {
+  die("skip Requires ext/mbstring");
+}
+?>
 --INI--
 zend.multibyte=1
 --FILE--
@@ -17,8 +23,8 @@ print 'DONE';
 --EXPECTF--
 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 [1123131232131312321] 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
+Fatal error: Cannot use constants as encoding in %sdeclare_001.php on line %d

diff --git a/Zend/tests/declare_002.phpt b/Zend/tests/declare_002.phpt
index 1babdf338b81e6f2406fa7b160c67dec235219d2..19844556f1791b23b0903263fcbacda424c0a74f 100644 (file)
--- a/Zend/tests/declare_002.phpt
+++ b/Zend/tests/declare_002.phpt
@@ -5,6 +5,9 @@ Testing declare statement with several type values
 if (!ini_get("zend.multibyte")) {
   die("skip Requires zend.multibyte=1");
 }
+if (!extension_loaded("mbstring")) {
+  die("skip Requires ext/mbstring");
+}
 ?>
 --FILE--
 <?php

diff --git a/Zend/tests/declare_003.phpt b/Zend/tests/declare_003.phpt
new file mode 100644 (file)
index 0000000..73cc681
--- /dev/null
+++ b/Zend/tests/declare_003.phpt
@@ -0,0 +1,23 @@
+--TEST--
+Testing declare statement with several type values
+--INI--
+zend.multibyte=1
+--FILE--
+<?php
+
+declare(encoding = 1);
+declare(encoding = 1123131232131312321);
+declare(encoding = NULL);
+declare(encoding = M_PI);
+
+print 'DONE';
+
+?>
+--EXPECTF--
+Warning: Unsupported encoding [1] in %sdeclare_003.php on line %d
+
+Warning: Unsupported encoding [1123131232131312321] in %sdeclare_003.php on line %d
+
+Warning: Unsupported encoding [] in %sdeclare_003.php on line %d
+
+Fatal error: Cannot use constants as encoding in %sdeclare_003.php on line %d

diff --git a/Zend/tests/declare_004.phpt b/Zend/tests/declare_004.phpt
new file mode 100644 (file)
index 0000000..a2ba51a
--- /dev/null
+++ b/Zend/tests/declare_004.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Testing declare statement with several type values
+--SKIPIF--
+<?php
+if (!ini_get("zend.multibyte")) {
+  die("skip Requires zend.multibyte=1");
+}
+?>
+--FILE--
+<?php
+
+declare(encoding = 1);
+declare(encoding = 1123131232131312321);
+declare(encoding = NULL);
+declare(encoding = M_PI);
+
+print 'DONE';
+
+?>
+--EXPECTF--
+Warning: Unsupported encoding [%d] in %sdeclare_004.php on line 3
+
+Warning: Unsupported encoding [%f] in %sdeclare_004.php on line 4
+
+Warning: Unsupported encoding [] in %sdeclare_004.php on line 5
+
+Fatal error: Cannot use constants as encoding in %sdeclare_004.php on line 6