AC-669: Fixed directory name checking too lax

svera · svera · commit cbe4ffa9a4ea · 2021-09-28T13:22:13.000+02:00
diff --git a/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php b/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
@@ -64,7 +64,9 @@ public function process(File $phpcsFile, $stackPtr)
             }
         }
 
-        if (preg_match('/(sql|data)/', $fileInfo->getPath()) === 1) {
+        $folderName = basename($fileInfo->getPath());
+
+        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"
diff --git a/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/another-data-folder/file3.inc b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/another-data-folder/file3.inc
@@ -0,0 +1 @@
+<?php
diff --git a/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/another-sql-folder/file4.inc b/Magento2/Tests/Legacy/_files/InstallUpgradeUnitTest/another-sql-folder/file4.inc
@@ -0,0 +1 @@
+<?php

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,9 @@ public function process(File $phpcsFile, $stackPtr)`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`		`- if (preg_match('/(sql\|data)/', $fileInfo->getPath()) === 1) {`
	`67`	`+ $folderName = basename($fileInfo->getPath());`
	`68`	`+`
	`69`	`+ if ($folderName === 'data' \|\| $folderName === 'sql') {`
`68`	`70`	`$phpcsFile->addError(`
`69`	`71`	`$fileInfo->getFilename()." is in an invalid directory ".$fileInfo->getPath().":\n"`
`70`	`72`	`. "- Create a data patch within module's Setup/Patch/Data folder for data upgrades.\n"`