diff options
| author | Xinchen Hui <laruence@php.net> | 2015-04-01 13:06:38 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-04-01 13:06:38 +0800 |
| commit | fd0baec2e9afbd6706f16c26d32ec038c192d7e5 (patch) | |
| tree | 0ba31b7242cc63451c84fb9fbb1172bffa9314e9 /ext/mbstring/tests | |
| parent | af812eac4c9727bdfb90cac1a35ab53d741cb7eb (diff) | |
| parent | ed772e1a998ca72fc1c354fcefc05149ca7a2a56 (diff) | |
| download | php-git-fd0baec2e9afbd6706f16c26d32ec038c192d7e5.tar.gz | |
Merge branch 'master' of https://git.php.net/repository/php-src
Diffstat (limited to 'ext/mbstring/tests')
| -rw-r--r-- | ext/mbstring/tests/common.inc | 2 | ||||
| -rw-r--r-- | ext/mbstring/tests/mb_convert_variables.phpt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/mbstring/tests/common.inc b/ext/mbstring/tests/common.inc index 1df6341077..a40dde0399 100644 --- a/ext/mbstring/tests/common.inc +++ b/ext/mbstring/tests/common.inc @@ -45,7 +45,7 @@ class tc public $s1 = '日本語EUC-JPの文字列'; public $s2 = 'English Text'; - function tc() + function __construct() { } } diff --git a/ext/mbstring/tests/mb_convert_variables.phpt b/ext/mbstring/tests/mb_convert_variables.phpt index 01ced05104..22253b5352 100644 --- a/ext/mbstring/tests/mb_convert_variables.phpt +++ b/ext/mbstring/tests/mb_convert_variables.phpt @@ -76,7 +76,7 @@ class foo public $s2; public $s3; - function foo() + function __construct() { global $sjis, $jis, $euc_jp; @@ -92,7 +92,7 @@ class bar public $s2; public $s3; - function bar() + function __construct() { global $sjis, $jis, $euc_jp; |