Merge branch 'master' into report-memory-improvements

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.

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

@@ -45,7 +45,7 @@ public function getErrorList()
         return array(
                 31 => 1,
                 34 => 1,
-                54 => 1,
+                68 => 1,
                );
 
     }//end getErrorList()

CodeSniffer/Standards/Squiz/Sniffs/Scope/MethodScopeSniff.php

@@ -64,7 +64,7 @@ protected function processTokenWithinScope(PHP_CodeSniffer_File $phpcsFile, $sta
 
         $modifier = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$scopeModifiers, $stackPtr);
         if (($modifier === false) || ($tokens[$modifier]['line'] !== $tokens[$stackPtr]['line'])) {
-            $error = 'No scope modifier specified for function "%s"';
+            $error = 'Visibility must be declared on method "%s"';
             $data  = array($methodName);
             $phpcsFile->addError($error, $stackPtr, 'Missing', $data);
         }

package.xml

@@ -41,6 +41,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Added Squiz DisallowBooleanStatementSniff to ban boolean operators outside of control structure conditions
   - Coding standard ignore comments can now appear instead doc blocks as well as inline comments
     -- Thanks to Stuart Langley for the patch
+  - Generic LineLengthSniff now ignores SVN URL and Head URL comments
+    -- Thanks to Karl DeBisschop for the patch
   - PEAR MultiLineConditionSniff now has a setting to specify how many spaces code should be indented
     -- Default remains at 4; override the 'indent' setting in a ruleset.xml file to change
     -- Thanks to Szabolcs Sulik for the patch
@@ -62,6 +64,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Squiz ClassFileNameSniff no longer throws errors when checking STDIN
   - Squiz CSS sniffs no longer generate errors for IE filters
   - Squiz LogicalOperatorSpacingSniff now ignores whitespace at the end of a line
+  - Squiz.Scope.MethodScope.Missing error message now mentions 'visibility' instead of 'scope modifier'
+    -- Thanks to Renat Akhmedyanov for the patch
   - The PSR2 standard no longer throws errors for additional spacing after a type hint
   - Fixed cases where code was incorrectly assigned the T_GOTO_LABEL token when used in a complex CASE condition
   - Fixed bug #20026 : Check for multi-line arrays that should be single-line is slightly wrong