Merge branch 'main' into task/remove-atruleargs

Author: JakeQZ

CHANGELOG.md

@@ -33,7 +33,7 @@ Please also have a look at our
 - Make all non-private properties `@internal` (#886)
 - Use more native type declarations and strict mode
   (#641, #772, #774, #778, #804, #841, #873, #875, #891, #922, #923, #933, #958,
-  #964, #967, #1000, #1044, #1134, #1136, #1137, #1139, #1140, #1141)
+  #964, #967, #1000, #1044, #1134, #1136, #1137, #1139, #1140, #1141, #1145)
 - Add visibility to all class/interface constants (#469)
 
 ### Deprecated

config/phpstan-baseline.neon

@@ -1,17 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: '#^Call to an undefined method Sabberworm\\CSS\\OutputFormat\:\:comments\(\)\.$#'
-			identifier: method.notFound
-			count: 1
-			path: ../src/CSSList/AtRuleBlockList.php
-
-		-
-			message: '#^Call to an undefined method Sabberworm\\CSS\\OutputFormat\:\:spaceBeforeOpeningBrace\(\)\.$#'
-			identifier: method.notFound
-			count: 1
-			path: ../src/CSSList/AtRuleBlockList.php
-
 		-
 			message: '#^Only booleans are allowed in an if condition, string given\.$#'
 			identifier: if.condNotBoolean
@@ -144,18 +132,6 @@ parameters:
 			count: 1
 			path: ../src/Property/Import.php
 
-		-
-			message: '#^Call to an undefined method Sabberworm\\CSS\\OutputFormat\:\:comments\(\)\.$#'
-			identifier: method.notFound
-			count: 1
-			path: ../src/Rule/Rule.php
-
-		-
-			message: '#^Call to an undefined method Sabberworm\\CSS\\OutputFormat\:\:spaceAfterRuleName\(\)\.$#'
-			identifier: method.notFound
-			count: 1
-			path: ../src/Rule/Rule.php
-
 		-
 			message: '#^Only booleans are allowed in an if condition, Sabberworm\\CSS\\Value\\RuleValueList\|string\|null given\.$#'
 			identifier: if.condNotBoolean
@@ -371,21 +347,3 @@ parameters:
 			identifier: typePerfect.narrowPublicClassMethodParamType
 			count: 1
 			path: ../src/Value/Size.php
-
-		-
-			message: '#^Call to an undefined method Sabberworm\\CSS\\OutputFormat\:\:implode\(\)\.$#'
-			identifier: method.notFound
-			count: 1
-			path: ../src/Value/ValueList.php
-
-		-
-			message: '#^Call to an undefined method Sabberworm\\CSS\\OutputFormat\:\:spaceAfterListArgumentSeparator\(\)\.$#'
-			identifier: method.notFound
-			count: 1
-			path: ../src/Value/ValueList.php
-
-		-
-			message: '#^Call to an undefined method Sabberworm\\CSS\\OutputFormat\:\:spaceBeforeListArgumentSeparator\(\)\.$#'
-			identifier: method.notFound
-			count: 1
-			path: ../src/Value/ValueList.php

src/CSSList/AtRuleBlockList.php

@@ -13,7 +13,7 @@
 class AtRuleBlockList extends CSSBlockList implements AtRule
 {
     /**
-     * @var string
+     * @var non-empty-string
      */
     private $type;
 
@@ -23,6 +23,7 @@ class AtRuleBlockList extends CSSBlockList implements AtRule
     private $arguments;
 
     /**
+     * @param non-empty-string $type
      * @param int<0, max> $lineNumber
      */
     public function __construct(string $type, string $arguments = '', int $lineNumber = 0)
@@ -32,6 +33,9 @@ public function __construct(string $type, string $arguments = '', int $lineNumbe
         $this->arguments = $arguments;
     }
 
+    /**
+     * @return non-empty-string
+     */
     public function atRuleName(): string
     {
         return $this->type;
@@ -52,13 +56,14 @@ public function __toString(): string
 
     public function render(OutputFormat $outputFormat): string
     {
-        $result = $outputFormat->comments($this);
+        $formatter = $outputFormat->getFormatter();
+        $result = $formatter->comments($this);
         $result .= $outputFormat->getContentBeforeAtRuleBlock();
         $arguments = $this->arguments;
         if ($arguments) {
             $arguments = ' ' . $arguments;
         }
-        $result .= "@{$this->type}$arguments{$outputFormat->spaceBeforeOpeningBrace()}{";
+        $result .= "@{$this->type}$arguments{$formatter->spaceBeforeOpeningBrace()}{";
         $result .= $this->renderListContents($outputFormat);
         $result .= '}';
         $result .= $outputFormat->getContentAfterAtRuleBlock();

src/Property/AtRule.php

@@ -20,7 +20,7 @@ interface AtRule extends Renderable, Commentable
     public const BLOCK_RULES = 'media/document/supports/region-style/font-feature-values';
 
     /**
-     * @return string|null
+     * @return non-empty-string
      */
-    public function atRuleName();
+    public function atRuleName(): string;
 }

src/Property/CSSNamespace.php

@@ -101,7 +101,7 @@ public function setPrefix($prefix): void
     }
 
     /**
-     * @return string
+     * @return non-empty-string
      */
     public function atRuleName(): string
     {

src/Property/Charset.php

@@ -84,6 +84,9 @@ public function render(OutputFormat $outputFormat): string
         return "{$outputFormat->comments($this)}@charset {$this->charset->render($outputFormat)};";
     }
 
+    /**
+     * @return non-empty-string
+     */
     public function atRuleName(): string
     {
         return 'charset';

src/Property/Import.php

@@ -86,6 +86,9 @@ public function render(OutputFormat $outputFormat): string
             . ($this->mediaQuery === null ? '' : ' ' . $this->mediaQuery) . ';';
     }
 
+    /**
+     * @return non-empty-string
+     */
     public function atRuleName(): string
     {
         return 'import';

src/Rule/Rule.php

@@ -234,7 +234,8 @@ public function __toString(): string
 
     public function render(OutputFormat $outputFormat): string
     {
-        $result = "{$outputFormat->comments($this)}{$this->rule}:{$outputFormat->spaceAfterRuleName()}";
+        $formatter = $outputFormat->getFormatter();
+        $result = "{$formatter->comments($this)}{$this->rule}:{$formatter->spaceAfterRuleName()}";
         if ($this->value instanceof Value) { // Can also be a ValueList
             $result .= $this->value->render($outputFormat);
         } else {

src/RuleSet/AtRuleSet.php

@@ -16,7 +16,7 @@
 class AtRuleSet extends RuleSet implements AtRule
 {
     /**
-     * @var string
+     * @var non-empty-string
      */
     private $type;
 
@@ -26,7 +26,7 @@ class AtRuleSet extends RuleSet implements AtRule
     private $arguments;
 
     /**
-     * @param string $type
+     * @param non-empty-string $type
      * @param string $arguments
      * @param int<0, max> $lineNumber
      */
@@ -38,9 +38,9 @@ public function __construct($type, $arguments = '', int $lineNumber = 0)
     }
 
     /**
-     * @return string
+     * @return non-empty-string
      */
-    public function atRuleName()
+    public function atRuleName(): string
     {
         return $this->type;
     }

src/Value/ValueList.php

@@ -93,9 +93,11 @@ public function __toString(): string
 
     public function render(OutputFormat $outputFormat): string
     {
-        return $outputFormat->implode(
-            $outputFormat->spaceBeforeListArgumentSeparator($this->separator) . $this->separator
-            . $outputFormat->spaceAfterListArgumentSeparator($this->separator),
+        $formatter = $outputFormat->getFormatter();
+
+        return $formatter->implode(
+            $formatter->spaceBeforeListArgumentSeparator($this->separator) . $this->separator
+            . $formatter->spaceAfterListArgumentSeparator($this->separator),
             $this->components
         );
     }