bug #18837 [Serializer] AbstractObjectNormalizer: be sure that isAllowedAttribute is called (dunglas)

fabpot · fabpot · commit 7dc1491ec05a · 2016-05-24T12:12:38.000+02:00
This PR was submitted for the master branch but it was merged into the 3.1 branch instead (closes #18837). Discussion ---------- [Serializer] AbstractObjectNormalizer: be sure that isAllowedAttribute is called | Q | A | ------------- | --- | Branch? | 3.1 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Please merge before the release of 3.1 (potential bug fix) Commits ------- 29b4115 [Serializer] AbstractObjectNormalizer: be sure that isAllowedAttribute is called
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -182,10 +182,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
                 $attribute = $this->nameConverter->denormalize($attribute);
             }
 
-            $allowed = $allowedAttributes === false || in_array($attribute, $allowedAttributes);
-            $ignored = in_array($attribute, $this->ignoredAttributes);
-
-            if (!$allowed || $ignored) {
+            if (($allowedAttributes !== false && !in_array($attribute, $allowedAttributes)) || !$this->isAllowedAttribute($class, $attribute, $format, $context)) {
                 continue;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -182,10 +182,7 @@ public function denormalize($data, $class, $format = null, array $context = arra`
`182`	`182`	`$attribute = $this->nameConverter->denormalize($attribute);`
`183`	`183`	`}`
`184`	`184`
`185`		`- $allowed = $allowedAttributes === false \|\| in_array($attribute, $allowedAttributes);`
`186`		`- $ignored = in_array($attribute, $this->ignoredAttributes);`
`187`		`-`
`188`		`- if (!$allowed \|\| $ignored) {`
	`185`	`+ if (($allowedAttributes !== false && !in_array($attribute, $allowedAttributes)) \|\| !$this->isAllowedAttribute($class, $attribute, $format, $context)) {`
`189`	`186`	`continue;`
`190`	`187`	`}`
`191`	`188`