Fix tests and imports

src/ZfrRest/Factory/PostHandlerFactory.php

@@ -35,13 +35,6 @@ public function createService(ServiceLocatorInterface $serviceLocator)
     {
         $parentLocator = $serviceLocator->getServiceLocator();
 
-        /* @var \ZfrRest\Options\ModuleOptions $options */
-        $options = $parentLocator->get('ZfrRest\Options\ModuleOptions');
-
-        return new PostHandler(
-            $options->getControllerBehaviours(),
-            $parentLocator->get('InputFilterManager'),
-            $parentLocator->get('HydratorManager')
-        );
+        return new PostHandler($parentLocator->get('InputFilterManager'), $parentLocator->get('HydratorManager'));
     }
 }

src/ZfrRest/Factory/PutHandlerFactory.php

@@ -35,13 +35,6 @@ public function createService(ServiceLocatorInterface $serviceLocator)
     {
         $parentLocator = $serviceLocator->getServiceLocator();
 
-        /* @var \ZfrRest\Options\ModuleOptions $options */
-        $options = $parentLocator->get('ZfrRest\Options\ModuleOptions');
-
-        return new PutHandler(
-            $options->getControllerBehaviours(),
-            $parentLocator->get('InputFilterManager'),
-            $parentLocator->get('HydratorManager')
-        );
+        return new PutHandler($parentLocator->get('InputFilterManager'), $parentLocator->get('HydratorManager'));
     }
 }

src/ZfrRest/Mvc/Controller/AbstractRestfulController.php

@@ -28,8 +28,8 @@
 use ZfrRest\Http\Exception\Client\NotFoundException;
 use ZfrRest\Mvc\Controller\MethodHandler\MethodHandlerPluginManager;
 use ZfrRest\Mvc\Exception\RuntimeException;
-use ZfrRest\Resource\ResourceInterface;
 use ZfrRest\Resource\Metadata\ResourceMetadataInterface;
+use ZfrRest\Resource\ResourceInterface;
 use ZfrRest\View\Model\ResourceModel;
 
 /**

src/ZfrRest/Mvc/Controller/MethodHandler/DeleteHandler.php

@@ -18,7 +18,6 @@
 
 namespace ZfrRest\Mvc\Controller\MethodHandler;
 
-use Zend\Mvc\Controller\AbstractController;
 use ZfrRest\Http\Exception\Client\MethodNotAllowedException;
 use ZfrRest\Mvc\Controller\AbstractRestfulController;
 use ZfrRest\Resource\ResourceInterface;

src/ZfrRest/Mvc/Controller/MethodHandler/GetHandler.php

@@ -18,7 +18,6 @@
 
 namespace ZfrRest\Mvc\Controller\MethodHandler;
 
-use Zend\Mvc\Controller\AbstractController;
 use ZfrRest\Http\Exception\Client\MethodNotAllowedException;
 use ZfrRest\Mvc\Controller\AbstractRestfulController;
 use ZfrRest\Resource\ResourceInterface;

src/ZfrRest/Mvc/Controller/MethodHandler/MethodHandlerInterface.php

@@ -18,7 +18,6 @@
 
 namespace ZfrRest\Mvc\Controller\MethodHandler;
 
-use Zend\Mvc\Controller\AbstractController;
 use ZfrRest\Mvc\Controller\AbstractRestfulController;
 use ZfrRest\Resource\ResourceInterface;
 

src/ZfrRest/Mvc/Controller/MethodHandler/OptionsHandler.php

@@ -18,7 +18,6 @@
 
 namespace ZfrRest\Mvc\Controller\MethodHandler;
 
-use Zend\Mvc\Controller\AbstractController;
 use ZfrRest\Mvc\Controller\AbstractRestfulController;
 use ZfrRest\Resource\ResourceInterface;
 

src/ZfrRest/Mvc/Controller/MethodHandler/PostHandler.php

@@ -19,11 +19,9 @@
 namespace ZfrRest\Mvc\Controller\MethodHandler;
 
 use Zend\InputFilter\InputFilterPluginManager;
-use Zend\Mvc\Controller\AbstractController;
 use Zend\Stdlib\Hydrator\HydratorPluginManager;
 use ZfrRest\Http\Exception\Client\MethodNotAllowedException;
 use ZfrRest\Mvc\Controller\AbstractRestfulController;
-use ZfrRest\Options\ControllerBehavioursOptions;
 use ZfrRest\Resource\ResourceInterface;
 use ZfrRest\View\Model\ResourceModel;
 
@@ -71,9 +69,6 @@ public function __construct(
      * As you can see, the post method have three arguments: the object that is inserted, the resource metadata and
      * the resource itself (which is the Collection where the object is added)
      *
-     * Note that if you have set "auto_validate" and/or "auto_hydrate" to false in ZfrRest config, those steps will
-     * do nothing
-     *
      * {@inheritDoc}
      * @throws MethodNotAllowedException
      */

src/ZfrRest/Mvc/Controller/MethodHandler/PutHandler.php

@@ -63,9 +63,6 @@ public function __construct(
      *      - we hydrate valid data to update existing resource
      *      - we pass the object to the put method of the controller
      *
-     * Note that if you have set "auto_validate" and/or "auto_hydrate" to false in ZfrRest config, those steps will
-     * do nothing
-     *
      * {@inheritDoc}
      * @throws MethodNotAllowedException
      */

src/ZfrRest/Mvc/Controller/Plugin/PaginatorWrapper.php

@@ -23,7 +23,6 @@
 use Doctrine\Common\Collections\Selectable;
 use DoctrineModule\Paginator\Adapter\Collection as CollectionAdapter;
 use DoctrineModule\Paginator\Adapter\Selectable as SelectableAdapter;
-use Traversable;
 use Zend\Mvc\Controller\Plugin\AbstractPlugin;
 use Zend\Paginator\Paginator;
 use ZfrRest\Exception\RuntimeException;

src/ZfrRest/Options/ModuleOptions.php

@@ -18,7 +18,6 @@
 
 namespace ZfrRest\Options;
 
-use Traversable;
 use Zend\Stdlib\AbstractOptions;
 
 /**
@@ -48,13 +47,6 @@ class ModuleOptions extends AbstractOptions
      */
     protected $cache;
 
-    /**
-     * Controller behaviours
-     *
-     * @var ControllerBehavioursOptions|null
-     */
-    protected $controllerBehaviours;
-
     /**
      * Array that map a custom exception to a HttpExceptionInterface exception
      *
@@ -135,27 +127,6 @@ public function getCache()
         return $this->cache;
     }
 
-    /**
-     * @param  array $controllerBehaviours
-     * @return void
-     */
-    public function setControllerBehaviours(array $controllerBehaviours)
-    {
-        $this->controllerBehaviours = new ControllerBehavioursOptions($controllerBehaviours);
-    }
-
-    /**
-     * @return ControllerBehavioursOptions
-     */
-    public function getControllerBehaviours()
-    {
-        if (null === $this->controllerBehaviours) {
-            $this->controllerBehaviours = new ControllerBehavioursOptions();
-        }
-
-        return $this->controllerBehaviours;
-    }
-
     /**
      * @param  array $exceptionMap
      * @return void

src/ZfrRest/Resource/Metadata/Driver/AnnotationDriver.php

@@ -22,9 +22,9 @@
 use Doctrine\Common\Persistence\Mapping\ClassMetadataFactory;
 use Metadata\Driver\DriverInterface;
 use ReflectionClass;
+use ZfrRest\Resource\Metadata\Annotation;
 use ZfrRest\Resource\Metadata\CollectionResourceMetadata;
 use ZfrRest\Resource\Metadata\ResourceMetadata;
-use ZfrRest\Resource\Metadata\Annotation;
 
 /**
  * This driver loads the metadata from annotations

src/ZfrRest/Router/Http/Matcher/CollectionSubPathMatcher.php

@@ -22,9 +22,9 @@
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\Common\Collections\Selectable;
 use Traversable;
-use ZfrRest\Router\Exception\RuntimeException;
 use ZfrRest\Resource\Resource;
 use ZfrRest\Resource\ResourceInterface;
+use ZfrRest\Router\Exception\RuntimeException;
 
 /**
  * Matcher for an collection sub-path

src/ZfrRest/Router/Http/ResourceGraphRoute.php

@@ -23,8 +23,8 @@
 use Zend\EventManager\EventManagerAwareInterface;
 use Zend\EventManager\EventManagerAwareTrait;
 use Zend\Http\Request as HttpRequest;
-use Zend\Mvc\Router\Http\RouteMatch;
 use Zend\Mvc\Router\Http\RouteInterface;
+use Zend\Mvc\Router\Http\RouteMatch;
 use Zend\Stdlib\RequestInterface;
 use ZfrRest\Resource\Resource;
 use ZfrRest\Resource\ResourceInterface;

src/ZfrRest/View/Model/ResourceModel.php

@@ -19,7 +19,6 @@
 namespace ZfrRest\View\Model;
 
 use Zend\View\Model\ViewModel;
-use ZfrRest\Resource\Metadata\ResourceMetadataInterface;
 use ZfrRest\Resource\ResourceInterface;
 
 /**

tests/ZfrRestTest/Asset/Mvc/DataHydrationObject.php

@@ -27,29 +27,10 @@ class DataHydrationObject
     use DataHydrationTrait;
 
     /**
-     * @var ControllerBehavioursOptions
+     * @param HydratorPluginManager $hydratorPluginManager
      */
-    protected $controllerBehavioursOptions;
-
-    /**
-     * @param ControllerBehavioursOptions $behavioursOptions
-     * @param HydratorPluginManager       $hydratorPluginManager
-     */
-    public function __construct(
-        ControllerBehavioursOptions $behavioursOptions,
-        HydratorPluginManager $hydratorPluginManager
-    ) {
-        $this->controllerBehavioursOptions = $behavioursOptions;
-        $this->hydratorPluginManager       = $hydratorPluginManager;
-    }
-
-    /**
-     * Get the controller behaviour options
-     *
-     * @return ControllerBehavioursOptions
-     */
-    public function getControllerBehavioursOptions()
+    public function __construct(HydratorPluginManager $hydratorPluginManager)
     {
-        return $this->controllerBehavioursOptions;
+        $this->hydratorPluginManager = $hydratorPluginManager;
     }
 }

tests/ZfrRestTest/Asset/Mvc/DataValidationObject.php

@@ -20,36 +20,17 @@
 
 use Zend\InputFilter\InputFilterPluginManager;
 use ZfrRest\Mvc\Controller\MethodHandler\DataValidationTrait;
-use ZfrRest\Options\ControllerBehavioursOptions;
 
 class DataValidationObject
 {
     use DataValidationTrait;
 
     /**
-     * @var ControllerBehavioursOptions
-     */
-    protected $controllerBehavioursOptions;
-
-    /**
-     * @param ControllerBehavioursOptions $behavioursOptions
      * @param InputFilterPluginManager    $inputFilterPluginManager
      */
-    public function __construct(
-        ControllerBehavioursOptions $behavioursOptions,
-        InputFilterPluginManager $inputFilterPluginManager
-    ) {
-        $this->controllerBehavioursOptions = $behavioursOptions;
+    public function __construct(InputFilterPluginManager $inputFilterPluginManager)
+    {
         $this->inputFilterPluginManager    = $inputFilterPluginManager;
     }
 
-    /**
-     * Get the controller behaviour options
-     *
-     * @return ControllerBehavioursOptions
-     */
-    public function getControllerBehavioursOptions()
-    {
-        return $this->controllerBehavioursOptions;
-    }
 }

tests/ZfrRestTest/Factory/PostHandlerFactoryTest.php

@@ -24,7 +24,6 @@
 use Zend\Stdlib\Hydrator\HydratorPluginManager;
 use ZfrRest\Factory\PostHandlerFactory;
 use ZfrRest\Mvc\Controller\MethodHandler\MethodHandlerPluginManager;
-use ZfrRest\Options\ModuleOptions;
 
 /**
  * @licence MIT
@@ -42,7 +41,6 @@ public function testCreateFromFactory()
         $pluginManager  = new MethodHandlerPluginManager();
         $pluginManager->setServiceLocator($serviceManager);
 
-        $serviceManager->setService('ZfrRest\Options\ModuleOptions', new ModuleOptions());
         $serviceManager->setService('InputFilterManager', new InputFilterPluginManager());
         $serviceManager->setService('HydratorManager', new HydratorPluginManager());
 

tests/ZfrRestTest/Factory/PutHandlerFactoryTest.php

@@ -24,7 +24,6 @@
 use Zend\Stdlib\Hydrator\HydratorPluginManager;
 use ZfrRest\Factory\PutHandlerFactory;
 use ZfrRest\Mvc\Controller\MethodHandler\MethodHandlerPluginManager;
-use ZfrRest\Options\ModuleOptions;
 
 /**
  * @licence MIT
@@ -42,7 +41,6 @@ public function testCreateFromFactory()
         $pluginManager  = new MethodHandlerPluginManager();
         $pluginManager->setServiceLocator($serviceManager);
 
-        $serviceManager->setService('ZfrRest\Options\ModuleOptions', new ModuleOptions());
         $serviceManager->setService('InputFilterManager', new InputFilterPluginManager());
         $serviceManager->setService('HydratorManager', new HydratorPluginManager());
 

tests/ZfrRestTest/Mvc/Controller/MethodHandler/DataHydrationTraitTest.php

@@ -36,34 +36,15 @@ class DataHydrationTraitTest extends PHPUnit_Framework_TestCase
      */
     protected $dataHydration;
 
-    /**
-     * @var ControllerBehavioursOptions
-     */
-    protected $controllerBehavioursOptions;
-
     /**
      * @var \Zend\Stdlib\Hydrator\HydratorPluginManager
      */
     protected $hydratorPluginManager;
 
     public function setUp()
     {
-        $this->controllerBehavioursOptions = new ControllerBehavioursOptions();
-        $this->hydratorPluginManager       = $this->getMock('Zend\Stdlib\Hydrator\HydratorPluginManager');
-
-        $this->dataHydration = new DataHydrationObject(
-            $this->controllerBehavioursOptions,
-            $this->hydratorPluginManager
-        );
-    }
-
-    public function testReturnUntouchedDataIfDontAutoHydrate()
-    {
-        $this->controllerBehavioursOptions->setAutoHydrate(false);
-
-        $result = $this->dataHydration->hydrateData($this->getMock('ZfrRest\Resource\ResourceInterface'), ['foo']);
-
-        $this->assertEquals(['foo'], $result);
+        $this->hydratorPluginManager = $this->getMock('Zend\Stdlib\Hydrator\HydratorPluginManager');
+        $this->dataHydration         = new DataHydrationObject($this->hydratorPluginManager);
     }
 
     public function testThrowExceptionIfNoHydratorNameIsDefined()