Refactor aggregation of renames via new Set datatype.

Author: beberlei

src/main/QafooLabs/Refactoring/Application/FixClassNames.php

@@ -13,6 +13,7 @@
 
 namespace QafooLabs\Refactoring\Application;
 
+use QafooLabs\Collections\Set;
 use QafooLabs\Refactoring\Domain\Model\Directory;
 use QafooLabs\Refactoring\Domain\Model\File;
 use QafooLabs\Refactoring\Domain\Model\PhpName;
@@ -35,7 +36,7 @@ public function refactor(Directory $directory)
     {
         $phpFiles = $directory->findAllPhpFilesRecursivly();
 
-        $renames = array();
+        $renames = new Set();
         $occurances = array();
 
         foreach ($phpFiles as $phpFile) {
@@ -59,19 +60,15 @@ public function refactor(Directory $directory)
 
                 $buffer->replaceString($line, $currentClassName->shortName(), $expectedClassName->shortName());
 
-                $rename = true;
+                $renames->add(new PhpNameChange($currentClassName, $expectedClassName));
             }
 
             if ($expectedClassName->namespaceName() !== $currentClassName->namespaceName()) {
                 $namespaceLine = $class->namespaceDeclarationLine();
 
                 $buffer->replaceString($namespaceLine, $currentClassName->namespaceName(), $expectedClassName->namespaceName());
 
-                $rename = true;
-            }
-
-            if ($rename) {
-                $renames[] = new PhpNameChange($currentClassName, $expectedClassName);
+                $renames->add(new PhpNameChange($currentClassName, $expectedClassName));
             }
         }
 

src/main/QafooLabs/Refactoring/Domain/Model/PhpName.php

@@ -13,10 +13,12 @@
 
 namespace QafooLabs\Refactoring\Domain\Model;
 
+use QafooLabs\Collections\Hashable;
+
 /**
  * Representation of a Name in PHP
  */
-class PhpName
+class PhpName implements Hashable
 {
     private $fullyQualifiedName;
     private $relativeName;
@@ -129,4 +131,9 @@ public function __toString()
     {
         return sprintf('%s[%s]', $this->fullyQualifiedName, $this->relativeName);
     }
+
+    public function hashCode()
+    {
+        return "1373136332" . $this->fullyQualifiedName . $this->relativeName;
+    }
 }

src/main/QafooLabs/Refactoring/Domain/Model/PhpNameChange.php

@@ -13,7 +13,9 @@
 
 namespace QafooLabs\Refactoring\Domain\Model;
 
-class PhpNameChange
+use QafooLabs\Collections\Hashable;
+
+class PhpNameChange implements Hashable
 {
     private $fromName;
     private $toName;
@@ -33,4 +35,9 @@ public function change(PhpName $name)
     {
         return $name->change($this->fromName, $this->toName);
     }
+
+    public function hashCode()
+    {
+        return "1373136290" . $this->fromName->hashCode() . $this->toName->hashCode();
+    }
 }