Skip to content

Commit 06bd61b

Browse files
oliverkleeoliverklee
committed
[TASK] Use native types for all constructor parameters
Part of #811
1 parent 1d2d5f3 commit 06bd61b

20 files changed

+23
-40
lines changed

‎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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class Parser
2222
* @param string $text the complete CSS as text (i.e., usually the contents of a CSS file)
2323
* @param int<0, 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(string $text, ?Settings $parserSettings = null, int $lineNumber = 1)
2626
{
2727
if ($parserSettings === null) {
2828
$parserSettings = Settings::create();

‎src/Parsing/Anchor.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@ class Anchor
1919
*/
2020
private $parserState;
2121

22-
/**
23-
* @param int $position
24-
*/
25-
public function __construct($position, ParserState $parserState)
22+
public function __construct(int $position, ParserState $parserState)
2623
{
2724
$this->position = $position;
2825
$this->parserState = $parserState;

‎src/Parsing/ParserState.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class ParserState
5353
* @param string $text the complete CSS as text (i.e., usually the contents of a CSS file)
5454
* @param int<0, max> $lineNumber
5555
*/
56-
public function __construct($text, Settings $parserSettings, $lineNumber = 1)
56+
public function __construct(string $text, Settings $parserSettings, int $lineNumber = 1)
5757
{
5858
$this->parserSettings = $parserSettings;
5959
$this->text = $text;

‎src/Property/CSSNamespace.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,9 @@ class CSSNamespace implements AtRule
3535
protected $comments = [];
3636

3737
/**
38-
* @param string $url
39-
* @param string|null $prefix
4038
* @param int<0, max> $lineNumber
4139
*/
42-
public function __construct($url, $prefix = null, $lineNumber = 0)
40+
public function __construct(string $url, ?string $prefix = null, int $lineNumber = 0)
4341
{
4442
$this->url = $url;
4543
$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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,9 @@ class Import implements AtRule
3838
protected $comments = [];
3939

4040
/**
41-
* @param string $mediaQuery
4241
* @param int<0, max> $lineNumber
4342
*/
44-
public function __construct(URL $location, $mediaQuery, $lineNumber = 0)
43+
public function __construct(URL $location, string $mediaQuery, int $lineNumber = 0)
4544
{
4645
$this->location = $location;
4746
$this->mediaQuery = $mediaQuery;

‎src/Rule/Rule.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,9 @@ class Rule implements Renderable, Commentable
5656
protected $comments = [];
5757

5858
/**
59-
* @param string $rule
6059
* @param int<0, max> $lineNumber
61-
* @param int $columnNumber
6260
*/
63-
public function __construct($rule, $lineNumber = 0, $columnNumber = 0)
61+
public function __construct(string $rule, int $lineNumber = 0, int $columnNumber = 0)
6462
{
6563
$this->rule = $rule;
6664
$this->lineNumber = $lineNumber;

‎src/RuleSet/AtRuleSet.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,9 @@ class AtRuleSet extends RuleSet implements AtRule
2626
private $arguments;
2727

2828
/**
29-
* @param string $type
30-
* @param string $arguments
3129
* @param int<0, max> $lineNumber
3230
*/
33-
public function __construct($type, $arguments = '', $lineNumber = 0)
31+
public function __construct(string $type, string $arguments = '', int $lineNumber = 0)
3432
{
3533
parent::__construct($lineNumber);
3634
$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
}

‎src/Value/CSSFunction.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,10 @@ class CSSFunction extends ValueList
2424
protected $name;
2525

2626
/**
27-
* @param string $name
28-
* @param RuleValueList|array<array-key, Value|string> $arguments
29-
* @param string $separator
27+
* @param RuleValueList|array<array-key, Value|string> $aArguments
3028
* @param int<0, max> $lineNumber
3129
*/
32-
public function __construct($name, $arguments, $separator = ',', $lineNumber = 0)
30+
public function __construct(string $name, $arguments, string $separator = ',', int $lineNumber = 0)
3331
{
3432
if ($arguments instanceof RuleValueList) {
3533
$separator = $arguments->getListSeparator();

‎src/Value/CSSString.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@ class CSSString extends PrimitiveValue
2323
private $string;
2424

2525
/**
26-
* @param string $string
2726
* @param int<0, max> $lineNumber
2827
*/
29-
public function __construct($string, $lineNumber = 0)
28+
public function __construct(string $string, int $lineNumber = 0)
3029
{
3130
$this->string = $string;
3231
parent::__construct($lineNumber);

‎src/Value/CalcRuleValueList.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class CalcRuleValueList extends RuleValueList
1111
/**
1212
* @param int<0, max> $lineNumber
1313
*/
14-
public function __construct($lineNumber = 0)
14+
public function __construct(int $lineNumber = 0)
1515
{
1616
parent::__construct(',', $lineNumber);
1717
}

‎src/Value/Color.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class Color extends CSSFunction
1919
* @param array<array-key, Value|string> $colorValues
2020
* @param int<0, max> $lineNumber
2121
*/
22-
public function __construct(array $colorValues, $lineNumber = 0)
22+
public function __construct(array $colorValues, int $lineNumber = 0)
2323
{
2424
parent::__construct(\implode('', \array_keys($colorValues)), $colorValues, ',', $lineNumber);
2525
}

‎src/Value/LineName.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class LineName extends ValueList
1515
* @param array<int, Value|string> $components
1616
* @param int<0, max> $lineNumber
1717
*/
18-
public function __construct(array $components = [], $lineNumber = 0)
18+
public function __construct(array $components = [], int $lineNumber = 0)
1919
{
2020
parent::__construct($components, ' ', $lineNumber);
2121
}

‎src/Value/RuleValueList.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@
1212
class RuleValueList extends ValueList
1313
{
1414
/**
15-
* @param string $separator
1615
* @param int<0, max> $lineNumber
1716
*/
18-
public function __construct($separator = ',', $lineNumber = 0)
17+
public function __construct(string $separator = ',', int $lineNumber = 0)
1918
{
2019
parent::__construct([], $separator, $lineNumber);
2120
}

‎src/Value/Size.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,10 @@ class Size extends PrimitiveValue
6868
private $bIsColorComponent;
6969

7070
/**
71-
* @param float|int|string $size
72-
* @param string|null $unit
73-
* @param bool $bIsColorComponent
71+
* @param float|int|string $fSize
7472
* @param int<0, max> $lineNumber
7573
*/
76-
public function __construct($size, $unit = null, $bIsColorComponent = false, $lineNumber = 0)
74+
public function __construct($size, ?string $unit = null, bool $bIsColorComponent = false, int $lineNumber = 0)
7775
{
7876
parent::__construct($lineNumber);
7977
$this->size = (float) $size;

‎src/Value/URL.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class URL extends PrimitiveValue
2323
/**
2424
* @param int<0, max> $lineNumber
2525
*/
26-
public function __construct(CSSString $oURL, $lineNumber = 0)
26+
public function __construct(CSSString $oURL, int $lineNumber = 0)
2727
{
2828
parent::__construct($lineNumber);
2929
$this->oURL = $oURL;

‎src/Value/Value.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ abstract class Value implements Renderable
2626
/**
2727
* @param int<0, max> $lineNumber
2828
*/
29-
public function __construct($lineNumber = 0)
29+
public function __construct(int $lineNumber = 0)
3030
{
3131
$this->lineNumber = $lineNumber;
3232
}

‎src/Value/ValueList.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,10 @@ abstract class ValueList extends Value
2929
protected $separator;
3030

3131
/**
32-
* @param array<array-key, Value|string>|Value|string $components
33-
* @param string $separator
32+
* @param array<array-key, Value|string>|Value|string $aComponents
3433
* @param int<0, max> $lineNumber
3534
*/
36-
public function __construct($components = [], $separator = ',', $lineNumber = 0)
35+
public function __construct($components = [], string $separator = ',', int $lineNumber = 0)
3736
{
3837
parent::__construct($lineNumber);
3938
if (!\is_array($components)) {

0 commit comments

Comments
 (0)