Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/6373' into develop
Browse files Browse the repository at this point in the history 
Forward port zendframework/zendframework#6373
  • Loading branch information
@weierophinney
weierophinney committed Aug 7, 2014
173 parents 9354996 + 44b0196 + 4cf13fa + 26a1d46 + 712a04b + 4dbc11a + c99b627 + 740abb6 + 9b5478d + 91a23e2 + 8649d44 + 3f353b0 + d340adb + 1e0e8f4 + 5c4289e + fb94cca + 2a3844c + 906bbcf + 3d9b8bb + 84844ae + 62fc651 + b0a3dd4 + 0dca0ef + 910bbbf + e574b9b + f30ec7d + 1fa84de + 41b8543 + 9e2c9d5 + 913f51c + 39924f3 + c2a11e1 + 61b9322 + 413a38b + e51b2b8 + 20e328b + 6437ec0 + e9b8476 + 95e54a0 + 7ea3aed + df6a706 + a82fc82 + 7c2a059 + 4fefb53 + 599ee3a + ea3fc65 + f6c04c2 + 6591e3d + a4f76e3 + 33c7531 + 2d59782 + 8152327 + e56ce9b + db9b18f + b88635a + a262823 + b79aef6 + c2284e4 + 70193eb + 96acf77 + 9675426 + 5f02411 + 0dafea7 + 15dc674 + 4a2447d + e6eb7f3 + e9499c5 + 272b15f + 11c7758 + 6f0e918 + 5f4980a + ecca95a + 88b5971 + ecb8d13 + 9de1c08 + 44aad17 + 13269e9 + 654cdb6 + dc708db + 380ffba + ff67e7f + fe2e025 + 95f0efa + 68cc4b3 + bf13b96 + 8870381 + 56480f4 + 1fa90d7 + 5c7fe1f + abe9bc1 + a33cacd + cdd7d9f + 6a261b1 + 5e594c4 + 01c1241 + 30d1dd2 + d4af079 + c9aa9b4 + 10f47ca + ef20fa1 + 2187ae2 + e7f3993 + db93d37 + aa57612 + 4af81d8 + 2f90998 + 3013404 + 69d83fe + f383ca9 + 1b26f48 + 054f09d + 0c86829 + f22d81a + e7ebffe + 72a7a54 + cc09223 + ab99f58 + 2c69e37 + b6ccfbc + b92a5da + 773a133 + 9ee28ff + 5865e20 + 63c7303 + 73371d0 + b96f402 + b36e36b + 60fa081 + a1d27a6 + 43e9240 + 9e59ae6 + be1ce44 + 5a6465d + 7e455b4 + 83d837e + 28bc01e + 215be48 + efcc8e0 + 5192ae6 + 7e1ba0f + dec8ccf + 94afc0f + 8c3ea5f + d680762 + 9092473 + 041fc63 + ea6499d + 1f59300 + a75142b + f592cc2 + f523aef + 2d12221 + 34ad758 + 23cc229 + 1fa15a0 + 6b74fc7 + 1472e82 + d816ccc + 7b26586 + 08d26c4 + a5cc444 + fe92acf + 6bd67b2 + 371ba41 + 2dc7154 + 2902dd7 + aecaa35 + 63cc2ee + fe40c59 + 52f5bec + 08624c3 + 38b98d2 + 5396c6f commit bc6b82e
Show file tree
Hide file tree
Showing 4 changed files with 258 additions and 148 deletions.
11 changes: 3 additions & 8 deletions src/Filter/NumberFormat.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,23 +27,18 @@ public function filter($value)
return $value;
}

if (!is_int($value)
&& !is_float($value)
) {
if (!is_int($value) && !is_float($value)) {
$result = parent::filter($value);
} else {
ErrorHandler::start();

$result = $this->getFormatter()->format(
$value,
$this->getType()
);
$result = $this->getFormatter()->format($value, $this->getType());

ErrorHandler::stop();
}

if (false !== $result) {
return str_replace("\xC2\xA0", ' ', $result);
return $result;
}

return $value;
Expand Down
153 changes: 126 additions & 27 deletions src/Validator/Float.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
use Traversable;
use Zend\I18n\Exception as I18nException;
use Zend\Stdlib\ArrayUtils;
use Zend\Stdlib\StringUtils;
use Zend\Stdlib\StringWrapper\StringWrapperInterface;
use Zend\Validator\AbstractValidator;
use Zend\Validator\Exception;

Expand All @@ -37,6 +39,13 @@ class Float extends AbstractValidator
*/
protected $locale;

/**
* UTF-8 compatable wrapper for string functions
*
* @var StringWrapperInterface
*/
protected $wrapper;

/**
* Constructor for the integer validator
*
Expand All @@ -46,12 +55,13 @@ class Float extends AbstractValidator
public function __construct($options = array())
{
if (!extension_loaded('intl')) {
throw new I18nException\ExtensionNotLoadedException(sprintf(
'%s component requires the intl PHP extension',
__NAMESPACE__
));
throw new I18nException\ExtensionNotLoadedException(
sprintf('%s component requires the intl PHP extension', __NAMESPACE__)
);
}

$this->wrapper = StringUtils::getWrapper();

if ($options instanceof Traversable) {
$options = ArrayUtils::iteratorToArray($options);
}
Expand Down Expand Up @@ -88,56 +98,145 @@ public function setLocale($locale)
return $this;
}


/**
* Returns true if and only if $value is a floating-point value
* Returns true if and only if $value is a floating-point value. Uses the formal definition of a float as described
* in the PHP manual: {@link http://www.php.net/float}
*
* @param string $value
* @return bool
* @throws Exception\InvalidArgumentException
*/
public function isValid($value)
{
if (!is_string($value) && !is_int($value) && !is_float($value)) {
if (!is_scalar($value) || is_bool($value)) {
$this->error(self::INVALID);
return false;
}

$this->setValue($value);

if (is_float($value)) {
if (is_float($value) || is_int($value)) {
return true;
}

$locale = $this->getLocale();
$format = new NumberFormatter($locale, NumberFormatter::DECIMAL);
if (intl_is_failure($format->getErrorCode())) {
throw new Exception\InvalidArgumentException("Invalid locale string given");
// Need to check if this is scientific formatted string. If not, switch to decimal.
$formatter = new NumberFormatter($this->getLocale(), NumberFormatter::SCIENTIFIC);

if (intl_is_failure($formatter->getErrorCode())) {
throw new Exception\InvalidArgumentException($formatter->getErrorMessage());
}

$parsedFloat = $format->parse($value, NumberFormatter::TYPE_DOUBLE);
if (intl_is_failure($format->getErrorCode())) {
$this->error(self::NOT_FLOAT);
return false;
if (StringUtils::hasPcreUnicodeSupport()) {
$exponentialSymbols = '[Ee' . $formatter->getSymbol(NumberFormatter::EXPONENTIAL_SYMBOL) . ']+';
$search = '/' . $exponentialSymbols . '/u';
} else {
$exponentialSymbols = '[Ee]';
$search = '/' . $exponentialSymbols . '/';
}

$decimalSep = $format->getSymbol(NumberFormatter::DECIMAL_SEPARATOR_SYMBOL);
$groupingSep = $format->getSymbol(NumberFormatter::GROUPING_SEPARATOR_SYMBOL);
if (!preg_match($search, $value)) {
$formatter = new NumberFormatter($this->getLocale(), NumberFormatter::DECIMAL);
}

$valueFiltered = str_replace($groupingSep, '', $value);
$valueFiltered = str_replace($decimalSep, '.', $valueFiltered);
/**
* @desc There are seperator "look-alikes" for decimal and group seperators that are more commonly used than the
* official unicode chracter. We need to replace those with the real thing - or remove it.
*/
$groupSeparator = $formatter->getSymbol(NumberFormatter::GROUPING_SEPARATOR_SYMBOL);
$decSeparator = $formatter->getSymbol(NumberFormatter::DECIMAL_SEPARATOR_SYMBOL);

//NO-BREAK SPACE and ARABIC THOUSANDS SEPARATOR
if ($groupSeparator == "\xC2\xA0") {
$value = str_replace(' ', $groupSeparator, $value);
} elseif ($groupSeparator == "\xD9\xAC") { //NumberFormatter doesn't have grouping at all for Arabic-Indic
$value = str_replace(array('\'', $groupSeparator), '', $value);
}

while (strpos($valueFiltered, '.') !== false
&& (substr($valueFiltered, -1) == '0' || substr($valueFiltered, -1) == '.')
) {
$valueFiltered = substr($valueFiltered, 0, strlen($valueFiltered) - 1);
//ARABIC DECIMAL SEPARATOR
if ($decSeparator == "\xD9\xAB") {
$value = str_replace(',', $decSeparator, $value);
}

if (strval($parsedFloat) !== $valueFiltered) {
$this->error(self::NOT_FLOAT);
$groupSeparatorPosition = $this->wrapper->strpos($value, $groupSeparator);
$decSeparatorPosition = $this->wrapper->strpos($value, $decSeparator);

//We have seperators, and they are flipped. i.e. 2.000,000 for en-US
if ($groupSeparatorPosition && $decSeparatorPosition && $groupSeparatorPosition > $decSeparatorPosition) {
return false;
}

return true;
//If we have Unicode support, we can use the real graphemes, otherwise, just the ASCII characters
$decimal = '['. preg_quote($decSeparator, '/') . ']';
$prefix = '[+-]';
$exp = $exponentialSymbols;
$numberRange = '0-9';
$useUnicode = '';
$suffix = '';

if (StringUtils::hasPcreUnicodeSupport()) {
$prefix = '['
. preg_quote(
$formatter->getTextAttribute(NumberFormatter::POSITIVE_PREFIX)
. $formatter->getTextAttribute(NumberFormatter::NEGATIVE_PREFIX)
. $formatter->getSymbol(NumberFormatter::PLUS_SIGN_SYMBOL)
. $formatter->getSymbol(NumberFormatter::MINUS_SIGN_SYMBOL),
'/'
)
. ']{0,3}';
$suffix = ($formatter->getTextAttribute(NumberFormatter::NEGATIVE_SUFFIX))
? '['
. preg_quote(
$formatter->getTextAttribute(NumberFormatter::POSITIVE_SUFFIX)
. $formatter->getTextAttribute(NumberFormatter::NEGATIVE_SUFFIX)
. $formatter->getSymbol(NumberFormatter::PLUS_SIGN_SYMBOL)
. $formatter->getSymbol(NumberFormatter::MINUS_SIGN_SYMBOL),
'/'
)
. ']{0,3}'
: '';
$numberRange = '\p{N}';
$useUnicode = 'u';
}

/**
* @desc Match against the formal definition of a float. The
* exponential number check is modified for RTL non-Latin number
* systems (Arabic-Indic numbering). I'm also switching out the period
* for the decimal separator. The formal definition leaves out +- from
* the integer and decimal notations so add that. This also checks
* that a grouping sperator is not in the last GROUPING_SIZE graphemes
* of the string - i.e. 10,6 is not valid for en-US.
* @see http://www.php.net/float
*/

$lnum = '[' . $numberRange . ']+';
$dnum = '(([' . $numberRange . ']*' . $decimal . $lnum . ')|(' . $lnum . $decimal . '[' . $numberRange . ']*))';
$expDnum = '((' . $prefix . '((' . $lnum . '|' . $dnum . ')' . $exp . $prefix . $lnum . ')' . $suffix . ')|'
. '(' . $suffix . '(' . $lnum . $prefix . $exp . '(' . $dnum . '|' . $lnum . '))' . $prefix . '))';

// LEFT-TO-RIGHT MARK (U+200E) is messing up everything for the handful
// of locales that have it
$lnumSearch = str_replace("\xE2\x80\x8E", '', '/^' .$prefix . $lnum . $suffix . '$/' . $useUnicode);
$dnumSearch = str_replace("\xE2\x80\x8E", '', '/^' .$prefix . $dnum . $suffix . '$/' . $useUnicode);
$expDnumSearch = str_replace("\xE2\x80\x8E", '', '/^' . $expDnum . '$/' . $useUnicode);
$value = str_replace("\xE2\x80\x8E", '', $value);
$unGroupedValue = str_replace($groupSeparator, '', $value);

// No strrpos() in wrappers yet. ICU 4.x doesn't have grouping size for
// everything. ICU 52 has 3 for ALL locales.
$groupSize = ($formatter->getAttribute(NumberFormatter::GROUPING_SIZE))
? $formatter->getAttribute(NumberFormatter::GROUPING_SIZE)
: 3;
$lastStringGroup = $this->wrapper->substr($value, -$groupSize);

if ((preg_match($lnumSearch, $unGroupedValue)
|| preg_match($dnumSearch, $unGroupedValue)
|| preg_match($expDnumSearch, $unGroupedValue))
&& false === $this->wrapper->strpos($lastStringGroup, $groupSeparator)
) {
return true;
}

return false;
}
}
4 changes: 2 additions & 2 deletions test/Filter/NumberFormatTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public function numberToFormattedProvider()
NumberFormatter::DEFAULT_STYLE,
NumberFormatter::TYPE_DOUBLE,
1234567.8912346,
'1 234 567,891'
'1 234 567,891'
),
);
}
Expand Down Expand Up @@ -161,6 +161,6 @@ public function testReturnUnfiltered($input)
{
$filter = new NumberFormatFilter('de_AT', NumberFormatter::DEFAULT_STYLE, NumberFormatter::TYPE_DOUBLE);

$this->assertEquals($input, $filter->filter($input));
$this->assertEquals($input, $filter->filter($input));
}
}
Loading

0 comments on commit bc6b82e

Please sign in to comment.