Extracted getTarget duplicate code to new classes.

tomzx · tomzx · commit 6e7e092e135e · 2015-01-14T23:34:36.000-05:00
diff --git a/src/PHPSemVerChecker/Node/Statement/ClassMethod.php b/src/PHPSemVerChecker/Node/Statement/ClassMethod.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace PHPSemVerChecker\Node\Statement;
+
+use PhpParser\Node\Stmt;
+use PhpParser\Node\Stmt\ClassMethod as BaseClassMethod;
+
+class ClassMethod {
+	public static function getFullyQualifiedName(Stmt $context, BaseClassMethod $classMethod)
+	{
+		$fqcn = $context->name;
+		if ($context->namespacedName) {
+			$fqcn = $context->namespacedName->toString();
+		}
+		return $fqcn . '::' . $classMethod->name;
+	}
+}
diff --git a/src/PHPSemVerChecker/Node/Statement/Class_.php b/src/PHPSemVerChecker/Node/Statement/Class_.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace PHPSemVerChecker\Node\Statement;
+
+use PhpParser\Node\Stmt\Class_ as BaseClass;
+
+class Class_ {
+	public static function getFullyQualifiedName(BaseClass $class)
+	{
+		if ($class->namespacedName) {
+			return $class->namespacedName->toString();
+		}
+		return $class->name;
+	}
+}
diff --git a/src/PHPSemVerChecker/Node/Statement/Function_.php b/src/PHPSemVerChecker/Node/Statement/Function_.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace PHPSemVerChecker\Node\Statement;
+
+use PhpParser\Node\Stmt\Function_ as BaseFunction;
+
+class Function_ {
+	public static function getFullyQualifiedName(BaseFunction $function)
+	{
+		$fqfn = '';
+		if ($function->namespacedName) {
+			$fqfn = $function->namespacedName->toString() . '::';
+		}
+		return $fqfn . $function->name;
+	}
+}
diff --git a/src/PHPSemVerChecker/Node/Statement/Interface_.php b/src/PHPSemVerChecker/Node/Statement/Interface_.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace PHPSemVerChecker\Node\Statement;
+
+use PhpParser\Node\Stmt\Interface_ as BaseInterface;
+
+class Interface_ {
+	public static function getFullyQualifiedName(BaseInterface $interface)
+	{
+		if ($interface->namespacedName) {
+			return $interface->namespacedName->toString();
+		}
+		return $interface->name;
+	}
+}
diff --git a/src/PHPSemVerChecker/Node/Statement/Property.php b/src/PHPSemVerChecker/Node/Statement/Property.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace PHPSemVerChecker\Node\Statement;
+
+use PhpParser\Node\Stmt;
+use PhpParser\Node\Stmt\Property as BaseProperty;
+
+class Property {
+	public static function getFullyQualifiedName(Stmt $context, BaseProperty $property)
+	{
+		$fqcn = $context->name;
+		if ($context->namespacedName) {
+			$fqcn = $context->namespacedName->toString();
+		}
+		return $fqcn . '::$' . $property->props[0]->name;
+	}
+}
diff --git a/src/PHPSemVerChecker/Node/Statement/Trait_.php b/src/PHPSemVerChecker/Node/Statement/Trait_.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace PHPSemVerChecker\Node\Statement;
+
+use PhpParser\Node\Stmt\Trait_ as BaseTrait;
+
+class Trait_ {
+	public static function getFullyQualifiedName(BaseTrait $trait)
+	{
+		if ($trait->namespacedName) {
+			return $trait->namespacedName->toString();
+		}
+		return $trait->name;
+	}
+}
diff --git a/src/PHPSemVerChecker/Operation/ClassAdded.php b/src/PHPSemVerChecker/Operation/ClassAdded.php
@@ -3,6 +3,7 @@
 namespace PHPSemVerChecker\Operation;
 
 use PhpParser\Node\Stmt\Class_;
+use PHPSemVerChecker\Node\Statement\Class_ as PClass;
 use PHPSemVerChecker\SemanticVersioning\Level;
 
 class ClassAdded extends Operation {
@@ -58,10 +59,6 @@ public function getLine()
 	 */
 	public function getTarget()
 	{
-		$fqcn = $this->classAfter->name;
-		if ($this->classAfter->namespacedName) {
-			$fqcn = $this->classAfter->namespacedName->toString();
-		}
-		return $fqcn;
+		return PClass::getFullyQualifiedName($this->classAfter);
 	}
 }
diff --git a/src/PHPSemVerChecker/Operation/ClassMethodAdded.php b/src/PHPSemVerChecker/Operation/ClassMethodAdded.php
@@ -4,6 +4,7 @@
 
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\ClassMethod;
+use PHPSemVerChecker\Node\Statement\ClassMethod as PClassMethod;
 use PHPSemVerChecker\SemanticVersioning\Level;
 
 class ClassMethodAdded extends ClassMethodOperation {
@@ -76,10 +77,6 @@ public function getLine()
 	 */
 	public function getTarget()
 	{
-		$fqcn = $this->contextAfter->name;
-		if ($this->contextAfter->namespacedName) {
-			$fqcn = $this->contextAfter->namespacedName->toString();
-		}
-		return $fqcn . '::' . $this->classMethodAfter->name;
+		return PClassMethod::getFullyQualifiedName($this->contextAfter, $this->classMethodAfter);
 	}
 }
diff --git a/src/PHPSemVerChecker/Operation/ClassMethodImplementationChanged.php b/src/PHPSemVerChecker/Operation/ClassMethodImplementationChanged.php
@@ -4,6 +4,7 @@
 
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\ClassMethod;
+use PHPSemVerChecker\Node\Statement\ClassMethod as PClassMethod;
 use PHPSemVerChecker\SemanticVersioning\Level;
 
 class ClassMethodImplementationChanged extends ClassMethodOperation {
@@ -98,10 +99,6 @@ public function getLine()
 	 */
 	public function getTarget()
 	{
-		$fqcn = $this->contextAfter->name;
-		if ($this->contextAfter->namespacedName) {
-			$fqcn = $this->contextAfter->namespacedName->toString();
-		}
-		return $fqcn . '::' . $this->classMethodBefore->name;
+		return PClassMethod::getFullyQualifiedName($this->contextAfter, $this->classMethodAfter);
 	}
 }
diff --git a/src/PHPSemVerChecker/Operation/ClassMethodParameterChanged.php b/src/PHPSemVerChecker/Operation/ClassMethodParameterChanged.php
@@ -4,6 +4,7 @@
 
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\ClassMethod;
+use PHPSemVerChecker\Node\Statement\ClassMethod as PClassMethod;
 use PHPSemVerChecker\SemanticVersioning\Level;
 
 class ClassMethodParameterChanged extends ClassMethodOperation {
@@ -100,10 +101,6 @@ public function getLine()
 	 */
 	public function getTarget()
 	{
-		$fqcn = $this->contextAfter->name;
-		if ($this->contextAfter->namespacedName) {
-			$fqcn = $this->contextAfter->namespacedName->toString();
-		}
-		return $fqcn . '::' . $this->classMethodBefore->name;
+		return PClassMethod::getFullyQualifiedName($this->contextAfter, $this->classMethodAfter);
 	}
 }
diff --git a/src/PHPSemVerChecker/Operation/ClassMethodParameterNameChanged.php b/src/PHPSemVerChecker/Operation/ClassMethodParameterNameChanged.php
@@ -4,6 +4,7 @@
 
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\ClassMethod;
+use PHPSemVerChecker\Node\Statement\ClassMethod as PClassMethod;
 use PHPSemVerChecker\SemanticVersioning\Level;
 
 class ClassMethodParameterNameChanged extends ClassMethodOperation {
@@ -100,10 +101,6 @@ public function getLine()
 	 */
 	public function getTarget()
 	{
-		$fqcn = $this->contextAfter->name;
-		if ($this->contextAfter->namespacedName) {
-			$fqcn = $this->contextAfter->namespacedName->toString();
-		}
-		return $fqcn . '::' . $this->classMethodBefore->name;
+		return PClassMethod::getFullyQualifiedName($this->contextAfter, $this->classMethodAfter);
 	}
 }
diff --git a/src/PHPSemVerChecker/Operation/ClassMethodRemoved.php b/src/PHPSemVerChecker/Operation/ClassMethodRemoved.php
@@ -5,6 +5,7 @@
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
+use PHPSemVerChecker\Node\Statement\ClassMethod as PClassMethod;
 use PHPSemVerChecker\SemanticVersioning\Level;
 
 class ClassMethodRemoved extends ClassMethodOperation {
@@ -77,10 +78,6 @@ public function getLine()
 	 */
 	public function getTarget()
 	{
-		$fqcn = $this->contextBefore->name;
-		if ($this->contextBefore->namespacedName) {
-			$fqcn = $this->contextBefore->namespacedName->toString();
-		}
-		return $fqcn . '::' . $this->classMethodBefore->name;
+		return PClassMethod::getFullyQualifiedName($this->contextBefore, $this->classMethodBefore);
 	}
 }
diff --git a/src/PHPSemVerChecker/Operation/ClassRemoved.php b/src/PHPSemVerChecker/Operation/ClassRemoved.php
@@ -3,6 +3,7 @@
 namespace PHPSemVerChecker\Operation;
 
 use PhpParser\Node\Stmt\Class_;
+use PHPSemVerChecker\Node\Statement\Class_ as PClass;
 use PHPSemVerChecker\SemanticVersioning\Level;
 
 class ClassRemoved extends Operation {
@@ -55,10 +56,6 @@ public function getLine()
 	 */
 	public function getTarget()
 	{
-		$fqcn = $this->classBefore->name;
-		if ($this->classBefore->namespacedName) {
-			$fqcn = $this->classBefore->namespacedName->toString();
-		}
-		return $fqcn;
+		return PClass::getFullyQualifiedName($this->classBefore);
 	}
 }
diff --git a/src/PHPSemVerChecker/Operation/FunctionAdded.php b/src/PHPSemVerChecker/Operation/FunctionAdded.php
@@ -3,6 +3,7 @@
 namespace PHPSemVerChecker\Operation;
 
 use PhpParser\Node\Stmt\Function_;
+use PHPSemVerChecker\Node\Statement\Function_ as PFunction;
 use PHPSemVerChecker\SemanticVersioning\Level;
 
 class FunctionAdded extends Operation {
@@ -42,7 +43,6 @@ public function __construct($fileAfter, Function_ $functionAfter)
 	 */
 	public function getLocation()
 	{
-
 		return $this->fileAfter;
 	}
 
@@ -59,10 +59,6 @@ public function getLine()
 	 */
 	public function getTarget()
 	{
-		$fqfn = $this->functionAfter->name;
-		if ($this->functionAfter->namespacedName) {
-			$fqfn = $this->functionAfter->namespacedName->toString() . '::' . $this->functionAfter->name;
-		}
-		return $fqfn;
+		return PFunction::getFullyQualifiedName($this->functionAfter);
 	}
 }
diff --git a/src/PHPSemVerChecker/Operation/FunctionImplementationChanged.php b/src/PHPSemVerChecker/Operation/FunctionImplementationChanged.php
@@ -4,6 +4,7 @@
 
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Function_;
+use PHPSemVerChecker\Node\Statement\Function_ as PFunction;
 use PHPSemVerChecker\SemanticVersioning\Level;
 
 class FunctionImplementationChanged extends Operation {
@@ -71,10 +72,6 @@ public function getLine()
 	 */
 	public function getTarget()
 	{
-		$fqfn = $this->functionAfter->name;
-		if ($this->functionAfter->namespacedName) {
-			$fqfn = $this->functionAfter->namespacedName->toString() . '::' . $this->functionAfter->name;
-		}
-		return $fqfn;
+		return PFunction::getFullyQualifiedName($this->functionAfter);
 	}
 }
diff --git a/src/PHPSemVerChecker/Operation/FunctionParameterChanged.php b/src/PHPSemVerChecker/Operation/FunctionParameterChanged.php
@@ -3,6 +3,7 @@
 namespace PHPSemVerChecker\Operation;
 
 use PhpParser\Node\Stmt\Function_;
+use PHPSemVerChecker\Node\Statement\Function_ as PFunction;
 use PHPSemVerChecker\SemanticVersioning\Level;
 
 class FunctionParameterChanged extends Operation {
@@ -70,10 +71,6 @@ public function getLine()
 	 */
 	public function getTarget()
 	{
-		$fqfn = $this->functionAfter->name;
-		if ($this->functionAfter->namespacedName) {
-			$fqfn = $this->functionAfter->namespacedName->toString() . '::' . $this->functionAfter->name;
-		}
-		return $fqfn;
+		return PFunction::getFullyQualifiedName($this->functionAfter);
 	}
 }
diff --git a/src/PHPSemVerChecker/Operation/FunctionParameterNameChanged.php b/src/PHPSemVerChecker/Operation/FunctionParameterNameChanged.php
@@ -3,6 +3,7 @@
 namespace PHPSemVerChecker\Operation;
 
 use PhpParser\Node\Stmt\Function_;
+use PHPSemVerChecker\Node\Statement\Function_ as PFunction;
 use PHPSemVerChecker\SemanticVersioning\Level;
 
 class FunctionParameterNameChanged extends Operation {
@@ -70,10 +71,6 @@ public function getLine()
 	 */
 	public function getTarget()
 	{
-		$fqfn = $this->functionAfter->name;
-		if ($this->functionAfter->namespacedName) {
-			$fqfn = $this->functionAfter->namespacedName->toString() . '::' . $this->functionAfter->name;
-		}
-		return $fqfn;
+		return PFunction::getFullyQualifiedName($this->functionAfter);
 	}
 }
diff --git a/src/PHPSemVerChecker/Operation/FunctionRemoved.php b/src/PHPSemVerChecker/Operation/FunctionRemoved.php
@@ -3,6 +3,7 @@
 namespace PHPSemVerChecker\Operation;
 
 use PhpParser\Node\Stmt\Function_;
+use PHPSemVerChecker\Node\Statement\Function_ as PFunction;
 use PHPSemVerChecker\SemanticVersioning\Level;
 
 class FunctionRemoved extends Operation {
@@ -58,10 +59,6 @@ public function getLine()
 	 */
 	public function getTarget()
 	{
-		$fqfn = $this->functionBefore->name;
-		if ($this->functionBefore->namespacedName) {
-			$fqfn = $this->functionBefore->namespacedName->toString() . '::' . $this->functionBefore->name;
-		}
-		return $fqfn;
+		return PFunction::getFullyQualifiedName($this->functionBefore);
 	}
 }
diff --git a/src/PHPSemVerChecker/Operation/InterfaceAdded.php b/src/PHPSemVerChecker/Operation/InterfaceAdded.php
@@ -3,6 +3,7 @@
 namespace PHPSemVerChecker\Operation;
 
 use PhpParser\Node\Stmt\Interface_;
+use PHPSemVerChecker\Node\Statement\Interface_ as PInterface;
 use PHPSemVerChecker\SemanticVersioning\Level;
 
 class InterfaceAdded extends Operation {
@@ -58,10 +59,6 @@ public function getLine()
 	 */
 	public function getTarget()
 	{
-		$fqcn = $this->interfaceAfter->name;
-		if ($this->interfaceAfter->namespacedName) {
-			$fqcn = $this->interfaceAfter->namespacedName->toString();
-		}
-		return $fqcn;
+		return PInterface::getFullyQualifiedName($this->interfaceAfter);
 	}
 }
diff --git a/src/PHPSemVerChecker/Operation/InterfaceRemoved.php b/src/PHPSemVerChecker/Operation/InterfaceRemoved.php
@@ -3,6 +3,7 @@
 namespace PHPSemVerChecker\Operation;
 
 use PhpParser\Node\Stmt\Interface_;
+use PHPSemVerChecker\Node\Statement\Interface_ as PInterface;
 use PHPSemVerChecker\SemanticVersioning\Level;
 
 class InterfaceRemoved extends Operation {
@@ -58,10 +59,6 @@ public function getLine()
 	 */
 	public function getTarget()
 	{
-		$fqcn = $this->interfaceBefore->name;
-		if ($this->interfaceBefore->namespacedName) {
-			$fqcn = $this->interfaceBefore->namespacedName->toString();
-		}
-		return $fqcn;
+		return PInterface::getFullyQualifiedName($this->interfaceBefore);
 	}
 }
diff --git a/src/PHPSemVerChecker/Operation/PropertyAdded.php b/src/PHPSemVerChecker/Operation/PropertyAdded.php
diff --git a/src/PHPSemVerChecker/Operation/PropertyRemoved.php b/src/PHPSemVerChecker/Operation/PropertyRemoved.php
diff --git a/src/PHPSemVerChecker/Operation/TraitAdded.php b/src/PHPSemVerChecker/Operation/TraitAdded.php
diff --git a/src/PHPSemVerChecker/Operation/TraitRemoved.php b/src/PHPSemVerChecker/Operation/TraitRemoved.php
diff --git a/tests/PHPSemVerChecker/Analyzer/ClassPropertyAnalyzerTest.php b/tests/PHPSemVerChecker/Analyzer/ClassPropertyAnalyzerTest.php
diff --git a/tests/PHPSemVerChecker/Analyzer/TraitPropertyAnalyzerTest.php b/tests/PHPSemVerChecker/Analyzer/TraitPropertyAnalyzerTest.php

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`namespace PHPSemVerChecker\Operation;`
`4`	`4`
`5`	`5`	`use PhpParser\Node\Stmt\Class_;`
	`6`	`+use PHPSemVerChecker\Node\Statement\Class_ as PClass;`
`6`	`7`	`use PHPSemVerChecker\SemanticVersioning\Level;`
`7`	`8`
`8`	`9`	`class ClassAdded extends Operation {`
`@@ -58,10 +59,6 @@ public function getLine()`
`58`	`59`	`*/`
`59`	`60`	`public function getTarget()`
`60`	`61`	`{`
`61`		`- $fqcn = $this->classAfter->name;`
`62`		`- if ($this->classAfter->namespacedName) {`
`63`		`- $fqcn = $this->classAfter->namespacedName->toString();`
`64`		`- }`
`65`		`- return $fqcn;`
	`62`	`+ return PClass::getFullyQualifiedName($this->classAfter);`
`66`	`63`	`}`
`67`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`use PhpParser\Node\Stmt;`
`6`	`6`	`use PhpParser\Node\Stmt\ClassMethod;`
	`7`	`+use PHPSemVerChecker\Node\Statement\ClassMethod as PClassMethod;`
`7`	`8`	`use PHPSemVerChecker\SemanticVersioning\Level;`
`8`	`9`
`9`	`10`	`class ClassMethodAdded extends ClassMethodOperation {`
`@@ -76,10 +77,6 @@ public function getLine()`
`76`	`77`	`*/`
`77`	`78`	`public function getTarget()`
`78`	`79`	`{`
`79`		`- $fqcn = $this->contextAfter->name;`
`80`		`- if ($this->contextAfter->namespacedName) {`
`81`		`- $fqcn = $this->contextAfter->namespacedName->toString();`
`82`		`- }`
`83`		`- return $fqcn . '::' . $this->classMethodAfter->name;`
	`80`	`+ return PClassMethod::getFullyQualifiedName($this->contextAfter, $this->classMethodAfter);`
`84`	`81`	`}`
`85`	`82`	`}`