Skip to content

Commit c43f253

Browse files
sverasvera
committed
Merge branch 'develop' of github.com:magento/magento-coding-standard into AC-659
2 parents d0fe150 + d4dc9e2 commit c43f253

39 files changed

+1256
-49
lines changed

‎Magento2/Sniffs/Annotation/AnnotationFormatValidator.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ private function validateMultiLinesInShortDescription(
6464
&& $tokens[$shortPtrEnd]['code'] !== T_DOC_COMMENT_TAG
6565
) {
6666
$error = 'Short description should not be in multi lines';
67-
$phpcsFile->addFixableError($error, $shortPtrEnd + 1, 'MethodAnnotation');
67+
$phpcsFile->addError($error, $shortPtrEnd + 1, 'MethodAnnotation');
6868
}
6969
}
7070

@@ -95,7 +95,7 @@ private function validateSpacingBetweenShortAndLongDescriptions(
9595
&& $tokens[$shortPtrEnd]['code'] !== T_DOC_COMMENT_TAG
9696
) {
9797
$error = 'There must be exactly one blank line between lines short and long descriptions';
98-
$phpcsFile->addFixableError($error, $shortPtrEnd + 1, 'MethodAnnotation');
98+
$phpcsFile->addError($error, $shortPtrEnd + 1, 'MethodAnnotation');
9999
}
100100
if ($shortPtrEnd != $shortPtr) {
101101
$this->validateLongDescriptionFormat($phpcsFile, $shortPtrEnd, $commentEndPtr, $emptyTypeTokens);
@@ -123,16 +123,16 @@ private function validateShortDescriptionFormat(
123123
$tokens = $phpcsFile->getTokens();
124124
if ($tokens[$shortPtr]['line'] !== $tokens[$stackPtr]['line'] + 1) {
125125
$error = 'No blank lines are allowed before short description';
126-
$phpcsFile->addFixableError($error, $shortPtr, 'MethodAnnotation');
126+
$phpcsFile->addError($error, $shortPtr, 'MethodAnnotation');
127127
}
128128
if (strtolower($tokens[$shortPtr]['content']) === '{@inheritdoc}') {
129129
$error = 'If the @inheritdoc not inline it shouldn’t have braces';
130-
$phpcsFile->addFixableError($error, $shortPtr, 'MethodAnnotation');
130+
$phpcsFile->addError($error, $shortPtr, 'MethodAnnotation');
131131
}
132132
$shortPtrContent = $tokens[$shortPtr]['content'];
133133
if (preg_match('/^\p{Ll}/u', $shortPtrContent) === 1) {
134134
$error = 'Short description must start with a capital letter';
135-
$phpcsFile->addFixableError($error, $shortPtr, 'MethodAnnotation');
135+
$phpcsFile->addError($error, $shortPtr, 'MethodAnnotation');
136136
}
137137
$this->validateNoExtraNewLineBeforeShortDescription(
138138
$phpcsFile,
@@ -171,16 +171,16 @@ private function validateLongDescriptionFormat(
171171
$longPtr = $phpcsFile->findNext($emptyTypeTokens, $shortPtrEnd + 1, $commentEndPtr - 1, true);
172172
if (strtolower($tokens[$longPtr]['content']) === '@inheritdoc') {
173173
$error = '@inheritdoc imports only short description, annotation must have long description';
174-
$phpcsFile->addFixableError($error, $longPtr, 'MethodAnnotation');
174+
$phpcsFile->addError($error, $longPtr, 'MethodAnnotation');
175175
}
176176
if ($longPtr !== false && $tokens[$longPtr]['code'] === T_DOC_COMMENT_STRING) {
177177
if ($tokens[$longPtr]['line'] !== $tokens[$shortPtrEnd]['line'] + 2) {
178178
$error = 'There must be exactly one blank line between descriptions';
179-
$phpcsFile->addFixableError($error, $longPtr, 'MethodAnnotation');
179+
$phpcsFile->addError($error, $longPtr, 'MethodAnnotation');
180180
}
181181
if (preg_match('/^\p{Ll}/u', $tokens[$longPtr]['content']) === 1) {
182182
$error = 'Long description must start with a capital letter';
183-
$phpcsFile->addFixableError($error, $longPtr, 'MethodAnnotation');
183+
$phpcsFile->addError($error, $longPtr, 'MethodAnnotation');
184184
}
185185
}
186186
}
@@ -203,7 +203,7 @@ public function validateTagsSpacingFormat(File $phpcsFile, int $commentStartPtr,
203203
&& strtolower($commentTagPtrContent) !== '@inheritdoc'
204204
) {
205205
$error = 'There must be exactly one blank line before tags';
206-
$phpcsFile->addFixableError($error, $firstTagPtr, 'MethodAnnotation');
206+
$phpcsFile->addError($error, $firstTagPtr, 'MethodAnnotation');
207207
}
208208
}
209209
}
@@ -240,7 +240,7 @@ public function validateTagGroupingFormat(File $phpcsFile, int $commentStartPtr)
240240
if ($paramGroupId !== null
241241
&& $paramGroupId !== $groupId) {
242242
$error = 'Parameter tags must be grouped together';
243-
$phpcsFile->addFixableError($error, $tag, 'MethodAnnotation');
243+
$phpcsFile->addError($error, $tag, 'MethodAnnotation');
244244
}
245245
if ($paramGroupId === null) {
246246
$paramGroupId = $groupId;
@@ -273,7 +273,7 @@ public function validateTagAligningFormat(File $phpcsFile, int $commentStartPtr)
273273

274274
if (!$this->allTagsAligned($actualPositions)
275275
&& !$this->noneTagsAligned($actualPositions, $noAlignmentPositions)) {
276-
$phpcsFile->addFixableError(
276+
$phpcsFile->addError(
277277
'Tags visual alignment must be consistent',
278278
$stackPtr,
279279
'MethodArguments'
@@ -322,7 +322,7 @@ private function validateNoExtraNewLineBeforeShortDescription(
322322
$prevPtr = $phpcsFile->findPrevious($emptyTypeTokens, $commentEndPtr - 1, $commentStartPtr, true);
323323
if ($tokens[$prevPtr]['line'] < ($tokens[$commentEndPtr]['line'] - 1)) {
324324
$error = 'Additional blank lines found at end of the annotation block';
325-
$phpcsFile->addFixableError($error, $commentEndPtr, 'MethodAnnotation');
325+
$phpcsFile->addError($error, $commentEndPtr, 'MethodAnnotation');
326326
}
327327
}
328328

@@ -351,7 +351,7 @@ public function validateDescriptionFormatStructure(
351351
&& strtolower($commentTagPtrContent) !== '@inheritdoc'
352352
) {
353353
$error = 'Missing short description';
354-
$phpcsFile->addFixableError($error, $commentStartPtr, 'MethodAnnotation');
354+
$phpcsFile->addError($error, $commentStartPtr, 'MethodAnnotation');
355355
} else {
356356
$this->validateShortDescriptionFormat(
357357
$phpcsFile,

‎Magento2/Sniffs/Annotation/MethodArgumentsSniff.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -225,15 +225,15 @@ private function validateParameterAnnotationForArgumentExists(
225225
$previousCommentClosePtr
226226
);
227227
if ($inheritdocAnnotationWithBracesExists) {
228-
$phpcsFile->addFixableError(
228+
$phpcsFile->addError(
229229
'{@inheritdoc} does not import parameter annotation',
230230
$stackPtr,
231231
'MethodArguments'
232232
);
233233
} elseif ($this->validateCommentBlockExists($phpcsFile, $previousCommentClosePtr, $stackPtr)
234234
&& !$inheritdocAnnotationWithoutBracesExists
235235
) {
236-
$phpcsFile->addFixableError(
236+
$phpcsFile->addError(
237237
'Missing @param for argument in method annotation',
238238
$stackPtr,
239239
'MethodArguments'
@@ -257,13 +257,13 @@ private function validateCommentBlockDoesnotHaveExtraParameterAnnotation(
257257
int $stackPtr
258258
): void {
259259
if ($argumentsCount < $parametersCount && $argumentsCount > 0) {
260-
$phpcsFile->addFixableError(
260+
$phpcsFile->addError(
261261
'Extra @param found in method annotation',
262262
$stackPtr,
263263
'MethodArguments'
264264
);
265265
} elseif ($argumentsCount > 0 && $argumentsCount != $parametersCount && $parametersCount != 0) {
266-
$phpcsFile->addFixableError(
266+
$phpcsFile->addError(
267267
'@param is not found for one or more params in method annotation',
268268
$stackPtr,
269269
'MethodArguments'
@@ -290,7 +290,7 @@ private function validateArgumentNameInParameterAnnotationExists(
290290
$parameterNames = $this->getMethodParameters($paramDefinitions);
291291
if (!in_array($methodArguments[$ptr], $parameterNames)) {
292292
$error = $methodArguments[$ptr] . ' parameter is missing in method annotation';
293-
$phpcsFile->addFixableError($error, $stackPtr, 'MethodArguments');
293+
$phpcsFile->addError($error, $stackPtr, 'MethodArguments');
294294
}
295295
}
296296

@@ -311,7 +311,7 @@ private function validateParameterPresentInMethodSignature(
311311
array $paramPointers
312312
): void {
313313
if (!in_array($paramDefinitionsArguments, $methodArguments)) {
314-
$phpcsFile->addFixableError(
314+
$phpcsFile->addError(
315315
$paramDefinitionsArguments . ' parameter is missing in method arguments signature',
316316
$paramPointers[$ptr],
317317
'MethodArguments'
@@ -340,7 +340,7 @@ private function validateParameterOrderIsCorrect(
340340
&& in_array($methodArguments[$ptr], $parameterNames)
341341
) {
342342
if ($methodArguments[$ptr] != $parameterNames[$ptr]) {
343-
$phpcsFile->addFixableError(
343+
$phpcsFile->addError(
344344
$methodArguments[$ptr] . ' parameter is not in order',
345345
$paramPointers[$ptr],
346346
'MethodArguments'
@@ -383,7 +383,7 @@ private function validateDuplicateAnnotationDoesnotExists(
383383
}
384384
}
385385
foreach ($duplicateParameters as $value) {
386-
$phpcsFile->addFixableError(
386+
$phpcsFile->addError(
387387
$value . ' duplicate found in method annotation',
388388
$stackPtr,
389389
'MethodArguments'
@@ -410,7 +410,7 @@ private function validateParameterAnnotationFormatIsCorrect(
410410
): void {
411411
switch (count($paramDefinitions)) {
412412
case 0:
413-
$phpcsFile->addFixableError(
413+
$phpcsFile->addError(
414414
'Missing both type and parameter',
415415
$paramPointers[$ptr],
416416
'MethodArguments'
@@ -427,7 +427,7 @@ private function validateParameterAnnotationFormatIsCorrect(
427427
break;
428428
case 2:
429429
if ($this->isInvalidType($paramDefinitions[0])) {
430-
$phpcsFile->addFixableError(
430+
$phpcsFile->addError(
431431
$paramDefinitions[0] . ' is not a valid PHP type',
432432
$paramPointers[$ptr],
433433
'MethodArguments'
@@ -449,7 +449,7 @@ private function validateParameterAnnotationFormatIsCorrect(
449449
'MethodArguments'
450450
);
451451
if ($this->isInvalidType($paramDefinitions[0])) {
452-
$phpcsFile->addFixableError(
452+
$phpcsFile->addError(
453453
$paramDefinitions[0] . ' is not a valid PHP type',
454454
$paramPointers[$ptr],
455455
'MethodArguments'
@@ -633,7 +633,7 @@ private function validateFormattingConsistency(
633633
}
634634
if (!$this->allParamsAligned($argumentPositions, $commentPositions)
635635
&& !$this->noneParamsAligned($argumentPositions, $commentPositions, $paramDefinitions)) {
636-
$phpcsFile->addFixableError(
636+
$phpcsFile->addError(
637637
'Method arguments visual alignment must be consistent',
638638
$paramPointers[0],
639639
'MethodArguments'

‎Magento2/Sniffs/Html/HtmlDirectiveSniff.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ private function validateVariableUsage(File $phpcsFile, string $body): void
200200
'Template directives may not invoke methods. Only scalar array access is allowed.' . PHP_EOL
201201
. 'Found "' . trim($body) . '"',
202202
null,
203-
'HtmlTemplates.DirectiveUsage.ProhibitedMethodCall'
203+
'HtmlTemplatesProhibitedMethodCall'
204204
);
205205
}
206206
}
@@ -224,7 +224,7 @@ private function validateDefinedVariables(File $phpcsFile, string $templateText)
224224
$phpcsFile->addError(
225225
'Template @vars comment block contains invalid JSON.',
226226
null,
227-
'HtmlTemplates.DirectiveUsage.InvalidVarsJSON'
227+
'HtmlTemplatesInvalidVarsJSON'
228228
);
229229
return;
230230
}
@@ -235,7 +235,7 @@ private function validateDefinedVariables(File $phpcsFile, string $templateText)
235235
'Template @vars comment block contains invalid label.' . PHP_EOL
236236
. 'Label for variable "' . $var . '" is empty.',
237237
null,
238-
'HtmlTemplates.DirectiveUsage.InvalidVariableLabel'
238+
'HtmlTemplatesInvalidVariableLabel'
239239
);
240240
}
241241
}
@@ -254,7 +254,7 @@ private function validateDefinedVariables(File $phpcsFile, string $templateText)
254254
'Template @vars comment block is missing a variable used in the template.' . PHP_EOL
255255
. 'Missing variable: ' . $undefinedVariable,
256256
null,
257-
'HtmlTemplates.DirectiveUsage.UndefinedVariable'
257+
'HtmlTemplatesUndefinedVariable'
258258
);
259259
}
260260
}

‎Magento2/Sniffs/Legacy/DiConfigSniff.php

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento2\Sniffs\Legacy;
8+
9+
use PHP_CodeSniffer\Files\File;
10+
use PHP_CodeSniffer\Sniffs\Sniff;
11+
12+
class DiConfigSniff implements Sniff
13+
{
14+
private const WARNING_CODE = 'FoundObsoleteAttribute';
15+
16+
/**
17+
* @var string[] Associative array containing the obsolete nodes and the message to display when they are found.
18+
*/
19+
private $obsoleteDiNodes = [
20+
'<param' => 'The <param> node is obsolete. Instead, use the <argument name="..." xsi:type="...">',
21+
'<instance' => 'The <instance> node is obsolete. Instead, use the <argument name="..." xsi:type="object">',
22+
'<array' => 'The <array> node is obsolete. Instead, use the <argument name="..." xsi:type="array">',
23+
'<item key=' => 'The <item key="..."> node is obsolete. Instead, use the <item name="..." xsi:type="...">',
24+
'<value' => 'The <value> node is obsolete. Instead, provide the actual value as a text literal.'
25+
];
26+
27+
/**
28+
* @inheritDoc
29+
*/
30+
public function register(): array
31+
{
32+
return [
33+
T_INLINE_HTML
34+
];
35+
}
36+
37+
/**
38+
* @inheritDoc
39+
*/
40+
public function process(File $phpcsFile, $stackPtr)
41+
{
42+
$lineContent = $phpcsFile->getTokensAsString($stackPtr, 1);
43+
44+
foreach ($this->obsoleteDiNodes as $element => $message) {
45+
if (strpos($lineContent, $element) !== false) {
46+
$phpcsFile->addWarning(
47+
$message,
48+
$stackPtr,
49+
self::WARNING_CODE
50+
);
51+
}
52+
}
53+
}
54+
}

‎Magento2/Sniffs/Less/AvoidIdSniff.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ class AvoidIdSniff implements Sniff
5151
T_PLUS,
5252
T_NS_SEPARATOR,
5353
T_LNUMBER,
54+
T_BITWISE_NOT
5455
];
5556

5657
/**

‎Magento2/Sniffs/Less/ClassNamingSniff.php

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@
2121
*/
2222
class ClassNamingSniff implements Sniff
2323
{
24-
25-
const STRING_HELPER_CLASSES_PREFIX = '_';
26-
27-
const STRING_ALLOWED_UNDERSCORES = '__';
24+
private const STRING_HELPER_CLASSES_PREFIX = '_';
2825

2926
/**
3027
* A list of tokenizers this sniff supports.
@@ -62,7 +59,19 @@ public function process(File $phpcsFile, $stackPtr)
6259

6360
$className = $tokens[$stackPtr + 1]['content'];
6461
if (preg_match_all('/[^a-z0-9\-_]/U', $className, $matches)) {
65-
$phpcsFile->addError('Class name contains not allowed symbols', $stackPtr, 'NotAllowedSymbol', $matches);
62+
$phpcsFile->addError(
63+
'CSS class name does not follow class naming requirements: %s',
64+
$stackPtr,
65+
'NotAllowedSymbol',
66+
[implode("", $matches[0])]
67+
);
68+
}
69+
if (strpos($className, self::STRING_HELPER_CLASSES_PREFIX, 2) !== false) {
70+
$phpcsFile->addError(
71+
'CSS class names should be separated with "-" (dash) instead of "_" (underscore)',
72+
$stackPtr,
73+
'NotAllowedSymbol'
74+
);
6675
}
6776
}
6877
}

‎Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,13 @@ public function process(File $phpcsFile, $stackPtr)
5757
$closingCurly = $phpcsFile->findNext(T_CLOSE_USE_GROUP, ($next + 1));
5858
do {
5959
$next = $phpcsFile->findNext(Tokens::$emptyTokens, ($next + 1), $closingCurly, true);
60-
$groupedAsContent = $baseUse. $tokens[$next]['content'];
61-
$next = $phpcsFile->findNext(T_COMMA, ($next + 1), $closingCurly);
62-
if (strpos($groupedAsContent, $this->prohibitNamespace) !== false) {
63-
$phpcsFile->addWarning($this->warningMessage, $stackPtr, $this->warningCode);
64-
return;
60+
if ($next !== false) {
61+
$groupedAsContent = $baseUse. $tokens[$next]['content'];
62+
$next = $phpcsFile->findNext(T_COMMA, ($next + 1), $closingCurly);
63+
if (strpos($groupedAsContent, $this->prohibitNamespace) !== false) {
64+
$phpcsFile->addWarning($this->warningMessage, $stackPtr, $this->warningCode);
65+
return;
66+
}
6567
}
6668
} while ($next !== false);
6769
}

‎Magento2/Sniffs/Security/InsecureFunctionSniff.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,12 @@ class InsecureFunctionSniff extends ForbiddenFunctionsSniff
3333
'srand' => null,
3434
'mt_srand' => null,
3535
'mt_rand' => 'random_int',
36+
// Custom Rules - MTS-2096
37+
'eval' => null,
38+
'proc_nice' => null,
39+
'proc_open' => null,
40+
'proc_close' => null,
41+
'proc_terminate' => null,
42+
'proc_get_status' => null,
3643
];
3744
}

0 commit comments

Comments
 (0)