make method parameter type PhpTypeExcepression.

Author: smeghead

src/Php/PhpMethod.php

@@ -17,8 +17,14 @@ class PhpMethod {
     protected PhpAccessModifier $accessModifier;
 
     public function __construct(ClassMethod $method, PhpClass $class) {
-        $params = array_map(function($x) use ($class){
-            $type = $class->findTypeByTypeParts($x, 'type');
+        $docString = '';
+        $doc = $method->getDocComment();
+        if ( ! empty($doc)) {
+            $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());
         $this->name = $method->name->toString();

src/Php/PhpMethodParameter.php

@@ -3,9 +3,9 @@
 
 class PhpMethodParameter {
     private string $name;
-    private PhpType $type;
+    private PhpTypeExpression $type;
 
-    public function __construct(string $name, PhpType $type) {
+    public function __construct(string $name, PhpTypeExpression $type) {
         $this->name = $name;
         $this->type = $type;
     }
@@ -14,7 +14,7 @@ public function getName(): string {
         return $this->name;
     }
 
-    public function getType(): PhpType {
+    public function getType(): PhpTypeExpression {
         return $this->type;
     }
 }

test/PhpReflectionTest.php

@@ -224,11 +224,11 @@ public function testNullable(): void {
         $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('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()->getNamespace(), 'parameter type namespace.');
+        $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.');
         $this->assertSame('tag', $data->getMethods()[0]->getParams()[1]->getName(), 'parameter name. tag');
         $this->assertSame('Tag', $data->getMethods()[0]->getParams()[1]->getType()->getName(), 'parameter type. tag');
-        $this->assertSame(['hoge', 'fuga', 'product', 'tags'], $data->getMethods()[0]->getParams()[1]->getType()->getNamespace(), 'parameter type namespace. tag');
+        $this->assertSame(['hoge', 'fuga', 'product', 'tags'], $data->getMethods()[0]->getParams()[1]->getType()->getTypes()[0]->getNamespace(), 'parameter type namespace. tag');
     }
     public function testNullableWithoutNamespace(): void {
         $options = new Options([]);
@@ -243,8 +243,8 @@ public function testNullableWithoutNamespace(): void {
         $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]->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()->getNamespace(), 'parameter type namespace.');
+        $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.');
     }
     public function testFullyQualified(): void {
         $options = new Options([]);
@@ -262,7 +262,7 @@ public function testFullyQualified(): void {
         $this->assertSame([], $data->getMethods()[0]->getType()->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()->getNamespace(), 'parameter type namespace.');
+        $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.');

test/dummy/PhpMethodDummy.php

@@ -5,6 +5,7 @@
   PhpMethod,
   PhpAccessModifier,
   PhpMethodParameter,
+    PhpTypeExpression,
 };
 
 require_once(__DIR__ . '/PhpAccessModifierDummy.php');
@@ -18,7 +19,7 @@ class PhpMethodDummy extends PhpMethod {
 
     public function __construct(\stdClass $method) {
         $params = array_map(function($x){
-            return new PhpMethodParameter($x->name, new PhpType([], '', $x->type->name));
+            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);