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

[Serializer] Add missing normalizer options constants

Browse Source
This commit is contained in:
Maxime Steinhausser 2017-04-27 17:42:57 +02:00
parent b11822640a
commit b0c414f2c8
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,7 @@ abstract class AbstractNormalizer extends SerializerAwareNormalizer implements N
const CIRCULAR_REFERENCE_LIMIT = 'circular_reference_limit';
const OBJECT_TO_POPULATE = 'object_to_populate';
const GROUPS = 'groups';
const ATTRIBUTES = 'attributes';
/**
* @var int
@ -240,13 +241,13 @@ abstract class AbstractNormalizer extends SerializerAwareNormalizer implements N
return false;
}
if (isset($context['attributes'][$attribute])) {
if (isset($context[self::ATTRIBUTES][$attribute])) {
// Nested attributes
return true;
}
if (isset($context['attributes']) && is_array($context['attributes'])) {
return in_array($attribute, $context['attributes'], true);
if (isset($context[self::ATTRIBUTES]) && is_array($context[self::ATTRIBUTES])) {
return in_array($attribute, $context[self::ATTRIBUTES], true);
}
return true;
@ -396,8 +397,8 @@ abstract class AbstractNormalizer extends SerializerAwareNormalizer implements N
*/
protected function createChildContext(array $parentContext, $attribute)
{
if (isset($parentContext['attributes'][$attribute])) {
$parentContext['attributes'] = $parentContext['attributes'][$attribute];
if (isset($parentContext[self::ATTRIBUTES][$attribute])) {
$parentContext[self::ATTRIBUTES] = $parentContext[self::ATTRIBUTES][$attribute];
}
return $parentContext;

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

@ -32,6 +32,7 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
{
const ENABLE_MAX_DEPTH = 'enable_max_depth';
const DEPTH_KEY_PATTERN = 'depth_%s::%s';
const ALLOW_EXTRA_ATTRIBUTES = 'allow_extra_attributes';
private $propertyTypeExtractor;
private $attributesCache = array();
@ -189,7 +190,7 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
}
if (($allowedAttributes !== false && !in_array($attribute, $allowedAttributes)) || !$this->isAllowedAttribute($class, $attribute, $format, $context)) {
if (isset($context['allow_extra_attributes']) && !$context['allow_extra_attributes']) {
if (isset($context[self::ALLOW_EXTRA_ATTRIBUTES]) && !$context[self::ALLOW_EXTRA_ATTRIBUTES]) {
$extraAttributes[] = $attribute;
}