[TASK] Use native types for all constructor parameters

oliverklee · oliverklee · commit 6bd939dbd857 · 2025-02-10T11:57:56.000+01:00
Part of #811
diff --git a/src/CSSList/AtRuleBlockList.php b/src/CSSList/AtRuleBlockList.php
@@ -23,11 +23,9 @@ class AtRuleBlockList extends CSSBlockList implements AtRule
     private $sArgs;
 
     /**
-     * @param string $type
-     * @param string $arguments
      * @param int<0, max> $lineNumber
      */
-    public function __construct($type, $arguments = '', $lineNumber = 0)
+    public function __construct(string $type, string $arguments = '', int $lineNumber = 0)
     {
         parent::__construct($lineNumber);
         $this->type = $type;
diff --git a/src/CSSList/CSSBlockList.php b/src/CSSList/CSSBlockList.php
@@ -23,7 +23,7 @@ abstract class CSSBlockList extends CSSList
     /**
      * @param int<0, max> $lineNumber
      */
-    public function __construct($lineNumber = 0)
+    public function __construct(int $lineNumber = 0)
     {
         parent::__construct($lineNumber);
     }
diff --git a/src/CSSList/CSSList.php b/src/CSSList/CSSList.php
@@ -57,7 +57,7 @@ abstract class CSSList implements Renderable, Commentable
     /**
      * @param int<0, max> $lineNumber
      */
-    public function __construct($lineNumber = 0)
+    public function __construct(int $lineNumber = 0)
     {
         $this->comments = [];
         $this->contents = [];
diff --git a/src/CSSList/Document.php b/src/CSSList/Document.php
@@ -21,7 +21,7 @@ class Document extends CSSBlockList
     /**
      * @param int<0, max> $lineNumber
      */
-    public function __construct($lineNumber = 0)
+    public function __construct(int $lineNumber = 0)
     {
         parent::__construct($lineNumber);
     }
diff --git a/src/CSSList/KeyFrame.php b/src/CSSList/KeyFrame.php
@@ -22,7 +22,7 @@ class KeyFrame extends CSSList implements AtRule
     /**
      * @param int<0, max> $lineNumber
      */
-    public function __construct($lineNumber = 0)
+    public function __construct(int $lineNumber = 0)
     {
         parent::__construct($lineNumber);
         $this->vendorKeyFrame = null;
diff --git a/src/Comment/Comment.php b/src/Comment/Comment.php
@@ -24,10 +24,9 @@ class Comment implements Renderable
     protected $commentText;
 
     /**
-     * @param string $commentText
      * @param int<0, max> $lineNumber
      */
-    public function __construct($commentText = '', $lineNumber = 0)
+    public function __construct(string $commentText = '', int $lineNumber = 0)
     {
         $this->commentText = $commentText;
         $this->lineNumber = $lineNumber;
diff --git a/src/Parser.php b/src/Parser.php
@@ -22,7 +22,7 @@ class Parser
      * @param string $sText the complete CSS as text (i.e., usually the contents of a CSS file)
      * @param int<0, max> $lineNumber the line number (starting from 1, not from 0)
      */
-    public function __construct($sText, ?Settings $oParserSettings = null, $lineNumber = 1)
+    public function __construct(string $sText, ?Settings $oParserSettings = null, int $lineNumber = 1)
     {
         if ($oParserSettings === null) {
             $oParserSettings = Settings::create();
diff --git a/src/Parsing/Anchor.php b/src/Parsing/Anchor.php
@@ -19,10 +19,7 @@ class Anchor
      */
     private $parserState;
 
-    /**
-     * @param int $iPosition
-     */
-    public function __construct($iPosition, ParserState $parserState)
+    public function __construct(int $iPosition, ParserState $parserState)
     {
         $this->iPosition = $iPosition;
         $this->parserState = $parserState;
diff --git a/src/Parsing/OutputException.php b/src/Parsing/OutputException.php
@@ -10,10 +10,9 @@
 final class OutputException extends SourceException
 {
     /**
-     * @param string $sMessage
      * @param int<0, max> $lineNumber
      */
-    public function __construct($sMessage, $lineNumber = 0)
+    public function __construct(string $sMessage, int $lineNumber = 0)
     {
         parent::__construct($sMessage, $lineNumber);
     }
diff --git a/src/Parsing/ParserState.php b/src/Parsing/ParserState.php
@@ -60,7 +60,7 @@ class ParserState
      * @param string $sText the complete CSS as text (i.e., usually the contents of a CSS file)
      * @param int<0, max> $lineNumber
      */
-    public function __construct($sText, Settings $oParserSettings, $lineNumber = 1)
+    public function __construct(string $sText, Settings $oParserSettings, int $lineNumber = 1)
     {
         $this->oParserSettings = $oParserSettings;
         $this->sText = $sText;
diff --git a/src/Parsing/SourceException.php b/src/Parsing/SourceException.php
@@ -12,10 +12,9 @@ class SourceException extends \Exception
     private $lineNumber;
 
     /**
-     * @param string $sMessage
      * @param int<0, max> $lineNumber
      */
-    public function __construct($sMessage, $lineNumber = 0)
+    public function __construct(string $sMessage, int $lineNumber = 0)
     {
         $this->lineNumber = $lineNumber;
         if ($lineNumber !== 0) {
diff --git a/src/Parsing/UnexpectedTokenException.php b/src/Parsing/UnexpectedTokenException.php
@@ -27,12 +27,9 @@ class UnexpectedTokenException extends SourceException
     private $sMatchType;
 
     /**
-     * @param string $sExpected
-     * @param string $sFound
-     * @param string $sMatchType
      * @param int<0, max> $lineNumber
      */
-    public function __construct($sExpected, $sFound, $sMatchType = 'literal', $lineNumber = 0)
+    public function __construct(string $sExpected, string $sFound, string $sMatchType = 'literal', int $lineNumber = 0)
     {
         $this->sExpected = $sExpected;
         $this->sFound = $sFound;
diff --git a/src/Property/CSSNamespace.php b/src/Property/CSSNamespace.php
@@ -35,11 +35,9 @@ class CSSNamespace implements AtRule
     protected $comments;
 
     /**
-     * @param string $mUrl
-     * @param string|null $sPrefix
      * @param int<0, max> $lineNumber
      */
-    public function __construct($mUrl, $sPrefix = null, $lineNumber = 0)
+    public function __construct(string $mUrl, ?string $sPrefix = null, int $lineNumber = 0)
     {
         $this->mUrl = $mUrl;
         $this->sPrefix = $sPrefix;
diff --git a/src/Property/Charset.php b/src/Property/Charset.php
@@ -40,7 +40,7 @@ class Charset implements AtRule
     /**
      * @param int<0, max> $lineNumber
      */
-    public function __construct(CSSString $oCharset, $lineNumber = 0)
+    public function __construct(CSSString $oCharset, int $lineNumber = 0)
     {
         $this->oCharset = $oCharset;
         $this->lineNumber = $lineNumber;
diff --git a/src/Property/Import.php b/src/Property/Import.php
@@ -38,10 +38,9 @@ class Import implements AtRule
     protected $comments;
 
     /**
-     * @param string $mediaQuery
      * @param int<0, max> $lineNumber
      */
-    public function __construct(URL $location, $mediaQuery, $lineNumber = 0)
+    public function __construct(URL $location, string $mediaQuery, int $lineNumber = 0)
     {
         $this->location = $location;
         $this->mediaQuery = $mediaQuery;
diff --git a/src/Property/Selector.php b/src/Property/Selector.php
@@ -84,11 +84,7 @@ public static function isValid($sSelector)
         return \preg_match(static::SELECTOR_VALIDATION_RX, $sSelector);
     }
 
-    /**
-     * @param string $sSelector
-     * @param bool $bCalculateSpecificity
-     */
-    public function __construct($sSelector, $bCalculateSpecificity = false)
+    public function __construct(string $sSelector, bool $bCalculateSpecificity = false)
     {
         $this->setSelector($sSelector);
         if ($bCalculateSpecificity) {
diff --git a/src/Rule/Rule.php b/src/Rule/Rule.php
@@ -61,11 +61,9 @@ class Rule implements Renderable, Commentable
     protected $comments;
 
     /**
-     * @param string $sRule
      * @param int<0, max> $lineNumber
-     * @param int $iColNo
      */
-    public function __construct($sRule, $lineNumber = 0, $iColNo = 0)
+    public function __construct(string $sRule, int $lineNumber = 0, int $iColNo = 0)
     {
         $this->sRule = $sRule;
         $this->mValue = null;
diff --git a/src/RuleSet/AtRuleSet.php b/src/RuleSet/AtRuleSet.php
@@ -26,11 +26,9 @@ class AtRuleSet extends RuleSet implements AtRule
     private $sArgs;
 
     /**
-     * @param string $sType
-     * @param string $sArgs
      * @param int<0, max> $lineNumber
      */
-    public function __construct($sType, $sArgs = '', $lineNumber = 0)
+    public function __construct(string $sType, string $sArgs = '', int $lineNumber = 0)
     {
         parent::__construct($lineNumber);
         $this->sType = $sType;
diff --git a/src/RuleSet/DeclarationBlock.php b/src/RuleSet/DeclarationBlock.php
@@ -32,7 +32,7 @@ class DeclarationBlock extends RuleSet
     /**
      * @param int<0, max> $lineNumber
      */
-    public function __construct($lineNumber = 0)
+    public function __construct(int $lineNumber = 0)
     {
         parent::__construct($lineNumber);
         $this->aSelectors = [];
diff --git a/src/RuleSet/RuleSet.php b/src/RuleSet/RuleSet.php
@@ -46,7 +46,7 @@ abstract class RuleSet implements Renderable, Commentable
     /**
      * @param int<0, max> $lineNumber
      */
-    public function __construct($lineNumber = 0)
+    public function __construct(int $lineNumber = 0)
     {
         $this->aRules = [];
         $this->lineNumber = $lineNumber;
diff --git a/src/Value/CSSFunction.php b/src/Value/CSSFunction.php
@@ -24,12 +24,10 @@ class CSSFunction extends ValueList
     protected $sName;
 
     /**
-     * @param string $sName
      * @param RuleValueList|array<array-key, Value|string> $aArguments
-     * @param string $sSeparator
      * @param int<0, max> $lineNumber
      */
-    public function __construct($sName, $aArguments, $sSeparator = ',', $lineNumber = 0)
+    public function __construct(string $sName, $aArguments, string $sSeparator = ',', int $lineNumber = 0)
     {
         if ($aArguments instanceof RuleValueList) {
             $sSeparator = $aArguments->getListSeparator();
diff --git a/src/Value/CSSString.php b/src/Value/CSSString.php
@@ -23,10 +23,9 @@ class CSSString extends PrimitiveValue
     private $sString;
 
     /**
-     * @param string $sString
      * @param int<0, max> $lineNumber
      */
-    public function __construct($sString, $lineNumber = 0)
+    public function __construct(string $sString, int $lineNumber = 0)
     {
         $this->sString = $sString;
         parent::__construct($lineNumber);
diff --git a/src/Value/CalcRuleValueList.php b/src/Value/CalcRuleValueList.php
@@ -11,7 +11,7 @@ class CalcRuleValueList extends RuleValueList
     /**
      * @param int<0, max> $lineNumber
      */
-    public function __construct($lineNumber = 0)
+    public function __construct(int $lineNumber = 0)
     {
         parent::__construct(',', $lineNumber);
     }
diff --git a/src/Value/Color.php b/src/Value/Color.php
@@ -19,7 +19,7 @@ class Color extends CSSFunction
      * @param array<array-key, Value|string> $colorValues
      * @param int<0, max> $lineNumber
      */
-    public function __construct(array $colorValues, $lineNumber = 0)
+    public function __construct(array $colorValues, int $lineNumber = 0)
     {
         parent::__construct(\implode('', \array_keys($colorValues)), $colorValues, ',', $lineNumber);
     }
diff --git a/src/Value/LineName.php b/src/Value/LineName.php
@@ -15,7 +15,7 @@ class LineName extends ValueList
      * @param array<int, Value|string> $aComponents
      * @param int<0, max> $lineNumber
      */
-    public function __construct(array $aComponents = [], $lineNumber = 0)
+    public function __construct(array $aComponents = [], int $lineNumber = 0)
     {
         parent::__construct($aComponents, ' ', $lineNumber);
     }
diff --git a/src/Value/PrimitiveValue.php b/src/Value/PrimitiveValue.php
@@ -9,7 +9,7 @@ abstract class PrimitiveValue extends Value
     /**
      * @param int<0, max> $lineNumber
      */
-    public function __construct($lineNumber = 0)
+    public function __construct(int $lineNumber = 0)
     {
         parent::__construct($lineNumber);
     }
diff --git a/src/Value/RuleValueList.php b/src/Value/RuleValueList.php
@@ -12,10 +12,9 @@
 class RuleValueList extends ValueList
 {
     /**
-     * @param string $sSeparator
      * @param int<0, max> $lineNumber
      */
-    public function __construct($sSeparator = ',', $lineNumber = 0)
+    public function __construct(string $sSeparator = ',', int $lineNumber = 0)
     {
         parent::__construct([], $sSeparator, $lineNumber);
     }
diff --git a/src/Value/Size.php b/src/Value/Size.php
@@ -69,11 +69,9 @@ class Size extends PrimitiveValue
 
     /**
      * @param float|int|string $fSize
-     * @param string|null $sUnit
-     * @param bool $bIsColorComponent
      * @param int<0, max> $lineNumber
      */
-    public function __construct($fSize, $sUnit = null, $bIsColorComponent = false, $lineNumber = 0)
+    public function __construct($fSize, ?string $sUnit = null, bool $bIsColorComponent = false, int $lineNumber = 0)
     {
         parent::__construct($lineNumber);
         $this->fSize = (float) $fSize;
diff --git a/src/Value/URL.php b/src/Value/URL.php
@@ -23,7 +23,7 @@ class URL extends PrimitiveValue
     /**
      * @param int<0, max> $lineNumber
      */
-    public function __construct(CSSString $oURL, $lineNumber = 0)
+    public function __construct(CSSString $oURL, int $lineNumber = 0)
     {
         parent::__construct($lineNumber);
         $this->oURL = $oURL;
diff --git a/src/Value/Value.php b/src/Value/Value.php
@@ -26,7 +26,7 @@ abstract class Value implements Renderable
     /**
      * @param int<0, max> $lineNumber
      */
-    public function __construct($lineNumber = 0)
+    public function __construct(int $lineNumber = 0)
     {
         $this->lineNumber = $lineNumber;
     }
diff --git a/src/Value/ValueList.php b/src/Value/ValueList.php
@@ -30,10 +30,9 @@ abstract class ValueList extends Value
 
     /**
      * @param array<array-key, Value|string>|Value|string $aComponents
-     * @param string $sSeparator
      * @param int<0, max> $lineNumber
      */
-    public function __construct($aComponents = [], $sSeparator = ',', $lineNumber = 0)
+    public function __construct($aComponents = [], string $sSeparator = ',', int $lineNumber = 0)
     {
         parent::__construct($lineNumber);
         if (!\is_array($aComponents)) {

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ abstract class CSSBlockList extends CSSList`
`23`	`23`	`/**`
`24`	`24`	`* @param int<0, max> $lineNumber`
`25`	`25`	`*/`
`26`		`- public function __construct($lineNumber = 0)`
	`26`	`+ public function __construct(int $lineNumber = 0)`
`27`	`27`	`{`
`28`	`28`	`parent::__construct($lineNumber);`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ abstract class CSSList implements Renderable, Commentable`
`57`	`57`	`/**`
`58`	`58`	`* @param int<0, max> $lineNumber`
`59`	`59`	`*/`
`60`		`- public function __construct($lineNumber = 0)`
	`60`	`+ public function __construct(int $lineNumber = 0)`
`61`	`61`	`{`
`62`	`62`	`$this->comments = [];`
`63`	`63`	`$this->contents = [];`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class Document extends CSSBlockList`
`21`	`21`	`/**`
`22`	`22`	`* @param int<0, max> $lineNumber`
`23`	`23`	`*/`
`24`		`- public function __construct($lineNumber = 0)`
	`24`	`+ public function __construct(int $lineNumber = 0)`
`25`	`25`	`{`
`26`	`26`	`parent::__construct($lineNumber);`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class KeyFrame extends CSSList implements AtRule`
`22`	`22`	`/**`
`23`	`23`	`* @param int<0, max> $lineNumber`
`24`	`24`	`*/`
`25`		`- public function __construct($lineNumber = 0)`
	`25`	`+ public function __construct(int $lineNumber = 0)`
`26`	`26`	`{`
`27`	`27`	`parent::__construct($lineNumber);`
`28`	`28`	`$this->vendorKeyFrame = null;`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class Parser`
`22`	`22`	`* @param string $sText the complete CSS as text (i.e., usually the contents of a CSS file)`
`23`	`23`	`* @param int<0, max> $lineNumber the line number (starting from 1, not from 0)`
`24`	`24`	`*/`
`25`		`- public function __construct($sText, ?Settings $oParserSettings = null, $lineNumber = 1)`
	`25`	`+ public function __construct(string $sText, ?Settings $oParserSettings = null, int $lineNumber = 1)`
`26`	`26`	`{`
`27`	`27`	`if ($oParserSettings === null) {`
`28`	`28`	`$oParserSettings = Settings::create();`
Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,9 @@`
`10`	`10`	`final class OutputException extends SourceException`
`11`	`11`	`{`
`12`	`12`	`/**`
`13`		`- * @param string $sMessage`
`14`	`13`	`* @param int<0, max> $lineNumber`
`15`	`14`	`*/`
`16`		`- public function __construct($sMessage, $lineNumber = 0)`
	`15`	`+ public function __construct(string $sMessage, int $lineNumber = 0)`
`17`	`16`	`{`
`18`	`17`	`parent::__construct($sMessage, $lineNumber);`
`19`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ class ParserState`
`60`	`60`	`* @param string $sText the complete CSS as text (i.e., usually the contents of a CSS file)`
`61`	`61`	`* @param int<0, max> $lineNumber`
`62`	`62`	`*/`
`63`		`- public function __construct($sText, Settings $oParserSettings, $lineNumber = 1)`
	`63`	`+ public function __construct(string $sText, Settings $oParserSettings, int $lineNumber = 1)`
`64`	`64`	`{`
`65`	`65`	`$this->oParserSettings = $oParserSettings;`
`66`	`66`	`$this->sText = $sText;`