Merge pull request #3 from PhilDaiguille/feat/enhancement-code

Feat/enhancement code

Author: PhilDaiguille

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [8.2, 8.3, 8.4, 8.5]
+        php: [8.2, 8.3, 8.4]
 
     steps:
       - name: Checkout

.gitignore

@@ -24,7 +24,7 @@ protected function process(int $tokenIndex, Tokens $tokens): void
             return;
         }
 
-        $tag = $this->collectUntil($tokenIndex, $tokens, '/>');
+        $tag = $this->collectUntil($tokenIndex, $tokens, '>');
 
         // If aria-label present and non-empty - OK
         if (preg_match('/aria-label\s*=\s*(?:"|\')([^"\']*)(?:"|\')/i', $tag, $m)) {

CHANGELOG.md

@@ -4,10 +4,10 @@
 
 namespace TwigA11y\Rules\Aria;
 
-use TwigCsFixer\Rules\AbstractRule;
+use TwigA11y\Rules\AbstractA11yRule;
 use TwigCsFixer\Token\Tokens;
 
-final class AriaRequiredAttrRule extends AbstractRule
+final class AriaRequiredAttrRule extends AbstractA11yRule
 {
     protected function process(int $tokenIndex, Tokens $tokens): void
     {
@@ -48,7 +48,8 @@ protected function process(int $tokenIndex, Tokens $tokens): void
                                 $tokenRef = $tokens->get(0);
                                 $this->addError(sprintf('Role "%s" requires attribute "%s".', $role, $attr), $tokenRef, 'AriaRequired.Missing');
 
-                                break 2; // one error per file for tests
+                                // stop after first missing attribute found for test determinism
+                                return;
                             }
                         }
                     }

src/Rules/Aria/AriaLabelRule.php

@@ -4,11 +4,11 @@
 
 namespace TwigA11y\Rules\Aria;
 
-use TwigCsFixer\Rules\AbstractRule;
+use TwigA11y\Rules\AbstractA11yRule;
 use TwigCsFixer\Token\Token;
 use TwigCsFixer\Token\Tokens;
 
-final class AriaRoleRule extends AbstractRule
+final class AriaRoleRule extends AbstractA11yRule
 {
     protected function process(int $tokenIndex, Tokens $tokens): void
     {
@@ -43,7 +43,8 @@ protected function process(int $tokenIndex, Tokens $tokens): void
                     $tokenRef = $tokens->get(0);
                     $this->addError(sprintf('Invalid ARIA role "%s".', $role), $tokenRef, 'AriaRole.InvalidRole');
 
-                    break; // one error per file for tests
+                    // stop after first invalid role for determinism in tests
+                    return;
                 }
             }
         }

src/Rules/Aria/AriaRequiredAttrRule.php

@@ -23,7 +23,7 @@ public function evaluate(Tokens $tokens, int $tokenIndex, callable $emit): void
             return;
         }
 
-        $tag = $this->collectUntil($tokenIndex, $tokens, '/>', 50);
+        $tag = $this->collectUntil($tokenIndex, $tokens, '>', 50);
 
         if (preg_match('/tabindex\s*=\s*(?:"|\')?([\-0-9]+)(?:"|\')?/i', $tag, $m)) {
             $num = (int) $m[1];

src/Rules/Aria/AriaRoleRule.php

@@ -23,7 +23,7 @@ protected function process(int $tokenIndex, Tokens $tokens): void
             return;
         }
 
-        $opening = $this->collectUntil($tokenIndex, $tokens, '/>/');
+        $opening = $this->collectUntil($tokenIndex, $tokens, '>');
 
         // Check for for attribute
         if (preg_match('/\bfor\s*=\s*(?:"|\')([^"\']+)(?:"|\')/i', $opening)) {

src/Rules/Aria/TabIndexRule.php

@@ -23,7 +23,8 @@ protected function process(int $tokenIndex, Tokens $tokens): void
             return;
         }
 
-        $opening = $this->collectUntil($tokenIndex, $tokens, '/>', 50);
+        // Use a simple literal terminator to avoid malformed regex patterns
+        $opening = $this->collectUntil($tokenIndex, $tokens, '>', 50);
 
         // Has aria-label? then OK
         if (preg_match('/\baria-label\s*=\s*("|\')/i', $opening)) {

src/Rules/Forms/FormLabelRule.php

@@ -23,7 +23,7 @@ protected function process(int $tokenIndex, Tokens $tokens): void
         }
 
         // Collect opening tag
-        $opening = $this->collectUntil($tokenIndex, $tokens, '/>/');
+        $opening = $this->collectUntil($tokenIndex, $tokens, '>');
 
         $id = null;
         if (preg_match('/\bid\s*=\s*(?:"|\')([^"\']+)(?:"|\')/i', $opening, $m)) {