💄 Minor clean

Author: VincentLanglet

TwigCS/Environment/StubbedEnvironment.php

@@ -22,17 +22,17 @@ class StubbedEnvironment extends Environment
     /**
      * @var TwigFilter[]
      */
-    private $stubFilters;
+    protected $stubFilters = [];
 
     /**
      * @var TwigFunction[]
      */
-    private $stubFunctions;
+    protected $stubFunctions = [];
 
     /**
      * @var TwigTest[]
      */
-    private $stubTests;
+    protected $stubTests = [];
 
     public function __construct()
     {
@@ -44,10 +44,6 @@ public function __construct()
         $this->addTokenParser(new TransChoiceTokenParser());
         $this->addTokenParser(new TransDefaultDomainTokenParser());
         $this->addTokenParser(new TransTokenParser());
-
-        $this->stubFilters = [];
-        $this->stubFunctions = [];
-        $this->stubTests = [];
     }
 
     /**

TwigCS/Ruleset/Ruleset.php

@@ -15,12 +15,7 @@ class Ruleset
     /**
      * @var SniffInterface[]
      */
-    protected $sniffs;
-
-    public function __construct()
-    {
-        $this->sniffs = [];
-    }
+    protected $sniffs = [];
 
     /**
      * @return SniffInterface[]

TwigCS/Runner/Fixer.php

@@ -241,18 +241,6 @@ public function generateDiff($filePath)
         return $diff;
     }
 
-    /**
-     * Get a count of fixes that have been performed on the file.
-     *
-     * This value is reset every time a new file is started, or an existing file is restarted.
-     *
-     * @return int
-     */
-    public function getFixCount()
-    {
-        return $this->numFixes;
-    }
-
     /**
      * Get the current content of the file, as a string.
      *

TwigCS/Sniff/AbstractSniff.php

@@ -27,37 +27,24 @@ abstract class AbstractSniff implements SniffInterface
 
     /**
      * @param Report $report
-     *
-     * @return self
      */
     public function enableReport(Report $report)
     {
         $this->report = $report;
-
-        return $this;
     }
 
     /**
      * @param Fixer $fixer
-     *
-     * @return self
      */
     public function enableFixer(Fixer $fixer)
     {
         $this->fixer = $fixer;
-
-        return $this;
     }
 
-    /**
-     * @return self
-     */
     public function disable()
     {
         $this->report = null;
         $this->fixer = null;
-
-        return $this;
     }
 
     /**

TwigCS/Tests/AbstractSniffTest.php

@@ -18,22 +18,6 @@
  */
 abstract class AbstractSniffTest extends TestCase
 {
-    /**
-     * @var StubbedEnvironment
-     */
-    private $env;
-
-    /**
-     * @var Linter
-     */
-    private $lint;
-
-    public function setUp()
-    {
-        $this->env = new StubbedEnvironment();
-        $this->lint = new Linter($this->env, new Tokenizer($this->env));
-    }
-
     /**
      * Should call $this->checkGenericSniff(new Sniff(), [...]);
      */
@@ -45,16 +29,18 @@ abstract public function testSniff();
      */
     protected function checkGenericSniff(SniffInterface $sniff, array $expects)
     {
+        $env = new StubbedEnvironment();
+        $tokenizer = new Tokenizer($env);
+        $linter = new Linter($env, $tokenizer);
         $ruleset = new Ruleset();
-        $fixer = new Fixer($ruleset, new Tokenizer($this->env));
 
         try {
             $class = new ReflectionClass(get_called_class());
             $className = $class->getShortName();
             $file = __DIR__.'/Fixtures/'.$className.'.twig';
 
             $ruleset->addSniff($sniff);
-            $report = $this->lint->run([$file], $ruleset);
+            $report = $linter->run([$file], $ruleset);
         } catch (Exception $e) {
             $this->fail($e->getMessage());
 
@@ -75,6 +61,7 @@ protected function checkGenericSniff(SniffInterface $sniff, array $expects)
 
         $fixedFile = __DIR__.'/Fixtures/'.$className.'.fixed.twig';
         if (file_exists($fixedFile)) {
+            $fixer = new Fixer($ruleset, $tokenizer);
             $sniff->enableFixer($fixer);
             $fixer->fixFile($file);