symfony
diff --git a/‎src/Symfony/Component/Translation/CHANGELOG.md
Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Component/Translation/CHANGELOG.md
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Component/Translation/Dumper/CsvFileDumper.php
Lines changed: 10 additions & 0 deletions b/‎src/Symfony/Component/Translation/Dumper/CsvFileDumper.php
Lines changed: 10 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Translation/Dumper/FileDumper.php
Lines changed: 4 additions & 0 deletions b/‎src/Symfony/Component/Translation/Dumper/FileDumper.php
Lines changed: 4 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Translation/Dumper/IcuResFileDumper.php
Lines changed: 10 additions & 0 deletions b/‎src/Symfony/Component/Translation/Dumper/IcuResFileDumper.php
Lines changed: 10 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Translation/Dumper/IniFileDumper.php
Lines changed: 10 additions & 0 deletions b/‎src/Symfony/Component/Translation/Dumper/IniFileDumper.php
Lines changed: 10 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Translation/Dumper/JsonFileDumper.php
Lines changed: 10 additions & 0 deletions b/‎src/Symfony/Component/Translation/Dumper/JsonFileDumper.php
Lines changed: 10 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Translation/Dumper/MoFileDumper.php
Lines changed: 10 additions & 0 deletions b/‎src/Symfony/Component/Translation/Dumper/MoFileDumper.php
Lines changed: 10 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Translation/Dumper/PhpFileDumper.php
Lines changed: 10 additions & 0 deletions b/‎src/Symfony/Component/Translation/Dumper/PhpFileDumper.php
Lines changed: 10 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Translation/Dumper/PoFileDumper.php
Lines changed: 10 additions & 0 deletions b/‎src/Symfony/Component/Translation/Dumper/PoFileDumper.php
Lines changed: 10 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Translation/Dumper/QtFileDumper.php
Lines changed: 10 additions & 0 deletions b/‎src/Symfony/Component/Translation/Dumper/QtFileDumper.php
Lines changed: 10 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Translation/Dumper/XliffFileDumper.php
Lines changed: 2 additions & 0 deletions b/‎src/Symfony/Component/Translation/Dumper/XliffFileDumper.php
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Translation/Dumper/YamlFileDumper.php
Lines changed: 2 additions & 0 deletions b/‎src/Symfony/Component/Translation/Dumper/YamlFileDumper.php
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Translation/Tests/Dumper/FileDumperTest.php
Lines changed: 6 additions & 1 deletion b/‎src/Symfony/Component/Translation/Tests/Dumper/FileDumperTest.php
Lines changed: 6 additions & 1 deletion
@@ -4,6 +4,7 @@ CHANGELOG
 2.8.0
 -----
 
+ * deprecated FileDumper::format(), overwrite FileDumper::formatCatalogue() instead.
  * deprecated Translator::getMessages(), rely on TranslatorBagInterface::getCatalogue() instead.
  * added options `as_tree`, `inline` to YamlFileDumper
  * added support for XLIFF target and tool attributes.
 
@@ -27,6 +27,16 @@ class CsvFileDumper extends FileDumper
      * {@inheritdoc}
      */
     public function format(MessageCatalogue $messages, $domain = 'messages')
+    {
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use the formatCatalogue() method instead.', E_USER_DEPRECATED);
+
+        return $this->formatCatalogue($messages, $domain);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())
     {
         $handle = fopen('php://memory', 'rb+');
 
 
@@ -99,6 +99,8 @@ public function dump(MessageCatalogue $messages, $options = array())
      */
     protected function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())
     {
+        @trigger_error('The '.__METHOD__.' method will replace the format method in 3.0. You should overwritten it instead of overwriting format instead.', E_USER_DEPRECATED);
+
     }
 
@@ -109,6 +111,8 @@ protected function formatCatalogue(MessageCatalogue $messages, $domain, array $o
      * @param string           $domain
      *
      * @return string representation
+     *
+     * @deprecated since version 2.8, to be removed in 3.0. Overwrite formatCatalogue() instead.
      */
     abstract protected function format(MessageCatalogue $messages, $domain);
 
 
@@ -29,6 +29,16 @@ class IcuResFileDumper extends FileDumper
      * {@inheritdoc}
      */
     public function format(MessageCatalogue $messages, $domain = 'messages')
+    {
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use the 
628C
formatCatalogue() method instead.', E_USER_DEPRECATED);
+
+        return $this->formatCatalogue($messages, $domain);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())
     {
         $data = $indexes = $resources = '';
 
 
@@ -24,6 +24,16 @@ class IniFileDumper extends FileDumper
      * {@inheritdoc}
      */
     public function format(MessageCatalogue $messages, $domain = 'messages')
+    {
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use the formatCatalogue() method instead.', E_USER_DEPRECATED);
+
+        return $this->formatCatalogue($messages, $domain);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())
     {
         $output = '';
 
 
@@ -24,6 +24,16 @@ class JsonFileDumper extends FileDumper
      * {@inheritdoc}
      */
     public function format(MessageCatalogue $messages, $domain = 'messages')
+    {
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use the formatCatalogue() method instead.', E_USER_DEPRECATED);
+
+        return $this->formatCatalogue($messages, $domain);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())
     {
         return json_encode($messages->all($domain), defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0);
     }
 
@@ -25,6 +25,16 @@ class MoFileDumper extends FileDumper
      * {@inheritdoc}
      */
     public function format(MessageCatalogue $messages, $domain = 'messages')
+    {
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use the formatCatalogue() method instead.', E_USER_DEPRECATED);
+
+        return $this->formatCatalogue($messages, $domain);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())
     {
         $output = $sources = $targets = $sourceOffsets = $targetOffsets = '';
         $offsets = array();
 
@@ -24,6 +24,16 @@ class PhpFileDumper extends FileDumper
      * {@inheritdoc}
      */
     protected function format(MessageCatalogue $messages, $domain)
+    {
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use the formatCatalogue() method instead.', E_USER_DEPRECATED);
+
+        return $this->formatCatalogue($messages, $domain);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())
     {
         $output = "<?php\n\nreturn ".var_export($messages->all($domain), true).";\n";
 
 
@@ -24,6 +24,16 @@ class PoFileDumper extends FileDumper
      * {@inheritdoc}
      */
     public function format(MessageCatalogue $messages, $domain = 'messages')
+    {
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use the formatCatalogue() method instead.', E_USER_DEPRECATED);
+
+        return $this->formatCatalogue($messages, $domain);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())
     {
         $output = 'msgid ""'."\n";
         $output .= 'msgstr ""'."\n";
 
@@ -24,6 +24,16 @@ class QtFileDumper extends FileDumper
      * {@inheritdoc}
      */
     public function format(MessageCatalogue $messages, $domain)
+    {
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use the formatCatalogue() method instead.', E_USER_DEPRECATED);
+
+        return $this->formatCatalogue($messages, $domain);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())
     {
         $dom = new \DOMDocument('1.0', 'utf-8');
         $dom->formatOutput = true;
 
@@ -108,6 +108,8 @@ protected function formatCatalogue(MessageCatalogue $messages, $domain, array $o
      */
     protected function format(MessageCatalogue $messages, $domain)
     {
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use the formatCatalogue() method instead.', E_USER_DEPRECATED);
+
         return $this->formatCatalogue($messages, $domain);
     }
 
 
@@ -49,6 +49,8 @@ protected function formatCatalogue(MessageCatalogue $messages, $domain, array $o
      */
     protected function format(MessageCatalogue $messages, $domain)
     {
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use the formatCatalogue() method instead.', E_USER_DEPRECATED);
+
         return $this->formatCatalogue($messages, $domain);
     }
 
 
@@ -58,11 +58,16 @@ public function testDumpCreatesNestedDirectoriesAndFile()
 
 class ConcreteFileDumper extends FileDumper
 {
-    protected function format(MessageCatalogue $messages, $domain)
+    protected function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())
     {
         return '';
     }
 
+    protected function format(MessageCatalogue $messages, $domain)
+    {
+        return $this->formatCatalogue($messages, $domain);
+    }
+
     protected function getExtension()
     {
         return 'concrete';
Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,8 @@ public function dump(MessageCatalogue $messages, $options = array())`
`99`	`99`	`*/`
`100`	`100`	`protected function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())`
`101`	`101`	`{`
	`102`	`+ @trigger_error('The '.__METHOD__.' method will replace the format method in 3.0. You should overwritten it instead of overwriting format instead.', E_USER_DEPRECATED);`
	`103`	`+`
`102`	`104`	`return $this->format($messages, $domain);`
`103`	`105`	`}`
`104`	`106`
`@@ -109,6 +111,8 @@ protected function formatCatalogue(MessageCatalogue $messages, $domain, array $o`
`109`	`111`	`* @param string $domain`
`110`	`112`	`*`
`111`	`113`	`* @return string representation`
	`114`	`+ *`
	`115`	`+ * @deprecated since version 2.8, to be removed in 3.0. Overwrite formatCatalogue() instead.`
`112`	`116`	`*/`
`113`	`117`	`abstract protected function format(MessageCatalogue $messages, $domain);`
`114`	`118`
Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,8 @@ protected function formatCatalogue(MessageCatalogue $messages, $domain, array $o`
`108`	`108`	`*/`
`109`	`109`	`protected function format(MessageCatalogue $messages, $domain)`
`110`	`110`	`{`
	`111`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use the formatCatalogue() method instead.', E_USER_DEPRECATED);`
	`112`	`+`
`111`	`113`	`return $this->formatCatalogue($messages, $domain);`
`112`	`114`	`}`
`113`	`115`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,8 @@ protected function formatCatalogue(MessageCatalogue $messages, $domain, array $o`
`49`	`49`	`*/`
`50`	`50`	`protected function format(MessageCatalogue $messages, $domain)`
`51`	`51`	`{`
	`52`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use the formatCatalogue() method instead.', E_USER_DEPRECATED);`
	`53`	`+`
`52`	`54`	`return $this->formatCatalogue($messages, $domain);`
`53`	`55`	`}`
`54`	`56`
Original file line number	Diff line number	Diff line change
`@@ -58,11 +58,16 @@ public function testDumpCreatesNestedDirectoriesAndFile()`
`58`	`58`
`59`	`59`	`class ConcreteFileDumper extends FileDumper`
`60`	`60`	`{`
`61`		`- protected function format(MessageCatalogue $messages, $domain)`
	`61`	`+ protected function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())`
`62`	`62`	`{`
`63`	`63`	`return '';`
`64`	`64`	`}`
`65`	`65`
	`66`	`+ protected function format(MessageCatalogue $messages, $domain)`
	`67`	`+ {`
	`68`	`+ return $this->formatCatalogue($messages, $domain);`
	`69`	`+ }`
	`70`	`+`
`66`	`71`	`protected function getExtension()`
`67`	`72`	`{`
`68`	`73`	`return 'concrete';`