upgraded dependencies
This commit is contained in:
97
vendor/symfony/http-foundation/ParameterBag.php
vendored
97
vendor/symfony/http-foundation/ParameterBag.php
vendored
@@ -11,10 +11,14 @@
|
||||
|
||||
namespace Symfony\Component\HttpFoundation;
|
||||
|
||||
use Symfony\Component\HttpFoundation\Exception\BadRequestException;
|
||||
|
||||
/**
|
||||
* ParameterBag is a container for key/value pairs.
|
||||
*
|
||||
* @author Fabien Potencier <fabien@symfony.com>
|
||||
*
|
||||
* @implements \IteratorAggregate<string, mixed>
|
||||
*/
|
||||
class ParameterBag implements \IteratorAggregate, \Countable
|
||||
{
|
||||
@@ -31,17 +35,29 @@ class ParameterBag implements \IteratorAggregate, \Countable
|
||||
/**
|
||||
* Returns the parameters.
|
||||
*
|
||||
* @return array An array of parameters
|
||||
* @param string|null $key The name of the parameter to return or null to get them all
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function all()
|
||||
public function all(/* string $key = null */)
|
||||
{
|
||||
return $this->parameters;
|
||||
$key = \func_num_args() > 0 ? func_get_arg(0) : null;
|
||||
|
||||
if (null === $key) {
|
||||
return $this->parameters;
|
||||
}
|
||||
|
||||
if (!\is_array($value = $this->parameters[$key] ?? [])) {
|
||||
throw new BadRequestException(sprintf('Unexpected value for parameter "%s": expecting "array", got "%s".', $key, get_debug_type($value)));
|
||||
}
|
||||
|
||||
return $value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the parameter keys.
|
||||
*
|
||||
* @return array An array of parameter keys
|
||||
* @return array
|
||||
*/
|
||||
public function keys()
|
||||
{
|
||||
@@ -67,12 +83,11 @@ class ParameterBag implements \IteratorAggregate, \Countable
|
||||
/**
|
||||
* Returns a parameter by name.
|
||||
*
|
||||
* @param string $key The key
|
||||
* @param mixed $default The default value if the parameter key does not exist
|
||||
* @param mixed $default The default value if the parameter key does not exist
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public function get($key, $default = null)
|
||||
public function get(string $key, $default = null)
|
||||
{
|
||||
return \array_key_exists($key, $this->parameters) ? $this->parameters[$key] : $default;
|
||||
}
|
||||
@@ -80,10 +95,9 @@ class ParameterBag implements \IteratorAggregate, \Countable
|
||||
/**
|
||||
* Sets a parameter by name.
|
||||
*
|
||||
* @param string $key The key
|
||||
* @param mixed $value The value
|
||||
* @param mixed $value The value
|
||||
*/
|
||||
public function set($key, $value)
|
||||
public function set(string $key, $value)
|
||||
{
|
||||
$this->parameters[$key] = $value;
|
||||
}
|
||||
@@ -91,21 +105,17 @@ class ParameterBag implements \IteratorAggregate, \Countable
|
||||
/**
|
||||
* Returns true if the parameter is defined.
|
||||
*
|
||||
* @param string $key The key
|
||||
*
|
||||
* @return bool true if the parameter exists, false otherwise
|
||||
* @return bool
|
||||
*/
|
||||
public function has($key)
|
||||
public function has(string $key)
|
||||
{
|
||||
return \array_key_exists($key, $this->parameters);
|
||||
}
|
||||
|
||||
/**
|
||||
* Removes a parameter.
|
||||
*
|
||||
* @param string $key The key
|
||||
*/
|
||||
public function remove($key)
|
||||
public function remove(string $key)
|
||||
{
|
||||
unset($this->parameters[$key]);
|
||||
}
|
||||
@@ -113,12 +123,9 @@ class ParameterBag implements \IteratorAggregate, \Countable
|
||||
/**
|
||||
* Returns the alphabetic characters of the parameter value.
|
||||
*
|
||||
* @param string $key The parameter key
|
||||
* @param string $default The default value if the parameter key does not exist
|
||||
*
|
||||
* @return string The filtered value
|
||||
* @return string
|
||||
*/
|
||||
public function getAlpha($key, $default = '')
|
||||
public function getAlpha(string $key, string $default = '')
|
||||
{
|
||||
return preg_replace('/[^[:alpha:]]/', '', $this->get($key, $default));
|
||||
}
|
||||
@@ -126,12 +133,9 @@ class ParameterBag implements \IteratorAggregate, \Countable
|
||||
/**
|
||||
* 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
|
||||
*
|
||||
* @return string The filtered value
|
||||
* @return string
|
||||
*/
|
||||
public function getAlnum($key, $default = '')
|
||||
public function getAlnum(string $key, string $default = '')
|
||||
{
|
||||
return preg_replace('/[^[:alnum:]]/', '', $this->get($key, $default));
|
||||
}
|
||||
@@ -139,12 +143,9 @@ class ParameterBag implements \IteratorAggregate, \Countable
|
||||
/**
|
||||
* 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
|
||||
*
|
||||
* @return string The filtered value
|
||||
* @return string
|
||||
*/
|
||||
public function getDigits($key, $default = '')
|
||||
public function getDigits(string $key, string $default = '')
|
||||
{
|
||||
// we need to remove - and + because they're allowed in the filter
|
||||
return str_replace(['-', '+'], '', $this->filter($key, $default, \FILTER_SANITIZE_NUMBER_INT));
|
||||
@@ -153,12 +154,9 @@ class ParameterBag implements \IteratorAggregate, \Countable
|
||||
/**
|
||||
* 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
|
||||
*
|
||||
* @return int The filtered value
|
||||
* @return int
|
||||
*/
|
||||
public function getInt($key, $default = 0)
|
||||
public function getInt(string $key, int $default = 0)
|
||||
{
|
||||
return (int) $this->get($key, $default);
|
||||
}
|
||||
@@ -166,12 +164,9 @@ class ParameterBag implements \IteratorAggregate, \Countable
|
||||
/**
|
||||
* Returns the parameter value converted to boolean.
|
||||
*
|
||||
* @param string $key The parameter key
|
||||
* @param bool $default The default value if the parameter key does not exist
|
||||
*
|
||||
* @return bool The filtered value
|
||||
* @return bool
|
||||
*/
|
||||
public function getBoolean($key, $default = false)
|
||||
public function getBoolean(string $key, bool $default = false)
|
||||
{
|
||||
return $this->filter($key, $default, \FILTER_VALIDATE_BOOLEAN);
|
||||
}
|
||||
@@ -179,16 +174,15 @@ class ParameterBag implements \IteratorAggregate, \Countable
|
||||
/**
|
||||
* Filter key.
|
||||
*
|
||||
* @param string $key Key
|
||||
* @param mixed $default Default = null
|
||||
* @param int $filter FILTER_* constant
|
||||
* @param mixed $options Filter options
|
||||
* @param mixed $default Default = null
|
||||
* @param int $filter FILTER_* constant
|
||||
* @param mixed $options Filter options
|
||||
*
|
||||
* @see https://php.net/filter-var
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public function filter($key, $default = null, $filter = \FILTER_DEFAULT, $options = [])
|
||||
public function filter(string $key, $default = null, int $filter = \FILTER_DEFAULT, $options = [])
|
||||
{
|
||||
$value = $this->get($key, $default);
|
||||
|
||||
@@ -202,13 +196,18 @@ class ParameterBag implements \IteratorAggregate, \Countable
|
||||
$options['flags'] = \FILTER_REQUIRE_ARRAY;
|
||||
}
|
||||
|
||||
if ((\FILTER_CALLBACK & $filter) && !(($options['options'] ?? null) instanceof \Closure)) {
|
||||
trigger_deprecation('symfony/http-foundation', '5.2', 'Not passing a Closure together with FILTER_CALLBACK to "%s()" is deprecated. Wrap your filter in a closure instead.', __METHOD__);
|
||||
// throw new \InvalidArgumentException(sprintf('A Closure must be passed to "%s()" when FILTER_CALLBACK is used, "%s" given.', __METHOD__, get_debug_type($options['options'] ?? null)));
|
||||
}
|
||||
|
||||
return filter_var($value, $filter, $options);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns an iterator for parameters.
|
||||
*
|
||||
* @return \ArrayIterator An \ArrayIterator instance
|
||||
* @return \ArrayIterator<string, mixed>
|
||||
*/
|
||||
#[\ReturnTypeWillChange]
|
||||
public function getIterator()
|
||||
@@ -219,7 +218,7 @@ class ParameterBag implements \IteratorAggregate, \Countable
|
||||
/**
|
||||
* Returns the number of parameters.
|
||||
*
|
||||
* @return int The number of parameters
|
||||
* @return int
|
||||
*/
|
||||
#[\ReturnTypeWillChange]
|
||||
public function count()
|
||||
|
Reference in New Issue
Block a user