[GH-31] Fix problems with renaming classes.

Author: beberlei

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

@@ -18,6 +18,7 @@
 use QafooLabs\Refactoring\Domain\Model\File;
 use QafooLabs\Refactoring\Domain\Model\PhpName;
 use QafooLabs\Refactoring\Domain\Model\PhpNameChange;
+use QafooLabs\Refactoring\Domain\Model\PhpNames\NoImportedUsagesFilter;
 
 class FixClassNames
 {
@@ -38,10 +39,15 @@ public function refactor(Directory $directory)
 
         $renames = new Set();
         $occurances = array();
+        $noImportedUsages = new NoImportedUsagesFilter();
 
         foreach ($phpFiles as $phpFile) {
             $classes = $this->codeAnalysis->findClasses($phpFile);
-            $occurances = array_merge($this->nameScanner->findNames($phpFile), $occurances);
+
+            $occurances = array_merge(
+                $noImportedUsages->filter($this->nameScanner->findNames($phpFile)),
+                $occurances
+            );
 
             if (count($classes) !== 1) {
                 continue;

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

@@ -106,7 +106,7 @@ public function change(PhpName $from, PhpName $to)
         $newParts = self::stringToParts($to->fullyQualifiedName);
         $newParts = $this->adjustSize($from, $newParts);
 
-        if ($this->fullyQualifiedName === $this->relativeName) {
+        if ($this->isFullyQualified()) {
             $relativeNewParts = $newParts;
         } else {
             $diff = ($this->type === self::TYPE_CLASS)

src/main/QafooLabs/Refactoring/Domain/Model/PhpNames/NoImportedUsagesFilter.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace QafooLabs\Refactoring\Domain\Model\PhpNames;
+
+use QafooLabs\Refactoring\Domain\Model\PhpName;
+
+/**
+ * Filters a list of php occurances by all items expect the imported relative usages.
+ */
+class NoImportedUsagesFilter
+{
+    /**
+     * @param array<PhpNameOccurance>
+     *
+     * @return array<PhpNameOccurance>
+     */
+    public function filter(array $phpNames)
+    {
+        $fileUseOccurances = array_flip(
+            array_map(
+                function ($useOccurance) {
+                    return $useOccurance->name()->fullyQualifiedName();
+                },
+                array_filter(
+                    $phpNames,
+                    function ($occurance) {
+                        return $occurance->name()->type() === PhpName::TYPE_USE;
+                    }
+                )
+            )
+        );
+
+        return array_filter(
+            $phpNames,
+            function ($occurance) use ($fileUseOccurances) {
+                return (
+                    $occurance->name()->type() !== PhpName::TYPE_USAGE ||
+                    !isset($fileUseOccurances[$occurance->name()->fullyQualifiedName()])
+                );
+            }
+        );
+    }
+}

src/test/QafooLabs/Refactoring/Domain/Model/PhpNames/NoImportedUsagesFilterTest.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace QafooLabs\Refactoring\Domain\Model\PhpNames;
+
+use QafooLabs\Refactoring\Domain\Model\PhpName;
+use QafooLabs\Refactoring\Domain\Model\PhpNameOccurance;
+use QafooLabs\Refactoring\Domain\Model\File;
+
+class NoImportedUsagesFilterTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @group GH-31
+     * @test
+     */
+    public function it_filters_imported_php_name_usages()
+    {
+        $file = new File('foo.php', 'code');
+        $filter = new NoImportedUsagesFilter();
+        $names = $filter->filter(array(
+            new PhpNameOccurance(new PhpName('Foo\Bar', 'Foo\Bar', PhpName::TYPE_USE), $file, 12),
+            new PhpNameOccurance(new PhpName('Foo\Bar', 'Bar', PhpName::TYPE_USAGE), $file, 12),
+        ));
+
+        $this->assertEquals(1, count($names));
+    }
+}