Browse Source

Fix tests on freebsd

migration/RELEASE_1_0_0
Hannes Magnusson 20 years ago
parent
commit
ea2891fa9d
  1. 4
      ext/standard/tests/strings/htmlentities15.phpt
  2. 4
      tests/lang/034.phpt

4
ext/standard/tests/strings/htmlentities15.phpt

@ -8,14 +8,14 @@ unicode.script_encoding=KOI-8
unicode.output_encoding=KOI-8
--SKIPIF--
<?php
$result = (bool)setlocale(LC_CTYPE, "ru_RU.koi8r");
$result = (bool)setlocale(LC_CTYPE, "ru_RU.koi8r", "ru_RU.KOI8-R");
if (!$result || preg_match('/koi8/i', setlocale(LC_CTYPE, 0)) == 0) {
die("skip setlocale() failed\n");
}
?>
--FILE--
<?php
setlocale(LC_CTYPE, "ru_RU.koi8r");
setlocale(LC_CTYPE, "ru_RU.koi8r", "ru_RU.KOI8-R");
$str = "ŇĎÓËĎŰÎŮĘ";
var_dump($str, htmlentities($str, ENT_QUOTES, ''));
?>

4
tests/lang/034.phpt

@ -2,14 +2,14 @@
Bug #12647 (Locale settings affecting float parsing)
--SKIPIF--
<?php # try to activate a german locale
if (setlocale(LC_NUMERIC, "de_DE", "de", "german", "ge") === FALSE) {
if (setlocale(LC_NUMERIC, "de_DE", "de", "german", "ge", "de_DE.ISO8859-1") === FALSE) {
print "skip";
}
?>
--FILE--
<?php
# activate the german locale
setlocale(LC_NUMERIC, "de_DE", "de", "german", "ge");
setlocale(LC_NUMERIC, "de_DE", "de", "german", "ge", "de_DE.ISO8859-1");
echo (float)"3.14", "\n";
?>

Loading…
Cancel
Save