Merge branch '2.8' into 3.2

fabpot · fabpot · commit 993a79c5254b · 2017-07-04T08:27:49.000+03:00
* 2.8:
  Improve CircularReferenceException message
diff --git a/Normalizer/AbstractNormalizer.php b/Normalizer/AbstractNormalizer.php
@@ -191,7 +191,7 @@ protected function handleCircularReference($object)
             return call_user_func($this->circularReferenceHandler, $object);
         }
 
-        throw new CircularReferenceException(sprintf('A circular reference has been detected (configured limit: %d).', $this->circularReferenceLimit));
+        throw new CircularReferenceException(sprintf('A circular reference has been detected when serializing the object of class "%s" (configured limit: %d)', get_class($object), $this->circularReferenceLimit));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ protected function handleCircularReference($object)`
`191`	`191`	`return call_user_func($this->circularReferenceHandler, $object);`
`192`	`192`	`}`
`193`	`193`
`194`		`- throw new CircularReferenceException(sprintf('A circular reference has been detected (configured limit: %d).', $this->circularReferenceLimit));`
	`194`	`+ throw new CircularReferenceException(sprintf('A circular reference has been detected when serializing the object of class "%s" (configured limit: %d)', get_class($object), $this->circularReferenceLimit));`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`/**`