make method return type PhpTypeExcepression.

smeghead · smeghead · commit 53f88c447103 · 2023-02-14T22:26:17.000+09:00
diff --git a/src/DiagramElement/Entry.php b/src/DiagramElement/Entry.php
@@ -92,7 +92,9 @@ public function getArrows(): array {
             if (count($m->getParams()) > 0) {
                 continue;
             }
-            $arrows[] = new ArrowDependency($this->class, $m->getType());
+            foreach ($m->getType()->getTypes() as $t) {
+                $arrows[] = new ArrowDependency($this->class, $t);
+            }
         }
         $extends = $this->class->getExtends();
         if ( ! empty($extends)) {
diff --git a/src/Php/PhpClass.php b/src/Php/PhpClass.php
@@ -147,54 +147,6 @@ protected function findNamespaceByTypeParts(array $type_parts): array {
         return $this->getNamespace();
     }
 
-    /**
-     * php-parserの解析結果の情報から、指定のクラスの型情報を取得します。
-     * クラスのuseの状態から、namespaceを解決したPhpTypeを返却します。
-     * @param NodeAbstract ClassMethod または Property または Param が渡されることを想定
-     */
-    public function findTypeByTypeParts(NodeAbstract $stmt, string $property, string $docAttribute = ''): PhpType {
-        $docComment = $stmt->getDocComment();
-        $doc = '';
-        if ( ! empty($docComment)) {
-            $doc =  $docComment->getText();
-        }
-        $parts = [];
-        $type = $stmt->{$property};
-        if ($type instanceOf NullableType) {
-            $type = $type->type;
-        }
-        if ( ! empty($doc) && ! empty($docAttribute)) {
-            // @{$docAttribute} に定義された型情報を取得する。
-            if (preg_match(sprintf('/@%s\s+(\S+)(\b|\s).*/', $docAttribute), $doc, $matches)) {
-                $typeString = $matches[1];
-                if (mb_substr($typeString, 0, 1) === '\\') {
-                    $parts = explode('\\', mb_substr($typeString, 1));
-                    $typeName = array_pop($parts);
-                    return new PhpType($parts, '', $typeName);
-                }
-
-                $parts = explode('\\', $typeString);
-            }
-        } else if ($type instanceOf Identifier) {
-            $parts[] = $type->name;
-        } else if ($type instanceOf FullyQualified) {
-            return new PhpType(
-                array_slice($type->parts, 0, count($type->parts) - 1),
-                '',
-                end($type->parts));
-        } else if ($type instanceOf Name) {
-            $parts = $type->parts;
-        } else if ($type instanceOf UnionType) {
-
-        }
-        $namespace = [];
-        if (count($parts) > 0) {
-            $namespace = $this->findNamespaceByTypeParts($parts);
-            $typeName = array_pop($parts);
-        }
-        return new PhpType($namespace, $stmt->getType(), $typeName ?? '');
-    }
-
     /** @return PhpMethod[] メソッド一覧 */
     public function getMethods(): array {
         $methods = [];
diff --git a/src/Php/PhpMethod.php b/src/Php/PhpMethod.php
@@ -11,7 +11,7 @@
 
 class PhpMethod {
     protected string $name;
-    protected PhpType $type;
+    protected PhpTypeExpression $type;
     /** @var PhpMethodParameter[] パラメータ一覧 */
     protected array $params;
     protected PhpAccessModifier $accessModifier;
@@ -23,7 +23,6 @@ public function __construct(ClassMethod $method, PhpClass $class) {
             $docString = $doc->getText();
         }
         $params = array_map(function($x) use ($class, $docString){
-            // $type = $class->findTypeByTypeParts($x, 'type');
             $type = PhpTypeExpression::buildByMethodParam($x, $class->getNamespace(), $docString, $x->var->name, $class->getUses());
             return new PhpMethodParameter($x->var->name, $type);
         }, $method->getParams());
@@ -33,15 +32,15 @@ public function __construct(ClassMethod $method, PhpClass $class) {
         $this->accessModifier = new PhpAccessModifier($method);
     }
 
-    private function getTypeFromMethod(ClassMethod $method, PhpClass $class): PhpType {
-        return $class->findTypeByTypeParts($method, 'returnType', 'return');
+    private function getTypeFromMethod(ClassMethod $method, PhpClass $class): PhpTypeExpression {
+        return PhpTypeExpression::buildByMethodReturn($method, $class->getNamespace(), $class->getUses());
     }
 
     public function getName(): string {
         return $this->name;
     }
 
-    public function getType(): PhpType {
+    public function getType(): PhpTypeExpression {
         return $this->type;
     }
 
diff --git a/src/Php/PhpProperty.php b/src/Php/PhpProperty.php
@@ -12,7 +12,6 @@ class PhpProperty {
 
     public function __construct(Property $p, PhpClass $class) {
         $this->name = $p->props[0]->name->toString();
-        // $this->type = $class->findTypeByTypeParts($p, 'type', 'var');
         $this->type = PhpTypeExpression::buildByVar($p, $class->getNamespace(), $class->getUses());
         $this->accessModifier = new PhpAccessModifier($p);
     }
diff --git a/src/Php/PhpTypeExpression.php b/src/Php/PhpTypeExpression.php
@@ -165,8 +165,7 @@ private function parseType(Property|Identifier|NullableType|Name|null $type, arr
                     if (count($targets) > 0) {
                         $parts = array_merge($targets[0]->getNamespace(), [$targets[0]->getName()]);
                     } else {
-                        $docString = sprintf('%s\\%s', implode('\\', $currentNamespace), $typeString);
-                        $parts = explode('\\', $docString);
+                        $parts = array_merge($currentNamespace, explode('\\', $typeString));
                     }
                 }
             }
diff --git a/test/PhpReflectionTest.php b/test/PhpReflectionTest.php
@@ -131,7 +131,7 @@ public function testDump_with_methods(): void {
         $this->assertSame('method1', $data->getMethods()[0]->getName(), 'namespace name.');
         $this->assertSame('param1', $data->getMethods()[0]->getParams()[0]->getName(), 'parameter name.');
         $this->assertSame('Product', $data->getMethods()[0]->getType()->getName(), 'return type.');
-        $this->assertSame([], $data->getMethods()[0]->getType()->getNamespace(), 'return type namespace.');
+        $this->assertSame([], $data->getMethods()[0]->getType()->getTypes()[0]->getNamespace(), 'return type namespace.');
         $this->assertSame(true, $data->getMethods()[0]->getAccessModifier()->isPublic(), 'public.');
         $this->assertSame(false, $data->getMethods()[0]->getAccessModifier()->isPrivate(), 'private.');
         $this->assertSame(false, $data->getMethods()[0]->getAccessModifier()->isStatic(), 'static.');
@@ -148,7 +148,7 @@ public function testDump_with_methods2(): void {
         $this->assertSame(['hoge', 'fuga', 'product'], $data->getClassType()->getNamespace(), 'namespace name.');
         $this->assertSame('method1', $data->getMethods()[0]->getName(), 'namespace name.');
         $this->assertSame('Product', $data->getMethods()[0]->getType()->getName(), 'return type.');
-        $this->assertSame(['hoge', 'fuga', 'product'], $data->getMethods()[0]->getType()->getNamespace(), 'return type namespace.');
+        $this->assertSame(['hoge', 'fuga', 'product'], $data->getMethods()[0]->getType()->getTypes()[0]->getNamespace(), 'return type namespace.');
         $this->assertSame('param1', $data->getMethods()[0]->getParams()[0]->getName(), 'parameter name.');
         $this->assertSame(true, $data->getMethods()[0]->getAccessModifier()->isPublic(), 'public.');
         $this->assertSame(false, $data->getMethods()[0]->getAccessModifier()->isPrivate(), 'private.');
@@ -221,8 +221,8 @@ public function testNullable(): void {
         $this->assertSame('Product', $data->getClassType()->getName(), 'class type name.');
         $this->assertSame(['hoge', 'fuga', 'product'], $data->getClassType()->getNamespace(), 'namespace name.');
         $this->assertSame('nullable', $data->getMethods()[0]->getName(), 'namespace name.');
-        $this->assertSame('Tag', $data->getMethods()[0]->getType()->getName(), 'return type.');
-        $this->assertSame(['hoge', 'fuga', 'product', 'tags'], $data->getMethods()[0]->getType()->getNamespace(), 'return type namespace.');
+        $this->assertSame('?Tag', $data->getMethods()[0]->getType()->getName(), 'return type.');
+        $this->assertSame(['hoge', 'fuga', 'product', 'tags'], $data->getMethods()[0]->getType()->getTypes()[0]->getNamespace(), 'return type namespace.');
         $this->assertSame('name', $data->getMethods()[0]->getParams()[0]->getName(), 'parameter name.');
         $this->assertSame('?Name', $data->getMethods()[0]->getParams()[0]->getType()->getName(), 'parameter type.');
         $this->assertSame(['hoge', 'fuga', 'product'], $data->getMethods()[0]->getParams()[0]->getType()->getTypes()[0]->getNamespace(), 'parameter type namespace.');
@@ -240,8 +240,8 @@ public function testNullableWithoutNamespace(): void {
         $this->assertSame('ProductWithoutNamespace', $data->getClassType()->getName(), 'class type name.');
         $this->assertSame([], $data->getClassType()->getNamespace(), 'namespace name.');
         $this->assertSame('nullable', $data->getMethods()[0]->getName(), 'namespace name.');
-        $this->assertSame('Name', $data->getMethods()[0]->getType()->getName(), 'return type.');
-        $this->assertSame(['hoge', 'fuga', 'product'], $data->getMethods()[0]->getType()->getNamespace(), 'return type namespace.');
+        $this->assertSame('?Name', $data->getMethods()[0]->getType()->getName(), 'return type.');
+        $this->assertSame(['hoge', 'fuga', 'product'], $data->getMethods()[0]->getType()->getTypes()[0]->getNamespace(), 'return type namespace.');
         $this->assertSame('name', $data->getMethods()[0]->getParams()[0]->getName(), 'parameter name.');
         $this->assertSame('?Name', $data->getMethods()[0]->getParams()[0]->getType()->getName(), 'parameter type.');
         $this->assertSame(['hoge', 'fuga', 'product'], $data->getMethods()[0]->getParams()[0]->getType()->getTypes()[0]->getNamespace(), 'parameter type namespace.');
@@ -259,13 +259,13 @@ public function testFullyQualified(): void {
         $this->assertSame([], $data->getExtends()[0]->getNamespace(), 'super class namespace.');
         $this->assertSame('getInner', $data->getMethods()[0]->getName(), 'method name.');
         $this->assertSame('Exception', $data->getMethods()[0]->getType()->getName(), 'return type.');
-        $this->assertSame([], $data->getMethods()[0]->getType()->getNamespace(), 'return type namespace.');
+        $this->assertSame([], $data->getMethods()[0]->getType()->getTypes()[0]->getNamespace(), 'return type namespace.');
         $this->assertSame('e', $data->getMethods()[0]->getParams()[0]->getName(), 'parameter name.');
         $this->assertSame('Exception', $data->getMethods()[0]->getParams()[0]->getType()->getName(), 'parameter type.');
         $this->assertSame([], $data->getMethods()[0]->getParams()[0]->getType()->getTypes()[0]->getNamespace(), 'parameter type namespace.');
         $this->assertSame('external', $data->getMethods()[1]->getName(), 'method name.');
         $this->assertSame('Exception', $data->getMethods()[1]->getType()->getName(), 'return type.');
-        $this->assertSame(['external'], $data->getMethods()[1]->getType()->getNamespace(), 'return type namespace.');
+        $this->assertSame(['external'], $data->getMethods()[1]->getType()->getTypes()[0]->getNamespace(), 'return type namespace.');
     }
     public function testClassesInAFile(): void {
         $options = new Options([]);
diff --git a/test/dummy/PhpMethodDummy.php b/test/dummy/PhpMethodDummy.php
@@ -22,7 +22,7 @@ public function __construct(\stdClass $method) {
             return new PhpMethodParameter($x->name, PhpTypeExpression::buildByPhpType(new PhpType([], '', $x->type->name)));
         }, $method->params);
         $this->name = $method->name;
-        $this->type = new PhpType($method->type->namespace, 'Stmt_Class', $method->type->name);
+        $this->type = PhpTypeExpression::buildByPhpType(new PhpType($method->type->namespace, 'Stmt_Class', $method->type->name));
         $this->params = $params;
         $this->accessModifier = new PhpAccessModifierDummy($method->modifier);
     }

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,9 @@ public function getArrows(): array {`
`92`	`92`	`if (count($m->getParams()) > 0) {`
`93`	`93`	`continue;`
`94`	`94`	`}`
`95`		`- $arrows[] = new ArrowDependency($this->class, $m->getType());`
	`95`	`+ foreach ($m->getType()->getTypes() as $t) {`
	`96`	`+ $arrows[] = new ArrowDependency($this->class, $t);`
	`97`	`+ }`
`96`	`98`	`}`
`97`	`99`	`$extends = $this->class->getExtends();`
`98`	`100`	`if ( ! empty($extends)) {`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`class PhpMethod {`
`13`	`13`	`protected string $name;`
`14`		`- protected PhpType $type;`
	`14`	`+ protected PhpTypeExpression $type;`
`15`	`15`	`/** @var PhpMethodParameter[] パラメータ一覧 */`
`16`	`16`	`protected array $params;`
`17`	`17`	`protected PhpAccessModifier $accessModifier;`
`@@ -23,7 +23,6 @@ public function __construct(ClassMethod $method, PhpClass $class) {`
`23`	`23`	`$docString = $doc->getText();`
`24`	`24`	`}`
`25`	`25`	`$params = array_map(function($x) use ($class, $docString){`
`26`		`- // $type = $class->findTypeByTypeParts($x, 'type');`
`27`	`26`	`$type = PhpTypeExpression::buildByMethodParam($x, $class->getNamespace(), $docString, $x->var->name, $class->getUses());`
`28`	`27`	`return new PhpMethodParameter($x->var->name, $type);`
`29`	`28`	`}, $method->getParams());`
`@@ -33,15 +32,15 @@ public function __construct(ClassMethod $method, PhpClass $class) {`
`33`	`32`	`$this->accessModifier = new PhpAccessModifier($method);`
`34`	`33`	`}`
`35`	`34`
`36`		`- private function getTypeFromMethod(ClassMethod $method, PhpClass $class): PhpType {`
`37`		`- return $class->findTypeByTypeParts($method, 'returnType', 'return');`
	`35`	`+ private function getTypeFromMethod(ClassMethod $method, PhpClass $class): PhpTypeExpression {`
	`36`	`+ return PhpTypeExpression::buildByMethodReturn($method, $class->getNamespace(), $class->getUses());`
`38`	`37`	`}`
`39`	`38`
`40`	`39`	`public function getName(): string {`
`41`	`40`	`return $this->name;`
`42`	`41`	`}`
`43`	`42`
`44`		`- public function getType(): PhpType {`
	`43`	`+ public function getType(): PhpTypeExpression {`
`45`	`44`	`return $this->type;`
`46`	`45`	`}`
`47`	`46`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ class PhpProperty {`
`12`	`12`
`13`	`13`	`public function __construct(Property $p, PhpClass $class) {`
`14`	`14`	`$this->name = $p->props[0]->name->toString();`
`15`		`- // $this->type = $class->findTypeByTypeParts($p, 'type', 'var');`
`16`	`15`	`$this->type = PhpTypeExpression::buildByVar($p, $class->getNamespace(), $class->getUses());`
`17`	`16`	`$this->accessModifier = new PhpAccessModifier($p);`
`18`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -165,8 +165,7 @@ private function parseType(Property\|Identifier\|NullableType\|Name\|null $type, arr`
`165`	`165`	`if (count($targets) > 0) {`
`166`	`166`	`$parts = array_merge($targets[0]->getNamespace(), [$targets[0]->getName()]);`
`167`	`167`	`} else {`
`168`		`- $docString = sprintf('%s\\%s', implode('\\', $currentNamespace), $typeString);`
`169`		`- $parts = explode('\\', $docString);`
	`168`	`+ $parts = array_merge($currentNamespace, explode('\\', $typeString));`
`170`	`169`	`}`
`171`	`170`	`}`
`172`	`171`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public function __construct(\stdClass $method) {`
`22`	`22`	`return new PhpMethodParameter($x->name, PhpTypeExpression::buildByPhpType(new PhpType([], '', $x->type->name)));`
`23`	`23`	`}, $method->params);`
`24`	`24`	`$this->name = $method->name;`
`25`		`- $this->type = new PhpType($method->type->namespace, 'Stmt_Class', $method->type->name);`
	`25`	`+ $this->type = PhpTypeExpression::buildByPhpType(new PhpType($method->type->namespace, 'Stmt_Class', $method->type->name));`
`26`	`26`	`$this->params = $params;`
`27`	`27`	`$this->accessModifier = new PhpAccessModifierDummy($method->modifier);`
`28`	`28`	`}`