Symplify / PHP7_CodeSniffer

src/Standards/Squiz/Tests/ControlStructures/InlineIfDeclarationUnitTest.php

Doc Comments +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
      *
      * @param string $testFile The name of the file being tested.
      *
-     * @return array
+     * @return string[]
      */
     public function getCliValues($testFile)
     {

Indentation +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
                 48 => 1,
                 70 => 1,
                 71 => 1,
-               );
+                );
 
     }//end getErrorList()
 

src/Standards/Squiz/Tests/Debug/JavaScriptLintUnitTest.php

Doc Comments +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     /**
      * Should this test be skipped for some reason.
      *
-     * @return void
+     * @return boolean
      */
     protected function shouldSkipTest()
     {

src/Standards/Squiz/Tests/Debug/JSLintUnitTest.php

Doc Comments +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     /**
      * Should this test be skipped for some reason.
      *
-     * @return void
+     * @return boolean
      */
     protected function shouldSkipTest()
     {

Indentation +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
                 48 => 1,
                 70 => 1,
                 71 => 1,
-               );
+                );
 
     }//end getErrorList()
 

src/Standards/Squiz/Tests/PHP/HeredocUnitTest.inc

Doc Comments -6 removed lines

@@ -16,9 +16,3 @@
         $arr = array(
             'a' => 'a'
 <<<<<<< HEAD
-            'b' => 'b'
-=======
-            'c' => 'c'
->>>>>>> master
-        );
-    }

Unused Use Statements -6 removed lines

@@ -16,9 +16,3 @@
         $arr = array(
             'a' => 'a'
 <<<<<<< HEAD
-            'b' => 'b'
-=======
-            'c' => 'c'
->>>>>>> master
-        );
-    }

Indentation -6 removed lines

@@ -16,9 +16,3 @@
         $arr = array(
             'a' => 'a'
 <<<<<<< HEAD
-            'b' => 'b'
-=======
-            'c' => 'c'
->>>>>>> master
-        );
-    }

Switch Indentation -6 removed lines

@@ -16,9 +16,3 @@
         $arr = array(
             'a' => 'a'
 <<<<<<< HEAD
-            'b' => 'b'
-=======
-            'c' => 'c'
->>>>>>> master
-        );
-    }

Spacing -6 removed lines

@@ -16,9 +16,3 @@
         $arr = array(
             'a' => 'a'
 <<<<<<< HEAD
-            'b' => 'b'
-=======
-            'c' => 'c'
->>>>>>> master
-        );
-    }

Braces -6 removed lines

@@ -16,9 +16,3 @@
         $arr = array(
             'a' => 'a'
 <<<<<<< HEAD
-            'b' => 'b'
-=======
-            'c' => 'c'
->>>>>>> master
-        );
-    }

Upper-Lower-Casing -6 removed lines

@@ -16,9 +16,3 @@
         $arr = array(
             'a' => 'a'
 <<<<<<< HEAD
-            'b' => 'b'
-=======
-            'c' => 'c'
->>>>>>> master
-        );
-    }

src/Standards/Zend/Tests/Debug/CodeAnalyzerUnitTest.php

Doc Comments +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     /**
      * Should this test be skipped for some reason.
      *
-     * @return void
+     * @return boolean
      */
     protected function shouldSkipTest()
     {

src/Tokenizers/Tokenizer.php

Doc Comments +1 added lines

@@ -57,6 +57,7 @@
      * @param string                         $content The content to tokenize,
      * @param \PHP_CodeSniffer\Config | null $config  The config data for the run.
      * @param string                         $eolChar The EOL char used in the content.
+     * @param null|\PHP_CodeSniffer\Config $config
      *
      * @return void
      * @throws TokenizerException If the file appears to be minified.

Indentation +11 added lines, -11 removed lines

@@ -160,16 +160,16 @@ 
         }
 
         $this->tokensWithTabs = array(
-                                 T_WHITESPACE               => true,
-                                 T_COMMENT                  => true,
-                                 T_DOC_COMMENT              => true,
-                                 T_DOC_COMMENT_WHITESPACE   => true,
-                                 T_DOC_COMMENT_STRING       => true,
-                                 T_CONSTANT_ENCAPSED_STRING => true,
-                                 T_DOUBLE_QUOTED_STRING     => true,
-                                 T_HEREDOC                  => true,
-                                 T_NOWDOC                   => true,
-                                 T_INLINE_HTML              => true,
+                                    T_WHITESPACE               => true,
+                                    T_COMMENT                  => true,
+                                    T_DOC_COMMENT              => true,
+                                    T_DOC_COMMENT_WHITESPACE   => true,
+                                    T_DOC_COMMENT_STRING       => true,
+                                    T_CONSTANT_ENCAPSED_STRING => true,
+                                    T_DOUBLE_QUOTED_STRING     => true,
+                                    T_HEREDOC                  => true,
+                                    T_NOWDOC                   => true,
+                                    T_INLINE_HTML              => true,
                                 );
 
         $this->numTokens = count($this->tokens);
@@ -673,7 +673,7 @@ 
                     $todo        = array(
                                     $stackPtr,
                                     $opener,
-                                   );
+                                    );
 
                     if (PHP_CODESNIFFER_VERBOSITY > 1) {
                         $type       = $this->tokens[$stackPtr]['type'];

Switch Indentation +45 added lines, -45 removed lines

@@ -406,60 +406,60 @@
             */
 
             switch ($this->tokens[$i]['code']) {
-            case T_OPEN_SQUARE_BRACKET:
-                $squareOpeners[] = $i;
-
-                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                    echo str_repeat("\t", count($squareOpeners));
-                    echo str_repeat("\t", count($curlyOpeners));
-                    echo "=> Found square bracket opener at $i".PHP_EOL;
-                }
-                break;
-            case T_OPEN_CURLY_BRACKET:
-                if (isset($this->tokens[$i]['scope_closer']) === false) {
-                    $curlyOpeners[] = $i;
+                case T_OPEN_SQUARE_BRACKET:
+                    $squareOpeners[] = $i;
 
                     if (PHP_CODESNIFFER_VERBOSITY > 1) {
                         echo str_repeat("\t", count($squareOpeners));
                         echo str_repeat("\t", count($curlyOpeners));
-                        echo "=> Found curly bracket opener at $i".PHP_EOL;
+                        echo "=> Found square bracket opener at $i".PHP_EOL;
                     }
-                }
-                break;
-            case T_CLOSE_SQUARE_BRACKET:
-                if (empty($squareOpeners) === false) {
-                    $opener = array_pop($squareOpeners);
-                    $this->tokens[$i]['bracket_opener']      = $opener;
-                    $this->tokens[$i]['bracket_closer']      = $i;
-                    $this->tokens[$opener]['bracket_opener'] = $opener;
-                    $this->tokens[$opener]['bracket_closer'] = $i;
+                    break;
+                case T_OPEN_CURLY_BRACKET:
+                    if (isset($this->tokens[$i]['scope_closer']) === false) {
+                        $curlyOpeners[] = $i;
 
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        echo str_repeat("\t", count($squareOpeners));
-                        echo str_repeat("\t", count($curlyOpeners));
-                        echo "\t=> Found square bracket closer at $i for $opener".PHP_EOL;
+                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
+                            echo str_repeat("\t", count($squareOpeners));
+                            echo str_repeat("\t", count($curlyOpeners));
+                            echo "=> Found curly bracket opener at $i".PHP_EOL;
+                        }
                     }
-                }
-                break;
-            case T_CLOSE_CURLY_BRACKET:
-                if (empty($curlyOpeners) === false
-                    && isset($this->tokens[$i]['scope_opener']) === false
-                ) {
-                    $opener = array_pop($curlyOpeners);
-                    $this->tokens[$i]['bracket_opener']      = $opener;
-                    $this->tokens[$i]['bracket_closer']      = $i;
-                    $this->tokens[$opener]['bracket_opener'] = $opener;
-                    $this->tokens[$opener]['bracket_closer'] = $i;
+                    break;
+                case T_CLOSE_SQUARE_BRACKET:
+                    if (empty($squareOpeners) === false) {
+                        $opener = array_pop($squareOpeners);
+                        $this->tokens[$i]['bracket_opener']      = $opener;
+                        $this->tokens[$i]['bracket_closer']      = $i;
+                        $this->tokens[$opener]['bracket_opener'] = $opener;
+                        $this->tokens[$opener]['bracket_closer'] = $i;
 
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        echo str_repeat("\t", count($squareOpeners));
-                        echo str_repeat("\t", count($curlyOpeners));
-                        echo "\t=> Found curly bracket closer at $i for $opener".PHP_EOL;
+                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
+                            echo str_repeat("\t", count($squareOpeners));
+                            echo str_repeat("\t", count($curlyOpeners));
+                            echo "\t=> Found square bracket closer at $i for $opener".PHP_EOL;
+                        }
                     }
-                }
-                break;
-            default:
-                continue;
+                    break;
+                case T_CLOSE_CURLY_BRACKET:
+                    if (empty($curlyOpeners) === false
+                        && isset($this->tokens[$i]['scope_opener']) === false
+                    ) {
+                        $opener = array_pop($curlyOpeners);
+                        $this->tokens[$i]['bracket_opener']      = $opener;
+                        $this->tokens[$i]['bracket_closer']      = $i;
+                        $this->tokens[$opener]['bracket_opener'] = $opener;
+                        $this->tokens[$opener]['bracket_closer'] = $i;
+
+                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
+                            echo str_repeat("\t", count($squareOpeners));
+                            echo str_repeat("\t", count($curlyOpeners));
+                            echo "\t=> Found curly bracket closer at $i for $opener".PHP_EOL;
+                        }
+                    }
+                    break;
+                default:
+                    continue;
             }//end switch
         }//end for
 

Spacing +4 added lines, -4 removed lines

@@ -61,7 +61,7 @@ 
      * @return void
      * @throws TokenizerException If the file appears to be minified.
      */
-    public function __construct($content, $config, $eolChar='\n')
+    public function __construct($content, $config, $eolChar = '\n')
     {
         $this->eolChar = $eolChar;
 
@@ -92,7 +92,7 @@ 
      *
      * @return boolean
      */
-    protected function isMinifiedContent($content, $eolChar='\n')
+    protected function isMinifiedContent($content, $eolChar = '\n')
     {
         // Minified files often have a very large number of characters per line
         // and cause issues when tokenizing.
@@ -263,7 +263,7 @@ 
      *
      * @return void
      */
-    public function replaceTabsInToken(&$token, $prefix=' ', $padding=' ')
+    public function replaceTabsInToken(&$token, $prefix = ' ', $padding = ' ')
     {
         $checkEncoding = false;
         if ($this->config->encoding !== 'iso-8859-1' && function_exists('iconv_strlen') === true) {
@@ -564,7 +564,7 @@ 
      *
      * @return int The position in the stack that closed the scope.
      */
-    private function recurseScopeMap($stackPtr, $depth=1, &$ignore=0)
+    private function recurseScopeMap($stackPtr, $depth = 1, &$ignore = 0)
     {
         if (PHP_CODESNIFFER_VERBOSITY > 1) {
             echo str_repeat("\t", $depth);

src/Util/Common.php

Unused Use Statements -3 removed lines

@@ -9,9 +9,6 @@
 
 namespace PHP_CodeSniffer\Util;
 
-use PHP_CodeSniffer\Config;
-use PHP_CodeSniffer\Exceptions\RuntimeException;
-
 class Common
 {
 

Indentation +10 added lines, -10 removed lines

@@ -21,16 +21,16 @@
      * @var string[]
      */
     public static $allowedTypes = array(
-                                   'array',
-                                   'boolean',
-                                   'float',
-                                   'integer',
-                                   'mixed',
-                                   'object',
-                                   'string',
-                                   'resource',
-                                   'callable',
-                                  );
+                                    'array',
+                                    'boolean',
+                                    'float',
+                                    'integer',
+                                    'mixed',
+                                    'object',
+                                    'string',
+                                    'resource',
+                                    'callable',
+                                    );
 
 
     /**

Switch Indentation +9 added lines, -9 removed lines

@@ -343,15 +343,15 @@
         } else {
             $lowerVarType = strtolower($varType);
             switch ($lowerVarType) {
-            case 'bool':
-                return 'boolean';
-            case 'double':
-            case 'real':
-                return 'float';
-            case 'int':
-                return 'integer';
-            case 'array()':
-                return 'array';
+                case 'bool':
+                    return 'boolean';
+                case 'double':
+                case 'real':
+                    return 'float';
+                case 'int':
+                    return 'integer';
+                case 'array()':
+                    return 'array';
             }//end switch
 
             if (strpos($lowerVarType, 'array(') !== false) {

Spacing +4 added lines, -4 removed lines

@@ -162,7 +162,7 @@ 
      *
      * @return string
      */
-    public static function prepareForOutput($content, $exclude=array())
+    public static function prepareForOutput($content, $exclude = array())
     {
         if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
             if (in_array("\r", $exclude) === false) {
@@ -221,9 +221,9 @@ 
      */
     public static function isCamelCaps(
         $string,
-        $classFormat=false,
-        $public=true,
-        $strict=true
+        $classFormat = false,
+        $public = true,
+        $strict = true
     ) {
         // Check the first character first.
         if ($classFormat === false) {

Doc Comments +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
      *
      * @param string $path The path to use.
      *
-     * @return mixed
+     * @return string
      */
     public static function realpath($path)
     {

src/Sniffs/AbstractScopeSniff.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
     public function __construct(
         array $scopeTokens,
         array $tokens,
-        $listenOutside=false
+        $listenOutside = false
     ) {
         if (empty($scopeTokens) === true) {
             $error = 'The scope tokens list cannot be empty';

Doc Comments +3 added lines, -3 removed lines

@@ -67,7 +67,7 @@ 
     /**
      * Processes the function tokens within the class.
      *
-     * @param PHP_CodeSniffer_File $phpcsFile The file where this token was found.
+     * @param File $phpcsFile The file where this token was found.
      * @param int                  $stackPtr  The position where the token was found.
      * @param int                  $currScope The current scope opener token.
      *
@@ -150,7 +150,7 @@ 
      * Processes a token that is found within the scope that this test is
      * listening to.
      *
-     * @param PHP_CodeSniffer_File $phpcsFile The file where this token was found.
+     * @param File $phpcsFile The file where this token was found.
      * @param int                  $stackPtr  The position in the stack where this
      *                                        token was found.
      *
@@ -190,7 +190,7 @@ 
     /**
      * Returns the namespace declaration of a file.
      *
-     * @param PHP_CodeSniffer_File $phpcsFile The file where this token was found.
+     * @param File $phpcsFile The file where this token was found.
      * @param int                  $stackPtr  The position where the search for the
      *                                        namespace declaration will start.
      *

src/Files/LocalFile.php

Indentation +9 added lines, -9 removed lines

@@ -128,15 +128,15 @@
         parent::process();
 
         $cache = array(
-                  'hash'         => $hash,
-                  'errors'       => $this->errors,
-                  'warnings'     => $this->warnings,
-                  'metrics'      => $this->metrics,
-                  'errorCount'   => $this->errorCount,
-                  'warningCount' => $this->warningCount,
-                  'fixableCount' => $this->fixableCount,
-                  'numTokens'    => $this->numTokens,
-                 );
+                    'hash'         => $hash,
+                    'errors'       => $this->errors,
+                    'warnings'     => $this->warnings,
+                    'metrics'      => $this->metrics,
+                    'errorCount'   => $this->errorCount,
+                    'warningCount' => $this->warningCount,
+                    'fixableCount' => $this->fixableCount,
+                    'numTokens'    => $this->numTokens,
+                    );
 
         Cache::set($this->path, $cache);