magento
diff --git a/‎Magento2/Sniffs/Files/LineLengthSniff.php
Copy file name to clipboardExpand all lines: Magento2/Sniffs/Files/LineLengthSniff.php
+21-3Lines changed: 21 additions & 3 deletions b/‎Magento2/Sniffs/Files/LineLengthSniff.php
Copy file name to clipboardExpand all lines: Magento2/Sniffs/Files/LineLengthSniff.php
+21-3Lines changed: 21 additions & 3 deletions
diff --git a/‎Magento2/Tests/Files/LineLengthUnitTest.inc
Copy file name to clipboardExpand all lines: Magento2/Tests/Files/LineLengthUnitTest.inc
+1Lines changed: 1 addition & 0 deletions b/‎Magento2/Tests/Files/LineLengthUnitTest.inc
Copy file name to clipboardExpand all lines: Magento2/Tests/Files/LineLengthUnitTest.inc
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎Magento2/Tests/Files/LineLengthUnitTest.php
Copy file name to clipboardExpand all lines: Magento2/Tests/Files/LineLengthUnitTest.php
+1Lines changed: 1 addition & 0 deletions b/‎Magento2/Tests/Files/LineLengthUnitTest.php
Copy file name to clipboardExpand all lines: Magento2/Tests/Files/LineLengthUnitTest.php
+1Lines changed: 1 addition & 0 deletions
@@ -27,6 +27,20 @@ class LineLengthSniff extends FilesLineLengthSniff
      */
     protected $lastLineRegExp = '~__\(.+\)|\bPhrase\(.+\)~';
 
+    /**
+     * Regular expression for finding a __ keyword added in the translation string.
+     *
+     * @var string
+     */
+    protected $underscoreKeywordRegExp = '~\'[^\']+\'(*SKIP)(*F)| __~';
+
+    /**
+     * Regular expression for finding a Phrase keyword added in the translation string.
+     *
+     * @var string
+     */
+    protected $phaseKeywordRegExp = '~\'[^\']+\'(*SKIP)(*F)| \bPhrase~';
+
     /**
      * Having the next-to-last line content allows to ignore long lines in case of translations.
      *
@@ -77,10 +91,14 @@ protected function checkLineLength($phpcsFile, $tokens, $stackPtr)
      */
     protected function doesPreviousLineContainTranslationString()
     {
-        $lastLineMatch       = preg_match($this->lastLineRegExp, $this->lastLineContent) !== 0;
-        $nextToLastLineMatch = preg_match($this->nextToLastLineRegexp, $this->nextToLastLineContent) !== 0;
+        if (preg_match($this->phaseKeywordRegExp, $this->lastLineContent) == 0
+            || preg_match($this->underscoreKeywordRegExp, $this->lastLineContent) == 0
+        ) {
+            $lastLineMatch       = preg_match($this->lastLineRegExp, $this->lastLineContent) !== 0;
+            $nextToLastLineMatch = preg_match($this->nextToLastLineRegexp, $this->nextToLastLineContent) !== 0;
+            return $lastLineMatch || $nextToLastLineMatch;
+        }
 
-        return $lastLineMatch || $nextToLastLineMatch;
     }
 
     /**
 
@@ -29,3 +29,4 @@ $phraseObjects = [
 $test = '012344567890123445678901234456789012344567890123445678901234456789';
 $test1 = '01234456789012344567890123445678901234456789012344567890123445678901234456789';
 $test2 = '012344567890123445678901234456789012344567890123445678901234456789012344567890123445678901234456789';
+$test3 = "If a string exceeds 120 characters and a part of the string is Phrase('xy'), this would not be caught by the regular expression because it matches any line containing Phrase('xy') or __('xy').";
@@ -20,6 +20,7 @@ public function getErrorList()
         return [
             9 => 1,
             19 => 1,
+            32 => 1,
         ];
     }
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ public function getErrorList()`
`20`	`20`	`return [`
`21`	`21`	`9 => 1,`
`22`	`22`	`19 => 1,`
	`23`	`+ 32 => 1,`
`23`	`24`	`];`
`24`	`25`	`}`
`25`	`26`