sunrise-php / http-message

src/Header/ContentTypeHeader.php

Indentation +52 added lines, -52 removed lines

@@ -28,64 +28,64 @@
 class ContentTypeHeader extends Header
 {
 
-    /**
-     * Regular Expression for a content type validation
-     *
-     * @link https://tools.ietf.org/html/rfc6838#section-4.2
-     *
-     * @var string
-     */
-    public const RFC6838_CONTENT_TYPE = '/^[\dA-Za-z][\d\w\!#\$&\+\-\.\^]*(?:\/[\dA-Za-z][\d\w\!#\$&\+\-\.\^]*)?$/';
+	/**
+	 * Regular Expression for a content type validation
+	 *
+	 * @link https://tools.ietf.org/html/rfc6838#section-4.2
+	 *
+	 * @var string
+	 */
+	public const RFC6838_CONTENT_TYPE = '/^[\dA-Za-z][\d\w\!#\$&\+\-\.\^]*(?:\/[\dA-Za-z][\d\w\!#\$&\+\-\.\^]*)?$/';
 
-    /**
-     * @var string
-     */
-    private string $type;
+	/**
+	 * @var string
+	 */
+	private string $type;
 
-    /**
-     * @var array<string, string>
-     */
-    private array $parameters;
+	/**
+	 * @var array<string, string>
+	 */
+	private array $parameters;
 
-    /**
-     * Constructor of the class
-     *
-     * @param string $type
-     * @param array<array-key, mixed> $parameters
-     *
-     * @throws InvalidHeaderException
-     *         - If the type isn't valid;
-     *         - If the parameters aren't valid.
-     */
-    public function __construct(string $type, array $parameters = [])
-    {
-        $this->validateValueByRegex(self::RFC6838_CONTENT_TYPE, $type);
+	/**
+	 * Constructor of the class
+	 *
+	 * @param string $type
+	 * @param array<array-key, mixed> $parameters
+	 *
+	 * @throws InvalidHeaderException
+	 *         - If the type isn't valid;
+	 *         - If the parameters aren't valid.
+	 */
+	public function __construct(string $type, array $parameters = [])
+	{
+		$this->validateValueByRegex(self::RFC6838_CONTENT_TYPE, $type);
 
-        // validate and normalize the parameters...
-        $parameters = $this->validateParameters($parameters);
+		// validate and normalize the parameters...
+		$parameters = $this->validateParameters($parameters);
 
-        $this->type = $type;
-        $this->parameters = $parameters;
-    }
+		$this->type = $type;
+		$this->parameters = $parameters;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getFieldName(): string
-    {
-        return 'Content-Type';
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getFieldName(): string
+	{
+		return 'Content-Type';
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getFieldValue(): string
-    {
-        $v = $this->type;
-        foreach ($this->parameters as $name => $value) {
-            $v .= sprintf('; %s="%s"', $name, $value);
-        }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getFieldValue(): string
+	{
+		$v = $this->type;
+		foreach ($this->parameters as $name => $value) {
+			$v .= sprintf('; %s="%s"', $name, $value);
+		}
 
-        return $v;
-    }
+		return $v;
+	}
 }

src/Header/ContentLengthHeader.php

Indentation +51 added lines, -51 removed lines

@@ -28,60 +28,60 @@
 class ContentLengthHeader extends Header
 {
 
-    /**
-     * @var int
-     */
-    private int $value;
+	/**
+	 * @var int
+	 */
+	private int $value;
 
-    /**
-     * Constructor of the class
-     *
-     * @param int $value
-     *
-     * @throws InvalidHeaderException
-     *         If the value isn't valid.
-     */
-    public function __construct(int $value)
-    {
-        $this->validateValue($value);
+	/**
+	 * Constructor of the class
+	 *
+	 * @param int $value
+	 *
+	 * @throws InvalidHeaderException
+	 *         If the value isn't valid.
+	 */
+	public function __construct(int $value)
+	{
+		$this->validateValue($value);
 
-        $this->value = $value;
-    }
+		$this->value = $value;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getFieldName(): string
-    {
-        return 'Content-Length';
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getFieldName(): string
+	{
+		return 'Content-Length';
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getFieldValue(): string
-    {
-        return sprintf('%d', $this->value);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getFieldValue(): string
+	{
+		return sprintf('%d', $this->value);
+	}
 
-    /**
-     * Validates the given value
-     *
-     * @param int $value
-     *
-     * @return void
-     *
-     * @throws InvalidHeaderException
-     *         If the value isn't valid.
-     */
-    private function validateValue(int $value): void
-    {
-        if (! ($value >= 0)) {
-            throw new InvalidHeaderException(sprintf(
-                'The value "%2$d" for the header "%1$s" is not valid',
-                $this->getFieldName(),
-                $value
-            ));
-        }
-    }
+	/**
+	 * Validates the given value
+	 *
+	 * @param int $value
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidHeaderException
+	 *         If the value isn't valid.
+	 */
+	private function validateValue(int $value): void
+	{
+		if (! ($value >= 0)) {
+			throw new InvalidHeaderException(sprintf(
+				'The value "%2$d" for the header "%1$s" is not valid',
+				$this->getFieldName(),
+				$value
+			));
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
      */
     private function validateValue(int $value): void
     {
-        if (! ($value >= 0)) {
+        if (!($value >= 0)) {
             throw new InvalidHeaderException(sprintf(
                 'The value "%2$d" for the header "%1$s" is not valid',
                 $this->getFieldName(),

src/Header/RefreshHeader.php

Indentation +61 added lines, -61 removed lines

@@ -31,72 +31,72 @@
 class RefreshHeader extends Header
 {
 
-    /**
-     * @var int
-     */
-    private int $delay;
+	/**
+	 * @var int
+	 */
+	private int $delay;
 
-    /**
-     * @var UriInterface
-     */
-    private UriInterface $uri;
+	/**
+	 * @var UriInterface
+	 */
+	private UriInterface $uri;
 
-    /**
-     * Constructor of the class
-     *
-     * @param int $delay
-     * @param mixed $uri
-     *
-     * @throws InvalidUriException
-     *         If the URI isn't valid.
-     *
-     * @throws InvalidHeaderException
-     *         If the delay isn't valid.
-     */
-    public function __construct(int $delay, $uri)
-    {
-        $this->validateDelay($delay);
+	/**
+	 * Constructor of the class
+	 *
+	 * @param int $delay
+	 * @param mixed $uri
+	 *
+	 * @throws InvalidUriException
+	 *         If the URI isn't valid.
+	 *
+	 * @throws InvalidHeaderException
+	 *         If the delay isn't valid.
+	 */
+	public function __construct(int $delay, $uri)
+	{
+		$this->validateDelay($delay);
 
-        $uri = Uri::create($uri);
+		$uri = Uri::create($uri);
 
-        $this->delay = $delay;
-        $this->uri = $uri;
-    }
+		$this->delay = $delay;
+		$this->uri = $uri;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getFieldName(): string
-    {
-        return 'Refresh';
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getFieldName(): string
+	{
+		return 'Refresh';
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getFieldValue(): string
-    {
-        return sprintf('%d; url=%s', $this->delay, $this->uri->__toString());
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getFieldValue(): string
+	{
+		return sprintf('%d; url=%s', $this->delay, $this->uri->__toString());
+	}
 
-    /**
-     * Validates the redirection delay
-     *
-     * @param int $delay
-     *
-     * @return void
-     *
-     * @throws InvalidHeaderException
-     *         If the delay isn't valid.
-     */
-    private function validateDelay(int $delay): void
-    {
-        if (! ($delay >= 0)) {
-            throw new InvalidHeaderException(sprintf(
-                'The delay "%2$d" for the header "%1$s" is not valid',
-                $this->getFieldName(),
-                $delay
-            ));
-        }
-    }
+	/**
+	 * Validates the redirection delay
+	 *
+	 * @param int $delay
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidHeaderException
+	 *         If the delay isn't valid.
+	 */
+	private function validateDelay(int $delay): void
+	{
+		if (! ($delay >= 0)) {
+			throw new InvalidHeaderException(sprintf(
+				'The delay "%2$d" for the header "%1$s" is not valid',
+				$this->getFieldName(),
+				$delay
+			));
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
      */
     private function validateDelay(int $delay): void
     {
-        if (! ($delay >= 0)) {
+        if (!($delay >= 0)) {
             throw new InvalidHeaderException(sprintf(
                 'The delay "%2$d" for the header "%1$s" is not valid',
                 $this->getFieldName(),

src/Header/ContentMD5Header.php

Indentation +39 added lines, -39 removed lines

@@ -23,48 +23,48 @@
 class ContentMD5Header extends Header
 {
 
-    /**
-     * Regular Expression for a MD5 digest validation
-     *
-     * @link https://tools.ietf.org/html/rfc2045#section-6.8
-     *
-     * @var string
-     */
-    public const RFC2045_MD5_DIGEST = '/^[A-Za-z0-9\+\/]+=*$/';
+	/**
+	 * Regular Expression for a MD5 digest validation
+	 *
+	 * @link https://tools.ietf.org/html/rfc2045#section-6.8
+	 *
+	 * @var string
+	 */
+	public const RFC2045_MD5_DIGEST = '/^[A-Za-z0-9\+\/]+=*$/';
 
-    /**
-     * @var string
-     */
-    private string $value;
+	/**
+	 * @var string
+	 */
+	private string $value;
 
-    /**
-     * Constructor of the class
-     *
-     * @param string $value
-     *
-     * @throws InvalidHeaderException
-     *         If the value isn't valid.
-     */
-    public function __construct(string $value)
-    {
-        $this->validateValueByRegex(self::RFC2045_MD5_DIGEST, $value);
+	/**
+	 * Constructor of the class
+	 *
+	 * @param string $value
+	 *
+	 * @throws InvalidHeaderException
+	 *         If the value isn't valid.
+	 */
+	public function __construct(string $value)
+	{
+		$this->validateValueByRegex(self::RFC2045_MD5_DIGEST, $value);
 
-        $this->value = $value;
-    }
+		$this->value = $value;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getFieldName(): string
-    {
-        return 'Content-MD5';
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getFieldName(): string
+	{
+		return 'Content-MD5';
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getFieldValue(): string
-    {
-        return $this->value;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getFieldValue(): string
+	{
+		return $this->value;
+	}
 }

src/Header/AccessControlAllowMethodsHeader.php

Indentation +33 added lines, -33 removed lines

@@ -29,41 +29,41 @@
 class AccessControlAllowMethodsHeader extends Header
 {
 
-    /**
-     * @var list<string>
-     */
-    private array $methods = [];
+	/**
+	 * @var list<string>
+	 */
+	private array $methods = [];
 
-    /**
-     * Constructor of the class
-     *
-     * @param string ...$methods
-     *
-     * @throws InvalidHeaderException
-     *         If one of the methods isn't valid.
-     */
-    public function __construct(string ...$methods)
-    {
-        $this->validateToken(...$methods);
+	/**
+	 * Constructor of the class
+	 *
+	 * @param string ...$methods
+	 *
+	 * @throws InvalidHeaderException
+	 *         If one of the methods isn't valid.
+	 */
+	public function __construct(string ...$methods)
+	{
+		$this->validateToken(...$methods);
 
-        foreach ($methods as $method) {
-            $this->methods[] = strtoupper($method);
-        }
-    }
+		foreach ($methods as $method) {
+			$this->methods[] = strtoupper($method);
+		}
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getFieldName(): string
-    {
-        return 'Access-Control-Allow-Methods';
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getFieldName(): string
+	{
+		return 'Access-Control-Allow-Methods';
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getFieldValue(): string
-    {
-        return implode(', ', $this->methods);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getFieldValue(): string
+	{
+		return implode(', ', $this->methods);
+	}
 }

src/Header/TrailerHeader.php

Indentation +35 added lines, -35 removed lines

@@ -23,39 +23,39 @@
 class TrailerHeader extends Header
 {
 
-    /**
-     * @var string
-     */
-    private string $value;
-
-    /**
-     * Constructor of the class
-     *
-     * @param string $value
-     *
-     * @throws InvalidHeaderException
-     *         If the value isn't valid.
-     */
-    public function __construct(string $value)
-    {
-        $this->validateToken($value);
-
-        $this->value = $value;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFieldName(): string
-    {
-        return 'Trailer';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFieldValue(): string
-    {
-        return $this->value;
-    }
+	/**
+	 * @var string
+	 */
+	private string $value;
+
+	/**
+	 * Constructor of the class
+	 *
+	 * @param string $value
+	 *
+	 * @throws InvalidHeaderException
+	 *         If the value isn't valid.
+	 */
+	public function __construct(string $value)
+	{
+		$this->validateToken($value);
+
+		$this->value = $value;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getFieldName(): string
+	{
+		return 'Trailer';
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getFieldValue(): string
+	{
+		return $this->value;
+	}
 }

src/Header/AccessControlAllowHeadersHeader.php

Indentation +33 added lines, -33 removed lines

@@ -28,41 +28,41 @@
 class AccessControlAllowHeadersHeader extends Header
 {
 
-    /**
-     * @var list<string>
-     */
-    private array $headers = [];
+	/**
+	 * @var list<string>
+	 */
+	private array $headers = [];
 
-    /**
-     * Constructor of the class
-     *
-     * @param string ...$headers
-     *
-     * @throws InvalidHeaderException
-     *         If one of the header names isn't valid.
-     */
-    public function __construct(string ...$headers)
-    {
-        $this->validateToken(...$headers);
+	/**
+	 * Constructor of the class
+	 *
+	 * @param string ...$headers
+	 *
+	 * @throws InvalidHeaderException
+	 *         If one of the header names isn't valid.
+	 */
+	public function __construct(string ...$headers)
+	{
+		$this->validateToken(...$headers);
 
-        foreach ($headers as $header) {
-            $this->headers[] = $header;
-        }
-    }
+		foreach ($headers as $header) {
+			$this->headers[] = $header;
+		}
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getFieldName(): string
-    {
-        return 'Access-Control-Allow-Headers';
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getFieldName(): string
+	{
+		return 'Access-Control-Allow-Headers';
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getFieldValue(): string
-    {
-        return implode(', ', $this->headers);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getFieldValue(): string
+	{
+		return implode(', ', $this->headers);
+	}
 }

src/Header/SetCookieHeader.php

Indentation +249 added lines, -249 removed lines

@@ -36,253 +36,253 @@
 class SetCookieHeader extends Header
 {
 
-    /**
-     * Default cookie options
-     *
-     * @var array{
-     *   path?: ?string,
-     *   domain?: ?string,
-     *   secure?: ?bool,
-     *   httpOnly?: ?bool,
-     *   sameSite?: ?string
-     * }
-     */
-    public const DEFAULT_OPTIONS = [
-        self::OPTION_KEY_PATH      => '/',
-        self::OPTION_KEY_DOMAIN    => null,
-        self::OPTION_KEY_SECURE    => null,
-        self::OPTION_KEY_HTTP_ONLY => true,
-        self::OPTION_KEY_SAME_SITE => CookieSameSite::LAX,
-    ];
-
-    /**
-     * Cookie option keys
-     */
-    public const OPTION_KEY_PATH = 'path';
-    public const OPTION_KEY_DOMAIN = 'domain';
-    public const OPTION_KEY_SECURE = 'secure';
-    public const OPTION_KEY_HTTP_ONLY = 'httpOnly';
-    public const OPTION_KEY_SAME_SITE = 'sameSite';
-
-    /**
-     * @deprecated Use the {@see CookieSameSite} enum.
-     */
-    public const SAME_SITE_LAX = CookieSameSite::LAX;
-
-    /**
-     * @deprecated Use the {@see CookieSameSite} enum.
-     */
-    public const SAME_SITE_STRICT = CookieSameSite::STRICT;
-
-    /**
-     * @deprecated Use the {@see CookieSameSite} enum.
-     */
-    public const SAME_SITE_NONE = CookieSameSite::NONE;
-
-    /**
-     * @deprecated Use the {@see SetCookieHeader::OPTION_KEY_SAME_SITE} constant.
-     */
-    public const OPTION_KEY_SAMESITE = self::OPTION_KEY_SAME_SITE;
-
-    /**
-     * @var ?array{
-     *   path?: ?string,
-     *   domain?: ?string,
-     *   secure?: ?bool,
-     *   httpOnly?: ?bool,
-     *   sameSite?: ?string
-     * }
-     *
-     * @deprecated Use the {@see SetCookieHeader::DEFAULT_OPTIONS} constant.
-     */
-    protected static ?array $defaultOptions = null;
-
-    /**
-     * The cookie name
-     *
-     * @var string
-     */
-    private string $name;
-
-    /**
-     * The cookie value
-     *
-     * @var string
-     */
-    private string $value;
-
-    /**
-     * The cookie expiration date
-     *
-     * @var DateTimeInterface|null
-     */
-    private ?DateTimeInterface $expires;
-
-    /**
-     * The cookie options
-     *
-     * @var array{
-     *   path?: ?string,
-     *   domain?: ?string,
-     *   secure?: ?bool,
-     *   httpOnly?: ?bool,
-     *   sameSite?: ?string
-     * }
-     */
-    private array $options;
-
-    /**
-     * Constructor of the class
-     *
-     * @param string $name
-     * @param string $value
-     * @param DateTimeInterface|null $expires
-     * @param array{
-     *   path?: ?string,
-     *   domain?: ?string,
-     *   secure?: ?bool,
-     *   httpOnly?: ?bool,
-     *   sameSite?: ?string
-     * } $options
-     *
-     * @throws InvalidHeaderException
-     *         If one of the arguments isn't valid.
-     */
-    public function __construct(string $name, string $value, ?DateTimeInterface $expires = null, array $options = [])
-    {
-        $this->validateCookieName($name);
-
-        if (isset($options[self::OPTION_KEY_PATH])) {
-            $this->validateCookieOption(
-                self::OPTION_KEY_PATH,
-                $options[self::OPTION_KEY_PATH]
-            );
-        }
-
-        if (isset($options[self::OPTION_KEY_DOMAIN])) {
-            $this->validateCookieOption(
-                self::OPTION_KEY_DOMAIN,
-                $options[self::OPTION_KEY_DOMAIN]
-            );
-        }
-
-        if (isset($options[self::OPTION_KEY_SAME_SITE])) {
-            $this->validateCookieOption(
-                self::OPTION_KEY_SAME_SITE,
-                $options[self::OPTION_KEY_SAME_SITE]
-            );
-        }
-
-        if ($value === '') {
-            $value = 'deleted';
-            $expires = new DateTimeImmutable('1 year ago');
-        }
-
-        $options += (static::$defaultOptions ?? static::DEFAULT_OPTIONS);
-
-        $this->name = $name;
-        $this->value = $value;
-        $this->expires = $expires;
-        $this->options = $options;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFieldName(): string
-    {
-        return 'Set-Cookie';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getFieldValue(): string
-    {
-        $name = rawurlencode($this->name);
-        $value = rawurlencode($this->value);
-        $result = sprintf('%s=%s', $name, $value);
-
-        if (isset($this->expires)) {
-            $result .= '; Expires=' . $this->formatDateTime($this->expires);
-            $result .= '; Max-Age=' . max($this->expires->getTimestamp() - time(), 0);
-        }
-
-        if (isset($this->options[self::OPTION_KEY_PATH])) {
-            $result .= '; Path=' . $this->options[self::OPTION_KEY_PATH];
-        }
-
-        if (isset($this->options[self::OPTION_KEY_DOMAIN])) {
-            $result .= '; Domain=' . $this->options[self::OPTION_KEY_DOMAIN];
-        }
-
-        if (isset($this->options[self::OPTION_KEY_SECURE]) && $this->options[self::OPTION_KEY_SECURE]) {
-            $result .= '; Secure';
-        }
-
-        if (isset($this->options[self::OPTION_KEY_HTTP_ONLY]) && $this->options[self::OPTION_KEY_HTTP_ONLY]) {
-            $result .= '; HttpOnly';
-        }
-
-        if (isset($this->options[self::OPTION_KEY_SAME_SITE])) {
-            $result .= '; SameSite=' . $this->options[self::OPTION_KEY_SAME_SITE];
-        }
-
-        return $result;
-    }
-
-    /**
-     * Validates the given cookie name
-     *
-     * @param string $name
-     *
-     * @return void
-     *
-     * @throws InvalidHeaderException
-     *         If the cookie name isn't valid.
-     */
-    private function validateCookieName(string $name): void
-    {
-        if ('' === $name) {
-            throw new InvalidHeaderException('Cookie name cannot be empty');
-        }
-
-        // https://github.com/php/php-src/blob/02a5335b710aa36cd0c3108bfb9c6f7a57d40000/ext/standard/head.c#L93
-        if (strpbrk($name, "=,; \t\r\n\013\014") !== false) {
-            throw new InvalidHeaderException(sprintf(
-                'The cookie name "%s" contains prohibited characters',
-                $name
-            ));
-        }
-    }
-
-    /**
-     * Validates the given cookie option
-     *
-     * @param string $key
-     * @param mixed $value
-     *
-     * @return void
-     *
-     * @throws InvalidHeaderException
-     *         If the cookie option isn't valid.
-     */
-    private function validateCookieOption(string $key, $value): void
-    {
-        if (!is_string($value)) {
-            throw new InvalidHeaderException(sprintf(
-                'The cookie option "%s" must be a string',
-                $key
-            ));
-        }
-
-        // https://github.com/php/php-src/blob/02a5335b710aa36cd0c3108bfb9c6f7a57d40000/ext/standard/head.c#L103
-        // https://github.com/php/php-src/blob/02a5335b710aa36cd0c3108bfb9c6f7a57d40000/ext/standard/head.c#L108
-        if (strpbrk($value, ",; \t\r\n\013\014") !== false) {
-            throw new InvalidHeaderException(sprintf(
-                'The cookie option "%s" contains prohibited characters',
-                $key
-            ));
-        }
-    }
+	/**
+	 * Default cookie options
+	 *
+	 * @var array{
+	 *   path?: ?string,
+	 *   domain?: ?string,
+	 *   secure?: ?bool,
+	 *   httpOnly?: ?bool,
+	 *   sameSite?: ?string
+	 * }
+	 */
+	public const DEFAULT_OPTIONS = [
+		self::OPTION_KEY_PATH      => '/',
+		self::OPTION_KEY_DOMAIN    => null,
+		self::OPTION_KEY_SECURE    => null,
+		self::OPTION_KEY_HTTP_ONLY => true,
+		self::OPTION_KEY_SAME_SITE => CookieSameSite::LAX,
+	];
+
+	/**
+	 * Cookie option keys
+	 */
+	public const OPTION_KEY_PATH = 'path';
+	public const OPTION_KEY_DOMAIN = 'domain';
+	public const OPTION_KEY_SECURE = 'secure';
+	public const OPTION_KEY_HTTP_ONLY = 'httpOnly';
+	public const OPTION_KEY_SAME_SITE = 'sameSite';
+
+	/**
+	 * @deprecated Use the {@see CookieSameSite} enum.
+	 */
+	public const SAME_SITE_LAX = CookieSameSite::LAX;
+
+	/**
+	 * @deprecated Use the {@see CookieSameSite} enum.
+	 */
+	public const SAME_SITE_STRICT = CookieSameSite::STRICT;
+
+	/**
+	 * @deprecated Use the {@see CookieSameSite} enum.
+	 */
+	public const SAME_SITE_NONE = CookieSameSite::NONE;
+
+	/**
+	 * @deprecated Use the {@see SetCookieHeader::OPTION_KEY_SAME_SITE} constant.
+	 */
+	public const OPTION_KEY_SAMESITE = self::OPTION_KEY_SAME_SITE;
+
+	/**
+	 * @var ?array{
+	 *   path?: ?string,
+	 *   domain?: ?string,
+	 *   secure?: ?bool,
+	 *   httpOnly?: ?bool,
+	 *   sameSite?: ?string
+	 * }
+	 *
+	 * @deprecated Use the {@see SetCookieHeader::DEFAULT_OPTIONS} constant.
+	 */
+	protected static ?array $defaultOptions = null;
+
+	/**
+	 * The cookie name
+	 *
+	 * @var string
+	 */
+	private string $name;
+
+	/**
+	 * The cookie value
+	 *
+	 * @var string
+	 */
+	private string $value;
+
+	/**
+	 * The cookie expiration date
+	 *
+	 * @var DateTimeInterface|null
+	 */
+	private ?DateTimeInterface $expires;
+
+	/**
+	 * The cookie options
+	 *
+	 * @var array{
+	 *   path?: ?string,
+	 *   domain?: ?string,
+	 *   secure?: ?bool,
+	 *   httpOnly?: ?bool,
+	 *   sameSite?: ?string
+	 * }
+	 */
+	private array $options;
+
+	/**
+	 * Constructor of the class
+	 *
+	 * @param string $name
+	 * @param string $value
+	 * @param DateTimeInterface|null $expires
+	 * @param array{
+	 *   path?: ?string,
+	 *   domain?: ?string,
+	 *   secure?: ?bool,
+	 *   httpOnly?: ?bool,
+	 *   sameSite?: ?string
+	 * } $options
+	 *
+	 * @throws InvalidHeaderException
+	 *         If one of the arguments isn't valid.
+	 */
+	public function __construct(string $name, string $value, ?DateTimeInterface $expires = null, array $options = [])
+	{
+		$this->validateCookieName($name);
+
+		if (isset($options[self::OPTION_KEY_PATH])) {
+			$this->validateCookieOption(
+				self::OPTION_KEY_PATH,
+				$options[self::OPTION_KEY_PATH]
+			);
+		}
+
+		if (isset($options[self::OPTION_KEY_DOMAIN])) {
+			$this->validateCookieOption(
+				self::OPTION_KEY_DOMAIN,
+				$options[self::OPTION_KEY_DOMAIN]
+			);
+		}
+
+		if (isset($options[self::OPTION_KEY_SAME_SITE])) {
+			$this->validateCookieOption(
+				self::OPTION_KEY_SAME_SITE,
+				$options[self::OPTION_KEY_SAME_SITE]
+			);
+		}
+
+		if ($value === '') {
+			$value = 'deleted';
+			$expires = new DateTimeImmutable('1 year ago');
+		}
+
+		$options += (static::$defaultOptions ?? static::DEFAULT_OPTIONS);
+
+		$this->name = $name;
+		$this->value = $value;
+		$this->expires = $expires;
+		$this->options = $options;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getFieldName(): string
+	{
+		return 'Set-Cookie';
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getFieldValue(): string
+	{
+		$name = rawurlencode($this->name);
+		$value = rawurlencode($this->value);
+		$result = sprintf('%s=%s', $name, $value);
+
+		if (isset($this->expires)) {
+			$result .= '; Expires=' . $this->formatDateTime($this->expires);
+			$result .= '; Max-Age=' . max($this->expires->getTimestamp() - time(), 0);
+		}
+
+		if (isset($this->options[self::OPTION_KEY_PATH])) {
+			$result .= '; Path=' . $this->options[self::OPTION_KEY_PATH];
+		}
+
+		if (isset($this->options[self::OPTION_KEY_DOMAIN])) {
+			$result .= '; Domain=' . $this->options[self::OPTION_KEY_DOMAIN];
+		}
+
+		if (isset($this->options[self::OPTION_KEY_SECURE]) && $this->options[self::OPTION_KEY_SECURE]) {
+			$result .= '; Secure';
+		}
+
+		if (isset($this->options[self::OPTION_KEY_HTTP_ONLY]) && $this->options[self::OPTION_KEY_HTTP_ONLY]) {
+			$result .= '; HttpOnly';
+		}
+
+		if (isset($this->options[self::OPTION_KEY_SAME_SITE])) {
+			$result .= '; SameSite=' . $this->options[self::OPTION_KEY_SAME_SITE];
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Validates the given cookie name
+	 *
+	 * @param string $name
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidHeaderException
+	 *         If the cookie name isn't valid.
+	 */
+	private function validateCookieName(string $name): void
+	{
+		if ('' === $name) {
+			throw new InvalidHeaderException('Cookie name cannot be empty');
+		}
+
+		// https://github.com/php/php-src/blob/02a5335b710aa36cd0c3108bfb9c6f7a57d40000/ext/standard/head.c#L93
+		if (strpbrk($name, "=,; \t\r\n\013\014") !== false) {
+			throw new InvalidHeaderException(sprintf(
+				'The cookie name "%s" contains prohibited characters',
+				$name
+			));
+		}
+	}
+
+	/**
+	 * Validates the given cookie option
+	 *
+	 * @param string $key
+	 * @param mixed $value
+	 *
+	 * @return void
+	 *
+	 * @throws InvalidHeaderException
+	 *         If the cookie option isn't valid.
+	 */
+	private function validateCookieOption(string $key, $value): void
+	{
+		if (!is_string($value)) {
+			throw new InvalidHeaderException(sprintf(
+				'The cookie option "%s" must be a string',
+				$key
+			));
+		}
+
+		// https://github.com/php/php-src/blob/02a5335b710aa36cd0c3108bfb9c6f7a57d40000/ext/standard/head.c#L103
+		// https://github.com/php/php-src/blob/02a5335b710aa36cd0c3108bfb9c6f7a57d40000/ext/standard/head.c#L108
+		if (strpbrk($value, ",; \t\r\n\013\014") !== false) {
+			throw new InvalidHeaderException(sprintf(
+				'The cookie option "%s" contains prohibited characters',
+				$key
+			));
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
      *
      * @deprecated Use the {@see SetCookieHeader::DEFAULT_OPTIONS} constant.
      */
-    protected static ?array $defaultOptions = null;
+    protected static ? array $defaultOptions = null;
 
     /**
      * The cookie name

src/Header/ContentLanguageHeader.php

Indentation +41 added lines, -41 removed lines

@@ -28,50 +28,50 @@
 class ContentLanguageHeader extends Header
 {
 
-    /**
-     * Regular Expression for a language tag validation
-     *
-     * @link https://tools.ietf.org/html/rfc2616#section-3.10
-     *
-     * @var string
-     */
-    public const RFC2616_LANGUAGE_TAG = '/^[a-zA-Z]{1,8}(?:\-[a-zA-Z]{1,8})?$/';
+	/**
+	 * Regular Expression for a language tag validation
+	 *
+	 * @link https://tools.ietf.org/html/rfc2616#section-3.10
+	 *
+	 * @var string
+	 */
+	public const RFC2616_LANGUAGE_TAG = '/^[a-zA-Z]{1,8}(?:\-[a-zA-Z]{1,8})?$/';
 
-    /**
-     * @var list<string>
-     */
-    private array $languages = [];
+	/**
+	 * @var list<string>
+	 */
+	private array $languages = [];
 
-    /**
-     * Constructor of the class
-     *
-     * @param string ...$languages
-     *
-     * @throws InvalidHeaderException
-     *         If one of the language codes isn't valid.
-     */
-    public function __construct(string ...$languages)
-    {
-        $this->validateValueByRegex(self::RFC2616_LANGUAGE_TAG, ...$languages);
+	/**
+	 * Constructor of the class
+	 *
+	 * @param string ...$languages
+	 *
+	 * @throws InvalidHeaderException
+	 *         If one of the language codes isn't valid.
+	 */
+	public function __construct(string ...$languages)
+	{
+		$this->validateValueByRegex(self::RFC2616_LANGUAGE_TAG, ...$languages);
 
-        foreach ($languages as $language) {
-            $this->languages[] = $language;
-        }
-    }
+		foreach ($languages as $language) {
+			$this->languages[] = $language;
+		}
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getFieldName(): string
-    {
-        return 'Content-Language';
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getFieldName(): string
+	{
+		return 'Content-Language';
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getFieldValue(): string
-    {
-        return implode(', ', $this->languages);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getFieldValue(): string
+	{
+		return implode(', ', $this->languages);
+	}
 }