[GH-28][GH-29] Fix another bug in false/positive change detection by using Name Type filtering.

Author: beberlei

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

@@ -33,8 +33,13 @@ public function findNames(File $file)
         return array_map(function ($use) use ($file) {
             $type = constant('QafooLabs\Refactoring\Domain\Model\PhpName::TYPE_' . strtoupper($use['type']));
             return new PhpNameOccurance(
-                new PhpName($use['fqcn'], $use['alias'], $type),
-                $file, $use['line']
+                new PhpName(
+                    $use['fqcn'],
+                    $use['alias'],
+                    $type
+                ),
+                $file,
+                $use['line']
             );
         }, $collector->collectedNameDeclarations());
     }

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

@@ -59,9 +59,19 @@ public function refactor(Directory $directory)
 
             if (!$expectedClassName->namespaceName()->equals($currentClassName->namespaceName())) {
                 $renames->add(new PhpNameChange($currentClassName->fullyQualified(), $expectedClassName->fullyQualified()));
+
+                $buffer->replaceString(
+                    $class->namespaceDeclarationLine(),
+                    $currentClassName->namespaceName()->fullyQualifiedName(),
+                    $expectedClassName->namespaceName()->fullyQualifiedName()
+                );
             }
         }
 
+        $occurances = array_filter($occurances, function ($occurance) {
+            return $occurance->name()->type() !== PhpName::TYPE_NAMESPACE;
+        });
+
         foreach ($occurances as $occurance) {
             $name = $occurance->name();