Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: skip processing of Squiz.Commenting.FunctionComment for @inheritDoc #3533

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix: skip processing of Squiz.Commenting.FunctionComment for @inheritDoc #3533

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ed987a
fix: skip processing of Squiz.Commenting.FunctionComment for @inheritDoc
PavelSavushkinMix Jan 17, 2022
0eb04ae
fix: add strict comparison of the inheritdoc values
PavelSavushkinMix Jan 17, 2022
cc2684f
fix: add tests for the inheritDoc w/o brackets
PavelSavushkinMix Jan 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/Standards/Squiz/Sniffs/Commenting/FunctionCommentSniff.php
View file
Open in desktop
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);
PavelSavushkinMix marked this conversation as resolved.
Show resolved Hide resolved
}
}

Expand Down