Merge branch 'patch-2' of https://github.com/radioheaded/PHP_CodeSniffer

gsherwood · gsherwood · commit e81e99e885e5 · 2013-11-19T08:02:36.000+11:00
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'] !== '') {`