From 0c945598626e0a9c4a9379f65e2547827f7a5544 Mon Sep 17 00:00:00 2001 From: Atul-glo35265 Date: Tue, 25 Jul 2023 13:32:36 +0530 Subject: [PATCH 1/7] AC-9184::Static Tests Failure on using Adobe copyright content - Added condition to use copyright in new format --- Magento2Framework/Sniffs/Header/CopyrightSniff.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Magento2Framework/Sniffs/Header/CopyrightSniff.php b/Magento2Framework/Sniffs/Header/CopyrightSniff.php index 81442207..e23aaba4 100644 --- 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; } From 1aced4b2a1a380bb052607ab94f62c14dd8e6c5e Mon Sep 17 00:00:00 2001 From: Rimple Saini Date: Thu, 27 Jul 2023 17:14:01 +0530 Subject: [PATCH 2/7] AC-9184::Static Tests Failure on using Adobe copyright content - Update Version --- composer.json | 2 +- composer.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index e4c0c17b..e3c79454 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "AFL-3.0" ], "type": "phpcodesniffer-standard", - "version": "31", + "version": "32", "require": { "php": ">=7.4", "webonyx/graphql-php": "^15.0", diff --git a/composer.lock b/composer.lock index eb5742d8..993e2d97 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": "005e2882d6bfb6ebf35f0acfa890efac", + "content-hash": "527277cebca41c223661e203e2f5f5e7", "packages": [ { "name": "dealerdirect/phpcodesniffer-composer-installer", @@ -2382,5 +2382,5 @@ "ext-dom": "*" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.2.0" } From 7704854ed6b9c8bb29fa62a946e15ee8abcb434b Mon Sep 17 00:00:00 2001 From: Atul-glo35265 Date: Fri, 28 Jul 2023 11:50:24 +0530 Subject: [PATCH 3/7] AC-9184::Static Tests Failure on using Adobe copyright content - Added condition to use copyright in new format --- .../Sniffs/Header/CopyrightAnotherExtensionsFilesSniff.php | 2 ++ Magento2Framework/Sniffs/Header/CopyrightGraphQLSniff.php | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Magento2Framework/Sniffs/Header/CopyrightAnotherExtensionsFilesSniff.php b/Magento2Framework/Sniffs/Header/CopyrightAnotherExtensionsFilesSniff.php index 3bafbb1f..3310e667 100644 --- 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 index 1e488e69..5eae2b5e 100644 --- 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; } From 42f012962c566b552c43b12bb8f59e7c5ef798ee Mon Sep 17 00:00:00 2001 From: Atul-glo35265 Date: Mon, 14 Aug 2023 16:47:33 +0530 Subject: [PATCH 4/7] Resolve Conflict --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 993e2d97..4a94589d 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": "527277cebca41c223661e203e2f5f5e7", + "content-hash": "2cb0816434787b635536aa2fd6ac017f", "packages": [ { "name": "dealerdirect/phpcodesniffer-composer-installer", @@ -2377,10 +2377,10 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=7.4", + "php": "~8.1.0 || ~8.2.0", "ext-simplexml": "*", "ext-dom": "*" }, "platform-dev": [], - "plugin-api-version": "2.2.0" -} + "plugin-api-version": "2.3.0" +} \ No newline at end of file From e52de693a38700c1a577c29af45527e9246bd2fa Mon Sep 17 00:00:00 2001 From: Atul-glo35265 Date: Thu, 24 Aug 2023 15:55:37 +0530 Subject: [PATCH 5/7] AC-9184::Static Tests Failure on using Adobe copyright content - Update Rector Dependency --- composer.json | 2 +- composer.lock | 45 ++++++++++++++++++++++++--------------------- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/composer.json b/composer.json index 04d1abc9..2d2c9974 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "ext-dom": "*", "phpcompatibility/php-compatibility": "^9.3", "squizlabs/php_codesniffer": "^3.6.1", - "rector/rector": "^0.15.10", + "rector/rector": "^0.18.0", "symfony/polyfill": "^1.16", "phpcsstandards/phpcsutils": "^1.0.5" }, diff --git a/composer.lock b/composer.lock index 4a94589d..f63a6852 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": "2cb0816434787b635536aa2fd6ac017f", + "content-hash": "fecbeaf15a13fcb2776f3ac54efa39fb", "packages": [ { "name": "dealerdirect/phpcodesniffer-composer-installer", @@ -222,16 +222,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.9.14", + "version": "1.10.30", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "e5fcc96289cf737304286a9b505fbed091f02e58" + "reference": "2910afdd3fe33e5afd71c09f3fb0d0845b48c410" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e5fcc96289cf737304286a9b505fbed091f02e58", - "reference": "e5fcc96289cf737304286a9b505fbed091f02e58", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/2910afdd3fe33e5afd71c09f3fb0d0845b48c410", + "reference": "2910afdd3fe33e5afd71c09f3fb0d0845b48c410", "shasum": "" }, "require": { @@ -260,8 +260,11 @@ "static analysis" ], "support": { + "docs": "https://phpstan.org/user-guide/getting-started", + "forum": "https://github.com/phpstan/phpstan/discussions", "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.9.14" + "security": "https://github.com/phpstan/phpstan/security/policy", + "source": "https://github.com/phpstan/phpstan-src" }, "funding": [ { @@ -277,30 +280,29 @@ "type": "tidelift" } ], - "time": "2023-01-19T10:47:09+00:00" + "time": "2023-08-22T13:48:25+00:00" }, { "name": "rector/rector", - "version": "0.15.10", + "version": "0.18.0", "source": { "type": "git", "url": "https://github.com/rectorphp/rector.git", - "reference": "000bfb6f7974449399f39e1a210458395b75c887" + "reference": "758ada29b5c80d933f906735d3026520390a2a1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rectorphp/rector/zipball/000bfb6f7974449399f39e1a210458395b75c887", - "reference": "000bfb6f7974449399f39e1a210458395b75c887", + "url": "https://api.github.com/repos/rectorphp/rector/zipball/758ada29b5c80d933f906735d3026520390a2a1d", + "reference": "758ada29b5c80d933f906735d3026520390a2a1d", "shasum": "" }, "require": { "php": "^7.2|^8.0", - "phpstan/phpstan": "^1.9.7" + "phpstan/phpstan": "^1.10.26" }, "conflict": { "rector/rector-doctrine": "*", "rector/rector-downgrade-php": "*", - "rector/rector-php-parser": "*", "rector/rector-phpunit": "*", "rector/rector-symfony": "*" }, @@ -308,11 +310,6 @@ "bin/rector" ], "type": "library", - "extra": { - "branch-alias": { - "dev-main": "0.14-dev" - } - }, "autoload": { "files": [ "bootstrap.php" @@ -323,9 +320,15 @@ "MIT" ], "description": "Instant Upgrade and Automated Refactoring of any PHP code", + "keywords": [ + "automation", + "dev", + "migration", + "refactoring" + ], "support": { "issues": "https://github.com/rectorphp/rector/issues", - "source": "https://github.com/rectorphp/rector/tree/0.15.10" + "source": "https://github.com/rectorphp/rector/tree/0.18.0" }, "funding": [ { @@ -333,7 +336,7 @@ "type": "github" } ], - "time": "2023-01-21T14:30:16+00:00" + "time": "2023-08-17T12:53:22+00:00" }, { "name": "squizlabs/php_codesniffer", @@ -2383,4 +2386,4 @@ }, "platform-dev": [], "plugin-api-version": "2.3.0" -} \ No newline at end of file +} From 5e4ef1363044093aaf7d54ce7cd98fac914b01aa Mon Sep 17 00:00:00 2001 From: Atul-glo35265 Date: Thu, 24 Aug 2023 16:32:55 +0530 Subject: [PATCH 6/7] AC-9184::Static Tests Failure on using Adobe copyright content - Update Rector Dependency --- composer.json | 2 +- composer.lock | 21 +++++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 2d2c9974..54c62c61 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "ext-dom": "*", "phpcompatibility/php-compatibility": "^9.3", "squizlabs/php_codesniffer": "^3.6.1", - "rector/rector": "^0.18.0", + "rector/rector": "^0.16.0", "symfony/polyfill": "^1.16", "phpcsstandards/phpcsutils": "^1.0.5" }, diff --git a/composer.lock b/composer.lock index f63a6852..833823d8 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": "fecbeaf15a13fcb2776f3ac54efa39fb", + "content-hash": "85706157c667b84ac6386062a90f04cb", "packages": [ { "name": "dealerdirect/phpcodesniffer-composer-installer", @@ -284,21 +284,21 @@ }, { "name": "rector/rector", - "version": "0.18.0", + "version": "0.16.0", "source": { "type": "git", "url": "https://github.com/rectorphp/rector.git", - "reference": "758ada29b5c80d933f906735d3026520390a2a1d" + "reference": "2125ff71ea05b079562a8f59ca48a97eb78dc07f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rectorphp/rector/zipball/758ada29b5c80d933f906735d3026520390a2a1d", - "reference": "758ada29b5c80d933f906735d3026520390a2a1d", + "url": "https://api.github.com/repos/rectorphp/rector/zipball/2125ff71ea05b079562a8f59ca48a97eb78dc07f", + "reference": "2125ff71ea05b079562a8f59ca48a97eb78dc07f", "shasum": "" }, "require": { "php": "^7.2|^8.0", - "phpstan/phpstan": "^1.10.26" + "phpstan/phpstan": "^1.10.14" }, "conflict": { "rector/rector-doctrine": "*", @@ -310,6 +310,11 @@ "bin/rector" ], "type": "library", + "extra": { + "branch-alias": { + "dev-main": "0.15-dev" + } + }, "autoload": { "files": [ "bootstrap.php" @@ -328,7 +333,7 @@ ], "support": { "issues": "https://github.com/rectorphp/rector/issues", - "source": "https://github.com/rectorphp/rector/tree/0.18.0" + "source": "https://github.com/rectorphp/rector/tree/0.16.0" }, "funding": [ { @@ -336,7 +341,7 @@ "type": "github" } ], - "time": "2023-08-17T12:53:22+00:00" + "time": "2023-05-05T12:12:17+00:00" }, { "name": "squizlabs/php_codesniffer", From a7257ac1e063dcab3cb27049046927a28c7aed5f Mon Sep 17 00:00:00 2001 From: Atul-glo35265 Date: Thu, 24 Aug 2023 16:59:28 +0530 Subject: [PATCH 7/7] AC-9184::Static Tests Failure on using Adobe copyright content - Update Rector Dependency AC-9184::Static Tests Failure on using Adobe copyright content - Update Rector Dependency AC-9184::Static Tests Failure on using Adobe copyright content - Update Rector Dependency to latest version --- composer.json | 2 +- composer.lock | 21 ++++++++------------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index 54c62c61..afee6829 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "ext-dom": "*", "phpcompatibility/php-compatibility": "^9.3", "squizlabs/php_codesniffer": "^3.6.1", - "rector/rector": "^0.16.0", + "rector/rector": "0.17.12", "symfony/polyfill": "^1.16", "phpcsstandards/phpcsutils": "^1.0.5" }, diff --git a/composer.lock b/composer.lock index 833823d8..daf77a82 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": "85706157c667b84ac6386062a90f04cb", + "content-hash": "ed90b6398ecbe9407a63634ecf205431", "packages": [ { "name": "dealerdirect/phpcodesniffer-composer-installer", @@ -284,21 +284,21 @@ }, { "name": "rector/rector", - "version": "0.16.0", + "version": "0.17.12", "source": { "type": "git", "url": "https://github.com/rectorphp/rector.git", - "reference": "2125ff71ea05b079562a8f59ca48a97eb78dc07f" + "reference": "af3a14a8a9fffa3100b730571c356f6c658d5e09" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rectorphp/rector/zipball/2125ff71ea05b079562a8f59ca48a97eb78dc07f", - "reference": "2125ff71ea05b079562a8f59ca48a97eb78dc07f", + "url": "https://api.github.com/repos/rectorphp/rector/zipball/af3a14a8a9fffa3100b730571c356f6c658d5e09", + "reference": "af3a14a8a9fffa3100b730571c356f6c658d5e09", "shasum": "" }, "require": { "php": "^7.2|^8.0", - "phpstan/phpstan": "^1.10.14" + "phpstan/phpstan": "^1.10.26" }, "conflict": { "rector/rector-doctrine": "*", @@ -310,11 +310,6 @@ "bin/rector" ], "type": "library", - "extra": { - "branch-alias": { - "dev-main": "0.15-dev" - } - }, "autoload": { "files": [ "bootstrap.php" @@ -333,7 +328,7 @@ ], "support": { "issues": "https://github.com/rectorphp/rector/issues", - "source": "https://github.com/rectorphp/rector/tree/0.16.0" + "source": "https://github.com/rectorphp/rector/tree/0.17.12" }, "funding": [ { @@ -341,7 +336,7 @@ "type": "github" } ], - "time": "2023-05-05T12:12:17+00:00" + "time": "2023-08-10T15:22:02+00:00" }, { "name": "squizlabs/php_codesniffer",