[TASK] Avoid magic method forwarding in OutputFormat

Author: oliverklee

src/CSSList/Document.php

@@ -86,7 +86,7 @@ public function render(?OutputFormat $outputFormat = null): string
         if ($outputFormat === null) {
             $outputFormat = new OutputFormat();
         }
-        return $outputFormat->comments($this) . $this->renderListContents($outputFormat);
+        return $outputFormat->getFormatter()->comments($this) . $this->renderListContents($outputFormat);
     }
 
     public function isRootList(): bool

src/CSSList/KeyFrame.php

@@ -61,8 +61,9 @@ public function __toString(): string
 
     public function render(OutputFormat $outputFormat): string
     {
-        $result = $outputFormat->comments($this);
-        $result .= "@{$this->vendorKeyFrame} {$this->animationName}{$outputFormat->spaceBeforeOpeningBrace()}{";
+        $formatter = $outputFormat->getFormatter();
+        $result = $formatter->comments($this);
+        $result .= "@{$this->vendorKeyFrame} {$this->animationName}{$formatter->spaceBeforeOpeningBrace()}{";
         $result .= $this->renderListContents($outputFormat);
         $result .= '}';
         return $result;

src/Property/Charset.php

@@ -81,7 +81,7 @@ public function __toString(): string
 
     public function render(OutputFormat $outputFormat): string
     {
-        return "{$outputFormat->comments($this)}@charset {$this->charset->render($outputFormat)};";
+        return "{$outputFormat->getFormatter()->comments($this)}@charset {$this->charset->render($outputFormat)};";
     }
 
     /**

src/Property/Import.php

@@ -82,7 +82,7 @@ public function __toString(): string
 
     public function render(OutputFormat $outputFormat): string
     {
-        return $outputFormat->comments($this) . '@import ' . $this->location->render($outputFormat)
+        return $outputFormat->getFormatter()->comments($this) . '@import ' . $this->location->render($outputFormat)
             . ($this->mediaQuery === null ? '' : ' ' . $this->mediaQuery) . ';';
     }
 

src/RuleSet/DeclarationBlock.php

@@ -155,21 +155,23 @@ public function __toString(): string
      */
     public function render(OutputFormat $outputFormat): string
     {
-        $result = $outputFormat->comments($this);
+        $formatter = $outputFormat->getFormatter();
+        $result = $formatter->comments($this);
         if (\count($this->selectors) === 0) {
             // If all the selectors have been removed, this declaration block becomes invalid
             throw new OutputException('Attempt to print declaration block with missing selector', $this->lineNumber);
         }
         $result .= $outputFormat->getContentBeforeDeclarationBlock();
-        $result .= $outputFormat->implode(
-            $outputFormat->spaceBeforeSelectorSeparator() . ',' . $outputFormat->spaceAfterSelectorSeparator(),
+        $result .= $formatter->implode(
+            $formatter->spaceBeforeSelectorSeparator() . ',' . $formatter->spaceAfterSelectorSeparator(),
             $this->selectors
         );
         $result .= $outputFormat->getContentAfterDeclarationBlockSelectors();
-        $result .= $outputFormat->spaceBeforeOpeningBrace() . '{';
+        $result .= $formatter->spaceBeforeOpeningBrace() . '{';
         $result .= $this->renderRules($outputFormat);
         $result .= '}';
         $result .= $outputFormat->getContentAfterDeclarationBlock();
+
         return $result;
     }
 }

src/RuleSet/RuleSet.php

@@ -278,27 +278,29 @@ protected function renderRules(OutputFormat $outputFormat)
         $isFirst = true;
         $nextLevelFormat = $outputFormat->nextLevel();
         foreach ($this->getRules() as $rule) {
-            $renderedRule = $nextLevelFormat->safely(static function () use ($rule, $nextLevelFormat): string {
-                return $rule->render($nextLevelFormat);
-            });
+            $renderedRule = $nextLevelFormat->getFormatter()
+                ->safely(static function () use ($rule, $nextLevelFormat): string {
+                    return $rule->render($nextLevelFormat);
+                });
             if ($renderedRule === null) {
                 continue;
             }
             if ($isFirst) {
                 $isFirst = false;
-                $result .= $nextLevelFormat->spaceBeforeRules();
+                $result .= $nextLevelFormat->getFormatter()->spaceBeforeRules();
             } else {
-                $result .= $nextLevelFormat->spaceBetweenRules();
+                $result .= $nextLevelFormat->getFormatter()->spaceBetweenRules();
             }
             $result .= $renderedRule;
         }
 
+        $formatter = $outputFormat->getFormatter();
         if (!$isFirst) {
             // Had some output
-            $result .= $outputFormat->spaceAfterRules();
+            $result .= $formatter->spaceAfterRules();
         }
 
-        return $outputFormat->removeLastSemicolon($result);
+        return $formatter->removeLastSemicolon($result);
     }
 
     /**

src/Value/CalcRuleValueList.php

@@ -18,6 +18,6 @@ public function __construct(int $lineNumber = 0)
 
     public function render(OutputFormat $outputFormat): string
     {
-        return $outputFormat->implode(' ', $this->components);
+        return $outputFormat->getFormatter()->implode(' ', $this->components);
     }
 }