8000 [Serializer] Argument objects by theofidry · Pull Request #19277 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Serializer] Argument objects #19277

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

Merged
merged 14 commits into from
Jul 11, 2016
Merged

[Serializer] Argument objects #19277

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7bd4ac5
Test
theofidry Jul 3, 2016
e99a90b
Add tests
theofidry Jul 3, 2016
e64e999
Address comments
theofidry Jul 3, 2016
4884a2e
f1
theofidry Jul 3, 2016
f361e52
fix tests
theofidry Jul 4, 2016
f46a176
Apply patch
theofidry Jul 4, 2016
93608dc
Add deprecation message
theofidry Jul 5, 2016
d4cdb00
fix CS
theofidry Jul 5, 2016
5556fa5
fix
theofidry Jul 6, 2016
3fe9802
revert CS
theofidry Jul 6, 2016
e437e04
fix reflection type
theofidry Jul 6, 2016
7b5d55d
Prevent BC in instantiateObject
dunglas Jul 10, 2016
98bcb91
Merge pull request #1 from dunglas/theofidry-feature/param-object
theofidry Jul 10, 2016
988eba1
fix tests
theofidry Jul 10, 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
15 changes: 3 additions & 12 deletions src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,17 +268,6 @@ protected function getConstructor(array &$data, $class, array &$context, \Reflec
return $reflectionClass->getConstructor();
}

/**
* @see instantiateComplexObject
* @deprecated Since 3.1, will be removed in 4.0. Use instantiateComplexObject instead.
*/
protected function instantiateObject(array &$data, $class, array &$context, \ReflectionClass $reflectionClass, $allowedAttributes)
{
@trigger_error(sprintf('"%s()" has been deprecated since Symfony 3.1 and will be removed in version 4.0. Use "%s::instantiateComplexObject()" instead.', __METHOD__, __CLASS__), E_USER_DEPRECATED);

return $this->instantiateComplexObject($data, $class, $context, $reflectionClass, $allowedAttributes);
}

/**
* Instantiates an object using constructor parameters when needed.
*
Expand All @@ -298,8 +287,10 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref
*
* @throws RuntimeException
*/
protected function instantiateComplexObject(array &$data, $class, array &$context, \ReflectionClass $reflectionClass, $allowedAttributes, $format = null)
protected function instantiateObject(array &$data, $class, array &$context, \ReflectionClass $reflectionClass, $allowedAttributes/*, $format = null*/)
{
$format = func_num_args() >= 6 ? func_get_arg(5) : null;

if (
isset($context[static::OBJECT_TO_POPULATE]) &&
is_object($context[static::OBJECT_TO_POPULATE]) &&
Expand Down
2 changes: 1 addition & 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 @@ -175,7 +175,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
$normalizedData = $this->prepareForDenormalization($data);

$reflectionClass = new \ReflectionClass($class);
$object = $this->instantiateComplexObject($normalizedData, $class, $context, $reflectionClass, $allowedAttributes, $format);
$object = $this->instantiateObject($normalizedData, $class, $context, $reflectionClass, $allowedAttributes, $format);

foreach ($normalizedData as $attribute => $value) {
if ($this->nameConverter) {
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
$normalizedData = $this->prepareForDenormalization($data);

$reflectionClass = new \ReflectionClass($class);
$object = $this->instantiateComplexObject($normalizedData, $class, $context, $reflectionClass, $allowedAttributes, $format);
$object = $this->instantiateObject($normalizedData, $class, $context, $reflectionClass, $allowedAttributes, $format);

$classMethods = get_class_methods($object);
foreach ($normalizedData as $attribute => $value) {
Expand Down
0