bug #2145 do not iterate non-array data (xabbuh)

xabbuh · xabbuh · commit 13ffb9ee78d3 · 2020-03-27T16:39:47.000+01:00
This PR was merged into the 2.7 branch. Discussion ---------- do not iterate non-array data Commits ------- 8180b35 do not iterate non-array data
diff --git a/Decoder/JsonToFormDecoder.php b/Decoder/JsonToFormDecoder.php
@@ -48,7 +48,7 @@ private function xWwwFormEncodedLike(&$data)
     public function decode($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);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ private function xWwwFormEncodedLike(&$data)`
`48`	`48`	`public function decode($data)`
`49`	`49`	`{`
`50`	`50`	`$decodedData = @json_decode($data, true);`
`51`		`- if ($decodedData) {`
	`51`	`+ if (is_array($decodedData)) {`
`52`	`52`	`$this->xWwwFormEncodedLike($decodedData);`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -47,4 +47,12 @@ public function testDecodeWithRemovingFalseData()`
`47`	`47`	`$this->assertEquals('3.14', $decoded['floatKey']);`
`48`	`48`	`$this->assertEquals('bar', $decoded['stringKey']);`
`49`	`49`	`}`
	`50`	`+`
	`51`	`+ public function testDecodeStringData()`
	`52`	`+ {`
	`53`	`+ $decoder = new JsonToFormDecoder();`
	`54`	`+ $decoded = $decoder->decode('"foo"');`
	`55`	`+`
	`56`	`+ $this->assertSame('foo', $decoded);`
	`57`	`+ }`
`50`	`58`	`}`