Making module options strict, removing need for custom ruleset

.gitignore

@@ -10,4 +10,5 @@ phpunit.xml
 clover.xml
 tmp/
 vendor/
-
+composer.lock
+composer.phar

.travis.yml

@@ -17,7 +17,7 @@ before_script:
 script:
   - ./vendor/bin/phpunit --coverage-clover ./build/logs/clover.xml --exclude-group Performance
   - ./vendor/bin/phpunit --group=Functional
-  - ./vendor/bin/phpcs --standard=./ruleset.xml ./src/ ./tests/
+  - ./vendor/bin/phpcs --standard=PSR2 ./src/ ./tests/
 
 after_script:
   - php vendor/bin/coveralls -v

src/ZfrRest/Factory/DecoderPluginManagerFactory.php

@@ -36,10 +36,10 @@ class DecoderPluginManagerFactory implements FactoryInterface
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
-        $config = $serviceLocator->get('Config');
-        $config = $config['zfr_rest']['decoders'];
+        /* @var $options \ZfrRest\Options\ModuleOptions */
+        $options = $serviceLocator->get('ZfrRest\Options\ModuleOptions');
 
-        $decoderPluginManager = new DecoderPluginManager(new Config($config));
+        $decoderPluginManager = new DecoderPluginManager(new Config($options->getDecoders()));
         $decoderPluginManager->setServiceLocator($serviceLocator);
 
         return $decoderPluginManager;

src/ZfrRest/Factory/ModelPluginManagerFactory.php

@@ -36,10 +36,10 @@ class ModelPluginManagerFactory implements FactoryInterface
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
-        $config = $serviceLocator->get('Config');
-        $config = $config['zfr_rest']['models'];
+        /* @var $options \ZfrRest\Options\ModuleOptions */
+        $options = $serviceLocator->get('ZfrRest\Options\ModuleOptions');
 
-        $modelPluginManager = new ModelPluginManager(new Config($config));
+        $modelPluginManager = new ModelPluginManager(new Config($options->getModels()));
         $modelPluginManager->setServiceLocator($serviceLocator);
 
         return $modelPluginManager;

src/ZfrRest/Factory/ModuleOptionsFactory.php

@@ -36,6 +36,7 @@ class ModuleOptionsFactory implements FactoryInterface
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
         $config = $serviceLocator->get('Config');
+
         return new ModuleOptions($config['zfr_rest']);
     }
 }

src/ZfrRest/Options/ModuleOptions.php

@@ -28,11 +28,6 @@
  */
 class ModuleOptions extends AbstractOptions
 {
-    /**
-     * {@inheritDoc}
-     */
-    protected $__strictMode__ = false;
-
     /**
      * Key of the object manager fetched from the service locator
      *
@@ -61,8 +56,23 @@ class ModuleOptions extends AbstractOptions
      */
     protected $resourceMetadataOptions;
 
+    /**
+     * Plugin manager configuration for the content decoders
+     *
+     * @var array
+     */
+    protected $decoders = array();
+
+    /**
+     * Plugin manager configuration for the view models
+     *
+     * @var array
+     */
+    protected $models = array();
+
     /**
      * @param string $objectManager
+     *
      * @return void
      */
     public function setObjectManager($objectManager)
@@ -80,6 +90,7 @@ public function getObjectManager()
 
     /**
      * @param  array $options
+     *
      * @return void
      */
     public function setListeners(array $options)
@@ -97,6 +108,7 @@ public function getListeners()
 
     /**
      * @param  array $options
+     *
      * @return void
      */
     public function setControllerBehaviours(array $options)
@@ -114,6 +126,7 @@ public function getControllerBehaviours()
 
     /**
      * @param  array $options
+     *
      * @return void
      */
     public function setResourceMetadata(array $options)
@@ -128,4 +141,40 @@ public function getResourceMetadata()
     {
         return $this->resourceMetadataOptions;
     }
+
+    /**
+     * @param  array $decoders
+     *
+     * @return void
+     */
+    public function setDecoders(array $decoders)
+    {
+        $this->decoders = $decoders;
+    }
+
+    /**
+     * @return array
+     */
+    public function getDecoders()
+    {
+        return $this->decoders;
+    }
+
+    /**
+     * @param array $models
+     *
+     * @return void
+     */
+    public function setModels(array $models)
+    {
+        $this->models = $models;
+    }
+
+    /**
+     * @return array
+     */
+    public function getModels()
+    {
+        return $this->models;
+    }
 }

tests/ZfrRestTest/Serializer/DecoderPluginManagerTest.php

@@ -21,6 +21,7 @@
 use PHPUnit_Framework_TestCase as TestCase;
 use Zend\ServiceManager\ServiceManager;
 use Zend\Mvc\Service\ServiceManagerConfig;
+use ZfrRest\Options\ModuleOptions;
 use ZfrRest\Serializer\DecoderPluginManager;
 
 class DecoderPluginManagerTest extends TestCase
@@ -59,7 +60,8 @@ public function testCanRetrievePluginManagerWithServiceManager()
                 )
             )
         );
-        $serviceManager->setService('Config', array('zfr_rest' => array('decoders' => array())));
+
+        $serviceManager->setService('ZfrRest\Options\ModuleOptions', new ModuleOptions());
 
         $decoderPluginManager = $serviceManager->get('DecoderPluginManager');
 

tests/ZfrRestTest/View/Model/ModelPluginManagerTest.php

@@ -21,6 +21,7 @@
 use PHPUnit_Framework_TestCase as TestCase;
 use Zend\ServiceManager\ServiceManager;
 use Zend\Mvc\Service\ServiceManagerConfig;
+use ZfrRest\Options\ModuleOptions;
 use ZfrRest\View\Model\ModelPluginManager;
 
 class ModelPluginManagerTest extends TestCase
@@ -57,7 +58,7 @@ public function testCanRetrievePluginManagerWithServiceManager()
                 )
             )
         );
-        $serviceManager->setService('Config', array('zfr_rest' => array('models' => array())));
+        $serviceManager->setService('ZfrRest\Options\ModuleOptions', new ModuleOptions());
 
         $modelPluginManager = $serviceManager->get('ModelPluginManager');