add test that consider uses.

smeghead · smeghead · commit df2c56fe546d · 2023-02-14T00:19:37.000+09:00
diff --git a/src/Php/PhpTypeExpression.php b/src/Php/PhpTypeExpression.php
@@ -20,11 +20,21 @@ class PhpTypeExpression {
     private string $docString = '';
     /** @var PhpType[] */
     private array $types;
+    /** @var PhpType[] */
+    private array $uses;
 
-    private function __construct(NodeAbstract $stmt, string $targetType, array $currentNamespace, string $docString) {
+    /**
+     * @param NodeAbstract $stmt 対象のツリー
+     * @param string $targetType 
+     * @param string[] $currentNamespace
+     * @param string $docString
+     * @param PhpType[] $uses
+     */
+    private function __construct(NodeAbstract $stmt, string $targetType, array $currentNamespace, string $docString, array $uses) {
         if ( ! in_array($targetType, [self::VAR, self::PARAM, self::RETURN_TYPE])) {
             throw new \Exception('invalid tag.');
         }
+        $this->uses = $uses;
 
         $type = $stmt->{$targetType === self::RETURN_TYPE ? 'returnType' : 'type'};
         if ( ! empty($docString)) {
@@ -40,7 +50,17 @@ private function __construct(NodeAbstract $stmt, string $targetType, array $curr
         }
     }
 
-    public static function buildByVar(NodeAbstract $stmt, array $currentNamespace): self {
+    /**
+     * @param NodeAbstract $stmt
+     * @param string[] $currentNamespace
+     * @param PhpType[] $uses
+     * @return self
+     */
+    public static function buildByVar(
+        NodeAbstract $stmt,
+        array $currentNamespace,
+        array $uses
+    ): self {
         $doc = $stmt->getDocComment();
         $typeString = '';
         if ($doc instanceof Doc) {
@@ -49,18 +69,43 @@ public static function buildByVar(NodeAbstract $stmt, array $currentNamespace):
                 $typeString = $matches[1];
             }
         }
-        return new self($stmt, self::VAR, $currentNamespace, $typeString);
+        return new self($stmt, self::VAR, $currentNamespace, $typeString, $uses);
     }
-    public static function buildByMethodParam(NodeAbstract $stmt, array $currentNamespace, string $docString, string $paramName): self {
+
+    /**
+     * @param NodeAbstract $stmt
+     * @param string[] $currentNamespace
+     * @param string $docString
+     * @param PhpType[] $uses
+     * @return self
+     */
+    public static function buildByMethodParam(
+        NodeAbstract $stmt,
+        array $currentNamespace,
+        string $docString,
+        string $paramName,
+        array $uses
+    ): self {
         $typeString = '';
         if (!empty($docString)) {
             if (preg_match(sprintf('/@%s\s+(\S+)(\b|\s)\s*\$%s.*/', 'param', $paramName), $docString, $matches)) {
                 $typeString = $matches[1];
             }
         }
-        return new self($stmt, self::PARAM, $currentNamespace, $typeString);
+        return new self($stmt, self::PARAM, $currentNamespace, $typeString, $uses);
     }
-    public static function buildByMethodReturn(NodeAbstract $stmt, array $currentNamespace): self {
+
+    /**
+     * @param NodeAbstract $stmt
+     * @param string[] $currentNamespace
+     * @param PhpType[] $uses
+     * @return self
+     */
+    public static function buildByMethodReturn(
+        NodeAbstract $stmt,
+        array $currentNamespace,
+        array $uses
+    ): self {
         $doc = $stmt->getDocComment();
         $typeString = '';
         if ($doc instanceof Doc) {
@@ -69,7 +114,7 @@ public static function buildByMethodReturn(NodeAbstract $stmt, array $currentNam
                 $typeString = $matches[1];
             }
         }
-        return new self($stmt, self::RETURN_TYPE, $currentNamespace, $typeString);
+        return new self($stmt, self::RETURN_TYPE, $currentNamespace, $typeString, $uses);
     }
 
     /**
@@ -96,12 +141,21 @@ private function parseType(Property|Identifier|NullableType|Name|null $type, arr
             } else {
                 if (mb_substr($typeString, 0, 1) === '\\') {
                     $docString = mb_substr($typeString, 1);
+                    $parts = explode('\\', $docString);
                 } else {
-                    // TODO usesを検索して適切なnamespaceを探す必要がある。
-                    
-                    $docString = sprintf('%s\\%s', implode('\\', $currentNamespace), $typeString);
+                    // usesを検索して適切なnamespaceを探す必要がある。
+                    $targets = array_filter($this->uses, function(PhpType $t) use($typeString) {
+                        $xParts = explode('\\', $typeString);
+                        $name = array_pop($xParts);
+                        return $name === $t->getName();
+                    });
+                    if (count($targets) > 0) {
+                        $parts = array_merge($targets[0]->getNamespace());
+                    } else {
+                        $docString = sprintf('%s\\%s', implode('\\', $currentNamespace), $typeString);
+                        $parts = explode('\\', $docString);
+                    }
                 }
-                $parts = explode('\\', $docString);
             }
         }
         $nullable = false;
@@ -115,9 +169,17 @@ private function parseType(Property|Identifier|NullableType|Name|null $type, arr
             } else if ($type instanceOf FullyQualified) {
                 $parts = $type->parts;
             } else if ($type instanceOf Name) {
-                // TODO usesを検索して適切なnamespaceを探す必要がある。
-
-                $parts = array_merge($currentNamespace, $type->parts);
+                $typeParts = $type->parts;
+                // usesを検索して適切なnamespaceを探す必要がある。
+                $targets = array_filter($this->uses, function(PhpType $t) use($typeParts) {
+                    $name = array_pop($typeParts);
+                    return $name === $t->getName();
+                });
+                if (count($targets) > 0) {
+                    $parts = array_merge($targets[0]->getNamespace(), [array_pop($typeParts)]);
+                } else {
+                    $parts = array_merge($currentNamespace, $type->parts);
+                }
             }
         }
         $typeName = array_pop($parts);
diff --git a/test/PhpTypeExpressionTest.php b/test/PhpTypeExpressionTest.php
@@ -2,7 +2,7 @@
 
 use PhpParser\ParserFactory;
 use PHPUnit\Framework\TestCase;
-
+use Smeghead\PhpClassDiagram\Php\PhpType;
 use Smeghead\PhpClassDiagram\Php\PhpTypeExpression;
 
 final class PhpTypeExpressionTest extends TestCase {
@@ -21,7 +21,7 @@ public function testNullableString(): void {
             throw new \Exception("Parse error: {$error->getMessage()} file: {$filename}\n");
         }
 
-        $expression = PhpTypeExpression::buildByVar($ast[0]->stmts[1]->stmts[0], ['hoge', 'fuga', 'product']);
+        $expression = PhpTypeExpression::buildByVar($ast[0]->stmts[2]->stmts[0], ['hoge', 'fuga', 'product'], []);
         $types = $expression->getTypes();
 
         $this->assertSame([], $types[0]->getNamespace(), 'namespace');
@@ -37,7 +37,7 @@ public function testIntOrString(): void {
         } catch (Error $error) {
             throw new \Exception("Parse error: {$error->getMessage()} file: {$filename}\n");
         }
-        $expression = PhpTypeExpression::buildByVar($ast[0]->stmts[1]->stmts[1], ['hoge', 'fuga', 'product']);
+        $expression = PhpTypeExpression::buildByVar($ast[0]->stmts[2]->stmts[1], ['hoge', 'fuga', 'product'], []);
         $types = $expression->getTypes();
 
         $this->assertSame([], $types[0]->getNamespace(), 'namespace');
@@ -56,7 +56,7 @@ public function testPrice(): void {
         } catch (Error $error) {
             throw new \Exception("Parse error: {$error->getMessage()} file: {$filename}\n");
         }
-        $expression = PhpTypeExpression::buildByVar($ast[0]->stmts[1]->stmts[2], ['hoge', 'fuga', 'product']);
+        $expression = PhpTypeExpression::buildByVar($ast[0]->stmts[2]->stmts[2], ['hoge', 'fuga', 'product'], []);
         $types = $expression->getTypes();
 
         $this->assertSame(['hoge', 'fuga', 'product'], $types[0]->getNamespace(), 'namespace');
@@ -72,7 +72,7 @@ public function testException(): void {
         } catch (Error $error) {
             throw new \Exception("Parse error: {$error->getMessage()} file: {$filename}\n");
         }
-        $expression = PhpTypeExpression::buildByVar($ast[0]->stmts[1]->stmts[4], ['hoge', 'fuga', 'product']);
+        $expression = PhpTypeExpression::buildByVar($ast[0]->stmts[2]->stmts[4], ['hoge', 'fuga', 'product'], []);
         $types = $expression->getTypes();
 
         $this->assertSame([], $types[0]->getNamespace(), 'namespace');
@@ -88,7 +88,7 @@ public function testRelated(): void {
         } catch (Error $error) {
             throw new \Exception("Parse error: {$error->getMessage()} file: {$filename}\n");
         }
-        $expression = PhpTypeExpression::buildByVar($ast[0]->stmts[1]->stmts[5], ['hoge', 'fuga', 'product']);
+        $expression = PhpTypeExpression::buildByVar($ast[0]->stmts[2]->stmts[5], ['hoge', 'fuga', 'product'], []);
         $types = $expression->getTypes();
 
         $this->assertSame(['hoge', 'fuga', 'product', 'bar'], $types[0]->getNamespace(), 'namespace');
@@ -104,7 +104,7 @@ public function testAbsolute(): void {
         } catch (Error $error) {
             throw new \Exception("Parse error: {$error->getMessage()} file: {$filename}\n");
         }
-        $expression = PhpTypeExpression::buildByVar($ast[0]->stmts[1]->stmts[6], ['hoge', 'fuga', 'product']);
+        $expression = PhpTypeExpression::buildByVar($ast[0]->stmts[2]->stmts[6], ['hoge', 'fuga', 'product'], []);
         $types = $expression->getTypes();
 
         $this->assertSame(['hoge', 'fuga', 'product', 'bar'], $types[0]->getNamespace(), 'namespace');
@@ -121,7 +121,7 @@ public function testDocString(): void {
         } catch (Error $error) {
             throw new \Exception("Parse error: {$error->getMessage()} file: {$filename}\n");
         }
-        $expression = PhpTypeExpression::buildByVar($ast[0]->stmts[1]->stmts[7], ['hoge', 'fuga', 'product']);
+        $expression = PhpTypeExpression::buildByVar($ast[0]->stmts[2]->stmts[7], ['hoge', 'fuga', 'product'], []);
         $types = $expression->getTypes();
 
         $this->assertSame(['hoge', 'fuga', 'product', 'bur'], $types[0]->getNamespace(), 'namespace');
@@ -138,7 +138,7 @@ public function testDocStringUnion(): void {
         } catch (Error $error) {
             throw new \Exception("Parse error: {$error->getMessage()} file: {$filename}\n");
         }
-        $expression = PhpTypeExpression::buildByVar($ast[0]->stmts[1]->stmts[8], ['hoge', 'fuga', 'product']);
+        $expression = PhpTypeExpression::buildByVar($ast[0]->stmts[2]->stmts[8], ['hoge', 'fuga', 'product'], []);
         $types = $expression->getTypes();
 
         $this->assertSame([], $types[0]->getNamespace(), 'namespace');
@@ -158,7 +158,7 @@ public function testDocStringUnion2(): void {
         } catch (Error $error) {
             throw new \Exception("Parse error: {$error->getMessage()} file: {$filename}\n");
         }
-        $expression = PhpTypeExpression::buildByVar($ast[0]->stmts[1]->stmts[9], ['hoge', 'fuga', 'product']);
+        $expression = PhpTypeExpression::buildByVar($ast[0]->stmts[2]->stmts[9], ['hoge', 'fuga', 'product'], []);
         $types = $expression->getTypes();
 
         $this->assertSame([], $types[0]->getNamespace(), 'namespace');
@@ -178,10 +178,10 @@ public function testMethodParameterInt(): void {
             throw new \Exception("Parse error: {$error->getMessage()} file: {$filename}\n");
         }
         // var_dump($ast[0]->stmts[1]->stmts[8]);die();
-        $doc = $ast[0]->stmts[1]->stmts[10]->getDocComment();
+        $doc = $ast[0]->stmts[2]->stmts[10]->getDocComment();
         $docString = $doc->getText();
-        $param = $ast[0]->stmts[1]->stmts[10]->getParams()[0];
-        $expression = PhpTypeExpression::buildByMethodParam($param, ['hoge', 'fuga', 'product'], $docString, 'paramint');
+        $param = $ast[0]->stmts[2]->stmts[10]->getParams()[0];
+        $expression = PhpTypeExpression::buildByMethodParam($param, ['hoge', 'fuga', 'product'], $docString, 'paramint', []);
         $types = $expression->getTypes();
 
         $this->assertSame([], $types[0]->getNamespace(), 'namespace');
@@ -198,10 +198,10 @@ public function testMethodParameterPrice(): void {
             throw new \Exception("Parse error: {$error->getMessage()} file: {$filename}\n");
         }
         // var_dump($ast[0]->stmts[1]->stmts[8]);die();
-        $doc = $ast[0]->stmts[1]->stmts[10]->getDocComment();
+        $doc = $ast[0]->stmts[2]->stmts[10]->getDocComment();
         $docString = $doc->getText();
-        $param = $ast[0]->stmts[1]->stmts[10]->getParams()[1];
-        $expression = PhpTypeExpression::buildByMethodParam($param, ['hoge', 'fuga', 'product'], $docString, 'paramint');
+        $param = $ast[0]->stmts[2]->stmts[10]->getParams()[1];
+        $expression = PhpTypeExpression::buildByMethodParam($param, ['hoge', 'fuga', 'product'], $docString, 'paramint', []);
         $types = $expression->getTypes();
 
         $this->assertSame(['hoge', 'fuga', 'product'], $types[0]->getNamespace(), 'namespace');
@@ -218,10 +218,10 @@ public function testMethodParameterDocString(): void {
             throw new \Exception("Parse error: {$error->getMessage()} file: {$filename}\n");
         }
         // var_dump($ast[0]->stmts[1]->stmts[8]);die();
-        $doc = $ast[0]->stmts[1]->stmts[10]->getDocComment();
+        $doc = $ast[0]->stmts[2]->stmts[10]->getDocComment();
         $docString = $doc->getText();
-        $param = $ast[0]->stmts[1]->stmts[10]->getParams()[2];
-        $expression = PhpTypeExpression::buildByMethodParam($param, ['hoge', 'fuga', 'product'], $docString, 'param1');
+        $param = $ast[0]->stmts[2]->stmts[10]->getParams()[2];
+        $expression = PhpTypeExpression::buildByMethodParam($param, ['hoge', 'fuga', 'product'], $docString, 'param1', []);
         $types = $expression->getTypes();
 
         $this->assertSame([], $types[0]->getNamespace(), 'namespace');
@@ -240,9 +240,9 @@ public function testMethodReturnInt(): void {
         } catch (Error $error) {
             throw new \Exception("Parse error: {$error->getMessage()} file: {$filename}\n");
         }
-        $method = $ast[0]->stmts[1]->stmts[10];
+        $method = $ast[0]->stmts[2]->stmts[10];
         // var_dump($method);die();
-        $expression = PhpTypeExpression::buildByMethodReturn($method, ['hoge', 'fuga', 'product']);
+        $expression = PhpTypeExpression::buildByMethodReturn($method, ['hoge', 'fuga', 'product'], []);
         $types = $expression->getTypes();
 
         $this->assertSame([], $types[0]->getNamespace(), 'namespace');
@@ -258,9 +258,9 @@ public function testMethodReturnProduct(): void {
         } catch (Error $error) {
             throw new \Exception("Parse error: {$error->getMessage()} file: {$filename}\n");
         }
-        $method = $ast[0]->stmts[1]->stmts[11];
+        $method = $ast[0]->stmts[2]->stmts[11];
         // var_dump($method);die();
-        $expression = PhpTypeExpression::buildByMethodReturn($method, ['hoge', 'fuga', 'product']);
+        $expression = PhpTypeExpression::buildByMethodReturn($method, ['hoge', 'fuga', 'product'], []);
         $types = $expression->getTypes();
 
         $this->assertSame(['hoge', 'fuga', 'product'], $types[0]->getNamespace(), 'namespace');
@@ -276,14 +276,34 @@ public function testMethodReturnArray(): void {
         } catch (Error $error) {
             throw new \Exception("Parse error: {$error->getMessage()} file: {$filename}\n");
         }
-        $method = $ast[0]->stmts[1]->stmts[12];
+        $method = $ast[0]->stmts[2]->stmts[12];
         // var_dump($method);die();
-        $expression = PhpTypeExpression::buildByMethodReturn($method, ['hoge', 'fuga', 'product']);
+        $expression = PhpTypeExpression::buildByMethodReturn($method, ['hoge', 'fuga', 'product'], []);
         $types = $expression->getTypes();
 
         $this->assertSame([], $types[0]->getNamespace(), 'namespace');
         $this->assertSame('array', $types[0]->getName(), 'name');
         $this->assertSame(false, $types[0]->getNullable(), 'nullable');
     }
+    public function testMethodParameterTag(): void {
+        // /** @params string|int $param1 */
+        $parser = (new ParserFactory)->create(ParserFactory::PREFER_PHP7);
+        $filename = sprintf('%s/php8/product/Product.php', $this->fixtureDir);
+        try {
+            $ast = $parser->parse(file_get_contents($filename));
+        } catch (Error $error) {
+            throw new \Exception("Parse error: {$error->getMessage()} file: {$filename}\n");
+        }
+        // var_dump($ast[0]->stmts[1]->stmts[8]);die();
+        $docString = '';
+        $param = $ast[0]->stmts[2]->stmts[13]->getParams()[0];
+        $uses = [new PhpType(['hoge', 'fuga', 'product', 'tag'], '', 'Tag')];
+        $expression = PhpTypeExpression::buildByMethodParam($param, ['hoge', 'fuga', 'product'], $docString, 'paramint', $uses);
+        $types = $expression->getTypes();
+
+        $this->assertSame(['hoge', 'fuga', 'product', 'tag'], $types[0]->getNamespace(), 'namespace');
+        $this->assertSame('Tag', $types[0]->getName(), 'name');
+        $this->assertSame(false, $types[0]->getNullable(), 'nullable');
+    }
 
 }
diff --git a/test/fixtures/php8/product/Product.php b/test/fixtures/php8/product/Product.php
@@ -5,6 +5,7 @@
     Name,
     Price,
 };
+use hoge\fuga\product\tag\Tag;
 
 class Product {
     private ?string $nullableString;
@@ -38,4 +39,8 @@ public function method2(): int {
     public function method3(): array {
         return [];
     }
+
+    public function method4(Tag $tag): array {
+        return [];
+    }
 }
