Commitdf2e7cd

committed

[Serializer] Fix denormalization of object with typed constructor arg (not castable) and with COLLECT_DENORMALIZATION_ERRORS

1 parent547e876 commitdf2e7cdCopy full SHA for df2e7cd

File tree

+29

-1

lines changed

+29

-1

lines changed

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -417,7 +417,15 @@ protected function instantiateObject(array &$data, string $class, array &$contex`
`417`	`417`	`}`
`418`	`418`
`419`	`419`	`if ($constructor->isConstructor()) {`
`420`		`-return$reflectionClass->newInstanceArgs($params);`
	`420`	`+try {`
	`421`	`+return$reflectionClass->newInstanceArgs($params);`
	`422`	`+ }catch (\TypeError$th) {`
	`423`	`+if (!isset($context['not_normalizable_value_exceptions'])) {`
	`424`	`+throw$th;`
	`425`	`+ }`
	`426`	`+`
	`427`	`+return$reflectionClass->newInstanceWithoutConstructor();`
	`428`	`+ }`
`421`	`429`	`}else {`
`422`	`430`	`return$constructor->invokeArgs(null,$params);`
`423`	`431`	`}`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ final class Php74Full`
`28`	`28`	`/** @var Php74Full[] */`
`29`	`29`	`publicarray$collection;`
`30`	`30`	`publicPhp74FullWithConstructor$php74FullWithConstructor;`
	`31`	`+publicPhp74FullWithTypedConstructor$php74FullWithTypedConstructor;`
`31`	`32`	`publicDummyMessageInterface$dummyMessage;`
`32`	`33`	`/** @var TestFoo[] $nestedArray */`
`33`	`34`	`publicTestFoo$nestedObject;`
`@@ -43,6 +44,13 @@ public function __construct($constructorArgument)`
`43`	`44`	`}`
`44`	`45`	`}`
`45`	`46`
	`47`	`+finalclass Php74FullWithTypedConstructor`
	`48`	`+{`
	`49`	`+publicfunction__construct(float$something)`
	`50`	`+ {`
	`51`	`+ }`
	`52`	`+}`
	`53`	`+`
`46`	`54`	`finalclass TestFoo`
`47`	`55`	`{`
`48`	`56`	`publicint$int;`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -852,6 +852,9 @@ public function testCollectDenormalizationErrors(?ClassMetadataFactory $classMet`
`852`	`852`	`}`
`853`	`853`	`],`
`854`	`854`	`"php74FullWithConstructor": {},`
	`855`	`+ "php74FullWithTypedConstructor": {`
	`856`	`+ "something": "not a float"`
	`857`	`+ },`
`855`	`858`	`"dummyMessage": {`
`856`	`859`	`},`
`857`	`860`	`"nestedObject": {`
`@@ -1005,6 +1008,15 @@ public function testCollectDenormalizationErrors(?ClassMetadataFactory $classMet`
`1005`	`1008`	`'useMessageForUser' =>true,`
`1006`	`1009`	`'message' =>'Failed to create object because the class misses the "constructorArgument" property.',`
`1007`	`1010`	`],`
	`1011`	`+ [`
	`1012`	`+'currentType' =>'string',`
	`1013`	`+'expectedTypes' => [`
	`1014`	`+'float',`
	`1015`	`+ ],`
	`1016`	`+'path' =>'php74FullWithTypedConstructor',`
	`1017`	`+'useMessageForUser' =>false,`
	`1018`	`+'message' =>'The type of the "something" attribute for class "Symfony\Component\Serializer\Tests\Fixtures\Php74FullWithTypedConstructor" must be one of "float" ("string" given).',`
	`1019`	`+ ],`
`1008`	`1020`	`$classMetadataFactory ?`
`1009`	`1021`	`[`
`1010`	`1022`	`'currentType' =>'null',`

Comments

(0)