tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Use php.internal_encoding instead of iconv.internal_encoding in PHP 5.6+

Browse Source
This commit is contained in:
Simon Welsh 2014-05-24 11:35:19 +10:00
parent 85d2a16ad6
commit 8ed5e8490d
1 changed files with 59 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
thirdparty/Zend/Locale/Format.php vendored
View File

@ -309,8 +309,13 @@ class Zend_Locale_Format
// Get correct signs for this locale // Get correct signs for this locale
$symbols = Zend_Locale_Data::getList($options['locale'], 'symbols'); $symbols = Zend_Locale_Data::getList($options['locale'], 'symbols');
if (version_compare(PHP_VERSION, '5.6', '<')) {
$oenc = iconv_get_encoding('internal_encoding'); $oenc = iconv_get_encoding('internal_encoding');
iconv_set_encoding('internal_encoding', 'UTF-8'); iconv_set_encoding('internal_encoding', 'UTF-8');
} else {
$oenc = ini_get('php.internal_encoding');
ini_set('php.internal_encoding', 'UTF-8');
}
// Get format // Get format
$format = $options['number_format']; $format = $options['number_format'];
@ -345,7 +350,11 @@ class Zend_Locale_Format
} }
if (iconv_strpos($format, '0') === false) { if (iconv_strpos($format, '0') === false) {
if (version_compare(PHP_VERSION, '5.6', '<')) {
iconv_set_encoding('internal_encoding', $oenc); iconv_set_encoding('internal_encoding', $oenc);
} else {
ini_set('php.internal_encoding', $oenc);
}
require_once 'Zend/Locale/Exception.php'; require_once 'Zend/Locale/Exception.php';
throw new Zend_Locale_Exception('Wrong format... missing 0'); throw new Zend_Locale_Exception('Wrong format... missing 0');
} }
@ -471,7 +480,11 @@ class Zend_Locale_Format
} }
} }
if (version_compare(PHP_VERSION, '5.6', '<')) {
iconv_set_encoding('internal_encoding', $oenc); iconv_set_encoding('internal_encoding', $oenc);
} else {
ini_set('php.internal_encoding', $oenc);
}
return (string) $format; return (string) $format;
} }
@ -780,8 +793,13 @@ class Zend_Locale_Format
$result['date_format'] = $format; // save the format used to normalize $number (convenience) $result['date_format'] = $format; // save the format used to normalize $number (convenience)
$result['locale'] = $options['locale']; // save the locale used to normalize $number (convenience) $result['locale'] = $options['locale']; // save the locale used to normalize $number (convenience)
if (version_compare(PHP_VERSION, '5.6', '<')) {
$oenc = iconv_get_encoding('internal_encoding'); $oenc = iconv_get_encoding('internal_encoding');
iconv_set_encoding('internal_encoding', 'UTF-8'); iconv_set_encoding('internal_encoding', 'UTF-8');
} else {
$oenc = ini_get('php.internal_encoding');
ini_set('php.internal_encoding', 'UTF-8');
}
$day = iconv_strpos($format, 'd'); $day = iconv_strpos($format, 'd');
$month = iconv_strpos($format, 'M'); $month = iconv_strpos($format, 'M');
$year = iconv_strpos($format, 'y'); $year = iconv_strpos($format, 'y');
@ -846,7 +864,11 @@ class Zend_Locale_Format
} }
if (empty($parse)) { if (empty($parse)) {
if (version_compare(PHP_VERSION, '5.6', '<')) {
iconv_set_encoding('internal_encoding', $oenc); iconv_set_encoding('internal_encoding', $oenc);
} else {
ini_set('php.internal_encoding', $oenc);
}
require_once 'Zend/Locale/Exception.php'; require_once 'Zend/Locale/Exception.php';
throw new Zend_Locale_Exception("Unknown date format, neither date nor time in '" . $format . "' found"); throw new Zend_Locale_Exception("Unknown date format, neither date nor time in '" . $format . "' found");
} }
@ -866,7 +888,11 @@ class Zend_Locale_Format
preg_match_all('/\d+/u', $number, $splitted); preg_match_all('/\d+/u', $number, $splitted);
if (count($splitted[0]) == 0) { if (count($splitted[0]) == 0) {
if (version_compare(PHP_VERSION, '5.6', '<')) {
iconv_set_encoding('internal_encoding', $oenc); iconv_set_encoding('internal_encoding', $oenc);
} else {
ini_set('php.internal_encoding', $oenc);
}
require_once 'Zend/Locale/Exception.php'; require_once 'Zend/Locale/Exception.php';
throw new Zend_Locale_Exception("No date part in '$date' found."); throw new Zend_Locale_Exception("No date part in '$date' found.");
} }
@ -972,7 +998,11 @@ class Zend_Locale_Format
if (($position !== false) and ((iconv_strpos($date, $result['day']) === false) or if (($position !== false) and ((iconv_strpos($date, $result['day']) === false) or
(isset($result['year']) and (iconv_strpos($date, $result['year']) === false)))) { (isset($result['year']) and (iconv_strpos($date, $result['year']) === false)))) {
if ($options['fix_date'] !== true) { if ($options['fix_date'] !== true) {
if (version_compare(PHP_VERSION, '5.6', '<')) {
iconv_set_encoding('internal_encoding', $oenc); iconv_set_encoding('internal_encoding', $oenc);
} else {
ini_set('php.internal_encoding', $oenc);
}
require_once 'Zend/Locale/Exception.php'; require_once 'Zend/Locale/Exception.php';
throw new Zend_Locale_Exception("Unable to parse date '$date' using '" . $format throw new Zend_Locale_Exception("Unable to parse date '$date' using '" . $format
. "' (false month, $position, $month)"); . "' (false month, $position, $month)");
@ -988,7 +1018,11 @@ class Zend_Locale_Format
if (isset($result['day']) and isset($result['year'])) { if (isset($result['day']) and isset($result['year'])) {
if ($result['day'] > 31) { if ($result['day'] > 31) {
if ($options['fix_date'] !== true) { if ($options['fix_date'] !== true) {
if (version_compare(PHP_VERSION, '5.6', '<')) {
iconv_set_encoding('internal_encoding', $oenc); iconv_set_encoding('internal_encoding', $oenc);
} else {
ini_set('php.internal_encoding', $oenc);
}
require_once 'Zend/Locale/Exception.php'; require_once 'Zend/Locale/Exception.php';
throw new Zend_Locale_Exception("Unable to parse date '$date' using '" throw new Zend_Locale_Exception("Unable to parse date '$date' using '"
. $format . "' (d <> y)"); . $format . "' (d <> y)");
@ -1004,7 +1038,11 @@ class Zend_Locale_Format
if (isset($result['month']) and isset($result['year'])) { if (isset($result['month']) and isset($result['year'])) {
if ($result['month'] > 31) { if ($result['month'] > 31) {
if ($options['fix_date'] !== true) { if ($options['fix_date'] !== true) {
if (version_compare(PHP_VERSION, '5.6', '<')) {
iconv_set_encoding('internal_encoding', $oenc); iconv_set_encoding('internal_encoding', $oenc);
} else {
ini_set('php.internal_encoding', $oenc);
}
require_once 'Zend/Locale/Exception.php'; require_once 'Zend/Locale/Exception.php';
throw new Zend_Locale_Exception("Unable to parse date '$date' using '" throw new Zend_Locale_Exception("Unable to parse date '$date' using '"
. $format . "' (M <> y)"); . $format . "' (M <> y)");
@ -1020,7 +1058,11 @@ class Zend_Locale_Format
if (isset($result['month']) and isset($result['day'])) { if (isset($result['month']) and isset($result['day'])) {
if ($result['month'] > 12) { if ($result['month'] > 12) {
if ($options['fix_date'] !== true || $result['month'] > 31) { if ($options['fix_date'] !== true || $result['month'] > 31) {
if (version_compare(PHP_VERSION, '5.6', '<')) {
iconv_set_encoding('internal_encoding', $oenc); iconv_set_encoding('internal_encoding', $oenc);
} else {
ini_set('php.internal_encoding', $oenc);
}
require_once 'Zend/Locale/Exception.php'; require_once 'Zend/Locale/Exception.php';
throw new Zend_Locale_Exception("Unable to parse date '$date' using '" throw new Zend_Locale_Exception("Unable to parse date '$date' using '"
. $format . "' (M <> d)"); . $format . "' (M <> d)");
@ -1047,7 +1089,11 @@ class Zend_Locale_Format
} }
} }
if (version_compare(PHP_VERSION, '5.6', '<')) {
iconv_set_encoding('internal_encoding', $oenc); iconv_set_encoding('internal_encoding', $oenc);
} else {
ini_set('php.internal_encoding', $oenc);
}
return $result; return $result;
} }