diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert CS

Browse Source
This commit is contained in:
Théo FIDRY 2016-07-06 17:37:20 +01:00
parent 5556fa5470
commit 3fe9802ead
No known key found for this signature in database
GPG Key ID: 2B998DE558208B67
2 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
View File

@ -330,11 +330,7 @@ abstract class AbstractNormalizer extends SerializerAwareNormalizer implements N
$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()) {
$parameterData = $this->serializer->deserialize($parameterData, $constructorParameter->getClass()->getName(), $format, $context);
@ -343,30 +339,24 @@ abstract class AbstractNormalizer extends SerializerAwareNormalizer implements N
// 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(
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();

1
src/Symfony/Component/Serializer/composer.json
View File

@ -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",