From 95835501655f590b1ca6e89d25c462ece1ba5218 Mon Sep 17 00:00:00 2001
From: Oliver Klee <github@oliverklee.de>
Date: Thu, 20 Feb 2025 12:05:44 +0100
Subject: [PATCH] [CLEANUP] Use accessors in `OutputFormatter`

Avoid direct access to `OutputFormat` properties as well
as variable access and magic methods.

Also drop some dead code.

We might possibly want to drop the `space` method altogether,
but that's out of scope for this change.
---
 src/OutputFormatter.php | 68 +++++++++++++++++++++++++++++++----------
 1 file changed, 52 insertions(+), 16 deletions(-)

diff --git a/src/OutputFormatter.php b/src/OutputFormatter.php
index 9f815d6f..dc3e9b57 100644
--- a/src/OutputFormatter.php
+++ b/src/OutputFormatter.php
@@ -19,18 +19,54 @@ public function __construct(OutputFormat $outputFormat)
         $this->outputFormat = $outputFormat;
     }
 
-    public function space(string $sName, ?string $sType = null): string
-    {
-        $sSpaceString = $this->outputFormat->get("Space$sName");
-        // If $sSpaceString is an array, we have multiple values configured
-        // depending on the type of object the space applies to
-        if (\is_array($sSpaceString)) {
-            if ($sType !== null && isset($sSpaceString[$sType])) {
-                $sSpaceString = $sSpaceString[$sType];
-            } else {
-                $sSpaceString = \reset($sSpaceString);
-            }
+    /**
+     * @param non-empty-string $sName
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function space(string $sName): string
+    {
+        switch ($sName) {
+            case 'AfterRuleName':
+                $sSpaceString = $this->outputFormat->getSpaceAfterRuleName();
+                break;
+            case 'BeforeRules':
+                $sSpaceString = $this->outputFormat->getSpaceBeforeRules();
+                break;
+            case 'AfterRules':
+                $sSpaceString = $this->outputFormat->getSpaceAfterRules();
+                break;
+            case 'BetweenRules':
+                $sSpaceString = $this->outputFormat->getSpaceBetweenRules();
+                break;
+            case 'BeforeBlocks':
+                $sSpaceString = $this->outputFormat->getSpaceBeforeBlocks();
+                break;
+            case 'AfterBlocks':
+                $sSpaceString = $this->outputFormat->getSpaceAfterBlocks();
+                break;
+            case 'BetweenBlocks':
+                $sSpaceString = $this->outputFormat->getSpaceBetweenBlocks();
+                break;
+            case 'BeforeSelectorSeparator':
+                $sSpaceString = $this->outputFormat->getSpaceBeforeSelectorSeparator();
+                break;
+            case 'AfterSelectorSeparator':
+                $sSpaceString = $this->outputFormat->getSpaceAfterSelectorSeparator();
+                break;
+            case 'BeforeOpeningBrace':
+                $sSpaceString = $this->outputFormat->getSpaceBeforeOpeningBrace();
+                break;
+            case 'BeforeListArgumentSeparator':
+                $sSpaceString = $this->outputFormat->getSpaceBeforeListArgumentSeparator();
+                break;
+            case 'AfterListArgumentSeparator':
+                $sSpaceString = $this->outputFormat->getSpaceAfterListArgumentSeparator();
+                break;
+            default:
+                throw new \InvalidArgumentException("Unknown space type: $sName", 1740049248);
         }
+
         return $this->prepareSpace($sSpaceString);
     }
 
@@ -86,7 +122,7 @@ public function spaceBeforeListArgumentSeparator(string $sSeparator): string
     {
         $spaceForSeparator = $this->outputFormat->getSpaceBeforeListArgumentSeparators();
 
-        return $spaceForSeparator[$sSeparator] ?? $this->space('BeforeListArgumentSeparator', $sSeparator);
+        return $spaceForSeparator[$sSeparator] ?? $this->space('BeforeListArgumentSeparator');
     }
 
     /**
@@ -96,7 +132,7 @@ public function spaceAfterListArgumentSeparator(string $sSeparator): string
     {
         $spaceForSeparator = $this->outputFormat->getSpaceAfterListArgumentSeparators();
 
-        return $spaceForSeparator[$sSeparator] ?? $this->space('AfterListArgumentSeparator', $sSeparator);
+        return $spaceForSeparator[$sSeparator] ?? $this->space('AfterListArgumentSeparator');
     }
 
     public function spaceBeforeOpeningBrace(): string
@@ -109,7 +145,7 @@ public function spaceBeforeOpeningBrace(): string
      */
     public function safely(callable $cCode): ?string
     {
-        if ($this->outputFormat->get('IgnoreExceptions')) {
+        if ($this->outputFormat->getIgnoreExceptions()) {
             // If output exceptions are ignored, run the code with exception guards
             try {
                 return $cCode();
@@ -152,7 +188,7 @@ public function implode(string $sSeparator, array $aValues, bool $bIncreaseLevel
 
     public function removeLastSemicolon(string $sString): string
     {
-        if ($this->outputFormat->get('SemicolonAfterLastRule')) {
+        if ($this->outputFormat->getSemicolonAfterLastRule()) {
             return $sString;
         }
         $sString = \explode(';', $sString);
@@ -167,7 +203,7 @@ public function removeLastSemicolon(string $sString): string
 
     public function comments(Commentable $oCommentable): string
     {
-        if (!$this->outputFormat->bRenderComments) {
+        if (!$this->outputFormat->getRenderComments()) {
             return '';
         }