Merge branch '2.x'

* 2.x: do not iterate non-array data
FriendsOfSymfony · Mar 27, 2020 · e287a8e · e287a8e
2 parents f3460d5 + 8857ef9
commit e287a8e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Decoder/JsonToFormDecoder.php b/Decoder/JsonToFormDecoder.php
@@ -46,7 +46,7 @@ private function xWwwFormEncodedLike(array &$data): void
     public function decode(string $data)
     {
         $decodedData = @json_decode($data, true);
-        if ($decodedData) {
+        if (is_array($decodedData)) {
             $this->xWwwFormEncodedLike($decodedData);
         }
 

diff --git a/Tests/Decoder/JsonToFormDecoderTest.php b/Tests/Decoder/JsonToFormDecoderTest.php
@@ -47,4 +47,12 @@ public function testDecodeWithRemovingFalseData()
         $this->assertEquals('3.14', $decoded['floatKey']);
         $this->assertEquals('bar', $decoded['stringKey']);
     }
+
+    public function testDecodeStringData()
+    {
+        $decoder = new JsonToFormDecoder();
+        $decoded = $decoder->decode('"foo"');
+
+        $this->assertSame('foo', $decoded);
+    }
 }