Merge remote-tracking branch 'origin/7.x-2.x' into 8.x-2.x

coder_sniffer/Drupal/Sniffs/Files/TxtFileLineLengthSniff.php

@@ -13,7 +13,7 @@
 /**
  * Drupal_Sniffs_Files_TxtFileLineLengthSniff.
  *
- * Checks all lines in a *.txt file and throws warnings if they are over 80
+ * Checks all lines in a *.txt or *.md file and throws warnings if they are over 80
  * characters in length.
  *
  * @category PHP
@@ -49,7 +49,7 @@ class Drupal_Sniffs_Files_TxtFileLineLengthSniff implements PHP_CodeSniffer_Snif
     public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
     {
         $fileExtension = strtolower(substr($phpcsFile->getFilename(), -3));
-        if ($fileExtension === 'txt') {
+        if ($fileExtension === 'txt' || $fileExtension === '.md') {
             $tokens = $phpcsFile->getTokens();
 
             $content = rtrim($tokens[$stackPtr]['content']);

coder_sniffer/Drupal/ruleset.xml

@@ -7,6 +7,7 @@
   <!-- Usually there is no code in txt or info files, so we suppress warnings about
     PHP short tags and what not. -->
   <exclude-pattern>*.txt</exclude-pattern>
+  <exclude-pattern>*.md</exclude-pattern>
   <exclude-pattern>*.info</exclude-pattern>
  </rule>