Implement more suggestions from code review

Author: oliverklee

src/RuleSet/RuleSet.php

@@ -25,6 +25,8 @@
 abstract class RuleSet implements Renderable, Commentable
 {
     /**
+     * the rules in this rule set, using the property name as the key
+     *
      * @var array<string, Rule>
      */
     private $rules = [];
@@ -153,14 +155,15 @@ public function getRules($searchPattern = null)
         }
         /** @var array<int, Rule> $result */
         $result = [];
-        foreach ($this->rules as $ruleName => $rule) {
+        foreach ($this->rules as $propertyName => $rule) {
             // 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 || $ruleName === $searchPattern
+                !$searchPattern || $propertyName === $searchPattern
                 || (
                     \strrpos($searchPattern, '-') === \strlen($searchPattern) - \strlen('-')
-                    && (\strpos($ruleName, $searchPattern) === 0 || $ruleName === \substr($searchPattern, 0, -1))
+                    && (\strpos($propertyName, $searchPattern) === 0
+                        || $propertyName === \substr($searchPattern, 0, -1))
                 )
             ) {
                 $result = \array_merge($result, $rule);
@@ -223,21 +226,21 @@ public function getRulesAssoc($searchPattern = null)
      * Note: this is different from pre-v.2.0 behaviour of PHP-CSS-Parser, where passing a Rule instance would
      * remove all rules with the same name. To get the old behaviour, use `removeRule($rule->getRule())`.
      *
-     * @param Rule|string|null $removalPattern
-     *        pattern to remove. If $mRule is null, all rules are removed. If the pattern ends in a dash,
+     * @param Rule|string|null $searchPattern
+     *        pattern to remove. If this is `null`, all rules are removed. If the pattern ends in a dash,
      *        all rules starting with the pattern are removed as well as one matching the pattern with the dash
      *        excluded. Passing a Rule behaves matches by identity.
      */
-    public function removeRule($removalPattern): void
+    public function removeRule($searchPattern): void
     {
-        if ($removalPattern instanceof Rule) {
-            $removalRule = $removalPattern->getRule();
-            if (!isset($this->rules[$removalRule])) {
+        if ($searchPattern instanceof Rule) {
+            $propertyToRemove = $searchPattern->getRule();
+            if (!isset($this->rules[$propertyToRemove])) {
                 return;
             }
-            foreach ($this->rules[$removalRule] as $key => $rule) {
-                if ($rule === $removalPattern) {
-                    unset($this->rules[$removalRule][$key]);
+            foreach ($this->rules[$propertyToRemove] as $key => $rule) {
+                if ($rule === $searchPattern) {
+                    unset($this->rules[$propertyToRemove][$key]);
                 }
             }
         } else {
@@ -246,9 +249,9 @@ public function removeRule($removalPattern): void
                 // or the search rule ends in “-” and the found rule starts with the search rule or equals it
                 // (without the trailing dash).
                 if (
-                    !$removalPattern || $ruleName === $removalPattern
-                    || (\strrpos($removalPattern, '-') === \strlen($removalPattern) - \strlen('-')
-                        && (\strpos($ruleName, $removalPattern) === 0 || $ruleName === \substr($removalPattern, 0, -1)))
+                    !$searchPattern || $ruleName === $searchPattern
+                    || (\strrpos($searchPattern, '-') === \strlen($searchPattern) - \strlen('-')
+                        && (\strpos($ruleName, $searchPattern) === 0 || $ruleName === \substr($searchPattern, 0, -1)))
                 ) {
                     unset($this->rules[$ruleName]);
                 }