Another strategy

VincentLanglet · Aug 22, 2024 · 3a4986a · 3a4986a
1 parent 703deeb
commit 3a4986a
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 69 deletions.
diff --git a/src/Runner/Linter.php b/src/Runner/Linter.php
@@ -126,6 +126,7 @@ public function run(iterable $files, Ruleset $ruleset, ?FixerInterface $fixer =
                     continue;
                 }
 
+                $node->setSourceContext($node->getSourceContext());
                 foreach ($nodeVisitorRules as $nodeVisitor) {
                     $nodeVisitor->setReport($report, $stream->getIgnoredViolations());
                 }
@@ -146,18 +147,18 @@ public function run(iterable $files, Ruleset $ruleset, ?FixerInterface $fixer =
 
     private function parseTemplate(string $content, string $filePath, Report $report): ?ModuleNode
     {
-        if (!StubbedEnvironment::satisfiesTwigVersion(3, 10)) {
-            // @codeCoverageIgnoreStart
-            $violation = new Violation(
-                Violation::LEVEL_FATAL,
-                'Node visitor rules require twig/twig >= 3.10.0',
-                $filePath,
-            );
-            $report->addViolation($violation);
-
-            return null;
-            // @codeCoverageIgnoreEnd
-        }
+//        if (!StubbedEnvironment::satisfiesTwigVersion(3, 10)) {
+//            // @codeCoverageIgnoreStart
+//            $violation = new Violation(
+//                Violation::LEVEL_FATAL,
+//                'Node visitor rules require twig/twig >= 3.10.0',
+//                $filePath,
+//            );
+//            $report->addViolation($violation);
+//
+//            return null;
+//            // @codeCoverageIgnoreEnd
+//        }
 
         try {
             $twigSource = new Source($content, $filePath);

diff --git a/tests/Rules/Node/ForbiddenBlock/ForbiddenBlockRuleTest.php b/tests/Rules/Node/ForbiddenBlock/ForbiddenBlockRuleTest.php
@@ -11,15 +11,6 @@
 
 final class ForbiddenBlockRuleTest extends AbstractRuleTestCase
 {
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        if (!InstalledVersions::satisfies(new VersionParser(), 'twig/twig', '>=3.10.0')) {
-            static::markTestSkipped('twig/twig ^3.10.0 is required.');
-        }
-    }
-
     public function testConfiguration(): void
     {
         static::assertSame(

diff --git a/tests/Rules/Node/ForbiddenFilter/ForbiddenFilterRuleTest.php b/tests/Rules/Node/ForbiddenFilter/ForbiddenFilterRuleTest.php
@@ -11,15 +11,6 @@
 
 final class ForbiddenFilterRuleTest extends AbstractRuleTestCase
 {
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        if (!InstalledVersions::satisfies(new VersionParser(), 'twig/twig', '>=3.10.0')) {
-            static::markTestSkipped('twig/twig ^3.10.0 is required.');
-        }
-    }
-
     public function testConfiguration(): void
     {
         static::assertSame(

diff --git a/tests/Rules/Node/ForbiddenFunction/ForbiddenFunctionRuleTest.php b/tests/Rules/Node/ForbiddenFunction/ForbiddenFunctionRuleTest.php
@@ -11,15 +11,6 @@
 
 final class ForbiddenFunctionRuleTest extends AbstractRuleTestCase
 {
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        if (!InstalledVersions::satisfies(new VersionParser(), 'twig/twig', '>=3.10.0')) {
-            static::markTestSkipped('twig/twig ^3.10.0 is required.');
-        }
-    }
-
     public function testConfiguration(): void
     {
         static::assertSame(

diff --git a/tests/Rules/Node/NodeRuleTest.php b/tests/Rules/Node/NodeRuleTest.php
@@ -22,15 +22,6 @@
 
 final class NodeRuleTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        if (!InstalledVersions::satisfies(new VersionParser(), 'twig/twig', '>=3.10.0')) {
-            static::markTestSkipped('twig/twig ^3.10.0 is required.');
-        }
-    }
-
     public function testEnterNodeRule(): void
     {
         $report = new Report([new \SplFileInfo('fakeFile.html.twig')]);

diff --git a/tests/Rules/Node/ValidConstantFunction/ValidConstantFunctionRuleTest.php b/tests/Rules/Node/ValidConstantFunction/ValidConstantFunctionRuleTest.php
@@ -13,15 +13,6 @@ final class ValidConstantFunctionRuleTest extends AbstractRuleTestCase
 {
     public const SOME_CONSTANT = 'Foo';
 
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        if (!InstalledVersions::satisfies(new VersionParser(), 'twig/twig', '>=3.10.0')) {
-            static::markTestSkipped('twig/twig ^3.10.0 is required.');
-        }
-    }
-
     public function testRule(): void
     {
         $this->checkRule(new ValidConstantFunctionRule(), [

diff --git a/tests/Runner/LinterTest.php b/tests/Runner/LinterTest.php
@@ -276,10 +276,6 @@ public function testFileIsNotCachedWhenReportHasErrors(): void
 
     public function testViolationsFromNodeVisitorRule(): void
     {
-        if (!InstalledVersions::satisfies(new VersionParser(), 'twig/twig', '>=3.10.0')) {
-            static::markTestSkipped('twig/twig ^3.10.0 is required.');
-        }
-
         $filePath = $this->getTmpPath(__DIR__.'/Fixtures/Linter/node_visitor.twig');
 
         $ruleset = new Ruleset();
@@ -324,10 +320,6 @@ public function testViolationsFromNodeVisitorRule(): void
 
     public function testNodeVisitorWithInvalidFiles(): void
     {
-        if (!InstalledVersions::satisfies(new VersionParser(), 'twig/twig', '>=3.10.0')) {
-            static::markTestSkipped('twig/twig ^3.10.0 is required.');
-        }
-
         $filePath = $this->getTmpPath(__DIR__.'/Fixtures/Linter/file.twig');
         $filePath2 = $this->getTmpPath(__DIR__.'/Fixtures/Linter/file2.twig');
 
@@ -360,10 +352,6 @@ public function testNodeVisitorWithInvalidFiles(): void
 
     public function testNodeVisitorWithBuggyFixer(): void
     {
-        if (!InstalledVersions::satisfies(new VersionParser(), 'twig/twig', '>=3.10.0')) {
-            static::markTestSkipped('twig/twig ^3.10.0 is required.');
-        }
-
         $filePath = $this->getTmpPath(__DIR__.'/Fixtures/Linter/file.twig');
 
         $ruleset = new Ruleset();