[Serializer] tryfrom to tryFrom - assignments inlined - newLine + add backedEnum type in message

allison guilhem · allison guilhem · commit 4fefa38f7352 · 2022-07-31T18:27:03.000+02:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/BackedEnumNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/BackedEnumNormalizer.php
@@ -61,9 +61,8 @@ public function denormalize($data, $type, $format = null, array $context = [])
             throw NotNormalizableValueException::createForUnexpectedDataType('The data is neither an integer nor a string, you should pass an integer or a string that can be parsed as an enumeration case of type '.$type.'.', $data, [Type::BUILTIN_TYPE_INT, Type::BUILTIN_TYPE_STRING], $context['deserialization_path'] ?? null, true);
         }
 
-        $matched = $type::tryfrom($data);
-        if (!$matched) {
-            throw new InvalidArgumentException('The data must belong to a backed enumeration.');
+        if (!$matched = $type::tryFrom($data)) {
+            throw new InvalidArgumentException('The data must belong to a backed enumeration of type ' . $type);
         }
 
         return $matched;
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/DummyObjectWithEnumConstructor.php b/src/Symfony/Component/Serializer/Tests/Fixtures/DummyObjectWithEnumConstructor.php
@@ -6,7 +6,7 @@
 
 class DummyObjectWithEnumConstructor
 {
-    public function __construct(public StringBackedEnumDummy $get) 
+    public function __construct(public StringBackedEnumDummy $get)
     {
     }
-}
+}
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/BackedEnumNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/BackedEnumNormalizerTest.php
@@ -116,6 +116,8 @@ public function testDenormalizeObjectThrowsException()
     public function testDenormalizeBadBackingValueThrowsException()
     {
         $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('The data must belong to a backed enumeration of type ' . StringBackedEnumDummy::class);
+
         $this->normalizer->denormalize('POST', StringBackedEnumDummy::class);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -61,9 +61,8 @@ public function denormalize($data, $type, $format = null, array $context = [])`
`61`	`61`	`throw NotNormalizableValueException::createForUnexpectedDataType('The data is neither an integer nor a string, you should pass an integer or a string that can be parsed as an enumeration case of type '.$type.'.', $data, [Type::BUILTIN_TYPE_INT, Type::BUILTIN_TYPE_STRING], $context['deserialization_path'] ?? null, true);`
`62`	`62`	`}`
`63`	`63`
`64`		`- $matched = $type::tryfrom($data);`
`65`		`- if (!$matched) {`
`66`		`- throw new InvalidArgumentException('The data must belong to a backed enumeration.');`
	`64`	`+ if (!$matched = $type::tryFrom($data)) {`
	`65`	`+ throw new InvalidArgumentException('The data must belong to a backed enumeration of type ' . $type);`
`67`	`66`	`}`
`68`	`67`
`69`	`68`	`return $matched;`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`class DummyObjectWithEnumConstructor`
`8`	`8`	`{`
`9`		`- public function __construct(public StringBackedEnumDummy $get)`
	`9`	`+ public function __construct(public StringBackedEnumDummy $get)`
`10`	`10`	`{`
`11`	`11`	`}`
`12`		`-}`
	`12`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,8 @@ public function testDenormalizeObjectThrowsException()`
`116`	`116`	`public function testDenormalizeBadBackingValueThrowsException()`
`117`	`117`	`{`
`118`	`118`	`$this->expectException(InvalidArgumentException::class);`
	`119`	`+ $this->expectExceptionMessage('The data must belong to a backed enumeration of type ' . StringBackedEnumDummy::class);`
	`120`	`+`
`119`	`121`	`$this->normalizer->denormalize('POST', StringBackedEnumDummy::class);`
`120`	`122`	`}`
`121`	`123`