Skip to content

Commit 43d09d6

Browse files
oliverkleeoliverklee
committed
[TASK] Use native types for all constructor parameters
Part of #811
1 parent 88b8729 commit 43d09d6

31 files changed

+31
-132
lines changed

‎src/CSSList/AtRuleBlockList.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,7 @@ class AtRuleBlockList extends CSSBlockList implements AtRule
2222
*/
2323
private $sArgs;
2424

25-
/**
26-
* @param string $type
27-
* @param string $arguments
28-
* @param int $lineNumber
29-
*/
30-
public function __construct($type, $arguments = '', $lineNumber = 0)
25+
public function __construct(string $type, string $arguments = '', int $lineNumber = 0)
3126
{
3227
parent::__construct($lineNumber);
3328
$this->type = $type;

‎src/CSSList/CSSBlockList.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@
2020
*/
2121
abstract class CSSBlockList extends CSSList
2222
{
23-
/**
24-
* @param int $lineNumber
25-
*/
26-
public function __construct($lineNumber = 0)
23+
public function __construct(int $lineNumber = 0)
2724
{
2825
parent::__construct($lineNumber);
2926
}

‎src/CSSList/CSSList.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,7 @@ abstract class CSSList implements Renderable, Commentable
4848
*/
4949
protected $lineNumber;
5050

51-
/**
52-
* @param int $lineNumber
53-
*/
54-
public function __construct($lineNumber = 0)
51+
public function __construct(int $lineNumber = 0)
5552
{
5653
$this->comments = [];
5754
$this->contents = [];

‎src/CSSList/Document.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@
1818
*/
1919
class Document extends CSSBlockList
2020
{
21-
/**
22-
* @param int $lineNumber
23-
*/
24-
public function __construct($lineNumber = 0)
21+
public function __construct(int $lineNumber = 0)
2522
{
2623
parent::__construct($lineNumber);
2724
}

‎src/CSSList/KeyFrame.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@ class KeyFrame extends CSSList implements AtRule
1919
*/
2020
private $animationName;
2121

22-
/**
23-
* @param int $lineNumber
24-
*/
25-
public function __construct($lineNumber = 0)
22+
public function __construct(int $lineNumber = 0)
2623
{
2724
parent::__construct($lineNumber);
2825
$this->vendorKeyFrame = null;

‎src/Comment/Comment.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,7 @@ class Comment implements Renderable
1919
*/
2020
protected $commentText;
2121

22-
/**
23-
* @param string $commentText
24-
* @param int $lineNumber
25-
*/
26-
public function __construct($commentText = '', $lineNumber = 0)
22+
public function __construct(string $commentText = '', int $lineNumber = 0)
2723
{
2824
$this->commentText = $commentText;
2925
$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 $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 & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@
99
*/
1010
final class OutputException extends SourceException
1111
{
12-
/**
13-
* @param string $sMessage
14-
* @param int $lineNumber
15-
*/
16-
public function __construct($sMessage, $lineNumber = 0)
12+
public function __construct(string $sMessage, int $lineNumber = 0)
1713
{
1814
parent::__construct($sMessage, $lineNumber);
1915
}

‎src/Parsing/ParserState.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,8 @@ class ParserState
5858

5959
/**
6060
* @param string $sText the complete CSS as text (i.e., usually the contents of a CSS file)
61-
* @param int $lineNumber
6261
*/
63-
public function __construct($sText, Settings $oParserSettings, $lineNumber = 1)
62+
public function __construct(string $sText, Settings $oParserSettings, int $lineNumber = 1)
6463
{
6564
$this->oParserSettings = $oParserSettings;
6665
$this->sText = $sText;

‎src/Parsing/SourceException.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,7 @@ class SourceException extends \Exception
1111
*/
1212
private $lineNumber;
1313

14-
/**
15-
* @param string $sMessage
16-
* @param int $lineNumber
17-
*/
18-
public function __construct($sMessage, $lineNumber = 0)
14+
public function __construct(string $sMessage, int $lineNumber = 0)
1915
{
2016
$this->lineNumber = $lineNumber;
2117
if ($lineNumber !== 0) {

‎src/Parsing/UnexpectedTokenException.php

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,7 @@ class UnexpectedTokenException extends SourceException
2626
*/
2727
private $sMatchType;
2828

29-
/**
30-
* @param string $sExpected
31-
* @param string $sFound
32-
* @param string $sMatchType
33-
* @param int $lineNumber
34-
*/
35-
public function __construct($sExpected, $sFound, $sMatchType = 'literal', $lineNumber = 0)
29+
public function __construct(string $sExpected, string $sFound, string $sMatchType = 'literal', int $lineNumber = 0)
3630
{
3731
$this->sExpected = $sExpected;
3832
$this->sFound = $sFound;

‎src/Property/CSSNamespace.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,7 @@ class CSSNamespace implements AtRule
3232
*/
3333
protected $comments;
3434

35-
/**
36-
* @param string $mUrl
37-
* @param string|null $sPrefix
38-
* @param int $lineNumber
39-
*/
40-
public function __construct($mUrl, $sPrefix = null, $lineNumber = 0)
35+
public function __construct(string $mUrl, ?string $sPrefix = null, int $lineNumber = 0)
4136
{
4237
$this->mUrl = $mUrl;
4338
$this->sPrefix = $sPrefix;

‎src/Property/Charset.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,7 @@ class Charset implements AtRule
3333
*/
3434
protected $comments;
3535

36-
/**
37-
* @param int $lineNumber
38-
*/
39-
public function __construct(CSSString $oCharset, $lineNumber = 0)
36+
public function __construct(CSSString $oCharset, int $lineNumber = 0)
4037
{
4138
$this->oCharset = $oCharset;
4239
$this->lineNumber = $lineNumber;

‎src/Property/Import.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,7 @@ class Import implements AtRule
3333
*/
3434
protected $comments;
3535

36-
/**
37-
* @param string $mediaQuery
38-
* @param int $lineNumber
39-
*/
40-
public function __construct(URL $location, $mediaQuery, $lineNumber = 0)
36+
public function __construct(URL $location, string $mediaQuery, int $lineNumber = 0)
4137
{
4238
$this->location = $location;
4339
$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 & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,7 @@ class Rule implements Renderable, Commentable
5656
*/
5757
protected $comments;
5858

59-
/**
60-
* @param string $sRule
61-
* @param int $lineNumber
62-
* @param int $iColNo
63-
*/
64-
public function __construct($sRule, $lineNumber = 0, $iColNo = 0)
59+
public function __construct(string $sRule, int $lineNumber = 0, int $iColNo = 0)
6560
{
6661
$this->sRule = $sRule;
6762
$this->mValue = null;

‎src/RuleSet/AtRuleSet.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,7 @@ class AtRuleSet extends RuleSet implements AtRule
2525
*/
2626
private $sArgs;
2727

28-
/**
29-
* @param string $sType
30-
* @param string $sArgs
31-
* @param int $lineNumber
32-
*/
33-
public function __construct($sType, $sArgs = '', $lineNumber = 0)
28+
public function __construct(string $sType, string $sArgs = '', int $lineNumber = 0)
3429
{
3530
parent::__construct($lineNumber);
3631
$this->sType = $sType;

‎src/RuleSet/DeclarationBlock.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@ class DeclarationBlock extends RuleSet
2929
*/
3030
private $aSelectors;
3131

32-
/**
33-
* @param int $lineNumber
34-
*/
35-
public function __construct($lineNumber = 0)
32+
public function __construct(int $lineNumber = 0)
3633
{
3734
parent::__construct($lineNumber);
3835
$this->aSelectors = [];

‎src/RuleSet/RuleSet.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,7 @@ abstract class RuleSet implements Renderable, Commentable
3939
*/
4040
protected $comments;
4141

42-
/**
43-
* @param int $lineNumber
44-
*/
45-
public function __construct($lineNumber = 0)
42+
public function __construct(int $lineNumber = 0)
4643
{
4744
$this->aRules = [];
4845
$this->lineNumber = $lineNumber;

‎src/Value/CSSFunction.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,9 @@ class CSSFunction extends ValueList
1919
protected $sName;
2020

2121
/**
22-
* @param string $sName
2322
* @param RuleValueList|array<array-key, Value|string> $aArguments
24-
* @param string $sSeparator
25-
* @param int $lineNumber
2623
*/
27-
public function __construct($sName, $aArguments, $sSeparator = ',', $lineNumber = 0)
24+
public function __construct(string $sName, $aArguments, string $sSeparator = ',', int $lineNumber = 0)
2825
{
2926
if ($aArguments instanceof RuleValueList) {
3027
$sSeparator = $aArguments->getListSeparator();

‎src/Value/CSSString.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@ class CSSString extends PrimitiveValue
2222
*/
2323
private $sString;
2424

25-
/**
26-
* @param string $sString
27-
* @param int $lineNumber
28-
*/
29-
public function __construct($sString, $lineNumber = 0)
25+
public function __construct(string $sString, int $lineNumber = 0)
3026
{
3127
$this->sString = $sString;
3228
parent::__construct($lineNumber);

‎src/Value/CalcRuleValueList.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@
88

99
class CalcRuleValueList extends RuleValueList
1010
{
11-
/**
12-
* @param int $lineNumber
13-
*/
14-
public function __construct($lineNumber = 0)
11+
public function __construct(int $lineNumber = 0)
1512
{
1613
parent::__construct(',', $lineNumber);
1714
}

‎src/Value/Color.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@ class Color extends CSSFunction
1717
{
1818
/**
1919
* @param array<array-key, Value|string> $colorValues
20-
* @param int $lineNumber
2120
*/
22-
public function __construct(array $colorValues, $lineNumber = 0)
21+
public function __construct(array $colorValues, int $lineNumber = 0)
2322
{
2423
parent::__construct(\implode('', \array_keys($colorValues)), $colorValues, ',', $lineNumber);
2524
}

‎src/Value/LineName.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ class LineName extends ValueList
1313
{
1414
/**
1515
* @param array<int, Value|string> $aComponents
16-
* @param int $lineNumber
1716
*/
18-
public function __construct(array $aComponents = [], $lineNumber = 0)
17+
public function __construct(array $aComponents = [], int $lineNumber = 0)
1918
{
2019
parent::__construct($aComponents, ' ', $lineNumber);
2120
}

‎src/Value/PrimitiveValue.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66

77
abstract class PrimitiveValue extends Value
88
{
9-
/**
10-
* @param int $lineNumber
11-
*/
12-
public function __construct($lineNumber = 0)
9+
public function __construct(int $lineNumber = 0)
1310
{
1411
parent::__construct($lineNumber);
1512
}

‎src/Value/RuleValueList.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,7 @@
1111
*/
1212
class RuleValueList extends ValueList
1313
{
14-
/**
15-
* @param string $sSeparator
16-
* @param int $lineNumber
17-
*/
18-
public function __construct($sSeparator = ',', $lineNumber = 0)
14+
public function __construct(string $sSeparator = ',', int $lineNumber = 0)
1915
{
2016
parent::__construct([], $sSeparator, $lineNumber);
2117
}

‎src/Value/Size.php

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

7070
/**
7171
* @param float|int|string $fSize
72-
* @param string|null $sUnit
73-
* @param bool $bIsColorComponent
74-
* @param int $lineNumber
7572
*/
76-
public function __construct($fSize, $sUnit = null, $bIsColorComponent = false, $lineNumber = 0)
73+
public function __construct($fSize, ?string $sUnit = null, bool $bIsColorComponent = false, int $lineNumber = 0)
7774
{
7875
parent::__construct($lineNumber);
7976
$this->fSize = (float) $fSize;

‎src/Value/URL.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@ class URL extends PrimitiveValue
2020
*/
2121
private $oURL;
2222

23-
/**
24-
* @param int $lineNumber
25-
*/
26-
public function __construct(CSSString $oURL, $lineNumber = 0)
23+
public function __construct(CSSString $oURL, int $lineNumber = 0)
2724
{
2825
parent::__construct($lineNumber);
2926
$this->oURL = $oURL;

‎src/Value/Value.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@ abstract class Value implements Renderable
2121
*/
2222
protected $lineNumber;
2323

24-
/**
25-
* @param int $lineNumber
26-
*/
27-
public function __construct($lineNumber = 0)
24+
public function __construct(int $lineNumber = 0)
2825
{
2926
$this->lineNumber = $lineNumber;
3027
}

‎src/Value/ValueList.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@ abstract class ValueList extends Value
2626

2727
/**
2828
* @param array<array-key, Value|string>|Value|string $aComponents
29-
* @param string $sSeparator
30-
* @param int $lineNumber
3129
*/
32-
public function __construct($aComponents = [], $sSeparator = ',', $lineNumber = 0)
30+
public function __construct($aComponents = [], string $sSeparator = ',', int $lineNumber = 0)
3331
{
3432
parent::__construct($lineNumber);
3533
if (!\is_array($aComponents)) {

0 commit comments

Comments
 (0)