StringHelper::parseStr() missing decode value in case of variable s…

…tarts with brackets
BerliozFramework · Mar 7, 2022 · 9cb5d1b · 9cb5d1b
1 parent a9d8f12
commit 9cb5d1b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. This projec
 to [Semantic Versioning] (http://semver.org/). For change log format,
 use [Keep a Changelog] (http://keepachangelog.com/).
 
+## [1.6.5] - 2022-03-07
+
+### Fixed
+
+- `StringHelper::parseStr()` missing decode value in case of variable starts with brackets
+
 ## [1.6.4] - 2022-03-07
 
 ### Fixed

diff --git a/src/StringHelper.php b/src/StringHelper.php
@@ -299,7 +299,10 @@ public static function parseStr(string $str, bool $keepDots = true): array
             }
 
             $result = reset($result);
-            $final = b_array_merge_recursive($final, [urldecode($split[0]) => $result ?: ($split[1] ?? null)]);
+            if (false === $result) {
+                $result = urldecode($split[1] ?? '');
+            }
+            $final = b_array_merge_recursive($final, [urldecode($split[0]) => $result]);
         }
 
         return $final;

diff --git a/tests/StringHelperTest.php b/tests/StringHelperTest.php
@@ -165,8 +165,8 @@ public function testParseStr()
             StringHelper::parseStr('first=value&arr%5B%5D=foo+bar&arr%5b%5d=baz')
         );
         $this->assertEquals(
-            ['[first]' => 'value', '[foo]' => 'bar', 'arr' => ['baz']],
-            StringHelper::parseStr('%5Bfirst%5D=value&%5Bfoo%5D=bar&arr%5b%5d=baz')
+            ['[first]' => 'val[ue', '[foo]' => 'bar', 'arr' => ['baz']],
+            StringHelper::parseStr('%5Bfirst%5D=val%5Bue&%5Bfoo%5D=bar&arr%5b%5d=baz')
         );
 
         $this->assertEquals([], StringHelper::parseStr(''));