[Translator] Add argument $buildDir to DataCollectorTranslator::warmUp()

nicolas-grekas · nicolas-grekas · commit d18bd278abf7 · 2023-10-18T13:40:39.000+02:00
diff --git a/UPGRADE-6.4.md b/UPGRADE-6.4.md
@@ -213,6 +213,11 @@ Templating
 
  * The component is deprecated and will be removed in 7.0, use [Twig](https://twig.symfony.com) instead
 
+Translator
+----------
+
+ * [BC Break] Add argument `$buildDir` to `DataCollectorTranslator::warmUp()`
+
 Validator
 ---------
 
diff --git a/src/Symfony/Component/Translation/CHANGELOG.md b/src/Symfony/Component/Translation/CHANGELOG.md
@@ -6,6 +6,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
 ---
diff --git a/src/Symfony/Component/Translation/DataCollectorTranslator.php b/src/Symfony/Component/Translation/DataCollectorTranslator.php
@@ -71,13 +71,8 @@ public function getCatalogues(): array
         return $this->translator->getCatalogues();
     }
 
-    /**
-     * @param string|null $buildDir
-     */
-    public function warmUp(string $cacheDir /* , string $buildDir = null */): array
+    public function warmUp(string $cacheDir, string $buildDir = null): array
     {
-        $buildDir = 1 < \func_num_args() ? func_get_arg(1) : null;
-
         if ($this->translator instanceof WarmableInterface) {
             return (array) $this->translator->warmUp($cacheDir, $buildDir);
         }
diff --git a/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json
@@ -27,7 +27,7 @@
         "symfony/console": "^5.4|^6.0|^7.0",
         "symfony/dependency-injection": "^5.4|^6.0|^7.0",
         "symfony/http-client-contracts": "^2.5|^3.0",
-        "symfony/http-kernel": "^5.4|^6.0",
+        "symfony/http-kernel": "^5.4|^6.0|^7.0",
         "symfony/intl": "^5.4|^6.0|^7.0",
         "symfony/polyfill-intl-icu": "^1.21",
         "symfony/routing": "^5.4|^6.0|^7.0",
@@ -40,7 +40,7 @@
         "symfony/config": "<5.4",
         "symfony/dependency-injection": "<5.4",
         "symfony/http-client-contracts": "<2.5",
-        "symfony/http-kernel": "<5.4|>=7.0",
+        "symfony/http-kernel": "<5.4",
         "symfony/service-contracts": "<2.5",
         "symfony/twig-bundle": "<5.4",
         "symfony/yaml": "<5.4",

Original file line number	Diff line number	Diff line change
`@@ -71,13 +71,8 @@ public function getCatalogues(): array`
`71`	`71`	`return $this->translator->getCatalogues();`
`72`	`72`	`}`
`73`	`73`
`74`		`- /**`
`75`		`- * @param string\|null $buildDir`
`76`		`- */`
`77`		`- public function warmUp(string $cacheDir /* , string $buildDir = null */): array`
	`74`	`+ public function warmUp(string $cacheDir, string $buildDir = null): array`
`78`	`75`	`{`
`79`		`- $buildDir = 1 < \func_num_args() ? func_get_arg(1) : null;`
`80`		`-`
`81`	`76`	`if ($this->translator instanceof WarmableInterface) {`
`82`	`77`	`return (array) $this->translator->warmUp($cacheDir, $buildDir);`
`83`	`78`	`}`