Merge branch 'develop' of https://github.com/magento/magento-coding-standard into AC-667-Fix

Author: jcuerdo

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/Sniffs/Legacy/InstallUpgradeSniff.php

@@ -64,7 +64,10 @@ public function process(File $phpcsFile, $stackPtr)
             }
         }
 
-        if (preg_match('/(sql|data)/', $fileInfo->getPath()) === 1) {
+        $folders = array_filter(explode('/', $fileInfo->getPath()));
+        $folderName = array_pop($folders);
+
+        if ($folderName === 'data' || $folderName === 'sql') {
             $phpcsFile->addError(
                 $fileInfo->getFilename()." is in an invalid directory ".$fileInfo->getPath().":\n"
                 . "- Create a data patch within module's Setup/Patch/Data folder for data upgrades.\n"

Magento2/Tests/Commenting/ClassPropertyPHPDocFormattingUnitTest.inc

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

Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/another-data-folder/file3.inc

@@ -0,0 +1 @@
+<?php

Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/another-sql-folder/file4.inc

@@ -0,0 +1 @@
+<?php

Magento2/ruleset.xml

@@ -686,4 +686,9 @@
     <rule ref="Internal.NoCodeFound">
         <severity>0</severity>
     </rule>
+    <!-- TODO: AC-1314 -->
+    <rule ref="Magento2.Legacy">
+        <exclude name="Magento2.Legacy.Copyright"/>
+        <exclude name="Magento2.Legacy.CopyrightAnotherExtensionsFiles"/>
+    </rule>
 </ruleset>

composer.json

@@ -6,7 +6,7 @@
         "AFL-3.0"
     ],
     "type": "phpcodesniffer-standard",
-    "version": "10",
+    "version": "12",
     "require": {
         "php": ">=7.3",
         "squizlabs/php_codesniffer": "^3.6",