Respect basepath configuration option in output

magento · Jul 3, 2023 · 9c2ac84 · 9c2ac84
1 parent ffd3fb4
commit 9c2ac84
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php b/Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
@@ -11,6 +11,7 @@
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Util\Common;
 use SplFileInfo;
 
 class InstallUpgradeSniff implements Sniff
@@ -108,7 +109,7 @@ public function process(File $phpcsFile, $stackPtr)
                 self::INVALID_DIRECTORIES_ERROR_CODES[$folderName],
                 [
                     $fileInfo->getFilename(),
-                    $fileInfo->getPath(),
+                    Common::stripBasepath($fileInfo->getPath(), $phpcsFile->config->basepath),
                 ]
             );
         }

diff --git a/Magento2/Sniffs/Legacy/ParseXMLTrait.php b/Magento2/Sniffs/Legacy/ParseXMLTrait.php
@@ -9,6 +9,7 @@
 
 use DOMDocument;
 use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Common;
 
 trait ParseXMLTrait
 {
@@ -34,7 +35,7 @@ private function getFormattedXML(File $phpcsFile)
                 0,
                 self::ERROR_CODE_XML,
                 [
-                    $phpcsFile->getFilename(),
+                    Common::stripBasepath($phpcsFile->getFilename(), $phpcsFile->config->basepath),
                 ]
             );
             return false;

diff --git a/Magento2/Sniffs/Legacy/RestrictedCodeSniff.php b/Magento2/Sniffs/Legacy/RestrictedCodeSniff.php
@@ -11,6 +11,7 @@
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Util\Common;
 
 /**
  * Tests to find usage of restricted code
@@ -76,7 +77,7 @@ public function process(File $phpcsFile, $stackPtr)
                 $this->classes[$token]['warning_code'],
                 [
                     $token,
-                    $phpcsFile->getFilename(),
+                    Common::stripBasepath($phpcsFile->getFilename(), $phpcsFile->config->basepath),
                     $this->classes[$token]['replacement'],
                 ]
             );