zendframework · pauloelr · Jun 26, 2013 · Jun 26, 2013 · Jun 26, 2013 · Jun 27, 2013
diff --git a/library/Zend/Filter/BaseName.php b/library/Zend/Filter/BaseName.php
@@ -21,6 +21,14 @@ class BaseName extends AbstractFilter
      */
     public function filter($value)
     {
+        if(!is_scalar($value)){
+            throw new Exception\InvalidArgumentException(sprintf(
+                '%s expects parameter to be scalar, "%s" given',
+                __METHOD__,
+                (is_object($value) ? get_class($value) : gettype($value))
+            ));
+        }
+
         return basename((string) $value);
     }
 }
diff --git a/library/Zend/Filter/Digits.php b/library/Zend/Filter/Digits.php
@@ -23,6 +23,14 @@ class Digits extends AbstractFilter
      */
     public function filter($value)
     {
+        if(!is_scalar($value)){
+            throw new Exception\InvalidArgumentException(sprintf(
+                '%s expects parameter to be scalar, "%s" given',
+                __METHOD__,
+                (is_object($value) ? get_class($value) : gettype($value))
+            ));
+        }
+
         if (!StringUtils::hasPcreUnicodeSupport()) {
             // POSIX named classes are not supported, use alternative 0-9 match
             $pattern = '/[^0-9]/';

diff --git a/library/Zend/Filter/HtmlEntities.php b/library/Zend/Filter/HtmlEntities.php
@@ -179,6 +179,14 @@ public function setDoubleQuote($doubleQuote)
      */
     public function filter($value)
     {
+        if(!is_scalar($value)){
+            throw new Exception\InvalidArgumentException(sprintf(
+                '%s expects parameter to be scalar, "%s" given',
+                __METHOD__,
+                (is_object($value) ? get_class($value) : gettype($value))
+            ));
+        }
+
         $filtered = htmlentities((string) $value, $this->getQuoteStyle(), $this->getEncoding(), $this->getDoubleQuote());
         if (strlen((string) $value) && !strlen($filtered)) {
             if (!function_exists('iconv')) {

diff --git a/library/Zend/Filter/Int.php b/library/Zend/Filter/Int.php
@@ -21,6 +21,14 @@ class Int extends AbstractFilter
      */
     public function filter($value)
     {
+        if(!is_scalar($value)){
+            throw new Exception\InvalidArgumentException(sprintf(
+                '%s expects parameter to be scalar, "%s" given',
+                __METHOD__,
+                (is_object($value) ? get_class($value) : gettype($value))
+            ));
+        }
+
         return (int) ((string) $value);
     }
 }
diff --git a/library/Zend/Filter/RealPath.php b/library/Zend/Filter/RealPath.php
@@ -71,6 +71,14 @@ public function getExists()
      */
     public function filter($value)
     {
+        if(!is_scalar($value)){
+            throw new Exception\InvalidArgumentException(sprintf(
+                '%s expects parameter to be scalar, "%s" given',
+                __METHOD__,
+                (is_object($value) ? get_class($value) : gettype($value))
+            ));
+        }
+
         $path = (string) $value;
         if ($this->options['exists']) {
             return realpath($path);

diff --git a/library/Zend/Filter/StringToLower.php b/library/Zend/Filter/StringToLower.php
@@ -46,6 +46,14 @@ public function __construct($encodingOrOptions = null)
      */
     public function filter($value)
     {
+        if(!is_scalar($value)){
+            throw new Exception\InvalidArgumentException(sprintf(
+                '%s expects parameter to be scalar, "%s" given',
+                __METHOD__,
+                (is_object($value) ? get_class($value) : gettype($value))
+            ));
+        }
+
         if ($this->options['encoding'] !== null) {
             return mb_strtolower((string) $value,  $this->options['encoding']);
         }

diff --git a/library/Zend/Filter/StringToUpper.php b/library/Zend/Filter/StringToUpper.php
@@ -46,6 +46,14 @@ public function __construct($encodingOrOptions = null)
      */
     public function filter($value)
     {
+        if(!is_scalar($value)){
+            throw new Exception\InvalidArgumentException(sprintf(
+                '%s expects parameter to be scalar, "%s" given',
+                __METHOD__,
+                (is_object($value) ? get_class($value) : gettype($value))
+            ));
+        }
+
         if ($this->options['encoding'] !== null) {
             return mb_strtoupper((string) $value,  $this->options['encoding']);
         }

diff --git a/library/Zend/Filter/StripTags.php b/library/Zend/Filter/StripTags.php
@@ -173,6 +173,14 @@ public function setAttributesAllowed($attributesAllowed)
      */
     public function filter($value)
     {
+        if(!is_scalar($value)){
+            throw new Exception\InvalidArgumentException(sprintf(
+                '%s expects parameter to be scalar, "%s" given',
+                __METHOD__,
+                (is_object($value) ? get_class($value) : gettype($value))
+            ));
+        }
+
         $value = (string) $value;
 
         // Strip HTML comments first

diff --git a/tests/ZendTest/Filter/BaseNameTest.php b/tests/ZendTest/Filter/BaseNameTest.php
@@ -36,4 +36,23 @@ public function testBasic()
             $this->assertEquals($output, $filter($input));
         }
     }
+
+    /**
+     * Ensures that an InvalidArgumentException is raised if array is used
+     *
+     * @return void
+     */
+    public function testExceptionRaisedIfArrayUsed()
+    {
+        $filter = new BaseNameFilter();
+        $input = array('/path/to/filename', '/path/to/filename.ext');
+
+        try {
+            $filter->filter($input);
+        } catch (\Zend\Filter\Exception\InvalidArgumentException $expected) {
+            return;
+        }
+
+        $this->fail('An expected InvalidArgumentException has not been raised.');
+    }
 }
diff --git a/tests/ZendTest/Filter/DigitsTest.php b/tests/ZendTest/Filter/DigitsTest.php
@@ -85,4 +85,23 @@ public function testBasic()
                 );
         }
     }
+
+    /**
+     * Ensures that an InvalidArgumentException is raised if array is used
+     *
+     * @return void
+     */
+    public function testExceptionRaisedIfArrayUsed()
+    {
+        $filter = new DigitsFilter();
+        $input = array('abc123', 'abc 123');
+
+        try {
+            $filter->filter($input);
+        } catch (\Zend\Filter\Exception\InvalidArgumentException $expected) {
+            return;
+        }
+
+        $this->fail('An expected InvalidArgumentException has not been raised.');
+    }
 }
diff --git a/tests/ZendTest/Filter/HtmlEntitiesTest.php b/tests/ZendTest/Filter/HtmlEntitiesTest.php
@@ -258,6 +258,24 @@ public function testRaisesExceptionIfEncodingMismatchDetectedAndFinalStringIsEmp
         }
     }
 
+    /**
+     * Ensures that an InvalidArgumentException is raised if array is used
+     *
+     * @return void
+     */
+    public function testExceptionRaisedIfArrayUsed()
+    {
+        $input = array('<', '>');
+
+        try {
+            $this->_filter->filter($input);
+        } catch (\Zend\Filter\Exception\InvalidArgumentException $expected) {
+            return;
+        }
+
+        $this->fail('An expected InvalidArgumentException has not been raised.');
+    }
+
     /**
      * Null error handler; used when wanting to ignore specific error types
      */

diff --git a/tests/ZendTest/Filter/IntTest.php b/tests/ZendTest/Filter/IntTest.php
@@ -41,4 +41,23 @@ public function testBasic()
             $this->assertEquals($output, $filter($input));
         }
     }
+
+    /**
+     * Ensures that an InvalidArgumentException is raised if array is used
+     *
+     * @return void
+     */
+    public function testExceptionRaisedIfArrayUsed()
+    {
+        $filter = new IntFilter();
+        $input = array('123 test', '456 test');
+
+        try {
+            $filter->filter($input);
+        } catch (\Zend\Filter\Exception\InvalidArgumentException $expected) {
+            return;
+        }
+
+        $this->fail('An expected InvalidArgumentException has not been raised.');
+    }
 }
diff --git a/tests/ZendTest/Filter/RealPathTest.php b/tests/ZendTest/Filter/RealPathTest.php
@@ -106,4 +106,26 @@ public function testNonExistantPath()
                . DIRECTORY_SEPARATOR . '_files';
         $this->assertEquals($path, $filter($path3));
     }
+
+    /**
+     * Ensures that an InvalidArgumentException is raised if array is used
+     *
+     * @return void
+     */
+    public function testExceptionRaisedIfArrayUsed()
+    {
+        $filter   = $this->_filter;
+        $input = array(
+            $this->_filesPath . DIRECTORY_SEPARATOR . 'file.1',
+            $this->_filesPath . DIRECTORY_SEPARATOR . 'file.2'
+        );
+
+        try {
+            $filter->filter($input);
+        } catch (\Zend\Filter\Exception\InvalidArgumentException $expected) {
+            return;
+        }
+
+        $this->fail('An expected InvalidArgumentException has not been raised.');
+    }
 }
diff --git a/tests/ZendTest/Filter/StringToLowerTest.php b/tests/ZendTest/Filter/StringToLowerTest.php
@@ -158,4 +158,22 @@ public function testDetectMbInternalEncoding()
 
         $this->assertEquals(mb_internal_encoding(), $this->_filter->getEncoding());
     }
+
+    /**
+     * Ensures that an InvalidArgumentException is raised if array is used
+     *
+     * @return void
+     */
+    public function testExceptionRaisedIfArrayUsed()
+    {
+        $input = array('ABC', 'DEF');
+
+        try {
+            $this->_filter->filter($input);
+        } catch (\Zend\Filter\Exception\InvalidArgumentException $expected) {
+            return;
+        }
+
+        $this->fail('An expected InvalidArgumentException has not been raised.');
+    }
 }
diff --git a/tests/ZendTest/Filter/StringToUpperTest.php b/tests/ZendTest/Filter/StringToUpperTest.php
@@ -158,4 +158,22 @@ public function testDetectMbInternalEncoding()
 
         $this->assertEquals(mb_internal_encoding(), $this->_filter->getEncoding());
     }
+
+    /**
+     * Ensures that an InvalidArgumentException is raised if array is used
+     *
+     * @return void
+     */
+    public function testExceptionRaisedIfArrayUsed()
+    {
+        $input = array('abc', 'def');
+
+        try {
+            $this->_filter->filter($input);
+            } catch (\Zend\Filter\Exception\InvalidArgumentException $expected) {
+            return;
+        }
+
+        $this->fail('An expected InvalidArgumentException has not been raised.');
+    }
 }
diff --git a/tests/ZendTest/Filter/StripTagsTest.php b/tests/ZendTest/Filter/StripTagsTest.php
@@ -538,4 +538,22 @@ public function testFilterCanAllowHyphenatedAttributeNames()
 
         $this->assertEquals($expected, $this->_filter->filter($input));
     }
+
+    /**
+     * Ensures that an InvalidArgumentException is raised if array is used
+     *
+     * @return void
+     */
+    public function testExceptionRaisedIfArrayUsed()
+    {
+        $input = array('<li data-name="Test User" data-id="11223"></li>', '<li data-name="Test User 2" data-id="456789"></li>');
+
+        try {
+            $this->_filter->filter($input);
+        } catch (\Zend\Filter\Exception\InvalidArgumentException $expected) {
+            return;
+        }
+
+        $this->fail('An expected InvalidArgumentException has not been raised.');
+    }
 }