Merge pull request #77 from magento-commerce/imported-svera-magento-coding-standard-289

[Imported] AC-1339: Detect comment for typed class properties

Author: svera

Magento2/Sniffs/Commenting/ClassPropertyPHPDocFormattingSniff.php

@@ -57,13 +57,17 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
         $tokens = $phpcsFile->getTokens();
 
         $commentEnd = $phpcsFile->findPrevious($this->ignoreTokens, ($stackPtr - 1), null, true);
-        if ($commentEnd === false
+
+        if ($commentEnd !== false && $tokens[$commentEnd]['code'] === T_STRING) {
+            $commentEnd = $phpcsFile->findPrevious($this->ignoreTokens, ($commentEnd - 1), null, true);
+        } elseif ($commentEnd === false
             || ($tokens[$commentEnd]['code'] !== T_DOC_COMMENT_CLOSE_TAG
                 && $tokens[$commentEnd]['code'] !== T_COMMENT)
         ) {
             $phpcsFile->addWarning('Missing PHP DocBlock for class property.', $stackPtr, 'Missing');
             return;
         }
+
         $commentStart = $tokens[$commentEnd]['comment_opener'];
         $foundVar = null;
         foreach ($tokens[$commentStart]['comment_tags'] as $tag) {

Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc

@@ -120,4 +120,9 @@ class correctlyFormattedClassMemberDocBlock
      * @var test
      */
     protected $test;
+
+    /**
+     * @var string
+     */
+    protected string $test;
 }