used native PHP 8 features

src/Bridges/HttpDI/HttpExtension.php

@@ -114,7 +114,7 @@ private function sendHeaders()
 			}
 
 			$value = self::buildPolicy($config->$key);
-			if (strpos($value, "'nonce'")) {
+			if (str_contains($value, "'nonce'")) {
 				$this->initialization->addBody('$cspNonce = base64_encode(random_bytes(16));');
 				$value = Nette\DI\ContainerBuilder::literal(
 					'str_replace(?, ? . $cspNonce, ?)',

src/Http/Context.php

@@ -50,7 +50,7 @@ public function isModified(string|int|\DateTimeInterface|null $lastModified = nu
 		} elseif ($ifNoneMatch !== null) {
 			$etag = $this->response->getHeader('ETag');
 
-			if ($etag === null || strpos(' ' . strtr($ifNoneMatch, ",\t", '  '), ' ' . $etag) === false) {
+			if ($etag === null || !str_contains(' ' . strtr($ifNoneMatch, ",\t", '  '), ' ' . $etag)) {
 				return true;
 
 			} else {

src/Http/Helpers.php

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

src/Http/RequestFactory.php

@@ -159,7 +159,7 @@ private function getGetPostCookie(Url $url): array
 						$list[$key][$k] = (string) preg_replace('#[^' . self::ValidChars . ']+#u', '', $v);
 
 					} else {
-						throw new Nette\InvalidStateException(sprintf('Invalid value in $_POST/$_COOKIE in key %s, expected string, %s given.', "'$k'", gettype($v)));
+						throw new Nette\InvalidStateException(sprintf('Invalid value in $_POST/$_COOKIE in key %s, expected string, %s given.', "'$k'", get_debug_type($v)));
 					}
 				}
 			}
@@ -301,9 +301,9 @@ private function useForwardedProxy(Url $url): ?string
 
 		if (isset($proxyParams['for'])) {
 			$address = $proxyParams['for'][0];
-			$remoteAddr = strpos($address, '[') === false
-				? explode(':', $address)[0]  // IPv4
-				: substr($address, 1, strpos($address, ']') - 1); // IPv6
+			$remoteAddr = str_contains($address, '[')
+				? substr($address, 1, strpos($address, ']') - 1) // IPv6
+				: explode(':', $address)[0];  // IPv4
 		}
 
 		if (isset($proxyParams['proto']) && count($proxyParams['proto']) === 1) {

src/Http/Response.php

@@ -229,7 +229,7 @@ public function __destruct()
 	{
 		if (
 			self::$fixIE
-			&& strpos($_SERVER['HTTP_USER_AGENT'] ?? '', 'MSIE ') !== false
+			&& str_contains($_SERVER['HTTP_USER_AGENT'] ?? '', 'MSIE ')
 			&& in_array($this->code, [400, 403, 404, 405, 406, 408, 409, 410, 500, 501, 505], true)
 			&& preg_match('#^text/html(?:;|$)#', (string) $this->getHeader('Content-Type'))
 		) {

src/Http/Url.php

@@ -177,7 +177,7 @@ public function getDefaultPort(): ?int
 	public function setPath(string $path): static
 	{
 		$this->path = $path;
-		if ($this->host && substr($this->path, 0, 1) !== '/') {
+		if ($this->host && !str_starts_with($this->path, '/')) {
 			$this->path = '/' . $this->path;
 		}
 
@@ -366,7 +366,7 @@ final public function export(): array
 	 */
 	private static function idnHostToUnicode(string $host): string
 	{
-		if (strpos($host, '--') === false) { // host does not contain IDN
+		if (!str_contains($host, '--')) { // host does not contain IDN
 			return $host;
 		}
 

src/Http/UrlImmutable.php

@@ -288,7 +288,7 @@ final public function export(): array
 
 	protected function build(): void
 	{
-		if ($this->host && substr($this->path, 0, 1) !== '/') {
+		if ($this->host && !str_starts_with($this->path, '/')) {
 			$this->path = '/' . $this->path;
 		}
 

tests/Http/Request.detectLanguage.phpt

@@ -14,7 +14,7 @@ require __DIR__ . '/../bootstrap.php';
 
 test('', function () {
 	$headers = ['Accept-Language' => 'en, cs'];
-	$request = new Http\Request(new Http\UrlScript, null, null, null, $headers);
+	$request = new Http\Request(new Http\UrlScript, headers: $headers);
 
 	Assert::same('en', $request->detectLanguage(['en', 'cs']));
 	Assert::same('en', $request->detectLanguage(['cs', 'en']));
@@ -24,7 +24,7 @@ test('', function () {
 
 test('', function () {
 	$headers = ['Accept-Language' => 'da, en-gb;q=0.8, en;q=0.7'];
-	$request = new Http\Request(new Http\UrlScript, null, null, null, $headers);
+	$request = new Http\Request(new Http\UrlScript, headers: $headers);
 
 	Assert::same('en-gb', $request->detectLanguage(['en', 'en-gb']));
 	Assert::same('en', $request->detectLanguage(['en']));
@@ -33,15 +33,15 @@ test('', function () {
 
 test('', function () {
 	$headers = [];
-	$request = new Http\Request(new Http\UrlScript, null, null, null, $headers);
+	$request = new Http\Request(new Http\UrlScript, headers: $headers);
 
 	Assert::null($request->detectLanguage(['en']));
 });
 
 
 test('', function () {
 	$headers = ['Accept-Language' => 'garbage'];
-	$request = new Http\Request(new Http\UrlScript, null, null, null, $headers);
+	$request = new Http\Request(new Http\UrlScript, headers: $headers);
 
 	Assert::null($request->detectLanguage(['en']));
 });

tests/Http/Request.getOrigin.phpt

@@ -16,15 +16,15 @@ test('missing origin', function () {
 
 
 test('opaque origin', function () {
-	$request = new Http\Request(new Http\UrlScript, null, null, null, [
+	$request = new Http\Request(new Http\UrlScript, headers: [
 		'Origin' => 'null',
 	]);
 	Assert::null($request->getOrigin());
 });
 
 
 test('normal origin', function () {
-	$request = new Http\Request(new Http\UrlScript, null, null, null, [
+	$request = new Http\Request(new Http\UrlScript, headers: [
 		'Origin' => 'https://nette.org',
 	]);
 	Assert::equal(new UrlImmutable('https://nette.org'), $request->getOrigin());

tests/Http/Request.getRawBody.phpt

@@ -13,7 +13,7 @@ require __DIR__ . '/../bootstrap.php';
 
 
 test('', function () {
-	$request = new Http\Request(new Http\UrlScript, null, null, null, null, null, null, null, fn() => 'raw body');
+	$request = new Http\Request(new Http\UrlScript, rawBodyCallback: fn() => 'raw body');
 
 	Assert::same('raw body', $request->getRawBody());
 });

tests/Http/Request.headers.phpt

@@ -18,12 +18,12 @@ test('', function () {
 });
 
 test('', function () {
-	$request = new Http\Request(new Http\UrlScript, null, null, null, []);
+	$request = new Http\Request(new Http\UrlScript);
 	Assert::same([], $request->getHeaders());
 });
 
 test('', function () {
-	$request = new Http\Request(new Http\UrlScript, null, null, null, [
+	$request = new Http\Request(new Http\UrlScript, headers: [
 		'one' => '1',
 		'TWO' => '2',
 		'X-Header' => 'X',

tests/Http/Request.invalidType.phpt

@@ -19,7 +19,7 @@ test('invalid POST', function () {
 
 	Assert::exception(function () {
 		(new Http\RequestFactory)->fromGlobals();
-	}, Nette\InvalidStateException::class, 'Invalid value in $_POST/$_COOKIE in key \'int\', expected string, integer given.');
+	}, Nette\InvalidStateException::class, 'Invalid value in $_POST/$_COOKIE in key \'int\', expected string, int given.');
 });
 
 
@@ -29,5 +29,5 @@ test('invalid COOKIE', function () {
 
 	Assert::exception(function () {
 		(new Http\RequestFactory)->fromGlobals();
-	}, Nette\InvalidStateException::class, 'Invalid value in $_POST/$_COOKIE in key \'0\', expected string, integer given.');
+	}, Nette\InvalidStateException::class, 'Invalid value in $_POST/$_COOKIE in key \'0\', expected string, int given.');
 });