Allow blank line after single line declaration #32

dnaber-de · dnaber-de · commit f31f05d8b866 · 2020-01-17T14:49:18.000+01:00
diff --git a/Inpsyde/Sniffs/CodeQuality/FunctionBodyStartSniff.php b/Inpsyde/Sniffs/CodeQuality/FunctionBodyStartSniff.php
@@ -86,7 +86,7 @@ private function checkBodyStart(
 
         $error =
             ($isMultiLineDeclare || $isSingleLineSignature) && $bodyLine !== ($openerLine + 2)
-            || $isSingleLineDeclare && $bodyLine !== ($openerLine + 1);
+            || $isSingleLineDeclare && $bodyLine > ($openerLine + 2);
 
         if (!$error) {
             return [null, null, null];
diff --git a/tests/fixtures/function-body-start.php b/tests/fixtures/function-body-start.php
@@ -8,7 +8,8 @@ function foo()
     return 'foo';
 }
 
-// @phpcsWarningCodeOnNextLine WrongForSingleLineDeclaration
+// tolerate this as PHPStorm code styler cannot distinguish between
+// single line and multiline function declarations. See issue #32
 function bar()
 {
 
@@ -66,7 +67,6 @@ public function foo()
         return 'foo';
     }
 
-    // @phpcsWarningCodeOnNextLine WrongForSingleLineDeclaration
     private function bar()
     {
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@ function foo()`
`8`	`8`	`return 'foo';`
`9`	`9`	`}`
`10`	`10`
`11`		`-// @phpcsWarningCodeOnNextLine WrongForSingleLineDeclaration`
	`11`	`+// tolerate this as PHPStorm code styler cannot distinguish between`
	`12`	`+// single line and multiline function declarations. See issue #32`
`12`	`13`	`function bar()`
`13`	`14`	`{`
`14`	`15`
`@@ -66,7 +67,6 @@ public function foo()`
`66`	`67`	`return 'foo';`
`67`	`68`	`}`
`68`	`69`
`69`		`- // @phpcsWarningCodeOnNextLine WrongForSingleLineDeclaration`
`70`	`70`	`private function bar()`
`71`	`71`	`{`
`72`	`72`