Add RequestMethodInterface

Author: devanych

composer.json

@@ -20,7 +20,6 @@
     },
     "require": {
         "php": "^7.4",
-        "fig/http-message-util": "^1.1",
         "httpsoft/http-stream": "^1.0",
         "httpsoft/http-uploaded-file": "^1.0",
         "httpsoft/http-uri": "^1.0"

src/Request.php

@@ -4,7 +4,6 @@
 
 namespace HttpSoft\Request;
 
-use Fig\Http\Message\RequestMethodInterface;
 use HttpSoft\Uri\UriData;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\StreamInterface;

src/RequestMethodInterface.php

@@ -0,0 +1,68 @@
+<?php
+
+declare(strict_types=1);
+
+namespace HttpSoft\Request;
+
+interface RequestMethodInterface
+{
+    /**
+     * @link https://tools.ietf.org/html/rfc7231#section-4.3.1
+     */
+    public const METHOD_GET = 'GET';
+
+    /**
+     * @link https://tools.ietf.org/html/rfc7231#section-4.3.2
+     */
+    public const METHOD_HEAD = 'HEAD';
+
+    /**
+     * @link https://tools.ietf.org/html/rfc7231#section-4.3.3
+     */
+    public const METHOD_POST = 'POST';
+
+    /**
+     * @link https://tools.ietf.org/html/rfc7231#section-4.3.4
+     */
+    public const METHOD_PUT = 'PUT';
+
+    /**
+     * @link https://tools.ietf.org/html/rfc5789#section-2
+     */
+    public const METHOD_PATCH = 'PATCH';
+
+    /**
+     * @link https://tools.ietf.org/html/rfc7231#section-4.3.5
+     */
+    public const METHOD_DELETE = 'DELETE';
+
+    /**
+     * @link https://tools.ietf.org/html/rfc7231#section-4.3.6
+     */
+    public const METHOD_CONNECT = 'CONNECT';
+
+    /**
+     * @link https://tools.ietf.org/html/rfc7231#section-4.3.7
+     */
+    public const METHOD_OPTIONS = 'OPTIONS';
+
+    /**
+     * @link https://tools.ietf.org/html/rfc7231#section-4.3.8
+     */
+    public const METHOD_TRACE = 'TRACE';
+
+    /**
+     * Array/List of all defined methods.
+     */
+    public const METHODS = [
+        self::METHOD_GET,
+        self::METHOD_HEAD,
+        self::METHOD_POST,
+        self::METHOD_PUT,
+        self::METHOD_PATCH,
+        self::METHOD_DELETE,
+        self::METHOD_CONNECT,
+        self::METHOD_OPTIONS,
+        self::METHOD_TRACE,
+    ];
+}

src/RequestTrait.php

@@ -4,7 +4,6 @@
 
 namespace HttpSoft\Request;
 
-use Fig\Http\Message\RequestMethodInterface;
 use HttpSoft\Stream\MessageTrait;
 use HttpSoft\Stream\StreamFactory;
 use HttpSoft\Uri\UriData;
@@ -16,10 +15,12 @@
 
 use function gettype;
 use function get_class;
+use function in_array;
 use function is_object;
 use function is_string;
 use function preg_match;
 use function sprintf;
+use function strtoupper;
 
 /**
  * Trait implementing the methods defined in `Psr\Http\Message\RequestInterface`.
@@ -249,7 +250,10 @@ private function init(
      */
     private function setMethod(string $method): void
     {
-        if (!preg_match('/^[!#$%&\'*+.^_`|~0-9a-z-]+$/i', $method)) {
+        if (
+            !in_array(strtoupper($method), RequestMethodInterface::METHODS)
+            && !preg_match('/^[!#$%&\'*+.^_`|~0-9a-z-]+$/i', $method)
+        ) {
             throw new InvalidArgumentException(sprintf('`%s` is not valid HTTP method.', $method));
         }
 

src/ServerRequest.php

@@ -4,7 +4,6 @@
 
 namespace HttpSoft\Request;
 
-use Fig\Http\Message\RequestMethodInterface;
 use HttpSoft\Uri\UriData;
 use InvalidArgumentException;
 use Psr\Http\Message\ServerRequestInterface;