Skip to content

Commit fc108c0

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

13 files changed

+30
-26
lines changed

‎CHANGELOG.md

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

8181
### Removed
8282

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

‎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);

‎tests/Unit/Value/CSSStringTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function setStringSetsString(): void
6363
/**
6464
* @test
6565
*/
66-
public function getLineNoByDefaultReturnsZero(): void
66+
public function getLineNumberByDefaultReturnsZero(): void
6767
{
6868
$subject = new CSSString('');
6969

@@ -73,7 +73,7 @@ public function getLineNoByDefaultReturnsZero(): void
7373
/**
7474
* @test
7575
*/
76-
public function getLineNoReturnsLineNumberProvidedToConstructor(): void
76+
public function getLineNumberReturnsLineNumberProvidedToConstructor(): void
7777
{
7878
$lineNumber = 42;
7979

‎tests/Unit/Value/CalcRuleValueListTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function getLineNumberByDefaultReturnsZero(): void
3939
/**
4040
* @test
4141
*/
42-
public function getLineNoReturnsLineNumberProvidedToConstructor(): void
42+
public function getLineNumberReturnsLineNumberProvidedToConstructor(): void
4343
{
4444
$lineNumber = 42;
4545

‎tests/Unit/Value/URLTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function setUrlReplacesUrl(): void
6363
/**
6464
* @test
6565
*/
66-
public function getLineNoByDefaultReturnsZero(): void
66+
public function getLineNumberByDefaultReturnsZero(): void
6767
{
6868
$subject = new URL(new CSSString('http://example.com'));
6969

@@ -73,7 +73,7 @@ public function getLineNoByDefaultReturnsZero(): void
7373
/**
7474
* @test
7575
*/
76-
public function getLineNoReturnsLineNumberProvidedToConstructor(): void
76+
public function getLineNumberReturnsLineNumberProvidedToConstructor(): void
7777
{
7878
$lineNumber = 17;
7979

‎tests/UnitDeprecated/Position/PositionTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function provideColumnNumber(): array
4848
/**
4949
* @test
5050
*/
51-
public function getLineNoInitiallyReturnsZero(): void
51+
public function getLineNumberInitiallyReturnsZero(): void
5252
{
5353
self::assertSame(0, $this->subject->getLineNo());
5454
}
@@ -58,7 +58,7 @@ public function getLineNoInitiallyReturnsZero(): void
5858
*
5959
* @dataProvider provideLineNumber
6060
*/
61-
public function getLineNoReturnsLineNumberSet(int $lineNumber): void
61+
public function getLineNumberReturnsLineNumberSet(int $lineNumber): void
6262
{
6363
$this->subject->setPosition($lineNumber);
6464

@@ -68,7 +68,7 @@ public function getLineNoReturnsLineNumberSet(int $lineNumber): void
6868
/**
6969
* @test
7070
*/
71-
public function getLineNoReturnsZeroAfterLineNumberCleared(): void
71+
public function getLineNumberReturnsZeroAfterLineNumberCleared(): void
7272
{
7373
$this->subject->setPosition(99);
7474

@@ -80,7 +80,7 @@ public function getLineNoReturnsZeroAfterLineNumberCleared(): void
8080
/**
8181
* @test
8282
*/
83-
public function getColNoInitiallyReturnsZero(): void
83+
public function getColumnNumberInitiallyReturnsZero(): void
8484
{
8585
self::assertSame(0, $this->subject->getColNo());
8686
}
@@ -90,7 +90,7 @@ public function getColNoInitiallyReturnsZero(): void
9090
*
9191
* @dataProvider provideColumnNumber
9292
*/
93-
public function getColNoReturnsColumnNumberSet(int $columnNumber): void
93+
public function getColumnNumberReturnsColumnNumberSet(int $columnNumber): void
9494
{
9595
$this->subject->setPosition(1, $columnNumber);
9696

@@ -100,7 +100,7 @@ public function getColNoReturnsColumnNumberSet(int $columnNumber): void
100100
/**
101101
* @test
102102
*/
103-
public function getColNoReturnsZeroAfterColumnNumberCleared(): void
103+
public function getColumnNumberReturnsZeroAfterColumnNumberCleared(): void
104104
{
105105
$this->subject->setPosition(1, 99);
106106

@@ -124,7 +124,7 @@ public function setPositionWithZeroClearsLineNumber(): void
124124
/**
125125
* @test
126126
*/
127-
public function getLineNoAfterSetPositionWithZeroReturnsZero(): void
127+
public function getLineNumberAfterSetPositionWithZeroReturnsZero(): void
128128
{
129129
$this->subject->setPosition(99);
130130

0 commit comments

Comments
 (0)