From 22700511d91b748240da0ac8b697f2ab409aad21 Mon Sep 17 00:00:00 2001
From: Ondrej Mirtes <ondrej@mirtes.cz>
Date: Sat, 6 Jan 2024 13:32:30 +0100
Subject: [PATCH] Fix detection of shadowed trait methods

---
 src/Analyser/NodeScopeResolver.php            | 14 ++++++-
 .../PHPStan/Rules/Debug/DumpTypeRuleTest.php  | 14 +++++++
 tests/PHPStan/Rules/Debug/data/bug-10377.php  | 37 +++++++++++++++++++
 3 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 tests/PHPStan/Rules/Debug/data/bug-10377.php

diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
index d3ffae3077..cb173b44a0 100644
--- a/src/Analyser/NodeScopeResolver.php
+++ b/src/Analyser/NodeScopeResolver.php
@@ -4473,8 +4473,20 @@ private function processTraitUse(Node\Stmt\TraitUse $node, MutatingScope $classS
 			if (!isset($this->analysedFiles[$fileName])) {
 				continue;
 			}
+			$adaptations = [];
+			foreach ($node->adaptations as $adaptation) {
+				if ($adaptation->trait === null) {
+					$adaptations[] = $adaptation;
+					continue;
+				}
+				if ($adaptation->trait->toLowerString() !== $trait->toLowerString()) {
+					continue;
+				}
+
+				$adaptations[] = $adaptation;
+			}
 			$parserNodes = $this->parser->parseFile($fileName);
-			$this->processNodesForTraitUse($parserNodes, $traitReflection, $classScope, $node->adaptations, $nodeCallback);
+			$this->processNodesForTraitUse($parserNodes, $traitReflection, $classScope, $adaptations, $nodeCallback);
 		}
 	}
 
diff --git a/tests/PHPStan/Rules/Debug/DumpTypeRuleTest.php b/tests/PHPStan/Rules/Debug/DumpTypeRuleTest.php
index bbd36941eb..77f45bfef1 100644
--- a/tests/PHPStan/Rules/Debug/DumpTypeRuleTest.php
+++ b/tests/PHPStan/Rules/Debug/DumpTypeRuleTest.php
@@ -72,4 +72,18 @@ public function testBug7803(): void
 		]);
 	}
 
+	public function testBug10377(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-10377.php'], [
+			[
+				'Dumped type: array<string, mixed>',
+				22,
+			],
+			[
+				'Dumped type: array<string, mixed>',
+				34,
+			],
+		]);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Debug/data/bug-10377.php b/tests/PHPStan/Rules/Debug/data/bug-10377.php
new file mode 100644
index 0000000000..b9850376e4
--- /dev/null
+++ b/tests/PHPStan/Rules/Debug/data/bug-10377.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Bug10377;
+
+final class WebRequest
+{
+
+	use Headers, RequestParameters {
+		Headers::addAdditionalProperties as addAdditionalPropertiesHeaders;
+		RequestParameters::addAdditionalProperties insteadof Headers;
+	}
+
+}
+
+trait Headers
+{
+	/**
+	 * @param array<string, mixed> $additionalProperties
+	 */
+	public function addAdditionalProperties(array $additionalProperties): void
+	{
+		\PHPStan\dumpType($additionalProperties);
+	}
+}
+
+trait RequestParameters
+{
+
+	/**
+	 * @param array<string, mixed> $additionalProperties
+	 */
+	public function addAdditionalProperties(array $additionalProperties): void
+	{
+		\PHPStan\dumpType($additionalProperties);
+	}
+
+}