fix some scrutinizer issues

Author: xalopp

.scrutinizer.yml

@@ -3,3 +3,4 @@ filter:
     - "MO4/Tests/*/*.inc"
   dependency_paths:
     - "vendor/squizlabs/php_codesniffer/src/"
+    - "vendor/squizlabs/php_codesniffer/tests/Standards"

MO4/Sniffs/Formatting/AlphabeticalUseStatementsSniff.php

@@ -13,6 +13,14 @@
  * @link     https://github.com/Mayflower/mo4-coding-standard
  */
 
+namespace MO4\Sniffs\Formatting;
+
+use PHP_CodeSniffer\Exceptions\RuntimeException;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Standards\PSR2\Sniffs\Namespaces\UseDeclarationSniff;
+use PHP_CodeSniffer\Util\Common;
+use PHP_CodeSniffer\Util\Tokens as PHP_CodeSniffer_Tokens;
+
 /**
  * Alphabetical Use Statements sniff.
  *
@@ -27,15 +35,6 @@
  * @license   http://spdx.org/licenses/MIT MIT License
  * @link      https://github.com/Mayflower/mo4-coding-standard
  */
-
-namespace MO4\Sniffs\Formatting;
-
-use PHP_CodeSniffer\Exceptions\RuntimeException;
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Standards\PSR2\Sniffs\Namespaces\UseDeclarationSniff;
-use PHP_CodeSniffer\Util\Common;
-use PHP_CodeSniffer\Util\Tokens as PHP_CodeSniffer_Tokens;
-
 class AlphabeticalUseStatementsSniff extends UseDeclarationSniff
 {
 

MO4/Sniffs/Formatting/ArrayAlignmentSniff.php

@@ -153,8 +153,6 @@ public function process(File $phpcsFile, $stackPtr)
 
                 if ($column > $keyEndColumn) {
                     $keyEndColumn = $column;
-                } else {
-                    $keyEndColumn = $keyEndColumn;
                 }
 
                 $lastLine = $line;

MO4/Sniffs/Formatting/UnnecessaryNamespaceUsageSniff.php

@@ -87,7 +87,7 @@ public function process(File $phpcsFile, $stackPtr)
 
         $tokens        = $phpcsFile->getTokens();
         $useStatements = $this->getUseStatements($phpcsFile, 0, ($stackPtr - 1));
-        $nameSpace     = $this->getNameSpace($phpcsFile, 0, ($stackPtr - 1));
+        $namespace     = $this->getNamespace($phpcsFile, 0, ($stackPtr - 1));
 
         $nsSep = $phpcsFile->findNext($scanTokens, ($stackPtr + 1));
 
@@ -113,7 +113,7 @@ public function process(File $phpcsFile, $stackPtr)
                     $phpcsFile,
                     $useStatements,
                     $className,
-                    $nameSpace,
+                    $namespace,
                     $nsSep,
                     ($classNameEnd - 1),
                     false
@@ -174,7 +174,7 @@ public function process(File $phpcsFile, $stackPtr)
                                 $phpcsFile,
                                 $useStatements,
                                 $typeToken,
-                                $nameSpace,
+                                $namespace,
                                 $docCommentStringPtr,
                                 $docCommentStringPtr,
                                 true
@@ -320,7 +320,7 @@ private function getFullyQualifiedClassName($className)
      * @param File   $phpcsFile     PHP CS File
      * @param array  $useStatements array with class use statements
      * @param string $className     class name
-     * @param string $nameSpace     name space
+     * @param string $namespace     name space
      * @param int    $startPtr      start token pointer
      * @param int    $endPtr        end token pointer
      * @param bool   $isDocBlock    true if fixing doc block
@@ -331,12 +331,13 @@ private function checkShorthandPossible(
         File $phpcsFile,
         $useStatements,
         $className,
-        $nameSpace,
+        $namespace,
         $startPtr,
         $endPtr,
         $isDocBlock=false
     ) {
         $msg     = 'Shorthand possible. Replace "%s" with "%s"';
+        $code    = 'UnnecessaryNamespaceUsage';
         $fixable = false;
         $replaceClassName = false;
         $replacement      = null;
@@ -346,20 +347,21 @@ private function checkShorthandPossible(
         if (array_key_exists($fullClassName, $useStatements) === true) {
             $replacement = $useStatements[$fullClassName];
 
-            $data    = array(
-                        $className,
-                        $replacement,
-                       );
+            $data = array(
+                     $className,
+                     $replacement,
+                    );
+
             $fixable = $phpcsFile->addFixableWarning(
                 $msg,
                 $startPtr,
-                'UnnecessaryNameSpaceUsage',
+                $code,
                 $data
             );
 
             $replaceClassName = true;
-        } else if (strpos($fullClassName, $nameSpace) === 0) {
-            $replacement = substr($fullClassName, strlen($nameSpace));
+        } else if (strpos($fullClassName, $namespace) === 0) {
+            $replacement = substr($fullClassName, strlen($namespace));
 
             $data    = array(
                         $className,
@@ -368,7 +370,7 @@ private function checkShorthandPossible(
             $fixable = $phpcsFile->addFixableWarning(
                 $msg,
                 $startPtr,
-                'UnnecessaryNameSpaceUsage',
+                $code,
                 $data
             );
         }//end if

MO4/Sniffs/Strings/VariableInDoubleQuotedStringSniff.php

@@ -35,7 +35,7 @@ class VariableInDoubleQuotedStringSniff implements Sniff
     /**
      * The PHP_CodeSniffer object controlling this run.
      *
-     * @var PHP_CodeSniffer
+     * @var File
      */
     private $phpCsFile = null;