🔧 Avoid duplicate

Author: Vincent Langlet

Symfony3Custom/Sniffs/Commenting/FunctionCommentSniff.php

@@ -57,6 +57,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
 
             if ($commentRequired) {
                 $phpcsFile->addError('Missing function doc comment', $stackPtr, 'Missing');
+
                 return;
             } else {
                 // The comment may not be required, we'll see in next checks
@@ -69,7 +70,11 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
         $commentStart = null;
         if ($hasComment) {
             if ($tokens[$commentEnd]['code'] === T_COMMENT) {
-                $phpcsFile->addError('You must use "/**" style comments for a function comment', $stackPtr, 'WrongStyle');
+                $phpcsFile->addError(
+                    'You must use "/**" style comments for a function comment',
+                    $stackPtr,
+                    'WrongStyle'
+                );
 
                 return;
             }
@@ -192,7 +197,7 @@ protected function processWhitespace(
         $found = $startLine - $prevLine - 1;
 
         // Skip for class opening
-        if ($found !== 1 && !($found === 0 && $tokens[$before]['type'] === 'T_OPEN_CURLY_BRACKET')) {
+        if ($found < 1 && !($found === 0 && $tokens[$before]['type'] === 'T_OPEN_CURLY_BRACKET')) {
             if ($found < 0) {
                 $found = 0;
             }
@@ -241,8 +246,6 @@ protected function processWhitespace(
      */
     protected function isInheritDoc(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
     {
-        $tokens = $phpcsFile->getTokens();
-
         $start = $phpcsFile->findPrevious(T_DOC_COMMENT_OPEN_TAG, $stackPtr - 1);
         $end = $phpcsFile->findNext(T_DOC_COMMENT_CLOSE_TAG, $start);
 
@@ -267,8 +270,6 @@ protected function processParams(
         $stackPtr,
         $commentStart
     ) {
-        $tokens = $phpcsFile->getTokens();
-
         if ($this->isInheritDoc($phpcsFile, $stackPtr)) {
             return;
         }

Symfony3Custom/Tests/Commenting/FunctionCommentUnitTest.inc.fixed

@@ -26,6 +26,7 @@ function functionTest3($test)
     return 42;
 }
 
+
 /**
  * @param array $tab Test Argument
  */
@@ -54,6 +55,7 @@ class classToTestIndentation
         return 42;
     }
 
+
     /**
      * @param array $tab Test Argument
      */

Symfony3Custom/Tests/Commenting/FunctionCommentUnitTest.php

@@ -21,10 +21,8 @@ public function getErrorList()
         return array(
             5 => 1,
             10 => 2,
-            29 => 1,
             43 => 1,
             48 => 2,
-            57 => 1,
             76 => 2,
             83 => 1,
             93 => 1,