Skip to content

Commit c65630c

Browse files
committed
Merge branch '6.4' into 7.1
* 6.4: [Form] Remove unnecessary imports minor #58472 CS: clean some whitespaces/indentation (keradus) Fix newline harden test to not depend on the system's configured default timezone [Form] Support intl.use_exceptions/error_level in NumberToLocalizedStringTransformer [Doctrine][Messenger] Use common sequence name to get id from Oracle [ExpressionLanguage] Add missing test case for `Lexer` [FrameworkBundle] Fix passing request_stack to session.listener ensure session storages are opened in tests before destroying them [Serializer] Fix `ObjectNormalizer` gives warnings on normalizing with public static property [HttpKernel] Correctly merge `max-age`/`s-maxage` and `Expires` headers [Security][Validator] Check translations for Czech [Security] Fix serialized object representation in tests [DoctrineBridge] Fix risky test warnings [Serializer] Catch `NotNormalizableValueException` for variadic parameters
2 parents 1175ffa + 6375b48 commit c65630c

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

Data/Generator/LanguageDataGenerator.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,11 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, str
130130
$localizedNames[$language] = $name;
131131
}
132132
}
133-
$data = [
133+
134+
return [
134135
'Names' => $names,
135136
'LocalizedNames' => $localizedNames,
136137
];
137-
138-
return $data;
139138
}
140139

141140
return null;

0 commit comments

Comments
 (0)