tweet_live: comparison web/lib/Zend/Locale/Format.php

equal deleted inserted replaced

-:5a6b6e770365
+:68c69c656a2c
 * to license@zend.com so we can send you a copy immediately.
 *
 * @category   Zend
 * @package    Zend_Locale
 * @subpackage Format
-* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
-* @version    $Id: Format.php 24807 2012-05-15 12:10:42Z adamlundrigan $
+* @version    $Id$
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 /**
 * include needed classes
 /**
 * @category   Zend
 * @package    Zend_Locale
 * @subpackage Format
-* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Locale_Format
 {
 const STANDARD   = 'auto';
 'number_format' => null,
 'format_type'   => 'iso',
 'fix_date'      => false,
 'locale'        => null,
 'cache'         => null,
-'disableCache'  => false,
+'disableCache'  => null,
 'precision'     => null);
 /**
 * Sets class wide options, if no option was given, the actual set options will be returned
 * The 'precision' option of a value is used to truncate or stretch extra digits. -1 means not to touch the extra digits.
 * with the default date format for a locale, use array('date_format' => null, 'locale' => $locale) for their options.
 *
 * @param  array  $options  Array of options, keyed by option name: format_type = 'iso' | 'php', fix_date = true | false,
 *                          locale = Zend_Locale | locale string, precision = whole number between -1 and 30
 * @throws Zend_Locale_Exception
-* @return Options array if no option was given
+* @return array if no option was given
 */
 public static function setOptions(array $options = array())
 {
 self::$_options = self::_checkOptions($options) + self::$_options;
 return self::$_options;
 * See {@link setOptions()} for details.
 *
 * @param  array  $options  Array of options, keyed by option name: format_type = 'iso' | 'php', fix_date = true | false,
 *                          locale = Zend_Locale | locale string, precision = whole number between -1 and 30
 * @throws Zend_Locale_Exception
-* @return Options array if no option was given
+* @return array if no option was given
 */
 private static function _checkOptions(array $options = array())
 {
 if (count($options) == 0) {
 return self::$_options;
 Zend_Locale_Data::setCache($value);
 }
 break;
 case 'disablecache' :
-Zend_Locale_Data::disableCache($value);
+if (null !== $value) {
+Zend_Locale_Data::disableCache($value);
+}
 break;
 case 'precision' :
 if ($value === NULL) {
 $value = -1;
 }
 // Get correct signs for this locale
 $symbols = Zend_Locale_Data::getList($options['locale'],'symbols');
 // Change locale input to be default number
-if ((strpos($input, $symbols['minus']) !== false) ||
+if (($input[0] == $symbols['minus']) && ('-' != $input[0])) {
-(strpos($input, '-') !== false)) {
+$input = '-' . substr($input, 1);
-$input = strtr($input, array($symbols['minus'] => '', '-' => ''));
-$input = '-' . $input;
 }
 $input = str_replace($symbols['group'],'', $input);
 if (strpos($input, $symbols['decimal']) !== false) {
 if ($symbols['decimal'] != '.') {
 * The seperation and fraction sign is used from the set locale.
 * ##0.#  -> 12345.12345 -> 12345.12345
 * ##0.00 -> 12345.12345 -> 12345.12
 * ##,##0.00 -> 12345.12345 -> 12,345.12
 *
-* @param   string  $input    Localized number string
+* @param   string  $value    Localized number string
 * @param   array   $options  Options: number_format, locale, precision. See {@link setOptions()} for details.
 * @return  string  locale formatted number
 * @throws Zend_Locale_Exception
 */
 public static function toNumber($value, array $options = array())
 $options           = self::_checkOptions($options) + self::$_options;
 $options['locale'] = (string) $options['locale'];
 // Get correct signs for this locale
 $symbols = Zend_Locale_Data::getList($options['locale'], 'symbols');
-$oenc = iconv_get_encoding('internal_encoding');
+$oenc = self::_getEncoding();
-iconv_set_encoding('internal_encoding', 'UTF-8');
+self::_setEncoding('UTF-8');
 // Get format
 $format = $options['number_format'];
 if ($format === null) {
 $format  = Zend_Locale_Data::getContent($options['locale'], 'decimalnumber');
 $format  = self::_seperateFormat($format, $value, $options['precision']);
 }
 $value = Zend_Locale_Math::normalize($value);
 }
 if (iconv_strpos($format, '0') === false) {
-iconv_set_encoding('internal_encoding', $oenc);
+self::_setEncoding($oenc);
 require_once 'Zend/Locale/Exception.php';
 throw new Zend_Locale_Exception('Wrong format... missing 0');
 }
 // get number parts
 } else {
 $format = str_replace('-', $symbols['minus'], $format);
 }
 }
-iconv_set_encoding('internal_encoding', $oenc);
+self::_setEncoding($oenc);
 return (string) $format;
 }
+/**
+* @param string $format
+* @param string $value
+* @param int $precision
+* @return string
+*/
 private static function _seperateFormat($format, $value, $precision)
 {
 if (iconv_strpos($format, ';') !== false) {
 if (call_user_func(Zend_Locale_Math::$comp, $value, 0, $precision) < 0) {
 $tmpformat = iconv_substr($format, iconv_strpos($format, ';') + 1);
 /**
 * Internal method to convert cldr number syntax into regex
 *
 * @param  string $type
+* @param  array  $options Options: locale. See {@link setOptions()} for details.
 * @return string
+* @throws Zend_Locale_Exception
 */
 private static function _getRegexForType($type, $options)
 {
 $decimal  = Zend_Locale_Data::getContent($options['locale'], $type);
 $decimal  = preg_replace('/[^#0,;\.\-Ee]/u', '',$decimal);
 }
 /**
 * Alias for getNumber
 *
-* @param   string  $value    Number to localize
+* @param   string  $input    Number to localize
 * @param   array   $options  Options: locale, precision. See {@link setOptions()} for details.
 * @return  float
 */
 public static function getFloat($input, array $options = array())
 {
 /**
 * Returns if a float was found
 * Alias for isNumber()
 *
-* @param   string  $input    Localized number string
+* @param   string $value  Localized number string
-* @param   array   $options  Options: locale. See {@link setOptions()} for details.
+* @param   array $options Options: locale. See {@link setOptions()} for details.
-* @return  boolean           Returns true if a number was found
+* @return  boolean        Returns true if a number was found
 */
 public static function isFloat($value, array $options = array())
 {
 return self::isNumber($value, $options);
 }
 }
 /**
 * Returns if a integer was found
 *
-* @param   string  $input    Localized number string
+* @param  string $value Localized number string
-* @param   array   $options  Options: locale. See {@link setOptions()} for details.
+* @param  array $options Options: locale. See {@link setOptions()} for details.
-* @return  boolean           Returns true if a integer was found
+* @return boolean Returns true if a integer was found
 */
 public static function isInteger($value, array $options = array())
 {
 if (!self::isNumber($value, $options)) {
 return false;
 {
 if ($format === null) {
 return null;
 }
-$convert = array('d' => 'dd'  , 'D' => 'EE'  , 'j' => 'd'   , 'l' => 'EEEE', 'N' => 'eee' , 'S' => 'SS'  ,
+$convert = array(
-'w' => 'e'   , 'z' => 'D'   , 'W' => 'ww'  , 'F' => 'MMMM', 'm' => 'MM'  , 'M' => 'MMM' ,
+'d' => 'dd'  , 'D' => 'EE'  , 'j' => 'd'   , 'l' => 'EEEE',
-'n' => 'M'   , 't' => 'ddd' , 'L' => 'l'   , 'o' => 'YYYY', 'Y' => 'yyyy', 'y' => 'yy'  ,
+'N' => 'eee' , 'S' => 'SS'  , 'w' => 'e'   , 'z' => 'D'   ,
-'a' => 'a'   , 'A' => 'a'   , 'B' => 'B'   , 'g' => 'h'   , 'G' => 'H'   , 'h' => 'hh'  ,
+'W' => 'ww'  , 'F' => 'MMMM', 'm' => 'MM'  , 'M' => 'MMM' ,
-'H' => 'HH'  , 'i' => 'mm'  , 's' => 'ss'  , 'e' => 'zzzz', 'I' => 'I'   , 'O' => 'Z'   ,
+'n' => 'M'   , 't' => 'ddd' , 'L' => 'l'   , 'o' => 'YYYY',
-'P' => 'ZZZZ', 'T' => 'z'   , 'Z' => 'X'   , 'c' => 'yyyy-MM-ddTHH:mm:ssZZZZ',
+'Y' => 'yyyy', 'y' => 'yy'  , 'a' => 'a'   , 'A' => 'a'   ,
-'r' => 'r'   , 'U' => 'U');
+'B' => 'B'   , 'g' => 'h'   , 'G' => 'H'   , 'h' => 'hh'  ,
-$values = str_split($format);
+'H' => 'HH'  , 'i' => 'mm'  , 's' => 'ss'  , 'e' => 'zzzz',
-foreach ($values as $key => $value) {
+'I' => 'I'   , 'O' => 'Z'   , 'P' => 'ZZZZ', 'T' => 'z'   ,
-if (isset($convert[$value]) === true) {
+'Z' => 'X'   , 'c' => 'yyyy-MM-ddTHH:mm:ssZZZZ', 'r' => 'r',
-$values[$key] = $convert[$value];
+'U' => 'U',
-}
+);
-}
+$escaped = false;
+$inEscapedString = false;
-return join($values);
+$converted = array();
+foreach (str_split($format) as $char) {
+if (!$escaped && $char == '\\') {
+// Next char will be escaped: let's remember it
+$escaped = true;
+} elseif ($escaped) {
+if (!$inEscapedString) {
+// First escaped string: start the quoted chunk
+$converted[] = "'";
+$inEscapedString = true;
+}
+// Since the previous char was a \ and we are in the quoted
+// chunk, let's simply add $char as it is
+$converted[] = $char;
+$escaped = false;
+} elseif ($char == "'") {
+// Single quotes need to be escaped like this
+$converted[] = "''";
+} else {
+if ($inEscapedString) {
+// Close the single-quoted chunk
+$converted[] = "'";
+$inEscapedString = false;
+}
+// Convert the unescaped char if needed
+if (isset($convert[$char])) {
+$converted[] = $convert[$char];
+} else {
+$converted[] = $char;
+}
+}
+}
+return implode($converted);
 }
 /**
 * Parse date and split in named array fields
 *
-* @param   string  $date     Date string to parse
+* @param  string $date    Date string to parse
-* @param   array   $options  Options: format_type, fix_date, locale, date_format. See {@link setOptions()} for details.
+* @param  array  $options Options: format_type, fix_date, locale, date_format. See {@link setOptions()} for details.
-* @return  array             Possible array members: day, month, year, hour, minute, second, fixed, format
+* @return array Possible array members: day, month, year, hour, minute, second, fixed, format
+* @throws Zend_Locale_Exception
 */
 private static function _parseDate($date, $options)
 {
 if (!self::_getUniCodeSupport()) {
 trigger_error("Sorry, your PCRE extension does not support UTF8 which is needed for the I18N core", E_USER_NOTICE);
 $format = $options['date_format'];
 $number = $date; // working copy
 $result['date_format'] = $format; // save the format used to normalize $number (convenience)
 $result['locale'] = $options['locale']; // save the locale used to normalize $number (convenience)
-$oenc = iconv_get_encoding('internal_encoding');
+$oenc = self::_getEncoding();
-iconv_set_encoding('internal_encoding', 'UTF-8');
+self::_setEncoding('UTF-8');
 $day   = iconv_strpos($format, 'd');
 $month = iconv_strpos($format, 'M');
 $year  = iconv_strpos($format, 'y');
 $hour  = iconv_strpos($format, 'H');
 $min   = iconv_strpos($format, 'm');
 if ($sec !== false) {
 $parse[$sec] = 's';
 }
 if (empty($parse)) {
-iconv_set_encoding('internal_encoding', $oenc);
+self::_setEncoding($oenc);
 require_once 'Zend/Locale/Exception.php';
 throw new Zend_Locale_Exception("Unknown date format, neither date nor time in '" . $format . "' found");
 }
 ksort($parse);
 // split number parts
 $split = false;
 preg_match_all('/\d+/u', $number, $splitted);
 if (count($splitted[0]) == 0) {
-iconv_set_encoding('internal_encoding', $oenc);
+self::_setEncoding($oenc);
 require_once 'Zend/Locale/Exception.php';
 throw new Zend_Locale_Exception("No date part in '$date' found.");
 }
 if (count($splitted[0]) == 1) {
 $split = 0;
 // fix false month
 if (isset($result['day']) and isset($result['month'])) {
 if (($position !== false) and ((iconv_strpos($date, $result['day']) === false) or
 (isset($result['year']) and (iconv_strpos($date, $result['year']) === false)))) {
 if ($options['fix_date'] !== true) {
-iconv_set_encoding('internal_encoding', $oenc);
+self::_setEncoding($oenc);
 require_once 'Zend/Locale/Exception.php';
 throw new Zend_Locale_Exception("Unable to parse date '$date' using '" . $format
 . "' (false month, $position, $month)");
 }
 $temp = $result['day'];
 // fix switched values d <> y
 if (isset($result['day']) and isset($result['year'])) {
 if ($result['day'] > 31) {
 if ($options['fix_date'] !== true) {
-iconv_set_encoding('internal_encoding', $oenc);
+self::_setEncoding($oenc);
 require_once 'Zend/Locale/Exception.php';
 throw new Zend_Locale_Exception("Unable to parse date '$date' using '"
 . $format . "' (d <> y)");
 }
 $temp = $result['year'];
 // fix switched values M <> y
 if (isset($result['month']) and isset($result['year'])) {
 if ($result['month'] > 31) {
 if ($options['fix_date'] !== true) {
-iconv_set_encoding('internal_encoding', $oenc);
+self::_setEncoding($oenc);
 require_once 'Zend/Locale/Exception.php';
 throw new Zend_Locale_Exception("Unable to parse date '$date' using '"
 . $format . "' (M <> y)");
 }
 $temp = $result['year'];
 // fix switched values M <> d
 if (isset($result['month']) and isset($result['day'])) {
 if ($result['month'] > 12) {
 if ($options['fix_date'] !== true || $result['month'] > 31) {
-iconv_set_encoding('internal_encoding', $oenc);
+self::_setEncoding($oenc);
 require_once 'Zend/Locale/Exception.php';
 throw new Zend_Locale_Exception("Unable to parse date '$date' using '"
 . $format . "' (M <> d)");
 }
 $temp = $result['day'];
 $result['year'] = (int) $result['year'] + 1900;
 }
 }
 }
-iconv_set_encoding('internal_encoding', $oenc);
+self::_setEncoding($oenc);
 return $result;
 }
 /**
 * Search $number for a month name found in $monthlist, and replace if found.
 }
 /**
 * Returns the default time format for $locale.
 *
-* @param  string|Zend_Locale  $locale  OPTIONAL Locale of $number, possibly in string form (e.g. 'de_AT')
+* @param  string|Zend_Locale $locale OPTIONAL Locale of $number, possibly in string form (e.g. 'de_AT')
 * @return string  format
+* @throws Zend_Locale_Exception
 */
 public static function getTimeFormat($locale = null)
 {
 $format = Zend_Locale_Data::getContent($locale, 'time');
 if (empty($format)) {
 return $format;
 }
 /**
 * Returns an array with 'hour', 'minute', and 'second' elements extracted from $time
-* according to the order described in $format.  For a format of 'H:m:s', and
+* according to the order described in $format.  For a format of 'H:i:s', and
 * an input of 11:20:55, getTime() would return:
 * array ('hour' => 11, 'minute' => 20, 'second' => 55)
 * The optional $locale parameter may be used to help extract times from strings
 * containing both a time and a day or month name.
 *
 }
 /**
 * Returns the default datetime format for $locale.
 *
-* @param  string|Zend_Locale  $locale  OPTIONAL Locale of $number, possibly in string form (e.g. 'de_AT')
+* @param  string|Zend_Locale $locale OPTIONAL Locale of $number, possibly in string form (e.g. 'de_AT')
 * @return string  format
+* @throws Zend_Locale_Exception
 */
 public static function getDateTimeFormat($locale = null)
 {
 $format = Zend_Locale_Data::getContent($locale, 'datetime');
 if (empty($format)) {
 return $format;
 }
 /**
 * Returns an array with 'year', 'month', 'day', 'hour', 'minute', and 'second' elements
-* extracted from $datetime according to the order described in $format.  For a format of 'd.M.y H:m:s',
+* extracted from $datetime according to the order described in $format.  For a format of 'd.M.y H:i:s',
 * and an input of 10.05.1985 11:20:55, getDateTime() would return:
 * array ('year' => 1985, 'month' => 5, 'day' => 10, 'hour' => 11, 'minute' => 20, 'second' => 55)
 * The optional $locale parameter may be used to help extract times from strings
 * containing both a time and a day or month name.
 *
 */
 protected static function _getUniCodeSupport()
 {
 return (@preg_match('/\pL/u', 'a')) ? true : false;
 }
+/**
+* Internal method to retrieve the current encoding via the ini setting
+* default_charset for PHP >= 5.6 or iconv_get_encoding otherwise.
+*
+* @return string
+*/
+protected static function _getEncoding()
+{
+$oenc = PHP_VERSION_ID < 50600
+? iconv_get_encoding('internal_encoding')
+: ini_get('default_charset');
+return $oenc;
+}
+/**
+* Internal method to set the encoding via the ini setting
+* default_charset for PHP >= 5.6 or iconv_set_encoding otherwise.
+*
+* @param string $encoding
+* @return void
+*/
+protected static function _setEncoding($encoding)
+{
+if (PHP_VERSION_ID < 50600) {
+iconv_set_encoding('internal_encoding', $encoding);
+} else {
+ini_set('default_charset', $encoding);
+}
+}
 }

changeset 1230	68c69c656a2c
parent 807	877f952ae2bd