Skip to content
Merged
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ Please also have a look at our

### Removed

- Remove `getLineNo()` from these classes (use `getLineNumber()` instead):
`Comment`, `CSSList`, `SourceException`, `Charset`, `CSSNamespace`, `Import`,
`Rule`, `DeclarationBlock`, `RuleSet`, `CSSFunction`, `Value` (#1258)
- Remove `Rule::getColNo()` (use `getColumnNumber()` instead) (#1287)
- Passing a string as the first argument to `getAllValues()` is no longer
supported and will not work;
Expand Down
8 changes: 0 additions & 8 deletions src/Position/Position.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,6 @@ public function getLineNumber(): ?int
return $this->lineNumber;
}

/**
* @return int<0, max>
*/
public function getLineNo(): int
{
return $this->getLineNumber() ?? 0;
}

/**
* @return int<0, max>|null
*/
Expand Down
7 changes: 0 additions & 7 deletions src/Position/Positionable.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,6 @@ interface Positionable
*/
public function getLineNumber(): ?int;

/**
* @return int<0, max>
*
* @deprecated in version 8.9.0, will be removed in v9.0. Use `getLineNumber()` instead.
*/
public function getLineNo(): int;

/**
* @return int<0, max>|null
*/
Expand Down
12 changes: 0 additions & 12 deletions tests/Unit/CSSList/AtRuleBlockListTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -114,18 +114,6 @@ public function atRuleArgsReturnsArgumentsProvidedToConstructor(): void
self::assertSame($arguments, $subject->atRuleArgs());
}

/**
* @test
*/
public function getLineNoReturnsLineNumberProvidedToConstructor(): void
{
$lineNumber = 42;

$subject = new AtRuleBlockList('', '', $lineNumber);

self::assertSame($lineNumber, $subject->getLineNo());
}

/**
* @test
*/
Expand Down
22 changes: 0 additions & 22 deletions tests/Unit/CSSList/CSSListTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,28 +57,6 @@ public function implementsCSSListItem(): void
self::assertInstanceOf(CSSListItem::class, $subject);
}

/**
* @test
*/
public function getLineNoByDefaultReturnsZero(): void
{
$subject = new ConcreteCSSList();

self::assertSame(0, $subject->getLineNo());
}

/**
* @test
*/
public function getLineNoReturnsLineNumberProvidedToConstructor(): void
{
$lineNumber = 42;

$subject = new ConcreteCSSList($lineNumber);

self::assertSame($lineNumber, $subject->getLineNo());
}

/**
* @test
*/
Expand Down
12 changes: 0 additions & 12 deletions tests/Unit/CSSList/KeyFrameTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,6 @@ public function isCSSList(): void
self::assertInstanceOf(CSSList::class, $subject);
}

/**
* @test
*/
public function getLineNoReturnsLineNumberProvidedToConstructor(): void
{
$lineNumber = 42;

$subject = new KeyFrame($lineNumber);

self::assertSame($lineNumber, $subject->getLineNo());
}

/**
* @test
*/
Expand Down
21 changes: 0 additions & 21 deletions tests/Unit/Comment/CommentTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,27 +57,6 @@ public function setCommentSetsComments(): void
self::assertSame($comment, $subject->getComment());
}

/**
* @test
*/
public function getLineNoOnEmptyInstanceReturnsZero(): void
{
$subject = new Comment();

self::assertSame(0, $subject->getLineNo());
}

/**
* @test
*/
public function getLineNoInitiallyReturnsLineNumberPassedToConstructor(): void
{
$lineNumber = 42;
$subject = new Comment('', $lineNumber);

self::assertSame($lineNumber, $subject->getLineNo());
}

/**
* @test
*/
Expand Down
21 changes: 0 additions & 21 deletions tests/Unit/Parsing/OutputExceptionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,27 +32,6 @@ public function getMessageReturnsMessageProvidedToConstructor(): void
self::assertStringContainsString($message, $exception->getMessage());
}

/**
* @test
*/
public function getLineNoByDefaultReturnsZero(): void
{
$exception = new OutputException('foo');

self::assertSame(0, $exception->getLineNo());
}

/**
* @test
*/
public function getLineNoReturnsLineNumberProvidedToConstructor(): void
{
$lineNumber = 17;
$exception = new OutputException('foo', $lineNumber);

self::assertSame($lineNumber, $exception->getLineNo());
}

/**
* @test
*/
Expand Down
21 changes: 0 additions & 21 deletions tests/Unit/Parsing/SourceExceptionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,27 +23,6 @@ public function getMessageReturnsMessageProvidedToConstructor(): void
self::assertStringContainsString($message, $exception->getMessage());
}

/**
* @test
*/
public function getLineNoByDefaultReturnsZero(): void
{
$exception = new SourceException('foo');

self::assertSame(0, $exception->getLineNo());
}

/**
* @test
*/
public function getLineNoReturnsLineNumberProvidedToConstructor(): void
{
$lineNumber = 17;
$exception = new SourceException('foo', $lineNumber);

self::assertSame($lineNumber, $exception->getLineNo());
}

/**
* @test
*/
Expand Down
21 changes: 0 additions & 21 deletions tests/Unit/Parsing/UnexpectedEOFExceptionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,27 +21,6 @@ public function extendsUnexpectedTokenException(): void
self::assertInstanceOf(UnexpectedTokenException::class, new UnexpectedEOFException('expected', 'found'));
}

/**
* @test
*/
public function getLineNoByDefaultReturnsZero(): void
{
$exception = new UnexpectedEOFException('expected', 'found');

self::assertSame(0, $exception->getLineNo());
}

/**
* @test
*/
public function getLineNoReturnsLineNumberProvidedToConstructor(): void
{
$lineNumber = 17;
$exception = new UnexpectedEOFException('expected', 'found', 'literal', $lineNumber);

self::assertSame($lineNumber, $exception->getLineNo());
}

/**
* @test
*/
Expand Down
21 changes: 0 additions & 21 deletions tests/Unit/Parsing/UnexpectedTokenExceptionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,27 +21,6 @@ public function extendsSourceException(): void
self::assertInstanceOf(SourceException::class, new UnexpectedTokenException('expected', 'found'));
}

/**
* @test
*/
public function getLineNoByDefaultReturnsZero(): void
{
$exception = new UnexpectedTokenException('expected', 'found');

self::assertSame(0, $exception->getLineNo());
}

/**
* @test
*/
public function getLineNoReturnsLineNumberProvidedToConstructor(): void
{
$lineNumber = 17;
$exception = new UnexpectedTokenException('expected', 'found', 'literal', $lineNumber);

self::assertSame($lineNumber, $exception->getLineNo());
}

/**
* @test
*/
Expand Down
22 changes: 0 additions & 22 deletions tests/Unit/Value/CSSStringTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,28 +60,6 @@ public function setStringSetsString(): void
self::assertSame($string, $subject->getString());
}

/**
* @test
*/
public function getLineNoByDefaultReturnsZero(): void
{
$subject = new CSSString('');

self::assertSame(0, $subject->getLineNo());
}

/**
* @test
*/
public function getLineNoReturnsLineNumberProvidedToConstructor(): void
{
$lineNumber = 42;

$subject = new CSSString('', $lineNumber);

self::assertSame($lineNumber, $subject->getLineNo());
}

/**
* @test
*/
Expand Down
22 changes: 0 additions & 22 deletions tests/Unit/Value/CalcRuleValueListTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,28 +26,6 @@ public function isRuleValueList(): void
self::assertInstanceOf(RuleValueList::class, $subject);
}

/**
* @test
*/
public function getLineNoByDefaultReturnsZero(): void
{
$subject = new CalcRuleValueList();

self::assertSame(0, $subject->getLineNo());
}

/**
* @test
*/
public function getLineNoReturnsLineNumberProvidedToConstructor(): void
{
$lineNumber = 42;

$subject = new CalcRuleValueList($lineNumber);

self::assertSame($lineNumber, $subject->getLineNo());
}

/**
* @test
*/
Expand Down
22 changes: 0 additions & 22 deletions tests/Unit/Value/URLTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,28 +60,6 @@ public function setUrlReplacesUrl(): void
self::assertSame($newUrl, $subject->getURL());
}

/**
* @test
*/
public function getLineNoByDefaultReturnsZero(): void
{
$subject = new URL(new CSSString('http://example.com'));

self::assertSame(0, $subject->getLineNo());
}

/**
* @test
*/
public function getLineNoReturnsLineNumberProvidedToConstructor(): void
{
$lineNumber = 17;

$subject = new URL(new CSSString('http://example.com'), $lineNumber);

self::assertSame($lineNumber, $subject->getLineNo());
}

/**
* @test
*/
Expand Down
Empty file added tests/UnitDeprecated/.gitkeep
Empty file.
Loading