Return Type Sniff should ignore abstract functions and interfaces, fixes

#151 (#152)
djoos · Jan 16, 2019 · 406a1db · 406a1db
1 parent 8477dc3
commit 406a1db
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 0 deletions.
diff --git a/Symfony/Sniffs/Functions/ReturnTypeSniff.php b/Symfony/Sniffs/Functions/ReturnTypeSniff.php
@@ -68,6 +68,10 @@ public function process(File $phpcsFile, $stackPtr)
         $next = $stackPtr;
 
         do {
+            if (!isset($tokens[$stackPtr]['scope_closer'])) {
+                break;
+            }
+
             $next = $phpcsFile->findNext(
                 T_RETURN,
                 $next + 1,

diff --git a/Symfony/Tests/Functions/ReturnTypeUnitTest.inc b/Symfony/Tests/Functions/ReturnTypeUnitTest.inc
@@ -29,3 +29,23 @@ function omg(): void
         }
     };
 }
+
+interface FooInterface
+{
+     public function fooMixed();
+
+     public function voidFoo(): void;
+}
+
+abstract class AbstractFoo
+{
+    public function fooMixed();
+
+    public function voidFoo(): void;
+
+    public function fail(): void
+    {
+        return null;
+    }
+}
+
diff --git a/Symfony/Tests/Functions/ReturnTypeUnitTest.php b/Symfony/Tests/Functions/ReturnTypeUnitTest.php
@@ -45,6 +45,7 @@ public function getErrorList()
         return array(
             5 => 1,
             21 => 1,
+            48 => 1,
         );
     }