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

Prevent BC in instantiateObject

Browse Source
This commit is contained in:
Kévin Dunglas 2016-07-10 18:21:22 +02:00
parent e437e0408e
commit 7b5d55d5f0
No known key found for this signature in database
GPG Key ID: 4D04EBEF06AAF3A6
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -268,17 +268,6 @@ abstract class AbstractNormalizer extends SerializerAwareNormalizer implements N
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.
*
@ -298,8 +287,10 @@ abstract class AbstractNormalizer extends SerializerAwareNormalizer implements N
*
* @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]) &&

2
src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
View File

@ -175,7 +175,7 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
$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) {

2
src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
View File

@ -47,7 +47,7 @@ class GetSetMethodNormalizer extends AbstractObjectNormalizer
$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) {