Merge pull request #365 from PHPCSStandards/feature/universal-constants-modifierkeywordorder-use-utils-constants-getproperties

Universal/ModifierKeywordOrder: use new PHPCSUtils 1.1.0 Constants::getProperties() method

Author: jrfnl

Universal/Sniffs/Constants/ModifierKeywordOrderSniff.php

@@ -12,8 +12,7 @@
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Util\Tokens;
-use PHPCSUtils\Tokens\Collections;
+use PHPCSUtils\Utils\Constants;
 use PHPCSUtils\Utils\Scopes;
 
 /**
@@ -95,36 +94,19 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
-        $tokens = $phpcsFile->getTokens();
-        $valid  = Collections::constantModifierKeywords() + Tokens::$emptyTokens;
-
-        $finalPtr      = false;
-        $visibilityPtr = false;
-
-        for ($i = ($stackPtr - 1); $i > 0; $i--) {
-            if (isset($valid[$tokens[$i]['code']]) === false) {
-                break;
-            }
+        $constantInfo = Constants::getProperties($phpcsFile, $stackPtr);
 
-            if (isset(Tokens::$emptyTokens[$tokens[$i]['code']]) === true) {
-                continue;
-            }
-
-            if ($tokens[$i]['code'] === \T_FINAL) {
-                $finalPtr = $i;
-            } else {
-                $visibilityPtr = $i;
-            }
-        }
-
-        if ($finalPtr === false || $visibilityPtr === false) {
+        if ($constantInfo['final_token'] === false || $constantInfo['scope_token'] === false) {
             /*
              * Either no modifier keywords found at all; or only one type of modifier
              * keyword (final or visibility) declared, but not both. No ordering needed.
              */
             return;
         }
 
+        $finalPtr      = $constantInfo['final_token'];
+        $visibilityPtr = $constantInfo['scope_token'];
+
         if ($visibilityPtr < $finalPtr) {
             $phpcsFile->recordMetric($stackPtr, self::METRIC_NAME, self::VISIBILITY_FINAL);
         } else {