fix php7 build

Author: staabm

tests/PHPStan/Analyser/nsrt/bug-2001-php8.php

@@ -0,0 +1,51 @@
+<?php // lint >= 8.0
+
+namespace Bug2001Php8;
+
+use function PHPStan\Testing\assertType;
+
+class HelloWorld
+{
+	public function parseUrl(string $url): string
+	{
+		$parsedUrl = parse_url(urldecode($url));
+		assertType('array{scheme?: string, host?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment?: string}|false', $parsedUrl);
+
+		if (array_key_exists('host', $parsedUrl)) {
+			assertType('array{scheme?: string, host: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment?: string}', $parsedUrl);
+			throw new \RuntimeException('Absolute URLs are prohibited for the redirectTo parameter.');
+		}
+
+		assertType('array{scheme?: string, host?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment?: string}', $parsedUrl);
+
+		$redirectUrl = $parsedUrl['path'];
+
+		if (array_key_exists('query', $parsedUrl)) {
+			assertType('array{scheme?: string, host?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query: string, fragment?: string}', $parsedUrl);
+			$redirectUrl .= '?' . $parsedUrl['query'];
+		}
+
+		if (array_key_exists('fragment', $parsedUrl)) {
+			assertType('array{scheme?: string, host?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment: string}', $parsedUrl);
+			$redirectUrl .= '#' . $parsedUrl['query'];
+		}
+
+		assertType('array{scheme?: string, host?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment?: string}', $parsedUrl);
+
+		return $redirectUrl;
+	}
+
+	public function doFoo(int $i)
+	{
+		$a = ['a' => $i];
+		if (rand(0, 1)) {
+			$a['b'] = $i;
+		}
+
+		if (rand(0,1)) {
+			$a = ['d' => $i];
+		}
+
+		assertType('array{a: int, b?: int}|array{d: int}', $a);
+	}
+}

tests/PHPStan/Analyser/nsrt/bug-2001.php

@@ -1,4 +1,4 @@
-<?php
+<?php // lint < 8.0
 
 namespace Bug2001;
 
@@ -16,21 +16,21 @@ public function parseUrl(string $url): string
 			throw new \RuntimeException('Absolute URLs are prohibited for the redirectTo parameter.');
 		}
 
-		assertType('array{scheme?: string, host?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment?: string}', $parsedUrl);
+		assertType('array{scheme?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment?: string}|false', $parsedUrl);
 
 		$redirectUrl = $parsedUrl['path'];
 
 		if (array_key_exists('query', $parsedUrl)) {
-			assertType('array{scheme?: string, host?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query: string, fragment?: string}', $parsedUrl);
+			assertType('array{scheme?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query: string, fragment?: string}', $parsedUrl);
 			$redirectUrl .= '?' . $parsedUrl['query'];
 		}
 
 		if (array_key_exists('fragment', $parsedUrl)) {
-			assertType('array{scheme?: string, host?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment: string}', $parsedUrl);
+			assertType('array{scheme?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment: string}', $parsedUrl);
 			$redirectUrl .= '#' . $parsedUrl['query'];
 		}
 
-		assertType('array{scheme?: string, host?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment?: string}', $parsedUrl);
+		assertType('array{scheme?: string, port?: int<0, 65535>, user?: string, pass?: string, path?: string, query?: string, fragment?: string}|false', $parsedUrl);
 
 		return $redirectUrl;
 	}