[GH-29] Add detection of PhpName types in ParserPhpNameScanner.

Author: beberlei

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

@@ -31,8 +31,9 @@ public function findNames(File $file)
         $traverser->traverse($stmts);
 
         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']),
+                new PhpName($use['fqcn'], $use['alias'], $type),
                 $file, $use['line']
             );
         }, $collector->collectedNameDeclarations());

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

@@ -40,7 +40,8 @@ public function enterNode(PHPParser_Node $node)
             $this->nameDeclarations[] = array(
                 'alias' => $name,
                 'fqcn' => $name,
-                'line' => $node->getLine()
+                'line' => $node->getLine(),
+                'type' => 'use',
             );
         }
 
@@ -51,6 +52,7 @@ public function enterNode(PHPParser_Node $node)
                 'alias' => $usedAlias,
                 'fqcn' => $this->fullyQualifiedNameFor($usedAlias),
                 'line' => $node->getLine(),
+                'type' => 'usage',
             );
         }
 
@@ -61,6 +63,7 @@ public function enterNode(PHPParser_Node $node)
                 'alias' => $usedAlias,
                 'fqcn' => $this->fullyQualifiedNameFor($usedAlias),
                 'line' => $node->getLine(),
+                'type' => 'usage',
             );
         }
 
@@ -70,7 +73,8 @@ public function enterNode(PHPParser_Node $node)
             $this->nameDeclarations[] = array(
                 'alias' => $className,
                 'fqcn' => $this->fullyQualifiedNameFor($className),
-                'line' => $node->getLine()
+                'line' => $node->getLine(),
+                'type' => 'class',
             );
 
             if ($node->extends) {
@@ -80,6 +84,7 @@ public function enterNode(PHPParser_Node $node)
                     'alias' => $usedAlias,
                     'fqcn' => $this->fullyQualifiedNameFor($usedAlias),
                     'line' => $node->extends->getLine(),
+                    'type' => 'usage',
                 );
             }
 
@@ -90,6 +95,7 @@ public function enterNode(PHPParser_Node $node)
                     'alias' => $usedAlias,
                     'fqcn' => $this->fullyQualifiedNameFor($usedAlias),
                     'line' => $implement->getLine(),
+                    'type' => 'usage',
                 );
             }
         }
@@ -101,7 +107,8 @@ public function enterNode(PHPParser_Node $node)
             $this->nameDeclarations[] = array(
                 'alias' => $this->currentNamespace,
                 'fqcn' => $this->currentNamespace,
-                'line' => $node->name->getLine()
+                'line' => $node->name->getLine(),
+                'type' => 'namespace',
             );
         }
     }

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

@@ -16,14 +16,14 @@ 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),
+                new PhpNameOccurance(new PhpName('QafooLabs\Refactoring\Adapters\PHPParser', 'QafooLabs\Refactoring\Adapters\PHPParser', PhpName::TYPE_NAMESPACE), $file, 3),
+                new PhpNameOccurance(new PhpName('QafooLabs\Refactoring\Domain\Model\File', 'QafooLabs\Refactoring\Domain\Model\File', PhpName::TYPE_USE), $file, 5),
+                new PhpNameOccurance(new PhpName('QafooLabs\Refactoring\Domain\Model\PhpName', 'QafooLabs\Refactoring\Domain\Model\PhpName', PhpName::TYPE_USE), $file, 6),
+                new PhpNameOccurance(new PhpName('QafooLabs\Refactoring\Domain\Model\PhpNameOccurance', 'QafooLabs\Refactoring\Domain\Model\PhpNameOccurance', PhpName::TYPE_USE), $file, 7),
+                new PhpNameOccurance(new PhpName('QafooLabs\Refactoring\Adapters\PHPParser\ParserPhpNameScannerTest', 'ParserPhpNameScannerTest', PhpName::TYPE_CLASS), $file, 9),
+                new PhpNameOccurance(new PhpName('QafooLabs\Refactoring\Adapters\PHPParser\PHPUnit_Framework_TestCase', 'PHPUnit_Framework_TestCase', PhpName::TYPE_USAGE), $file, 9),
+                new PhpNameOccurance(new PhpName('QafooLabs\Refactoring\Domain\Model\File', 'File', PhpName::TYPE_USAGE), $file, 13),
+                new PhpNameOccurance(new PhpName('QafooLabs\Refactoring\Adapters\PHPParser\ParserPhpNameScanner', 'ParserPhpNameScanner', PhpName::TYPE_USAGE), $file, 14),
             ),
             array_slice($names, 0, 8)
         );