Merge remote-tracking branch 'origin/1.12.x' into 2.1.x

Author: ondrejmirtes

resources/functionMap_php80delta.php

@@ -82,6 +82,8 @@
 		'imagejpeg' => ['bool', 'im'=>'GdImage', 'filename='=>'string|resource|null', 'quality='=>'int'],
 		'imagerotate' => ['false|object', 'src_im'=>'resource', 'angle'=>'float', 'bgdcolor'=>'int', 'ignoretransparent='=>'int'],
 		'imagescale' => ['false|object', 'im'=>'resource', 'new_width'=>'int', 'new_height='=>'int', 'method='=>'int'],
+		'getenv' => ['string|false', 'varname'=>'string', 'local_only='=>'bool'],
+		'getenv\'1' => ['array<string, string>', 'varname='=>'null', 'local_only='=>'bool'],
 		'ldap_set_rebind_proc' => ['bool', 'ldap'=>'resource', 'callback'=>'?callable'],
 		'mb_decode_numericentity' => ['string|false', 'string'=>'string', 'convmap'=>'array', 'encoding='=>'string'],
 		'mb_detect_order' => ['bool|list<non-falsy-string>', 'encoding_list='=>'non-empty-list<non-falsy-string>|non-falsy-string|null'],

src/Command/InceptionResult.php

@@ -103,9 +103,15 @@ public function getEditorModeInsteadOfFile(): ?string
 	public function handleReturn(int $exitCode, ?int $peakMemoryUsageBytes, float $analysisStartTime): int
 	{
 		if ($this->getErrorOutput()->isVerbose()) {
+			$elapsedTime = round(microtime(true) - $analysisStartTime, 2);
+			if ($elapsedTime < 10) {
+				$elapsedTimeString = sprintf('%.2f seconds', $elapsedTime);
+			} else {
+				$elapsedTimeString = $this->formatDuration((int) $elapsedTime);
+			}
 			$this->getErrorOutput()->writeLineFormatted(sprintf(
 				'Elapsed time: %s',
-				$this->formatDuration((int) round(microtime(true) - $analysisStartTime)),
+				$elapsedTimeString,
 			));
 		}
 

tests/PHPStan/Analyser/nsrt/getenv-php74.php

@@ -0,0 +1,23 @@
+<?php // lint < 8.0
+
+namespace GetenvPHP74;
+
+use function PHPStan\Testing\assertType;
+
+class Foo
+{
+	/**
+	 * @param string|null $stringOrNull
+	 * @param mixed       $mixed
+	 */
+	public function test($stringOrNull, $mixed)
+	{
+		assertType('string|false', getenv(null));
+		assertType('array<string, string>', getenv());
+		assertType('string|false', getenv('foo'));
+
+		assertType('string|false', getenv($stringOrNull));
+		assertType('string|false', getenv($mixed));
+	}
+
+}

tests/PHPStan/Analyser/nsrt/getenv-php80.php

@@ -0,0 +1,20 @@
+<?php // lint >= 8.0
+
+namespace GetenvPHP80;
+
+use function PHPStan\Testing\assertType;
+
+class Foo
+{
+
+	public function test(string|null $stringOrNull, mixed $mixed)
+	{
+		assertType('array<string, string>', getenv(null));
+		assertType('array<string, string>', getenv());
+		assertType('string|false', getenv('foo'));
+
+		assertType('array<string, string>|string|false', getenv($stringOrNull));
+		assertType('array<string, string>|string|false', getenv($mixed));
+	}
+
+}

tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php

@@ -2248,4 +2248,17 @@ public function testBug12954(): void
 		$this->analyse([__DIR__ . '/../../Analyser/nsrt/bug-12954.php'], []);
 	}
 
+	public function testBug13065(): void
+	{
+		$errors = [];
+		if (PHP_VERSION_ID < 80000) {
+			$errors[] = [
+				'Parameter #1 $varname of function getenv expects string, null given.',
+				10,
+			];
+		}
+
+		$this->analyse([__DIR__ . '/data/bug-13065.php'], $errors);
+	}
+
 }

tests/PHPStan/Rules/Functions/data/bug-13065.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Bug13065;
+
+class Foo
+{
+
+	public function test()
+	{
+		getenv(null);
+		getenv();
+		getenv('foo');
+	}
+
+}