sunrise-php / http-message

functions/server_request_files.php

Indentation +40 added lines, -40 removed lines

@@ -42,50 +42,50 @@
  */
 function server_request_files(?array $files = null): array
 {
-    $files ??= $_FILES;
+	$files ??= $_FILES;
 
-    $walker = function ($path, $size, $error, $name, $type) use (&$walker) {
-        if (!is_array($path)) {
-            // What if the path is an empty string?
-            $stream = new FileStream($path, 'rb');
+	$walker = function ($path, $size, $error, $name, $type) use (&$walker) {
+		if (!is_array($path)) {
+			// What if the path is an empty string?
+			$stream = new FileStream($path, 'rb');
 
-            return new UploadedFile(
-                $stream,
-                $size,
-                $error,
-                $name,
-                $type
-            );
-        }
+			return new UploadedFile(
+				$stream,
+				$size,
+				$error,
+				$name,
+				$type
+			);
+		}
 
-        $result = [];
-        foreach ($path as $key => $_) {
-            if (UPLOAD_ERR_NO_FILE <> $error[$key]) {
-                $result[$key] = $walker(
-                    $path[$key],
-                    $size[$key],
-                    $error[$key],
-                    $name[$key],
-                    $type[$key]
-                );
-            }
-        }
+		$result = [];
+		foreach ($path as $key => $_) {
+			if (UPLOAD_ERR_NO_FILE <> $error[$key]) {
+				$result[$key] = $walker(
+					$path[$key],
+					$size[$key],
+					$error[$key],
+					$name[$key],
+					$type[$key]
+				);
+			}
+		}
 
-        return $result;
-    };
+		return $result;
+	};
 
-    $result = [];
-    foreach ($files as $key => $file) {
-        if (UPLOAD_ERR_NO_FILE <> $file['error']) {
-            $result[$key] = $walker(
-                $file['tmp_name'],
-                $file['size'],
-                $file['error'],
-                $file['name'],
-                $file['type']
-            );
-        }
-    }
+	$result = [];
+	foreach ($files as $key => $file) {
+		if (UPLOAD_ERR_NO_FILE <> $file['error']) {
+			$result[$key] = $walker(
+				$file['tmp_name'],
+				$file['size'],
+				$file['error'],
+				$file['name'],
+				$file['type']
+			);
+		}
+	}
 
-    return $result;
+	return $result;
 }

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 {
     $files ??= $_FILES;
 
-    $walker = function ($path, $size, $error, $name, $type) use (&$walker) {
+    $walker = function($path, $size, $error, $name, $type) use (&$walker) {
         if (!is_array($path)) {
             // What if the path is an empty string?
             $stream = new FileStream($path, 'rb');

functions/header_accept_parse.php

Indentation +101 added lines, -101 removed lines

@@ -25,105 +25,105 @@
  */
 function header_accept_parse(string $header): array
 {
-    static $cache = [];
-
-    if (isset($cache[$header])) {
-        return $cache[$header];
-    }
-
-    $cursor = -1;
-    $cursorInValue = true;
-    $cursorInParameter = false;
-    $cursorInParameterName = false;
-    $cursorInParameterValue = false;
-    $cursorInQuotedParameterValue = false;
-
-    $data = [];
-    $valueIndex = 0;
-    $parameterIndex = 0;
-
-    while (true) {
-        $char = $header[++$cursor] ?? null;
-        $prev = $header[$cursor-1] ?? null;
-        $next = $header[$cursor+1] ?? null;
-
-        if ($char === null) {
-            break;
-        }
-
-        if ($char === ' ' && !$cursorInQuotedParameterValue) {
-            continue;
-        }
-
-        if ($char === ',' && !$cursorInQuotedParameterValue) {
-            $cursorInValue = true;
-            $cursorInParameter = false;
-            $cursorInParameterName = false;
-            $cursorInParameterValue = false;
-            $cursorInQuotedParameterValue = false;
-            $parameterIndex = 0;
-            $valueIndex++;
-            continue;
-        }
-        if ($char === ';' && !$cursorInQuotedParameterValue) {
-            $cursorInValue = false;
-            $cursorInParameter = true;
-            $cursorInParameterName = true;
-            $cursorInParameterValue = false;
-            $cursorInQuotedParameterValue = false;
-            $parameterIndex++;
-            continue;
-        }
-        if ($char === '=' && !$cursorInQuotedParameterValue && $cursorInParameterName) {
-            $cursorInValue = false;
-            $cursorInParameter = true;
-            $cursorInParameterName = false;
-            $cursorInParameterValue = true;
-            $cursorInQuotedParameterValue = false;
-            continue;
-        }
-
-        if ($char === '"' && !$cursorInQuotedParameterValue && $cursorInParameterValue) {
-            $cursorInQuotedParameterValue = true;
-            continue;
-        }
-        if ($char === '\\' && $next === '"' && $cursorInQuotedParameterValue) {
-            continue;
-        }
-        if ($char === '"' && $prev !== '\\' && $cursorInQuotedParameterValue) {
-            $cursorInParameterValue = false;
-            $cursorInQuotedParameterValue = false;
-            continue;
-        }
-
-        if ($cursorInValue) {
-            $data[$valueIndex][0] ??= '';
-            $data[$valueIndex][0] .= $char;
-            continue;
-        }
-        if ($cursorInParameterName && isset($data[$valueIndex][0])) {
-            $data[$valueIndex][1][$parameterIndex][0] ??= '';
-            $data[$valueIndex][1][$parameterIndex][0] .= $char;
-            continue;
-        }
-        if ($cursorInParameterValue && isset($data[$valueIndex][1][$parameterIndex][0])) {
-            $data[$valueIndex][1][$parameterIndex][1] ??= '';
-            $data[$valueIndex][1][$parameterIndex][1] .= $char;
-            continue;
-        }
-    }
-
-    $result = [];
-    foreach ($data as $item) {
-        $result[$item[0]] = [];
-        if (isset($item[1])) {
-            foreach ($item[1] as $param) {
-                $result[$item[0]][$param[0]] = $param[1] ?? '';
-            }
-        }
-    }
-
-    uasort($result, fn(array $a, array $b): int => ($b['q'] ?? 1) <=> ($a['q'] ?? 1));
-
-    return $cache[$header] = $result;
+	static $cache = [];
+
+	if (isset($cache[$header])) {
+		return $cache[$header];
+	}
+
+	$cursor = -1;
+	$cursorInValue = true;
+	$cursorInParameter = false;
+	$cursorInParameterName = false;
+	$cursorInParameterValue = false;
+	$cursorInQuotedParameterValue = false;
+
+	$data = [];
+	$valueIndex = 0;
+	$parameterIndex = 0;
+
+	while (true) {
+		$char = $header[++$cursor] ?? null;
+		$prev = $header[$cursor-1] ?? null;
+		$next = $header[$cursor+1] ?? null;
+
+		if ($char === null) {
+			break;
+		}
+
+		if ($char === ' ' && !$cursorInQuotedParameterValue) {
+			continue;
+		}
+
+		if ($char === ',' && !$cursorInQuotedParameterValue) {
+			$cursorInValue = true;
+			$cursorInParameter = false;
+			$cursorInParameterName = false;
+			$cursorInParameterValue = false;
+			$cursorInQuotedParameterValue = false;
+			$parameterIndex = 0;
+			$valueIndex++;
+			continue;
+		}
+		if ($char === ';' && !$cursorInQuotedParameterValue) {
+			$cursorInValue = false;
+			$cursorInParameter = true;
+			$cursorInParameterName = true;
+			$cursorInParameterValue = false;
+			$cursorInQuotedParameterValue = false;
+			$parameterIndex++;
+			continue;
+		}
+		if ($char === '=' && !$cursorInQuotedParameterValue && $cursorInParameterName) {
+			$cursorInValue = false;
+			$cursorInParameter = true;
+			$cursorInParameterName = false;
+			$cursorInParameterValue = true;
+			$cursorInQuotedParameterValue = false;
+			continue;
+		}
+
+		if ($char === '"' && !$cursorInQuotedParameterValue && $cursorInParameterValue) {
+			$cursorInQuotedParameterValue = true;
+			continue;
+		}
+		if ($char === '\\' && $next === '"' && $cursorInQuotedParameterValue) {
+			continue;
+		}
+		if ($char === '"' && $prev !== '\\' && $cursorInQuotedParameterValue) {
+			$cursorInParameterValue = false;
+			$cursorInQuotedParameterValue = false;
+			continue;
+		}
+
+		if ($cursorInValue) {
+			$data[$valueIndex][0] ??= '';
+			$data[$valueIndex][0] .= $char;
+			continue;
+		}
+		if ($cursorInParameterName && isset($data[$valueIndex][0])) {
+			$data[$valueIndex][1][$parameterIndex][0] ??= '';
+			$data[$valueIndex][1][$parameterIndex][0] .= $char;
+			continue;
+		}
+		if ($cursorInParameterValue && isset($data[$valueIndex][1][$parameterIndex][0])) {
+			$data[$valueIndex][1][$parameterIndex][1] ??= '';
+			$data[$valueIndex][1][$parameterIndex][1] .= $char;
+			continue;
+		}
+	}
+
+	$result = [];
+	foreach ($data as $item) {
+		$result[$item[0]] = [];
+		if (isset($item[1])) {
+			foreach ($item[1] as $param) {
+				$result[$item[0]][$param[0]] = $param[1] ?? '';
+			}
+		}
+	}
+
+	uasort($result, fn(array $a, array $b): int => ($b['q'] ?? 1) <=> ($a['q'] ?? 1));
+
+	return $cache[$header] = $result;
 }

Spacing +2 added lines, -2 removed lines

@@ -44,8 +44,8 @@
 
     while (true) {
         $char = $header[++$cursor] ?? null;
-        $prev = $header[$cursor-1] ?? null;
-        $next = $header[$cursor+1] ?? null;
+        $prev = $header[$cursor - 1] ?? null;
+        $next = $header[$cursor + 1] ?? null;
 
         if ($char === null) {
             break;

src/Header.php

Indentation +200 added lines, -200 removed lines

@@ -36,222 +36,222 @@
 abstract class Header implements HeaderInterface
 {
 
-    /**
-     * Regular Expression for a token validation
-     *
-     * @link https://tools.ietf.org/html/rfc7230#section-3.2
-     *
-     * @var string
-     */
-    public const RFC7230_VALID_TOKEN = '/^[\x21\x23-\x27\x2A\x2B\x2D\x2E\x30-\x39\x41-\x5A\x5E-\x7A\x7C\x7E]+$/';
+	/**
+	 * Regular Expression for a token validation
+	 *
+	 * @link https://tools.ietf.org/html/rfc7230#section-3.2
+	 *
+	 * @var string
+	 */
+	public const RFC7230_VALID_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
-     *
-     * @var string
-     */
-    public const RFC7230_VALID_FIELD_VALUE = '/^[\x09\x20-\x7E\x80-\xFF]*$/';
+	/**
+	 * Regular Expression for a field value validation
+	 *
+	 * @link https://tools.ietf.org/html/rfc7230#section-3.2
+	 *
+	 * @var string
+	 */
+	public const RFC7230_VALID_FIELD_VALUE = '/^[\x09\x20-\x7E\x80-\xFF]*$/';
 
-    /**
-     * Regular Expression for a quoted string validation
-     *
-     * @link https://tools.ietf.org/html/rfc7230#section-3.2
-     *
-     * @var string
-     */
-    public const RFC7230_VALID_QUOTED_STRING = '/^[\x09\x20\x21\x23-\x5B\x5D-\x7E\x80-\xFF]*$/';
+	/**
+	 * Regular Expression for a quoted string validation
+	 *
+	 * @link https://tools.ietf.org/html/rfc7230#section-3.2
+	 *
+	 * @var string
+	 */
+	public const RFC7230_VALID_QUOTED_STRING = '/^[\x09\x20\x21\x23-\x5B\x5D-\x7E\x80-\xFF]*$/';
 
-    /**
-     * Date and time format
-     *
-     * @link https://www.rfc-editor.org/rfc/rfc822#section-5
-     *
-     * @var string
-     */
-    public const RFC822_DATE_TIME_FORMAT = 'D, d M y H:i:s O';
+	/**
+	 * Date and time format
+	 *
+	 * @link https://www.rfc-editor.org/rfc/rfc822#section-5
+	 *
+	 * @var string
+	 */
+	public const RFC822_DATE_TIME_FORMAT = 'D, d M y H:i:s O';
 
-    /**
-     * {@inheritdoc}
-     */
-    final public function getIterator(): Traversable
-    {
-        yield $this->getFieldName();
-        yield $this->getFieldValue();
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	final public function getIterator(): Traversable
+	{
+		yield $this->getFieldName();
+		yield $this->getFieldValue();
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    final public function __toString(): string
-    {
-        return sprintf('%s: %s', $this->getFieldName(), $this->getFieldValue());
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	final public function __toString(): string
+	{
+		return sprintf('%s: %s', $this->getFieldName(), $this->getFieldValue());
+	}
 
-    /**
-     * Checks if the given string is a token
-     *
-     * @param string $token
-     *
-     * @return bool
-     */
-    final protected function isToken(string $token): bool
-    {
-        return preg_match(self::RFC7230_VALID_TOKEN, $token) === 1;
-    }
+	/**
+	 * Checks if the given string is a token
+	 *
+	 * @param string $token
+	 *
+	 * @return bool
+	 */
+	final protected function isToken(string $token): bool
+	{
+		return preg_match(self::RFC7230_VALID_TOKEN, $token) === 1;
+	}
 
-    /**
-     * Validates the given token(s)
-     *
-     * @param string ...$tokens
-     *
-     * @return void
-     *
-     * @throws InvalidHeaderException
-     *         If one of the tokens isn't valid.
-     */
-    final protected function validateToken(string ...$tokens): void
-    {
-        $this->validateValueByRegex(self::RFC7230_VALID_TOKEN, ...$tokens);
-    }
+	/**
+	 * Validates the given token(s)
+	 *
+	 * @param string ...$tokens
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidHeaderException
+	 *         If one of the tokens isn't valid.
+	 */
+	final protected function validateToken(string ...$tokens): void
+	{
+		$this->validateValueByRegex(self::RFC7230_VALID_TOKEN, ...$tokens);
+	}
 
-    /**
-     * Validates the given field value(s)
-     *
-     * @param string ...$fieldValues
-     *
-     * @return void
-     *
-     * @throws InvalidHeaderException
-     *         If one of the field values isn't valid.
-     */
-    final protected function validateFieldValue(string ...$fieldValues): void
-    {
-        $this->validateValueByRegex(self::RFC7230_VALID_FIELD_VALUE, ...$fieldValues);
-    }
+	/**
+	 * Validates the given field value(s)
+	 *
+	 * @param string ...$fieldValues
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidHeaderException
+	 *         If one of the field values isn't valid.
+	 */
+	final protected function validateFieldValue(string ...$fieldValues): void
+	{
+		$this->validateValueByRegex(self::RFC7230_VALID_FIELD_VALUE, ...$fieldValues);
+	}
 
-    /**
-     * Validates the given quoted string(s)
-     *
-     * @param string ...$quotedStrings
-     *
-     * @return void
-     *
-     * @throws InvalidHeaderException
-     *         If one of the quoted strings isn't valid.
-     */
-    final protected function validateQuotedString(string ...$quotedStrings): void
-    {
-        $this->validateValueByRegex(self::RFC7230_VALID_QUOTED_STRING, ...$quotedStrings);
-    }
+	/**
+	 * Validates the given quoted string(s)
+	 *
+	 * @param string ...$quotedStrings
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidHeaderException
+	 *         If one of the quoted strings isn't valid.
+	 */
+	final protected function validateQuotedString(string ...$quotedStrings): void
+	{
+		$this->validateValueByRegex(self::RFC7230_VALID_QUOTED_STRING, ...$quotedStrings);
+	}
 
-    /**
-     * Validates and normalizes the given parameters
-     *
-     * @param array<array-key, mixed> $parameters
-     *
-     * @return array<string, string>
-     *         The normalized parameters.
-     *
-     * @throws InvalidHeaderException
-     *         If one of the parameters isn't valid.
-     */
-    final protected function validateParameters(array $parameters): array
-    {
-        return $this->validateParametersByRegex(
-            $parameters,
-            self::RFC7230_VALID_TOKEN,
-            self::RFC7230_VALID_QUOTED_STRING
-        );
-    }
+	/**
+	 * Validates and normalizes the given parameters
+	 *
+	 * @param array<array-key, mixed> $parameters
+	 *
+	 * @return array<string, string>
+	 *         The normalized parameters.
+	 *
+	 * @throws InvalidHeaderException
+	 *         If one of the parameters isn't valid.
+	 */
+	final protected function validateParameters(array $parameters): array
+	{
+		return $this->validateParametersByRegex(
+			$parameters,
+			self::RFC7230_VALID_TOKEN,
+			self::RFC7230_VALID_QUOTED_STRING
+		);
+	}
 
-    /**
-     * Validates the given value(s) by the given regular expression
-     *
-     * @param string $regex
-     * @param string ...$values
-     *
-     * @return void
-     *
-     * @throws InvalidHeaderException
-     *         If one of the values isn't valid.
-     */
-    final protected function validateValueByRegex(string $regex, string ...$values): void
-    {
-        foreach ($values as $value) {
-            if (!preg_match($regex, $value)) {
-                throw new InvalidHeaderException(sprintf(
-                    'The value "%2$s" for the header "%1$s" is not valid',
-                    $this->getFieldName(),
-                    $value
-                ));
-            }
-        }
-    }
+	/**
+	 * Validates the given value(s) by the given regular expression
+	 *
+	 * @param string $regex
+	 * @param string ...$values
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidHeaderException
+	 *         If one of the values isn't valid.
+	 */
+	final protected function validateValueByRegex(string $regex, string ...$values): void
+	{
+		foreach ($values as $value) {
+			if (!preg_match($regex, $value)) {
+				throw new InvalidHeaderException(sprintf(
+					'The value "%2$s" for the header "%1$s" is not valid',
+					$this->getFieldName(),
+					$value
+				));
+			}
+		}
+	}
 
-    /**
-     * Validates and normalizes the given parameters by the given regular expressions
-     *
-     * @param array<array-key, mixed> $parameters
-     * @param string $nameRegex
-     * @param string $valueRegex
-     *
-     * @return array<string, string>
-     *         The normalized parameters.
-     *
-     * @throws InvalidHeaderException
-     *         If one of the parameters isn't valid.
-     */
-    final protected function validateParametersByRegex(array $parameters, string $nameRegex, string $valueRegex): array
-    {
-        foreach ($parameters as $name => &$value) {
-            if (!is_string($name) || !preg_match($nameRegex, $name)) {
-                throw new InvalidHeaderException(sprintf(
-                    'The parameter name "%2$s" for the header "%1$s" is not valid',
-                    $this->getFieldName(),
-                    (is_string($name) ? $name : ('<' . gettype($name) . '>'))
-                ));
-            }
+	/**
+	 * Validates and normalizes the given parameters by the given regular expressions
+	 *
+	 * @param array<array-key, mixed> $parameters
+	 * @param string $nameRegex
+	 * @param string $valueRegex
+	 *
+	 * @return array<string, string>
+	 *         The normalized parameters.
+	 *
+	 * @throws InvalidHeaderException
+	 *         If one of the parameters isn't valid.
+	 */
+	final protected function validateParametersByRegex(array $parameters, string $nameRegex, string $valueRegex): array
+	{
+		foreach ($parameters as $name => &$value) {
+			if (!is_string($name) || !preg_match($nameRegex, $name)) {
+				throw new InvalidHeaderException(sprintf(
+					'The parameter name "%2$s" for the header "%1$s" is not valid',
+					$this->getFieldName(),
+					(is_string($name) ? $name : ('<' . gettype($name) . '>'))
+				));
+			}
 
-            // e.g. Cache-Control: max-age=31536000
-            if (is_int($value)) {
-                $value = (string) $value;
-            }
+			// e.g. Cache-Control: max-age=31536000
+			if (is_int($value)) {
+				$value = (string) $value;
+			}
 
-            if (!is_string($value) || !preg_match($valueRegex, $value)) {
-                throw new InvalidHeaderException(sprintf(
-                    'The parameter value "%2$s" for the header "%1$s" is not valid',
-                    $this->getFieldName(),
-                    (is_string($value) ? $value : ('<' . gettype($value) . '>'))
-                ));
-            }
-        }
+			if (!is_string($value) || !preg_match($valueRegex, $value)) {
+				throw new InvalidHeaderException(sprintf(
+					'The parameter value "%2$s" for the header "%1$s" is not valid',
+					$this->getFieldName(),
+					(is_string($value) ? $value : ('<' . gettype($value) . '>'))
+				));
+			}
+		}
 
-        /** @var array<string, string> $parameters */
+		/** @var array<string, string> $parameters */
 
-        return $parameters;
-    }
+		return $parameters;
+	}
 
-    /**
-     * Formats the given date-time object
-     *
-     * @link https://tools.ietf.org/html/rfc7230#section-3.2
-     *
-     * @param DateTimeInterface $dateTime
-     *
-     * @return string
-     */
-    final protected function formatDateTime(DateTimeInterface $dateTime): string
-    {
-        if ($dateTime instanceof DateTime) {
-            return (clone $dateTime)
-                ->setTimezone(new DateTimeZone('GMT'))
-                ->format(self::RFC822_DATE_TIME_FORMAT);
-        }
+	/**
+	 * Formats the given date-time object
+	 *
+	 * @link https://tools.ietf.org/html/rfc7230#section-3.2
+	 *
+	 * @param DateTimeInterface $dateTime
+	 *
+	 * @return string
+	 */
+	final protected function formatDateTime(DateTimeInterface $dateTime): string
+	{
+		if ($dateTime instanceof DateTime) {
+			return (clone $dateTime)
+				->setTimezone(new DateTimeZone('GMT'))
+				->format(self::RFC822_DATE_TIME_FORMAT);
+		}
 
-        return $dateTime
-            ->setTimezone(new DateTimeZone('GMT'))
-            ->format(self::RFC822_DATE_TIME_FORMAT);
-    }
+		return $dateTime
+			->setTimezone(new DateTimeZone('GMT'))
+			->format(self::RFC822_DATE_TIME_FORMAT);
+	}
 }

src/ServerRequestProxy.php

Indentation +578 added lines, -578 removed lines

@@ -38,582 +38,582 @@
 final class ServerRequestProxy implements ServerRequestInterface, RequestMethodInterface
 {
 
-    /**
-     * @var ServerRequestInterface
-     */
-    private ServerRequestInterface $request;
-
-    /**
-     * Constructor of the class
-     *
-     * @param ServerRequestInterface $request
-     */
-    public function __construct(ServerRequestInterface $request)
-    {
-        $this->request = $request;
-    }
-
-    /**
-     * Creates the proxy from the given object
-     *
-     * @param ServerRequestInterface $request
-     *
-     * @return self
-     */
-    public static function create(ServerRequestInterface $request): self
-    {
-        if ($request instanceof self) {
-            return $request;
-        }
-
-        return new self($request);
-    }
-
-    /**
-     * Checks if the request is JSON
-     *
-     * @link https://tools.ietf.org/html/rfc4627
-     *
-     * @return bool
-     */
-    public function isJson(): bool
-    {
-        return $this->clientProducesMediaType([
-            'application/json',
-        ]);
-    }
-
-    /**
-     * Checks if the request is XML
-     *
-     * @link https://tools.ietf.org/html/rfc2376
-     *
-     * @return bool
-     */
-    public function isXml(): bool
-    {
-        return $this->clientProducesMediaType([
-            'application/xml',
-            'text/xml',
-        ]);
-    }
-
-    /**
-     * Gets the client's IP address
-     *
-     * @param array<string, string> $proxyChain
-     *
-     * @return IpAddress
-     */
-    public function getClientIpAddress(array $proxyChain = []): IpAddress
-    {
-        $env = $this->request->getServerParams();
-
-        /** @var string */
-        $client = $env['REMOTE_ADDR'] ?? '::1';
-
-        /** @var list<string> */
-        $proxies = [];
-
-        while (isset($proxyChain[$client])) {
-            $proxyHeader = $proxyChain[$client];
-            unset($proxyChain[$client]);
-
-            $header = $this->request->getHeaderLine($proxyHeader);
-            if ($header === '') {
-                break;
-            }
-
-            $addresses = explode(',', $header);
-            foreach ($addresses as $i => $address) {
-                $addresses[$i] = trim($address);
-                if ($addresses[$i] === '') {
-                    unset($addresses[$i]);
-                }
-            }
-
-            if ($addresses === []) {
-                break;
-            }
-
-            $client = reset($addresses);
-            unset($addresses[key($addresses)]);
-
-            foreach ($addresses as $address) {
-                $proxies[] = $address;
-            }
-        }
-
-        return new IpAddress($client, $proxies);
-    }
-
-    /**
-     * Gets the client's produced media type
-     *
-     * @link https://tools.ietf.org/html/rfc7231#section-3.1.1.1
-     * @link https://tools.ietf.org/html/rfc7231#section-3.1.1.5
-     *
-     * @return string
-     */
-    public function getClientProducedMediaType(): string
-    {
-        $header = $this->request->getHeaderLine('Content-Type');
-        if ($header === '') {
-            return '';
-        }
-
-        $result = strstr($header, ';', true);
-        if ($result === false) {
-            $result = $header;
-        }
-
-        $result = trim($result);
-        if ($result === '') {
-            return '';
-        }
-
-        return strtolower($result);
-    }
-
-    /**
-     * Gets the client's consumed media types
-     *
-     * @link https://tools.ietf.org/html/rfc7231#section-1.2
-     * @link https://tools.ietf.org/html/rfc7231#section-3.1.1.1
-     * @link https://tools.ietf.org/html/rfc7231#section-5.3.2
-     *
-     * @return array<string, array<string, string>>
-     */
-    public function getClientConsumedMediaTypes(): array
-    {
-        $header = $this->request->getHeaderLine('Accept');
-        if ($header === '') {
-            return [];
-        }
-
-        $accept = header_accept_parse($header);
-        if ($accept === []) {
-            return [];
-        }
-
-        $result = [];
-        foreach ($accept as $type => $params) {
-            $result[strtolower($type)] = $params;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Gets the client's consumed encodings
-     *
-     * @return array<string, array<string, string>>
-     */
-    public function getClientConsumedEncodings(): array
-    {
-        $header = $this->request->getHeaderLine('Accept-Encoding');
-        if ($header === '') {
-            return [];
-        }
-
-        $accept = header_accept_parse($header);
-        if ($accept === []) {
-            return [];
-        }
-
-        return $accept;
-    }
-
-    /**
-     * Gets the client's consumed languages
-     *
-     * @return array<string, array<string, string>>
-     */
-    public function getClientConsumedLanguages(): array
-    {
-        $header = $this->request->getHeaderLine('Accept-Language');
-        if ($header === '') {
-            return [];
-        }
-
-        $accept = header_accept_parse($header);
-        if ($accept === []) {
-            return [];
-        }
-
-        return $accept;
-    }
-
-    /**
-     * Checks if the client produces one of the given media types
-     *
-     * @param list<string> $consumes
-     *
-     * @return bool
-     */
-    public function clientProducesMediaType(array $consumes): bool
-    {
-        if ($consumes === []) {
-            return true;
-        }
-
-        $produced = $this->getClientProducedMediaType();
-        if ($produced === '') {
-            return false;
-        }
-
-        foreach ($consumes as $consumed) {
-            if ($this->equalsMediaTypes($consumed, $produced)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Checks if the client consumes one of the given media types
-     *
-     * @param list<string> $produces
-     *
-     * @return bool
-     */
-    public function clientConsumesMediaType(array $produces): bool
-    {
-        if ($produces === []) {
-            return true;
-        }
-
-        $consumes = $this->getClientConsumedMediaTypes();
-        if ($consumes === []) {
-            return true;
-        }
-
-        if (isset($consumes['*/*'])) {
-            return true;
-        }
-
-        foreach ($produces as $a) {
-            foreach ($consumes as $b => $_) {
-                if ($this->equalsMediaTypes($a, $b)) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Checks if the given media types are equal
-     *
-     * @param string $a
-     * @param string $b
-     *
-     * @return bool
-     */
-    public function equalsMediaTypes(string $a, string $b): bool
-    {
-        if ($a === $b) {
-            return true;
-        }
-
-        $slash = strpos($a, '/');
-        if ($slash === false || !isset($b[$slash]) || $b[$slash] !== '/') {
-            return false;
-        }
-
-        $star = $slash + 1;
-        if (!isset($a[$star], $b[$star])) {
-            return false;
-        }
-
-        if (!($a[$star] === '*' || $b[$star] === '*')) {
-            return false;
-        }
-
-        return strncmp($a, $b, $star) === 0;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getProtocolVersion(): string
-    {
-        return $this->request->getProtocolVersion();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withProtocolVersion($version)
-    {
-        $clone = clone $this;
-        $clone->request = $clone->request->withProtocolVersion($version);
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getHeaders(): array
-    {
-        return $this->request->getHeaders();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function hasHeader($name): bool
-    {
-        return $this->request->hasHeader($name);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getHeader($name): array
-    {
-        return $this->request->getHeader($name);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getHeaderLine($name): string
-    {
-        return $this->request->getHeaderLine($name);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withHeader($name, $value)
-    {
-        $clone = clone $this;
-        $clone->request = $clone->request->withHeader($name, $value);
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withAddedHeader($name, $value)
-    {
-        $clone = clone $this;
-        $clone->request = $clone->request->withAddedHeader($name, $value);
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withoutHeader($name)
-    {
-        $clone = clone $this;
-        $clone->request = $clone->request->withoutHeader($name);
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getBody(): StreamInterface
-    {
-        return $this->request->getBody();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withBody(StreamInterface $body)
-    {
-        $clone = clone $this;
-        $clone->request = $clone->request->withBody($body);
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMethod(): string
-    {
-        return $this->request->getMethod();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withMethod($method)
-    {
-        $clone = clone $this;
-        $clone->request = $clone->request->withMethod($method);
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUri(): UriInterface
-    {
-        return $this->request->getUri();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withUri(UriInterface $uri, $preserveHost = false)
-    {
-        $clone = clone $this;
-        $clone->request = $clone->request->withUri($uri, $preserveHost);
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getRequestTarget(): string
-    {
-        return $this->request->getRequestTarget();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withRequestTarget($requestTarget)
-    {
-        $clone = clone $this;
-        $clone->request = $clone->request->withRequestTarget($requestTarget);
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getServerParams(): array
-    {
-        return $this->request->getServerParams();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getQueryParams(): array
-    {
-        return $this->request->getQueryParams();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withQueryParams(array $query)
-    {
-        $clone = clone $this;
-        $clone->request = $clone->request->withQueryParams($query);
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getCookieParams(): array
-    {
-        return $this->request->getCookieParams();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withCookieParams(array $cookies)
-    {
-        $clone = clone $this;
-        $clone->request = $clone->request->withCookieParams($cookies);
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUploadedFiles(): array
-    {
-        return $this->request->getUploadedFiles();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withUploadedFiles(array $uploadedFiles)
-    {
-        $clone = clone $this;
-        $clone->request = $clone->request->withUploadedFiles($uploadedFiles);
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getParsedBody()
-    {
-        return $this->request->getParsedBody();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withParsedBody($data)
-    {
-        $clone = clone $this;
-        $clone->request = $clone->request->withParsedBody($data);
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getAttributes(): array
-    {
-        return $this->request->getAttributes();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getAttribute($name, $default = null)
-    {
-        return $this->request->getAttribute($name, $default);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withAttribute($name, $value)
-    {
-        $clone = clone $this;
-        $clone->request = $clone->request->withAttribute($name, $value);
-
-        return $clone;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function withoutAttribute($name)
-    {
-        $clone = clone $this;
-        $clone->request = $clone->request->withoutAttribute($name);
-
-        return $clone;
-    }
+	/**
+	 * @var ServerRequestInterface
+	 */
+	private ServerRequestInterface $request;
+
+	/**
+	 * Constructor of the class
+	 *
+	 * @param ServerRequestInterface $request
+	 */
+	public function __construct(ServerRequestInterface $request)
+	{
+		$this->request = $request;
+	}
+
+	/**
+	 * Creates the proxy from the given object
+	 *
+	 * @param ServerRequestInterface $request
+	 *
+	 * @return self
+	 */
+	public static function create(ServerRequestInterface $request): self
+	{
+		if ($request instanceof self) {
+			return $request;
+		}
+
+		return new self($request);
+	}
+
+	/**
+	 * Checks if the request is JSON
+	 *
+	 * @link https://tools.ietf.org/html/rfc4627
+	 *
+	 * @return bool
+	 */
+	public function isJson(): bool
+	{
+		return $this->clientProducesMediaType([
+			'application/json',
+		]);
+	}
+
+	/**
+	 * Checks if the request is XML
+	 *
+	 * @link https://tools.ietf.org/html/rfc2376
+	 *
+	 * @return bool
+	 */
+	public function isXml(): bool
+	{
+		return $this->clientProducesMediaType([
+			'application/xml',
+			'text/xml',
+		]);
+	}
+
+	/**
+	 * Gets the client's IP address
+	 *
+	 * @param array<string, string> $proxyChain
+	 *
+	 * @return IpAddress
+	 */
+	public function getClientIpAddress(array $proxyChain = []): IpAddress
+	{
+		$env = $this->request->getServerParams();
+
+		/** @var string */
+		$client = $env['REMOTE_ADDR'] ?? '::1';
+
+		/** @var list<string> */
+		$proxies = [];
+
+		while (isset($proxyChain[$client])) {
+			$proxyHeader = $proxyChain[$client];
+			unset($proxyChain[$client]);
+
+			$header = $this->request->getHeaderLine($proxyHeader);
+			if ($header === '') {
+				break;
+			}
+
+			$addresses = explode(',', $header);
+			foreach ($addresses as $i => $address) {
+				$addresses[$i] = trim($address);
+				if ($addresses[$i] === '') {
+					unset($addresses[$i]);
+				}
+			}
+
+			if ($addresses === []) {
+				break;
+			}
+
+			$client = reset($addresses);
+			unset($addresses[key($addresses)]);
+
+			foreach ($addresses as $address) {
+				$proxies[] = $address;
+			}
+		}
+
+		return new IpAddress($client, $proxies);
+	}
+
+	/**
+	 * Gets the client's produced media type
+	 *
+	 * @link https://tools.ietf.org/html/rfc7231#section-3.1.1.1
+	 * @link https://tools.ietf.org/html/rfc7231#section-3.1.1.5
+	 *
+	 * @return string
+	 */
+	public function getClientProducedMediaType(): string
+	{
+		$header = $this->request->getHeaderLine('Content-Type');
+		if ($header === '') {
+			return '';
+		}
+
+		$result = strstr($header, ';', true);
+		if ($result === false) {
+			$result = $header;
+		}
+
+		$result = trim($result);
+		if ($result === '') {
+			return '';
+		}
+
+		return strtolower($result);
+	}
+
+	/**
+	 * Gets the client's consumed media types
+	 *
+	 * @link https://tools.ietf.org/html/rfc7231#section-1.2
+	 * @link https://tools.ietf.org/html/rfc7231#section-3.1.1.1
+	 * @link https://tools.ietf.org/html/rfc7231#section-5.3.2
+	 *
+	 * @return array<string, array<string, string>>
+	 */
+	public function getClientConsumedMediaTypes(): array
+	{
+		$header = $this->request->getHeaderLine('Accept');
+		if ($header === '') {
+			return [];
+		}
+
+		$accept = header_accept_parse($header);
+		if ($accept === []) {
+			return [];
+		}
+
+		$result = [];
+		foreach ($accept as $type => $params) {
+			$result[strtolower($type)] = $params;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Gets the client's consumed encodings
+	 *
+	 * @return array<string, array<string, string>>
+	 */
+	public function getClientConsumedEncodings(): array
+	{
+		$header = $this->request->getHeaderLine('Accept-Encoding');
+		if ($header === '') {
+			return [];
+		}
+
+		$accept = header_accept_parse($header);
+		if ($accept === []) {
+			return [];
+		}
+
+		return $accept;
+	}
+
+	/**
+	 * Gets the client's consumed languages
+	 *
+	 * @return array<string, array<string, string>>
+	 */
+	public function getClientConsumedLanguages(): array
+	{
+		$header = $this->request->getHeaderLine('Accept-Language');
+		if ($header === '') {
+			return [];
+		}
+
+		$accept = header_accept_parse($header);
+		if ($accept === []) {
+			return [];
+		}
+
+		return $accept;
+	}
+
+	/**
+	 * Checks if the client produces one of the given media types
+	 *
+	 * @param list<string> $consumes
+	 *
+	 * @return bool
+	 */
+	public function clientProducesMediaType(array $consumes): bool
+	{
+		if ($consumes === []) {
+			return true;
+		}
+
+		$produced = $this->getClientProducedMediaType();
+		if ($produced === '') {
+			return false;
+		}
+
+		foreach ($consumes as $consumed) {
+			if ($this->equalsMediaTypes($consumed, $produced)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Checks if the client consumes one of the given media types
+	 *
+	 * @param list<string> $produces
+	 *
+	 * @return bool
+	 */
+	public function clientConsumesMediaType(array $produces): bool
+	{
+		if ($produces === []) {
+			return true;
+		}
+
+		$consumes = $this->getClientConsumedMediaTypes();
+		if ($consumes === []) {
+			return true;
+		}
+
+		if (isset($consumes['*/*'])) {
+			return true;
+		}
+
+		foreach ($produces as $a) {
+			foreach ($consumes as $b => $_) {
+				if ($this->equalsMediaTypes($a, $b)) {
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Checks if the given media types are equal
+	 *
+	 * @param string $a
+	 * @param string $b
+	 *
+	 * @return bool
+	 */
+	public function equalsMediaTypes(string $a, string $b): bool
+	{
+		if ($a === $b) {
+			return true;
+		}
+
+		$slash = strpos($a, '/');
+		if ($slash === false || !isset($b[$slash]) || $b[$slash] !== '/') {
+			return false;
+		}
+
+		$star = $slash + 1;
+		if (!isset($a[$star], $b[$star])) {
+			return false;
+		}
+
+		if (!($a[$star] === '*' || $b[$star] === '*')) {
+			return false;
+		}
+
+		return strncmp($a, $b, $star) === 0;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getProtocolVersion(): string
+	{
+		return $this->request->getProtocolVersion();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function withProtocolVersion($version)
+	{
+		$clone = clone $this;
+		$clone->request = $clone->request->withProtocolVersion($version);
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getHeaders(): array
+	{
+		return $this->request->getHeaders();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function hasHeader($name): bool
+	{
+		return $this->request->hasHeader($name);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getHeader($name): array
+	{
+		return $this->request->getHeader($name);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getHeaderLine($name): string
+	{
+		return $this->request->getHeaderLine($name);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function withHeader($name, $value)
+	{
+		$clone = clone $this;
+		$clone->request = $clone->request->withHeader($name, $value);
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function withAddedHeader($name, $value)
+	{
+		$clone = clone $this;
+		$clone->request = $clone->request->withAddedHeader($name, $value);
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function withoutHeader($name)
+	{
+		$clone = clone $this;
+		$clone->request = $clone->request->withoutHeader($name);
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getBody(): StreamInterface
+	{
+		return $this->request->getBody();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function withBody(StreamInterface $body)
+	{
+		$clone = clone $this;
+		$clone->request = $clone->request->withBody($body);
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getMethod(): string
+	{
+		return $this->request->getMethod();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function withMethod($method)
+	{
+		$clone = clone $this;
+		$clone->request = $clone->request->withMethod($method);
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUri(): UriInterface
+	{
+		return $this->request->getUri();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function withUri(UriInterface $uri, $preserveHost = false)
+	{
+		$clone = clone $this;
+		$clone->request = $clone->request->withUri($uri, $preserveHost);
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getRequestTarget(): string
+	{
+		return $this->request->getRequestTarget();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function withRequestTarget($requestTarget)
+	{
+		$clone = clone $this;
+		$clone->request = $clone->request->withRequestTarget($requestTarget);
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getServerParams(): array
+	{
+		return $this->request->getServerParams();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getQueryParams(): array
+	{
+		return $this->request->getQueryParams();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function withQueryParams(array $query)
+	{
+		$clone = clone $this;
+		$clone->request = $clone->request->withQueryParams($query);
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getCookieParams(): array
+	{
+		return $this->request->getCookieParams();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function withCookieParams(array $cookies)
+	{
+		$clone = clone $this;
+		$clone->request = $clone->request->withCookieParams($cookies);
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUploadedFiles(): array
+	{
+		return $this->request->getUploadedFiles();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function withUploadedFiles(array $uploadedFiles)
+	{
+		$clone = clone $this;
+		$clone->request = $clone->request->withUploadedFiles($uploadedFiles);
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getParsedBody()
+	{
+		return $this->request->getParsedBody();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function withParsedBody($data)
+	{
+		$clone = clone $this;
+		$clone->request = $clone->request->withParsedBody($data);
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getAttributes(): array
+	{
+		return $this->request->getAttributes();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getAttribute($name, $default = null)
+	{
+		return $this->request->getAttribute($name, $default);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function withAttribute($name, $value)
+	{
+		$clone = clone $this;
+		$clone->request = $clone->request->withAttribute($name, $value);
+
+		return $clone;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function withoutAttribute($name)
+	{
+		$clone = clone $this;
+		$clone->request = $clone->request->withoutAttribute($name);
+
+		return $clone;
+	}
 }

src/Response/JsonResponse.php

Indentation +46 added lines, -46 removed lines

@@ -36,57 +36,57 @@
 final class JsonResponse extends Response
 {
 
-    /**
-     * Constructor of the class
-     *
-     * @param int $statusCode
-     * @param mixed $data
-     * @param int $flags
-     * @param int $depth
-     *
-     * @throws InvalidArgumentException
-     */
-    public function __construct(int $statusCode, $data, int $flags = 0, int $depth = 512)
-    {
-        parent::__construct($statusCode);
+	/**
+	 * Constructor of the class
+	 *
+	 * @param int $statusCode
+	 * @param mixed $data
+	 * @param int $flags
+	 * @param int $depth
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct(int $statusCode, $data, int $flags = 0, int $depth = 512)
+	{
+		parent::__construct($statusCode);
 
-        $this->setBody($this->createBody($data, $flags, $depth));
+		$this->setBody($this->createBody($data, $flags, $depth));
 
-        $this->setHeader('Content-Type', 'application/json; charset=utf-8');
-    }
+		$this->setHeader('Content-Type', 'application/json; charset=utf-8');
+	}
 
-    /**
-     * Creates the response body from the given JSON data
-     *
-     * @param mixed $data
-     * @param int $flags
-     * @param int $depth
-     *
-     * @return StreamInterface
-     *
-     * @throws InvalidArgumentException
-     */
-    private function createBody($data, int $flags, int $depth): StreamInterface
-    {
-        if ($data instanceof StreamInterface) {
-            return $data;
-        }
+	/**
+	 * Creates the response body from the given JSON data
+	 *
+	 * @param mixed $data
+	 * @param int $flags
+	 * @param int $depth
+	 *
+	 * @return StreamInterface
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	private function createBody($data, int $flags, int $depth): StreamInterface
+	{
+		if ($data instanceof StreamInterface) {
+			return $data;
+		}
 
-        $flags |= JSON_THROW_ON_ERROR;
+		$flags |= JSON_THROW_ON_ERROR;
 
-        try {
-            $payload = json_encode($data, $flags, $depth);
-        } catch (JsonException $e) {
-            throw new InvalidArgumentException(sprintf(
-                'Unable to create JSON response due to invalid JSON data: %s',
-                $e->getMessage()
-            ), 0, $e);
-        }
+		try {
+			$payload = json_encode($data, $flags, $depth);
+		} catch (JsonException $e) {
+			throw new InvalidArgumentException(sprintf(
+				'Unable to create JSON response due to invalid JSON data: %s',
+				$e->getMessage()
+			), 0, $e);
+		}
 
-        $stream = new PhpTempStream('r+b');
-        $stream->write($payload);
-        $stream->rewind();
+		$stream = new PhpTempStream('r+b');
+		$stream->write($payload);
+		$stream->rewind();
 
-        return $stream;
-    }
+		return $stream;
+	}
 }

src/Response/HtmlResponse.php

Indentation +40 added lines, -40 removed lines

@@ -32,51 +32,51 @@
 final class HtmlResponse extends Response
 {
 
-    /**
-     * Constructor of the class
-     *
-     * @param int $statusCode
-     * @param mixed $html
-     *
-     * @throws InvalidArgumentException
-     */
-    public function __construct(int $statusCode, $html)
-    {
-        parent::__construct($statusCode);
+	/**
+	 * Constructor of the class
+	 *
+	 * @param int $statusCode
+	 * @param mixed $html
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct(int $statusCode, $html)
+	{
+		parent::__construct($statusCode);
 
-        $this->setBody($this->createBody($html));
+		$this->setBody($this->createBody($html));
 
-        $this->setHeader('Content-Type', 'text/html; charset=utf-8');
-    }
+		$this->setHeader('Content-Type', 'text/html; charset=utf-8');
+	}
 
-    /**
-     * Creates the response body from the given HTML
-     *
-     * @param mixed $html
-     *
-     * @return StreamInterface
-     *
-     * @throws InvalidArgumentException
-     */
-    private function createBody($html): StreamInterface
-    {
-        if ($html instanceof StreamInterface) {
-            return $html;
-        }
+	/**
+	 * Creates the response body from the given HTML
+	 *
+	 * @param mixed $html
+	 *
+	 * @return StreamInterface
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	private function createBody($html): StreamInterface
+	{
+		if ($html instanceof StreamInterface) {
+			return $html;
+		}
 
-        if (is_object($html) && method_exists($html, '__toString')) {
-            /** @var string */
-            $html = $html->__toString();
-        }
+		if (is_object($html) && method_exists($html, '__toString')) {
+			/** @var string */
+			$html = $html->__toString();
+		}
 
-        if (!is_string($html)) {
-            throw new InvalidArgumentException('Unable to create HTML response due to unexpected HTML data');
-        }
+		if (!is_string($html)) {
+			throw new InvalidArgumentException('Unable to create HTML response due to unexpected HTML data');
+		}
 
-        $stream = new PhpTempStream('r+b');
-        $stream->write($html);
-        $stream->rewind();
+		$stream = new PhpTempStream('r+b');
+		$stream->write($html);
+		$stream->rewind();
 
-        return $stream;
-    }
+		return $stream;
+	}
 }

src/Response.php

Indentation +230 added lines, -230 removed lines

@@ -35,258 +35,258 @@
 class Response extends Message implements ResponseInterface, StatusCodeInterface
 {
 
-    /**
-     * List of Reason Phrases
-     *
-     * @link http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
-     *
-     * @var array<int, string>
-     */
-    public const REASON_PHRASES = [
+	/**
+	 * List of Reason Phrases
+	 *
+	 * @link http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
+	 *
+	 * @var array<int, string>
+	 */
+	public const REASON_PHRASES = [
 
-        // 1xx
-        100 => 'Continue',
-        101 => 'Switching Protocols',
-        102 => 'Processing',
-        103 => 'Early Hints',
+		// 1xx
+		100 => 'Continue',
+		101 => 'Switching Protocols',
+		102 => 'Processing',
+		103 => 'Early Hints',
 
-        // 2xx
-        200 => 'OK',
-        201 => 'Created',
-        202 => 'Accepted',
-        203 => 'Non-Authoritative Information',
-        204 => 'No Content',
-        205 => 'Reset Content',
-        206 => 'Partial Content',
-        207 => 'Multi-Status',
-        208 => 'Already Reported',
-        226 => 'IM Used',
+		// 2xx
+		200 => 'OK',
+		201 => 'Created',
+		202 => 'Accepted',
+		203 => 'Non-Authoritative Information',
+		204 => 'No Content',
+		205 => 'Reset Content',
+		206 => 'Partial Content',
+		207 => 'Multi-Status',
+		208 => 'Already Reported',
+		226 => 'IM Used',
 
-        // 3xx
-        300 => 'Multiple Choices',
-        301 => 'Moved Permanently',
-        302 => 'Found',
-        303 => 'See Other',
-        304 => 'Not Modified',
-        305 => 'Use Proxy',
-        307 => 'Temporary Redirect',
-        308 => 'Permanent Redirect',
+		// 3xx
+		300 => 'Multiple Choices',
+		301 => 'Moved Permanently',
+		302 => 'Found',
+		303 => 'See Other',
+		304 => 'Not Modified',
+		305 => 'Use Proxy',
+		307 => 'Temporary Redirect',
+		308 => 'Permanent Redirect',
 
-        // 4xx
-        400 => 'Bad Request',
-        401 => 'Unauthorized',
-        402 => 'Payment Required',
-        403 => 'Forbidden',
-        404 => 'Not Found',
-        405 => 'Method Not Allowed',
-        406 => 'Not Acceptable',
-        407 => 'Proxy Authentication Required',
-        408 => 'Request Timeout',
-        409 => 'Conflict',
-        410 => 'Gone',
-        411 => 'Length Required',
-        412 => 'Precondition Failed',
-        413 => 'Payload Too Large',
-        414 => 'URI Too Long',
-        415 => 'Unsupported Media Type',
-        416 => 'Range Not Satisfiable',
-        417 => 'Expectation Failed',
-        421 => 'Misdirected Request',
-        422 => 'Unprocessable Entity',
-        423 => 'Locked',
-        424 => 'Failed Dependency',
-        425 => 'Too Early',
-        426 => 'Upgrade Required',
-        428 => 'Precondition Required',
-        429 => 'Too Many Requests',
-        431 => 'Request Header Fields Too Large',
-        451 => 'Unavailable For Legal Reasons',
+		// 4xx
+		400 => 'Bad Request',
+		401 => 'Unauthorized',
+		402 => 'Payment Required',
+		403 => 'Forbidden',
+		404 => 'Not Found',
+		405 => 'Method Not Allowed',
+		406 => 'Not Acceptable',
+		407 => 'Proxy Authentication Required',
+		408 => 'Request Timeout',
+		409 => 'Conflict',
+		410 => 'Gone',
+		411 => 'Length Required',
+		412 => 'Precondition Failed',
+		413 => 'Payload Too Large',
+		414 => 'URI Too Long',
+		415 => 'Unsupported Media Type',
+		416 => 'Range Not Satisfiable',
+		417 => 'Expectation Failed',
+		421 => 'Misdirected Request',
+		422 => 'Unprocessable Entity',
+		423 => 'Locked',
+		424 => 'Failed Dependency',
+		425 => 'Too Early',
+		426 => 'Upgrade Required',
+		428 => 'Precondition Required',
+		429 => 'Too Many Requests',
+		431 => 'Request Header Fields Too Large',
+		451 => 'Unavailable For Legal Reasons',
 
-        // 5xx
-        500 => 'Internal Server Error',
-        501 => 'Not Implemented',
-        502 => 'Bad Gateway',
-        503 => 'Service Unavailable',
-        504 => 'Gateway Timeout',
-        505 => 'HTTP Version Not Supported',
-        506 => 'Variant Also Negotiates',
-        507 => 'Insufficient Storage',
-        508 => 'Loop Detected',
-        510 => 'Not Extended',
-        511 => 'Network Authentication Required',
-    ];
+		// 5xx
+		500 => 'Internal Server Error',
+		501 => 'Not Implemented',
+		502 => 'Bad Gateway',
+		503 => 'Service Unavailable',
+		504 => 'Gateway Timeout',
+		505 => 'HTTP Version Not Supported',
+		506 => 'Variant Also Negotiates',
+		507 => 'Insufficient Storage',
+		508 => 'Loop Detected',
+		510 => 'Not Extended',
+		511 => 'Network Authentication Required',
+	];
 
-    /**
-     * Default response status code
-     *
-     * @var int
-     */
-    public const DEFAULT_STATUS_CODE = self::STATUS_OK;
+	/**
+	 * Default response status code
+	 *
+	 * @var int
+	 */
+	public const DEFAULT_STATUS_CODE = self::STATUS_OK;
 
-    /**
-     * Default response reason phrase
-     *
-     * @var string
-     */
-    public const DEFAULT_REASON_PHRASE = self::REASON_PHRASES[self::DEFAULT_STATUS_CODE];
+	/**
+	 * Default response reason phrase
+	 *
+	 * @var string
+	 */
+	public const DEFAULT_REASON_PHRASE = self::REASON_PHRASES[self::DEFAULT_STATUS_CODE];
 
-    /**
-     * Reason phrase for unknown status code
-     *
-     * @var string
-     */
-    public const UNKNOWN_STATUS_CODE_REASON_PHRASE = 'Unknown Status Code';
+	/**
+	 * Reason phrase for unknown status code
+	 *
+	 * @var string
+	 */
+	public const UNKNOWN_STATUS_CODE_REASON_PHRASE = 'Unknown Status Code';
 
-    /**
-     * The response's status code
-     *
-     * @var int
-     */
-    private int $statusCode = self::DEFAULT_STATUS_CODE;
+	/**
+	 * The response's status code
+	 *
+	 * @var int
+	 */
+	private int $statusCode = self::DEFAULT_STATUS_CODE;
 
-    /**
-     * The response's reason phrase
-     *
-     * @var string
-     */
-    private string $reasonPhrase = self::DEFAULT_REASON_PHRASE;
+	/**
+	 * The response's reason phrase
+	 *
+	 * @var string
+	 */
+	private string $reasonPhrase = self::DEFAULT_REASON_PHRASE;
 
-    /**
-     * Constrictor of the class
-     *
-     * @param int|null $statusCode
-     * @param string|null $reasonPhrase
-     * @param array<string, string|string[]>|null $headers
-     * @param StreamInterface|null $body
-     *
-     * @throws InvalidArgumentException
-     *         If one of the arguments isn't valid.
-     */
-    public function __construct(
-        ?int $statusCode = null,
-        ?string $reasonPhrase = null,
-        ?array $headers = null,
-        ?StreamInterface $body = null
-    ) {
-        if (isset($statusCode)) {
-            $this->setStatus($statusCode, $reasonPhrase ?? '');
-        }
+	/**
+	 * Constrictor of the class
+	 *
+	 * @param int|null $statusCode
+	 * @param string|null $reasonPhrase
+	 * @param array<string, string|string[]>|null $headers
+	 * @param StreamInterface|null $body
+	 *
+	 * @throws InvalidArgumentException
+	 *         If one of the arguments isn't valid.
+	 */
+	public function __construct(
+		?int $statusCode = null,
+		?string $reasonPhrase = null,
+		?array $headers = null,
+		?StreamInterface $body = null
+	) {
+		if (isset($statusCode)) {
+			$this->setStatus($statusCode, $reasonPhrase ?? '');
+		}
 
-        if (isset($headers)) {
-            $this->setHeaders($headers);
-        }
+		if (isset($headers)) {
+			$this->setHeaders($headers);
+		}
 
-        if (isset($body)) {
-            $this->setBody($body);
-        }
-    }
+		if (isset($body)) {
+			$this->setBody($body);
+		}
+	}
 
-    /**
-     * Gets the response's status code
-     *
-     * @return int
-     */
-    public function getStatusCode(): int
-    {
-        return $this->statusCode;
-    }
+	/**
+	 * Gets the response's status code
+	 *
+	 * @return int
+	 */
+	public function getStatusCode(): int
+	{
+		return $this->statusCode;
+	}
 
-    /**
-     * Gets the response's reason phrase
-     *
-     * @return string
-     */
-    public function getReasonPhrase(): string
-    {
-        return $this->reasonPhrase;
-    }
+	/**
+	 * Gets the response's reason phrase
+	 *
+	 * @return string
+	 */
+	public function getReasonPhrase(): string
+	{
+		return $this->reasonPhrase;
+	}
 
-    /**
-     * Creates a new instance of the response with the given status code
-     *
-     * @param int $code
-     * @param string $reasonPhrase
-     *
-     * @return static
-     *
-     * @throws InvalidArgumentException
-     *         If the status isn't valid.
-     */
-    public function withStatus($code, $reasonPhrase = ''): ResponseInterface
-    {
-        $clone = clone $this;
-        $clone->setStatus($code, $reasonPhrase);
+	/**
+	 * Creates a new instance of the response with the given status code
+	 *
+	 * @param int $code
+	 * @param string $reasonPhrase
+	 *
+	 * @return static
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the status isn't valid.
+	 */
+	public function withStatus($code, $reasonPhrase = ''): ResponseInterface
+	{
+		$clone = clone $this;
+		$clone->setStatus($code, $reasonPhrase);
 
-        return $clone;
-    }
+		return $clone;
+	}
 
-    /**
-     * Sets the given status code to the response
-     *
-     * @param int $statusCode
-     * @param string $reasonPhrase
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *         If the status isn't valid.
-     */
-    final protected function setStatus($statusCode, $reasonPhrase): void
-    {
-        $this->validateStatusCode($statusCode);
-        $this->validateReasonPhrase($reasonPhrase);
+	/**
+	 * Sets the given status code to the response
+	 *
+	 * @param int $statusCode
+	 * @param string $reasonPhrase
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the status isn't valid.
+	 */
+	final protected function setStatus($statusCode, $reasonPhrase): void
+	{
+		$this->validateStatusCode($statusCode);
+		$this->validateReasonPhrase($reasonPhrase);
 
-        if ('' === $reasonPhrase) {
-            $reasonPhrase = self::REASON_PHRASES[$statusCode] ?? self::UNKNOWN_STATUS_CODE_REASON_PHRASE;
-        }
+		if ('' === $reasonPhrase) {
+			$reasonPhrase = self::REASON_PHRASES[$statusCode] ?? self::UNKNOWN_STATUS_CODE_REASON_PHRASE;
+		}
 
-        $this->statusCode = $statusCode;
-        $this->reasonPhrase = $reasonPhrase;
-    }
+		$this->statusCode = $statusCode;
+		$this->reasonPhrase = $reasonPhrase;
+	}
 
-    /**
-     * Validates the given status code
-     *
-     * @link https://tools.ietf.org/html/rfc7230#section-3.1.2
-     *
-     * @param mixed $statusCode
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *         If the status code isn't valid.
-     */
-    private function validateStatusCode($statusCode): void
-    {
-        if (!is_int($statusCode)) {
-            throw new InvalidArgumentException('HTTP status code must be an integer');
-        }
+	/**
+	 * Validates the given status code
+	 *
+	 * @link https://tools.ietf.org/html/rfc7230#section-3.1.2
+	 *
+	 * @param mixed $statusCode
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the status code isn't valid.
+	 */
+	private function validateStatusCode($statusCode): void
+	{
+		if (!is_int($statusCode)) {
+			throw new InvalidArgumentException('HTTP status code must be an integer');
+		}
 
-        if (! ($statusCode >= 100 && $statusCode <= 599)) {
-            throw new InvalidArgumentException('Invalid HTTP status code');
-        }
-    }
+		if (! ($statusCode >= 100 && $statusCode <= 599)) {
+			throw new InvalidArgumentException('Invalid HTTP status code');
+		}
+	}
 
-    /**
-     * Validates the given reason phrase
-     *
-     * @link https://tools.ietf.org/html/rfc7230#section-3.1.2
-     *
-     * @param mixed $reasonPhrase
-     *
-     * @return void
-     *
-     * @throws InvalidArgumentException
-     *         If the reason phrase isn't valid.
-     */
-    private function validateReasonPhrase($reasonPhrase): void
-    {
-        if (!is_string($reasonPhrase)) {
-            throw new InvalidArgumentException('HTTP reason phrase must be a string');
-        }
+	/**
+	 * Validates the given reason phrase
+	 *
+	 * @link https://tools.ietf.org/html/rfc7230#section-3.1.2
+	 *
+	 * @param mixed $reasonPhrase
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidArgumentException
+	 *         If the reason phrase isn't valid.
+	 */
+	private function validateReasonPhrase($reasonPhrase): void
+	{
+		if (!is_string($reasonPhrase)) {
+			throw new InvalidArgumentException('HTTP reason phrase must be a string');
+		}
 
-        if (!preg_match(Header::RFC7230_VALID_FIELD_VALUE, $reasonPhrase)) {
-            throw new InvalidArgumentException('Invalid HTTP reason phrase');
-        }
-    }
+		if (!preg_match(Header::RFC7230_VALID_FIELD_VALUE, $reasonPhrase)) {
+			throw new InvalidArgumentException('Invalid HTTP reason phrase');
+		}
+	}
 }

src/Stream/PhpMemoryStream.php

Indentation +9 added lines, -9 removed lines

@@ -27,13 +27,13 @@
 final class PhpMemoryStream extends Stream
 {
 
-    /**
-     * Constructor of the class
-     *
-     * @param string $mode
-     */
-    public function __construct(string $mode = 'r+b')
-    {
-        parent::__construct(fopen('php://memory', $mode));
-    }
+	/**
+	 * Constructor of the class
+	 *
+	 * @param string $mode
+	 */
+	public function __construct(string $mode = 'r+b')
+	{
+		parent::__construct(fopen('php://memory', $mode));
+	}
 }

src/Stream/PhpInputStream.php

Indentation +11 added lines, -11 removed lines

@@ -28,18 +28,18 @@
 final class PhpInputStream extends Stream
 {
 
-    /**
-     * Constructor of the class
-     */
-    public function __construct()
-    {
-        $input = fopen('php://input', 'rb');
-        $resource = fopen('php://temp', 'r+b');
+	/**
+	 * Constructor of the class
+	 */
+	public function __construct()
+	{
+		$input = fopen('php://input', 'rb');
+		$resource = fopen('php://temp', 'r+b');
 
-        stream_copy_to_stream($input, $resource);
+		stream_copy_to_stream($input, $resource);
 
-        parent::__construct($resource);
+		parent::__construct($resource);
 
-        $this->rewind();
-    }
+		$this->rewind();
+	}
 }