[Serializer] Fix deprecation wording

dunglas · dunglas · commit 80191a3e4f6b · 2015-01-12T16:40:22.000+01:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -119,15 +119,15 @@ public function setIgnoredAttributes(array $ignoredAttributes)
     /**
      * Set attributes to be camelized on denormalize.
      *
-     * @deprecated since 2.7, to be removed in 3.0. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.
+     * @deprecated Deprecated since version 2.7, to be removed in 3.0. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.
      *
      * @param array $camelizedAttributes
      *
      * @return self
      */
     public function setCamelizedAttributes(array $camelizedAttributes)
     {
-        trigger_error('The setCamelizedAttributes() method has been deprecated. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.', E_USER_DEPRECATED);
+        trigger_error(sprintf('%s is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.', __METHOD__), E_USER_DEPRECATED);
 
         $attributes = array();
         foreach ($camelizedAttributes as $camelizedAttribute) {
@@ -194,15 +194,15 @@ protected function handleCircularReference($object)
     /**
      * Format an attribute name, for example to convert a snake_case name to camelCase.
      *
-     * @deprecated since 2.7, to be removed in 3.0. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.
+     * @deprecated Deprecated since version 2.7, to be removed in 3.0. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.
      *
      * @param string $attributeName
      *
      * @return string
      */
     protected function formatAttribute($attributeName)
     {
-        trigger_error('The formatAttribute() method has been deprecated. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.', E_USER_DEPRECATED);
+        trigger_error(sprintf('%s is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.', __METHOD__), E_USER_DEPRECATED);
 
         return $this->nameConverter ? $this->nameConverter->normalize($attributeName) : $attributeName;
     }

Original file line number	Diff line number	Diff line change
`@@ -119,15 +119,15 @@ public function setIgnoredAttributes(array $ignoredAttributes)`
`119`	`119`	`/**`
`120`	`120`	`* Set attributes to be camelized on denormalize.`
`121`	`121`	`*`
`122`		`- * @deprecated since 2.7, to be removed in 3.0. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.`
	`122`	`+ * @deprecated Deprecated since version 2.7, to be removed in 3.0. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.`
`123`	`123`	`*`
`124`	`124`	`* @param array $camelizedAttributes`
`125`	`125`	`*`
`126`	`126`	`* @return self`
`127`	`127`	`*/`
`128`	`128`	`public function setCamelizedAttributes(array $camelizedAttributes)`
`129`	`129`	`{`
`130`		`- trigger_error('The setCamelizedAttributes() method has been deprecated. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.', E_USER_DEPRECATED);`
	`130`	`+ trigger_error(sprintf('%s is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.', __METHOD__), E_USER_DEPRECATED);`
`131`	`131`
`132`	`132`	`$attributes = array();`
`133`	`133`	`foreach ($camelizedAttributes as $camelizedAttribute) {`
`@@ -194,15 +194,15 @@ protected function handleCircularReference($object)`
`194`	`194`	`/**`
`195`	`195`	`* Format an attribute name, for example to convert a snake_case name to camelCase.`
`196`	`196`	`*`
`197`		`- * @deprecated since 2.7, to be removed in 3.0. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.`
	`197`	`+ * @deprecated Deprecated since version 2.7, to be removed in 3.0. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.`
`198`	`198`	`*`
`199`	`199`	`* @param string $attributeName`
`200`	`200`	`*`
`201`	`201`	`* @return string`
`202`	`202`	`*/`
`203`	`203`	`protected function formatAttribute($attributeName)`
`204`	`204`	`{`
`205`		`- trigger_error('The formatAttribute() method has been deprecated. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.', E_USER_DEPRECATED);`
	`205`	`+ trigger_error(sprintf('%s is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter instead.', __METHOD__), E_USER_DEPRECATED);`
`206`	`206`
`207`	`207`	`return $this->nameConverter ? $this->nameConverter->normalize($attributeName) : $attributeName;`
`208`	`208`	`}`