Skip to content

Commit 7704854

Browse files
committed
AC-9184::Static Tests Failure on using Adobe copyright content - Added condition to use copyright in new format
1 parent 0c94559 commit 7704854

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

Magento2Framework/Sniffs/Header/CopyrightAnotherExtensionsFilesSniff.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ class CopyrightAnotherExtensionsFilesSniff implements Sniff
1616

1717
private const COPYRIGHT_MAGENTO_TEXT = 'Copyright © Magento, Inc. All rights reserved.';
1818
private const COPYRIGHT_ADOBE = '/Copyright \d+ Adobe/';
19+
private const COPYRIGHT_ADOBE_TEXT = 'ADOBE CONFIDENTIAL';
1920

2021
/**
2122
* Defines the tokenizers that this sniff is using.
@@ -48,6 +49,7 @@ public function process(File $phpcsFile, $stackPtr)
4849

4950
if (strpos($fileText, self::COPYRIGHT_MAGENTO_TEXT) !== false
5051
|| preg_match(self::COPYRIGHT_ADOBE, $fileText)
52+
|| strpos($fileText, self::COPYRIGHT_ADOBE_TEXT) !== false
5153
) {
5254
return;
5355
}

Magento2Framework/Sniffs/Header/CopyrightGraphQLSniff.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ class CopyrightGraphQLSniff implements Sniff
1616

1717
private const COPYRIGHT_MAGENTO_TEXT = 'Copyright © Magento, Inc. All rights reserved.';
1818
private const COPYRIGHT_ADOBE = '/Copyright \d+ Adobe/';
19+
private const COPYRIGHT_ADOBE_TEXT = 'ADOBE CONFIDENTIAL';
1920

2021
private const FILE_EXTENSION = 'graphqls';
2122

@@ -44,7 +45,9 @@ public function process(File $phpcsFile, $stackPtr)
4445
// @phpcs:ignore Magento2.Functions.DiscouragedFunction.Discouraged
4546
$content = file_get_contents($phpcsFile->getFilename());
4647

47-
if (strpos($content, self::COPYRIGHT_MAGENTO_TEXT) !== false || preg_match(self::COPYRIGHT_ADOBE, $content)) {
48+
if (strpos($content, self::COPYRIGHT_MAGENTO_TEXT) !== false
49+
|| preg_match(self::COPYRIGHT_ADOBE, $content)
50+
|| strpos($content, self::COPYRIGHT_ADOBE_TEXT) !== false) {
4851
return;
4952
}
5053

0 commit comments

Comments
 (0)