bug #52886 [HttpKernel] Catch TypeError if the wrong type is used in BackedEnumValueResolver (alexandre-daubois)

nicolas-grekas · nicolas-grekas · commit db099a340b5c · 2023-12-04T14:52:31.000+01:00
This PR was merged into the 6.3 branch. Discussion ---------- [HttpKernel] Catch `TypeError` if the wrong type is used in `BackedEnumValueResolver` | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #52053 | License | MIT Commits ------- 5b08257 [HttpKernel] Catch `TypeError` if the wrong type is used in `BackedEnumValueResolver`
diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/BackedEnumValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/BackedEnumValueResolver.php
@@ -86,7 +86,7 @@ public function resolve(Request $request, ArgumentMetadata $argument): iterable
 
         try {
             return [$enumType::from($value)];
-        } catch (\ValueError $e) {
+        } catch (\ValueError|\TypeError $e) {
             throw new NotFoundHttpException(sprintf('Could not resolve the "%s $%s" controller argument: ', $argument->getType(), $argument->getName()).$e->getMessage(), $e);
         }
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/BackedEnumValueResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/BackedEnumValueResolverTest.php
@@ -16,6 +16,7 @@
 use Symfony\Component\HttpKernel\Controller\ArgumentResolver\BackedEnumValueResolver;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\HttpKernel\Tests\Fixtures\IntEnum;
 use Symfony\Component\HttpKernel\Tests\Fixtures\Suit;
 
 class BackedEnumValueResolverTest extends TestCase
@@ -134,6 +135,18 @@ public function testResolveThrowsOnUnexpectedType()
         $resolver->resolve($request, $metadata);
     }
 
+    public function testResolveThrowsOnTypeError()
+    {
+        $resolver = new BackedEnumValueResolver();
+        $request = self::createRequest(['suit' => 'value']);
+        $metadata = self::createArgumentMetadata('suit', IntEnum::class);
+
+        $this->expectException(NotFoundHttpException::class);
+        $this->expectExceptionMessage('Could not resolve the "Symfony\Component\HttpKernel\Tests\Fixtures\IntEnum $suit" controller argument: Symfony\Component\HttpKernel\Tests\Fixtures\IntEnum::from(): Argument #1 ($value) must be of type int, string given');
+
+        $resolver->resolve($request, $metadata);
+    }
+
     private static function createRequest(array $attributes = []): Request
     {
         return new Request([], [], $attributes);
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/IntEnum.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/IntEnum.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\HttpKernel\Tests\Fixtures;
+
+enum IntEnum: int
+{
+    case One = 1;
+    case Two = 2;
+}

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public function resolve(Request $request, ArgumentMetadata $argument): iterable`
`86`	`86`
`87`	`87`	`try {`
`88`	`88`	`return [$enumType::from($value)];`
`89`		`- } catch (\ValueError $e) {`
	`89`	`+ } catch (\ValueError\|\TypeError $e) {`
`90`	`90`	`throw new NotFoundHttpException(sprintf('Could not resolve the "%s $%s" controller argument: ', $argument->getType(), $argument->getName()).$e->getMessage(), $e);`
`91`	`91`	`}`
`92`	`92`	`}`