Prevent creating empty keys when key ends with a period

javleds · javleds · commit e3a062a5d994 · 2023-10-11T21:21:37.000-06:00
diff --git a/src/Symfony/Component/Translation/Tests/Util/ArrayConverterTest.php b/src/Symfony/Component/Translation/Tests/Util/ArrayConverterTest.php
@@ -69,6 +69,20 @@ public static function messagesData()
                     ],
                 ],
             ],
+            [
+                // input
+                [
+                    'foo.' => 'foo.',
+                    'bar.' => 'bar.',
+                    'foo bar.' => 'foo bar.',
+                ],
+                // expected output
+                [
+                    'foo' => 'foo.',
+                    'bar' => 'bar.',
+                    'foo bar' => 'foo bar.',
+                ],
+            ],
         ];
     }
 }
diff --git a/src/Symfony/Component/Translation/Util/ArrayConverter.php b/src/Symfony/Component/Translation/Util/ArrayConverter.php
@@ -65,6 +65,24 @@ private static function &getElementByPath(array &$tree, array $parts)
                 $elem = &$elem[implode('.', \array_slice($parts, $i))];
                 break;
             }
+
+            if (empty($part)) {
+                /* Prevent creating empty keys when string ends with period, example:
+                 * 'foo.'
+                 *
+                 * Instead of:
+                 * 'foo':
+                 *   '' : 'foo.'
+                 *
+                 * We ensure thr following:
+                 * 'foo': 'foo.'
+                 */
+                $parentOfElem = &$elem;
+                $elem = $parentOfElem;
+
+                continue;
+            }
+
             $parentOfElem = &$elem;
             $elem = &$elem[$part];
         }
