[GH-28] Finally fix all the known nasty issues with renaming (hopefully), closes GH-28

Author: beberlei

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

@@ -85,9 +85,17 @@ private function overlaps(PhpName $other)
         return false;
     }
 
+    private function shareNamespace(PhpName $other)
+    {
+        $otherName = array();
+        $otherParts = $this->stringToParts($other->fullyQualifiedName);
+
+        return strpos($this->fullyQualifiedName, $otherParts[0]) !== false;
+    }
+
     public function change(PhpName $from, PhpName $to)
     {
-        if ( ! $this->isAffectedByChangesTo($from)) {
+        if ( ! $this->isAffectedByChangesTo($from) && ! $this->shareNamespace($from)) {
             return $this;
         }
 
@@ -101,12 +109,18 @@ public function change(PhpName $from, PhpName $to)
         if ($this->fullyQualifiedName === $this->relativeName) {
             $relativeNewParts = $newParts;
         } else {
-            $relativeNewParts = array_slice($newParts, -1 * count(explode('\\', $this->relativeName)));
+            $diff = count($newParts) - $this->numParts();
+            $relativeNewParts = array_slice($newParts, -1 * (count(explode('\\', $this->relativeName))+$diff));
         }
 
         return new PhpName(self::partsToString($newParts), self::partsToString($relativeNewParts), $this->type);
     }
 
+    private function numParts()
+    {
+        return substr_count($this->fullyQualifiedName, '\\') + 1;
+    }
+
     private function adjustSize($from, $newParts)
     {
         $fromParts = self::stringToParts($from->fullyQualifiedName);

src/test/QafooLabs/Refactoring/Domain/Model/PhpNameTest.php

@@ -109,7 +109,7 @@ public function testRegression5()
         $changed = $name->change($from, $to);
 
         $this->assertEquals('Qafoo\ChangeTrack\Analyzer\ChangeFeed', $changed->fullyQualifiedName());
-        $this->assertEQuals('ChangeFeed', $changed->relativeName());
+        $this->assertEQuals('Analyzer\ChangeFeed', $changed->relativeName());
     }
 
     public function testRegression6()
@@ -158,4 +158,17 @@ public function testChangeKeepsType()
 
         $this->assertEquals(PhpName::TYPE_NAMESPACE, $changed->type());
     }
+
+    public function testAddRelativeNameWhenNamespaceExpands()
+    {
+        $from = new PhpName('Foo', 'Foo');
+        $to = new PhpName('Foo\Bar', 'Foo\Bar');
+
+        $name = new PhpName('Foo\Foo', 'Foo');
+        $changed = $name->change($from, $to);
+
+        $this->assertFalse($name->isAffectedByChangesTo($from));
+        $this->assertEquals('Foo\Bar\Foo', $changed->fullyQualifiedName());
+        $this->assertEquals('Bar\Foo', $changed->relativeName());
+    }
 }