From 95f699c7ac2b227af55e04e1ea0308aa32011fa2 Mon Sep 17 00:00:00 2001 From: Elisea Cornejo Date: Mon, 27 Sep 2021 16:08:39 +0200 Subject: [PATCH 1/4] AC-1314: Fix copyright sniff --- .../Sniffs/Legacy/CopyrightAnotherExtensionsFilesSniff.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Magento2/Sniffs/Legacy/CopyrightAnotherExtensionsFilesSniff.php b/Magento2/Sniffs/Legacy/CopyrightAnotherExtensionsFilesSniff.php index 1455ee58..31801890 100644 --- a/Magento2/Sniffs/Legacy/CopyrightAnotherExtensionsFilesSniff.php +++ b/Magento2/Sniffs/Legacy/CopyrightAnotherExtensionsFilesSniff.php @@ -7,6 +7,7 @@ namespace Magento2\Sniffs\Legacy; +use Magento2\Sniffs\Less\TokenizerSymbolsInterface; use PHP_CodeSniffer\Files\File; use PHP_CodeSniffer\Sniffs\Sniff; @@ -16,6 +17,8 @@ class CopyrightAnotherExtensionsFilesSniff implements Sniff private const COPYRIGHT_MAGENTO_TEXT = 'Copyright © Magento, Inc. All rights reserved.'; private const COPYRIGHT_ADOBE = '/Copyright \d+ Adobe/'; + + public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS, 'PHP']; /** * @inheritDoc @@ -23,7 +26,8 @@ class CopyrightAnotherExtensionsFilesSniff implements Sniff public function register(): array { return [ - T_INLINE_HTML + T_INLINE_HTML, + T_OPEN_TAG ]; } From 2c54b326cb2982c63fbe0ab31baa4d387179b5da Mon Sep 17 00:00:00 2001 From: Elisea Cornejo Date: Tue, 28 Sep 2021 09:40:43 +0200 Subject: [PATCH 2/4] AC-1314: Fix copyright sniff --- .../Sniffs/Legacy/CopyrightAnotherExtensionsFilesSniff.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Magento2/Sniffs/Legacy/CopyrightAnotherExtensionsFilesSniff.php b/Magento2/Sniffs/Legacy/CopyrightAnotherExtensionsFilesSniff.php index 31801890..a1d6995b 100644 --- a/Magento2/Sniffs/Legacy/CopyrightAnotherExtensionsFilesSniff.php +++ b/Magento2/Sniffs/Legacy/CopyrightAnotherExtensionsFilesSniff.php @@ -18,6 +18,11 @@ class CopyrightAnotherExtensionsFilesSniff implements Sniff private const COPYRIGHT_MAGENTO_TEXT = 'Copyright © Magento, Inc. All rights reserved.'; private const COPYRIGHT_ADOBE = '/Copyright \d+ Adobe/'; + /** + * Defines the tokenizers that this sniff is using. + * + * @var array + */ public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS, 'PHP']; /** From 53380c7613790d92b88c1ff5a04961c340df3e33 Mon Sep 17 00:00:00 2001 From: Elisea Cornejo Date: Mon, 11 Oct 2021 16:18:57 +0200 Subject: [PATCH 3/4] AC-1314: Fix copyright sniff --- ...est.xml => CopyrightAnotherExtensionsFilesUnitTest.3.xml} | 0 .../Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.php | 5 +++++ 2 files changed, 5 insertions(+) rename Magento2/Tests/Legacy/{CopyrightAnotherExtensionsFilesUnitTest.xml => CopyrightAnotherExtensionsFilesUnitTest.3.xml} (100%) diff --git a/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.xml b/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.3.xml similarity index 100% rename from Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.xml rename to Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.3.xml diff --git a/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.php b/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.php index 8796abb9..4223e600 100644 --- a/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.php +++ b/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.php @@ -36,6 +36,11 @@ public function getWarningList($testFile = '') if ($testFile === 'CopyrightAnotherExtensionsFilesUnitTest.4.js') { return []; } + if ($testFile === 'CopyrightAnotherExtensionsFilesUnitTest.5.less') { + return [ + null => 1, + ]; + } return []; } } From 9416fc8d6b91d4bf3a034df96fbf58e936e14dba Mon Sep 17 00:00:00 2001 From: Elisea Cornejo Date: Wed, 13 Oct 2021 10:50:51 +0200 Subject: [PATCH 4/4] AC-1314: Fix copyright sniff --- .../Legacy/CopyrightAnotherExtensionsFilesUnitTest.5.less | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.5.less diff --git a/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.5.less b/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.5.less new file mode 100644 index 00000000..a86154e6 --- /dev/null +++ b/Magento2/Tests/Legacy/CopyrightAnotherExtensionsFilesUnitTest.5.less @@ -0,0 +1,8 @@ +/** + * Copyright © Magento, Inc. + * See COPYING.txt for license details. + */ + +//@magento_import "magento_import.less"; +@import "dir/import.less"; +