Skip to content

Commit efaffac

Browse files
committed
Fixed wrongly returning error for valid descriptions
1 parent 1ed4156 commit efaffac

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,6 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
131131
return;
132132
}
133133

134-
if (stripos($tokens[$isShortDescriptionPreviousVar]['content'], $tokens[$string]['content']) !== false) {
135-
$error = 'Short description duplicates class property name.';
136-
$phpcsFile->addWarning($error, $isShortDescriptionPreviousVar, 'AlreadyHaveMeaningfulNameVar');
137-
return;
138-
}
139134
$regularExpression = '/
140135
# Split camelCase "words". Two global alternatives. Either g1of2:
141136
(?<=[a-z]) # Position is after a lowercase,
@@ -145,9 +140,9 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
145140
/x';
146141
$varTagParts = preg_split($regularExpression, $tokens[$string]['content']);
147142

148-
if (stripos($tokens[$isShortDescriptionPreviousVar]['content'], implode(' ', $varTagParts)) === false) {
149-
return;
150-
}
143+
if (stripos($tokens[$isShortDescriptionPreviousVar]['content'], implode('', $varTagParts)) === false) {
144+
return;
145+
}
151146
$error = 'Short description duplicates class property name.';
152147
$phpcsFile->addWarning($error, $isShortDescriptionPreviousVar, 'AlreadyHaveMeaningfulNameVar');
153148
}

0 commit comments

Comments
 (0)