Update all method to handle default values

Korbeil · Korbeil · commit e1fa45800d5f · 2020-11-02T10:33:12.000+01:00
diff --git a/src/Symfony/Component/HttpFoundation/ParameterBag.php b/src/Symfony/Component/HttpFoundation/ParameterBag.php
@@ -37,15 +37,20 @@ public function __construct(array $parameters = [])
      *
      * @return array An array of parameters
      */
-    public function all(/*string $key = null*/)
+    public function all(/*string $key = null, array $default = []*/)
     {
         $key = \func_num_args() > 0 ? func_get_arg(0) : null;
 
         if (null === $key) {
             return $this->parameters;
         }
 
-        if (!\is_array($value = $this->parameters[$key] ?? [])) {
+        $default = \func_num_args() > 1 ? func_get_arg(1) : [];
+        if (!\is_array($default)) {
+            throw new \TypeError(sprintf('Unexpected value for default value: expecting "array", got "%s".', get_debug_type($default)));
+        }
+
+        if (!\is_array($value = $this->parameters[$key] ?? $default)) {
             throw new BadRequestException(sprintf('Unexpected value for parameter "%s": expecting "array", got "%s".', $key, get_debug_type($value)));
         }
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php
@@ -43,6 +43,21 @@ public function testAllThrowsForNonArrayValues()
         $bag->all('foo');
     }
 
+    public function testAllWithDefaultKey()
+    {
+        $bag = new ParameterBag(['foo' => ['bar', 'baz'], 'null' => null]);
+
+        $this->assertEquals(['bar', 'baz'], $bag->all('foo', ['qux']), '->all() gets the value of a parameter');
+        $this->assertEquals(['qux'], $bag->all('unknown', ['qux']), '->all() returns an given default array if a parameter is not defined');
+    }
+
+    public function testAllThrowsForNonArrayDefaults()
+    {
+        $this->expectException(\TypeError::class);
+        $bag = new ParameterBag(['foo' => 'bar', 'null' => null]);
+        $bag->all('foo', 12345);
+    }
+
     public function testKeys()
     {
         $bag = new ParameterBag(['foo' => 'bar']);

Original file line number	Diff line number	Diff line change
`@@ -37,15 +37,20 @@ public function __construct(array $parameters = [])`
`37`	`37`	`*`
`38`	`38`	`* @return array An array of parameters`
`39`	`39`	`*/`
`40`		`- public function all(/string $key = null/)`
	`40`	`+ public function all(/string $key = null, array $default = []/)`
`41`	`41`	`{`
`42`	`42`	`$key = \func_num_args() > 0 ? func_get_arg(0) : null;`
`43`	`43`
`44`	`44`	`if (null === $key) {`
`45`	`45`	`return $this->parameters;`
`46`	`46`	`}`
`47`	`47`
`48`		`- if (!\is_array($value = $this->parameters[$key] ?? [])) {`
	`48`	`+ $default = \func_num_args() > 1 ? func_get_arg(1) : [];`
	`49`	`+ if (!\is_array($default)) {`
	`50`	`+ throw new \TypeError(sprintf('Unexpected value for default value: expecting "array", got "%s".', get_debug_type($default)));`
	`51`	`+ }`
	`52`	`+`
	`53`	`+ if (!\is_array($value = $this->parameters[$key] ?? $default)) {`
`49`	`54`	`throw new BadRequestException(sprintf('Unexpected value for parameter "%s": expecting "array", got "%s".', $key, get_debug_type($value)));`
`50`	`55`	`}`
`51`	`56`