Skip to content

Commit f17128e

Browse files
committed
Merge branch '4.2' into 4.3
* 4.2: fixed CS fixed CS [HttpKernel] Remove TestEventDispatcher.
2 parents 690c0a1 + 9279727 commit f17128e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Data/Generator/LocaleDataGenerator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ protected function compileTemporaryBundles(BundleCompilerInterface $compiler, $s
6565
protected function preGenerate()
6666
{
6767
// Write parents locale file for the Translation component
68-
\file_put_contents(
68+
file_put_contents(
6969
__DIR__.'/../../../Translation/Resources/data/parents.json',
70-
\json_encode($this->localeParents, \JSON_PRETTY_PRINT).\PHP_EOL
70+
json_encode($this->localeParents, \JSON_PRETTY_PRINT).\PHP_EOL
7171
);
7272
}
7373

Data/Util/LocaleScanner.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ public function scanParents(string $sourceDir): array
9292
$fallbacks = [];
9393

9494
foreach ($locales as $locale) {
95-
$content = \file_get_contents($sourceDir.'/'.$locale.'.txt');
95+
$content = file_get_contents($sourceDir.'/'.$locale.'.txt');
9696

9797
// Aliases contain the text "%%PARENT" followed by the aliased locale
98-
if (\preg_match('/%%Parent{"([^"]+)"}/', $content, $matches)) {
98+
if (preg_match('/%%Parent{"([^"]+)"}/', $content, $matches)) {
9999
$fallbacks[$locale] = $matches[1];
100100
}
101101
}

0 commit comments

Comments
 (0)