Merge branch 2.1.x into 2.2.x

Author: phpstan-bot

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

@@ -0,0 +1,49 @@
+<?php declare(strict_types = 1);
+
+namespace Bug14553;
+
+use function PHPStan\Testing\assertType;
+
+class Foo {
+
+	const FORMAT_HTML = 'html';
+
+	const FORMAT_MARKDOWN = 'markdown';
+
+	/**
+	 * @param list<self::FORMAT_*> $formats
+	 * @return array<self::FORMAT_*, string>|string
+	 * @phpstan-return ($formats is array{} ? string : ($formats is array{self::FORMAT_MARKDOWN} ? string : ($formats is array{self::FORMAT_HTML} ? string : non-empty-array<self::FORMAT_*, string>)))
+	 */
+	public function getMessage(array $formats = [])
+	{
+		$message = '<h1>title</h1>';
+
+		if (!$formats) {
+			return $message;
+		}
+
+		if (1 === count($formats)) {
+			return self::formatMessage($message, array_first($formats));
+		}
+
+		$formatted = [];
+		foreach ($formats as $format) {
+			$formatted[$format] = self::formatMessage($message, $format);
+		}
+
+		assertType('non-empty-array{html?: string, markdown?: string}', $formatted);
+
+		return $formatted;
+	}
+
+	private function formatMessage(string $message, string $format): string
+	{
+		if ($format === self::FORMAT_HTML) {
+			return $message;
+		}
+
+		return '# title';
+	}
+
+}

tests/PHPStan/Rules/Methods/ReturnTypeRuleTest.php

@@ -1341,4 +1341,10 @@ public function testBug12653(): void
 		$this->analyse([__DIR__ . '/data/bug-12653.php'], []);
 	}
 
+	#[RequiresPhp('>= 8.5.0')]
+	public function testBug14553(): void
+	{
+		$this->analyse([__DIR__ . '/../../Analyser/nsrt/bug-14553.php'], []);
+	}
+
 }