Save values (cli options) passed manually and merge with defaults

ksimka · ksimka · commit 3442e7682cc0 · 2013-11-18T19:38:03.000+03:00
We need to save manually passed values in order to prevent using default values in `PHP_CodeSniffer::process` (`$cliValues = $this->cli->getCommandLineValues()`) I'm not sure if this is acceptable, so I made simple changes in previous PR (squizlabs/PHP_CodeSniffer#172). Choose which one better reflects your vision of doing this.
diff --git a/CodeSniffer/CLI.php b/CodeSniffer/CLI.php
@@ -499,6 +499,8 @@ public function process($values=array())
     {
         if (empty($values) === true) {
             $values = $this->getCommandLineValues();
+        } else {
+            $this->values = $values = array_merge($this->getDefaults(), $values);
         }
 
         if ($values['generator'] !== '') {

Original file line number	Diff line number	Diff line change
`@@ -499,6 +499,8 @@ public function process($values=array())`
`499`	`499`	`{`
`500`	`500`	`if (empty($values) === true) {`
`501`	`501`	`$values = $this->getCommandLineValues();`
	`502`	`+ } else {`
	`503`	`+ $this->values = $values = array_merge($this->getDefaults(), $values);`
`502`	`504`	`}`
`503`	`505`
`504`	`506`	`if ($values['generator'] !== '') {`