refactor(a11y): streamline condition checks in accessibility rules for improved readability

Author: PhilDaiguille

src/Rules/Aria/AriaErrorMessageIdExistsRule.php

@@ -30,7 +30,10 @@ public function evaluate(Tokens $tokens, int $tokenIndex, callable $emit): void
 
         foreach ($refs as $ref) {
             $refId = $this->firstMatch($ref, 1, 2);
-            if ('' === $refId || isset($ids[$refId])) {
+            if ('' === $refId) {
+                continue;
+            }
+            if (isset($ids[$refId])) {
                 continue;
             }
 

src/Rules/Forms/InvalidFieldErrorMessageRule.php

@@ -51,8 +51,10 @@ public function evaluate(Tokens $tokens, int $tokenIndex, callable $emit): void
             if (!$this->isSupportedField($tagName, $tag)) {
                 continue;
             }
-
-            if ($this->hasNonEmptyReference($tag, 'aria-describedby') || $this->hasNonEmptyReference($tag, 'aria-errormessage')) {
+            if ($this->hasNonEmptyReference($tag, 'aria-describedby')) {
+                continue;
+            }
+            if ($this->hasNonEmptyReference($tag, 'aria-errormessage')) {
                 continue;
             }
 

src/Rules/Forms/RadioGroupAccessibleNameRule.php

@@ -58,8 +58,10 @@ public function evaluate(Tokens $tokens, int $tokenIndex, callable $emit): void
             if ($radioCount < 2) {
                 continue;
             }
-
-            if ($this->hasNonEmptyReference($groupBlock, 'aria-labelledby') || $this->hasNonEmptyReference($groupBlock, 'aria-label')) {
+            if ($this->hasNonEmptyReference($groupBlock, 'aria-labelledby')) {
+                continue;
+            }
+            if ($this->hasNonEmptyReference($groupBlock, 'aria-label')) {
                 continue;
             }
 

src/Rules/Forms/RadioGroupStructureRule.php

@@ -42,8 +42,10 @@ public function evaluate(Tokens $tokens, int $tokenIndex, callable $emit): void
             if (count($items) < 2) {
                 continue;
             }
-
-            if ($this->isInsideFieldsetGroup($full, $name) || $this->isInsideAriaRadioGroup($full, $name)) {
+            if ($this->isInsideFieldsetGroup($full, $name)) {
+                continue;
+            }
+            if ($this->isInsideAriaRadioGroup($full, $name)) {
                 continue;
             }
 
@@ -69,7 +71,7 @@ private function isInsideFieldsetGroup(string $full, string $name): bool
 
         foreach ($fieldsets as $fieldset) {
             $content = $fieldset[1];
-            $count = preg_match_all('/<input\b[^>]*\btype\s*=\s*(?:"radio"|\'radio\')[^>]*\bname\s*=\s*(?:"'.preg_quote($name, '/').'"|\''.preg_quote($name, '/').'\')[^>]*>/i', $content);
+            $count = preg_match_all('/<input\b[^>]*\btype\s*=\s*(?:"radio"|\'radio\')[^>]*\bname\s*=\s*(?:"'.preg_quote($name, '/').'"|\''.preg_quote($name, '/')."')[^>]*>/i", $content);
             if ($count >= 2) {
                 return true;
             }
@@ -86,7 +88,7 @@ private function isInsideAriaRadioGroup(string $full, string $name): bool
 
         foreach ($groups as $group) {
             $content = $group[2];
-            $count = preg_match_all('/<input\b[^>]*\btype\s*=\s*(?:"radio"|\'radio\')[^>]*\bname\s*=\s*(?:"'.preg_quote($name, '/').'"|\''.preg_quote($name, '/').'\')[^>]*>/i', $content);
+            $count = preg_match_all('/<input\b[^>]*\btype\s*=\s*(?:"radio"|\'radio\')[^>]*\bname\s*=\s*(?:"'.preg_quote($name, '/').'"|\''.preg_quote($name, '/')."')[^>]*>/i", $content);
             if ($count >= 2) {
                 return true;
             }

src/Rules/Media/SvgAccessibilityRule.php

@@ -121,10 +121,7 @@ private function hasSvgTitle(string $fullTag, Tokens $tokens, int $tokenIndex):
         // Look ahead in tokens for a title element within the SVG
         // Collect more content to find nested elements
         $extendedContent = $this->collectUntil($tokenIndex, $tokens, '</svg>', 500);
-        if (preg_match('/<\s*title(\s+[^>]*)?>(.*?)<\/\s*title\s*>/is', $extendedContent)) {
-            return true;
-        }
 
-        return false;
+        return (bool) preg_match('/<\s*title(\s+[^>]*)?>(.*?)<\/\s*title\s*>/is', $extendedContent);
     }
 }

src/Rules/Structure/DetailsSummaryRule.php

@@ -26,7 +26,7 @@ public function evaluate(Tokens $tokens, int $tokenIndex, callable $emit): void
             return;
         }
 
-        foreach ($matches[0] as $index => $match) {
+        foreach ($matches[0] as $match) {
             $detailsBlock = $match[0];
             $offset = $match[1];
             $line = 1 + substr_count(substr($full, 0, $offset), "\n");

src/Rules/Structure/TableCaptionMissingRule.php

@@ -35,10 +35,8 @@ public function evaluate(Tokens $tokens, int $tokenIndex, callable $emit): void
                 continue;
             }
 
-            if (preg_match('/<caption\b[^>]*>(.*?)<\/caption>/is', $inner, $captionMatch)) {
-                if ('' !== trim(strip_tags($captionMatch[1]))) {
-                    continue;
-                }
+            if (preg_match('/<caption\b[^>]*>(.*?)<\/caption>/is', $inner, $captionMatch) && '' !== trim(strip_tags($captionMatch[1]))) {
+                continue;
             }
 
             $line = 1 + substr_count(substr($full, 0, $offset), "\n");