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

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
fix tests
  • Loading branch information
@theofidry
theofidry committed Jul 10, 2016
commit 988eba11b6057192cf292dcdd550ea9cfea042d6
11 changes: 5 additions & 6 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 @@ -323,14 +323,13 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref
}
} elseif ($allowed && !$ignored && (isset($data[$key]) || array_key_exists($key, $data))) {
$parameterData = $data[$key];
if (null !== $constructorParameter->getType()) {
try {
try {
if (null !== $constructorParameter->getClass()) {
$parameterClass = $constructorParameter->getClass()->getName();
} catch (\ReflectionException $e) {
throw new RuntimeException(sprintf('Could not determine the class of the parameter "%s".', $key), 0, $e);
$parameterData = $this->serializer->deserialize($parameterData, $parameterClass, $format, $context);
}

$parameterData = $this->serializer->deserialize($parameterData, $parameterClass, $format, $context);
} catch (\ReflectionException $e) {
throw new RuntimeException(sprintf('Could not determine the class of the parameter "%s".', $key), 0, $e);
}

// Don't run set for a parameter passed to the constructor
Expand Down
0