Skip to content

Commit b45a10a

Browse files
xabbuhxabbuh
committed
Merge branch '7.0' into 7.1
* 7.0: fix tests
2 parents c468b5f + 212a8e1 commit b45a10a

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

‎src/Symfony/Component/Translation/Bridge/Crowdin/Tests/CrowdinProviderTest.php‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public function testCompleteWriteProcessAddFiles()
7575
<tool tool-id="symfony" tool-name="Symfony"/>
7676
</header>
7777
<body>
78-
<trans-unit id="qW_vcFr" resname="a">
78+
<trans-unit id="%s" resname="a">
7979
<source>a</source>
8080
<target>trans_en_a</target>
8181
</trans-unit>
@@ -93,7 +93,7 @@ public function testCompleteWriteProcessAddFiles()
9393
<tool tool-id="symfony" tool-name="Symfony"/>
9494
</header>
9595
<body>
96-
<trans-unit id="9dF75ai" resname="post.num_comments">
96+
<trans-unit id="%s" resname="post.num_comments">
9797
<source>post.num_comments</source>
9898
<target>{count, plural, one {# comment} other {# comments}}</target>
9999
</trans-unit>
@@ -116,7 +116,7 @@ public function testCompleteWriteProcessAddFiles()
116116
$this->assertSame('https://api.crowdin.com/api/v2/storages', $url);
117117
$this->assertSame('Content-Type: application/octet-stream', $options['normalized_headers']['content-type'][0]);
118118
$this->assertSame('Crowdin-API-FileName: messages.xlf', $options['normalized_headers']['crowdin-api-filename'][0]);
119-
$this->assertSame($expectedMessagesFileContent, $options['body']);
119+
$this->assertStringMatchesFormat($expectedMessagesFileContent, $options['body']);
120120

121121
return new JsonMockResponse(['data' => ['id' => 19]], ['http_code' => 201]);
122122
},
@@ -132,7 +132,7 @@ public function testCompleteWriteProcessAddFiles()
132132
$this->assertSame('https://api.crowdin.com/api/v2/storages', $url);
133133
$this->assertSame('Content-Type: application/octet-stream', $options['normalized_headers']['content-type'][0]);
134134
$this->assertSame('Crowdin-API-FileName: validators.xlf', $options['normalized_headers']['crowdin-api-filename'][0]);
135-
$this->assertSame($expectedValidatorsFileContent, $options['body']);
135+
$this->assertStringMatchesFormat($expectedValidatorsFileContent, $options['body']);
136136

137137
return new JsonMockResponse(['data' => ['id' => 19]], ['http_code' => 201]);
138138
},
@@ -171,7 +171,7 @@ public function testWriteAddFileServerError()
171171
<tool tool-id="symfony" tool-name="Symfony"/>
172172
</header>
173173
<body>
174-
<trans-unit id="qW_vcFr" resname="a">
174+
<trans-unit id="%s" resname="a">
175175
<source>a</source>
176176
<target>trans_en_a</target>
177177
</trans-unit>
@@ -194,7 +194,7 @@ public function testWriteAddFileServerError()
194194
$this->assertSame('https://api.crowdin.com/api/v2/storages', $url);
195195
$this->assertSame('Content-Type: application/octet-stream', $options['normalized_headers']['content-type'][0]);
196196
$this->assertSame('Crowdin-API-FileName: messages.xlf', $options['normalized_headers']['crowdin-api-filename'][0]);
197-
$this->assertSame($expectedMessagesFileContent, $options['body']);
197+
$this->assertStringMatchesFormat($expectedMessagesFileContent, $options['body']);
198198

199199
return new JsonMockResponse(['data' => ['id' => 19]], ['http_code' => 201]);
200200
},
@@ -236,7 +236,7 @@ public function testWriteUpdateFileServerError()
236236
<tool tool-id="symfony" tool-name="Symfony"/>
237237
</header>
238238
<body>
239-
<trans-unit id="qW_vcFr" resname="a">
239+
<trans-unit id="%s" resname="a">
240240
<source>a</source>
241241
<target>trans_en_a</target>
242242
</trans-unit>
@@ -266,7 +266,7 @@ public function testWriteUpdateFileServerError()
266266
$this->assertSame('https://api.crowdin.com/api/v2/storages', $url);
267267
$this->assertSame('Content-Type: application/octet-stream', $options['normalized_headers']['content-type'][0]);
268268
$this->assertSame('Crowdin-API-FileName: messages.xlf', $options['normalized_headers']['crowdin-api-filename'][0]);
269-
$this->assertSame($expectedMessagesFileContent, $options['body']);
269+
$this->assertStringMatchesFormat($expectedMessagesFileContent, $options['body']);
270270

271271
return new JsonMockResponse(['data' => ['id' => 19]], ['http_code' => 201]);
272272
},
@@ -308,7 +308,7 @@ public function testWriteUploadTranslationsServerError()
308308
<tool tool-id="symfony" tool-name="Symfony"/>
309309
</header>
310310
<body>
311-
<trans-unit id="qW_vcFr" resname="a">
311+
<trans-unit id="%s" resname="a">
312312
<source>a</source>
313313
<target>trans_fr_a</target>
314314
</trans-unit>
@@ -326,7 +326,7 @@ public function testWriteUploadTranslationsServerError()
326326
<tool tool-id="symfony" tool-name="Symfony"/>
327327
</header>
328328
<body>
329-
<trans-unit id="qW_vcFr" resname="a">
329+
<trans-unit id="%s" resname="a">
330330
<source>a</source>
331331
<target>trans_en_a</target>
332332
</trans-unit>
@@ -355,7 +355,7 @@ public function testWriteUploadTranslationsServerError()
355355
$this->assertSame('https://api.crowdin.com/api/v2/storages', $url);
356356
$this->assertSame('Content-Type: application/octet-stream', $options['normalized_headers']['content-type'][0]);
357357
$this->assertSame('Crowdin-API-FileName: messages.xlf', $options['normalized_headers']['crowdin-api-filename'][0]);
358-
$this->assertSame($expectedMessagesFileContent, $options['body']);
358+
$this->assertStringMatchesFormat($expectedMessagesFileContent, $options['body']);
359359

360360
return new JsonMockResponse(['data' => ['id' => 19]], ['http_code' => 201]);
361361
},
@@ -371,7 +371,7 @@ public function testWriteUploadTranslationsServerError()
371371
$this->assertSame('https://api.crowdin.com/api/v2/storages', $url);
372372
$this->assertSame('Content-Type: application/octet-stream', $options['normalized_headers']['content-type'][0]);
373373
$this->assertSame('Crowdin-API-FileName: messages.xlf', $options['normalized_headers']['crowdin-api-filename'][0]);
374-
$this->assertSame($expectedMessagesTranslationsContent, $options['body']);
374+
$this->assertStringMatchesFormat($expectedMessagesTranslationsContent, $options['body']);
375375

376376
return new JsonMockResponse(['data' => ['id' => 19]], ['http_code' => 201]);
377377
},
@@ -415,11 +415,11 @@ public function testCompleteWriteProcessUpdateFiles()
415415
<tool tool-id="symfony" tool-name="Symfony"/>
416416
</header>
417417
<body>
418-
<trans-unit id="qW_vcFr" resname="a">
418+
<trans-unit id="%s" resname="a">
419419
<source>a</source>
420420
<target>trans_en_a</target>
421421
</trans-unit>
422-
<trans-unit id="SyIS4xr" resname="b">
422+
<trans-unit id="%s" resname="b">
423423
<source>b</source>
424424
<target>trans_en_b</target>
425425
</trans-unit>
@@ -448,7 +448,7 @@ public function testCompleteWriteProcessUpdateFiles()
448448
$this->assertSame('https://api.crowdin.com/api/v2/storages', $url);
449449
$this->assertSame('Content-Type: application/octet-stream', $options['normalized_headers']['content-type'][0]);
450450
$this->assertSame('Crowdin-API-FileName: messages.xlf', $options['normalized_headers']['crowdin-api-filename'][0]);
451-
$this->assertSame($expectedMessagesFileContent, $options['body']);
451+
$this->assertStringMatchesFormat($expectedMessagesFileContent, $options['body']);
452452

453453
return new JsonMockResponse(['data' => ['id' => 19]], ['http_code' => 201]);
454454
},
@@ -489,7 +489,7 @@ public function testCompleteWriteProcessAddFileAndUploadTranslations(TranslatorB
489489
<tool tool-id="symfony" tool-name="Symfony"/>
490490
</header>
491491
<body>
492-
<trans-unit id="qW_vcFr" resname="a">
492+
<trans-unit id="%s" resname="a">
493493
<source>a</source>
494494
<target>trans_en_a</target>
495495
</trans-unit>
@@ -518,7 +518,7 @@ public function testCompleteWriteProcessAddFileAndUploadTranslations(TranslatorB
518518
$this->assertSame('https://api.crowdin.com/api/v2/storages', $url);
519519
$this->assertSame('Content-Type: application/octet-stream', $options['normalized_headers']['content-type'][0]);
520520
$this->assertSame('Crowdin-API-FileName: messages.xlf', $options['normalized_headers']['crowdin-api-filename'][0]);
521-
$this->assertSame($expectedMessagesFileContent, $options['body']);
521+
$this->assertStringMatchesFormat($expectedMessagesFileContent, $options['body']);
522522

523523
return new JsonMockResponse(['data' => ['id' => 19]], ['http_code' => 201]);
524524
},
@@ -534,7 +534,7 @@ public function testCompleteWriteProcessAddFileAndUploadTranslations(TranslatorB
534534
$this->assertSame('https://api.crowdin.com/api/v2/storages', $url);
535535
$this->assertSame('Content-Type: application/octet-stream', $options['normalized_headers']['content-type'][0]);
536536
$this->assertSame('Crowdin-API-FileName: messages.xlf', $options['normalized_headers']['crowdin-api-filename'][0]);
537-
$this->assertSame($expectedMessagesTranslationsContent, $options['body']);
537+
$this->assertStringMatchesFormat($expectedMessagesTranslationsContent, $options['body']);
538538

539539
return new JsonMockResponse(['data' => ['id' => 19]], ['http_code' => 201]);
540540
},
@@ -575,7 +575,7 @@ public static function getResponsesForProcessAddFileAndUploadTranslations(): \Ge
575575
<tool tool-id="symfony" tool-name="Symfony"/>
576576
</header>
577577
<body>
578-
<trans-unit id="qW_vcFr" resname="a">
578+
<trans-unit id="%s" resname="a">
579579
<source>a</source>
580580
<target>trans_fr_a</target>
581581
</trans-unit>
@@ -602,7 +602,7 @@ public static function getResponsesForProcessAddFileAndUploadTranslations(): \Ge
602602
<tool tool-id="symfony" tool-name="Symfony"/>
603603
</header>
604604
<body>
605-
<trans-unit id="qW_vcFr" resname="a">
605+
<trans-unit id="%s" resname="a">
606606
<source>a</source>
607607
<target>trans_en_gb_a</target>
608608
</trans-unit>

‎src/Symfony/Component/Translation/Bridge/Phrase/Tests/PhraseProviderTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ public function testWrite(string $locale, string $localeId, string $domain, stri
693693
}
694694

695695
if (str_starts_with($part, '<?xml')) {
696-
$this->assertSame($content, $part);
696+
$this->assertStringMatchesFormat($content, $part);
697697
$testedContent = true;
698698
}
699699

@@ -797,11 +797,11 @@ public function writeProvider(): \Generator
797797
<tool tool-id="symfony" tool-name="Symfony"/>
798798
</header>
799799
<body>
800-
<trans-unit id="YQ5EBNy" resname="general.back">
800+
<trans-unit id="%s" resname="general.back">
801801
<source>general.back</source>
802802
<target><![CDATA[back &!]]></target>
803803
</trans-unit>
804-
<trans-unit id="QoyA.iN" resname="general.cancel">
804+
<trans-unit id="%s" resname="general.cancel">
805805
<source>general.cancel</source>
806806
<target>Cancel</target>
807807
</trans-unit>
@@ -837,11 +837,11 @@ public function writeProvider(): \Generator
837837
<tool tool-id="symfony" tool-name="Symfony"/>
838838
</header>
839839
<body>
840-
<trans-unit id="YQ5EBNy" resname="general.back">
840+
<trans-unit id="%s" resname="general.back">
841841
<source>general.back</source>
842842
<target>zurück</target>
843843
</trans-unit>
844-
<trans-unit id="QoyA.iN" resname="general.cancel">
844+
<trans-unit id="%s" resname="general.cancel">
845845
<source>general.cancel</source>
846846
<target>Abbrechen</target>
847847
</trans-unit>

0 commit comments

Comments
 (0)