add OptionsMethodModule

composer.json

@@ -53,7 +53,7 @@
         }
     },
     "scripts" :{
-        "test": ["phpunit"],
+        "test": ["@cs", "phpunit"],
         "coverage": ["php -dzend_extension=xdebug.so ./vendor/bin/phpunit --coverage-text --coverage-html=build/coverage"],
         "cs": ["php-cs-fixer fix -v --dry-run", "phpcs --standard=./phpcs.xml src"],
         "cs-fix": ["php-cs-fixer fix -v", "phpcbf src"]

src/Invoker.php

@@ -39,7 +39,7 @@ public function invoke(AbstractRequest $request)
     {
         $onMethod = 'on' . ucfirst($request->method);
         if (method_exists($request->resourceObject, $onMethod) !== true) {
-            return $this->extraMethod($request->resourceObject, $request, $onMethod);
+            return $this->invokeOptions($request->resourceObject, $request, $onMethod);
         }
         if ($request->resourceObject->uri instanceof AbstractUri) {
             $request->resourceObject->uri->query = $request->query;
@@ -76,14 +76,14 @@ private function postRequest(AbstractRequest $request, $result)
      *
      * @throws Exception\MethodNotAllowedException
      *
-     * @return ResourceObject
+     * @return string
      */
-    private function extraMethod(ResourceObject $ro, AbstractRequest $request, $method)
+    private function invokeOptions(ResourceObject $ro, AbstractRequest $request, $method)
     {
-        if ($request->method !== Request::OPTIONS) {
-            throw new MethodNotAllowedException(get_class($request->resourceObject) . "::$method()", 405);
+        if ($request->method == Request::OPTIONS) {
+            return $this->optionsRenderer->render($ro);
         }
 
-        return $this->optionsRenderer->render($ro);
+        throw new MethodNotAllowedException(get_class($request->resourceObject) . "::$method()", 405);
     }
 }

src/Module/OptionsMethodModule.php

@@ -0,0 +1,22 @@
+<?php
+/**
+ * This file is part of the BEAR.Resource package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
+namespace BEAR\Resource\Module;
+
+use BEAR\Resource\OptionsRenderer;
+use BEAR\Resource\RenderInterface;
+use Ray\Di\AbstractModule;
+
+class OptionsMethodModule extends AbstractModule
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        $this->bind(RenderInterface::class)->annotatedWith('options')->to(OptionsRenderer::class);
+    }
+}

src/Module/VoidOptionsMethodModule.php

@@ -0,0 +1,22 @@
+<?php
+/**
+ * This file is part of the BEAR.Resource package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
+namespace BEAR\Resource\Module;
+
+use BEAR\Resource\RenderInterface;
+use BEAR\Resource\VoidOptionsRenderer;
+use Ray\Di\AbstractModule;
+
+class VoidOptionsMethodModule extends AbstractModule
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        $this->bind(RenderInterface::class)->annotatedWith('options')->to(VoidOptionsRenderer::class);
+    }
+}

src/VoidOptionsRenderer.php

@@ -0,0 +1,20 @@
+<?php
+/**
+ * This file is part of the BEAR.Resource package.
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ */
+namespace BEAR\Resource;
+
+use BEAR\Resource\Exception\MethodNotAllowedException;
+
+final class VoidOptionsRenderer implements RenderInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function render(ResourceObject $ro)
+    {
+        throw new MethodNotAllowedException(get_class($ro) . '::options', 405);
+    }
+}

tests/InvokerTest.php

@@ -6,7 +6,6 @@
  */
 namespace BEAR\Resource;
 
-use BEAR\Resource\Exception\MethodNotAllowedException;
 use BEAR\Resource\Exception\ParameterException;
 use BEAR\Resource\Interceptor\FakeLogInterceptor;
 use BEAR\Resource\Interceptor\Log;
@@ -167,18 +166,32 @@ public function testOptionsWeaver()
         $this->assertSame($actual, $expected);
     }
 
+    /**
+     * @expectedException \InvalidArgumentException
+     */
     public function testInvokeExceptionHandle()
     {
-        $this->setExpectedException(\InvalidArgumentException::class);
         $outOfRangeId = 4;
         $request = new Request($this->invoker, new User, Request::GET, ['id' => $outOfRangeId]);
         $this->invoker->invoke($request);
     }
 
+    /**
+     * @expectedException \BEAR\Resource\Exception\MethodNotAllowedException
+     */
     public function testInvalidMethod()
     {
-        $this->setExpectedException(MethodNotAllowedException::class);
         $request = new Request($this->invoker, new Order, Request::DELETE);
         $this->invoker->invoke($request);
     }
+
+    /**
+     * @expectedException \BEAR\Resource\Exception\MethodNotAllowedException
+     */
+    public function testOptionsNotAllowed()
+    {
+        $invoker = new Invoker(new NamedParameter(new ArrayCache, new VoidParamHandler), new VoidOptionsRenderer);
+        $request = new Request($this->invoker, new Order, Request::DELETE);
+        $invoker->invoke($request);
+    }
 }