Merge branch 'feature/squiz-methodscope-handle-unconventional-spacing…

…' of https://github.com/jrfnl/PHP_CodeSniffer
squizlabs · Jun 13, 2022 · 89a588a · 89a588a
2 parents d9cf568 + 10c10ac
commit 89a588a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/src/Standards/Squiz/Sniffs/Scope/MethodScopeSniff.php b/src/Standards/Squiz/Sniffs/Scope/MethodScopeSniff.php
@@ -54,17 +54,8 @@ protected function processTokenWithinScope(File $phpcsFile, $stackPtr, $currScop
             return;
         }
 
-        $modifier = null;
-        for ($i = ($stackPtr - 1); $i > 0; $i--) {
-            if ($tokens[$i]['line'] < $tokens[$stackPtr]['line']) {
-                break;
-            } else if (isset(Tokens::$scopeModifiers[$tokens[$i]['code']]) === true) {
-                $modifier = $i;
-                break;
-            }
-        }
-
-        if ($modifier === null) {
+        $properties = $phpcsFile->getMethodProperties($stackPtr);
+        if ($properties['scope_specified'] === false) {
             $error = 'Visibility must be declared on method "%s"';
             $data  = [$methodName];
             $phpcsFile->addError($error, $stackPtr, 'Missing', $data);

diff --git a/src/Standards/Squiz/Tests/Scope/MethodScopeUnitTest.inc b/src/Standards/Squiz/Tests/Scope/MethodScopeUnitTest.inc
@@ -48,3 +48,10 @@ enum SomeEnum
     private function func1() {}
     protected function func1() {}
 }
+
+class UnconventionalSpacing {
+    public
+    static
+    function
+    myFunction() {}
+}