Merge pull request zendframework/zendframework#5436 from ThaDafinser/…

…ZendFilter

[WIP] Zend\Filter harmonization (Issue 5119)

Conflicts:
	library/Zend/I18n/Filter/NumberFormat.php

src/Filter/Alnum.php

@@ -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);
     }
 }

src/Filter/Alpha.php

@@ -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);
     }
 }

src/Filter/NumberFormat.php

@@ -23,13 +23,15 @@ class NumberFormat extends NumberParse
      */
     public function filter($value)
     {
-        if (!is_int($value)
-            && !is_float($value)) {
+        if (!is_scalar($value)) {
+            return $value;
+        }
 
+        if (!is_int($value)
+            && !is_float($value)
+        ) {
             $result = parent::filter($value);
-
         } else {
-
             ErrorHandler::start();
 
             $result = $this->getFormatter()->format(
@@ -38,7 +40,6 @@ public function filter($value)
             );
 
             ErrorHandler::stop();
-
         }
 
         if (false !== $result) {

test/Filter/AlnumTest.php

@@ -158,4 +158,40 @@ public function testAllowWhiteSpace()
             $this->assertEquals($expected, $actual);
         }
     }
+
+    public function testFilterSupportArray()
+    {
+        $filter = new AlnumFilter();
+
+        $values = array(
+            'abc123'  => 'abc123',
+            'abc 123' => 'abc123',
+            'abcxyz'  => 'abcxyz',
+            'AZ@#4.3' => 'AZ43',
+            ''        => ''
+        );
+
+        $actual = $filter->filter(array_keys($values));
+
+        $this->assertEquals(array_values($values), $actual);
+    }
+
+    public function returnUnfilteredDataProvider()
+    {
+        return array(
+            array(null),
+            array(new \stdClass())
+        );
+    }
+
+    /**
+     * @dataProvider returnUnfilteredDataProvider
+     * @return void
+     */
+    public function testReturnUnfiltered($input)
+    {
+        $filter = new AlnumFilter();
+
+        $this->assertEquals($input,  $filter->filter($input));
+    }
 }

test/Filter/AlphaTest.php

@@ -162,4 +162,40 @@ public function testAllowWhiteSpace()
             $this->assertEquals($expected, $actual);
         }
     }
+
+    public function testFilterSupportArray()
+    {
+        $filter = new AlphaFilter();
+
+        $values = array(
+            'abc123'        => 'abc',
+            'abc 123'       => 'abc',
+            'abcxyz'        => 'abcxyz',
+            ''              => ''
+        );
+
+        $actual = $filter->filter(array_keys($values));
+
+        $this->assertEquals(array_values($values), $actual);
+    }
+
+    public function returnUnfilteredDataProvider()
+    {
+        return array(
+            array(null),
+            array(new \stdClass())
+        );
+    }
+
+    /**
+     * @dataProvider returnUnfilteredDataProvider
+     * @return void
+     */
+    public function testReturnUnfiltered($input)
+    {
+        $filter = new AlphaFilter();
+
+        $this->assertEquals($input,  $filter->filter($input));
+    }
+
 }

test/Filter/NumberFormatTest.php

@@ -139,4 +139,28 @@ public function formattedToNumberProvider()
             ),
         );
     }
+
+
+    public function returnUnfilteredDataProvider()
+    {
+        return array(
+            array(null),
+            array(new \stdClass()),
+            array(array(
+                '1.234.567,891',
+                '1.567,891'
+            ))
+        );
+    }
+
+    /**
+     * @dataProvider returnUnfilteredDataProvider
+     * @return void
+     */
+    public function testReturnUnfiltered($input)
+    {
+        $filter = new NumberFormatFilter('de_AT', NumberFormatter::DEFAULT_STYLE, NumberFormatter::TYPE_DOUBLE);
+
+        $this->assertEquals($input,  $filter->filter($input));
+    }
 }