symfony
diff --git a/‎src/Symfony/Component/HttpFoundation/ParameterBag.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/ParameterBag.php
+12-33Lines changed: 12 additions & 33 deletions b/‎src/Symfony/Component/HttpFoundation/ParameterBag.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/ParameterBag.php
+12-33Lines changed: 12 additions & 33 deletions
@@ -128,70 +128,65 @@ public function remove($key)
      *
      * @param string $key     The parameter key
      * @param string $default The default value if the parameter key does not exist
-     * @param bool   $deep    If true, a path like foo[bar] will find deeper items
      *
      * @return string The filtered value
      */
-    public function getAlpha($key, $default = '', $deep = false)
+    public function getAlpha($key, $default = '')
     {
-        return preg_replace('/[^[:alpha:]]/', '', $this->get($key, $default, $deep));
+        return preg_replace('/[^[:alpha:]]/', '', $this->get($key, $default));
     }
 
     /**
      * Returns the alphabetic characters and digits of the parameter value.
      *
      * @param string $key     The parameter key
      * @param string $default The default value if the parameter key does not exist
-     * @param bool   $deep    If true, a path like foo[bar] will find deeper items
      *
      * @return string The filtered value
      */
-    public function getAlnum($key, $default = '', $deep = false)
+    public function getAlnum($key, $default = '')
     {
-        return preg_replace('/[^[:alnum:]]/', '', $this->get($key, $default, $deep));
+        return preg_replace('/[^[:alnum:]]/', '', $this->get($key, $default));
     }
 
     /**
      * Returns the digits of the parameter value.
      *
      * @param string $key     The parameter key
      * @param string $default The default value if the parameter key does not exist
-     * @param bool   $deep    If true, a path like foo[bar] will find deeper items
      *
      * @return string The filtered value
      */
-    public function getDigits($key, $default = '', $deep = false)
+    public function getDigits($key, $default = '')
     {
         // we need to remove - and + because they're allowed in the filter
-        return str_replace(array('-', '+'), '', $this->filter($key, $default, FILTER_SANITIZE_NUMBER_INT, array(), $deep));
+        return str_replace(array('-', '+'), '', $this->filter($key, $default, FILTER_SANITIZE_NUMBER_INT));
     }
 
     /**
      * Returns the parameter value converted to integer.
      *
      * @param string $key     The parameter key
      * @param int    $default The default value if the parameter key does not exist
-     * @param bool   $deep    If true, a path like foo[bar] will find deeper items
      *
      * @return int The filtered value
      */
-    public function getInt($key, $default = 0, $deep = false)
+    public function getInt($key, $default = 0)
     {
-        return (int) $this->get($key, $default, $deep);
+        return (int) $this->get($key, $default);
     }
 
     /**
      * Returns the parameter value converted to boolean.
      *
      * @param string $key     The parameter key
      * @param mixed  $default The default value if the parameter key does not exist
-     * @param bool   $deep    If true, a path like foo[bar] will find deeper items
      *
      * @return bool The filtered value
      */
-    public function getBoolean($key, $default = false, $deep = false)
+    public function getBoolean($key, $default = false)
     {
-        return $this->filter($key, $default, FILTER_VALIDATE_BOOLEAN, array(), $deep);
+        return $this->filter($key, $default, FILTER_VALIDATE_BOOLEAN);
     }
 
     /**
@@ -201,30 +196,14 @@ public function getBoolean($key, $default = false, $deep = false)
      * @param mixed  $default Default = null.
      * @param int    $filter  FILTER_* constant.
      * @param mixed  $options Filter options.
-     * @param bool   $deep    Default = false.
      *
      * @see http://php.net/manual/en/function.filter-var.php
      *
      * @return mixed
      */
-    public function filter($key, $default = null, $filter = FILTER_DEFAULT, $options = array(), $deep = false)
+    public function filter($key, $default = null, $filter = FILTER_DEFAULT, $options = array())
     {
-        static $filters = null;
-
-        if (null === $filters) {
-            foreach (filter_list() as $tmp) {
-                $filters[filter_id($tmp)] = 1;
-            }
-        }
-        if (is_bool($filter) || !isset($filters[$filter]) || is_array($deep)) {
-            @trigger_error('Passing the $deep boolean as 3rd argument to the '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Remove it altogether as the $deep argument will be removed in 3.0.', E_USER_ERROR);
-            $tmp = $deep;
-            $deep = $filter;
-            $filter = $options;
-            $options = $tmp;
-        }
-
-        $value = $this->get($key, $default, $deep);
+        $value = $this->get($key, $default);
 
         // Always turn $options into an array - this allows filter_var option shortcuts.
         if (!is_array($options) && $options) {
Original file line number	Diff line number	Diff line change
`@@ -128,70 +128,65 @@ public function remove($key)`
`128`	`128`	`*`
`129`	`129`	`* @param string $key The parameter key`
`130`	`130`	`* @param string $default The default value if the parameter key does not exist`
`131`		`- * @param bool $deep If true, a path like foo[bar] will find deeper items`
`132`	`131`	`*`
`133`	`132`	`* @return string The filtered value`
`134`	`133`	`*/`
`135`		`- public function getAlpha($key, $default = '', $deep = false)`
	`134`	`+ public function getAlpha($key, $default = '')`
`136`	`135`	`{`
`137`		`- return preg_replace('/[^[:alpha:]]/', '', $this->get($key, $default, $deep));`
	`136`	`+ return preg_replace('/[^[:alpha:]]/', '', $this->get($key, $default));`
`138`	`137`	`}`
`139`	`138`
`140`	`139`	`/**`
`141`	`140`	`* Returns the alphabetic characters and digits of the parameter value.`
`142`	`141`	`*`
`143`	`142`	`* @param string $key The parameter key`
`144`	`143`	`* @param string $default The default value if the parameter key does not exist`
`145`		`- * @param bool $deep If true, a path like foo[bar] will find deeper items`
`146`	`144`	`*`
`147`	`145`	`* @return string The filtered value`
`148`	`146`	`*/`
`149`		`- public function getAlnum($key, $default = '', $deep = false)`
	`147`	`+ public function getAlnum($key, $default = '')`
`150`	`148`	`{`
`151`		`- return preg_replace('/[^[:alnum:]]/', '', $this->get($key, $default, $deep));`
	`149`	`+ return preg_replace('/[^[:alnum:]]/', '', $this->get($key, $default));`
`152`	`150`	`}`
`153`	`151`
`154`	`152`	`/**`
`155`	`153`	`* Returns the digits of the parameter value.`
`156`	`154`	`*`
`157`	`155`	`* @param string $key The parameter key`
`158`	`156`	`* @param string $default The default value if the parameter key does not exist`
`159`		`- * @param bool $deep If true, a path like foo[bar] will find deeper items`
`160`	`157`	`*`
`161`	`158`	`* @return string The filtered value`
`162`	`159`	`*/`
`163`		`- public function getDigits($key, $default = '', $deep = false)`
	`160`	`+ public function getDigits($key, $default = '')`
`164`	`161`	`{`
`165`	`162`	`// we need to remove - and + because they're allowed in the filter`
`166`		`- return str_replace(array('-', '+'), '', $this->filter($key, $default, FILTER_SANITIZE_NUMBER_INT, array(), $deep));`
	`163`	`+ return str_replace(array('-', '+'), '', $this->filter($key, $default, FILTER_SANITIZE_NUMBER_INT));`
`167`	`164`	`}`
`168`	`165`
`169`	`166`	`/**`
`170`	`167`	`* Returns the parameter value converted to integer.`
`171`	`168`	`*`
`172`	`169`	`* @param string $key The parameter key`
`173`	`170`	`* @param int $default The default value if the parameter key does not exist`
`174`		`- * @param bool $deep If true, a path like foo[bar] will find deeper items`
`175`	`171`	`*`
`176`	`172`	`* @return int The filtered value`
`177`	`173`	`*/`
`178`		`- public function getInt($key, $default = 0, $deep = false)`
	`174`	`+ public function getInt($key, $default = 0)`
`179`	`175`	`{`
`180`		`- return (int) $this->get($key, $default, $deep);`
	`176`	`+ return (int) $this->get($key, $default);`
`181`	`177`	`}`
`182`	`178`
`183`	`179`	`/**`
`184`	`180`	`* Returns the parameter value converted to boolean.`
`185`	`181`	`*`
`186`	`182`	`* @param string $key The parameter key`
`187`	`183`	`* @param mixed $default The default value if the parameter key does not exist`
`188`		`- * @param bool $deep If true, a path like foo[bar] will find deeper items`
`189`	`184`	`*`
`190`	`185`	`* @return bool The filtered value`
`191`	`186`	`*/`
`192`		`- public function getBoolean($key, $default = false, $deep = false)`
	`187`	`+ public function getBoolean($key, $default = false)`
`193`	`188`	`{`
`194`		`- return $this->filter($key, $default, FILTER_VALIDATE_BOOLEAN, array(), $deep);`
	`189`	`+ return $this->filter($key, $default, FILTER_VALIDATE_BOOLEAN);`
`195`	`190`	`}`
`196`	`191`
`197`	`192`	`/**`
`@@ -201,30 +196,14 @@ public function getBoolean($key, $default = false, $deep = false)`
`201`	`196`	`* @param mixed $default Default = null.`
`202`	`197`	`* @param int $filter FILTER_* constant.`
`203`	`198`	`* @param mixed $options Filter options.`
`204`		`- * @param bool $deep Default = false.`
`205`	`199`	`*`
`206`	`200`	`* @see http://php.net/manual/en/function.filter-var.php`
`207`	`201`	`*`
`208`	`202`	`* @return mixed`
`209`	`203`	`*/`
`210`		`- public function filter($key, $default = null, $filter = FILTER_DEFAULT, $options = array(), $deep = false)`
	`204`	`+ public function filter($key, $default = null, $filter = FILTER_DEFAULT, $options = array())`
`211`	`205`	`{`
`212`		`- static $filters = null;`
`213`		`-`
`214`		`- if (null === $filters) {`
`215`		`- foreach (filter_list() as $tmp) {`
`216`		`- $filters[filter_id($tmp)] = 1;`
`217`		`- }`
`218`		`- }`
`219`		`- if (is_bool($filter) \|\| !isset($filters[$filter]) \|\| is_array($deep)) {`
`220`		`- @trigger_error('Passing the $deep boolean as 3rd argument to the '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Remove it altogether as the $deep argument will be removed in 3.0.', E_USER_ERROR);`
`221`		`- $tmp = $deep;`
`222`		`- $deep = $filter;`
`223`		`- $filter = $options;`
`224`		`- $options = $tmp;`
`225`		`- }`
`226`		`-`
`227`		`- $value = $this->get($key, $default, $deep);`
	`206`	`+ $value = $this->get($key, $default);`
`228`	`207`
`229`	`208`	`// Always turn $options into an array - this allows filter_var option shortcuts.`
`230`	`209`	`if (!is_array($options) && $options) {`