Code cleanup.

tomzx · tomzx · commit 6d91ae4bd89d · 2015-01-14T23:41:36.000-05:00
Unused use statement removed.
diff --git a/src/PHPSemVerChecker/Analyzer/Analyzer.php b/src/PHPSemVerChecker/Analyzer/Analyzer.php
@@ -5,8 +5,7 @@
 use PHPSemVerChecker\Registry\Registry;
 use PHPSemVerChecker\Report\Report;
 
-class Analyzer
-{
+class Analyzer {
 	/**
 	 * Compare with a destination registry (what the new source code is like).
 	 *
diff --git a/src/PHPSemVerChecker/Analyzer/ClassAnalyzer.php b/src/PHPSemVerChecker/Analyzer/ClassAnalyzer.php
@@ -6,10 +6,8 @@
 use PHPSemVerChecker\Operation\ClassRemoved;
 use PHPSemVerChecker\Registry\Registry;
 use PHPSemVerChecker\Report\Report;
-use PHPSemVerChecker\SemanticVersioning\Level;
 
-class ClassAnalyzer
-{
+class ClassAnalyzer {
 	protected $context = 'class';
 
 	public function analyze(Registry $registryBefore, Registry $registryAfter)
diff --git a/src/PHPSemVerChecker/Analyzer/ClassMethodAnalyzer.php b/src/PHPSemVerChecker/Analyzer/ClassMethodAnalyzer.php
@@ -3,24 +3,21 @@
 namespace PHPSemVerChecker\Analyzer;
 
 use PhpParser\Node\Stmt;
-use PhpParser\Node\Stmt\Class_;
-use PhpParser\Node\Stmt\ClassMethod;
 use PHPSemVerChecker\Comparator\Signature;
 use PHPSemVerChecker\Operation\ClassMethodAdded;
 use PHPSemVerChecker\Operation\ClassMethodImplementationChanged;
 use PHPSemVerChecker\Operation\ClassMethodParameterChanged;
 use PHPSemVerChecker\Operation\ClassMethodParameterNameChanged;
 use PHPSemVerChecker\Operation\ClassMethodRemoved;
 use PHPSemVerChecker\Report\Report;
-use PHPSemVerChecker\SemanticVersioning\Level;
 
-class ClassMethodAnalyzer
-{
+class ClassMethodAnalyzer {
 	protected $context;
 	protected $fileBefore;
 	protected $fileAfter;
 
 	/**
+	 * @param string $context
 	 * @param string $fileBefore
 	 * @param string $fileAfter
 	 */
@@ -33,7 +30,6 @@ public function __construct($context, $fileBefore = null, $fileAfter = null)
 
 	public function analyze(Stmt $contextBefore, Stmt $contextAfter)
 	{
-		// TODO: Verify that the given contexts match the context given in the constructor <tom@tomrochette.com>
 		$report = new Report();
 
 		$methodsBefore = $contextBefore->getMethods();
diff --git a/src/PHPSemVerChecker/Analyzer/FunctionAnalyzer.php b/src/PHPSemVerChecker/Analyzer/FunctionAnalyzer.php
@@ -13,8 +13,7 @@
 use PHPSemVerChecker\Report\Report;
 use PHPSemVerChecker\SemanticVersioning\Level;
 
-class FunctionAnalyzer
-{
+class FunctionAnalyzer {
 	protected $context = 'function';
 
 	/**
@@ -42,7 +41,6 @@ public function analyze(Registry $registryBefore, Registry $registryAfter)
 
 		foreach ($toVerify as $key) {
 			$fileBefore = $registryBefore->mapping['function'][$key];
-			/** @var Function_ $functionBefore */
 			$functionBefore = $registryBefore->data['function'][$key];
 			$fileAfter = $registryAfter->mapping['function'][$key];
 			$functionAfter = $registryAfter->data['function'][$key];
diff --git a/src/PHPSemVerChecker/Analyzer/InterfaceAnalyzer.php b/src/PHPSemVerChecker/Analyzer/InterfaceAnalyzer.php
@@ -6,10 +6,8 @@
 use PHPSemVerChecker\Operation\InterfaceRemoved;
 use PHPSemVerChecker\Registry\Registry;
 use PHPSemVerChecker\Report\Report;
-use PHPSemVerChecker\SemanticVersioning\Level;
 
-class InterfaceAnalyzer
-{
+class InterfaceAnalyzer {
 	protected $context = 'interface';
 
 	public function analyze(Registry $registryBefore, Registry $registryAfter)
diff --git a/src/PHPSemVerChecker/Analyzer/PropertyAnalyzer.php b/src/PHPSemVerChecker/Analyzer/PropertyAnalyzer.php
@@ -8,8 +8,7 @@
 use PHPSemVerChecker\Operation\PropertyRemoved;
 use PHPSemVerChecker\Report\Report;
 
-class PropertyAnalyzer
-{
+class PropertyAnalyzer {
 	/**
 	 * @var string
 	 */
diff --git a/src/PHPSemVerChecker/Analyzer/TraitAnalyzer.php b/src/PHPSemVerChecker/Analyzer/TraitAnalyzer.php
@@ -6,10 +6,8 @@
 use PHPSemVerChecker\Operation\TraitRemoved;
 use PHPSemVerChecker\Registry\Registry;
 use PHPSemVerChecker\Report\Report;
-use PHPSemVerChecker\SemanticVersioning\Level;
 
-class TraitAnalyzer
-{
+class TraitAnalyzer {
 	protected $context = 'trait';
 
 	public function analyze(Registry $registryBefore, Registry $registryAfter)
diff --git a/src/PHPSemVerChecker/Comparator/Signature.php b/src/PHPSemVerChecker/Comparator/Signature.php
@@ -2,8 +2,7 @@
 
 namespace PHPSemVerChecker\Comparator;
 
-class Signature
-{
+class Signature {
 	/**
 	 * @param array $paramsA
 	 * @param array $paramsB
@@ -42,7 +41,7 @@ public static function isSameVariables(array $paramsA, array $paramsB)
 
 		$iterations = min(count($paramsA), count($paramsB));
 		for ($i = 0; $i < $iterations; ++$i) {
-			if ( $paramsA[$i]->name != $paramsB[$i]->name) {
+			if ($paramsA[$i]->name != $paramsB[$i]->name) {
 				return false;
 			}
 		}
diff --git a/src/PHPSemVerChecker/Comparator/Type.php b/src/PHPSemVerChecker/Comparator/Type.php
@@ -2,8 +2,7 @@
 
 namespace PHPSemVerChecker\Comparator;
 
-class Type
-{
+class Type {
 	/**
 	 * @param \PhpParser\Node\Name|string $typeA
 	 * @param \PhpParser\Node\Name|string $typeB
diff --git a/src/PHPSemVerChecker/Console/Command/CompareCommand.php b/src/PHPSemVerChecker/Console/Command/CompareCommand.php
@@ -63,6 +63,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
 		$duration = microtime(true) - $startTime;
 		$output->writeln('');
-		$output->writeln('Time: '.round($duration, 3).' seconds, Memory: '.round(memory_get_peak_usage() / 1024 / 1024, 3).' MB');
+		$output->writeln('Time: ' . round($duration, 3) . ' seconds, Memory: ' . round(memory_get_peak_usage() / 1024 / 1024, 3) . ' MB');
 	}
 }
diff --git a/src/PHPSemVerChecker/Operation/ClassMethodAdded.php b/src/PHPSemVerChecker/Operation/ClassMethodAdded.php
@@ -12,17 +12,17 @@ class ClassMethodAdded extends ClassMethodOperation {
 	 * @var array
 	 */
 	protected $code = [
-		'class' => ['V015', 'V016', 'V028'],
+		'class'     => ['V015', 'V016', 'V028'],
 		'interface' => ['V034'],
-		'trait' => ['V047', 'V048', 'V057'],
+		'trait'     => ['V047', 'V048', 'V057'],
 	];
 	/**
 	 * @var int
 	 */
 	protected $level = [
-		'class' => [Level::MAJOR, Level::MAJOR, Level::PATCH],
+		'class'     => [Level::MAJOR, Level::MAJOR, Level::PATCH],
 		'interface' => [Level::MAJOR],
-		'trait' => [Level::MAJOR, Level::MAJOR, Level::MAJOR],
+		'trait'     => [Level::MAJOR, Level::MAJOR, Level::MAJOR],
 	];
 	/**
 	 * @var string
diff --git a/src/PHPSemVerChecker/Operation/ClassMethodOperation.php b/src/PHPSemVerChecker/Operation/ClassMethodOperation.php
@@ -5,8 +5,7 @@
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 
-abstract class ClassMethodOperation extends Operation
-{
+abstract class ClassMethodOperation extends Operation {
 	/**
 	 * @var string
 	 */
@@ -31,9 +30,9 @@ public function getLevel()
 	protected function getVisibilityMapping()
 	{
 		return [
-			Class_::MODIFIER_PUBLIC => 0,
+			Class_::MODIFIER_PUBLIC    => 0,
 			Class_::MODIFIER_PROTECTED => 1,
-			Class_::MODIFIER_PRIVATE => 2,
+			Class_::MODIFIER_PRIVATE   => 2,
 		];
 	}
 
diff --git a/src/PHPSemVerChecker/Operation/ClassMethodParameterChanged.php b/src/PHPSemVerChecker/Operation/ClassMethodParameterChanged.php
@@ -12,17 +12,17 @@ class ClassMethodParameterChanged extends ClassMethodOperation {
 	 * @var array
 	 */
 	protected $code = [
-		'class' => ['V010', 'V011', 'V031'],
+		'class'     => ['V010', 'V011', 'V031'],
 		'interface' => ['V036'],
-		'trait' => ['V042', 'V043', 'V059'],
+		'trait'     => ['V042', 'V043', 'V059'],
 	];
 	/**
 	 * @var int
 	 */
 	protected $level = [
-		'class' => [Level::MAJOR, Level::MAJOR, Level::PATCH],
+		'class'     => [Level::MAJOR, Level::MAJOR, Level::PATCH],
 		'interface' => [Level::MAJOR],
-		'trait' => [Level::MAJOR, Level::MAJOR, Level::PATCH],
+		'trait'     => [Level::MAJOR, Level::MAJOR, Level::PATCH],
 	];
 	/**
 	 * @var string
diff --git a/src/PHPSemVerChecker/Operation/ClassMethodParameterNameChanged.php b/src/PHPSemVerChecker/Operation/ClassMethodParameterNameChanged.php
@@ -12,17 +12,17 @@ class ClassMethodParameterNameChanged extends ClassMethodOperation {
 	 * @var array
 	 */
 	protected $code = [
-		'class' => ['V060', 'V061', 'V062'],
+		'class'     => ['V060', 'V061', 'V062'],
 		'interface' => ['V063'],
-		'trait' => ['V064', 'V065', 'V066'],
+		'trait'     => ['V064', 'V065', 'V066'],
 	];
 	/**
 	 * @var int
 	 */
 	protected $level = [
-		'class' => [Level::PATCH, Level::PATCH, Level::PATCH],
+		'class'     => [Level::PATCH, Level::PATCH, Level::PATCH],
 		'interface' => [Level::PATCH],
-		'trait' => [Level::PATCH, Level::PATCH, Level::PATCH],
+		'trait'     => [Level::PATCH, Level::PATCH, Level::PATCH],
 	];
 	/**
 	 * @var string
diff --git a/src/PHPSemVerChecker/Operation/ClassMethodRemoved.php b/src/PHPSemVerChecker/Operation/ClassMethodRemoved.php
@@ -13,17 +13,17 @@ class ClassMethodRemoved extends ClassMethodOperation {
 	 * @var array
 	 */
 	protected $code = [
-		'class' => ['V006', 'V007', 'V029'],
+		'class'     => ['V006', 'V007', 'V029'],
 		'interface' => ['V035'],
-		'trait' => ['V038',  'V039',  'V058'],
+		'trait'     => ['V038', 'V039', 'V058'],
 	];
 	/**
 	 * @var int
 	 */
 	protected $level = [
-		'class' => [Level::MAJOR, Level::MAJOR, Level::PATCH],
+		'class'     => [Level::MAJOR, Level::MAJOR, Level::PATCH],
 		'interface' => [Level::MAJOR],
-		'trait' => [Level::MAJOR, Level::MAJOR, Level::MAJOR],
+		'trait'     => [Level::MAJOR, Level::MAJOR, Level::MAJOR],
 	];
 	/**
 	 * @var string
diff --git a/src/PHPSemVerChecker/Operation/FunctionImplementationChanged.php b/src/PHPSemVerChecker/Operation/FunctionImplementationChanged.php
@@ -2,7 +2,6 @@
 
 namespace PHPSemVerChecker\Operation;
 
-use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Function_;
 use PHPSemVerChecker\Node\Statement\Function_ as PFunction;
 use PHPSemVerChecker\SemanticVersioning\Level;
diff --git a/src/PHPSemVerChecker/Operation/PropertyAdded.php b/src/PHPSemVerChecker/Operation/PropertyAdded.php
@@ -3,7 +3,6 @@
 namespace PHPSemVerChecker\Operation;
 
 use PhpParser\Node\Stmt;
-use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Property;
 use PHPSemVerChecker\Node\Statement\Property as PProperty;
 use PHPSemVerChecker\SemanticVersioning\Level;
@@ -41,10 +40,10 @@ class PropertyAdded extends PropertyOperation {
 	protected $propertyAfter;
 
 	/**
-	 * @param string                           $context
-	 * @param string                           $fileAfter
-	 * @param \PhpParser\Node\Stmt             $contextAfter
-	 * @param \PhpParser\Node\Stmt\ClassMethod $propertyAfter
+	 * @param string                        $context
+	 * @param string                        $fileAfter
+	 * @param \PhpParser\Node\Stmt          $contextAfter
+	 * @param \PhpParser\Node\Stmt\Property $propertyAfter
 	 */
 	public function __construct($context, $fileAfter, Stmt $contextAfter, Property $propertyAfter)
 	{
diff --git a/src/PHPSemVerChecker/Operation/PropertyOperation.php b/src/PHPSemVerChecker/Operation/PropertyOperation.php
@@ -5,8 +5,7 @@
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\Property;
 
-abstract class PropertyOperation extends Operation
-{
+abstract class PropertyOperation extends Operation {
 	/**
 	 * @var string
 	 */
@@ -31,9 +30,9 @@ public function getLevel()
 	protected function getVisibilityMapping()
 	{
 		return [
-			Class_::MODIFIER_PUBLIC => 0,
+			Class_::MODIFIER_PUBLIC    => 0,
 			Class_::MODIFIER_PROTECTED => 1,
-			Class_::MODIFIER_PRIVATE => 2,
+			Class_::MODIFIER_PRIVATE   => 2,
 		];
 	}
 
diff --git a/src/PHPSemVerChecker/Operation/PropertyRemoved.php b/src/PHPSemVerChecker/Operation/PropertyRemoved.php
@@ -14,7 +14,7 @@ class PropertyRemoved extends PropertyOperation {
 	 */
 	protected $code = [
 		'class' => ['V008', 'V009', 'V027'],
-		'trait' => ['V040',  'V041',  'V056'],
+		'trait' => ['V040', 'V041', 'V056'],
 	];
 	/**
 	 * @var int
diff --git a/src/PHPSemVerChecker/Registry/Registry.php b/src/PHPSemVerChecker/Registry/Registry.php
@@ -3,6 +3,7 @@
 namespace PHPSemVerChecker\Registry;
 
 use PhpParser\Node;
+use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\Function_;
 use PhpParser\Node\Stmt\Interface_;
@@ -31,27 +32,26 @@ class Registry {
 	public function __construct()
 	{
 		$contexts = [
-			'class'    => [],
-			'function' => [],
+			'class'     => [],
+			'function'  => [],
 			'interface' => [],
-			'trait' => [],
+			'trait'     => [],
 		];
 
 		$this->data = $contexts;
 		$this->mapping = $contexts;
 	}
 
-	// TODO: Try to reduce the amount of data moved around (we don't need statements inside methods/functions) <tom@tomrochette.com>
 	/**
-	 * @param \PhpParser\Node\Stmt\Class_ $item
+	 * @param \PhpParser\Node\Stmt\Class_ $class
 	 */
 	public function addClass(Class_ $class)
 	{
 		$this->addNode('class', $class);
 	}
 
 	/**
-	 * @param \PhpParser\Node\Stmt\Function_ $item
+	 * @param \PhpParser\Node\Stmt\Function_ $function
 	 */
 	public function addFunction(Function_ $function)
 	{
@@ -75,21 +75,21 @@ public function addTrait(Trait_ $trait)
 	}
 
 	/**
-	 * @param string               $context
-	 * @param \PhpParser\Node\Stmt $node
+	 * @param string $context
+	 * @param Stmt   $node
 	 */
-	protected function addNode($context, Node\Stmt $node)
+	protected function addNode($context, Stmt $node)
 	{
 		$fullyQualifiedName = $this->fullyQualifiedName($node);
 		$this->data[$context][$fullyQualifiedName] = $node;
 		$this->mapping[$context][$fullyQualifiedName] = $this->getCurrentFile();
 	}
 
 	/**
-	 * @param \PhpParser\Node\Stmt $node
+	 * @param Stmt $node
 	 * @return string
 	 */
-	protected function fullyQualifiedName(Node\Stmt $node)
+	protected function fullyQualifiedName(Stmt $node)
 	{
 		return $node->namespacedName ? $node->namespacedName->toString() : $node->name;
 	}
diff --git a/src/PHPSemVerChecker/Report/Report.php b/src/PHPSemVerChecker/Report/Report.php
diff --git a/src/PHPSemVerChecker/Reporter/Reporter.php b/src/PHPSemVerChecker/Reporter/Reporter.php
diff --git a/src/PHPSemVerChecker/Scanner/Scanner.php b/src/PHPSemVerChecker/Scanner/Scanner.php
diff --git a/src/PHPSemVerChecker/SemanticVersioning/Level.php b/src/PHPSemVerChecker/SemanticVersioning/Level.php
diff --git a/src/PHPSemVerChecker/Visitor/ClassVisitor.php b/src/PHPSemVerChecker/Visitor/ClassVisitor.php

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,7 @@`
`5`	`5`	`use PHPSemVerChecker\Registry\Registry;`
`6`	`6`	`use PHPSemVerChecker\Report\Report;`
`7`	`7`
`8`		`-class Analyzer`
`9`		`-{`
	`8`	`+class Analyzer {`
`10`	`9`	`/**`
`11`	`10`	`* Compare with a destination registry (what the new source code is like).`
`12`	`11`	`*`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,6 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`63`	`63`
`64`	`64`	`$duration = microtime(true) - $startTime;`
`65`	`65`	`$output->writeln('');`
`66`		`- $output->writeln('Time: '.round($duration, 3).' seconds, Memory: '.round(memory_get_peak_usage() / 1024 / 1024, 3).' MB');`
	`66`	`+ $output->writeln('Time: ' . round($duration, 3) . ' seconds, Memory: ' . round(memory_get_peak_usage() / 1024 / 1024, 3) . ' MB');`
`67`	`67`	`}`
`68`	`68`	`}`