Merge branch refs/heads/2.1.x into 2.2.x

Author: phpstan-bot

src/Analyser/NodeScopeResolver.php

@@ -1010,6 +1010,8 @@ private function processStmtNode(
 		} elseif ($stmt instanceof Node\Stmt\Namespace_) {
 			if ($stmt->name !== null) {
 				$scope = $scope->enterNamespace($stmt->name->toString());
+			} else {
+				$scope = $scope->enterNamespace('');
 			}
 
 			$scope = $this->processStmtNodesInternal($stmt, $stmt->stmts, $scope, $storage, $nodeCallback, $context)->getScope();

tests/PHPStan/Rules/Functions/MissingFunctionReturnTypehintRuleTest.php

@@ -82,4 +82,9 @@ public function testRule(): void
 		]);
 	}
 
+	public function testBug13831(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-13831.php'], []);
+	}
+
 }

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

@@ -0,0 +1,14 @@
+<?php
+
+namespace Bug13831 {
+	// non-global namespace block
+}
+
+namespace {
+
+	/** @return list<string> */
+	function bug13831Qux(): array {
+		return [ random_bytes(16) ];
+	}
+
+}