added error type property and indentation property

sjlangley · Sep 13, 2013 · 165ec84 · 165ec84
1 parent 06f8dd9
commit 165ec84
Showing 1 changed file with 19 additions and 2 deletions.
diff --git a/CodeSniffer/Standards/Squiz/Sniffs/CSS/IndentationSniff.php b/CodeSniffer/Standards/Squiz/Sniffs/CSS/IndentationSniff.php
@@ -47,6 +47,19 @@ public function register()
 
     }//end register()
 
+    /**
+     * If true, an error will be thrown; otherwise a warning.
+     *
+     * @var bool
+     */
+    public $error = true;
+
+    /**
+    * The number of spaces code should be indented.
+    *
+    * @var int
+    */
+    public $indent = 4;
 
     /**
      * Processes the tokens that this sniff is interested in.
@@ -99,7 +112,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
                 $foundIndent = 0;
             }
 
-            $expectedIndent = ($indentLevel * 4);
+            $expectedIndent = ($indentLevel * $this->indent);
             if ($expectedIndent > 0 && strpos($tokens[$i]['content'], $phpcsFile->eolChar) !== false
             ) {
                 if ($nestingLevel !== $indentLevel) {
@@ -112,7 +125,11 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
                           $expectedIndent,
                           $foundIndent,
                          );
-                $phpcsFile->addError($error, $i, 'Incorrect', $data);
+                if ($this->error === true) {
+                    $phpcsFile->addError($error, $i, 'Incorrect', $data);
+                } else {
+                    $phpcsFile->addWarning($error, $i, 'Incorrect', $data);
+                }
             }
 
             $currentLine = $tokens[$i]['line'];