Skip to content

Commit 5493982

Browse files
oliverkleeJakeQZ
andauthored
[TASK] Use native type declarations for $lineNumber (#1134)
Part of #811 Co-authored-by: JakeQZ <jake.github@qzdesign.co.uk>
1 parent 6607f94 commit 5493982

20 files changed

Lines changed: 28 additions & 28 deletions

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Please also have a look at our
3232
- Make all non-private properties `@internal` (#886)
3333
- Use more native type declarations and strict mode
3434
(#641, #772, #774, #778, #804, #841, #873, #875, #891, #922, #923, #933, #958,
35-
#964, #967, #1000, #1044)
35+
#964, #967, #1000, #1044, #1134)
3636
- Add visibility to all class/interface constants (#469)
3737

3838
### Deprecated

src/CSSList/CSSList.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ abstract class CSSList implements Renderable, Commentable
5757
/**
5858
* @param int<0, max> $lineNumber
5959
*/
60-
public function __construct($lineNumber = 0)
60+
public function __construct(int $lineNumber = 0)
6161
{
6262
$this->lineNumber = $lineNumber;
6363
}

src/Parser.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ class Parser
2020

2121
/**
2222
* @param string $text the complete CSS as text (i.e., usually the contents of a CSS file)
23-
* @param int<0, max> $lineNumber the line number (starting from 1, not from 0)
23+
* @param int<1, max> $lineNumber the line number (starting from 1, not from 0)
2424
*/
25-
public function __construct($text, ?Settings $parserSettings = null, $lineNumber = 1)
25+
public function __construct($text, ?Settings $parserSettings = null, int $lineNumber = 1)
2626
{
2727
if ($parserSettings === null) {
2828
$parserSettings = Settings::create();

src/Parsing/ParserState.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ class ParserState
4545
private $charset;
4646

4747
/**
48-
* @var int
48+
* @var int<1, max> $lineNumber
4949
*/
5050
private $lineNumber;
5151

5252
/**
5353
* @param string $text the complete CSS as text (i.e., usually the contents of a CSS file)
54-
* @param int<0, max> $lineNumber
54+
* @param int<1, max> $lineNumber
5555
*/
56-
public function __construct($text, Settings $parserSettings, $lineNumber = 1)
56+
public function __construct($text, Settings $parserSettings, int $lineNumber = 1)
5757
{
5858
$this->parserSettings = $parserSettings;
5959
$this->text = $text;
@@ -73,7 +73,7 @@ public function setCharset(string $charset): void
7373
}
7474

7575
/**
76-
* @return int
76+
* @return int<1, max>
7777
*/
7878
public function currentLine()
7979
{

src/Property/CSSNamespace.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class CSSNamespace implements AtRule
2323
private $prefix;
2424

2525
/**
26-
* @var int
26+
* @var int<0, max> $lineNumber
2727
*/
2828
private $lineNumber;
2929

@@ -39,7 +39,7 @@ class CSSNamespace implements AtRule
3939
* @param string|null $prefix
4040
* @param int<0, max> $lineNumber
4141
*/
42-
public function __construct($url, $prefix = null, $lineNumber = 0)
42+
public function __construct($url, $prefix = null, int $lineNumber = 0)
4343
{
4444
$this->url = $url;
4545
$this->prefix = $prefix;

src/Property/Charset.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class Charset implements AtRule
4040
/**
4141
* @param int<0, max> $lineNumber
4242
*/
43-
public function __construct(CSSString $charset, $lineNumber = 0)
43+
public function __construct(CSSString $charset, int $lineNumber = 0)
4444
{
4545
$this->charset = $charset;
4646
$this->lineNumber = $lineNumber;

src/Property/Import.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class Import implements AtRule
4141
* @param string $mediaQuery
4242
* @param int<0, max> $lineNumber
4343
*/
44-
public function __construct(URL $location, $mediaQuery, $lineNumber = 0)
44+
public function __construct(URL $location, $mediaQuery, int $lineNumber = 0)
4545
{
4646
$this->location = $location;
4747
$this->mediaQuery = $mediaQuery;

src/Rule/Rule.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class Rule implements Renderable, Commentable
3737
private $isImportant = false;
3838

3939
/**
40-
* @var int
40+
* @var int<0, max> $lineNumber
4141
*/
4242
protected $lineNumber;
4343

@@ -60,7 +60,7 @@ class Rule implements Renderable, Commentable
6060
* @param int<0, max> $lineNumber
6161
* @param int $columnNumber
6262
*/
63-
public function __construct($rule, $lineNumber = 0, $columnNumber = 0)
63+
public function __construct($rule, int $lineNumber = 0, $columnNumber = 0)
6464
{
6565
$this->rule = $rule;
6666
$this->lineNumber = $lineNumber;
@@ -143,10 +143,10 @@ public function getColNo()
143143
}
144144

145145
/**
146-
* @param int $lineNumber
146+
* @param int<0, max> $lineNumber
147147
* @param int $columnNumber
148148
*/
149-
public function setPosition($lineNumber, $columnNumber): void
149+
public function setPosition(int $lineNumber, $columnNumber): void
150150
{
151151
$this->columnNumber = $columnNumber;
152152
$this->lineNumber = $lineNumber;

src/RuleSet/AtRuleSet.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class AtRuleSet extends RuleSet implements AtRule
3030
* @param string $arguments
3131
* @param int<0, max> $lineNumber
3232
*/
33-
public function __construct($type, $arguments = '', $lineNumber = 0)
33+
public function __construct($type, $arguments = '', int $lineNumber = 0)
3434
{
3535
parent::__construct($lineNumber);
3636
$this->type = $type;

src/RuleSet/RuleSet.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ abstract class RuleSet implements Renderable, Commentable
4949
/**
5050
* @param int<0, max> $lineNumber
5151
*/
52-
public function __construct($lineNumber = 0)
52+
public function __construct(int $lineNumber = 0)
5353
{
5454
$this->lineNumber = $lineNumber;
5555
}

0 commit comments

Comments
 (0)