[BUGFIX] Fix a type annotation in RuleSet

Also improve some variable names.

Part of #756.

Author: oliverklee

config/phpstan-baseline.neon

@@ -330,12 +330,6 @@ parameters:
 			count: 1
 			path: ../src/RuleSet/DeclarationBlock.php
 
-		-
-			message: '#^Argument of an invalid type Sabberworm\\CSS\\Rule\\Rule supplied for foreach, only iterables are supported\.$#'
-			identifier: foreach.nonIterable
-			count: 2
-			path: ../src/RuleSet/RuleSet.php
-
 		-
 			message: '#^Call to an undefined method Sabberworm\\CSS\\OutputFormat\:\:removeLastSemicolon\(\)\.$#'
 			identifier: method.notFound
@@ -396,12 +390,6 @@ parameters:
 			count: 1
 			path: ../src/RuleSet/RuleSet.php
 
-		-
-			message: '#^Use explicit methods over array access on object$#'
-			identifier: typePerfect.noArrayAccessOnObject
-			count: 1
-			path: ../src/RuleSet/RuleSet.php
-
 		-
 			message: '#^Parameters should have "string" types as the only types passed to this method$#'
 			identifier: typePerfect.narrowPublicClassMethodParamType

src/RuleSet/RuleSet.php

@@ -25,7 +25,10 @@
 abstract class RuleSet implements Renderable, Commentable
 {
     /**
-     * @var array<string, Rule>
+     * the rules in this rule set, using the property or rule name as the key,
+     * with potentially multiple rules per property or rule name.
+     *
+     * @var array<string, array<int<0,max>, Rule>>
      */
     private $rules = [];
 
@@ -103,15 +106,15 @@ public function getLineNo(): int
 
     public function addRule(Rule $ruleToAdd, ?Rule $sibling = null): void
     {
-        $sRule = $ruleToAdd->getRule();
-        if (!isset($this->rules[$sRule])) {
-            $this->rules[$sRule] = [];
+        $propertyOrRuleName = $ruleToAdd->getRule();
+        if (!isset($this->rules[$propertyOrRuleName])) {
+            $this->rules[$propertyOrRuleName] = [];
         }
 
-        $position = \count($this->rules[$sRule]);
+        $position = \count($this->rules[$propertyOrRuleName]);
 
         if ($sibling !== null) {
-            $iSiblingPos = \array_search($sibling, $this->rules[$sRule], true);
+            $iSiblingPos = \array_search($sibling, $this->rules[$propertyOrRuleName], true);
             if ($iSiblingPos !== false) {
                 $position = $iSiblingPos;
                 $ruleToAdd->setPosition($sibling->getLineNo(), $sibling->getColNo() - 1);
@@ -127,7 +130,7 @@ public function addRule(Rule $ruleToAdd, ?Rule $sibling = null): void
             }
         }
 
-        \array_splice($this->rules[$sRule], $position, 0, [$ruleToAdd]);
+        \array_splice($this->rules[$propertyOrRuleName], $position, 0, [$ruleToAdd]);
     }
 
     /**
@@ -153,14 +156,15 @@ public function getRules($searchPattern = null)
         }
         /** @var array<int, Rule> $result */
         $result = [];
-        foreach ($this->rules as $sName => $rules) {
+        foreach ($this->rules as $propertyOrRuleName => $rules) {
             // Either no search rule is given or the search rule matches the found rule exactly
             // or the search rule ends in “-” and the found rule starts with the search rule.
             if (
-                !$searchPattern || $sName === $searchPattern
+                !$searchPattern || $propertyOrRuleName === $searchPattern
                 || (
                     \strrpos($searchPattern, '-') === \strlen($searchPattern) - \strlen('-')
-                    && (\strpos($sName, $searchPattern) === 0 || $sName === \substr($searchPattern, 0, -1))
+                    && (\strpos($propertyOrRuleName, $searchPattern) === 0
+                        || $propertyOrRuleName === \substr($searchPattern, 0, -1))
                 )
             ) {
                 $result = \array_merge($result, $rules);
@@ -230,26 +234,27 @@ public function getRulesAssoc($searchPattern = null)
     public function removeRule($searchPattern): void
     {
         if ($searchPattern instanceof Rule) {
-            $sRule = $searchPattern->getRule();
-            if (!isset($this->rules[$sRule])) {
+            $propertyOrRuleName = $searchPattern->getRule();
+            if (!isset($this->rules[$propertyOrRuleName])) {
                 return;
             }
-            foreach ($this->rules[$sRule] as $key => $rule) {
+            foreach ($this->rules[$propertyOrRuleName] as $key => $rule) {
                 if ($rule === $searchPattern) {
-                    unset($this->rules[$sRule][$key]);
+                    unset($this->rules[$propertyOrRuleName][$key]);
                 }
             }
         } else {
-            foreach ($this->rules as $sName => $rules) {
+            foreach ($this->rules as $propertyOrRuleName => $rules) {
                 // Either no search rule is given or the search rule matches the found rule exactly
                 // or the search rule ends in “-” and the found rule starts with the search rule or equals it
                 // (without the trailing dash).
                 if (
-                    !$searchPattern || $sName === $searchPattern
+                    !$searchPattern || $propertyOrRuleName === $searchPattern
                     || (\strrpos($searchPattern, '-') === \strlen($searchPattern) - \strlen('-')
-                        && (\strpos($sName, $searchPattern) === 0 || $sName === \substr($searchPattern, 0, -1)))
+                        && (\strpos($propertyOrRuleName, $searchPattern) === 0
+                            || $propertyOrRuleName === \substr($searchPattern, 0, -1)))
                 ) {
-                    unset($this->rules[$sName]);
+                    unset($this->rules[$propertyOrRuleName]);
                 }
             }
         }