Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.

ext/mbstring/tests/zend_multibyte-01.phpt

@@ -1,14 +1,9 @@
 --TEST--
 zend multibyte (1)
 --SKIPIF--
-<?php
-ini_set("mbstring.script_encoding","SJIS");
-if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
-	die("skip zend-multibyte is not available");
-}
-?>
 --INI--
-mbstring.script_encoding=Shift_JIS
+zend.multibyte=On
+zend.script_encoding=Shift_JIS
 mbstring.internal_encoding=Shift_JIS
 --FILE--
 <?php

ext/mbstring/tests/zend_multibyte-02.phpt

@@ -1,14 +1,9 @@
 --TEST--
 zend multibyte (2)
 --SKIPIF--
-<?php
-ini_set("mbstring.script_encoding","SJIS");
-if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
-	die("skip zend-multibyte is not available");
-}
-?>
 --INI--
-mbstring.script_encoding=UTF-8
+zend.multibyte=On
+zend.script_encoding=UTF-8
 mbstring.internal_encoding=CP932
 --FILE--
 <?php

ext/mbstring/tests/zend_multibyte-03.phpt

@@ -1,14 +1,9 @@
 --TEST--
 zend multibyte (3)
 --SKIPIF--
-<?php
-ini_set("mbstring.script_encoding","SJIS");
-if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
-	die("skip zend-multibyte is not available");
-}
-?>
 --INI--
-mbstring.script_encoding=UTF-8
+zend.multibyte=On
+zend.script_encoding=UTF-8
 mbstring.internal_encoding=EUC-JP
 --FILE--
 <?php

ext/mbstring/tests/zend_multibyte-04.phpt

@@ -1,14 +1,9 @@
 --TEST--
 zend multibyte (4)
 --SKIPIF--
-<?php
-ini_set("mbstring.script_encoding","SJIS");
-if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
-	die("skip zend-multibyte is not available");
-}
-?>
 --INI--
-mbstring.script_encoding=CP932
+zend.multibyte=On
+zend.script_encoding=CP932
 mbstring.internal_encoding=UTF-8
 --FILE--
 <?php

ext/mbstring/tests/zend_multibyte-05.phpt

@@ -1,14 +1,9 @@
 --TEST--
 zend multibyte (5)
 --SKIPIF--
-<?php
-ini_set("mbstring.script_encoding","SJIS");
-if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
-	die("skip zend-multibyte is not available");
-}
-?>
 --INI--
-mbstring.script_encoding=EUC-JP
+zend.multibyte=On
+zend.script_encoding=EUC-JP
 mbstring.internal_encoding=UTF-8
 --FILE--
 <?php

ext/mbstring/tests/zend_multibyte-06.phpt

@@ -1,14 +1,9 @@
 --TEST--
 zend multibyte (6)
 --SKIPIF--
-<?php
-ini_set("mbstring.script_encoding","SJIS");
-if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
-	die("skip zend-multibyte is not available");
-}
-?>
 --INI--
-mbstring.script_encoding=EUC-JP
+zend.multibyte=On
+zend.script_encoding=EUC-JP
 mbstring.internal_encoding=CP932
 --FILE--
 <?php

ext/mbstring/tests/zend_multibyte-07.phpt

@@ -1,14 +1,9 @@
 --TEST--
 zend multibyte (7)
 --SKIPIF--
-<?php
-ini_set("mbstring.script_encoding","SJIS");
-if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
-	die("skip zend-multibyte is not available");
-}
-?>
 --INI--
-mbstring.script_encoding=ISO-8859-1
+zend.multibyte=On
+zend.script_encoding=ISO-8859-1
 mbstring.internal_encoding=EUC-JP
 --FILE--
 <?php

ext/mbstring/tests/zend_multibyte-08.phpt

@@ -1,14 +1,9 @@
 --TEST--
 zend multibyte (8)
 --SKIPIF--
-<?php
-ini_set("mbstring.script_encoding","SJIS");
-if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
-	die("skip zend-multibyte is not available");
-}
-?>
 --INI--
-mbstring.script_encoding=ISO-8859-1
+zend.multibyte=On
+zend.script_encoding=ISO-8859-1
 mbstring.internal_encoding=UTF-8
 --FILE--
 <?php

ext/mbstring/tests/zend_multibyte-09.phpt

@@ -1,14 +1,9 @@
 --TEST--
 zend multibyte (9)
 --SKIPIF--
-<?php
-ini_set("mbstring.script_encoding","SJIS");
-if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
-	die("skip zend-multibyte is not available");
-}
-?>
 --INI--
-mbstring.script_encoding=cp1251
+zend.multibyte=On
+zend.script_encoding=cp1251
 mbstring.internal_encoding=UTF-8
 --FILE--
 <?php

ext/mbstring/tests/zend_multibyte-10.phpt

@@ -1,12 +1,6 @@
 --TEST--
 zend multibyte (10)
 --SKIPIF--
-<?php
-ini_set("mbstring.script_encoding","SJIS");
-if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
-	die("skip zend-multibyte is not available");
-}
-?>
 --FILE--
 <?php
 declare(encoding="ISO-8859-15");

ext/mbstring/tests/zend_multibyte-11.phpt

@@ -1,12 +1,6 @@
 --TEST--
 zend multibyte (11)
 --SKIPIF--
-<?php
-ini_set("mbstring.script_encoding","SJIS");
-if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
-	die("skip zend-multibyte is not available");
-}
-?>
 --FILE--
 <?php
 declare(encoding="ISO-8859-15") {

ext/mbstring/tests/zend_multibyte-12.phpt

@@ -1,12 +1,6 @@
 --TEST--
 zend multibyte (12)
 --SKIPIF--
-<?php
-ini_set("mbstring.script_encoding","SJIS");
-if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
-	die("skip zend-multibyte is not available");
-}
-?>
 --FILE--
 <?php
 declare(encoding="ISO-8859-15");

ext/mbstring/tests/zend_multibyte-13.phpt

@@ -1,14 +1,9 @@
 --TEST--
 zend multibyte (13)
 --SKIPIF--
-<?php
-ini_set("mbstring.script_encoding","SJIS");
-if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
-	die("skip zend-multibyte is not available");
-}
-?>
 --INI--
-mbstring.script_encoding=UTF-8
+zend.multibyte=On
+zend.script_encoding=UTF-8
 mbstring.internal_encoding=ISO-8859-1
 --FILE--
 <?php

ext/mbstring/tests/zend_multibyte-14.phpt

@@ -1,14 +1,9 @@
 --TEST--
 zend multibyte (14)
 --SKIPIF--
-<?php
-ini_set("mbstring.script_encoding","SJIS");
-if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
-	die("skip zend-multibyte is not available");
-}
-?>
 --INI--
-mbstring.script_encoding=UTF-8
+zend.multibyte=On
+zend.script_encoding=UTF-8
 mbstring.internal_encoding=UTF-8
 --FILE--
 <?php