Fix a regression where classes, functions, interfaces and traits with different namespace but similar name where merged into a single instance, ignoring the namespace.

Author: tomzx

src/PHPSemVerChecker/Analyzer/ClassAnalyzer.php

@@ -27,18 +27,18 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
 		$classesBefore = $registryBefore->data['class'];
 		$classesAfter = $registryAfter->data['class'];
 
-		$classesBeforeKeyed = [];
 		$filesBeforeKeyed = [];
+		$classesBeforeKeyed = [];
 		foreach ($classesBefore as $key => $classBefore) {
-			$classesBeforeKeyed[strtolower($classBefore->name)] = $classBefore;
-			$filesBeforeKeyed[strtolower($classBefore->name)] = $registryBefore->mapping['class'][$key];
+			$filesBeforeKeyed[strtolower($key)] = $registryBefore->mapping['class'][$key];
+			$classesBeforeKeyed[strtolower($key)] = $classBefore;
 		}
 
-		$classesAfterKeyed = [];
 		$filesAfterKeyed = [];
+		$classesAfterKeyed = [];
 		foreach ($classesAfter as $key => $classAfter) {
-			$classesAfterKeyed[strtolower($classAfter->name)] = $classAfter;
-			$filesAfterKeyed[strtolower($classAfter->name)] = $registryAfter->mapping['class'][$key];
+			$filesAfterKeyed[strtolower($key)] = $registryAfter->mapping['class'][$key];
+			$classesAfterKeyed[strtolower($key)] = $classAfter;
 		}
 
 		$classNamesBefore = array_keys($classesBeforeKeyed);

src/PHPSemVerChecker/Analyzer/FunctionAnalyzer.php

@@ -40,18 +40,18 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
 		$functionsBefore = $registryBefore->data['function'];
 		$functionsAfter = $registryAfter->data['function'];
 
-		$functionsBeforeKeyed = [];
 		$filesBeforeKeyed = [];
+		$functionsBeforeKeyed = [];
 		foreach ($functionsBefore as $key => $functionBefore) {
-			$functionsBeforeKeyed[strtolower($functionBefore->name)] = $functionBefore;
-			$filesBeforeKeyed[strtolower($functionBefore->name)] = $registryBefore->mapping['function'][$key];
+			$filesBeforeKeyed[strtolower($key)] = $registryBefore->mapping['function'][$key];
+			$functionsBeforeKeyed[strtolower($key)] = $functionBefore;
 		}
 
-		$functionsAfterKeyed = [];
 		$filesAfterKeyed = [];
+		$functionsAfterKeyed = [];
 		foreach ($functionsAfter as $key => $functionAfter) {
-			$functionsAfterKeyed[strtolower($functionAfter->name)] = $functionAfter;
-			$filesAfterKeyed[strtolower($functionAfter->name)] = $registryAfter->mapping['function'][$key];
+			$filesAfterKeyed[strtolower($key)] = $registryAfter->mapping['function'][$key];
+			$functionsAfterKeyed[strtolower($key)] = $functionAfter;
 		}
 
 		$functionNamesBefore = array_keys($functionsBeforeKeyed);
@@ -123,8 +123,8 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
 		}
 
 		foreach ($added as $key) {
-			$fileAfter = $registryAfter->mapping['function'][$key];
-			$functionAfter = $registryAfter->data['function'][$key];
+			$fileAfter = $filesAfterKeyed[$key];
+			$functionAfter = $functionsAfterKeyed[$key];
 
 			$data = new FunctionAdded($fileAfter, $functionAfter);
 			$report->addFunction($data);

src/PHPSemVerChecker/Analyzer/InterfaceAnalyzer.php

@@ -27,18 +27,18 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
 		$interfacesBefore = $registryBefore->data['interface'];
 		$interfacesAfter = $registryAfter->data['interface'];
 
-		$interfacesBeforeKeyed = [];
 		$filesBeforeKeyed = [];
+		$interfacesBeforeKeyed = [];
 		foreach ($interfacesBefore as $key => $interfaceBefore) {
-			$interfacesBeforeKeyed[strtolower($interfaceBefore->name)] = $interfaceBefore;
-			$filesBeforeKeyed[strtolower($interfaceBefore->name)] = $registryBefore->mapping['interface'][$key];
+			$filesBeforeKeyed[strtolower($key)] = $registryBefore->mapping['interface'][$key];
+			$interfacesBeforeKeyed[strtolower($key)] = $interfaceBefore;
 		}
 
-		$interfacesAfterKeyed = [];
 		$filesAfterKeyed = [];
+		$interfacesAfterKeyed = [];
 		foreach ($interfacesAfter as $key => $interfaceAfter) {
-			$interfacesAfterKeyed[strtolower($interfaceAfter->name)] = $interfaceAfter;
-			$filesAfterKeyed[strtolower($interfaceAfter->name)] = $registryAfter->mapping['interface'][$key];
+			$filesAfterKeyed[strtolower($key)] = $registryAfter->mapping['interface'][$key];
+			$interfacesAfterKeyed[strtolower($key)] = $interfaceAfter;
 		}
 
 		$interfaceNamesBefore = array_keys($interfacesBeforeKeyed);
@@ -86,7 +86,6 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
 		}
 
 		foreach ($added as $key) {
-
 			$fileAfter = $filesAfterKeyed[$key];
 			$interfaceAfter = $interfacesAfterKeyed[$key];
 

src/PHPSemVerChecker/Analyzer/TraitAnalyzer.php

@@ -27,18 +27,18 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
 		$traitsBefore = $registryBefore->data['trait'];
 		$traitsAfter = $registryAfter->data['trait'];
 
-		$traitsBeforeKeyed = [];
 		$filesBeforeKeyed = [];
+		$traitsBeforeKeyed = [];
 		foreach ($traitsBefore as $key => $traitBefore) {
-			$traitsBeforeKeyed[strtolower($traitBefore->name)] = $traitBefore;
-			$filesBeforeKeyed[strtolower($traitBefore->name)] = $registryBefore->mapping['trait'][$key];
+			$filesBeforeKeyed[strtolower($key)] = $registryBefore->mapping['trait'][$key];
+			$traitsBeforeKeyed[strtolower($key)] = $traitBefore;
 		}
 
-		$traitsAfterKeyed = [];
 		$filesAfterKeyed = [];
+		$traitsAfterKeyed = [];
 		foreach ($traitsAfter as $key => $traitAfter) {
-			$traitsAfterKeyed[strtolower($traitAfter->name)] = $traitAfter;
-			$filesAfterKeyed[strtolower($traitAfter->name)] = $registryAfter->mapping['trait'][$key];
+			$filesAfterKeyed[strtolower($key)] = $registryAfter->mapping['trait'][$key];
+			$traitsAfterKeyed[strtolower($key)] = $traitAfter;
 		}
 
 		$traitNamesBefore = array_keys($traitsBeforeKeyed);
@@ -91,7 +91,7 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
 
 		foreach ($added as $key) {
 			$fileAfter = $filesAfterKeyed[$key];
-			$traitAfter = $traitsAfter[$key];
+			$traitAfter = $traitsAfterKeyed[$key];
 
 			$data = new TraitAdded($fileAfter, $traitAfter);
 			$report->addTrait($data);

tests/PHPSemVerChecker/Analyzer/FunctionAnalyzerTest.php

@@ -3,6 +3,7 @@
 namespace PHPSemVerChecker\Test\Analyzer;
 
 use PhpParser\Node\Expr\FuncCall;
+use PhpParser\Node\Name;
 use PhpParser\Node\Param;
 use PhpParser\Node\Scalar\String_;
 use PhpParser\Node\Stmt\Function_;
@@ -417,4 +418,22 @@ public function testFunctionCaseChanged()
 		$this->assertSame('Function name case was changed.', $report['function'][$expectedLevel][0]->getReason());
 		$this->assertSame('someFunctionName', $report['function'][$expectedLevel][0]->getTarget());
 	}
+
+	public function testFunctionNamespaceDoNotOverlap()
+	{
+		$before = new Registry();
+		$after = new Registry();
+
+		$before->addFunction(new Function_('tmp'));
+		$function = new Function_('tmp');
+		$function->namespacedName = Name::concat('namespaceTmp', 'tmp');
+		$before->addFunction($function);
+
+		$analyzer = new FunctionAnalyzer();
+		$report = $analyzer->analyze($before, $after);
+
+		$context = 'function';
+		$expectedLevel = Level::MAJOR;
+		$this->assertCount(2, $report[$context][$expectedLevel], 'Interfaces with similar names but different namespace are possibly considered the same in the analyzer logic');
+	}
 }

tests/PHPSemVerChecker/Analyzer/InterfaceAnalyzerTest.php

@@ -2,6 +2,7 @@
 
 namespace PHPSemVerChecker\Test\Analyzer;
 
+use PhpParser\Node\Name;
 use PhpParser\Node\Stmt\Interface_;
 use PHPSemVerChecker\Analyzer\InterfaceAnalyzer;
 use PHPSemVerChecker\Registry\Registry;
@@ -83,4 +84,22 @@ public function testInterfaceCaseChanged()
 		$this->assertSame('V153', $report[$context][$expectedLevel][0]->getCode());
 		$this->assertSame('Interface name case was changed.', $report[$context][$expectedLevel][0]->getReason());
 	}
+
+	public function testInterfaceNamespaceDoNotOverlap()
+	{
+		$before = new Registry();
+		$after = new Registry();
+
+		$before->addInterface(new Interface_('tmp'));
+		$interface = new Interface_('tmp');
+		$interface->namespacedName = Name::concat('namespaceTmp', 'tmp');
+		$before->addInterface($interface);
+
+		$analyzer = new InterfaceAnalyzer();
+		$report = $analyzer->analyze($before, $after);
+
+		$context = 'interface';
+		$expectedLevel = Level::MAJOR;
+		$this->assertCount(2, $report[$context][$expectedLevel], 'Interfaces with similar names but different namespace are possibly considered the same in the analyzer logic');
+	}
 }

tests/PHPSemVerChecker/Analyzer/TraitAnalyzerTest.php

@@ -2,6 +2,7 @@
 
 namespace PHPSemVerChecker\Test\Analyzer;
 
+use PhpParser\Node\Name;
 use PhpParser\Node\Stmt\Trait_;
 use PHPSemVerChecker\Analyzer\TraitAnalyzer;
 use PHPSemVerChecker\Registry\Registry;
@@ -81,4 +82,22 @@ public function testTraitCaseChanged()
 		$this->assertSame('Trait name case was changed.', $report[$context][$expectedLevel][0]->getReason());
 		$this->assertSame('testtrait', $report[$context][$expectedLevel][0]->getTarget());
 	}
+
+	public function testTraitNamespaceDoNotOverlap()
+	{
+		$before = new Registry();
+		$after = new Registry();
+
+		$before->addTrait(new Trait_('tmp'));
+		$trait = new Trait_('tmp');
+		$trait->namespacedName = Name::concat('namespaceTmp', 'tmp');
+		$before->addTrait($trait);
+
+		$analyzer = new TraitAnalyzer();
+		$report = $analyzer->analyze($before, $after);
+
+		$context = 'trait';
+		$expectedLevel = Level::MAJOR;
+		$this->assertCount(2, $report[$context][$expectedLevel], 'Traits with similar names but different namespace are possibly considered the same in the analyzer logic');
+	}
 }