fix: fix to Avoid interdependencies Smeghead\PhpClassDiagram\Php and Smeghead\PhpClassDiagram\Php\Finders.

Author: smeghead

CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## v1.2.1 (2023-09-07)
+
+### Bug fix
+
+ * fix to Avoid interdependencies Smeghead\PhpClassDiagram\Php and Smeghead\PhpClassDiagram\Php\Finders.
+
 ## v1.2.0 (2023-09-05)
 
 ### Features

dogfood-package.png

@@ -6,12 +6,9 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Name\FullyQualified;
-use PhpParser\Node\Param;
-use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassLike;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\NodeFinder;
-use Smeghead\PhpClassDiagram\Php\PhpType;
 
 final class FindUsePhpTypes
 {
@@ -23,7 +20,7 @@ public function __construct(ClassLike $class)
     }
 
     /**
-     * @return PhpType[] use class types.
+     * @return FullyQualified[] use class types.
      */
     public function collectTypes(): array
     {
@@ -39,10 +36,6 @@ public function collectTypes(): array
             }));
         }
         // @phpstan-ignore-next-line
-        return array_map(function(FullyQualified $x): PhpType {
-            $parts = $x->parts;
-            $name = array_pop($parts);
-            return new PhpType($parts, '', $name);
-        }, $useClasses);
+        return $useClasses;
     }
 }

src/Php/Finders/FindUsePhpTypes.php

@@ -229,6 +229,6 @@ public function getDescription(): string
     public function getUsingTypes(): array
     {
         $finder = new FindUsePhpTypes($this->syntax);
-        return $finder->collectTypes();
+        return array_map(fn(FullyQualified $x) => new PhpType(array_slice($x->parts, 0, count($x->parts) - 1), '', end($x->parts)), $finder->collectTypes());
     }
 }

src/Php/PhpClass.php

@@ -26,5 +26,4 @@ public function testMainUseProduct(): void
         $this->assertSame(['hoge', 'fuga', 'product'], $types[0]->getNamespace());
         $this->assertSame('Product', $types[0]->getName());
     }
-
 }