Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit 9aba21c2e8b2 · 2023-10-18T14:19:55.000+02:00
* 6.4:
  [Translator] Add argument `$buildDir` to `DataCollectorTranslator::warmUp()`
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -26,7 +26,7 @@
         "symfony/error-handler": "^6.4|^7.0",
         "symfony/event-dispatcher": "^6.4|^7.0",
         "symfony/http-foundation": "^6.4|^7.0",
-        "symfony/http-kernel": "^6.4",
+        "symfony/http-kernel": "^6.4|^7.0",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/filesystem": "^6.4|^7.0",
         "symfony/finder": "^6.4|^7.0",
diff --git a/src/Symfony/Component/Translation/CHANGELOG.md b/src/Symfony/Component/Translation/CHANGELOG.md
@@ -12,6 +12,7 @@ CHANGELOG
 
  * Give current locale to `LocaleSwitcher::runWithLocale()`'s callback
  * Add `--as-tree` option to `translation:pull` command to write YAML messages as a tree-like structure
+ * [BC BREAK] Add argument `$buildDir` to `DataCollectorTranslator::warmUp()`
 
 6.3
 ---
