8000 Remove newly added XliffRawLoader and merge it with XliffFileLoader · symfony/symfony@a97bd14 · GitHub
[go: up one dir, main page]
Skip to content

Commit a97bd14

Browse files
welcoMatticwelcoMattic
committed
Remove newly added XliffRawLoader and merge it with XliffFileLoader
1 parent b9a0e5e commit a97bd14

File tree

8 files changed

+105
-280
lines changed

8 files changed

+105
-280
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
use Symfony\Component\Translation\Loader\PoFileLoader;
3939
use Symfony\Component\Translation\Loader\QtFileLoader;
4040
use Symfony\Component\Translation\Loader\XliffFileLoader;
41-
use Symfony\Component\Translation\Loader\XliffRawLoader;
4241
use Symfony\Component\Translation\Loader\YamlFileLoader;
4342
use Symfony\Component\Translation\LoggingTranslator;
4443
use Symfony\Component\Translation\Provider\ProvidersFactory;
@@ -87,9 +86,6 @@
8786
->set('translation.loader.xliff', XliffFileLoader::class)
8887
->tag('translation.loader', ['alias' => 'xlf', 'legacy-alias' => 'xliff'])
8988

90-
->set('translation.loader.xliff_raw', XliffRawLoader::class)
91-
->tag('translation.loader', ['alias' => 'xlf_raw'])
92-
9389
->set('translation.loader.po', PoFileLoader::class)
9490
->tag('translation.loader', ['alias' => 'po'])
9591

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/translation_providers.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,28 +29,28 @@
2929

3030
->set('translation.provider_factory.null', NullProviderFactory::class)
3131
->args([
32-
service('translation.loader.xliff_raw'),
32+
service('translation.loader.xliff'),
3333
])
3434
->parent('translation.provider_factory.abstract')
3535
->tag('translation.provider_factory')
3636

3737
->set('translation.provider_factory.loco', LocoProviderFactory::class)
3838
->args([
39-
service('translation.loader.xliff_raw'),
39+
service('translation.loader.xliff'),
4040
])
4141
->parent('translation.provider_factory.abstract')
4242
->tag('translation.provider_factory')
4343

4444
->set('translation.provider_factory.poeditor', PoEditorProviderFactory::class)
4545
->args([
46-
service('translation.loader.xliff_raw'),
46+
service('translation.loader.xliff'),
4747
])
4848
->parent('translation.provider_factory.abstract')
4949
->tag('translation.provider_factory')
5050

5151
->set('translation.provider_factory.lokalise', LokaliseProviderFactory::class)
5252
->args([
53-
service('translation.loader.xliff_raw'),
53+
service('translation.loader.xliff'),
5454
])
5555
->parent('translation.provider_factory.abstract')
5656
->tag('translation.provider_factory')

‎src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationPullCommandTest.php

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ class TranslationPullCommandTest extends TestCase
2929
private $fs;
3030
private $translationDir;
3131

32+
public function testPullNewMessages()
33+
{
34+
$this->markTestIncomplete();
35+
}
36+
3237
protected function setUp(): void
3338
{
3439
$this->fs = new Filesystem();
@@ -49,7 +54,7 @@ private function createCommandTester($extractedMessages = [], $loadedMessages =
4954
{
5055
$this->markTestIncomplete();
5156

52-
$translator = $this->getMockBuilder('Symfony\Component\Translation\Translator')
57+
$translator = $this->getMockBuilder(\Symfony\Component\Translation\Translator::class)
5358
->disableOriginalConstructor()
5459
->getMock();
5560

@@ -58,7 +63,7 @@ private function createCommandTester($extractedMessages = [], $loadedMessages =
5863
->method('getFallbackLocales')
5964
->willReturn(['en']);
6065

61-
$loader = $this->getMockBuilder('Symfony\Component\Translation\Reader\TranslationReader')->getMock();
66+
$loader = $this->getMockBuilder(\Symfony\Component\Translation\Reader\TranslationReader::class)->getMock();
6267
$loader
6368
->expects($this->any())
6469
->method('read')
@@ -68,15 +73,15 @@ function ($path, $catalogue) use ($loadedMessages) {
6873
}
6974
);
7075

71-
$writer = $this->getMockBuilder('Symfony\Component\Translation\Writer\TranslationWriter')->getMock();
76+
$writer = $this->getMockBuilder(\Symfony\Component\Translation\Writer\TranslationWriter::class)->getMock();
7277
$writer
7378
->expects($this->any())
7479
->method('getFormats')
7580
->willReturn(
7681
['xlf', 'yml', 'yaml']
7782
);
7883

79-
$providers = $this->getMockBuilder('Symfony\Component\Translation\Provider\TranslationProviders')->getMock();
84+
$providers = $this->getMockBuilder(\Symfony\Component\Translation\Provider\TranslationProviders::class)->getMock();
8085
$providers
8186
->expects($this->any())
8287
->method('keys')
@@ -89,7 +94,7 @@ function ($path, $catalogue) use ($loadedMessages) {
8994
['foo', $this->getBundle($this->translationDir)],
9095
['test', $this->getBundle('test')],
9196
];
92-
$kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
97+
$kernel = $this->getMockBuilder(\Symfony\Component\HttpKernel\KernelInterface::class)->getMock();
9398
$kernel
9499
->expects($this->any())
95100
->method('getBundle')
@@ -117,7 +122,7 @@ function ($path, $catalogue) use ($loadedMessages) {
117122

118123
private function getBundle($path)
119124
{
120-
$bundle = $this->getMockBuilder('Symfony\Component\HttpKernel\Bundle\BundleInterface')->getMock();
125+
$bundle = $this->getMockBuilder(\Symfony\Component\HttpKernel\Bundle\BundleInterface::class)->getMock();
121126
$bundle
122127
->expects($this->any())
123128
->method('getPath')

‎src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationPushCommandTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public function testPushNewMessages($providers)
5858
public function providersProvider(): \Generator
5959
{
6060
yield [
61-
['loco' => $this->getMockBuilder('Symfony\Component\Translation\Bridge\Loco\LocoProvider')->disableOriginalConstructor()->getMock()],
61+
['loco' => $this->getMockBuilder(\Symfony\Component\Translation\Bridge\Loco\LocoProvider::class)->disableOriginalConstructor()->getMock()],
6262
];
6363
}
6464

@@ -80,7 +80,7 @@ protected function tearDown(): void
8080
*/
8181
private function createCommandTester($providerMessages = [], $localMessages = [], array $providers = [], array $locales = [], array $domains = [], HttpKernel\KernelInterface $kernel = null, array $transPaths = [])
8282
{
83-
$translator = $this->getMockBuilder('Symfony\Component\Translation\Translator')
83+
$translator = $this->getMockBuilder(\Symfony\Component\Translation\Translator::class)
8484
->disableOriginalConstructor()
8585
->getMock();
8686

@@ -89,7 +89,7 @@ private function createCommandTester($providerMessages = [], $localMessages = []
8989
->method('getFallbackLocales')
9090
->willReturn(['en']);
9191

92-
$reader = $this->getMockBuilder('Symfony\Component\Translation\Reader\TranslationReader')->getMock();
92+
$reader = $this->getMockBuilder(\Symfony\Component\Translation\Reader\TranslationReader::class)->getMock();
9393
$reader
9494
->expects($this->any())
9595
->method('read')
@@ -99,15 +99,15 @@ function ($path, $catalogue) use ($localMessages) {
9999
}
100100
);
101101

102-
$writer = $this->getMockBuilder('Symfony\Component\Translation\Writer\TranslationWriter')->getMock();
102+
$writer = $this->getMockBuilder(\Symfony\Component\Translation\Writer\TranslationWriter::class)->getMock();
103103
$writer
104104
->expects($this->any())
105105
->method('getFormats')
106106
->willReturn(
107107
['xlf', 'yml', 'yaml']
108108
);
109109

110-
$providersMock = $this->getMockBuilder('Symfony\Component\Translation\Provider\TranslationProviders')
110+
$providersMock = $this->getMockBuilder(\Symfony\Component\Translation\Provider\TranslationProviders::class)
111111
->setConstructorArgs([$providers])
112112
->getMock();
113113

@@ -140,7 +140,7 @@ function (array $domains, array $locales) use ($providerMessages) {
140140
['foo', $this->getBundle($this->translationDir)],
141141
['test', $this->getBundle('test')],
142142
];
143-
$kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
143+
$kernel = $this->getMockBuilder(\Symfony\Component\HttpKernel\KernelInterface::class)->getMock();
144144
$kernel
145145
->expects($this->any())
146146
->method('getBundle')
@@ -168,7 +168,7 @@ function (array $domains, array $locales) use ($providerMessages) {
168168

169169
private function getBundle($path)
170170
{
171-
$bundle = $this->getMockBuilder('Symfony\Component\HttpKernel\Bundle\BundleInterface')->getMock();
171+
$bundle = $this->getMockBuilder(\Symfony\Component\HttpKernel\Bundle\BundleInterface::class)->getMock();
172172
$bundle
173173
->expects($this->any())
174174
->method('getPath')

‎src/Symfony/Component/Translation/Bridge/Loco/Tests/LocoProviderTest.php

Lines changed: 16 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use Symfony\Component\HttpClient\MockHttpClient;
88
use Symfony\Component\Translation\Bridge\Loco\Provider\LocoProvider;
99
use Symfony\Component\Translation\Loader\ArrayLoader;
10-
use Symfony\Component\Translation\Loader\XliffRawLoader;
10+
use Symfony\Component\Translation\Loader\XliffFileLoader;
1111
use Symfony\Component\Translation\MessageCatalogue;
1212
use Symfony\Component\Translation\TranslatorBag;
1313
use Symfony\Contracts\HttpClient\ResponseInterface;
@@ -184,7 +184,7 @@ public function testCompleteWriteProcess()
184184
'validators' => ['post.num_comments' => '{count, plural, one {# commentaire} other {# commentaires}}'],
185185
]));
186186

187-
$locoProvider = new LocoProvider('API_KEY', new MockHttpClient($responses), new XliffRawLoader(), $this->createMock(LoggerInterface::class), 'en');
187+
$locoProvider = new LocoProvider('API_KEY', new MockHttpClient($responses), new XliffFileLoader(), $this->createMock(LoggerInterface::class), 'en');
188188
$locoProvider->write($translatorBag);
189189
}
190190

@@ -209,7 +209,7 @@ public function testReadForOneLocaleAndOneDomain(string $locale, string $domain,
209209
return $response;
210210
});
211211

212-
$locoProvider = new LocoProvider('API_KEY', $httpClient, new XliffRawLoader(), $this->createMock(LoggerInterface::class), 'en');
212+
$locoProvider = new LocoProvider('API_KEY', $httpClient, new XliffFileLoader(), $this->createMock(LoggerInterface::class), 'en');
213213
$translatorBag = $locoProvider->read([$domain], [$locale]);
214214

215215
$arrayLoader = new ArrayLoader();
@@ -243,7 +243,7 @@ public function testReadForManyLocalesAndManyDomains(array $locales, array $doma
243243
return $response;
244244
});
245245

246-
$locoProvider = new LocoProvider('API_KEY', $httpClient, new XliffRawLoader(), $this->createMock(LoggerInterface::class), 'en');
246+
$locoProvider = new LocoProvider('API_KEY', $httpClient, new XliffFileLoader(), $this->createMock(LoggerInterface::class), 'en');
247247
$translatorBag = $locoProvider->read($domains, [$locale]);
248248

249249
$arrayLoader = new ArrayLoader();
@@ -276,19 +276,10 @@ public function getProviderData(): \Generator
276276

277277
public function getLocoResponsesForOneLocaleAndOneDomain(): \Generator
278278
{
279-
yield ['en', 'messages', <<& 10000 lt;XLIFF
279+
yield ['en', 'messages', <<<'XLIFF'
280280
<?xml version="1.0" encoding="UTF-8"?>
281-
<!--
282-
Loco xml export: XLIFF 1.2
283-
Project: symfony-translation-provider
284-
Release: Working copy
285-
Locale: en, English
286-
Tagged: messages
287-
Exported by: Firstname Lastname
288-
Exported at: Tue, 15 Dec 2020 17:10:28 +0100
289-
-->
290281
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
291-
<file original="https://localise.biz/welcomattic/symfony-translation-provider" source-language="en" datatype="database" tool-id="loco">
282+
<file original="https://localise.biz/user/symfony-translation-provider" source-language="en" datatype="database" tool-id="loco">
292283
<header>
293284
<tool tool-id="loco" tool-name="Loco" tool-version="1.0.25 20201211-1" tool-company="Loco"/>
294285
</header>
@@ -304,26 +295,18 @@ public function getLocoResponsesForOneLocaleAndOneDomain(): \Generator
304295
</body>
305296
</file>
306297
</xliff>
298+
307299
XLIFF,
308300
[
309301
'index.hello' => 'Hello',
310302
'index.greetings' => 'Welcome, {firstname}!',
311303
],
312304
];
313305

314-
yield ['fr', 'messages', <<<XLIFF
306+
yield ['fr', 'messages', <<<'XLIFF'
315307
<?xml version="1.0" encoding="UTF-8"?>
316-
<!--
317-
Loco xml export: XLIFF 1.2
318-
Project: symfony-translation-provider
319-
Release: Working copy
320-
Locale: fr, French
321-
Tagged: messages
322-
Exported by: Firstname Lastname
323-
Exported at: Tue, 15 Dec 2020 17:10:28 +0100
324-
-->
325308
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
326-
<file original="https://localise.biz/welcomattic/symfony-translation-provider" source-language="en" datatype="database" tool-id="loco">
309+
<file original="https://localise.biz/user/symfony-translation-provider" source-language="en" datatype="database" tool-id="loco">
327310
<header>
328311
<tool tool-id="loco" tool-name="Loco" tool-version="1.0.25 20201211-1" tool-company="Loco"/>
329312
</header>
@@ -339,6 +322,7 @@ public function getLocoResponsesForOneLocaleAndOneDomain(): \Generator
339322
</body>
340323
</file>
341324
</xliff>
325+
342326
XLIFF,
343327
[
344328
'index.hello' => 'Bonjour',
@@ -353,19 +337,10 @@ public function getLocoResponsesForManyLocalesAndManyDomains(): \Generator
353337
['en', 'fr'],
354338
['messages', 'validators'],
355339
[
356-
'en' => <<<XLIFF
340+
'en' => <<<'XLIFF'
357341
<?xml version="1.0" encoding="UTF-8"?>
358-
<!--
359-
Loco xml export: XLIFF 1.2
360-
Project: symfony-translation-provider
361-
Release: Working copy
362-
Locale: en, English
363-
Tagged: messages
364-
Exported by: Firstname Lastname
365-
Exported at: Tue, 15 Dec 2020 17:10:28 +0100
366-
-->
367342
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
368-
<file original="https://localise.biz/welcomattic/symfony-translation-provider" source-language="en" datatype="database" tool-id="loco">
343+
<file original="https://localise.biz/user/symfony-translation-provider" source-language="en" datatype="database" tool-id="loco">
369344
<header>
370345
<tool tool-id="loco" tool-name="Loco" tool-version="1.0.25 20201211-1" tool-company="Loco"/>
371346
</header>
@@ -381,20 +356,12 @@ public function getLocoResponsesForManyLocalesAndManyDomains(): \Generator
381356
</body>
382357
</file>
383358
</xliff>
359+
384360
XLIFF,
385-
'fr' => <<<XLIFF
361+
'fr' => <<<'XLIFF'
386362
<?xml version="1.0" encoding="UTF-8"?>
387-
<!--
388-
Loco xml export: XLIFF 1.2
389-
Project: symfony-translation-provider
390-
Release: Working copy
391-
Locale: fr, French
392-
Tagged: messages
393-
Exported by: Firstname Lastname
394-
Exported at: Tue, 15 Dec 2020 17:10:28 +0100
395-
-->
396363
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd">
397-
<file original="https://localise.biz/welcomattic/symfony-translation-provider" source-language="en" datatype="database" tool-id="loco">
364+
<file original="https://localise.biz/user/symfony-translation-provider" source-language="en" datatype="database" tool-id="loco">
398365
<header>
399366
<tool tool-id="loco" tool-name="Loco" tool-version="1.0.25 20201211-1" tool-company="Loco"/>
400367
</header>
@@ -410,6 +377,7 @@ public function getLocoResponsesForManyLocalesAndManyDomains(): \Generator
410377
</body>
411378
</file>
412379
</xliff>
380+
413381
XLIFF,
414382
],
415383
[

0 commit comments

Comments
 (0)
0