Merge branch 'master' into report-memory-improvements

Author: gsherwood

CodeSniffer/Standards/PEAR/Sniffs/Functions/FunctionCallSignatureSniff.php

@@ -107,15 +107,40 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
         }
 
         // Check if this is a single line or multi-line function call.
-        if ($tokens[$openBracket]['line'] === $tokens[$closeBracket]['line']) {
-            $this->processSingleLineCall($phpcsFile, $stackPtr, $openBracket, $tokens);
-        } else {
+        if ($this->isMultiLineCall($phpcsFile, $stackPtr, $openBracket, $tokens) === true) {
             $this->processMultiLineCall($phpcsFile, $stackPtr, $openBracket, $tokens);
+        } else {
+            $this->processSingleLineCall($phpcsFile, $stackPtr, $openBracket, $tokens);
         }
 
     }//end process()
 
 
+    /**
+     * Processes single-line calls.
+     *
+     * @param PHP_CodeSniffer_File $phpcsFile   The file being scanned.
+     * @param int                  $stackPtr    The position of the current token
+     *                                          in the stack passed in $tokens.
+     * @param int                  $openBracket The position of the opening bracket
+     *                                          in the stack passed in $tokens.
+     * @param array                $tokens      The stack of tokens that make up
+     *                                          the file.
+     *
+     * @return void
+     */
+    public function isMultiLineCall(PHP_CodeSniffer_File $phpcsFile, $stackPtr, $openBracket, $tokens)
+    {
+        $closeBracket = $tokens[$openBracket]['parenthesis_closer'];
+        if ($tokens[$openBracket]['line'] !== $tokens[$closeBracket]['line']) {
+            return true;
+        }
+
+        return false;
+
+    }//end isMultiLineCall();
+
+
     /**
      * Processes single-line calls.
      *

CodeSniffer/Standards/PSR2/ruleset.xml

@@ -115,6 +115,9 @@
    <property name="equalsSpacing" value="1"/>
   </properties>
  </rule>
+ <rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingAfterHint">
+  <severity>0</severity>
+ </rule>
 
  <!-- Method arguments with default values MUST go at the end of the argument list. -->
  <rule ref="PEAR.Functions.ValidDefaultValue"/>

README.markdown

@@ -40,7 +40,7 @@ You can also download the PHP\_CodeSniffer source and run the `phpcs` command di
 Documentation
 -------------
 
-The documentation for PHP\_CodeSniffer is available in the [PEAR manual](http://pear.php.net/manual/en/package.php.php-codesniffer.php).
+The documentation for PHP\_CodeSniffer is available on the [Github wiki](https://github.com/squizlabs/PHP_CodeSniffer/wiki).
 
 Information about upcoming features and releases is available on the [Squiz Labs blog](http://www.squizlabs.com/php-codesniffer).
 

package.xml

@@ -60,6 +60,7 @@ 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
+  - The PSR2 standard no longer throws errors for additional spacing after a type hint
   - Fixed bug #20026 : Check for multi-line arrays that should be single-line is slightly wrong
     -- Adds new error message for single-line arrays that end with a comma
   - Fixed bug #20029 : ForbiddenFunction sniff incorrectly recognizes methods in USE clauses