Skip to content

Commit

Permalink
fix: skip processing of Squiz.Commenting.FunctionComment for @inheritdoc
Browse files Browse the repository at this point in the history


It's supported to use {@inheritdoc}. Add support of @inheritdoc (w/o brackets).
Original PR number - squizlabs#3051

Closes squizlabs#2770
  • Loading branch information
PavelSavushkinMix committed Jan 17, 2022
1 parent 498a939 commit 7ed987a
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/Standards/Squiz/Sniffs/Commenting/FunctionCommentSniff.php
Expand Up @@ -737,7 +737,7 @@ protected function checkSpacingAfterParamName(File $phpcsFile, $param, $maxVar,
* in the stack passed in $tokens.
* @param int $commentStart The position in the stack where the comment started.
*
* @return boolean TRUE if the docblock contains only {@inheritdoc} (case-insensitive).
* @return boolean TRUE if the docblock contains {@inheritdoc} or @inheritdoc (case-insensitive).
*/
protected function checkInheritdoc(File $phpcsFile, $stackPtr, $commentStart)
{
Expand All @@ -751,12 +751,12 @@ protected function checkInheritdoc(File $phpcsFile, $stackPtr, $commentStart)
for ($i = $commentStart; $i <= $tokens[$commentStart]['comment_closer']; $i++) {
if (in_array($tokens[$i]['code'], $allowedTokens) === false) {
$trimmedContent = strtolower(trim($tokens[$i]['content']));
$allowedInheritDocs = [
'{@inheritdoc}',
'@inheritdoc',
];

if ($trimmedContent === '{@inheritdoc}') {
return true;
} else {
return false;
}
return in_array($trimmedContent, $allowedInheritDocs);
}
}

Expand Down

0 comments on commit 7ed987a

Please sign in to comment.