magento · sivaschenko · Aug 20, 2021 · Aug 20, 2021 · Aug 23, 2021 · Aug 23, 2021
diff --git a/Magento2/Sniffs/Annotation/AnnotationFormatValidator.php b/Magento2/Sniffs/Annotation/AnnotationFormatValidator.php
@@ -64,7 +64,7 @@ private function validateMultiLinesInShortDescription(
             && $tokens[$shortPtrEnd]['code'] !== T_DOC_COMMENT_TAG
         ) {
             $error = 'Short description should not be in multi lines';
-            $phpcsFile->addFixableError($error, $shortPtrEnd + 1, 'MethodAnnotation');
+            $phpcsFile->addError($error, $shortPtrEnd + 1, 'MethodAnnotation');
         }
     }
 
@@ -95,7 +95,7 @@ private function validateSpacingBetweenShortAndLongDescriptions(
             && $tokens[$shortPtrEnd]['code'] !== T_DOC_COMMENT_TAG
         ) {
             $error = 'There must be exactly one blank line between lines short and long descriptions';
-            $phpcsFile->addFixableError($error, $shortPtrEnd + 1, 'MethodAnnotation');
+            $phpcsFile->addError($error, $shortPtrEnd + 1, 'MethodAnnotation');
         }
         if ($shortPtrEnd != $shortPtr) {
             $this->validateLongDescriptionFormat($phpcsFile, $shortPtrEnd, $commentEndPtr, $emptyTypeTokens);
@@ -123,16 +123,16 @@ private function validateShortDescriptionFormat(
         $tokens = $phpcsFile->getTokens();
         if ($tokens[$shortPtr]['line'] !== $tokens[$stackPtr]['line'] + 1) {
             $error = 'No blank lines are allowed before short description';
-            $phpcsFile->addFixableError($error, $shortPtr, 'MethodAnnotation');
+            $phpcsFile->addError($error, $shortPtr, 'MethodAnnotation');
         }
         if (strtolower($tokens[$shortPtr]['content']) === '{@inheritdoc}') {
             $error = 'If the @inheritdoc not inline it shouldn’t have braces';
-            $phpcsFile->addFixableError($error, $shortPtr, 'MethodAnnotation');
+            $phpcsFile->addError($error, $shortPtr, 'MethodAnnotation');
         }
         $shortPtrContent = $tokens[$shortPtr]['content'];
         if (preg_match('/^\p{Ll}/u', $shortPtrContent) === 1) {
             $error = 'Short description must start with a capital letter';
-            $phpcsFile->addFixableError($error, $shortPtr, 'MethodAnnotation');
+            $phpcsFile->addError($error, $shortPtr, 'MethodAnnotation');
         }
         $this->validateNoExtraNewLineBeforeShortDescription(
             $phpcsFile,
@@ -171,16 +171,16 @@ private function validateLongDescriptionFormat(
         $longPtr = $phpcsFile->findNext($emptyTypeTokens, $shortPtrEnd + 1, $commentEndPtr - 1, true);
         if (strtolower($tokens[$longPtr]['content']) === '@inheritdoc') {
             $error = '@inheritdoc imports only short description, annotation must have long description';
-            $phpcsFile->addFixableError($error, $longPtr, 'MethodAnnotation');
+            $phpcsFile->addError($error, $longPtr, 'MethodAnnotation');
         }
         if ($longPtr !== false && $tokens[$longPtr]['code'] === T_DOC_COMMENT_STRING) {
             if ($tokens[$longPtr]['line'] !== $tokens[$shortPtrEnd]['line'] + 2) {
                 $error = 'There must be exactly one blank line between descriptions';
-                $phpcsFile->addFixableError($error, $longPtr, 'MethodAnnotation');
+                $phpcsFile->addError($error, $longPtr, 'MethodAnnotation');
             }
             if (preg_match('/^\p{Ll}/u', $tokens[$longPtr]['content']) === 1) {
                 $error = 'Long description must start with a capital letter';
-                $phpcsFile->addFixableError($error, $longPtr, 'MethodAnnotation');
+                $phpcsFile->addError($error, $longPtr, 'MethodAnnotation');
             }
         }
     }
@@ -203,7 +203,7 @@ public function validateTagsSpacingFormat(File $phpcsFile, int $commentStartPtr,
                 && strtolower($commentTagPtrContent) !== '@inheritdoc'
             ) {
                 $error = 'There must be exactly one blank line before tags';
-                $phpcsFile->addFixableError($error, $firstTagPtr, 'MethodAnnotation');
+                $phpcsFile->addError($error, $firstTagPtr, 'MethodAnnotation');
             }
         }
     }
@@ -240,7 +240,7 @@ public function validateTagGroupingFormat(File $phpcsFile, int $commentStartPtr)
                 if ($paramGroupId !== null
                     && $paramGroupId !== $groupId) {
                     $error = 'Parameter tags must be grouped together';
-                    $phpcsFile->addFixableError($error, $tag, 'MethodAnnotation');
+                    $phpcsFile->addError($error, $tag, 'MethodAnnotation');
                 }
                 if ($paramGroupId === null) {
                     $paramGroupId = $groupId;
@@ -273,7 +273,7 @@ public function validateTagAligningFormat(File $phpcsFile, int $commentStartPtr)
 
         if (!$this->allTagsAligned($actualPositions)
             && !$this->noneTagsAligned($actualPositions, $noAlignmentPositions)) {
-            $phpcsFile->addFixableError(
+            $phpcsFile->addError(
                 'Tags visual alignment must be consistent',
                 $stackPtr,
                 'MethodArguments'
@@ -322,7 +322,7 @@ private function validateNoExtraNewLineBeforeShortDescription(
         $prevPtr = $phpcsFile->findPrevious($emptyTypeTokens, $commentEndPtr - 1, $commentStartPtr, true);
         if ($tokens[$prevPtr]['line'] < ($tokens[$commentEndPtr]['line'] - 1)) {
             $error = 'Additional blank lines found at end of the annotation block';
-            $phpcsFile->addFixableError($error, $commentEndPtr, 'MethodAnnotation');
+            $phpcsFile->addError($error, $commentEndPtr, 'MethodAnnotation');
         }
     }
 
@@ -351,7 +351,7 @@ public function validateDescriptionFormatStructure(
                 && strtolower($commentTagPtrContent) !== '@inheritdoc'
             ) {
                 $error = 'Missing short description';
-                $phpcsFile->addFixableError($error, $commentStartPtr, 'MethodAnnotation');
+                $phpcsFile->addError($error, $commentStartPtr, 'MethodAnnotation');
             } else {
                 $this->validateShortDescriptionFormat(
                     $phpcsFile,

diff --git a/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php b/Magento2/Sniffs/Annotation/MethodArgumentsSniff.php
@@ -225,15 +225,15 @@ private function validateParameterAnnotationForArgumentExists(
                 $previousCommentClosePtr
             );
             if ($inheritdocAnnotationWithBracesExists) {
-                $phpcsFile->addFixableError(
+                $phpcsFile->addError(
                     '{@inheritdoc} does not import parameter annotation',
                     $stackPtr,
                     'MethodArguments'
                 );
             } elseif ($this->validateCommentBlockExists($phpcsFile, $previousCommentClosePtr, $stackPtr)
                 && !$inheritdocAnnotationWithoutBracesExists
             ) {
-                $phpcsFile->addFixableError(
+                $phpcsFile->addError(
                     'Missing @param for argument in method annotation',
                     $stackPtr,
                     'MethodArguments'
@@ -257,13 +257,13 @@ private function validateCommentBlockDoesnotHaveExtraParameterAnnotation(
         int $stackPtr
     ): void {
         if ($argumentsCount < $parametersCount && $argumentsCount > 0) {
-            $phpcsFile->addFixableError(
+            $phpcsFile->addError(
                 'Extra @param found in method annotation',
                 $stackPtr,
                 'MethodArguments'
             );
         } elseif ($argumentsCount > 0 && $argumentsCount != $parametersCount && $parametersCount != 0) {
-            $phpcsFile->addFixableError(
+            $phpcsFile->addError(
                 '@param is not found for one or more params in method annotation',
                 $stackPtr,
                 'MethodArguments'
@@ -290,7 +290,7 @@ private function validateArgumentNameInParameterAnnotationExists(
         $parameterNames = $this->getMethodParameters($paramDefinitions);
         if (!in_array($methodArguments[$ptr], $parameterNames)) {
             $error = $methodArguments[$ptr] . ' parameter is missing in method annotation';
-            $phpcsFile->addFixableError($error, $stackPtr, 'MethodArguments');
+            $phpcsFile->addError($error, $stackPtr, 'MethodArguments');
         }
     }
 
@@ -311,7 +311,7 @@ private function validateParameterPresentInMethodSignature(
         array $paramPointers
     ): void {
         if (!in_array($paramDefinitionsArguments, $methodArguments)) {
-            $phpcsFile->addFixableError(
+            $phpcsFile->addError(
                 $paramDefinitionsArguments . ' parameter is missing in method arguments signature',
                 $paramPointers[$ptr],
                 'MethodArguments'
@@ -340,7 +340,7 @@ private function validateParameterOrderIsCorrect(
                 && in_array($methodArguments[$ptr], $parameterNames)
             ) {
                 if ($methodArguments[$ptr] != $parameterNames[$ptr]) {
-                    $phpcsFile->addFixableError(
+                    $phpcsFile->addError(
                         $methodArguments[$ptr] . ' parameter is not in order',
                         $paramPointers[$ptr],
                         'MethodArguments'
@@ -383,7 +383,7 @@ private function validateDuplicateAnnotationDoesnotExists(
                 }
             }
             foreach ($duplicateParameters as $value) {
-                $phpcsFile->addFixableError(
+                $phpcsFile->addError(
                     $value . ' duplicate found in method annotation',
                     $stackPtr,
                     'MethodArguments'
@@ -410,7 +410,7 @@ private function validateParameterAnnotationFormatIsCorrect(
     ): void {
         switch (count($paramDefinitions)) {
             case 0:
-                $phpcsFile->addFixableError(
+                $phpcsFile->addError(
                     'Missing both type and parameter',
                     $paramPointers[$ptr],
                     'MethodArguments'
@@ -427,7 +427,7 @@ private function validateParameterAnnotationFormatIsCorrect(
                 break;
             case 2:
                 if ($this->isInvalidType($paramDefinitions[0])) {
-                    $phpcsFile->addFixableError(
+                    $phpcsFile->addError(
                         $paramDefinitions[0] . ' is not a valid PHP type',
                         $paramPointers[$ptr],
                         'MethodArguments'
@@ -449,7 +449,7 @@ private function validateParameterAnnotationFormatIsCorrect(
                         'MethodArguments'
                     );
                     if ($this->isInvalidType($paramDefinitions[0])) {
-                        $phpcsFile->addFixableError(
+                        $phpcsFile->addError(
                             $paramDefinitions[0] . ' is not a valid PHP type',
                             $paramPointers[$ptr],
                             'MethodArguments'
@@ -633,7 +633,7 @@ private function validateFormattingConsistency(
         }
         if (!$this->allParamsAligned($argumentPositions, $commentPositions)
             && !$this->noneParamsAligned($argumentPositions, $commentPositions, $paramDefinitions)) {
-            $phpcsFile->addFixableError(
+            $phpcsFile->addError(
                 'Method arguments visual alignment must be consistent',
                 $paramPointers[0],
                 'MethodArguments'

diff --git a/Magento2/Sniffs/Html/HtmlDirectiveSniff.php b/Magento2/Sniffs/Html/HtmlDirectiveSniff.php
@@ -200,7 +200,7 @@ private function validateVariableUsage(File $phpcsFile, string $body): void
                     'Template directives may not invoke methods. Only scalar array access is allowed.' . PHP_EOL
                     . 'Found "' . trim($body) . '"',
                     null,
-                    'HtmlTemplates.DirectiveUsage.ProhibitedMethodCall'
+                    'HtmlTemplatesProhibitedMethodCall'
                 );
             }
         }
@@ -224,7 +224,7 @@ private function validateDefinedVariables(File $phpcsFile, string $templateText)
                 $phpcsFile->addError(
                     'Template @vars comment block contains invalid JSON.',
                     null,
-                    'HtmlTemplates.DirectiveUsage.InvalidVarsJSON'
+                    'HtmlTemplatesInvalidVarsJSON'
                 );
                 return;
             }
@@ -235,7 +235,7 @@ private function validateDefinedVariables(File $phpcsFile, string $templateText)
                         'Template @vars comment block contains invalid label.' . PHP_EOL
                         . 'Label for variable "' . $var . '" is empty.',
                         null,
-                        'HtmlTemplates.DirectiveUsage.InvalidVariableLabel'
+                        'HtmlTemplatesInvalidVariableLabel'
                     );
                 }
             }
@@ -254,7 +254,7 @@ private function validateDefinedVariables(File $phpcsFile, string $templateText)
                 'Template @vars comment block is missing a variable used in the template.' . PHP_EOL
                  . 'Missing variable: ' . $undefinedVariable,
                 null,
-                'HtmlTemplates.DirectiveUsage.UndefinedVariable'
+                'HtmlTemplatesUndefinedVariable'
             );
         }
     }

diff --git a/Magento2/Sniffs/Less/AvoidIdSniff.php b/Magento2/Sniffs/Less/AvoidIdSniff.php
@@ -51,6 +51,7 @@ class AvoidIdSniff implements Sniff
         T_PLUS,
         T_NS_SEPARATOR,
         T_LNUMBER,
+        T_BITWISE_NOT
     ];
 
     /**

diff --git a/Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php b/Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php
@@ -57,11 +57,13 @@ public function process(File $phpcsFile, $stackPtr)
             $closingCurly = $phpcsFile->findNext(T_CLOSE_USE_GROUP, ($next + 1));
             do {
                 $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($next + 1), $closingCurly, true);
-                $groupedAsContent = $baseUse. $tokens[$next]['content'];
-                $next = $phpcsFile->findNext(T_COMMA, ($next + 1), $closingCurly);
-                if (strpos($groupedAsContent, $this->prohibitNamespace) !== false) {
-                    $phpcsFile->addWarning($this->warningMessage, $stackPtr, $this->warningCode);
-                    return;
+                if ($next !== false) {
+                    $groupedAsContent = $baseUse. $tokens[$next]['content'];
+                    $next = $phpcsFile->findNext(T_COMMA, ($next + 1), $closingCurly);
+                    if (strpos($groupedAsContent, $this->prohibitNamespace) !== false) {
+                        $phpcsFile->addWarning($this->warningMessage, $stackPtr, $this->warningCode);
+                        return;
+                    }
                 }
             } while ($next !== false);
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,6 +51,7 @@ class AvoidIdSniff implements Sniff @@
             T_PLUS,
             T_NS_SEPARATOR,
             T_LNUMBER,
+            T_BITWISE_NOT
         ];
         /**
@@ Expand Down @@