[BUGFIX] Remove trailing semicolon with compact format (#1345)

Fixes #1342.

Author: JakeQZ

CHANGELOG.md

@@ -74,6 +74,8 @@ Please also have a look at our
 
 ### Fixed
 
+- Remove trailing semicolon from declaration blocks with 'compact'
+  `OutputFormat` (#1345)
 - Parse selector functions (like `:not`) with comma-separated arguments (#1292)
 - Parse quoted attribute selector value containing comma (#1323)
 - Allow comma in selectors (e.g. `:not(html, body)`) (#1293)

src/OutputFormat.php

@@ -726,6 +726,7 @@ public static function createCompact(): self
             ->setSpaceAfterRuleName('')
             ->setSpaceBeforeOpeningBrace('')
             ->setSpaceAfterSelectorSeparator('')
+            ->setSemicolonAfterLastRule(false)
             ->setRenderComments(false);
 
         return $format;

tests/Comment/CommentTest.php

@@ -49,8 +49,8 @@ public function keepCommentsInOutput(): void
             . ' * Comments' . "\n"
             . ' *//* Hell */@import url("some/url.css") screen;'
             . '/* Number 4 *//* Number 5 */.foo,#bar{'
-            . '/* Number 6 */background-color:#000;}@media screen{'
-            . '/** Number 10 **/#foo.bar{/** Number 10b **/position:absolute;}}',
+            . '/* Number 6 */background-color:#000}@media screen{'
+            . '/** Number 10 **/#foo.bar{/** Number 10b **/position:absolute}}',
             $cssDocument->render(OutputFormat::createCompact()->setRenderComments(true))
         );
     }
@@ -76,8 +76,8 @@ public function stripCommentsFromOutput(): void
 ', $css->render(OutputFormat::createPretty()->setRenderComments(false)));
         self::assertSame(
             '@import url("some/url.css") screen;'
-            . '.foo,#bar{background-color:#000;}'
-            . '@media screen{#foo.bar{position:absolute;}}',
+            . '.foo,#bar{background-color:#000}'
+            . '@media screen{#foo.bar{position:absolute}}',
             $css->render(OutputFormat::createCompact())
         );
     }

tests/Functional/RuleSet/RuleSetTest.php

@@ -71,7 +71,7 @@ public function renderReturnsCssForRulesSet(array $propertyNamesAndValuesToSet,
     /**
      * @test
      */
-    public function renderWithCompactOutputFormatReturnsCssWithoutWhitespace(): void
+    public function renderWithCompactOutputFormatReturnsCssWithoutWhitespaceOrTrailingSemicolon(): void
     {
         $this->setRulesFromPropertyNamesAndValues([
             ['name' => 'color', 'value' => 'green'],
@@ -80,7 +80,7 @@ public function renderWithCompactOutputFormatReturnsCssWithoutWhitespace(): void
 
         $result = $this->subject->render(OutputFormat::createCompact());
 
-        self::assertSame('color:green;display:block;', $result);
+        self::assertSame('color:green;display:block', $result);
     }
 
     /**

tests/OutputFormatTest.php

@@ -69,8 +69,8 @@ public function plain(): void
     public function compact(): void
     {
         self::assertSame(
-            '.main,.test{font:italic normal bold 16px/1.2 "Helvetica",Verdana,sans-serif;background:white;}'
-            . '@media screen{.main{background-size:100% 100%;font-size:1.3em;background-color:#fff;}}',
+            '.main,.test{font:italic normal bold 16px/1.2 "Helvetica",Verdana,sans-serif;background:white}'
+            . '@media screen{.main{background-size:100% 100%;font-size:1.3em;background-color:#fff}}',
             $this->document->render(OutputFormat::createCompact())
         );
     }

tests/Unit/OutputFormatTest.php

@@ -1034,6 +1034,16 @@ public function createCompactReturnsInstanceWithSpaceAfterListArgumentSeparators
         self::assertSame([], $newInstance->getSpaceAfterListArgumentSeparators());
     }
 
+    /**
+     * @test
+     */
+    public function createCompactReturnsInstanceWithRenderSemicolonAfterLastRuleDisabled(): void
+    {
+        $newInstance = OutputFormat::createCompact();
+
+        self::assertFalse($newInstance->shouldRenderSemicolonAfterLastRule());
+    }
+
     /**
      * @test
      */