Symplify / PHP7_CodeSniffer

src/Files/FileList.php

Doc Comments +1 added lines, -1 removed lines

@@ -193,7 +193,7 @@
     /**
      * Return the file path of the current file being processed.
      *
-     * @return void
+     * @return string
      */
     function key()
     {

Spacing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
      *
      * @return void
      */
-    public function addFile($path, $file=null)
+    public function addFile($path, $file = null)
     {
         // No filtering is done for STDIN.
         if ($path === 'STDIN'

Unused Use Statements -1 removed lines

@@ -10,7 +10,6 @@
 namespace Symplify\PHP7_CodeSniffer\Reports;
 
 use Symplify\PHP7_CodeSniffer\Files\File;
-use Symplify\PHP7_CodeSniffer\Util;
 
 class Diff implements Report
 {

src/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);
 

src/Sniffs/AbstractPatternSniff.php

Switch Indentation +18 added lines, -18 removed lines

@@ -890,26 +890,26 @@
         $nestedBraces      = 0;
         for ($start = $from; $start >= 0; $start--) {
             switch ($pattern[$start]) {
-            case '(':
-                if ($nestedParenthesis === 0) {
-                    $skip['to'] = 'parenthesis_closer';
-                }
+                case '(':
+                    if ($nestedParenthesis === 0) {
+                        $skip['to'] = 'parenthesis_closer';
+                    }
 
-                $nestedParenthesis--;
-                break;
-            case '{':
-                if ($nestedBraces === 0) {
-                    $skip['to'] = 'scope_closer';
-                }
+                    $nestedParenthesis--;
+                    break;
+                case '{':
+                    if ($nestedBraces === 0) {
+                        $skip['to'] = 'scope_closer';
+                    }
 
-                $nestedBraces--;
-                break;
-            case '}':
-                $nestedBraces++;
-                break;
-            case ')':
-                $nestedParenthesis++;
-                break;
+                    $nestedBraces--;
+                    break;
+                case '}':
+                    $nestedBraces++;
+                    break;
+                case ')':
+                    $nestedParenthesis++;
+                    break;
             }//end switch
 
             if (isset($skip['to']) === true) {

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
      *
      * @param boolean $ignoreComments If true, comments will be ignored.
      */
-    public function __construct($ignoreComments=null)
+    public function __construct($ignoreComments = null)
     {
         // This is here for backwards compatibility.
         if ($ignoreComments !== null) {

Doc Comments +3 added lines, -3 removed lines

@@ -177,7 +177,7 @@ 
     /**
      * Processes the test.
      *
-     * @param Symplify\PHP7_CodeSniffer_File $phpcsFile The Symplify\PHP7_CodeSniffer file where the
+     * @param File $phpcsFile The Symplify\PHP7_CodeSniffer file where the
      *                                        token occurred.
      * @param int                  $stackPtr  The position in the tokens stack
      *                                        where the listening token type was
@@ -247,7 +247,7 @@ 
      *                                          for checking, which includes are
      *                                          parsed token representation of the
      *                                          pattern.
-     * @param Symplify\PHP7_CodeSniffer_File $phpcsFile   The Symplify\PHP7_CodeSniffer file where the
+     * @param File $phpcsFile   The Symplify\PHP7_CodeSniffer file where the
      *                                          token occurred.
      * @param int                  $stackPtr    The position in the tokens stack where
      *                                          the listening token type was found.
@@ -746,7 +746,7 @@ 
      /**
       * Processes any tokens registered with registerSupplementary().
       *
-      * @param Symplify\PHP7_CodeSniffer_File $phpcsFile The Symplify\PHP7_CodeSniffer file where to
+      * @param File $phpcsFile The Symplify\PHP7_CodeSniffer file where to
       *                                        process the skip.
       * @param int                  $stackPtr  The position in the tokens stack to
       *                                        process.

Unused Use Statements -1 removed lines

@@ -10,7 +10,6 @@
 namespace Symplify\PHP7_CodeSniffer\Sniffs;
 
 use Symplify\PHP7_CodeSniffer\Files\File;
-use Symplify\PHP7_CodeSniffer\Config;
 use Symplify\PHP7_CodeSniffer\Util\Tokens;
 use Symplify\PHP7_CodeSniffer\Tokenizers\PHP;
 use Symplify\PHP7_CodeSniffer\Exceptions\RuntimeException;

Indentation +18 added lines, -18 removed lines

@@ -97,9 +97,9 @@ 
             $listenTypes[] = $tokenType;
 
             $patternArray = array(
-                             'listen_pos'   => $pos,
-                             'pattern'      => $parsedPattern,
-                             'pattern_code' => $pattern,
+                                'listen_pos'   => $pos,
+                                'pattern'      => $parsedPattern,
+                                'pattern_code' => $pattern,
                             );
 
             if (isset($this->_parsedPatterns[$tokenType]) === false) {
@@ -743,17 +743,17 @@ 
     }//end registerSupplementary()
 
 
-     /**
-      * Processes any tokens registered with registerSupplementary().
-      *
-      * @param Symplify\PHP7_CodeSniffer_File $phpcsFile The Symplify\PHP7_CodeSniffer file where to
-      *                                        process the skip.
-      * @param int                  $stackPtr  The position in the tokens stack to
-      *                                        process.
-      *
-      * @return void
-      * @see    registerSupplementary()
-      */
+        /**
+         * Processes any tokens registered with registerSupplementary().
+         *
+         * @param Symplify\PHP7_CodeSniffer_File $phpcsFile The Symplify\PHP7_CodeSniffer file where to
+         *                                        process the skip.
+         * @param int                  $stackPtr  The position in the tokens stack to
+         *                                        process.
+         *
+         * @return void
+         * @see    registerSupplementary()
+         */
     protected function processSupplementary(File $phpcsFile, $stackPtr)
     {
 
@@ -926,10 +926,10 @@ 
         $patterns = array();
         foreach ($tokens as $patternInfo) {
             $patterns[] = array(
-                           'type'  => 'token',
-                           'token' => $patternInfo['code'],
-                           'value' => $patternInfo['content'],
-                          );
+                            'type'  => 'token',
+                            'token' => $patternInfo['code'],
+                            'value' => $patternInfo['content'],
+                            );
         }
 
         return $patterns;

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

@@ -117,7 +117,7 @@ 
     /**
      * Processes the tokens that this test is listening for.
      *
-     * @param Symplify\PHP7_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.
      *
@@ -147,7 +147,7 @@ 
      * Processes a token that is found within the scope that this test is
      * listening to.
      *
-     * @param Symplify\PHP7_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.
      * @param int                  $currScope The position in the tokens array that
@@ -163,7 +163,7 @@ 
      * Processes a token that is found within the scope that this test is
      * listening to.
      *
-     * @param Symplify\PHP7_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.
      *

src/Sniffs/AbstractVariableSniff.php

Indentation +9 added lines, -9 removed lines

@@ -67,17 +67,17 @@
     public function __construct()
     {
         $scopes = array(
-                   T_CLASS,
-                   T_TRAIT,
-                   T_INTERFACE,
-                  );
+                    T_CLASS,
+                    T_TRAIT,
+                    T_INTERFACE,
+                    );
 
         $listen = array(
-                   T_FUNCTION,
-                   T_VARIABLE,
-                   T_DOUBLE_QUOTED_STRING,
-                   T_HEREDOC,
-                  );
+                    T_FUNCTION,
+                    T_VARIABLE,
+                    T_DOUBLE_QUOTED_STRING,
+                    T_HEREDOC,
+                    );
 
         parent::__construct($scopes, $listen, true);
 

Doc Comments +5 added lines, -5 removed lines

@@ -69,7 +69,7 @@ 
     /**
      * Processes the token in the specified Symplify\PHP7_CodeSniffer_File.
      *
-     * @param Symplify\PHP7_CodeSniffer_File $phpcsFile The Symplify\PHP7_CodeSniffer file where this
+     * @param File $phpcsFile The Symplify\PHP7_CodeSniffer file where this
      *                                        token was found.
      * @param int                  $stackPtr  The position where the token was found.
      * @param array                $currScope The current scope opener token.
@@ -143,7 +143,7 @@ 
     /**
      * Processes the token outside the scope in the file.
      *
-     * @param Symplify\PHP7_CodeSniffer_File $phpcsFile The Symplify\PHP7_CodeSniffer file where this
+     * @param File $phpcsFile The Symplify\PHP7_CodeSniffer file where this
      *                                        token was found.
      * @param int                  $stackPtr  The position where the token was found.
      *
@@ -171,7 +171,7 @@ 
     /**
      * Called to process class member vars.
      *
-     * @param Symplify\PHP7_CodeSniffer_File $phpcsFile The Symplify\PHP7_CodeSniffer file where this
+     * @param File $phpcsFile The Symplify\PHP7_CodeSniffer file where this
      *                                        token was found.
      * @param int                  $stackPtr  The position where the token was found.
      *
@@ -183,7 +183,7 @@ 
     /**
      * Called to process normal member vars.
      *
-     * @param Symplify\PHP7_CodeSniffer_File $phpcsFile The Symplify\PHP7_CodeSniffer file where this
+     * @param File $phpcsFile The Symplify\PHP7_CodeSniffer file where this
      *                                        token was found.
      * @param int                  $stackPtr  The position where the token was found.
      *
@@ -198,7 +198,7 @@ 
      * Note that there may be more than one variable in the string, which will
      * result only in one call for the string or one call per line for heredocs.
      *
-     * @param Symplify\PHP7_CodeSniffer_File $phpcsFile The Symplify\PHP7_CodeSniffer file where this
+     * @param File $phpcsFile The Symplify\PHP7_CodeSniffer file where this
      *                                        token was found.
      * @param int                  $stackPtr  The position where the double quoted
      *                                        string was found.

Unused Use Statements -1 removed lines

@@ -16,7 +16,6 @@
 namespace Symplify\PHP7_CodeSniffer\Sniffs;
 
 use Symplify\PHP7_CodeSniffer\Files\File;
-use Symplify\PHP7_CodeSniffer\Exceptions\RuntimeException;
 
 abstract class AbstractVariableSniff extends AbstractScopeSniff
 {

src/Files/File.php

Indentation +56 added lines, -56 removed lines

@@ -780,11 +780,11 @@ 
             }
 
             $checkCodes = array(
-                           $sniffCode,
-                           $parts[0].'.'.$parts[1].'.'.$parts[2],
-                           $parts[0].'.'.$parts[1],
-                           $parts[0],
-                          );
+                            $sniffCode,
+                            $parts[0].'.'.$parts[1].'.'.$parts[2],
+                            $parts[0].'.'.$parts[1],
+                            $parts[0],
+                            );
         }//end if
 
         // Filter out any messages for sniffs that shouldn't have run
@@ -860,8 +860,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
@@ -908,12 +908,12 @@ 
         }
 
         $messages[$line][$column][] = array(
-                                       'message'  => $message,
-                                       'source'   => $sniffCode,
-                                       'listener' => $this->activeListener,
-                                       'severity' => $severity,
-                                       'fixable'  => $fixable,
-                                      );
+                                        'message'  => $message,
+                                        'source'   => $sniffCode,
+                                        'listener' => $this->activeListener,
+                                        'severity' => $severity,
+                                        'fixable'  => $fixable,
+                                        );
 
         if (PHP_CODESNIFFER_VERBOSITY > 1
             && $this->fixer->enabled === true
@@ -1328,16 +1328,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;
@@ -1383,7 +1383,7 @@ 
                 'is_final'        => $isFinal,
                 'is_static'       => $isStatic,
                 'is_closure'      => $isClosure,
-               );
+                );
 
     }//end getMethodProperties()
 
@@ -1441,16 +1441,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;
@@ -1484,7 +1484,7 @@ 
                 'scope'           => $scope,
                 'scope_specified' => $scopeSpecified,
                 'is_static'       => $isStatic,
-               );
+                );
 
     }//end getMemberProperties()
 
@@ -1514,12 +1514,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;
@@ -1543,7 +1543,7 @@ 
         return array(
                 'is_abstract' => $isAbstract,
                 'is_final'    => $isFinal,
-               );
+                );
 
     }//end getClassProperties()
 
@@ -1893,17 +1893,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;
@@ -2116,9 +2116,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 +112 added lines, -112 removed lines

@@ -1209,88 +1209,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
 
@@ -1352,27 +1352,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
 
@@ -1462,21 +1462,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
 
@@ -1530,13 +1530,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 +25 added lines, -25 removed lines

@@ -572,9 +572,9 @@ 
         $error,
         $stackPtr,
         $code,
-        $data=array(),
-        $severity=0,
-        $fixable=false
+        $data = array(),
+        $severity = 0,
+        $fixable = false
     ) {
         if ($stackPtr === null) {
             $line   = 1;
@@ -606,9 +606,9 @@ 
         $warning,
         $stackPtr,
         $code,
-        $data=array(),
-        $severity=0,
-        $fixable=false
+        $data = array(),
+        $severity = 0,
+        $fixable = false
     ) {
         if ($stackPtr === null) {
             $line   = 1;
@@ -639,8 +639,8 @@ 
         $error,
         $line,
         $code,
-        $data=array(),
-        $severity=0
+        $data = array(),
+        $severity = 0
     ) {
         return $this->addMessage(true, $error, $line, 1, $code, $data, $severity, false);
 
@@ -663,8 +663,8 @@ 
         $warning,
         $line,
         $code,
-        $data=array(),
-        $severity=0
+        $data = array(),
+        $severity = 0
     ) {
         return $this->addMessage(false, $warning, $line, 1, $code, $data, $severity, false);
 
@@ -689,8 +689,8 @@ 
         $error,
         $stackPtr,
         $code,
-        $data=array(),
-        $severity=0
+        $data = array(),
+        $severity = 0
     ) {
         $recorded = $this->addError($error, $stackPtr, $code, $data, $severity, true);
         if ($recorded === true && $this->fixer->enabled === true) {
@@ -720,8 +720,8 @@ 
         $warning,
         $stackPtr,
         $code,
-        $data=array(),
-        $severity=0
+        $data = array(),
+        $severity = 0
     ) {
         $recorded = $this->addWarning($warning, $stackPtr, $code, $data, $severity, true);
         if ($recorded === true && $this->fixer->enabled === true) {
@@ -1698,10 +1698,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;
 
@@ -1779,10 +1779,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;
 
@@ -1825,7 +1825,7 @@ 
      *
      * @return int
      */
-    public function findStartOfStatement($start, $ignore=null)
+    public function findStartOfStatement($start, $ignore = null)
     {
         $endTokens = Util\Tokens::$blockOpeners;
 
@@ -1890,7 +1890,7 @@ 
      *
      * @return int
      */
-    public function findEndOfStatement($start, $ignore=null)
+    public function findEndOfStatement($start, $ignore = null)
     {
         $endTokens = array(
                       T_COLON                => true,
@@ -1974,7 +1974,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);

Doc Comments +2 added lines, -2 removed lines

@@ -530,7 +530,7 @@ 
     /**
      * Returns the token stack for this file.
      *
-     * @return array
+     * @return string
      */
     public function getTokens()
     {
@@ -1692,7 +1692,7 @@ 
      *                           will not be checked. IE. checking will stop
      *                           at the previous semi-colon found.
      *
-     * @return int|bool
+     * @return integer
      * @see    findNext()
      */
     public function findPrevious(

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);
 

src/Runner.php

Indentation +3 added lines, -3 removed lines

@@ -402,8 +402,8 @@ 
                     throw new RuntimeException('Failed to create child process');
                 } else if ($pid !== 0) {
                     $childProcs[] = array(
-                                     'pid' => $pid,
-                                     'out' => $childOutFilename,
+                                        'pid' => $pid,
+                                        'out' => $childOutFilename,
                                     );
                 } else {
                     // Move forward to the start of the batch.
@@ -451,7 +451,7 @@ 
                                     'totalErrors'   => $this->reporter->totalErrors,
                                     'totalWarnings' => $this->reporter->totalWarnings,
                                     'totalFixable'  => $this->reporter->totalFixable,
-                                   );
+                                    );
 
                     $output  = '<'.'?php'."\n".' $childOutput = ';
                     $output .= var_export($childOutput, true);

Switch Indentation +13 added lines, -13 removed lines

@@ -607,19 +607,19 @@
                 $input = trim($input);
 
                 switch ($input) {
-                case 's':
-                    break(2);
-                case 'q':
-                    exit(0);
-                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.
-                    $file->ruleset->populateTokenListeners();
-                    $file->reloadContent();
-                    $file->process();
-                    $this->reporter->cacheFileReport($file, $this->config);
-                    break;
+                    case 's':
+                        break(2);
+                    case 'q':
+                        exit(0);
+                    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.
+                        $file->ruleset->populateTokenListeners();
+                        $file->reloadContent();
+                        $file->process();
+                        $this->reporter->cacheFileReport($file, $this->config);
+                        break;
                 }
             }//end while
         }//end if

src/Ruleset.php

Indentation +11 added lines, -11 removed lines

@@ -846,7 +846,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();
@@ -1084,8 +1084,8 @@ 
             $patterns       = $this->getIgnorePatterns($sniffCode);
             foreach ($patterns as $pattern => $type) {
                 $replacements = array(
-                                 '\\,' => ',',
-                                 '*'   => '.*',
+                                    '\\,' => ',',
+                                    '*'   => '.*',
                                 );
 
                 $ignorePatterns[] = strtr($pattern, $replacements);
@@ -1095,8 +1095,8 @@ 
             $patterns        = $this->getIncludePatterns($sniffCode);
             foreach ($patterns as $pattern => $type) {
                 $replacements = array(
-                                 '\\,' => ',',
-                                 '*'   => '.*',
+                                    '\\,' => ',',
+                                    '*'   => '.*',
                                 );
 
                 $includePatterns[] = strtr($pattern, $replacements);
@@ -1109,12 +1109,12 @@ 
 
                 if (isset($this->tokenListeners[$token][$sniffClass]) === false) {
                     $this->tokenListeners[$token][$sniffClass] = array(
-                                                                  'class'      => $sniffClass,
-                                                                  'source'     => $sniffCode,
-                                                                  'tokenizers' => $tokenizers,
-                                                                  'ignore'     => $ignorePatterns,
-                                                                  'include'    => $includePatterns,
-                                                                 );
+                                                                    'class'      => $sniffClass,
+                                                                    'source'     => $sniffCode,
+                                                                    'tokenizers' => $tokenizers,
+                                                                    'ignore'     => $ignorePatterns,
+                                                                    'include'    => $includePatterns,
+                                                                    );
                 }
             }
         }//end foreach

Spacing +7 added lines, -7 removed lines

@@ -261,7 +261,7 @@ 
      * @return string[]
      * @throws RuntimeException If the ruleset path is invalid.
      */
-    public function processRuleset($rulesetPath, $depth=0)
+    public function processRuleset($rulesetPath, $depth = 0)
     {
         $rulesetPath = Util\Common::realpath($rulesetPath);
         if (PHP_CODESNIFFER_VERBOSITY > 1) {
@@ -506,7 +506,7 @@ 
      *
      * @return array
      */
-    private function expandSniffDirectory($directory, $depth=0)
+    private function expandSniffDirectory($directory, $depth = 0)
     {
         $sniffs = array();
 
@@ -569,7 +569,7 @@ 
      * @return array
      * @throws RuntimeException 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.
@@ -751,7 +751,7 @@ 
      * @return void
      * @throws RuntimeException If rule settings are invalid.
      */
-    private function processRule($rule, $newSniffs, $depth=0)
+    private function processRule($rule, $newSniffs, $depth = 0)
     {
         $ref  = (string) $rule['ref'];
         $todo = array($ref);
@@ -861,7 +861,7 @@ 
                         foreach (explode(',', $value) as $val) {
                             $v = '';
 
-                            list($k,$v) = explode('=>', $val.'=>');
+                            list($k, $v) = explode('=>', $val.'=>');
                             if ($v !== '') {
                                 $values[$k] = $v;
                             } else {
@@ -1166,7 +1166,7 @@ 
      *
      * @return array
      */
-    public function getIgnorePatterns($listener=null)
+    public function getIgnorePatterns($listener = null)
     {
         if ($listener === null) {
             return $this->ignorePatterns;
@@ -1192,7 +1192,7 @@ 
      *
      * @return array
      */
-    public function getIncludePatterns($listener=null)
+    public function getIncludePatterns($listener = null)
     {
         if ($listener === null) {
             return $this->includePatterns;