Merge pull request #136 from zf-fr/remove-collection-hydrator

Remove hydrator mapping for Collection

docs/02. Quick Start.md

@@ -84,8 +84,7 @@ use ZfrRest\Resource\Metadata\Annotation as REST;
  *      hydrator="Zend\Stdlib\Hydrator\ClassMethods"
  * )
  * @REST\Collection(
- *      controller="Application\Controller\UsersController",
- *      hydrator="Zend\Stdlib\Hydrator\ClassMethods"
+ *      controller="Application\Controller\UsersController"
  * )
  */
 class User
@@ -246,7 +245,7 @@ to do is **passing the resource to the service for your business logic**.
 
 For the `put` method, you don't even need to manually validate the user data, because it has already been validated
 using the input filter you specified in the mapping. If data would have been invalid, it would have returned a
-400 Bad Request error, with the various error messages under the `errors` key.
+`422 Unprocessable Entity` error, with the various error messages under the `errors` key.
 
 If you want automatic serialization of the resource, you must return a ResourceModel (it needs a resource). ZfrRest
 provides you a utility controller plugin called `resourceModel` that you can use to create one.
@@ -361,8 +360,7 @@ use ZfrRest\Resource\Metadata\Annotation as REST;
  *      hydrator="Zend\Stdlib\Hydrator\ClassMethods"
  * )
  * @REST\Collection(
- *      controller="Application\Controller\TweetsController",
- *      hydrator="Zend\Stdlib\Hydrator\ClassMethods"
+ *      controller="Application\Controller\TweetsController"
  * )
  */
 class Tweet

docs/08. Mapping reference.md

@@ -25,7 +25,6 @@ Allow to define mapping when a resource is accessed as a collection.
 Attributes:
 
 * `controller`: FQCN of the controller (pulled from the controller plugin manager)
-* `hydrator`: FQCN of the hydrator (pulled from the hydrator plugin manager).
 
 ### Association
 

src/ZfrRest/Resource/Metadata/Annotation/Collection.php

@@ -29,19 +29,13 @@ final class Collection implements AnnotationInterface
      */
     public $controller;
 
-    /**
-     * @var string
-     */
-    public $hydrator;
-
     /**
      * {@inheritDoc}
      */
     public function getValue()
     {
         return [
-            'controller'  => $this->controller,
-            'hydrator'    => $this->hydrator
+            'controller' => $this->controller
         ];
     }
 }

src/ZfrRest/Resource/Metadata/CollectionResourceMetadata.php

@@ -33,12 +33,4 @@ public function getControllerName()
     {
         return $this->propertyMetadata['controller'];
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getHydratorName()
-    {
-        return $this->propertyMetadata['hydrator'];
-    }
 }

src/ZfrRest/Resource/Metadata/CollectionResourceMetadataInterface.php

@@ -32,11 +32,4 @@ interface CollectionResourceMetadataInterface
      * @return string|null
      */
     public function getControllerName();
-
-    /**
-     * Get the hydrator's FQCN to be used for this resource
-     *
-     * @return string|null
-     */
-    public function getHydratorName();
 }

src/ZfrRest/View/Renderer/SimpleResourceRenderer.php

@@ -121,7 +121,7 @@ public function renderItem(ResourceInterface $resource)
      */
     public function renderCollection(ResourceInterface $resource)
     {
-        $hydratorName = $resource->getMetadata()->getCollectionMetadata()->getHydratorName();
+        $hydratorName = $resource->getMetadata()->getHydratorName();
         $hydrator     = $this->hydratorPluginManager->get($hydratorName);
 
         $data    = $resource->getData();

tests/ZfrRestTest/Asset/Resource/Metadata/Annotation/A.php

@@ -29,8 +29,7 @@
  *      hydrator="ResourceHydrator"
  * )
  * @REST\Collection(
- *      controller="CollectionController",
- *      hydrator="CollectionHydrator"
+ *      controller="CollectionController"
  * )
  */
 class A

tests/ZfrRestTest/Asset/Resource/Metadata/Annotation/B.php

@@ -31,8 +31,7 @@
  *      hydrator="ResourceHydrator"
  * )
  * @REST\Collection(
- *      controller="CollectionController",
- *      hydrator="CollectionHydrator"
+ *      controller="CollectionController"
  * )
  */
 class B

tests/ZfrRestTest/Asset/Resource/Metadata/Annotation/C.php

@@ -31,8 +31,7 @@
  *      hydrator="ResourceHydrator"
  * )
  * @REST\Collection(
- *      controller="CollectionController",
- *      hydrator="CollectionHydrator"
+ *      controller="CollectionController"
  * )
  */
 class C

tests/ZfrRestTest/Asset/Resource/Metadata/Annotation/D.php

@@ -29,8 +29,7 @@
  *      hydrator="ResourceHydrator"
  * )
  * @REST\Collection(
- *      controller="CollectionController",
- *      hydrator="CollectionHydrator"
+ *      controller="CollectionController"
  * )
  */
 class D

tests/ZfrRestTest/Resource/Metadata/Annotation/CollectionTest.php

@@ -33,12 +33,10 @@ class CollectionTest extends PHPUnit_Framework_TestCase
     public function testAnnotation()
     {
         $annotation = new Collection();
-        $annotation->controller  = 'Controller';
-        $annotation->hydrator    = 'Hydrator';
+        $annotation->controller = 'Controller';
 
         $expected = [
-            'controller'  => 'Controller',
-            'hydrator'    => 'Hydrator'
+            'controller' => 'Controller'
         ];
 
         $this->assertEquals($expected, $annotation->getValue());

tests/ZfrRestTest/Resource/Metadata/CollectionResourceMetadataTest.php

@@ -35,15 +35,13 @@ public function testSettersAndGetters()
         $collectionResourceMetadata = new CollectionResourceMetadata('stdClass');
 
         $data = [
-            'controller' => 'Controller',
-            'hydrator'   => 'Hydrator'
+            'controller' => 'Controller'
         ];
 
         foreach ($data as $key => $value) {
             $collectionResourceMetadata->propertyMetadata[$key] = $value;
         }
 
         $this->assertEquals($data['controller'], $collectionResourceMetadata->getControllerName());
-        $this->assertEquals($data['hydrator'], $collectionResourceMetadata->getHydratorName());
     }
 }

tests/ZfrRestTest/Resource/Metadata/Driver/AnnotationDriverTest.php

@@ -46,7 +46,6 @@ public function testMetadataFromAnnotation()
 
         $collectionMetadata = $metadata->getCollectionMetadata();
         $this->assertEquals('CollectionController', $collectionMetadata->getControllerName());
-        $this->assertEquals('CollectionHydrator', $collectionMetadata->getHydratorName());
 
         $this->assertTrue($metadata->hasAssociationMetadata('b'));
         $this->assertFalse($metadata->hasAssociationMetadata('c'));

tests/ZfrRestTest/View/Renderer/SimpleResourceRendererTest.php

@@ -31,7 +31,7 @@
  * @group Coverage
  * @covers \ZfrRest\View\Renderer\SimpleResourceRenderer
  */
-class ResourceRendererTest extends PHPUnit_Framework_TestCase
+class SimpleResourceRendererTest extends PHPUnit_Framework_TestCase
 {
     /**
      * ResourceRenderer does not really have engine
@@ -90,11 +90,10 @@ public function testCanRenderPaginator()
     {
         $hydratorPluginManager = $this->getMock('Zend\Stdlib\Hydrator\HydratorPluginManager');
 
-        $renderer           = new SimpleResourceRenderer($hydratorPluginManager);
-        $resource           = $this->getMock('ZfrRest\Resource\ResourceInterface');
-        $metadata           = $this->getMock('ZfrRest\Resource\Metadata\ResourceMetadataInterface');
-        $collectionMetadata = $this->getMock('ZfrRest\Resource\Metadata\CollectionResourceMetadataInterface');
-        $hydrator           = $this->getMock('Zend\Stdlib\Hydrator\HydratorInterface');
+        $renderer = new SimpleResourceRenderer($hydratorPluginManager);
+        $resource = $this->getMock('ZfrRest\Resource\ResourceInterface');
+        $metadata = $this->getMock('ZfrRest\Resource\Metadata\ResourceMetadataInterface');
+        $hydrator = $this->getMock('Zend\Stdlib\Hydrator\HydratorInterface');
 
         $resourceModel = new ResourceModel($resource, $hydrator);
         $paginator     = $this->getMock('Zend\Paginator\Paginator', [], [], '', false);
@@ -123,8 +122,7 @@ public function testCanRenderPaginator()
         $resource->expects($this->once())->method('getMetadata')->will($this->returnValue($metadata));
         $resource->expects($this->once())->method('getData')->will($this->returnValue($paginator));
 
-        $metadata->expects($this->once())->method('getCollectionMetadata')->will($this->returnValue($collectionMetadata));
-        $collectionMetadata->expects($this->once())->method('getHydratorName')->will($this->returnValue('Hydrator'));
+        $metadata->expects($this->once())->method('getHydratorName')->will($this->returnValue('Hydrator'));
 
         $hydratorPluginManager->expects($this->once())
                               ->method('get')