Disable caching during test runs + allow -w to override -n from a rul…

…eset
squizlabs · May 18, 2015 · 24c7a7f · 24c7a7f
1 parent b469e78
commit 24c7a7f
Showing 1 changed file with 17 additions and 9 deletions.
diff --git a/src/Config.php b/src/Config.php
@@ -472,9 +472,11 @@ public function restoreDefaults()
             $this->colors = (bool) $colors;
         }
 
-        $cache = self::getConfigData('cache');
-        if ($cache !== null) {
-            $this->cache = (bool) $cache;
+        if (defined('PHP_CODESNIFFER_IN_TESTS') === false) {
+            $cache = self::getConfigData('cache');
+            if ($cache !== null) {
+                $this->cache = (bool) $cache;
+            }
         }
 
     }//end restoreDefaults()
@@ -534,12 +536,16 @@ public function processShortArgument($arg, $pos)
             }
             break;
         case 'n' :
-            $this->warningSeverity = 0;
-            $this->overriddenDefaults['warningSeverity'] = true;
+            if (isset($this->overriddenDefaults['warningSeverity']) === false) {
+                $this->warningSeverity = 0;
+                $this->overriddenDefaults['warningSeverity'] = true;
+            }
             break;
         case 'w' :
-            $this->warningSeverity = $this->errorSeverity;
-            $this->overriddenDefaults['warningSeverity'] = true;
+            if (isset($this->overriddenDefaults['warningSeverity']) === false) {
+                $this->warningSeverity = $this->errorSeverity;
+                $this->overriddenDefaults['warningSeverity'] = true;
+            }
             break;
         default:
             if ($this->dieOnUnknownArg === false) {
@@ -579,8 +585,10 @@ public function processLongArgument($arg, $pos)
             $this->overriddenDefaults['colors'] = true;
             break;
         case 'cache':
-            $this->cache = true;
-            $this->overriddenDefaults['cache'] = true;
+            if (defined('PHP_CODESNIFFER_IN_TESTS') === false) {
+                $this->cache = true;
+                $this->overriddenDefaults['cache'] = true;
+            }
             break;
         case 'no-cache':
             $this->cache = false;