[TASK] Use native types for all constructor parameters

oliverklee · oliverklee · commit c7842918e45f · 2025-02-20T09:21:53.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 $arguments;
 
     /**
-     * @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/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->lineNumber = $lineNumber;
     }
diff --git a/src/Parser.php b/src/Parser.php
@@ -22,7 +22,7 @@ class Parser
      * @param string $text 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($text, ?Settings $parserSettings = null, $lineNumber = 1)
+    public function __construct(string $text, ?Settings $parserSettings = null, int $lineNumber = 1)
     {
         if ($parserSettings === null) {
             $parserSettings = Settings::create();
diff --git a/src/Parsing/Anchor.php b/src/Parsing/Anchor.php
@@ -19,10 +19,7 @@ class Anchor
      */
     private $parserState;
 
-    /**
-     * @param int $position
-     */
-    public function __construct($position, ParserState $parserState)
+    public function __construct(int $position, ParserState $parserState)
     {
         $this->position = $position;
         $this->parserState = $parserState;
diff --git a/src/Parsing/ParserState.php b/src/Parsing/ParserState.php
@@ -58,7 +58,7 @@ class ParserState
      * @param string $text the complete CSS as text (i.e., usually the contents of a CSS file)
      * @param int<0, max> $lineNumber
      */
-    public function __construct($text, Settings $parserSettings, $lineNumber = 1)
+    public function __construct(string $text, Settings $parserSettings, int $lineNumber = 1)
     {
         $this->parserSettings = $parserSettings;
         $this->text = $text;
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 $prefix
      * @param int<0, max> $lineNumber
      */
-    public function __construct($mUrl, $prefix = null, $lineNumber = 0)
+    public function __construct(string $mUrl, ?string $prefix = null, int $lineNumber = 0)
     {
         $this->mUrl = $mUrl;
         $this->prefix = $prefix;
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->lineNumber = $lineNumber;
diff --git a/src/RuleSet/AtRuleSet.php b/src/RuleSet/AtRuleSet.php
@@ -26,11 +26,9 @@ class AtRuleSet extends RuleSet implements AtRule
     private $arguments;
 
     /**
-     * @param string $sType
-     * @param string $arguments
      * @param int<0, max> $lineNumber
      */
-    public function __construct($sType, $arguments = '', $lineNumber = 0)
+    public function __construct(string $sType, string $arguments = '', int $lineNumber = 0)
     {
         parent::__construct($lineNumber);
         $this->sType = $sType;
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->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/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
`@@ -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->lineNumber = $lineNumber;`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class Parser`
`22`	`22`	`* @param string $text 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($text, ?Settings $parserSettings = null, $lineNumber = 1)`
	`25`	`+ public function __construct(string $text, ?Settings $parserSettings = null, int $lineNumber = 1)`
`26`	`26`	`{`
`27`	`27`	`if ($parserSettings === null) {`
`28`	`28`	`$parserSettings = Settings::create();`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ class ParserState`
`58`	`58`	`* @param string $text the complete CSS as text (i.e., usually the contents of a CSS file)`
`59`	`59`	`* @param int<0, max> $lineNumber`
`60`	`60`	`*/`
`61`		`- public function __construct($text, Settings $parserSettings, $lineNumber = 1)`
	`61`	`+ public function __construct(string $text, Settings $parserSettings, int $lineNumber = 1)`
`62`	`62`	`{`
`63`	`63`	`$this->parserSettings = $parserSettings;`
`64`	`64`	`$this->text = $text;`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class Charset implements AtRule`
`40`	`40`	`/**`
`41`	`41`	`* @param int<0, max> $lineNumber`
`42`	`42`	`*/`
`43`		`- public function __construct(CSSString $oCharset, $lineNumber = 0)`
	`43`	`+ public function __construct(CSSString $oCharset, int $lineNumber = 0)`
`44`	`44`	`{`
`45`	`45`	`$this->oCharset = $oCharset;`
`46`	`46`	`$this->lineNumber = $lineNumber;`
Original file line number	Diff line number	Diff line change
`@@ -84,11 +84,7 @@ public static function isValid($sSelector)`
`84`	`84`	`return \preg_match(static::SELECTOR_VALIDATION_RX, $sSelector);`
`85`	`85`	`}`
`86`	`86`
`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)`
`92`	`88`	`{`
`93`	`89`	`$this->setSelector($sSelector);`
`94`	`90`	`if ($bCalculateSpecificity) {`