Normalizing header key consistency

src/Helpers/server.php

@@ -56,7 +56,7 @@ function getallheaders(): array
 
         foreach ($data as $key => $value) {
             if (substr($key, 0, 5) == 'HTTP_') {
-                $headers[str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($key, 5)))))] = $value;
+                $headers[str_replace(' ', '-', strtolower(str_replace('_', ' ', substr($key, 5))))] = $value;
             }
         }
 

src/Http/Request/Header.php

@@ -32,10 +32,12 @@ trait Header
      * @param string $key
      * @return bool
      */
-    public static function hasHeader(string $key): bool
-    {
-        return isset(self::$__headers[strtolower($key)]);
-    }
+	  public static function hasHeader(string $key): bool
+	  {
+	  	  list($keyWithHyphens, $keyWithUnderscores) = self::normalizeHeaderKey($key);
+
+	  	  return isset(self::$__headers[$keyWithHyphens]) || isset(self::$__headers[$keyWithUnderscores]);
+	  }
 
     /**
      * Gets the request header by given key
@@ -44,7 +46,14 @@ public static function hasHeader(string $key): bool
      */
     public static function getHeader(string $key): ?string
     {
-        return self::hasHeader($key) ? self::$__headers[strtolower($key)] : null;
+	      list($keyWithHyphens, $keyWithUnderscores) = self::normalizeHeaderKey($key);
+
+	      if (array_key_exists($keyWithHyphens, self::$__headers)) {
+		        return self::$__headers[$keyWithHyphens];
+	      } elseif (array_key_exists($keyWithUnderscores, self::$__headers)) {
+		        return self::$__headers[$keyWithUnderscores];
+	      }
+	      return null;
     }
 
     /**
@@ -77,4 +86,14 @@ public static function deleteHeader(string $key)
         }
     }
 
+	  /**
+	   * @param string $key
+	   * @return array
+	   */
+	  private static function normalizeHeaderKey(string $key): array
+	  {
+	  	$keyWithHyphens = str_replace('_', '-', strtolower($key));
+	  	$keyWithUnderscores = str_replace('-', '_', $key);
+	  	return [$keyWithHyphens, $keyWithUnderscores];
+	  }
 }