Skip to content

Commit 35a5449

Browse files
nicolas-grekasnicolas-grekas
committed
minor #61372 chore: PHP CS Fixer - update heredoc handling (keradus)
This PR was merged into the 7.4 branch. Discussion ---------- chore: PHP CS Fixer - update heredoc handling | Q | A | ------------- | --- | Branch? | 7.4 | Bug fix? | no | New feature? | no <!-- please update src/**/CHANGELOG.md files --> | Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files --> | Issues | Fix CS <!-- prefix each issue number with "Fix #", no need to create an issue if none exists, explain below instead --> | License | MIT Inspired while #61371 , but can be merged separately. ``@PHPxMigration`` and ``@Symfony`` ruleset have different config for those rules. I assume the difference is coming from supporting pre-7.2 PHP version earlier in the codebase, where heredoc closure and trailing comma had to be on separated lines - but it's no longer the case. Can we benefit from newer PHP syntax and incorporate those changes? (yes, `trailing_comma_in_multiline`, part of ``@Symfony``, is already having this enabled!) if so, i will also merge them into ``@Symfony`` ruleset itself afterwards. with love by [PHP Coding Standards Fixer](https://cs.symfony.com/) Commits ------- f9956227bb6 chore: PHP CS Fixer - update heredoc handling
2 parents c008adc + 7e0002a commit 35a5449

File tree

3 files changed

+74
-44
lines changed

3 files changed

+74
-44
lines changed

‎Tests/Command/TranslationLintCommandTest.php‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,9 @@ public function testLintMalformedIcuTranslations()
104104
en messages No
105105
fr messages No
106106
-------- ---------- --------
107-
EOF, $display);
107+
EOF,
108+
$display
109+
);
108110
$this->assertStringContainsString(\sprintf(<<<EOF
109111
Errors for locale "en" and domain "messages"
110112
--------------------------------------------
@@ -113,7 +115,9 @@ public function testLintMalformedIcuTranslations()
113115
114116
[ERROR] Invalid message format (error #65807): %s: message formatter creation failed:
115117
U_DEFAULT_KEYWORD_MISSING
116-
EOF, \PHP_VERSION_ID >= 80500 ? 'MessageFormatter::__construct()' : 'msgfmt_create'), $display);
118+
EOF,
119+
\PHP_VERSION_ID >= 80500 ? 'MessageFormatter::__construct()' : 'msgfmt_create'
120+
), $display);
117121

118122
if (\PHP_VERSION_ID >= 80500) {
119123
$this->assertStringContainsString(<<<EOF
@@ -129,7 +133,9 @@ public function testLintMalformedIcuTranslations()
129133
130134
[ERROR] Invalid message format (error #65807): MessageFormatter::__construct(): message formatter creation failed:
131135
U_DEFAULT_KEYWORD_MISSING
132-
EOF, $display);
136+
EOF,
137+
$display
138+
);
133139
} else {
134140
$this->assertStringContainsString(<<<EOF
135141
Errors for locale "fr" and domain "messages"
@@ -144,7 +150,9 @@ public function testLintMalformedIcuTranslations()
144150
145151
[ERROR] Invalid message format (error #65807): msgfmt_create: message formatter creation failed:
146152
U_DEFAULT_KEYWORD_MISSING
147-
EOF, $display);
153+
EOF,
154+
$display
155+
);
148156
}
149157
}
150158

‎Tests/Command/TranslationPullCommandTest.php‎

Lines changed: 60 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,9 @@ public function testPullNewXlf12Messages()
106106
</body>
107107
</file>
108108
</xliff>
109-
XLIFF
110-
, file_get_contents($filenameEn));
109+
XLIFF,
110+
file_get_contents($filenameEn)
111+
);
111112
$this->assertXmlStringEqualsXmlString(<<<XLIFF
112113
<?xml version="1.0"?>
113114
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
@@ -123,8 +124,9 @@ public function testPullNewXlf12Messages()
123124
</body>
124125
</file>
125126
</xliff>
126-
XLIFF
127-
, file_get_contents($filenameEnIcu));
127+
XLIFF,
128+
file_get_contents($filenameEnIcu)
129+
);
128130
$this->assertXmlStringEqualsXmlString(<<<XLIFF
129131
<?xml version="1.0"?>
130132
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
@@ -144,8 +146,9 @@ public function testPullNewXlf12Messages()
144146
</body>
145147
</file>
146148
</xliff>
147-
XLIFF
148-
, file_get_contents($filenameFr));
149+
XLIFF,
150+
file_get_contents($filenameFr)
151+
);
149152
$this->assertXmlStringEqualsXmlString(<<<XLIFF
150153
<?xml version="1.0"?>
151154
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
@@ -161,8 +164,9 @@ public function testPullNewXlf12Messages()
161164
</body>
162165
</file>
163166
</xliff>
164-
XLIFF
165-
, file_get_contents($filenameFrIcu));
167+
XLIFF,
168+
file_get_contents($filenameFrIcu)
169+
);
166170
}
167171

168172
public function testPullNewXlf20Messages()
@@ -215,8 +219,9 @@ public function testPullNewXlf20Messages()
215219
</unit>
216220
</file>
217221
</xliff>
218-
XLIFF
219-
, file_get_contents($filenameEn));
222+
XLIFF,
223+
file_get_contents($filenameEn)
224+
);
220225
$this->assertXmlStringEqualsXmlString(<<<XLIFF
221226
<?xml version="1.0" encoding="utf-8"?>
222227
<xliff xmlns="urn:oasis:names:tc:xliff:document:2.0" version="2.0" srcLang="en" trgLang="fr">
@@ -235,8 +240,9 @@ public function testPullNewXlf20Messages()
235240
</unit>
236241
</file>
237242
</xliff>
238-
XLIFF
239-
, file_get_contents($filenameFr));
243+
XLIFF,
244+
file_get_contents($filenameFr)
245+
);
240246
}
241247

242248
public function testPullNewYamlMessagesAsInlined()
@@ -275,12 +281,16 @@ public function testPullNewYamlMessagesAsInlined()
275281
new.foo: newFoo
276282
note: NOTE
277283
278-
YAML, file_get_contents($filenameEn));
284+
YAML,
285+
file_get_contents($filenameEn)
286+
);
279287
$this->assertEquals(<<<YAML
280288
new.foo: nouveauFoo
281289
note: NOTE
282290
283-
YAML, file_get_contents($filenameFr));
291+
YAML,
292+
file_get_contents($filenameFr)
293+
);
284294
}
285295

286296
public function testPullNewYamlMessagesAsTree()
@@ -320,13 +330,17 @@ public function testPullNewYamlMessagesAsTree()
320330
foo: newFoo
321331
note: NOTE
322332
323-
YAML, file_get_contents($filenameEn));
333+
YAML,
334+
file_get_contents($filenameEn)
335+
);
324336
$this->assertEquals(<<<YAML
325337
new:
326338
foo: nouveauFoo
327339
note: NOTE
328340
329-
YAML, file_get_contents($filenameFr));
341+
YAML,
342+
file_get_contents($filenameFr)
343+
);
330344
}
331345

332346
public function testPullForceMessages()
@@ -390,8 +404,9 @@ public function testPullForceMessages()
390404
</body>
391405
</file>
392406
</xliff>
393-
XLIFF
394-
, file_get_contents($filenameMessagesEn));
407+
XLIFF,
408+
file_get_contents($filenameMessagesEn)
409+
);
395410
$this->assertXmlStringEqualsXmlString(<<<XLIFF
396411
<?xml version="1.0"?>
397412
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
@@ -411,8 +426,9 @@ public function testPullForceMessages()
411426
</body>
412427
</file>
413428
</xliff>
414-
XLIFF
415-
, file_get_contents($filenameMessagesFr));
429+
XLIFF,
430+
file_get_contents($filenameMessagesFr)
431+
);
416432

417433
$this->assertXmlStringEqualsXmlString(<<<XLIFF
418434
<?xml version="1.0"?>
@@ -433,8 +449,9 @@ public function testPullForceMessages()
433449
</body>
434450
</file>
435451
</xliff>
436-
XLIFF
437-
, file_get_contents($filenameValidatorsEn));
452+
XLIFF,
453+
file_get_contents($filenameValidatorsEn)
454+
);
438455
$this->assertXmlStringEqualsXmlString(<<<XLIFF
439456
<?xml version="1.0"?>
440457
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
@@ -454,8 +471,9 @@ public function testPullForceMessages()
454471
</body>
455472
</file>
456473
</xliff>
457-
XLIFF
458-
, file_get_contents($filenameValidatorsFr));
474+
XLIFF,
475+
file_get_contents($filenameValidatorsFr)
476+
);
459477
}
460478

461479
#[RequiresPhpExtension('intl')]
@@ -511,8 +529,9 @@ public function testPullForceIntlIcuMessages()
511529
</body>
512530
</file>
513531
</xliff>
514-
XLIFF
515-
, file_get_contents($filenameEn));
532+
XLIFF,
533+
file_get_contents($filenameEn)
534+
);
516535
$this->assertXmlStringEqualsXmlString(<<<XLIFF
517536
<?xml version="1.0"?>
518537
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
@@ -532,8 +551,9 @@ public function testPullForceIntlIcuMessages()
532551
</body>
533552
</file>
534553
</xliff>
535-
XLIFF
536-
, file_get_contents($filenameFr));
554+
XLIFF,
555+
file_get_contents($filenameFr)
556+
);
537557
}
538558

539559
public function testPullMessagesWithDefaultLocale()
@@ -587,8 +607,9 @@ public function testPullMessagesWithDefaultLocale()
587607
</body>
588608
</file>
589609
</xliff>
590-
XLIFF
591-
, file_get_contents($filenameEn));
610+
XLIFF,
611+
file_get_contents($filenameEn)
612+
);
592613
$this->assertXmlStringEqualsXmlString(<<<XLIFF
593614
<?xml version="1.0"?>
594615
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
@@ -608,8 +629,9 @@ public function testPullMessagesWithDefaultLocale()
608629
</body>
609630
</file>
610631
</xliff>
611-
XLIFF
612-
, file_get_contents($filenameFr));
632+
XLIFF,
633+
file_get_contents($filenameFr)
634+
);
613635
}
614636

615637
public function testPullMessagesMultipleDomains()
@@ -664,8 +686,9 @@ public function testPullMessagesMultipleDomains()
664686
</body>
665687
</file>
666688
</xliff>
667-
XLIFF
668-
, file_get_contents($filenameMessages));
689+
XLIFF,
690+
file_get_contents($filenameMessages)
691+
);
669692
$this->assertXmlStringEqualsXmlString(<<<XLIFF
670693
<?xml version="1.0"?>
671694
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
@@ -685,8 +708,9 @@ public function testPullMessagesMultipleDomains()
685708
</body>
686709
</file>
687710
</xliff>
688-
XLIFF
689-
, file_get_contents($filenameDomain));
711+
XLIFF,
712+
file_get_contents($filenameDomain)
713+
);
690714
}
691715

692716
#[DataProvider('provideCompletionSuggestions')]

‎Translator.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,7 @@ private function dumpCatalogue(string $locale, ConfigCacheInterface $cache): voi
316316
%s
317317
return \$catalogue;
318318
319-
EOF
320-
,
319+
EOF,
321320
$locale,
322321
var_export($this->getAllMessages($this->catalogues[$locale]), true),
323322
$fallbackContent
@@ -341,8 +340,7 @@ private function getFallbackContent(MessageCatalogue $catalogue): string
341340
$catalogue%s = new MessageCatalogue('%s', %s);
342341
$catalogue%s->addFallbackCatalogue($catalogue%s);
343342

344-
EOF
345-
,
343+
EOF,
346344
$fallbackSuffix,
347345
$fallback,
348346
var_export($this->getAllMessages($fallbackCatalogue), true),

0 commit comments

Comments
 (0)