handle case with throws from ArrayDenormalizer

greedyivan · greedyivan · commit f6dee970134f · 2020-11-24T00:41:08.000+03:00
diff --git a/src/Symfony/Component/Serializer/Exception/InvalidArgumentException.php b/src/Symfony/Component/Serializer/Exception/InvalidArgumentException.php
@@ -16,6 +16,6 @@
  *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */
-class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface, AggregableExceptionInterface
 {
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/CollectErrorsDummy.php b/src/Symfony/Component/Serializer/Tests/Fixtures/CollectErrorsDummy.php
@@ -19,6 +19,11 @@ class CollectErrorsDummy
      */
     public $arrayOfObjects;
 
+    /**
+     * @var CollectErrorsArrayDummy[]
+     */
+    public $stringArrayOfObjects;
+
     /**
      * @var CollectErrorsObjectDummy
      */
diff --git a/src/Symfony/Component/Serializer/Tests/SerializerTest.php b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
@@ -640,12 +640,13 @@ public function testDeserializeAndUnwrap()
 
     public function testCollectDenormalizationErrors()
     {
-        $jsonData = '{"int":"string","array":"string","arrayOfObjects":[{"date":"string"}],"object":{"foo":"1","bar":"1"},"variadicObject":{"foo":1,"args":[{"foo":"1"},{"foo":"1","args":1}]}}';
+        $jsonData = '{"int":"string","array":"string","arrayOfObjects":[{"date":"string"}],"stringArrayOfObjects":"string","object":{"foo":"1","bar":"1"},"variadicObject":{"foo":1,"args":[{"foo":"1"},{"foo":"1","args":1}]}}';
 
         $expected = static function () {
             yield 'int' => 'The type of the "int" attribute for class "Symfony\Component\Serializer\Tests\Fixtures\CollectErrorsDummy" must be one of "int" ("string" given).';
             yield 'array' => 'The type of the "array" attribute for class "Symfony\Component\Serializer\Tests\Fixtures\CollectErrorsDummy" must be one of "array" ("string" given).';
             yield 'arrayOfObjects.date' => 'DateTimeImmutable::__construct(): Failed to parse time string (string) at position 0 (s): The timezone could not be found in the database';
+            yield 'stringArrayOfObjects' => 'Data expected to be an array, string given.';
             yield 'object.foo' => 'The type of the "foo" attribute for class "Symfony\Component\Serializer\Tests\Fixtures\CollectErrorsObjectDummy" must be one of "int" ("string" given).';
             yield 'object.bar' => 'The type of the "bar" attribute for class "Symfony\Component\Serializer\Tests\Fixtures\CollectErrorsObjectDummy" must be one of "int" ("string" given).';
             yield 'object.baz' => 'Cannot create an instance of "Symfony\Component\Serializer\Tests\Fixtures\CollectErrorsObjectDummy" from serialized data because its constructor requires parameter "baz" to be present.';

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@`
`16`	`16`	`*`
`17`	`17`	`* @author Johannes M. Schmitt <schmittjoh@gmail.com>`
`18`	`18`	`*/`
`19`		`-class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface`
	`19`	`+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface, AggregableExceptionInterface`
`20`	`20`	`{`
`21`	`21`	`}`