Skip to content

Commit b4941a3

Browse files
Merge branch '4.1'
* 4.1: [HttpKernel] fix PHP 5.4 compat Fix surrogate not using original request [Finder] Update RealIteratorTestCase [Routing] remove unneeded dev dep on doctrine/common [minor] SCA [Validator] Remove BOM in some xlf files Ensure updateTimestamp returns a boolean Fix #27378: Error when rendering a DateIntervalType form with exactly 0 weeks [HttpKernel] fix session tracking in surrogate master requests
2 parents 38f17f7 + 426cf62 commit b4941a3

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

Data/Generator/LanguageDataGenerator.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,7 @@ protected function generateDataForMeta(BundleReaderInterface $reader, $tempDir)
157157
return array(
158158
'Version' => $rootBundle['Version'],
159159
'Languages' => $this->languageCodes,
160-
'Aliases' => array_map(function (\ResourceBundle $bundle) {
161-
return $bundle['replacement'];
162-
}, iterator_to_array($metadataBundle['alias']['language'])),
160+
'Aliases' => array_column(iterator_to_array($metadataBundle['alias']['language']), 'replacement'),
163161
'Alpha2ToAlpha3' => $this->generateAlpha2ToAlpha3Mapping($metadataBundle),
164162
);
165163
}

0 commit comments

Comments
 (0)