diff --git a/src/Symfony/Component/Translation/Tests/Util/ArrayConverterTest.php b/src/Symfony/Component/Translation/Tests/Util/ArrayConverterTest.php
index 8936ef1ae6926..446130cc477a5 100644
--- a/src/Symfony/Component/Translation/Tests/Util/ArrayConverterTest.php
+++ b/src/Symfony/Component/Translation/Tests/Util/ArrayConverterTest.php
@@ -69,6 +69,34 @@ public static function messagesData()
],
],
],
+ [
+ // input
+ [
+ 'foo.' => 'foo.',
+ '.bar' => '.bar',
+ 'abc.abc' => 'value',
+ 'bcd.bcd.' => 'value',
+ '.cde.cde.' => 'value',
+ '.def.def' => 'value',
+ ],
+ // expected output
+ [
+ 'foo.' => 'foo.',
+ '.bar' => '.bar',
+ 'abc' => [
+ 'abc' => 'value',
+ ],
+ 'bcd' => [
+ 'bcd.' => 'value',
+ ],
+ '.cde' => [
+ 'cde.' => 'value',
+ ],
+ '.def' => [
+ 'def' => 'value',
+ ],
+ ],
+ ],
];
}
}
diff --git a/src/Symfony/Component/Translation/Util/ArrayConverter.php b/src/Symfony/Component/Translation/Util/ArrayConverter.php
index f69c2e3c6481d..e132e3decfcdd 100644
--- a/src/Symfony/Component/Translation/Util/ArrayConverter.php
+++ b/src/Symfony/Component/Translation/Util/ArrayConverter.php
@@ -38,7 +38,7 @@ public static function expandToTree(array $messages)
$tree = [];
foreach ($messages as $id => $value) {
- $referenceToElement = &self::getElementByPath($tree, explode('.', $id));
+ $referenceToElement = &self::getElementByPath($tree, self::getKeyParts($id));
$referenceToElement = $value;
@@ -65,6 +65,7 @@ private static function &getElementByPath(array &$tree, array $parts)
$elem = &$elem[implode('.', \array_slice($parts, $i))];
break;
}
+
$parentOfElem = &$elem;
$elem = &$elem[$part];
}
@@ -96,4 +97,45 @@ private static function cancelExpand(array &$tree, string $prefix, array $node)
}
}
}
+
+ private static function getKeyParts(string $key)
+ {
+ $parts = explode('.', $key);
+ $partsCount = \count($parts);
+
+ $result = [];
+ $buffer = '';
+
+ foreach ($parts as $index => $part) {
+ if (0 === $index && '' === $part) {
+ $buffer = '.';
+
+ continue;
+ }
+
+ if ($index === $partsCount - 1 && '' === $part) {
+ $buffer .= '.';
+ $result[] = $buffer;
+
+ continue;
+ }
+
+ if (isset($parts[$index + 1]) && '' === $parts[$index + 1]) {
+ $buffer .= $part;
+
+ continue;
+ }
+
+ if ($buffer) {
+ $result[] = $buffer.$part;
+ $buffer = '';
+
+ continue;
+ }
+
+ $result[] = $part;
+ }
+
+ return $result;
+ }
}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy