unification of Response and IResponse params (BC break)

Author: dg

src/Http/IResponse.php

@@ -12,7 +12,6 @@
 
 /**
  * HTTP response interface.
- * @method self deleteHeader(string $name)
  */
 interface IResponse
 {
@@ -167,6 +166,11 @@ function setHeader(string $name, string $value): static;
 	 */
 	function addHeader(string $name, string $value): static;
 
+	/**
+	 * Deletes a previously sent HTTP header.
+	 */
+	function deleteHeader(string $name): static;
+
 	/**
 	 * Sends a Content-type HTTP header.
 	 */
@@ -180,7 +184,7 @@ function redirect(string $url, int $code = self::S302_FOUND): void;
 	/**
 	 * Sets the time (like '20 minutes') before a page cached on a browser expires, null means "must-revalidate".
 	 */
-	function setExpiration(?string $expire): static;
+	function setExpiration(?string $expires): static;
 
 	/**
 	 * Checks if headers have been sent.
@@ -193,7 +197,7 @@ function isSent(): bool;
 	function getHeader(string $header): ?string;
 
 	/**
-	 * Returns a associative array of headers to sent.
+	 * Returns an associative array of headers to sent.
 	 */
 	function getHeaders(): array;
 
@@ -203,11 +207,12 @@ function getHeaders(): array;
 	function setCookie(
 		string $name,
 		string $value,
-		?int $expire,
+		string|int|null $expires,
 		?string $path = null,
 		?string $domain = null,
 		bool $secure = false,
 		bool $httpOnly = true,
+		string $sameSite = self::SAME_SITE_LAX,
 	): static;
 
 	/**

src/Http/Response.php

@@ -167,18 +167,18 @@ public function redirect(string $url, int $code = self::S302_FOUND): void
 	 * The parameter is either a time interval (as text) or `null`, which disables caching.
 	 * @throws Nette\InvalidStateException  if HTTP headers have been sent
 	 */
-	public function setExpiration(?string $time): static
+	public function setExpiration(?string $expires): static
 	{
 		$this->setHeader('Pragma', null);
-		if (!$time) { // no cache
+		if (!$expires) { // no cache
 			$this->setHeader('Cache-Control', 's-maxage=0, max-age=0, must-revalidate');
 			$this->setHeader('Expires', 'Mon, 23 Jan 1978 10:00:00 GMT');
 			return $this;
 		}
 
-		$time = DateTime::from($time);
-		$this->setHeader('Cache-Control', 'max-age=' . ($time->format('U') - time()));
-		$this->setHeader('Expires', Helpers::formatDate($time));
+		$expires = DateTime::from($expires);
+		$this->setHeader('Cache-Control', 'max-age=' . ($expires->format('U') - time()));
+		$this->setHeader('Expires', Helpers::formatDate($expires));
 		return $this;
 	}
 
@@ -246,7 +246,7 @@ public function __destruct()
 	public function setCookie(
 		string $name,
 		string $value,
-		string|int|\DateTimeInterface|null $time,
+		string|int|null $expires,
 		?string $path = null,
 		?string $domain = null,
 		?bool $secure = null,
@@ -255,7 +255,7 @@ public function setCookie(
 	): static {
 		self::checkHeaders();
 		setcookie($name, $value, [
-			'expires' => $time ? (int) DateTime::from($time)->format('U') : 0,
+			'expires' => $expires ? (int) DateTime::from($expires)->format('U') : 0,
 			'path' => $path ?? ($domain ? '/' : $this->cookiePath),
 			'domain' => $domain ?? ($path ? '' : $this->cookieDomain),
 			'secure' => $secure ?? $this->cookieSecure,