[Serializer] Improve messages for unexpected resources values

fancyweb · fancyweb · commit e26d257612f3 · 2019-10-27T17:10:29.000+01:00
diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
@@ -426,7 +426,7 @@ private function buildXml(\DOMNode $parentNode, $data, $xmlRootNodeName = null)
             return $this->appendNode($parentNode, $data, 'data');
         }
 
-        throw new NotEncodableValueException(sprintf('An unexpected value could not be serialized: %s', var_export($data, true)));
+        throw new NotEncodableValueException(sprintf('An unexpected value could not be serialized: %s', !is_resource($data) ? var_export($data, true) : sprintf('a "%s" resource', get_resource_type($data))));
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Serializer.php b/src/Symfony/Component/Serializer/Serializer.php
@@ -164,7 +164,7 @@ public function normalize($data, $format = null, array $context = [])
             throw new NotNormalizableValueException(sprintf('Could not normalize object of type %s, no supporting normalizer found.', \get_class($data)));
         }
 
-        throw new NotNormalizableValueException(sprintf('An unexpected value could not be normalized: %s', var_export($data, true)));
+        throw new NotNormalizableValueException(sprintf('An unexpected value could not be normalized: %s', !is_resource($data) ? var_export($data, true) : sprintf('a "%s" resource', get_resource_type($data))));
     }
 
     /**
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
@@ -14,6 +14,7 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Serializer\Encoder\XmlEncoder;
+use Symfony\Component\Serializer\Exception\NotEncodableValueException;
 use Symfony\Component\Serializer\Normalizer\CustomNormalizer;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\Serializer;
@@ -679,6 +680,14 @@ public function testEncodeXmlWithDateTimeObjectField()
         $this->assertEquals($this->createXmlWithDateTimeField(), $actualXml);
     }
 
+    public function testNotEncodableValueExceptionMessageForAResource()
+    {
+        $this->expectException(NotEncodableValueException::class);
+        $this->expectExceptionMessage('An unexpected value could not be serialized: a "stream" resource');
+
+        (new XmlEncoder())->encode(tmpfile(), 'xml');
+    }
+
     /**
      * @return XmlEncoder
      */
diff --git a/src/Symfony/Component/Serializer/Tests/SerializerTest.php b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Serializer\Encoder\JsonEncoder;
+use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
 use Symfony\Component\Serializer\Normalizer\ArrayDenormalizer;
 use Symfony\Component\Serializer\Normalizer\CustomNormalizer;
 use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
@@ -328,6 +329,14 @@ public function testDeserializeObjectConstructorWithObjectTypeHint()
 
         $this->assertEquals(new Foo(new Bar('baz')), $serializer->deserialize($jsonData, Foo::class, 'json'));
     }
+
+    public function testNotNormalizableValueExceptionMessageForAResource()
+    {
+        $this->expectException(NotNormalizableValueException::class);
+        $this->expectExceptionMessage('An unexpected value could not be normalized: a "stream" resource');
+
+        (new Serializer())->normalize(tmpfile());
+    }
 }
 
 class Model

Original file line number	Diff line number	Diff line change
`@@ -426,7 +426,7 @@ private function buildXml(\DOMNode $parentNode, $data, $xmlRootNodeName = null)`
`426`	`426`	`return $this->appendNode($parentNode, $data, 'data');`
`427`	`427`	`}`
`428`	`428`
`429`		`- throw new NotEncodableValueException(sprintf('An unexpected value could not be serialized: %s', var_export($data, true)));`
	`429`	`+ throw new NotEncodableValueException(sprintf('An unexpected value could not be serialized: %s', !is_resource($data) ? var_export($data, true) : sprintf('a "%s" resource', get_resource_type($data))));`
`430`	`430`	`}`
`431`	`431`
`432`	`432`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ public function normalize($data, $format = null, array $context = [])`
`164`	`164`	`throw new NotNormalizableValueException(sprintf('Could not normalize object of type %s, no supporting normalizer found.', \get_class($data)));`
`165`	`165`	`}`
`166`	`166`
`167`		`- throw new NotNormalizableValueException(sprintf('An unexpected value could not be normalized: %s', var_export($data, true)));`
	`167`	`+ throw new NotNormalizableValueException(sprintf('An unexpected value could not be normalized: %s', !is_resource($data) ? var_export($data, true) : sprintf('a "%s" resource', get_resource_type($data))));`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`/**`