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

AoJ · Nov 18, 2013 · e81e99e · e81e99e
2 parents a35b06e + 3442e76
commit e81e99e
Showing 1 changed file with 2 additions and 0 deletions.
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'] !== '') {