Merge pull request #251 from magento-commerce/imported-fredden-magent…

…o-coding-standard-437

[Imported] Ensure only the relevant docblock is read

Magento2/Sniffs/Annotation/MethodAnnotationStructureSniff.php

@@ -53,7 +53,8 @@ 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) {
+        $prevSemicolon = $phpcsFile->findPrevious(T_SEMICOLON, $stackPtr, $commentEndPtr);
+        if (!$commentStartPtr || $prevSemicolon) {
             $phpcsFile->addError('Comment block is missing', $stackPtr, 'MethodArguments');
             return;
         }

Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.inc

@@ -389,4 +389,12 @@ class MethodAnnotationFixture
     {
         return false;
     }
+
+    /** @var OutputInterface */
+    private $output;
+
+    private function thisMethodHasNoDocBlock(): bool
+    {
+        return false;
+    }
 }

Magento2/Tests/Annotation/MethodAnnotationStructureUnitTest.php

@@ -31,13 +31,15 @@ public function getErrorList()
             185 => 1,
             227 => 1,
             235 => 1,
+            261 => 1,
             268 => 2,
             269 => 1,
             277 => 1,
             278 => 1,
             288 => 1,
             289 => 1,
-            298 => 1
+            298 => 1,
+            396 => 1,
         ];
     }