8000 [Serializer] Harden the ObjectNormalizer by dunglas · Pull Request #17959 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Serializer] Harden the ObjectNormalizer #17959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[Serializer] Harden the ObjectNormalizer #17959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d4d0a6
[Serializer] Harden the ObjectNormalizer
dunglas Feb 29, 2016
46cc248
Add a conflict section
dunglas Mar 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@

namespace Symfony\Component\Serializer\Normalizer;

use Symfony\Component\PropertyAccess\Exception\InvalidArgumentException;
use Symfony\Component\Serializer\Exception\CircularReferenceException;
use Symfony\Component\Serializer\Exception\LogicException;
use Symfony\Component\Serializer\Exception\UnexpectedValueException;

/**
* Base class for a normalizer dealing with objects.
Expand Down Expand Up @@ -172,7 +174,11 @@ public function denormalize($data, $class, $format = null, array $context = arra
$ignored = in_array($attribute, $this->ignoredAttributes);

if ($allowed && !$ignored) {
$this->setAttributeValue($object, $attribute, $value, $format, $context);
try {
$this->setAttributeValue($object, $attribute, $value, $format, $context);
} catch (InvalidArgumentException $e) {
throw new UnexpectedValueException($e->getMessage(), $e->getCode(), $e);
}
}
}

Expand Down
15 changes: 15 additions & 0 deletions src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,14 @@ public function testMaxDepth()

$this->assertEquals($expected, $result);
}

/**
* @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
*/
public function testThrowUnexpectedValueException()
{
$this->normalizer->denormalize(array('foo' => 'bar'), ObjectTypeHinted::class);
}
}

class ObjectDummy
Expand Down Expand Up @@ -658,3 +666,10 @@ public static function getBaz()
return 'L';
}
}

class ObjectTypeHinted
{
public function setFoo(array $f)
{
}
}
3 changes: 3 additions & 0 deletions src/Symfony/Component/Serializer/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
"doctrine/annotations": "~1.0",
"doctrine/cache": "~1.0"
},
"conflict": {
"symfony/property-access": ">=3.0,<3.0.4|>=2.8,<2.8.4"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then I would rather update the constraint in require-devto ~2.8,>=2.8.4|~3.0,>=3.0.4.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why? The conflict line has the same effect and works in prod too.

},
"suggest": {
"psr/cache-implementation": "For using the metadata cache.",
"symfony/yaml": "For using the default YAML mapping loader.",
Expand Down
0