[Routing] Remove variadic constructor signature

wouterj · wouterj · commit 6d908cd05bb6 · 2022-04-25T11:43:41.000+02:00
diff --git a/src/Symfony/Component/Routing/Requirement/EnumRequirement.php b/src/Symfony/Component/Routing/Requirement/EnumRequirement.php
@@ -22,12 +22,13 @@ final class EnumRequirement implements \Stringable
 
     /**
      * @template T of \BackedEnum
+     *
      * @param class-string<T> $enum
-     * @param T ...$cases
+     * @param list<T>         $cases
      */
-    public function __construct(string $enum, \BackedEnum ...$cases)
+    public function __construct(string $enum, array $cases = [])
     {
-        if (!\is_subclass_of($enum, \BackedEnum::class, true)) {
+        if (!is_subclass_of($enum, \BackedEnum::class, true)) {
             throw new InvalidArgumentException(sprintf('"%s" is not a \BackedEnum class.', $enum));
         }
 
diff --git a/src/Symfony/Component/Routing/Tests/Requirement/EnumRequirementTest.php b/src/Symfony/Component/Routing/Tests/Requirement/EnumRequirementTest.php
@@ -35,23 +35,23 @@ public function testCaseFromAnotherEnum()
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('"Symfony\Component\Routing\Tests\Fixtures\Enum\TestStringBackedEnum2::Spades" is not a case of "Symfony\Component\Routing\Tests\Fixtures\Enum\TestStringBackedEnum".');
 
-        new EnumRequirement(TestStringBackedEnum::class, TestStringBackedEnum::Diamonds, TestStringBackedEnum2::Spades);
+        new EnumRequirement(TestStringBackedEnum::class, [TestStringBackedEnum::Diamonds, TestStringBackedEnum2::Spades]);
     }
 
     /**
      * @dataProvider provideToString
      */
-    public function testToString(string $expected, string $enum, \BackedEnum ...$cases)
+    public function testToString(string $expected, string $enum, array $cases = [])
     {
-        $this->assertSame($expected, (string) new EnumRequirement($enum, ...$cases));
+        $this->assertSame($expected, (string) new EnumRequirement($enum, $cases));
     }
 
     public function provideToString()
     {
         return [
             ['hearts|diamonds|clubs|spades', TestStringBackedEnum::class],
             ['10|20|30|40', TestIntBackedEnum::class],
-            ['diamonds|spades', TestStringBackedEnum::class, TestStringBackedEnum::Diamonds, TestStringBackedEnum::Spades],
+            ['diamonds|spades', TestStringBackedEnum::class, [TestStringBackedEnum::Diamonds, TestStringBackedEnum::Spades]],
             ['hearts|diamonds|clubs|spa\|des', TestStringBackedEnum2::class],
         ];
     }

Original file line number	Diff line number	Diff line change
`@@ -35,23 +35,23 @@ public function testCaseFromAnotherEnum()`
`35`	`35`	`$this->expectException(InvalidArgumentException::class);`
`36`	`36`	`$this->expectExceptionMessage('"Symfony\Component\Routing\Tests\Fixtures\Enum\TestStringBackedEnum2::Spades" is not a case of "Symfony\Component\Routing\Tests\Fixtures\Enum\TestStringBackedEnum".');`
`37`	`37`
`38`		`- new EnumRequirement(TestStringBackedEnum::class, TestStringBackedEnum::Diamonds, TestStringBackedEnum2::Spades);`
	`38`	`+ new EnumRequirement(TestStringBackedEnum::class, [TestStringBackedEnum::Diamonds, TestStringBackedEnum2::Spades]);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`/**`
`42`	`42`	`* @dataProvider provideToString`
`43`	`43`	`*/`
`44`		`- public function testToString(string $expected, string $enum, \BackedEnum ...$cases)`
	`44`	`+ public function testToString(string $expected, string $enum, array $cases = [])`
`45`	`45`	`{`
`46`		`- $this->assertSame($expected, (string) new EnumRequirement($enum, ...$cases));`
	`46`	`+ $this->assertSame($expected, (string) new EnumRequirement($enum, $cases));`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`public function provideToString()`
`50`	`50`	`{`
`51`	`51`	`return [`
`52`	`52`	`['hearts\|diamonds\|clubs\|spades', TestStringBackedEnum::class],`
`53`	`53`	`['10\|20\|30\|40', TestIntBackedEnum::class],`
`54`		`- ['diamonds\|spades', TestStringBackedEnum::class, TestStringBackedEnum::Diamonds, TestStringBackedEnum::Spades],`
	`54`	`+ ['diamonds\|spades', TestStringBackedEnum::class, [TestStringBackedEnum::Diamonds, TestStringBackedEnum::Spades]],`
`55`	`55`	`['hearts\|diamonds\|clubs\|spa\\|des', TestStringBackedEnum2::class],`
`56`	`56`	`];`
`57`	`57`	`}`