Artisan, Time, Helpers Upgrade

Author: tamedevelopers

src/Capsule/Artisan.php

@@ -58,7 +58,7 @@ public function __construct()
      * - Quoted args are respected: "--path=\"my path\""
      * - Placeholder tokens like [name] are ignored if passed literally.
      */
-    public static function call(string $input): int
+    public static function call(string $input)
     {
         // Tokenize input and drop placeholder tokens like [name]
         $tokens = self::tokenizeCommand($input);
@@ -164,8 +164,11 @@ public function registerAll(array $commands): void
 
     /**
      * Handle argv input and dispatch
+     *
+     * When running in console, returns an int exit code.
+     * When running from web (non-console), returns the command's result if available; otherwise, the exit code.
      */
-    public function run(array $argv): int
+    public function run(array $argv)
     {
         // In PHP CLI, $argv[0] is the script name (tame), so command starts at index 1
         $commandInput = $argv[1] ?? 'list';
@@ -176,6 +179,7 @@ public function run(array $argv): int
 
         if ($commandInput === 'list') {
             $this->renderList();
+            // For web context, nothing to return; keep consistent exit code 0
             return 0;
         }
 
@@ -199,6 +203,7 @@ public function run(array $argv): int
 
         $exitCode = 0;
         $handled = false;
+        $firstResult = null; // capture first non-null non-int result
 
         // Resolve primary once and track unresolved flags across providers
         $primaryMethod = $sub ?: 'handle';
@@ -214,8 +219,11 @@ public function run(array $argv): int
                     continue;
                 }
 
-                $result = (int) ($this->invokeCommandMethod($instance, $primaryMethod, $positionals, $options) ?? 0);
-                $exitCode = max($exitCode, $result);
+                $raw = $this->invokeCommandMethod($instance, $primaryMethod, $positionals, $options);
+                $exitCode = max($exitCode, is_numeric($raw) ? (int)$raw : 0);
+                if ($firstResult === null && $raw !== null && !is_int($raw)) {
+                    $firstResult = $raw;
+                }
                 $handled = true;
 
                 // Route flags as methods on the same instance and mark them as resolved
@@ -237,8 +245,11 @@ public function run(array $argv): int
             // Fallback: callable handler (no subcommands/flags routing)
             if (isset($entry['handler']) && \is_callable($entry['handler'])) {
                 $handler = $entry['handler'];
-                $result = (int) ($handler($rawArgs) ?? 0);
-                $exitCode = max($exitCode, $result);
+                $raw = $handler($rawArgs);
+                $exitCode = max($exitCode, is_numeric($raw) ? (int)$raw : 0);
+                if ($firstResult === null && $raw !== null && !is_int($raw)) {
+                    $firstResult = $raw;
+                }
                 $handled = true;
                 continue;
             }
@@ -254,8 +265,9 @@ public function run(array $argv): int
             }
             return max($exitCode, 1);
         }
-
-        return $exitCode;
+        
+        // prefer returning the first meaningful result or exit code
+        return $firstResult !== null ? $firstResult : $exitCode;
     }
 
     /**

src/Commands/ProcessorCommand.php

@@ -46,7 +46,7 @@ public function handle()
     /**
      * Convert Name-String to Image File.
      */
-    public function toImage(): string
+    public function toImage(): string|int
     {
         [$name, $bgColor, $textColor, $path, $generate, $output, $fontWeight, $type] = [
             $this->flag('name'), 
@@ -76,15 +76,18 @@ public function toImage(): string
 
         $path = Tame::getBasePath($path);
 
-        Logger::info("$path\n");
+        if ($this->isConsole()) {
+            Logger::info("$path\n");
+            return 1;
+        }
 
         return $path;
     }
 
     /**
      * Extract an Image to Text
      */
-    public function toText(): string
+    public function toText(): string|int
     {
         [$path, $grayscale, $contrast] = [
             $this->flag('path'), 
@@ -100,7 +103,10 @@ public function toText(): string
             ],
         ]);
 
-        // Logger::info("$text\n");
+        if ($this->isConsole()) {
+            Logger::info("$text\n");
+            return 1;
+        }
 
         return $text;
     }

tests/imageToText.php

@@ -15,17 +15,11 @@
 
 $isCli = (php_sapi_name() === 'cli');
 
-dd(
-  Artisan::call('processor:toText --path=thousand_units.png'),
-);
-
 // :toText --path=thousand_units.png
 if ($isCli) {
-  $text = Artisan::call('processor');
+  $text = Artisan::call('processor:toText --path=thousand_units.png');
 
   dd(
-    // $args,
-    Artisan::call("list"),
     $text
   );
 }