🎨 Improve code style

Author: siguici

autoload.php

@@ -7,7 +7,7 @@
 $loader = null;
 
 foreach (['../..', '.'] as $dir) {
-    if (file_exists($file = __DIR__."/$dir/vendor/autoload.php")) {
+    if (file_exists($file = __DIR__."/{$dir}/vendor/autoload.php")) {
         /** @var ClassLoader $loader */
         $loader = include_once $file;
         break;

src/Program.php

@@ -7,7 +7,7 @@
 use InvalidArgumentException;
 use RuntimeException;
 
-class Program
+final class Program
 {
     protected string $projectRoot;
 
@@ -30,23 +30,6 @@ class Program
         'unlock' => '🔓', 'bell' => '🔔', 'coffee' => '☕',
     ];
 
-    public function __construct(protected string $binFile, protected string $userRoot)
-    {
-        if (! is_file($binFile)) {
-            throw new InvalidArgumentException("$binFile is not a file");
-        }
-
-        if (! is_dir($userRoot)) {
-            throw new InvalidArgumentException("$userRoot is not a directory");
-        }
-
-        $this->binFile = realpath($binFile);
-        $this->userRoot = realpath($userRoot);
-        $this->projectRoot = dirname(__DIR__);
-
-        $this->configure();
-    }
-
     public function configure(): void
     {
         $this->composerJson = $this->loadComposerJson($this->userRoot);
@@ -72,67 +55,16 @@ public function setName(string $name): static
         return $this;
     }
 
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
     public function setDescription(string $description): static
     {
         $this->description = $description;
 
         return $this;
     }
 
-    public function getDescription(): string
-    {
-        return $this->description;
-    }
-
-    protected function loadComposerJson(string $dir): mixed
-    {
-        return $this->loadJson($dir.DIRECTORY_SEPARATOR.'composer.json', true);
-    }
-
-    protected function loadJson(string $file, bool $assoc = false): mixed
-    {
-        if (! is_file($file)) {
-            throw new InvalidArgumentException("$file is not a file");
-        }
-
-        $file = realpath($file);
-        $data = file_get_contents($file);
-
-        if (! json_validate($data)) {
-            throw new RuntimeException("Invalid `composer.json` file ($file)");
-        }
-
-        return json_decode($data, $assoc);
-    }
-
-    /**
-     * @param  null|array<string>  $argv
-     **/
-    public function run(?int $argc = null, ?array $argv = null): never
-    {
-        extract($this->parseArgs($argc, $argv));
-        $binFile = realpath($argv0);
-
-        if ($binFile !== $this->binFile && basename($this->binFile) !== basename($binFile) && dirname($binFile) !== dirname(__DIR__)) {
-            $this->sendError('Cannot run %s from %s', $this->binFile, $argv0);
-        }
-
-        $code = $this->execute($args);
-
-        exit($code);
-    }
-
-    /**
-     * @param  null|array<string>  $args
-     **/
     public function execute(array $args): int
     {
-        $this->output("Project: $this->name\n\t$this->description".PHP_EOL);
+        $this->output("Project: {$this->name}\n\t{$this->description}".PHP_EOL);
         if (! count($args)) {
             $code = $this->scan('❯ ');
             $this->output($code);
@@ -141,6 +73,11 @@ public function execute(array $args): int
         return 0;
     }
 
+    /**
+     * @return (array|mixed|null)[]
+     *
+     * @psalm-return array{argv0: mixed|null, args: array}
+     */
     public function parseArgs(int $argc, array $argv): array
     {
         /** @var array<string> */
@@ -169,23 +106,15 @@ public function command(string $name, ?callable $action = null): ?callable
         $name = trim($name, DIRECTORY_SEPARATOR);
 
         foreach ($this->commands as $pattern => $action) {
-            if (preg_match("/^$pattern$/", $name, $matches)) {
+            if (preg_match("/^{$pattern}$/", $name, $matches)) {
                 return $action;
             }
         }
 
         return null;
     }
 
-    public function executeCommand(string $name, array $args): mixed
-    {
-        if ($process = $this->command($name)) {
-            return $process(...$args);
-        }
-        $this->sendError("Command $name not found");
-    }
-
-    public function sendError(string $message, mixed ...$args): never
+    public function sendError(string $message, string ...$args): never
     {
         $this->output($message, ...$args);
         $this->end(1);
@@ -196,12 +125,10 @@ public function output(string $message, mixed ...$args): void
         $this->print(STDOUT, $message, ...$args);
     }
 
-    public function error(string $message, mixed ...$args): void
-    {
-        $this->print(STDOUT, $this->icon('error')." {$message}", ...$args);
-    }
-
-    public function print($stream, $message, mixed ...$args): void
+    /**
+     * @param  resource  $stream
+     */
+    public function print($stream, string $message, mixed ...$args): void
     {
         $message .= PHP_EOL;
 
@@ -212,52 +139,39 @@ public function print($stream, $message, mixed ...$args): void
         }
     }
 
-    public function scan(?string $prompt = null): string
+    public function scan(?string $prompt = null): string|false
     {
         return isset($prompt) ? readline($prompt) : trim(fgets(STDIN));
     }
 
-    public function scanString(?string $prompt = null): string
+    public function end(int $code = 0): never
     {
-        return $this->scan($prompt);
+        exit($code);
     }
 
-    public function scanInt(?string $prompt = null): int
+    public function icon(string $name): string
     {
-        return (int) $this->scan($prompt);
+        return $this->icons[$name] ?? '';
     }
 
-    public function scanFloat(?string $prompt = null): float
+    protected function loadComposerJson(string $dir): mixed
     {
-        return (float) $this->scan($prompt);
+        return $this->loadJson($dir.DIRECTORY_SEPARATOR.'composer.json', true);
     }
 
-    public function scanBool(?string $prompt = null): bool
+    protected function loadJson(string $file, bool $assoc = false): mixed
     {
-        $input = strtolower($this->scan($prompt.' (yes/no) '));
+        if (! is_file($file)) {
+            throw new InvalidArgumentException("{$file} is not a file");
+        }
 
-        return in_array($input, ['yes', 'y', 'true', '1']);
-    }
+        $file = realpath($file);
+        $data = file_get_contents($file);
 
-    public function scanChoice(string $prompt, array $choices): string
-    {
-        while (true) {
-            echo $prompt.' ['.implode('/', $choices).']: ';
-            $input = strtolower($this->scan());
-            if (in_array($input, $choices)) {
-                return $input;
-            }
-            $this->sendError("Invalid choice. Please try again.\n");
+        if (! json_validate($data)) {
+            throw new RuntimeException("Invalid `composer.json` file ({$file})");
         }
-    }
 
-    public function end(int $code = 0): never
-    {
-        exit($code);
-    }
-
-    public function icon(string $name): string
-    {
-        return $this->icons[$name] ?? '';
+        return json_decode($data, $assoc);
     }
 }

src/Runtime.php

@@ -4,10 +4,4 @@
 
 namespace Sikessem\View;
 
-class Runtime
-{
-    public static function instance(): self
-    {
-        return new self;
-    }
-}
+final class Runtime {}