Hierarchy distances - collect all traits

ondrejmirtes · ondrejmirtes · commit 314a9ccd99fc · 2020-04-19T22:03:53.000+02:00
diff --git a/src/Reflection/ClassReflection.php b/src/Reflection/ClassReflection.php
@@ -259,7 +259,7 @@ public function getClassHierarchyDistances(): array
 				$this->getName() => $distance,
 			];
 			$currentClassReflection = $this->getNativeReflection();
-			foreach ($this->getNativeReflection()->getTraits() as $trait) {
+			foreach ($this->collectTraits($this->getNativeReflection()) as $trait) {
 				$distance++;
 				if (array_key_exists($trait->getName(), $distances)) {
 					continue;
@@ -275,7 +275,7 @@ public function getClassHierarchyDistances(): array
 					$distances[$parentClassName] = $distance;
 				}
 				$currentClassReflection = $currentClassReflection->getParentClass();
-				foreach ($currentClassReflection->getTraits() as $trait) {
+				foreach ($this->collectTraits($currentClassReflection) as $trait) {
 					$distance++;
 					if (array_key_exists($trait->getName(), $distances)) {
 						continue;
@@ -299,6 +299,33 @@ public function getClassHierarchyDistances(): array
 		return $this->classHierarchyDistances;
 	}
 
+	/**
+	 * @param \ReflectionClass $class
+	 * @return \ReflectionClass[]
+	 */
+	private function collectTraits(\ReflectionClass $class): array
+	{
+		$traits = [];
+		$traitsLeftToAnalyze = $class->getTraits();
+
+		while (count($traitsLeftToAnalyze) !== 0) {
+			$trait = reset($traitsLeftToAnalyze);
+			$traits[] = $trait;
+
+			foreach ($trait->getTraits() as $subTrait) {
+				if (in_array($subTrait, $traits, true)) {
+					continue;
+				}
+
+				$traitsLeftToAnalyze[] = $subTrait;
+			}
+
+			array_shift($traitsLeftToAnalyze);
+		}
+
+		return $traits;
+	}
+
 	public function hasProperty(string $propertyName): bool
 	{
 		foreach ($this->propertiesClassReflectionExtensions as $extension) {
diff --git a/tests/PHPStan/Reflection/ClassReflectionTest.php b/tests/PHPStan/Reflection/ClassReflectionTest.php
@@ -38,8 +38,9 @@ public function dataClassHierarchyDistances(): array
 				[
 					\HierarchyDistances\Lorem::class => 0,
 					\HierarchyDistances\TraitTwo::class => 1,
-					\HierarchyDistances\FirstLoremInterface::class => 2,
-					\HierarchyDistances\SecondLoremInterface::class => 3,
+					\HierarchyDistances\TraitThree::class => 2,
+					\HierarchyDistances\FirstLoremInterface::class => 3,
+					\HierarchyDistances\SecondLoremInterface::class => 4,
 				],
 			],
 			[
@@ -50,25 +51,27 @@ public function dataClassHierarchyDistances(): array
 					\HierarchyDistances\TraitOne::class => 1,
 					\HierarchyDistances\Lorem::class => 2,
 					\HierarchyDistances\TraitTwo::class => 3,
-					\HierarchyDistances\SecondLoremInterface::class => 4,
-					\HierarchyDistances\FirstLoremInterface::class => 5,
-					\HierarchyDistances\FirstIpsumInterface::class => 6,
-					\HierarchyDistances\ExtendedIpsumInterface::class => 7,
-					\HierarchyDistances\SecondIpsumInterface::class => 8,
-					\HierarchyDistances\ThirdIpsumInterface::class => 9,
+					\HierarchyDistances\TraitThree::class => 4,
+					\HierarchyDistances\SecondLoremInterface::class => 5,
+					\HierarchyDistances\FirstLoremInterface::class => 6,
+					\HierarchyDistances\FirstIpsumInterface::class => 7,
+					\HierarchyDistances\ExtendedIpsumInterface::class => 8,
+					\HierarchyDistances\SecondIpsumInterface::class => 9,
+					\HierarchyDistances\ThirdIpsumInterface::class => 10,
 				]
 				:
 				[
 					\HierarchyDistances\Ipsum::class => 0,
 					\HierarchyDistances\TraitOne::class => 1,
 					\HierarchyDistances\Lorem::class => 2,
 					\HierarchyDistances\TraitTwo::class => 3,
-					\HierarchyDistances\FirstLoremInterface::class => 4,
-					\HierarchyDistances\SecondLoremInterface::class => 5,
-					\HierarchyDistances\FirstIpsumInterface::class => 6,
-					\HierarchyDistances\SecondIpsumInterface::class => 7,
-					\HierarchyDistances\ThirdIpsumInterface::class => 8,
-					\HierarchyDistances\ExtendedIpsumInterface::class => 9,
+					\HierarchyDistances\TraitThree::class => 4,
+					\HierarchyDistances\FirstLoremInterface::class => 5,
+					\HierarchyDistances\SecondLoremInterface::class => 6,
+					\HierarchyDistances\FirstIpsumInterface::class => 7,
+					\HierarchyDistances\SecondIpsumInterface::class => 8,
+					\HierarchyDistances\ThirdIpsumInterface::class => 9,
+					\HierarchyDistances\ExtendedIpsumInterface::class => 10,
 				],
 			],
 		];
diff --git a/tests/PHPStan/Reflection/data/distances/TraitThree.php b/tests/PHPStan/Reflection/data/distances/TraitThree.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace HierarchyDistances;
+
+trait TraitThree
+{
+
+}
diff --git a/tests/PHPStan/Reflection/data/distances/TraitTwo.php b/tests/PHPStan/Reflection/data/distances/TraitTwo.php
@@ -5,4 +5,6 @@
 trait TraitTwo
 {
 
+	use TraitThree;
+
 }

-Original file line number
+Diff line change
@@ @@ -0,0 +1,8 @@ @@
 +<?php
++
 +namespace HierarchyDistances;
++
 +trait TraitThree
 +{
++
 +}
Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,6 @@`
`5`	`5`	`trait TraitTwo`
`6`	`6`	`{`
`7`	`7`
	`8`	`+ use TraitThree;`
	`9`	`+`
`8`	`10`	`}`