Skip to content

Commit cd13c25

Browse files
committed
Fix iconv /w locale conversion
1 parent 60189aa commit cd13c25

File tree

2 files changed

+10
-26
lines changed

2 files changed

+10
-26
lines changed

ext/iconv/tests/iconv_basic_001-win32.phpt

-20
This file was deleted.

ext/iconv/tests/iconv_basic_001.phpt

+10-6
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@ Test the basics to function iconv.
44
Rodrigo Prado de Jesus <royopa [at] gmail [dot] com>
55
--EXTENSIONS--
66
iconv
7-
--SKIPIF--
8-
<?php
9-
if (substr(PHP_OS, 0, 3) == 'WIN' ) {die('skip not for windows');}
10-
if (setlocale(LC_ALL, 'invalid') === 'invalid') { die('skip setlocale() is broken /w musl'); }
11-
if (setlocale(LC_ALL, "en_US.utf8") === false) { die('skip en_US.utf8 locales not available'); }
12-
?>
137
--FILE--
148
<?php
159
setlocale(LC_ALL, "en_US.utf8");
@@ -19,7 +13,17 @@ $string_to_translate = 'Žluťoučký kůň\n';
1913

2014
$string_out = iconv($in_charset, $out_charset, $string_to_translate);
2115

16+
var_dump($string_out);
17+
18+
setlocale(LC_ALL, "C");
19+
$in_charset = 'UTF-8';
20+
$out_charset = 'ASCII//TRANSLIT';
21+
$string_to_translate = 'Žluťoučký kůň\n';
22+
23+
$string_out = iconv($in_charset, $out_charset, $string_to_translate);
24+
2225
var_dump($string_out);
2326
?>
2427
--EXPECT--
2528
string(15) "Zlutoucky kun\n"
29+
string(15) "Zlutoucky kun\n"

0 commit comments

Comments
 (0)