[BUGFIX] Render rules in line and column number order (#1059)

Fixes #1052
Closes #1058

Co-authored-by: Jake Hotson <jake.github@qzdesign.co.uk>

Author: oliverklee

CHANGELOG.md

@@ -54,6 +54,7 @@ Please also have a look at our
 
 ### Fixed
 
+- Render rules in line and column number order (#1059)
 - Don't render `rgb` colors with percentage values using hex notation (#803)
 - Parse `@font-face` `src` property as comma-delimited list (#790)
 

src/RuleSet/RuleSet.php

@@ -277,22 +277,20 @@ protected function renderRules(OutputFormat $outputFormat)
         $result = '';
         $isFirst = true;
         $nextLevelFormat = $outputFormat->nextLevel();
-        foreach ($this->rules as $rules) {
-            foreach ($rules as $rule) {
-                $renderedRule = $nextLevelFormat->safely(static function () use ($rule, $nextLevelFormat): string {
-                    return $rule->render($nextLevelFormat);
-                });
-                if ($renderedRule === null) {
-                    continue;
-                }
-                if ($isFirst) {
-                    $isFirst = false;
-                    $result .= $nextLevelFormat->spaceBeforeRules();
-                } else {
-                    $result .= $nextLevelFormat->spaceBetweenRules();
-                }
-                $result .= $renderedRule;
+        foreach ($this->getRules() as $rule) {
+            $renderedRule = $nextLevelFormat->safely(static function () use ($rule, $nextLevelFormat): string {
+                return $rule->render($nextLevelFormat);
+            });
+            if ($renderedRule === null) {
+                continue;
+            }
+            if ($isFirst) {
+                $isFirst = false;
+                $result .= $nextLevelFormat->spaceBeforeRules();
+            } else {
+                $result .= $nextLevelFormat->spaceBetweenRules();
             }
+            $result .= $renderedRule;
         }
 
         if (!$isFirst) {

tests/Functional/RuleSet/DeclarationBlockTest.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sabberworm\CSS\Tests\Functional\RuleSet;
+
+use PHPUnit\Framework\TestCase;
+use Sabberworm\CSS\OutputFormat;
+use Sabberworm\CSS\Property\Selector;
+use Sabberworm\CSS\Rule\Rule;
+use Sabberworm\CSS\RuleSet\DeclarationBlock;
+
+/**
+ * @covers \Sabberworm\CSS\RuleSet\DeclarationBlock
+ */
+final class DeclarationBlockTest extends TestCase
+{
+    /**
+     * @test
+     */
+    public function rendersRulesInOrderProvided(): void
+    {
+        $declarationBlock = new DeclarationBlock();
+        $declarationBlock->setSelectors([new Selector('.test')]);
+
+        $rule1 = new Rule('background-color');
+        $rule1->setValue('transparent');
+        $declarationBlock->addRule($rule1);
+
+        $rule2 = new Rule('background');
+        $rule2->setValue('#222');
+        $declarationBlock->addRule($rule2);
+
+        $rule3 = new Rule('background-color');
+        $rule3->setValue('#fff');
+        $declarationBlock->addRule($rule3);
+
+        $expectedRendering = 'background-color: transparent;background: #222;background-color: #fff';
+        self::assertStringContainsString($expectedRendering, $declarationBlock->render(new OutputFormat()));
+    }
+}