cs

Author: dg

src/Bridges/HttpDI/HttpExtension.php

@@ -93,7 +93,7 @@ public function loadConfiguration(): void
 	private function sendHeaders(): void
 	{
 		$config = $this->config;
-		$headers = array_map('strval', $config->headers);
+		$headers = array_map(strval(...), $config->headers);
 
 		if (isset($config->frames) && $config->frames !== true && !isset($headers['X-Frame-Options'])) {
 			$frames = $config->frames;

src/Http/FileUpload.php

@@ -140,7 +140,7 @@ public function getSuggestedExtension(): ?string
 			}
 			[, , $type] = Nette\Utils\Helpers::falseToNull(@getimagesize($this->tmpName)); // @ - files smaller than 12 bytes causes read error
 			if ($type) {
-				return $this->extension = image_type_to_extension($type, false);
+				return $this->extension = image_type_to_extension($type, include_dot: false);
 			}
 			$this->extension = false;
 		}
@@ -231,7 +231,7 @@ function (string $message) use ($dest): void {
 	 */
 	public function isImage(): bool
 	{
-		$types = array_map(fn($type) => Image::typeToMimeType($type), Image::getSupportedTypes());
+		$types = array_map(Image::typeToMimeType(...), Image::getSupportedTypes());
 		return in_array($this->getContentType(), $types, strict: true);
 	}
 

src/Http/Helpers.php

@@ -56,7 +56,7 @@ public static function ipMatch(string $ip, string $mask): bool
 	}
 
 
-	public static function initCookie(IRequest $request, IResponse $response)
+	public static function initCookie(IRequest $request, IResponse $response): void
 	{
 		$response->setCookie(self::StrictCookieName, '1', 0, '/', sameSite: IResponse::SameSiteStrict);
 	}

src/Http/Request.php

@@ -35,6 +35,7 @@ class Request implements IRequest
 {
 	use Nette\SmartObject;
 
+	/** @var string[] */
 	private readonly array $headers;
 
 	private readonly ?\Closure $rawBodyCallback;
@@ -178,6 +179,7 @@ public function getHeader(string $header): ?string
 
 	/**
 	 * Returns all HTTP headers as associative array.
+	 * @return string[]
 	 */
 	public function getHeaders(): array
 	{
@@ -207,7 +209,7 @@ public function getOrigin(): ?UrlImmutable
 			return $header === 'null'
 				? null
 				: new UrlImmutable($header);
-		} catch (Nette\InvalidArgumentException $e) {
+		} catch (Nette\InvalidArgumentException) {
 			return null;
 		}
 	}

src/Http/RequestFactory.php

@@ -24,6 +24,7 @@ class RequestFactory
 	/** @internal */
 	private const ValidChars = '\x09\x0A\x0D\x20-\x7E\xA0-\x{10FFFF}';
 
+	/** @var array<string, string[]> */
 	public array $urlFilters = [
 		'path' => ['#//#' => '/'], // '%20' => ''
 		'url' => [], // '#[.,)]$#D' => ''
@@ -132,7 +133,7 @@ private function getScriptPath(Url $url): string
 
 	private function getGetPostCookie(Url $url): array
 	{
-		$useFilter = (!in_array((string) ini_get('filter.default'), ['', 'unsafe_raw'], true) || ini_get('filter.default_flags'));
+		$useFilter = (!in_array((string) ini_get('filter.default'), ['', 'unsafe_raw'], strict: true) || ini_get('filter.default_flags'));
 
 		$query = $url->getQueryParameters();
 		$post = $useFilter
@@ -235,7 +236,7 @@ private function getHeaders(): array
 		} else {
 			$headers = [];
 			foreach ($_SERVER as $k => $v) {
-				if (strncmp($k, 'HTTP_', 5) === 0) {
+				if (str_starts_with($k, 'HTTP_')) {
 					$k = substr($k, 5);
 				} elseif (strncmp($k, 'CONTENT_', 8)) {
 					continue;

src/Http/Response.php

@@ -276,7 +276,7 @@ private function checkHeaders(): void
 		} elseif (
 			$this->warnOnBuffer &&
 			ob_get_length() &&
-			!array_filter(ob_get_status(true), fn(array $i): bool => !$i['chunk_size'])
+			!array_filter(ob_get_status(full_status: true), fn(array $i): bool => !$i['chunk_size'])
 		) {
 			trigger_error('Possible problem: you are sending a HTTP header while already having some data in output buffer. Try Tracy\OutputDebugger or send cookies/start session earlier.');
 		}

src/Http/Session.php

@@ -46,19 +46,16 @@ class Session
 		'cookie_lifetime' => 0,   // for a maximum of 3 hours or until the browser is closed
 		'gc_maxlifetime' => self::DefaultFileLifetime, // 3 hours
 	];
-
-	private readonly IRequest $request;
-	private readonly IResponse $response;
 	private ?\SessionHandlerInterface $handler = null;
 	private bool $readAndClose = false;
 	private bool $fileExists = true;
 	private bool $autoStart = true;
 
 
-	public function __construct(IRequest $request, IResponse $response)
-	{
-		$this->request = $request;
-		$this->response = $response;
+	public function __construct(
+		private readonly IRequest $request,
+		private readonly IResponse $response,
+	) {
 		$this->options['cookie_path'] = &$this->response->cookiePath;
 		$this->options['cookie_domain'] = &$this->response->cookieDomain;
 		$this->options['cookie_secure'] = &$this->response->cookieSecure;
@@ -75,7 +72,7 @@ public function start(): void
 	}
 
 
-	private function doStart($mustExists = false): void
+	private function doStart(bool $mustExists = false): void
 	{
 		if (session_status() === PHP_SESSION_ACTIVE) { // adapt an existing session
 			if (!$this->started) {
@@ -254,7 +251,7 @@ public function regenerateId(): void
 				throw new Nette\InvalidStateException('Cannot regenerate session ID after HTTP headers have been sent' . ($file ? " (output started at $file:$line)." : '.'));
 			}
 
-			session_regenerate_id(true);
+			session_regenerate_id(delete_old_session: true);
 		} else {
 			session_id(session_create_id());
 		}
@@ -318,7 +315,7 @@ public function getSection(string $section, string $class = SessionSection::clas
 	public function hasSection(string $section): bool
 	{
 		if ($this->exists() && !$this->started) {
-			$this->autoStart(false);
+			$this->autoStart(forWrite: false);
 		}
 
 		return !empty($_SESSION['__NF']['DATA'][$section]);
@@ -329,7 +326,7 @@ public function hasSection(string $section): bool
 	public function getSectionNames(): array
 	{
 		if ($this->exists() && !$this->started) {
-			$this->autoStart(false);
+			$this->autoStart(forWrite: false);
 		}
 
 		return array_keys($_SESSION['__NF']['DATA'] ?? []);
@@ -442,7 +439,7 @@ private function configure(array $config): void
 			if ($value === null || ini_get("session.$key") == $value) { // intentionally ==
 				continue;
 
-			} elseif (strncmp($key, 'cookie_', 7) === 0) {
+			} elseif (str_starts_with($key, 'cookie_')) {
 				$cookie[substr($key, 7)] = $value;
 
 			} else {

src/Http/SessionSection.php

@@ -36,7 +36,7 @@ public function __construct(
 	 */
 	public function getIterator(): \Iterator
 	{
-		$this->session->autoStart(false);
+		$this->session->autoStart(forWrite: false);
 		return new \ArrayIterator($this->getData() ?? []);
 	}
 
@@ -49,7 +49,7 @@ public function set(string $name, mixed $value, ?string $expire = null): void
 		if ($value === null) {
 			$this->remove($name);
 		} else {
-			$this->session->autoStart(true);
+			$this->session->autoStart(forWrite: true);
 			$this->getData()[$name] = $value;
 			$this->setExpiration($expire, $name);
 		}
@@ -65,7 +65,7 @@ public function get(string $name): mixed
 			throw new \ArgumentCountError(__METHOD__ . '() expects 1 arguments, given more.');
 		}
 
-		$this->session->autoStart(false);
+		$this->session->autoStart(forWrite: false);
 		return $this->getData()[$name] ?? null;
 	}
 
@@ -76,7 +76,7 @@ public function get(string $name): mixed
 	 */
 	public function remove(string|array|null $name = null): void
 	{
-		$this->session->autoStart(false);
+		$this->session->autoStart(forWrite: false);
 		if (func_num_args() > 1) {
 			throw new \ArgumentCountError(__METHOD__ . '() expects at most 1 arguments, given more.');
 
@@ -96,9 +96,9 @@ public function remove(string|array|null $name = null): void
 	 * Sets a variable in this session section.
 	 * @deprecated  use set() instead
 	 */
-	public function __set(string $name, $value): void
+	public function __set(string $name, mixed $value): void
 	{
-		$this->session->autoStart(true);
+		$this->session->autoStart(forWrite: true);
 		$this->getData()[$name] = $value;
 	}
 
@@ -109,7 +109,7 @@ public function __set(string $name, $value): void
 	 */
 	public function &__get(string $name): mixed
 	{
-		$this->session->autoStart(true);
+		$this->session->autoStart(forWrite: true);
 		$data = &$this->getData();
 		if ($this->warnOnUndefined && !array_key_exists($name, $data ?? [])) {
 			trigger_error("The variable '$name' does not exist in session section");
@@ -125,7 +125,7 @@ public function &__get(string $name): mixed
 	 */
 	public function __isset(string $name): bool
 	{
-		$this->session->autoStart(false);
+		$this->session->autoStart(forWrite: false);
 		return isset($this->getData()[$name]);
 	}
 

src/Http/Url.php

@@ -47,6 +47,7 @@ class Url implements \JsonSerializable
 {
 	use Nette\SmartObject;
 
+	/** @var array<string, int> */
 	public static array $defaultPorts = [
 		'http' => 80,
 		'https' => 443,

src/Http/UserStorage.php

@@ -37,7 +37,7 @@ public function __construct(
 	 */
 	public function setAuthenticated(bool $state): self
 	{
-		$section = $this->getSessionSection(true);
+		$section = $this->getSessionSection(need: true);
 		$section->authenticated = $state;
 
 		// Session Fixation defence
@@ -61,7 +61,7 @@ public function setAuthenticated(bool $state): self
 	 */
 	public function isAuthenticated(): bool
 	{
-		$session = $this->getSessionSection(false);
+		$session = $this->getSessionSection(need: false);
 		return $session && $session->authenticated;
 	}
 
@@ -71,7 +71,7 @@ public function isAuthenticated(): bool
 	 */
 	public function setIdentity(?IIdentity $identity): self
 	{
-		$this->getSessionSection(true)->identity = $identity;
+		$this->getSessionSection(need: true)->identity = $identity;
 		return $this;
 	}
 
@@ -81,7 +81,7 @@ public function setIdentity(?IIdentity $identity): self
 	 */
 	public function getIdentity(): ?Nette\Security\IIdentity
 	{
-		$session = $this->getSessionSection(false);
+		$session = $this->getSessionSection(need: false);
 		return $session ? $session->identity : null;
 	}
 
@@ -114,7 +114,7 @@ public function getNamespace(): string
 	 */
 	public function setExpiration(?string $time, int $flags = 0): self
 	{
-		$section = $this->getSessionSection(true);
+		$section = $this->getSessionSection(need: true);
 		if ($time) {
 			$time = Nette\Utils\DateTime::from($time)->format('U');
 			$section->expireTime = $time;
@@ -135,7 +135,7 @@ public function setExpiration(?string $time, int $flags = 0): self
 	 */
 	public function getLogoutReason(): ?int
 	{
-		$session = $this->getSessionSection(false);
+		$session = $this->getSessionSection(need: false);
 		return $session ? $session->reason : null;
 	}