[TASK] Use Property\Declaration in RuleContainer classes

CHANGELOG.md

@@ -18,7 +18,7 @@ Please also have a look at our
 
 ### Changed
 
-- `Rule\Rule` class is renamed to `Property\Declaration` (#1508, #1512)
+- `Rule\Rule` class is renamed to `Property\Declaration` (#1508, #1512, #1513)
 - `Rule::setRule()` and `getRule()` are replaced with `setPropertyName()` and
   `getPropertyName()` (#1506)
 - `Selector` is now represented as a sequence of `Selector\Component` objects

src/RuleSet/DeclarationBlock.php

@@ -17,9 +17,9 @@
 use Sabberworm\CSS\Parsing\UnexpectedTokenException;
 use Sabberworm\CSS\Position\Position;
 use Sabberworm\CSS\Position\Positionable;
+use Sabberworm\CSS\Property\Declaration;
 use Sabberworm\CSS\Property\KeyframeSelector;
 use Sabberworm\CSS\Property\Selector;
-use Sabberworm\CSS\Rule\Rule;
 use Sabberworm\CSS\Settings;
 
 /**
@@ -182,13 +182,13 @@ public function getRuleSet(): RuleSet
     /**
      * @see RuleSet::addRule()
      */
-    public function addRule(Rule $ruleToAdd, ?Rule $sibling = null): void
+    public function addRule(Declaration $declarationToAdd, ?Declaration $sibling = null): void
     {
-        $this->ruleSet->addRule($ruleToAdd, $sibling);
+        $this->ruleSet->addRule($declarationToAdd, $sibling);
     }
 
     /**
-     * @return array<int<0, max>, Rule>
+     * @return array<int<0, max>, Declaration>
      *
      * @see RuleSet::getRules()
      */
@@ -198,17 +198,17 @@ public function getRules(?string $searchPattern = null): array
     }
 
     /**
-     * @param array<Rule> $rules
+     * @param array<Declaration> $declarations
      *
      * @see RuleSet::setRules()
      */
-    public function setRules(array $rules): void
+    public function setRules(array $declarations): void
     {
-        $this->ruleSet->setRules($rules);
+        $this->ruleSet->setRules($declarations);
     }
 
     /**
-     * @return array<string, Rule>
+     * @return array<string, Declaration>
      *
      * @see RuleSet::getRulesAssoc()
      */
@@ -220,9 +220,9 @@ public function getRulesAssoc(?string $searchPattern = null): array
     /**
      * @see RuleSet::removeRule()
      */
-    public function removeRule(Rule $ruleToRemove): void
+    public function removeRule(Declaration $declarationToRemove): void
     {
-        $this->ruleSet->removeRule($ruleToRemove);
+        $this->ruleSet->removeRule($declarationToRemove);
     }
 
     /**

src/RuleSet/RuleContainer.php

@@ -4,33 +4,33 @@
 
 namespace Sabberworm\CSS\RuleSet;
 
-use Sabberworm\CSS\Rule\Rule;
+use Sabberworm\CSS\Property\Declaration;
 
 /**
  * Represents a CSS item that contains `Rules`, defining the methods to manipulate them.
  */
 interface RuleContainer
 {
-    public function addRule(Rule $ruleToAdd, ?Rule $sibling = null): void;
+    public function addRule(Declaration $declarationToAdd, ?Declaration $sibling = null): void;
 
-    public function removeRule(Rule $ruleToRemove): void;
+    public function removeRule(Declaration $declarationToRemove): void;
 
     public function removeMatchingRules(string $searchPattern): void;
 
     public function removeAllRules(): void;
 
     /**
-     * @param array<Rule> $rules
+     * @param array<Declaration> $declarations
      */
-    public function setRules(array $rules): void;
+    public function setRules(array $declarations): void;
 
     /**
-     * @return array<int<0, max>, Rule>
+     * @return array<int<0, max>, Declaration>
      */
     public function getRules(?string $searchPattern = null): array;
 
     /**
-     * @return array<string, Rule>
+     * @return array<string, Declaration>
      */
     public function getRulesAssoc(?string $searchPattern = null): array;
 }