[Serializer] ObjectNormalizer: add missing parameters

dunglas · fabpot · commit 58ac241c1d56 · 2016-05-24T12:10:22.000+02:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
@@ -68,14 +68,14 @@ protected function extractAttributes($object, $format = null, array $context = a
                 $attributeName = lcfirst(substr($name, 2));
             }
 
-            if (null !== $attributeName && $this->isAllowedAttribute($object, $attributeName)) {
+            if (null !== $attributeName && $this->isAllowedAttribute($object, $attributeName, $format, $context)) {
                 $attributes[$attributeName] = true;
             }
         }
 
         // properties
         foreach ($reflClass->getProperties(\ReflectionProperty::IS_PUBLIC) as $reflProperty) {
-            if ($reflProperty->isStatic() || !$this->isAllowedAttribute($object, $reflProperty->name)) {
+            if ($reflProperty->isStatic() || !$this->isAllowedAttribute($object, $reflProperty->name, $format, $context)) {
                 continue;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -68,14 +68,14 @@ protected function extractAttributes($object, $format = null, array $context = a`
`68`	`68`	`$attributeName = lcfirst(substr($name, 2));`
`69`	`69`	`}`
`70`	`70`
`71`		`- if (null !== $attributeName && $this->isAllowedAttribute($object, $attributeName)) {`
	`71`	`+ if (null !== $attributeName && $this->isAllowedAttribute($object, $attributeName, $format, $context)) {`
`72`	`72`	`$attributes[$attributeName] = true;`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`// properties`
`77`	`77`	`foreach ($reflClass->getProperties(\ReflectionProperty::IS_PUBLIC) as $reflProperty) {`
`78`		`- if ($reflProperty->isStatic() \|\| !$this->isAllowedAttribute($object, $reflProperty->name)) {`
	`78`	`+ if ($reflProperty->isStatic() \|\| !$this->isAllowedAttribute($object, $reflProperty->name, $format, $context)) {`
`79`	`79`	`continue;`
`80`	`80`	`}`
`81`	`81`