symfony
diff --git a/‎src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
Lines changed: 10 additions & 14 deletions b/‎src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
Lines changed: 10 additions & 14 deletions
@@ -101,12 +101,12 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory
 
         if (isset($this->defaultContext[self::CALLBACKS])) {
             if (!\is_array($this->defaultContext[self::CALLBACKS])) {
-                throw new InvalidArgumentException('The callbacks default context must be a array of callable.');
+                throw new InvalidArgumentException(sprintf('The "%s" default context option must be a array of callables.', self::CALLBACKS));
             }
 
             foreach ($this->defaultContext[self::CALLBACKS] as $attribute => $callback) {
                 if (!\is_callable($callback)) {
-                    throw new InvalidArgumentException(sprintf('The callback given in the default context for attribute "%s" is not callable.', $attribute));
+                    throw new InvalidArgumentException(sprintf('Invalid callback found for attribute "%s" in the "%s" default context option.', $attribute, self::CALLBACKS));
                 }
             }
         }
 
@@ -61,7 +61,7 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory
         parent::__construct($classMetadataFactory, $nameConverter, $defaultContext);
 
         if (isset($this->defaultContext[self::MAX_DEPTH_HANDLER]) && !\is_callable($this->defaultContext[self::MAX_DEPTH_HANDLER])) {
-            throw new InvalidArgumentException(sprintf('The %s given in the default context is not callable.', self::MAX_DEPTH_HANDLER));
+            throw new InvalidArgumentException(sprintf('The "%s" given in the default context is not callable.', self::MAX_DEPTH_HANDLER));
         }
 
         $this->defaultContext[self::EXCLUDE_FROM_CACHE_KEY] = [self::CIRCULAR_REFERENCE_LIMIT_COUNTERS];
@@ -91,22 +91,15 @@ 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 (isset($context[self::CALLBACKS])) {
             if (!\is_array($context[self::CALLBACKS])) {
-                throw new InvalidArgumentException('The callbacks context must be a array of callable.');
+                throw new InvalidArgumentException(sprintf('The "%s" context option must be a array of callables.', self::CALLBACKS));
             }
 
             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));
+                    throw new InvalidArgumentException(sprintf('Invalid callback found for attribute "%s" in the "%s" context option.', $attribute, self::CALLBACKS));
                 }
             }
         }
@@ -120,10 +113,13 @@ public function normalize($object, $format = null, array $context = [])
         $attributes = $this->getAttributes($object, $format, $context);
         $class = $this->objectClassResolver ? ($this->objectClassResolver)($object) : \get_class($object);
         $attributesMetadata = $this->classMetadataFactory ? $this->classMetadataFactory->getMetadataFor($class)->getAttributesMetadata() : null;
-        $maxDepthHandler = $context[self::MAX_DEPTH_HANDLER] ?? $this->defaultContext[self::MAX_DEPTH_HANDLER] ?? $this->maxDepthHandler;
-
-        if (null !== $maxDepthHandler && !\is_callable($maxDepthHandler)) {
-            throw new InvalidArgumentException(sprintf('The %s given in the context is not callable.', self::MAX_DEPTH_HANDLER));
+        if (isset($context[self::MAX_DEPTH_HANDLER])) {
+            $maxDepthHandler = $context[self::MAX_DEPTH_HANDLER];
+            if (!\is_callable($maxDepthHandler)) {
+                throw new InvalidArgumentException(sprintf('The "%s" given in the context is not callable.', self::MAX_DEPTH_HANDLER));
+            }
+        } else {
+            $maxDepthHandler = $this->defaultContext[self::MAX_DEPTH_HANDLER] ?? $this->maxDepthHandler;
         }
 
         foreach ($attributes as $attribute) {
Original file line number	Diff line number	Diff line change
`@@ -101,12 +101,12 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory`
`101`	`101`
`102`	`102`	`if (isset($this->defaultContext[self::CALLBACKS])) {`
`10000 103`	`103`	`if (!\is_array($this->defaultContext[self::CALLBACKS])) {`
`104`		`- throw new InvalidArgumentException('The callbacks default context must be a array of callable.');`
	`104`	`+ throw new InvalidArgumentException(sprintf('The "%s" default context option must be a array of callables.', self::CALLBACKS));`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`foreach ($this->defaultContext[self::CALLBACKS] as $attribute => $callback) {`
`108`	`108`	`if (!\is_callable($callback)) {`
`109`		`- throw new InvalidArgumentException(sprintf('The callback given in the default context for attribute "%s" is not callable.', $attribute));`
	`109`	`+ throw new InvalidArgumentException(sprintf('Invalid callback found for attribute "%s" in the "%s" default context option.', $attribute, self::CALLBACKS));`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`	`}`