[#75] InputMerger not merging options with defaults properly

Add an InspectableArgvInput input class so that we may check if arguments/options are set.

Author: tomzx

bin/php-semver-checker

@@ -25,4 +25,4 @@ if (!$found) {
 ini_set('xdebug.max_nesting_level', 5000);
 
 $app = new PHPSemVerChecker\Console\Application();
-$app->run();
+$app->run(new PHPSemVerChecker\Console\InspectableArgvInput());

src/PHPSemVerChecker/Console/InputMerger.php

@@ -19,23 +19,20 @@ class InputMerger
 	 */
 	public function merge(InputInterface $input, Configuration $config)
 	{
-		$missingArguments = $this->getKeysOfNullValues($input->getArguments());
-		foreach ($missingArguments as $key) {
-			$input->setArgument($key, $config->get($key));
+		foreach ($input->getArguments() as $argument => $value) {
+			if ($input->hasArgumentSet($argument)) {
+				$config->set($argument, $value);
+			} else {
+				$input->setArgument($argument, $config->get($argument));
+			}
 		}
-		$missingOptions = $this->getKeysOfNullValues($input->getOptions());
-		foreach ($missingOptions as $key) {
-			$input->setOption($key, $config->get($key));
-		}
-		$config->merge(array_merge($input->getArguments(), $input->getOptions()));
-	}
 
-	/**
-	 * @param array $array
-	 * @return array
-	 */
-	private function getKeysOfNullValues(array $array)
-	{
-		return array_keys(array_filter($array, 'is_null'));
+		foreach ($input->getOptions() as $option => $value) {
+			if ($input->hasOptionSet($option)) {
+				$config->set($option, $value);
+			} else {
+				$input->setOption($option, $config->get($option));
+			}
+		}
 	}
-}
+}

src/PHPSemVerChecker/Console/InspectableArgvInput.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace PHPSemVerChecker\Console;
+
+use Symfony\Component\Console\Input\ArgvInput;
+
+class InspectableArgvInput extends ArgvInput
+{
+	/**
+	 * Returns true if the argument value is set.
+	 *
+	 * @param string $name The argument name
+	 *
+	 * @return bool true if the argument is set (not a default value)
+	 */
+	public function hasArgumentSet($name)
+	{
+		return isset($this->arguments[$name]);
+	}
+
+	/**
+	 * Returns true if the option value is set.
+	 *
+	 * @param string $name The option name
+	 *
+	 * @return bool true if the option is set (not a default value)
+	 */
+	public function hasOptionSet($name)
+	{
+		return isset($this->options[$name]);
+	}
+}

tests/PHPSemVerChecker/Console/InputMergerTest.php

@@ -5,6 +5,7 @@
 use PHPSemVerChecker\Configuration\Configuration;
 use PHPSemVerChecker\Console\Command\CompareCommand;
 use PHPSemVerChecker\Console\InputMerger;
+use PHPSemVerChecker\Console\InspectableArgvInput;
 use Symfony\Component\Console\Input\StringInput;
 
 class InputMergerTest extends \PHPUnit_Framework_TestCase
@@ -15,9 +16,10 @@ public function testMerge()
 		// Prepare options and arguments
 		$config->set('include-before', 'in-before config');
 		$config->set('source-after', 'src-after config');
+		$config->set('full-path', true);
 
 		// Specify options and arguments for input
-		$input = new StringInput('--include-before "in-before cli" "src-before cli"');
+		$input = new InspectableArgvInput([null, '--include-before', 'in-before cli', 'src-before cli']);
 		$command = new CompareCommand();
 		$input->bind($command->getDefinition());
 		$this->assertEquals('in-before cli', $input->getOption('include-before'), 'Test setup: Could not prepare input arguments');
@@ -29,5 +31,6 @@ public function testMerge()
 		$this->assertEquals('src-before cli', $input->getArgument('source-before'), 'Input arguments must not be overwritten by empty configuration');
 		$this->assertEquals('src-after config', $config->get('source-after'), 'Configuration must not be overwritten by empty CLI argument');
 		$this->assertEquals('src-after config', $input->getArgument('source-after'), 'Missing input arguments must take on existing configuration');
+		$this->assertEquals(true, $config->get('full-path'), 'CLI option should use Configuration value and not CLI default');
 	}
 }