Merge pull request #651 from PHPCSStandards/feature/phpcs-ruleset-minor-tweak

PHPCS ruleset: allow for trailing annotations

Author: jrfnl

phpcs.xml.dist

@@ -41,7 +41,9 @@
     <rule ref="Squiz.Commenting.EmptyCatchComment"/>
     <rule ref="Squiz.Commenting.InlineComment"/>
     <rule ref="Squiz.Commenting.LongConditionClosingComment"/>
-    <rule ref="Squiz.Commenting.PostStatementComment"/>
+    <rule ref="Squiz.Commenting.PostStatementComment">
+        <exclude name="Squiz.Commenting.PostStatementComment.AnnotationFound"/>
+    </rule>
     <rule ref="Squiz.Commenting.VariableComment"/>
     <rule ref="Squiz.Formatting.OperatorBracket"/>
     <rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing"/>

src/Standards/Generic/Sniffs/ControlStructures/DisallowYodaConditionsSniff.php

@@ -146,7 +146,7 @@ public function isArrayStatic(File $phpcsFile, $arrayToken)
             $end   = $tokens[$arrayToken]['parenthesis_closer'];
         } else {
             // Shouldn't be possible but may happen if external sniffs are using this method.
-            return true;
+            return true; // @codeCoverageIgnore
         }
 
         $staticTokens  = Tokens::$emptyTokens;

src/Standards/Generic/Sniffs/Strings/UnnecessaryHeredocSniff.php

@@ -44,7 +44,7 @@ public function process(File $phpcsFile, $stackPtr)
         if (isset($tokens[$stackPtr]['scope_closer']) === false) {
             // Just to be safe. Shouldn't be possible as in that case, the opener shouldn't be tokenized
             // to T_START_HEREDOC by PHP.
-            return;
+            return; // @codeCoverageIgnore
         }
 
         $closer = $tokens[$stackPtr]['scope_closer'];

src/Util/Help.php

@@ -270,8 +270,7 @@ private function printUsage()
     {
         $command = 'phpcs';
         if (defined('PHP_CODESNIFFER_CBF') === true && PHP_CODESNIFFER_CBF === true) {
-            // @codeCoverageIgnore
-            $command = 'phpcbf';
+            $command = 'phpcbf'; // @codeCoverageIgnore
         }
 
         $this->printCategoryHeader('Usage');