Merge branch '2.7' into 2.8

fabpot · fabpot · commit ff6bd03c458a · 2017-07-03T17:09:54.000+03:00
* 2.7:
  Improve CircularReferenceException message
diff --git a/Normalizer/AbstractNormalizer.php b/Normalizer/AbstractNormalizer.php
@@ -228,7 +228,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
`@@ -228,7 +228,7 @@ protected function handleCircularReference($object)`
`228`	`228`	`return call_user_func($this->circularReferenceHandler, $object);`
`229`	`229`	`}`
`230`	`230`
`231`		`- throw new CircularReferenceException(sprintf('A circular reference has been detected (configured limit: %d).', $this->circularReferenceLimit));`
	`231`	`+ 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));`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`/**`