ruby4406
diff --git a/‎Magento2/Sniffs/Templates/ThisInTemplateSniff.php
Copy file name to clipboardExpand all lines: Magento2/Sniffs/Templates/ThisInTemplateSniff.php
+6-4Lines changed: 6 additions & 4 deletions b/‎Magento2/Sniffs/Templates/ThisInTemplateSniff.php
Copy file name to clipboardExpand all lines: Magento2/Sniffs/Templates/ThisInTemplateSniff.php
+6-4Lines changed: 6 additions & 4 deletions
diff --git a/‎Magento2/Tests/Templates/ThisInTemplateUnitTest.php
Copy file name to clipboardExpand all lines: Magento2/Tests/Templates/ThisInTemplateUnitTest.php
+1-1Lines changed: 1 addition & 1 deletion b/‎Magento2/Tests/Templates/ThisInTemplateUnitTest.php
Copy file name to clipboardExpand all lines: Magento2/Tests/Templates/ThisInTemplateUnitTest.php
+1-1Lines changed: 1 addition & 1 deletion
@@ -60,10 +60,12 @@ public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
         if ($tokens[$stackPtr]['content'] === '$this') {
-            $phpcsFile->addWarning($this->warningMessageFoundThis, $stackPtr, $this->warningCodeFoundThis);
-        }
-        if ($tokens[$stackPtr]['content'] === 'helper') {
-            $phpcsFile->addWarning($this->warningMessageFoundHelper, $stackPtr, $this->warningCodeFoundHelper);
+            $position = $phpcsFile->findNext(T_STRING, $stackPtr, null, false, 'helper', true);
+            if ($position !== false) {
+                $phpcsFile->addWarning($this->warningMessageFoundHelper, $position, $this->warningCodeFoundHelper);
+            } else {
+                $phpcsFile->addWarning($this->warningMessageFoundThis, $stackPtr, $this->warningCodeFoundThis);
+            }
         }
     }
 }
@@ -25,7 +25,7 @@ public function getWarningList()
         return [
             3 => 2,
             4 => 1,
-            5 => 2,
+            5 => 1,
         ];
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -60,10 +60,12 @@ public function process(File $phpcsFile, $stackPtr)`
`60`	`60`	`{`
`61`	`61`	`$tokens = $phpcsFile->getTokens();`
`62`	`62`	`if ($tokens[$stackPtr]['content'] === '$this') {`
`63`		`- $phpcsFile->addWarning($this->warningMessageFoundThis, $stackPtr, $this->warningCodeFoundThis);`
`64`		`- }`
`65`		`- if ($tokens[$stackPtr]['content'] === 'helper') {`
`66`		`- $phpcsFile->addWarning($this->warningMessageFoundHelper, $stackPtr, $this->warningCodeFoundHelper);`
	`63`	`+ $position = $phpcsFile->findNext(T_STRING, $stackPtr, null, false, 'helper', true);`
	`64`	`+ if ($position !== false) {`
	`65`	`+ $phpcsFile->addWarning($this->warningMessageFoundHelper, $position, $this->warningCodeFoundHelper);`
	`66`	`+ } else {`
	`67`	`+ $phpcsFile->addWarning($this->warningMessageFoundThis, $stackPtr, $this->warningCodeFoundThis);`
	`68`	`+ }`
`67`	`69`	`}`
`68`	`70`	`}`
`69`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public function getWarningList()`
`25`	`25`	`return [`
`26`	`26`	`3 => 2,`
`27`	`27`	`4 => 1,`
`28`		`- 5 => 2,`
	`28`	`+ 5 => 1,`
`29`	`29`	`];`
`30`	`30`	`}`
`31`	`31`	`}`