diff --git a/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php b/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php index a4ff6470..538f80c9 100644 --- a/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php +++ b/Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php @@ -52,6 +52,11 @@ public function process(File $phpcsFile, $stackPtr) { $tokens = $phpcsFile->getTokens(); $commentStartPtr = $phpcsFile->findPrevious(T_DOC_COMMENT_OPEN_TAG, ($stackPtr), 0); + $commentEndPtr = $phpcsFile->findPrevious(T_DOC_COMMENT_CLOSE_TAG, ($stackPtr), 0); + if (!$commentStartPtr) { + $phpcsFile->addError('Comment block is missing', $stackPtr, 'MethodArguments'); + return; + } if ($this->PHPDocFormattingValidator->hasDeprecatedWellFormatted($commentStartPtr, $tokens) !== true) { $phpcsFile->addWarning( @@ -62,11 +67,7 @@ public function process(File $phpcsFile, $stackPtr) 'InvalidDeprecatedTagUsage' ); } - $commentEndPtr = $phpcsFile->findPrevious(T_DOC_COMMENT_CLOSE_TAG, ($stackPtr), 0); - if (!$commentStartPtr) { - $phpcsFile->addError('Comment block is missing', $stackPtr, 'MethodArguments'); - return; - } + $commentCloserPtr = $tokens[$commentStartPtr]['comment_closer']; $functionPtrContent = $tokens[$stackPtr + 2]['content']; if (preg_match('/(?i)__construct/', $functionPtrContent)) {