Merge branch 'master' into report-memory-improvements

Conflicts:
	package.xml

Author: gsherwood

CodeSniffer/File.php

@@ -422,7 +422,7 @@ public function start($contents=null)
         // token, get them to process it.
         foreach ($this->_tokens as $stackPtr => $token) {
             // Check for ignored lines.
-            if ($token['code'] === T_COMMENT) {
+            if ($token['code'] === T_COMMENT || $token['code'] === T_DOC_COMMENT) {
                 if (strpos($token['content'], '@codingStandardsIgnoreStart') !== false) {
                     $ignoring = true;
                 } else if (strpos($token['content'], '@codingStandardsIgnoreEnd') !== false) {

package.xml

@@ -39,6 +39,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Fixed problem where some file content could be ignored when checking STDIN
   - Version information is now printed when installed via composer or run from a Git clone (request #20050)
   - 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
   - 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

tests/Core/ErrorSuppressionTest.php

@@ -148,6 +148,18 @@ public function testSuppressFile()
         $this->assertEquals(0, $numWarnings);
         $this->assertEquals(0, count($warnings));
 
+        // Process with a Doc Block suppression.
+        $content = '<?php '.PHP_EOL.'/* @codingStandardsIgnoreFile */'.PHP_EOL.'//TODO: write some code';
+        $phpcs->processFile('suppressionTest.php', $content);
+
+        $files = $phpcs->getFiles();
+        $file  = $files[1];
+
+        $warnings    = $file->getWarnings();
+        $numWarnings = $file->getWarningCount();
+        $this->assertEquals(0, $numWarnings);
+        $this->assertEquals(0, count($warnings));
+
     }//end testSuppressFile()