Merge remote-tracking branch 'upstream/develop' into simplify-install…

…-instructions
magento · Sep 7, 2023 · 65a4b0c · 65a4b0c
2 parents 55c28a9 + db2e2e7
commit 65a4b0c
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 25 deletions.
diff --git a/Magento2Framework/Sniffs/Header/CopyrightAnotherExtensionsFilesSniff.php b/Magento2Framework/Sniffs/Header/CopyrightAnotherExtensionsFilesSniff.php
@@ -16,6 +16,7 @@ class CopyrightAnotherExtensionsFilesSniff implements Sniff
 
     private const COPYRIGHT_MAGENTO_TEXT = 'Copyright © Magento, Inc. All rights reserved.';
     private const COPYRIGHT_ADOBE = '/Copyright \d+ Adobe/';
+    private const COPYRIGHT_ADOBE_TEXT = 'ADOBE CONFIDENTIAL';
 
     /**
      * Defines the tokenizers that this sniff is using.
@@ -48,6 +49,7 @@ public function process(File $phpcsFile, $stackPtr)
 
         if (strpos($fileText, self::COPYRIGHT_MAGENTO_TEXT) !== false
             || preg_match(self::COPYRIGHT_ADOBE, $fileText)
+                || strpos($fileText, self::COPYRIGHT_ADOBE_TEXT) !== false
         ) {
             return;
         }

diff --git a/Magento2Framework/Sniffs/Header/CopyrightGraphQLSniff.php b/Magento2Framework/Sniffs/Header/CopyrightGraphQLSniff.php
@@ -16,6 +16,7 @@ class CopyrightGraphQLSniff implements Sniff
 
     private const COPYRIGHT_MAGENTO_TEXT = 'Copyright © Magento, Inc. All rights reserved.';
     private const COPYRIGHT_ADOBE = '/Copyright \d+ Adobe/';
+    private const COPYRIGHT_ADOBE_TEXT = 'ADOBE CONFIDENTIAL';
 
     private const FILE_EXTENSION = 'graphqls';
 
@@ -44,7 +45,9 @@ public function process(File $phpcsFile, $stackPtr)
         // @phpcs:ignore Magento2.Functions.DiscouragedFunction.Discouraged
         $content = file_get_contents($phpcsFile->getFilename());
 
-        if (strpos($content, self::COPYRIGHT_MAGENTO_TEXT) !== false || preg_match(self::COPYRIGHT_ADOBE, $content)) {
+        if (strpos($content, self::COPYRIGHT_MAGENTO_TEXT) !== false
+            || preg_match(self::COPYRIGHT_ADOBE, $content)
+                || strpos($content, self::COPYRIGHT_ADOBE_TEXT) !== false) {
             return;
         }
 

diff --git a/Magento2Framework/Sniffs/Header/CopyrightSniff.php b/Magento2Framework/Sniffs/Header/CopyrightSniff.php
@@ -16,6 +16,7 @@ class CopyrightSniff implements Sniff
 
     private const COPYRIGHT_MAGENTO_TEXT = 'Copyright © Magento, Inc. All rights reserved.';
     private const COPYRIGHT_ADOBE = '/Copyright \d+ Adobe/';
+    private const COPYRIGHT_ADOBE_TEXT = 'ADOBE CONFIDENTIAL';
 
     /**
      * @inheritdoc
@@ -48,7 +49,9 @@ public function process(File $phpcsFile, $stackPtr)
         $content = $phpcsFile->getTokens()[$positionComment]['content'];
         $adobeCopyrightFound = preg_match(self::COPYRIGHT_ADOBE, $content);
 
-        if (strpos($content, self::COPYRIGHT_MAGENTO_TEXT) !== false || $adobeCopyrightFound) {
+        if (strpos($content, self::COPYRIGHT_MAGENTO_TEXT) !== false ||
+                $adobeCopyrightFound ||
+                    strpos($content, self::COPYRIGHT_ADOBE_TEXT) !== false) {
             return;
         }
 

diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "31",
+    "version": "32",
     "require": {
         "php": "~8.1.0 || ~8.2.0",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.2 || ^1.0",
@@ -15,7 +15,7 @@
         "ext-dom": "*",
         "phpcompatibility/php-compatibility": "^9.3",
         "squizlabs/php_codesniffer": "^3.6.1",
-        "rector/rector": "^0.15.10",
+        "rector/rector": "0.17.12",
         "symfony/polyfill": "^1.16",
         "phpcsstandards/phpcsutils": "^1.0.5"
     },

diff --git a/composer.lock b/composer.lock