deprecate transChoice method

aitboudad · aitboudad · commit 599dfcf145f2 · 2015-09-10T17:31:22.000Z
diff --git a/src/Symfony/Component/Translation/IdentityTranslator.php b/src/Symfony/Component/Translation/IdentityTranslator.php
@@ -89,6 +89,7 @@ public function trans($id, array $parameters = array(), $domain = null, $locale
      */
     public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null)
     {
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Rely on the MessageFormatterInterface and TranslatorInterface::trans() method instead.', E_USER_DEPRECATED);
         if (!$locale) {
             $locale = $this->getLocale();
         }
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
@@ -256,6 +256,7 @@ public function trans($id, array $parameters = array(), $domain = null, $locale
      */
     public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null)
     {
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Rely on the MessageFormatterInterface and TranslatorInterface::trans() method instead.', E_USER_DEPRECATED);
         if (null === $domain) {
             $domain = 'messages';
         }
diff --git a/src/Symfony/Component/Translation/TranslatorInterface.php b/src/Symfony/Component/Translation/TranslatorInterface.php
@@ -38,6 +38,8 @@ public function trans($id, array $parameters = array(), $domain = null, $locale
 
     /**
      * Translates the given choice message by choosing a translation according to a number.
+     * @deprecated since version 2.8, to be removed in 3.0.
+     *             Use the {@link trans} method instead.
      *
      * @param string      $id         The message id (may also be an object that can be cast to string)
      * @param int         $number     The number to use to find the indice of the message

Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,7 @@ public function trans($id, array $parameters = array(), $domain = null, $locale`
`89`	`89`	`*/`
`90`	`90`	`public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null)`
`91`	`91`	`{`
	`92`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Rely on the MessageFormatterInterface and TranslatorInterface::trans() method instead.', E_USER_DEPRECATED);`
`92`	`93`	`if (!$locale) {`
`93`	`94`	`$locale = $this->getLocale();`
`94`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -256,6 +256,7 @@ public function trans($id, array $parameters = array(), $domain = null, $locale`
`256`	`256`	`*/`
`257`	`257`	`public function transChoice($id, $number, array $parameters = array(), $domain = null, $locale = null)`
`258`	`258`	`{`
	`259`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Rely on the MessageFormatterInterface and TranslatorInterface::trans() method instead.', E_USER_DEPRECATED);`
`259`	`260`	`if (null === $domain) {`
`260`	`261`	`$domain = 'messages';`
`261`	`262`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,8 @@ public function trans($id, array $parameters = array(), $domain = null, $locale`
`38`	`38`
`39`	`39`	`/**`
`40`	`40`	`* Translates the given choice message by choosing a translation according to a number.`
	`41`	`+ * @deprecated since version 2.8, to be removed in 3.0.`
	`42`	`+ * Use the {@link trans} method instead.`
`41`	`43`	`*`
`42`	`44`	`* @param string $id The message id (may also be an object that can be cast to string)`
`43`	`45`	`* @param int $number The number to use to find the indice of the message`