magento#121 HelperInTemplate Rule porposal amends

Author: diazwatson

Magento2/Sniffs/Templates/ThisInTemplateSniff.php

@@ -14,13 +14,6 @@
  */
 class ThisInTemplateSniff implements Sniff
 {
-    /**
-     * String representation of warning.
-     *
-     * @var string
-     */
-    protected $warningMessageFoundHelper = 'Usage of helpers in templates is discouraged.';
-
     /**
      * Warning violation code.
      *
@@ -33,7 +26,7 @@ class ThisInTemplateSniff implements Sniff
      *
      * @var string
      */
-    protected $warningMessageFoundThis = 'Usage of $this in template files is deprecated.';
+    protected $warningMessageFoundHelper = 'Usage of helpers in templates is discouraged.';
 
     /**
      * Warning violation code.
@@ -42,12 +35,22 @@ class ThisInTemplateSniff implements Sniff
      */
     protected $warningCodeFoundThis = 'FoundThis';
 
+    /**
+     * String representation of warning.
+     *
+     * @var string
+     */
+    protected $warningMessageFoundThis = 'Usage of $this in template files is deprecated.';
+
     /**
      * @inheritdoc
      */
     public function register()
     {
-        return [T_VARIABLE];
+        return [
+            T_VARIABLE,
+            T_STRING,
+        ];
     }
 
     /**
@@ -59,7 +62,7 @@ public function process(File $phpcsFile, $stackPtr)
         if ($tokens[$stackPtr]['content'] === '$this') {
             $phpcsFile->addWarning($this->warningMessageFoundThis, $stackPtr, $this->warningCodeFoundThis);
         }
-        if ($tokens[$stackPtr]['content'] === 'helper(') {
+        if ($tokens[$stackPtr]['content'] === 'helper') {
             $phpcsFile->addWarning($this->warningMessageFoundHelper, $stackPtr, $this->warningCodeFoundHelper);
         }
     }

Magento2/Tests/Templates/ThisInTemplateUnitTest.php

@@ -28,7 +28,7 @@ public function getWarningList()
         return [
             3 => 2,
             4 => 1,
-            5 => 1,
+            5 => 2,
         ];
     }
 }