Merge branch 'hotfix/94'

Close #94
Fixes zfcampus/zf-content-validation#58

CHANGELOG.md

@@ -13,6 +13,11 @@ All notable changes to this project will be documented in this file, in reverse
 - [#86](https://github.com/zfcampus/zf-content-negotiation/pull/86) makes
   zend-console a suggested dependency.
 
+- [#88](https://github.com/zfcampus/zf-content-negotiation/pull/88) updates how
+  the `ContentTypeListener` decides how to parse incoming content when no
+  `Content-Type` header is present. If the content begins with a `{` or `[`
+  character, it will now parse it as JSON instead of as form data.
+
 ### Deprecated
 
 - Nothing.

src/ContentTypeListener.php

@@ -101,7 +101,14 @@ public function __invoke(MvcEvent $e)
                     break;
                 }
 
-                parse_str($content, $bodyParams);
+                // Try to assume JSON if content starts like JSON and no explicit Content-Type was provided
+                if (! $bodyParams && in_array($content[0], ['{', '['], true)) {
+                    $bodyParams = $this->decodeJson($content);
+                }
+
+                if (! $bodyParams || $bodyParams instanceof ApiProblemResponse) {
+                    parse_str($content, $bodyParams);
+                }
                 break;
             default:
                 break;

test/ContentTypeListenerTest.php

@@ -227,8 +227,12 @@ public function testOnFinishWillRemoveAnyUploadFilesUploadedByTheListener()
         $p->setAccessible(true);
         $p->setValue($this->listener, $tmpDir);
 
+        if (strpos(PHP_OS, 'Darwin') !== false) {
+            $tmpFile = '/private/var/' . $tmpFile;
+        }
+
         $this->listener->onFinish($event);
-        $this->assertFalse(file_exists($tmpFile));
+        $this->assertFileNotExists($tmpFile);
     }
 
     public function testOnFinishDoesNotRemoveUploadFilesTheListenerDidNotCreate()