Skip to content

Commit e52cbb9

Browse files
committed
[TASK] Remove getLineNo() and getColNo()
Part of #974.
1 parent 8587712 commit e52cbb9

14 files changed

+31
-27
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@ Please also have a look at our
7878

7979
### Removed
8080

81+
- `getLineNo()` is removed from these classes (use `getLineNumber()` instead):
82+
`Comment`, `CSSList`, `SourceException`, `Charset`, `CSSNamespace`, `Import`,
83+
`Rule`, `DeclarationBlock`, `RuleSet`, `CSSFunction`, `Value` (#1258)
84+
- `Rule::getColNo()` is removed (use `getColumnNumber()` instead) (#1258)
8185
- Passing a string as the first argument to `getAllValues()` is no longer
8286
supported and will not work;
8387
the search pattern should now be passed as the second argument (#1243)

src/RuleSet/RuleSet.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public function addRule(Rule $ruleToAdd, ?Rule $sibling = null): void
107107
$siblingPosition = \array_search($sibling, $this->rules[$propertyName], true);
108108
if ($siblingPosition !== false) {
109109
$position = $siblingPosition;
110-
$ruleToAdd->setPosition($sibling->getLineNo(), $sibling->getColNo() - 1);
110+
$ruleToAdd->setPosition($sibling->getLineNumber(), $sibling->getColNo() - 1);
111111
}
112112
}
113113
if ($ruleToAdd->getLineNo() === 0 && $ruleToAdd->getColNo() === 0) {

tests/Unit/CSSList/AtRuleBlockListTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public function atRuleArgsReturnsArgumentsProvidedToConstructor(): void
117117
/**
118118
* @test
119119
*/
120-
public function getLineNoReturnsLineNumberProvidedToConstructor(): void
120+
public function getLineNumberReturnsLineNumberProvidedToConstructor(): void
121121
{
122122
$lineNumber = 42;
123123

tests/Unit/CSSList/CSSListTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function implementsCSSListItem(): void
6060
/**
6161
* @test
6262
*/
63-
public function getLineNoByDefaultReturnsZero(): void
63+
public function getLineNumberByDefaultReturnsZero(): void
6464
{
6565
$subject = new ConcreteCSSList();
6666

@@ -70,7 +70,7 @@ public function getLineNoByDefaultReturnsZero(): void
7070
/**
7171
* @test
7272
*/
73-
public function getLineNoReturnsLineNumberProvidedToConstructor(): void
73+
public function getLineNumberReturnsLineNumberProvidedToConstructor(): void
7474
{
7575
$lineNumber = 42;
7676

tests/Unit/CSSList/KeyFrameTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public function isCSSList(): void
7171
/**
7272
* @test
7373
*/
74-
public function getLineNoReturnsLineNumberProvidedToConstructor(): void
74+
public function getLineNumberReturnsLineNumberProvidedToConstructor(): void
7575
{
7676
$lineNumber = 42;
7777

tests/Unit/Comment/CommentTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function setCommentSetsComments(): void
6060
/**
6161
* @test
6262
*/
63-
public function getLineNoOnEmptyInstanceReturnsZero(): void
63+
public function getLineNumberOnEmptyInstanceReturnsZero(): void
6464
{
6565
$subject = new Comment();
6666

@@ -70,7 +70,7 @@ public function getLineNoOnEmptyInstanceReturnsZero(): void
7070
/**
7171
* @test
7272
*/
73-
public function getLineNoInitiallyReturnsLineNumberPassedToConstructor(): void
73+
public function getLineNumberInitiallyReturnsLineNumberPassedToConstructor(): void
7474
{
7575
$lineNumber = 42;
7676
$subject = new Comment('', $lineNumber);

tests/Unit/Parsing/OutputExceptionTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function getMessageReturnsMessageProvidedToConstructor(): void
3535
/**
3636
* @test
3737
*/
38-
public function getLineNoByDefaultReturnsZero(): void
38+
public function getLineNumberByDefaultReturnsZero(): void
3939
{
4040
$exception = new OutputException('foo');
4141

@@ -45,7 +45,7 @@ public function getLineNoByDefaultReturnsZero(): void
4545
/**
4646
* @test
4747
*/
48-
public function getLineNoReturnsLineNumberProvidedToConstructor(): void
48+
public function getLineNumberReturnsLineNumberProvidedToConstructor(): void
4949
{
5050
$lineNumber = 17;
5151
$exception = new OutputException('foo', $lineNumber);

tests/Unit/Parsing/SourceExceptionTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function getMessageReturnsMessageProvidedToConstructor(): void
2626
/**
2727
* @test
2828
*/
29-
public function getLineNoByDefaultReturnsZero(): void
29+
public function getLineNumberByDefaultReturnsZero(): void
3030
{
3131
$exception = new SourceException('foo');
3232

@@ -36,7 +36,7 @@ public function getLineNoByDefaultReturnsZero(): void
3636
/**
3737
* @test
3838
*/
39-
public function getLineNoReturnsLineNumberProvidedToConstructor(): void
39+
public function getLineNumberReturnsLineNumberProvidedToConstructor(): void
4040
{
4141
$lineNumber = 17;
4242
$exception = new SourceException('foo', $lineNumber);

tests/Unit/Parsing/UnexpectedEOFExceptionTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function extendsUnexpectedTokenException(): void
2424
/**
2525
* @test
2626
*/
27-
public function getLineNoByDefaultReturnsZero(): void
27+
public function getLineNumberByDefaultReturnsZero(): void
2828
{
2929
$exception = new UnexpectedEOFException('expected', 'found');
3030

@@ -34,7 +34,7 @@ public function getLineNoByDefaultReturnsZero(): void
3434
/**
3535
* @test
3636
*/
37-
public function getLineNoReturnsLineNumberProvidedToConstructor(): void
37+
public function getLineNumberReturnsLineNumberProvidedToConstructor(): void
3838
{
3939
$lineNumber = 17;
4040
$exception = new UnexpectedEOFException('expected', 'found', 'literal', $lineNumber);

tests/Unit/Parsing/UnexpectedTokenExceptionTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function extendsSourceException(): void
2424
/**
2525
* @test
2626
*/
27-
public function getLineNoByDefaultReturnsZero(): void
27+
public function getLineNumberByDefaultReturnsZero(): void
2828
{
2929
$exception = new UnexpectedTokenException('expected', 'found');
3030

@@ -34,7 +34,7 @@ public function getLineNoByDefaultReturnsZero(): void
3434
/**
3535
* @test
3636
*/
37-
public function getLineNoReturnsLineNumberProvidedToConstructor(): void
37+
public function getLineNumberReturnsLineNumberProvidedToConstructor(): void
3838
{
3939
$lineNumber = 17;
4040
$exception = new UnexpectedTokenException('expected', 'found', 'literal', $lineNumber);

0 commit comments

Comments
 (0)