From a5a05a617acb25522cd416527b2838f894ba63c8 Mon Sep 17 00:00:00 2001 From: Lena Orobei Date: Mon, 11 Feb 2019 15:50:24 -0600 Subject: [PATCH 1/5] REPO-70: [EQP][Sniffs Consolidation] Assign severity to each sniff - changed rules severities based on #14 --- Magento/ruleset.xml | 408 +++++++++++++++++++++++++++++++++----------- 1 file changed, 304 insertions(+), 104 deletions(-) diff --git a/Magento/ruleset.xml b/Magento/ruleset.xml index ce101e33..fc8036a2 100644 --- a/Magento/ruleset.xml +++ b/Magento/ruleset.xml @@ -5,194 +5,368 @@ - - 8 - warning + + + 10 + error - - 8 + + 10 + error + *.phtml - - 6 + + 10 + error - - 6 + + 10 + error - - 8 + + 10 + error - - 6 + + 10 + error - - 6 + + 10 + error - - 6 + + 10 + error - + 10 + error - - 8 - warning + + 10 + error - - 8 + + 10 + error - + 10 - *.phtml + error - + + 10 + error + + 10 + error - - 8 + + 10 + error + *.phtml - + 10 + error - - 6 + + + + 9 + warning + + + 9 + warning + + + *.phtml + 9 + warning + + 8 + warning 8 - - - 8 warning 8 - - - 8 + warning + 8 warning - 6 - - - 10 - 6 - - - 10 + 8 + warning - 6 - - 8 + warning - - 10 + + 8 + warning - - 10 + + *.phtml + 8 + warning - + 8 + warning - - 10 + + + + 7 + warning - - 8 + + 7 + warning + + + 7 + warning + + + 7 + warning + + + 7 + warning + + + 7 + warning + + + 7 + warning + + + 7 + warning + + + 7 + warning + + + 7 + warning + + + 7 + warning + + + 7 + warning + + + 7 + warning + + + 7 + warning - 8 + 7 + warning - 8 + 7 + warning - - 8 + + 7 + warning - - 10 + + 7 + warning - - 10 + + 7 + warning - - 8 + + 7 + warning - - *.phtml - 8 + + 7 + warning - - 10 + + 7 + warning - - 8 + + 7 + warning - - *.phtml + + + 6 + warning - + 6 + warning + + + 6 + warning + + + 6 + warning + + + 6 + warning + + + 6 + warning + + + 6 + warning + + + 6 + warning + + + 6 + warning + + + 6 + warning - + 6 + warning + + + 6 + warning 6 warning - - 8 + + 6 warning - - - - 10 - error + + 6 + warning - - 10 - error - *.phtml + + 6 + warning - + 6 warning - + 6 warning - + 6 - - - + warning - - 10 - error + + 6 + warning - - 8 + + 6 warning - + 6 + warning - + + 6 + warning + + + 6 + warning + + + 6 + warning + + + 6 + warning + + + 6 + warning + + + 6 + warning + + + 6 + warning + + + 6 + warning + + + 6 + warning + + + 6 + warning + + + 6 + warning + + + 6 + warning + + + 6 + warning + + 6 warning @@ -200,7 +374,33 @@ 6 warning - - 8 + + 6 + warning + + + 6 + warning + + + 6 + warning + + + + + 5 + warning + + + 5 + warning + + + + + + 5 + warning From f9f75a31af392a87d480664bbc0a9e51d52e4138 Mon Sep 17 00:00:00 2001 From: Lena Orobei Date: Tue, 12 Feb 2019 09:50:09 -0600 Subject: [PATCH 2/5] REPO-70: [EQP][Sniffs Consolidation] Assign severity to each sniff - fix code style --- Magento/Sniffs/Legacy/MageEntitySniff.php | 10 +++++----- Magento/Sniffs/PHP/DiscouragedFunctionSniff.php | 2 +- Magento/Sniffs/Security/IncludeFileSniff.php | 10 +++++----- Magento/Sniffs/Security/XssTemplateSniff.php | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Magento/Sniffs/Legacy/MageEntitySniff.php b/Magento/Sniffs/Legacy/MageEntitySniff.php index 6750eec5..e0db60a8 100644 --- a/Magento/Sniffs/Legacy/MageEntitySniff.php +++ b/Magento/Sniffs/Legacy/MageEntitySniff.php @@ -13,11 +13,11 @@ */ class MageEntitySniff implements Sniff { - /** - * String representation of error. - * - * @var string - */ + /** + * String representation of error. + * + * @var string + */ protected $errorMessage = 'Possible Magento 2 design violation. Detected typical Magento 1.x construction "%s".'; /** diff --git a/Magento/Sniffs/PHP/DiscouragedFunctionSniff.php b/Magento/Sniffs/PHP/DiscouragedFunctionSniff.php index 7cf74e84..660c1800 100644 --- a/Magento/Sniffs/PHP/DiscouragedFunctionSniff.php +++ b/Magento/Sniffs/PHP/DiscouragedFunctionSniff.php @@ -235,7 +235,7 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff * * @return void */ - protected function addError($phpcsFile, $stackPtr, $function, $pattern = null) + protected function addError($phpcsFile, $stackPtr, $function, $pattern=null) { $data = [$function]; $warningMessage = 'The use of function %s() is discouraged'; diff --git a/Magento/Sniffs/Security/IncludeFileSniff.php b/Magento/Sniffs/Security/IncludeFileSniff.php index 28b768ea..79803904 100644 --- a/Magento/Sniffs/Security/IncludeFileSniff.php +++ b/Magento/Sniffs/Security/IncludeFileSniff.php @@ -14,11 +14,11 @@ */ class IncludeFileSniff implements Sniff { - /** - * Warning violation code. - * - * @var string - */ + /** + * Warning violation code. + * + * @var string + */ protected $warningCode = 'FoundIncludeFile'; /** diff --git a/Magento/Sniffs/Security/XssTemplateSniff.php b/Magento/Sniffs/Security/XssTemplateSniff.php index b737206d..50f96ad7 100644 --- a/Magento/Sniffs/Security/XssTemplateSniff.php +++ b/Magento/Sniffs/Security/XssTemplateSniff.php @@ -307,7 +307,7 @@ private function findNextInScope($types, $start, $end) * @param int|bool $last * @return int|bool */ - private function findLastInScope($types, $start, $end, $last = false) + private function findLastInScope($types, $start, $end, $last=false) { $types = (array)$types; $nextInScope = $this->findNextInScope($types, $start, $end); From cdf990171083f50e8b309b49c957cf2eb0c5d9cb Mon Sep 17 00:00:00 2001 From: Lena Orobei Date: Wed, 13 Feb 2019 15:09:22 -0600 Subject: [PATCH 3/5] REPO-70: [EQP][Sniffs Consolidation] Assign severity to each sniff - review fixes; - made it follow PSR2; --- .../Sniffs/PHP/DiscouragedFunctionSniff.php | 2 +- Magento/Sniffs/Security/XssTemplateSniff.php | 2 +- Magento/ruleset.xml | 36 +++++++++++++++++++ 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/Magento/Sniffs/PHP/DiscouragedFunctionSniff.php b/Magento/Sniffs/PHP/DiscouragedFunctionSniff.php index 660c1800..7cf74e84 100644 --- a/Magento/Sniffs/PHP/DiscouragedFunctionSniff.php +++ b/Magento/Sniffs/PHP/DiscouragedFunctionSniff.php @@ -235,7 +235,7 @@ class DiscouragedFunctionSniff extends ForbiddenFunctionsSniff * * @return void */ - protected function addError($phpcsFile, $stackPtr, $function, $pattern=null) + protected function addError($phpcsFile, $stackPtr, $function, $pattern = null) { $data = [$function]; $warningMessage = 'The use of function %s() is discouraged'; diff --git a/Magento/Sniffs/Security/XssTemplateSniff.php b/Magento/Sniffs/Security/XssTemplateSniff.php index 50f96ad7..b737206d 100644 --- a/Magento/Sniffs/Security/XssTemplateSniff.php +++ b/Magento/Sniffs/Security/XssTemplateSniff.php @@ -307,7 +307,7 @@ private function findNextInScope($types, $start, $end) * @param int|bool $last * @return int|bool */ - private function findLastInScope($types, $start, $end, $last=false) + private function findLastInScope($types, $start, $end, $last = false) { $types = (array)$types; $nextInScope = $this->findNextInScope($types, $start, $end); diff --git a/Magento/ruleset.xml b/Magento/ruleset.xml index fc8036a2..5d9b301c 100644 --- a/Magento/ruleset.xml +++ b/Magento/ruleset.xml @@ -172,6 +172,9 @@ 7 warning + + 0 + 7 warning @@ -263,6 +266,12 @@ warning + + + + + + 6 warning @@ -314,6 +323,12 @@ 6 warning + + 0 + + + 0 + 6 warning @@ -342,6 +357,9 @@ 6 warning + + 0 + 6 warning @@ -357,6 +375,12 @@ 6 warning + + + + + + 0 6 @@ -383,9 +407,21 @@ warning + + + 6 warning + + 0 + + + 0 + + + 0 + From 9f42f25a8bc914c33d067da5fa3bdaf125076334 Mon Sep 17 00:00:00 2001 From: Lena Orobei Date: Fri, 15 Feb 2019 11:49:08 -0600 Subject: [PATCH 4/5] REPO-70: [EQP][Sniffs Consolidation] Assign severity to each sniff - review fixes --- Magento/Sniffs/Security/IncludeFileSniff.php | 2 +- .../Tests/Security/IncludeFileUnitTest.php | 17 ++++----- Magento/ruleset.xml | 36 +++++++++---------- 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/Magento/Sniffs/Security/IncludeFileSniff.php b/Magento/Sniffs/Security/IncludeFileSniff.php index 79803904..0673f598 100644 --- a/Magento/Sniffs/Security/IncludeFileSniff.php +++ b/Magento/Sniffs/Security/IncludeFileSniff.php @@ -93,7 +93,7 @@ public function process(File $phpcsFile, $stackPtr) if ($hasVariable) { $message .= ' Variables inside are insecure.'; } - $phpcsFile->addWarning( + $phpcsFile->addError( $message, $stackPtr, $this->warningCode, diff --git a/Magento/Tests/Security/IncludeFileUnitTest.php b/Magento/Tests/Security/IncludeFileUnitTest.php index 254dc842..40153cf5 100644 --- a/Magento/Tests/Security/IncludeFileUnitTest.php +++ b/Magento/Tests/Security/IncludeFileUnitTest.php @@ -3,6 +3,7 @@ * Copyright © Magento. All rights reserved. * See COPYING.txt for license details. */ + namespace Magento\Tests\Security; use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest; @@ -16,14 +17,6 @@ class IncludeFileUnitTest extends AbstractSniffUnitTest * @inheritdoc */ public function getErrorList() - { - return []; - } - - /** - * @inheritdoc - */ - public function getWarningList() { return [ 3 => 1, @@ -42,4 +35,12 @@ public function getWarningList() 34 => 1, ]; } + + /** + * @inheritdoc + */ + public function getWarningList() + { + return []; + } } diff --git a/Magento/ruleset.xml b/Magento/ruleset.xml index 5d9b301c..69cb6ca9 100644 --- a/Magento/ruleset.xml +++ b/Magento/ruleset.xml @@ -47,6 +47,10 @@ 10 error + + 10 + error + 10 error @@ -73,8 +77,16 @@ error - - + + + 9 + warning + + + 9 + warning + + 9 warning @@ -87,6 +99,10 @@ 9 warning + + 9 + warning + @@ -113,10 +129,6 @@ 8 warning - - 8 - warning - 8 warning @@ -183,10 +195,6 @@ 7 warning - - 7 - warning - 7 warning @@ -219,10 +227,6 @@ 7 warning - - 7 - warning - 7 warning @@ -233,10 +237,6 @@ 6 warning - - 6 - warning - 6 warning From 1d0c79ab37298f9a28d725b69b1841c03264a2ef Mon Sep 17 00:00:00 2001 From: Lena Orobei Date: Thu, 28 Feb 2019 09:30:56 -0600 Subject: [PATCH 5/5] REPO-70: [EQP][Sniffs Consolidation] Assign severity to each sniff - review fixes --- Magento/ruleset.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Magento/ruleset.xml b/Magento/ruleset.xml index f0d49bb0..91f4c72f 100644 --- a/Magento/ruleset.xml +++ b/Magento/ruleset.xml @@ -104,7 +104,7 @@ warning - + 8 warning @@ -118,7 +118,8 @@ warning - 6 + 8 + warning @@ -305,6 +306,7 @@ 6 warning + 6 @@ -339,6 +341,7 @@ 6 warning + 6