Merge branch 'hotfix/43' into develop

Forward port #43

Author: weierophinney

CHANGELOG.md

@@ -45,6 +45,9 @@ All notable changes to this project will be documented in this file, in reverse
 - [#93](https://github.com/zendframework/zend-mvc/pull/93) ensures that the
   Console `Catchall` route factory will not fail when the `defaults` `$options`
   array key is missing.
+- [#43](https://github.com/zendframework/zend-mvc/pull/43) updates the
+  `AbstractRestfulController` to ensure it can accept textual (e.g., XML, YAML)
+  data.
 
 ## 2.7.1 - 2016-03-02
 

src/Controller/AbstractRestfulController.php

@@ -560,8 +560,8 @@ protected function getIdentifier($routeMatch, $request)
      *
      * If the content-type indicates a JSON payload, the payload is immediately
      * decoded and the data returned. Otherwise, the data is passed to
-     * parse_str(). If that function returns a single-member array with a key
-     * of "0", the method assumes that we have non-urlencoded content and
+     * parse_str(). If that function returns a single-member array with a empty
+     * value, the method assumes that we have non-urlencoded content and
      * returns the raw content; otherwise, the array created is returned.
      *
      * @param  mixed $request
@@ -578,10 +578,9 @@ protected function processBodyContent($request)
 
         parse_str($content, $parsedParams);
 
-        // If parse_str fails to decode, or we have a single element with key
-        // 0, return the raw content.
-        if (!is_array($parsedParams)
-            || (1 == count($parsedParams) && isset($parsedParams[0]))
+        // If parse_str fails to decode, or we have a single element with empty value
+        if (!is_array($parsedParams) || empty($parsedParams)
+            || (1 == count($parsedParams) && '' === reset($parsedParams))
         ) {
             return $content;
         }

test/Controller/RestfulControllerTest.php

@@ -18,6 +18,7 @@
 use Zend\Http\Response;
 use Zend\Mvc\MvcEvent;
 use Zend\Mvc\Router\RouteMatch;
+use ZendTest\Mvc\Controller\TestAsset\RestfulContentTypeTestController;
 
 class RestfulControllerTest extends TestCase
 {
@@ -101,6 +102,22 @@ public function testDispatchInvokesCreateMethodWhenNoActionPresentAndPostInvoked
         $this->assertEquals('create', $this->routeMatch->getParam('action'));
     }
 
+    public function testCanReceiveStringAsRequestContent()
+    {
+        $string = "any content";
+        $this->request->setMethod('PUT');
+        $this->request->setContent($string);
+        $this->routeMatch->setParam('id', $id = 1);
+
+        $controller = new RestfulContentTypeTestController();
+        $controller->setEvent($this->event);
+        $result = $controller->dispatch($this->request, $this->response);
+
+        $this->assertEquals($id, $result['id']);
+        $this->assertEquals($string, $result['data']);
+        $this->assertEquals('update', $this->routeMatch->getParam('action'));
+    }
+
     public function testDispatchInvokesUpdateMethodWhenNoActionPresentAndPutInvokedWithIdentifier()
     {
         $entity = ['name' => __FUNCTION__];

test/Controller/TestAsset/RestfulContentTypeTestController.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\Mvc\Controller\TestAsset;
+
+use Zend\Mvc\Controller\AbstractRestfulController;
+
+class RestfulContentTypeTestController extends AbstractRestfulController
+{
+    /**
+     * Update an existing resource
+     *
+     * @param  mixed $id
+     * @param  mixed $data
+     * @return array
+     */
+    public function update($id, $data)
+    {
+        return [
+            'id' => $id,
+            'data' => $data,
+        ];
+    }
+}