Merge branch 'master' of github.com:zendframework/zf2

zendframework · May 14, 2014 · 0967d63 · 0967d63
commit 0967d63
Show file tree

Hide file tree

Showing 326 changed files with 1,567 additions and 639 deletions.
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
         }
     },
     "require": {
-        "php": ">=5.3.3",
+        "php": ">=5.3.23",
         "zendframework/zend-stdlib": "self.version"
     },
     "require-dev": {
@@ -41,8 +41,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.2-dev",
-            "dev-develop": "2.3-dev"
+            "dev-master": "2.3-dev",
+            "dev-develop": "2.4-dev"
         }
     },
     "autoload-dev": {

diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 

diff --git a/src/Exception/ExtensionNotLoadedException.php b/src/Exception/ExtensionNotLoadedException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 

diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 

diff --git a/src/Exception/OutOfBoundsException.php b/src/Exception/OutOfBoundsException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 

diff --git a/src/Exception/ParseException.php b/src/Exception/ParseException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 

diff --git a/src/Exception/RangeException.php b/src/Exception/RangeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 

diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 

diff --git a/src/Filter/AbstractLocale.php b/src/Filter/AbstractLocale.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 

diff --git a/src/Filter/Alnum.php b/src/Filter/Alnum.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
@@ -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());
 
@@ -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);
     }
 }
diff --git a/src/Filter/Alpha.php b/src/Filter/Alpha.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
@@ -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());
 
@@ -37,6 +41,6 @@ public function filter($value)
             $pattern = '/[^\p{L}' . $whiteSpace . ']/u';
         }
 
-        return preg_replace($pattern, '', (string) $value);
+        return preg_replace($pattern, '', $value);
     }
 }
diff --git a/src/Filter/NumberFormat.php b/src/Filter/NumberFormat.php
@@ -3,133 +3,16 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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 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
@@ -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;
     }
 }