Merge pull request #140 from magento-trigger/AC-99

svera · web-flow · commit 6f2a73b5a00f · 2021-12-20T20:23:31.000+01:00
AC-99: Update Third Party library: jquery.tabs
diff --git a/Magento2/Sniffs/Html/HtmlCollapsibleAttributeSniff.php b/Magento2/Sniffs/Html/HtmlCollapsibleAttributeSniff.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento2\Sniffs\Html;
+
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
+/**
+ * Sniffing improper HTML bindings.
+ */
+class HtmlCollapsibleAttributeSniff implements Sniff
+{
+    /**
+     * @inheritDoc
+     */
+    public function register()
+    {
+        return [T_INLINE_HTML];
+    }
+
+    /**
+     * Detect use of data attributes used by older version of bootstrap collapse
+     *
+     * Use new attributes in https://getbootstrap.com/docs/5.0/components/collapse/
+     *
+     * @param File $phpcsFile
+     * @param int $stackPtr
+     * @return int|void
+     */
+    public function process(File $phpcsFile, $stackPtr)
+    {
+        if ($stackPtr !== 0) {
+            return;
+        }
+        $html = $phpcsFile->getTokensAsString($stackPtr, count($phpcsFile->getTokens()));
+
+        if (empty($html)) {
+            return;
+        }
+
+        $pattern = '$<\w+.*?\s*(?=.*?\s*data-toggle="collapse")[^>]*?>.*?$';
+        if (preg_match_all($pattern, $html, $matches, PREG_SET_ORDER)) {
+            foreach ($matches as $match) {
+                $phpcsFile->addError(
+                    'Collapsible attributes data-toggle and data-target need to be updated to ' .
+                    'data-bs-toggle and data-bs-target'
+                    . ' - "' . $match[0]  . PHP_EOL,
+                    null,
+                    'HtmlCollapsibleAttribute'
+                );
+            }
+        }
+    }
+}
diff --git a/Magento2/Tests/Html/HtmlCollapsibleAttributeUnitTest.1.inc b/Magento2/Tests/Html/HtmlCollapsibleAttributeUnitTest.1.inc
@@ -0,0 +1,35 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<html>
+    <head>
+        <base/>
+        <link/>
+    </head>
+    <body>
+        <div class="action-dropdown">
+            <button type="button" class="action-toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown">
+                <span>Test</span>
+            </button>
+        </div>
+        <div class="fieldset-wrapper-title">
+            <strong class="admin__collapsible-title" data-toggle="collapse" data-bind="attr:{'data-target': '#'+id}">
+                <span data-bind="text: title"></span>
+            </strong>
+        </div>
+        <div class="admin__collapsible-title"
+            data-toggle="collapse"
+            data-target="#id-content">
+            <span>Test</span>
+        </div>
+        <strong <?= /* @noEscape */ $isCollapsable ?
+            'class="admin__collapsible-title" data-toggle="collapse" data-target="#' . $id . '-content"' :
+            'class="title"'; ?>>
+            <span><?= $block->escapeHtml($element->getLegend()) ?></span>
+        </strong>
+    </body>
+</html>
diff --git a/Magento2/Tests/Html/HtmlCollapsibleAttributeUnitTest.php b/Magento2/Tests/Html/HtmlCollapsibleAttributeUnitTest.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento2\Tests\Html;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+class HtmlCollapsibleAttributeUnitTest extends AbstractSniffUnitTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function getErrorList()
+    {
+        return [1 => 3];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getWarningList()
+    {
+        return [];
+    }
+}
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
@@ -143,6 +143,13 @@
         <type>error</type>
         <exclude-pattern>*\.xml$</exclude-pattern>
     </rule>
+    <rule ref="Magento2.Html.HtmlCollapsibleAttribute">
+        <include-pattern>*\.html$</include-pattern>
+        <include-pattern>*\.phtml$</include-pattern>
+        <severity>10</severity>
+        <type>error</type>
+        <exclude-pattern>*\.xml$</exclude-pattern>
+    </rule>
     <rule ref="Magento2.Legacy.Layout">
         <severity>10</severity>
         <type>error</type>
