1
0
mirror of https://github.com/php/php-src.git synced 2026-04-10 09:33:06 +02:00

Merge branch 'PHP-5.6'

* PHP-5.6:
  Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.
This commit is contained in:
Yasuo Ohgaki
2014-01-19 13:33:27 +09:00
14 changed files with 22 additions and 95 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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");

View File

@@ -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") {

View File

@@ -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");

View File

@@ -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

View File

@@ -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