From fc108c0b919f5dff4cad6b440c25e7824c048df4 Mon Sep 17 00:00:00 2001 From: Jake Hotson Date: Wed, 21 May 2025 23:46:08 +0100 Subject: [PATCH] [TASK] Remove `getLineNo()` and `getColNo()` Part of #974. --- CHANGELOG.md | 4 ++++ tests/Unit/CSSList/AtRuleBlockListTest.php | 2 +- tests/Unit/CSSList/CSSListTest.php | 4 ++-- tests/Unit/CSSList/KeyFrameTest.php | 2 +- tests/Unit/Comment/CommentTest.php | 4 ++-- tests/Unit/Parsing/OutputExceptionTest.php | 4 ++-- tests/Unit/Parsing/SourceExceptionTest.php | 4 ++-- tests/Unit/Parsing/UnexpectedEOFExceptionTest.php | 4 ++-- .../Unit/Parsing/UnexpectedTokenExceptionTest.php | 4 ++-- tests/Unit/Value/CSSStringTest.php | 4 ++-- tests/Unit/Value/CalcRuleValueListTest.php | 2 +- tests/Unit/Value/URLTest.php | 4 ++-- tests/UnitDeprecated/Position/PositionTest.php | 14 +++++++------- 13 files changed, 30 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5255f87e..77eb29b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -80,6 +80,10 @@ Please also have a look at our ### Removed +- `getLineNo()` is removed from these classes (use `getLineNumber()` instead): + `Comment`, `CSSList`, `SourceException`, `Charset`, `CSSNamespace`, `Import`, + `Rule`, `DeclarationBlock`, `RuleSet`, `CSSFunction`, `Value` (#1258) +- `Rule::getColNo()` is removed (use `getColumnNumber()` instead) (#1258) - Passing a string as the first argument to `getAllValues()` is no longer supported and will not work; the search pattern should now be passed as the second argument (#1243) diff --git a/tests/Unit/CSSList/AtRuleBlockListTest.php b/tests/Unit/CSSList/AtRuleBlockListTest.php index 0252f7d3..4c73675b 100644 --- a/tests/Unit/CSSList/AtRuleBlockListTest.php +++ b/tests/Unit/CSSList/AtRuleBlockListTest.php @@ -117,7 +117,7 @@ public function atRuleArgsReturnsArgumentsProvidedToConstructor(): void /** * @test */ - public function getLineNoReturnsLineNumberProvidedToConstructor(): void + public function getLineNumberReturnsLineNumberProvidedToConstructor(): void { $lineNumber = 42; diff --git a/tests/Unit/CSSList/CSSListTest.php b/tests/Unit/CSSList/CSSListTest.php index 03539533..bd086508 100644 --- a/tests/Unit/CSSList/CSSListTest.php +++ b/tests/Unit/CSSList/CSSListTest.php @@ -60,7 +60,7 @@ public function implementsCSSListItem(): void /** * @test */ - public function getLineNoByDefaultReturnsZero(): void + public function getLineNumberByDefaultReturnsZero(): void { $subject = new ConcreteCSSList(); @@ -70,7 +70,7 @@ public function getLineNoByDefaultReturnsZero(): void /** * @test */ - public function getLineNoReturnsLineNumberProvidedToConstructor(): void + public function getLineNumberReturnsLineNumberProvidedToConstructor(): void { $lineNumber = 42; diff --git a/tests/Unit/CSSList/KeyFrameTest.php b/tests/Unit/CSSList/KeyFrameTest.php index a3a0d43a..df6fc0dd 100644 --- a/tests/Unit/CSSList/KeyFrameTest.php +++ b/tests/Unit/CSSList/KeyFrameTest.php @@ -71,7 +71,7 @@ public function isCSSList(): void /** * @test */ - public function getLineNoReturnsLineNumberProvidedToConstructor(): void + public function getLineNumberReturnsLineNumberProvidedToConstructor(): void { $lineNumber = 42; diff --git a/tests/Unit/Comment/CommentTest.php b/tests/Unit/Comment/CommentTest.php index 2bfe670c..b36b18ea 100644 --- a/tests/Unit/Comment/CommentTest.php +++ b/tests/Unit/Comment/CommentTest.php @@ -60,7 +60,7 @@ public function setCommentSetsComments(): void /** * @test */ - public function getLineNoOnEmptyInstanceReturnsZero(): void + public function getLineNumberOnEmptyInstanceReturnsZero(): void { $subject = new Comment(); @@ -70,7 +70,7 @@ public function getLineNoOnEmptyInstanceReturnsZero(): void /** * @test */ - public function getLineNoInitiallyReturnsLineNumberPassedToConstructor(): void + public function getLineNumberInitiallyReturnsLineNumberPassedToConstructor(): void { $lineNumber = 42; $subject = new Comment('', $lineNumber); diff --git a/tests/Unit/Parsing/OutputExceptionTest.php b/tests/Unit/Parsing/OutputExceptionTest.php index d3409aa4..bf099010 100644 --- a/tests/Unit/Parsing/OutputExceptionTest.php +++ b/tests/Unit/Parsing/OutputExceptionTest.php @@ -35,7 +35,7 @@ public function getMessageReturnsMessageProvidedToConstructor(): void /** * @test */ - public function getLineNoByDefaultReturnsZero(): void + public function getLineNumberByDefaultReturnsZero(): void { $exception = new OutputException('foo'); @@ -45,7 +45,7 @@ public function getLineNoByDefaultReturnsZero(): void /** * @test */ - public function getLineNoReturnsLineNumberProvidedToConstructor(): void + public function getLineNumberReturnsLineNumberProvidedToConstructor(): void { $lineNumber = 17; $exception = new OutputException('foo', $lineNumber); diff --git a/tests/Unit/Parsing/SourceExceptionTest.php b/tests/Unit/Parsing/SourceExceptionTest.php index b497ff52..0385f578 100644 --- a/tests/Unit/Parsing/SourceExceptionTest.php +++ b/tests/Unit/Parsing/SourceExceptionTest.php @@ -26,7 +26,7 @@ public function getMessageReturnsMessageProvidedToConstructor(): void /** * @test */ - public function getLineNoByDefaultReturnsZero(): void + public function getLineNumberByDefaultReturnsZero(): void { $exception = new SourceException('foo'); @@ -36,7 +36,7 @@ public function getLineNoByDefaultReturnsZero(): void /** * @test */ - public function getLineNoReturnsLineNumberProvidedToConstructor(): void + public function getLineNumberReturnsLineNumberProvidedToConstructor(): void { $lineNumber = 17; $exception = new SourceException('foo', $lineNumber); diff --git a/tests/Unit/Parsing/UnexpectedEOFExceptionTest.php b/tests/Unit/Parsing/UnexpectedEOFExceptionTest.php index 929609ef..6fa2e281 100644 --- a/tests/Unit/Parsing/UnexpectedEOFExceptionTest.php +++ b/tests/Unit/Parsing/UnexpectedEOFExceptionTest.php @@ -24,7 +24,7 @@ public function extendsUnexpectedTokenException(): void /** * @test */ - public function getLineNoByDefaultReturnsZero(): void + public function getLineNumberByDefaultReturnsZero(): void { $exception = new UnexpectedEOFException('expected', 'found'); @@ -34,7 +34,7 @@ public function getLineNoByDefaultReturnsZero(): void /** * @test */ - public function getLineNoReturnsLineNumberProvidedToConstructor(): void + public function getLineNumberReturnsLineNumberProvidedToConstructor(): void { $lineNumber = 17; $exception = new UnexpectedEOFException('expected', 'found', 'literal', $lineNumber); diff --git a/tests/Unit/Parsing/UnexpectedTokenExceptionTest.php b/tests/Unit/Parsing/UnexpectedTokenExceptionTest.php index e5c7a64d..642ac1ed 100644 --- a/tests/Unit/Parsing/UnexpectedTokenExceptionTest.php +++ b/tests/Unit/Parsing/UnexpectedTokenExceptionTest.php @@ -24,7 +24,7 @@ public function extendsSourceException(): void /** * @test */ - public function getLineNoByDefaultReturnsZero(): void + public function getLineNumberByDefaultReturnsZero(): void { $exception = new UnexpectedTokenException('expected', 'found'); @@ -34,7 +34,7 @@ public function getLineNoByDefaultReturnsZero(): void /** * @test */ - public function getLineNoReturnsLineNumberProvidedToConstructor(): void + public function getLineNumberReturnsLineNumberProvidedToConstructor(): void { $lineNumber = 17; $exception = new UnexpectedTokenException('expected', 'found', 'literal', $lineNumber); diff --git a/tests/Unit/Value/CSSStringTest.php b/tests/Unit/Value/CSSStringTest.php index e88f3554..ed5d52df 100644 --- a/tests/Unit/Value/CSSStringTest.php +++ b/tests/Unit/Value/CSSStringTest.php @@ -63,7 +63,7 @@ public function setStringSetsString(): void /** * @test */ - public function getLineNoByDefaultReturnsZero(): void + public function getLineNumberByDefaultReturnsZero(): void { $subject = new CSSString(''); @@ -73,7 +73,7 @@ public function getLineNoByDefaultReturnsZero(): void /** * @test */ - public function getLineNoReturnsLineNumberProvidedToConstructor(): void + public function getLineNumberReturnsLineNumberProvidedToConstructor(): void { $lineNumber = 42; diff --git a/tests/Unit/Value/CalcRuleValueListTest.php b/tests/Unit/Value/CalcRuleValueListTest.php index 5d73d9e9..a0157b8a 100644 --- a/tests/Unit/Value/CalcRuleValueListTest.php +++ b/tests/Unit/Value/CalcRuleValueListTest.php @@ -39,7 +39,7 @@ public function getLineNumberByDefaultReturnsZero(): void /** * @test */ - public function getLineNoReturnsLineNumberProvidedToConstructor(): void + public function getLineNumberReturnsLineNumberProvidedToConstructor(): void { $lineNumber = 42; diff --git a/tests/Unit/Value/URLTest.php b/tests/Unit/Value/URLTest.php index 42d96e29..6d1e46b6 100644 --- a/tests/Unit/Value/URLTest.php +++ b/tests/Unit/Value/URLTest.php @@ -63,7 +63,7 @@ public function setUrlReplacesUrl(): void /** * @test */ - public function getLineNoByDefaultReturnsZero(): void + public function getLineNumberByDefaultReturnsZero(): void { $subject = new URL(new CSSString('http://example.com')); @@ -73,7 +73,7 @@ public function getLineNoByDefaultReturnsZero(): void /** * @test */ - public function getLineNoReturnsLineNumberProvidedToConstructor(): void + public function getLineNumberReturnsLineNumberProvidedToConstructor(): void { $lineNumber = 17; diff --git a/tests/UnitDeprecated/Position/PositionTest.php b/tests/UnitDeprecated/Position/PositionTest.php index 2e06cc6d..8d3785e4 100644 --- a/tests/UnitDeprecated/Position/PositionTest.php +++ b/tests/UnitDeprecated/Position/PositionTest.php @@ -48,7 +48,7 @@ public function provideColumnNumber(): array /** * @test */ - public function getLineNoInitiallyReturnsZero(): void + public function getLineNumberInitiallyReturnsZero(): void { self::assertSame(0, $this->subject->getLineNo()); } @@ -58,7 +58,7 @@ public function getLineNoInitiallyReturnsZero(): void * * @dataProvider provideLineNumber */ - public function getLineNoReturnsLineNumberSet(int $lineNumber): void + public function getLineNumberReturnsLineNumberSet(int $lineNumber): void { $this->subject->setPosition($lineNumber); @@ -68,7 +68,7 @@ public function getLineNoReturnsLineNumberSet(int $lineNumber): void /** * @test */ - public function getLineNoReturnsZeroAfterLineNumberCleared(): void + public function getLineNumberReturnsZeroAfterLineNumberCleared(): void { $this->subject->setPosition(99); @@ -80,7 +80,7 @@ public function getLineNoReturnsZeroAfterLineNumberCleared(): void /** * @test */ - public function getColNoInitiallyReturnsZero(): void + public function getColumnNumberInitiallyReturnsZero(): void { self::assertSame(0, $this->subject->getColNo()); } @@ -90,7 +90,7 @@ public function getColNoInitiallyReturnsZero(): void * * @dataProvider provideColumnNumber */ - public function getColNoReturnsColumnNumberSet(int $columnNumber): void + public function getColumnNumberReturnsColumnNumberSet(int $columnNumber): void { $this->subject->setPosition(1, $columnNumber); @@ -100,7 +100,7 @@ public function getColNoReturnsColumnNumberSet(int $columnNumber): void /** * @test */ - public function getColNoReturnsZeroAfterColumnNumberCleared(): void + public function getColumnNumberReturnsZeroAfterColumnNumberCleared(): void { $this->subject->setPosition(1, 99); @@ -124,7 +124,7 @@ public function setPositionWithZeroClearsLineNumber(): void /** * @test */ - public function getLineNoAfterSetPositionWithZeroReturnsZero(): void + public function getLineNumberAfterSetPositionWithZeroReturnsZero(): void { $this->subject->setPosition(99);