Fix arg type and add test

fancyweb · fancyweb · commit da295d925418 · 2022-04-27T12:30:13.000+02:00
diff --git a/src/Symfony/Component/Routing/Requirement/EnumRequirement.php b/src/Symfony/Component/Routing/Requirement/EnumRequirement.php
@@ -26,13 +26,16 @@ final class EnumRequirement implements \Stringable
      * @param class-string<T> $enum
      * @param T|list<T>       $cases
      */
-    public function __construct(string $enum, string|array $cases = [])
+    public function __construct(string $enum, \BackedEnum|array $cases = [])
     {
         if (!is_subclass_of($enum, \BackedEnum::class, true)) {
             throw new InvalidArgumentException(sprintf('"%s" is not a \BackedEnum class.', $enum));
         }
 
-        $cases = (array) $cases;
+        if (!\is_array($cases)) {
+            $cases = [$cases];
+        }
+
         foreach ($cases as $case) {
             if (!$case instanceof \BackedEnum) {
                 throw new InvalidArgumentException(sprintf('Case must be a \BackedEnum instance, "%s" given.', get_debug_type($case)));
diff --git a/src/Symfony/Component/Routing/Tests/Requirement/EnumRequirementTest.php b/src/Symfony/Component/Routing/Tests/Requirement/EnumRequirementTest.php
@@ -49,7 +49,7 @@ public function testCaseFromAnotherEnum()
     /**
      * @dataProvider provideToString
      */
-    public function testToString(string $expected, string $enum, array $cases = [])
+    public function testToString(string $expected, string $enum, \BackedEnum|array $cases = [])
     {
         $this->assertSame($expected, (string) new EnumRequirement($enum, $cases));
     }
@@ -60,6 +60,7 @@ public function provideToString()
             ['hearts|diamonds|clubs|spades', TestStringBackedEnum::class],
             ['10|20|30|40', TestIntBackedEnum::class],
             ['diamonds|spades', TestStringBackedEnum::class, [TestStringBackedEnum::Diamonds, TestStringBackedEnum::Spades]],
+            ['diamonds', TestStringBackedEnum::class, TestStringBackedEnum::Diamonds],
             ['hearts|diamonds|clubs|spa\|des', TestStringBackedEnum2::class],
         ];
     }

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function testCaseFromAnotherEnum()`
`49`	`49`	`/**`
`50`	`50`	`* @dataProvider provideToString`
`51`	`51`	`*/`
`52`		`- public function testToString(string $expected, string $enum, array $cases = [])`
	`52`	`+ public function testToString(string $expected, string $enum, \BackedEnum\|array $cases = [])`
`53`	`53`	`{`
`54`	`54`	`$this->assertSame($expected, (string) new EnumRequirement($enum, $cases));`
`55`	`55`	`}`
`@@ -60,6 +60,7 @@ public function provideToString()`
`60`	`60`	`['hearts\|diamonds\|clubs\|spades', TestStringBackedEnum::class],`
`61`	`61`	`['10\|20\|30\|40', TestIntBackedEnum::class],`
`62`	`62`	`['diamonds\|spades', TestStringBackedEnum::class, [TestStringBackedEnum::Diamonds, TestStringBackedEnum::Spades]],`
	`63`	`+ ['diamonds', TestStringBackedEnum::class, TestStringBackedEnum::Diamonds],`
`63`	`64`	`['hearts\|diamonds\|clubs\|spa\\|des', TestStringBackedEnum2::class],`
`64`	`65`	`];`
`65`	`66`	`}`