changed var, props and methods FQCN displaying

Author: mkusher

src/Complete/Completer/ObjectCompleter.php

@@ -68,7 +68,7 @@ protected function createEntryForMethod(MethodData $method){
     }
 
     protected function createEntryForProperty(ClassProperty $prop){
-        $type = $prop->type instanceof FQCN ? $prop->type->toString() : 'mixed';
+        $type = $prop->type instanceof FQCN ? $prop->type->getClassName() : 'mixed';
         return new Entry(
             $prop->name,
             $type

src/Complete/Completer/VarCompleter.php

@@ -7,6 +7,7 @@
 use Entity\Project;
 use Entity\Node\Variable;
 use Entity\Completion\Entry;
+use Entity\FQCN;
 
 class VarCompleter implements CompleterInterface
 {
@@ -17,8 +18,12 @@ public function getEntries(Project $project, Context $context)
 
     protected function createEntry(Variable $var)
     {
+        $type = $var->getType() instanceof FQCN ?
+            $var->getType()->toString() :
+            $var->getType();
         return new Entry(
-            $var->getName()
+            $var->getName(),
+            $type
         );
     }
 }

src/Entity/Node/MethodData.php

@@ -35,9 +35,14 @@ public function addParam(MethodParam $param){
     public function getParamsStr(){
         $paramsStr = [];
         foreach($this->arguments as $argument){
+            /** @var MethodParam $argument */
             $curParam = [];
             if($argument->getType()){
-                $curParam[] = $argument->getType();
+                if ($argument->getType() instanceof FQCN) {
+                    $curParam[] = $argument->getType()->getClassName();
+                } else {
+                    $curParam[] = $argument->getType();
+                }
             }
             $curParam[] = sprintf("$%s", $argument->getName());
             $paramsStr[] = implode(" ", $curParam);
@@ -46,7 +51,7 @@ public function getParamsStr(){
     }
     public function getReturnStr(){
         if($this->return instanceof FQCN){
-            return $this->return->toString();
+            return $this->return->getClassName();
         }
         return "mixed";
     }