Skip to content

Commit be60456

Browse files
authored
[BUGFIX] Ensure valid position for first Rule added to RuleSet (#1262)
Part of #974.
1 parent 6c565cf commit be60456

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ Please also have a look at our
105105

106106
### Fixed
107107

108+
- Ensure first rule added with `RuleSet::addRule()` has valid position (#1262)
108109
- Don't render `rgb` colors with percentage values using hex notation (#803)
109110

110111
### Documentation

src/RuleSet/RuleSet.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@ public function addRule(Rule $ruleToAdd, ?Rule $sibling = null): void
117117
if ($rulesCount > 0) {
118118
$last = $rules[$rulesCount - 1];
119119
$ruleToAdd->setPosition($last->getLineNo() + 1, 0);
120+
} else {
121+
$ruleToAdd->setPosition(1, 0);
120122
}
121123
} elseif ($ruleToAdd->getColumnNumber() === null) {
122124
$ruleToAdd->setPosition($ruleToAdd->getLineNumber(), 0);

tests/Unit/RuleSet/RuleSetTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,6 @@ public function addRuleWithoutSiblingAddsRuleAfterInitialRulesAndSetsValidLineAn
9595
array $initialPropertyNames,
9696
string $propertyNameToAdd
9797
): void {
98-
if ($initialPropertyNames === []) {
99-
self::markTestSkipped('currently broken - first rule added does not have valid line number set');
100-
}
101-
10298
$ruleToAdd = new Rule($propertyNameToAdd);
10399
$this->setRulesFromPropertyNames($initialPropertyNames);
104100

0 commit comments

Comments
 (0)