Skip to content

Commit a4f47b1

Browse files
committed
[TASK] Use Property\Declaration in RuleContainer classes
This replaces `Rule\Rule`, following #1508.
1 parent 27da0c8 commit a4f47b1

4 files changed

Lines changed: 92 additions & 90 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Please also have a look at our
1818

1919
### Changed
2020

21-
- `Rule\Rule` class is renamed to `Property\Declaration` (#1508, #1512)
21+
- `Rule\Rule` class is renamed to `Property\Declaration` (#1508, #1512, #1513)
2222
- `Rule::setRule()` and `getRule()` are replaced with `setPropertyName()` and
2323
`getPropertyName()` (#1506)
2424
- `Selector` is now represented as a sequence of `Selector\Component` objects

src/RuleSet/DeclarationBlock.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
use Sabberworm\CSS\Parsing\UnexpectedTokenException;
1818
use Sabberworm\CSS\Position\Position;
1919
use Sabberworm\CSS\Position\Positionable;
20+
use Sabberworm\CSS\Property\Declaration;
2021
use Sabberworm\CSS\Property\KeyframeSelector;
2122
use Sabberworm\CSS\Property\Selector;
22-
use Sabberworm\CSS\Rule\Rule;
2323
use Sabberworm\CSS\Settings;
2424

2525
/**
@@ -182,13 +182,13 @@ public function getRuleSet(): RuleSet
182182
/**
183183
* @see RuleSet::addRule()
184184
*/
185-
public function addRule(Rule $ruleToAdd, ?Rule $sibling = null): void
185+
public function addRule(Declaration $declarationToAdd, ?Declaration $sibling = null): void
186186
{
187-
$this->ruleSet->addRule($ruleToAdd, $sibling);
187+
$this->ruleSet->addRule($declarationToAdd, $sibling);
188188
}
189189

190190
/**
191-
* @return array<int<0, max>, Rule>
191+
* @return array<int<0, max>, Declaration>
192192
*
193193
* @see RuleSet::getRules()
194194
*/
@@ -198,17 +198,17 @@ public function getRules(?string $searchPattern = null): array
198198
}
199199

200200
/**
201-
* @param array<Rule> $rules
201+
* @param array<Declaration> $declarations
202202
*
203203
* @see RuleSet::setRules()
204204
*/
205-
public function setRules(array $rules): void
205+
public function setRules(array $declarations): void
206206
{
207-
$this->ruleSet->setRules($rules);
207+
$this->ruleSet->setRules($declarations);
208208
}
209209

210210
/**
211-
* @return array<string, Rule>
211+
* @return array<string, Declaration>
212212
*
213213
* @see RuleSet::getRulesAssoc()
214214
*/
@@ -220,9 +220,9 @@ public function getRulesAssoc(?string $searchPattern = null): array
220220
/**
221221
* @see RuleSet::removeRule()
222222
*/
223-
public function removeRule(Rule $ruleToRemove): void
223+
public function removeRule(Declaration $declarationToRemove): void
224224
{
225-
$this->ruleSet->removeRule($ruleToRemove);
225+
$this->ruleSet->removeRule($declarationToRemove);
226226
}
227227

228228
/**

src/RuleSet/RuleContainer.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,33 @@
44

55
namespace Sabberworm\CSS\RuleSet;
66

7-
use Sabberworm\CSS\Rule\Rule;
7+
use Sabberworm\CSS\Property\Declaration;
88

99
/**
1010
* Represents a CSS item that contains `Rules`, defining the methods to manipulate them.
1111
*/
1212
interface RuleContainer
1313
{
14-
public function addRule(Rule $ruleToAdd, ?Rule $sibling = null): void;
14+
public function addRule(Declaration $declarationToAdd, ?Declaration $sibling = null): void;
1515

16-
public function removeRule(Rule $ruleToRemove): void;
16+
public function removeRule(Declaration $declarationToRemove): void;
1717

1818
public function removeMatchingRules(string $searchPattern): void;
1919

2020
public function removeAllRules(): void;
2121

2222
/**
23-
* @param array<Rule> $rules
23+
* @param array<Declaration> $declarations
2424
*/
25-
public function setRules(array $rules): void;
25+
public function setRules(array $declarations): void;
2626

2727
/**
28-
* @return array<int<0, max>, Rule>
28+
* @return array<int<0, max>, Declaration>
2929
*/
3030
public function getRules(?string $searchPattern = null): array;
3131

3232
/**
33-
* @return array<string, Rule>
33+
* @return array<string, Declaration>
3434
*/
3535
public function getRulesAssoc(?string $searchPattern = null): array;
3636
}

0 commit comments

Comments
 (0)