Merge pull request #127 from konarshankar07/75_linelengthsniff_keyword

Fixed issue in line length sniff for phrase and __ keyword

Author: lenaorobei

Magento2/Sniffs/Files/LineLengthSniff.php

@@ -27,7 +27,7 @@ public function register()
     public function process(File $phpcsFile, $stackPtr)
     {
         $phpcsFile->addError(
-            // phpcs:ignore Magento2.Files.LineLength.MaxExceeded
+            // phpcs:ignore Generic.Files.LineLength
             'Final keyword is prohibited in Magento. It decreases extensibility and is not compatible with plugins and proxies.',
             $stackPtr,
             'FoundFinal'

Magento2/Sniffs/PHP/FinalImplementationSniff.php

@@ -23,7 +23,7 @@ class LanguageConstructSniff implements Sniff
     /**
      * String representation of backtick error.
      *
-     * phpcs:disable Magento2.Files.LineLength.MaxExceeded
+     * phpcs:disable Generic.Files.LineLength
      *
      * @var string
      */

Magento2/Sniffs/Security/LanguageConstructSniff.php

@@ -17,7 +17,7 @@ class ExecutableRegExSniff implements Sniff
     /**
      * String representation of error.
      *
-     * phpcs:disable Magento2.Files.LineLength.MaxExceeded
+     * phpcs:disable Generic.Files.LineLength
      *
      * @var string
      */

Magento2/Sniffs/Strings/ExecutableRegExSniff.php

@@ -172,11 +172,6 @@
         <exclude-pattern>*/Test/*</exclude-pattern>
         <exclude-pattern>*Test.php</exclude-pattern>
     </rule>
-    <rule ref="Magento2.Files.LineLength">
-        <severity>8</severity>
-        <type>warning</type>
-        <exclude-pattern>*.phtml</exclude-pattern>
-    </rule>
     <rule ref="Magento2.NamingConvention.InterfaceName">
         <severity>8</severity>
         <type>warning</type>
@@ -306,6 +301,14 @@
         <severity>6</severity>
         <type>warning</type>
     </rule>
+    <rule ref="Generic.Files.LineLength">
+        <properties>
+            <property name="lineLimit" value="120"/>
+            <property name="absoluteLineLimit" value="0"/>
+        </properties>
+        <severity>6</severity>
+        <type>warning</type>
+    </rule>
     <rule ref="Generic.Formatting.DisallowMultipleStatements">
         <severity>6</severity>
         <type>warning</type>

Magento2/Tests/Files/LineLengthUnitTest.inc

@@ -12,7 +12,7 @@ You can achieve this by adding the following to your project's `composer.json`:
 ````
 "scripts": {
     "post-install-cmd": [
-      "([ $COMPOSER_DEV_MODE -eq 1 ] && vendor/bin/phpcs --config-set installed_paths ../../magento/magento-coding-standard/) || true"
+      "([ $COMPOSER_DEV_MODE -eq 0 ] || vendor/bin/phpcs --config-set installed_paths ../../magento/magento-coding-standard/)"
     ],
     "post-update-cmd": [
       "([ $COMPOSER_DEV_MODE -eq 0 ] || vendor/bin/phpcs --config-set installed_paths ../../magento/magento-coding-standard/)"