refactor(commands): update soar option handling and improve user prompts

- Simplify and streamline the `WithSoarOptions` trait by removing unnecessary method definitions.
- Use `resolve` instead of `app` for dependency resolution in `soar()`.
- Rename `normalizedSoarOptions` to `normalizedOptions` for consistency.
- Improve handling of `verbose` mode with `isDebug()` in `debugSoar()`.
- Adjust `ScoreCommand` to handle empty query input with more efficient and streamlined logic.
- Remove redundant comments and clarify inline explanations for reading queries from STDIN.

Author: guanguans

phpstan.neon

@@ -80,24 +80,24 @@ parameters:
             function: 'env_explode()'
             message: 'use config() instead'
     ignoreErrors:
-        - '#^Call to method label\(\) on an unknown class Spatie\\.*\\Ray\.$#'
-        - '#^Function clock not found\.$#'
 #        - identifier: cast.string
+#        - identifier: encapsedStringPart.nonString
 #        - identifier: logicalAnd.resultUnused
 #        - identifier: return.void
 #        - identifier: symplify.noDynamicName
 #        - identifier: typePerfect.noMixedMethodCaller
         - identifier: argument.templateType
         - identifier: argument.type
         - identifier: binaryOp.invalid
-        - identifier: encapsedStringPart.nonString
         - identifier: method.nonObject
         - identifier: missingType.generics
         - identifier: missingType.iterableValue
         - identifier: return.type
         - identifier: shipmonk.deadMethod
         - identifier: symplify.explicitTraitSuffixName
         - identifier: symplify.requireExceptionNamespace
+        - '#^Call to method label\(\) on an unknown class Spatie\\.*\\Ray\.$#'
+        - '#^Function clock not found\.$#'
         -
             identifier: symplify.explicitInterfaceSuffixName
             path: src/Contracts/

src/Commands/Concerns/WithSoarOptions.php

@@ -26,30 +26,23 @@ trait WithSoarOptions
 {
     protected function configure(): void
     {
-        $this->setDefinition($this->definition());
-    }
-
-    /**
-     * @return list<\Symfony\Component\Console\Input\InputArgument|\Symfony\Component\Console\Input\InputOption>
-     */
-    protected function definition(): array
-    {
-        return [
+        $this->setDefinition([
             new InputOption(
                 'option',
-                'o',
+                null,
                 InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
-                'The option to be passed to Soar(e.g. `--option=-report-type=markdown` or `--option report-type=markdown` or `-o report-type=markdown`)',
+                'The option to be passed to Soar(e.g. `--option=-report-type=markdown` or `--option report-type=markdown`)',
             ),
-        ];
+        ]);
     }
 
     protected function debugSoar(): Soar
     {
         $soar = $this->soar();
 
-        if ($this->option('verbose')) {
+        if ($this->output->isVerbose()) {
             $soar->dump();
+
             $this->output->newLine();
         }
 
@@ -58,10 +51,10 @@ protected function debugSoar(): Soar
 
     protected function soar(): Soar
     {
-        return app(Soar::class)->withOptions($this->normalizedSoarOptions());
+        return resolve(Soar::class)->withOptions($this->normalizedOptions());
     }
 
-    protected function normalizedSoarOptions(): array
+    protected function normalizedOptions(): array
     {
         return collect($this->option('option'))
             ->mapWithKeys(static function (string $option): array {

src/Commands/ScoreCommand.php

@@ -33,19 +33,16 @@ class ScoreCommand extends Command
      */
     public function handle(): void
     {
-        $soar = $this->soar();
-
-        $query = $soar->getOption('-query');
+        $query = $this->soar()->getOption('-query');
 
+        // If the query is not passed in, read from STDIN
         if (($fstat = fstat(\STDIN)) && 0 < $fstat['size']) {
             $query = trim(stream_get_contents(\STDIN));
             fclose(\STDIN);
         }
 
-        while (true) {
-            $query = $query ?: $this->ask('Please input the SQL statements');
-
-            if ($query) {
+        while (blank($query)) {
+            if (filled($query = $this->ask('Please input the SQL statements'))) {
                 break;
             }
         }

tests/Commands/ClearCommandTest.php

@@ -22,7 +22,7 @@
 use Guanguans\LaravelSoar\Facades\Soar;
 use function Pest\Laravel\artisan;
 
-it('can clear the soar log file', function (): void {
+it('can clear the Soar log file', function (): void {
     Soar::onlyVerbose()->scores('select * from foo;');
 
     expect($logFile = ClearCommand::soarLogFile())->toBeFile();

tests/Commands/RunCommandTest.php

@@ -19,7 +19,6 @@
  */
 
 use Guanguans\LaravelSoar\Commands\RunCommand;
-use Symfony\Component\Console\Command\Command;
 use function Pest\Laravel\artisan;
 
 it('can run Soar with the given options', function (): void {
@@ -32,5 +31,5 @@
             ],
             '--verbose' => true,
         ]
-    )->assertExitCode(Command::SUCCESS);
+    )->assertOk();
 })->group(__DIR__, __FILE__);

tests/Commands/ScoreCommandTest.php

@@ -19,11 +19,10 @@
  */
 
 use Guanguans\LaravelSoar\Commands\ScoreCommand;
-use Symfony\Component\Console\Command\Command;
 use function Pest\Laravel\artisan;
 
 it('can get the Soar scores of the given SQL statements', function (): void {
     artisan(ScoreCommand::class)
         ->expectsQuestion('Please input the SQL statements', 'select * from foo; select * from bar;')
-        ->assertExitCode(Command::SUCCESS);
+        ->assertOk();
 })->group(__DIR__, __FILE__);