[TASK] Use native type declarations for Renderable

CHANGELOG.md

@@ -24,7 +24,7 @@ Please also have a look at our
 - Only allow `string` for some `OutputFormat` properties (#885)
 - Make all non-private properties `@internal` (#886)
 - Use more native type declarations and strict mode
-  (#641, #772, #774, #778, #804, #841, #873, #875)
+  (#641, #772, #774, #778, #804, #841, #873, #875, #891)
 - Add visibility to all class/interface constants (#469)
 
 ### Deprecated

src/CSSList/AtRuleBlockList.php

@@ -25,7 +25,7 @@ class AtRuleBlockList extends CSSBlockList implements AtRule
     /**
      * @param string $type
      * @param string $arguments
-     * @param int $lineNumber
+     * @param int<0, max> $lineNumber
      */
     public function __construct($type, $arguments = '', $lineNumber = 0)
     {

src/CSSList/CSSBlockList.php

@@ -21,7 +21,7 @@
 abstract class CSSBlockList extends CSSList
 {
     /**
-     * @param int $lineNumber
+     * @param int<0, max> $lineNumber
      */
     public function __construct($lineNumber = 0)
     {

src/CSSList/CSSList.php

@@ -48,14 +48,14 @@ abstract class CSSList implements Renderable, Commentable
     protected $contents;
 
     /**
-     * @var int
+     * @var int<0, max>
      *
      * @internal since 8.8.0
      */
     protected $lineNumber;
 
     /**
-     * @param int $lineNumber
+     * @param int<0, max> $lineNumber
      */
     public function __construct($lineNumber = 0)
     {
@@ -255,9 +255,9 @@ private static function identifierIs($identifier, string $match): bool
     }
 
     /**
-     * @return int
+     * @return int<0, max>
      */
-    public function getLineNo()
+    public function getLineNo(): int
     {
         return $this->lineNumber;
     }

src/CSSList/Document.php

@@ -19,7 +19,7 @@
 class Document extends CSSBlockList
 {
     /**
-     * @param int $lineNumber
+     * @param int<0, max> $lineNumber
      */
     public function __construct($lineNumber = 0)
     {

src/CSSList/KeyFrame.php

@@ -20,7 +20,7 @@ class KeyFrame extends CSSList implements AtRule
     private $animationName;
 
     /**
-     * @param int $lineNumber
+     * @param int<0, max> $lineNumber
      */
     public function __construct($lineNumber = 0)
     {

src/Comment/Comment.php

@@ -10,7 +10,7 @@
 class Comment implements Renderable
 {
     /**
-     * @var int
+     * @var int<0, max>
      *
      * @internal since 8.8.0
      */
@@ -25,7 +25,7 @@ class Comment implements Renderable
 
     /**
      * @param string $commentText
-     * @param int $lineNumber
+     * @param int<0, max> $lineNumber
      */
     public function __construct($commentText = '', $lineNumber = 0)
     {
@@ -42,9 +42,9 @@ public function getComment()
     }
 
     /**
-     * @return int
+     * @return int<0, max>
      */
-    public function getLineNo()
+    public function getLineNo(): int
     {
         return $this->lineNumber;
     }

src/Parser.php

@@ -20,7 +20,7 @@ class Parser
 
     /**
      * @param string $sText the complete CSS as text (i.e., usually the contents of a CSS file)
-     * @param int $lineNumber the line number (starting from 1, not from 0)
+     * @param int<0, max> $lineNumber the line number (starting from 1, not from 0)
      */
     public function __construct($sText, ?Settings $oParserSettings = null, $lineNumber = 1)
     {

src/Parsing/OutputException.php

@@ -11,7 +11,7 @@ final class OutputException extends SourceException
 {
     /**
      * @param string $sMessage
-     * @param int $lineNumber
+     * @param int<0, max> $lineNumber
      */
     public function __construct($sMessage, $lineNumber = 0)
     {

src/Parsing/ParserState.php

@@ -58,7 +58,7 @@ class ParserState
 
     /**
      * @param string $sText the complete CSS as text (i.e., usually the contents of a CSS file)
-     * @param int $lineNumber
+     * @param int<0, max> $lineNumber
      */
     public function __construct($sText, Settings $oParserSettings, $lineNumber = 1)
     {

src/Parsing/SourceException.php

@@ -13,7 +13,7 @@ class SourceException extends \Exception
 
     /**
      * @param string $sMessage
-     * @param int $lineNumber
+     * @param int<0, max> $lineNumber
      */
     public function __construct($sMessage, $lineNumber = 0)
     {
@@ -25,9 +25,9 @@ public function __construct($sMessage, $lineNumber = 0)
     }
 
     /**
-     * @return int
+     * @return int<0, max>
      */
-    public function getLineNo()
+    public function getLineNo(): int
     {
         return $this->lineNumber;
     }

src/Parsing/UnexpectedTokenException.php

@@ -30,7 +30,7 @@ class UnexpectedTokenException extends SourceException
      * @param string $sExpected
      * @param string $sFound
      * @param string $sMatchType
-     * @param int $lineNumber
+     * @param int<0, max> $lineNumber
      */
     public function __construct($sExpected, $sFound, $sMatchType = 'literal', $lineNumber = 0)
     {

src/Property/CSSNamespace.php

@@ -37,7 +37,7 @@ class CSSNamespace implements AtRule
     /**
      * @param string $mUrl
      * @param string|null $sPrefix
-     * @param int $lineNumber
+     * @param int<0, max> $lineNumber
      */
     public function __construct($mUrl, $sPrefix = null, $lineNumber = 0)
     {
@@ -48,9 +48,9 @@ public function __construct($mUrl, $sPrefix = null, $lineNumber = 0)
     }
 
     /**
-     * @return int
+     * @return int<0, max>
      */
-    public function getLineNo()
+    public function getLineNo(): int
     {
         return $this->lineNumber;
     }

src/Property/Charset.php

@@ -24,7 +24,7 @@ class Charset implements AtRule
     private $oCharset;
 
     /**
-     * @var int
+     * @var int<0, max>
      *
      * @internal since 8.8.0
      */
@@ -38,7 +38,7 @@ class Charset implements AtRule
     protected $comments;
 
     /**
-     * @param int $lineNumber
+     * @param int<0, max> $lineNumber
      */
     public function __construct(CSSString $oCharset, $lineNumber = 0)
     {
@@ -48,9 +48,9 @@ public function __construct(CSSString $oCharset, $lineNumber = 0)
     }
 
     /**
-     * @return int
+     * @return int<0, max>
      */
-    public function getLineNo()
+    public function getLineNo(): int
     {
         return $this->lineNumber;
     }

src/Property/Import.php

@@ -24,7 +24,7 @@ class Import implements AtRule
     private $mediaQuery;
 
     /**
-     * @var int
+     * @var int<0, max>
      *
      * @internal since 8.8.0
      */
@@ -39,7 +39,7 @@ class Import implements AtRule
 
     /**
      * @param string $mediaQuery
-     * @param int $lineNumber
+     * @param int<0, max> $lineNumber
      */
     public function __construct(URL $location, $mediaQuery, $lineNumber = 0)
     {
@@ -50,9 +50,9 @@ public function __construct(URL $location, $mediaQuery, $lineNumber = 0)
     }
 
     /**
-     * @return int
+     * @return int<0, max>
      */
-    public function getLineNo()
+    public function getLineNo(): int
     {
         return $this->lineNumber;
     }

src/Renderable.php

@@ -6,18 +6,12 @@
 
 interface Renderable
 {
-    /**
-     * @return string
-     */
-    public function __toString();
+    public function __toString(): string;
 
-    /**
-     * @return string
-     */
-    public function render(OutputFormat $oOutputFormat);
+    public function render(OutputFormat $oOutputFormat): string;
 
     /**
-     * @return int
+     * @return int<0, max>
      */
-    public function getLineNo();
+    public function getLineNo(): int;
 }

src/Rule/Rule.php

@@ -62,7 +62,7 @@ class Rule implements Renderable, Commentable
 
     /**
      * @param string $sRule
-     * @param int $lineNumber
+     * @param int<0, max> $lineNumber
      * @param int $iColNo
      */
     public function __construct($sRule, $lineNumber = 0, $iColNo = 0)
@@ -141,9 +141,9 @@ private static function listDelimiterForRule($sRule): array
     }
 
     /**
-     * @return int
+     * @return int<0, max>
      */
-    public function getLineNo()
+    public function getLineNo(): int
     {
         return $this->lineNumber;
     }

src/RuleSet/AtRuleSet.php

@@ -28,7 +28,7 @@ class AtRuleSet extends RuleSet implements AtRule
     /**
      * @param string $sType
      * @param string $sArgs
-     * @param int $lineNumber
+     * @param int<0, max> $lineNumber
      */
     public function __construct($sType, $sArgs = '', $lineNumber = 0)
     {

src/RuleSet/DeclarationBlock.php

@@ -30,7 +30,7 @@ class DeclarationBlock extends RuleSet
     private $aSelectors;
 
     /**
-     * @param int $lineNumber
+     * @param int<0, max> $lineNumber
      */
     public function __construct($lineNumber = 0)
     {

src/RuleSet/RuleSet.php

@@ -30,7 +30,7 @@ abstract class RuleSet implements Renderable, Commentable
     private $aRules;
 
     /**
-     * @var int
+     * @var int<0, max>
      *
      * @internal since 8.8.0
      */
@@ -44,7 +44,7 @@ abstract class RuleSet implements Renderable, Commentable
     protected $comments;
 
     /**
-     * @param int $lineNumber
+     * @param int<0, max> $lineNumber
      */
     public function __construct($lineNumber = 0)
     {
@@ -94,9 +94,9 @@ public static function parseRuleSet(ParserState $parserState, RuleSet $ruleSet):
     }
 
     /**
-     * @return int
+     * @return int<0, max>
      */
-    public function getLineNo()
+    public function getLineNo(): int
     {
         return $this->lineNumber;
     }

src/Value/CSSFunction.php

@@ -24,7 +24,7 @@ class CSSFunction extends ValueList
      * @param string $sName
      * @param RuleValueList|array<array-key, Value|string> $aArguments
      * @param string $sSeparator
-     * @param int $lineNumber
+     * @param int<0, max> $lineNumber
      */
     public function __construct($sName, $aArguments, $sSeparator = ',', $lineNumber = 0)
     {

src/Value/CSSString.php

@@ -24,7 +24,7 @@ class CSSString extends PrimitiveValue
 
     /**
      * @param string $sString
-     * @param int $lineNumber
+     * @param int<0, max> $lineNumber
      */
     public function __construct($sString, $lineNumber = 0)
     {

src/Value/CalcRuleValueList.php

@@ -9,17 +9,14 @@
 class CalcRuleValueList extends RuleValueList
 {
     /**
-     * @param int $lineNumber
+     * @param int<0, max> $lineNumber
      */
     public function __construct($lineNumber = 0)
     {
         parent::__construct(',', $lineNumber);
     }
 
-    /**
-     * @return string
-     */
-    public function render(OutputFormat $oOutputFormat)
+    public function render(OutputFormat $oOutputFormat): string
     {
         return $oOutputFormat->implode(' ', $this->aComponents);
     }

src/Value/Color.php

@@ -17,7 +17,7 @@ class Color extends CSSFunction
 {
     /**
      * @param array<array-key, Value|string> $colorValues
-     * @param int $lineNumber
+     * @param int<0, max> $lineNumber
      */
     public function __construct(array $colorValues, $lineNumber = 0)
     {

src/Value/LineName.php

@@ -13,7 +13,7 @@ class LineName extends ValueList
 {
     /**
      * @param array<int, Value|string> $aComponents
-     * @param int $lineNumber
+     * @param int<0, max> $lineNumber
      */
     public function __construct(array $aComponents = [], $lineNumber = 0)
     {

src/Value/PrimitiveValue.php

@@ -7,7 +7,7 @@
 abstract class PrimitiveValue extends Value
 {
     /**
-     * @param int $lineNumber
+     * @param int<0, max> $lineNumber
      */
     public function __construct($lineNumber = 0)
     {