Merge pull request #54 from district09/develop

jonasanne · web-flow · commit 1524029d5226 · 2025-03-20T14:10:16.000+01:00
Merge develop into main
diff --git a/composer.json b/composer.json
@@ -33,6 +33,7 @@
         "drupal/drupal-extension": "^5.0",
         "enlightn/security-checker": "^2.0",
         "ergebnis/composer-normalize": "^2.11",
+        "friendsoftwig/twigcs": "^6.5",
         "mglaman/phpstan-drupal": "^1.1",
         "nette/neon": "^3.2",
         "phpcompatibility/php-compatibility": "^9.3",
diff --git a/src/Twigcs/Ruleset/Twig.php b/src/Twigcs/Ruleset/Twig.php
@@ -4,7 +4,6 @@
 
 use FriendsOfTwig\Twigcs\Ruleset\Official;
 use FriendsOfTwig\Twigcs\Ruleset\RulesetInterface;
-use NdB\TwigCSA11Y\Ruleset;
 
 /**
  * Twig ruleset.
@@ -26,8 +25,7 @@ public function __construct(int $twigMajorVersion)
     public function getRules()
     {
         $official = new Official($this->twigMajorVersion);
-        $wcag = new Ruleset($this->twigMajorVersion);
 
-        return array_merge($official->getRules(), $wcag->getRules());
+        return array_merge($official->getRules());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`
`5`	`5`	`use FriendsOfTwig\Twigcs\Ruleset\Official;`
`6`	`6`	`use FriendsOfTwig\Twigcs\Ruleset\RulesetInterface;`
`7`		`-use NdB\TwigCSA11Y\Ruleset;`
`8`	`7`
`9`	`8`	`/**`
`10`	`9`	`* Twig ruleset.`
`@@ -26,8 +25,7 @@ public function __construct(int $twigMajorVersion)`
`26`	`25`	`public function getRules()`
`27`	`26`	`{`
`28`	`27`	`$official = new Official($this->twigMajorVersion);`
`29`		`- $wcag = new Ruleset($this->twigMajorVersion);`
`30`	`28`
`31`		`- return array_merge($official->getRules(), $wcag->getRules());`
	`29`	`+ return array_merge($official->getRules());`
`32`	`30`	`}`
`33`	`31`	`}`