Merge branch 'cli-check-option-values'

Author: lkrms

src/Toolkit/Cli/CliCommand.php

@@ -866,6 +866,35 @@ final protected function normaliseOptionValues(
         return $_values ?? [];
     }
 
+    /**
+     * Check that an array of option values is valid
+     *
+     * @param mixed[] $values
+     * @phpstan-assert-if-true array<string,array<string|int|bool>|string|int|bool|null> $values
+     */
+    final protected function checkOptionValues(array $values): bool
+    {
+        foreach ($values as $value) {
+            if (
+                $value === null
+                || is_string($value)
+                || is_int($value)
+                || is_bool($value)
+            ) {
+                continue;
+            }
+            if (!is_array($value)) {
+                return false;
+            }
+            foreach ($value as $v) {
+                if (!(is_string($v) || is_int($v) || is_bool($v))) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
     /**
      * Get an array that maps option names to values
      *

tests/fixtures/Toolkit/Cli/Command/TestOptions.php

@@ -2,6 +2,7 @@
 
 namespace Salient\Tests\Cli\Command;
 
+use Salient\Cli\Exception\CliInvalidArgumentsException;
 use Salient\Cli\CliCommand;
 use Salient\Cli\CliOption;
 use Salient\Contract\Cli\CliOptionType;
@@ -183,16 +184,20 @@ protected function run(string ...$args)
             case self::ACTION_APPLY_VALUES:
                 /** @var string */
                 $data = $this->Data;
-                /** @var array<string,array<string|int|bool>|string|int|bool|null> */
                 $data = Json::parseObjectAsArray($data);
+                if (!is_array($data) || !$this->checkOptionValues($data)) {
+                    throw new CliInvalidArgumentsException('Invalid option values');
+                }
                 $this->applyOptionValues($data, true, true, false, true, true);
                 break;
 
             case self::ACTION_APPLY_SCHEMA_VALUES:
                 /** @var string */
                 $data = $this->Data;
-                /** @var array<string,array<string|int|bool>|string|int|bool|null> */
                 $data = Json::parseObjectAsArray($data);
+                if (!is_array($data) || !$this->checkOptionValues($data)) {
+                    throw new CliInvalidArgumentsException('Invalid option values');
+                }
                 $this->applyOptionValues($data, true, true, true, true, true);
                 break;
 

tests/unit/Toolkit/Cli/CliApplicationTest.php

@@ -372,6 +372,24 @@ public static function commandProvider(): array
                 fn(TestOptions $command) =>
                     static::assertSame($command, $command->Result),
             ],
+            'apply option values (invalid values)' => [
+                null,
+                1,
+                [
+                    '--action=apply-values',
+                    '--data=' . Json::stringify(['value' => 3.14]),
+                ],
+                [
+                    [Level::ERROR, 'Error: Invalid option values'],
+                    [Level::INFO, <<<'EOF'
+
+app [-fF] [--nullable] [-v <entity>] [-V <value>,...] [-s <date>]
+    [-r[<pattern>]]
+
+See 'app --help' for more information.
+EOF],
+                ],
+            ],
         ];
     }