Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

[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 1 commit
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
Prev Previous commit
Next Next commit
revert CS
  • Loading branch information
@theofidry
theofidry committed Jul 6, 2016
commit 3fe9802eadde75e6252859275e39832451dc56c6
34 changes: 12 additions & 22 deletions 34 src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,11 +330,7 @@ protected function instantiateComplexObject(array &$data, $class, array &$contex

$params = array_merge($params, $data[$paramName]);
}

continue;
}

if ($allowed && !$ignored && (isset($data[$key]) || array_key_exists($key, $data))) {
} elseif ($allowed && !$ignored && (isset($data[$key]) || array_key_exists($key, $data))) {
$parameterData = $data[$key];
if (null !== $constructorParameter->getClass()) {
Copy link
Contributor

@GuilhemN GuilhemN Jul 5, 2016 •
edited
Loading

Choose a reason for hiding this comment

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

ReflectionParameter::getType() should be used when available imo and exceptions catched in case the type hinted class doesn't exist.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I personally find it easier to check check if the class is null or not in this case

Copy link
Contributor

Choose a reason for hiding this comment

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

I agree but the type hint may be on a class not loadable. In this case, the exception thrown should be catched and the default value applied.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

could you elaborate? On which scenario may it happen? Not that I'm not trusting you, but if that's the case I would like to add a test for it :)

Copy link
Contributor

Choose a reason for hiding this comment

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

In case you use a type hint with a class from a third party library which is not loaded because you don't need it for example.
And the advantage of getType() is that it doesn't need to load the class, so would work anyway.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah I see, fair enough will change that then

$parameterData = $this->serializer->deserialize($parameterData, $constructorParameter->getClass()->getName(), $format, $context);
Expand All @@ -343,30 +339,24 @@ protected function instantiateComplexObject(array &$data, $class, array &$contex
// Don't run set for a parameter passed to the constructor
$params[] = $parameterData;
unset($data[$key]);

continue;
}

if ($constructorParameter->isDefaultValueAvailable()) {
} elseif ($constructorParameter->isDefaultValueAvailable()) {
$params[] = $constructorParameter->getDefaultValue();

continue;
} else {
throw new RuntimeException(
Copy link
Member

Choose a reason for hiding this comment

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

Why removing the unset?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

bad copy/paste, should be kept

sprintf(
'Cannot create an instance of %s from serialized data because its constructor requires parameter "%s" to be present.',
$class,
$constructorParameter->name
)
);
}

throw new RuntimeException(
sprintf(
'Cannot create an instance of %s from serialized data because its constructor requires parameter "%s" to be present.',
$class,
$constructorParameter->name
)
);
}

if ($constructor->isConstructor()) {
return $reflectionClass->newInstanceArgs($params);
} else {
return $constructor->invokeArgs(null, $params);
}

return $constructor->invokeArgs(null, $params);
}

return new $class();
Expand Down
1 change: 1 addition & 0 deletions 1 src/Symfony/Component/Serializer/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"require-dev": {
"symfony/yaml": "~2.8|~3.0",
"symfony/config": "~2.8|~3.0",
"symfony/property-access": "~2.8|~3.0",
"symfony/http-foundation": "~2.8|~3.0",
"symfony/cache": "~3.1",
"symfony/property-info": "~2.8|~3.0",
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.