Merge pull request #21 from bmitch/Issue#13

Fixes #13
bmitch · Dec 4, 2016 · a3d40e0 · a3d40e0
2 parents 4fb7ec5 + 2676f7d
commit a3d40e0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,7 @@ script:
  - vendor/bin/phpcs --standard=psr2 src
  - vendor/bin/phpcs --standard=phpcs.xml src
  - vendor/bin/phpcs --standard=phpcs.xml tests --ignore=tests/Sniffs
+ - vendor/bin/phpcs --standard=src/Codor/ruleset.xml src
  - vendor/bin/phpunit --debug --coverage-clover=coverage.xml
  - vendor/bin/phpmd src text codesize,unusedcode,naming
  - vendor/bin/phploc src --progress

diff --git a/src/Codor/Sniffs/Files/FunctionParameterSniff.php b/src/Codor/Sniffs/Files/FunctionParameterSniff.php
@@ -33,10 +33,9 @@ public function register()
      */
     public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
     {
-        $tokens = $phpcsFile->getTokens();
-        $token = $tokens[$stackPtr];
-
-        $openParenIndex = $token['parenthesis_opener'];
+        $tokens           = $phpcsFile->getTokens();
+        $token            = $tokens[$stackPtr];
+        $openParenIndex   = $token['parenthesis_opener'];
         $closedParenIndex = $token['parenthesis_closer'];
 
         $numberOfParameters = 0;
@@ -47,13 +46,11 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
         }
 
         if ($numberOfParameters > $this->maxParameters) {
-            $error = "Function has more than {$this->maxParameters} parameters. Please reduce.";
-            $phpcsFile->addError($error, $stackPtr);
+            $phpcsFile->addError("Function has more than {$this->maxParameters} parameters. Please reduce.", $stackPtr);
         }
 
         if ($numberOfParameters == $this->maxParameters) {
-            $warning = "Function has {$this->maxParameters} parameters. Please reduce if possible.";
-            $phpcsFile->addWarning($warning, $stackPtr);
+            $phpcsFile->addWarning("Function has {$this->maxParameters} parameters.", $stackPtr);
         }
     }
 }