kovarjan
diff --git a/‎Magento2/Sniffs/Security/XssTemplateSniff.php
Copy file name to clipboardExpand all lines: Magento2/Sniffs/Security/XssTemplateSniff.php
+2-2Lines changed: 2 additions & 2 deletions b/‎Magento2/Sniffs/Security/XssTemplateSniff.php
Copy file name to clipboardExpand all lines: Magento2/Sniffs/Security/XssTemplateSniff.php
+2-2Lines changed: 2 additions & 2 deletions
@@ -147,11 +147,11 @@ public function process(File $phpcsFile, $stackPtr)
     private function findSpecialAnnotation($stackPtr)
     {
         if ($this->tokens[$stackPtr]['code'] === T_ECHO) {
-            $startOfStatement = $this->file->findPrevious(T_OPEN_TAG, $stackPtr);
+            $startOfStatement = $this->file->findPrevious([T_OPEN_TAG, T_SEMICOLON], $stackPtr);
             return $this->file->findPrevious(T_COMMENT, $stackPtr, $startOfStatement);
         }
         if ($this->tokens[$stackPtr]['code'] === T_OPEN_TAG_WITH_ECHO) {
-            $endOfStatement = $this->file->findNext(T_CLOSE_TAG, $stackPtr);
+            $endOfStatement = $this->file->findNext([T_CLOSE_TAG, T_SEMICOLON], $stackPtr);
             return $this->file->findNext(T_COMMENT, $stackPtr, $endOfStatement);
         }
         return false;
Original file line number	Diff line number	Diff line change
`@@ -147,11 +147,11 @@ public function process(File $phpcsFile, $stackPtr)`
`147`	`147`	`private function findSpecialAnnotation($stackPtr)`
`148`	`148`	`{`
`149`	`149`	`if ($this->tokens[$stackPtr]['code'] === T_ECHO) {`
`150`		`- $startOfStatement = $this->file->findPrevious(T_OPEN_TAG, $stackPtr);`
	`150`	`+ $startOfStatement = $this->file->findPrevious([T_OPEN_TAG, T_SEMICOLON], $stackPtr);`
`151`	`151`	`return $this->file->findPrevious(T_COMMENT, $stackPtr, $startOfStatement);`
`152`	`152`	`}`
`153`	`153`	`if ($this->tokens[$stackPtr]['code'] === T_OPEN_TAG_WITH_ECHO) {`
`154`		`- $endOfStatement = $this->file->findNext(T_CLOSE_TAG, $stackPtr);`
	`154`	`+ $endOfStatement = $this->file->findNext([T_CLOSE_TAG, T_SEMICOLON], $stackPtr);`
`155`	`155`	`return $this->file->findNext(T_COMMENT, $stackPtr, $endOfStatement);`
`156`	`156`	`}`
`157`	`157`	`return false;`