🚨 Add tests for fixer

Author: VincentLanglet

TwigCS/Runner/Linter.php

@@ -57,16 +57,7 @@ public function run(array $files, Ruleset $ruleset, bool $fix = false)
         $report = new Report();
 
         if ($fix) {
-            $fixer = new Fixer($ruleset, $this->tokenizer);
-
-            foreach ($ruleset->getSniffs() as $sniff) {
-                $sniff->enableFixer($fixer);
-            }
-
-            foreach ($files as $file) {
-                $fixer->fixFile($file);
-                file_put_contents($file, $fixer->getContents());
-            }
+            $this->fix($files, $ruleset);
         }
 
         foreach ($ruleset->getSniffs() as $sniff) {
@@ -92,6 +83,31 @@ public function run(array $files, Ruleset $ruleset, bool $fix = false)
         return $report;
     }
 
+    /**
+     * @param array   $files
+     * @param Ruleset $ruleset
+     *
+     * @throws Exception
+     */
+    public function fix(array $files, Ruleset $ruleset)
+    {
+        $fixer = new Fixer($ruleset, $this->tokenizer);
+
+        foreach ($ruleset->getSniffs() as $sniff) {
+            $sniff->enableFixer($fixer);
+        }
+
+        foreach ($files as $file) {
+            $success = $fixer->fixFile($file);
+
+            if (!$success) {
+                throw new Exception("Cannot fix the file $file.");
+            }
+
+            file_put_contents($file, $fixer->getContents());
+        }
+    }
+
     /**
      * Checks one template against the set of rules.
      *

TwigCS/Tests/AbstractSniffTest.php

@@ -8,6 +8,7 @@
 use TwigCS\Environment\StubbedEnvironment;
 use TwigCS\Report\SniffViolation;
 use TwigCS\Ruleset\Ruleset;
+use TwigCS\Runner\Fixer;
 use TwigCS\Runner\Linter;
 use TwigCS\Sniff\SniffInterface;
 use TwigCS\Token\Tokenizer;
@@ -45,9 +46,12 @@ abstract public function testSniff();
     protected function checkGenericSniff(SniffInterface $sniff, array $expects)
     {
         $ruleset = new Ruleset();
+        $fixer = new Fixer($ruleset, new Tokenizer($this->env));
+
         try {
             $class = new ReflectionClass(get_called_class());
-            $file = __DIR__.'/Fixtures/'.$class->getShortName().'.twig';
+            $className = $class->getShortName();
+            $file = __DIR__.'/Fixtures/'.$className.'.twig';
 
             $ruleset->addSniff($sniff);
             $report = $this->lint->run([$file], $ruleset);
@@ -68,5 +72,16 @@ protected function checkGenericSniff(SniffInterface $sniff, array $expects)
 
             $this->assertEquals($expects, $messagePositions);
         }
+
+        $fixedFile = __DIR__.'/Fixtures/'.$className.'.fixed.twig';
+        if (file_exists($fixedFile)) {
+            $sniff->enableFixer($fixer);
+            $fixer->fixFile($file);
+
+            $diff = $fixer->generateDiff($fixedFile);
+            if ("" !== $diff) {
+                $this->fail($diff);
+            }
+        }
     }
 }

TwigCS/Tests/Fixtures/BlankEOFTest.fixed.twig

@@ -0,0 +1,2 @@
+<div class="error">
+</div>