TASK: Refactor eel command input validation

Sebobo · Sep 24, 2021 · f73a147 · f73a147
1 parent 26a1d9c
commit f73a147
Showing 1 changed file with 24 additions and 3 deletions.
diff --git a/Classes/Command/EvaluateEelExpressionCommand.php b/Classes/Command/EvaluateEelExpressionCommand.php
@@ -13,12 +13,16 @@
  * source code.
  */
 
+use Neos\Eel\Exception as EelException;
 use Neos\Eel\ParserException;
 use Neos\Flow\Annotations as Flow;
-use Neos\Eel\Exception as EelException;
 use Shel\Neos\Terminal\Domain\CommandContext;
 use Shel\Neos\Terminal\Domain\CommandInvocationResult;
 use Shel\Neos\Terminal\Service\EelEvaluationService;
+use Symfony\Component\Console\Exception\RuntimeException;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\StringInput;
 
 class EvaluateEelExpressionCommand implements TerminalCommandInterface
 {
@@ -40,11 +44,28 @@ public static function getCommandDescription(): string
 
     public static function getCommandUsage(): string
     {
-        return 'eel <string>';
+        return 'eel ' . self::getInputDefinition()->getSynopsis();
+    }
+
+    public static function getInputDefinition(): InputDefinition
+    {
+        return new InputDefinition([
+            new InputArgument('expression', InputArgument::REQUIRED),
+        ]);
     }
 
     public function invokeCommand(string $argument, CommandContext $commandContext): CommandInvocationResult
     {
+        $input = new StringInput($argument);
+        $input->bind(self::getInputDefinition());
+
+        try {
+            $input->validate();
+        } catch (RuntimeException $e) {
+            return new CommandInvocationResult(false, $e->getMessage());
+        }
+
+        $expression = $input->getArgument('expression');
         $success = true;
 
         $evaluationContext = [
@@ -54,7 +75,7 @@ public function invokeCommand(string $argument, CommandContext $commandContext):
         ];
 
         try {
-            $result = $this->eelEvaluationService->evaluateEelExpression('${' . $argument . '}', $evaluationContext);
+            $result = $this->eelEvaluationService->evaluateEelExpression('${' . $expression . '}', $evaluationContext);
         } catch (EelException | ParserException | \Exception $e) {
             $success = false;
             $result = $e->getMessage();