Since name resolution is done with NameResolver, unnecessary processing has been deleted.

Author: smeghead

dogfood-model.png

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Smeghead\PhpClassDiagram\Php\Finder;
+namespace Smeghead\PhpClassDiagram\Php\Finders;
 
 use PhpParser\Node;
 use PhpParser\Node\Param;

dogfood-package.png

@@ -4,14 +4,6 @@
 
 namespace Smeghead\PhpClassDiagram\Php;
 
-use PhpParser\NodeFinder;
-use PhpParser\Node;
-use PhpParser\Node\{
-    NullableType,
-    Identifier,
-    Name,
-    UnionType,
-};
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\{
@@ -25,7 +17,7 @@
     Use_,
 };
 use Smeghead\PhpClassDiagram\Php\Doc\PhpDocComment;
-use Smeghead\PhpClassDiagram\Php\Finder\FindConstructerProperties;
+use Smeghead\PhpClassDiagram\Php\Finders\FindConstructerProperties;
 
 class PhpClass
 {
@@ -156,27 +148,13 @@ private function getUsesRec($stmts, $uses = [])
      * * useしているクラスに目的のクラスがあるかを探す
      * * 自身のクラス名が目的のクラスかどうか   ... (不要かもしれない。暗黙の参照と統合可能
      * * 暗黙の参照として、自身のnamespaceを返却する
+     * 
+     * Since name resolution is done with NameResolver, unnecessary processing has been deleted.
      */
     private function findNamespaceByTypeParts(array $type_parts): array
     {
-        $type = str_replace('[]', '', array_pop($type_parts));
-        $primitives = ['string', 'bool', 'boolean', 'int', 'integer', 'float', 'double', 'array', 'object', 'resource'];
-        if (in_array($type, $primitives)) {
-            return [];
-        }
-        foreach ($this->getUses() as $u) {
-            if ($u->getName() === $type) {
-                return $u->getNamespace();
-            }
-        }
-        // 探したいクラスが、自身の型だった場合
-        $t = $this->getClassType();
-        if ($t->getName() === $type) {
-            return $t->getNamespace();
-        }
-
-        // 暗黙的な参照と見做す
-        return $this->getNamespace();
+        array_pop($type_parts);
+        return $type_parts;
     }
 
     /** @return PhpMethod[] メソッド一覧 */
@@ -213,25 +191,19 @@ public function getExtends(): array
                     '',
                     end($Name->parts)
                 );
-            } else {
-                $parts = $Name->parts;
-                $namespace = [];
-                if (count($parts) > 0) {
-                    $namespace = $this->findNamespaceByTypeParts($parts);
-                    $typeName = array_pop($parts);
-                }
-                $extends[] = new PhpType(array_merge($namespace, $parts), 'Stmt_Class', $typeName);
             }
         }
+        
         if (!empty($this->syntax->implements)) {
-            foreach ($this->syntax->implements as $i) {
-                $parts = $i->parts;
-                $namespace = [];
-                if (count($parts) > 0) {
-                    $namespace = $this->findNamespaceByTypeParts($parts);
-                    $typeName = array_pop($parts);
+            foreach ($this->syntax->implements as $Name) {
+                // $parts = $i->parts;
+                if ($Name instanceof FullyQualified) {
+                    $extends[] = new PhpType(
+                        array_slice($Name->parts, 0, count($Name->parts) - 1),
+                        '',
+                        end($Name->parts)
+                    );
                 }
-                $extends[] = new PhpType(array_merge($namespace, $parts), 'Stmt_Interface', $typeName);
             }
         }
         return $extends;

dogfood.png

@@ -11,6 +11,8 @@
     Namespace_,
     ClassLike,
 };
+use PhpParser\NodeTraverser;
+use PhpParser\NodeVisitor\NameResolver;
 use Smeghead\PhpClassDiagram\Config\Options;
 
 class PhpReader
@@ -50,6 +52,11 @@ public static function parseFile(string $directory, string $filename, Options $o
         $parser = (new ParserFactory)->create($targetVesion);
         try {
             $ast = $parser->parse($code);
+            $nameResolver = new NameResolver();
+            $nodeTraverser = new NodeTraverser();
+            $nodeTraverser->addVisitor($nameResolver);
+            // Resolve names
+            $ast = $nodeTraverser->traverse($ast);
         } catch (Error $error) {
             throw new \Exception("Parse error: {$error->getMessage()} file: {$filename}\n");
         }

src/Php/Finder/FindConstructerProperties.php renamed to src/Php/Finders/FindConstructerProperties.php

@@ -8,7 +8,6 @@
 use PhpParser\Node\Name;
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\NullableType;
-use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Property;
 use PhpParser\Node\UnionType;