Merge pull request #164 from zf-fr/default-values

Set empty values
zf-fr · May 16, 2014 · 730989a · 730989a
2 parents 11c5244 + 0aa91ac
commit 730989a
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.3.1
+
+* ZfrRest now returns input errors correctly if no data was given in the body
+
 ## 0.3.0
 
 * Association mapping can now accept one new property: `collectionController`. It allows to map a specific

diff --git a/src/ZfrRest/Mvc/Controller/MethodHandler/PostHandler.php b/src/ZfrRest/Mvc/Controller/MethodHandler/PostHandler.php
@@ -80,7 +80,7 @@ public function handleMethod(AbstractRestfulController $controller, ResourceInte
         }
 
         $singleResource = $resource->getMetadata()->createResource();
-        $data           = json_decode($controller->getRequest()->getContent(), true);
+        $data           = json_decode($controller->getRequest()->getContent(), true) ?: [];
 
         if ($controller->getAutoValidate()) {
             $data = $this->validateData($singleResource, $data, $controller);

diff --git a/src/ZfrRest/Mvc/Controller/MethodHandler/PutHandler.php b/src/ZfrRest/Mvc/Controller/MethodHandler/PutHandler.php
@@ -73,7 +73,7 @@ public function handleMethod(AbstractRestfulController $controller, ResourceInte
             throw new MethodNotAllowedException();
         }
 
-        $data = json_decode($controller->getRequest()->getContent(), true);
+        $data = json_decode($controller->getRequest()->getContent(), true) ?: [];
 
         if ($controller->getAutoValidate()) {
             $data = $this->validateData($resource, $data, $controller);

diff --git a/tests/ZfrRestTest/Mvc/Controller/MethodHandler/PostHandlerTest.php b/tests/ZfrRestTest/Mvc/Controller/MethodHandler/PostHandlerTest.php
@@ -44,4 +44,36 @@ public function testThrowMethodNotAllowedIfNoPostMethodIsSet()
 
         $handler->handleMethod($controller, $this->getMock('ZfrRest\Resource\ResourceInterface'));
     }
+
+    public function testCreateEmptyDataIfNoBodyIsPassed()
+    {
+        $controller = $this->getMock('ZfrRest\Mvc\Controller\AbstractRestfulController', ['post']);
+
+        $handler = $this->getMock(
+            'ZfrRest\Mvc\Controller\MethodHandler\PostHandler',
+            ['validateData', 'hydrateData'],
+            [],
+            '',
+            false
+        );
+
+        $singleResource = $this->getMock('ZfrRest\Resource\ResourceInterface');
+
+        $metadata = $this->getMock('ZfrRest\Resource\Metadata\ResourceMetadataInterface');
+        $metadata->expects($this->once())
+                 ->method('createResource')
+                 ->will($this->returnValue($singleResource));
+
+        $resource = $this->getMock('ZfrRest\Resource\ResourceInterface');
+        $resource->expects($this->once())
+                 ->method('getMetadata')
+                 ->will($this->returnValue($metadata));
+
+        $handler->expects($this->once())
+                ->method('validateData')
+                ->with($singleResource, [], $controller)
+                ->will($this->returnValue([]));
+
+        $handler->handleMethod($controller, $resource);
+    }
 }
diff --git a/tests/ZfrRestTest/Mvc/Controller/MethodHandler/PutHandlerTest.php b/tests/ZfrRestTest/Mvc/Controller/MethodHandler/PutHandlerTest.php
@@ -44,4 +44,25 @@ public function testThrowMethodNotAllowedIfNoPutMethodIsSet()
 
         $handler->handleMethod($controller, $this->getMock('ZfrRest\Resource\ResourceInterface'));
     }
+
+    public function testCreateEmptyDataIfNoBodyIsPassed()
+    {
+        $controller = $this->getMock('ZfrRest\Mvc\Controller\AbstractRestfulController', ['put']);
+
+        $handler = $this->getMock(
+            'ZfrRest\Mvc\Controller\MethodHandler\PutHandler',
+            ['validateData', 'hydrateData'],
+            [],
+            '',
+            false
+        );
+
+        $resource = $this->getMock('ZfrRest\Resource\ResourceInterface');
+        $handler->expects($this->once())
+                ->method('validateData')
+                ->with($resource, [], $controller)
+                ->will($this->returnValue([]));
+
+        $handler->handleMethod($controller, $resource);
+    }
 }