Merge branch 'feature/29' into develop

Close #29

Author: weierophinney

CHANGELOG.md

@@ -27,7 +27,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#29](https://github.com/zendframework/zend-diactoros/pull/29) fixes request
+  method validation to allow any valid token as defined by [RFC
+  7230](http://tools.ietf.org/html/rfc7230#appendix-B). This allows usage of
+  custom request methods, vs a static, hard-coded list.
 
 ## 1.0.5 - 2015-06-24
 

src/RequestTrait.php

@@ -47,23 +47,6 @@ trait RequestTrait
      */
     private $uri;
 
-    /**
-     * Supported HTTP methods
-     *
-     * @var array
-     */
-    private $validMethods = [
-        'CONNECT',
-        'DELETE',
-        'GET',
-        'HEAD',
-        'OPTIONS',
-        'PATCH',
-        'POST',
-        'PUT',
-        'TRACE',
-    ];
-
     /**
      * Initialize request state.
      *
@@ -290,9 +273,7 @@ private function validateMethod($method)
             ));
         }
 
-        $method = strtoupper($method);
-
-        if (! in_array($method, $this->validMethods, true)) {
+        if (! preg_match('/^[!#$%&\'*+.^_`\|~0-9a-z-]+$/i', $method)) {
             throw new InvalidArgumentException(sprintf(
                 'Unsupported HTTP method "%s" provided',
                 $method

test/RequestTest.php

@@ -120,7 +120,7 @@ public function invalidRequestMethod()
             'false'      => [ false ],
             'int'        => [ 1 ],
             'float'      => [ 1.1 ],
-            'bad-string' => [ 'BOGUS-METHOD' ],
+            'bad-string' => [ 'BOGUS METHOD' ],
             'array'      => [ ['POST'] ],
             'stdClass'   => [ (object) [ 'method' => 'POST'] ],
         ];
@@ -135,6 +135,34 @@ public function testConstructorRaisesExceptionForInvalidMethod($method)
         new Request(null, $method);
     }
 
+    public function customRequestMethods()
+    {
+        return[
+            /* WebDAV methods */
+            'TRACE'     => ['TRACE'],
+            'PROPFIND'  => ['PROPFIND'],
+            'PROPPATCH' => ['PROPPATCH'],
+            'MKCOL'     => ['MKCOL'],
+            'COPY'      => ['COPY'],
+            'MOVE'      => ['MOVE'],
+            'LOCK'      => ['LOCK'],
+            'UNLOCK'    => ['UNLOCK'],
+            'UNLOCK'    => ['UNLOCK'],
+            /* Arbitrary methods */
+            '#!ALPHA-1234&%' => ['#!ALPHA-1234&%'],
+        ];
+    }
+
+    /**
+     * @dataProvider customRequestMethods
+     * @group 29
+     */
+    public function testAllowsCustomRequestMethodsThatFollowSpec($method)
+    {
+        $request = new Request(null, $method);
+        $this->assertSame($method, $request->getMethod());
+    }
+
     public function invalidRequestBody()
     {
         return [