Merge branch '6.2' into 6.3

* 6.2:
  Fix merge
  [Translation] Fix handling of null messages in `ArrayLoader`
  [Console] Remove exec and replace it by shell_exec
  [Security] Skip clearing CSRF Token on stateless logout

Loader/ArrayLoader.php

@@ -43,9 +43,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;
             }
         }

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();

Tests/fixtures/non-string.yml

@@ -0,0 +1,4 @@
+root:
+  foo1:
+  foo2: ''
+  bar: 'bar'