Skip to content

Commit 92d0f93

Browse files
committed
Fix static tests.
1 parent bed152b commit 92d0f93

File tree

2 files changed

+27
-9
lines changed

2 files changed

+27
-9
lines changed

dev/tests/static/framework/Magento/Sniffs/Annotation/AnnotationFormatValidator.php

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* See COPYING.txt for license details.
55
*/
66
declare(strict_types=1);
7+
78
namespace Magento\Sniffs\Annotation;
89

910
use PHP_CodeSniffer\Files\File;
@@ -261,14 +262,13 @@ public function validateTagAligningFormat(File $phpcsFile, int $commentStartPtr)
261262
$noAlignmentPositions = [];
262263
$actualPositions = [];
263264
$stackPtr = null;
264-
foreach ($tokens[$commentStartPtr]['comment_tags'] as $position => $tag) {
265+
foreach ($tokens[$commentStartPtr]['comment_tags'] as $tag) {
265266
$content = $tokens[$tag]['content'];
266267
if (preg_match('/^@/', $content) && ($tokens[$tag]['line'] === $tokens[$tag + 2]['line'])) {
267268
$noAlignmentPositions[] = $tokens[$tag + 1]['column'] + 1;
268269
$actualPositions[] = $tokens[$tag + 2]['column'];
269270
$stackPtr = $stackPtr ?? $tag;
270271
}
271-
272272
}
273273

274274
if (!$this->allTagsAligned($actualPositions)
@@ -281,11 +281,26 @@ public function validateTagAligningFormat(File $phpcsFile, int $commentStartPtr)
281281
}
282282
}
283283

284-
private function allTagsAligned(array $actualPositions) {
284+
/**
285+
* Check whether all docblock params are aligned.
286+
*
287+
* @param array $actualPositions
288+
* @return bool
289+
*/
290+
private function allTagsAligned(array $actualPositions)
291+
{
285292
return count(array_unique($actualPositions)) === 1;
286293
}
287294

288-
private function noneTagsAligned(array $actualPositions, array $noAlignmentPositions) {
295+
/**
296+
* Check whether all docblock params are not aligned.
297+
*
298+
* @param array $actualPositions
299+
* @param array $noAlignmentPositions
300+
* @return bool
301+
*/
302+
private function noneTagsAligned(array $actualPositions, array $noAlignmentPositions)
303+
{
289304
return $actualPositions === $noAlignmentPositions;
290305
}
291306

dev/tests/static/framework/Magento/Sniffs/Annotation/MethodArgumentsSniff.php

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ private function getMethodArguments(File $phpcsFile, int $openParenthesisPtr, in
124124
private function getMethodParameters(array $paramDefinitions): array
125125
{
126126
$paramName = [];
127-
for ($i = 0; $i < count($paramDefinitions); $i++) {
127+
$paramCount = count($paramDefinitions);
128+
for ($i = 0; $i < $paramCount; $i++) {
128129
if (isset($paramDefinitions[$i]['paramName'])) {
129130
$paramName[] = $paramDefinitions[$i]['paramName'];
130131
}
@@ -371,10 +372,11 @@ private function validateDuplicateAnnotationDoesnotExists(
371372
$parametersCount = count($paramPointers);
372373
if ($argumentsCount <= $parametersCount && $argumentsCount > 0) {
373374
$duplicateParameters = [];
374-
for ($i = 0; $i < count($paramDefinitions); $i++) {
375+
$paramCount = count($paramDefinitions);
376+
for ($i = 0; $i < $paramCount; $i++) {
375377
if (isset($paramDefinitions[$i]['paramName'])) {
376378
$parameterContent = $paramDefinitions[$i]['paramName'];
377-
for ($j = $i + 1; $j < count($paramDefinitions); $j++) {
379+
for ($j = $i + 1; $j < $paramCount; $j++) {
378380
if (isset($paramDefinitions[$j]['paramName'])
379381
&& $parameterContent === $paramDefinitions[$j]['paramName']
380382
) {
@@ -517,7 +519,7 @@ private function validateMethodParameterAnnotations(
517519
$paramPointers
518520
);
519521
$tokens = $phpcsFile->getTokens();
520-
for ($ptr = 0; $ptr < count($methodArguments); $ptr++) {
522+
for ($ptr = 0; $ptr < $argumentCount; $ptr++) {
521523
if (isset($paramPointers[$ptr])) {
522524
$this->validateArgumentNameInParameterAnnotationExists(
523525
$stackPtr,
@@ -614,7 +616,8 @@ private function validateFormattingConsistency(
614616
$argumentPositions = [];
615617
$commentPositions = [];
616618
$tokens = $phpcsFile->getTokens();
617-
for ($ptr = 0; $ptr < count($methodArguments); $ptr++) {
619+
$argumentCount = count($methodArguments);
620+
for ($ptr = 0; $ptr < $argumentCount; $ptr++) {
618621
if (isset($paramPointers[$ptr])) {
619622
$paramContent = $tokens[$paramPointers[$ptr] + 2]['content'];
620623
$paramDefinition = $paramDefinitions[$ptr];

0 commit comments

Comments
 (0)