Merge pull request #27 from VincentLanglet/staging

🐛 Handle case previousString is false

Author: VincentLanglet

Symfony3Custom/Sniffs/Commenting/DocCommentGroupSameTypeSniff.php

@@ -88,11 +88,22 @@ public function process(File $phpcsFile, $stackPtr)
                 $stackPtr
             );
 
+            $previousLine = -1;
             if (false !== $previousString) {
-                $previousStringLine = $tokens[$previousString]['line'];
+                $previousLine = $tokens[$previousString]['line'];
+                $previousElement = $previousString;
+            }
+
+            if (false !== $previousTag) {
                 $previousTagLine = $tokens[$previousTag]['line'];
-                $previousLine = max($previousStringLine, $previousTagLine);
 
+                if ($previousTagLine > $previousLine) {
+                    $previousLine = $previousTagLine;
+                    $previousElement = $previousTag;
+                }
+            }
+
+            if ($previousLine >= 0) {
                 $currentIsCustom = !in_array($currentType, $this->tags);
                 $previousIsCustom = ('' !== $previousType)
                     && !in_array($previousType, $this->tags);
@@ -121,7 +132,7 @@ public function process(File $phpcsFile, $stackPtr)
                             $phpcsFile->fixer->beginChangeset();
                             $this->removeLines(
                                 $phpcsFile,
-                                $previousString,
+                                $previousElement,
                                 $previousLine + 1,
                                 $commentTagLine - 1
                             );
@@ -161,7 +172,7 @@ public function process(File $phpcsFile, $stackPtr)
                             } else {
                                 $this->removeLines(
                                     $phpcsFile,
-                                    $previousString,
+                                    $previousElement,
                                     $previousLine + 2,
                                     $commentTagLine - 1
                                 );

Symfony3Custom/Tests/Commenting/DocCommentGroupSameTypeUnitTest.inc

@@ -61,3 +61,8 @@
  *
  * @param string $a
  */
+
+/**
+ * @Route("/{id}/")
+ * @param
+ */

Symfony3Custom/Tests/Commenting/DocCommentGroupSameTypeUnitTest.inc.fixed

@@ -63,3 +63,9 @@
  *
  * @param string $a
  */
+
+/**
+ * @Route("/{id}/")
+ *
+ * @param
+ */

Symfony3Custom/Tests/Commenting/DocCommentGroupSameTypeUnitTest.php

@@ -32,6 +32,7 @@ public function getErrorList()
             20 => 1,
             29 => 1,
             33 => 1,
+            67 => 1,
         );
     }