Merge pull request #60 from mmoll/minor_fixes

minor optimizations

Author: xalopp

MO4/Sniffs/Arrays/ArrayDoubleArrowAlignmentSniff.php

@@ -121,7 +121,7 @@ public function process(File $phpcsFile, $stackPtr)
 
                 $j = ($i - 1);
                 while (($j >= 0) && ($tokens[$j]['line'] === $current['line'])) {
-                    if ((in_array($tokens[$j]['code'], PHP_CodeSniffer_Tokens::$emptyTokens)) === false) {
+                    if (in_array($tokens[$j]['code'], PHP_CodeSniffer_Tokens::$emptyTokens, true) === false) {
                         $hasKeyInLine = true;
                     }
 

MO4/Sniffs/Commenting/PropertyCommentSniff.php

@@ -53,6 +53,8 @@ class PropertyCommentSniff extends AbstractScopeSniff
 
     /**
      * Construct PropertyCommentSniff
+     *
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException
      */
     public function __construct()
     {
@@ -153,9 +155,9 @@ protected function processTokenWithinScope(
                 $this->myTokenTypes,
                 $commentEnd
             );
-            if ($tokens[$commentStart]['line'] === $tokens[$commentEnd]['line']
+            if ($firstTokenOnLine !== false
+                && $tokens[$commentStart]['line'] === $tokens[$commentEnd]['line']
                 && $tokens[$stackPtr]['line'] > $tokens[$commentEnd]['line']
-                && $firstTokenOnLine !== false
             ) {
                 return;
             }

MO4/Sniffs/Formatting/AlphabeticalUseStatementsSniff.php

@@ -94,7 +94,7 @@ class AlphabeticalUseStatementsSniff extends UseDeclarationSniff
      */
     public function register()
     {
-        if (in_array($this->order, $this->supportedOrderingMethods) === false) {
+        if (in_array($this->order, $this->supportedOrderingMethods, true) === false) {
             $error = sprintf(
                 "'%s' is not a valid order function for %s! Pick one of: %s",
                 $this->order,
@@ -360,15 +360,15 @@ private function findNewDestination(
      */
     private function compareString($a, $b)
     {
-        if ('dictionary' === $this->order) {
-            return $this->dictionaryCompare($a, $b);
-        } else if ('string' === $this->order) {
+        switch ($this->order) {
+        case 'string':
             return strcmp($a, $b);
-        } else if ('string-locale' === $this->order) {
+        case 'string-locale':
             return strcoll($a, $b);
-        } else if ('string-case-insensitive' === $this->order) {
+        case 'string-case-insensitive':
             return strcasecmp($a, $b);
-        } else {
+        default:
+            // Default is 'dictionary'.
             return $this->dictionaryCompare($a, $b);
         }
 

MO4/Sniffs/Formatting/UnnecessaryNamespaceUsageSniff.php

@@ -103,7 +103,7 @@ public function process(File $phpcsFile, $stackPtr)
 
             if ($tokens[$nsSep]['code'] === T_NS_SEPARATOR) {
                 if ($tokens[($nsSep - 1)]['code'] === T_STRING) {
-                    $nsSep -= 1;
+                    --$nsSep;
                 }
 
                 $className = $phpcsFile->getTokensAsString(
@@ -124,7 +124,7 @@ public function process(File $phpcsFile, $stackPtr)
                 // Doc comment block.
                 foreach ($tokens[$nsSep]['comment_tags'] as $tag) {
                     $content = $tokens[$tag]['content'];
-                    if ((array_key_exists($content, $docCommentTags)) === false) {
+                    if (array_key_exists($content, $docCommentTags) === false) {
                         continue;
                     }