[Serializer] Optimize GetSetMethodNormalizer and PropertyNormalizer

dunglas · dunglas · commit c41346baef6d · 2015-03-01T18:38:38.000+01:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
@@ -68,7 +68,7 @@ public function normalize($object, $format = null, array $context = array())
                 }
 
                 $attributeValue = $method->invoke($object);
-                if (array_key_exists($attributeName, $this->callbacks)) {
+                if (isset($this->callbacks[$attributeName])) {
                     $attributeValue = call_user_func($this->callbacks[$attributeName], $attributeValue);
                 }
                 if (null !== $attributeValue && !is_scalar($attributeValue)) {
diff --git a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
@@ -64,7 +64,7 @@ public function normalize($object, $format = null, array $context = array())
 
             $attributeValue = $property->getValue($object);
 
-            if (array_key_exists($property->name, $this->callbacks)) {
+            if (isset($this->callbacks[$property->name])) {
                 $attributeValue = call_user_func($this->callbacks[$property->name], $attributeValue);
             }
             if (null !== $attributeValue && !is_scalar($attributeValue)) {

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public function normalize($object, $format = null, array $context = array())`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`$attributeValue = $method->invoke($object);`
`71`		`- if (array_key_exists($attributeName, $this->callbacks)) {`
	`71`	`+ if (isset($this->callbacks[$attributeName])) {`
`72`	`72`	`$attributeValue = call_user_func($this->callbacks[$attributeName], $attributeValue);`
`73`	`73`	`}`
`74`	`74`	`if (null !== $attributeValue && !is_scalar($attributeValue)) {`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public function normalize($object, $format = null, array $context = array())`
`64`	`64`
`65`	`65`	`$attributeValue = $property->getValue($object);`
`66`	`66`
`67`		`- if (array_key_exists($property->name, $this->callbacks)) {`
	`67`	`+ if (isset($this->callbacks[$property->name])) {`
`68`	`68`	`$attributeValue = call_user_func($this->callbacks[$property->name], $attributeValue);`
`69`	`69`	`}`
`70`	`70`	`if (null !== $attributeValue && !is_scalar($attributeValue)) {`