Skip to content

Commit e54b7da

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

31 files changed

+31
-60
lines changed

‎src/CSSList/AtRuleBlockList.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,9 @@ class AtRuleBlockList extends CSSBlockList implements AtRule
2323
private $arguments;
2424

2525
/**
26-
* @param string $type
27-
* @param string $arguments
2826
* @param int<0, max> $lineNumber
2927
*/
30-
public function __construct($type, $arguments = '', $lineNumber = 0)
28+
public function __construct(string $type, string $arguments = '', int $lineNumber = 0)
3129
{
3230
parent::__construct($lineNumber);
3331
$this->type = $type;

‎src/CSSList/CSSBlockList.php

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

‎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->comments = [];
6363
$this->contents = [];

‎src/CSSList/Document.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class Document extends CSSBlockList
2121
/**
2222
* @param int<0, max> $lineNumber
2323
*/
24-
public function __construct($lineNumber = 0)
24+
public function __construct(int $lineNumber = 0)
2525
{
2626
parent::__construct($lineNumber);
2727
}

‎src/CSSList/KeyFrame.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class KeyFrame extends CSSList implements AtRule
2222
/**
2323
* @param int<0, max> $lineNumber
2424
*/
25-
public function __construct($lineNumber = 0)
25+
public function __construct(int $lineNumber = 0)
2626
{
2727
parent::__construct($lineNumber);
2828
$this->vendorKeyFrame = null;

‎src/Comment/Comment.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,9 @@ class Comment implements Renderable
2424
protected $commentText;
2525

2626
/**
27-
* @param string $commentText
2827
* @param int<0, max> $lineNumber
2928
*/
30-
public function __construct($commentText = '', $lineNumber = 0)
29+
public function __construct(string $commentText = '', int $lineNumber = 0)
3130
{
3231
$this->commentText = $commentText;
3332
$this->lineNumber = $lineNumber;

‎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 $sText 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($sText, ?Settings $oParserSettings = null, $lineNumber = 1)
25+
public function __construct(string $sText, ?Settings $oParserSettings = null, int $lineNumber = 1)
2626
{
2727
if ($oParserSettings === null) {
2828
$oParserSettings = 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 $iPosition
24-
*/
25-
public function __construct($iPosition, ParserState $parserState)
22+
public function __construct(int $iPosition, ParserState $parserState)
2623
{
2724
$this->iPosition = $iPosition;
2825
$this->parserState = $parserState;

‎src/Parsing/OutputException.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@
1010
final class OutputException extends SourceException
1111
{
1212
/**
13-
* @param string $sMessage
1413
* @param int<0, max> $lineNumber
1514
*/
16-
public function __construct($sMessage, $lineNumber = 0)
15+
public function __construct(string $sMessage, int $lineNumber = 0)
1716
{
1817
parent::__construct($sMessage, $lineNumber);
1918
}

‎src/Parsing/ParserState.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class ParserState
6060
* @param string $sText the complete CSS as text (i.e., usually the contents of a CSS file)
6161
* @param int<0, max> $lineNumber
6262
*/
63-
public function __construct($sText, Settings $oParserSettings, $lineNumber = 1)
63+
public function __construct(string $sText, Settings $oParserSettings, int $lineNumber = 1)
6464
{
6565
$this->oParserSettings = $oParserSettings;
6666
$this->sText = $sText;

‎src/Parsing/SourceException.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@ class SourceException extends \Exception
1212
private $lineNumber;
1313

1414
/**
15-
* @param string $sMessage
1615
* @param int<0, max> $lineNumber
1716
*/
18-
public function __construct($sMessage, $lineNumber = 0)
17+
public function __construct(string $sMessage, int $lineNumber = 0)
1918
{
2019
$this->lineNumber = $lineNumber;
2120
if ($lineNumber !== 0) {

‎src/Parsing/UnexpectedTokenException.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,9 @@ class UnexpectedTokenException extends SourceException
2727
private $sMatchType;
2828

2929
/**
30-
* @param string $sExpected
31-
* @param string $sFound
32-
* @param string $sMatchType
3330
* @param int<0, max> $lineNumber
3431
*/
35-
public function __construct($sExpected, $sFound, $sMatchType = 'literal', $lineNumber = 0)
32+
public function __construct(string $sExpected, string $sFound, string $sMatchType = 'literal', int $lineNumber = 0)
3633
{
3734
$this->sExpected = $sExpected;
3835
$this->sFound = $sFound;

‎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 $mUrl
39-
* @param string|null $sPrefix
4038
* @param int<0, max> $lineNumber
4139
*/
42-
public function __construct($mUrl, $sPrefix = null, $lineNumber = 0)
40+
public function __construct(string $mUrl, ?string $sPrefix = null, int $lineNumber = 0)
4341
{
4442
$this->mUrl = $mUrl;
4543
$this->sPrefix = $sPrefix;

‎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 $oCharset, $lineNumber = 0)
43+
public function __construct(CSSString $oCharset, int $lineNumber = 0)
4444
{
4545
$this->oCharset = $oCharset;
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/Property/Selector.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,7 @@ public static function isValid($sSelector)
8484
return \preg_match(static::SELECTOR_VALIDATION_RX, $sSelector);
8585
}
8686

87-
/**
88-
* @param string $sSelector
89-
* @param bool $bCalculateSpecificity
90-
*/
91-
public function __construct($sSelector, $bCalculateSpecificity = false)
87+
public function __construct(string $sSelector, bool $bCalculateSpecificity = false)
9288
{
9389
$this->setSelector($sSelector);
9490
if ($bCalculateSpecificity) {

‎src/Rule/Rule.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,9 @@ class Rule implements Renderable, Commentable
6161
protected $comments;
6262

6363
/**
64-
* @param string $sRule
6564
* @param int<0, max> $lineNumber
66-
* @param int $iColNo
6765
*/
68-
public function __construct($sRule, $lineNumber = 0, $iColNo = 0)
66+
public function __construct(string $sRule, int $lineNumber = 0, int $iColNo = 0)
6967
{
7068
$this->sRule = $sRule;
7169
$this->mValue = null;

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

‎src/RuleSet/DeclarationBlock.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class DeclarationBlock extends RuleSet
3232
/**
3333
* @param int<0, max> $lineNumber
3434
*/
35-
public function __construct($lineNumber = 0)
35+
public function __construct(int $lineNumber = 0)
3636
{
3737
parent::__construct($lineNumber);
3838
$this->aSelectors = [];

‎src/RuleSet/RuleSet.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ abstract class RuleSet implements Renderable, Commentable
4646
/**
4747
* @param int<0, max> $lineNumber
4848
*/
49-
public function __construct($lineNumber = 0)
49+
public function __construct(int $lineNumber = 0)
5050
{
5151
$this->aRules = [];
5252
$this->lineNumber = $lineNumber;

‎src/Value/CSSFunction.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,10 @@ class CSSFunction extends ValueList
2424
protected $sName;
2525

2626
/**
27-
* @param string $sName
2827
* @param RuleValueList|array<array-key, Value|string> $aArguments
29-
* @param string $sSeparator
3028
* @param int<0, max> $lineNumber
3129
*/
32-
public function __construct($sName, $aArguments, $sSeparator = ',', $lineNumber = 0)
30+
public function __construct(string $sName, $aArguments, string $sSeparator = ',', int $lineNumber = 0)
3331
{
3432
if ($aArguments instanceof RuleValueList) {
3533
$sSeparator = $aArguments->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 $sString;
2424

2525
/**
26-
* @param string $sString
2726
* @param int<0, max> $lineNumber
2827
*/
29-
public function __construct($sString, $lineNumber = 0)
28+
public function __construct(string $sString, int $lineNumber = 0)
3029
{
3130
$this->sString = $sString;
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> $aComponents
1616
* @param int<0, max> $lineNumber
1717
*/
18-
public function __construct(array $aComponents = [], $lineNumber = 0)
18+
public function __construct(array $aComponents = [], int $lineNumber = 0)
1919
{
2020
parent::__construct($aComponents, ' ', $lineNumber);
2121
}

‎src/Value/PrimitiveValue.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ abstract class PrimitiveValue extends Value
99
/**
1010
* @param int<0, max> $lineNumber
1111
*/
12-
public function __construct($lineNumber = 0)
12+
public function __construct(int $lineNumber = 0)
1313
{
1414
parent::__construct($lineNumber);
1515
}

‎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 $sSeparator
1615
* @param int<0, max> $lineNumber
1716
*/
18-
public function __construct($sSeparator = ',', $lineNumber = 0)
17+
public function __construct(string $sSeparator = ',', int $lineNumber = 0)
1918
{
2019
parent::__construct([], $sSeparator, $lineNumber);
2120
}

‎src/Value/Size.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,9 @@ class Size extends PrimitiveValue
6969

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

‎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: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,9 @@ abstract class ValueList extends Value
3030

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

0 commit comments

Comments
 (0)