[GH-28] Fix bug where too many false positive namespaces and use statements where changed, even though only one file was moved to a subfolder.

Author: beberlei

src/main/QafooLabs/Refactoring/Adapters/PHPParser/ParserPhpNameScanner.php

@@ -11,6 +11,7 @@
 use PHPParser_Parser;
 use PHPParser_Lexer;
 use PHPParser_NodeTraverser;
+use PHPParser_Error;
 
 class ParserPhpNameScanner implements PhpNameScanner
 {
@@ -20,7 +21,11 @@ public function findNames(File $file)
         $collector = new PhpNameCollector();
         $traverser = new PHPParser_NodeTraverser;
 
-        $stmts = $parser->parse($file->getCode());
+        try {
+            $stmts = $parser->parse($file->getCode());
+        } catch (PHPParser_Error $e) {
+            throw new \RuntimeException("Error parsing " . $file->getRelativePath() .": " . $e->getMessage(), 0, $e);
+        }
 
         $traverser->addVisitor($collector);
         $traverser->traverse($stmts);

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

@@ -58,7 +58,7 @@ public function refactor(Directory $directory)
             }
 
             if (!$expectedClassName->namespaceName()->equals($currentClassName->namespaceName())) {
-                $renames->add(new PhpNameChange($currentClassName->namespaceName(), $expectedClassName->namespaceName()));
+                $renames->add(new PhpNameChange($currentClassName->fullyQualified(), $expectedClassName->fullyQualified()));
             }
         }
 

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

@@ -88,7 +88,7 @@ public function change(PhpName $from, PhpName $to)
         }
 
         $newParts = self::stringToParts($to->fullyQualifiedName);
-        $newParts = $this->appendMissingParts($from, $newParts);
+        $newParts = $this->adjustSize($from, $newParts);
 
         if ($this->fullyQualifiedName === $this->relativeName) {
             $relativeNewParts = $newParts;
@@ -99,7 +99,7 @@ public function change(PhpName $from, PhpName $to)
         return new PhpName(self::partsToString($newParts), self::partsToString($relativeNewParts));
     }
 
-    private function appendMissingParts($from, $newParts)
+    private function adjustSize($from, $newParts)
     {
         $fromParts = self::stringToParts($from->fullyQualifiedName);
         $thisParts = self::stringToParts($this->fullyQualifiedName);
@@ -109,6 +109,10 @@ private function appendMissingParts($from, $newParts)
             $newParts = array_merge($newParts, array_slice($thisParts, count($newParts)+$sizeChange));
         }
 
+        if (count($thisParts) < (count($newParts)+$sizeChange)) {
+            $newParts = array_slice($newParts, 0, count($thisParts) - $sizeChange);
+        }
+
         return $newParts;
     }
 

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

@@ -134,4 +134,16 @@ public function testRegression7()
         $this->assertEquals('Foo\Boing', $changed->fullyQualifiedName());
         $this->assertEquals('Foo\Boing', $changed->relativeName());
     }
+
+    public function testRegression8()
+    {
+        $from = new PhpName('Foo\Foo\Foo', 'Foo\Foo\Foo');
+        $to = new PhpName('Foo\Boing', 'Foo\Boing');
+
+        $name = new PhpName('Foo\Foo', 'Foo\Foo');
+        $changed = $name->change($from, $to);
+
+        $this->assertEquals('Foo', $changed->fullyQualifiedName());
+        $this->assertEquals('Foo', $changed->relativeName());
+    }
 }