Merge remote-tracking branch 'zf2/master'

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "zendframework/zend-i18n",
-    "description": "Zend\\I18n component",
+    "description": " ",
     "license": "BSD-3-Clause",
     "keywords": [
         "zf2",
@@ -9,11 +9,11 @@
     "homepage": "https://github.com/zendframework/zend-i18n",
     "autoload": {
         "psr-4": {
-            "Zend\\I18n\\": "src/"
+            "Zend\\I18n": "src/"
         }
     },
     "require": {
-        "php": ">=5.3.23",
+        "php": ">=5.3.3",
         "zendframework/zend-stdlib": "self.version"
     },
     "require-dev": {

src/Exception/ExceptionInterface.php

@@ -0,0 +1,19 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_I18n
+ */
+
+namespace Zend\I18n\Exception;
+
+/**
+ * @category   Zend
+ * @package    Zend_I18n
+ * @subpackage Translator
+ */
+interface ExceptionInterface
+{}

src/Exception/InvalidArgumentException.php

@@ -0,0 +1,20 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_I18n
+ */
+
+namespace Zend\I18n\Exception;
+
+/**
+ * @category   Zend
+ * @package    Zend_I18n
+ * @subpackage Translator
+ */
+class InvalidArgumentException extends \InvalidArgumentException implements
+    ExceptionInterface
+{}

src/Exception/OutOfBoundsException.php

@@ -0,0 +1,20 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_I18n
+ */
+
+namespace Zend\I18n\Exception;
+
+/**
+ * @category   Zend
+ * @package    Zend_I18n
+ * @subpackage Translator
+ */
+class OutOfBoundsException extends \OutOfBoundsException implements
+    ExceptionInterface
+{}

src/Exception/ParseException.php

@@ -0,0 +1,19 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_I18n
+ */
+
+namespace Zend\I18n\Exception;
+
+/**
+ * @category   Zend
+ * @package    Zend_I18n
+ * @subpackage Translator
+ */
+class ParseException extends RuntimeException implements ExceptionInterface
+{}

src/Exception/RangeException.php

@@ -0,0 +1,19 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_I18n
+ */
+
+namespace Zend\I18n\Exception;
+
+/**
+ * @category   Zend
+ * @package    Zend_I18n
+ * @subpackage Translator
+ */
+class RangeException extends \RangeException implements ExceptionInterface
+{}

src/Exception/RuntimeException.php

@@ -0,0 +1,19 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_I18n
+ */
+
+namespace Zend\I18n\Exception;
+
+/**
+ * @category   Zend
+ * @package    Zend_I18n
+ * @subpackage Translator
+ */
+class RuntimeException extends \RuntimeException implements ExceptionInterface
+{}

src/Filter/AbstractLocale.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_I18n
+ */
+
+namespace Zend\I18n\Filter;
+
+use Locale;
+use Zend\Filter\AbstractFilter;
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ */
+abstract class AbstractLocale extends AbstractFilter
+{
+    /**
+     * Sets the locale option
+     *
+     * @param  string|null $locale
+     * @return AbstractLocale
+     */
+    public function setLocale($locale = null)
+    {
+        $this->options['locale'] = $locale;
+        return $this;
+    }
+
+    /**
+     * Returns the locale option
+     *
+     * @return string
+     */
+    public function getLocale()
+    {
+        if (!isset($this->options['locale'])) {
+            $this->options['locale'] = Locale::getDefault();
+        }
+        return $this->options['locale'];
+    }
+}

src/Filter/Alnum.php

@@ -0,0 +1,97 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_I18n
+ */
+
+namespace Zend\I18n\Filter;
+
+use Locale;
+use Traversable;
+use Zend\Stdlib\ArrayUtils;
+
+/**
+ * @category   Zend
+ * @package    Zend_Filter
+ */
+class Alnum extends AbstractLocale
+{
+    /**
+     * @var array
+     */
+    protected $options = array(
+        'locale'            => null,
+        'allow_white_space' => false,
+    );
+
+    /**
+     * Sets default option values for this instance
+     *
+     * @param array|Traversable|boolean|null $allowWhiteSpaceOrOptions
+     * @param string|null $locale
+     */
+    public function __construct($allowWhiteSpaceOrOptions = null, $locale = null)
+    {
+        if ($allowWhiteSpaceOrOptions !== null) {
+            if (static::isOptions($allowWhiteSpaceOrOptions)){
+                $this->setOptions($allowWhiteSpaceOrOptions);
+            } else {
+                $this->setAllowWhiteSpace($allowWhiteSpaceOrOptions);
+                $this->setLocale($locale);
+            }
+        }
+    }
+
+    /**
+     * Sets the allowWhiteSpace option
+     *
+     * @param  boolean $flag
+     * @return Alnum Provides a fluent interface
+     */
+    public function setAllowWhiteSpace($flag = true)
+    {
+        $this->options['allow_white_space'] = (boolean) $flag;
+        return $this;
+    }
+
+    /**
+     * Whether white space is allowed
+     *
+     * @return boolean
+     */
+    public function getAllowWhiteSpace()
+    {
+        return $this->options['allow_white_space'];
+    }
+
+    /**
+     * Defined by Zend\Filter\FilterInterface
+     *
+     * Returns $value as string with all non-alphanumeric characters removed
+     *
+     * @param  mixed $value
+     * @return string
+     */
+    public function filter($value)
+    {
+        $whiteSpace = $this->options['allow_white_space'] ? '\s' : '';
+        $language   = Locale::getPrimaryLanguage($this->getLocale());
+
+        if (!static::hasPcreUnicodeSupport()) {
+            // POSIX named classes are not supported, use alternative a-zA-Z0-9 match
+            $pattern = '/[^a-zA-Z0-9' . $whiteSpace . ']/';
+        } elseif ($language == 'ja'|| $language == 'ko' || $language == 'zh') {
+            // Use english alphabet
+            $pattern = '/[^a-zA-Z0-9'  . $whiteSpace . ']/u';
+        } else {
+            // Use native language alphabet
+            $pattern = '/[^\p{L}\p{N}' . $whiteSpace . ']/u';
+        }
+
+        return preg_replace($pattern, '', (string) $value);
+    }
+}