Skip to content

Respect --basepath configuration option in output #457

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

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
Next Next commit
Update getFormattedXML() to match its docblock
  • Loading branch information
@fredden
fredden committed Sep 26, 2023
commit 6c03b6063026b1a85a406519f80be9e08cb4916f
12 changes: 8 additions & 4 deletions Magento2/Sniffs/Legacy/ClassReferencesInConfigurationFilesSniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,14 @@ private function assertNonFactoryNameModule(File $phpcsFile, array $classes)
*/
private function getFormattedXML(File $phpcsFile)
{
$doc = new DomDocument('1.0');
$doc->formatOutput = true;
$doc->loadXML($phpcsFile->getTokensAsString(0, count($phpcsFile->getTokens())));
return $doc->saveXML();
try {
$doc = new DomDocument('1.0');
$doc->formatOutput = true;
$doc->loadXML($phpcsFile->getTokensAsString(0, count($phpcsFile->getTokens())));
return $doc->saveXML();
} catch (\Exception $e) {
return false;
}
}

/**
Expand Down
12 changes: 8 additions & 4 deletions Magento2/Sniffs/Legacy/LayoutSniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,10 +272,14 @@ private function testObsoleteReferences(SimpleXMLElement $layout, File $phpcsFil
*/
private function getFormattedXML(File $phpcsFile)
{
$doc = new DomDocument('1.0');
$doc->formatOutput = true;
$doc->loadXML($phpcsFile->getTokensAsString(0, count($phpcsFile->getTokens())));
return $doc->saveXML();
try {
$doc = new DomDocument('1.0');
$doc->formatOutput = true;
$doc->loadXML($phpcsFile->getTokensAsString(0, count($phpcsFile->getTokens())));
return $doc->saveXML();
} catch (\Exception $e) {
return false;
}
}

/**
Expand Down
12 changes: 8 additions & 4 deletions Magento2/Sniffs/Legacy/ModuleXMLSniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,13 @@ public function process(File $phpcsFile, $stackPtr)
*/
private function getFormattedXML(File $phpcsFile)
{
$doc = new DomDocument('1.0');
$doc->formatOutput = true;
$doc->loadXML($phpcsFile->getTokensAsString(0, 999999));
return $doc->saveXML();
try {
$doc = new DomDocument('1.0');
$doc->formatOutput = true;
$doc->loadXML($phpcsFile->getTokensAsString(0, count($phpcsFile->getTokens())));
return $doc->saveXML();
} catch (\Exception $e) {
return false;
}
}
}
12 changes: 8 additions & 4 deletions Magento2/Sniffs/Legacy/ObsoleteAclSniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,13 @@ public function process(File $phpcsFile, $stackPtr)
*/
private function getFormattedXML(File $phpcsFile)
{
$doc = new DomDocument('1.0');
$doc->formatOutput = true;
$doc->loadXML($phpcsFile->getTokensAsString(0, 999999));
return $doc->saveXML();
try {
$doc = new DomDocument('1.0');
$doc->formatOutput = true;
$doc->loadXML($phpcsFile->getTokensAsString(0, count($phpcsFile->getTokens())));
return $doc->saveXML();
} catch (\Exception $e) {
return false;
}
}
}
12 changes: 8 additions & 4 deletions Magento2/Sniffs/Legacy/ObsoleteConfigNodesSniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,14 @@ public function process(File $phpcsFile, $stackPtr)
*/
private function getFormattedXML(File $phpcsFile)
{
$doc = new DomDocument('1.0');
$doc->formatOutput = true;
$doc->loadXML($phpcsFile->getTokensAsString(0, 999999));
return $doc->saveXML();
try {
$doc = new DomDocument('1.0');
$doc->formatOutput = true;
$doc->loadXML($phpcsFile->getTokensAsString(0, count($phpcsFile->getTokens())));
return $doc->saveXML();
} catch (\Exception $e) {
return false;
}
}

/**
Expand Down
12 changes: 8 additions & 4 deletions Magento2/Sniffs/Legacy/ObsoleteMenuSniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,13 @@ public function process(File $phpcsFile, $stackPtr)
*/
private function getFormattedXML(File $phpcsFile)
{
$doc = new DomDocument('1.0');
$doc->formatOutput = true;
$doc->loadXML($phpcsFile->getTokensAsString(0, 999999));
return $doc->saveXML();
try {
$doc = new DomDocument('1.0');
$doc->formatOutput = true;
$doc->loadXML($phpcsFile->getTokensAsString(0, count($phpcsFile->getTokens())));
return $doc->saveXML();
} catch (\Exception $e) {
return false;
}
}
}
12 changes: 8 additions & 4 deletions Magento2/Sniffs/Legacy/ObsoleteSystemConfigurationSniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,13 @@ private function invalidXML(File $phpcsFile, int $stackPtr): void
*/
private function getFormattedXML(File $phpcsFile)
{
$doc = new DomDocument('1.0');
$doc->formatOutput = true;
$doc->loadXML($phpcsFile->getTokensAsString(0, 999999));
return $doc->saveXML();
try {
$doc = new DomDocument('1.0');
$doc->formatOutput = true;
$doc->loadXML($phpcsFile->getTokensAsString(0, count($phpcsFile->getTokens())));
return $doc->saveXML();
} catch (\Exception $e) {
return false;
}
}
}
12 changes: 8 additions & 4 deletions Magento2/Sniffs/Legacy/WidgetXMLSniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,13 @@ protected function invalidXML(File $phpcsFile, int $stackPtr): void
*/
private function getFormattedXML(File $phpcsFile)
{
$doc = new DomDocument('1.0');
$doc->formatOutput = true;
$doc->loadXML($phpcsFile->getTokensAsString(0, 999999));
return $doc->saveXML();
try {
$doc = new DomDocument('1.0');
$doc->formatOutput = true;
$doc->loadXML($phpcsFile->getTokensAsString(0, count($phpcsFile->getTokens())));
return $doc->saveXML();
} catch (\Exception $e) {
return false;
}
}
}