feat: Added subcommand support with single and scopes modes

Author: smeghead

CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG
 
+### Features
+
+ * Added subcommand support with `single` and `scopes` modes
+ * The `single` mode analyzes a single PHP file
+ * The `scopes` mode supports analyzing multiple files and directories
+ * Enhanced command line interface with help and version options
+
 ## v0.0.3 (2025-03-20)
 
 ### Features

src/Analyze/VariableAnalyzer.php

@@ -34,7 +34,8 @@ private function analyzeFunction(Func $function): Scope
         $analyzedVars = [];
 
         foreach ($variableNames as $variableName) {
-            $vars = array_filter($variables, fn($variable) => $variable->name === $variableName);
+            // array_values でインデックスを振り直す
+            $vars = array_values(array_filter($variables, fn($variable) => $variable->name === $variableName));
             $variableHardUsage = $this->calcVariableHardUsage($vars);
             $analyzedVars[] = new AnalyzedVariable($variableName, $variableHardUsage);
         }

src/Command/AbstractCommand.php

@@ -17,10 +17,10 @@ protected function printHelp(): void
     {
         echo "Usage: php bin/php-variable-hard-usage [command] [options]\n";
         echo "Commands:\n";
-        echo "  single <file>           Analyze a single file\n";
-        echo "  scopes <directory>      Analyze PHP files in a directory\n";
+        echo "  single <file>                  Analyze a single file\n";
+        echo "  scopes <path1> [<path2> ...]  Analyze PHP files in directories or specific files\n";
         echo "Options:\n";
-        echo "  --help                  Display help information\n";
-        echo "  --version               Show the version of the tool\n";
+        echo "  --help                         Display help information\n";
+        echo "  --version                      Show the version of the tool\n";
     }
 }

src/Command/ScopesCommand.php

@@ -9,26 +9,43 @@
 
 final class ScopesCommand extends AbstractCommand
 {
-    private string $directory;
+    /** @var list<string> */
+    private array $paths;
 
-    public function __construct(string $directory)
+    /**
+     * @param list<string> $paths ディレクトリまたはファイルのパスリスト
+     */
+    public function __construct(array $paths)
     {
-        $this->directory = $directory;
+        $this->paths = $paths;
     }
 
     public function execute(): void
     {
-        if (!is_dir($this->directory)) {
-            fwrite(STDERR, "Directory not found: {$this->directory}\n");
-            return;
+        $phpFiles = [];
+
+        // 各パスを処理
+        foreach ($this->paths as $path) {
+            if (is_dir($path)) {
+                // ディレクトリの場合は再帰的にPHPファイルを収集
+                $dirFiles = $this->findPhpFiles($path);
+                $phpFiles = array_merge($phpFiles, $dirFiles);
+            } elseif (is_file($path) && pathinfo($path, PATHINFO_EXTENSION) === 'php') {
+                // 単一のPHPファイルの場合
+                $phpFiles[] = $path;
+            } else {
+                fwrite(STDERR, "Invalid path: {$path}\n");
+            }
         }
 
-        $phpFiles = $this->findPhpFiles($this->directory);
         if (empty($phpFiles)) {
-            fwrite(STDERR, "No PHP files found in: {$this->directory}\n");
+            fwrite(STDERR, "No PHP files found in specified paths\n");
             return;
         }
 
+        // 重複を削除
+        $phpFiles = array_unique($phpFiles);
+        
         $results = [];
         foreach ($phpFiles as $file) {
             try {

src/CommandFactory.php

@@ -41,10 +41,11 @@ public function createCommand(array $argv): CommandInterface
 
         if ($arg === 'scopes') {
             if (count($argv) < 3) {
-                fwrite(STDERR, "Usage: php bin/php-variable-hard-usage scopes <directory>\n");
+                fwrite(STDERR, "Usage: php bin/php-variable-hard-usage scopes <path1> [<path2> ...]\n");
                 return new HelpCommand();
             }
-            return new ScopesCommand($argv[2]);
+            // 複数のパスを渡す
+            return new ScopesCommand(array_slice($argv, 2));
         }
 
         // 後方互換性のため、コマンドが指定されていない場合は単一ファイルモードとして扱う