Skip to content

[TASK] Remove getLineNo() and getColNo() #1258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/CSSList/AtRuleBlockListTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public function atRuleArgsReturnsArgumentsProvidedToConstructor(): void
/**
* @test
*/
public function getLineNoReturnsLineNumberProvidedToConstructor(): void
public function getLineNumberReturnsLineNumberProvidedToConstructor(): void
{
$lineNumber = 42;

Expand Down
4 changes: 2 additions & 2 deletions tests/Unit/CSSList/CSSListTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public function implementsCSSListItem(): void
/**
* @test
*/
public function getLineNoByDefaultReturnsZero(): void
public function getLineNumberByDefaultReturnsZero(): void
{
$subject = new ConcreteCSSList();

Expand All @@ -70,7 +70,7 @@ public function getLineNoByDefaultReturnsZero(): void
/**
* @test
*/
public function getLineNoReturnsLineNumberProvidedToConstructor(): void
public function getLineNumberReturnsLineNumberProvidedToConstructor(): void
{
$lineNumber = 42;

Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/CSSList/KeyFrameTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public function isCSSList(): void
/**
* @test
*/
public function getLineNoReturnsLineNumberProvidedToConstructor(): void
public function getLineNumberReturnsLineNumberProvidedToConstructor(): void
{
$lineNumber = 42;

Expand Down
4 changes: 2 additions & 2 deletions tests/Unit/Comment/CommentTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public function setCommentSetsComments(): void
/**
* @test
*/
public function getLineNoOnEmptyInstanceReturnsZero(): void
public function getLineNumberOnEmptyInstanceReturnsZero(): void
{
$subject = new Comment();

Expand All @@ -70,7 +70,7 @@ public function getLineNoOnEmptyInstanceReturnsZero(): void
/**
* @test
*/
public function getLineNoInitiallyReturnsLineNumberPassedToConstructor(): void
public function getLineNumberInitiallyReturnsLineNumberPassedToConstructor(): void
{
$lineNumber = 42;
$subject = new Comment('', $lineNumber);
Expand Down
4 changes: 2 additions & 2 deletions tests/Unit/Parsing/OutputExceptionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public function getMessageReturnsMessageProvidedToConstructor(): void
/**
* @test
*/
public function getLineNoByDefaultReturnsZero(): void
public function getLineNumberByDefaultReturnsZero(): void
{
$exception = new OutputException('foo');

Expand All @@ -45,7 +45,7 @@ public function getLineNoByDefaultReturnsZero(): void
/**
* @test
*/
public function getLineNoReturnsLineNumberProvidedToConstructor(): void
public function getLineNumberReturnsLineNumberProvidedToConstructor(): void
{
$lineNumber = 17;
$exception = new OutputException('foo', $lineNumber);
Expand Down
4 changes: 2 additions & 2 deletions tests/Unit/Parsing/SourceExceptionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public function getMessageReturnsMessageProvidedToConstructor(): void
/**
* @test
*/
public function getLineNoByDefaultReturnsZero(): void
public function getLineNumberByDefaultReturnsZero(): void
{
$exception = new SourceException('foo');

Expand All @@ -36,7 +36,7 @@ public function getLineNoByDefaultReturnsZero(): void
/**
* @test
*/
public function getLineNoReturnsLineNumberProvidedToConstructor(): void
public function getLineNumberReturnsLineNumberProvidedToConstructor(): void
{
$lineNumber = 17;
$exception = new SourceException('foo', $lineNumber);
Expand Down
4 changes: 2 additions & 2 deletions tests/Unit/Parsing/UnexpectedEOFExceptionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public function extendsUnexpectedTokenException(): void
/**
* @test
*/
public function getLineNoByDefaultReturnsZero(): void
public function getLineNumberByDefaultReturnsZero(): void
{
$exception = new UnexpectedEOFException('expected', 'found');

Expand All @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions tests/Unit/Parsing/UnexpectedTokenExceptionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public function extendsSourceException(): void
/**
* @test
*/
public function getLineNoByDefaultReturnsZero(): void
public function getLineNumberByDefaultReturnsZero(): void
{
$exception = new UnexpectedTokenException('expected', 'found');

Expand All @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions tests/Unit/Value/CSSStringTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public function setStringSetsString(): void
/**
* @test
*/
public function getLineNoByDefaultReturnsZero(): void
public function getLineNumberByDefaultReturnsZero(): void
{
$subject = new CSSString('');

Expand All @@ -73,7 +73,7 @@ public function getLineNoByDefaultReturnsZero(): void
/**
* @test
*/
public function getLineNoReturnsLineNumberProvidedToConstructor(): void
public function getLineNumberReturnsLineNumberProvidedToConstructor(): void
{
$lineNumber = 42;

Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Value/CalcRuleValueListTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function getLineNumberByDefaultReturnsZero(): void
/**
* @test
*/
public function getLineNoReturnsLineNumberProvidedToConstructor(): void
public function getLineNumberReturnsLineNumberProvidedToConstructor(): void
{
$lineNumber = 42;

Expand Down
4 changes: 2 additions & 2 deletions tests/Unit/Value/URLTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'));

Expand All @@ -73,7 +73,7 @@ public function getLineNoByDefaultReturnsZero(): void
/**
* @test
*/
public function getLineNoReturnsLineNumberProvidedToConstructor(): void
public function getLineNumberReturnsLineNumberProvidedToConstructor(): void
{
$lineNumber = 17;

Expand Down
14 changes: 7 additions & 7 deletions tests/UnitDeprecated/Position/PositionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public function provideColumnNumber(): array
/**
* @test
*/
public function getLineNoInitiallyReturnsZero(): void
public function getLineNumberInitiallyReturnsZero(): void
{
self::assertSame(0, $this->subject->getLineNo());
}
Expand All @@ -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);

Expand All @@ -68,7 +68,7 @@ public function getLineNoReturnsLineNumberSet(int $lineNumber): void
/**
* @test
*/
public function getLineNoReturnsZeroAfterLineNumberCleared(): void
public function getLineNumberReturnsZeroAfterLineNumberCleared(): void
{
$this->subject->setPosition(99);

Expand All @@ -80,7 +80,7 @@ public function getLineNoReturnsZeroAfterLineNumberCleared(): void
/**
* @test
*/
public function getColNoInitiallyReturnsZero(): void
public function getColumnNumberInitiallyReturnsZero(): void
{
self::assertSame(0, $this->subject->getColNo());
}
Expand All @@ -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);

Expand All @@ -100,7 +100,7 @@ public function getColNoReturnsColumnNumberSet(int $columnNumber): void
/**
* @test
*/
public function getColNoReturnsZeroAfterColumnNumberCleared(): void
public function getColumnNumberReturnsZeroAfterColumnNumberCleared(): void
{
$this->subject->setPosition(1, 99);

Expand All @@ -124,7 +124,7 @@ public function setPositionWithZeroClearsLineNumber(): void
/**
* @test
*/
public function getLineNoAfterSetPositionWithZeroReturnsZero(): void
public function getLineNumberAfterSetPositionWithZeroReturnsZero(): void
{
$this->subject->setPosition(99);

Expand Down