[Translator] deprecate getMessages in favor of getCatalogue.

aitboudad · aitboudad · commit 03beebb2604a · 2015-05-05T12:22:50.000Z
diff --git a/UPGRADE-2.8.md b/UPGRADE-2.8.md
@@ -0,0 +1,24 @@
+﻿UPGRADE FROM 2.7 to 2.8
+=======================
+
+Translator
+----------
+ * The `getMessages()` method of the `Symfony\Component\Translation\Translator` was deprecated and will be removed in
+   Symfony 3.0. You should use the `getCatalogue()` method of the `Symfony\Component\Translation\TranslatorBagInterface`.
+
+   Before:
+
+   ```php
+   $messages = $translator->getMessages();
+   ```
+
+   After:
+
+   ```php
+    $catalogue = $translator->getCatalogue($locale);
+    $messages = $catalogue->all();
+
+    while ($catalogue = $catalogue->getFallbackCatalogue()) {
+        $messages = array_replace_recursive($catalogue->all(), $messages);
+    }
+   ```
diff --git a/src/Symfony/Component/Translation/CHANGELOG.md b/src/Symfony/Component/Translation/CHANGELOG.md
@@ -1,6 +1,10 @@
 CHANGELOG
 =========
 
+2.8.0
+-----
+ * deprecated Translator::getMessages(), rely on the TranslatorBagInterface::getCatalogue() instead.
+
 2.7.0
 -----
 
diff --git a/src/Symfony/Component/Translation/Tests/TranslatorTest.php b/src/Symfony/Component/Translation/Tests/TranslatorTest.php
@@ -499,8 +499,10 @@ public function testTransChoiceFallbackWithNoTranslation()
     /**
      * @dataProvider dataProviderGetMessages
      */
-    public function testGetMessages($resources, $locale, $expected)
+    public function testLegacyGetMessages($resources, $locale, $expected)
     {
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
+
         $locales = array_keys($resources);
         $_locale = !is_null($locale) ? $locale : reset($locales);
         $locales = array_slice($locales, 0, array_search($_locale, $locales));
diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
@@ -292,6 +292,8 @@ protected function getLoaders()
      */
     public function getMessages($locale = null)
     {
+        trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Rely on the TranslatorBagInterface instead', E_USER_DEPRECATED);
+
         $catalogues = array();
         $catalogues[] = $catalogue = $this->getCatalogue($locale);
         while ($catalogue = $catalogue->getFallbackCatalogue()) {

Original file line number	Diff line number	Diff line change
`@@ -292,6 +292,8 @@ protected function getLoaders()`
`292`	`292`	`*/`
`293`	`293`	`public function getMessages($locale = null)`
`294`	`294`	`{`
	`295`	`+ trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Rely on the TranslatorBagInterface instead', E_USER_DEPRECATED);`
	`296`	`+`
`295`	`297`	`$catalogues = array();`
`296`	`298`	`$catalogues[] = $catalogue = $this->getCatalogue($locale);`
`297`	`299`	`while ($catalogue = $catalogue->getFallbackCatalogue()) {`