Revert "Merge branch 'superdweebie-rand-bugfix'"

This reverts commit 002ce3dee6107f2c71af8e7ce0ed1f43693ddadf, reversing
changes made to 0023a96e4756112661c11dbf4e293f4be110809a.

Note: we will need to revert this revert when merging develop to master for the
2.3.0 release. See http://git-scm.com/blog/2010/03/02/undoing-merges.html - the
section on "Reverting the Revert," for details.

src/Filter/NumberFormat.php

@@ -9,11 +9,127 @@
 
 namespace Zend\I18n\Filter;
 
+use NumberFormatter;
+use Traversable;
 use Zend\I18n\Exception;
 use Zend\Stdlib\ErrorHandler;
 
-class NumberFormat extends NumberParse
+class NumberFormat 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
@@ -24,28 +140,24 @@ class NumberFormat extends NumberParse
      */
     public function filter($value)
     {
-        if (!is_int($value)
-            && !is_float($value)) {
-
-            $result = parent::filter($value);
+        $formatter = $this->getFormatter();
+        $type      = $this->getType();
 
+        if (is_int($value) || is_float($value)) {
+            ErrorHandler::start();
+            $result = $formatter->format($value, $type);
+            ErrorHandler::stop();
         } else {
-
+            $value = str_replace(array("\xC2\xA0", ' '), '', $value);
             ErrorHandler::start();
-
-            $result = $this->getFormatter()->format(
-                $value,
-                $this->getType()
-            );
-
+            $result = $formatter->parse($value, $type);
             ErrorHandler::stop();
-
         }
 
-        if (false !== $result) {
-            return str_replace("\xC2\xA0", ' ', $result);
+        if ($result === false) {
+            return $value;
         }
 
-        return $value;
+        return str_replace("\xC2\xA0", ' ', $result);
     }
 }