🐛 Fix FunctionComment fixer

Author: Vincent Langlet

Symfony3Custom/Sniffs/Commenting/FunctionCommentSniff.php

@@ -140,11 +140,11 @@ protected function processWhitespace(
             if ($fix === true) {
                 if ($found > 1) {
                     $phpcsFile->fixer->beginChangeset();
+
                     for ($i = ($before + 1); $i < ($commentStart - 1); $i++) {
                         $phpcsFile->fixer->replaceToken($i, '');
                     }
 
-                    $phpcsFile->fixer->replaceToken($i, $phpcsFile->eolChar);
                     $phpcsFile->fixer->endChangeset();
                 } else {
                     // Try and maintain indentation.

Symfony3Custom/Tests/Commenting/FunctionCommentUnitTest.inc

@@ -7,17 +7,25 @@ function functionTest1($test)
 {
     return 42;
 }
+/**
+ * @return int
+ */
+function functionTest2($test)
+{
+    return 42;
+}
 
 /**
  * @param string $test Test Argument
  *
  * @return int
  */
-function functionTest2($test)
+function functionTest3($test)
 {
     return 42;
 }
 
+
 /**
  * @param array $tab Test Argument
  */
@@ -27,3 +35,40 @@ function functionTestWithCallBack($tab)
         return $t[0];
     }, $tab);
 }
+
+class classToTestIndentation
+{
+    /**
+     * @param string $test Test Argument
+     */
+    function functionTest1($test)
+    {
+        return 42;
+    }
+    /**
+     * @return int
+     */
+    function functionTest2($test)
+    {
+        return 42;
+    }
+
+
+    /**
+     * @param array $tab Test Argument
+     */
+    function functionTestWithCallBack($tab)
+    {
+        $thing = array_map(function ($t) {
+            return $t[0];
+        }, $tab);
+    }
+}
+
+/**
+ * #{@inheritdoc}
+ */
+function functionTestInherit($test)
+{
+    return 42;
+}

Symfony3Custom/Tests/Commenting/FunctionCommentUnitTest.inc.fixed

@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * @param string $test Test Argument
+ */
+function functionTest1($test)
+{
+    return 42;
+}
+
+/**
+ * @return int
+ */
+function functionTest2($test)
+{
+    return 42;
+}
+
+/**
+ * @param string $test Test Argument
+ *
+ * @return int
+ */
+function functionTest3($test)
+{
+    return 42;
+}
+
+/**
+ * @param array $tab Test Argument
+ */
+function functionTestWithCallBack($tab)
+{
+    $thing = array_map(function ($t) {
+        return $t[0];
+    }, $tab);
+}
+
+class classToTestIndentation
+{
+    /**
+     * @param string $test Test Argument
+     */
+    function functionTest1($test)
+    {
+        return 42;
+    }
+
+    /**
+     * @return int
+     */
+    function functionTest2($test)
+    {
+        return 42;
+    }
+
+    /**
+     * @param array $tab Test Argument
+     */
+    function functionTestWithCallBack($tab)
+    {
+        $thing = array_map(function ($t) {
+            return $t[0];
+        }, $tab);
+    }
+}
+
+/**
+ * #{@inheritdoc}
+ */
+function functionTestInherit($test)
+{
+    return 42;
+}

Symfony3Custom/Tests/Commenting/FunctionCommentUnitTest.php

@@ -21,6 +21,11 @@ public function getErrorList()
     {
         return array(
             5 => 1,
+            10 => 2,
+            29 => 1,
+            43 => 1,
+            48 => 2,
+            57 => 1,
         );
     }