Savepoint with failing test for changing the scanning of PhpNames by adding class and namespace declarations to result.

Author: beberlei

src/main/QafooLabs/Refactoring/Adapters/PHPParser/Visitor/PhpNameCollector.php

@@ -65,6 +65,14 @@ public function enterNode(PHPParser_Node $node)
         }
 
         if ($node instanceof PHPParser_Node_Stmt_Class) {
+            $className = $node->name;
+
+            $this->nameDeclarations[] = array(
+                'alias' => $className,
+                'fqcn' => $this->fullyQualifiedNameFor($className),
+                'line' => $node->getLine()
+            );
+
             if ($node->extends) {
                 $usedAlias = implode('\\', $node->extends->parts);
 
@@ -89,6 +97,12 @@ public function enterNode(PHPParser_Node $node)
         if ($node instanceof PHPParser_Node_Stmt_Namespace) {
             $this->currentNamespace = implode('\\', $node->name->parts);
             $this->useStatements = array();
+
+            $this->nameDeclarations[] = array(
+                'alias' => $this->currentNamespace,
+                'fqcn' => $this->currentNamespace,
+                'line' => $node->name->getLine()
+            );
         }
     }
 

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

@@ -23,13 +23,13 @@ class FixClassNames
 {
     private $codeAnalysis;
     private $editor;
-    private $occurancescanner;
+    private $nameScanner;
 
-    public function __construct($codeAnalysis, $editor, $occurancescanner)
+    public function __construct($codeAnalysis, $editor, $nameScanner)
     {
         $this->codeAnalysis = $codeAnalysis;
         $this->editor = $editor;
-        $this->nameScanner = $occurancescanner;
+        $this->nameScanner = $nameScanner;
     }
 
     public function refactor(Directory $directory)
@@ -47,26 +47,24 @@ public function refactor(Directory $directory)
                 continue;
             }
 
-            $rename = false;
             $class = $classes[0];
             $currentClassName = $class->declarationName();
             $expectedClassName = $phpFile->extractPsr0ClassName();
 
             $buffer = $this->editor->openBuffer($phpFile);
 
-            // TODO: Introduce Set datastructure with addIf($data, $condition)
             if ($expectedClassName->shortName() !== $currentClassName->shortName()) {
                 $line = $class->declarationLine();
 
-                $buffer->replaceString($line, $currentClassName->shortName(), $expectedClassName->shortName());
+                #$buffer->replaceString($line, $currentClassName->shortName(), $expectedClassName->shortName());
 
                 $renames->add(new PhpNameChange($currentClassName, $expectedClassName));
             }
 
             if ($expectedClassName->namespaceName() !== $currentClassName->namespaceName()) {
                 $namespaceLine = $class->namespaceDeclarationLine();
 
-                $buffer->replaceString($namespaceLine, $currentClassName->namespaceName(), $expectedClassName->namespaceName());
+                #$buffer->replaceString($namespaceLine, $currentClassName->namespaceName(), $expectedClassName->namespaceName());
 
                 $renames->add(new PhpNameChange($currentClassName, $expectedClassName));
             }

src/test/QafooLabs/Refactoring/Adapters/PHPParser/ParserPhpNameScannerTest.php

@@ -16,14 +16,16 @@ public function testFindNames()
 
         $this->assertEquals(
             array(
+                new PhpNameOccurance(new PhpName('QafooLabs\Refactoring\Adapters\PHPParser', 'QafooLabs\Refactoring\Adapters\PHPParser'), $file, 3),
                 new PhpNameOccurance(new PhpName('QafooLabs\Refactoring\Domain\Model\File', 'QafooLabs\Refactoring\Domain\Model\File'), $file, 5),
                 new PhpNameOccurance(new PhpName('QafooLabs\Refactoring\Domain\Model\PhpName', 'QafooLabs\Refactoring\Domain\Model\PhpName'), $file, 6),
                 new PhpNameOccurance(new PhpName('QafooLabs\Refactoring\Domain\Model\PhpNameOccurance', 'QafooLabs\Refactoring\Domain\Model\PhpNameOccurance'), $file, 7),
+                new PhpNameOccurance(new PhpName('QafooLabs\Refactoring\Adapters\PHPParser\ParserPhpNameScannerTest', 'ParserPhpNameScannerTest'), $file, 9),
                 new PhpNameOccurance(new PhpName('QafooLabs\Refactoring\Adapters\PHPParser\PHPUnit_Framework_TestCase', 'PHPUnit_Framework_TestCase'), $file, 9),
                 new PhpNameOccurance(new PhpName('QafooLabs\Refactoring\Domain\Model\File', 'File'), $file, 13),
                 new PhpNameOccurance(new PhpName('QafooLabs\Refactoring\Adapters\PHPParser\ParserPhpNameScanner', 'ParserPhpNameScanner'), $file, 14),
             ),
-            array_slice($names, 0, 6)
+            array_slice($names, 0, 8)
         );
     }
 }