Skip to content

Fix DirectThrowSniff false positive #331

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

Closed
wants to merge 5 commits into from
Closed

Fix DirectThrowSniff false positive #331

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
54ca471
Fix DirectThrowSniff false positive
rmsundar1 Nov 10, 2021
483de85
fix custom exception gives false positive with DirectThrowSniff
rmsundar1 Nov 11, 2021
0994f92
fix coding standard
rmsundar1 Nov 30, 2021
b9c0aed
Apply suggestions from code review
rmsundar1 Dec 15, 2021
38c7997
Fix error
rmsundar1 Dec 10, 2021
File filter

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
Apply suggestions from code review 
Co-authored-by: Sergio Vera <sergio.vera@gmail.com>
  • Loading branch information
@rmsundar1 @svera
rmsundar1 and svera authored Dec 15, 2021
commit b9c0aed441edd4a7164862934586a13c0535c62f
20 changes: 18 additions & 2 deletions Magento2/Sniffs/Exceptions/DirectThrowSniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,23 @@ public function process(File $phpcsFile, $stackPtr)
$exceptionString = 'Exception';
$customExceptionFound = false;
foreach ($tokens as $key => $token) {
if ($token['code'] === T_USE) {
if ($token['code'] !== T_USE) {
continue;
}
$endOfUse = $phpcsFile->findEndOfStatement($key);
$useStatementValue = $this->getFullClassNameAndAlias($tokens, $key, $endOfUse);
// we safely consider use statement has alias will not be a direct exception class
if (!empty($useStatementValue['alias'])) {
continue;
}
if (substr($useStatementValue['name'], 0, strlen($exceptionString)) !== $exceptionString
&& substr($useStatementValue['name'], -strlen($exceptionString)) === $exceptionString
&& $useStatementValue['name'] !== $exceptionString
) {
$customExceptionFound = true;
break;
}
}
$endOfUse = $phpcsFile->findEndOfStatement($key);
$useStatementValue = $this->getFullClassNameAndAlias($tokens, $key, $endOfUse);
//we safely consider use statement has alias will not be a direct exception class
Expand Down Expand Up @@ -84,7 +100,7 @@ public function process(File $phpcsFile, $stackPtr)
* @param int $end
* @return array
*/
private function getFullClassNameAndAlias($tokens, $start, $end)
private function getFullClassNameAndAlias($tokens, $start, $end): array
{
$fullName = $alias = '';
$foundAlias = false;
Expand Down