refactor(ConfigCommand): Simplify handle method and extract editor logic

- Remove the ExecutableFinder dependency from the handle method signature.
- Update config file output message format for clarity.
- Inline editor determination logic into a private method to enhance readability.
- Use a closure for setting TTY support in the Process instance to streamline the code.

Author: ityaozm@gmail.com

app/Commands/CommitCommand.php

@@ -18,7 +18,6 @@
 use App\ConfigManager;
 use App\Exceptions\RuntimeException;
 use App\GeneratorManager;
-use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Stringable;
 use LaravelZero\Framework\Commands\Command;
@@ -115,14 +114,6 @@ function (int $attempts) use ($cachedDiff, $type): string {
             });
     }
 
-    /**
-     * @noinspection PhpMissingParentCallCommonInspection
-     */
-    public function schedule(Schedule $schedule): void
-    {
-        // $schedule->command(static::class)->everyMinute();
-    }
-
     /**
      * @codeCoverageIgnore
      *

app/Commands/ConfigCommand.php

@@ -16,7 +16,6 @@
 use App\ConfigManager;
 use App\Exceptions\RuntimeException;
 use App\Exceptions\UnsupportedConfigActionException;
-use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Support\Arr;
 use LaravelZero\Framework\Commands\Command;
 use Symfony\Component\Console\Completion\CompletionInput;
@@ -53,12 +52,14 @@ public function __construct()
      * @throws \Psr\Container\ContainerExceptionInterface
      * @throws \Psr\Container\NotFoundExceptionInterface
      */
-    public function handle(ExecutableFinder $executableFinder): int
+    public function handle(): int
     {
         $file = $this->configFile();
-        $this->output->note("The config file($file) is being operated.");
+
+        $this->output->note("The config file [$file] is being operated.");
         file_exists($file) or $this->configManager->putFile($file);
         $this->configManager->replaceFrom($file);
+
         $action = $this->argument('action');
         $key = $this->argument('key');
 
@@ -97,25 +98,10 @@ public function handle(ExecutableFinder $executableFinder): int
 
                 break;
             case 'edit':
-                $editor = value(function () use ($executableFinder) {
-                    if ($editor = $this->option('editor')) {
-                        return $editor;
-                    }
-
-                    $editors = windows_os() ? self::WINDOWS_EDITORS : self::UNIX_EDITORS;
-
-                    foreach ($editors as $editor) {
-                        if ($executableFinder->find($editor)) {
-                            return $editor;
-                        }
-                    }
-
-                    throw new RuntimeException('Unable to find a default editor or specify the editor.');
-                });
-
-                tap(new Process([$editor, $file]), static function (Process $process): void {
-                    Process::isTtySupported() and $process->setTty(true);
-                })->setTimeout(null)->mustRun();
+                tap(
+                    new Process([$this->editor(), $file]),
+                    static fn (Process $process): bool => Process::isTtySupported() and $process->setTty(true)
+                )->setTimeout(null)->mustRun();
 
                 break;
             default:
@@ -152,14 +138,6 @@ public function complete(CompletionInput $input, CompletionSuggestions $suggesti
         }
     }
 
-    /**
-     * @noinspection PhpMissingParentCallCommonInspection
-     */
-    public function schedule(Schedule $schedule): void
-    {
-        // $schedule->command(static::class)->everyMinute();
-    }
-
     public static function hydratedActions(): string
     {
         return implode(', ', self::ACTIONS);
@@ -196,50 +174,6 @@ protected function initialize(InputInterface $input, OutputInterface $output): v
         }
     }
 
-    /**
-     * @throws \JsonException
-     */
-    private function argToValue(string $arg): mixed
-    {
-        // if (0 === strncasecmp($arg, 'null', 4)) {
-        //     return;
-        // }
-        //
-        // if (0 === strncasecmp($arg, 'true', 4)) {
-        //     return true;
-        // }
-        //
-        // if (0 === strncasecmp($arg, 'false', 5)) {
-        //     return false;
-        // }
-        //
-        // if (is_numeric($arg)) {
-        //     return str_contains($arg, '.') ? (float) $arg : (int) $arg;
-        // }
-
-        if (str($arg)->isJson()) {
-            return json_decode($arg, true, 512, \JSON_THROW_ON_ERROR);
-        }
-
-        return $arg;
-    }
-
-    /**
-     * @noinspection JsonEncodingApiUsageInspection
-     */
-    private function valueToArg(mixed $value): string
-    {
-        // if (null === $value) {
-        //     return 'null';
-        // }
-        //
-        // if (\is_scalar($value)) {
-        //     return var_export($value, true);
-        // }
-
-        return (string) json_encode($value, \JSON_PRETTY_PRINT | \JSON_UNESCAPED_UNICODE);
-    }
-
     private function configFile(): string
     {
         if ($file = $this->option('file')) {
@@ -252,4 +186,36 @@ private function configFile(): string
 
         return ConfigManager::localPath();
     }
+
+    private function editor(): string
+    {
+        if ($editor = $this->option('editor')) {
+            return $editor;
+        }
+
+        $editors = windows_os() ? self::WINDOWS_EDITORS : self::UNIX_EDITORS;
+
+        foreach ($editors as $editor) {
+            if (resolve(ExecutableFinder::class)->find($editor)) {
+                return $editor;
+            }
+        }
+
+        throw new RuntimeException('Unable to find a default editor or specify the editor.');
+    }
+
+    /**
+     * @throws \JsonException
+     */
+    private function argToValue(string $arg): mixed
+    {
+        return str($arg)->isJson() ? json_decode($arg, true, 512, \JSON_THROW_ON_ERROR) : $arg;
+    }
+
+    private function valueToArg(mixed $value): string
+    {
+        return \is_string($value)
+            ? $value
+            : json_encode($value, ConfigManager::JSON_OPTIONS);
+    }
 }

app/Commands/ThanksCommand.php

@@ -13,7 +13,6 @@
 
 namespace App\Commands;
 
-use Illuminate\Console\Scheduling\Schedule;
 use LaravelZero\Framework\Commands\Command;
 
 final class ThanksCommand extends Command
@@ -42,12 +41,4 @@ public function handle(): void
             '    <options=bold>https://github.com/guanguans/ai-commit</>',
         ]);
     }
-
-    /**
-     * @noinspection PhpMissingParentCallCommonInspection
-     */
-    public function schedule(Schedule $schedule): void
-    {
-        // $schedule->command(static::class)->everyMinute();
-    }
 }

baselines/complexity.functionLike.neon

@@ -1,5 +1,3 @@
-# total 4 errors
+# total 1 error
 includes:
-    - complexity.functionLike.neon
     - method.notFound.neon
-    - missing-identifier.neon

baselines/loader.neon

@@ -30,7 +30,6 @@
         // __DIR__.'/src/Support/Rectors',
     ])
     ->ignoreUnknownClasses([
-        'LaravelZero\Framework\Components\Logo\FigletString',
     ])
     /** @see \ShipMonk\ComposerDependencyAnalyser\Analyser::CORE_EXTENSIONS */
     ->ignoreErrorsOnExtensions(

baselines/missing-identifier.neon

@@ -348,7 +348,7 @@
         "roave-no-leaks": "@php vendor/bin/roave-no-leaks",
         "sk": "@php vendor/bin/swiss-knife --ansi -v",
         "sk-alice-yaml-fixtures-to-php": "@sk alice-yaml-fixtures-to-php --help",
-        "sk-check-commented-code": "@sk check-commented-code app/ bootstrap/ config/ resources/ tests/ --line-limit=20",
+        "sk-check-commented-code": "@sk check-commented-code app/ bootstrap/ config/ resources/ tests/ --line-limit=6 --skip-file=bootstrap/providers.php",
         "sk-check-conflicts": "@sk check-conflicts app/ bootstrap/ config/ resources/ tests/",
         "sk-dump-editorconfig": "@sk dump-editorconfig",
         "sk-finalize-classes": "@sk finalize-classes app/",

composer-dependency-analyser.php

@@ -104,16 +104,6 @@
     */
 
     'providers' => [
-        // Laravel Framework Service Providers...
-        // Illuminate\Cache\CacheServiceProvider::class,
-        // Illuminate\Filesystem\FilesystemServiceProvider::class,
-        // Illuminate\Hashing\HashServiceProvider::class,
-        // Illuminate\Pipeline\PipelineServiceProvider::class,
-        // Illuminate\Translation\TranslationServiceProvider::class,
-        // Illuminate\Validation\ValidationServiceProvider::class,
-        // Illuminate\View\ViewServiceProvider::class,
-
-        // Application Service Providers...
         // App\Providers\AppServiceProvider::class,
     ],
 ];

composer.json

@@ -53,7 +53,6 @@
     */
 
     'add' => [
-        // ..
         Illuminate\Foundation\Console\VendorPublishCommand::class,
     ],
 
@@ -91,6 +90,6 @@
     */
 
     'remove' => [
-        // ..
+        // ...
     ],
 ];