Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Respect --basepath configuration option in output #457

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

Respect --basepath configuration option in output #457

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bedbf6e
Adhere to coding standard
fredden Jul 3, 2023
c2efacd
Let PHP_CodeSniffer run sprintf as needed
fredden Jul 3, 2023
6c03b60
Update getFormattedXML() to match its docblock
fredden Jul 3, 2023
880d4f7
Extract common code to new trait
fredden Jul 3, 2023
c688fd3
Remove duplicate code
fredden Jul 3, 2023
a73bafe
Respect basepath configuration option in output
fredden Jul 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Respect basepath configuration option in output
  • Loading branch information
@fredden
fredden committed Sep 26, 2023
commit a73bafef403a234b14c1e217dccbc54b7db41f76
3 changes: 2 additions & 1 deletion Magento2/Sniffs/Legacy/InstallUpgradeSniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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),
]
);
}
Expand Down
3 changes: 2 additions & 1 deletion Magento2/Sniffs/Legacy/ParseXMLTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

use DOMDocument;
use PHP_CodeSniffer\Files\File;
use PHP_CodeSniffer\Util\Common;

trait ParseXMLTrait
{
Expand All @@ -32,7 +33,7 @@ private function getFormattedXML(File $phpcsFile)
0,
'WrongXML',
[
$phpcsFile->getFilename(),
Common::stripBasepath($phpcsFile->getFilename(), $phpcsFile->config->basepath),
]
);
return false;
Expand Down
3 changes: 2 additions & 1 deletion Magento2/Sniffs/Legacy/RestrictedCodeSniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'],
]
);
Expand Down