sunrise/http-header integration for validation

composer.json

@@ -4,15 +4,18 @@
  "keywords": ["fenric", "sunrise", "http-message", "rfc-7230", "psr-7", "psr-17"],
  "homepage": "https://github.com/sunrise-php/http-message",
  "license": "MIT",
- "authors": [{
- "name": "Anatoly Fenric",
- "email": "[email protected]",
- "homepage": "https://anatoly.fenric.ru/"
- }],
+ "authors": [
+ {
+ "name": "Anatoly Fenric",
+ "email": "[email protected]",
+ "homepage": "https://anatoly.fenric.ru/"
+ }
+ ],
  "require": {
  "php": "^7.1",
  "psr/http-factory": "^1.0",
  "psr/http-message": "^1.0",
+ "sunrise/http-header": "^1.0",
  "sunrise/stream": "^1.0",
  "sunrise/uri": "^1.0"
  },

src/Message.php

@@ -16,6 +16,7 @@
  */
 use Psr\Http\Message\MessageInterface;
 use Psr\Http\Message\StreamInterface;
+use Sunrise\Http\Header\HeaderInterface;
 
 /**
  * Hypertext Transfer Protocol Message
@@ -26,20 +27,6 @@
 class Message implements MessageInterface
 {
 
- /**
- * Regular Expression for a token validation
- *
- * @link https://tools.ietf.org/html/rfc7230#section-3.2
- */
- protected const RFC7230_TOKEN = '/^[\x21\x23-\x27\x2A\x2B\x2D\x2E\x30-\x39\x41-\x5A\x5E-\x7A\x7C\x7E]+$/';
-
- /**
- * Regular Expression for a field-value validation
- *
- * @link https://tools.ietf.org/html/rfc7230#section-3.2
- */
- protected const RFC7230_FIELD_VALUE = '/^[\x09\x20-\x7E\x80-\xFF]*$/';
-
  /**
  * Protocol version for the message
  *
@@ -247,7 +234,7 @@ protected function validateHeaderName($headerName) : void
  {
  throw new \InvalidArgumentException('Header name must be a string');
  }
- else if (! \preg_match(self::RFC7230_TOKEN, $headerName))
+ else if (! \preg_match(HeaderInterface::RFC7230_TOKEN, $headerName))
  {
  throw new \InvalidArgumentException(\sprintf('The given header name "%s" is not valid', $headerName));
  }
@@ -282,7 +269,7 @@ protected function validateHeaderValue($headerValue) : void
  {
  throw new \InvalidArgumentException('Header value must be a string or an array containing only strings');
  }
- else if (! \preg_match(self::RFC7230_FIELD_VALUE, $oneOf))
+ else if (! \preg_match(HeaderInterface::RFC7230_FIELD_VALUE, $oneOf))
  {
  throw new \InvalidArgumentException(\sprintf('The given header value "%s" is not valid', $oneOf));
  }

src/Request.php

@@ -16,6 +16,7 @@
  */
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\UriInterface;
+use Sunrise\Http\Header\HeaderInterface;
 
 /**
  * HTTP Request Message
@@ -168,7 +169,7 @@ protected function validateMethod($method) : void
  {
  throw new \InvalidArgumentException('HTTP method must be a string');
  }
- else if (! \preg_match(self::RFC7230_TOKEN, $method))
+ else if (! \preg_match(HeaderInterface::RFC7230_TOKEN, $method))
  {
  throw new \InvalidArgumentException(\sprintf('The given method "%s" is not valid', $method));
  }

src/Response.php

@@ -15,6 +15,7 @@
  * Import classes
  */
 use Psr\Http\Message\ResponseInterface;
+use Sunrise\Http\Header\HeaderInterface;
 
 /**
  * HTTP Response Message
@@ -116,7 +117,7 @@ protected function validateReasonPhrase($reasonPhrase) : void
  {
  throw new \InvalidArgumentException('HTTP reason-phrase must be a string');
  }
- else if (! \preg_match(self::RFC7230_FIELD_VALUE, $reasonPhrase))
+ else if (! \preg_match(HeaderInterface::RFC7230_FIELD_VALUE, $reasonPhrase))
  {
  throw new \InvalidArgumentException(\sprintf('The given reason-phrase "%s" is not valid', $reasonPhrase));
  }