Symplify / PHP7_CodeSniffer

CodeSniffer.php

Doc Comments +5 added lines, -5 removed lines

@@ -474,7 +474,7 @@ 
     /**
      * Sets the internal CLI object.
      *
-     * @param object $cli The CLI object controlling the run.
+     * @param PHP_CodeSniffer_CLI $cli The CLI object controlling the run.
      *
      * @return void
      */
@@ -491,7 +491,7 @@ 
      * @param string|array $files        The files and directories to process. For
      *                                   directories, each sub directory will also
      *                                   be traversed for source files.
-     * @param string|array $standards    The set of code sniffs we are testing
+     * @param string $standards    The set of code sniffs we are testing
      *                                   against.
      * @param array        $restrictions The sniff codes to restrict the
      *                                   violations to.
@@ -2286,7 +2286,7 @@ 
      *
      * @param string $standard The name of the coding standard.
      *
-     * @return string|null
+     * @return string
      */
     public static function getInstalledStandardPath($standard)
     {
@@ -2455,7 +2455,7 @@ 
      *
      * @param string $path The path to use.
      *
-     * @return mixed
+     * @return boolean
      */
     public static function isPharFile($path)
     {
@@ -2475,7 +2475,7 @@ 
      *
      * @param string $path The path to use.
      *
-     * @return mixed
+     * @return string|false
      */
     public static function realpath($path)
     {

Indentation +24 added lines, -24 removed lines

@@ -181,10 +181,10 @@ 
      * @var array
      */
     public $defaultFileExtensions = array(
-                                     'php' => 'PHP',
-                                     'inc' => 'PHP',
-                                     'js'  => 'JS',
-                                     'css' => 'CSS',
+                                        'php' => 'PHP',
+                                        'inc' => 'PHP',
+                                        'js'  => 'JS',
+                                        'css' => 'CSS',
                                     );
 
     /**
@@ -193,16 +193,16 @@ 
      * @var array(string)
      */
     public static $allowedTypes = array(
-                                   'array',
-                                   'boolean',
-                                   'float',
-                                   'integer',
-                                   'mixed',
-                                   'object',
-                                   'string',
-                                   'resource',
-                                   'callable',
-                                  );
+                                    'array',
+                                    'boolean',
+                                    'float',
+                                    'integer',
+                                    'mixed',
+                                    'object',
+                                    'string',
+                                    'resource',
+                                    'callable',
+                                    );
 
 
     /**
@@ -1229,7 +1229,7 @@ 
 
                 if (isset($this->ruleset[$code]) === false) {
                     $this->ruleset[$code] = array(
-                                             'properties' => array(),
+                                                'properties' => array(),
                                             );
                 } else if (isset($this->ruleset[$code]['properties']) === false) {
                     $this->ruleset[$code]['properties'] = array();
@@ -1457,8 +1457,8 @@ 
                 // While there is support for a type of each pattern
                 // (absolute or relative) we don't actually support it here.
                 $replacements = array(
-                                 '\\,' => ',',
-                                 '*'   => '.*',
+                                    '\\,' => ',',
+                                    '*'   => '.*',
                                 );
 
                 $ignorePatterns[] = strtr($pattern, $replacements);
@@ -1471,11 +1471,11 @@ 
 
                 if (isset($this->_tokenListeners[$token][$listenerClass]) === false) {
                     $this->_tokenListeners[$token][$listenerClass] = array(
-                                                                      'class'      => $listenerClass,
-                                                                      'source'     => $listenerSource,
-                                                                      'tokenizers' => $tokenizers,
-                                                                      'ignore'     => $ignorePatterns,
-                                                                     );
+                                                                        'class'      => $listenerClass,
+                                                                        'source'     => $listenerSource,
+                                                                        'tokenizers' => $tokenizers,
+                                                                        'ignore'     => $ignorePatterns,
+                                                                        );
                 }
             }
         }//end foreach
@@ -1655,8 +1655,8 @@ 
             }
 
             $replacements = array(
-                             '\\,' => ',',
-                             '*'   => '.*',
+                                '\\,' => ',',
+                                '*'   => '.*',
                             );
 
             // We assume a / directory separator, as do the exclude rules

Switch Indentation +21 added lines, -21 removed lines

@@ -1802,18 +1802,18 @@ 
             $input = trim($input);
 
             switch ($input) {
-            case 's':
-                break(2);
-            case 'q':
-                exit(0);
-                break;
-            default:
-                // Repopulate the sniffs because some of them save their state
-                // and only clear it when the file changes, but we are rechecking
-                // the same file.
-                $this->populateTokenListeners();
-                $phpcsFile = $this->_processFile($file, $contents);
-                break;
+                case 's':
+                    break(2);
+                case 'q':
+                    exit(0);
+                    break;
+                default:
+                    // Repopulate the sniffs because some of them save their state
+                    // and only clear it when the file changes, but we are rechecking
+                    // the same file.
+                    $this->populateTokenListeners();
+                    $phpcsFile = $this->_processFile($file, $contents);
+                    break;
             }
         }//end while
 
@@ -2075,15 +2075,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 +23 added lines, -23 removed lines

@@ -225,10 +225,10 @@ 
      * @see process()
      */
     public function __construct(
-        $verbosity=0,
-        $tabWidth=0,
-        $encoding='iso-8859-1',
-        $interactive=false
+        $verbosity = 0,
+        $tabWidth = 0,
+        $encoding = 'iso-8859-1',
+        $interactive = false
     ) {
         if ($verbosity !== null) {
             $this->setVerbosity($verbosity);
@@ -456,7 +456,7 @@ 
      *
      * @return array
      */
-    public function getIgnorePatterns($listener=null)
+    public function getIgnorePatterns($listener = null)
     {
         if ($listener === null) {
             return $this->ignorePatterns;
@@ -499,7 +499,7 @@ 
      *
      * @return void
      */
-    public function process($files, $standards, array $restrictions=array(), $local=false)
+    public function process($files, $standards, array $restrictions = array(), $local = false)
     {
         $files = (array) $files;
         $this->initStandard($standards, $restrictions);
@@ -517,7 +517,7 @@ 
      *
      * @return void
      */
-    public function initStandard($standards, array $restrictions=array())
+    public function initStandard($standards, array $restrictions = array())
     {
         $standards = (array) $standards;
 
@@ -589,7 +589,7 @@ 
      * @return void
      * @throws PHP_CodeSniffer_Exception If files are invalid.
      */
-    public function processFiles($files, $local=false)
+    public function processFiles($files, $local = false)
     {
         $files        = (array) $files;
         $cliValues    = $this->cli->getCommandLineValues();
@@ -696,7 +696,7 @@ 
      * @return array
      * @throws PHP_CodeSniffer_Exception If the ruleset path is invalid.
      */
-    public function processRuleset($rulesetPath, $depth=0)
+    public function processRuleset($rulesetPath, $depth = 0)
     {
         $rulesetPath = self::realpath($rulesetPath);
         if (PHP_CODESNIFFER_VERBOSITY > 1) {
@@ -921,7 +921,7 @@ 
      *
      * @return array
      */
-    private function _expandSniffDirectory($directory, $depth=0)
+    private function _expandSniffDirectory($directory, $depth = 0)
     {
         $sniffs = array();
 
@@ -989,7 +989,7 @@ 
      * @return array
      * @throws PHP_CodeSniffer_Exception If the reference is invalid.
      */
-    private function _expandRulesetReference($ref, $rulesetDir, $depth=0)
+    private function _expandRulesetReference($ref, $rulesetDir, $depth = 0)
     {
         // Ignore internal sniffs codes as they are used to only
         // hide and change internal messages.
@@ -1169,7 +1169,7 @@ 
      *
      * @return void
      */
-    private function _processRule($rule, $depth=0)
+    private function _processRule($rule, $depth = 0)
     {
         $code = (string) $rule['ref'];
 
@@ -1244,7 +1244,7 @@ 
                     foreach (explode(',', $value) as $val) {
                         $v = '';
 
-                        list($k,$v) = explode('=>', $val.'=>');
+                        list($k, $v) = explode('=>', $val.'=>');
                         if ($v !== '') {
                             $values[$k] = $v;
                         } else {
@@ -1300,7 +1300,7 @@ 
      *
      * @return bool
      */
-    private function _shouldProcessElement($element, $depth=0)
+    private function _shouldProcessElement($element, $depth = 0)
     {
         if (isset($element['phpcbf-only']) === false
             && isset($element['phpcs-only']) === false
@@ -1529,7 +1529,7 @@ 
      * @throws Exception If there was an error opening a directory.
      * @see    shouldProcessFile()
      */
-    public function getFilesToProcess($paths, $local=false)
+    public function getFilesToProcess($paths, $local = false)
     {
         $files = array();
 
@@ -1700,7 +1700,7 @@ 
      * @throws PHP_CodeSniffer_Exception If the file could not be processed.
      * @see    _processFile()
      */
-    public function processFile($file, $contents=null)
+    public function processFile($file, $contents = null)
     {
         if ($contents === null && file_exists($file) === false) {
             throw new PHP_CodeSniffer_Exception("Source file $file does not exist");
@@ -1893,7 +1893,7 @@ 
      *
      * @return void
      */
-    public function generateDocs($standard, array $sniffs=array(), $generator='Text')
+    public function generateDocs($standard, array $sniffs = array(), $generator = 'Text')
     {
         if (class_exists('PHP_CodeSniffer_DocGenerators_'.$generator, true) === false) {
             throw new PHP_CodeSniffer_Exception('Class PHP_CodeSniffer_DocGenerators_'.$generator.' not found');
@@ -1953,9 +1953,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) {
@@ -2197,8 +2197,8 @@ 
      * @see    isInstalledStandard()
      */
     public static function getInstalledStandards(
-        $includeGeneric=false,
-        $standardsDir=''
+        $includeGeneric = false,
+        $standardsDir = ''
     ) {
         $installedStandards = array();
 
@@ -2356,7 +2356,7 @@ 
      * @see    getConfigData()
      * @throws PHP_CodeSniffer_Exception If the config file can not be written.
      */
-    public static function setConfigData($key, $value, $temp=false)
+    public static function setConfigData($key, $value, $temp = false)
     {
         if ($temp === false) {
             $path = '';

CodeSniffer/DocGenerators/HTML.php

Doc Comments +1 added lines, -1 removed lines

@@ -157,7 +157,7 @@
      *
      * The TOC is just an unordered list of bookmarks to sniffs on the page.
      *
-     * @param array $standardFiles An array of paths to the XML standard files.
+     * @param string[] $standardFiles An array of paths to the XML standard files.
      *
      * @return void
      */

CodeSniffer/File.php

Doc Comments +2 added lines, -2 removed lines

@@ -866,7 +866,7 @@ 
      * @param string $error    The error message.
      * @param int    $line     The line on which the error occurred.
      * @param string $code     A violation code unique to the sniff message.
-     * @param array  $data     Replacements for the error message.
+     * @param string[]  $data     Replacements for the error message.
      * @param int    $severity The severity level for this error. A value of 0 will be converted into the default severity level.
      *                          will be converted into the default severity level.
      *
@@ -890,7 +890,7 @@ 
      * @param string $warning  The error message.
      * @param int    $line     The line on which the warning occurred.
      * @param string $code     A violation code unique to the sniff message.
-     * @param array  $data     Replacements for the warning message.
+     * @param string[]  $data     Replacements for the warning message.
      * @param int    $severity The severity level for this warning. A value of 0 will be converted into the default severity level.
      *                          will be converted into the default severity level.
      *

Indentation +67 added lines, -67 removed lines

@@ -1045,8 +1045,8 @@ 
             // While there is support for a type of each pattern
             // (absolute or relative) we don't actually support it here.
             $replacements = array(
-                             '\\,' => ',',
-                             '*'   => '.*',
+                                '\\,' => ',',
+                                '*'   => '.*',
                             );
 
             // We assume a / directory separator, as do the exclude rules
@@ -1101,7 +1101,7 @@ 
                                             'source'   => $sniffCode,
                                             'severity' => $severity,
                                             'fixable'  => $fixable,
-                                           );
+                                            );
 
         if (PHP_CODESNIFFER_VERBOSITY > 1
             && $this->fixer->enabled === true
@@ -1192,8 +1192,8 @@ 
             // While there is support for a type of each pattern
             // (absolute or relative) we don't actually support it here.
             $replacements = array(
-                             '\\,' => ',',
-                             '*'   => '.*',
+                                '\\,' => ',',
+                                '*'   => '.*',
                             );
 
             // We assume a / directory separator, as do the exclude rules
@@ -1244,11 +1244,11 @@ 
         }
 
         $this->_warnings[$line][$column][] = array(
-                                              'message'  => $message,
-                                              'source'   => $sniffCode,
-                                              'severity' => $severity,
-                                              'fixable'  => $fixable,
-                                             );
+                                                'message'  => $message,
+                                                'source'   => $sniffCode,
+                                                'severity' => $severity,
+                                                'fixable'  => $fixable,
+                                                );
 
         if (PHP_CODESNIFFER_VERBOSITY > 1
             && $this->fixer->enabled === true
@@ -1278,9 +1278,9 @@ 
         if (isset($this->_metrics[$metric]) === false) {
             $this->_metrics[$metric] = array(
                                         'values' => array(
-                                                     $value => array($stackPtr),
+                                                        $value => array($stackPtr),
                                                     ),
-                                       );
+                                        );
         } else {
             if (isset($this->_metrics[$metric]['values'][$value]) === false) {
                 $this->_metrics[$metric]['values'][$value] = array($stackPtr);
@@ -1487,17 +1487,17 @@ 
         }
 
         $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,
+                            );
 
         $numTokens = count($tokens);
         for ($i = 0; $i < $numTokens; $i++) {
@@ -1997,7 +1997,7 @@ 
                     $todo        = array(
                                     $stackPtr,
                                     $opener,
-                                   );
+                                    );
 
                     if (PHP_CODESNIFFER_VERBOSITY > 1) {
                         $type       = $tokens[$stackPtr]['type'];
@@ -2906,16 +2906,16 @@ 
         }
 
         $valid = array(
-                  T_PUBLIC      => T_PUBLIC,
-                  T_PRIVATE     => T_PRIVATE,
-                  T_PROTECTED   => T_PROTECTED,
-                  T_STATIC      => T_STATIC,
-                  T_FINAL       => T_FINAL,
-                  T_ABSTRACT    => T_ABSTRACT,
-                  T_WHITESPACE  => T_WHITESPACE,
-                  T_COMMENT     => T_COMMENT,
-                  T_DOC_COMMENT => T_DOC_COMMENT,
-                 );
+                    T_PUBLIC      => T_PUBLIC,
+                    T_PRIVATE     => T_PRIVATE,
+                    T_PROTECTED   => T_PROTECTED,
+                    T_STATIC      => T_STATIC,
+                    T_FINAL       => T_FINAL,
+                    T_ABSTRACT    => T_ABSTRACT,
+                    T_WHITESPACE  => T_WHITESPACE,
+                    T_COMMENT     => T_COMMENT,
+                    T_DOC_COMMENT => T_DOC_COMMENT,
+                    );
 
         $scope          = 'public';
         $scopeSpecified = false;
@@ -2961,7 +2961,7 @@ 
                 'is_final'        => $isFinal,
                 'is_static'       => $isStatic,
                 'is_closure'      => $isClosure,
-               );
+                );
 
     }//end getMethodProperties()
 
@@ -3019,16 +3019,16 @@ 
         }
 
         $valid = array(
-                  T_PUBLIC      => T_PUBLIC,
-                  T_PRIVATE     => T_PRIVATE,
-                  T_PROTECTED   => T_PROTECTED,
-                  T_STATIC      => T_STATIC,
-                  T_WHITESPACE  => T_WHITESPACE,
-                  T_COMMENT     => T_COMMENT,
-                  T_DOC_COMMENT => T_DOC_COMMENT,
-                  T_VARIABLE    => T_VARIABLE,
-                  T_COMMA       => T_COMMA,
-                 );
+                    T_PUBLIC      => T_PUBLIC,
+                    T_PRIVATE     => T_PRIVATE,
+                    T_PROTECTED   => T_PROTECTED,
+                    T_STATIC      => T_STATIC,
+                    T_WHITESPACE  => T_WHITESPACE,
+                    T_COMMENT     => T_COMMENT,
+                    T_DOC_COMMENT => T_DOC_COMMENT,
+                    T_VARIABLE    => T_VARIABLE,
+                    T_COMMA       => T_COMMA,
+                    );
 
         $scope          = 'public';
         $scopeSpecified = false;
@@ -3062,7 +3062,7 @@ 
                 'scope'           => $scope,
                 'scope_specified' => $scopeSpecified,
                 'is_static'       => $isStatic,
-               );
+                );
 
     }//end getMemberProperties()
 
@@ -3092,12 +3092,12 @@ 
         }
 
         $valid = array(
-                  T_FINAL       => T_FINAL,
-                  T_ABSTRACT    => T_ABSTRACT,
-                  T_WHITESPACE  => T_WHITESPACE,
-                  T_COMMENT     => T_COMMENT,
-                  T_DOC_COMMENT => T_DOC_COMMENT,
-                 );
+                    T_FINAL       => T_FINAL,
+                    T_ABSTRACT    => T_ABSTRACT,
+                    T_WHITESPACE  => T_WHITESPACE,
+                    T_COMMENT     => T_COMMENT,
+                    T_DOC_COMMENT => T_DOC_COMMENT,
+                    );
 
         $isAbstract = false;
         $isFinal    = false;
@@ -3121,7 +3121,7 @@ 
         return array(
                 'is_abstract' => $isAbstract,
                 'is_final'    => $isFinal,
-               );
+                );
 
     }//end getClassProperties()
 
@@ -3471,17 +3471,17 @@ 
     public function findEndOfStatement($start, $ignore=null)
     {
         $endTokens = array(
-                      T_COLON                => true,
-                      T_COMMA                => true,
-                      T_DOUBLE_ARROW         => true,
-                      T_SEMICOLON            => true,
-                      T_CLOSE_PARENTHESIS    => true,
-                      T_CLOSE_SQUARE_BRACKET => true,
-                      T_CLOSE_CURLY_BRACKET  => true,
-                      T_CLOSE_SHORT_ARRAY    => true,
-                      T_OPEN_TAG             => true,
-                      T_CLOSE_TAG            => true,
-                     );
+                        T_COLON                => true,
+                        T_COMMA                => true,
+                        T_DOUBLE_ARROW         => true,
+                        T_SEMICOLON            => true,
+                        T_CLOSE_PARENTHESIS    => true,
+                        T_CLOSE_SQUARE_BRACKET => true,
+                        T_CLOSE_CURLY_BRACKET  => true,
+                        T_CLOSE_SHORT_ARRAY    => true,
+                        T_OPEN_TAG             => true,
+                        T_CLOSE_TAG            => true,
+                        );
 
         if ($ignore !== null) {
             $ignore = (array) $ignore;
@@ -3694,9 +3694,9 @@ 
         }
 
         $find = array(
-                 T_NS_SEPARATOR,
-                 T_STRING,
-                 T_WHITESPACE,
+                    T_NS_SEPARATOR,
+                    T_STRING,
+                    T_WHITESPACE,
                 );
 
         $end  = $this->findNext($find, ($extendsIndex + 1), $classCloserIndex, true);

Switch Indentation +157 added lines, -157 removed lines

@@ -1704,60 +1704,60 @@ 
             */
 
             switch ($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($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);
-                    $tokens[$i]['bracket_opener']      = $opener;
-                    $tokens[$i]['bracket_closer']      = $i;
-                    $tokens[$opener]['bracket_opener'] = $opener;
-                    $tokens[$opener]['bracket_closer'] = $i;
+                    break;
+                case T_OPEN_CURLY_BRACKET:
+                    if (isset($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($tokens[$i]['scope_opener']) === false
-                ) {
-                    $opener = array_pop($curlyOpeners);
-                    $tokens[$i]['bracket_opener']      = $opener;
-                    $tokens[$i]['bracket_closer']      = $i;
-                    $tokens[$opener]['bracket_opener'] = $opener;
-                    $tokens[$opener]['bracket_closer'] = $i;
+                    break;
+                case T_CLOSE_SQUARE_BRACKET:
+                    if (empty($squareOpeners) === false) {
+                        $opener = array_pop($squareOpeners);
+                        $tokens[$i]['bracket_opener']      = $opener;
+                        $tokens[$i]['bracket_closer']      = $i;
+                        $tokens[$opener]['bracket_opener'] = $opener;
+                        $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($tokens[$i]['scope_opener']) === false
+                    ) {
+                        $opener = array_pop($curlyOpeners);
+                        $tokens[$i]['bracket_opener']      = $opener;
+                        $tokens[$i]['bracket_closer']      = $i;
+                        $tokens[$opener]['bracket_opener'] = $opener;
+                        $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
 
@@ -2787,88 +2787,88 @@ 
             }
 
             switch ($this->_tokens[$i]['code']) {
-            case T_BITWISE_AND:
-                $passByReference = true;
-                break;
-            case T_VARIABLE:
-                $currVar = $i;
-                break;
-            case T_ELLIPSIS:
-                $variableLength = true;
-                break;
-            case T_ARRAY_HINT:
-            case T_CALLABLE:
-                $typeHint = $this->_tokens[$i]['content'];
-                break;
-            case T_STRING:
-                // This is a string, so it may be a type hint, but it could
-                // also be a constant used as a default value.
-                $prevComma = false;
-                for ($t = $i; $t >= $opener; $t--) {
-                    if ($this->_tokens[$t]['code'] === T_COMMA) {
-                        $prevComma = $t;
-                        break;
+                case T_BITWISE_AND:
+                    $passByReference = true;
+                    break;
+                case T_VARIABLE:
+                    $currVar = $i;
+                    break;
+                case T_ELLIPSIS:
+                    $variableLength = true;
+                    break;
+                case T_ARRAY_HINT:
+                case T_CALLABLE:
+                    $typeHint = $this->_tokens[$i]['content'];
+                    break;
+                case T_STRING:
+                    // This is a string, so it may be a type hint, but it could
+                    // also be a constant used as a default value.
+                    $prevComma = false;
+                    for ($t = $i; $t >= $opener; $t--) {
+                        if ($this->_tokens[$t]['code'] === T_COMMA) {
+                            $prevComma = $t;
+                            break;
+                        }
                     }
-                }
 
-                if ($prevComma !== false) {
-                    $nextEquals = false;
-                    for ($t = $prevComma; $t < $i; $t++) {
-                        if ($this->_tokens[$t]['code'] === T_EQUAL) {
-                            $nextEquals = $t;
+                    if ($prevComma !== false) {
+                        $nextEquals = false;
+                        for ($t = $prevComma; $t < $i; $t++) {
+                            if ($this->_tokens[$t]['code'] === T_EQUAL) {
+                                $nextEquals = $t;
+                                break;
+                            }
+                        }
+
+                        if ($nextEquals !== false) {
                             break;
                         }
                     }
 
-                    if ($nextEquals !== false) {
-                        break;
+                    if ($defaultStart === null) {
+                        $typeHint .= $this->_tokens[$i]['content'];
+                    }
+                    break;
+                case T_NS_SEPARATOR:
+                    // Part of a type hint or default value.
+                    if ($defaultStart === null) {
+                        $typeHint .= $this->_tokens[$i]['content'];
+                    }
+                    break;
+                case T_CLOSE_PARENTHESIS:
+                case T_COMMA:
+                    // If it's null, then there must be no parameters for this
+                    // method.
+                    if ($currVar === null) {
+                        continue;
                     }
-                }
-
-                if ($defaultStart === null) {
-                    $typeHint .= $this->_tokens[$i]['content'];
-                }
-                break;
-            case T_NS_SEPARATOR:
-                // Part of a type hint or default value.
-                if ($defaultStart === null) {
-                    $typeHint .= $this->_tokens[$i]['content'];
-                }
-                break;
-            case T_CLOSE_PARENTHESIS:
-            case T_COMMA:
-                // If it's null, then there must be no parameters for this
-                // method.
-                if ($currVar === null) {
-                    continue;
-                }
 
-                $vars[$paramCount]         = array();
-                $vars[$paramCount]['name'] = $this->_tokens[$currVar]['content'];
+                    $vars[$paramCount]         = array();
+                    $vars[$paramCount]['name'] = $this->_tokens[$currVar]['content'];
 
-                if ($defaultStart !== null) {
-                    $vars[$paramCount]['default']
-                        = $this->getTokensAsString(
-                            $defaultStart,
-                            ($i - $defaultStart)
-                        );
-                }
+                    if ($defaultStart !== null) {
+                        $vars[$paramCount]['default']
+                            = $this->getTokensAsString(
+                                $defaultStart,
+                                ($i - $defaultStart)
+                            );
+                    }
 
-                $vars[$paramCount]['pass_by_reference'] = $passByReference;
-                $vars[$paramCount]['variable_length']   = $variableLength;
-                $vars[$paramCount]['type_hint']         = $typeHint;
+                    $vars[$paramCount]['pass_by_reference'] = $passByReference;
+                    $vars[$paramCount]['variable_length']   = $variableLength;
+                    $vars[$paramCount]['type_hint']         = $typeHint;
 
-                // Reset the vars, as we are about to process the next parameter.
-                $defaultStart    = null;
-                $passByReference = false;
-                $variableLength  = false;
-                $typeHint        = '';
+                    // Reset the vars, as we are about to process the next parameter.
+                    $defaultStart    = null;
+                    $passByReference = false;
+                    $variableLength  = false;
+                    $typeHint        = '';
 
-                $paramCount++;
-                break;
-            case T_EQUAL:
-                $defaultStart = ($i + 1);
-                break;
+                    $paramCount++;
+                    break;
+                case T_EQUAL:
+                    $defaultStart = ($i + 1);
+                    break;
             }//end switch
         }//end for
 
@@ -2930,27 +2930,27 @@ 
             }
 
             switch ($this->_tokens[$i]['code']) {
-            case T_PUBLIC:
-                $scope          = 'public';
-                $scopeSpecified = true;
-                break;
-            case T_PRIVATE:
-                $scope          = 'private';
-                $scopeSpecified = true;
-                break;
-            case T_PROTECTED:
-                $scope          = 'protected';
-                $scopeSpecified = true;
-                break;
-            case T_ABSTRACT:
-                $isAbstract = true;
-                break;
-            case T_FINAL:
-                $isFinal = true;
-                break;
-            case T_STATIC:
-                $isStatic = true;
-                break;
+                case T_PUBLIC:
+                    $scope          = 'public';
+                    $scopeSpecified = true;
+                    break;
+                case T_PRIVATE:
+                    $scope          = 'private';
+                    $scopeSpecified = true;
+                    break;
+                case T_PROTECTED:
+                    $scope          = 'protected';
+                    $scopeSpecified = true;
+                    break;
+                case T_ABSTRACT:
+                    $isAbstract = true;
+                    break;
+                case T_FINAL:
+                    $isFinal = true;
+                    break;
+                case T_STATIC:
+                    $isStatic = true;
+                    break;
             }//end switch
         }//end for
 
@@ -3040,21 +3040,21 @@ 
             }
 
             switch ($this->_tokens[$i]['code']) {
-            case T_PUBLIC:
-                $scope          = 'public';
-                $scopeSpecified = true;
-                break;
-            case T_PRIVATE:
-                $scope          = 'private';
-                $scopeSpecified = true;
-                break;
-            case T_PROTECTED:
-                $scope          = 'protected';
-                $scopeSpecified = true;
-                break;
-            case T_STATIC:
-                $isStatic = true;
-                break;
+                case T_PUBLIC:
+                    $scope          = 'public';
+                    $scopeSpecified = true;
+                    break;
+                case T_PRIVATE:
+                    $scope          = 'private';
+                    $scopeSpecified = true;
+                    break;
+                case T_PROTECTED:
+                    $scope          = 'protected';
+                    $scopeSpecified = true;
+                    break;
+                case T_STATIC:
+                    $isStatic = true;
+                    break;
             }
         }//end for
 
@@ -3108,13 +3108,13 @@ 
             }
 
             switch ($this->_tokens[$i]['code']) {
-            case T_ABSTRACT:
-                $isAbstract = true;
-                break;
+                case T_ABSTRACT:
+                    $isAbstract = true;
+                    break;
 
-            case T_FINAL:
-                $isFinal = true;
-                break;
+                case T_FINAL:
+                    $isFinal = true;
+                    break;
             }
         }//end for
 

Spacing +37 added lines, -37 removed lines

@@ -437,7 +437,7 @@ 
      *
      * @return void
      */
-    public function start($contents=null)
+    public function start($contents = null)
     {
         $this->_errors       = array();
         $this->_warnings     = array();
@@ -644,7 +644,7 @@ 
      *
      * @return void
      */
-    private function _parse($contents=null)
+    private function _parse($contents = null)
     {
         if ($contents === null && empty($this->_tokens) === false) {
             // File has already been parsed.
@@ -747,7 +747,7 @@ 
      * @return string
      * @throws PHP_CodeSniffer_Exception If $file could not be opened.
      */
-    public static function detectLineEndings($file, $contents=null)
+    public static function detectLineEndings($file, $contents = null)
     {
         if ($contents === null) {
             // Determine the newline character being used in this file.
@@ -808,10 +808,10 @@ 
     public function addError(
         $error,
         $stackPtr,
-        $code='',
-        $data=array(),
-        $severity=0,
-        $fixable=false
+        $code = '',
+        $data = array(),
+        $severity = 0,
+        $fixable = false
     ) {
         if ($stackPtr === null) {
             $line   = 1;
@@ -842,10 +842,10 @@ 
     public function addWarning(
         $warning,
         $stackPtr,
-        $code='',
-        $data=array(),
-        $severity=0,
-        $fixable=false
+        $code = '',
+        $data = array(),
+        $severity = 0,
+        $fixable = false
     ) {
         if ($stackPtr === null) {
             $line   = 1;
@@ -875,9 +875,9 @@ 
     public function addErrorOnLine(
         $error,
         $line,
-        $code='',
-        $data=array(),
-        $severity=0
+        $code = '',
+        $data = array(),
+        $severity = 0
     ) {
         return $this->_addError($error, $line, 1, $code, $data, $severity, false);
 
@@ -899,9 +899,9 @@ 
     public function addWarningOnLine(
         $warning,
         $line,
-        $code='',
-        $data=array(),
-        $severity=0
+        $code = '',
+        $data = array(),
+        $severity = 0
     ) {
         return $this->_addWarning($warning, $line, 1, $code, $data, $severity, false);
 
@@ -925,9 +925,9 @@ 
     public function addFixableError(
         $error,
         $stackPtr,
-        $code='',
-        $data=array(),
-        $severity=0
+        $code = '',
+        $data = array(),
+        $severity = 0
     ) {
         $recorded = $this->addError($error, $stackPtr, $code, $data, $severity, true);
         if ($recorded === true && $this->fixer->enabled === true) {
@@ -956,9 +956,9 @@ 
     public function addFixableWarning(
         $warning,
         $stackPtr,
-        $code='',
-        $data=array(),
-        $severity=0
+        $code = '',
+        $data = array(),
+        $severity = 0
     ) {
         $recorded = $this->addWarning($warning, $stackPtr, $code, $data, $severity, true);
         if ($recorded === true && $this->fixer->enabled === true) {
@@ -1417,7 +1417,7 @@ 
      * @throws PHP_CodeSniffer_Exception If the file cannot be processed.
      * @return array
      */
-    public static function tokenizeString($string, $tokenizer, $eolChar='\n', $tabWidth=null, $encoding=null)
+    public static function tokenizeString($string, $tokenizer, $eolChar = '\n', $tabWidth = null, $encoding = null)
     {
         // Minified files often have a very large number of characters per line
         // and cause issues when tokenizing.
@@ -1891,8 +1891,8 @@ 
         $tokenizer,
         $eolChar,
         $stackPtr,
-        $depth=1,
-        &$ignore=0
+        $depth = 1,
+        &$ignore = 0
     ) {
         if (PHP_CODESNIFFER_VERBOSITY > 1) {
             echo str_repeat("\t", $depth);
@@ -3276,10 +3276,10 @@ 
     public function findPrevious(
         $types,
         $start,
-        $end=null,
-        $exclude=false,
-        $value=null,
-        $local=false
+        $end = null,
+        $exclude = false,
+        $value = null,
+        $local = false
     ) {
         $types = (array) $types;
 
@@ -3357,10 +3357,10 @@ 
     public function findNext(
         $types,
         $start,
-        $end=null,
-        $exclude=false,
-        $value=null,
-        $local=false
+        $end = null,
+        $exclude = false,
+        $value = null,
+        $local = false
     ) {
         $types = (array) $types;
 
@@ -3403,7 +3403,7 @@ 
      *
      * @return int
      */
-    public function findStartOfStatement($start, $ignore=null)
+    public function findStartOfStatement($start, $ignore = null)
     {
         $endTokens = PHP_CodeSniffer_Tokens::$blockOpeners;
 
@@ -3468,7 +3468,7 @@ 
      *
      * @return int
      */
-    public function findEndOfStatement($start, $ignore=null)
+    public function findEndOfStatement($start, $ignore = null)
     {
         $endTokens = array(
                       T_COLON                => true,
@@ -3552,7 +3552,7 @@ 
      *
      * @return int | bool
      */
-    public function findFirstOnLine($types, $start, $exclude=false, $value=null)
+    public function findFirstOnLine($types, $start, $exclude = false, $value = null)
     {
         if (is_array($types) === false) {
             $types = array($types);

CodeSniffer/Fixer.php

Doc Comments +2 added lines, -2 removed lines

@@ -356,7 +356,7 @@ 
     /**
      * Start recording actions for a changeset.
      *
-     * @return void
+     * @return false|null
      */
     public function beginChangeset()
     {
@@ -383,7 +383,7 @@ 
     /**
      * Stop recording actions for a changeset, and apply logged changes.
      *
-     * @return boolean
+     * @return false|null
      */
     public function endChangeset()
     {

Indentation +3 added lines, -3 removed lines

@@ -529,9 +529,9 @@
 
         if (isset($this->_oldTokenValues[$stackPtr]) === false) {
             $this->_oldTokenValues[$stackPtr] = array(
-                                                 'curr' => $content,
-                                                 'prev' => $this->_tokens[$stackPtr],
-                                                 'loop' => $this->loops,
+                                                    'curr' => $content,
+                                                    'prev' => $this->_tokens[$stackPtr],
+                                                    'loop' => $this->loops,
                                                 );
         } else {
             if ($this->_oldTokenValues[$stackPtr]['prev'] === $content

Switch Indentation +8 added lines, -8 removed lines

@@ -283,14 +283,14 @@
         foreach ($diffLines as $line) {
             if (isset($line[0]) === true) {
                 switch ($line[0]) {
-                case '-':
-                    $diff[] = "\033[31m$line\033[0m";
-                    break;
-                case '+':
-                    $diff[] = "\033[32m$line\033[0m";
-                    break;
-                default:
-                    $diff[] = $line;
+                    case '-':
+                        $diff[] = "\033[31m$line\033[0m";
+                        break;
+                    case '+':
+                        $diff[] = "\033[32m$line\033[0m";
+                        break;
+                    default:
+                        $diff[] = $line;
                 }
             }
         }

Spacing +2 added lines, -2 removed lines

@@ -237,7 +237,7 @@ 
      *
      * @return string
      */
-    public function generateDiff($filePath=null, $colors=true)
+    public function generateDiff($filePath = null, $colors = true)
     {
         if ($filePath === null) {
             $filePath = $this->_currentFile->getFilename();
@@ -654,7 +654,7 @@ 
      *
      * @return bool If the change was accepted.
      */
-    public function substrToken($stackPtr, $start, $length=null)
+    public function substrToken($stackPtr, $start, $length = null)
     {
         $current = $this->getTokenContent($stackPtr);
 

CodeSniffer/Reports/Cbf.php

Doc Comments +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
      * @param boolean              $showSources Show sources?
      * @param int                  $width       Maximum allowed line width.
      *
-     * @return boolean
+     * @return null|boolean
      */
     public function generateFileReport(
         $report,

Spacing +5 added lines, -5 removed lines

@@ -54,8 +54,8 @@ 
     public function generateFileReport(
         $report,
         PHP_CodeSniffer_File $phpcsFile,
-        $showSources=false,
-        $width=80
+        $showSources = false,
+        $width = 80
     ) {
         $cliValues = $phpcsFile->phpcs->cli->getCommandLineValues();
         $errors    = $phpcsFile->getFixableCount();
@@ -138,9 +138,9 @@ 
         $totalErrors,
         $totalWarnings,
         $totalFixable,
-        $showSources=false,
-        $width=80,
-        $toScreen=true
+        $showSources = false,
+        $width = 80,
+        $toScreen = true
     ) {
         echo $cachedData;
         echo "Fixed $totalFiles files".PHP_EOL;

CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/JumbledIncrementerSniff.php

Doc Comments +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
     /**
      * Registers the tokens that this sniff wants to listen for.
      *
-     * @return int[]
+     * @return integer[]
      */
     public function register()
     {

CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/UselessOverridingMethodSniff.php

Doc Comments +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
     /**
      * Registers the tokens that this sniff wants to listen for.
      *
-     * @return int[]
+     * @return integer[]
      */
     public function register()
     {

Indentation +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
                                 T_VARIABLE,
                                 T_LNUMBER,
                                 T_CONSTANT_ENCAPSED_STRING,
-                               );
+                                );
 
         $parameters       = array('');
         $parenthesisCount = 1;

CodeSniffer/Standards/Generic/Sniffs/Commenting/DocCommentSniff.php

Doc Comments +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return string[]
      */
     public function register()
     {

Indentation +9 added lines, -9 removed lines

@@ -32,9 +32,9 @@ 
      * @var array
      */
     public $supportedTokenizers = array(
-                                   'PHP',
-                                   'JS',
-                                  );
+                                    'PHP',
+                                    'JS',
+                                    );
 
 
     /**
@@ -65,9 +65,9 @@ 
         $commentEnd   = $tokens[$stackPtr]['comment_closer'];
 
         $empty = array(
-                  T_DOC_COMMENT_WHITESPACE,
-                  T_DOC_COMMENT_STAR,
-                 );
+                    T_DOC_COMMENT_WHITESPACE,
+                    T_DOC_COMMENT_STAR,
+                    );
 
         $short = $phpcsFile->findNext($empty, ($stackPtr + 1), $commentEnd, true);
         if ($short === false) {
@@ -310,9 +310,9 @@ 
                 if ($padding !== $required) {
                     $error = 'Tag value indented incorrectly; expected %s spaces but found %s';
                     $data  = array(
-                              $required,
-                              $padding,
-                             );
+                                $required,
+                                $padding,
+                                );
 
                     $fix = $phpcsFile->addFixableError($error, ($tag + 1), 'TagValueIndent', $data);
                     if ($fix === true) {

CodeSniffer/Standards/Generic/Sniffs/Debug/ClosureLinterSniff.php

Doc Comments +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
     /**
      * Returns the token types that this sniff is interested in.
      *
-     * @return int[]
+     * @return integer[]
      */
     public function register()
     {
@@ -71,7 +71,7 @@ 
      * @param int                  $stackPtr  The position in the stack where
      *                                        the token was found.
      *
-     * @return void
+     * @return null|integer
      * @throws PHP_CodeSniffer_Exception If jslint.js could not be run
      */
     public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)

Indentation +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
             $data    = array(
                         $code,
                         $error,
-                       );
+                        );
             if (in_array($code, $this->errorCodes) === true) {
                 $phpcsFile->addErrorOnLine($message, $line, 'ExternalToolError', $data);
             } else {