bug #46586 [HttpKernel] Fix BackedEnumValueResolver already resolved enum value (janatjak)

derrabus · derrabus · commit 742c3c2a2d95 · 2022-06-06T21:10:10.000+02:00
This PR was merged into the 6.1 branch. Discussion ---------- [HttpKernel] Fix BackedEnumValueResolver already resolved enum value | Q | A | ------------- | --- | Branch? | 6.1 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #46585 | License | MIT | Doc PR | Fix #46585 Commits ------- d0923b2 [HttpKernel] Fix BackedEnumValueResolver already resolved enum value
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/BackedEnumValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/BackedEnumValueResolver.php
@@ -51,6 +51,12 @@ public function resolve(Request $request, ArgumentMetadata $argument): iterable
             return;
         }
 
+        if ($value instanceof \BackedEnum) {
+            yield $value;
+
+            return;
+        }
+
         if (!\is_int($value) && !\is_string($value)) {
             throw new \LogicException(sprintf('Could not resolve the "%s $%s" controller argument: expecting an int or string, got %s.', $argument->getType(), $argument->getName(), get_debug_type($value)));
         }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/BackedEnumValueResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/BackedEnumValueResolverTest.php
@@ -95,6 +95,12 @@ public function provideTestResolveData(): iterable
             ),
             [null],
         ];
+
+        yield 'already resolved attribute value' => [
+            self::createRequest(['suit' => Suit::Hearts]),
+            self::createArgumentMetadata('suit', Suit::class),
+            [Suit::Hearts],
+        ];
     }
 
     public function testResolveThrowsNotFoundOnInvalidValue()

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,12 @@ public function resolve(Request $request, ArgumentMetadata $argument): iterable`
`51`	`51`	`return;`
`52`	`52`	`}`
`53`	`53`
	`54`	`+ if ($value instanceof \BackedEnum) {`
	`55`	`+ yield $value;`
	`56`	`+`
	`57`	`+ return;`
	`58`	`+ }`
	`59`	`+`
`54`	`60`	`if (!\is_int($value) && !\is_string($value)) {`
`55`	`61`	`throw new \LogicException(sprintf('Could not resolve the "%s $%s" controller argument: expecting an int or string, got %s.', $argument->getType(), $argument->getName(), get_debug_type($value)));`
`56`	`62`	`}`