Remove space before self-close when auto-fixed

Author: fredden

Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php

@@ -96,7 +96,8 @@ public function process(File $phpcsFile, $stackPtr): void
                         if ($fix) {
                             $token = $phpcsFile->getTokens()[$ptr];
                             $original = $match[0];
-                            $replacement = str_replace('/>', '>', $original);
+                            $replacement = str_replace(' />', '>', $original);
+                            $replacement = str_replace('/>', '>', $replacement);
                             $phpcsFile->fixer->replaceToken(
                                 $ptr,
                                 str_replace($original, $replacement, $token['content'])

Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php

@@ -83,7 +83,8 @@ public function process(File $phpcsFile, $stackPtr)
                         if ($fix) {
                             $token = $phpcsFile->getTokens()[$ptr];
                             $original = $match[0];
-                            $replacement = str_replace('/>', '></' . $match[1] . '>', $original);
+                            $replacement = str_replace(' />', '></' . $match[1] . '>', $original);
+                            $replacement = str_replace('/>', '></' . $match[1] . '>', $replacement);
                             $phpcsFile->fixer->replaceToken(
                                 $ptr,
                                 str_replace($original, $replacement, $token['content'])

Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc

@@ -30,5 +30,6 @@
     </video>
     <wbr/>
     <hr/>
+    <hr style="color: red" />
 </body>
 </html>

Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc.fixed

@@ -30,5 +30,6 @@
     </video>
     <wbr>
     <hr>
+    <hr style="color: red">
 </body>
 </html>

Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.php

@@ -38,6 +38,7 @@ public function getWarningList()
             29 => 1,
             31 => 1,
             32 => 1,
+            33 => 1,
         ];
     }
 }

Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc

@@ -40,5 +40,6 @@
         <translate/>
         <scope/>
         <span/>
+        <span style="color: red" />
     </body>
 </html>

Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc.fixed

@@ -40,5 +40,6 @@
         <translate></translate>
         <scope></scope>
         <span></span>
+        <span style="color: red"></span>
     </body>
 </html>

Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.php

@@ -25,6 +25,7 @@ public function getErrorList()
             40 => 1,
             41 => 1,
             42 => 1,
+            43 => 1,
         ];
     }