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

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history 
Promote develop to master, becoming the next stable release.
  • Loading branch information
@weierophinney
weierophinney committed Mar 12, 2014
163 parents 95dd270 + 144fb7e + 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 + f8c7771 commit fe40c59
Show file tree
Hide file tree
Showing 58 changed files with 1,015 additions and 211 deletions.
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
}
},
"require": {
"php": ">=5.3.3",
"php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version"
},
"require-dev": {
Expand Down
10 changes: 7 additions & 3 deletions src/Filter/Alnum.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,15 @@ public function getAllowWhiteSpace()
*
* Returns $value as string with all non-alphanumeric characters removed
*
* @param mixed $value
* @return string
* @param string|array $value
* @return string|array
*/
public function filter($value)
{
if (!is_scalar($value) && !is_array($value)) {
return $value;
}

$whiteSpace = $this->options['allow_white_space'] ? '\s' : '';
$language = Locale::getPrimaryLanguage($this->getLocale());

Expand All @@ -87,6 +91,6 @@ public function filter($value)
$pattern = '/[^\p{L}\p{N}' . $whiteSpace . ']/u';
}

return preg_replace($pattern, '', (string) $value);
return preg_replace($pattern, '', $value);
}
}
10 changes: 7 additions & 3 deletions src/Filter/Alpha.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,15 @@ class Alpha extends Alnum
*
* Returns the string $value, removing all but alphabetic characters
*
* @param string $value
* @return string
* @param string|array $value
* @return string|array
*/
public function filter($value)
{
if (!is_scalar($value) && !is_array($value)) {
return $value;
}

$whiteSpace = $this->options['allow_white_space'] ? '\s' : '';
$language = Locale::getPrimaryLanguage($this->getLocale());

Expand All @@ -37,6 +41,6 @@ public function filter($value)
$pattern = '/[^\p{L}' . $whiteSpace . ']/u';
}

return preg_replace($pattern, '', (string) $value);
return preg_replace($pattern, '', $value);
}
}
146 changes: 17 additions & 129 deletions src/Filter/NumberFormat.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,127 +9,10 @@

namespace Zend\I18n\Filter;

use NumberFormatter;
use Traversable;
use Zend\I18n\Exception;
use Zend\Stdlib\ErrorHandler;

class NumberFormat extends AbstractLocale
class NumberFormat extends NumberParse
{
protected $options = array(
'locale' => null,
'style' => NumberFormatter::DEFAULT_STYLE,
'type' => NumberFormatter::TYPE_DOUBLE
);

/**
* @var NumberFormatter
*/
protected $formatter = null;

/**
* @param array|Traversable|string|null $localeOrOptions
* @param int $style
* @param int $type
*/
public function __construct(
$localeOrOptions = null,
$style = NumberFormatter::DEFAULT_STYLE,
$type = NumberFormatter::TYPE_DOUBLE)
{
parent::__construct();
if ($localeOrOptions !== null) {
if ($localeOrOptions instanceof Traversable) {
$localeOrOptions = iterator_to_array($localeOrOptions);
}

if (!is_array($localeOrOptions)) {
$this->setLocale($localeOrOptions);
$this->setStyle($style);
$this->setType($type);
} else {
$this->setOptions($localeOrOptions);
}
}
}

/**
* @param string|null $locale
* @return NumberFormat
*/
public function setLocale($locale = null)
{
$this->options['locale'] = $locale;
$this->formatter = null;
return $this;
}

/**
* @param int $style
* @return NumberFormat
*/
public function setStyle($style)
{
$this->options['style'] = (int) $style;
$this->formatter = null;
return $this;
}

/**
* @return int
*/
public function getStyle()
{
return $this->options['style'];
}

/**
* @param int $type
* @return NumberFormat
*/
public function setType($type)
{
$this->options['type'] = (int) $type;
return $this;
}

/**
* @return int
*/
public function getType()
{
return $this->options['type'];
}

/**
* @param NumberFormatter $formatter
* @return NumberFormat
*/
public function setFormatter(NumberFormatter $formatter)
{
$this->formatter = $formatter;
return $this;
}

/**
* @return NumberFormatter
* @throws Exception\RuntimeException
*/
public function getFormatter()
{
if ($this->formatter === null) {
$formatter = NumberFormatter::create($this->getLocale(), $this->getStyle());
if (!$formatter) {
throw new Exception\RuntimeException(
'Can not create NumberFormatter instance; ' . intl_get_error_message()
);
}

$this->formatter = $formatter;
}

return $this->formatter;
}

/**
* Defined by Zend\Filter\FilterInterface
Expand All @@ -140,24 +23,29 @@ public function getFormatter()
*/
public function filter($value)
{
$formatter = $this->getFormatter();
$type = $this->getType();
if (!is_scalar($value)) {
return $value;
}

if (is_int($value) || is_float($value)) {
ErrorHandler::start();
$result = $formatter->format($value, $type);
ErrorHandler::stop();
if (!is_int($value)
&& !is_float($value)
) {
$result = parent::filter($value);
} else {
$value = str_replace(array("\xC2\xA0", ' '), '', $value);
ErrorHandler::start();
$result = $formatter->parse($value, $type);

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

ErrorHandler::stop();
}

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

return str_replace("\xC2\xA0", ' ', $result);
return $value;
}
}
163 changes: 163 additions & 0 deletions src/Filter/NumberParse.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,163 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

namespace Zend\I18n\Filter;

use NumberFormatter;
use Traversable;
use Zend\I18n\Exception;
use Zend\Stdlib\ErrorHandler;

class NumberParse extends AbstractLocale
{
protected $options = array(
'locale' => null,
'style' => NumberFormatter::DEFAULT_STYLE,
'type' => NumberFormatter::TYPE_DOUBLE
);

/**
* @var NumberFormatter
*/
protected $formatter = null;

/**
* @param array|Traversable|string|null $localeOrOptions
* @param int $style
* @param int $type
*/
public function __construct(
$localeOrOptions = null,
$style = NumberFormatter::DEFAULT_STYLE,
$type = NumberFormatter::TYPE_DOUBLE
) {
parent::__construct();
if ($localeOrOptions !== null) {
if ($localeOrOptions instanceof Traversable) {
$localeOrOptions = iterator_to_array($localeOrOptions);
}

if (!is_array($localeOrOptions)) {
$this->setLocale($localeOrOptions);
$this->setStyle($style);
$this->setType($type);
} else {
$this->setOptions($localeOrOptions);
}
}
}

/**
* @param string|null $locale
* @return NumberFormat
*/
public function setLocale($locale = null)
{
$this->options['locale'] = $locale;
$this->formatter = null;
return $this;
}

/**
* @param int $style
* @return NumberFormat
*/
public function setStyle($style)
{
$this->options['style'] = (int) $style;
$this->formatter = null;
return $this;
}

/**
* @return int
*/
public function getStyle()
{
return $this->options['style'];
}

/**
* @param int $type
* @return NumberFormat
*/
public function setType($type)
{
$this->options['type'] = (int) $type;
return $this;
}

/**
* @return int
*/
public function getType()
{
return $this->options['type'];
}

/**
* @param NumberFormatter $formatter
* @return NumberFormat
*/
public function setFormatter(NumberFormatter $formatter)
{
$this->formatter = $formatter;
return $this;
}

/**
* @return NumberFormatter
* @throws Exception\RuntimeException
*/
public function getFormatter()
{
if ($this->formatter === null) {
$formatter = NumberFormatter::create($this->getLocale(), $this->getStyle());
if (!$formatter) {
throw new Exception\RuntimeException(
'Can not create NumberFormatter instance; ' . intl_get_error_message()
);
}

$this->formatter = $formatter;
}

return $this->formatter;
}


/**
* Defined by Zend\Filter\FilterInterface
*
* @see Zend\Filter\FilterInterface::filter()
* @param mixed $value
* @return mixed
*/
public function filter($value)
{
if (!is_int($value)
&& !is_float($value)
) {
ErrorHandler::start();

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

ErrorHandler::stop();

if (false !== $result) {
return $result;
}
}

return $value;
}
}
Loading

0 comments on commit fe40c59

Please sign in to comment.