Skip to content

Commit

Permalink
Merge branch '6.4' into 7.1
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
xabbuh committed Oct 9, 2024
2 parents 1175ffa + 6375b48 commit c65630c
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions Data/Generator/LanguageDataGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,11 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, str
$localizedNames[$language] = $name;
}
}
$data = [

return [
'Names' => $names,
'LocalizedNames' => $localizedNames,
];

return $data;
}

return null;
Expand Down

0 comments on commit c65630c

Please sign in to comment.