[CLEANUP] Avoid Hungarian notation for outputFormat (#910)

Part of #756

Author: oliverklee

src/CSSList/AtRuleBlockList.php

@@ -55,18 +55,18 @@ public function __toString(): string
         return $this->render(new OutputFormat());
     }
 
-    public function render(OutputFormat $oOutputFormat): string
+    public function render(OutputFormat $outputFormat): string
     {
-        $sResult = $oOutputFormat->comments($this);
-        $sResult .= $oOutputFormat->sBeforeAtRuleBlock;
+        $sResult = $outputFormat->comments($this);
+        $sResult .= $outputFormat->sBeforeAtRuleBlock;
         $sArgs = $this->sArgs;
         if ($sArgs) {
             $sArgs = ' ' . $sArgs;
         }
-        $sResult .= "@{$this->type}$sArgs{$oOutputFormat->spaceBeforeOpeningBrace()}{";
-        $sResult .= $this->renderListContents($oOutputFormat);
+        $sResult .= "@{$this->type}$sArgs{$outputFormat->spaceBeforeOpeningBrace()}{";
+        $sResult .= $this->renderListContents($outputFormat);
         $sResult .= '}';
-        $sResult .= $oOutputFormat->sAfterAtRuleBlock;
+        $sResult .= $outputFormat->sAfterAtRuleBlock;
         return $sResult;
     }
 

src/CSSList/CSSList.php

@@ -410,16 +410,16 @@ public function __toString(): string
     /**
      * @return string
      */
-    protected function renderListContents(OutputFormat $oOutputFormat)
+    protected function renderListContents(OutputFormat $outputFormat)
     {
         $result = '';
         $isFirst = true;
-        $nextLevelFormat = $oOutputFormat;
+        $nextLevelFormat = $outputFormat;
         if (!$this->isRootList()) {
-            $nextLevelFormat = $oOutputFormat->nextLevel();
+            $nextLevelFormat = $outputFormat->nextLevel();
         }
         foreach ($this->contents as $listItem) {
-            $renderedCss = $oOutputFormat->safely(static function () use ($nextLevelFormat, $listItem): string {
+            $renderedCss = $outputFormat->safely(static function () use ($nextLevelFormat, $listItem): string {
                 return $listItem->render($nextLevelFormat);
             });
             if ($renderedCss === null) {
@@ -436,7 +436,7 @@ protected function renderListContents(OutputFormat $oOutputFormat)
 
         if (!$isFirst) {
             // Had some output
-            $result .= $oOutputFormat->spaceAfterBlocks();
+            $result .= $outputFormat->spaceAfterBlocks();
         }
 
         return $result;

src/CSSList/Document.php

@@ -114,12 +114,12 @@ public function getSelectorsBySpecificity($sSpecificitySearch = null): array
     /**
      * Overrides `render()` to make format argument optional.
      */
-    public function render(?OutputFormat $oOutputFormat = null): string
+    public function render(?OutputFormat $outputFormat = null): string
     {
-        if ($oOutputFormat === null) {
-            $oOutputFormat = new OutputFormat();
+        if ($outputFormat === null) {
+            $outputFormat = new OutputFormat();
         }
-        return $oOutputFormat->comments($this) . $this->renderListContents($oOutputFormat);
+        return $outputFormat->comments($this) . $this->renderListContents($outputFormat);
     }
 
     public function isRootList(): bool

src/CSSList/KeyFrame.php

@@ -66,11 +66,11 @@ public function __toString(): string
         return $this->render(new OutputFormat());
     }
 
-    public function render(OutputFormat $oOutputFormat): string
+    public function render(OutputFormat $outputFormat): string
     {
-        $sResult = $oOutputFormat->comments($this);
-        $sResult .= "@{$this->vendorKeyFrame} {$this->animationName}{$oOutputFormat->spaceBeforeOpeningBrace()}{";
-        $sResult .= $this->renderListContents($oOutputFormat);
+        $sResult = $outputFormat->comments($this);
+        $sResult .= "@{$this->vendorKeyFrame} {$this->animationName}{$outputFormat->spaceBeforeOpeningBrace()}{";
+        $sResult .= $this->renderListContents($outputFormat);
         $sResult .= '}';
         return $sResult;
     }

src/Property/CSSNamespace.php

@@ -60,10 +60,10 @@ public function __toString(): string
         return $this->render(new OutputFormat());
     }
 
-    public function render(OutputFormat $oOutputFormat): string
+    public function render(OutputFormat $outputFormat): string
     {
         return '@namespace ' . ($this->sPrefix === null ? '' : $this->sPrefix . ' ')
-            . $this->mUrl->render($oOutputFormat) . ';';
+            . $this->mUrl->render($outputFormat) . ';';
     }
 
     /**

src/Property/Charset.php

@@ -77,9 +77,9 @@ public function __toString(): string
         return $this->render(new OutputFormat());
     }
 
-    public function render(OutputFormat $oOutputFormat): string
+    public function render(OutputFormat $outputFormat): string
     {
-        return "{$oOutputFormat->comments($this)}@charset {$this->oCharset->render($oOutputFormat)};";
+        return "{$outputFormat->comments($this)}@charset {$this->oCharset->render($outputFormat)};";
     }
 
     public function atRuleName(): string

src/Property/Import.php

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

src/Renderable.php

@@ -8,7 +8,7 @@ interface Renderable
 {
     public function __toString(): string;
 
-    public function render(OutputFormat $oOutputFormat): string;
+    public function render(OutputFormat $outputFormat): string;
 
     /**
      * @return int<0, max>

src/Rule/Rule.php

@@ -267,11 +267,11 @@ public function __toString(): string
         return $this->render(new OutputFormat());
     }
 
-    public function render(OutputFormat $oOutputFormat): string
+    public function render(OutputFormat $outputFormat): string
     {
-        $sResult = "{$oOutputFormat->comments($this)}{$this->sRule}:{$oOutputFormat->spaceAfterRuleName()}";
+        $sResult = "{$outputFormat->comments($this)}{$this->sRule}:{$outputFormat->spaceAfterRuleName()}";
         if ($this->mValue instanceof Value) { // Can also be a ValueList
-            $sResult .= $this->mValue->render($oOutputFormat);
+            $sResult .= $this->mValue->render($outputFormat);
         } else {
             $sResult .= $this->mValue;
         }

src/RuleSet/AtRuleSet.php

@@ -58,15 +58,15 @@ public function __toString(): string
         return $this->render(new OutputFormat());
     }
 
-    public function render(OutputFormat $oOutputFormat): string
+    public function render(OutputFormat $outputFormat): string
     {
-        $sResult = $oOutputFormat->comments($this);
+        $sResult = $outputFormat->comments($this);
         $sArgs = $this->sArgs;
         if ($sArgs) {
             $sArgs = ' ' . $sArgs;
         }
-        $sResult .= "@{$this->sType}$sArgs{$oOutputFormat->spaceBeforeOpeningBrace()}{";
-        $sResult .= $this->renderRules($oOutputFormat);
+        $sResult .= "@{$this->sType}$sArgs{$outputFormat->spaceBeforeOpeningBrace()}{";
+        $sResult .= $this->renderRules($outputFormat);
         $sResult .= '}';
         return $sResult;
     }