Merge branch '3.2' into 3.3

fabpot · fabpot · commit 419d82243c0f · 2017-07-04T08:29:22.000+03:00
* 3.2:
  Don't access private services from container aware commands (deprecated)
  Improve CircularReferenceException message
diff --git a/Normalizer/AbstractNormalizer.php b/Normalizer/AbstractNormalizer.php
@@ -192,7 +192,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
`@@ -192,7 +192,7 @@ protected function handleCircularReference($object)`
`192`	`192`	`return call_user_func($this->circularReferenceHandler, $object);`
`193`	`193`	`}`
`194`	`194`
`195`		`- throw new CircularReferenceException(sprintf('A circular reference has been detected (configured limit: %d).', $this->circularReferenceLimit));`
	`195`	`+ 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));`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`/**`