From 1682b12606c23646e1a4a64e8505cfec06f1dfc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fco=20Javier=20Nu=CC=81n=CC=83ez=20Berrocoso?= Date: Sat, 29 Nov 2014 12:23:49 +0100 Subject: [PATCH 1/3] Issue #12658 Add a deprecation note about Translator's setFallbackLocale method --- src/Symfony/Component/Translation/Translator.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php index 356a21b5923e1..4dd0e85fe603e 100644 --- a/src/Symfony/Component/Translation/Translator.php +++ b/src/Symfony/Component/Translation/Translator.php @@ -160,6 +160,7 @@ public function getLocale() */ public function setFallbackLocale($locales) { + trigger_error('The setFallbackLocale method was removed in 3.0. You should use the new method setFallbackLocales.', E_USER_DEPRECATED); $this->setFallbackLocales(is_array($locales) ? $locales : array($locales)); } From 2f7580bfd39dcdc60595742ce1cc141037b5d87f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fco=20Javier=20Nu=CC=81n=CC=83ez=20Berrocoso?= Date: Sat, 29 Nov 2014 13:37:54 +0100 Subject: [PATCH 2/3] Issue #12658 Add a deprecation note about Translator's setFallbackLocale method --- src/Symfony/Component/Translation/Translator.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php index 4dd0e85fe603e..6aa8707264689 100644 --- a/src/Symfony/Component/Translation/Translator.php +++ b/src/Symfony/Component/Translation/Translator.php @@ -154,13 +154,17 @@ public function getLocale() * * @throws \InvalidArgumentException If a locale contains invalid characters * - * @deprecated since 2.3, to be removed in 3.0. Use setFallbackLocales() instead. + * @deprecated Deprecated since version 2.3, to be removed in 3.0. Use setFallbackLocales() instead. * * @api */ public function setFallbackLocale($locales) { - trigger_error('The setFallbackLocale method was removed in 3.0. You should use the new method setFallbackLocales.', E_USER_DEPRECATED); + trigger_error( + 'The setFallbackLocale() method is deprecated since version 2.3 and will be removed in 3.0. Use setFallbackLocales() instead.', + E_USER_DEPRECATED + ); + $this->setFallbackLocales(is_array($locales) ? $locales : array($locales)); } From 339c4f37646ed9947d71124b63412b2ceaebeeec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fco=20Javier=20Nu=CC=81n=CC=83ez=20Berrocoso?= Date: Sat, 29 Nov 2014 14:23:14 +0100 Subject: [PATCH 3/3] Issue #12658 the whole expression on one line --- src/Symfony/Component/Translation/Translator.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php index 6aa8707264689..7ad2043f975de 100644 --- a/src/Symfony/Component/Translation/Translator.php +++ b/src/Symfony/Component/Translation/Translator.php @@ -160,10 +160,7 @@ public function getLocale() */ public function setFallbackLocale($locales) { - trigger_error( - 'The setFallbackLocale() method is deprecated since version 2.3 and will be removed in 3.0. Use setFallbackLocales() instead.', - E_USER_DEPRECATED - ); + trigger_error('The setFallbackLocale() method is deprecated since version 2.3 and will be removed in 3.0. Use setFallbackLocales() instead.', E_USER_DEPRECATED); $this->setFallbackLocales(is_array($locales) ? $locales : array($locales)); }