✨ Add Fixer

Author: VincentLanglet

TwigCS/Command/TwigCSCommand.php

@@ -10,9 +10,9 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use TwigCS\Config\Config;
 use TwigCS\Environment\StubbedEnvironment;
-use TwigCS\Linter;
 use TwigCS\Report\TextFormatter;
 use TwigCS\Ruleset\Ruleset;
+use TwigCS\Runner\Linter;
 use TwigCS\Token\Tokenizer;
 
 /**

TwigCS/Ruleset/Generic/BlankEOFSniff.php

@@ -12,31 +12,45 @@
 class BlankEOFSniff extends AbstractSniff
 {
     /**
-     * @param Token   $token
      * @param int     $tokenPosition
      * @param Token[] $tokens
      *
      * @return Token
      *
      * @throws Exception
      */
-    public function process(Token $token, int $tokenPosition, array $tokens)
+    public function process(int $tokenPosition, array $tokens)
     {
+        $token = $tokens[$tokenPosition];
+
         if ($this->isTokenMatching($token, Token::EOF_TYPE)) {
             $i = 0;
             while (isset($tokens[$tokenPosition - ($i + 1)])
                 && $this->isTokenMatching($tokens[$tokenPosition - ($i + 1)], Token::EOL_TYPE)
             ) {
-                ++$i;
+                $i++;
             }
 
             if (1 !== $i) {
                 // Either 0 or 2+ blank lines.
-                $this->addMessage(
+                $fix = $this->addFixableMessage(
                     $this::MESSAGE_TYPE_ERROR,
                     sprintf('A file must end with 1 blank line; found %d', $i),
                     $token
                 );
+
+                if ($fix) {
+                    if (0 === $i) {
+                        $this->fixer->addNewlineBefore($tokenPosition);
+                    } else {
+                        $this->fixer->beginChangeset();
+                        while ($i > 1) {
+                            $this->fixer->replaceToken($tokenPosition - $i, '');
+                            $i--;
+                        }
+                        $this->fixer->endChangeset();
+                    }
+                }
             }
         }
 

TwigCS/Ruleset/Generic/DelimiterSpacingSniff.php

@@ -12,42 +12,44 @@
 class DelimiterSpacingSniff extends AbstractSniff
 {
     /**
-     * @param Token   $token
      * @param int     $tokenPosition
      * @param Token[] $tokens
      *
      * @return Token
      *
      * @throws Exception
      */
-    public function process(Token $token, int $tokenPosition, array $tokens)
+    public function process(int $tokenPosition, array $tokens)
     {
+        $token = $tokens[$tokenPosition];
+
         if ($this->isTokenMatching($token, Token::VAR_START_TYPE)
             || $this->isTokenMatching($token, Token::BLOCK_START_TYPE)
             || $this->isTokenMatching($token, Token::COMMENT_START_TYPE)
         ) {
-            $this->processStart($token, $tokenPosition, $tokens);
+            $this->processStart($tokenPosition, $tokens);
         }
 
         if ($this->isTokenMatching($token, Token::VAR_END_TYPE)
             || $this->isTokenMatching($token, Token::BLOCK_END_TYPE)
             || $this->isTokenMatching($token, Token::COMMENT_END_TYPE)
         ) {
-            $this->processEnd($token, $tokenPosition, $tokens);
+            $this->processEnd($tokenPosition, $tokens);
         }
 
         return $token;
     }
 
     /**
-     * @param Token   $token
      * @param int     $tokenPosition
      * @param Token[] $tokens
      *
      * @throws Exception
      */
-    public function processStart(Token $token, $tokenPosition, $tokens)
+    public function processStart(int $tokenPosition, array $tokens)
     {
+        $token = $tokens[$tokenPosition];
+
         // Ignore new line
         if ($this->isTokenMatching($tokens[$tokenPosition + 1], Token::EOL_TYPE)) {
             return;
@@ -69,14 +71,15 @@ public function processStart(Token $token, $tokenPosition, $tokens)
     }
 
     /**
-     * @param Token   $token
      * @param int     $tokenPosition
      * @param Token[] $tokens
      *
      * @throws Exception
      */
-    public function processEnd(Token $token, $tokenPosition, $tokens)
+    public function processEnd(int $tokenPosition, array $tokens)
     {
+        $token = $tokens[$tokenPosition];
+
         // Ignore new line
         if ($this->isTokenMatching($tokens[$tokenPosition - 1], Token::EOL_TYPE)) {
             return;

TwigCS/Ruleset/Generic/DisallowCommentedCodeSniff.php

@@ -14,16 +14,17 @@
 class DisallowCommentedCodeSniff extends AbstractSniff
 {
     /**
-     * @param Token   $token
      * @param int     $tokenPosition
      * @param Token[] $tokens
      *
      * @return Token
      *
      * @throws Exception
      */
-    public function process(Token $token, int $tokenPosition, array $tokens)
+    public function process(int $tokenPosition, array $tokens)
     {
+        $token = $tokens[$tokenPosition];
+
         if ($this->isTokenMatching($token, Token::COMMENT_START_TYPE)) {
             $i = $tokenPosition;
             $found = false;