feat: search dependency from method code.

Until now, dependency information was obtained from class fields and method signatures, but now the dependency information is also obtained from within the method code.

Author: smeghead

CHANGELOG.md

@@ -3,6 +3,7 @@
 ### Features
 
  * added to run PHPStan in GitHub Action flow.
+ * Until now, dependency information was obtained from class fields and method signatures, but now the dependency information is also obtained from within the method code.
 
 ## v1.1.1 (2023-07-30)
 

composer.json

@@ -31,7 +31,7 @@
     ],
     "scripts": {
         "test": [
-            "php vendor/phpunit/phpunit/phpunit test/"
+            "php vendor/phpunit/phpunit/phpunit --colors test/"
         ],
         "build": [
             "php -d phar.readonly=off ./vendor/bin/phar-composer build ./"

dogfood-model.png

@@ -166,4 +166,16 @@ public function getArrows(): array
 
         return $arrows;
     }
+
+    /**
+     * @return Arrow[] using arrows.
+     */
+    public function getUsingArrows(): array
+    {
+        $arrows = [];
+        foreach ($this->getClass()->getUsingTypes() as $t) {
+            $arrows[] = new ArrowDependency($this->class, $t);
+        }
+        return $arrows;
+    }
 }

dogfood-package.png

@@ -143,6 +143,10 @@ public function getArrows(): array
         foreach ($this->children as $n) {
             $arrows = array_merge($arrows, $n->getArrows());
         }
+        foreach ($this->entries as $n) {
+            $arrows = array_merge($arrows, $n->getUsingArrows());
+        }
+
         return $arrows;
     }
 

dogfood.png

@@ -49,9 +49,9 @@ public function dump(): array
      */
     public function getRelations(): array
     {
-        $entities = $this->package->getEntries();
-        $relation_expressions = array_map(function (Arrow $x) use ($entities) {
-            foreach ($entities as $e) {
+        $entries = $this->package->getEntries();
+        $relation_expressions = array_map(function (Arrow $x) use ($entries) {
+            foreach ($entries as $e) {
                 if ($e->getClass()->getClassType()->equals($x->getTo())) {
                     return $x->toString($e->getClass());
                 }
@@ -60,7 +60,7 @@ public function getRelations(): array
         }, $this->package->getArrows());
         $relation_expressions = array_filter($relation_expressions);
         sort($relation_expressions);
-        return array_unique($relation_expressions);
+        return array_values(array_unique($relation_expressions));
     }
 
     /**

src/DiagramElement/Entry.php

@@ -4,7 +4,7 @@
 
 namespace Smeghead\PhpClassDiagram\Php\Doc;
 
-use PhpParser\Node\Stmt;
+use PhpParser\Node;
 use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocNode;
 use PHPStan\PhpDocParser\Lexer\Lexer;
@@ -17,7 +17,7 @@ class PhpDocComment
 {
     private string $text = '';
 
-    public function __construct(Stmt $stmt)
+    public function __construct(Node $stmt)
     {
         $doc = $stmt->getDocComment();
         if (!empty($doc)) {

src/DiagramElement/Package.php

@@ -11,7 +11,7 @@
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\NodeFinder;
 
-class FindConstructerProperties
+final class FindConstructerProperties
 {
     /** @var \PhpParser\Node\Param[] */
     private array $properties = [];