From 875262961aaa8ce7d34512131d7ce8556dfe3585 Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Tue, 31 Jan 2023 17:17:20 +0000
Subject: [PATCH 01/12] Update list of void elements

---
 Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php     |  6 ++----
 Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php     | 11 ++++-------
 Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc   |  2 --
 Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.php   |  4 +++-
 Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc |  2 --
 Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.php   |  4 +++-
 6 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php b/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
index 5ce7c20d..c92f3742 100644
--- a/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
+++ b/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
@@ -44,15 +44,13 @@ class HtmlClosingVoidTagsSniff implements Sniff
         'col',
         'embed',
         'hr',
+        'img',
         'input',
-        'keygen',
         'link',
-        'menuitem',
         'meta',
-        'param',
         'source',
         'track',
-        'wbr'
+        'wbr',
     ];
 
     /**
diff --git a/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php b/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
index ecbdca44..e2527bb2 100644
--- a/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
+++ b/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
@@ -17,13 +17,13 @@
 class HtmlSelfClosingTagsSniff implements Sniff
 {
     /**
-     * List of void elements
+     * List of void elements.
      *
-     * https://www.w3.org/TR/html51/syntax.html#writing-html-documents-elements
+     * https://html.spec.whatwg.org/multipage/syntax.html#void-elements
      *
      * @var string[]
      */
-    private $voidElements = [
+    private const HTML_VOID_ELEMENTS = [
         'area',
         'base',
         'br',
@@ -32,11 +32,8 @@ class HtmlSelfClosingTagsSniff implements Sniff
         'hr',
         'img',
         'input',
-        'keygen',
         'link',
-        'menuitem',
         'meta',
-        'param',
         'source',
         'track',
         'wbr',
@@ -70,7 +67,7 @@ public function process(File $phpcsFile, $stackPtr)
 
         if (preg_match_all('$<(\w{2,})\s?[^<]*\/>$', $html, $matches, PREG_SET_ORDER)) {
             foreach ($matches as $match) {
-                if (!in_array($match[1], $this->voidElements)) {
+                if (!in_array($match[1], self::HTML_VOID_ELEMENTS)) {
                     $phpcsFile->addError(
                         'Avoid using self-closing tag with non-void html element'
                         . ' - "' . $match[0]  . PHP_EOL,
diff --git a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc
index dd701d03..68cf5f01 100644
--- a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc
+++ b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc
@@ -22,10 +22,8 @@
     <hr/>
     <img src="" alt=""/>
     <input type="text" id="test_input"/>
-    <keygen/>
     <link/>
     <meta/>
-    <param name="" value=""/>
     <video>
         <source/>
         <track src=""/>
diff --git a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.php b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.php
index db95dd69..87103b9a 100644
--- a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.php
+++ b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.php
@@ -22,6 +22,8 @@ public function getErrorList()
      */
     public function getWarningList()
     {
-        return [1 => 15];
+        return [
+            1 => 14,
+        ];
     }
 }
diff --git a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc
index 3fadb203..b6ebd936 100644
--- a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc
+++ b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc
@@ -22,10 +22,8 @@
         <hr/>
         <img src="" alt=""/>
         <input type="text" id="test_input"/>
-        <keygen/>
         <link/>
         <meta/>
-        <param name="" value=""/>
         <video>
             <source/>
             <track src=""/>
diff --git a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.php b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.php
index dd6b0cef..b7287c87 100644
--- a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.php
+++ b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.php
@@ -14,7 +14,9 @@ class HtmlSelfClosingTagsUnitTest extends AbstractSniffUnitTest
      */
     public function getErrorList()
     {
-        return [1 => 9];
+        return [
+            1 => 9,
+        ];
     }
 
     /**

From 436084e6551204922dcbe4d46fdf406b1edb3fe5 Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Tue, 31 Jan 2023 17:25:25 +0000
Subject: [PATCH 02/12] Automatically fix closing tags when possible

---
 .../Sniffs/Html/HtmlClosingVoidTagsSniff.php  |  30 ++++-
 .../Sniffs/Html/HtmlSelfClosingTagsSniff.php  |  30 ++++-
 .../HtmlClosingVoidTagsUnitTest.inc.fixed     |  33 +++++
 .../HtmlSelfClosingTagsUnitTest.1.inc.fixed   |  43 +++++++
 composer.json                                 |   3 +-
 composer.lock                                 | 121 +++++++++++++++++-
 6 files changed, 255 insertions(+), 5 deletions(-)
 create mode 100644 Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc.fixed
 create mode 100644 Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc.fixed

diff --git a/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php b/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
index c92f3742..c6e6916b 100644
--- a/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
+++ b/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
@@ -82,13 +82,41 @@ public function process(File $phpcsFile, $stackPtr): void
         if (preg_match_all('$<(\w{2,})\s?[^<]*\/>$', $html, $matches, PREG_SET_ORDER)) {
             foreach ($matches as $match) {
                 if (in_array($match[1], self::HTML_VOID_ELEMENTS)) {
-                    $phpcsFile->addWarning(
+                    $fix = $phpcsFile->addFixableWarning(
                         sprintf(self::WARNING_MESSAGE, $match[0]),
                         null,
                         self::WARNING_CODE
                     );
+
+                    if ($fix) {
+                        $this->fixClosingTag($phpcsFile, $match[0]);
+                    }
                 }
             }
         }
     }
+
+    /**
+     * Apply a fix for the detected issue
+     *
+     * @param File $phpcsFile
+     * @param string $needle
+     */
+    public function fixClosingTag(File $phpcsFile, string $needle): void
+    {
+        foreach ($phpcsFile->getTokens() as $ptr => $token) {
+            if ($token['code'] !== T_INLINE_HTML) {
+                continue;
+            }
+
+            if (str_contains($token['content'], $needle)) {
+                $original = $needle;
+                $replacement = str_replace('/>', '>', $original);
+
+                $phpcsFile->fixer->replaceToken($ptr, str_replace($original, $replacement, $token['content']));
+
+                break;
+            }
+        }
+    }
 }
diff --git a/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php b/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
index e2527bb2..5b07744a 100644
--- a/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
+++ b/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
@@ -68,14 +68,42 @@ public function process(File $phpcsFile, $stackPtr)
         if (preg_match_all('$<(\w{2,})\s?[^<]*\/>$', $html, $matches, PREG_SET_ORDER)) {
             foreach ($matches as $match) {
                 if (!in_array($match[1], self::HTML_VOID_ELEMENTS)) {
-                    $phpcsFile->addError(
+                    $fix = $phpcsFile->addFixableError(
                         'Avoid using self-closing tag with non-void html element'
                         . ' - "' . $match[0]  . PHP_EOL,
                         null,
                         'HtmlSelfClosingNonVoidTag'
                     );
+
+                    if ($fix) {
+                        $this->fixClosingTag($phpcsFile, $match);
+                    }
                 }
             }
         }
     }
+
+    /**
+     * Apply a fix for the detected issue
+     *
+     * @param File  $phpcsFile
+     * @param array $match
+     */
+    private function fixClosingTag(File $phpcsFile, array $match): void
+    {
+        foreach ($phpcsFile->getTokens() as $ptr => $token) {
+            if ($token['code'] !== T_INLINE_HTML) {
+                continue;
+            }
+
+            if (str_contains($token['content'], $match[0])) {
+                $original = $match[0];
+                $replacement = str_replace('/>', '></' . $match[1] . '>', $original);
+
+                $phpcsFile->fixer->replaceToken($ptr, str_replace($original, $replacement, $token['content']));
+
+                return;
+            }
+        }
+    }
 }
diff --git a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc.fixed b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc.fixed
new file mode 100644
index 00000000..18c36267
--- /dev/null
+++ b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc.fixed
@@ -0,0 +1,33 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<html>
+<head>
+    <base>
+    <link>
+</head>
+<body>
+    <area alt="">
+    <br>
+    <table>
+        <colgroup>
+            <col>
+        </colgroup>
+    </table>
+    <embed>
+    <hr>
+    <img src="" alt="">
+    <input type="text" id="test_input">
+    <link>
+    <meta>
+    <video>
+        <source>
+        <track src="">
+    </video>
+    <wbr>
+</body>
+</html>
diff --git a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc.fixed b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc.fixed
new file mode 100644
index 00000000..60d65c44
--- /dev/null
+++ b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc.fixed
@@ -0,0 +1,43 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<html>
+    <head>
+        <base/>
+        <link/>
+    </head>
+    <body>
+        <area alt=""/>
+        <br/>
+        <table>
+            <colgroup>
+                <col/>
+            </colgroup>
+        </table>
+        <embed/>
+        <hr/>
+        <img src="" alt=""/>
+        <input type="text" id="test_input"/>
+        <link/>
+        <meta/>
+        <video>
+            <source/>
+            <track src=""/>
+        </video>
+        <wbr/>
+
+        <label for="test_input"></label>
+        <style type="text/css"></style>
+        <div></div>
+        <span></span>
+        <text></text>
+        <render></render>
+        <each></each>
+        <translate></translate>
+        <scope></scope>
+    </body>
+</html>
diff --git a/composer.json b/composer.json
index a277cf3a..3624e916 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,8 @@
         "ext-dom": "*",
         "phpcompatibility/php-compatibility": "^9.3",
         "squizlabs/php_codesniffer": "^3.6.1",
-        "rector/rector": "^0.14.8"
+        "rector/rector": "^0.14.8",
+        "symfony/polyfill": "^1.15"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.8"
diff --git a/composer.lock b/composer.lock
index 11f55459..fc4ed920 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "cfdb4177ef4747a5a6b83942ab05d65d",
+    "content-hash": "6e4991bd93ecef257345b98d603f57d0",
     "packages": [
         {
             "name": "phpcompatibility/php-compatibility",
@@ -240,6 +240,123 @@
             },
             "time": "2022-06-18T07:21:10+00:00"
         },
+        {
+            "name": "symfony/polyfill",
+            "version": "v1.27.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill.git",
+                "reference": "b78222a273aac3e5bab6358bf499d7f1fb88e48b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill/zipball/b78222a273aac3e5bab6358bf499d7f1fb88e48b",
+                "reference": "b78222a273aac3e5bab6358bf499d7f1fb88e48b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "replace": {
+                "symfony/polyfill-apcu": "self.version",
+                "symfony/polyfill-ctype": "self.version",
+                "symfony/polyfill-iconv": "self.version",
+                "symfony/polyfill-intl-grapheme": "self.version",
+                "symfony/polyfill-intl-icu": "self.version",
+                "symfony/polyfill-intl-idn": "self.version",
+                "symfony/polyfill-intl-messageformatter": "self.version",
+                "symfony/polyfill-intl-normalizer": "self.version",
+                "symfony/polyfill-mbstring": "self.version",
+                "symfony/polyfill-php72": "self.version",
+                "symfony/polyfill-php73": "self.version",
+                "symfony/polyfill-php74": "self.version",
+                "symfony/polyfill-php80": "self.version",
+                "symfony/polyfill-php81": "self.version",
+                "symfony/polyfill-php82": "self.version",
+                "symfony/polyfill-php83": "self.version",
+                "symfony/polyfill-util": "self.version",
+                "symfony/polyfill-uuid": "self.version",
+                "symfony/polyfill-xml": "self.version"
+            },
+            "require-dev": {
+                "symfony/intl": "^4.4|^5.0|^6.0",
+                "symfony/phpunit-bridge": "^5.3|^6.0",
+                "symfony/var-dumper": "^4.4|^5.1|^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.27-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/bootstrap.php",
+                    "src/Apcu/bootstrap.php",
+                    "src/Ctype/bootstrap.php",
+                    "src/Uuid/bootstrap.php",
+                    "src/Iconv/bootstrap.php",
+                    "src/Intl/Grapheme/bootstrap.php",
+                    "src/Intl/Idn/bootstrap.php",
+                    "src/Intl/Icu/bootstrap.php",
+                    "src/Intl/MessageFormatter/bootstrap.php",
+                    "src/Intl/Normalizer/bootstrap.php",
+                    "src/Mbstring/bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\": "src/"
+                },
+                "classmap": [
+                    "src/Intl/Icu/Resources/stubs",
+                    "src/Intl/MessageFormatter/Resources/stubs",
+                    "src/Intl/Normalizer/Resources/stubs",
+                    "src/Php82/Resources/stubs",
+                    "src/Php80/Resources/stubs",
+                    "src/Php73/Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfills backporting features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compat",
+                "compatibility",
+                "polyfill",
+                "shim"
+            ],
+            "support": {
+                "issues": "https://github.com/symfony/polyfill/issues",
+                "source": "https://github.com/symfony/polyfill/tree/v1.27.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-11-10T10:11:03+00:00"
+        },
         {
             "name": "webonyx/graphql-php",
             "version": "v15.0.0",
@@ -2054,5 +2171,5 @@
         "ext-dom": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.3.0"
 }

From da2ee67438887c4609c91b28c502317565e3feb8 Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Tue, 31 Jan 2023 18:55:26 +0000
Subject: [PATCH 03/12] Annotate the offending lines not the file

---
 .../Sniffs/Html/HtmlClosingVoidTagsSniff.php  | 49 ++++++++++-----
 .../Sniffs/Html/HtmlSelfClosingTagsSniff.php  | 59 +++++++++++++------
 .../Html/HtmlClosingVoidTagsUnitTest.inc      |  1 +
 .../HtmlClosingVoidTagsUnitTest.inc.fixed     |  1 +
 .../Html/HtmlClosingVoidTagsUnitTest.php      | 16 ++++-
 .../Html/HtmlSelfClosingTagsUnitTest.1.inc    |  1 +
 .../HtmlSelfClosingTagsUnitTest.1.inc.fixed   |  1 +
 .../Html/HtmlSelfClosingTagsUnitTest.php      | 11 +++-
 8 files changed, 105 insertions(+), 34 deletions(-)

diff --git a/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php b/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
index c6e6916b..3d895bff 100644
--- a/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
+++ b/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
@@ -53,6 +53,9 @@ class HtmlClosingVoidTagsSniff implements Sniff
         'wbr',
     ];
 
+    /** @var int */
+    private int $lastPointer = 0;
+
     /**
      * @inheritdoc
      */
@@ -82,14 +85,29 @@ public function process(File $phpcsFile, $stackPtr): void
         if (preg_match_all('$<(\w{2,})\s?[^<]*\/>$', $html, $matches, PREG_SET_ORDER)) {
             foreach ($matches as $match) {
                 if (in_array($match[1], self::HTML_VOID_ELEMENTS)) {
-                    $fix = $phpcsFile->addFixableWarning(
-                        sprintf(self::WARNING_MESSAGE, $match[0]),
-                        null,
-                        self::WARNING_CODE
-                    );
+                    $ptr = $this->findPointer($phpcsFile, $match[0]);
+                    if ($ptr) {
+                        $fix = $phpcsFile->addFixableWarning(
+                            sprintf(self::WARNING_MESSAGE, $match[0]),
+                            $ptr,
+                            self::WARNING_CODE
+                        );
 
-                    if ($fix) {
-                        $this->fixClosingTag($phpcsFile, $match[0]);
+                        if ($fix) {
+                            $token = $phpcsFile->getTokens()[$ptr];
+                            $original = $match[0];
+                            $replacement = str_replace('/>', '>', $original);
+                            $phpcsFile->fixer->replaceToken(
+                                $ptr,
+                                str_replace($original, $replacement, $token['content'])
+                            );
+                        }
+                    } else {
+                        $phpcsFile->addWarning(
+                            sprintf(self::WARNING_MESSAGE, $match[0]),
+                            null,
+                            self::WARNING_CODE
+                        );
                     }
                 }
             }
@@ -101,22 +119,25 @@ public function process(File $phpcsFile, $stackPtr): void
      *
      * @param File $phpcsFile
      * @param string $needle
+     * @return int|null
      */
-    public function fixClosingTag(File $phpcsFile, string $needle): void
+    public function findPointer(File $phpcsFile, string $needle): ?int
     {
         foreach ($phpcsFile->getTokens() as $ptr => $token) {
+            if ($ptr < $this->lastPointer) {
+                continue;
+            }
+
             if ($token['code'] !== T_INLINE_HTML) {
                 continue;
             }
 
             if (str_contains($token['content'], $needle)) {
-                $original = $needle;
-                $replacement = str_replace('/>', '>', $original);
-
-                $phpcsFile->fixer->replaceToken($ptr, str_replace($original, $replacement, $token['content']));
-
-                break;
+                $this->lastPointer = $ptr;
+                return $ptr;
             }
         }
+
+        return null;
     }
 }
diff --git a/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php b/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
index 5b07744a..f068627f 100644
--- a/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
+++ b/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
@@ -39,6 +39,9 @@ class HtmlSelfClosingTagsSniff implements Sniff
         'wbr',
     ];
 
+    /** @var int */
+    private int $lastPointer = 0;
+
     /**
      * @inheritDoc
      */
@@ -68,15 +71,32 @@ public function process(File $phpcsFile, $stackPtr)
         if (preg_match_all('$<(\w{2,})\s?[^<]*\/>$', $html, $matches, PREG_SET_ORDER)) {
             foreach ($matches as $match) {
                 if (!in_array($match[1], self::HTML_VOID_ELEMENTS)) {
-                    $fix = $phpcsFile->addFixableError(
-                        'Avoid using self-closing tag with non-void html element'
-                        . ' - "' . $match[0]  . PHP_EOL,
-                        null,
-                        'HtmlSelfClosingNonVoidTag'
-                    );
+                    $ptr = $this->findPointer($phpcsFile, $match[0]);
+                    if ($ptr) {
+                        $fix = $phpcsFile->addFixableError(
+                            'Avoid using self-closing tag with non-void html element'
+                            . ' - "' . $match[0] . PHP_EOL,
+                            $ptr,
+                            'HtmlSelfClosingNonVoidTag'
+                        );
+
+                        if ($fix) {
+                            $token = $phpcsFile->getTokens()[$ptr];
+                            $original = $match[0];
+                            $replacement = str_replace('/>', '></' . $match[1] . '>', $original);
+                            $phpcsFile->fixer->replaceToken(
+                                $ptr,
+                                str_replace($original, $replacement, $token['content'])
+                            );
 
-                    if ($fix) {
-                        $this->fixClosingTag($phpcsFile, $match);
+                        }
+                    } else {
+                        $phpcsFile->addError(
+                            'Avoid using self-closing tag with non-void html element'
+                            . ' - "' . $match[0]  . PHP_EOL,
+                            null,
+                            'HtmlSelfClosingNonVoidTag'
+                        );
                     }
                 }
             }
@@ -86,24 +106,27 @@ public function process(File $phpcsFile, $stackPtr)
     /**
      * Apply a fix for the detected issue
      *
-     * @param File  $phpcsFile
-     * @param array $match
+     * @param File $phpcsFile
+     * @param string $needle
+     * @return int|null
      */
-    private function fixClosingTag(File $phpcsFile, array $match): void
+    private function findPointer(File $phpcsFile, string $needle): ?int
     {
         foreach ($phpcsFile->getTokens() as $ptr => $token) {
-            if ($token['code'] !== T_INLINE_HTML) {
+            if ($ptr < $this->lastPointer) {
                 continue;
             }
 
-            if (str_contains($token['content'], $match[0])) {
-                $original = $match[0];
-                $replacement = str_replace('/>', '></' . $match[1] . '>', $original);
-
-                $phpcsFile->fixer->replaceToken($ptr, str_replace($original, $replacement, $token['content']));
+            if ($token['code'] !== T_INLINE_HTML) {
+                continue;
+            }
 
-                return;
+            if (str_contains($token['content'], $needle)) {
+                $this->lastPointer = $ptr;
+                return $ptr;
             }
         }
+
+        return null;
     }
 }
diff --git a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc
index 68cf5f01..5c6c021a 100644
--- a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc
+++ b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc
@@ -29,5 +29,6 @@
         <track src=""/>
     </video>
     <wbr/>
+    <hr/>
 </body>
 </html>
diff --git a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc.fixed b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc.fixed
index 18c36267..0ad134a8 100644
--- a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc.fixed
+++ b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc.fixed
@@ -29,5 +29,6 @@
         <track src="">
     </video>
     <wbr>
+    <hr>
 </body>
 </html>
diff --git a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.php b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.php
index 87103b9a..54ef3da8 100644
--- a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.php
+++ b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.php
@@ -23,7 +23,21 @@ public function getErrorList()
     public function getWarningList()
     {
         return [
-            1 => 14,
+            10 => 1,
+            11 => 1,
+            14 => 1,
+            15 => 1,
+            18 => 1,
+            21 => 1,
+            22 => 1,
+            23 => 1,
+            24 => 1,
+            25 => 1,
+            26 => 1,
+            28 => 1,
+            29 => 1,
+            31 => 1,
+            32 => 1,
         ];
     }
 }
diff --git a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc
index b6ebd936..4a412822 100644
--- a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc
+++ b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc
@@ -39,5 +39,6 @@
         <each/>
         <translate/>
         <scope/>
+        <span/>
     </body>
 </html>
diff --git a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc.fixed b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc.fixed
index 60d65c44..2d348c55 100644
--- a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc.fixed
+++ b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc.fixed
@@ -39,5 +39,6 @@
         <each></each>
         <translate></translate>
         <scope></scope>
+        <span></span>
     </body>
 </html>
diff --git a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.php b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.php
index b7287c87..316c63ea 100644
--- a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.php
+++ b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.php
@@ -15,7 +15,16 @@ class HtmlSelfClosingTagsUnitTest extends AbstractSniffUnitTest
     public function getErrorList()
     {
         return [
-            1 => 9,
+            33 => 1,
+            34 => 1,
+            35 => 1,
+            36 => 1,
+            37 => 1,
+            38 => 1,
+            39 => 1,
+            40 => 1,
+            41 => 1,
+            42 => 1,
         ];
     }
 

From 381242e15c2251adbae60160ce7ada936fde8342 Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Tue, 31 Jan 2023 19:07:47 +0000
Subject: [PATCH 04/12] Increase minimum polyfill version

This is an attempt to fix a test failure which seems unrelated to this change,
which seems to require str_ends_with() somewhere.
---
 composer.json | 2 +-
 composer.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 3624e916..49b3f7e2 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
         "phpcompatibility/php-compatibility": "^9.3",
         "squizlabs/php_codesniffer": "^3.6.1",
         "rector/rector": "^0.14.8",
-        "symfony/polyfill": "^1.15"
+        "symfony/polyfill": "^1.16"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.8"
diff --git a/composer.lock b/composer.lock
index fc4ed920..b4a64057 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "6e4991bd93ecef257345b98d603f57d0",
+    "content-hash": "0c1e598f16594c56f36b7da4e389d3f9",
     "packages": [
         {
             "name": "phpcompatibility/php-compatibility",

From 809cfabe1928ad5accabd0e5e6bda2e036bade3d Mon Sep 17 00:00:00 2001
From: Dan Wallis <mrdanwallis@gmail.com>
Date: Thu, 2 Feb 2023 13:06:45 +0000
Subject: [PATCH 05/12] Remove space before self-close when auto-fixed

---
 Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php           | 3 ++-
 Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php           | 3 ++-
 Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc         | 1 +
 Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc.fixed   | 1 +
 Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.php         | 1 +
 Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc       | 1 +
 Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc.fixed | 1 +
 Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.php         | 1 +
 8 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php b/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
index 3d895bff..5e9655d7 100644
--- a/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
+++ b/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'])
diff --git a/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php b/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
index f068627f..e02a25a5 100644
--- a/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
+++ b/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'])
diff --git a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc
index 5c6c021a..336ff618 100644
--- a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc
+++ b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc
@@ -30,5 +30,6 @@
     </video>
     <wbr/>
     <hr/>
+    <hr style="color: red" />
 </body>
 </html>
diff --git a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc.fixed b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc.fixed
index 0ad134a8..6898c43b 100644
--- a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc.fixed
+++ b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc.fixed
@@ -30,5 +30,6 @@
     </video>
     <wbr>
     <hr>
+    <hr style="color: red">
 </body>
 </html>
diff --git a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.php b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.php
index 54ef3da8..477e945a 100644
--- a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.php
+++ b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.php
@@ -38,6 +38,7 @@ public function getWarningList()
             29 => 1,
             31 => 1,
             32 => 1,
+            33 => 1,
         ];
     }
 }
diff --git a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc
index 4a412822..ada76221 100644
--- a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc
+++ b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc
@@ -40,5 +40,6 @@
         <translate/>
         <scope/>
         <span/>
+        <span style="color: red" />
     </body>
 </html>
diff --git a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc.fixed b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc.fixed
index 2d348c55..8c37b48d 100644
--- a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc.fixed
+++ b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc.fixed
@@ -40,5 +40,6 @@
         <translate></translate>
         <scope></scope>
         <span></span>
+        <span style="color: red"></span>
     </body>
 </html>
diff --git a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.php b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.php
index 316c63ea..4946fd0e 100644
--- a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.php
+++ b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.php
@@ -25,6 +25,7 @@ public function getErrorList()
             40 => 1,
             41 => 1,
             42 => 1,
+            43 => 1,
         ];
     }
 

From 33585e045dabfe148a68892a747046959527cd1e Mon Sep 17 00:00:00 2001
From: Dan Wallis <dan@wallis.nz>
Date: Fri, 26 May 2023 11:35:13 +0100
Subject: [PATCH 06/12] Correct return type

---
 Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php b/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
index e02a25a5..5342272a 100644
--- a/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
+++ b/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
@@ -55,7 +55,7 @@ public function register()
      *
      * @param File $phpcsFile
      * @param int $stackPtr
-     * @return int|void
+     * @return void
      */
     public function process(File $phpcsFile, $stackPtr)
     {

From 42bc067b9bff33060bd6193d390b018a4802a1bb Mon Sep 17 00:00:00 2001
From: Dan Wallis <dan@wallis.nz>
Date: Fri, 26 May 2023 11:35:34 +0100
Subject: [PATCH 07/12] Reduce duplicate code

---
 .../Sniffs/Html/HtmlClosingVoidTagsSniff.php  | 32 +------------------
 .../Sniffs/Html/HtmlSelfClosingTagsSniff.php  |  2 +-
 2 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php b/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
index 5e9655d7..81d048f3 100644
--- a/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
+++ b/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
@@ -13,7 +13,7 @@
 /**
  * Sniff for void closing tags.
  */
-class HtmlClosingVoidTagsSniff implements Sniff
+class HtmlClosingVoidTagsSniff extends HtmlSelfClosingTagsSniff implements Sniff
 {
     /**
      * String representation of warning.
@@ -53,9 +53,6 @@ class HtmlClosingVoidTagsSniff implements Sniff
         'wbr',
     ];
 
-    /** @var int */
-    private int $lastPointer = 0;
-
     /**
      * @inheritdoc
      */
@@ -114,31 +111,4 @@ public function process(File $phpcsFile, $stackPtr): void
             }
         }
     }
-
-    /**
-     * Apply a fix for the detected issue
-     *
-     * @param File $phpcsFile
-     * @param string $needle
-     * @return int|null
-     */
-    public function findPointer(File $phpcsFile, string $needle): ?int
-    {
-        foreach ($phpcsFile->getTokens() as $ptr => $token) {
-            if ($ptr < $this->lastPointer) {
-                continue;
-            }
-
-            if ($token['code'] !== T_INLINE_HTML) {
-                continue;
-            }
-
-            if (str_contains($token['content'], $needle)) {
-                $this->lastPointer = $ptr;
-                return $ptr;
-            }
-        }
-
-        return null;
-    }
 }
diff --git a/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php b/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
index 5342272a..f6b5dff8 100644
--- a/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
+++ b/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
@@ -111,7 +111,7 @@ public function process(File $phpcsFile, $stackPtr)
      * @param string $needle
      * @return int|null
      */
-    private function findPointer(File $phpcsFile, string $needle): ?int
+    protected function findPointer(File $phpcsFile, string $needle): ?int
     {
         foreach ($phpcsFile->getTokens() as $ptr => $token) {
             if ($ptr < $this->lastPointer) {

From 48ff5f2a52cccdec90bd78287ffe7a69c28f61c0 Mon Sep 17 00:00:00 2001
From: Dan Wallis <dan@wallis.nz>
Date: Fri, 26 May 2023 11:50:33 +0100
Subject: [PATCH 08/12] Improve test cases

---
 .../Html/HtmlClosingVoidTagsUnitTest.inc      |  7 +++++++
 .../HtmlClosingVoidTagsUnitTest.inc.fixed     |  7 +++++++
 .../Html/HtmlClosingVoidTagsUnitTest.php      | 11 +++++-----
 .../Html/HtmlSelfClosingTagsUnitTest.1.inc    | 12 +++++++++++
 .../HtmlSelfClosingTagsUnitTest.1.inc.fixed   | 12 +++++++++++
 .../Html/HtmlSelfClosingTagsUnitTest.php      | 21 ++++++++++---------
 6 files changed, 55 insertions(+), 15 deletions(-)

diff --git a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc
index 336ff618..68f40388 100644
--- a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc
+++ b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc
@@ -22,6 +22,13 @@
     <hr/>
     <img src="" alt=""/>
     <input type="text" id="test_input"/>
+    <input type="text"
+           id="multi-line-input"
+           placeholder="Alert should be on last line"
+           />
+    <input type="text"
+           id="multi-line-input2"
+           placeholder="Alert should be on last line" />
     <link/>
     <meta/>
     <video>
diff --git a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc.fixed b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc.fixed
index 6898c43b..a7b722a1 100644
--- a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc.fixed
+++ b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc.fixed
@@ -22,6 +22,13 @@
     <hr>
     <img src="" alt="">
     <input type="text" id="test_input">
+    <input type="text"
+           id="multi-line-input"
+           placeholder="Alert should be on last line"
+           />
+    <input type="text"
+           id="multi-line-input2"
+           placeholder="Alert should be on last line" />
     <link>
     <meta>
     <video>
diff --git a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.php b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.php
index 477e945a..2cf45e46 100644
--- a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.php
+++ b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.php
@@ -23,6 +23,7 @@ public function getErrorList()
     public function getWarningList()
     {
         return [
+            1 => 2,
             10 => 1,
             11 => 1,
             14 => 1,
@@ -32,13 +33,13 @@ public function getWarningList()
             22 => 1,
             23 => 1,
             24 => 1,
-            25 => 1,
-            26 => 1,
-            28 => 1,
-            29 => 1,
-            31 => 1,
             32 => 1,
             33 => 1,
+            35 => 1,
+            36 => 1,
+            38 => 1,
+            39 => 1,
+            40 => 1,
         ];
     }
 }
diff --git a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc
index ada76221..1e207375 100644
--- a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc
+++ b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc
@@ -22,6 +22,13 @@
         <hr/>
         <img src="" alt=""/>
         <input type="text" id="test_input"/>
+        <input type="text"
+               id="multi-line-input"
+               placeholder="Alert should be on last line"
+               />
+        <input type="text"
+               id="multi-line-input2"
+               placeholder="Alert should be on last line" />
         <link/>
         <meta/>
         <video>
@@ -31,6 +38,11 @@
         <wbr/>
 
         <label for="test_input"/>
+        <label
+               for="multi-line-input"
+               />
+        <label
+               for="multi-line-input2" />
         <style type="text/css"/>
         <div/>
         <span/>
diff --git a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc.fixed b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc.fixed
index 8c37b48d..522dfcc6 100644
--- a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc.fixed
+++ b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc.fixed
@@ -22,6 +22,13 @@
         <hr/>
         <img src="" alt=""/>
         <input type="text" id="test_input"/>
+        <input type="text"
+               id="multi-line-input"
+               placeholder="Alert should be on last line"
+               />
+        <input type="text"
+               id="multi-line-input2"
+               placeholder="Alert should be on last line" />
         <link/>
         <meta/>
         <video>
@@ -31,6 +38,11 @@
         <wbr/>
 
         <label for="test_input"></label>
+        <label
+               for="multi-line-input"
+               />
+        <label
+               for="multi-line-input2" />
         <style type="text/css"></style>
         <div></div>
         <span></span>
diff --git a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.php b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.php
index 4946fd0e..f54850b1 100644
--- a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.php
+++ b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.php
@@ -15,17 +15,18 @@ class HtmlSelfClosingTagsUnitTest extends AbstractSniffUnitTest
     public function getErrorList()
     {
         return [
-            33 => 1,
-            34 => 1,
-            35 => 1,
-            36 => 1,
-            37 => 1,
-            38 => 1,
-            39 => 1,
+            1 => 2,
             40 => 1,
-            41 => 1,
-            42 => 1,
-            43 => 1,
+            46 => 1,
+            47 => 1,
+            48 => 1,
+            49 => 1,
+            50 => 1,
+            51 => 1,
+            52 => 1,
+            53 => 1,
+            54 => 1,
+            55 => 1,
         ];
     }
 

From 321d698c9c8bca598eec6feedc9d9bfa66f2f865 Mon Sep 17 00:00:00 2001
From: Dan Wallis <dan@wallis.nz>
Date: Fri, 26 May 2023 11:59:18 +0100
Subject: [PATCH 09/12] Improve line detection/reporting

---
 Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php   |  4 ++--
 Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php   | 11 +++++++++--
 Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.php |  3 ++-
 Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.php |  3 ++-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php b/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
index 81d048f3..3610cb39 100644
--- a/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
+++ b/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
@@ -83,7 +83,7 @@ public function process(File $phpcsFile, $stackPtr): void
             foreach ($matches as $match) {
                 if (in_array($match[1], self::HTML_VOID_ELEMENTS)) {
                     $ptr = $this->findPointer($phpcsFile, $match[0]);
-                    if ($ptr) {
+                    if (!str_contains($match[0], "\n")) {
                         $fix = $phpcsFile->addFixableWarning(
                             sprintf(self::WARNING_MESSAGE, $match[0]),
                             $ptr,
@@ -103,7 +103,7 @@ public function process(File $phpcsFile, $stackPtr): void
                     } else {
                         $phpcsFile->addWarning(
                             sprintf(self::WARNING_MESSAGE, $match[0]),
-                            null,
+                            $ptr,
                             self::WARNING_CODE
                         );
                     }
diff --git a/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php b/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
index f6b5dff8..c026e67f 100644
--- a/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
+++ b/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
@@ -72,7 +72,7 @@ public function process(File $phpcsFile, $stackPtr)
             foreach ($matches as $match) {
                 if (!in_array($match[1], self::HTML_VOID_ELEMENTS)) {
                     $ptr = $this->findPointer($phpcsFile, $match[0]);
-                    if ($ptr) {
+                    if (!str_contains($match[0], "\n")) {
                         $fix = $phpcsFile->addFixableError(
                             'Avoid using self-closing tag with non-void html element'
                             . ' - "' . $match[0] . PHP_EOL,
@@ -95,7 +95,7 @@ public function process(File $phpcsFile, $stackPtr)
                         $phpcsFile->addError(
                             'Avoid using self-closing tag with non-void html element'
                             . ' - "' . $match[0]  . PHP_EOL,
-                            null,
+                            $ptr,
                             'HtmlSelfClosingNonVoidTag'
                         );
                     }
@@ -113,6 +113,13 @@ public function process(File $phpcsFile, $stackPtr)
      */
     protected function findPointer(File $phpcsFile, string $needle): ?int
     {
+        if (str_contains($needle, "\n")) {
+            foreach (explode("\n", $needle) as $line) {
+                $result = $this->findPointer($phpcsFile, $line);
+            }
+            return $result;
+        }
+
         foreach ($phpcsFile->getTokens() as $ptr => $token) {
             if ($ptr < $this->lastPointer) {
                 continue;
diff --git a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.php b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.php
index 2cf45e46..1e72c4b9 100644
--- a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.php
+++ b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.php
@@ -23,7 +23,6 @@ public function getErrorList()
     public function getWarningList()
     {
         return [
-            1 => 2,
             10 => 1,
             11 => 1,
             14 => 1,
@@ -33,6 +32,8 @@ public function getWarningList()
             22 => 1,
             23 => 1,
             24 => 1,
+            28 => 1,
+            31 => 1,
             32 => 1,
             33 => 1,
             35 => 1,
diff --git a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.php b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.php
index f54850b1..869498d9 100644
--- a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.php
+++ b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.php
@@ -15,8 +15,9 @@ class HtmlSelfClosingTagsUnitTest extends AbstractSniffUnitTest
     public function getErrorList()
     {
         return [
-            1 => 2,
             40 => 1,
+            43 => 1,
+            45 => 1,
             46 => 1,
             47 => 1,
             48 => 1,

From ca0ebae2b90b58657ae71baeebbbda43465325f5 Mon Sep 17 00:00:00 2001
From: Dan Wallis <dan@wallis.nz>
Date: Fri, 26 May 2023 12:19:37 +0100
Subject: [PATCH 10/12] Always fix closing HTML tags

---
 .../Sniffs/Html/HtmlClosingVoidTagsSniff.php  | 33 ++++++----------
 .../Sniffs/Html/HtmlSelfClosingTagsSniff.php  | 39 +++++++------------
 .../HtmlClosingVoidTagsUnitTest.inc.fixed     |  4 +-
 .../HtmlSelfClosingTagsUnitTest.1.inc.fixed   |  4 +-
 4 files changed, 28 insertions(+), 52 deletions(-)

diff --git a/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php b/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
index 3610cb39..90144639 100644
--- a/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
+++ b/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
@@ -83,29 +83,18 @@ public function process(File $phpcsFile, $stackPtr): void
             foreach ($matches as $match) {
                 if (in_array($match[1], self::HTML_VOID_ELEMENTS)) {
                     $ptr = $this->findPointer($phpcsFile, $match[0]);
-                    if (!str_contains($match[0], "\n")) {
-                        $fix = $phpcsFile->addFixableWarning(
-                            sprintf(self::WARNING_MESSAGE, $match[0]),
-                            $ptr,
-                            self::WARNING_CODE
-                        );
+                    $fix = $phpcsFile->addFixableWarning(
+                        sprintf(self::WARNING_MESSAGE, $match[0]),
+                        $ptr,
+                        self::WARNING_CODE
+                    );
 
-                        if ($fix) {
-                            $token = $phpcsFile->getTokens()[$ptr];
-                            $original = $match[0];
-                            $replacement = str_replace(' />', '>', $original);
-                            $replacement = str_replace('/>', '>', $replacement);
-                            $phpcsFile->fixer->replaceToken(
-                                $ptr,
-                                str_replace($original, $replacement, $token['content'])
-                            );
-                        }
-                    } else {
-                        $phpcsFile->addWarning(
-                            sprintf(self::WARNING_MESSAGE, $match[0]),
-                            $ptr,
-                            self::WARNING_CODE
-                        );
+                    if ($fix) {
+                        $token = $phpcsFile->getTokens()[$ptr];
+                        $original = $token['content'];
+                        $replacement = str_replace(' />', '>', $original);
+                        $replacement = str_replace('/>', '>', $replacement);
+                        $phpcsFile->fixer->replaceToken($ptr, $replacement);
                     }
                 }
             }
diff --git a/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php b/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
index c026e67f..5fd75e3d 100644
--- a/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
+++ b/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
@@ -72,32 +72,19 @@ public function process(File $phpcsFile, $stackPtr)
             foreach ($matches as $match) {
                 if (!in_array($match[1], self::HTML_VOID_ELEMENTS)) {
                     $ptr = $this->findPointer($phpcsFile, $match[0]);
-                    if (!str_contains($match[0], "\n")) {
-                        $fix = $phpcsFile->addFixableError(
-                            'Avoid using self-closing tag with non-void html element'
-                            . ' - "' . $match[0] . PHP_EOL,
-                            $ptr,
-                            'HtmlSelfClosingNonVoidTag'
-                        );
-
-                        if ($fix) {
-                            $token = $phpcsFile->getTokens()[$ptr];
-                            $original = $match[0];
-                            $replacement = str_replace(' />', '></' . $match[1] . '>', $original);
-                            $replacement = str_replace('/>', '></' . $match[1] . '>', $replacement);
-                            $phpcsFile->fixer->replaceToken(
-                                $ptr,
-                                str_replace($original, $replacement, $token['content'])
-                            );
-
-                        }
-                    } else {
-                        $phpcsFile->addError(
-                            'Avoid using self-closing tag with non-void html element'
-                            . ' - "' . $match[0]  . PHP_EOL,
-                            $ptr,
-                            'HtmlSelfClosingNonVoidTag'
-                        );
+                    $fix = $phpcsFile->addFixableError(
+                        'Avoid using self-closing tag with non-void html element'
+                        . ' - "' . $match[0] . PHP_EOL,
+                        $ptr,
+                        'HtmlSelfClosingNonVoidTag'
+                    );
+
+                    if ($fix) {
+                        $token = $phpcsFile->getTokens()[$ptr];
+                        $original = $token['content'];
+                        $replacement = str_replace(' />', '></' . $match[1] . '>', $original);
+                        $replacement = str_replace('/>', '></' . $match[1] . '>', $replacement);
+                        $phpcsFile->fixer->replaceToken($ptr, $replacement);
                     }
                 }
             }
diff --git a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc.fixed b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc.fixed
index a7b722a1..0b04c24f 100644
--- a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc.fixed
+++ b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc.fixed
@@ -25,10 +25,10 @@
     <input type="text"
            id="multi-line-input"
            placeholder="Alert should be on last line"
-           />
+          >
     <input type="text"
            id="multi-line-input2"
-           placeholder="Alert should be on last line" />
+           placeholder="Alert should be on last line">
     <link>
     <meta>
     <video>
diff --git a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc.fixed b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc.fixed
index 522dfcc6..cf12aa1b 100644
--- a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc.fixed
+++ b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc.fixed
@@ -40,9 +40,9 @@
         <label for="test_input"></label>
         <label
                for="multi-line-input"
-               />
+              ></label>
         <label
-               for="multi-line-input2" />
+               for="multi-line-input2"></label>
         <style type="text/css"></style>
         <div></div>
         <span></span>

From 0f21272e5364bfe0bf9a4cdf404c99155c2cbb81 Mon Sep 17 00:00:00 2001
From: Dan Wallis <dan@wallis.nz>
Date: Fri, 26 May 2023 12:26:14 +0100
Subject: [PATCH 11/12] Correct indentation when auto-fixing

---
 Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php           | 5 +++++
 Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php           | 5 +++++
 Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc.fixed   | 2 +-
 Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc.fixed | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php b/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
index 90144639..6c8a67f2 100644
--- a/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
+++ b/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
@@ -94,6 +94,11 @@ public function process(File $phpcsFile, $stackPtr): void
                         $original = $token['content'];
                         $replacement = str_replace(' />', '>', $original);
                         $replacement = str_replace('/>', '>', $replacement);
+
+                        if (preg_match('{^\s* />}', $original)) {
+                            $replacement = ' ' . $replacement;
+                        }
+
                         $phpcsFile->fixer->replaceToken($ptr, $replacement);
                     }
                 }
diff --git a/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php b/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
index 5fd75e3d..7c3cf9bc 100644
--- a/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
+++ b/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
@@ -84,6 +84,11 @@ public function process(File $phpcsFile, $stackPtr)
                         $original = $token['content'];
                         $replacement = str_replace(' />', '></' . $match[1] . '>', $original);
                         $replacement = str_replace('/>', '></' . $match[1] . '>', $replacement);
+
+                        if (preg_match('{^\s* />}', $original)) {
+                            $replacement = ' ' . $replacement;
+                        }
+
                         $phpcsFile->fixer->replaceToken($ptr, $replacement);
                     }
                 }
diff --git a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc.fixed b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc.fixed
index 0b04c24f..42b503a0 100644
--- a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc.fixed
+++ b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc.fixed
@@ -25,7 +25,7 @@
     <input type="text"
            id="multi-line-input"
            placeholder="Alert should be on last line"
-          >
+           >
     <input type="text"
            id="multi-line-input2"
            placeholder="Alert should be on last line">
diff --git a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc.fixed b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc.fixed
index cf12aa1b..38f04704 100644
--- a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc.fixed
+++ b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc.fixed
@@ -40,7 +40,7 @@
         <label for="test_input"></label>
         <label
                for="multi-line-input"
-              ></label>
+               ></label>
         <label
                for="multi-line-input2"></label>
         <style type="text/css"></style>

From 17ccd06bded3ed34e87ad22768bdafe1aa194aca Mon Sep 17 00:00:00 2001
From: Dan Wallis <dan@wallis.nz>
Date: Fri, 26 May 2023 16:44:11 +0100
Subject: [PATCH 12/12] Further reduce duplicate code

---
 .../Sniffs/Html/HtmlClosingVoidTagsSniff.php  | 31 -------------------
 .../Sniffs/Html/HtmlSelfClosingTagsSniff.php  |  2 +-
 2 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php b/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
index 6c8a67f2..b70c5a35 100644
--- a/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
+++ b/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
@@ -30,37 +30,6 @@ class HtmlClosingVoidTagsSniff extends HtmlSelfClosingTagsSniff implements Sniff
      */
     private const WARNING_CODE = 'HtmlClosingVoidElements';
 
-    /**
-     * List of void elements.
-     *
-     * https://html.spec.whatwg.org/multipage/syntax.html#void-elements
-     *
-     * @var string[]
-     */
-    private const HTML_VOID_ELEMENTS = [
-        'area',
-        'base',
-        'br',
-        'col',
-        'embed',
-        'hr',
-        'img',
-        'input',
-        'link',
-        'meta',
-        'source',
-        'track',
-        'wbr',
-    ];
-
-    /**
-     * @inheritdoc
-     */
-    public function register(): array
-    {
-        return [T_INLINE_HTML];
-    }
-
     /**
      * Detect use of self-closing tag with void html element.
      *
diff --git a/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php b/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
index 7c3cf9bc..627b7152 100644
--- a/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
+++ b/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
@@ -23,7 +23,7 @@ class HtmlSelfClosingTagsSniff implements Sniff
      *
      * @var string[]
      */
-    private const HTML_VOID_ELEMENTS = [
+    protected const HTML_VOID_ELEMENTS = [
         'area',
         'base',
         'br',