fix: reduce VHU(Variable Hard Usage)

Author: smeghead

src/Command/ScopesCommand.php

@@ -4,7 +4,9 @@
 
 namespace Smeghead\PhpVariableHardUsage\Command;
 
+use Smeghead\PhpVariableHardUsage\Analyze\AnalysisResult;
 use Smeghead\PhpVariableHardUsage\Analyze\VariableAnalyzer;
+use Smeghead\PhpVariableHardUsage\Parse\Exception\ParseFailedException;
 use Smeghead\PhpVariableHardUsage\Parse\VariableParser;
 
 final class ScopesCommand extends AbstractCommand
@@ -20,12 +22,16 @@ public function __construct(array $paths)
         $this->paths = $paths;
     }
 
-    public function execute(): int
+    /**
+     * @param list<string> $paths
+     * @return list<string>
+     */
+    private function pickupPhpFiles(array $paths): array
     {
         $phpFiles = [];
 
         // 各パスを処理
-        foreach ($this->paths as $path) {
+        foreach ($paths as $path) {
             if (is_dir($path)) {
                 // ディレクトリの場合は再帰的にPHPファイルを収集
                 $dirFiles = $this->findPhpFiles($path);
@@ -38,6 +44,26 @@ public function execute(): int
             }
         }
 
+        return $phpFiles;
+    }
+    
+    private function analyzeFile(string $file): AnalysisResult
+    {
+        $parser = new VariableParser();
+        $content = file_get_contents($file);
+        if ($content === false) {
+            throw new ParseFailedException("Failed to read file: {$file}");
+        }
+
+        $parseResult = $parser->parse($content);
+        $analyzer = new VariableAnalyzer($file, $parseResult->functions);
+        return $analyzer->analyze();
+    }
+
+    public function execute(): int
+    {
+        $phpFiles = $this->pickupPhpFiles($this->paths);
+
         if (empty($phpFiles)) {
             fwrite(STDERR, "No PHP files found in specified paths\n");
             return 1;
@@ -51,17 +77,7 @@ public function execute(): int
 
         foreach ($phpFiles as $file) {
             try {
-                $content = file_get_contents($file);
-                if ($content === false) {
-                    fwrite(STDERR, "Failed to read file: {$file}\n");
-                    $hasErrors = true;
-                    continue;
-                }
-
-                $parser = new VariableParser();
-                $parseResult = $parser->parse($content);
-                $analyzer = new VariableAnalyzer($file, $parseResult->functions);
-                $results[] = $analyzer->analyze();
+                $results[] = $this->analyzeFile($file);
             } catch (\Exception $e) {
                 fwrite(STDERR, "Error analyzing {$file}: {$e->getMessage()}\n");
                 $hasErrors = true;

src/Parse/VariableParser.php

@@ -6,6 +6,7 @@
 
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\FunctionLike;
+use PhpParser\Node\InterpolatedStringPart;
 use PhpParser\Node\Scalar\InterpolatedString;
 use PhpParser\NodeFinder;
 use PhpParser\NodeTraverser;
@@ -66,7 +67,7 @@ private function collectParseResultPerFunctionLike(array $functionLikes): array
             $variables = $this->nodeFinder->findInstanceOf($function, Variable::class);
             foreach ($variables as $variable) {
                 $assigned = $variable->getAttribute('assigned');
-                $func->addVariable(new VarReference($this->getVariableName($variable), $variable->getLine(), $assigned === true)); // @phpstan-ignore-line
+                $func->addVariable(new VarReference($this->getVariableName($variable), $variable->getLine(), $assigned === true));
             }
             return $func;
         }, $functionLikes);
@@ -78,11 +79,14 @@ private function getVariableName(Variable $variable): string
             $parts = $variable->name->parts;
             return sprintf('${"%s"}', implode('', array_map(function($part){
                 if ($part instanceof Variable) {
-                    return sprintf('{$%s}', $part->name);
+                    return sprintf('{$%s}', $part->name->name ?? $part->name);
+                } else if ($part instanceof InterpolatedStringPart) {
+                    return $part->value;
+                } else {
+                    return '';
                 }
-                return $part->value;
             }, $parts)));
         }
-        return $variable->name;
+        return $variable->name->name ?? $variable->name;
     }
 }