Merge branch 'master' into report-memory-improvements

Conflicts:
	package.xml

Author: gsherwood

CodeSniffer/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php

@@ -260,7 +260,9 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
                 $column = $tokens[$firstToken]['column'];
 
                 // Ignore the token for indentation if it's in the ignore list.
-                if (in_array($tokens[$firstToken]['code'], $this->ignoreIndentationTokens)) {
+                if (in_array($tokens[$firstToken]['code'], $this->ignoreIndentationTokens)
+                    || in_array($tokens[$firstToken]['type'], $this->ignoreIndentationTokens)
+                ) {
                     continue;
                 }
 

CodeSniffer/Standards/PSR2/ruleset.xml

@@ -56,7 +56,11 @@
  <!-- 2.4 Indenting -->
 
  <!-- Code MUST use an indent of 4 spaces, and MUST NOT use tabs for indenting. -->
- <rule ref="Generic.WhiteSpace.ScopeIndent"/>
+ <rule ref="Generic.WhiteSpace.ScopeIndent">
+  <properties>
+   <property name="ignoreIndentationTokens" type="array" value="T_COMMENT,T_DOC_COMMENT"/>
+  </properties>
+ </rule>
  <rule ref="Generic.WhiteSpace.DisallowTabIndent"/>
 
  <!-- 2.5 Keywords and True/False/Null -->

README.markdown

@@ -19,7 +19,13 @@ The easiest way to install PHP\_CodeSniffer is to use the PEAR installer. This w
 
     pear install PHP_CodeSniffer
 
-If you use [Composer](http://getcomposer.org/), include a dependency for `squizlabs/php_codesniffer` in your `composer.json` file. For example:
+If you prefer using [Composer](http://getcomposer.org/) you can easily install PHP_CodeSniffer system-wide with the following command:
+
+    composer global require 'squizlabs/php_codesniffer=*'
+
+Make sure you have `~/.composer/vendor/bin/` in your PATH.
+
+Or alternatively, include a dependency for `squizlabs/php_codesniffer` in your `composer.json` file. For example:
 
     {
         "require": {

package.xml

@@ -26,6 +26,10 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </stability>
  <license uri="https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt">BSD 3-Clause License</license>
  <notes>
+  - Generic ScopeIndentSniff now allows for ignored tokens to be set via ruleset.xml files
+    -- E.g., to ignore comments, override a property using:
+    -- name="ignoreIndentationTokens" type="array" value="T_COMMENT,T_DOC_COMMENT"
+  - PSR2 standard now ignores comments when checking indentation rules
   - Fixed bug #20093 : Bug with ternary operator token
   - Fixed bug #20097 : CLI.php throws error in php 5.2
   - Fixed bug #20100 : incorrect Function mysql() has been deprecated report