CommandProcessor: throws exception for invalid option values

Author: janpecha

src/CommandProcessor.php

@@ -49,6 +49,20 @@ public function process($app, array $args, array $env = NULL)
 							$_c = "$key ";
 						}
 
+						if (is_bool($value)) {
+							$value = $value ? '1' : '0';
+
+						} elseif ($value instanceof CommitId) {
+							$value = $value->toString();
+
+						} elseif ($value === NULL) {
+							// ignored
+							continue;
+
+						} elseif (!is_scalar($value)) {
+							throw new InvalidStateException('Unknow option value type ' . (is_object($value) ? get_class($value) : gettype($value)) . '.');
+						}
+
 						$cmd[] = $_c . $this->escapeArgument($value);
 					}
 

tests/GitPhp/CommandProcessor.phpt

@@ -35,14 +35,30 @@ test(function () {
 		'first',
 		[
 			'--second' => new CommitId('734713bc047d87bf7eac9674765ae793478c50d3'),
+			'--one' => TRUE,
+			'--two' => FALSE,
+			'--three' => NULL,
+			TRUE,
+			FALSE,
+			NULL,
 		],
 		NULL,
 		'arg',
 		new CommitId('734713bc047d87bf7eac9674765ae793478c50d3'),
 	];
 
 	$processor = new CommandProcessor(CommandProcessor::MODE_NON_WINDOWS);
-	Assert::same('git first --second 734713bc047d87bf7eac9674765ae793478c50d3 arg 734713bc047d87bf7eac9674765ae793478c50d3', $processor->process('git', $options));
+	Assert::same(implode(' ', [
+		'git',
+		'first',
+		'--second 734713bc047d87bf7eac9674765ae793478c50d3',
+		'--one 1',
+		'--two 0',
+		'1',
+		'0',
+		'arg',
+		'734713bc047d87bf7eac9674765ae793478c50d3',
+	]), $processor->process('git', $options));
 });
 
 
@@ -66,4 +82,12 @@ test(function () {
 			FALSE,
 		]);
 	}, InvalidStateException::class, 'Unknow argument type boolean.');
+
+	Assert::exception(function () use ($processor) {
+		$processor->process('git', [
+			[
+				(object) [],
+			],
+		]);
+	}, InvalidStateException::class, 'Unknow option value type stdClass.');
 });