Remove useless skip check

As of PHP 5.4.0, `detect_unicode` is always available, so this check
cannot fail.

diff --git a/Zend/tests/multibyte/bug68665.phpt b/Zend/tests/multibyte/bug68665.phpt
index e2c5a860f5dee9aa495fdccd54ab32832c70e41f..f770118ad42631a08f77855e39dddb9632a90935 100644 (file)
--- a/Zend/tests/multibyte/bug68665.phpt
+++ b/Zend/tests/multibyte/bug68665.phpt
@@ -2,9 +2,6 @@
 Crash with Big5
 --SKIPIF--
 <?php
-if (!in_array("zend.detect_unicode", array_keys(ini_get_all()))) {
-  die("skip Requires configure --enable-zend-multibyte option");
-}
 if (!extension_loaded("mbstring")) {
   die("skip Requires mbstring extension");
 }

diff --git a/Zend/tests/multibyte/multibyte_encoding_001.phpt b/Zend/tests/multibyte/multibyte_encoding_001.phpt
index 9f3a748e78851b31706042b8c3b55018772c15c4..3b26dcb9895abf3c755fb860631c2c983e918d72 100644 (file)
--- a/Zend/tests/multibyte/multibyte_encoding_001.phpt
+++ b/Zend/tests/multibyte/multibyte_encoding_001.phpt
@@ -2,9 +2,6 @@
 Zend Multibyte and ShiftJIS
 --SKIPIF--
 <?php
-if (!in_array("zend.detect_unicode", array_keys(ini_get_all()))) {
-  die("skip Requires configure --enable-zend-multibyte option");
-}
 if (!extension_loaded("mbstring")) {
   die("skip Requires mbstring extension");
 }

diff --git a/Zend/tests/multibyte/multibyte_encoding_002.phpt b/Zend/tests/multibyte/multibyte_encoding_002.phpt
index c4c225c8f737259608799e76671b528407bda5e4..bf6107c5419ee45d1f42eb883a96b369405cdb67 100644 (file)
--- a/Zend/tests/multibyte/multibyte_encoding_002.phpt
+++ b/Zend/tests/multibyte/multibyte_encoding_002.phpt
@@ -2,9 +2,6 @@
 Zend Multibyte and UTF-8 BOM
 --SKIPIF--
 <?php
-if (!in_array("zend.detect_unicode", array_keys(ini_get_all()))) {
-  die("skip Requires configure --enable-zend-multibyte option");
-}
 if (!extension_loaded("mbstring")) {
   die("skip Requires mbstring extension");
 }

diff --git a/Zend/tests/multibyte/multibyte_encoding_003.phpt b/Zend/tests/multibyte/multibyte_encoding_003.phpt
index ee861dbcc482bb117f7f09a8c35d7ddf620bc2c3..a0983329f410f518064413e0ceb550ff5115f526 100644 (file)
Binary files a/Zend/tests/multibyte/multibyte_encoding_003.phpt and b/Zend/tests/multibyte/multibyte_encoding_003.phpt differ

diff --git a/Zend/tests/multibyte/multibyte_encoding_004.phpt b/Zend/tests/multibyte/multibyte_encoding_004.phpt
index 1b4f4fecef2e0191c763be4e1e6cc1d0995955a0..0f7ab0cb10444f51310e36213afd30f3929eb797 100644 (file)
--- a/Zend/tests/multibyte/multibyte_encoding_004.phpt
+++ b/Zend/tests/multibyte/multibyte_encoding_004.phpt
@@ -2,9 +2,6 @@
 test for mbstring script_encoding for flex unsafe encoding (Shift_JIS)
 --SKIPIF--
 <?php
-if (!in_array("zend.detect_unicode", array_keys(ini_get_all()))) {
-  die("skip Requires configure --enable-zend-multibyte option");
-}
 if (!extension_loaded("mbstring")) {
   die("skip Requires mbstring extension");
 }

diff --git a/Zend/tests/multibyte/multibyte_encoding_005.phpt b/Zend/tests/multibyte/multibyte_encoding_005.phpt
index 305175d0ccaebfbb8fbe4e5fa7ab00514acb6212..6cf0630d9f12b72a39d12ac4207b550eafdd7dca 100644 (file)
--- a/Zend/tests/multibyte/multibyte_encoding_005.phpt
+++ b/Zend/tests/multibyte/multibyte_encoding_005.phpt
@@ -2,9 +2,6 @@
 encoding conversion from script encoding into internal encoding
 --SKIPIF--
 <?php
-if (!in_array("zend.detect_unicode", array_keys(ini_get_all()))) {
-  die("skip Requires configure --enable-zend-multibyte option");
-}
 if (!extension_loaded("mbstring")) {
   die("skip Requires mbstring extension");
 }

diff --git a/Zend/tests/multibyte/multibyte_encoding_006.phpt b/Zend/tests/multibyte/multibyte_encoding_006.phpt
index d518c29e3ebd8d9aa719ed7c8b393101492f5225..4d6292ae379f844f38ef7473603b9a5af496c58f 100644 (file)
Binary files a/Zend/tests/multibyte/multibyte_encoding_006.phpt and b/Zend/tests/multibyte/multibyte_encoding_006.phpt differ

diff --git a/Zend/tests/type_declarations/scalar_strict_declaration_placement_006.phpt b/Zend/tests/type_declarations/scalar_strict_declaration_placement_006.phpt
index e0644482cb3e048f0a64b1a77e4043bf9c5c039f..6d731c1557d261fbf4225cb1b53a02740ff9c58f 100644 (file)
--- a/Zend/tests/type_declarations/scalar_strict_declaration_placement_006.phpt
+++ b/Zend/tests/type_declarations/scalar_strict_declaration_placement_006.phpt
@@ -2,9 +2,6 @@
 Test strict declaration being first operation only 006
 --SKIPIF--
 <?php
-if (!in_array("zend.detect_unicode", array_keys(ini_get_all()))) {
-  die("skip Requires configure --enable-zend-multibyte option");
-}
 if (!extension_loaded("mbstring")) {
   die("skip Requires mbstring extension");
 }

diff --git a/Zend/tests/type_declarations/scalar_strict_declaration_placement_007.phpt b/Zend/tests/type_declarations/scalar_strict_declaration_placement_007.phpt
index 9afef254a99c650bb96c9fa497d942e01dfabdd2..c6cfbd56f4796cb20d1cbbf52531b4ce34ae620a 100644 (file)
--- a/Zend/tests/type_declarations/scalar_strict_declaration_placement_007.phpt
+++ b/Zend/tests/type_declarations/scalar_strict_declaration_placement_007.phpt
@@ -2,9 +2,6 @@
 Test strict declaration being first operation only 007
 --SKIPIF--
 <?php
-if (!in_array("zend.detect_unicode", array_keys(ini_get_all()))) {
-  die("skip Requires configure --enable-zend-multibyte option");
-}
 if (!extension_loaded("mbstring")) {
   die("skip Requires mbstring extension");
 }