[TASK] Avoid magic method forwarding in OutputFormat

Author: oliverklee

src/CSSList/AtRuleBlockList.php

@@ -49,13 +49,14 @@ public function __toString(): string
 
     public function render(OutputFormat $outputFormat): string
     {
-        $result = $outputFormat->comments($this);
+        $formatter = $outputFormat->getFormatter();
+        $result = $formatter->comments($this);
         $result .= $outputFormat->sBeforeAtRuleBlock;
         $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->sAfterAtRuleBlock;

src/CSSList/CSSList.php

@@ -418,25 +418,27 @@ protected function renderListContents(OutputFormat $outputFormat)
         if (!$this->isRootList()) {
             $nextLevelFormat = $outputFormat->nextLevel();
         }
+        $nextLevelFormatter = $nextLevelFormat->getFormatter();
+        $formatter = $outputFormat->getFormatter();
         foreach ($this->contents as $listItem) {
-            $renderedCss = $outputFormat->safely(static function () use ($nextLevelFormat, $listItem): string {
+            $renderedCss = $formatter->safely(static function () use ($nextLevelFormat, $listItem): string {
                 return $listItem->render($nextLevelFormat);
             });
             if ($renderedCss === null) {
                 continue;
             }
             if ($isFirst) {
                 $isFirst = false;
-                $result .= $nextLevelFormat->spaceBeforeBlocks();
+                $result .= $nextLevelFormatter->spaceBeforeBlocks();
             } else {
-                $result .= $nextLevelFormat->spaceBetweenBlocks();
+                $result .= $nextLevelFormatter->spaceBetweenBlocks();
             }
             $result .= $renderedCss;
         }
 
         if (!$isFirst) {
             // Had some output
-            $result .= $outputFormat->spaceAfterBlocks();
+            $result .= $formatter->spaceAfterBlocks();
         }
 
         return $result;

src/CSSList/Document.php

@@ -98,7 +98,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

@@ -58,8 +58,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

@@ -78,7 +78,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)};";
     }
 
     public function atRuleName(): string

src/Property/Import.php

@@ -79,7 +79,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/Rule/Rule.php

@@ -267,7 +267,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

@@ -60,12 +60,13 @@ public function __toString(): string
 
     public function render(OutputFormat $outputFormat): string
     {
-        $result = $outputFormat->comments($this);
+        $formatter = $outputFormat->getFormatter();
+        $result = $formatter->comments($this);
         $arguments = $this->arguments;
         if ($arguments) {
             $arguments = ' ' . $arguments;
         }
-        $result .= "@{$this->type}$arguments{$outputFormat->spaceBeforeOpeningBrace()}{";
+        $result .= "@{$this->type}$arguments{$formatter->spaceBeforeOpeningBrace()}{";
         $result .= $this->renderRules($outputFormat);
         $result .= '}';
         return $result;

src/RuleSet/DeclarationBlock.php

@@ -153,21 +153,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->sBeforeDeclarationBlock;
-        $result .= $outputFormat->implode(
-            $outputFormat->spaceBeforeSelectorSeparator() . ',' . $outputFormat->spaceAfterSelectorSeparator(),
+        $result .= $formatter->implode(
+            $formatter->spaceBeforeSelectorSeparator() . ',' . $formatter->spaceAfterSelectorSeparator(),
             $this->selectors
         );
         $result .= $outputFormat->sAfterDeclarationBlockSelectors;
-        $result .= $outputFormat->spaceBeforeOpeningBrace() . '{';
+        $result .= $formatter->spaceBeforeOpeningBrace() . '{';
         $result .= $this->renderRules($outputFormat);
         $result .= '}';
         $result .= $outputFormat->sAfterDeclarationBlock;
+
         return $result;
     }
 }

src/RuleSet/RuleSet.php

@@ -270,28 +270,29 @@ protected function renderRules(OutputFormat $outputFormat)
         $oNextLevel = $outputFormat->nextLevel();
         foreach ($this->aRules as $aRules) {
             foreach ($aRules as $rule) {
-                $sRendered = $oNextLevel->safely(static function () use ($rule, $oNextLevel): string {
+                $sRendered = $oNextLevel->getFormatter()->safely(static function () use ($rule, $oNextLevel): string {
                     return $rule->render($oNextLevel);
                 });
                 if ($sRendered === null) {
                     continue;
                 }
                 if ($bIsFirst) {
                     $bIsFirst = false;
-                    $result .= $oNextLevel->spaceBeforeRules();
+                    $result .= $oNextLevel->getFormatter()->spaceBeforeRules();
                 } else {
-                    $result .= $oNextLevel->spaceBetweenRules();
+                    $result .= $oNextLevel->getFormatter()->spaceBetweenRules();
                 }
                 $result .= $sRendered;
             }
         }
 
+        $formatter = $outputFormat->getFormatter();
         if (!$bIsFirst) {
             // Had some output
-            $result .= $outputFormat->spaceAfterRules();
+            $result .= $formatter->spaceAfterRules();
         }
 
-        return $outputFormat->removeLastSemicolon($result);
+        return $formatter->removeLastSemicolon($result);
     }
 
     /**