MC-18816: Impelement an better check for ThrowCatchSniff

roettigl · roettigl · commit 73ad14a7a59f · 2019-08-01T17:01:02.000+02:00
diff --git a/Magento2/Sniffs/Exceptions/ThrowCatchSniff.php b/Magento2/Sniffs/Exceptions/ThrowCatchSniff.php
@@ -78,7 +78,7 @@ public function process(File $phpcsFile, $stackPtr)
             }
         } while (isset($tokens[$nextToken]['scope_closer']) === true);
 
-        if (empty($catchClassName)) {
+        if (empty($catchClassNames)) {
             return; // is not relevant no catch found
         }
 
@@ -101,7 +101,9 @@ private function getFullClassName(array $tokens, int $startPos)
     {
         $fullName = "";
         $endOfClassName = [T_SEMICOLON => 0, T_CLOSE_PARENTHESIS => 0];
-        for ($i = $startPos; $i <= count($tokens); $i++) {
+
+        $tokenCount = count($tokens);
+        for ($i = $startPos; $i <= $tokenCount; $i++) {
             $type = $tokens[$i]['code'];
 
             if ($type === T_STRING || $type === T_NS_SEPARATOR) {

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public function process(File $phpcsFile, $stackPtr)`
`78`	`78`	`}`
`79`	`79`	`} while (isset($tokens[$nextToken]['scope_closer']) === true);`
`80`	`80`
`81`		`- if (empty($catchClassName)) {`
	`81`	`+ if (empty($catchClassNames)) {`
`82`	`82`	`return; // is not relevant no catch found`
`83`	`83`	`}`
`84`	`84`
`@@ -101,7 +101,9 @@ private function getFullClassName(array $tokens, int $startPos)`
`101`	`101`	`{`
`102`	`102`	`$fullName = "";`
`103`	`103`	`$endOfClassName = [T_SEMICOLON => 0, T_CLOSE_PARENTHESIS => 0];`
`104`		`- for ($i = $startPos; $i <= count($tokens); $i++) {`
	`104`	`+`
	`105`	`+ $tokenCount = count($tokens);`
	`106`	`+ for ($i = $startPos; $i <= $tokenCount; $i++) {`
`105`	`107`	`$type = $tokens[$i]['code'];`
`106`	`108`
`107`	`109`	`if ($type === T_STRING \|\| $type === T_NS_SEPARATOR) {`