[serializer] validate that the specified callbacks are actually callable

dbu · jewome62 · commit ba1097c947fb · 2019-04-07T13:39:12.000+02:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -99,10 +99,10 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory
         $this->nameConverter = $nameConverter;
         $this->defaultContext = array_merge($this->defaultContext, $defaultContext);
 
-        if (\is_array($this->defaultContext[self::CALLBACKS] ?? null)) {
+        if (\array_key_exists(self::CALLBACKS, $this->defaultContext)) {
             foreach ($this->defaultContext[self::CALLBACKS] as $attribute => $callback) {
                 if (!\is_callable($callback)) {
-                    throw new InvalidArgumentException(sprintf('The given callback for attribute "%s" is not callable.', $attribute));
+                    throw new InvalidArgumentException(sprintf('The callback given in the default context for attribute "%s" is not callable.', $attribute));
                 }
             }
         }
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -86,6 +86,13 @@ public function normalize($object, $format = null, array $context = [])
         if (!isset($context['cache_key'])) {
             $context['cache_key'] = $this->getCacheKey($format, $context);
         }
+        if (\array_key_exists(self::CALLBACKS, $context)) {
+            foreach ($context[self::CALLBACKS] as $attribute => $callback) {
+                if (!\is_callable($callback)) {
+                    throw new InvalidArgumentException(sprintf('The callback given in the context for attribute "%s" is not callable.', $attribute));
+                }
+            }
+        }
 
         if ($this->isCircularReference($object, $context)) {
             return $this->handleCircularReference($object, $format, $context);

Original file line number	Diff line number	Diff line change
`@@ -99,10 +99,10 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory`
`99`	`99`	`$this->nameConverter = $nameConverter;`
`100`	`100`	`$this->defaultContext = array_merge($this->defaultContext, $defaultContext);`
`101`	`101`
`102`		`- if (\is_array($this->defaultContext[self::CALLBACKS] ?? null)) {`
	`102`	`+ if (\array_key_exists(self::CALLBACKS, $this->defaultContext)) {`
`103`	`103`	`foreach ($this->defaultContext[self::CALLBACKS] as $attribute => $callback) {`
`104`	`104`	`if (!\is_callable($callback)) {`
`105`		`- throw new InvalidArgumentException(sprintf('The given callback for attribute "%s" is not callable.', $attribute));`
	`105`	`+ throw new InvalidArgumentException(sprintf('The callback given in the default context for attribute "%s" is not callable.', $attribute));`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`	`}`