bug #50315 [Translation] Fix handling of null messages in ArrayLoader (rob006)

nicolas-grekas · nicolas-grekas · commit d1898696e579 · 2023-05-19T14:34:56.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Translation] Fix handling of null messages in `ArrayLoader` | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #49894 | License | MIT | Doc PR | - Replaces #50252 Commits ------- 4be2036 [Translation] Fix handling of null messages in `ArrayLoader`
diff --git a/src/Symfony/Component/Translation/Loader/ArrayLoader.php b/src/Symfony/Component/Translation/Loader/ArrayLoader.php
@@ -46,9 +46,11 @@ private function flatten(array $messages): array
         foreach ($messages as $key => $value) {
             if (\is_array($value)) {
                 foreach ($this->flatten($value) as $k => $v) {
-                    $result[$key.'.'.$k] = $v;
+                    if (null !== $v) {
+                        $result[$key.'.'.$k] = $v;
+                    }
                 }
-            } else {
+            } elseif (null !== $value) {
                 $result[$key] = $value;
             }
         }
diff --git a/src/Symfony/Component/Translation/Tests/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/YamlFileLoaderTest.php
@@ -30,6 +30,15 @@ public function testLoad()
         $this->assertEquals([new FileResource($resource)], $catalogue->getResources());
     }
 
+    public function testLoadNonStringMessages()
+    {
+        $loader = new YamlFileLoader();
+        $resource = __DIR__.'/../fixtures/non-string.yml';
+        $catalogue = $loader->load($resource, 'en', 'domain1');
+
+        $this->assertSame(['root.foo2' => '', 'root.bar' => 'bar'], $catalogue->all('domain1'));
+    }
+
     public function testLoadDoesNothingIfEmpty()
     {
         $loader = new YamlFileLoader();
diff --git a/src/Symfony/Component/Translation/Tests/fixtures/non-string.yml b/src/Symfony/Component/Translation/Tests/fixtures/non-string.yml
@@ -0,0 +1,4 @@
+root:
+  foo1:
+  foo2: ''
+  bar: 'bar'

Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,11 @@ private function flatten(array $messages): array`
`46`	`46`	`foreach ($messages as $key => $value) {`
`47`	`47`	`if (\is_array($value)) {`
`48`	`48`	`foreach ($this->flatten($value) as $k => $v) {`
`49`		`- $result[$key.'.'.$k] = $v;`
	`49`	`+ if (null !== $v) {`
	`50`	`+ $result[$key.'.'.$k] = $v;`
	`51`	`+ }`
`50`	`52`	`}`
`51`		`- } else {`
	`53`	`+ } elseif (null !== $value) {`
`52`	`54`	`$result[$key] = $value;`
`53`	`55`	`}`
`54`	`56`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +root:
 +  foo1:
 +  foo2: ''
 +  bar: 'bar'