Merge branch 'master' of https://github.com/kdebisschop/PHP_CodeSniffer

Author: gsherwood

CodeSniffer/Standards/Generic/Sniffs/Files/LineLengthSniff.php

@@ -114,18 +114,16 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
     protected function checkLineLength(PHP_CodeSniffer_File $phpcsFile, $stackPtr, $lineContent)
     {
         // If the content is a CVS or SVN id in a version tag, or it is
-        // a license tag with a name and URL, there is nothing the
-        // developer can do to shorten the line, so don't throw errors.
-        if (preg_match('|@version[^\$]+\$Id|', $lineContent) !== 0) {
-            return;
-        }
-
-        if (preg_match('|@license|', $lineContent) !== 0) {
+        // a license tag with a name and URL, or it is an SVN URL, there
+        // is nothing the developer can do to shorten the line,
+        // so don't throw errors.
+        $regex = '~@license|@version[^\$]+\$Id|\$(Head)?URL[:\$]~';
+        if (preg_match($regex, $lineContent) !== 0) {
             return;
         }
 
         if (PHP_CODESNIFFER_ENCODING !== 'iso-8859-1') {
-            // Not using the detault encoding, so take a bit more care.
+            // Not using the default encoding, so take a bit more care.
             $lineLength = iconv_strlen($lineContent, PHP_CODESNIFFER_ENCODING);
             if ($lineLength === false) {
                 // String contained invalid characters, so revert to default.

CodeSniffer/Standards/Generic/Tests/Files/LineLengthUnitTest.inc

@@ -44,11 +44,25 @@ echo 'hi';
 <?php
 /**
  * Comments contining CVS IDs can be long, but should be ignored because
- * they cannot be changed by the developer. Same with license URLs.
+ * they cannot be changed by the developer. Same with license URLs. Also
+ * and URL/HeadURL in subversion.
  *
  * @license http://www.freebsd.org/copyright/freebsd-license.html BSD License (2 Clause)
+ *
+ * $URL: file/paths/in/subversion/are/prefixed/by/URL/or/HeadURL/and/can/be/very/long/especially/if/they/are/in/a/branch $
+ * $HeadURL: https://svn.example.org/file/paths/in/subversion/are/prefixed/by/URL/or/HeadURL/and/can/be/very/long/especially/if/they/are/in/a/branch $
  */
+
+// $URL: file/paths/in/subversion/are/prefixed/by/URL/or/HeadURL/and/can/be/very/long/especially/if/they/are/in/a/branch $
+// $HeadURL: https://svn.example.org/file/paths/in/subversion/are/prefixed/by/URL/or/HeadURL/and/can/be/very/long/especially/if/they/are/in/a/branch $
+
+echo '$URL: file/paths/in/subversion/are/prefixed/by/URL/or/HeadURL/and/can/be/very/long/especially/if/they/are/in/a/branch $';
+echo '$HeadURL: https://svn.example.org/file/paths/in/subversion/are/prefixed/by/URL/or/HeadURL/and/can/be/very/long/especially/if/they/are/in/a/branch $'
+
  ?>
 
+    * $URL: file/paths/in/subversion/are/prefixed/by/URL/or/HeadURL/and/can/be/very/long/especially/if/they/are/in/a/branch $
+    * $HeadURL: https://svn.example.org/file/paths/in/subversion/are/prefixed/by/URL/or/HeadURL/and/can/be/very/long/especially/if/they/are/in/a/branch $
+
 <?php
 // This is another really long comment that is going to go well over 100 characters, with no closing php tag after it.