Rename $mappingsBeforeKeyed to $filesBeforeKeyed

Author: emmetog

src/PHPSemVerChecker/Analyzer/ClassAnalyzer.php

@@ -27,19 +27,19 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
 		$classesAfter = $registryAfter->data['class'];
 
 		$classesBeforeKeyed = [];
-		$mappingsBeforeKeyed = [];
+		$filesBeforeKeyed = [];
 		foreach($classesBefore as $key => $classBefore)
 		{
 			$classesBeforeKeyed[strtolower($classBefore->name)] = $classBefore;
-			$mappingsBeforeKeyed[strtolower($classBefore->name)] = $registryBefore->mapping['class'][$key];
+			$filesBeforeKeyed[strtolower($classBefore->name)] = $registryBefore->mapping['class'][$key];
 		}
 
 		$classesAfterKeyed = [];
-		$mappingsAfterKeyed = [];
+		$filesAfterKeyed = [];
 		foreach($classesAfter as $key => $classAfter)
 		{
 			$classesAfterKeyed[strtolower($classAfter->name)] = $classAfter;
-			$mappingsAfterKeyed[strtolower($classAfter->name)] = $registryAfter->mapping['class'][$key];
+			$filesAfterKeyed[strtolower($classAfter->name)] = $registryAfter->mapping['class'][$key];
 		}
 
 		$classNamesBefore = array_keys($classesBeforeKeyed);
@@ -49,18 +49,18 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
 		$toVerify = array_intersect($classNamesBefore, $classNamesAfter);
 
 		foreach ($removed as $key) {
-			$fileBefore = $mappingsBeforeKeyed[$key];
+			$fileBefore = $filesBeforeKeyed[$key];
 			$classBefore = $classesBeforeKeyed[$key];
 
 			$data = new ClassRemoved($fileBefore, $classBefore);
 			$report->addClass($data);
 		}
 
 		foreach ($toVerify as $key) {
-			$fileBefore = $mappingsBeforeKeyed[$key];
+			$fileBefore = $filesBeforeKeyed[$key];
 			/** @var \PhpParser\Node\Stmt\Class_ $classBefore */
 			$classBefore = $classesBeforeKeyed[$key];
-			$fileAfter = $mappingsAfterKeyed[$key];
+			$fileAfter = $filesAfterKeyed[$key];
 			/** @var \PhpParser\Node\Stmt\Class_ $classBefore */
 			$classAfter = $classesAfterKeyed[$key];
 
@@ -88,7 +88,7 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
 		}
 
 		foreach ($added as $key) {
-			$fileAfter = $mappingsAfterKeyed[$key];
+			$fileAfter = $filesAfterKeyed[$key];
 			$classAfter = $classesAfterKeyed[$key];
 
 			$data = new ClassAdded($fileAfter, $classAfter);

src/PHPSemVerChecker/Analyzer/InterfaceAnalyzer.php

@@ -27,19 +27,19 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
 		$interfacesAfter = $registryAfter->data['interface'];
 
 		$interfacesBeforeKeyed = [];
-		$mappingsBeforeKeyed = [];
+		$filesBeforeKeyed = [];
 		foreach($interfacesBefore as $key => $interfaceBefore)
 		{
 			$interfacesBeforeKeyed[strtolower($interfaceBefore->name)] = $interfaceBefore;
-			$mappingsBeforeKeyed[strtolower($interfaceBefore->name)] = $registryBefore->mapping['interface'][$key];
+			$filesBeforeKeyed[strtolower($interfaceBefore->name)] = $registryBefore->mapping['interface'][$key];
 		}
 
 		$interfacesAfterKeyed = [];
-		$mappingsAfterKeyed = [];
+		$filesAfterKeyed = [];
 		foreach($interfacesAfter as $key => $interfaceAfter)
 		{
 			$interfacesAfterKeyed[strtolower($interfaceAfter->name)] = $interfaceAfter;
-			$mappingsAfterKeyed[strtolower($interfaceAfter->name)] = $registryAfter->mapping['interface'][$key];
+			$filesAfterKeyed[strtolower($interfaceAfter->name)] = $registryAfter->mapping['interface'][$key];
 		}
 
 		$interfaceNamesBefore = array_keys($interfacesBeforeKeyed);
@@ -49,28 +49,35 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
 		$toVerify = array_intersect($interfaceNamesBefore, $interfaceNamesAfter);
 
 		foreach ($removed as $key) {
-			$fileBefore = $mappingsBeforeKeyed[$key];
+			$fileBefore = $filesBeforeKeyed[$key];
 			$interfaceBefore = $interfacesBeforeKeyed[$key];
 
 			$data = new InterfaceRemoved($fileBefore, $interfaceBefore);
 			$report->addInterface($data);
 		}
 
 		foreach ($toVerify as $key) {
-			$fileBefore = $mappingsBeforeKeyed[$key];
+			$fileBefore = $filesBeforeKeyed[$key];
 			/** @var \PhpParser\Node\Stmt\Interface_ $interfaceBefore */
 			$interfaceBefore = $interfacesBeforeKeyed[$key];
-			$fileAfter = $mappingsAfterKeyed[$key];
+			$fileAfter = $filesAfterKeyed[$key];
 			/** @var \PhpParser\Node\Stmt\Interface_ $interfaceBefore */
 			$interfaceAfter = $interfacesAfterKeyed[$key];
 
 			// Leave non-strict comparison here
 			if ($interfaceBefore != $interfaceAfter) {
 
 				// Check if the name of the interface has changed case.
-				if($interfaceBefore->name !== $interfaceAfter->name)
-				{
-					$report->add('interface', new InterfaceRenamedCaseOnly($fileAfter, $interfaceAfter));
+				if ($interfaceBefore->name !== $interfaceAfter->name) {
+					$report->add(
+						'interface',
+						new InterfaceRenamedCaseOnly(
+							$fileBefore,
+							$interfaceBefore,
+							$fileAfter,
+							$interfaceAfter
+						)
+					);
 				}
 
 				$analyzer = new ClassMethodAnalyzer('interface', $fileBefore, $fileAfter);
@@ -81,7 +88,7 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
 
 		foreach ($added as $key) {
 
-			$fileAfter = $mappingsAfterKeyed[$key];
+			$fileAfter = $filesAfterKeyed[$key];
 			$interfaceAfter = $interfacesAfterKeyed[$key];
 
 			$data = new InterfaceAdded($fileAfter, $interfaceAfter);

src/PHPSemVerChecker/Analyzer/TraitAnalyzer.php

@@ -27,19 +27,19 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
 		$traitsAfter = $registryAfter->data['trait'];
 
 		$traitsBeforeKeyed = [];
-		$mappingsBeforeKeyed = [];
+		$filesBeforeKeyed = [];
 		foreach($traitsBefore as $key => $traitBefore)
 		{
 			$traitsBeforeKeyed[strtolower($traitBefore->name)] = $traitBefore;
-			$mappingsBeforeKeyed[strtolower($traitBefore->name)] = $registryBefore->mapping['trait'][$key];
+			$filesBeforeKeyed[strtolower($traitBefore->name)] = $registryBefore->mapping['trait'][$key];
 		}
 
 		$traitsAfterKeyed = [];
-		$mappingsAfterKeyed = [];
+		$filesAfterKeyed = [];
 		foreach($traitsAfter as $key => $traitAfter)
 		{
 			$traitsAfterKeyed[strtolower($traitAfter->name)] = $traitAfter;
-			$mappingsAfterKeyed[strtolower($traitAfter->name)] = $registryAfter->mapping['trait'][$key];
+			$filesAfterKeyed[strtolower($traitAfter->name)] = $registryAfter->mapping['trait'][$key];
 		}
 
 		$traitNamesBefore = array_keys($traitsBeforeKeyed);
@@ -49,18 +49,18 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
 		$toVerify = array_intersect($traitNamesBefore, $traitNamesAfter);
 
 		foreach ($removed as $key) {
-			$fileBefore = $mappingsBeforeKeyed[$key];
+			$fileBefore = $filesBeforeKeyed[$key];
 			$traitBefore = $traitsBeforeKeyed[$key];
 
 			$data = new TraitRemoved($fileBefore, $traitBefore);
 			$report->addTrait($data);
 		}
 
 		foreach ($toVerify as $key) {
-			$fileBefore = $mappingsBeforeKeyed[$key];
+			$fileBefore = $filesBeforeKeyed[$key];
 			/** @var \PhpParser\Node\Stmt\Class_ $traitBefore */
 			$traitBefore = $traitsBeforeKeyed[$key];
-			$fileAfter = $mappingsAfterKeyed[$key];
+			$fileAfter = $filesAfterKeyed[$key];
 			/** @var \PhpParser\Node\Stmt\Class_ $traitBefore */
 			$traitAfter = $traitsAfterKeyed[$key];
 
@@ -88,7 +88,7 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
 		}
 
 		foreach ($added as $key) {
-			$fileAfter = $mappingsAfterKeyed[$key];
+			$fileAfter = $filesAfterKeyed[$key];
 			$traitAfter = $traitsAfter[$key];
 
 			$data = new TraitAdded($fileAfter, $traitAfter);

src/PHPSemVerChecker/Operation/InterfaceOperationDelta.php

@@ -5,47 +5,57 @@
 use PhpParser\Node\Stmt\Interface_;
 use PHPSemVerChecker\Node\Statement\Interface_ as PInterface;
 
-class InterfaceOperationUnary extends Operation {
+class InterfaceOperationDelta extends Operation {
 	/**
 	 * @var string
 	 */
-	protected $file;
+	protected $fileBefore;
 	/**
 	 * @var \PhpParser\Node\Stmt\Interface_
 	 */
-	protected $interface;
+	protected $interfaceBefore;
+	/**
+	 * @var string
+	 */
+	protected $fileAfter;
+	/**
+	 * @var \PhpParser\Node\Stmt\Interface_
+	 */
+	protected $interfaceAfter;
 
 	/**
 	 * @param string                          $fileAfter
 	 * @param \PhpParser\Node\Stmt\Interface_ $interface
 	 */
-	public function __construct($fileAfter, Interface_ $interface)
+	public function __construct($fileBefore, Interface_ $interfaceBefore, $fileAfter, Interface_ $interfaceAfter)
 	{
-		$this->file = $fileAfter;
-		$this->interface = $interface;
+		$this->fileBefore = $fileBefore;
+		$this->interfaceBefore = $interfaceBefore;
+		$this->fileAfter = $fileAfter;
+		$this->interfaceAfter = $interfaceAfter;
 	}
 
 	/**
 	 * @return string
 	 */
 	public function getLocation()
 	{
-		return $this->file;
+		return $this->fileAfter;
 	}
 
 	/**
 	 * @return int
 	 */
 	public function getLine()
 	{
-		return $this->interface->getLine();
+		return $this->interfaceAfter->getLine();
 	}
 
 	/**
 	 * @return string
 	 */
 	public function getTarget()
 	{
-		return PInterface::getFullyQualifiedName($this->interface);
+		return PInterface::getFullyQualifiedName($this->interfaceAfter);
 	}
 }