Merge pull request #78 from webimpress/hotfix/76

Hotfix #76 - Parsing string data
zfcampus · Oct 11, 2016 · 17542ea · 17542ea
2 parents b46b247 + addefbf
commit 17542ea
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 7 deletions.
diff --git a/src/ContentTypeListener.php b/src/ContentTypeListener.php
@@ -101,13 +101,7 @@ public function __invoke(MvcEvent $e)
                     break;
                 }
 
-                // Stolen from AbstractRestfulController
                 parse_str($content, $bodyParams);
-                if (!is_array($bodyParams)
-                    || (1 == count($bodyParams) && isset($bodyParams[0]))
-                ) {
-                    $bodyParams = $content;
-                }
                 break;
             default:
                 break;
@@ -117,7 +111,6 @@ public function __invoke(MvcEvent $e)
             return $bodyParams;
         }
 
-        $bodyParams = $bodyParams ?: [];
         $parameterData->setBodyParams($bodyParams);
         $e->setParam('ZFContentNegotiationParameterData', $parameterData);
     }

diff --git a/test/ContentTypeListenerTest.php b/test/ContentTypeListenerTest.php
@@ -598,4 +598,49 @@ public function testMergesHalEmbeddedPropertiesIntoTopLevelObjectWhenDecodingHal
 
         $this->assertEquals($expected, $params->getBodyParams());
     }
+
+    public function methodsWithStringContent()
+    {
+        return [
+            'delete-string'      => ['DELETE', 'String Content', 'String_Content'],
+            'delete-zero-key'    => ['DELETE', '0=', 0],
+            'delete-empty-value' => ['DELETE', 'ids=', 'ids'],
+            'patch-string'       => ['PATCH', '@String-Content', '@String-Content'],
+            'patch-zero-key'     => ['PATCH', '0=', 0],
+            'patch-empty-value'  => ['PATCH', 'name=', 'name'],
+            'put-string'         => ['PUT', 'string.content', 'string_content'],
+            'put-zero-key'       => ['PUT', '0=', 0],
+            'put-empty-value'    => ['PUT', 'key=', 'key'],
+        ];
+    }
+
+    /**
+     * @dataProvider methodsWithStringContent
+     *
+     * @param string $method
+     * @param string $data
+     * @param string $key
+     */
+    public function testStringContentIsParsedCorrectlyToAnArray($method, $data, $key)
+    {
+        $listener = $this->listener;
+
+        $request = new Request();
+        $request->setMethod($method);
+        $request->setContent($data);
+
+        $event = new MvcEvent();
+        $event->setRequest($request);
+        $event->setRouteMatch($this->createRouteMatch([]));
+
+        $result = $listener($event);
+        $this->assertNull($result);
+
+        /** @var \ZF\ContentNegotiation\ParameterDataContainer $params */
+        $params = $event->getParam('ZFContentNegotiationParameterData');
+        $array = $params->getBodyParams();
+
+        $this->assertArrayHasKey($key, $array);
+        $this->assertSame('', $array[$key]);
+    }
 }