Skip to content

Commit e769c96

Browse files
author
Yasuo Ohgaki
committed
Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.
1 parent da83b51 commit e769c96

14 files changed

+22
-95
lines changed

‎ext/mbstring/tests/zend_multibyte-01.phpt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
--TEST--
22
zend multibyte (1)
33
--SKIPIF--
4-
<?php
5-
ini_set("mbstring.script_encoding","SJIS");
6-
if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
7-
die("skip zend-multibyte is not available");
8-
}
9-
?>
104
--INI--
11-
mbstring.script_encoding=Shift_JIS
5+
zend.multibyte=On
6+
zend.script_encoding=Shift_JIS
127
mbstring.internal_encoding=Shift_JIS
138
--FILE--
149
<?php

‎ext/mbstring/tests/zend_multibyte-02.phpt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
--TEST--
22
zend multibyte (2)
33
--SKIPIF--
4-
<?php
5-
ini_set("mbstring.script_encoding","SJIS");
6-
if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
7-
die("skip zend-multibyte is not available");
8-
}
9-
?>
104
--INI--
11-
mbstring.script_encoding=UTF-8
5+
zend.multibyte=On
6+
zend.script_encoding=UTF-8
127
mbstring.internal_encoding=CP932
138
--FILE--
149
<?php

‎ext/mbstring/tests/zend_multibyte-03.phpt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
--TEST--
22
zend multibyte (3)
33
--SKIPIF--
4-
<?php
5-
ini_set("mbstring.script_encoding","SJIS");
6-
if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
7-
die("skip zend-multibyte is not available");
8-
}
9-
?>
104
--INI--
11-
mbstring.script_encoding=UTF-8
5+
zend.multibyte=On
6+
zend.script_encoding=UTF-8
127
mbstring.internal_encoding=EUC-JP
138
--FILE--
149
<?php

‎ext/mbstring/tests/zend_multibyte-04.phpt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
--TEST--
22
zend multibyte (4)
33
--SKIPIF--
4-
<?php
5-
ini_set("mbstring.script_encoding","SJIS");
6-
if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
7-
die("skip zend-multibyte is not available");
8-
}
9-
?>
104
--INI--
11-
mbstring.script_encoding=CP932
5+
zend.multibyte=On
6+
zend.script_encoding=CP932
127
mbstring.internal_encoding=UTF-8
138
--FILE--
149
<?php

‎ext/mbstring/tests/zend_multibyte-05.phpt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
--TEST--
22
zend multibyte (5)
33
--SKIPIF--
4-
<?php
5-
ini_set("mbstring.script_encoding","SJIS");
6-
if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
7-
die("skip zend-multibyte is not available");
8-
}
9-
?>
104
--INI--
11-
mbstring.script_encoding=EUC-JP
5+
zend.multibyte=On
6+
zend.script_encoding=EUC-JP
127
mbstring.internal_encoding=UTF-8
138
--FILE--
149
<?php

‎ext/mbstring/tests/zend_multibyte-06.phpt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
--TEST--
22
zend multibyte (6)
33
--SKIPIF--
4-
<?php
5-
ini_set("mbstring.script_encoding","SJIS");
6-
if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
7-
die("skip zend-multibyte is not available");
8-
}
9-
?>
104
--INI--
11-
mbstring.script_encoding=EUC-JP
5+
zend.multibyte=On
6+
zend.script_encoding=EUC-JP
127
mbstring.internal_encoding=CP932
138
--FILE--
149
<?php

‎ext/mbstring/tests/zend_multibyte-07.phpt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
--TEST--
22
zend multibyte (7)
33
--SKIPIF--
4-
<?php
5-
ini_set("mbstring.script_encoding","SJIS");
6-
if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
7-
die("skip zend-multibyte is not available");
8-
}
9-
?>
104
--INI--
11-
mbstring.script_encoding=ISO-8859-1
5+
zend.multibyte=On
6+
zend.script_encoding=ISO-8859-1
127
mbstring.internal_encoding=EUC-JP
138
--FILE--
149
<?php

‎ext/mbstring/tests/zend_multibyte-08.phpt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
--TEST--
22
zend multibyte (8)
33
--SKIPIF--
4-
<?php
5-
ini_set("mbstring.script_encoding","SJIS");
6-
if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
7-
die("skip zend-multibyte is not available");
8-
}
9-
?>
104
--INI--
11-
mbstring.script_encoding=ISO-8859-1
5+
zend.multibyte=On
6+
zend.script_encoding=ISO-8859-1
127
mbstring.internal_encoding=UTF-8
138
--FILE--
149
<?php

‎ext/mbstring/tests/zend_multibyte-09.phpt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
--TEST--
22
zend multibyte (9)
33
--SKIPIF--
4-
<?php
5-
ini_set("mbstring.script_encoding","SJIS");
6-
if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
7-
die("skip zend-multibyte is not available");
8-
}
9-
?>
104
--INI--
11-
mbstring.script_encoding=cp1251
5+
zend.multibyte=On
6+
zend.script_encoding=cp1251
127
mbstring.internal_encoding=UTF-8
138
--FILE--
149
<?php

‎ext/mbstring/tests/zend_multibyte-10.phpt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
--TEST--
22
zend multibyte (10)
33
--SKIPIF--
4-
<?php
5-
ini_set("mbstring.script_encoding","SJIS");
6-
if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
7-
die("skip zend-multibyte is not available");
8-
}
9-
?>
104
--FILE--
115
<?php
126
declare(encoding="ISO-8859-15");

‎ext/mbstring/tests/zend_multibyte-11.phpt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
--TEST--
22
zend multibyte (11)
33
--SKIPIF--
4-
<?php
5-
ini_set("mbstring.script_encoding","SJIS");
6-
if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
7-
die("skip zend-multibyte is not available");
8-
}
9-
?>
104
--FILE--
115
<?php
126
declare(encoding="ISO-8859-15") {

‎ext/mbstring/tests/zend_multibyte-12.phpt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
--TEST--
22
zend multibyte (12)
33
--SKIPIF--
4-
<?php
5-
ini_set("mbstring.script_encoding","SJIS");
6-
if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
7-
die("skip zend-multibyte is not available");
8-
}
9-
?>
104
--FILE--
115
<?php
126
declare(encoding="ISO-8859-15");

‎ext/mbstring/tests/zend_multibyte-13.phpt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
--TEST--
22
zend multibyte (13)
33
--SKIPIF--
4-
<?php
5-
ini_set("mbstring.script_encoding","SJIS");
6-
if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
7-
die("skip zend-multibyte is not available");
8-
}
9-
?>
104
--INI--
11-
mbstring.script_encoding=UTF-8
5+
zend.multibyte=On
6+
zend.script_encoding=UTF-8
127
mbstring.internal_encoding=ISO-8859-1
138
--FILE--
149
<?php

‎ext/mbstring/tests/zend_multibyte-14.phpt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
--TEST--
22
zend multibyte (14)
33
--SKIPIF--
4-
<?php
5-
ini_set("mbstring.script_encoding","SJIS");
6-
if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
7-
die("skip zend-multibyte is not available");
8-
}
9-
?>
104
--INI--
11-
mbstring.script_encoding=UTF-8
5+
zend.multibyte=On
6+
zend.script_encoding=UTF-8
127
mbstring.internal_encoding=UTF-8
138
--FILE--
149
<?php

0 commit comments

Comments
 (0)