Updated of the Headers class implementation

slimphp · Aug 10, 2019 · 5f8a1fb · 5f8a1fb
1 parent b980d3c
commit 5f8a1fb
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/Headers.php b/src/Headers.php
@@ -37,7 +37,7 @@ public function __construct(array $headers = [], ?array $globals = null)
     /**
      * {@inheritdoc}
      */
-    public function addHeader(string $name, $value): HeadersInterface
+    public function addHeader($name, $value): HeadersInterface
     {
         [$values, $originalName, $normalizedName] = $this->prepareHeader($name, $value);
 
@@ -84,7 +84,7 @@ public function getHeader(string $name, $default = []): array
     /**
      * {@inheritdoc}
      */
-    public function setHeader(string $name, $value): HeadersInterface
+    public function setHeader($name, $value): HeadersInterface
     {
         [$values, $originalName, $normalizedName] = $this->prepareHeader($name, $value);
 
@@ -202,7 +202,7 @@ protected function trimHeaderValue($value): array
      *
      * @return array
      */
-    protected function prepareHeader(string $name, $value): array
+    protected function prepareHeader($name, $value): array
     {
         $this->validateHeader($name, $value);
         $values = $this->trimHeaderValue($value);
@@ -234,18 +234,18 @@ protected function prepareHeader(string $name, $value): array
      *
      * @throws InvalidArgumentException;
      */
-    protected function validateHeader(string $name, $value)
+    protected function validateHeader($name, $value)
     {
-        self::validateHeaderName($name);
-        self::validateHeaderValue($value);
+        $this->validateHeaderName($name);
+        $this->validateHeaderValue($value);
     }
 
     /**
      * @param mixed $name
      *
      * @throws InvalidArgumentException
      */
-    public static function validateHeaderName($name)
+    protected function validateHeaderName($name)
     {
         if (!is_string($name) || preg_match("@^[!#$%&'*+.^_`|~0-9A-Za-z-]+$@", $name) !== 1) {
             throw new InvalidArgumentException('Header name must be an RFC 7230 compatible string.');
@@ -257,7 +257,7 @@ public static function validateHeaderName($name)
      *
      * @throws InvalidArgumentException
      */
-    public static function validateHeaderValue($value)
+    protected function validateHeaderValue($value)
     {
         $items = is_array($value) ? $value : [$value];