Updates according to suggestions.

Drak · Drak · commit c4a0f799af9d · 2011-09-27T20:14:32.000+05:45
- Simplified logic of tests.
- Added more comments/docblocks.
- Added more convenience.
diff --git a/src/Symfony/Component/HttpFoundation/ParameterBag.php b/src/Symfony/Component/HttpFoundation/ParameterBag.php
@@ -250,17 +250,26 @@ public function getInt($key, $default = 0, $deep = false)
      * @param mixed   $default Default = null.
      * @param boolean $deep    Default = false.
      * @param integer $filter  FILTER_* constant.
-     * @param array   $options Filter options - can be an array of options or FILTER_* constant.
+     * @param mixed   $options Filter options.
+     * 
+     * @see http://php.net/manual/en/function.filter-var.php
      *
      * @return mixed
      */
-    public function filter($key, $default = null, $deep = false, $filter=FILTER_DEFAULT, array $options=array())
+    public function filter($key, $default = null, $deep = false, $filter=FILTER_DEFAULT, $options=array())
     {
         $value = $this->get($key, $default, $deep);
-        if (is_array($value)) {
+        
+        // Always turn $options into an array - this allows filter_var option shortcuts.
+        if (!is_array($options) && $options) {
+            $options = array('flags' => $options);
+        }
+        
+        // Add a convenience check for arrays.
+        if (is_array($value) && !isset($options['flags'])) {
             $options['flags'] = FILTER_REQUIRE_ARRAY;
         }
-
+        
         return filter_var($value, $filter, $options);
     }
 }
diff --git a/tests/Symfony/Tests/Component/HttpFoundation/ParameterBagTest.php b/tests/Symfony/Tests/Component/HttpFoundation/ParameterBagTest.php
@@ -171,10 +171,10 @@ public function testFilter()
         $bag = new ParameterBag(array(
             'digits' => '0123ab', 
             'email' => 'example@example.com', 
-            'url' => 'http://example.com/',
+            'url' => 'http://example.com/foo',
             'dec' => '256',
             'hex' => '0x100',
-            'array' => 'bang',
+            'array' => array('bang'),
             ));
 
         $this->assertEmpty($bag->filter('nokey'), '->filter() should return empty by default if no key is found');
@@ -183,7 +183,10 @@ public function testFilter()
         
         $this->assertEquals('example@example.com', $bag->filter('email', '', false, FILTER_VALIDATE_EMAIL), '->filter() gets a value of parameter as email');
         
-        $this->assertNotEquals('http://example.com/foo', $bag->filter('url', '', false, FILTER_VALIDATE_URL, array('flags' => FILTER_FLAG_PATH_REQUIRED)), '->filter() gets a value of parameter as url with a path');
+        $this->assertEquals('http://example.com/foo', $bag->filter('url', '', false, FILTER_VALIDATE_URL, array('flags' => FILTER_FLAG_PATH_REQUIRED)), '->filter() gets a value of parameter as url with a path');
+        
+        // This test is repeated for code-coverage
+        $this->assertEquals('http://example.com/foo', $bag->filter('url', '', false, FILTER_VALIDATE_URL, FILTER_FLAG_PATH_REQUIRED), '->filter() gets a value of parameter as url with a path');
         
         $this->assertFalse($bag->filter('dec', '', false, FILTER_VALIDATE_INT, array(
             'flags'   => FILTER_FLAG_ALLOW_HEX,
@@ -195,6 +198,8 @@ public function testFilter()
             'options' => array('min_range' => 1, 'max_range' => 0xff))
                 ), '->filter() gets a value of parameter as integer between boundaries');
         
-        $this->assertNotEquals(array('bang'), $bag->filter('array', '', false), '->filter() gets a value of parameter as an array');
+        $this->assertEquals(array('bang'), $bag->filter('array', '', false), '->filter() gets a value of parameter as an array');
+        
+        
     }
 }
