📦 Remove not used functionnality

Author: VincentLanglet

TwigCS/Command/TwigCSCommand.php

@@ -81,7 +81,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             'workingDirectory' => $currentDir,
         ]);
 
-        $twig     = new StubbedEnvironment(new ArrayLoader(), ['stub_tags' => $config->get('stub')]);
+        $twig     = new StubbedEnvironment(new ArrayLoader());
         $linter   = new Linter($twig, new Tokenizer($twig));
         $factory  = new RulesetFactory();
         $reporter = new TextFormatter($input, $output);

TwigCS/Environment/StubbedEnvironment.php

@@ -14,8 +14,6 @@
 use Twig\TwigFilter;
 use Twig\TwigFunction;
 use Twig\TwigTest;
-use TwigCS\Extension\SniffsExtension;
-use TwigCS\Token\TokenParser;
 
 /**
  * Provide stubs for all filters, functions, tests and tags that are not defined in twig's core.
@@ -56,28 +54,6 @@ public function __construct(LoaderInterface $loader = null, $options = [])
         $this->addTokenParser(new TransChoiceTokenParser());
         $this->addTokenParser(new TransDefaultDomainTokenParser());
         $this->addTokenParser(new TransTokenParser());
-
-        $this->stubCallable  = function () {
-            /* This will be used as stub filter, function or test */
-        };
-
-        $this->stubFilters   = [];
-        $this->stubFunctions = [];
-
-        if (isset($options['stub_tags'])) {
-            foreach ($options['stub_tags'] as $tag) {
-                $this->addTokenParser(new TokenParser($tag));
-            }
-        }
-
-        $this->stubTests = [];
-        if (isset($options['stub_tests'])) {
-            foreach ($options['stub_tests'] as $test) {
-                $this->stubTests[$test] = new TwigTest('stub', $this->stubCallable);
-            }
-        }
-
-        $this->addExtension(new SniffsExtension());
     }
 
     /**
@@ -111,19 +87,14 @@ public function getFunction($name)
     /**
      * @param string $name
      *
-     * @return false|TwigTest
+     * @return TwigTest
      */
     public function getTest($name)
     {
-        $test = parent::getTest($name);
-        if ($test) {
-            return $test;
-        }
-
-        if (isset($this->stubTests[$name])) {
-            return $this->stubTests[$name];
+        if (!isset($this->stubTests[$name])) {
+            $this->stubTests[$name] = new TwigTest('stub', $this->stubCallable);
         }
 
-        return false;
+        return $this->stubTests[$name];
     }
 }

TwigCS/Extension/SniffsExtension.php

@@ -7,12 +7,9 @@
 use Twig\Environment;
 use Twig\Error\Error;
 use Twig\Source;
-use TwigCS\Extension\SniffsExtension;
 use TwigCS\Report\Report;
 use TwigCS\Report\SniffViolation;
 use TwigCS\Ruleset\Ruleset;
-use TwigCS\Sniff\PostParserSniffInterface;
-use TwigCS\Sniff\PreParserSniffInterface;
 use TwigCS\Sniff\SniffInterface;
 use TwigCS\Token\Tokenizer;
 
@@ -26,11 +23,6 @@ class Linter
      */
     protected $env;
 
-    /**
-     * @var SniffsExtension
-     */
-    protected $sniffsExtension;
-
     /**
      * @var Tokenizer
      */
@@ -44,7 +36,6 @@ public function __construct(Environment $env, Tokenizer $tokenizer)
     {
         $this->env = $env;
 
-        $this->sniffsExtension = $this->env->getExtension('TwigCS\Extension\SniffsExtension');
         $this->tokenizer = $tokenizer;
     }
 
@@ -68,13 +59,8 @@ public function run($files, Ruleset $ruleset)
             throw new Exception('No files to process, provide at least one file to be linted');
         }
 
-        // setUp
         $report = new Report();
         foreach ($ruleset->getSniffs() as $sniff) {
-            if ($sniff instanceof PostParserSniffInterface) {
-                $this->sniffsExtension->addSniff($sniff);
-            }
-
             $sniff->enable($report);
         }
 
@@ -90,10 +76,6 @@ public function run($files, Ruleset $ruleset)
 
         // tearDown
         foreach ($ruleset->getSniffs() as $sniff) {
-            if ($sniff instanceof PostParserSniffInterface) {
-                $this->sniffsExtension->removeSniff($sniff);
-            }
-
             $sniff->disable();
         }
 
@@ -144,8 +126,8 @@ public function processTemplate($file, $ruleset, $report)
             return false;
         }
 
-        /** @var PreParserSniffInterface[] $sniffs */
-        $sniffs = $ruleset->getSniffs(SniffInterface::TYPE_PRE_PARSER);
+        /** @var SniffInterface[] $sniffs */
+        $sniffs = $ruleset->getSniffs();
         foreach ($sniffs as $sniff) {
             foreach ($stream as $index => $token) {
                 $sniff->process($token, $index, $stream);