diff --git a/src/Symfony/Component/Translation/CHANGELOG.md b/src/Symfony/Component/Translation/CHANGELOG.md index 69b13303bd27c..45f15a00196cd 100644 --- a/src/Symfony/Component/Translation/CHANGELOG.md +++ b/src/Symfony/Component/Translation/CHANGELOG.md @@ -6,6 +6,7 @@ CHANGELOG * deprecated FileDumper::format(), overwrite FileDumper::formatCatalogue() instead. * deprecated Translator::getMessages(), rely on TranslatorBagInterface::getCatalogue() instead. + * added `FileDumper::formatCatalogue` which allows format the catalogue without dumping it into file. * added option `json_encoding` to JsonFileDumper * added options `as_tree`, `inline` to YamlFileDumper * added support for XLIFF 2.0. diff --git a/src/Symfony/Component/Translation/Dumper/CsvFileDumper.php b/src/Symfony/Component/Translation/Dumper/CsvFileDumper.php index a4c4ef04af0a7..afadcd881e475 100644 --- a/src/Symfony/Component/Translation/Dumper/CsvFileDumper.php +++ b/src/Symfony/Component/Translation/Dumper/CsvFileDumper.php @@ -36,7 +36,7 @@ public function format(MessageCatalogue $messages, $domain = 'messages') /** * {@inheritdoc} */ - protected function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) + public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) { $handle = fopen('php://memory', 'rb+'); diff --git a/src/Symfony/Component/Translation/Dumper/FileDumper.php b/src/Symfony/Component/Translation/Dumper/FileDumper.php index 931000be84217..b217d108a5080 100644 --- a/src/Symfony/Component/Translation/Dumper/FileDumper.php +++ b/src/Symfony/Component/Translation/Dumper/FileDumper.php @@ -97,9 +97,9 @@ public function dump(MessageCatalogue $messages, $options = array()) * * @return string representation */ - protected function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) + public 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); + @trigger_error('The '.__METHOD__.' method will replace the format method in 3.0. You should overwrite it instead of overwriting format instead.', E_USER_DEPRECATED); return $this->format($messages, $domain); } diff --git a/src/Symfony/Component/Translation/Dumper/IcuResFileDumper.php b/src/Symfony/Component/Translation/Dumper/IcuResFileDumper.php index 95630431e58d9..deb4c7fb8e8c3 100644 --- a/src/Symfony/Component/Translation/Dumper/IcuResFileDumper.php +++ b/src/Symfony/Component/Translation/Dumper/IcuResFileDumper.php @@ -38,7 +38,7 @@ public function format(MessageCatalogue $messages, $domain = 'messages') /** * {@inheritdoc} */ - protected function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) + public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) { $data = $indexes = $resources = ''; diff --git a/src/Symfony/Component/Translation/Dumper/IniFileDumper.php b/src/Symfony/Component/Translation/Dumper/IniFileDumper.php index 7018b3c1ea093..36be230b5079c 100644 --- a/src/Symfony/Component/Translation/Dumper/IniFileDumper.php +++ b/src/Symfony/Component/Translation/Dumper/IniFileDumper.php @@ -33,7 +33,7 @@ public function format(MessageCatalogue $messages, $domain = 'messages') /** * {@inheritdoc} */ - protected function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) + public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) { $output = ''; diff --git a/src/Symfony/Component/Translation/Dumper/JsonFileDumper.php b/src/Symfony/Component/Translation/Dumper/JsonFileDumper.php index 0a7f1321fdadd..022e165d55b77 100644 --- a/src/Symfony/Component/Translation/Dumper/JsonFileDumper.php +++ b/src/Symfony/Component/Translation/Dumper/JsonFileDumper.php @@ -33,7 +33,7 @@ public function format(MessageCatalogue $messages, $domain = 'messages') /** * {@inheritdoc} */ - protected function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) + public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) { if (isset($options['json_encoding'])) { $flags = $options['json_encoding']; diff --git a/src/Symfony/Component/Translation/Dumper/MoFileDumper.php b/src/Symfony/Component/Translation/Dumper/MoFileDumper.php index 3758534e15e04..a8e123a98aee9 100644 --- a/src/Symfony/Component/Translation/Dumper/MoFileDumper.php +++ b/src/Symfony/Component/Translation/Dumper/MoFileDumper.php @@ -34,7 +34,7 @@ public function format(MessageCatalogue $messages, $domain = 'messages') /** * {@inheritdoc} */ - protected function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) + public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) { $output = $sources = $targets = $sourceOffsets = $targetOffsets = ''; $offsets = array(); diff --git a/src/Symfony/Component/Translation/Dumper/PhpFileDumper.php b/src/Symfony/Component/Translation/Dumper/PhpFileDumper.php index a3aa2e81f6b70..ea31dda58b312 100644 --- a/src/Symfony/Component/Translation/Dumper/PhpFileDumper.php +++ b/src/Symfony/Component/Translation/Dumper/PhpFileDumper.php @@ -33,7 +33,7 @@ protected function format(MessageCatalogue $messages, $domain) /** * {@inheritdoc} */ - protected function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) + public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) { $output = "all($domain), true).";\n"; diff --git a/src/Symfony/Component/Translation/Dumper/PoFileDumper.php b/src/Symfony/Component/Translation/Dumper/PoFileDumper.php index e54f77a4604fa..9e27bc7d9146c 100644 --- a/src/Symfony/Component/Translation/Dumper/PoFileDumper.php +++ b/src/Symfony/Component/Translation/Dumper/PoFileDumper.php @@ -33,7 +33,7 @@ public function format(MessageCatalogue $messages, $domain = 'messages') /** * {@inheritdoc} */ - protected function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) + public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) { $output = 'msgid ""'."\n"; $output .= 'msgstr ""'."\n"; diff --git a/src/Symfony/Component/Translation/Dumper/QtFileDumper.php b/src/Symfony/Component/Translation/Dumper/QtFileDumper.php index 256083f7d5bdf..5c2a4344f4641 100644 --- a/src/Symfony/Component/Translation/Dumper/QtFileDumper.php +++ b/src/Symfony/Component/Translation/Dumper/QtFileDumper.php @@ -33,7 +33,7 @@ public function format(MessageCatalogue $messages, $domain) /** * {@inheritdoc} */ - protected function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) + public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) { $dom = new \DOMDocument('1.0', 'utf-8'); $dom->formatOutput = true; diff --git a/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php b/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php index ee62eec169a08..6a7f65563d74d 100644 --- a/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php +++ b/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php @@ -23,7 +23,7 @@ class XliffFileDumper extends FileDumper /** * {@inheritdoc} */ - protected function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) + public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) { $xliffVersion = '1.2'; if (array_key_exists('xliff_version', $options)) { diff --git a/src/Symfony/Component/Translation/Dumper/YamlFileDumper.php b/src/Symfony/Component/Translation/Dumper/YamlFileDumper.php index 611f77fb5118e..8e496488e2a0f 100644 --- a/src/Symfony/Component/Translation/Dumper/YamlFileDumper.php +++ b/src/Symfony/Component/Translation/Dumper/YamlFileDumper.php @@ -25,7 +25,7 @@ class YamlFileDumper extends FileDumper /** * {@inheritdoc} */ - protected function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) + public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) { if (!class_exists('Symfony\Component\Yaml\Yaml')) { throw new \LogicException('Dumping translations in the YAML format requires the Symfony Yaml component.'); diff --git a/src/Symfony/Component/Translation/Tests/Dumper/CsvFileDumperTest.php b/src/Symfony/Component/Translation/Tests/Dumper/CsvFileDumperTest.php index 29177ff5f5903..961319208bf16 100644 --- a/src/Symfony/Component/Translation/Tests/Dumper/CsvFileDumperTest.php +++ b/src/Symfony/Component/Translation/Tests/Dumper/CsvFileDumperTest.php @@ -16,18 +16,14 @@ class CsvFileDumperTest extends \PHPUnit_Framework_TestCase { - public function testDump() + public function testFormatCatalogue() { $catalogue = new MessageCatalogue('en'); $catalogue->add(array('foo' => 'bar', 'bar' => 'foo foo', 'foo;foo' => 'bar')); - $tempDir = sys_get_temp_dir(); $dumper = new CsvFileDumper(); - $dumper->dump($catalogue, array('path' => $tempDir)); - $this->assertEquals(file_get_contents(__DIR__.'/../fixtures/valid.csv'), file_get_contents($tempDir.'/messages.en.csv')); - - unlink($tempDir.'/messages.en.csv'); + $this->assertStringEqualsFile(__DIR__.'/../fixtures/valid.csv', $dumper->formatCatalogue($catalogue, 'messages')); } } diff --git a/src/Symfony/Component/Translation/Tests/Dumper/FileDumperTest.php b/src/Symfony/Component/Translation/Tests/Dumper/FileDumperTest.php index 7bee93f7f8010..ed58546dd3f24 100644 --- a/src/Symfony/Component/Translation/Tests/Dumper/FileDumperTest.php +++ b/src/Symfony/Component/Translation/Tests/Dumper/FileDumperTest.php @@ -16,6 +16,19 @@ class FileDumperTest extends \PHPUnit_Framework_TestCase { + public function testDump() + { + $tempDir = sys_get_temp_dir(); + + $catalogue = new MessageCatalogue('en'); + $catalogue->add(array('foo' => 'bar')); + + $dumper = new ConcreteFileDumper(); + $dumper->dump($catalogue, array('path' => $tempDir)); + + $this->assertTrue(file_exists($tempDir.'/messages.en.concrete')); + } + public function testDumpBackupsFileIfExisting() { $tempDir = sys_get_temp_dir(); @@ -58,7 +71,7 @@ public function testDumpCreatesNestedDirectoriesAndFile() class ConcreteFileDumper extends FileDumper { - protected function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) + public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) { return ''; } diff --git a/src/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php b/src/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php index 7be7dfbf5de06..7122ddd135dff 100644 --- a/src/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php +++ b/src/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php @@ -16,7 +16,7 @@ class IcuResFileDumperTest extends \PHPUnit_Framework_TestCase { - public function testDump() + public function testFormatCatalogue() { if (!function_exists('mb_convert_encoding')) { $this->markTestSkipped('This test requires mbstring to work.'); @@ -25,14 +25,8 @@ public function testDump() $catalogue = new MessageCatalogue('en'); $catalogue->add(array('foo' => 'bar')); - $tempDir = sys_get_temp_dir().'/IcuResFileDumperTest'; $dumper = new IcuResFileDumper(); - $dumper->dump($catalogue, array('path' => $tempDir)); - $this->assertEquals(file_get_contents(__DIR__.'/../fixtures/resourcebundle/res/en.res'), file_get_contents($tempDir.'/messages/en.res')); - - @unlink($tempDir.'/messages/en.res'); - @rmdir($tempDir.'/messages'); - @rmdir($tempDir); + $this->assertStringEqualsFile(__DIR__.'/../fixtures/resourcebundle/res/en.res', $dumper->formatCatalogue($catalogue, 'messages')); } } diff --git a/src/Symfony/Component/Translation/Tests/Dumper/IniFileDumperTest.php b/src/Symfony/Component/Translation/Tests/Dumper/IniFileDumperTest.php index 2a2cefde1ef50..d8ae4b5b9f9f7 100644 --- a/src/Symfony/Component/Translation/Tests/Dumper/IniFileDumperTest.php +++ b/src/Symfony/Component/Translation/Tests/Dumper/IniFileDumperTest.php @@ -16,17 +16,13 @@ class IniFileDumperTest extends \PHPUnit_Framework_TestCase { - public function testDump() + public function testFormatCatalogue() { $catalogue = new MessageCatalogue('en'); $catalogue->add(array('foo' => 'bar')); - $tempDir = sys_get_temp_dir(); $dumper = new IniFileDumper(); - $dumper->dump($catalogue, array('path' => $tempDir)); - $this->assertEquals(file_get_contents(__DIR__.'/../fixtures/resources.ini'), file_get_contents($tempDir.'/messages.en.ini')); - - unlink($tempDir.'/messages.en.ini'); + $this->assertStringEqualsFile(__DIR__.'/../fixtures/resources.ini', $dumper->formatCatalogue($catalogue, 'messages')); } } diff --git a/src/Symfony/Component/Translation/Tests/Dumper/JsonFileDumperTest.php b/src/Symfony/Component/Translation/Tests/Dumper/JsonFileDumperTest.php index 0d6ffd58f9f59..971e86b035cb4 100644 --- a/src/Symfony/Component/Translation/Tests/Dumper/JsonFileDumperTest.php +++ b/src/Symfony/Component/Translation/Tests/Dumper/JsonFileDumperTest.php @@ -16,19 +16,7 @@ class JsonFileDumperTest extends \PHPUnit_Framework_TestCase { - private $tempDir; - - protected function setUp() - { - $this->tempDir = sys_get_temp_dir(); - } - - protected function tearDown() - { - unlink($this->tempDir.'/messages.en.json'); - } - - public function testDump() + public function testFormatCatalogue() { if (PHP_VERSION_ID < 50400) { $this->markTestIncomplete('PHP below 5.4 doesn\'t support JSON pretty printing'); @@ -38,9 +26,8 @@ public function testDump() $catalogue->add(array('foo' => 'bar')); $dumper = new JsonFileDumper(); - $dumper->dump($catalogue, array('path' => $this->tempDir)); - $this->assertEquals(file_get_contents(__DIR__.'/../fixtures/resources.json'), file_get_contents($this->tempDir.'/messages.en.json')); + $this->assertStringEqualsFile(__DIR__.'/../fixtures/resources.json', $dumper->formatCatalogue($catalogue, 'messages')); } public function testDumpWithCustomEncoding() @@ -49,8 +36,7 @@ public function testDumpWithCustomEncoding() $catalogue->add(array('foo' => '"bar"')); $dumper = new JsonFileDumper(); - $dumper->dump($catalogue, array('path' => $this->tempDir, 'json_encoding' => JSON_HEX_QUOT)); - $this->assertEquals(file_get_contents(__DIR__.'/../fixtures/resources.dump.json'), file_get_contents($this->tempDir.'/messages.en.json')); + $this->assertStringEqualsFile(__DIR__.'/../fixtures/resources.dump.json', $dumper->formatCatalogue($catalogue, 'messages', array('json_encoding' => JSON_HEX_QUOT))); } } diff --git a/src/Symfony/Component/Translation/Tests/Dumper/MoFileDumperTest.php b/src/Symfony/Component/Translation/Tests/Dumper/MoFileDumperTest.php index 439a25cd222fc..c47656c831eb2 100644 --- a/src/Symfony/Component/Translation/Tests/Dumper/MoFileDumperTest.php +++ b/src/Symfony/Component/Translation/Tests/Dumper/MoFileDumperTest.php @@ -16,16 +16,13 @@ class MoFileDumperTest extends \PHPUnit_Framework_TestCase { - public function testDump() + public function testFormatCatalogue() { $catalogue = new MessageCatalogue('en'); $catalogue->add(array('foo' => 'bar')); - $tempDir = sys_get_temp_dir(); $dumper = new MoFileDumper(); - $dumper->dump($catalogue, array('path' => $tempDir)); - $this->assertEquals(file_get_contents(__DIR__.'/../fixtures/resources.mo'), file_get_contents($tempDir.'/messages.en.mo')); - unlink($tempDir.'/messages.en.mo'); + $this->assertStringEqualsFile(__DIR__.'/../fixtures/resources.mo', $dumper->formatCatalogue($catalogue, 'messages')); } } diff --git a/src/Symfony/Component/Translation/Tests/Dumper/PhpFileDumperTest.php b/src/Symfony/Component/Translation/Tests/Dumper/PhpFileDumperTest.php index 18be5a0dc48a6..d24cd2b95bef0 100644 --- a/src/Symfony/Component/Translation/Tests/Dumper/PhpFileDumperTest.php +++ b/src/Symfony/Component/Translation/Tests/Dumper/PhpFileDumperTest.php @@ -16,17 +16,13 @@ class PhpFileDumperTest extends \PHPUnit_Framework_TestCase { - public function testDump() + public function testFormatCatalogue() { $catalogue = new MessageCatalogue('en'); $catalogue->add(array('foo' => 'bar')); - $tempDir = sys_get_temp_dir(); $dumper = new PhpFileDumper(); - $dumper->dump($catalogue, array('path' => $tempDir)); - $this->assertEquals(file_get_contents(__DIR__.'/../fixtures/resources.php'), file_get_contents($tempDir.'/messages.en.php')); - - unlink($tempDir.'/messages.en.php'); + $this->assertStringEqualsFile(__DIR__.'/../fixtures/resources.php', $dumper->formatCatalogue($catalogue, 'messages')); } } diff --git a/src/Symfony/Component/Translation/Tests/Dumper/PoFileDumperTest.php b/src/Symfony/Component/Translation/Tests/Dumper/PoFileDumperTest.php index 0296d6b2eaaa1..445961afe9026 100644 --- a/src/Symfony/Component/Translation/Tests/Dumper/PoFileDumperTest.php +++ b/src/Symfony/Component/Translation/Tests/Dumper/PoFileDumperTest.php @@ -16,16 +16,13 @@ class PoFileDumperTest extends \PHPUnit_Framework_TestCase { - public function testDump() + public function testFormatCatalogue() { $catalogue = new MessageCatalogue('en'); $catalogue->add(array('foo' => 'bar')); - $tempDir = sys_get_temp_dir(); $dumper = new PoFileDumper(); - $dumper->dump($catalogue, array('path' => $tempDir)); - $this->assertEquals(file_get_contents(__DIR__.'/../fixtures/resources.po'), file_get_contents($tempDir.'/messages.en.po')); - unlink($tempDir.'/messages.en.po'); + $this->assertStringEqualsFile(__DIR__.'/../fixtures/resources.po', $dumper->formatCatalogue($catalogue, 'messages')); } } diff --git a/src/Symfony/Component/Translation/Tests/Dumper/QtFileDumperTest.php b/src/Symfony/Component/Translation/Tests/Dumper/QtFileDumperTest.php index d7d8fb7e46987..690a4d0bf6619 100644 --- a/src/Symfony/Component/Translation/Tests/Dumper/QtFileDumperTest.php +++ b/src/Symfony/Component/Translation/Tests/Dumper/QtFileDumperTest.php @@ -16,17 +16,13 @@ class QtFileDumperTest extends \PHPUnit_Framework_TestCase { - public function testDump() + public function testFormatCatalogue() { $catalogue = new MessageCatalogue('en'); $catalogue->add(array('foo' => 'bar'), 'resources'); - $tempDir = sys_get_temp_dir(); $dumper = new QtFileDumper(); - $dumper->dump($catalogue, array('path' => $tempDir)); - $this->assertEquals(file_get_contents(__DIR__.'/../fixtures/resources.ts'), file_get_contents($tempDir.'/resources.en.ts')); - - unlink($tempDir.'/resources.en.ts'); + $this->assertStringEqualsFile(__DIR__.'/../fixtures/resources.ts', $dumper->formatCatalogue($catalogue, 'resources')); } } diff --git a/src/Symfony/Component/Translation/Tests/Dumper/XliffFileDumperTest.php b/src/Symfony/Component/Translation/Tests/Dumper/XliffFileDumperTest.php index 1d7306266bf19..072b605d777c3 100644 --- a/src/Symfony/Component/Translation/Tests/Dumper/XliffFileDumperTest.php +++ b/src/Symfony/Component/Translation/Tests/Dumper/XliffFileDumperTest.php @@ -16,14 +16,7 @@ class XliffFileDumperTest extends \PHPUnit_Framework_TestCase { - private $tempDir; - - protected function setUp() - { - $this->tempDir = sys_get_temp_dir(); - } - - public function testDump() + public function testFormatCatalogue() { $catalogue = new MessageCatalogue('en_US'); $catalogue->add(array( @@ -35,17 +28,14 @@ public function testDump() $catalogue->setMetadata('key', array('notes' => array(array('content' => 'baz'), array('content' => 'qux')))); $dumper = new XliffFileDumper(); - $dumper->dump($catalogue, array('path' => $this->tempDir, 'default_locale' => 'fr_FR')); - $this->assertEquals( - file_get_contents(__DIR__.'/../fixtures/resources-clean.xlf'), - file_get_contents($this->tempDir.'/messages.en_US.xlf') + $this->assertStringEqualsFile( + __DIR__.'/../fixtures/resources-clean.xlf', + $dumper->formatCatalogue($catalogue, 'messages', array('default_locale' => 'fr_FR')) ); - - unlink($this->tempDir.'/messages.en_US.xlf'); } - public function testDumpXliff2() + public function testFormatCatalogueXliff2() { $catalogue = new MessageCatalogue('en_US'); $catalogue->add(array( @@ -56,20 +46,16 @@ public function testDumpXliff2() $catalogue->setMetadata('key', array('target-attributes' => array('order' => 1))); $dumper = new XliffFileDumper(); - $dumper->dump($catalogue, array('path' => $this->tempDir, 'default_locale' => 'fr_FR', 'xliff_version' => '2.0')); - $this->assertEquals( - file_get_contents(__DIR__.'/../fixtures/resources-2.0-clean.xlf'), - file_get_contents($this->tempDir.'/messages.en_US.xlf') + $this->assertStringEqualsFile( + __DIR__.'/../fixtures/resources-2.0-clean.xlf', + $dumper->formatCatalogue($catalogue, 'messages', array('default_locale' => 'fr_FR', 'xliff_version' => '2.0')) ); - - unlink($this->tempDir.'/messages.en_US.xlf'); } - public function testDumpWithCustomToolInfo() + public function testFormatCatalogueWithCustomToolInfo() { $options = array( - 'path' => $this->tempDir, 'default_locale' => 'en_US', 'tool_info' => array('tool-id' => 'foo', 'tool-name' => 'foo', 'tool-version' => '0.0', 'tool-company' => 'Foo'), ); @@ -78,17 +64,14 @@ public function testDumpWithCustomToolInfo() $catalogue->add(array('foo' => 'bar')); $dumper = new XliffFileDumper(); - $dumper->dump($catalogue, $options); - $this->assertEquals( - file_get_contents(__DIR__.'/../fixtures/resources-tool-info.xlf'), - file_get_contents($this->tempDir.'/messages.en_US.xlf') + $this->assertStringEqualsFile( + __DIR__.'/../fixtures/resources-tool-info.xlf', + $dumper->formatCatalogue($catalogue, 'messages', $options) ); - - unlink($this->tempDir.'/messages.en_US.xlf'); } - public function testDumpWithTargetAttributesMetadata() + public function testFormatCatalogueWithTargetAttributesMetadata() { $catalogue = new MessageCatalogue('en_US'); $catalogue->add(array( @@ -96,15 +79,11 @@ public function testDumpWithTargetAttributesMetadata() )); $catalogue->setMetadata('foo', array('target-attributes' => array('state' => 'needs-translation'))); - $this->tempDir = sys_get_temp_dir(); $dumper = new XliffFileDumper(); - $dumper->dump($catalogue, array('path' => $this->tempDir, 'default_locale' => 'fr_FR')); - $this->assertEquals( - file_get_contents(__DIR__.'/../fixtures/resources-target-attributes.xlf'), - file_get_contents($this->tempDir.'/messages.en_US.xlf') + $this->assertStringEqualsFile( + __DIR__.'/../fixtures/resources-target-attributes.xlf', + $dumper->formatCatalogue($catalogue, 'messages', array('default_locale' => 'fr_FR')) ); - - unlink($this->tempDir.'/messages.en_US.xlf'); } } diff --git a/src/Symfony/Component/Translation/Tests/Dumper/YamlFileDumperTest.php b/src/Symfony/Component/Translation/Tests/Dumper/YamlFileDumperTest.php index 161925cd23bf4..d6bb477185a06 100644 --- a/src/Symfony/Component/Translation/Tests/Dumper/YamlFileDumperTest.php +++ b/src/Symfony/Component/Translation/Tests/Dumper/YamlFileDumperTest.php @@ -16,7 +16,7 @@ class YamlFileDumperTest extends \PHPUnit_Framework_TestCase { - public function testTreeDump() + public function testTreeFormatCatalogue() { $catalogue = new MessageCatalogue('en'); $catalogue->add( @@ -25,16 +25,12 @@ public function testTreeDump() 'foo.bar2' => 'value2', )); - $tempDir = sys_get_temp_dir(); $dumper = new YamlFileDumper(); - $dumper->dump($catalogue, array('path' => $tempDir, 'as_tree' => true, 'inline' => 999)); - $this->assertEquals(file_get_contents(__DIR__.'/../fixtures/messages.yml'), file_get_contents($tempDir.'/messages.en.yml')); - - unlink($tempDir.'/messages.en.yml'); + $this->assertStringEqualsFile(__DIR__.'/../fixtures/messages.yml', $dumper->formatCatalogue($catalogue, 'messages', array('as_tree' => true, 'inline' => 999))); } - public function testLinearDump() + public function testLinearFormatCatalogue() { $catalogue = new MessageCatalogue('en'); $catalogue->add( @@ -43,12 +39,8 @@ public function testLinearDump() 'foo.bar2' => 'value2', )); - $tempDir = sys_get_temp_dir(); $dumper = new YamlFileDumper(); - $dumper->dump($catalogue, array('path' => $tempDir)); - - $this->assertEquals(file_get_contents(__DIR__.'/../fixtures/messages_linear.yml'), file_get_contents($tempDir.'/messages.en.yml')); - unlink($tempDir.'/messages.en.yml'); + $this->assertStringEqualsFile(__DIR__.'/../fixtures/messages_linear.yml', $dumper->formatCatalogue($catalogue, 'messages')); } } pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy