gravityview / GravityView

vendor/squizlabs/php_codesniffer/src/Files/File.php

Doc Comments +2 added lines, -2 removed lines

@@ -705,7 +705,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.
      *
@@ -729,7 +729,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
      *                         will be converted into the default severity level.
      *

Indentation +2461 added lines, -2461 removed lines

@@ -19,2467 +19,2467 @@
 class File
 {
 
-    /**
-     * The absolute path to the file associated with this object.
-     *
-     * @var string
-     */
-    public $path = '';
-
-    /**
-     * The content of the file.
-     *
-     * @var string
-     */
-    protected $content = '';
-
-    /**
-     * The config data for the run.
-     *
-     * @var \PHP_CodeSniffer\Config
-     */
-    public $config = null;
-
-    /**
-     * The ruleset used for the run.
-     *
-     * @var \PHP_CodeSniffer\Ruleset
-     */
-    public $ruleset = null;
-
-    /**
-     * If TRUE, the entire file is being ignored.
-     *
-     * @var boolean
-     */
-    public $ignored = false;
-
-    /**
-     * The EOL character this file uses.
-     *
-     * @var string
-     */
-    public $eolChar = '';
-
-    /**
-     * The Fixer object to control fixing errors.
-     *
-     * @var \PHP_CodeSniffer\Fixer
-     */
-    public $fixer = null;
-
-    /**
-     * The tokenizer being used for this file.
-     *
-     * @var \PHP_CodeSniffer\Tokenizers\Tokenizer
-     */
-    public $tokenizer = null;
-
-    /**
-     * The name of the tokenizer being used for this file.
-     *
-     * @var string
-     */
-    public $tokenizerType = 'PHP';
-
-    /**
-     * Was the file loaded from cache?
-     *
-     * If TRUE, the file was loaded from a local cache.
-     * If FALSE, the file was tokenized and processed fully.
-     *
-     * @var boolean
-     */
-    public $fromCache = false;
-
-    /**
-     * The number of tokens in this file.
-     *
-     * Stored here to save calling count() everywhere.
-     *
-     * @var integer
-     */
-    public $numTokens = 0;
-
-    /**
-     * The tokens stack map.
-     *
-     * @var array
-     */
-    protected $tokens = [];
-
-    /**
-     * The errors raised from sniffs.
-     *
-     * @var array
-     * @see getErrors()
-     */
-    protected $errors = [];
-
-    /**
-     * The warnings raised from sniffs.
-     *
-     * @var array
-     * @see getWarnings()
-     */
-    protected $warnings = [];
-
-    /**
-     * The metrics recorded by sniffs.
-     *
-     * @var array
-     * @see getMetrics()
-     */
-    protected $metrics = [];
-
-    /**
-     * The metrics recorded for each token.
-     *
-     * Stops the same metric being recorded for the same token twice.
-     *
-     * @var array
-     * @see getMetrics()
-     */
-    private $metricTokens = [];
-
-    /**
-     * The total number of errors raised.
-     *
-     * @var integer
-     */
-    protected $errorCount = 0;
-
-    /**
-     * The total number of warnings raised.
-     *
-     * @var integer
-     */
-    protected $warningCount = 0;
-
-    /**
-     * The total number of errors and warnings that can be fixed.
-     *
-     * @var integer
-     */
-    protected $fixableCount = 0;
-
-    /**
-     * The total number of errors and warnings that were fixed.
-     *
-     * @var integer
-     */
-    protected $fixedCount = 0;
-
-    /**
-     * An array of sniffs that are being ignored.
-     *
-     * @var array
-     */
-    protected $ignoredListeners = [];
-
-    /**
-     * An array of message codes that are being ignored.
-     *
-     * @var array
-     */
-    protected $ignoredCodes = [];
-
-    /**
-     * An array of sniffs listening to this file's processing.
-     *
-     * @var \PHP_CodeSniffer\Sniffs\Sniff[]
-     */
-    protected $listeners = [];
-
-    /**
-     * The class name of the sniff currently processing the file.
-     *
-     * @var string
-     */
-    protected $activeListener = '';
-
-    /**
-     * An array of sniffs being processed and how long they took.
-     *
-     * @var array
-     */
-    protected $listenerTimes = [];
-
-    /**
-     * A cache of often used config settings to improve performance.
-     *
-     * Storing them here saves 10k+ calls to __get() in the Config class.
-     *
-     * @var array
-     */
-    protected $configCache = [];
-
-
-    /**
-     * Constructs a file.
-     *
-     * @param string                   $path    The absolute path to the file to process.
-     * @param \PHP_CodeSniffer\Ruleset $ruleset The ruleset used for the run.
-     * @param \PHP_CodeSniffer\Config  $config  The config data for the run.
-     *
-     * @return void
-     */
-    public function __construct($path, Ruleset $ruleset, Config $config)
-    {
-        $this->path    = $path;
-        $this->ruleset = $ruleset;
-        $this->config  = $config;
-        $this->fixer   = new Fixer();
-
-        $parts     = explode('.', $path);
-        $extension = array_pop($parts);
-        if (isset($config->extensions[$extension]) === true) {
-            $this->tokenizerType = $config->extensions[$extension];
-        } else {
-            // Revert to default.
-            $this->tokenizerType = 'PHP';
-        }
-
-        $this->configCache['cache']           = $this->config->cache;
-        $this->configCache['sniffs']          = array_map('strtolower', $this->config->sniffs);
-        $this->configCache['exclude']         = array_map('strtolower', $this->config->exclude);
-        $this->configCache['errorSeverity']   = $this->config->errorSeverity;
-        $this->configCache['warningSeverity'] = $this->config->warningSeverity;
-        $this->configCache['recordErrors']    = $this->config->recordErrors;
-        $this->configCache['ignorePatterns']  = $this->ruleset->ignorePatterns;
-        $this->configCache['includePatterns'] = $this->ruleset->includePatterns;
-
-    }//end __construct()
-
-
-    /**
-     * Set the content of the file.
-     *
-     * Setting the content also calculates the EOL char being used.
-     *
-     * @param string $content The file content.
-     *
-     * @return void
-     */
-    public function setContent($content)
-    {
-        $this->content = $content;
-        $this->tokens  = [];
-
-        try {
-            $this->eolChar = Util\Common::detectLineEndings($content);
-        } catch (RuntimeException $e) {
-            $this->addWarningOnLine($e->getMessage(), 1, 'Internal.DetectLineEndings');
-            return;
-        }
-
-    }//end setContent()
-
-
-    /**
-     * Reloads the content of the file.
-     *
-     * By default, we have no idea where our content comes from,
-     * so we can't do anything.
-     *
-     * @return void
-     */
-    public function reloadContent()
-    {
-
-    }//end reloadContent()
-
-
-    /**
-     * Disables caching of this file.
-     *
-     * @return void
-     */
-    public function disableCaching()
-    {
-        $this->configCache['cache'] = false;
-
-    }//end disableCaching()
-
-
-    /**
-     * Starts the stack traversal and tells listeners when tokens are found.
-     *
-     * @return void
-     */
-    public function process()
-    {
-        if ($this->ignored === true) {
-            return;
-        }
-
-        $this->errors       = [];
-        $this->warnings     = [];
-        $this->errorCount   = 0;
-        $this->warningCount = 0;
-        $this->fixableCount = 0;
-
-        $this->parse();
-
-        // Check if tokenizer errors cause this file to be ignored.
-        if ($this->ignored === true) {
-            return;
-        }
-
-        $this->fixer->startFile($this);
-
-        if (PHP_CODESNIFFER_VERBOSITY > 2) {
-            echo "\t*** START TOKEN PROCESSING ***".PHP_EOL;
-        }
-
-        $foundCode        = false;
-        $listenerIgnoreTo = [];
-        $inTests          = defined('PHP_CODESNIFFER_IN_TESTS');
-        $checkAnnotations = $this->config->annotations;
-
-        // Foreach of the listeners that have registered to listen for this
-        // token, get them to process it.
-        foreach ($this->tokens as $stackPtr => $token) {
-            // Check for ignored lines.
-            if ($checkAnnotations === true
-                && ($token['code'] === T_COMMENT
-                || $token['code'] === T_PHPCS_IGNORE_FILE
-                || $token['code'] === T_PHPCS_SET
-                || $token['code'] === T_DOC_COMMENT_STRING
-                || $token['code'] === T_DOC_COMMENT_TAG
-                || ($inTests === true && $token['code'] === T_INLINE_HTML))
-            ) {
-                $commentText      = ltrim($this->tokens[$stackPtr]['content'], ' /*');
-                $commentTextLower = strtolower($commentText);
-                if (strpos($commentText, '@codingStandards') !== false) {
-                    if (strpos($commentText, '@codingStandardsIgnoreFile') !== false) {
-                        // Ignoring the whole file, just a little late.
-                        $this->errors       = [];
-                        $this->warnings     = [];
-                        $this->errorCount   = 0;
-                        $this->warningCount = 0;
-                        $this->fixableCount = 0;
-                        return;
-                    } else if (strpos($commentText, '@codingStandardsChangeSetting') !== false) {
-                        $start   = strpos($commentText, '@codingStandardsChangeSetting');
-                        $comment = substr($commentText, ($start + 30));
-                        $parts   = explode(' ', $comment);
-                        if (count($parts) >= 2) {
-                            $sniffParts = explode('.', $parts[0]);
-                            if (count($sniffParts) >= 3) {
-                                // If the sniff code is not known to us, it has not been registered in this run.
-                                // But don't throw an error as it could be there for a different standard to use.
-                                if (isset($this->ruleset->sniffCodes[$parts[0]]) === true) {
-                                    $listenerCode  = array_shift($parts);
-                                    $propertyCode  = array_shift($parts);
-                                    $propertyValue = rtrim(implode(' ', $parts), " */\r\n");
-                                    $listenerClass = $this->ruleset->sniffCodes[$listenerCode];
-                                    $this->ruleset->setSniffProperty($listenerClass, $propertyCode, $propertyValue);
-                                }
-                            }
-                        }
-                    }//end if
-                } else if (substr($commentTextLower, 0, 16) === 'phpcs:ignorefile'
-                    || substr($commentTextLower, 0, 17) === '@phpcs:ignorefile'
-                ) {
-                    // Ignoring the whole file, just a little late.
-                    $this->errors       = [];
-                    $this->warnings     = [];
-                    $this->errorCount   = 0;
-                    $this->warningCount = 0;
-                    $this->fixableCount = 0;
-                    return;
-                } else if (substr($commentTextLower, 0, 9) === 'phpcs:set'
-                    || substr($commentTextLower, 0, 10) === '@phpcs:set'
-                ) {
-                    if (isset($token['sniffCode']) === true) {
-                        $listenerCode = $token['sniffCode'];
-                        if (isset($this->ruleset->sniffCodes[$listenerCode]) === true) {
-                            $propertyCode  = $token['sniffProperty'];
-                            $propertyValue = $token['sniffPropertyValue'];
-                            $listenerClass = $this->ruleset->sniffCodes[$listenerCode];
-                            $this->ruleset->setSniffProperty($listenerClass, $propertyCode, $propertyValue);
-                        }
-                    }
-                }//end if
-            }//end if
-
-            if (PHP_CODESNIFFER_VERBOSITY > 2) {
-                $type    = $token['type'];
-                $content = Util\Common::prepareForOutput($token['content']);
-                echo "\t\tProcess token $stackPtr: $type => $content".PHP_EOL;
-            }
-
-            if ($token['code'] !== T_INLINE_HTML) {
-                $foundCode = true;
-            }
-
-            if (isset($this->ruleset->tokenListeners[$token['code']]) === false) {
-                continue;
-            }
-
-            foreach ($this->ruleset->tokenListeners[$token['code']] as $listenerData) {
-                if (isset($this->ignoredListeners[$listenerData['class']]) === true
-                    || (isset($listenerIgnoreTo[$listenerData['class']]) === true
-                    && $listenerIgnoreTo[$listenerData['class']] > $stackPtr)
-                ) {
-                    // This sniff is ignoring past this token, or the whole file.
-                    continue;
-                }
-
-                // Make sure this sniff supports the tokenizer
-                // we are currently using.
-                $class = $listenerData['class'];
-
-                if (isset($listenerData['tokenizers'][$this->tokenizerType]) === false) {
-                    continue;
-                }
-
-                // If the file path matches one of our ignore patterns, skip it.
-                // While there is support for a type of each pattern
-                // (absolute or relative) we don't actually support it here.
-                foreach ($listenerData['ignore'] as $pattern) {
-                    // We assume a / directory separator, as do the exclude rules
-                    // most developers write, so we need a special case for any system
-                    // that is different.
-                    if (DIRECTORY_SEPARATOR === '\\') {
-                        $pattern = str_replace('/', '\\\\', $pattern);
-                    }
-
-                    $pattern = '`'.$pattern.'`i';
-                    if (preg_match($pattern, $this->path) === 1) {
-                        $this->ignoredListeners[$class] = true;
-                        continue(2);
-                    }
-                }
-
-                // If the file path does not match one of our include patterns, skip it.
-                // While there is support for a type of each pattern
-                // (absolute or relative) we don't actually support it here.
-                if (empty($listenerData['include']) === false) {
-                    $included = false;
-                    foreach ($listenerData['include'] as $pattern) {
-                        // We assume a / directory separator, as do the exclude rules
-                        // most developers write, so we need a special case for any system
-                        // that is different.
-                        if (DIRECTORY_SEPARATOR === '\\') {
-                            $pattern = str_replace('/', '\\\\', $pattern);
-                        }
-
-                        $pattern = '`'.$pattern.'`i';
-                        if (preg_match($pattern, $this->path) === 1) {
-                            $included = true;
-                            break;
-                        }
-                    }
-
-                    if ($included === false) {
-                        $this->ignoredListeners[$class] = true;
-                        continue;
-                    }
-                }//end if
-
-                $this->activeListener = $class;
-
-                if (PHP_CODESNIFFER_VERBOSITY > 2) {
-                    $startTime = microtime(true);
-                    echo "\t\t\tProcessing ".$this->activeListener.'... ';
-                }
-
-                $ignoreTo = $this->ruleset->sniffs[$class]->process($this, $stackPtr);
-                if ($ignoreTo !== null) {
-                    $listenerIgnoreTo[$this->activeListener] = $ignoreTo;
-                }
-
-                if (PHP_CODESNIFFER_VERBOSITY > 2) {
-                    $timeTaken = (microtime(true) - $startTime);
-                    if (isset($this->listenerTimes[$this->activeListener]) === false) {
-                        $this->listenerTimes[$this->activeListener] = 0;
-                    }
-
-                    $this->listenerTimes[$this->activeListener] += $timeTaken;
-
-                    $timeTaken = round(($timeTaken), 4);
-                    echo "DONE in $timeTaken seconds".PHP_EOL;
-                }
-
-                $this->activeListener = '';
-            }//end foreach
-        }//end foreach
-
-        // If short open tags are off but the file being checked uses
-        // short open tags, the whole content will be inline HTML
-        // and nothing will be checked. So try and handle this case.
-        // We don't show this error for STDIN because we can't be sure the content
-        // actually came directly from the user. It could be something like
-        // refs from a Git pre-push hook.
-        if ($foundCode === false && $this->tokenizerType === 'PHP' && $this->path !== 'STDIN') {
-            $shortTags = (bool) ini_get('short_open_tag');
-            if ($shortTags === false) {
-                $error = 'No PHP code was found in this file and short open tags are not allowed by this install of PHP. This file may be using short open tags but PHP does not allow them.';
-                $this->addWarning($error, null, 'Internal.NoCodeFound');
-            }
-        }
-
-        if (PHP_CODESNIFFER_VERBOSITY > 2) {
-            echo "\t*** END TOKEN PROCESSING ***".PHP_EOL;
-            echo "\t*** START SNIFF PROCESSING REPORT ***".PHP_EOL;
-
-            asort($this->listenerTimes, SORT_NUMERIC);
-            $this->listenerTimes = array_reverse($this->listenerTimes, true);
-            foreach ($this->listenerTimes as $listener => $timeTaken) {
-                echo "\t$listener: ".round(($timeTaken), 4).' secs'.PHP_EOL;
-            }
-
-            echo "\t*** END SNIFF PROCESSING REPORT ***".PHP_EOL;
-        }
-
-        $this->fixedCount += $this->fixer->getFixCount();
-
-    }//end process()
-
-
-    /**
-     * Tokenizes the file and prepares it for the test run.
-     *
-     * @return void
-     */
-    public function parse()
-    {
-        if (empty($this->tokens) === false) {
-            // File has already been parsed.
-            return;
-        }
-
-        try {
-            $tokenizerClass  = 'PHP_CodeSniffer\Tokenizers\\'.$this->tokenizerType;
-            $this->tokenizer = new $tokenizerClass($this->content, $this->config, $this->eolChar);
-            $this->tokens    = $this->tokenizer->getTokens();
-        } catch (TokenizerException $e) {
-            $this->ignored = true;
-            $this->addWarning($e->getMessage(), null, 'Internal.Tokenizer.Exception');
-            if (PHP_CODESNIFFER_VERBOSITY > 0) {
-                echo "[$this->tokenizerType => tokenizer error]... ";
-                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                    echo PHP_EOL;
-                }
-            }
-
-            return;
-        }
-
-        $this->numTokens = count($this->tokens);
-
-        // Check for mixed line endings as these can cause tokenizer errors and we
-        // should let the user know that the results they get may be incorrect.
-        // This is done by removing all backslashes, removing the newline char we
-        // detected, then converting newlines chars into text. If any backslashes
-        // are left at the end, we have additional newline chars in use.
-        $contents = str_replace('\\', '', $this->content);
-        $contents = str_replace($this->eolChar, '', $contents);
-        $contents = str_replace("\n", '\n', $contents);
-        $contents = str_replace("\r", '\r', $contents);
-        if (strpos($contents, '\\') !== false) {
-            $error = 'File has mixed line endings; this may cause incorrect results';
-            $this->addWarningOnLine($error, 1, 'Internal.LineEndings.Mixed');
-        }
-
-        if (PHP_CODESNIFFER_VERBOSITY > 0) {
-            if ($this->numTokens === 0) {
-                $numLines = 0;
-            } else {
-                $numLines = $this->tokens[($this->numTokens - 1)]['line'];
-            }
-
-            echo "[$this->tokenizerType => $this->numTokens tokens in $numLines lines]... ";
-            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                echo PHP_EOL;
-            }
-        }
-
-    }//end parse()
-
-
-    /**
-     * Returns the token stack for this file.
-     *
-     * @return array
-     */
-    public function getTokens()
-    {
-        return $this->tokens;
-
-    }//end getTokens()
-
-
-    /**
-     * Remove vars stored in this file that are no longer required.
-     *
-     * @return void
-     */
-    public function cleanUp()
-    {
-        $this->listenerTimes = null;
-        $this->content       = null;
-        $this->tokens        = null;
-        $this->metricTokens  = null;
-        $this->tokenizer     = null;
-        $this->fixer         = null;
-        $this->config        = null;
-        $this->ruleset       = null;
-
-    }//end cleanUp()
-
-
-    /**
-     * Records an error against a specific token in the file.
-     *
-     * @param string  $error    The error message.
-     * @param int     $stackPtr The stack position where the error occurred.
-     * @param string  $code     A violation code unique to the sniff message.
-     * @param array   $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.
-     * @param boolean $fixable  Can the error be fixed by the sniff?
-     *
-     * @return boolean
-     */
-    public function addError(
-        $error,
-        $stackPtr,
-        $code,
-        $data=[],
-        $severity=0,
-        $fixable=false
-    ) {
-        if ($stackPtr === null) {
-            $line   = 1;
-            $column = 1;
-        } else {
-            $line   = $this->tokens[$stackPtr]['line'];
-            $column = $this->tokens[$stackPtr]['column'];
-        }
-
-        return $this->addMessage(true, $error, $line, $column, $code, $data, $severity, $fixable);
-
-    }//end addError()
-
-
-    /**
-     * Records a warning against a specific token in the file.
-     *
-     * @param string  $warning  The error message.
-     * @param int     $stackPtr The stack position where the error occurred.
-     * @param string  $code     A violation code unique to the sniff message.
-     * @param array   $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.
-     * @param boolean $fixable  Can the warning be fixed by the sniff?
-     *
-     * @return boolean
-     */
-    public function addWarning(
-        $warning,
-        $stackPtr,
-        $code,
-        $data=[],
-        $severity=0,
-        $fixable=false
-    ) {
-        if ($stackPtr === null) {
-            $line   = 1;
-            $column = 1;
-        } else {
-            $line   = $this->tokens[$stackPtr]['line'];
-            $column = $this->tokens[$stackPtr]['column'];
-        }
-
-        return $this->addMessage(false, $warning, $line, $column, $code, $data, $severity, $fixable);
-
-    }//end addWarning()
-
-
-    /**
-     * Records an error against a specific line in the file.
-     *
-     * @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 int    $severity The severity level for this error. A value of 0
-     *                         will be converted into the default severity level.
-     *
-     * @return boolean
-     */
-    public function addErrorOnLine(
-        $error,
-        $line,
-        $code,
-        $data=[],
-        $severity=0
-    ) {
-        return $this->addMessage(true, $error, $line, 1, $code, $data, $severity, false);
-
-    }//end addErrorOnLine()
-
-
-    /**
-     * Records a warning against a specific token in the file.
-     *
-     * @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 int    $severity The severity level for this warning. A value of 0 will
-     *                         will be converted into the default severity level.
-     *
-     * @return boolean
-     */
-    public function addWarningOnLine(
-        $warning,
-        $line,
-        $code,
-        $data=[],
-        $severity=0
-    ) {
-        return $this->addMessage(false, $warning, $line, 1, $code, $data, $severity, false);
-
-    }//end addWarningOnLine()
-
-
-    /**
-     * Records a fixable error against a specific token in the file.
-     *
-     * Returns true if the error was recorded and should be fixed.
-     *
-     * @param string $error    The error message.
-     * @param int    $stackPtr The stack position where the error occurred.
-     * @param string $code     A violation code unique to the sniff message.
-     * @param array  $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.
-     *
-     * @return boolean
-     */
-    public function addFixableError(
-        $error,
-        $stackPtr,
-        $code,
-        $data=[],
-        $severity=0
-    ) {
-        $recorded = $this->addError($error, $stackPtr, $code, $data, $severity, true);
-        if ($recorded === true && $this->fixer->enabled === true) {
-            return true;
-        }
-
-        return false;
-
-    }//end addFixableError()
-
-
-    /**
-     * Records a fixable warning against a specific token in the file.
-     *
-     * Returns true if the warning was recorded and should be fixed.
-     *
-     * @param string $warning  The error message.
-     * @param int    $stackPtr The stack position where the error occurred.
-     * @param string $code     A violation code unique to the sniff message.
-     * @param array  $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.
-     *
-     * @return boolean
-     */
-    public function addFixableWarning(
-        $warning,
-        $stackPtr,
-        $code,
-        $data=[],
-        $severity=0
-    ) {
-        $recorded = $this->addWarning($warning, $stackPtr, $code, $data, $severity, true);
-        if ($recorded === true && $this->fixer->enabled === true) {
-            return true;
-        }
-
-        return false;
-
-    }//end addFixableWarning()
-
-
-    /**
-     * Adds an error to the error stack.
-     *
-     * @param boolean $error    Is this an error message?
-     * @param string  $message  The text of the message.
-     * @param int     $line     The line on which the message occurred.
-     * @param int     $column   The column at which the message occurred.
-     * @param string  $code     A violation code unique to the sniff message.
-     * @param array   $data     Replacements for the message.
-     * @param int     $severity The severity level for this message. A value of 0
-     *                          will be converted into the default severity level.
-     * @param boolean $fixable  Can the problem be fixed by the sniff?
-     *
-     * @return boolean
-     */
-    protected function addMessage($error, $message, $line, $column, $code, $data, $severity, $fixable)
-    {
-        // Check if this line is ignoring all message codes.
-        if (isset($this->tokenizer->ignoredLines[$line]['.all']) === true) {
-            return false;
-        }
-
-        // Work out which sniff generated the message.
-        $parts = explode('.', $code);
-        if ($parts[0] === 'Internal') {
-            // An internal message.
-            $listenerCode = Util\Common::getSniffCode($this->activeListener);
-            $sniffCode    = $code;
-            $checkCodes   = [$sniffCode];
-        } else {
-            if ($parts[0] !== $code) {
-                // The full message code has been passed in.
-                $sniffCode    = $code;
-                $listenerCode = substr($sniffCode, 0, strrpos($sniffCode, '.'));
-            } else {
-                $listenerCode = Util\Common::getSniffCode($this->activeListener);
-                $sniffCode    = $listenerCode.'.'.$code;
-                $parts        = explode('.', $sniffCode);
-            }
-
-            $checkCodes = [
-                $sniffCode,
-                $parts[0].'.'.$parts[1].'.'.$parts[2],
-                $parts[0].'.'.$parts[1],
-                $parts[0],
-            ];
-        }//end if
-
-        if (isset($this->tokenizer->ignoredLines[$line]) === true) {
-            // Check if this line is ignoring this specific message.
-            $ignored = false;
-            foreach ($checkCodes as $checkCode) {
-                if (isset($this->tokenizer->ignoredLines[$line][$checkCode]) === true) {
-                    $ignored = true;
-                    break;
-                }
-            }
-
-            // If it is ignored, make sure it's not whitelisted.
-            if ($ignored === true
-                && isset($this->tokenizer->ignoredLines[$line]['.except']) === true
-            ) {
-                foreach ($checkCodes as $checkCode) {
-                    if (isset($this->tokenizer->ignoredLines[$line]['.except'][$checkCode]) === true) {
-                        $ignored = false;
-                        break;
-                    }
-                }
-            }
-
-            if ($ignored === true) {
-                return false;
-            }
-        }//end if
-
-        $includeAll = true;
-        if ($this->configCache['cache'] === false
-            || $this->configCache['recordErrors'] === false
-        ) {
-            $includeAll = false;
-        }
-
-        // Filter out any messages for sniffs that shouldn't have run
-        // due to the use of the --sniffs command line argument.
-        if ($includeAll === false
-            && ((empty($this->configCache['sniffs']) === false
-            && in_array(strtolower($listenerCode), $this->configCache['sniffs'], true) === false)
-            || (empty($this->configCache['exclude']) === false
-            && in_array(strtolower($listenerCode), $this->configCache['exclude'], true) === true))
-        ) {
-            return false;
-        }
-
-        // If we know this sniff code is being ignored for this file, return early.
-        foreach ($checkCodes as $checkCode) {
-            if (isset($this->ignoredCodes[$checkCode]) === true) {
-                return false;
-            }
-        }
-
-        $oppositeType = 'warning';
-        if ($error === false) {
-            $oppositeType = 'error';
-        }
-
-        foreach ($checkCodes as $checkCode) {
-            // Make sure this message type has not been set to the opposite message type.
-            if (isset($this->ruleset->ruleset[$checkCode]['type']) === true
-                && $this->ruleset->ruleset[$checkCode]['type'] === $oppositeType
-            ) {
-                $error = !$error;
-                break;
-            }
-        }
-
-        if ($error === true) {
-            $configSeverity = $this->configCache['errorSeverity'];
-            $messageCount   = &$this->errorCount;
-            $messages       = &$this->errors;
-        } else {
-            $configSeverity = $this->configCache['warningSeverity'];
-            $messageCount   = &$this->warningCount;
-            $messages       = &$this->warnings;
-        }
-
-        if ($includeAll === false && $configSeverity === 0) {
-            // Don't bother doing any processing as these messages are just going to
-            // be hidden in the reports anyway.
-            return false;
-        }
-
-        if ($severity === 0) {
-            $severity = 5;
-        }
-
-        foreach ($checkCodes as $checkCode) {
-            // Make sure we are interested in this severity level.
-            if (isset($this->ruleset->ruleset[$checkCode]['severity']) === true) {
-                $severity = $this->ruleset->ruleset[$checkCode]['severity'];
-                break;
-            }
-        }
-
-        if ($includeAll === false && $configSeverity > $severity) {
-            return false;
-        }
-
-        // Make sure we are not ignoring this file.
-        $included = null;
-        foreach ($checkCodes as $checkCode) {
-            $patterns = null;
-
-            if (isset($this->configCache['includePatterns'][$checkCode]) === true) {
-                $patterns  = $this->configCache['includePatterns'][$checkCode];
-                $excluding = false;
-            } else if (isset($this->configCache['ignorePatterns'][$checkCode]) === true) {
-                $patterns  = $this->configCache['ignorePatterns'][$checkCode];
-                $excluding = true;
-            }
-
-            if ($patterns === null) {
-                continue;
-            }
-
-            foreach ($patterns as $pattern => $type) {
-                // While there is support for a type of each pattern
-                // (absolute or relative) we don't actually support it here.
-                $replacements = [
-                    '\\,' => ',',
-                    '*'   => '.*',
-                ];
-
-                // We assume a / directory separator, as do the exclude rules
-                // most developers write, so we need a special case for any system
-                // that is different.
-                if (DIRECTORY_SEPARATOR === '\\') {
-                    $replacements['/'] = '\\\\';
-                }
-
-                $pattern = '`'.strtr($pattern, $replacements).'`i';
-                $matched = preg_match($pattern, $this->path);
-
-                if ($matched === 0) {
-                    if ($excluding === false && $included === null) {
-                        // This file path is not being included.
-                        $included = false;
-                    }
-
-                    continue;
-                }
-
-                if ($excluding === true) {
-                    // This file path is being excluded.
-                    $this->ignoredCodes[$checkCode] = true;
-                    return false;
-                }
-
-                // This file path is being included.
-                $included = true;
-                break;
-            }//end foreach
-        }//end foreach
-
-        if ($included === false) {
-            // There were include rules set, but this file
-            // path didn't match any of them.
-            return false;
-        }
-
-        $messageCount++;
-        if ($fixable === true) {
-            $this->fixableCount++;
-        }
-
-        if ($this->configCache['recordErrors'] === false
-            && $includeAll === false
-        ) {
-            return true;
-        }
-
-        // Work out the error message.
-        if (isset($this->ruleset->ruleset[$sniffCode]['message']) === true) {
-            $message = $this->ruleset->ruleset[$sniffCode]['message'];
-        }
-
-        if (empty($data) === false) {
-            $message = vsprintf($message, $data);
-        }
-
-        if (isset($messages[$line]) === false) {
-            $messages[$line] = [];
-        }
-
-        if (isset($messages[$line][$column]) === false) {
-            $messages[$line][$column] = [];
-        }
-
-        $messages[$line][$column][] = [
-            'message'  => $message,
-            'source'   => $sniffCode,
-            'listener' => $this->activeListener,
-            'severity' => $severity,
-            'fixable'  => $fixable,
-        ];
-
-        if (PHP_CODESNIFFER_VERBOSITY > 1
-            && $this->fixer->enabled === true
-            && $fixable === true
-        ) {
-            @ob_end_clean();
-            echo "\tE: [Line $line] $message ($sniffCode)".PHP_EOL;
-            ob_start();
-        }
-
-        return true;
-
-    }//end addMessage()
-
-
-    /**
-     * Record a metric about the file being examined.
-     *
-     * @param int    $stackPtr The stack position where the metric was recorded.
-     * @param string $metric   The name of the metric being recorded.
-     * @param string $value    The value of the metric being recorded.
-     *
-     * @return boolean
-     */
-    public function recordMetric($stackPtr, $metric, $value)
-    {
-        if (isset($this->metrics[$metric]) === false) {
-            $this->metrics[$metric] = ['values' => [$value => 1]];
-            $this->metricTokens[$metric][$stackPtr] = true;
-        } else if (isset($this->metricTokens[$metric][$stackPtr]) === false) {
-            $this->metricTokens[$metric][$stackPtr] = true;
-            if (isset($this->metrics[$metric]['values'][$value]) === false) {
-                $this->metrics[$metric]['values'][$value] = 1;
-            } else {
-                $this->metrics[$metric]['values'][$value]++;
-            }
-        }
-
-        return true;
-
-    }//end recordMetric()
-
-
-    /**
-     * Returns the number of errors raised.
-     *
-     * @return int
-     */
-    public function getErrorCount()
-    {
-        return $this->errorCount;
-
-    }//end getErrorCount()
-
-
-    /**
-     * Returns the number of warnings raised.
-     *
-     * @return int
-     */
-    public function getWarningCount()
-    {
-        return $this->warningCount;
-
-    }//end getWarningCount()
-
-
-    /**
-     * Returns the number of fixable errors/warnings raised.
-     *
-     * @return int
-     */
-    public function getFixableCount()
-    {
-        return $this->fixableCount;
-
-    }//end getFixableCount()
-
-
-    /**
-     * Returns the number of fixed errors/warnings.
-     *
-     * @return int
-     */
-    public function getFixedCount()
-    {
-        return $this->fixedCount;
-
-    }//end getFixedCount()
-
-
-    /**
-     * Returns the list of ignored lines.
-     *
-     * @return array
-     */
-    public function getIgnoredLines()
-    {
-        return $this->tokenizer->ignoredLines;
-
-    }//end getIgnoredLines()
-
-
-    /**
-     * Returns the errors raised from processing this file.
-     *
-     * @return array
-     */
-    public function getErrors()
-    {
-        return $this->errors;
-
-    }//end getErrors()
-
-
-    /**
-     * Returns the warnings raised from processing this file.
-     *
-     * @return array
-     */
-    public function getWarnings()
-    {
-        return $this->warnings;
-
-    }//end getWarnings()
-
-
-    /**
-     * Returns the metrics found while processing this file.
-     *
-     * @return array
-     */
-    public function getMetrics()
-    {
-        return $this->metrics;
-
-    }//end getMetrics()
-
-
-    /**
-     * Returns the absolute filename of this file.
-     *
-     * @return string
-     */
-    public function getFilename()
-    {
-        return $this->path;
-
-    }//end getFilename()
-
-
-    /**
-     * Returns the declaration names for classes, interfaces, traits, and functions.
-     *
-     * @param int $stackPtr The position of the declaration token which
-     *                      declared the class, interface, trait, or function.
-     *
-     * @return string|null The name of the class, interface, trait, or function;
-     *                     or NULL if the function or class is anonymous.
-     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified token is not of type
-     *                                                      T_FUNCTION, T_CLASS, T_ANON_CLASS,
-     *                                                      T_CLOSURE, T_TRAIT, or T_INTERFACE.
-     */
-    public function getDeclarationName($stackPtr)
-    {
-        $tokenCode = $this->tokens[$stackPtr]['code'];
-
-        if ($tokenCode === T_ANON_CLASS || $tokenCode === T_CLOSURE) {
-            return null;
-        }
-
-        if ($tokenCode !== T_FUNCTION
-            && $tokenCode !== T_CLASS
-            && $tokenCode !== T_INTERFACE
-            && $tokenCode !== T_TRAIT
-        ) {
-            throw new RuntimeException('Token type "'.$this->tokens[$stackPtr]['type'].'" is not T_FUNCTION, T_CLASS, T_INTERFACE or T_TRAIT');
-        }
-
-        if ($tokenCode === T_FUNCTION
-            && strtolower($this->tokens[$stackPtr]['content']) !== 'function'
-        ) {
-            // This is a function declared without the "function" keyword.
-            // So this token is the function name.
-            return $this->tokens[$stackPtr]['content'];
-        }
-
-        $content = null;
-        for ($i = $stackPtr; $i < $this->numTokens; $i++) {
-            if ($this->tokens[$i]['code'] === T_STRING) {
-                $content = $this->tokens[$i]['content'];
-                break;
-            }
-        }
-
-        return $content;
-
-    }//end getDeclarationName()
-
-
-    /**
-     * Returns the method parameters for the specified function token.
-     *
-     * Each parameter is in the following format:
-     *
-     * <code>
-     *   0 => array(
-     *         'name'              => '$var',  // The variable name.
-     *         'token'             => integer, // The stack pointer to the variable name.
-     *         'content'           => string,  // The full content of the variable definition.
-     *         'pass_by_reference' => boolean, // Is the variable passed by reference?
-     *         'variable_length'   => boolean, // Is the param of variable length through use of `...` ?
-     *         'type_hint'         => string,  // The type hint for the variable.
-     *         'type_hint_token'   => integer, // The stack pointer to the type hint
-     *                                         // or false if there is no type hint.
-     *         'nullable_type'     => boolean, // Is the variable using a nullable type?
-     *        )
-     * </code>
-     *
-     * Parameters with default values have an additional array index of
-     * 'default' with the value of the default as a string.
-     *
-     * @param int $stackPtr The position in the stack of the function token
-     *                      to acquire the parameters for.
-     *
-     * @return array
-     * @throws \PHP_CodeSniffer\Exceptions\TokenizerException If the specified $stackPtr is not of
-     *                                                        type T_FUNCTION or T_CLOSURE.
-     */
-    public function getMethodParameters($stackPtr)
-    {
-        if ($this->tokens[$stackPtr]['code'] !== T_FUNCTION
-            && $this->tokens[$stackPtr]['code'] !== T_CLOSURE
-        ) {
-            throw new TokenizerException('$stackPtr must be of type T_FUNCTION or T_CLOSURE');
-        }
-
-        $opener = $this->tokens[$stackPtr]['parenthesis_opener'];
-        $closer = $this->tokens[$stackPtr]['parenthesis_closer'];
-
-        $vars            = [];
-        $currVar         = null;
-        $paramStart      = ($opener + 1);
-        $defaultStart    = null;
-        $paramCount      = 0;
-        $passByReference = false;
-        $variableLength  = false;
-        $typeHint        = '';
-        $typeHintToken   = false;
-        $nullableType    = false;
-
-        for ($i = $paramStart; $i <= $closer; $i++) {
-            // Check to see if this token has a parenthesis or bracket opener. If it does
-            // it's likely to be an array which might have arguments in it. This
-            // could cause problems in our parsing below, so lets just skip to the
-            // end of it.
-            if (isset($this->tokens[$i]['parenthesis_opener']) === true) {
-                // Don't do this if it's the close parenthesis for the method.
-                if ($i !== $this->tokens[$i]['parenthesis_closer']) {
-                    $i = ($this->tokens[$i]['parenthesis_closer'] + 1);
-                }
-            }
-
-            if (isset($this->tokens[$i]['bracket_opener']) === true) {
-                // Don't do this if it's the close parenthesis for the method.
-                if ($i !== $this->tokens[$i]['bracket_closer']) {
-                    $i = ($this->tokens[$i]['bracket_closer'] + 1);
-                }
-            }
-
-            switch ($this->tokens[$i]['code']) {
-            case T_BITWISE_AND:
-                if ($defaultStart === null) {
-                    $passByReference = true;
-                }
-                break;
-            case T_VARIABLE:
-                $currVar = $i;
-                break;
-            case T_ELLIPSIS:
-                $variableLength = true;
-                break;
-            case T_CALLABLE:
-                if ($typeHintToken === false) {
-                    $typeHintToken = $i;
-                }
-
-                $typeHint .= $this->tokens[$i]['content'];
-                break;
-            case T_SELF:
-            case T_PARENT:
-            case T_STATIC:
-                // Self and parent are valid, static invalid, but was probably intended as type hint.
-                if (isset($defaultStart) === false) {
-                    if ($typeHintToken === false) {
-                        $typeHintToken = $i;
-                    }
-
-                    $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;
-                            break;
-                        }
-                    }
-
-                    if ($nextEquals !== false) {
-                        break;
-                    }
-                }
-
-                if ($defaultStart === null) {
-                    if ($typeHintToken === false) {
-                        $typeHintToken = $i;
-                    }
-
-                    $typeHint .= $this->tokens[$i]['content'];
-                }
-                break;
-            case T_NS_SEPARATOR:
-                // Part of a type hint or default value.
-                if ($defaultStart === null) {
-                    if ($typeHintToken === false) {
-                        $typeHintToken = $i;
-                    }
-
-                    $typeHint .= $this->tokens[$i]['content'];
-                }
-                break;
-            case T_NULLABLE:
-                if ($defaultStart === null) {
-                    $nullableType = true;
-                    $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 2;
-                }
-
-                $vars[$paramCount]            = [];
-                $vars[$paramCount]['token']   = $currVar;
-                $vars[$paramCount]['name']    = $this->tokens[$currVar]['content'];
-                $vars[$paramCount]['content'] = trim($this->getTokensAsString($paramStart, ($i - $paramStart)));
-
-                if ($defaultStart !== null) {
-                    $vars[$paramCount]['default'] = trim($this->getTokensAsString($defaultStart, ($i - $defaultStart)));
-                }
-
-                $vars[$paramCount]['pass_by_reference'] = $passByReference;
-                $vars[$paramCount]['variable_length']   = $variableLength;
-                $vars[$paramCount]['type_hint']         = $typeHint;
-                $vars[$paramCount]['type_hint_token']   = $typeHintToken;
-                $vars[$paramCount]['nullable_type']     = $nullableType;
-
-                // Reset the vars, as we are about to process the next parameter.
-                $defaultStart    = null;
-                $paramStart      = ($i + 1);
-                $passByReference = false;
-                $variableLength  = false;
-                $typeHint        = '';
-                $typeHintToken   = false;
-                $nullableType    = false;
-
-                $paramCount++;
-                break;
-            case T_EQUAL:
-                $defaultStart = ($i + 1);
-                break;
-            }//end switch
-        }//end for
-
-        return $vars;
-
-    }//end getMethodParameters()
-
-
-    /**
-     * Returns the visibility and implementation properties of a method.
-     *
-     * The format of the array is:
-     * <code>
-     *   array(
-     *    'scope'                => 'public', // public protected or protected
-     *    'scope_specified'      => true,     // true is scope keyword was found.
-     *    'return_type'          => '',       // the return type of the method.
-     *    'return_type_token'    => integer,  // The stack pointer to the start of the return type
-     *                                        // or false if there is no return type.
-     *    'nullable_return_type' => false,    // true if the return type is nullable.
-     *    'is_abstract'          => false,    // true if the abstract keyword was found.
-     *    'is_final'             => false,    // true if the final keyword was found.
-     *    'is_static'            => false,    // true if the static keyword was found.
-     *    'has_body'             => false,    // true if the method has a body
-     *   );
-     * </code>
-     *
-     * @param int $stackPtr The position in the stack of the function token to
-     *                      acquire the properties for.
-     *
-     * @return array
-     * @throws \PHP_CodeSniffer\Exceptions\TokenizerException If the specified position is not a
-     *                                                        T_FUNCTION token.
-     */
-    public function getMethodProperties($stackPtr)
-    {
-        if ($this->tokens[$stackPtr]['code'] !== T_FUNCTION
-            && $this->tokens[$stackPtr]['code'] !== T_CLOSURE
-        ) {
-            throw new TokenizerException('$stackPtr must be of type T_FUNCTION or T_CLOSURE');
-        }
-
-        if ($this->tokens[$stackPtr]['code'] === T_FUNCTION) {
-            $valid = [
-                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,
-            ];
-        } else {
-            $valid = [
-                T_STATIC      => T_STATIC,
-                T_WHITESPACE  => T_WHITESPACE,
-                T_COMMENT     => T_COMMENT,
-                T_DOC_COMMENT => T_DOC_COMMENT,
-            ];
-        }
-
-        $scope          = 'public';
-        $scopeSpecified = false;
-        $isAbstract     = false;
-        $isFinal        = false;
-        $isStatic       = false;
-
-        for ($i = ($stackPtr - 1); $i > 0; $i--) {
-            if (isset($valid[$this->tokens[$i]['code']]) === false) {
-                break;
-            }
-
-            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;
-            }//end switch
-        }//end for
-
-        $returnType         = '';
-        $returnTypeToken    = false;
-        $nullableReturnType = false;
-        $hasBody            = true;
-
-        if (isset($this->tokens[$stackPtr]['parenthesis_closer']) === true) {
-            $scopeOpener = null;
-            if (isset($this->tokens[$stackPtr]['scope_opener']) === true) {
-                $scopeOpener = $this->tokens[$stackPtr]['scope_opener'];
-            }
-
-            $valid = [
-                T_STRING       => T_STRING,
-                T_CALLABLE     => T_CALLABLE,
-                T_SELF         => T_SELF,
-                T_PARENT       => T_PARENT,
-                T_NS_SEPARATOR => T_NS_SEPARATOR,
-            ];
-
-            for ($i = $this->tokens[$stackPtr]['parenthesis_closer']; $i < $this->numTokens; $i++) {
-                if (($scopeOpener === null && $this->tokens[$i]['code'] === T_SEMICOLON)
-                    || ($scopeOpener !== null && $i === $scopeOpener)
-                ) {
-                    // End of function definition.
-                    break;
-                }
-
-                if ($this->tokens[$i]['code'] === T_NULLABLE) {
-                    $nullableReturnType = true;
-                }
-
-                if (isset($valid[$this->tokens[$i]['code']]) === true) {
-                    if ($returnTypeToken === false) {
-                        $returnTypeToken = $i;
-                    }
-
-                    $returnType .= $this->tokens[$i]['content'];
-                }
-            }
-
-            $end     = $this->findNext([T_OPEN_CURLY_BRACKET, T_SEMICOLON], $this->tokens[$stackPtr]['parenthesis_closer']);
-            $hasBody = $this->tokens[$end]['code'] === T_OPEN_CURLY_BRACKET;
-        }//end if
-
-        if ($returnType !== '' && $nullableReturnType === true) {
-            $returnType = '?'.$returnType;
-        }
-
-        return [
-            'scope'                => $scope,
-            'scope_specified'      => $scopeSpecified,
-            'return_type'          => $returnType,
-            'return_type_token'    => $returnTypeToken,
-            'nullable_return_type' => $nullableReturnType,
-            'is_abstract'          => $isAbstract,
-            'is_final'             => $isFinal,
-            'is_static'            => $isStatic,
-            'has_body'             => $hasBody,
-        ];
-
-    }//end getMethodProperties()
-
-
-    /**
-     * Returns the visibility and implementation properties of the class member
-     * variable found at the specified position in the stack.
-     *
-     * The format of the array is:
-     *
-     * <code>
-     *   array(
-     *    'scope'           => 'public', // public protected or protected.
-     *    'scope_specified' => false,    // true if the scope was explicitly specified.
-     *    'is_static'       => false,    // true if the static keyword was found.
-     *   );
-     * </code>
-     *
-     * @param int $stackPtr The position in the stack of the T_VARIABLE token to
-     *                      acquire the properties for.
-     *
-     * @return array
-     * @throws \PHP_CodeSniffer\Exceptions\TokenizerException If the specified position is not a
-     *                                                        T_VARIABLE token, or if the position is not
-     *                                                        a class member variable.
-     */
-    public function getMemberProperties($stackPtr)
-    {
-        if ($this->tokens[$stackPtr]['code'] !== T_VARIABLE) {
-            throw new TokenizerException('$stackPtr must be of type T_VARIABLE');
-        }
-
-        $conditions = array_keys($this->tokens[$stackPtr]['conditions']);
-        $ptr        = array_pop($conditions);
-        if (isset($this->tokens[$ptr]) === false
-            || ($this->tokens[$ptr]['code'] !== T_CLASS
-            && $this->tokens[$ptr]['code'] !== T_ANON_CLASS
-            && $this->tokens[$ptr]['code'] !== T_TRAIT)
-        ) {
-            if (isset($this->tokens[$ptr]) === true
-                && $this->tokens[$ptr]['code'] === T_INTERFACE
-            ) {
-                // T_VARIABLEs in interfaces can actually be method arguments
-                // but they wont be seen as being inside the method because there
-                // are no scope openers and closers for abstract methods. If it is in
-                // parentheses, we can be pretty sure it is a method argument.
-                if (isset($this->tokens[$stackPtr]['nested_parenthesis']) === false
-                    || empty($this->tokens[$stackPtr]['nested_parenthesis']) === true
-                ) {
-                    $error = 'Possible parse error: interfaces may not include member vars';
-                    $this->addWarning($error, $stackPtr, 'Internal.ParseError.InterfaceHasMemberVar');
-                    return [];
-                }
-            } else {
-                throw new TokenizerException('$stackPtr is not a class member var');
-            }
-        }
-
-        // Make sure it's not a method parameter.
-        if (empty($this->tokens[$stackPtr]['nested_parenthesis']) === false) {
-            $parenthesis = array_keys($this->tokens[$stackPtr]['nested_parenthesis']);
-            $deepestOpen = array_pop($parenthesis);
-            if ($deepestOpen > $ptr
-                && isset($this->tokens[$deepestOpen]['parenthesis_owner']) === true
-                && $this->tokens[$this->tokens[$deepestOpen]['parenthesis_owner']]['code'] === T_FUNCTION
-            ) {
-                throw new TokenizerException('$stackPtr is not a class member var');
-            }
-        }
-
-        $valid = [
-            T_PUBLIC    => T_PUBLIC,
-            T_PRIVATE   => T_PRIVATE,
-            T_PROTECTED => T_PROTECTED,
-            T_STATIC    => T_STATIC,
-            T_VAR       => T_VAR,
-        ];
-
-        $valid += Util\Tokens::$emptyTokens;
-
-        $scope          = 'public';
-        $scopeSpecified = false;
-        $isStatic       = false;
-
-        $startOfStatement = $this->findPrevious(
-            [
-                T_SEMICOLON,
-                T_OPEN_CURLY_BRACKET,
-                T_CLOSE_CURLY_BRACKET,
-            ],
-            ($stackPtr - 1)
-        );
-
-        for ($i = ($startOfStatement + 1); $i < $stackPtr; $i++) {
-            if (isset($valid[$this->tokens[$i]['code']]) === false) {
-                break;
-            }
-
-            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;
-            }
-        }//end for
-
-        return [
-            'scope'           => $scope,
-            'scope_specified' => $scopeSpecified,
-            'is_static'       => $isStatic,
-        ];
-
-    }//end getMemberProperties()
-
-
-    /**
-     * Returns the visibility and implementation properties of a class.
-     *
-     * The format of the array is:
-     * <code>
-     *   array(
-     *    'is_abstract' => false, // true if the abstract keyword was found.
-     *    'is_final'    => false, // true if the final keyword was found.
-     *   );
-     * </code>
-     *
-     * @param int $stackPtr The position in the stack of the T_CLASS token to
-     *                      acquire the properties for.
-     *
-     * @return array
-     * @throws \PHP_CodeSniffer\Exceptions\TokenizerException If the specified position is not a
-     *                                                        T_CLASS token.
-     */
-    public function getClassProperties($stackPtr)
-    {
-        if ($this->tokens[$stackPtr]['code'] !== T_CLASS) {
-            throw new TokenizerException('$stackPtr must be of type T_CLASS');
-        }
-
-        $valid = [
-            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;
-
-        for ($i = ($stackPtr - 1); $i > 0; $i--) {
-            if (isset($valid[$this->tokens[$i]['code']]) === false) {
-                break;
-            }
-
-            switch ($this->tokens[$i]['code']) {
-            case T_ABSTRACT:
-                $isAbstract = true;
-                break;
-
-            case T_FINAL:
-                $isFinal = true;
-                break;
-            }
-        }//end for
-
-        return [
-            'is_abstract' => $isAbstract,
-            'is_final'    => $isFinal,
-        ];
-
-    }//end getClassProperties()
-
-
-    /**
-     * Determine if the passed token is a reference operator.
-     *
-     * Returns true if the specified token position represents a reference.
-     * Returns false if the token represents a bitwise operator.
-     *
-     * @param int $stackPtr The position of the T_BITWISE_AND token.
-     *
-     * @return boolean
-     */
-    public function isReference($stackPtr)
-    {
-        if ($this->tokens[$stackPtr]['code'] !== T_BITWISE_AND) {
-            return false;
-        }
-
-        $tokenBefore = $this->findPrevious(
-            Util\Tokens::$emptyTokens,
-            ($stackPtr - 1),
-            null,
-            true
-        );
-
-        if ($this->tokens[$tokenBefore]['code'] === T_FUNCTION) {
-            // Function returns a reference.
-            return true;
-        }
-
-        if ($this->tokens[$tokenBefore]['code'] === T_DOUBLE_ARROW) {
-            // Inside a foreach loop or array assignment, this is a reference.
-            return true;
-        }
-
-        if ($this->tokens[$tokenBefore]['code'] === T_AS) {
-            // Inside a foreach loop, this is a reference.
-            return true;
-        }
-
-        if (isset(Util\Tokens::$assignmentTokens[$this->tokens[$tokenBefore]['code']]) === true) {
-            // This is directly after an assignment. It's a reference. Even if
-            // it is part of an operation, the other tests will handle it.
-            return true;
-        }
-
-        $tokenAfter = $this->findNext(
-            Util\Tokens::$emptyTokens,
-            ($stackPtr + 1),
-            null,
-            true
-        );
-
-        if ($this->tokens[$tokenAfter]['code'] === T_NEW) {
-            return true;
-        }
-
-        if (isset($this->tokens[$stackPtr]['nested_parenthesis']) === true) {
-            $brackets    = $this->tokens[$stackPtr]['nested_parenthesis'];
-            $lastBracket = array_pop($brackets);
-            if (isset($this->tokens[$lastBracket]['parenthesis_owner']) === true) {
-                $owner = $this->tokens[$this->tokens[$lastBracket]['parenthesis_owner']];
-                if ($owner['code'] === T_FUNCTION
-                    || $owner['code'] === T_CLOSURE
-                ) {
-                    $params = $this->getMethodParameters($this->tokens[$lastBracket]['parenthesis_owner']);
-                    foreach ($params as $param) {
-                        $varToken = $tokenAfter;
-                        if ($param['variable_length'] === true) {
-                            $varToken = $this->findNext(
-                                (Util\Tokens::$emptyTokens + [T_ELLIPSIS]),
-                                ($stackPtr + 1),
-                                null,
-                                true
-                            );
-                        }
-
-                        if ($param['token'] === $varToken
-                            && $param['pass_by_reference'] === true
-                        ) {
-                            // Function parameter declared to be passed by reference.
-                            return true;
-                        }
-                    }
-                }//end if
-            } else {
-                $prev = false;
-                for ($t = ($this->tokens[$lastBracket]['parenthesis_opener'] - 1); $t >= 0; $t--) {
-                    if ($this->tokens[$t]['code'] !== T_WHITESPACE) {
-                        $prev = $t;
-                        break;
-                    }
-                }
-
-                if ($prev !== false && $this->tokens[$prev]['code'] === T_USE) {
-                    // Closure use by reference.
-                    return true;
-                }
-            }//end if
-        }//end if
-
-        // Pass by reference in function calls and assign by reference in arrays.
-        if ($this->tokens[$tokenBefore]['code'] === T_OPEN_PARENTHESIS
-            || $this->tokens[$tokenBefore]['code'] === T_COMMA
-            || $this->tokens[$tokenBefore]['code'] === T_OPEN_SHORT_ARRAY
-        ) {
-            if ($this->tokens[$tokenAfter]['code'] === T_VARIABLE) {
-                return true;
-            } else {
-                $skip   = Util\Tokens::$emptyTokens;
-                $skip[] = T_NS_SEPARATOR;
-                $skip[] = T_SELF;
-                $skip[] = T_PARENT;
-                $skip[] = T_STATIC;
-                $skip[] = T_STRING;
-                $skip[] = T_NAMESPACE;
-                $skip[] = T_DOUBLE_COLON;
-
-                $nextSignificantAfter = $this->findNext(
-                    $skip,
-                    ($stackPtr + 1),
-                    null,
-                    true
-                );
-                if ($this->tokens[$nextSignificantAfter]['code'] === T_VARIABLE) {
-                    return true;
-                }
-            }//end if
-        }//end if
-
-        return false;
-
-    }//end isReference()
-
-
-    /**
-     * Returns the content of the tokens from the specified start position in
-     * the token stack for the specified length.
-     *
-     * @param int  $start       The position to start from in the token stack.
-     * @param int  $length      The length of tokens to traverse from the start pos.
-     * @param bool $origContent Whether the original content or the tab replaced
-     *                          content should be used.
-     *
-     * @return string The token contents.
-     */
-    public function getTokensAsString($start, $length, $origContent=false)
-    {
-        if (is_int($start) === false || isset($this->tokens[$start]) === false) {
-            throw new RuntimeException('The $start position for getTokensAsString() must exist in the token stack');
-        }
-
-        if (is_int($length) === false || $length <= 0) {
-            return '';
-        }
-
-        $str = '';
-        $end = ($start + $length);
-        if ($end > $this->numTokens) {
-            $end = $this->numTokens;
-        }
-
-        for ($i = $start; $i < $end; $i++) {
-            // If tabs are being converted to spaces by the tokeniser, the
-            // original content should be used instead of the converted content.
-            if ($origContent === true && isset($this->tokens[$i]['orig_content']) === true) {
-                $str .= $this->tokens[$i]['orig_content'];
-            } else {
-                $str .= $this->tokens[$i]['content'];
-            }
-        }
-
-        return $str;
-
-    }//end getTokensAsString()
-
-
-    /**
-     * Returns the position of the previous specified token(s).
-     *
-     * If a value is specified, the previous token of the specified type(s)
-     * containing the specified value will be returned.
-     *
-     * Returns false if no token can be found.
-     *
-     * @param int|string|array $types   The type(s) of tokens to search for.
-     * @param int              $start   The position to start searching from in the
-     *                                  token stack.
-     * @param int              $end     The end position to fail if no token is found.
-     *                                  if not specified or null, end will default to
-     *                                  the start of the token stack.
-     * @param bool             $exclude If true, find the previous token that is NOT of
-     *                                  the types specified in $types.
-     * @param string           $value   The value that the token(s) must be equal to.
-     *                                  If value is omitted, tokens with any value will
-     *                                  be returned.
-     * @param bool             $local   If true, tokens outside the current statement
-     *                                  will not be checked. IE. checking will stop
-     *                                  at the previous semi-colon found.
-     *
-     * @return int|bool
-     * @see    findNext()
-     */
-    public function findPrevious(
-        $types,
-        $start,
-        $end=null,
-        $exclude=false,
-        $value=null,
-        $local=false
-    ) {
-        $types = (array) $types;
-
-        if ($end === null) {
-            $end = 0;
-        }
-
-        for ($i = $start; $i >= $end; $i--) {
-            $found = (bool) $exclude;
-            foreach ($types as $type) {
-                if ($this->tokens[$i]['code'] === $type) {
-                    $found = !$exclude;
-                    break;
-                }
-            }
-
-            if ($found === true) {
-                if ($value === null) {
-                    return $i;
-                } else if ($this->tokens[$i]['content'] === $value) {
-                    return $i;
-                }
-            }
-
-            if ($local === true) {
-                if (isset($this->tokens[$i]['scope_opener']) === true
-                    && $i === $this->tokens[$i]['scope_closer']
-                ) {
-                    $i = $this->tokens[$i]['scope_opener'];
-                } else if (isset($this->tokens[$i]['bracket_opener']) === true
-                    && $i === $this->tokens[$i]['bracket_closer']
-                ) {
-                    $i = $this->tokens[$i]['bracket_opener'];
-                } else if (isset($this->tokens[$i]['parenthesis_opener']) === true
-                    && $i === $this->tokens[$i]['parenthesis_closer']
-                ) {
-                    $i = $this->tokens[$i]['parenthesis_opener'];
-                } else if ($this->tokens[$i]['code'] === T_SEMICOLON) {
-                    break;
-                }
-            }
-        }//end for
-
-        return false;
-
-    }//end findPrevious()
-
-
-    /**
-     * Returns the position of the next specified token(s).
-     *
-     * If a value is specified, the next token of the specified type(s)
-     * containing the specified value will be returned.
-     *
-     * Returns false if no token can be found.
-     *
-     * @param int|string|array $types   The type(s) of tokens to search for.
-     * @param int              $start   The position to start searching from in the
-     *                                  token stack.
-     * @param int              $end     The end position to fail if no token is found.
-     *                                  if not specified or null, end will default to
-     *                                  the end of the token stack.
-     * @param bool             $exclude If true, find the next token that is NOT of
-     *                                  a type specified in $types.
-     * @param string           $value   The value that the token(s) must be equal to.
-     *                                  If value is omitted, tokens with any value will
-     *                                  be returned.
-     * @param bool             $local   If true, tokens outside the current statement
-     *                                  will not be checked. i.e., checking will stop
-     *                                  at the next semi-colon found.
-     *
-     * @return int|bool
-     * @see    findPrevious()
-     */
-    public function findNext(
-        $types,
-        $start,
-        $end=null,
-        $exclude=false,
-        $value=null,
-        $local=false
-    ) {
-        $types = (array) $types;
-
-        if ($end === null || $end > $this->numTokens) {
-            $end = $this->numTokens;
-        }
-
-        for ($i = $start; $i < $end; $i++) {
-            $found = (bool) $exclude;
-            foreach ($types as $type) {
-                if ($this->tokens[$i]['code'] === $type) {
-                    $found = !$exclude;
-                    break;
-                }
-            }
-
-            if ($found === true) {
-                if ($value === null) {
-                    return $i;
-                } else if ($this->tokens[$i]['content'] === $value) {
-                    return $i;
-                }
-            }
-
-            if ($local === true && $this->tokens[$i]['code'] === T_SEMICOLON) {
-                break;
-            }
-        }//end for
-
-        return false;
-
-    }//end findNext()
-
-
-    /**
-     * Returns the position of the first non-whitespace token in a statement.
-     *
-     * @param int       $start  The position to start searching from in the token stack.
-     * @param int|array $ignore Token types that should not be considered stop points.
-     *
-     * @return int
-     */
-    public function findStartOfStatement($start, $ignore=null)
-    {
-        $endTokens = Util\Tokens::$blockOpeners;
-
-        $endTokens[T_COLON]            = true;
-        $endTokens[T_COMMA]            = true;
-        $endTokens[T_DOUBLE_ARROW]     = true;
-        $endTokens[T_SEMICOLON]        = true;
-        $endTokens[T_OPEN_TAG]         = true;
-        $endTokens[T_CLOSE_TAG]        = true;
-        $endTokens[T_OPEN_SHORT_ARRAY] = true;
-
-        if ($ignore !== null) {
-            $ignore = (array) $ignore;
-            foreach ($ignore as $code) {
-                unset($endTokens[$code]);
-            }
-        }
-
-        $lastNotEmpty = $start;
-
-        for ($i = $start; $i >= 0; $i--) {
-            if (isset($endTokens[$this->tokens[$i]['code']]) === true) {
-                // Found the end of the previous statement.
-                return $lastNotEmpty;
-            }
-
-            if (isset($this->tokens[$i]['scope_opener']) === true
-                && $i === $this->tokens[$i]['scope_closer']
-            ) {
-                // Found the end of the previous scope block.
-                return $lastNotEmpty;
-            }
-
-            // Skip nested statements.
-            if (isset($this->tokens[$i]['bracket_opener']) === true
-                && $i === $this->tokens[$i]['bracket_closer']
-            ) {
-                $i = $this->tokens[$i]['bracket_opener'];
-            } else if (isset($this->tokens[$i]['parenthesis_opener']) === true
-                && $i === $this->tokens[$i]['parenthesis_closer']
-            ) {
-                $i = $this->tokens[$i]['parenthesis_opener'];
-            }
-
-            if (isset(Util\Tokens::$emptyTokens[$this->tokens[$i]['code']]) === false) {
-                $lastNotEmpty = $i;
-            }
-        }//end for
-
-        return 0;
-
-    }//end findStartOfStatement()
-
-
-    /**
-     * Returns the position of the last non-whitespace token in a statement.
-     *
-     * @param int       $start  The position to start searching from in the token stack.
-     * @param int|array $ignore Token types that should not be considered stop points.
-     *
-     * @return int
-     */
-    public function findEndOfStatement($start, $ignore=null)
-    {
-        $endTokens = [
-            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;
-            foreach ($ignore as $code) {
-                unset($endTokens[$code]);
-            }
-        }
-
-        $lastNotEmpty = $start;
-
-        for ($i = $start; $i < $this->numTokens; $i++) {
-            if ($i !== $start && isset($endTokens[$this->tokens[$i]['code']]) === true) {
-                // Found the end of the statement.
-                if ($this->tokens[$i]['code'] === T_CLOSE_PARENTHESIS
-                    || $this->tokens[$i]['code'] === T_CLOSE_SQUARE_BRACKET
-                    || $this->tokens[$i]['code'] === T_CLOSE_CURLY_BRACKET
-                    || $this->tokens[$i]['code'] === T_CLOSE_SHORT_ARRAY
-                    || $this->tokens[$i]['code'] === T_OPEN_TAG
-                    || $this->tokens[$i]['code'] === T_CLOSE_TAG
-                ) {
-                    return $lastNotEmpty;
-                }
-
-                return $i;
-            }
-
-            // Skip nested statements.
-            if (isset($this->tokens[$i]['scope_closer']) === true
-                && ($i === $this->tokens[$i]['scope_opener']
-                || $i === $this->tokens[$i]['scope_condition'])
-            ) {
-                if ($i === $start && isset(Util\Tokens::$scopeOpeners[$this->tokens[$i]['code']]) === true) {
-                    return $this->tokens[$i]['scope_closer'];
-                }
-
-                $i = $this->tokens[$i]['scope_closer'];
-            } else if (isset($this->tokens[$i]['bracket_closer']) === true
-                && $i === $this->tokens[$i]['bracket_opener']
-            ) {
-                $i = $this->tokens[$i]['bracket_closer'];
-            } else if (isset($this->tokens[$i]['parenthesis_closer']) === true
-                && $i === $this->tokens[$i]['parenthesis_opener']
-            ) {
-                $i = $this->tokens[$i]['parenthesis_closer'];
-            }
-
-            if (isset(Util\Tokens::$emptyTokens[$this->tokens[$i]['code']]) === false) {
-                $lastNotEmpty = $i;
-            }
-        }//end for
-
-        return ($this->numTokens - 1);
-
-    }//end findEndOfStatement()
-
-
-    /**
-     * Returns the position of the first token on a line, matching given type.
-     *
-     * Returns false if no token can be found.
-     *
-     * @param int|string|array $types   The type(s) of tokens to search for.
-     * @param int              $start   The position to start searching from in the
-     *                                  token stack. The first token matching on
-     *                                  this line before this token will be returned.
-     * @param bool             $exclude If true, find the token that is NOT of
-     *                                  the types specified in $types.
-     * @param string           $value   The value that the token must be equal to.
-     *                                  If value is omitted, tokens with any value will
-     *                                  be returned.
-     *
-     * @return int | bool
-     */
-    public function findFirstOnLine($types, $start, $exclude=false, $value=null)
-    {
-        if (is_array($types) === false) {
-            $types = [$types];
-        }
-
-        $foundToken = false;
-
-        for ($i = $start; $i >= 0; $i--) {
-            if ($this->tokens[$i]['line'] < $this->tokens[$start]['line']) {
-                break;
-            }
-
-            $found = $exclude;
-            foreach ($types as $type) {
-                if ($exclude === false) {
-                    if ($this->tokens[$i]['code'] === $type) {
-                        $found = true;
-                        break;
-                    }
-                } else {
-                    if ($this->tokens[$i]['code'] === $type) {
-                        $found = false;
-                        break;
-                    }
-                }
-            }
-
-            if ($found === true) {
-                if ($value === null) {
-                    $foundToken = $i;
-                } else if ($this->tokens[$i]['content'] === $value) {
-                    $foundToken = $i;
-                }
-            }
-        }//end for
-
-        return $foundToken;
-
-    }//end findFirstOnLine()
-
-
-    /**
-     * Determine if the passed token has a condition of one of the passed types.
-     *
-     * @param int              $stackPtr The position of the token we are checking.
-     * @param int|string|array $types    The type(s) of tokens to search for.
-     *
-     * @return boolean
-     */
-    public function hasCondition($stackPtr, $types)
-    {
-        // Check for the existence of the token.
-        if (isset($this->tokens[$stackPtr]) === false) {
-            return false;
-        }
-
-        // Make sure the token has conditions.
-        if (isset($this->tokens[$stackPtr]['conditions']) === false) {
-            return false;
-        }
-
-        $types      = (array) $types;
-        $conditions = $this->tokens[$stackPtr]['conditions'];
-
-        foreach ($types as $type) {
-            if (in_array($type, $conditions, true) === true) {
-                // We found a token with the required type.
-                return true;
-            }
-        }
-
-        return false;
-
-    }//end hasCondition()
-
-
-    /**
-     * Return the position of the condition for the passed token.
-     *
-     * Returns FALSE if the token does not have the condition.
-     *
-     * @param int        $stackPtr The position of the token we are checking.
-     * @param int|string $type     The type of token to search for.
-     *
-     * @return int
-     */
-    public function getCondition($stackPtr, $type)
-    {
-        // Check for the existence of the token.
-        if (isset($this->tokens[$stackPtr]) === false) {
-            return false;
-        }
-
-        // Make sure the token has conditions.
-        if (isset($this->tokens[$stackPtr]['conditions']) === false) {
-            return false;
-        }
-
-        $conditions = $this->tokens[$stackPtr]['conditions'];
-        foreach ($conditions as $token => $condition) {
-            if ($condition === $type) {
-                return $token;
-            }
-        }
-
-        return false;
-
-    }//end getCondition()
-
-
-    /**
-     * Returns the name of the class that the specified class extends.
-     * (works for classes, anonymous classes and interfaces)
-     *
-     * Returns FALSE on error or if there is no extended class name.
-     *
-     * @param int $stackPtr The stack position of the class.
-     *
-     * @return string|false
-     */
-    public function findExtendedClassName($stackPtr)
-    {
-        // Check for the existence of the token.
-        if (isset($this->tokens[$stackPtr]) === false) {
-            return false;
-        }
-
-        if ($this->tokens[$stackPtr]['code'] !== T_CLASS
-            && $this->tokens[$stackPtr]['code'] !== T_ANON_CLASS
-            && $this->tokens[$stackPtr]['code'] !== T_INTERFACE
-        ) {
-            return false;
-        }
-
-        if (isset($this->tokens[$stackPtr]['scope_opener']) === false) {
-            return false;
-        }
-
-        $classOpenerIndex = $this->tokens[$stackPtr]['scope_opener'];
-        $extendsIndex     = $this->findNext(T_EXTENDS, $stackPtr, $classOpenerIndex);
-        if (false === $extendsIndex) {
-            return false;
-        }
-
-        $find = [
-            T_NS_SEPARATOR,
-            T_STRING,
-            T_WHITESPACE,
-        ];
-
-        $end  = $this->findNext($find, ($extendsIndex + 1), ($classOpenerIndex + 1), true);
-        $name = $this->getTokensAsString(($extendsIndex + 1), ($end - $extendsIndex - 1));
-        $name = trim($name);
-
-        if ($name === '') {
-            return false;
-        }
-
-        return $name;
-
-    }//end findExtendedClassName()
-
-
-    /**
-     * Returns the names of the interfaces that the specified class implements.
-     *
-     * Returns FALSE on error or if there are no implemented interface names.
-     *
-     * @param int $stackPtr The stack position of the class.
-     *
-     * @return array|false
-     */
-    public function findImplementedInterfaceNames($stackPtr)
-    {
-        // Check for the existence of the token.
-        if (isset($this->tokens[$stackPtr]) === false) {
-            return false;
-        }
-
-        if ($this->tokens[$stackPtr]['code'] !== T_CLASS
-            && $this->tokens[$stackPtr]['code'] !== T_ANON_CLASS
-        ) {
-            return false;
-        }
-
-        if (isset($this->tokens[$stackPtr]['scope_closer']) === false) {
-            return false;
-        }
-
-        $classOpenerIndex = $this->tokens[$stackPtr]['scope_opener'];
-        $implementsIndex  = $this->findNext(T_IMPLEMENTS, $stackPtr, $classOpenerIndex);
-        if ($implementsIndex === false) {
-            return false;
-        }
-
-        $find = [
-            T_NS_SEPARATOR,
-            T_STRING,
-            T_WHITESPACE,
-            T_COMMA,
-        ];
-
-        $end  = $this->findNext($find, ($implementsIndex + 1), ($classOpenerIndex + 1), true);
-        $name = $this->getTokensAsString(($implementsIndex + 1), ($end - $implementsIndex - 1));
-        $name = trim($name);
-
-        if ($name === '') {
-            return false;
-        } else {
-            $names = explode(',', $name);
-            $names = array_map('trim', $names);
-            return $names;
-        }
-
-    }//end findImplementedInterfaceNames()
+	/**
+	 * The absolute path to the file associated with this object.
+	 *
+	 * @var string
+	 */
+	public $path = '';
+
+	/**
+	 * The content of the file.
+	 *
+	 * @var string
+	 */
+	protected $content = '';
+
+	/**
+	 * The config data for the run.
+	 *
+	 * @var \PHP_CodeSniffer\Config
+	 */
+	public $config = null;
+
+	/**
+	 * The ruleset used for the run.
+	 *
+	 * @var \PHP_CodeSniffer\Ruleset
+	 */
+	public $ruleset = null;
+
+	/**
+	 * If TRUE, the entire file is being ignored.
+	 *
+	 * @var boolean
+	 */
+	public $ignored = false;
+
+	/**
+	 * The EOL character this file uses.
+	 *
+	 * @var string
+	 */
+	public $eolChar = '';
+
+	/**
+	 * The Fixer object to control fixing errors.
+	 *
+	 * @var \PHP_CodeSniffer\Fixer
+	 */
+	public $fixer = null;
+
+	/**
+	 * The tokenizer being used for this file.
+	 *
+	 * @var \PHP_CodeSniffer\Tokenizers\Tokenizer
+	 */
+	public $tokenizer = null;
+
+	/**
+	 * The name of the tokenizer being used for this file.
+	 *
+	 * @var string
+	 */
+	public $tokenizerType = 'PHP';
+
+	/**
+	 * Was the file loaded from cache?
+	 *
+	 * If TRUE, the file was loaded from a local cache.
+	 * If FALSE, the file was tokenized and processed fully.
+	 *
+	 * @var boolean
+	 */
+	public $fromCache = false;
+
+	/**
+	 * The number of tokens in this file.
+	 *
+	 * Stored here to save calling count() everywhere.
+	 *
+	 * @var integer
+	 */
+	public $numTokens = 0;
+
+	/**
+	 * The tokens stack map.
+	 *
+	 * @var array
+	 */
+	protected $tokens = [];
+
+	/**
+	 * The errors raised from sniffs.
+	 *
+	 * @var array
+	 * @see getErrors()
+	 */
+	protected $errors = [];
+
+	/**
+	 * The warnings raised from sniffs.
+	 *
+	 * @var array
+	 * @see getWarnings()
+	 */
+	protected $warnings = [];
+
+	/**
+	 * The metrics recorded by sniffs.
+	 *
+	 * @var array
+	 * @see getMetrics()
+	 */
+	protected $metrics = [];
+
+	/**
+	 * The metrics recorded for each token.
+	 *
+	 * Stops the same metric being recorded for the same token twice.
+	 *
+	 * @var array
+	 * @see getMetrics()
+	 */
+	private $metricTokens = [];
+
+	/**
+	 * The total number of errors raised.
+	 *
+	 * @var integer
+	 */
+	protected $errorCount = 0;
+
+	/**
+	 * The total number of warnings raised.
+	 *
+	 * @var integer
+	 */
+	protected $warningCount = 0;
+
+	/**
+	 * The total number of errors and warnings that can be fixed.
+	 *
+	 * @var integer
+	 */
+	protected $fixableCount = 0;
+
+	/**
+	 * The total number of errors and warnings that were fixed.
+	 *
+	 * @var integer
+	 */
+	protected $fixedCount = 0;
+
+	/**
+	 * An array of sniffs that are being ignored.
+	 *
+	 * @var array
+	 */
+	protected $ignoredListeners = [];
+
+	/**
+	 * An array of message codes that are being ignored.
+	 *
+	 * @var array
+	 */
+	protected $ignoredCodes = [];
+
+	/**
+	 * An array of sniffs listening to this file's processing.
+	 *
+	 * @var \PHP_CodeSniffer\Sniffs\Sniff[]
+	 */
+	protected $listeners = [];
+
+	/**
+	 * The class name of the sniff currently processing the file.
+	 *
+	 * @var string
+	 */
+	protected $activeListener = '';
+
+	/**
+	 * An array of sniffs being processed and how long they took.
+	 *
+	 * @var array
+	 */
+	protected $listenerTimes = [];
+
+	/**
+	 * A cache of often used config settings to improve performance.
+	 *
+	 * Storing them here saves 10k+ calls to __get() in the Config class.
+	 *
+	 * @var array
+	 */
+	protected $configCache = [];
+
+
+	/**
+	 * Constructs a file.
+	 *
+	 * @param string                   $path    The absolute path to the file to process.
+	 * @param \PHP_CodeSniffer\Ruleset $ruleset The ruleset used for the run.
+	 * @param \PHP_CodeSniffer\Config  $config  The config data for the run.
+	 *
+	 * @return void
+	 */
+	public function __construct($path, Ruleset $ruleset, Config $config)
+	{
+		$this->path    = $path;
+		$this->ruleset = $ruleset;
+		$this->config  = $config;
+		$this->fixer   = new Fixer();
+
+		$parts     = explode('.', $path);
+		$extension = array_pop($parts);
+		if (isset($config->extensions[$extension]) === true) {
+			$this->tokenizerType = $config->extensions[$extension];
+		} else {
+			// Revert to default.
+			$this->tokenizerType = 'PHP';
+		}
+
+		$this->configCache['cache']           = $this->config->cache;
+		$this->configCache['sniffs']          = array_map('strtolower', $this->config->sniffs);
+		$this->configCache['exclude']         = array_map('strtolower', $this->config->exclude);
+		$this->configCache['errorSeverity']   = $this->config->errorSeverity;
+		$this->configCache['warningSeverity'] = $this->config->warningSeverity;
+		$this->configCache['recordErrors']    = $this->config->recordErrors;
+		$this->configCache['ignorePatterns']  = $this->ruleset->ignorePatterns;
+		$this->configCache['includePatterns'] = $this->ruleset->includePatterns;
+
+	}//end __construct()
+
+
+	/**
+	 * Set the content of the file.
+	 *
+	 * Setting the content also calculates the EOL char being used.
+	 *
+	 * @param string $content The file content.
+	 *
+	 * @return void
+	 */
+	public function setContent($content)
+	{
+		$this->content = $content;
+		$this->tokens  = [];
+
+		try {
+			$this->eolChar = Util\Common::detectLineEndings($content);
+		} catch (RuntimeException $e) {
+			$this->addWarningOnLine($e->getMessage(), 1, 'Internal.DetectLineEndings');
+			return;
+		}
+
+	}//end setContent()
+
+
+	/**
+	 * Reloads the content of the file.
+	 *
+	 * By default, we have no idea where our content comes from,
+	 * so we can't do anything.
+	 *
+	 * @return void
+	 */
+	public function reloadContent()
+	{
+
+	}//end reloadContent()
+
+
+	/**
+	 * Disables caching of this file.
+	 *
+	 * @return void
+	 */
+	public function disableCaching()
+	{
+		$this->configCache['cache'] = false;
+
+	}//end disableCaching()
+
+
+	/**
+	 * Starts the stack traversal and tells listeners when tokens are found.
+	 *
+	 * @return void
+	 */
+	public function process()
+	{
+		if ($this->ignored === true) {
+			return;
+		}
+
+		$this->errors       = [];
+		$this->warnings     = [];
+		$this->errorCount   = 0;
+		$this->warningCount = 0;
+		$this->fixableCount = 0;
+
+		$this->parse();
+
+		// Check if tokenizer errors cause this file to be ignored.
+		if ($this->ignored === true) {
+			return;
+		}
+
+		$this->fixer->startFile($this);
+
+		if (PHP_CODESNIFFER_VERBOSITY > 2) {
+			echo "\t*** START TOKEN PROCESSING ***".PHP_EOL;
+		}
+
+		$foundCode        = false;
+		$listenerIgnoreTo = [];
+		$inTests          = defined('PHP_CODESNIFFER_IN_TESTS');
+		$checkAnnotations = $this->config->annotations;
+
+		// Foreach of the listeners that have registered to listen for this
+		// token, get them to process it.
+		foreach ($this->tokens as $stackPtr => $token) {
+			// Check for ignored lines.
+			if ($checkAnnotations === true
+				&& ($token['code'] === T_COMMENT
+				|| $token['code'] === T_PHPCS_IGNORE_FILE
+				|| $token['code'] === T_PHPCS_SET
+				|| $token['code'] === T_DOC_COMMENT_STRING
+				|| $token['code'] === T_DOC_COMMENT_TAG
+				|| ($inTests === true && $token['code'] === T_INLINE_HTML))
+			) {
+				$commentText      = ltrim($this->tokens[$stackPtr]['content'], ' /*');
+				$commentTextLower = strtolower($commentText);
+				if (strpos($commentText, '@codingStandards') !== false) {
+					if (strpos($commentText, '@codingStandardsIgnoreFile') !== false) {
+						// Ignoring the whole file, just a little late.
+						$this->errors       = [];
+						$this->warnings     = [];
+						$this->errorCount   = 0;
+						$this->warningCount = 0;
+						$this->fixableCount = 0;
+						return;
+					} else if (strpos($commentText, '@codingStandardsChangeSetting') !== false) {
+						$start   = strpos($commentText, '@codingStandardsChangeSetting');
+						$comment = substr($commentText, ($start + 30));
+						$parts   = explode(' ', $comment);
+						if (count($parts) >= 2) {
+							$sniffParts = explode('.', $parts[0]);
+							if (count($sniffParts) >= 3) {
+								// If the sniff code is not known to us, it has not been registered in this run.
+								// But don't throw an error as it could be there for a different standard to use.
+								if (isset($this->ruleset->sniffCodes[$parts[0]]) === true) {
+									$listenerCode  = array_shift($parts);
+									$propertyCode  = array_shift($parts);
+									$propertyValue = rtrim(implode(' ', $parts), " */\r\n");
+									$listenerClass = $this->ruleset->sniffCodes[$listenerCode];
+									$this->ruleset->setSniffProperty($listenerClass, $propertyCode, $propertyValue);
+								}
+							}
+						}
+					}//end if
+				} else if (substr($commentTextLower, 0, 16) === 'phpcs:ignorefile'
+					|| substr($commentTextLower, 0, 17) === '@phpcs:ignorefile'
+				) {
+					// Ignoring the whole file, just a little late.
+					$this->errors       = [];
+					$this->warnings     = [];
+					$this->errorCount   = 0;
+					$this->warningCount = 0;
+					$this->fixableCount = 0;
+					return;
+				} else if (substr($commentTextLower, 0, 9) === 'phpcs:set'
+					|| substr($commentTextLower, 0, 10) === '@phpcs:set'
+				) {
+					if (isset($token['sniffCode']) === true) {
+						$listenerCode = $token['sniffCode'];
+						if (isset($this->ruleset->sniffCodes[$listenerCode]) === true) {
+							$propertyCode  = $token['sniffProperty'];
+							$propertyValue = $token['sniffPropertyValue'];
+							$listenerClass = $this->ruleset->sniffCodes[$listenerCode];
+							$this->ruleset->setSniffProperty($listenerClass, $propertyCode, $propertyValue);
+						}
+					}
+				}//end if
+			}//end if
+
+			if (PHP_CODESNIFFER_VERBOSITY > 2) {
+				$type    = $token['type'];
+				$content = Util\Common::prepareForOutput($token['content']);
+				echo "\t\tProcess token $stackPtr: $type => $content".PHP_EOL;
+			}
+
+			if ($token['code'] !== T_INLINE_HTML) {
+				$foundCode = true;
+			}
+
+			if (isset($this->ruleset->tokenListeners[$token['code']]) === false) {
+				continue;
+			}
+
+			foreach ($this->ruleset->tokenListeners[$token['code']] as $listenerData) {
+				if (isset($this->ignoredListeners[$listenerData['class']]) === true
+					|| (isset($listenerIgnoreTo[$listenerData['class']]) === true
+					&& $listenerIgnoreTo[$listenerData['class']] > $stackPtr)
+				) {
+					// This sniff is ignoring past this token, or the whole file.
+					continue;
+				}
+
+				// Make sure this sniff supports the tokenizer
+				// we are currently using.
+				$class = $listenerData['class'];
+
+				if (isset($listenerData['tokenizers'][$this->tokenizerType]) === false) {
+					continue;
+				}
+
+				// If the file path matches one of our ignore patterns, skip it.
+				// While there is support for a type of each pattern
+				// (absolute or relative) we don't actually support it here.
+				foreach ($listenerData['ignore'] as $pattern) {
+					// We assume a / directory separator, as do the exclude rules
+					// most developers write, so we need a special case for any system
+					// that is different.
+					if (DIRECTORY_SEPARATOR === '\\') {
+						$pattern = str_replace('/', '\\\\', $pattern);
+					}
+
+					$pattern = '`'.$pattern.'`i';
+					if (preg_match($pattern, $this->path) === 1) {
+						$this->ignoredListeners[$class] = true;
+						continue(2);
+					}
+				}
+
+				// If the file path does not match one of our include patterns, skip it.
+				// While there is support for a type of each pattern
+				// (absolute or relative) we don't actually support it here.
+				if (empty($listenerData['include']) === false) {
+					$included = false;
+					foreach ($listenerData['include'] as $pattern) {
+						// We assume a / directory separator, as do the exclude rules
+						// most developers write, so we need a special case for any system
+						// that is different.
+						if (DIRECTORY_SEPARATOR === '\\') {
+							$pattern = str_replace('/', '\\\\', $pattern);
+						}
+
+						$pattern = '`'.$pattern.'`i';
+						if (preg_match($pattern, $this->path) === 1) {
+							$included = true;
+							break;
+						}
+					}
+
+					if ($included === false) {
+						$this->ignoredListeners[$class] = true;
+						continue;
+					}
+				}//end if
+
+				$this->activeListener = $class;
+
+				if (PHP_CODESNIFFER_VERBOSITY > 2) {
+					$startTime = microtime(true);
+					echo "\t\t\tProcessing ".$this->activeListener.'... ';
+				}
+
+				$ignoreTo = $this->ruleset->sniffs[$class]->process($this, $stackPtr);
+				if ($ignoreTo !== null) {
+					$listenerIgnoreTo[$this->activeListener] = $ignoreTo;
+				}
+
+				if (PHP_CODESNIFFER_VERBOSITY > 2) {
+					$timeTaken = (microtime(true) - $startTime);
+					if (isset($this->listenerTimes[$this->activeListener]) === false) {
+						$this->listenerTimes[$this->activeListener] = 0;
+					}
+
+					$this->listenerTimes[$this->activeListener] += $timeTaken;
+
+					$timeTaken = round(($timeTaken), 4);
+					echo "DONE in $timeTaken seconds".PHP_EOL;
+				}
+
+				$this->activeListener = '';
+			}//end foreach
+		}//end foreach
+
+		// If short open tags are off but the file being checked uses
+		// short open tags, the whole content will be inline HTML
+		// and nothing will be checked. So try and handle this case.
+		// We don't show this error for STDIN because we can't be sure the content
+		// actually came directly from the user. It could be something like
+		// refs from a Git pre-push hook.
+		if ($foundCode === false && $this->tokenizerType === 'PHP' && $this->path !== 'STDIN') {
+			$shortTags = (bool) ini_get('short_open_tag');
+			if ($shortTags === false) {
+				$error = 'No PHP code was found in this file and short open tags are not allowed by this install of PHP. This file may be using short open tags but PHP does not allow them.';
+				$this->addWarning($error, null, 'Internal.NoCodeFound');
+			}
+		}
+
+		if (PHP_CODESNIFFER_VERBOSITY > 2) {
+			echo "\t*** END TOKEN PROCESSING ***".PHP_EOL;
+			echo "\t*** START SNIFF PROCESSING REPORT ***".PHP_EOL;
+
+			asort($this->listenerTimes, SORT_NUMERIC);
+			$this->listenerTimes = array_reverse($this->listenerTimes, true);
+			foreach ($this->listenerTimes as $listener => $timeTaken) {
+				echo "\t$listener: ".round(($timeTaken), 4).' secs'.PHP_EOL;
+			}
+
+			echo "\t*** END SNIFF PROCESSING REPORT ***".PHP_EOL;
+		}
+
+		$this->fixedCount += $this->fixer->getFixCount();
+
+	}//end process()
+
+
+	/**
+	 * Tokenizes the file and prepares it for the test run.
+	 *
+	 * @return void
+	 */
+	public function parse()
+	{
+		if (empty($this->tokens) === false) {
+			// File has already been parsed.
+			return;
+		}
+
+		try {
+			$tokenizerClass  = 'PHP_CodeSniffer\Tokenizers\\'.$this->tokenizerType;
+			$this->tokenizer = new $tokenizerClass($this->content, $this->config, $this->eolChar);
+			$this->tokens    = $this->tokenizer->getTokens();
+		} catch (TokenizerException $e) {
+			$this->ignored = true;
+			$this->addWarning($e->getMessage(), null, 'Internal.Tokenizer.Exception');
+			if (PHP_CODESNIFFER_VERBOSITY > 0) {
+				echo "[$this->tokenizerType => tokenizer error]... ";
+				if (PHP_CODESNIFFER_VERBOSITY > 1) {
+					echo PHP_EOL;
+				}
+			}
+
+			return;
+		}
+
+		$this->numTokens = count($this->tokens);
+
+		// Check for mixed line endings as these can cause tokenizer errors and we
+		// should let the user know that the results they get may be incorrect.
+		// This is done by removing all backslashes, removing the newline char we
+		// detected, then converting newlines chars into text. If any backslashes
+		// are left at the end, we have additional newline chars in use.
+		$contents = str_replace('\\', '', $this->content);
+		$contents = str_replace($this->eolChar, '', $contents);
+		$contents = str_replace("\n", '\n', $contents);
+		$contents = str_replace("\r", '\r', $contents);
+		if (strpos($contents, '\\') !== false) {
+			$error = 'File has mixed line endings; this may cause incorrect results';
+			$this->addWarningOnLine($error, 1, 'Internal.LineEndings.Mixed');
+		}
+
+		if (PHP_CODESNIFFER_VERBOSITY > 0) {
+			if ($this->numTokens === 0) {
+				$numLines = 0;
+			} else {
+				$numLines = $this->tokens[($this->numTokens - 1)]['line'];
+			}
+
+			echo "[$this->tokenizerType => $this->numTokens tokens in $numLines lines]... ";
+			if (PHP_CODESNIFFER_VERBOSITY > 1) {
+				echo PHP_EOL;
+			}
+		}
+
+	}//end parse()
+
+
+	/**
+	 * Returns the token stack for this file.
+	 *
+	 * @return array
+	 */
+	public function getTokens()
+	{
+		return $this->tokens;
+
+	}//end getTokens()
+
+
+	/**
+	 * Remove vars stored in this file that are no longer required.
+	 *
+	 * @return void
+	 */
+	public function cleanUp()
+	{
+		$this->listenerTimes = null;
+		$this->content       = null;
+		$this->tokens        = null;
+		$this->metricTokens  = null;
+		$this->tokenizer     = null;
+		$this->fixer         = null;
+		$this->config        = null;
+		$this->ruleset       = null;
+
+	}//end cleanUp()
+
+
+	/**
+	 * Records an error against a specific token in the file.
+	 *
+	 * @param string  $error    The error message.
+	 * @param int     $stackPtr The stack position where the error occurred.
+	 * @param string  $code     A violation code unique to the sniff message.
+	 * @param array   $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.
+	 * @param boolean $fixable  Can the error be fixed by the sniff?
+	 *
+	 * @return boolean
+	 */
+	public function addError(
+		$error,
+		$stackPtr,
+		$code,
+		$data=[],
+		$severity=0,
+		$fixable=false
+	) {
+		if ($stackPtr === null) {
+			$line   = 1;
+			$column = 1;
+		} else {
+			$line   = $this->tokens[$stackPtr]['line'];
+			$column = $this->tokens[$stackPtr]['column'];
+		}
+
+		return $this->addMessage(true, $error, $line, $column, $code, $data, $severity, $fixable);
+
+	}//end addError()
+
+
+	/**
+	 * Records a warning against a specific token in the file.
+	 *
+	 * @param string  $warning  The error message.
+	 * @param int     $stackPtr The stack position where the error occurred.
+	 * @param string  $code     A violation code unique to the sniff message.
+	 * @param array   $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.
+	 * @param boolean $fixable  Can the warning be fixed by the sniff?
+	 *
+	 * @return boolean
+	 */
+	public function addWarning(
+		$warning,
+		$stackPtr,
+		$code,
+		$data=[],
+		$severity=0,
+		$fixable=false
+	) {
+		if ($stackPtr === null) {
+			$line   = 1;
+			$column = 1;
+		} else {
+			$line   = $this->tokens[$stackPtr]['line'];
+			$column = $this->tokens[$stackPtr]['column'];
+		}
+
+		return $this->addMessage(false, $warning, $line, $column, $code, $data, $severity, $fixable);
+
+	}//end addWarning()
+
+
+	/**
+	 * Records an error against a specific line in the file.
+	 *
+	 * @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 int    $severity The severity level for this error. A value of 0
+	 *                         will be converted into the default severity level.
+	 *
+	 * @return boolean
+	 */
+	public function addErrorOnLine(
+		$error,
+		$line,
+		$code,
+		$data=[],
+		$severity=0
+	) {
+		return $this->addMessage(true, $error, $line, 1, $code, $data, $severity, false);
+
+	}//end addErrorOnLine()
+
+
+	/**
+	 * Records a warning against a specific token in the file.
+	 *
+	 * @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 int    $severity The severity level for this warning. A value of 0 will
+	 *                         will be converted into the default severity level.
+	 *
+	 * @return boolean
+	 */
+	public function addWarningOnLine(
+		$warning,
+		$line,
+		$code,
+		$data=[],
+		$severity=0
+	) {
+		return $this->addMessage(false, $warning, $line, 1, $code, $data, $severity, false);
+
+	}//end addWarningOnLine()
+
+
+	/**
+	 * Records a fixable error against a specific token in the file.
+	 *
+	 * Returns true if the error was recorded and should be fixed.
+	 *
+	 * @param string $error    The error message.
+	 * @param int    $stackPtr The stack position where the error occurred.
+	 * @param string $code     A violation code unique to the sniff message.
+	 * @param array  $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.
+	 *
+	 * @return boolean
+	 */
+	public function addFixableError(
+		$error,
+		$stackPtr,
+		$code,
+		$data=[],
+		$severity=0
+	) {
+		$recorded = $this->addError($error, $stackPtr, $code, $data, $severity, true);
+		if ($recorded === true && $this->fixer->enabled === true) {
+			return true;
+		}
+
+		return false;
+
+	}//end addFixableError()
+
+
+	/**
+	 * Records a fixable warning against a specific token in the file.
+	 *
+	 * Returns true if the warning was recorded and should be fixed.
+	 *
+	 * @param string $warning  The error message.
+	 * @param int    $stackPtr The stack position where the error occurred.
+	 * @param string $code     A violation code unique to the sniff message.
+	 * @param array  $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.
+	 *
+	 * @return boolean
+	 */
+	public function addFixableWarning(
+		$warning,
+		$stackPtr,
+		$code,
+		$data=[],
+		$severity=0
+	) {
+		$recorded = $this->addWarning($warning, $stackPtr, $code, $data, $severity, true);
+		if ($recorded === true && $this->fixer->enabled === true) {
+			return true;
+		}
+
+		return false;
+
+	}//end addFixableWarning()
+
+
+	/**
+	 * Adds an error to the error stack.
+	 *
+	 * @param boolean $error    Is this an error message?
+	 * @param string  $message  The text of the message.
+	 * @param int     $line     The line on which the message occurred.
+	 * @param int     $column   The column at which the message occurred.
+	 * @param string  $code     A violation code unique to the sniff message.
+	 * @param array   $data     Replacements for the message.
+	 * @param int     $severity The severity level for this message. A value of 0
+	 *                          will be converted into the default severity level.
+	 * @param boolean $fixable  Can the problem be fixed by the sniff?
+	 *
+	 * @return boolean
+	 */
+	protected function addMessage($error, $message, $line, $column, $code, $data, $severity, $fixable)
+	{
+		// Check if this line is ignoring all message codes.
+		if (isset($this->tokenizer->ignoredLines[$line]['.all']) === true) {
+			return false;
+		}
+
+		// Work out which sniff generated the message.
+		$parts = explode('.', $code);
+		if ($parts[0] === 'Internal') {
+			// An internal message.
+			$listenerCode = Util\Common::getSniffCode($this->activeListener);
+			$sniffCode    = $code;
+			$checkCodes   = [$sniffCode];
+		} else {
+			if ($parts[0] !== $code) {
+				// The full message code has been passed in.
+				$sniffCode    = $code;
+				$listenerCode = substr($sniffCode, 0, strrpos($sniffCode, '.'));
+			} else {
+				$listenerCode = Util\Common::getSniffCode($this->activeListener);
+				$sniffCode    = $listenerCode.'.'.$code;
+				$parts        = explode('.', $sniffCode);
+			}
+
+			$checkCodes = [
+				$sniffCode,
+				$parts[0].'.'.$parts[1].'.'.$parts[2],
+				$parts[0].'.'.$parts[1],
+				$parts[0],
+			];
+		}//end if
+
+		if (isset($this->tokenizer->ignoredLines[$line]) === true) {
+			// Check if this line is ignoring this specific message.
+			$ignored = false;
+			foreach ($checkCodes as $checkCode) {
+				if (isset($this->tokenizer->ignoredLines[$line][$checkCode]) === true) {
+					$ignored = true;
+					break;
+				}
+			}
+
+			// If it is ignored, make sure it's not whitelisted.
+			if ($ignored === true
+				&& isset($this->tokenizer->ignoredLines[$line]['.except']) === true
+			) {
+				foreach ($checkCodes as $checkCode) {
+					if (isset($this->tokenizer->ignoredLines[$line]['.except'][$checkCode]) === true) {
+						$ignored = false;
+						break;
+					}
+				}
+			}
+
+			if ($ignored === true) {
+				return false;
+			}
+		}//end if
+
+		$includeAll = true;
+		if ($this->configCache['cache'] === false
+			|| $this->configCache['recordErrors'] === false
+		) {
+			$includeAll = false;
+		}
+
+		// Filter out any messages for sniffs that shouldn't have run
+		// due to the use of the --sniffs command line argument.
+		if ($includeAll === false
+			&& ((empty($this->configCache['sniffs']) === false
+			&& in_array(strtolower($listenerCode), $this->configCache['sniffs'], true) === false)
+			|| (empty($this->configCache['exclude']) === false
+			&& in_array(strtolower($listenerCode), $this->configCache['exclude'], true) === true))
+		) {
+			return false;
+		}
+
+		// If we know this sniff code is being ignored for this file, return early.
+		foreach ($checkCodes as $checkCode) {
+			if (isset($this->ignoredCodes[$checkCode]) === true) {
+				return false;
+			}
+		}
+
+		$oppositeType = 'warning';
+		if ($error === false) {
+			$oppositeType = 'error';
+		}
+
+		foreach ($checkCodes as $checkCode) {
+			// Make sure this message type has not been set to the opposite message type.
+			if (isset($this->ruleset->ruleset[$checkCode]['type']) === true
+				&& $this->ruleset->ruleset[$checkCode]['type'] === $oppositeType
+			) {
+				$error = !$error;
+				break;
+			}
+		}
+
+		if ($error === true) {
+			$configSeverity = $this->configCache['errorSeverity'];
+			$messageCount   = &$this->errorCount;
+			$messages       = &$this->errors;
+		} else {
+			$configSeverity = $this->configCache['warningSeverity'];
+			$messageCount   = &$this->warningCount;
+			$messages       = &$this->warnings;
+		}
+
+		if ($includeAll === false && $configSeverity === 0) {
+			// Don't bother doing any processing as these messages are just going to
+			// be hidden in the reports anyway.
+			return false;
+		}
+
+		if ($severity === 0) {
+			$severity = 5;
+		}
+
+		foreach ($checkCodes as $checkCode) {
+			// Make sure we are interested in this severity level.
+			if (isset($this->ruleset->ruleset[$checkCode]['severity']) === true) {
+				$severity = $this->ruleset->ruleset[$checkCode]['severity'];
+				break;
+			}
+		}
+
+		if ($includeAll === false && $configSeverity > $severity) {
+			return false;
+		}
+
+		// Make sure we are not ignoring this file.
+		$included = null;
+		foreach ($checkCodes as $checkCode) {
+			$patterns = null;
+
+			if (isset($this->configCache['includePatterns'][$checkCode]) === true) {
+				$patterns  = $this->configCache['includePatterns'][$checkCode];
+				$excluding = false;
+			} else if (isset($this->configCache['ignorePatterns'][$checkCode]) === true) {
+				$patterns  = $this->configCache['ignorePatterns'][$checkCode];
+				$excluding = true;
+			}
+
+			if ($patterns === null) {
+				continue;
+			}
+
+			foreach ($patterns as $pattern => $type) {
+				// While there is support for a type of each pattern
+				// (absolute or relative) we don't actually support it here.
+				$replacements = [
+					'\\,' => ',',
+					'*'   => '.*',
+				];
+
+				// We assume a / directory separator, as do the exclude rules
+				// most developers write, so we need a special case for any system
+				// that is different.
+				if (DIRECTORY_SEPARATOR === '\\') {
+					$replacements['/'] = '\\\\';
+				}
+
+				$pattern = '`'.strtr($pattern, $replacements).'`i';
+				$matched = preg_match($pattern, $this->path);
+
+				if ($matched === 0) {
+					if ($excluding === false && $included === null) {
+						// This file path is not being included.
+						$included = false;
+					}
+
+					continue;
+				}
+
+				if ($excluding === true) {
+					// This file path is being excluded.
+					$this->ignoredCodes[$checkCode] = true;
+					return false;
+				}
+
+				// This file path is being included.
+				$included = true;
+				break;
+			}//end foreach
+		}//end foreach
+
+		if ($included === false) {
+			// There were include rules set, but this file
+			// path didn't match any of them.
+			return false;
+		}
+
+		$messageCount++;
+		if ($fixable === true) {
+			$this->fixableCount++;
+		}
+
+		if ($this->configCache['recordErrors'] === false
+			&& $includeAll === false
+		) {
+			return true;
+		}
+
+		// Work out the error message.
+		if (isset($this->ruleset->ruleset[$sniffCode]['message']) === true) {
+			$message = $this->ruleset->ruleset[$sniffCode]['message'];
+		}
+
+		if (empty($data) === false) {
+			$message = vsprintf($message, $data);
+		}
+
+		if (isset($messages[$line]) === false) {
+			$messages[$line] = [];
+		}
+
+		if (isset($messages[$line][$column]) === false) {
+			$messages[$line][$column] = [];
+		}
+
+		$messages[$line][$column][] = [
+			'message'  => $message,
+			'source'   => $sniffCode,
+			'listener' => $this->activeListener,
+			'severity' => $severity,
+			'fixable'  => $fixable,
+		];
+
+		if (PHP_CODESNIFFER_VERBOSITY > 1
+			&& $this->fixer->enabled === true
+			&& $fixable === true
+		) {
+			@ob_end_clean();
+			echo "\tE: [Line $line] $message ($sniffCode)".PHP_EOL;
+			ob_start();
+		}
+
+		return true;
+
+	}//end addMessage()
+
+
+	/**
+	 * Record a metric about the file being examined.
+	 *
+	 * @param int    $stackPtr The stack position where the metric was recorded.
+	 * @param string $metric   The name of the metric being recorded.
+	 * @param string $value    The value of the metric being recorded.
+	 *
+	 * @return boolean
+	 */
+	public function recordMetric($stackPtr, $metric, $value)
+	{
+		if (isset($this->metrics[$metric]) === false) {
+			$this->metrics[$metric] = ['values' => [$value => 1]];
+			$this->metricTokens[$metric][$stackPtr] = true;
+		} else if (isset($this->metricTokens[$metric][$stackPtr]) === false) {
+			$this->metricTokens[$metric][$stackPtr] = true;
+			if (isset($this->metrics[$metric]['values'][$value]) === false) {
+				$this->metrics[$metric]['values'][$value] = 1;
+			} else {
+				$this->metrics[$metric]['values'][$value]++;
+			}
+		}
+
+		return true;
+
+	}//end recordMetric()
+
+
+	/**
+	 * Returns the number of errors raised.
+	 *
+	 * @return int
+	 */
+	public function getErrorCount()
+	{
+		return $this->errorCount;
+
+	}//end getErrorCount()
+
+
+	/**
+	 * Returns the number of warnings raised.
+	 *
+	 * @return int
+	 */
+	public function getWarningCount()
+	{
+		return $this->warningCount;
+
+	}//end getWarningCount()
+
+
+	/**
+	 * Returns the number of fixable errors/warnings raised.
+	 *
+	 * @return int
+	 */
+	public function getFixableCount()
+	{
+		return $this->fixableCount;
+
+	}//end getFixableCount()
+
+
+	/**
+	 * Returns the number of fixed errors/warnings.
+	 *
+	 * @return int
+	 */
+	public function getFixedCount()
+	{
+		return $this->fixedCount;
+
+	}//end getFixedCount()
+
+
+	/**
+	 * Returns the list of ignored lines.
+	 *
+	 * @return array
+	 */
+	public function getIgnoredLines()
+	{
+		return $this->tokenizer->ignoredLines;
+
+	}//end getIgnoredLines()
+
+
+	/**
+	 * Returns the errors raised from processing this file.
+	 *
+	 * @return array
+	 */
+	public function getErrors()
+	{
+		return $this->errors;
+
+	}//end getErrors()
+
+
+	/**
+	 * Returns the warnings raised from processing this file.
+	 *
+	 * @return array
+	 */
+	public function getWarnings()
+	{
+		return $this->warnings;
+
+	}//end getWarnings()
+
+
+	/**
+	 * Returns the metrics found while processing this file.
+	 *
+	 * @return array
+	 */
+	public function getMetrics()
+	{
+		return $this->metrics;
+
+	}//end getMetrics()
+
+
+	/**
+	 * Returns the absolute filename of this file.
+	 *
+	 * @return string
+	 */
+	public function getFilename()
+	{
+		return $this->path;
+
+	}//end getFilename()
+
+
+	/**
+	 * Returns the declaration names for classes, interfaces, traits, and functions.
+	 *
+	 * @param int $stackPtr The position of the declaration token which
+	 *                      declared the class, interface, trait, or function.
+	 *
+	 * @return string|null The name of the class, interface, trait, or function;
+	 *                     or NULL if the function or class is anonymous.
+	 * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified token is not of type
+	 *                                                      T_FUNCTION, T_CLASS, T_ANON_CLASS,
+	 *                                                      T_CLOSURE, T_TRAIT, or T_INTERFACE.
+	 */
+	public function getDeclarationName($stackPtr)
+	{
+		$tokenCode = $this->tokens[$stackPtr]['code'];
+
+		if ($tokenCode === T_ANON_CLASS || $tokenCode === T_CLOSURE) {
+			return null;
+		}
+
+		if ($tokenCode !== T_FUNCTION
+			&& $tokenCode !== T_CLASS
+			&& $tokenCode !== T_INTERFACE
+			&& $tokenCode !== T_TRAIT
+		) {
+			throw new RuntimeException('Token type "'.$this->tokens[$stackPtr]['type'].'" is not T_FUNCTION, T_CLASS, T_INTERFACE or T_TRAIT');
+		}
+
+		if ($tokenCode === T_FUNCTION
+			&& strtolower($this->tokens[$stackPtr]['content']) !== 'function'
+		) {
+			// This is a function declared without the "function" keyword.
+			// So this token is the function name.
+			return $this->tokens[$stackPtr]['content'];
+		}
+
+		$content = null;
+		for ($i = $stackPtr; $i < $this->numTokens; $i++) {
+			if ($this->tokens[$i]['code'] === T_STRING) {
+				$content = $this->tokens[$i]['content'];
+				break;
+			}
+		}
+
+		return $content;
+
+	}//end getDeclarationName()
+
+
+	/**
+	 * Returns the method parameters for the specified function token.
+	 *
+	 * Each parameter is in the following format:
+	 *
+	 * <code>
+	 *   0 => array(
+	 *         'name'              => '$var',  // The variable name.
+	 *         'token'             => integer, // The stack pointer to the variable name.
+	 *         'content'           => string,  // The full content of the variable definition.
+	 *         'pass_by_reference' => boolean, // Is the variable passed by reference?
+	 *         'variable_length'   => boolean, // Is the param of variable length through use of `...` ?
+	 *         'type_hint'         => string,  // The type hint for the variable.
+	 *         'type_hint_token'   => integer, // The stack pointer to the type hint
+	 *                                         // or false if there is no type hint.
+	 *         'nullable_type'     => boolean, // Is the variable using a nullable type?
+	 *        )
+	 * </code>
+	 *
+	 * Parameters with default values have an additional array index of
+	 * 'default' with the value of the default as a string.
+	 *
+	 * @param int $stackPtr The position in the stack of the function token
+	 *                      to acquire the parameters for.
+	 *
+	 * @return array
+	 * @throws \PHP_CodeSniffer\Exceptions\TokenizerException If the specified $stackPtr is not of
+	 *                                                        type T_FUNCTION or T_CLOSURE.
+	 */
+	public function getMethodParameters($stackPtr)
+	{
+		if ($this->tokens[$stackPtr]['code'] !== T_FUNCTION
+			&& $this->tokens[$stackPtr]['code'] !== T_CLOSURE
+		) {
+			throw new TokenizerException('$stackPtr must be of type T_FUNCTION or T_CLOSURE');
+		}
+
+		$opener = $this->tokens[$stackPtr]['parenthesis_opener'];
+		$closer = $this->tokens[$stackPtr]['parenthesis_closer'];
+
+		$vars            = [];
+		$currVar         = null;
+		$paramStart      = ($opener + 1);
+		$defaultStart    = null;
+		$paramCount      = 0;
+		$passByReference = false;
+		$variableLength  = false;
+		$typeHint        = '';
+		$typeHintToken   = false;
+		$nullableType    = false;
+
+		for ($i = $paramStart; $i <= $closer; $i++) {
+			// Check to see if this token has a parenthesis or bracket opener. If it does
+			// it's likely to be an array which might have arguments in it. This
+			// could cause problems in our parsing below, so lets just skip to the
+			// end of it.
+			if (isset($this->tokens[$i]['parenthesis_opener']) === true) {
+				// Don't do this if it's the close parenthesis for the method.
+				if ($i !== $this->tokens[$i]['parenthesis_closer']) {
+					$i = ($this->tokens[$i]['parenthesis_closer'] + 1);
+				}
+			}
+
+			if (isset($this->tokens[$i]['bracket_opener']) === true) {
+				// Don't do this if it's the close parenthesis for the method.
+				if ($i !== $this->tokens[$i]['bracket_closer']) {
+					$i = ($this->tokens[$i]['bracket_closer'] + 1);
+				}
+			}
+
+			switch ($this->tokens[$i]['code']) {
+			case T_BITWISE_AND:
+				if ($defaultStart === null) {
+					$passByReference = true;
+				}
+				break;
+			case T_VARIABLE:
+				$currVar = $i;
+				break;
+			case T_ELLIPSIS:
+				$variableLength = true;
+				break;
+			case T_CALLABLE:
+				if ($typeHintToken === false) {
+					$typeHintToken = $i;
+				}
+
+				$typeHint .= $this->tokens[$i]['content'];
+				break;
+			case T_SELF:
+			case T_PARENT:
+			case T_STATIC:
+				// Self and parent are valid, static invalid, but was probably intended as type hint.
+				if (isset($defaultStart) === false) {
+					if ($typeHintToken === false) {
+						$typeHintToken = $i;
+					}
+
+					$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;
+							break;
+						}
+					}
+
+					if ($nextEquals !== false) {
+						break;
+					}
+				}
+
+				if ($defaultStart === null) {
+					if ($typeHintToken === false) {
+						$typeHintToken = $i;
+					}
+
+					$typeHint .= $this->tokens[$i]['content'];
+				}
+				break;
+			case T_NS_SEPARATOR:
+				// Part of a type hint or default value.
+				if ($defaultStart === null) {
+					if ($typeHintToken === false) {
+						$typeHintToken = $i;
+					}
+
+					$typeHint .= $this->tokens[$i]['content'];
+				}
+				break;
+			case T_NULLABLE:
+				if ($defaultStart === null) {
+					$nullableType = true;
+					$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 2;
+				}
+
+				$vars[$paramCount]            = [];
+				$vars[$paramCount]['token']   = $currVar;
+				$vars[$paramCount]['name']    = $this->tokens[$currVar]['content'];
+				$vars[$paramCount]['content'] = trim($this->getTokensAsString($paramStart, ($i - $paramStart)));
+
+				if ($defaultStart !== null) {
+					$vars[$paramCount]['default'] = trim($this->getTokensAsString($defaultStart, ($i - $defaultStart)));
+				}
+
+				$vars[$paramCount]['pass_by_reference'] = $passByReference;
+				$vars[$paramCount]['variable_length']   = $variableLength;
+				$vars[$paramCount]['type_hint']         = $typeHint;
+				$vars[$paramCount]['type_hint_token']   = $typeHintToken;
+				$vars[$paramCount]['nullable_type']     = $nullableType;
+
+				// Reset the vars, as we are about to process the next parameter.
+				$defaultStart    = null;
+				$paramStart      = ($i + 1);
+				$passByReference = false;
+				$variableLength  = false;
+				$typeHint        = '';
+				$typeHintToken   = false;
+				$nullableType    = false;
+
+				$paramCount++;
+				break;
+			case T_EQUAL:
+				$defaultStart = ($i + 1);
+				break;
+			}//end switch
+		}//end for
+
+		return $vars;
+
+	}//end getMethodParameters()
+
+
+	/**
+	 * Returns the visibility and implementation properties of a method.
+	 *
+	 * The format of the array is:
+	 * <code>
+	 *   array(
+	 *    'scope'                => 'public', // public protected or protected
+	 *    'scope_specified'      => true,     // true is scope keyword was found.
+	 *    'return_type'          => '',       // the return type of the method.
+	 *    'return_type_token'    => integer,  // The stack pointer to the start of the return type
+	 *                                        // or false if there is no return type.
+	 *    'nullable_return_type' => false,    // true if the return type is nullable.
+	 *    'is_abstract'          => false,    // true if the abstract keyword was found.
+	 *    'is_final'             => false,    // true if the final keyword was found.
+	 *    'is_static'            => false,    // true if the static keyword was found.
+	 *    'has_body'             => false,    // true if the method has a body
+	 *   );
+	 * </code>
+	 *
+	 * @param int $stackPtr The position in the stack of the function token to
+	 *                      acquire the properties for.
+	 *
+	 * @return array
+	 * @throws \PHP_CodeSniffer\Exceptions\TokenizerException If the specified position is not a
+	 *                                                        T_FUNCTION token.
+	 */
+	public function getMethodProperties($stackPtr)
+	{
+		if ($this->tokens[$stackPtr]['code'] !== T_FUNCTION
+			&& $this->tokens[$stackPtr]['code'] !== T_CLOSURE
+		) {
+			throw new TokenizerException('$stackPtr must be of type T_FUNCTION or T_CLOSURE');
+		}
+
+		if ($this->tokens[$stackPtr]['code'] === T_FUNCTION) {
+			$valid = [
+				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,
+			];
+		} else {
+			$valid = [
+				T_STATIC      => T_STATIC,
+				T_WHITESPACE  => T_WHITESPACE,
+				T_COMMENT     => T_COMMENT,
+				T_DOC_COMMENT => T_DOC_COMMENT,
+			];
+		}
+
+		$scope          = 'public';
+		$scopeSpecified = false;
+		$isAbstract     = false;
+		$isFinal        = false;
+		$isStatic       = false;
+
+		for ($i = ($stackPtr - 1); $i > 0; $i--) {
+			if (isset($valid[$this->tokens[$i]['code']]) === false) {
+				break;
+			}
+
+			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;
+			}//end switch
+		}//end for
+
+		$returnType         = '';
+		$returnTypeToken    = false;
+		$nullableReturnType = false;
+		$hasBody            = true;
+
+		if (isset($this->tokens[$stackPtr]['parenthesis_closer']) === true) {
+			$scopeOpener = null;
+			if (isset($this->tokens[$stackPtr]['scope_opener']) === true) {
+				$scopeOpener = $this->tokens[$stackPtr]['scope_opener'];
+			}
+
+			$valid = [
+				T_STRING       => T_STRING,
+				T_CALLABLE     => T_CALLABLE,
+				T_SELF         => T_SELF,
+				T_PARENT       => T_PARENT,
+				T_NS_SEPARATOR => T_NS_SEPARATOR,
+			];
+
+			for ($i = $this->tokens[$stackPtr]['parenthesis_closer']; $i < $this->numTokens; $i++) {
+				if (($scopeOpener === null && $this->tokens[$i]['code'] === T_SEMICOLON)
+					|| ($scopeOpener !== null && $i === $scopeOpener)
+				) {
+					// End of function definition.
+					break;
+				}
+
+				if ($this->tokens[$i]['code'] === T_NULLABLE) {
+					$nullableReturnType = true;
+				}
+
+				if (isset($valid[$this->tokens[$i]['code']]) === true) {
+					if ($returnTypeToken === false) {
+						$returnTypeToken = $i;
+					}
+
+					$returnType .= $this->tokens[$i]['content'];
+				}
+			}
+
+			$end     = $this->findNext([T_OPEN_CURLY_BRACKET, T_SEMICOLON], $this->tokens[$stackPtr]['parenthesis_closer']);
+			$hasBody = $this->tokens[$end]['code'] === T_OPEN_CURLY_BRACKET;
+		}//end if
+
+		if ($returnType !== '' && $nullableReturnType === true) {
+			$returnType = '?'.$returnType;
+		}
+
+		return [
+			'scope'                => $scope,
+			'scope_specified'      => $scopeSpecified,
+			'return_type'          => $returnType,
+			'return_type_token'    => $returnTypeToken,
+			'nullable_return_type' => $nullableReturnType,
+			'is_abstract'          => $isAbstract,
+			'is_final'             => $isFinal,
+			'is_static'            => $isStatic,
+			'has_body'             => $hasBody,
+		];
+
+	}//end getMethodProperties()
+
+
+	/**
+	 * Returns the visibility and implementation properties of the class member
+	 * variable found at the specified position in the stack.
+	 *
+	 * The format of the array is:
+	 *
+	 * <code>
+	 *   array(
+	 *    'scope'           => 'public', // public protected or protected.
+	 *    'scope_specified' => false,    // true if the scope was explicitly specified.
+	 *    'is_static'       => false,    // true if the static keyword was found.
+	 *   );
+	 * </code>
+	 *
+	 * @param int $stackPtr The position in the stack of the T_VARIABLE token to
+	 *                      acquire the properties for.
+	 *
+	 * @return array
+	 * @throws \PHP_CodeSniffer\Exceptions\TokenizerException If the specified position is not a
+	 *                                                        T_VARIABLE token, or if the position is not
+	 *                                                        a class member variable.
+	 */
+	public function getMemberProperties($stackPtr)
+	{
+		if ($this->tokens[$stackPtr]['code'] !== T_VARIABLE) {
+			throw new TokenizerException('$stackPtr must be of type T_VARIABLE');
+		}
+
+		$conditions = array_keys($this->tokens[$stackPtr]['conditions']);
+		$ptr        = array_pop($conditions);
+		if (isset($this->tokens[$ptr]) === false
+			|| ($this->tokens[$ptr]['code'] !== T_CLASS
+			&& $this->tokens[$ptr]['code'] !== T_ANON_CLASS
+			&& $this->tokens[$ptr]['code'] !== T_TRAIT)
+		) {
+			if (isset($this->tokens[$ptr]) === true
+				&& $this->tokens[$ptr]['code'] === T_INTERFACE
+			) {
+				// T_VARIABLEs in interfaces can actually be method arguments
+				// but they wont be seen as being inside the method because there
+				// are no scope openers and closers for abstract methods. If it is in
+				// parentheses, we can be pretty sure it is a method argument.
+				if (isset($this->tokens[$stackPtr]['nested_parenthesis']) === false
+					|| empty($this->tokens[$stackPtr]['nested_parenthesis']) === true
+				) {
+					$error = 'Possible parse error: interfaces may not include member vars';
+					$this->addWarning($error, $stackPtr, 'Internal.ParseError.InterfaceHasMemberVar');
+					return [];
+				}
+			} else {
+				throw new TokenizerException('$stackPtr is not a class member var');
+			}
+		}
+
+		// Make sure it's not a method parameter.
+		if (empty($this->tokens[$stackPtr]['nested_parenthesis']) === false) {
+			$parenthesis = array_keys($this->tokens[$stackPtr]['nested_parenthesis']);
+			$deepestOpen = array_pop($parenthesis);
+			if ($deepestOpen > $ptr
+				&& isset($this->tokens[$deepestOpen]['parenthesis_owner']) === true
+				&& $this->tokens[$this->tokens[$deepestOpen]['parenthesis_owner']]['code'] === T_FUNCTION
+			) {
+				throw new TokenizerException('$stackPtr is not a class member var');
+			}
+		}
+
+		$valid = [
+			T_PUBLIC    => T_PUBLIC,
+			T_PRIVATE   => T_PRIVATE,
+			T_PROTECTED => T_PROTECTED,
+			T_STATIC    => T_STATIC,
+			T_VAR       => T_VAR,
+		];
+
+		$valid += Util\Tokens::$emptyTokens;
+
+		$scope          = 'public';
+		$scopeSpecified = false;
+		$isStatic       = false;
+
+		$startOfStatement = $this->findPrevious(
+			[
+				T_SEMICOLON,
+				T_OPEN_CURLY_BRACKET,
+				T_CLOSE_CURLY_BRACKET,
+			],
+			($stackPtr - 1)
+		);
+
+		for ($i = ($startOfStatement + 1); $i < $stackPtr; $i++) {
+			if (isset($valid[$this->tokens[$i]['code']]) === false) {
+				break;
+			}
+
+			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;
+			}
+		}//end for
+
+		return [
+			'scope'           => $scope,
+			'scope_specified' => $scopeSpecified,
+			'is_static'       => $isStatic,
+		];
+
+	}//end getMemberProperties()
+
+
+	/**
+	 * Returns the visibility and implementation properties of a class.
+	 *
+	 * The format of the array is:
+	 * <code>
+	 *   array(
+	 *    'is_abstract' => false, // true if the abstract keyword was found.
+	 *    'is_final'    => false, // true if the final keyword was found.
+	 *   );
+	 * </code>
+	 *
+	 * @param int $stackPtr The position in the stack of the T_CLASS token to
+	 *                      acquire the properties for.
+	 *
+	 * @return array
+	 * @throws \PHP_CodeSniffer\Exceptions\TokenizerException If the specified position is not a
+	 *                                                        T_CLASS token.
+	 */
+	public function getClassProperties($stackPtr)
+	{
+		if ($this->tokens[$stackPtr]['code'] !== T_CLASS) {
+			throw new TokenizerException('$stackPtr must be of type T_CLASS');
+		}
+
+		$valid = [
+			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;
+
+		for ($i = ($stackPtr - 1); $i > 0; $i--) {
+			if (isset($valid[$this->tokens[$i]['code']]) === false) {
+				break;
+			}
+
+			switch ($this->tokens[$i]['code']) {
+			case T_ABSTRACT:
+				$isAbstract = true;
+				break;
+
+			case T_FINAL:
+				$isFinal = true;
+				break;
+			}
+		}//end for
+
+		return [
+			'is_abstract' => $isAbstract,
+			'is_final'    => $isFinal,
+		];
+
+	}//end getClassProperties()
+
+
+	/**
+	 * Determine if the passed token is a reference operator.
+	 *
+	 * Returns true if the specified token position represents a reference.
+	 * Returns false if the token represents a bitwise operator.
+	 *
+	 * @param int $stackPtr The position of the T_BITWISE_AND token.
+	 *
+	 * @return boolean
+	 */
+	public function isReference($stackPtr)
+	{
+		if ($this->tokens[$stackPtr]['code'] !== T_BITWISE_AND) {
+			return false;
+		}
+
+		$tokenBefore = $this->findPrevious(
+			Util\Tokens::$emptyTokens,
+			($stackPtr - 1),
+			null,
+			true
+		);
+
+		if ($this->tokens[$tokenBefore]['code'] === T_FUNCTION) {
+			// Function returns a reference.
+			return true;
+		}
+
+		if ($this->tokens[$tokenBefore]['code'] === T_DOUBLE_ARROW) {
+			// Inside a foreach loop or array assignment, this is a reference.
+			return true;
+		}
+
+		if ($this->tokens[$tokenBefore]['code'] === T_AS) {
+			// Inside a foreach loop, this is a reference.
+			return true;
+		}
+
+		if (isset(Util\Tokens::$assignmentTokens[$this->tokens[$tokenBefore]['code']]) === true) {
+			// This is directly after an assignment. It's a reference. Even if
+			// it is part of an operation, the other tests will handle it.
+			return true;
+		}
+
+		$tokenAfter = $this->findNext(
+			Util\Tokens::$emptyTokens,
+			($stackPtr + 1),
+			null,
+			true
+		);
+
+		if ($this->tokens[$tokenAfter]['code'] === T_NEW) {
+			return true;
+		}
+
+		if (isset($this->tokens[$stackPtr]['nested_parenthesis']) === true) {
+			$brackets    = $this->tokens[$stackPtr]['nested_parenthesis'];
+			$lastBracket = array_pop($brackets);
+			if (isset($this->tokens[$lastBracket]['parenthesis_owner']) === true) {
+				$owner = $this->tokens[$this->tokens[$lastBracket]['parenthesis_owner']];
+				if ($owner['code'] === T_FUNCTION
+					|| $owner['code'] === T_CLOSURE
+				) {
+					$params = $this->getMethodParameters($this->tokens[$lastBracket]['parenthesis_owner']);
+					foreach ($params as $param) {
+						$varToken = $tokenAfter;
+						if ($param['variable_length'] === true) {
+							$varToken = $this->findNext(
+								(Util\Tokens::$emptyTokens + [T_ELLIPSIS]),
+								($stackPtr + 1),
+								null,
+								true
+							);
+						}
+
+						if ($param['token'] === $varToken
+							&& $param['pass_by_reference'] === true
+						) {
+							// Function parameter declared to be passed by reference.
+							return true;
+						}
+					}
+				}//end if
+			} else {
+				$prev = false;
+				for ($t = ($this->tokens[$lastBracket]['parenthesis_opener'] - 1); $t >= 0; $t--) {
+					if ($this->tokens[$t]['code'] !== T_WHITESPACE) {
+						$prev = $t;
+						break;
+					}
+				}
+
+				if ($prev !== false && $this->tokens[$prev]['code'] === T_USE) {
+					// Closure use by reference.
+					return true;
+				}
+			}//end if
+		}//end if
+
+		// Pass by reference in function calls and assign by reference in arrays.
+		if ($this->tokens[$tokenBefore]['code'] === T_OPEN_PARENTHESIS
+			|| $this->tokens[$tokenBefore]['code'] === T_COMMA
+			|| $this->tokens[$tokenBefore]['code'] === T_OPEN_SHORT_ARRAY
+		) {
+			if ($this->tokens[$tokenAfter]['code'] === T_VARIABLE) {
+				return true;
+			} else {
+				$skip   = Util\Tokens::$emptyTokens;
+				$skip[] = T_NS_SEPARATOR;
+				$skip[] = T_SELF;
+				$skip[] = T_PARENT;
+				$skip[] = T_STATIC;
+				$skip[] = T_STRING;
+				$skip[] = T_NAMESPACE;
+				$skip[] = T_DOUBLE_COLON;
+
+				$nextSignificantAfter = $this->findNext(
+					$skip,
+					($stackPtr + 1),
+					null,
+					true
+				);
+				if ($this->tokens[$nextSignificantAfter]['code'] === T_VARIABLE) {
+					return true;
+				}
+			}//end if
+		}//end if
+
+		return false;
+
+	}//end isReference()
+
+
+	/**
+	 * Returns the content of the tokens from the specified start position in
+	 * the token stack for the specified length.
+	 *
+	 * @param int  $start       The position to start from in the token stack.
+	 * @param int  $length      The length of tokens to traverse from the start pos.
+	 * @param bool $origContent Whether the original content or the tab replaced
+	 *                          content should be used.
+	 *
+	 * @return string The token contents.
+	 */
+	public function getTokensAsString($start, $length, $origContent=false)
+	{
+		if (is_int($start) === false || isset($this->tokens[$start]) === false) {
+			throw new RuntimeException('The $start position for getTokensAsString() must exist in the token stack');
+		}
+
+		if (is_int($length) === false || $length <= 0) {
+			return '';
+		}
+
+		$str = '';
+		$end = ($start + $length);
+		if ($end > $this->numTokens) {
+			$end = $this->numTokens;
+		}
+
+		for ($i = $start; $i < $end; $i++) {
+			// If tabs are being converted to spaces by the tokeniser, the
+			// original content should be used instead of the converted content.
+			if ($origContent === true && isset($this->tokens[$i]['orig_content']) === true) {
+				$str .= $this->tokens[$i]['orig_content'];
+			} else {
+				$str .= $this->tokens[$i]['content'];
+			}
+		}
+
+		return $str;
+
+	}//end getTokensAsString()
+
+
+	/**
+	 * Returns the position of the previous specified token(s).
+	 *
+	 * If a value is specified, the previous token of the specified type(s)
+	 * containing the specified value will be returned.
+	 *
+	 * Returns false if no token can be found.
+	 *
+	 * @param int|string|array $types   The type(s) of tokens to search for.
+	 * @param int              $start   The position to start searching from in the
+	 *                                  token stack.
+	 * @param int              $end     The end position to fail if no token is found.
+	 *                                  if not specified or null, end will default to
+	 *                                  the start of the token stack.
+	 * @param bool             $exclude If true, find the previous token that is NOT of
+	 *                                  the types specified in $types.
+	 * @param string           $value   The value that the token(s) must be equal to.
+	 *                                  If value is omitted, tokens with any value will
+	 *                                  be returned.
+	 * @param bool             $local   If true, tokens outside the current statement
+	 *                                  will not be checked. IE. checking will stop
+	 *                                  at the previous semi-colon found.
+	 *
+	 * @return int|bool
+	 * @see    findNext()
+	 */
+	public function findPrevious(
+		$types,
+		$start,
+		$end=null,
+		$exclude=false,
+		$value=null,
+		$local=false
+	) {
+		$types = (array) $types;
+
+		if ($end === null) {
+			$end = 0;
+		}
+
+		for ($i = $start; $i >= $end; $i--) {
+			$found = (bool) $exclude;
+			foreach ($types as $type) {
+				if ($this->tokens[$i]['code'] === $type) {
+					$found = !$exclude;
+					break;
+				}
+			}
+
+			if ($found === true) {
+				if ($value === null) {
+					return $i;
+				} else if ($this->tokens[$i]['content'] === $value) {
+					return $i;
+				}
+			}
+
+			if ($local === true) {
+				if (isset($this->tokens[$i]['scope_opener']) === true
+					&& $i === $this->tokens[$i]['scope_closer']
+				) {
+					$i = $this->tokens[$i]['scope_opener'];
+				} else if (isset($this->tokens[$i]['bracket_opener']) === true
+					&& $i === $this->tokens[$i]['bracket_closer']
+				) {
+					$i = $this->tokens[$i]['bracket_opener'];
+				} else if (isset($this->tokens[$i]['parenthesis_opener']) === true
+					&& $i === $this->tokens[$i]['parenthesis_closer']
+				) {
+					$i = $this->tokens[$i]['parenthesis_opener'];
+				} else if ($this->tokens[$i]['code'] === T_SEMICOLON) {
+					break;
+				}
+			}
+		}//end for
+
+		return false;
+
+	}//end findPrevious()
+
+
+	/**
+	 * Returns the position of the next specified token(s).
+	 *
+	 * If a value is specified, the next token of the specified type(s)
+	 * containing the specified value will be returned.
+	 *
+	 * Returns false if no token can be found.
+	 *
+	 * @param int|string|array $types   The type(s) of tokens to search for.
+	 * @param int              $start   The position to start searching from in the
+	 *                                  token stack.
+	 * @param int              $end     The end position to fail if no token is found.
+	 *                                  if not specified or null, end will default to
+	 *                                  the end of the token stack.
+	 * @param bool             $exclude If true, find the next token that is NOT of
+	 *                                  a type specified in $types.
+	 * @param string           $value   The value that the token(s) must be equal to.
+	 *                                  If value is omitted, tokens with any value will
+	 *                                  be returned.
+	 * @param bool             $local   If true, tokens outside the current statement
+	 *                                  will not be checked. i.e., checking will stop
+	 *                                  at the next semi-colon found.
+	 *
+	 * @return int|bool
+	 * @see    findPrevious()
+	 */
+	public function findNext(
+		$types,
+		$start,
+		$end=null,
+		$exclude=false,
+		$value=null,
+		$local=false
+	) {
+		$types = (array) $types;
+
+		if ($end === null || $end > $this->numTokens) {
+			$end = $this->numTokens;
+		}
+
+		for ($i = $start; $i < $end; $i++) {
+			$found = (bool) $exclude;
+			foreach ($types as $type) {
+				if ($this->tokens[$i]['code'] === $type) {
+					$found = !$exclude;
+					break;
+				}
+			}
+
+			if ($found === true) {
+				if ($value === null) {
+					return $i;
+				} else if ($this->tokens[$i]['content'] === $value) {
+					return $i;
+				}
+			}
+
+			if ($local === true && $this->tokens[$i]['code'] === T_SEMICOLON) {
+				break;
+			}
+		}//end for
+
+		return false;
+
+	}//end findNext()
+
+
+	/**
+	 * Returns the position of the first non-whitespace token in a statement.
+	 *
+	 * @param int       $start  The position to start searching from in the token stack.
+	 * @param int|array $ignore Token types that should not be considered stop points.
+	 *
+	 * @return int
+	 */
+	public function findStartOfStatement($start, $ignore=null)
+	{
+		$endTokens = Util\Tokens::$blockOpeners;
+
+		$endTokens[T_COLON]            = true;
+		$endTokens[T_COMMA]            = true;
+		$endTokens[T_DOUBLE_ARROW]     = true;
+		$endTokens[T_SEMICOLON]        = true;
+		$endTokens[T_OPEN_TAG]         = true;
+		$endTokens[T_CLOSE_TAG]        = true;
+		$endTokens[T_OPEN_SHORT_ARRAY] = true;
+
+		if ($ignore !== null) {
+			$ignore = (array) $ignore;
+			foreach ($ignore as $code) {
+				unset($endTokens[$code]);
+			}
+		}
+
+		$lastNotEmpty = $start;
+
+		for ($i = $start; $i >= 0; $i--) {
+			if (isset($endTokens[$this->tokens[$i]['code']]) === true) {
+				// Found the end of the previous statement.
+				return $lastNotEmpty;
+			}
+
+			if (isset($this->tokens[$i]['scope_opener']) === true
+				&& $i === $this->tokens[$i]['scope_closer']
+			) {
+				// Found the end of the previous scope block.
+				return $lastNotEmpty;
+			}
+
+			// Skip nested statements.
+			if (isset($this->tokens[$i]['bracket_opener']) === true
+				&& $i === $this->tokens[$i]['bracket_closer']
+			) {
+				$i = $this->tokens[$i]['bracket_opener'];
+			} else if (isset($this->tokens[$i]['parenthesis_opener']) === true
+				&& $i === $this->tokens[$i]['parenthesis_closer']
+			) {
+				$i = $this->tokens[$i]['parenthesis_opener'];
+			}
+
+			if (isset(Util\Tokens::$emptyTokens[$this->tokens[$i]['code']]) === false) {
+				$lastNotEmpty = $i;
+			}
+		}//end for
+
+		return 0;
+
+	}//end findStartOfStatement()
+
+
+	/**
+	 * Returns the position of the last non-whitespace token in a statement.
+	 *
+	 * @param int       $start  The position to start searching from in the token stack.
+	 * @param int|array $ignore Token types that should not be considered stop points.
+	 *
+	 * @return int
+	 */
+	public function findEndOfStatement($start, $ignore=null)
+	{
+		$endTokens = [
+			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;
+			foreach ($ignore as $code) {
+				unset($endTokens[$code]);
+			}
+		}
+
+		$lastNotEmpty = $start;
+
+		for ($i = $start; $i < $this->numTokens; $i++) {
+			if ($i !== $start && isset($endTokens[$this->tokens[$i]['code']]) === true) {
+				// Found the end of the statement.
+				if ($this->tokens[$i]['code'] === T_CLOSE_PARENTHESIS
+					|| $this->tokens[$i]['code'] === T_CLOSE_SQUARE_BRACKET
+					|| $this->tokens[$i]['code'] === T_CLOSE_CURLY_BRACKET
+					|| $this->tokens[$i]['code'] === T_CLOSE_SHORT_ARRAY
+					|| $this->tokens[$i]['code'] === T_OPEN_TAG
+					|| $this->tokens[$i]['code'] === T_CLOSE_TAG
+				) {
+					return $lastNotEmpty;
+				}
+
+				return $i;
+			}
+
+			// Skip nested statements.
+			if (isset($this->tokens[$i]['scope_closer']) === true
+				&& ($i === $this->tokens[$i]['scope_opener']
+				|| $i === $this->tokens[$i]['scope_condition'])
+			) {
+				if ($i === $start && isset(Util\Tokens::$scopeOpeners[$this->tokens[$i]['code']]) === true) {
+					return $this->tokens[$i]['scope_closer'];
+				}
+
+				$i = $this->tokens[$i]['scope_closer'];
+			} else if (isset($this->tokens[$i]['bracket_closer']) === true
+				&& $i === $this->tokens[$i]['bracket_opener']
+			) {
+				$i = $this->tokens[$i]['bracket_closer'];
+			} else if (isset($this->tokens[$i]['parenthesis_closer']) === true
+				&& $i === $this->tokens[$i]['parenthesis_opener']
+			) {
+				$i = $this->tokens[$i]['parenthesis_closer'];
+			}
+
+			if (isset(Util\Tokens::$emptyTokens[$this->tokens[$i]['code']]) === false) {
+				$lastNotEmpty = $i;
+			}
+		}//end for
+
+		return ($this->numTokens - 1);
+
+	}//end findEndOfStatement()
+
+
+	/**
+	 * Returns the position of the first token on a line, matching given type.
+	 *
+	 * Returns false if no token can be found.
+	 *
+	 * @param int|string|array $types   The type(s) of tokens to search for.
+	 * @param int              $start   The position to start searching from in the
+	 *                                  token stack. The first token matching on
+	 *                                  this line before this token will be returned.
+	 * @param bool             $exclude If true, find the token that is NOT of
+	 *                                  the types specified in $types.
+	 * @param string           $value   The value that the token must be equal to.
+	 *                                  If value is omitted, tokens with any value will
+	 *                                  be returned.
+	 *
+	 * @return int | bool
+	 */
+	public function findFirstOnLine($types, $start, $exclude=false, $value=null)
+	{
+		if (is_array($types) === false) {
+			$types = [$types];
+		}
+
+		$foundToken = false;
+
+		for ($i = $start; $i >= 0; $i--) {
+			if ($this->tokens[$i]['line'] < $this->tokens[$start]['line']) {
+				break;
+			}
+
+			$found = $exclude;
+			foreach ($types as $type) {
+				if ($exclude === false) {
+					if ($this->tokens[$i]['code'] === $type) {
+						$found = true;
+						break;
+					}
+				} else {
+					if ($this->tokens[$i]['code'] === $type) {
+						$found = false;
+						break;
+					}
+				}
+			}
+
+			if ($found === true) {
+				if ($value === null) {
+					$foundToken = $i;
+				} else if ($this->tokens[$i]['content'] === $value) {
+					$foundToken = $i;
+				}
+			}
+		}//end for
+
+		return $foundToken;
+
+	}//end findFirstOnLine()
+
+
+	/**
+	 * Determine if the passed token has a condition of one of the passed types.
+	 *
+	 * @param int              $stackPtr The position of the token we are checking.
+	 * @param int|string|array $types    The type(s) of tokens to search for.
+	 *
+	 * @return boolean
+	 */
+	public function hasCondition($stackPtr, $types)
+	{
+		// Check for the existence of the token.
+		if (isset($this->tokens[$stackPtr]) === false) {
+			return false;
+		}
+
+		// Make sure the token has conditions.
+		if (isset($this->tokens[$stackPtr]['conditions']) === false) {
+			return false;
+		}
+
+		$types      = (array) $types;
+		$conditions = $this->tokens[$stackPtr]['conditions'];
+
+		foreach ($types as $type) {
+			if (in_array($type, $conditions, true) === true) {
+				// We found a token with the required type.
+				return true;
+			}
+		}
+
+		return false;
+
+	}//end hasCondition()
+
+
+	/**
+	 * Return the position of the condition for the passed token.
+	 *
+	 * Returns FALSE if the token does not have the condition.
+	 *
+	 * @param int        $stackPtr The position of the token we are checking.
+	 * @param int|string $type     The type of token to search for.
+	 *
+	 * @return int
+	 */
+	public function getCondition($stackPtr, $type)
+	{
+		// Check for the existence of the token.
+		if (isset($this->tokens[$stackPtr]) === false) {
+			return false;
+		}
+
+		// Make sure the token has conditions.
+		if (isset($this->tokens[$stackPtr]['conditions']) === false) {
+			return false;
+		}
+
+		$conditions = $this->tokens[$stackPtr]['conditions'];
+		foreach ($conditions as $token => $condition) {
+			if ($condition === $type) {
+				return $token;
+			}
+		}
+
+		return false;
+
+	}//end getCondition()
+
+
+	/**
+	 * Returns the name of the class that the specified class extends.
+	 * (works for classes, anonymous classes and interfaces)
+	 *
+	 * Returns FALSE on error or if there is no extended class name.
+	 *
+	 * @param int $stackPtr The stack position of the class.
+	 *
+	 * @return string|false
+	 */
+	public function findExtendedClassName($stackPtr)
+	{
+		// Check for the existence of the token.
+		if (isset($this->tokens[$stackPtr]) === false) {
+			return false;
+		}
+
+		if ($this->tokens[$stackPtr]['code'] !== T_CLASS
+			&& $this->tokens[$stackPtr]['code'] !== T_ANON_CLASS
+			&& $this->tokens[$stackPtr]['code'] !== T_INTERFACE
+		) {
+			return false;
+		}
+
+		if (isset($this->tokens[$stackPtr]['scope_opener']) === false) {
+			return false;
+		}
+
+		$classOpenerIndex = $this->tokens[$stackPtr]['scope_opener'];
+		$extendsIndex     = $this->findNext(T_EXTENDS, $stackPtr, $classOpenerIndex);
+		if (false === $extendsIndex) {
+			return false;
+		}
+
+		$find = [
+			T_NS_SEPARATOR,
+			T_STRING,
+			T_WHITESPACE,
+		];
+
+		$end  = $this->findNext($find, ($extendsIndex + 1), ($classOpenerIndex + 1), true);
+		$name = $this->getTokensAsString(($extendsIndex + 1), ($end - $extendsIndex - 1));
+		$name = trim($name);
+
+		if ($name === '') {
+			return false;
+		}
+
+		return $name;
+
+	}//end findExtendedClassName()
+
+
+	/**
+	 * Returns the names of the interfaces that the specified class implements.
+	 *
+	 * Returns FALSE on error or if there are no implemented interface names.
+	 *
+	 * @param int $stackPtr The stack position of the class.
+	 *
+	 * @return array|false
+	 */
+	public function findImplementedInterfaceNames($stackPtr)
+	{
+		// Check for the existence of the token.
+		if (isset($this->tokens[$stackPtr]) === false) {
+			return false;
+		}
+
+		if ($this->tokens[$stackPtr]['code'] !== T_CLASS
+			&& $this->tokens[$stackPtr]['code'] !== T_ANON_CLASS
+		) {
+			return false;
+		}
+
+		if (isset($this->tokens[$stackPtr]['scope_closer']) === false) {
+			return false;
+		}
+
+		$classOpenerIndex = $this->tokens[$stackPtr]['scope_opener'];
+		$implementsIndex  = $this->findNext(T_IMPLEMENTS, $stackPtr, $classOpenerIndex);
+		if ($implementsIndex === false) {
+			return false;
+		}
+
+		$find = [
+			T_NS_SEPARATOR,
+			T_STRING,
+			T_WHITESPACE,
+			T_COMMA,
+		];
+
+		$end  = $this->findNext($find, ($implementsIndex + 1), ($classOpenerIndex + 1), true);
+		$name = $this->getTokensAsString(($implementsIndex + 1), ($end - $implementsIndex - 1));
+		$name = trim($name);
+
+		if ($name === '') {
+			return false;
+		} else {
+			$names = explode(',', $name);
+			$names = array_map('trim', $names);
+			return $names;
+		}
+
+	}//end findImplementedInterfaceNames()
 
 
 }//end class

Switch Indentation +158 added lines, -158 removed lines

@@ -1324,122 +1324,122 @@ 
             }
 
             switch ($this->tokens[$i]['code']) {
-            case T_BITWISE_AND:
-                if ($defaultStart === null) {
-                    $passByReference = true;
-                }
-                break;
-            case T_VARIABLE:
-                $currVar = $i;
-                break;
-            case T_ELLIPSIS:
-                $variableLength = true;
-                break;
-            case T_CALLABLE:
-                if ($typeHintToken === false) {
-                    $typeHintToken = $i;
-                }
-
-                $typeHint .= $this->tokens[$i]['content'];
-                break;
-            case T_SELF:
-            case T_PARENT:
-            case T_STATIC:
-                // Self and parent are valid, static invalid, but was probably intended as type hint.
-                if (isset($defaultStart) === false) {
-                    if ($typeHintToken === false) {
-                        $typeHintToken = $i;
-                    }
-
-                    $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;
-                            break;
-                        }
-                    }
-
-                    if ($nextEquals !== false) {
-                        break;
-                    }
-                }
-
-                if ($defaultStart === null) {
-                    if ($typeHintToken === false) {
-                        $typeHintToken = $i;
-                    }
-
-                    $typeHint .= $this->tokens[$i]['content'];
-                }
-                break;
-            case T_NS_SEPARATOR:
-                // Part of a type hint or default value.
-                if ($defaultStart === null) {
-                    if ($typeHintToken === false) {
-                        $typeHintToken = $i;
-                    }
-
-                    $typeHint .= $this->tokens[$i]['content'];
-                }
-                break;
-            case T_NULLABLE:
-                if ($defaultStart === null) {
-                    $nullableType = true;
-                    $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 2;
-                }
-
-                $vars[$paramCount]            = [];
-                $vars[$paramCount]['token']   = $currVar;
-                $vars[$paramCount]['name']    = $this->tokens[$currVar]['content'];
-                $vars[$paramCount]['content'] = trim($this->getTokensAsString($paramStart, ($i - $paramStart)));
-
-                if ($defaultStart !== null) {
-                    $vars[$paramCount]['default'] = trim($this->getTokensAsString($defaultStart, ($i - $defaultStart)));
-                }
-
-                $vars[$paramCount]['pass_by_reference'] = $passByReference;
-                $vars[$paramCount]['variable_length']   = $variableLength;
-                $vars[$paramCount]['type_hint']         = $typeHint;
-                $vars[$paramCount]['type_hint_token']   = $typeHintToken;
-                $vars[$paramCount]['nullable_type']     = $nullableType;
-
-                // Reset the vars, as we are about to process the next parameter.
-                $defaultStart    = null;
-                $paramStart      = ($i + 1);
-                $passByReference = false;
-                $variableLength  = false;
-                $typeHint        = '';
-                $typeHintToken   = false;
-                $nullableType    = false;
-
-                $paramCount++;
-                break;
-            case T_EQUAL:
-                $defaultStart = ($i + 1);
-                break;
+            	case T_BITWISE_AND:
+                	if ($defaultStart === null) {
+                    	$passByReference = true;
+                	}
+                	break;
+            	case T_VARIABLE:
+                	$currVar = $i;
+                	break;
+            	case T_ELLIPSIS:
+                	$variableLength = true;
+                	break;
+            	case T_CALLABLE:
+                	if ($typeHintToken === false) {
+                    	$typeHintToken = $i;
+                	}
+
+                	$typeHint .= $this->tokens[$i]['content'];
+                	break;
+            	case T_SELF:
+            	case T_PARENT:
+            	case T_STATIC:
+                	// Self and parent are valid, static invalid, but was probably intended as type hint.
+                	if (isset($defaultStart) === false) {
+                    	if ($typeHintToken === false) {
+                        	$typeHintToken = $i;
+                    	}
+
+                    	$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;
+                            	break;
+                        	}
+                    	}
+
+                    	if ($nextEquals !== false) {
+                        	break;
+                    	}
+                	}
+
+                	if ($defaultStart === null) {
+                    	if ($typeHintToken === false) {
+                        	$typeHintToken = $i;
+                    	}
+
+                    	$typeHint .= $this->tokens[$i]['content'];
+                	}
+                	break;
+            	case T_NS_SEPARATOR:
+                	// Part of a type hint or default value.
+                	if ($defaultStart === null) {
+                    	if ($typeHintToken === false) {
+                        	$typeHintToken = $i;
+                    	}
+
+                    	$typeHint .= $this->tokens[$i]['content'];
+                	}
+                	break;
+            	case T_NULLABLE:
+                	if ($defaultStart === null) {
+                    	$nullableType = true;
+                    	$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 2;
+                	}
+
+                	$vars[$paramCount]            = [];
+                	$vars[$paramCount]['token']   = $currVar;
+                	$vars[$paramCount]['name']    = $this->tokens[$currVar]['content'];
+                	$vars[$paramCount]['content'] = trim($this->getTokensAsString($paramStart, ($i - $paramStart)));
+
+                	if ($defaultStart !== null) {
+                    	$vars[$paramCount]['default'] = trim($this->getTokensAsString($defaultStart, ($i - $defaultStart)));
+                	}
+
+                	$vars[$paramCount]['pass_by_reference'] = $passByReference;
+                	$vars[$paramCount]['variable_length']   = $variableLength;
+                	$vars[$paramCount]['type_hint']         = $typeHint;
+                	$vars[$paramCount]['type_hint_token']   = $typeHintToken;
+                	$vars[$paramCount]['nullable_type']     = $nullableType;
+
+                	// Reset the vars, as we are about to process the next parameter.
+                	$defaultStart    = null;
+                	$paramStart      = ($i + 1);
+                	$passByReference = false;
+                	$variableLength  = false;
+                	$typeHint        = '';
+                	$typeHintToken   = false;
+                	$nullableType    = false;
+
+                	$paramCount++;
+                	break;
+            	case T_EQUAL:
+                	$defaultStart = ($i + 1);
+                	break;
             }//end switch
         }//end for
 
@@ -1515,27 +1515,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
 
@@ -1697,21 +1697,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
 
@@ -1765,13 +1765,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 +567 added lines, -567 removed lines

@@ -106,7 +106,7 @@ 
      *
      * @var array
      */
-    protected $tokens = [];
+    protected $tokens = [ ];
 
     /**
      * The errors raised from sniffs.
@@ -114,7 +114,7 @@ 
      * @var array
      * @see getErrors()
      */
-    protected $errors = [];
+    protected $errors = [ ];
 
     /**
      * The warnings raised from sniffs.
@@ -122,7 +122,7 @@ 
      * @var array
      * @see getWarnings()
      */
-    protected $warnings = [];
+    protected $warnings = [ ];
 
     /**
      * The metrics recorded by sniffs.
@@ -130,7 +130,7 @@ 
      * @var array
      * @see getMetrics()
      */
-    protected $metrics = [];
+    protected $metrics = [ ];
 
     /**
      * The metrics recorded for each token.
@@ -140,7 +140,7 @@ 
      * @var array
      * @see getMetrics()
      */
-    private $metricTokens = [];
+    private $metricTokens = [ ];
 
     /**
      * The total number of errors raised.
@@ -175,21 +175,21 @@ 
      *
      * @var array
      */
-    protected $ignoredListeners = [];
+    protected $ignoredListeners = [ ];
 
     /**
      * An array of message codes that are being ignored.
      *
      * @var array
      */
-    protected $ignoredCodes = [];
+    protected $ignoredCodes = [ ];
 
     /**
      * An array of sniffs listening to this file's processing.
      *
      * @var \PHP_CodeSniffer\Sniffs\Sniff[]
      */
-    protected $listeners = [];
+    protected $listeners = [ ];
 
     /**
      * The class name of the sniff currently processing the file.
@@ -203,7 +203,7 @@ 
      *
      * @var array
      */
-    protected $listenerTimes = [];
+    protected $listenerTimes = [ ];
 
     /**
      * A cache of often used config settings to improve performance.
@@ -212,7 +212,7 @@ 
      *
      * @var array
      */
-    protected $configCache = [];
+    protected $configCache = [ ];
 
 
     /**
@@ -224,30 +224,30 @@ 
      *
      * @return void
      */
-    public function __construct($path, Ruleset $ruleset, Config $config)
+    public function __construct( $path, Ruleset $ruleset, Config $config )
     {
         $this->path    = $path;
         $this->ruleset = $ruleset;
         $this->config  = $config;
         $this->fixer   = new Fixer();
 
-        $parts     = explode('.', $path);
-        $extension = array_pop($parts);
-        if (isset($config->extensions[$extension]) === true) {
-            $this->tokenizerType = $config->extensions[$extension];
+        $parts     = explode( '.', $path );
+        $extension = array_pop( $parts );
+        if ( isset( $config->extensions[ $extension ] ) === true ) {
+            $this->tokenizerType = $config->extensions[ $extension ];
         } else {
             // Revert to default.
             $this->tokenizerType = 'PHP';
         }
 
-        $this->configCache['cache']           = $this->config->cache;
-        $this->configCache['sniffs']          = array_map('strtolower', $this->config->sniffs);
-        $this->configCache['exclude']         = array_map('strtolower', $this->config->exclude);
-        $this->configCache['errorSeverity']   = $this->config->errorSeverity;
-        $this->configCache['warningSeverity'] = $this->config->warningSeverity;
-        $this->configCache['recordErrors']    = $this->config->recordErrors;
-        $this->configCache['ignorePatterns']  = $this->ruleset->ignorePatterns;
-        $this->configCache['includePatterns'] = $this->ruleset->includePatterns;
+        $this->configCache[ 'cache' ]           = $this->config->cache;
+        $this->configCache[ 'sniffs' ]          = array_map( 'strtolower', $this->config->sniffs );
+        $this->configCache[ 'exclude' ]         = array_map( 'strtolower', $this->config->exclude );
+        $this->configCache[ 'errorSeverity' ]   = $this->config->errorSeverity;
+        $this->configCache[ 'warningSeverity' ] = $this->config->warningSeverity;
+        $this->configCache[ 'recordErrors' ]    = $this->config->recordErrors;
+        $this->configCache[ 'ignorePatterns' ]  = $this->ruleset->ignorePatterns;
+        $this->configCache[ 'includePatterns' ] = $this->ruleset->includePatterns;
 
     }//end __construct()
 
@@ -261,15 +261,15 @@ 
      *
      * @return void
      */
-    public function setContent($content)
+    public function setContent( $content )
     {
         $this->content = $content;
-        $this->tokens  = [];
+        $this->tokens  = [ ];
 
         try {
-            $this->eolChar = Util\Common::detectLineEndings($content);
-        } catch (RuntimeException $e) {
-            $this->addWarningOnLine($e->getMessage(), 1, 'Internal.DetectLineEndings');
+            $this->eolChar = Util\Common::detectLineEndings( $content );
+        } catch ( RuntimeException $e ) {
+            $this->addWarningOnLine( $e->getMessage(), 1, 'Internal.DetectLineEndings' );
             return;
         }
 
@@ -297,7 +297,7 @@ 
      */
     public function disableCaching()
     {
-        $this->configCache['cache'] = false;
+        $this->configCache[ 'cache' ] = false;
 
     }//end disableCaching()
 
@@ -309,12 +309,12 @@ 
      */
     public function process()
     {
-        if ($this->ignored === true) {
+        if ( $this->ignored === true ) {
             return;
         }
 
-        $this->errors       = [];
-        $this->warnings     = [];
+        $this->errors       = [ ];
+        $this->warnings     = [ ];
         $this->errorCount   = 0;
         $this->warningCount = 0;
         $this->fixableCount = 0;
@@ -322,106 +322,106 @@ 
         $this->parse();
 
         // Check if tokenizer errors cause this file to be ignored.
-        if ($this->ignored === true) {
+        if ( $this->ignored === true ) {
             return;
         }
 
-        $this->fixer->startFile($this);
+        $this->fixer->startFile( $this );
 
-        if (PHP_CODESNIFFER_VERBOSITY > 2) {
-            echo "\t*** START TOKEN PROCESSING ***".PHP_EOL;
+        if ( PHP_CODESNIFFER_VERBOSITY > 2 ) {
+            echo "\t*** START TOKEN PROCESSING ***" . PHP_EOL;
         }
 
         $foundCode        = false;
-        $listenerIgnoreTo = [];
-        $inTests          = defined('PHP_CODESNIFFER_IN_TESTS');
+        $listenerIgnoreTo = [ ];
+        $inTests          = defined( 'PHP_CODESNIFFER_IN_TESTS' );
         $checkAnnotations = $this->config->annotations;
 
         // Foreach of the listeners that have registered to listen for this
         // token, get them to process it.
-        foreach ($this->tokens as $stackPtr => $token) {
+        foreach ( $this->tokens as $stackPtr => $token ) {
             // Check for ignored lines.
-            if ($checkAnnotations === true
-                && ($token['code'] === T_COMMENT
-                || $token['code'] === T_PHPCS_IGNORE_FILE
-                || $token['code'] === T_PHPCS_SET
-                || $token['code'] === T_DOC_COMMENT_STRING
-                || $token['code'] === T_DOC_COMMENT_TAG
-                || ($inTests === true && $token['code'] === T_INLINE_HTML))
+            if ( $checkAnnotations === true
+                && ( $token[ 'code' ] === T_COMMENT
+                || $token[ 'code' ] === T_PHPCS_IGNORE_FILE
+                || $token[ 'code' ] === T_PHPCS_SET
+                || $token[ 'code' ] === T_DOC_COMMENT_STRING
+                || $token[ 'code' ] === T_DOC_COMMENT_TAG
+                || ( $inTests === true && $token[ 'code' ] === T_INLINE_HTML ) )
             ) {
-                $commentText      = ltrim($this->tokens[$stackPtr]['content'], ' /*');
-                $commentTextLower = strtolower($commentText);
-                if (strpos($commentText, '@codingStandards') !== false) {
-                    if (strpos($commentText, '@codingStandardsIgnoreFile') !== false) {
+                $commentText      = ltrim( $this->tokens[ $stackPtr ][ 'content' ], ' /*' );
+                $commentTextLower = strtolower( $commentText );
+                if ( strpos( $commentText, '@codingStandards' ) !== false ) {
+                    if ( strpos( $commentText, '@codingStandardsIgnoreFile' ) !== false ) {
                         // Ignoring the whole file, just a little late.
-                        $this->errors       = [];
-                        $this->warnings     = [];
+                        $this->errors       = [ ];
+                        $this->warnings     = [ ];
                         $this->errorCount   = 0;
                         $this->warningCount = 0;
                         $this->fixableCount = 0;
                         return;
-                    } else if (strpos($commentText, '@codingStandardsChangeSetting') !== false) {
-                        $start   = strpos($commentText, '@codingStandardsChangeSetting');
-                        $comment = substr($commentText, ($start + 30));
-                        $parts   = explode(' ', $comment);
-                        if (count($parts) >= 2) {
-                            $sniffParts = explode('.', $parts[0]);
-                            if (count($sniffParts) >= 3) {
+                    } else if ( strpos( $commentText, '@codingStandardsChangeSetting' ) !== false ) {
+                        $start   = strpos( $commentText, '@codingStandardsChangeSetting' );
+                        $comment = substr( $commentText, ( $start + 30 ) );
+                        $parts   = explode( ' ', $comment );
+                        if ( count( $parts ) >= 2 ) {
+                            $sniffParts = explode( '.', $parts[ 0 ] );
+                            if ( count( $sniffParts ) >= 3 ) {
                                 // If the sniff code is not known to us, it has not been registered in this run.
                                 // But don't throw an error as it could be there for a different standard to use.
-                                if (isset($this->ruleset->sniffCodes[$parts[0]]) === true) {
-                                    $listenerCode  = array_shift($parts);
-                                    $propertyCode  = array_shift($parts);
-                                    $propertyValue = rtrim(implode(' ', $parts), " */\r\n");
-                                    $listenerClass = $this->ruleset->sniffCodes[$listenerCode];
-                                    $this->ruleset->setSniffProperty($listenerClass, $propertyCode, $propertyValue);
+                                if ( isset( $this->ruleset->sniffCodes[ $parts[ 0 ] ] ) === true ) {
+                                    $listenerCode  = array_shift( $parts );
+                                    $propertyCode  = array_shift( $parts );
+                                    $propertyValue = rtrim( implode( ' ', $parts ), " */\r\n" );
+                                    $listenerClass = $this->ruleset->sniffCodes[ $listenerCode ];
+                                    $this->ruleset->setSniffProperty( $listenerClass, $propertyCode, $propertyValue );
                                 }
                             }
                         }
                     }//end if
-                } else if (substr($commentTextLower, 0, 16) === 'phpcs:ignorefile'
-                    || substr($commentTextLower, 0, 17) === '@phpcs:ignorefile'
+                } else if ( substr( $commentTextLower, 0, 16 ) === 'phpcs:ignorefile'
+                    || substr( $commentTextLower, 0, 17 ) === '@phpcs:ignorefile'
                 ) {
                     // Ignoring the whole file, just a little late.
-                    $this->errors       = [];
-                    $this->warnings     = [];
+                    $this->errors       = [ ];
+                    $this->warnings     = [ ];
                     $this->errorCount   = 0;
                     $this->warningCount = 0;
                     $this->fixableCount = 0;
                     return;
-                } else if (substr($commentTextLower, 0, 9) === 'phpcs:set'
-                    || substr($commentTextLower, 0, 10) === '@phpcs:set'
+                } else if ( substr( $commentTextLower, 0, 9 ) === 'phpcs:set'
+                    || substr( $commentTextLower, 0, 10 ) === '@phpcs:set'
                 ) {
-                    if (isset($token['sniffCode']) === true) {
-                        $listenerCode = $token['sniffCode'];
-                        if (isset($this->ruleset->sniffCodes[$listenerCode]) === true) {
-                            $propertyCode  = $token['sniffProperty'];
-                            $propertyValue = $token['sniffPropertyValue'];
-                            $listenerClass = $this->ruleset->sniffCodes[$listenerCode];
-                            $this->ruleset->setSniffProperty($listenerClass, $propertyCode, $propertyValue);
+                    if ( isset( $token[ 'sniffCode' ] ) === true ) {
+                        $listenerCode = $token[ 'sniffCode' ];
+                        if ( isset( $this->ruleset->sniffCodes[ $listenerCode ] ) === true ) {
+                            $propertyCode  = $token[ 'sniffProperty' ];
+                            $propertyValue = $token[ 'sniffPropertyValue' ];
+                            $listenerClass = $this->ruleset->sniffCodes[ $listenerCode ];
+                            $this->ruleset->setSniffProperty( $listenerClass, $propertyCode, $propertyValue );
                         }
                     }
                 }//end if
             }//end if
 
-            if (PHP_CODESNIFFER_VERBOSITY > 2) {
-                $type    = $token['type'];
-                $content = Util\Common::prepareForOutput($token['content']);
-                echo "\t\tProcess token $stackPtr: $type => $content".PHP_EOL;
+            if ( PHP_CODESNIFFER_VERBOSITY > 2 ) {
+                $type    = $token[ 'type' ];
+                $content = Util\Common::prepareForOutput( $token[ 'content' ] );
+                echo "\t\tProcess token $stackPtr: $type => $content" . PHP_EOL;
             }
 
-            if ($token['code'] !== T_INLINE_HTML) {
+            if ( $token[ 'code' ] !== T_INLINE_HTML ) {
                 $foundCode = true;
             }
 
-            if (isset($this->ruleset->tokenListeners[$token['code']]) === false) {
+            if ( isset( $this->ruleset->tokenListeners[ $token[ 'code' ] ] ) === false ) {
                 continue;
             }
 
-            foreach ($this->ruleset->tokenListeners[$token['code']] as $listenerData) {
-                if (isset($this->ignoredListeners[$listenerData['class']]) === true
-                    || (isset($listenerIgnoreTo[$listenerData['class']]) === true
-                    && $listenerIgnoreTo[$listenerData['class']] > $stackPtr)
+            foreach ( $this->ruleset->tokenListeners[ $token[ 'code' ] ] as $listenerData ) {
+                if ( isset( $this->ignoredListeners[ $listenerData[ 'class' ] ] ) === true
+                    || ( isset( $listenerIgnoreTo[ $listenerData[ 'class' ] ] ) === true
+                    && $listenerIgnoreTo[ $listenerData[ 'class' ] ] > $stackPtr )
                 ) {
                     // This sniff is ignoring past this token, or the whole file.
                     continue;
@@ -429,78 +429,78 @@ 
 
                 // Make sure this sniff supports the tokenizer
                 // we are currently using.
-                $class = $listenerData['class'];
+                $class = $listenerData[ 'class' ];
 
-                if (isset($listenerData['tokenizers'][$this->tokenizerType]) === false) {
+                if ( isset( $listenerData[ 'tokenizers' ][ $this->tokenizerType ] ) === false ) {
                     continue;
                 }
 
                 // If the file path matches one of our ignore patterns, skip it.
                 // While there is support for a type of each pattern
                 // (absolute or relative) we don't actually support it here.
-                foreach ($listenerData['ignore'] as $pattern) {
+                foreach ( $listenerData[ 'ignore' ] as $pattern ) {
                     // We assume a / directory separator, as do the exclude rules
                     // most developers write, so we need a special case for any system
                     // that is different.
-                    if (DIRECTORY_SEPARATOR === '\\') {
-                        $pattern = str_replace('/', '\\\\', $pattern);
+                    if ( DIRECTORY_SEPARATOR === '\\' ) {
+                        $pattern = str_replace( '/', '\\\\', $pattern );
                     }
 
-                    $pattern = '`'.$pattern.'`i';
-                    if (preg_match($pattern, $this->path) === 1) {
-                        $this->ignoredListeners[$class] = true;
-                        continue(2);
+                    $pattern = '`' . $pattern . '`i';
+                    if ( preg_match( $pattern, $this->path ) === 1 ) {
+                        $this->ignoredListeners[ $class ] = true;
+                        continue( 2 );
                     }
                 }
 
                 // If the file path does not match one of our include patterns, skip it.
                 // While there is support for a type of each pattern
                 // (absolute or relative) we don't actually support it here.
-                if (empty($listenerData['include']) === false) {
+                if ( empty( $listenerData[ 'include' ] ) === false ) {
                     $included = false;
-                    foreach ($listenerData['include'] as $pattern) {
+                    foreach ( $listenerData[ 'include' ] as $pattern ) {
                         // We assume a / directory separator, as do the exclude rules
                         // most developers write, so we need a special case for any system
                         // that is different.
-                        if (DIRECTORY_SEPARATOR === '\\') {
-                            $pattern = str_replace('/', '\\\\', $pattern);
+                        if ( DIRECTORY_SEPARATOR === '\\' ) {
+                            $pattern = str_replace( '/', '\\\\', $pattern );
                         }
 
-                        $pattern = '`'.$pattern.'`i';
-                        if (preg_match($pattern, $this->path) === 1) {
+                        $pattern = '`' . $pattern . '`i';
+                        if ( preg_match( $pattern, $this->path ) === 1 ) {
                             $included = true;
                             break;
                         }
                     }
 
-                    if ($included === false) {
-                        $this->ignoredListeners[$class] = true;
+                    if ( $included === false ) {
+                        $this->ignoredListeners[ $class ] = true;
                         continue;
                     }
                 }//end if
 
                 $this->activeListener = $class;
 
-                if (PHP_CODESNIFFER_VERBOSITY > 2) {
-                    $startTime = microtime(true);
-                    echo "\t\t\tProcessing ".$this->activeListener.'... ';
+                if ( PHP_CODESNIFFER_VERBOSITY > 2 ) {
+                    $startTime = microtime( true );
+                    echo "\t\t\tProcessing " . $this->activeListener . '... ';
                 }
 
-                $ignoreTo = $this->ruleset->sniffs[$class]->process($this, $stackPtr);
-                if ($ignoreTo !== null) {
-                    $listenerIgnoreTo[$this->activeListener] = $ignoreTo;
+                $ignoreTo = $this->ruleset->sniffs[ $class ]->process( $this, $stackPtr );
+                if ( $ignoreTo !== null ) {
+                    $listenerIgnoreTo[ $this->activeListener ] = $ignoreTo;
                 }
 
-                if (PHP_CODESNIFFER_VERBOSITY > 2) {
-                    $timeTaken = (microtime(true) - $startTime);
-                    if (isset($this->listenerTimes[$this->activeListener]) === false) {
-                        $this->listenerTimes[$this->activeListener] = 0;
+                if ( PHP_CODESNIFFER_VERBOSITY > 2 ) {
+                    $timeTaken = ( microtime( true ) - $startTime );
+                    if ( isset( $this->listenerTimes[ $this->activeListener ] ) === false ) {
+                        $this->listenerTimes[ $this->activeListener ] = 0;
                     }
 
-                    $this->listenerTimes[$this->activeListener] += $timeTaken;
+                    $this->listenerTimes[ $this->activeListener ] += $timeTaken;
 
-                    $timeTaken = round(($timeTaken), 4);
-                    echo "DONE in $timeTaken seconds".PHP_EOL;
+                    $timeTaken = round( ( $timeTaken ), 4 );
+                    echo "DONE in $timeTaken seconds" . PHP_EOL;
                 }
 
                 $this->activeListener = '';
@@ -513,25 +513,25 @@ 
         // We don't show this error for STDIN because we can't be sure the content
         // actually came directly from the user. It could be something like
         // refs from a Git pre-push hook.
-        if ($foundCode === false && $this->tokenizerType === 'PHP' && $this->path !== 'STDIN') {
-            $shortTags = (bool) ini_get('short_open_tag');
-            if ($shortTags === false) {
+        if ( $foundCode === false && $this->tokenizerType === 'PHP' && $this->path !== 'STDIN' ) {
+            $shortTags = (bool)ini_get( 'short_open_tag' );
+            if ( $shortTags === false ) {
                 $error = 'No PHP code was found in this file and short open tags are not allowed by this install of PHP. This file may be using short open tags but PHP does not allow them.';
-                $this->addWarning($error, null, 'Internal.NoCodeFound');
+                $this->addWarning( $error, null, 'Internal.NoCodeFound' );
             }
         }
 
-        if (PHP_CODESNIFFER_VERBOSITY > 2) {
-            echo "\t*** END TOKEN PROCESSING ***".PHP_EOL;
-            echo "\t*** START SNIFF PROCESSING REPORT ***".PHP_EOL;
+        if ( PHP_CODESNIFFER_VERBOSITY > 2 ) {
+            echo "\t*** END TOKEN PROCESSING ***" . PHP_EOL;
+            echo "\t*** START SNIFF PROCESSING REPORT ***" . PHP_EOL;
 
-            asort($this->listenerTimes, SORT_NUMERIC);
-            $this->listenerTimes = array_reverse($this->listenerTimes, true);
-            foreach ($this->listenerTimes as $listener => $timeTaken) {
-                echo "\t$listener: ".round(($timeTaken), 4).' secs'.PHP_EOL;
+            asort( $this->listenerTimes, SORT_NUMERIC );
+            $this->listenerTimes = array_reverse( $this->listenerTimes, true );
+            foreach ( $this->listenerTimes as $listener => $timeTaken ) {
+                echo "\t$listener: " . round( ( $timeTaken ), 4 ) . ' secs' . PHP_EOL;
             }
 
-            echo "\t*** END SNIFF PROCESSING REPORT ***".PHP_EOL;
+            echo "\t*** END SNIFF PROCESSING REPORT ***" . PHP_EOL;
         }
 
         $this->fixedCount += $this->fixer->getFixCount();
@@ -546,21 +546,21 @@ 
      */
     public function parse()
     {
-        if (empty($this->tokens) === false) {
+        if ( empty( $this->tokens ) === false ) {
             // File has already been parsed.
             return;
         }
 
         try {
-            $tokenizerClass  = 'PHP_CodeSniffer\Tokenizers\\'.$this->tokenizerType;
-            $this->tokenizer = new $tokenizerClass($this->content, $this->config, $this->eolChar);
+            $tokenizerClass  = 'PHP_CodeSniffer\Tokenizers\\' . $this->tokenizerType;
+            $this->tokenizer = new $tokenizerClass( $this->content, $this->config, $this->eolChar );
             $this->tokens    = $this->tokenizer->getTokens();
-        } catch (TokenizerException $e) {
+        } catch ( TokenizerException $e ) {
             $this->ignored = true;
-            $this->addWarning($e->getMessage(), null, 'Internal.Tokenizer.Exception');
-            if (PHP_CODESNIFFER_VERBOSITY > 0) {
+            $this->addWarning( $e->getMessage(), null, 'Internal.Tokenizer.Exception' );
+            if ( PHP_CODESNIFFER_VERBOSITY > 0 ) {
                 echo "[$this->tokenizerType => tokenizer error]... ";
-                if (PHP_CODESNIFFER_VERBOSITY > 1) {
+                if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
                     echo PHP_EOL;
                 }
             }
@@ -568,31 +568,31 @@ 
             return;
         }
 
-        $this->numTokens = count($this->tokens);
+        $this->numTokens = count( $this->tokens );
 
         // Check for mixed line endings as these can cause tokenizer errors and we
         // should let the user know that the results they get may be incorrect.
         // This is done by removing all backslashes, removing the newline char we
         // detected, then converting newlines chars into text. If any backslashes
         // are left at the end, we have additional newline chars in use.
-        $contents = str_replace('\\', '', $this->content);
-        $contents = str_replace($this->eolChar, '', $contents);
-        $contents = str_replace("\n", '\n', $contents);
-        $contents = str_replace("\r", '\r', $contents);
-        if (strpos($contents, '\\') !== false) {
+        $contents = str_replace( '\\', '', $this->content );
+        $contents = str_replace( $this->eolChar, '', $contents );
+        $contents = str_replace( "\n", '\n', $contents );
+        $contents = str_replace( "\r", '\r', $contents );
+        if ( strpos( $contents, '\\' ) !== false ) {
             $error = 'File has mixed line endings; this may cause incorrect results';
-            $this->addWarningOnLine($error, 1, 'Internal.LineEndings.Mixed');
+            $this->addWarningOnLine( $error, 1, 'Internal.LineEndings.Mixed' );
         }
 
-        if (PHP_CODESNIFFER_VERBOSITY > 0) {
-            if ($this->numTokens === 0) {
+        if ( PHP_CODESNIFFER_VERBOSITY > 0 ) {
+            if ( $this->numTokens === 0 ) {
                 $numLines = 0;
             } else {
-                $numLines = $this->tokens[($this->numTokens - 1)]['line'];
+                $numLines = $this->tokens[ ( $this->numTokens - 1 ) ][ 'line' ];
             }
 
             echo "[$this->tokenizerType => $this->numTokens tokens in $numLines lines]... ";
-            if (PHP_CODESNIFFER_VERBOSITY > 1) {
+            if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
                 echo PHP_EOL;
             }
         }
@@ -648,19 +648,19 @@ 
         $error,
         $stackPtr,
         $code,
-        $data=[],
-        $severity=0,
-        $fixable=false
+        $data = [ ],
+        $severity = 0,
+        $fixable = false
     ) {
-        if ($stackPtr === null) {
+        if ( $stackPtr === null ) {
             $line   = 1;
             $column = 1;
         } else {
-            $line   = $this->tokens[$stackPtr]['line'];
-            $column = $this->tokens[$stackPtr]['column'];
+            $line   = $this->tokens[ $stackPtr ][ 'line' ];
+            $column = $this->tokens[ $stackPtr ][ 'column' ];
         }
 
-        return $this->addMessage(true, $error, $line, $column, $code, $data, $severity, $fixable);
+        return $this->addMessage( true, $error, $line, $column, $code, $data, $severity, $fixable );
 
     }//end addError()
 
@@ -682,19 +682,19 @@ 
         $warning,
         $stackPtr,
         $code,
-        $data=[],
-        $severity=0,
-        $fixable=false
+        $data = [ ],
+        $severity = 0,
+        $fixable = false
     ) {
-        if ($stackPtr === null) {
+        if ( $stackPtr === null ) {
             $line   = 1;
             $column = 1;
         } else {
-            $line   = $this->tokens[$stackPtr]['line'];
-            $column = $this->tokens[$stackPtr]['column'];
+            $line   = $this->tokens[ $stackPtr ][ 'line' ];
+            $column = $this->tokens[ $stackPtr ][ 'column' ];
         }
 
-        return $this->addMessage(false, $warning, $line, $column, $code, $data, $severity, $fixable);
+        return $this->addMessage( false, $warning, $line, $column, $code, $data, $severity, $fixable );
 
     }//end addWarning()
 
@@ -715,10 +715,10 @@ 
         $error,
         $line,
         $code,
-        $data=[],
-        $severity=0
+        $data = [ ],
+        $severity = 0
     ) {
-        return $this->addMessage(true, $error, $line, 1, $code, $data, $severity, false);
+        return $this->addMessage( true, $error, $line, 1, $code, $data, $severity, false );
 
     }//end addErrorOnLine()
 
@@ -739,10 +739,10 @@ 
         $warning,
         $line,
         $code,
-        $data=[],
-        $severity=0
+        $data = [ ],
+        $severity = 0
     ) {
-        return $this->addMessage(false, $warning, $line, 1, $code, $data, $severity, false);
+        return $this->addMessage( false, $warning, $line, 1, $code, $data, $severity, false );
 
     }//end addWarningOnLine()
 
@@ -765,11 +765,11 @@ 
         $error,
         $stackPtr,
         $code,
-        $data=[],
-        $severity=0
+        $data = [ ],
+        $severity = 0
     ) {
-        $recorded = $this->addError($error, $stackPtr, $code, $data, $severity, true);
-        if ($recorded === true && $this->fixer->enabled === true) {
+        $recorded = $this->addError( $error, $stackPtr, $code, $data, $severity, true );
+        if ( $recorded === true && $this->fixer->enabled === true ) {
             return true;
         }
 
@@ -796,11 +796,11 @@ 
         $warning,
         $stackPtr,
         $code,
-        $data=[],
-        $severity=0
+        $data = [ ],
+        $severity = 0
     ) {
-        $recorded = $this->addWarning($warning, $stackPtr, $code, $data, $severity, true);
-        if ($recorded === true && $this->fixer->enabled === true) {
+        $recorded = $this->addWarning( $warning, $stackPtr, $code, $data, $severity, true );
+        if ( $recorded === true && $this->fixer->enabled === true ) {
             return true;
         }
 
@@ -824,156 +824,156 @@ 
      *
      * @return boolean
      */
-    protected function addMessage($error, $message, $line, $column, $code, $data, $severity, $fixable)
+    protected function addMessage( $error, $message, $line, $column, $code, $data, $severity, $fixable )
     {
         // Check if this line is ignoring all message codes.
-        if (isset($this->tokenizer->ignoredLines[$line]['.all']) === true) {
+        if ( isset( $this->tokenizer->ignoredLines[ $line ][ '.all' ] ) === true ) {
             return false;
         }
 
         // Work out which sniff generated the message.
-        $parts = explode('.', $code);
-        if ($parts[0] === 'Internal') {
+        $parts = explode( '.', $code );
+        if ( $parts[ 0 ] === 'Internal' ) {
             // An internal message.
-            $listenerCode = Util\Common::getSniffCode($this->activeListener);
+            $listenerCode = Util\Common::getSniffCode( $this->activeListener );
             $sniffCode    = $code;
-            $checkCodes   = [$sniffCode];
+            $checkCodes   = [ $sniffCode ];
         } else {
-            if ($parts[0] !== $code) {
+            if ( $parts[ 0 ] !== $code ) {
                 // The full message code has been passed in.
                 $sniffCode    = $code;
-                $listenerCode = substr($sniffCode, 0, strrpos($sniffCode, '.'));
+                $listenerCode = substr( $sniffCode, 0, strrpos( $sniffCode, '.' ) );
             } else {
-                $listenerCode = Util\Common::getSniffCode($this->activeListener);
-                $sniffCode    = $listenerCode.'.'.$code;
-                $parts        = explode('.', $sniffCode);
+                $listenerCode = Util\Common::getSniffCode( $this->activeListener );
+                $sniffCode    = $listenerCode . '.' . $code;
+                $parts        = explode( '.', $sniffCode );
             }
 
             $checkCodes = [
                 $sniffCode,
-                $parts[0].'.'.$parts[1].'.'.$parts[2],
-                $parts[0].'.'.$parts[1],
-                $parts[0],
+                $parts[ 0 ] . '.' . $parts[ 1 ] . '.' . $parts[ 2 ],
+                $parts[ 0 ] . '.' . $parts[ 1 ],
+                $parts[ 0 ],
             ];
         }//end if
 
-        if (isset($this->tokenizer->ignoredLines[$line]) === true) {
+        if ( isset( $this->tokenizer->ignoredLines[ $line ] ) === true ) {
             // Check if this line is ignoring this specific message.
             $ignored = false;
-            foreach ($checkCodes as $checkCode) {
-                if (isset($this->tokenizer->ignoredLines[$line][$checkCode]) === true) {
+            foreach ( $checkCodes as $checkCode ) {
+                if ( isset( $this->tokenizer->ignoredLines[ $line ][ $checkCode ] ) === true ) {
                     $ignored = true;
                     break;
                 }
             }
 
             // If it is ignored, make sure it's not whitelisted.
-            if ($ignored === true
-                && isset($this->tokenizer->ignoredLines[$line]['.except']) === true
+            if ( $ignored === true
+                && isset( $this->tokenizer->ignoredLines[ $line ][ '.except' ] ) === true
             ) {
-                foreach ($checkCodes as $checkCode) {
-                    if (isset($this->tokenizer->ignoredLines[$line]['.except'][$checkCode]) === true) {
+                foreach ( $checkCodes as $checkCode ) {
+                    if ( isset( $this->tokenizer->ignoredLines[ $line ][ '.except' ][ $checkCode ] ) === true ) {
                         $ignored = false;
                         break;
                     }
                 }
             }
 
-            if ($ignored === true) {
+            if ( $ignored === true ) {
                 return false;
             }
         }//end if
 
         $includeAll = true;
-        if ($this->configCache['cache'] === false
-            || $this->configCache['recordErrors'] === false
+        if ( $this->configCache[ 'cache' ] === false
+            || $this->configCache[ 'recordErrors' ] === false
         ) {
             $includeAll = false;
         }
 
         // Filter out any messages for sniffs that shouldn't have run
         // due to the use of the --sniffs command line argument.
-        if ($includeAll === false
-            && ((empty($this->configCache['sniffs']) === false
-            && in_array(strtolower($listenerCode), $this->configCache['sniffs'], true) === false)
-            || (empty($this->configCache['exclude']) === false
-            && in_array(strtolower($listenerCode), $this->configCache['exclude'], true) === true))
+        if ( $includeAll === false
+            && ( ( empty( $this->configCache[ 'sniffs' ] ) === false
+            && in_array( strtolower( $listenerCode ), $this->configCache[ 'sniffs' ], true ) === false )
+            || ( empty( $this->configCache[ 'exclude' ] ) === false
+            && in_array( strtolower( $listenerCode ), $this->configCache[ 'exclude' ], true ) === true ) )
         ) {
             return false;
         }
 
         // If we know this sniff code is being ignored for this file, return early.
-        foreach ($checkCodes as $checkCode) {
-            if (isset($this->ignoredCodes[$checkCode]) === true) {
+        foreach ( $checkCodes as $checkCode ) {
+            if ( isset( $this->ignoredCodes[ $checkCode ] ) === true ) {
                 return false;
             }
         }
 
         $oppositeType = 'warning';
-        if ($error === false) {
+        if ( $error === false ) {
             $oppositeType = 'error';
         }
 
-        foreach ($checkCodes as $checkCode) {
+        foreach ( $checkCodes as $checkCode ) {
             // Make sure this message type has not been set to the opposite message type.
-            if (isset($this->ruleset->ruleset[$checkCode]['type']) === true
-                && $this->ruleset->ruleset[$checkCode]['type'] === $oppositeType
+            if ( isset( $this->ruleset->ruleset[ $checkCode ][ 'type' ] ) === true
+                && $this->ruleset->ruleset[ $checkCode ][ 'type' ] === $oppositeType
             ) {
-                $error = !$error;
+                $error = ! $error;
                 break;
             }
         }
 
-        if ($error === true) {
-            $configSeverity = $this->configCache['errorSeverity'];
+        if ( $error === true ) {
+            $configSeverity = $this->configCache[ 'errorSeverity' ];
             $messageCount   = &$this->errorCount;
             $messages       = &$this->errors;
         } else {
-            $configSeverity = $this->configCache['warningSeverity'];
+            $configSeverity = $this->configCache[ 'warningSeverity' ];
             $messageCount   = &$this->warningCount;
             $messages       = &$this->warnings;
         }
 
-        if ($includeAll === false && $configSeverity === 0) {
+        if ( $includeAll === false && $configSeverity === 0 ) {
             // Don't bother doing any processing as these messages are just going to
             // be hidden in the reports anyway.
             return false;
         }
 
-        if ($severity === 0) {
+        if ( $severity === 0 ) {
             $severity = 5;
         }
 
-        foreach ($checkCodes as $checkCode) {
+        foreach ( $checkCodes as $checkCode ) {
             // Make sure we are interested in this severity level.
-            if (isset($this->ruleset->ruleset[$checkCode]['severity']) === true) {
-                $severity = $this->ruleset->ruleset[$checkCode]['severity'];
+            if ( isset( $this->ruleset->ruleset[ $checkCode ][ 'severity' ] ) === true ) {
+                $severity = $this->ruleset->ruleset[ $checkCode ][ 'severity' ];
                 break;
             }
         }
 
-        if ($includeAll === false && $configSeverity > $severity) {
+        if ( $includeAll === false && $configSeverity > $severity ) {
             return false;
         }
 
         // Make sure we are not ignoring this file.
         $included = null;
-        foreach ($checkCodes as $checkCode) {
+        foreach ( $checkCodes as $checkCode ) {
             $patterns = null;
 
-            if (isset($this->configCache['includePatterns'][$checkCode]) === true) {
-                $patterns  = $this->configCache['includePatterns'][$checkCode];
+            if ( isset( $this->configCache[ 'includePatterns' ][ $checkCode ] ) === true ) {
+                $patterns  = $this->configCache[ 'includePatterns' ][ $checkCode ];
                 $excluding = false;
-            } else if (isset($this->configCache['ignorePatterns'][$checkCode]) === true) {
-                $patterns  = $this->configCache['ignorePatterns'][$checkCode];
+            } else if ( isset( $this->configCache[ 'ignorePatterns' ][ $checkCode ] ) === true ) {
+                $patterns  = $this->configCache[ 'ignorePatterns' ][ $checkCode ];
                 $excluding = true;
             }
 
-            if ($patterns === null) {
+            if ( $patterns === null ) {
                 continue;
             }
 
-            foreach ($patterns as $pattern => $type) {
+            foreach ( $patterns as $pattern => $type ) {
                 // While there is support for a type of each pattern
                 // (absolute or relative) we don't actually support it here.
                 $replacements = [
@@ -984,15 +984,15 @@ 
                 // We assume a / directory separator, as do the exclude rules
                 // most developers write, so we need a special case for any system
                 // that is different.
-                if (DIRECTORY_SEPARATOR === '\\') {
-                    $replacements['/'] = '\\\\';
+                if ( DIRECTORY_SEPARATOR === '\\' ) {
+                    $replacements[ '/' ] = '\\\\';
                 }
 
-                $pattern = '`'.strtr($pattern, $replacements).'`i';
-                $matched = preg_match($pattern, $this->path);
+                $pattern = '`' . strtr( $pattern, $replacements ) . '`i';
+                $matched = preg_match( $pattern, $this->path );
 
-                if ($matched === 0) {
-                    if ($excluding === false && $included === null) {
+                if ( $matched === 0 ) {
+                    if ( $excluding === false && $included === null ) {
                         // This file path is not being included.
                         $included = false;
                     }
@@ -1000,9 +1000,9 @@ 
                     continue;
                 }
 
-                if ($excluding === true) {
+                if ( $excluding === true ) {
                     // This file path is being excluded.
-                    $this->ignoredCodes[$checkCode] = true;
+                    $this->ignoredCodes[ $checkCode ] = true;
                     return false;
                 }
 
@@ -1012,41 +1012,41 @@ 
             }//end foreach
         }//end foreach
 
-        if ($included === false) {
+        if ( $included === false ) {
             // There were include rules set, but this file
             // path didn't match any of them.
             return false;
         }
 
         $messageCount++;
-        if ($fixable === true) {
+        if ( $fixable === true ) {
             $this->fixableCount++;
         }
 
-        if ($this->configCache['recordErrors'] === false
+        if ( $this->configCache[ 'recordErrors' ] === false
             && $includeAll === false
         ) {
             return true;
         }
 
         // Work out the error message.
-        if (isset($this->ruleset->ruleset[$sniffCode]['message']) === true) {
-            $message = $this->ruleset->ruleset[$sniffCode]['message'];
+        if ( isset( $this->ruleset->ruleset[ $sniffCode ][ 'message' ] ) === true ) {
+            $message = $this->ruleset->ruleset[ $sniffCode ][ 'message' ];
         }
 
-        if (empty($data) === false) {
-            $message = vsprintf($message, $data);
+        if ( empty( $data ) === false ) {
+            $message = vsprintf( $message, $data );
         }
 
-        if (isset($messages[$line]) === false) {
-            $messages[$line] = [];
+        if ( isset( $messages[ $line ] ) === false ) {
+            $messages[ $line ] = [ ];
         }
 
-        if (isset($messages[$line][$column]) === false) {
-            $messages[$line][$column] = [];
+        if ( isset( $messages[ $line ][ $column ] ) === false ) {
+            $messages[ $line ][ $column ] = [ ];
         }
 
-        $messages[$line][$column][] = [
+        $messages[ $line ][ $column ][ ] = [
             'message'  => $message,
             'source'   => $sniffCode,
             'listener' => $this->activeListener,
@@ -1054,12 +1054,12 @@ 
             'fixable'  => $fixable,
         ];
 
-        if (PHP_CODESNIFFER_VERBOSITY > 1
+        if ( PHP_CODESNIFFER_VERBOSITY > 1
             && $this->fixer->enabled === true
             && $fixable === true
         ) {
             @ob_end_clean();
-            echo "\tE: [Line $line] $message ($sniffCode)".PHP_EOL;
+            echo "\tE: [Line $line] $message ($sniffCode)" . PHP_EOL;
             ob_start();
         }
 
@@ -1077,17 +1077,17 @@ 
      *
      * @return boolean
      */
-    public function recordMetric($stackPtr, $metric, $value)
+    public function recordMetric( $stackPtr, $metric, $value )
     {
-        if (isset($this->metrics[$metric]) === false) {
-            $this->metrics[$metric] = ['values' => [$value => 1]];
-            $this->metricTokens[$metric][$stackPtr] = true;
-        } else if (isset($this->metricTokens[$metric][$stackPtr]) === false) {
-            $this->metricTokens[$metric][$stackPtr] = true;
-            if (isset($this->metrics[$metric]['values'][$value]) === false) {
-                $this->metrics[$metric]['values'][$value] = 1;
+        if ( isset( $this->metrics[ $metric ] ) === false ) {
+            $this->metrics[ $metric ] = [ 'values' => [ $value => 1 ] ];
+            $this->metricTokens[ $metric ][ $stackPtr ] = true;
+        } else if ( isset( $this->metricTokens[ $metric ][ $stackPtr ] ) === false ) {
+            $this->metricTokens[ $metric ][ $stackPtr ] = true;
+            if ( isset( $this->metrics[ $metric ][ 'values' ][ $value ] ) === false ) {
+                $this->metrics[ $metric ][ 'values' ][ $value ] = 1;
             } else {
-                $this->metrics[$metric]['values'][$value]++;
+                $this->metrics[ $metric ][ 'values' ][ $value ]++;
             }
         }
 
@@ -1216,34 +1216,34 @@ 
      *                                                      T_FUNCTION, T_CLASS, T_ANON_CLASS,
      *                                                      T_CLOSURE, T_TRAIT, or T_INTERFACE.
      */
-    public function getDeclarationName($stackPtr)
+    public function getDeclarationName( $stackPtr )
     {
-        $tokenCode = $this->tokens[$stackPtr]['code'];
+        $tokenCode = $this->tokens[ $stackPtr ][ 'code' ];
 
-        if ($tokenCode === T_ANON_CLASS || $tokenCode === T_CLOSURE) {
+        if ( $tokenCode === T_ANON_CLASS || $tokenCode === T_CLOSURE ) {
             return null;
         }
 
-        if ($tokenCode !== T_FUNCTION
+        if ( $tokenCode !== T_FUNCTION
             && $tokenCode !== T_CLASS
             && $tokenCode !== T_INTERFACE
             && $tokenCode !== T_TRAIT
         ) {
-            throw new RuntimeException('Token type "'.$this->tokens[$stackPtr]['type'].'" is not T_FUNCTION, T_CLASS, T_INTERFACE or T_TRAIT');
+            throw new RuntimeException( 'Token type "' . $this->tokens[ $stackPtr ][ 'type' ] . '" is not T_FUNCTION, T_CLASS, T_INTERFACE or T_TRAIT' );
         }
 
-        if ($tokenCode === T_FUNCTION
-            && strtolower($this->tokens[$stackPtr]['content']) !== 'function'
+        if ( $tokenCode === T_FUNCTION
+            && strtolower( $this->tokens[ $stackPtr ][ 'content' ] ) !== 'function'
         ) {
             // This is a function declared without the "function" keyword.
             // So this token is the function name.
-            return $this->tokens[$stackPtr]['content'];
+            return $this->tokens[ $stackPtr ][ 'content' ];
         }
 
         $content = null;
-        for ($i = $stackPtr; $i < $this->numTokens; $i++) {
-            if ($this->tokens[$i]['code'] === T_STRING) {
-                $content = $this->tokens[$i]['content'];
+        for ( $i = $stackPtr; $i < $this->numTokens; $i++ ) {
+            if ( $this->tokens[ $i ][ 'code' ] === T_STRING ) {
+                $content = $this->tokens[ $i ][ 'content' ];
                 break;
             }
         }
@@ -1282,20 +1282,20 @@ 
      * @throws \PHP_CodeSniffer\Exceptions\TokenizerException If the specified $stackPtr is not of
      *                                                        type T_FUNCTION or T_CLOSURE.
      */
-    public function getMethodParameters($stackPtr)
+    public function getMethodParameters( $stackPtr )
     {
-        if ($this->tokens[$stackPtr]['code'] !== T_FUNCTION
-            && $this->tokens[$stackPtr]['code'] !== T_CLOSURE
+        if ( $this->tokens[ $stackPtr ][ 'code' ] !== T_FUNCTION
+            && $this->tokens[ $stackPtr ][ 'code' ] !== T_CLOSURE
         ) {
-            throw new TokenizerException('$stackPtr must be of type T_FUNCTION or T_CLOSURE');
+            throw new TokenizerException( '$stackPtr must be of type T_FUNCTION or T_CLOSURE' );
         }
 
-        $opener = $this->tokens[$stackPtr]['parenthesis_opener'];
-        $closer = $this->tokens[$stackPtr]['parenthesis_closer'];
+        $opener = $this->tokens[ $stackPtr ][ 'parenthesis_opener' ];
+        $closer = $this->tokens[ $stackPtr ][ 'parenthesis_closer' ];
 
-        $vars            = [];
+        $vars            = [ ];
         $currVar         = null;
-        $paramStart      = ($opener + 1);
+        $paramStart      = ( $opener + 1 );
         $defaultStart    = null;
         $paramCount      = 0;
         $passByReference = false;
@@ -1304,28 +1304,28 @@ 
         $typeHintToken   = false;
         $nullableType    = false;
 
-        for ($i = $paramStart; $i <= $closer; $i++) {
+        for ( $i = $paramStart; $i <= $closer; $i++ ) {
             // Check to see if this token has a parenthesis or bracket opener. If it does
             // it's likely to be an array which might have arguments in it. This
             // could cause problems in our parsing below, so lets just skip to the
             // end of it.
-            if (isset($this->tokens[$i]['parenthesis_opener']) === true) {
+            if ( isset( $this->tokens[ $i ][ 'parenthesis_opener' ] ) === true ) {
                 // Don't do this if it's the close parenthesis for the method.
-                if ($i !== $this->tokens[$i]['parenthesis_closer']) {
-                    $i = ($this->tokens[$i]['parenthesis_closer'] + 1);
+                if ( $i !== $this->tokens[ $i ][ 'parenthesis_closer' ] ) {
+                    $i = ( $this->tokens[ $i ][ 'parenthesis_closer' ] + 1 );
                 }
             }
 
-            if (isset($this->tokens[$i]['bracket_opener']) === true) {
+            if ( isset( $this->tokens[ $i ][ 'bracket_opener' ] ) === true ) {
                 // Don't do this if it's the close parenthesis for the method.
-                if ($i !== $this->tokens[$i]['bracket_closer']) {
-                    $i = ($this->tokens[$i]['bracket_closer'] + 1);
+                if ( $i !== $this->tokens[ $i ][ 'bracket_closer' ] ) {
+                    $i = ( $this->tokens[ $i ][ 'bracket_closer' ] + 1 );
                 }
             }
 
-            switch ($this->tokens[$i]['code']) {
+            switch ( $this->tokens[ $i ][ 'code' ] ) {
             case T_BITWISE_AND:
-                if ($defaultStart === null) {
+                if ( $defaultStart === null ) {
                     $passByReference = true;
                 }
                 break;
@@ -1336,99 +1336,99 @@ 
                 $variableLength = true;
                 break;
             case T_CALLABLE:
-                if ($typeHintToken === false) {
+                if ( $typeHintToken === false ) {
                     $typeHintToken = $i;
                 }
 
-                $typeHint .= $this->tokens[$i]['content'];
+                $typeHint .= $this->tokens[ $i ][ 'content' ];
                 break;
             case T_SELF:
             case T_PARENT:
             case T_STATIC:
                 // Self and parent are valid, static invalid, but was probably intended as type hint.
-                if (isset($defaultStart) === false) {
-                    if ($typeHintToken === false) {
+                if ( isset( $defaultStart ) === false ) {
+                    if ( $typeHintToken === false ) {
                         $typeHintToken = $i;
                     }
 
-                    $typeHint .= $this->tokens[$i]['content'];
+                    $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) {
+                for ( $t = $i; $t >= $opener; $t-- ) {
+                    if ( $this->tokens[ $t ][ 'code' ] === T_COMMA ) {
                         $prevComma = $t;
                         break;
                     }
                 }
 
-                if ($prevComma !== false) {
+                if ( $prevComma !== false ) {
                     $nextEquals = false;
-                    for ($t = $prevComma; $t < $i; $t++) {
-                        if ($this->tokens[$t]['code'] === T_EQUAL) {
+                    for ( $t = $prevComma; $t < $i; $t++ ) {
+                        if ( $this->tokens[ $t ][ 'code' ] === T_EQUAL ) {
                             $nextEquals = $t;
                             break;
                         }
                     }
 
-                    if ($nextEquals !== false) {
+                    if ( $nextEquals !== false ) {
                         break;
                     }
                 }
 
-                if ($defaultStart === null) {
-                    if ($typeHintToken === false) {
+                if ( $defaultStart === null ) {
+                    if ( $typeHintToken === false ) {
                         $typeHintToken = $i;
                     }
 
-                    $typeHint .= $this->tokens[$i]['content'];
+                    $typeHint .= $this->tokens[ $i ][ 'content' ];
                 }
                 break;
             case T_NS_SEPARATOR:
                 // Part of a type hint or default value.
-                if ($defaultStart === null) {
-                    if ($typeHintToken === false) {
+                if ( $defaultStart === null ) {
+                    if ( $typeHintToken === false ) {
                         $typeHintToken = $i;
                     }
 
-                    $typeHint .= $this->tokens[$i]['content'];
+                    $typeHint .= $this->tokens[ $i ][ 'content' ];
                 }
                 break;
             case T_NULLABLE:
-                if ($defaultStart === null) {
+                if ( $defaultStart === null ) {
                     $nullableType = true;
-                    $typeHint    .= $this->tokens[$i]['content'];
+                    $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) {
+                if ( $currVar === null ) {
                     continue 2;
                 }
 
-                $vars[$paramCount]            = [];
-                $vars[$paramCount]['token']   = $currVar;
-                $vars[$paramCount]['name']    = $this->tokens[$currVar]['content'];
-                $vars[$paramCount]['content'] = trim($this->getTokensAsString($paramStart, ($i - $paramStart)));
+                $vars[ $paramCount ]            = [ ];
+                $vars[ $paramCount ][ 'token' ]   = $currVar;
+                $vars[ $paramCount ][ 'name' ]    = $this->tokens[ $currVar ][ 'content' ];
+                $vars[ $paramCount ][ 'content' ] = trim( $this->getTokensAsString( $paramStart, ( $i - $paramStart ) ) );
 
-                if ($defaultStart !== null) {
-                    $vars[$paramCount]['default'] = trim($this->getTokensAsString($defaultStart, ($i - $defaultStart)));
+                if ( $defaultStart !== null ) {
+                    $vars[ $paramCount ][ 'default' ] = trim( $this->getTokensAsString( $defaultStart, ( $i - $defaultStart ) ) );
                 }
 
-                $vars[$paramCount]['pass_by_reference'] = $passByReference;
-                $vars[$paramCount]['variable_length']   = $variableLength;
-                $vars[$paramCount]['type_hint']         = $typeHint;
-                $vars[$paramCount]['type_hint_token']   = $typeHintToken;
-                $vars[$paramCount]['nullable_type']     = $nullableType;
+                $vars[ $paramCount ][ 'pass_by_reference' ] = $passByReference;
+                $vars[ $paramCount ][ 'variable_length' ]   = $variableLength;
+                $vars[ $paramCount ][ 'type_hint' ]         = $typeHint;
+                $vars[ $paramCount ][ 'type_hint_token' ]   = $typeHintToken;
+                $vars[ $paramCount ][ 'nullable_type' ]     = $nullableType;
 
                 // Reset the vars, as we are about to process the next parameter.
                 $defaultStart    = null;
-                $paramStart      = ($i + 1);
+                $paramStart      = ( $i + 1 );
                 $passByReference = false;
                 $variableLength  = false;
                 $typeHint        = '';
@@ -1438,7 +1438,7 @@ 
                 $paramCount++;
                 break;
             case T_EQUAL:
-                $defaultStart = ($i + 1);
+                $defaultStart = ( $i + 1 );
                 break;
             }//end switch
         }//end for
@@ -1474,15 +1474,15 @@ 
      * @throws \PHP_CodeSniffer\Exceptions\TokenizerException If the specified position is not a
      *                                                        T_FUNCTION token.
      */
-    public function getMethodProperties($stackPtr)
+    public function getMethodProperties( $stackPtr )
     {
-        if ($this->tokens[$stackPtr]['code'] !== T_FUNCTION
-            && $this->tokens[$stackPtr]['code'] !== T_CLOSURE
+        if ( $this->tokens[ $stackPtr ][ 'code' ] !== T_FUNCTION
+            && $this->tokens[ $stackPtr ][ 'code' ] !== T_CLOSURE
         ) {
-            throw new TokenizerException('$stackPtr must be of type T_FUNCTION or T_CLOSURE');
+            throw new TokenizerException( '$stackPtr must be of type T_FUNCTION or T_CLOSURE' );
         }
 
-        if ($this->tokens[$stackPtr]['code'] === T_FUNCTION) {
+        if ( $this->tokens[ $stackPtr ][ 'code' ] === T_FUNCTION ) {
             $valid = [
                 T_PUBLIC      => T_PUBLIC,
                 T_PRIVATE     => T_PRIVATE,
@@ -1509,12 +1509,12 @@ 
         $isFinal        = false;
         $isStatic       = false;
 
-        for ($i = ($stackPtr - 1); $i > 0; $i--) {
-            if (isset($valid[$this->tokens[$i]['code']]) === false) {
+        for ( $i = ( $stackPtr - 1 ); $i > 0; $i-- ) {
+            if ( isset( $valid[ $this->tokens[ $i ][ 'code' ] ] ) === false ) {
                 break;
             }
 
-            switch ($this->tokens[$i]['code']) {
+            switch ( $this->tokens[ $i ][ 'code' ] ) {
             case T_PUBLIC:
                 $scope          = 'public';
                 $scopeSpecified = true;
@@ -1544,10 +1544,10 @@ 
         $nullableReturnType = false;
         $hasBody            = true;
 
-        if (isset($this->tokens[$stackPtr]['parenthesis_closer']) === true) {
+        if ( isset( $this->tokens[ $stackPtr ][ 'parenthesis_closer' ] ) === true ) {
             $scopeOpener = null;
-            if (isset($this->tokens[$stackPtr]['scope_opener']) === true) {
-                $scopeOpener = $this->tokens[$stackPtr]['scope_opener'];
+            if ( isset( $this->tokens[ $stackPtr ][ 'scope_opener' ] ) === true ) {
+                $scopeOpener = $this->tokens[ $stackPtr ][ 'scope_opener' ];
             }
 
             $valid = [
@@ -1558,33 +1558,33 @@ 
                 T_NS_SEPARATOR => T_NS_SEPARATOR,
             ];
 
-            for ($i = $this->tokens[$stackPtr]['parenthesis_closer']; $i < $this->numTokens; $i++) {
-                if (($scopeOpener === null && $this->tokens[$i]['code'] === T_SEMICOLON)
-                    || ($scopeOpener !== null && $i === $scopeOpener)
+            for ( $i = $this->tokens[ $stackPtr ][ 'parenthesis_closer' ]; $i < $this->numTokens; $i++ ) {
+                if ( ( $scopeOpener === null && $this->tokens[ $i ][ 'code' ] === T_SEMICOLON )
+                    || ( $scopeOpener !== null && $i === $scopeOpener )
                 ) {
                     // End of function definition.
                     break;
                 }
 
-                if ($this->tokens[$i]['code'] === T_NULLABLE) {
+                if ( $this->tokens[ $i ][ 'code' ] === T_NULLABLE ) {
                     $nullableReturnType = true;
                 }
 
-                if (isset($valid[$this->tokens[$i]['code']]) === true) {
-                    if ($returnTypeToken === false) {
+                if ( isset( $valid[ $this->tokens[ $i ][ 'code' ] ] ) === true ) {
+                    if ( $returnTypeToken === false ) {
                         $returnTypeToken = $i;
                     }
 
-                    $returnType .= $this->tokens[$i]['content'];
+                    $returnType .= $this->tokens[ $i ][ 'content' ];
                 }
             }
 
-            $end     = $this->findNext([T_OPEN_CURLY_BRACKET, T_SEMICOLON], $this->tokens[$stackPtr]['parenthesis_closer']);
-            $hasBody = $this->tokens[$end]['code'] === T_OPEN_CURLY_BRACKET;
+            $end     = $this->findNext( [ T_OPEN_CURLY_BRACKET, T_SEMICOLON ], $this->tokens[ $stackPtr ][ 'parenthesis_closer' ] );
+            $hasBody = $this->tokens[ $end ][ 'code' ] === T_OPEN_CURLY_BRACKET;
         }//end if
 
-        if ($returnType !== '' && $nullableReturnType === true) {
-            $returnType = '?'.$returnType;
+        if ( $returnType !== '' && $nullableReturnType === true ) {
+            $returnType = '?' . $returnType;
         }
 
         return [
@@ -1624,47 +1624,47 @@ 
      *                                                        T_VARIABLE token, or if the position is not
      *                                                        a class member variable.
      */
-    public function getMemberProperties($stackPtr)
+    public function getMemberProperties( $stackPtr )
     {
-        if ($this->tokens[$stackPtr]['code'] !== T_VARIABLE) {
-            throw new TokenizerException('$stackPtr must be of type T_VARIABLE');
+        if ( $this->tokens[ $stackPtr ][ 'code' ] !== T_VARIABLE ) {
+            throw new TokenizerException( '$stackPtr must be of type T_VARIABLE' );
         }
 
-        $conditions = array_keys($this->tokens[$stackPtr]['conditions']);
-        $ptr        = array_pop($conditions);
-        if (isset($this->tokens[$ptr]) === false
-            || ($this->tokens[$ptr]['code'] !== T_CLASS
-            && $this->tokens[$ptr]['code'] !== T_ANON_CLASS
-            && $this->tokens[$ptr]['code'] !== T_TRAIT)
+        $conditions = array_keys( $this->tokens[ $stackPtr ][ 'conditions' ] );
+        $ptr        = array_pop( $conditions );
+        if ( isset( $this->tokens[ $ptr ] ) === false
+            || ( $this->tokens[ $ptr ][ 'code' ] !== T_CLASS
+            && $this->tokens[ $ptr ][ 'code' ] !== T_ANON_CLASS
+            && $this->tokens[ $ptr ][ 'code' ] !== T_TRAIT )
         ) {
-            if (isset($this->tokens[$ptr]) === true
-                && $this->tokens[$ptr]['code'] === T_INTERFACE
+            if ( isset( $this->tokens[ $ptr ] ) === true
+                && $this->tokens[ $ptr ][ 'code' ] === T_INTERFACE
             ) {
                 // T_VARIABLEs in interfaces can actually be method arguments
                 // but they wont be seen as being inside the method because there
                 // are no scope openers and closers for abstract methods. If it is in
                 // parentheses, we can be pretty sure it is a method argument.
-                if (isset($this->tokens[$stackPtr]['nested_parenthesis']) === false
-                    || empty($this->tokens[$stackPtr]['nested_parenthesis']) === true
+                if ( isset( $this->tokens[ $stackPtr ][ 'nested_parenthesis' ] ) === false
+                    || empty( $this->tokens[ $stackPtr ][ 'nested_parenthesis' ] ) === true
                 ) {
                     $error = 'Possible parse error: interfaces may not include member vars';
-                    $this->addWarning($error, $stackPtr, 'Internal.ParseError.InterfaceHasMemberVar');
-                    return [];
+                    $this->addWarning( $error, $stackPtr, 'Internal.ParseError.InterfaceHasMemberVar' );
+                    return [ ];
                 }
             } else {
-                throw new TokenizerException('$stackPtr is not a class member var');
+                throw new TokenizerException( '$stackPtr is not a class member var' );
             }
         }
 
         // Make sure it's not a method parameter.
-        if (empty($this->tokens[$stackPtr]['nested_parenthesis']) === false) {
-            $parenthesis = array_keys($this->tokens[$stackPtr]['nested_parenthesis']);
-            $deepestOpen = array_pop($parenthesis);
-            if ($deepestOpen > $ptr
-                && isset($this->tokens[$deepestOpen]['parenthesis_owner']) === true
-                && $this->tokens[$this->tokens[$deepestOpen]['parenthesis_owner']]['code'] === T_FUNCTION
+        if ( empty( $this->tokens[ $stackPtr ][ 'nested_parenthesis' ] ) === false ) {
+            $parenthesis = array_keys( $this->tokens[ $stackPtr ][ 'nested_parenthesis' ] );
+            $deepestOpen = array_pop( $parenthesis );
+            if ( $deepestOpen > $ptr
+                && isset( $this->tokens[ $deepestOpen ][ 'parenthesis_owner' ] ) === true
+                && $this->tokens[ $this->tokens[ $deepestOpen ][ 'parenthesis_owner' ] ][ 'code' ] === T_FUNCTION
             ) {
-                throw new TokenizerException('$stackPtr is not a class member var');
+                throw new TokenizerException( '$stackPtr is not a class member var' );
             }
         }
 
@@ -1688,15 +1688,15 @@ 
                 T_OPEN_CURLY_BRACKET,
                 T_CLOSE_CURLY_BRACKET,
             ],
-            ($stackPtr - 1)
+            ( $stackPtr - 1 )
         );
 
-        for ($i = ($startOfStatement + 1); $i < $stackPtr; $i++) {
-            if (isset($valid[$this->tokens[$i]['code']]) === false) {
+        for ( $i = ( $startOfStatement + 1 ); $i < $stackPtr; $i++ ) {
+            if ( isset( $valid[ $this->tokens[ $i ][ 'code' ] ] ) === false ) {
                 break;
             }
 
-            switch ($this->tokens[$i]['code']) {
+            switch ( $this->tokens[ $i ][ 'code' ] ) {
             case T_PUBLIC:
                 $scope          = 'public';
                 $scopeSpecified = true;
@@ -1742,10 +1742,10 @@ 
      * @throws \PHP_CodeSniffer\Exceptions\TokenizerException If the specified position is not a
      *                                                        T_CLASS token.
      */
-    public function getClassProperties($stackPtr)
+    public function getClassProperties( $stackPtr )
     {
-        if ($this->tokens[$stackPtr]['code'] !== T_CLASS) {
-            throw new TokenizerException('$stackPtr must be of type T_CLASS');
+        if ( $this->tokens[ $stackPtr ][ 'code' ] !== T_CLASS ) {
+            throw new TokenizerException( '$stackPtr must be of type T_CLASS' );
         }
 
         $valid = [
@@ -1759,12 +1759,12 @@ 
         $isAbstract = false;
         $isFinal    = false;
 
-        for ($i = ($stackPtr - 1); $i > 0; $i--) {
-            if (isset($valid[$this->tokens[$i]['code']]) === false) {
+        for ( $i = ( $stackPtr - 1 ); $i > 0; $i-- ) {
+            if ( isset( $valid[ $this->tokens[ $i ][ 'code' ] ] ) === false ) {
                 break;
             }
 
-            switch ($this->tokens[$i]['code']) {
+            switch ( $this->tokens[ $i ][ 'code' ] ) {
             case T_ABSTRACT:
                 $isAbstract = true;
                 break;
@@ -1793,35 +1793,35 @@ 
      *
      * @return boolean
      */
-    public function isReference($stackPtr)
+    public function isReference( $stackPtr )
     {
-        if ($this->tokens[$stackPtr]['code'] !== T_BITWISE_AND) {
+        if ( $this->tokens[ $stackPtr ][ 'code' ] !== T_BITWISE_AND ) {
             return false;
         }
 
         $tokenBefore = $this->findPrevious(
             Util\Tokens::$emptyTokens,
-            ($stackPtr - 1),
+            ( $stackPtr - 1 ),
             null,
             true
         );
 
-        if ($this->tokens[$tokenBefore]['code'] === T_FUNCTION) {
+        if ( $this->tokens[ $tokenBefore ][ 'code' ] === T_FUNCTION ) {
             // Function returns a reference.
             return true;
         }
 
-        if ($this->tokens[$tokenBefore]['code'] === T_DOUBLE_ARROW) {
+        if ( $this->tokens[ $tokenBefore ][ 'code' ] === T_DOUBLE_ARROW ) {
             // Inside a foreach loop or array assignment, this is a reference.
             return true;
         }
 
-        if ($this->tokens[$tokenBefore]['code'] === T_AS) {
+        if ( $this->tokens[ $tokenBefore ][ 'code' ] === T_AS ) {
             // Inside a foreach loop, this is a reference.
             return true;
         }
 
-        if (isset(Util\Tokens::$assignmentTokens[$this->tokens[$tokenBefore]['code']]) === true) {
+        if ( isset( Util\Tokens::$assignmentTokens[ $this->tokens[ $tokenBefore ][ 'code' ] ] ) === true ) {
             // This is directly after an assignment. It's a reference. Even if
             // it is part of an operation, the other tests will handle it.
             return true;
@@ -1829,37 +1829,37 @@ 
 
         $tokenAfter = $this->findNext(
             Util\Tokens::$emptyTokens,
-            ($stackPtr + 1),
+            ( $stackPtr + 1 ),
             null,
             true
         );
 
-        if ($this->tokens[$tokenAfter]['code'] === T_NEW) {
+        if ( $this->tokens[ $tokenAfter ][ 'code' ] === T_NEW ) {
             return true;
         }
 
-        if (isset($this->tokens[$stackPtr]['nested_parenthesis']) === true) {
-            $brackets    = $this->tokens[$stackPtr]['nested_parenthesis'];
-            $lastBracket = array_pop($brackets);
-            if (isset($this->tokens[$lastBracket]['parenthesis_owner']) === true) {
-                $owner = $this->tokens[$this->tokens[$lastBracket]['parenthesis_owner']];
-                if ($owner['code'] === T_FUNCTION
-                    || $owner['code'] === T_CLOSURE
+        if ( isset( $this->tokens[ $stackPtr ][ 'nested_parenthesis' ] ) === true ) {
+            $brackets    = $this->tokens[ $stackPtr ][ 'nested_parenthesis' ];
+            $lastBracket = array_pop( $brackets );
+            if ( isset( $this->tokens[ $lastBracket ][ 'parenthesis_owner' ] ) === true ) {
+                $owner = $this->tokens[ $this->tokens[ $lastBracket ][ 'parenthesis_owner' ] ];
+                if ( $owner[ 'code' ] === T_FUNCTION
+                    || $owner[ 'code' ] === T_CLOSURE
                 ) {
-                    $params = $this->getMethodParameters($this->tokens[$lastBracket]['parenthesis_owner']);
-                    foreach ($params as $param) {
+                    $params = $this->getMethodParameters( $this->tokens[ $lastBracket ][ 'parenthesis_owner' ] );
+                    foreach ( $params as $param ) {
                         $varToken = $tokenAfter;
-                        if ($param['variable_length'] === true) {
+                        if ( $param[ 'variable_length' ] === true ) {
                             $varToken = $this->findNext(
-                                (Util\Tokens::$emptyTokens + [T_ELLIPSIS]),
-                                ($stackPtr + 1),
+                                ( Util\Tokens::$emptyTokens + [ T_ELLIPSIS ] ),
+                                ( $stackPtr + 1 ),
                                 null,
                                 true
                             );
                         }
 
-                        if ($param['token'] === $varToken
-                            && $param['pass_by_reference'] === true
+                        if ( $param[ 'token' ] === $varToken
+                            && $param[ 'pass_by_reference' ] === true
                         ) {
                             // Function parameter declared to be passed by reference.
                             return true;
@@ -1868,14 +1868,14 @@ 
                 }//end if
             } else {
                 $prev = false;
-                for ($t = ($this->tokens[$lastBracket]['parenthesis_opener'] - 1); $t >= 0; $t--) {
-                    if ($this->tokens[$t]['code'] !== T_WHITESPACE) {
+                for ( $t = ( $this->tokens[ $lastBracket ][ 'parenthesis_opener' ] - 1 ); $t >= 0; $t-- ) {
+                    if ( $this->tokens[ $t ][ 'code' ] !== T_WHITESPACE ) {
                         $prev = $t;
                         break;
                     }
                 }
 
-                if ($prev !== false && $this->tokens[$prev]['code'] === T_USE) {
+                if ( $prev !== false && $this->tokens[ $prev ][ 'code' ] === T_USE ) {
                     // Closure use by reference.
                     return true;
                 }
@@ -1883,29 +1883,29 @@ 
         }//end if
 
         // Pass by reference in function calls and assign by reference in arrays.
-        if ($this->tokens[$tokenBefore]['code'] === T_OPEN_PARENTHESIS
-            || $this->tokens[$tokenBefore]['code'] === T_COMMA
-            || $this->tokens[$tokenBefore]['code'] === T_OPEN_SHORT_ARRAY
+        if ( $this->tokens[ $tokenBefore ][ 'code' ] === T_OPEN_PARENTHESIS
+            || $this->tokens[ $tokenBefore ][ 'code' ] === T_COMMA
+            || $this->tokens[ $tokenBefore ][ 'code' ] === T_OPEN_SHORT_ARRAY
         ) {
-            if ($this->tokens[$tokenAfter]['code'] === T_VARIABLE) {
+            if ( $this->tokens[ $tokenAfter ][ 'code' ] === T_VARIABLE ) {
                 return true;
             } else {
                 $skip   = Util\Tokens::$emptyTokens;
-                $skip[] = T_NS_SEPARATOR;
-                $skip[] = T_SELF;
-                $skip[] = T_PARENT;
-                $skip[] = T_STATIC;
-                $skip[] = T_STRING;
-                $skip[] = T_NAMESPACE;
-                $skip[] = T_DOUBLE_COLON;
+                $skip[ ] = T_NS_SEPARATOR;
+                $skip[ ] = T_SELF;
+                $skip[ ] = T_PARENT;
+                $skip[ ] = T_STATIC;
+                $skip[ ] = T_STRING;
+                $skip[ ] = T_NAMESPACE;
+                $skip[ ] = T_DOUBLE_COLON;
 
                 $nextSignificantAfter = $this->findNext(
                     $skip,
-                    ($stackPtr + 1),
+                    ( $stackPtr + 1 ),
                     null,
                     true
                 );
-                if ($this->tokens[$nextSignificantAfter]['code'] === T_VARIABLE) {
+                if ( $this->tokens[ $nextSignificantAfter ][ 'code' ] === T_VARIABLE ) {
                     return true;
                 }
             }//end if
@@ -1927,29 +1927,29 @@ 
      *
      * @return string The token contents.
      */
-    public function getTokensAsString($start, $length, $origContent=false)
+    public function getTokensAsString( $start, $length, $origContent = false )
     {
-        if (is_int($start) === false || isset($this->tokens[$start]) === false) {
-            throw new RuntimeException('The $start position for getTokensAsString() must exist in the token stack');
+        if ( is_int( $start ) === false || isset( $this->tokens[ $start ] ) === false ) {
+            throw new RuntimeException( 'The $start position for getTokensAsString() must exist in the token stack' );
         }
 
-        if (is_int($length) === false || $length <= 0) {
+        if ( is_int( $length ) === false || $length <= 0 ) {
             return '';
         }
 
         $str = '';
-        $end = ($start + $length);
-        if ($end > $this->numTokens) {
+        $end = ( $start + $length );
+        if ( $end > $this->numTokens ) {
             $end = $this->numTokens;
         }
 
-        for ($i = $start; $i < $end; $i++) {
+        for ( $i = $start; $i < $end; $i++ ) {
             // If tabs are being converted to spaces by the tokeniser, the
             // original content should be used instead of the converted content.
-            if ($origContent === true && isset($this->tokens[$i]['orig_content']) === true) {
-                $str .= $this->tokens[$i]['orig_content'];
+            if ( $origContent === true && isset( $this->tokens[ $i ][ 'orig_content' ] ) === true ) {
+                $str .= $this->tokens[ $i ][ 'orig_content' ];
             } else {
-                $str .= $this->tokens[$i]['content'];
+                $str .= $this->tokens[ $i ][ 'content' ];
             }
         }
 
@@ -1987,48 +1987,48 @@ 
     public function findPrevious(
         $types,
         $start,
-        $end=null,
-        $exclude=false,
-        $value=null,
-        $local=false
+        $end = null,
+        $exclude = false,
+        $value = null,
+        $local = false
     ) {
-        $types = (array) $types;
+        $types = (array)$types;
 
-        if ($end === null) {
+        if ( $end === null ) {
             $end = 0;
         }
 
-        for ($i = $start; $i >= $end; $i--) {
-            $found = (bool) $exclude;
-            foreach ($types as $type) {
-                if ($this->tokens[$i]['code'] === $type) {
-                    $found = !$exclude;
+        for ( $i = $start; $i >= $end; $i-- ) {
+            $found = (bool)$exclude;
+            foreach ( $types as $type ) {
+                if ( $this->tokens[ $i ][ 'code' ] === $type ) {
+                    $found = ! $exclude;
                     break;
                 }
             }
 
-            if ($found === true) {
-                if ($value === null) {
+            if ( $found === true ) {
+                if ( $value === null ) {
                     return $i;
-                } else if ($this->tokens[$i]['content'] === $value) {
+                } else if ( $this->tokens[ $i ][ 'content' ] === $value ) {
                     return $i;
                 }
             }
 
-            if ($local === true) {
-                if (isset($this->tokens[$i]['scope_opener']) === true
-                    && $i === $this->tokens[$i]['scope_closer']
+            if ( $local === true ) {
+                if ( isset( $this->tokens[ $i ][ 'scope_opener' ] ) === true
+                    && $i === $this->tokens[ $i ][ 'scope_closer' ]
                 ) {
-                    $i = $this->tokens[$i]['scope_opener'];
-                } else if (isset($this->tokens[$i]['bracket_opener']) === true
-                    && $i === $this->tokens[$i]['bracket_closer']
+                    $i = $this->tokens[ $i ][ 'scope_opener' ];
+                } else if ( isset( $this->tokens[ $i ][ 'bracket_opener' ] ) === true
+                    && $i === $this->tokens[ $i ][ 'bracket_closer' ]
                 ) {
-                    $i = $this->tokens[$i]['bracket_opener'];
-                } else if (isset($this->tokens[$i]['parenthesis_opener']) === true
-                    && $i === $this->tokens[$i]['parenthesis_closer']
+                    $i = $this->tokens[ $i ][ 'bracket_opener' ];
+                } else if ( isset( $this->tokens[ $i ][ 'parenthesis_opener' ] ) === true
+                    && $i === $this->tokens[ $i ][ 'parenthesis_closer' ]
                 ) {
-                    $i = $this->tokens[$i]['parenthesis_opener'];
-                } else if ($this->tokens[$i]['code'] === T_SEMICOLON) {
+                    $i = $this->tokens[ $i ][ 'parenthesis_opener' ];
+                } else if ( $this->tokens[ $i ][ 'code' ] === T_SEMICOLON ) {
                     break;
                 }
             }
@@ -2068,35 +2068,35 @@ 
     public function findNext(
         $types,
         $start,
-        $end=null,
-        $exclude=false,
-        $value=null,
-        $local=false
+        $end = null,
+        $exclude = false,
+        $value = null,
+        $local = false
     ) {
-        $types = (array) $types;
+        $types = (array)$types;
 
-        if ($end === null || $end > $this->numTokens) {
+        if ( $end === null || $end > $this->numTokens ) {
             $end = $this->numTokens;
         }
 
-        for ($i = $start; $i < $end; $i++) {
-            $found = (bool) $exclude;
-            foreach ($types as $type) {
-                if ($this->tokens[$i]['code'] === $type) {
-                    $found = !$exclude;
+        for ( $i = $start; $i < $end; $i++ ) {
+            $found = (bool)$exclude;
+            foreach ( $types as $type ) {
+                if ( $this->tokens[ $i ][ 'code' ] === $type ) {
+                    $found = ! $exclude;
                     break;
                 }
             }
 
-            if ($found === true) {
-                if ($value === null) {
+            if ( $found === true ) {
+                if ( $value === null ) {
                     return $i;
-                } else if ($this->tokens[$i]['content'] === $value) {
+                } else if ( $this->tokens[ $i ][ 'content' ] === $value ) {
                     return $i;
                 }
             }
 
-            if ($local === true && $this->tokens[$i]['code'] === T_SEMICOLON) {
+            if ( $local === true && $this->tokens[ $i ][ 'code' ] === T_SEMICOLON ) {
                 break;
             }
         }//end for
@@ -2114,52 +2114,52 @@ 
      *
      * @return int
      */
-    public function findStartOfStatement($start, $ignore=null)
+    public function findStartOfStatement( $start, $ignore = null )
     {
         $endTokens = Util\Tokens::$blockOpeners;
 
-        $endTokens[T_COLON]            = true;
-        $endTokens[T_COMMA]            = true;
-        $endTokens[T_DOUBLE_ARROW]     = true;
-        $endTokens[T_SEMICOLON]        = true;
-        $endTokens[T_OPEN_TAG]         = true;
-        $endTokens[T_CLOSE_TAG]        = true;
-        $endTokens[T_OPEN_SHORT_ARRAY] = true;
-
-        if ($ignore !== null) {
-            $ignore = (array) $ignore;
-            foreach ($ignore as $code) {
-                unset($endTokens[$code]);
+        $endTokens[ T_COLON ]            = true;
+        $endTokens[ T_COMMA ]            = true;
+        $endTokens[ T_DOUBLE_ARROW ]     = true;
+        $endTokens[ T_SEMICOLON ]        = true;
+        $endTokens[ T_OPEN_TAG ]         = true;
+        $endTokens[ T_CLOSE_TAG ]        = true;
+        $endTokens[ T_OPEN_SHORT_ARRAY ] = true;
+
+        if ( $ignore !== null ) {
+            $ignore = (array)$ignore;
+            foreach ( $ignore as $code ) {
+                unset( $endTokens[ $code ] );
             }
         }
 
         $lastNotEmpty = $start;
 
-        for ($i = $start; $i >= 0; $i--) {
-            if (isset($endTokens[$this->tokens[$i]['code']]) === true) {
+        for ( $i = $start; $i >= 0; $i-- ) {
+            if ( isset( $endTokens[ $this->tokens[ $i ][ 'code' ] ] ) === true ) {
                 // Found the end of the previous statement.
                 return $lastNotEmpty;
             }
 
-            if (isset($this->tokens[$i]['scope_opener']) === true
-                && $i === $this->tokens[$i]['scope_closer']
+            if ( isset( $this->tokens[ $i ][ 'scope_opener' ] ) === true
+                && $i === $this->tokens[ $i ][ 'scope_closer' ]
             ) {
                 // Found the end of the previous scope block.
                 return $lastNotEmpty;
             }
 
             // Skip nested statements.
-            if (isset($this->tokens[$i]['bracket_opener']) === true
-                && $i === $this->tokens[$i]['bracket_closer']
+            if ( isset( $this->tokens[ $i ][ 'bracket_opener' ] ) === true
+                && $i === $this->tokens[ $i ][ 'bracket_closer' ]
             ) {
-                $i = $this->tokens[$i]['bracket_opener'];
-            } else if (isset($this->tokens[$i]['parenthesis_opener']) === true
-                && $i === $this->tokens[$i]['parenthesis_closer']
+                $i = $this->tokens[ $i ][ 'bracket_opener' ];
+            } else if ( isset( $this->tokens[ $i ][ 'parenthesis_opener' ] ) === true
+                && $i === $this->tokens[ $i ][ 'parenthesis_closer' ]
             ) {
-                $i = $this->tokens[$i]['parenthesis_opener'];
+                $i = $this->tokens[ $i ][ 'parenthesis_opener' ];
             }
 
-            if (isset(Util\Tokens::$emptyTokens[$this->tokens[$i]['code']]) === false) {
+            if ( isset( Util\Tokens::$emptyTokens[ $this->tokens[ $i ][ 'code' ] ] ) === false ) {
                 $lastNotEmpty = $i;
             }
         }//end for
@@ -2177,7 +2177,7 @@ 
      *
      * @return int
      */
-    public function findEndOfStatement($start, $ignore=null)
+    public function findEndOfStatement( $start, $ignore = null )
     {
         $endTokens = [
             T_COLON                => true,
@@ -2192,24 +2192,24 @@ 
             T_CLOSE_TAG            => true,
         ];
 
-        if ($ignore !== null) {
-            $ignore = (array) $ignore;
-            foreach ($ignore as $code) {
-                unset($endTokens[$code]);
+        if ( $ignore !== null ) {
+            $ignore = (array)$ignore;
+            foreach ( $ignore as $code ) {
+                unset( $endTokens[ $code ] );
             }
         }
 
         $lastNotEmpty = $start;
 
-        for ($i = $start; $i < $this->numTokens; $i++) {
-            if ($i !== $start && isset($endTokens[$this->tokens[$i]['code']]) === true) {
+        for ( $i = $start; $i < $this->numTokens; $i++ ) {
+            if ( $i !== $start && isset( $endTokens[ $this->tokens[ $i ][ 'code' ] ] ) === true ) {
                 // Found the end of the statement.
-                if ($this->tokens[$i]['code'] === T_CLOSE_PARENTHESIS
-                    || $this->tokens[$i]['code'] === T_CLOSE_SQUARE_BRACKET
-                    || $this->tokens[$i]['code'] === T_CLOSE_CURLY_BRACKET
-                    || $this->tokens[$i]['code'] === T_CLOSE_SHORT_ARRAY
-                    || $this->tokens[$i]['code'] === T_OPEN_TAG
-                    || $this->tokens[$i]['code'] === T_CLOSE_TAG
+                if ( $this->tokens[ $i ][ 'code' ] === T_CLOSE_PARENTHESIS
+                    || $this->tokens[ $i ][ 'code' ] === T_CLOSE_SQUARE_BRACKET
+                    || $this->tokens[ $i ][ 'code' ] === T_CLOSE_CURLY_BRACKET
+                    || $this->tokens[ $i ][ 'code' ] === T_CLOSE_SHORT_ARRAY
+                    || $this->tokens[ $i ][ 'code' ] === T_OPEN_TAG
+                    || $this->tokens[ $i ][ 'code' ] === T_CLOSE_TAG
                 ) {
                     return $lastNotEmpty;
                 }
@@ -2218,31 +2218,31 @@ 
             }
 
             // Skip nested statements.
-            if (isset($this->tokens[$i]['scope_closer']) === true
-                && ($i === $this->tokens[$i]['scope_opener']
-                || $i === $this->tokens[$i]['scope_condition'])
+            if ( isset( $this->tokens[ $i ][ 'scope_closer' ] ) === true
+                && ( $i === $this->tokens[ $i ][ 'scope_opener' ]
+                || $i === $this->tokens[ $i ][ 'scope_condition' ] )
             ) {
-                if ($i === $start && isset(Util\Tokens::$scopeOpeners[$this->tokens[$i]['code']]) === true) {
-                    return $this->tokens[$i]['scope_closer'];
+                if ( $i === $start && isset( Util\Tokens::$scopeOpeners[ $this->tokens[ $i ][ 'code' ] ] ) === true ) {
+                    return $this->tokens[ $i ][ 'scope_closer' ];
                 }
 
-                $i = $this->tokens[$i]['scope_closer'];
-            } else if (isset($this->tokens[$i]['bracket_closer']) === true
-                && $i === $this->tokens[$i]['bracket_opener']
+                $i = $this->tokens[ $i ][ 'scope_closer' ];
+            } else if ( isset( $this->tokens[ $i ][ 'bracket_closer' ] ) === true
+                && $i === $this->tokens[ $i ][ 'bracket_opener' ]
             ) {
-                $i = $this->tokens[$i]['bracket_closer'];
-            } else if (isset($this->tokens[$i]['parenthesis_closer']) === true
-                && $i === $this->tokens[$i]['parenthesis_opener']
+                $i = $this->tokens[ $i ][ 'bracket_closer' ];
+            } else if ( isset( $this->tokens[ $i ][ 'parenthesis_closer' ] ) === true
+                && $i === $this->tokens[ $i ][ 'parenthesis_opener' ]
             ) {
-                $i = $this->tokens[$i]['parenthesis_closer'];
+                $i = $this->tokens[ $i ][ 'parenthesis_closer' ];
             }
 
-            if (isset(Util\Tokens::$emptyTokens[$this->tokens[$i]['code']]) === false) {
+            if ( isset( Util\Tokens::$emptyTokens[ $this->tokens[ $i ][ 'code' ] ] ) === false ) {
                 $lastNotEmpty = $i;
             }
         }//end for
 
-        return ($this->numTokens - 1);
+        return ( $this->numTokens - 1 );
 
     }//end findEndOfStatement()
 
@@ -2264,38 +2264,38 @@ 
      *
      * @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 = [$types];
+        if ( is_array( $types ) === false ) {
+            $types = [ $types ];
         }
 
         $foundToken = false;
 
-        for ($i = $start; $i >= 0; $i--) {
-            if ($this->tokens[$i]['line'] < $this->tokens[$start]['line']) {
+        for ( $i = $start; $i >= 0; $i-- ) {
+            if ( $this->tokens[ $i ][ 'line' ] < $this->tokens[ $start ][ 'line' ] ) {
                 break;
             }
 
             $found = $exclude;
-            foreach ($types as $type) {
-                if ($exclude === false) {
-                    if ($this->tokens[$i]['code'] === $type) {
+            foreach ( $types as $type ) {
+                if ( $exclude === false ) {
+                    if ( $this->tokens[ $i ][ 'code' ] === $type ) {
                         $found = true;
                         break;
                     }
                 } else {
-                    if ($this->tokens[$i]['code'] === $type) {
+                    if ( $this->tokens[ $i ][ 'code' ] === $type ) {
                         $found = false;
                         break;
                     }
                 }
             }
 
-            if ($found === true) {
-                if ($value === null) {
+            if ( $found === true ) {
+                if ( $value === null ) {
                     $foundToken = $i;
-                } else if ($this->tokens[$i]['content'] === $value) {
+                } else if ( $this->tokens[ $i ][ 'content' ] === $value ) {
                     $foundToken = $i;
                 }
             }
@@ -2314,23 +2314,23 @@ 
      *
      * @return boolean
      */
-    public function hasCondition($stackPtr, $types)
+    public function hasCondition( $stackPtr, $types )
     {
         // Check for the existence of the token.
-        if (isset($this->tokens[$stackPtr]) === false) {
+        if ( isset( $this->tokens[ $stackPtr ] ) === false ) {
             return false;
         }
 
         // Make sure the token has conditions.
-        if (isset($this->tokens[$stackPtr]['conditions']) === false) {
+        if ( isset( $this->tokens[ $stackPtr ][ 'conditions' ] ) === false ) {
             return false;
         }
 
-        $types      = (array) $types;
-        $conditions = $this->tokens[$stackPtr]['conditions'];
+        $types      = (array)$types;
+        $conditions = $this->tokens[ $stackPtr ][ 'conditions' ];
 
-        foreach ($types as $type) {
-            if (in_array($type, $conditions, true) === true) {
+        foreach ( $types as $type ) {
+            if ( in_array( $type, $conditions, true ) === true ) {
                 // We found a token with the required type.
                 return true;
             }
@@ -2351,21 +2351,21 @@ 
      *
      * @return int
      */
-    public function getCondition($stackPtr, $type)
+    public function getCondition( $stackPtr, $type )
     {
         // Check for the existence of the token.
-        if (isset($this->tokens[$stackPtr]) === false) {
+        if ( isset( $this->tokens[ $stackPtr ] ) === false ) {
             return false;
         }
 
         // Make sure the token has conditions.
-        if (isset($this->tokens[$stackPtr]['conditions']) === false) {
+        if ( isset( $this->tokens[ $stackPtr ][ 'conditions' ] ) === false ) {
             return false;
         }
 
-        $conditions = $this->tokens[$stackPtr]['conditions'];
-        foreach ($conditions as $token => $condition) {
-            if ($condition === $type) {
+        $conditions = $this->tokens[ $stackPtr ][ 'conditions' ];
+        foreach ( $conditions as $token => $condition ) {
+            if ( $condition === $type ) {
                 return $token;
             }
         }
@@ -2385,27 +2385,27 @@ 
      *
      * @return string|false
      */
-    public function findExtendedClassName($stackPtr)
+    public function findExtendedClassName( $stackPtr )
     {
         // Check for the existence of the token.
-        if (isset($this->tokens[$stackPtr]) === false) {
+        if ( isset( $this->tokens[ $stackPtr ] ) === false ) {
             return false;
         }
 
-        if ($this->tokens[$stackPtr]['code'] !== T_CLASS
-            && $this->tokens[$stackPtr]['code'] !== T_ANON_CLASS
-            && $this->tokens[$stackPtr]['code'] !== T_INTERFACE
+        if ( $this->tokens[ $stackPtr ][ 'code' ] !== T_CLASS
+            && $this->tokens[ $stackPtr ][ 'code' ] !== T_ANON_CLASS
+            && $this->tokens[ $stackPtr ][ 'code' ] !== T_INTERFACE
         ) {
             return false;
         }
 
-        if (isset($this->tokens[$stackPtr]['scope_opener']) === false) {
+        if ( isset( $this->tokens[ $stackPtr ][ 'scope_opener' ] ) === false ) {
             return false;
         }
 
-        $classOpenerIndex = $this->tokens[$stackPtr]['scope_opener'];
-        $extendsIndex     = $this->findNext(T_EXTENDS, $stackPtr, $classOpenerIndex);
-        if (false === $extendsIndex) {
+        $classOpenerIndex = $this->tokens[ $stackPtr ][ 'scope_opener' ];
+        $extendsIndex     = $this->findNext( T_EXTENDS, $stackPtr, $classOpenerIndex );
+        if ( false === $extendsIndex ) {
             return false;
         }
 
@@ -2415,11 +2415,11 @@ 
             T_WHITESPACE,
         ];
 
-        $end  = $this->findNext($find, ($extendsIndex + 1), ($classOpenerIndex + 1), true);
-        $name = $this->getTokensAsString(($extendsIndex + 1), ($end - $extendsIndex - 1));
-        $name = trim($name);
+        $end  = $this->findNext( $find, ( $extendsIndex + 1 ), ( $classOpenerIndex + 1 ), true );
+        $name = $this->getTokensAsString( ( $extendsIndex + 1 ), ( $end - $extendsIndex - 1 ) );
+        $name = trim( $name );
 
-        if ($name === '') {
+        if ( $name === '' ) {
             return false;
         }
 
@@ -2437,26 +2437,26 @@ 
      *
      * @return array|false
      */
-    public function findImplementedInterfaceNames($stackPtr)
+    public function findImplementedInterfaceNames( $stackPtr )
     {
         // Check for the existence of the token.
-        if (isset($this->tokens[$stackPtr]) === false) {
+        if ( isset( $this->tokens[ $stackPtr ] ) === false ) {
             return false;
         }
 
-        if ($this->tokens[$stackPtr]['code'] !== T_CLASS
-            && $this->tokens[$stackPtr]['code'] !== T_ANON_CLASS
+        if ( $this->tokens[ $stackPtr ][ 'code' ] !== T_CLASS
+            && $this->tokens[ $stackPtr ][ 'code' ] !== T_ANON_CLASS
         ) {
             return false;
         }
 
-        if (isset($this->tokens[$stackPtr]['scope_closer']) === false) {
+        if ( isset( $this->tokens[ $stackPtr ][ 'scope_closer' ] ) === false ) {
             return false;
         }
 
-        $classOpenerIndex = $this->tokens[$stackPtr]['scope_opener'];
-        $implementsIndex  = $this->findNext(T_IMPLEMENTS, $stackPtr, $classOpenerIndex);
-        if ($implementsIndex === false) {
+        $classOpenerIndex = $this->tokens[ $stackPtr ][ 'scope_opener' ];
+        $implementsIndex  = $this->findNext( T_IMPLEMENTS, $stackPtr, $classOpenerIndex );
+        if ( $implementsIndex === false ) {
             return false;
         }
 
@@ -2467,15 +2467,15 @@ 
             T_COMMA,
         ];
 
-        $end  = $this->findNext($find, ($implementsIndex + 1), ($classOpenerIndex + 1), true);
-        $name = $this->getTokensAsString(($implementsIndex + 1), ($end - $implementsIndex - 1));
-        $name = trim($name);
+        $end  = $this->findNext( $find, ( $implementsIndex + 1 ), ( $classOpenerIndex + 1 ), true );
+        $name = $this->getTokensAsString( ( $implementsIndex + 1 ), ( $end - $implementsIndex - 1 ) );
+        $name = trim( $name );
 
-        if ($name === '') {
+        if ( $name === '' ) {
             return false;
         } else {
-            $names = explode(',', $name);
-            $names = array_map('trim', $names);
+            $names = explode( ',', $name );
+            $names = array_map( 'trim', $names );
             return $names;
         }
 

Braces +34 added lines, -68 removed lines

@@ -16,8 +16,7 @@ 
 use PHP_CodeSniffer\Exceptions\RuntimeException;
 use PHP_CodeSniffer\Exceptions\TokenizerException;
 
-class File
-{
+class File {
 
     /**
      * The absolute path to the file associated with this object.
@@ -224,8 +223,7 @@ 
      *
      * @return void
      */
-    public function __construct($path, Ruleset $ruleset, Config $config)
-    {
+    public function __construct($path, Ruleset $ruleset, Config $config) {
         $this->path    = $path;
         $this->ruleset = $ruleset;
         $this->config  = $config;
@@ -261,8 +259,7 @@ 
      *
      * @return void
      */
-    public function setContent($content)
-    {
+    public function setContent($content) {
         $this->content = $content;
         $this->tokens  = [];
 
@@ -284,8 +281,7 @@ 
      *
      * @return void
      */
-    public function reloadContent()
-    {
+    public function reloadContent() {
 
     }//end reloadContent()
 
@@ -295,8 +291,7 @@ 
      *
      * @return void
      */
-    public function disableCaching()
-    {
+    public function disableCaching() {
         $this->configCache['cache'] = false;
 
     }//end disableCaching()
@@ -307,8 +302,7 @@ 
      *
      * @return void
      */
-    public function process()
-    {
+    public function process() {
         if ($this->ignored === true) {
             return;
         }
@@ -544,8 +538,7 @@ 
      *
      * @return void
      */
-    public function parse()
-    {
+    public function parse() {
         if (empty($this->tokens) === false) {
             // File has already been parsed.
             return;
@@ -605,8 +598,7 @@ 
      *
      * @return array
      */
-    public function getTokens()
-    {
+    public function getTokens() {
         return $this->tokens;
 
     }//end getTokens()
@@ -617,8 +609,7 @@ 
      *
      * @return void
      */
-    public function cleanUp()
-    {
+    public function cleanUp() {
         $this->listenerTimes = null;
         $this->content       = null;
         $this->tokens        = null;
@@ -824,8 +815,7 @@ 
      *
      * @return boolean
      */
-    protected function addMessage($error, $message, $line, $column, $code, $data, $severity, $fixable)
-    {
+    protected function addMessage($error, $message, $line, $column, $code, $data, $severity, $fixable) {
         // Check if this line is ignoring all message codes.
         if (isset($this->tokenizer->ignoredLines[$line]['.all']) === true) {
             return false;
@@ -1077,8 +1067,7 @@ 
      *
      * @return boolean
      */
-    public function recordMetric($stackPtr, $metric, $value)
-    {
+    public function recordMetric($stackPtr, $metric, $value) {
         if (isset($this->metrics[$metric]) === false) {
             $this->metrics[$metric] = ['values' => [$value => 1]];
             $this->metricTokens[$metric][$stackPtr] = true;
@@ -1101,8 +1090,7 @@ 
      *
      * @return int
      */
-    public function getErrorCount()
-    {
+    public function getErrorCount() {
         return $this->errorCount;
 
     }//end getErrorCount()
@@ -1113,8 +1101,7 @@ 
      *
      * @return int
      */
-    public function getWarningCount()
-    {
+    public function getWarningCount() {
         return $this->warningCount;
 
     }//end getWarningCount()
@@ -1125,8 +1112,7 @@ 
      *
      * @return int
      */
-    public function getFixableCount()
-    {
+    public function getFixableCount() {
         return $this->fixableCount;
 
     }//end getFixableCount()
@@ -1137,8 +1123,7 @@ 
      *
      * @return int
      */
-    public function getFixedCount()
-    {
+    public function getFixedCount() {
         return $this->fixedCount;
 
     }//end getFixedCount()
@@ -1149,8 +1134,7 @@ 
      *
      * @return array
      */
-    public function getIgnoredLines()
-    {
+    public function getIgnoredLines() {
         return $this->tokenizer->ignoredLines;
 
     }//end getIgnoredLines()
@@ -1161,8 +1145,7 @@ 
      *
      * @return array
      */
-    public function getErrors()
-    {
+    public function getErrors() {
         return $this->errors;
 
     }//end getErrors()
@@ -1173,8 +1156,7 @@ 
      *
      * @return array
      */
-    public function getWarnings()
-    {
+    public function getWarnings() {
         return $this->warnings;
 
     }//end getWarnings()
@@ -1185,8 +1167,7 @@ 
      *
      * @return array
      */
-    public function getMetrics()
-    {
+    public function getMetrics() {
         return $this->metrics;
 
     }//end getMetrics()
@@ -1197,8 +1178,7 @@ 
      *
      * @return string
      */
-    public function getFilename()
-    {
+    public function getFilename() {
         return $this->path;
 
     }//end getFilename()
@@ -1216,8 +1196,7 @@ 
      *                                                      T_FUNCTION, T_CLASS, T_ANON_CLASS,
      *                                                      T_CLOSURE, T_TRAIT, or T_INTERFACE.
      */
-    public function getDeclarationName($stackPtr)
-    {
+    public function getDeclarationName($stackPtr) {
         $tokenCode = $this->tokens[$stackPtr]['code'];
 
         if ($tokenCode === T_ANON_CLASS || $tokenCode === T_CLOSURE) {
@@ -1282,8 +1261,7 @@ 
      * @throws \PHP_CodeSniffer\Exceptions\TokenizerException If the specified $stackPtr is not of
      *                                                        type T_FUNCTION or T_CLOSURE.
      */
-    public function getMethodParameters($stackPtr)
-    {
+    public function getMethodParameters($stackPtr) {
         if ($this->tokens[$stackPtr]['code'] !== T_FUNCTION
             && $this->tokens[$stackPtr]['code'] !== T_CLOSURE
         ) {
@@ -1474,8 +1452,7 @@ 
      * @throws \PHP_CodeSniffer\Exceptions\TokenizerException If the specified position is not a
      *                                                        T_FUNCTION token.
      */
-    public function getMethodProperties($stackPtr)
-    {
+    public function getMethodProperties($stackPtr) {
         if ($this->tokens[$stackPtr]['code'] !== T_FUNCTION
             && $this->tokens[$stackPtr]['code'] !== T_CLOSURE
         ) {
@@ -1624,8 +1601,7 @@ 
      *                                                        T_VARIABLE token, or if the position is not
      *                                                        a class member variable.
      */
-    public function getMemberProperties($stackPtr)
-    {
+    public function getMemberProperties($stackPtr) {
         if ($this->tokens[$stackPtr]['code'] !== T_VARIABLE) {
             throw new TokenizerException('$stackPtr must be of type T_VARIABLE');
         }
@@ -1742,8 +1718,7 @@ 
      * @throws \PHP_CodeSniffer\Exceptions\TokenizerException If the specified position is not a
      *                                                        T_CLASS token.
      */
-    public function getClassProperties($stackPtr)
-    {
+    public function getClassProperties($stackPtr) {
         if ($this->tokens[$stackPtr]['code'] !== T_CLASS) {
             throw new TokenizerException('$stackPtr must be of type T_CLASS');
         }
@@ -1793,8 +1768,7 @@ 
      *
      * @return boolean
      */
-    public function isReference($stackPtr)
-    {
+    public function isReference($stackPtr) {
         if ($this->tokens[$stackPtr]['code'] !== T_BITWISE_AND) {
             return false;
         }
@@ -1927,8 +1901,7 @@ 
      *
      * @return string The token contents.
      */
-    public function getTokensAsString($start, $length, $origContent=false)
-    {
+    public function getTokensAsString($start, $length, $origContent=false) {
         if (is_int($start) === false || isset($this->tokens[$start]) === false) {
             throw new RuntimeException('The $start position for getTokensAsString() must exist in the token stack');
         }
@@ -2114,8 +2087,7 @@ 
      *
      * @return int
      */
-    public function findStartOfStatement($start, $ignore=null)
-    {
+    public function findStartOfStatement($start, $ignore=null) {
         $endTokens = Util\Tokens::$blockOpeners;
 
         $endTokens[T_COLON]            = true;
@@ -2177,8 +2149,7 @@ 
      *
      * @return int
      */
-    public function findEndOfStatement($start, $ignore=null)
-    {
+    public function findEndOfStatement($start, $ignore=null) {
         $endTokens = [
             T_COLON                => true,
             T_COMMA                => true,
@@ -2264,8 +2235,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 = [$types];
         }
@@ -2314,8 +2284,7 @@ 
      *
      * @return boolean
      */
-    public function hasCondition($stackPtr, $types)
-    {
+    public function hasCondition($stackPtr, $types) {
         // Check for the existence of the token.
         if (isset($this->tokens[$stackPtr]) === false) {
             return false;
@@ -2351,8 +2320,7 @@ 
      *
      * @return int
      */
-    public function getCondition($stackPtr, $type)
-    {
+    public function getCondition($stackPtr, $type) {
         // Check for the existence of the token.
         if (isset($this->tokens[$stackPtr]) === false) {
             return false;
@@ -2385,8 +2353,7 @@ 
      *
      * @return string|false
      */
-    public function findExtendedClassName($stackPtr)
-    {
+    public function findExtendedClassName($stackPtr) {
         // Check for the existence of the token.
         if (isset($this->tokens[$stackPtr]) === false) {
             return false;
@@ -2437,8 +2404,7 @@ 
      *
      * @return array|false
      */
-    public function findImplementedInterfaceNames($stackPtr)
-    {
+    public function findImplementedInterfaceNames($stackPtr) {
         // Check for the existence of the token.
         if (isset($this->tokens[$stackPtr]) === false) {
             return false;

vendor/squizlabs/php_codesniffer/src/Files/FileList.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +222 added lines, -222 removed lines

@@ -20,228 +20,228 @@
 class FileList implements \Iterator, \Countable
 {
 
-    /**
-     * A list of file paths that are included in the list.
-     *
-     * @var array
-     */
-    private $files = [];
-
-    /**
-     * The number of files in the list.
-     *
-     * @var integer
-     */
-    private $numFiles = 0;
-
-    /**
-     * The config data for the run.
-     *
-     * @var \PHP_CodeSniffer\Config
-     */
-    public $config = null;
-
-    /**
-     * The ruleset used for the run.
-     *
-     * @var \PHP_CodeSniffer\Ruleset
-     */
-    public $ruleset = null;
-
-    /**
-     * An array of patterns to use for skipping files.
-     *
-     * @var array
-     */
-    protected $ignorePatterns = [];
-
-
-    /**
-     * Constructs a file list and loads in an array of file paths to process.
-     *
-     * @param \PHP_CodeSniffer\Config  $config  The config data for the run.
-     * @param \PHP_CodeSniffer\Ruleset $ruleset The ruleset used for the run.
-     *
-     * @return void
-     */
-    public function __construct(Config $config, Ruleset $ruleset)
-    {
-        $this->ruleset = $ruleset;
-        $this->config  = $config;
-
-        $paths = $config->files;
-        foreach ($paths as $path) {
-            $isPharFile = Util\Common::isPharFile($path);
-            if (is_dir($path) === true || $isPharFile === true) {
-                if ($isPharFile === true) {
-                    $path = 'phar://'.$path;
-                }
-
-                $filterClass = $this->getFilterClass();
-
-                $di       = new \RecursiveDirectoryIterator($path, (\RecursiveDirectoryIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS));
-                $filter   = new $filterClass($di, $path, $config, $ruleset);
-                $iterator = new \RecursiveIteratorIterator($filter);
-
-                foreach ($iterator as $file) {
-                    $this->files[$file->getPathname()] = null;
-                    $this->numFiles++;
-                }
-            } else {
-                $this->addFile($path);
-            }//end if
-        }//end foreach
-
-        reset($this->files);
-
-    }//end __construct()
-
-
-    /**
-     * Add a file to the list.
-     *
-     * If a file object has already been created, it can be passed here.
-     * If it is left NULL, it will be created when accessed.
-     *
-     * @param string                      $path The path to the file being added.
-     * @param \PHP_CodeSniffer\Files\File $file The file being added.
-     *
-     * @return void
-     */
-    public function addFile($path, $file=null)
-    {
-        // No filtering is done for STDIN when the filename
-        // has not been specified.
-        if ($path === 'STDIN') {
-            $this->files[$path] = $file;
-            $this->numFiles++;
-            return;
-        }
-
-        $filterClass = $this->getFilterClass();
-
-        $di       = new \RecursiveArrayIterator([$path]);
-        $filter   = new $filterClass($di, $path, $this->config, $this->ruleset);
-        $iterator = new \RecursiveIteratorIterator($filter);
-
-        foreach ($iterator as $path) {
-            $this->files[$path] = $file;
-            $this->numFiles++;
-        }
-
-    }//end addFile()
-
-
-    /**
-     * Get the class name of the filter being used for the run.
-     *
-     * @return string
-     */
-    private function getFilterClass()
-    {
-        $filterType = $this->config->filter;
-
-        if ($filterType === null) {
-            $filterClass = '\PHP_CodeSniffer\Filters\Filter';
-        } else {
-            if (strpos($filterType, '.') !== false) {
-                // This is a path to a custom filter class.
-                $filename = realpath($filterType);
-                if ($filename === false) {
-                    $error = "ERROR: Custom filter \"$filterType\" not found".PHP_EOL;
-                    throw new DeepExitException($error, 3);
-                }
-
-                $filterClass = Autoload::loadFile($filename);
-            } else {
-                $filterClass = '\PHP_CodeSniffer\Filters\\'.$filterType;
-            }
-        }
-
-        return $filterClass;
-
-    }//end getFilterClass()
-
-
-    /**
-     * Rewind the iterator to the first file.
-     *
-     * @return void
-     */
-    public function rewind()
-    {
-        reset($this->files);
-
-    }//end rewind()
-
-
-    /**
-     * Get the file that is currently being processed.
-     *
-     * @return \PHP_CodeSniffer\Files\File
-     */
-    public function current()
-    {
-        $path = key($this->files);
-        if ($this->files[$path] === null) {
-            $this->files[$path] = new LocalFile($path, $this->ruleset, $this->config);
-        }
-
-        return $this->files[$path];
-
-    }//end current()
-
-
-    /**
-     * Return the file path of the current file being processed.
-     *
-     * @return void
-     */
-    public function key()
-    {
-        return key($this->files);
-
-    }//end key()
-
-
-    /**
-     * Move forward to the next file.
-     *
-     * @return void
-     */
-    public function next()
-    {
-        next($this->files);
-
-    }//end next()
-
-
-    /**
-     * Checks if current position is valid.
-     *
-     * @return boolean
-     */
-    public function valid()
-    {
-        if (current($this->files) === false) {
-            return false;
-        }
-
-        return true;
-
-    }//end valid()
-
-
-    /**
-     * Return the number of files in the list.
-     *
-     * @return integer
-     */
-    public function count()
-    {
-        return $this->numFiles;
-
-    }//end count()
+	/**
+	 * A list of file paths that are included in the list.
+	 *
+	 * @var array
+	 */
+	private $files = [];
+
+	/**
+	 * The number of files in the list.
+	 *
+	 * @var integer
+	 */
+	private $numFiles = 0;
+
+	/**
+	 * The config data for the run.
+	 *
+	 * @var \PHP_CodeSniffer\Config
+	 */
+	public $config = null;
+
+	/**
+	 * The ruleset used for the run.
+	 *
+	 * @var \PHP_CodeSniffer\Ruleset
+	 */
+	public $ruleset = null;
+
+	/**
+	 * An array of patterns to use for skipping files.
+	 *
+	 * @var array
+	 */
+	protected $ignorePatterns = [];
+
+
+	/**
+	 * Constructs a file list and loads in an array of file paths to process.
+	 *
+	 * @param \PHP_CodeSniffer\Config  $config  The config data for the run.
+	 * @param \PHP_CodeSniffer\Ruleset $ruleset The ruleset used for the run.
+	 *
+	 * @return void
+	 */
+	public function __construct(Config $config, Ruleset $ruleset)
+	{
+		$this->ruleset = $ruleset;
+		$this->config  = $config;
+
+		$paths = $config->files;
+		foreach ($paths as $path) {
+			$isPharFile = Util\Common::isPharFile($path);
+			if (is_dir($path) === true || $isPharFile === true) {
+				if ($isPharFile === true) {
+					$path = 'phar://'.$path;
+				}
+
+				$filterClass = $this->getFilterClass();
+
+				$di       = new \RecursiveDirectoryIterator($path, (\RecursiveDirectoryIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS));
+				$filter   = new $filterClass($di, $path, $config, $ruleset);
+				$iterator = new \RecursiveIteratorIterator($filter);
+
+				foreach ($iterator as $file) {
+					$this->files[$file->getPathname()] = null;
+					$this->numFiles++;
+				}
+			} else {
+				$this->addFile($path);
+			}//end if
+		}//end foreach
+
+		reset($this->files);
+
+	}//end __construct()
+
+
+	/**
+	 * Add a file to the list.
+	 *
+	 * If a file object has already been created, it can be passed here.
+	 * If it is left NULL, it will be created when accessed.
+	 *
+	 * @param string                      $path The path to the file being added.
+	 * @param \PHP_CodeSniffer\Files\File $file The file being added.
+	 *
+	 * @return void
+	 */
+	public function addFile($path, $file=null)
+	{
+		// No filtering is done for STDIN when the filename
+		// has not been specified.
+		if ($path === 'STDIN') {
+			$this->files[$path] = $file;
+			$this->numFiles++;
+			return;
+		}
+
+		$filterClass = $this->getFilterClass();
+
+		$di       = new \RecursiveArrayIterator([$path]);
+		$filter   = new $filterClass($di, $path, $this->config, $this->ruleset);
+		$iterator = new \RecursiveIteratorIterator($filter);
+
+		foreach ($iterator as $path) {
+			$this->files[$path] = $file;
+			$this->numFiles++;
+		}
+
+	}//end addFile()
+
+
+	/**
+	 * Get the class name of the filter being used for the run.
+	 *
+	 * @return string
+	 */
+	private function getFilterClass()
+	{
+		$filterType = $this->config->filter;
+
+		if ($filterType === null) {
+			$filterClass = '\PHP_CodeSniffer\Filters\Filter';
+		} else {
+			if (strpos($filterType, '.') !== false) {
+				// This is a path to a custom filter class.
+				$filename = realpath($filterType);
+				if ($filename === false) {
+					$error = "ERROR: Custom filter \"$filterType\" not found".PHP_EOL;
+					throw new DeepExitException($error, 3);
+				}
+
+				$filterClass = Autoload::loadFile($filename);
+			} else {
+				$filterClass = '\PHP_CodeSniffer\Filters\\'.$filterType;
+			}
+		}
+
+		return $filterClass;
+
+	}//end getFilterClass()
+
+
+	/**
+	 * Rewind the iterator to the first file.
+	 *
+	 * @return void
+	 */
+	public function rewind()
+	{
+		reset($this->files);
+
+	}//end rewind()
+
+
+	/**
+	 * Get the file that is currently being processed.
+	 *
+	 * @return \PHP_CodeSniffer\Files\File
+	 */
+	public function current()
+	{
+		$path = key($this->files);
+		if ($this->files[$path] === null) {
+			$this->files[$path] = new LocalFile($path, $this->ruleset, $this->config);
+		}
+
+		return $this->files[$path];
+
+	}//end current()
+
+
+	/**
+	 * Return the file path of the current file being processed.
+	 *
+	 * @return void
+	 */
+	public function key()
+	{
+		return key($this->files);
+
+	}//end key()
+
+
+	/**
+	 * Move forward to the next file.
+	 *
+	 * @return void
+	 */
+	public function next()
+	{
+		next($this->files);
+
+	}//end next()
+
+
+	/**
+	 * Checks if current position is valid.
+	 *
+	 * @return boolean
+	 */
+	public function valid()
+	{
+		if (current($this->files) === false) {
+			return false;
+		}
+
+		return true;
+
+	}//end valid()
+
+
+	/**
+	 * Return the number of files in the list.
+	 *
+	 * @return integer
+	 */
+	public function count()
+	{
+		return $this->numFiles;
+
+	}//end count()
 
 
 }//end class

Spacing +39 added lines, -39 removed lines

@@ -25,7 +25,7 @@ 
      *
      * @var array
      */
-    private $files = [];
+    private $files = [ ];
 
     /**
      * The number of files in the list.
@@ -53,7 +53,7 @@ 
      *
      * @var array
      */
-    protected $ignorePatterns = [];
+    protected $ignorePatterns = [ ];
 
 
     /**
@@ -64,35 +64,35 @@ 
      *
      * @return void
      */
-    public function __construct(Config $config, Ruleset $ruleset)
+    public function __construct( Config $config, Ruleset $ruleset )
     {
         $this->ruleset = $ruleset;
         $this->config  = $config;
 
         $paths = $config->files;
-        foreach ($paths as $path) {
-            $isPharFile = Util\Common::isPharFile($path);
-            if (is_dir($path) === true || $isPharFile === true) {
-                if ($isPharFile === true) {
-                    $path = 'phar://'.$path;
+        foreach ( $paths as $path ) {
+            $isPharFile = Util\Common::isPharFile( $path );
+            if ( is_dir( $path ) === true || $isPharFile === true ) {
+                if ( $isPharFile === true ) {
+                    $path = 'phar://' . $path;
                 }
 
                 $filterClass = $this->getFilterClass();
 
-                $di       = new \RecursiveDirectoryIterator($path, (\RecursiveDirectoryIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS));
-                $filter   = new $filterClass($di, $path, $config, $ruleset);
-                $iterator = new \RecursiveIteratorIterator($filter);
+                $di       = new \RecursiveDirectoryIterator( $path, ( \RecursiveDirectoryIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS ) );
+                $filter   = new $filterClass( $di, $path, $config, $ruleset );
+                $iterator = new \RecursiveIteratorIterator( $filter );
 
-                foreach ($iterator as $file) {
-                    $this->files[$file->getPathname()] = null;
+                foreach ( $iterator as $file ) {
+                    $this->files[ $file->getPathname() ] = null;
                     $this->numFiles++;
                 }
             } else {
-                $this->addFile($path);
+                $this->addFile( $path );
             }//end if
         }//end foreach
 
-        reset($this->files);
+        reset( $this->files );
 
     }//end __construct()
 
@@ -108,24 +108,24 @@ 
      *
      * @return void
      */
-    public function addFile($path, $file=null)
+    public function addFile( $path, $file = null )
     {
         // No filtering is done for STDIN when the filename
         // has not been specified.
-        if ($path === 'STDIN') {
-            $this->files[$path] = $file;
+        if ( $path === 'STDIN' ) {
+            $this->files[ $path ] = $file;
             $this->numFiles++;
             return;
         }
 
         $filterClass = $this->getFilterClass();
 
-        $di       = new \RecursiveArrayIterator([$path]);
-        $filter   = new $filterClass($di, $path, $this->config, $this->ruleset);
-        $iterator = new \RecursiveIteratorIterator($filter);
+        $di       = new \RecursiveArrayIterator( [ $path ] );
+        $filter   = new $filterClass( $di, $path, $this->config, $this->ruleset );
+        $iterator = new \RecursiveIteratorIterator( $filter );
 
-        foreach ($iterator as $path) {
-            $this->files[$path] = $file;
+        foreach ( $iterator as $path ) {
+            $this->files[ $path ] = $file;
             $this->numFiles++;
         }
 
@@ -141,20 +141,20 @@ 
     {
         $filterType = $this->config->filter;
 
-        if ($filterType === null) {
+        if ( $filterType === null ) {
             $filterClass = '\PHP_CodeSniffer\Filters\Filter';
         } else {
-            if (strpos($filterType, '.') !== false) {
+            if ( strpos( $filterType, '.' ) !== false ) {
                 // This is a path to a custom filter class.
-                $filename = realpath($filterType);
-                if ($filename === false) {
-                    $error = "ERROR: Custom filter \"$filterType\" not found".PHP_EOL;
-                    throw new DeepExitException($error, 3);
+                $filename = realpath( $filterType );
+                if ( $filename === false ) {
+                    $error = "ERROR: Custom filter \"$filterType\" not found" . PHP_EOL;
+                    throw new DeepExitException( $error, 3 );
                 }
 
-                $filterClass = Autoload::loadFile($filename);
+                $filterClass = Autoload::loadFile( $filename );
             } else {
-                $filterClass = '\PHP_CodeSniffer\Filters\\'.$filterType;
+                $filterClass = '\PHP_CodeSniffer\Filters\\' . $filterType;
             }
         }
 
@@ -170,7 +170,7 @@ 
      */
     public function rewind()
     {
-        reset($this->files);
+        reset( $this->files );
 
     }//end rewind()
 
@@ -182,12 +182,12 @@ 
      */
     public function current()
     {
-        $path = key($this->files);
-        if ($this->files[$path] === null) {
-            $this->files[$path] = new LocalFile($path, $this->ruleset, $this->config);
+        $path = key( $this->files );
+        if ( $this->files[ $path ] === null ) {
+            $this->files[ $path ] = new LocalFile( $path, $this->ruleset, $this->config );
         }
 
-        return $this->files[$path];
+        return $this->files[ $path ];
 
     }//end current()
 
@@ -199,7 +199,7 @@ 
      */
     public function key()
     {
-        return key($this->files);
+        return key( $this->files );
 
     }//end key()
 
@@ -211,7 +211,7 @@ 
      */
     public function next()
     {
-        next($this->files);
+        next( $this->files );
 
     }//end next()
 
@@ -223,7 +223,7 @@ 
      */
     public function valid()
     {
-        if (current($this->files) === false) {
+        if ( current( $this->files ) === false ) {
             return false;
         }
 

Braces +9 added lines, -18 removed lines

@@ -64,8 +64,7 @@ 
      *
      * @return void
      */
-    public function __construct(Config $config, Ruleset $ruleset)
-    {
+    public function __construct(Config $config, Ruleset $ruleset) {
         $this->ruleset = $ruleset;
         $this->config  = $config;
 
@@ -108,8 +107,7 @@ 
      *
      * @return void
      */
-    public function addFile($path, $file=null)
-    {
+    public function addFile($path, $file=null) {
         // No filtering is done for STDIN when the filename
         // has not been specified.
         if ($path === 'STDIN') {
@@ -137,8 +135,7 @@ 
      *
      * @return string
      */
-    private function getFilterClass()
-    {
+    private function getFilterClass() {
         $filterType = $this->config->filter;
 
         if ($filterType === null) {
@@ -168,8 +165,7 @@ 
      *
      * @return void
      */
-    public function rewind()
-    {
+    public function rewind() {
         reset($this->files);
 
     }//end rewind()
@@ -180,8 +176,7 @@ 
      *
      * @return \PHP_CodeSniffer\Files\File
      */
-    public function current()
-    {
+    public function current() {
         $path = key($this->files);
         if ($this->files[$path] === null) {
             $this->files[$path] = new LocalFile($path, $this->ruleset, $this->config);
@@ -197,8 +192,7 @@ 
      *
      * @return void
      */
-    public function key()
-    {
+    public function key() {
         return key($this->files);
 
     }//end key()
@@ -209,8 +203,7 @@ 
      *
      * @return void
      */
-    public function next()
-    {
+    public function next() {
         next($this->files);
 
     }//end next()
@@ -221,8 +214,7 @@ 
      *
      * @return boolean
      */
-    public function valid()
-    {
+    public function valid() {
         if (current($this->files) === false) {
             return false;
         }
@@ -237,8 +229,7 @@ 
      *
      * @return integer
      */
-    public function count()
-    {
+    public function count() {
         return $this->numFiles;
 
     }//end count()

vendor/squizlabs/php_codesniffer/src/Fixer.php

Doc Comments +2 added lines, -2 removed lines

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

Indentation +700 added lines, -700 removed lines

@@ -18,706 +18,706 @@
 class Fixer
 {
 
-    /**
-     * Is the fixer enabled and fixing a file?
-     *
-     * Sniffs should check this value to ensure they are not
-     * doing extra processing to prepare for a fix when fixing is
-     * not required.
-     *
-     * @var boolean
-     */
-    public $enabled = false;
-
-    /**
-     * The number of times we have looped over a file.
-     *
-     * @var integer
-     */
-    public $loops = 0;
-
-    /**
-     * The file being fixed.
-     *
-     * @var \PHP_CodeSniffer\Files\File
-     */
-    private $currentFile = null;
-
-    /**
-     * The list of tokens that make up the file contents.
-     *
-     * This is a simplified list which just contains the token content and nothing
-     * else. This is the array that is updated as fixes are made, not the file's
-     * token array. Imploding this array will give you the file content back.
-     *
-     * @var array<int, string>
-     */
-    private $tokens = [];
-
-    /**
-     * A list of tokens that have already been fixed.
-     *
-     * We don't allow the same token to be fixed more than once each time
-     * through a file as this can easily cause conflicts between sniffs.
-     *
-     * @var int[]
-     */
-    private $fixedTokens = [];
-
-    /**
-     * The last value of each fixed token.
-     *
-     * If a token is being "fixed" back to its last value, the fix is
-     * probably conflicting with another.
-     *
-     * @var array<int, string>
-     */
-    private $oldTokenValues = [];
-
-    /**
-     * A list of tokens that have been fixed during a changeset.
-     *
-     * All changes in changeset must be able to be applied, or else
-     * the entire changeset is rejected.
-     *
-     * @var array
-     */
-    private $changeset = [];
-
-    /**
-     * Is there an open changeset.
-     *
-     * @var boolean
-     */
-    private $inChangeset = false;
-
-    /**
-     * Is the current fixing loop in conflict?
-     *
-     * @var boolean
-     */
-    private $inConflict = false;
-
-    /**
-     * The number of fixes that have been performed.
-     *
-     * @var integer
-     */
-    private $numFixes = 0;
-
-
-    /**
-     * Starts fixing a new file.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being fixed.
-     *
-     * @return void
-     */
-    public function startFile(File $phpcsFile)
-    {
-        $this->currentFile = $phpcsFile;
-        $this->numFixes    = 0;
-        $this->fixedTokens = [];
-
-        $tokens       = $phpcsFile->getTokens();
-        $this->tokens = [];
-        foreach ($tokens as $index => $token) {
-            if (isset($token['orig_content']) === true) {
-                $this->tokens[$index] = $token['orig_content'];
-            } else {
-                $this->tokens[$index] = $token['content'];
-            }
-        }
-
-    }//end startFile()
-
-
-    /**
-     * Attempt to fix the file by processing it until no fixes are made.
-     *
-     * @return boolean
-     */
-    public function fixFile()
-    {
-        $fixable = $this->currentFile->getFixableCount();
-        if ($fixable === 0) {
-            // Nothing to fix.
-            return false;
-        }
-
-        $this->enabled = true;
-
-        $this->loops = 0;
-        while ($this->loops < 50) {
-            ob_start();
-
-            // Only needed once file content has changed.
-            $contents = $this->getContents();
-
-            if (PHP_CODESNIFFER_VERBOSITY > 2) {
-                @ob_end_clean();
-                echo '---START FILE CONTENT---'.PHP_EOL;
-                $lines = explode($this->currentFile->eolChar, $contents);
-                $max   = strlen(count($lines));
-                foreach ($lines as $lineNum => $line) {
-                    $lineNum++;
-                    echo str_pad($lineNum, $max, ' ', STR_PAD_LEFT).'|'.$line.PHP_EOL;
-                }
-
-                echo '--- END FILE CONTENT ---'.PHP_EOL;
-                ob_start();
-            }
-
-            $this->inConflict = false;
-            $this->currentFile->ruleset->populateTokenListeners();
-            $this->currentFile->setContent($contents);
-            $this->currentFile->process();
-            ob_end_clean();
-
-            $this->loops++;
-
-            if (PHP_CODESNIFFER_CBF === true && PHP_CODESNIFFER_VERBOSITY > 0) {
-                echo "\r".str_repeat(' ', 80)."\r";
-                echo "\t=> Fixing file: $this->numFixes/$fixable violations remaining [made $this->loops pass";
-                if ($this->loops > 1) {
-                    echo 'es';
-                }
-
-                echo ']... ';
-            }
-
-            if ($this->numFixes === 0 && $this->inConflict === false) {
-                // Nothing left to do.
-                break;
-            } else if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                echo "\t* fixed $this->numFixes violations, starting loop ".($this->loops + 1).' *'.PHP_EOL;
-            }
-        }//end while
-
-        $this->enabled = false;
-
-        if ($this->numFixes > 0) {
-            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                if (ob_get_level() > 0) {
-                    ob_end_clean();
-                }
-
-                echo "\t*** Reached maximum number of loops with $this->numFixes violations left unfixed ***".PHP_EOL;
-                ob_start();
-            }
-
-            return false;
-        }
-
-        return true;
-
-    }//end fixFile()
-
-
-    /**
-     * Generates a text diff of the original file and the new content.
-     *
-     * @param string  $filePath Optional file path to diff the file against.
-     *                          If not specified, the original version of the
-     *                          file will be used.
-     * @param boolean $colors   Print colored output or not.
-     *
-     * @return string
-     */
-    public function generateDiff($filePath=null, $colors=true)
-    {
-        if ($filePath === null) {
-            $filePath = $this->currentFile->getFilename();
-        }
-
-        $cwd = getcwd().DIRECTORY_SEPARATOR;
-        if (strpos($filePath, $cwd) === 0) {
-            $filename = substr($filePath, strlen($cwd));
-        } else {
-            $filename = $filePath;
-        }
-
-        $contents = $this->getContents();
-
-        $tempName  = tempnam(sys_get_temp_dir(), 'phpcs-fixer');
-        $fixedFile = fopen($tempName, 'w');
-        fwrite($fixedFile, $contents);
-
-        // We must use something like shell_exec() because whitespace at the end
-        // of lines is critical to diff files.
-        $filename = escapeshellarg($filename);
-        $cmd      = "diff -u -L$filename -LPHP_CodeSniffer $filename \"$tempName\"";
-
-        $diff = shell_exec($cmd);
-
-        fclose($fixedFile);
-        if (is_file($tempName) === true) {
-            unlink($tempName);
-        }
-
-        if ($colors === false) {
-            return $diff;
-        }
-
-        $diffLines = explode(PHP_EOL, $diff);
-        if (count($diffLines) === 1) {
-            // Seems to be required for cygwin.
-            $diffLines = explode("\n", $diff);
-        }
-
-        $diff = [];
-        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;
-                }
-            }
-        }
-
-        $diff = implode(PHP_EOL, $diff);
-
-        return $diff;
-
-    }//end generateDiff()
-
-
-    /**
-     * Get a count of fixes that have been performed on the file.
-     *
-     * This value is reset every time a new file is started, or an existing
-     * file is restarted.
-     *
-     * @return int
-     */
-    public function getFixCount()
-    {
-        return $this->numFixes;
-
-    }//end getFixCount()
-
-
-    /**
-     * Get the current content of the file, as a string.
-     *
-     * @return string
-     */
-    public function getContents()
-    {
-        $contents = implode($this->tokens);
-        return $contents;
-
-    }//end getContents()
-
-
-    /**
-     * Get the current fixed content of a token.
-     *
-     * This function takes changesets into account so should be used
-     * instead of directly accessing the token array.
-     *
-     * @param int $stackPtr The position of the token in the token stack.
-     *
-     * @return string
-     */
-    public function getTokenContent($stackPtr)
-    {
-        if ($this->inChangeset === true
-            && isset($this->changeset[$stackPtr]) === true
-        ) {
-            return $this->changeset[$stackPtr];
-        } else {
-            return $this->tokens[$stackPtr];
-        }
-
-    }//end getTokenContent()
-
-
-    /**
-     * Start recording actions for a changeset.
-     *
-     * @return void
-     */
-    public function beginChangeset()
-    {
-        if ($this->inConflict === true) {
-            return false;
-        }
-
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            $bt    = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-            $sniff = $bt[1]['class'];
-            $line  = $bt[0]['line'];
-
-            @ob_end_clean();
-            echo "\t=> Changeset started by $sniff (line $line)".PHP_EOL;
-            ob_start();
-        }
-
-        $this->changeset   = [];
-        $this->inChangeset = true;
-
-    }//end beginChangeset()
-
-
-    /**
-     * Stop recording actions for a changeset, and apply logged changes.
-     *
-     * @return boolean
-     */
-    public function endChangeset()
-    {
-        if ($this->inConflict === true) {
-            return false;
-        }
-
-        $this->inChangeset = false;
-
-        $success = true;
-        $applied = [];
-        foreach ($this->changeset as $stackPtr => $content) {
-            $success = $this->replaceToken($stackPtr, $content);
-            if ($success === false) {
-                break;
-            } else {
-                $applied[] = $stackPtr;
-            }
-        }
-
-        if ($success === false) {
-            // Rolling back all changes.
-            foreach ($applied as $stackPtr) {
-                $this->revertToken($stackPtr);
-            }
-
-            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                @ob_end_clean();
-                echo "\t=> Changeset failed to apply".PHP_EOL;
-                ob_start();
-            }
-        } else if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            $fixes = count($this->changeset);
-            @ob_end_clean();
-            echo "\t=> Changeset ended: $fixes changes applied".PHP_EOL;
-            ob_start();
-        }
-
-        $this->changeset = [];
-
-    }//end endChangeset()
-
-
-    /**
-     * Stop recording actions for a changeset, and discard logged changes.
-     *
-     * @return void
-     */
-    public function rollbackChangeset()
-    {
-        $this->inChangeset = false;
-        $this->inConflict  = false;
-
-        if (empty($this->changeset) === false) {
-            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                $bt = debug_backtrace();
-                if ($bt[1]['class'] === 'PHP_CodeSniffer\Fixer') {
-                    $sniff = $bt[2]['class'];
-                    $line  = $bt[1]['line'];
-                } else {
-                    $sniff = $bt[1]['class'];
-                    $line  = $bt[0]['line'];
-                }
-
-                $numChanges = count($this->changeset);
-
-                @ob_end_clean();
-                echo "\t\tR: $sniff (line $line) rolled back the changeset ($numChanges changes)".PHP_EOL;
-                echo "\t=> Changeset rolled back".PHP_EOL;
-                ob_start();
-            }
-
-            $this->changeset = [];
-        }//end if
-
-    }//end rollbackChangeset()
-
-
-    /**
-     * Replace the entire contents of a token.
-     *
-     * @param int    $stackPtr The position of the token in the token stack.
-     * @param string $content  The new content of the token.
-     *
-     * @return bool If the change was accepted.
-     */
-    public function replaceToken($stackPtr, $content)
-    {
-        if ($this->inConflict === true) {
-            return false;
-        }
-
-        if ($this->inChangeset === false
-            && isset($this->fixedTokens[$stackPtr]) === true
-        ) {
-            $indent = "\t";
-            if (empty($this->changeset) === false) {
-                $indent .= "\t";
-            }
-
-            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                @ob_end_clean();
-                echo "$indent* token $stackPtr has already been modified, skipping *".PHP_EOL;
-                ob_start();
-            }
-
-            return false;
-        }
-
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            $bt = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-            if ($bt[1]['class'] === 'PHP_CodeSniffer\Fixer') {
-                $sniff = $bt[2]['class'];
-                $line  = $bt[1]['line'];
-            } else {
-                $sniff = $bt[1]['class'];
-                $line  = $bt[0]['line'];
-            }
-
-            $tokens     = $this->currentFile->getTokens();
-            $type       = $tokens[$stackPtr]['type'];
-            $oldContent = Common::prepareForOutput($this->tokens[$stackPtr]);
-            $newContent = Common::prepareForOutput($content);
-            if (trim($this->tokens[$stackPtr]) === '' && isset($this->tokens[($stackPtr + 1)]) === true) {
-                // Add some context for whitespace only changes.
-                $append      = Common::prepareForOutput($this->tokens[($stackPtr + 1)]);
-                $oldContent .= $append;
-                $newContent .= $append;
-            }
-        }//end if
-
-        if ($this->inChangeset === true) {
-            $this->changeset[$stackPtr] = $content;
-
-            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                @ob_end_clean();
-                echo "\t\tQ: $sniff (line $line) replaced token $stackPtr ($type) \"$oldContent\" => \"$newContent\"".PHP_EOL;
-                ob_start();
-            }
-
-            return true;
-        }
-
-        if (isset($this->oldTokenValues[$stackPtr]) === false) {
-            $this->oldTokenValues[$stackPtr] = [
-                'curr' => $content,
-                'prev' => $this->tokens[$stackPtr],
-                'loop' => $this->loops,
-            ];
-        } else {
-            if ($this->oldTokenValues[$stackPtr]['prev'] === $content
-                && $this->oldTokenValues[$stackPtr]['loop'] === ($this->loops - 1)
-            ) {
-                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                    $indent = "\t";
-                    if (empty($this->changeset) === false) {
-                        $indent .= "\t";
-                    }
-
-                    $loop = $this->oldTokenValues[$stackPtr]['loop'];
-
-                    @ob_end_clean();
-                    echo "$indent**** $sniff (line $line) has possible conflict with another sniff on loop $loop; caused by the following change ****".PHP_EOL;
-                    echo "$indent**** replaced token $stackPtr ($type) \"$oldContent\" => \"$newContent\" ****".PHP_EOL;
-                }
-
-                if ($this->oldTokenValues[$stackPtr]['loop'] >= ($this->loops - 1)) {
-                    $this->inConflict = true;
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        echo "$indent**** ignoring all changes until next loop ****".PHP_EOL;
-                    }
-                }
-
-                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                    ob_start();
-                }
-
-                return false;
-            }//end if
-
-            $this->oldTokenValues[$stackPtr]['prev'] = $this->oldTokenValues[$stackPtr]['curr'];
-            $this->oldTokenValues[$stackPtr]['curr'] = $content;
-            $this->oldTokenValues[$stackPtr]['loop'] = $this->loops;
-        }//end if
-
-        $this->fixedTokens[$stackPtr] = $this->tokens[$stackPtr];
-        $this->tokens[$stackPtr]      = $content;
-        $this->numFixes++;
-
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            $indent = "\t";
-            if (empty($this->changeset) === false) {
-                $indent .= "\tA: ";
-            }
-
-            if (ob_get_level() > 0) {
-                ob_end_clean();
-            }
-
-            echo "$indent$sniff (line $line) replaced token $stackPtr ($type) \"$oldContent\" => \"$newContent\"".PHP_EOL;
-            ob_start();
-        }
-
-        return true;
-
-    }//end replaceToken()
-
-
-    /**
-     * Reverts the previous fix made to a token.
-     *
-     * @param int $stackPtr The position of the token in the token stack.
-     *
-     * @return bool If a change was reverted.
-     */
-    public function revertToken($stackPtr)
-    {
-        if (isset($this->fixedTokens[$stackPtr]) === false) {
-            return false;
-        }
-
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            $bt = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-            if ($bt[1]['class'] === 'PHP_CodeSniffer\Fixer') {
-                $sniff = $bt[2]['class'];
-                $line  = $bt[1]['line'];
-            } else {
-                $sniff = $bt[1]['class'];
-                $line  = $bt[0]['line'];
-            }
-
-            $tokens     = $this->currentFile->getTokens();
-            $type       = $tokens[$stackPtr]['type'];
-            $oldContent = Common::prepareForOutput($this->tokens[$stackPtr]);
-            $newContent = Common::prepareForOutput($this->fixedTokens[$stackPtr]);
-            if (trim($this->tokens[$stackPtr]) === '' && isset($tokens[($stackPtr + 1)]) === true) {
-                // Add some context for whitespace only changes.
-                $append      = Common::prepareForOutput($this->tokens[($stackPtr + 1)]);
-                $oldContent .= $append;
-                $newContent .= $append;
-            }
-        }//end if
-
-        $this->tokens[$stackPtr] = $this->fixedTokens[$stackPtr];
-        unset($this->fixedTokens[$stackPtr]);
-        $this->numFixes--;
-
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            $indent = "\t";
-            if (empty($this->changeset) === false) {
-                $indent .= "\tR: ";
-            }
-
-            @ob_end_clean();
-            echo "$indent$sniff (line $line) reverted token $stackPtr ($type) \"$oldContent\" => \"$newContent\"".PHP_EOL;
-            ob_start();
-        }
-
-        return true;
-
-    }//end revertToken()
-
-
-    /**
-     * Replace the content of a token with a part of its current content.
-     *
-     * @param int $stackPtr The position of the token in the token stack.
-     * @param int $start    The first character to keep.
-     * @param int $length   The number of characters to keep. If NULL, the content of
-     *                      the token from $start to the end of the content is kept.
-     *
-     * @return bool If the change was accepted.
-     */
-    public function substrToken($stackPtr, $start, $length=null)
-    {
-        $current = $this->getTokenContent($stackPtr);
-
-        if ($length === null) {
-            $newContent = substr($current, $start);
-        } else {
-            $newContent = substr($current, $start, $length);
-        }
-
-        return $this->replaceToken($stackPtr, $newContent);
-
-    }//end substrToken()
-
-
-    /**
-     * Adds a newline to end of a token's content.
-     *
-     * @param int $stackPtr The position of the token in the token stack.
-     *
-     * @return bool If the change was accepted.
-     */
-    public function addNewline($stackPtr)
-    {
-        $current = $this->getTokenContent($stackPtr);
-        return $this->replaceToken($stackPtr, $current.$this->currentFile->eolChar);
-
-    }//end addNewline()
-
-
-    /**
-     * Adds a newline to the start of a token's content.
-     *
-     * @param int $stackPtr The position of the token in the token stack.
-     *
-     * @return bool If the change was accepted.
-     */
-    public function addNewlineBefore($stackPtr)
-    {
-        $current = $this->getTokenContent($stackPtr);
-        return $this->replaceToken($stackPtr, $this->currentFile->eolChar.$current);
-
-    }//end addNewlineBefore()
-
-
-    /**
-     * Adds content to the end of a token's current content.
-     *
-     * @param int    $stackPtr The position of the token in the token stack.
-     * @param string $content  The content to add.
-     *
-     * @return bool If the change was accepted.
-     */
-    public function addContent($stackPtr, $content)
-    {
-        $current = $this->getTokenContent($stackPtr);
-        return $this->replaceToken($stackPtr, $current.$content);
-
-    }//end addContent()
-
-
-    /**
-     * Adds content to the start of a token's current content.
-     *
-     * @param int    $stackPtr The position of the token in the token stack.
-     * @param string $content  The content to add.
-     *
-     * @return bool If the change was accepted.
-     */
-    public function addContentBefore($stackPtr, $content)
-    {
-        $current = $this->getTokenContent($stackPtr);
-        return $this->replaceToken($stackPtr, $content.$current);
-
-    }//end addContentBefore()
+	/**
+	 * Is the fixer enabled and fixing a file?
+	 *
+	 * Sniffs should check this value to ensure they are not
+	 * doing extra processing to prepare for a fix when fixing is
+	 * not required.
+	 *
+	 * @var boolean
+	 */
+	public $enabled = false;
+
+	/**
+	 * The number of times we have looped over a file.
+	 *
+	 * @var integer
+	 */
+	public $loops = 0;
+
+	/**
+	 * The file being fixed.
+	 *
+	 * @var \PHP_CodeSniffer\Files\File
+	 */
+	private $currentFile = null;
+
+	/**
+	 * The list of tokens that make up the file contents.
+	 *
+	 * This is a simplified list which just contains the token content and nothing
+	 * else. This is the array that is updated as fixes are made, not the file's
+	 * token array. Imploding this array will give you the file content back.
+	 *
+	 * @var array<int, string>
+	 */
+	private $tokens = [];
+
+	/**
+	 * A list of tokens that have already been fixed.
+	 *
+	 * We don't allow the same token to be fixed more than once each time
+	 * through a file as this can easily cause conflicts between sniffs.
+	 *
+	 * @var int[]
+	 */
+	private $fixedTokens = [];
+
+	/**
+	 * The last value of each fixed token.
+	 *
+	 * If a token is being "fixed" back to its last value, the fix is
+	 * probably conflicting with another.
+	 *
+	 * @var array<int, string>
+	 */
+	private $oldTokenValues = [];
+
+	/**
+	 * A list of tokens that have been fixed during a changeset.
+	 *
+	 * All changes in changeset must be able to be applied, or else
+	 * the entire changeset is rejected.
+	 *
+	 * @var array
+	 */
+	private $changeset = [];
+
+	/**
+	 * Is there an open changeset.
+	 *
+	 * @var boolean
+	 */
+	private $inChangeset = false;
+
+	/**
+	 * Is the current fixing loop in conflict?
+	 *
+	 * @var boolean
+	 */
+	private $inConflict = false;
+
+	/**
+	 * The number of fixes that have been performed.
+	 *
+	 * @var integer
+	 */
+	private $numFixes = 0;
+
+
+	/**
+	 * Starts fixing a new file.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being fixed.
+	 *
+	 * @return void
+	 */
+	public function startFile(File $phpcsFile)
+	{
+		$this->currentFile = $phpcsFile;
+		$this->numFixes    = 0;
+		$this->fixedTokens = [];
+
+		$tokens       = $phpcsFile->getTokens();
+		$this->tokens = [];
+		foreach ($tokens as $index => $token) {
+			if (isset($token['orig_content']) === true) {
+				$this->tokens[$index] = $token['orig_content'];
+			} else {
+				$this->tokens[$index] = $token['content'];
+			}
+		}
+
+	}//end startFile()
+
+
+	/**
+	 * Attempt to fix the file by processing it until no fixes are made.
+	 *
+	 * @return boolean
+	 */
+	public function fixFile()
+	{
+		$fixable = $this->currentFile->getFixableCount();
+		if ($fixable === 0) {
+			// Nothing to fix.
+			return false;
+		}
+
+		$this->enabled = true;
+
+		$this->loops = 0;
+		while ($this->loops < 50) {
+			ob_start();
+
+			// Only needed once file content has changed.
+			$contents = $this->getContents();
+
+			if (PHP_CODESNIFFER_VERBOSITY > 2) {
+				@ob_end_clean();
+				echo '---START FILE CONTENT---'.PHP_EOL;
+				$lines = explode($this->currentFile->eolChar, $contents);
+				$max   = strlen(count($lines));
+				foreach ($lines as $lineNum => $line) {
+					$lineNum++;
+					echo str_pad($lineNum, $max, ' ', STR_PAD_LEFT).'|'.$line.PHP_EOL;
+				}
+
+				echo '--- END FILE CONTENT ---'.PHP_EOL;
+				ob_start();
+			}
+
+			$this->inConflict = false;
+			$this->currentFile->ruleset->populateTokenListeners();
+			$this->currentFile->setContent($contents);
+			$this->currentFile->process();
+			ob_end_clean();
+
+			$this->loops++;
+
+			if (PHP_CODESNIFFER_CBF === true && PHP_CODESNIFFER_VERBOSITY > 0) {
+				echo "\r".str_repeat(' ', 80)."\r";
+				echo "\t=> Fixing file: $this->numFixes/$fixable violations remaining [made $this->loops pass";
+				if ($this->loops > 1) {
+					echo 'es';
+				}
+
+				echo ']... ';
+			}
+
+			if ($this->numFixes === 0 && $this->inConflict === false) {
+				// Nothing left to do.
+				break;
+			} else if (PHP_CODESNIFFER_VERBOSITY > 1) {
+				echo "\t* fixed $this->numFixes violations, starting loop ".($this->loops + 1).' *'.PHP_EOL;
+			}
+		}//end while
+
+		$this->enabled = false;
+
+		if ($this->numFixes > 0) {
+			if (PHP_CODESNIFFER_VERBOSITY > 1) {
+				if (ob_get_level() > 0) {
+					ob_end_clean();
+				}
+
+				echo "\t*** Reached maximum number of loops with $this->numFixes violations left unfixed ***".PHP_EOL;
+				ob_start();
+			}
+
+			return false;
+		}
+
+		return true;
+
+	}//end fixFile()
+
+
+	/**
+	 * Generates a text diff of the original file and the new content.
+	 *
+	 * @param string  $filePath Optional file path to diff the file against.
+	 *                          If not specified, the original version of the
+	 *                          file will be used.
+	 * @param boolean $colors   Print colored output or not.
+	 *
+	 * @return string
+	 */
+	public function generateDiff($filePath=null, $colors=true)
+	{
+		if ($filePath === null) {
+			$filePath = $this->currentFile->getFilename();
+		}
+
+		$cwd = getcwd().DIRECTORY_SEPARATOR;
+		if (strpos($filePath, $cwd) === 0) {
+			$filename = substr($filePath, strlen($cwd));
+		} else {
+			$filename = $filePath;
+		}
+
+		$contents = $this->getContents();
+
+		$tempName  = tempnam(sys_get_temp_dir(), 'phpcs-fixer');
+		$fixedFile = fopen($tempName, 'w');
+		fwrite($fixedFile, $contents);
+
+		// We must use something like shell_exec() because whitespace at the end
+		// of lines is critical to diff files.
+		$filename = escapeshellarg($filename);
+		$cmd      = "diff -u -L$filename -LPHP_CodeSniffer $filename \"$tempName\"";
+
+		$diff = shell_exec($cmd);
+
+		fclose($fixedFile);
+		if (is_file($tempName) === true) {
+			unlink($tempName);
+		}
+
+		if ($colors === false) {
+			return $diff;
+		}
+
+		$diffLines = explode(PHP_EOL, $diff);
+		if (count($diffLines) === 1) {
+			// Seems to be required for cygwin.
+			$diffLines = explode("\n", $diff);
+		}
+
+		$diff = [];
+		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;
+				}
+			}
+		}
+
+		$diff = implode(PHP_EOL, $diff);
+
+		return $diff;
+
+	}//end generateDiff()
+
+
+	/**
+	 * Get a count of fixes that have been performed on the file.
+	 *
+	 * This value is reset every time a new file is started, or an existing
+	 * file is restarted.
+	 *
+	 * @return int
+	 */
+	public function getFixCount()
+	{
+		return $this->numFixes;
+
+	}//end getFixCount()
+
+
+	/**
+	 * Get the current content of the file, as a string.
+	 *
+	 * @return string
+	 */
+	public function getContents()
+	{
+		$contents = implode($this->tokens);
+		return $contents;
+
+	}//end getContents()
+
+
+	/**
+	 * Get the current fixed content of a token.
+	 *
+	 * This function takes changesets into account so should be used
+	 * instead of directly accessing the token array.
+	 *
+	 * @param int $stackPtr The position of the token in the token stack.
+	 *
+	 * @return string
+	 */
+	public function getTokenContent($stackPtr)
+	{
+		if ($this->inChangeset === true
+			&& isset($this->changeset[$stackPtr]) === true
+		) {
+			return $this->changeset[$stackPtr];
+		} else {
+			return $this->tokens[$stackPtr];
+		}
+
+	}//end getTokenContent()
+
+
+	/**
+	 * Start recording actions for a changeset.
+	 *
+	 * @return void
+	 */
+	public function beginChangeset()
+	{
+		if ($this->inConflict === true) {
+			return false;
+		}
+
+		if (PHP_CODESNIFFER_VERBOSITY > 1) {
+			$bt    = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+			$sniff = $bt[1]['class'];
+			$line  = $bt[0]['line'];
+
+			@ob_end_clean();
+			echo "\t=> Changeset started by $sniff (line $line)".PHP_EOL;
+			ob_start();
+		}
+
+		$this->changeset   = [];
+		$this->inChangeset = true;
+
+	}//end beginChangeset()
+
+
+	/**
+	 * Stop recording actions for a changeset, and apply logged changes.
+	 *
+	 * @return boolean
+	 */
+	public function endChangeset()
+	{
+		if ($this->inConflict === true) {
+			return false;
+		}
+
+		$this->inChangeset = false;
+
+		$success = true;
+		$applied = [];
+		foreach ($this->changeset as $stackPtr => $content) {
+			$success = $this->replaceToken($stackPtr, $content);
+			if ($success === false) {
+				break;
+			} else {
+				$applied[] = $stackPtr;
+			}
+		}
+
+		if ($success === false) {
+			// Rolling back all changes.
+			foreach ($applied as $stackPtr) {
+				$this->revertToken($stackPtr);
+			}
+
+			if (PHP_CODESNIFFER_VERBOSITY > 1) {
+				@ob_end_clean();
+				echo "\t=> Changeset failed to apply".PHP_EOL;
+				ob_start();
+			}
+		} else if (PHP_CODESNIFFER_VERBOSITY > 1) {
+			$fixes = count($this->changeset);
+			@ob_end_clean();
+			echo "\t=> Changeset ended: $fixes changes applied".PHP_EOL;
+			ob_start();
+		}
+
+		$this->changeset = [];
+
+	}//end endChangeset()
+
+
+	/**
+	 * Stop recording actions for a changeset, and discard logged changes.
+	 *
+	 * @return void
+	 */
+	public function rollbackChangeset()
+	{
+		$this->inChangeset = false;
+		$this->inConflict  = false;
+
+		if (empty($this->changeset) === false) {
+			if (PHP_CODESNIFFER_VERBOSITY > 1) {
+				$bt = debug_backtrace();
+				if ($bt[1]['class'] === 'PHP_CodeSniffer\Fixer') {
+					$sniff = $bt[2]['class'];
+					$line  = $bt[1]['line'];
+				} else {
+					$sniff = $bt[1]['class'];
+					$line  = $bt[0]['line'];
+				}
+
+				$numChanges = count($this->changeset);
+
+				@ob_end_clean();
+				echo "\t\tR: $sniff (line $line) rolled back the changeset ($numChanges changes)".PHP_EOL;
+				echo "\t=> Changeset rolled back".PHP_EOL;
+				ob_start();
+			}
+
+			$this->changeset = [];
+		}//end if
+
+	}//end rollbackChangeset()
+
+
+	/**
+	 * Replace the entire contents of a token.
+	 *
+	 * @param int    $stackPtr The position of the token in the token stack.
+	 * @param string $content  The new content of the token.
+	 *
+	 * @return bool If the change was accepted.
+	 */
+	public function replaceToken($stackPtr, $content)
+	{
+		if ($this->inConflict === true) {
+			return false;
+		}
+
+		if ($this->inChangeset === false
+			&& isset($this->fixedTokens[$stackPtr]) === true
+		) {
+			$indent = "\t";
+			if (empty($this->changeset) === false) {
+				$indent .= "\t";
+			}
+
+			if (PHP_CODESNIFFER_VERBOSITY > 1) {
+				@ob_end_clean();
+				echo "$indent* token $stackPtr has already been modified, skipping *".PHP_EOL;
+				ob_start();
+			}
+
+			return false;
+		}
+
+		if (PHP_CODESNIFFER_VERBOSITY > 1) {
+			$bt = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+			if ($bt[1]['class'] === 'PHP_CodeSniffer\Fixer') {
+				$sniff = $bt[2]['class'];
+				$line  = $bt[1]['line'];
+			} else {
+				$sniff = $bt[1]['class'];
+				$line  = $bt[0]['line'];
+			}
+
+			$tokens     = $this->currentFile->getTokens();
+			$type       = $tokens[$stackPtr]['type'];
+			$oldContent = Common::prepareForOutput($this->tokens[$stackPtr]);
+			$newContent = Common::prepareForOutput($content);
+			if (trim($this->tokens[$stackPtr]) === '' && isset($this->tokens[($stackPtr + 1)]) === true) {
+				// Add some context for whitespace only changes.
+				$append      = Common::prepareForOutput($this->tokens[($stackPtr + 1)]);
+				$oldContent .= $append;
+				$newContent .= $append;
+			}
+		}//end if
+
+		if ($this->inChangeset === true) {
+			$this->changeset[$stackPtr] = $content;
+
+			if (PHP_CODESNIFFER_VERBOSITY > 1) {
+				@ob_end_clean();
+				echo "\t\tQ: $sniff (line $line) replaced token $stackPtr ($type) \"$oldContent\" => \"$newContent\"".PHP_EOL;
+				ob_start();
+			}
+
+			return true;
+		}
+
+		if (isset($this->oldTokenValues[$stackPtr]) === false) {
+			$this->oldTokenValues[$stackPtr] = [
+				'curr' => $content,
+				'prev' => $this->tokens[$stackPtr],
+				'loop' => $this->loops,
+			];
+		} else {
+			if ($this->oldTokenValues[$stackPtr]['prev'] === $content
+				&& $this->oldTokenValues[$stackPtr]['loop'] === ($this->loops - 1)
+			) {
+				if (PHP_CODESNIFFER_VERBOSITY > 1) {
+					$indent = "\t";
+					if (empty($this->changeset) === false) {
+						$indent .= "\t";
+					}
+
+					$loop = $this->oldTokenValues[$stackPtr]['loop'];
+
+					@ob_end_clean();
+					echo "$indent**** $sniff (line $line) has possible conflict with another sniff on loop $loop; caused by the following change ****".PHP_EOL;
+					echo "$indent**** replaced token $stackPtr ($type) \"$oldContent\" => \"$newContent\" ****".PHP_EOL;
+				}
+
+				if ($this->oldTokenValues[$stackPtr]['loop'] >= ($this->loops - 1)) {
+					$this->inConflict = true;
+					if (PHP_CODESNIFFER_VERBOSITY > 1) {
+						echo "$indent**** ignoring all changes until next loop ****".PHP_EOL;
+					}
+				}
+
+				if (PHP_CODESNIFFER_VERBOSITY > 1) {
+					ob_start();
+				}
+
+				return false;
+			}//end if
+
+			$this->oldTokenValues[$stackPtr]['prev'] = $this->oldTokenValues[$stackPtr]['curr'];
+			$this->oldTokenValues[$stackPtr]['curr'] = $content;
+			$this->oldTokenValues[$stackPtr]['loop'] = $this->loops;
+		}//end if
+
+		$this->fixedTokens[$stackPtr] = $this->tokens[$stackPtr];
+		$this->tokens[$stackPtr]      = $content;
+		$this->numFixes++;
+
+		if (PHP_CODESNIFFER_VERBOSITY > 1) {
+			$indent = "\t";
+			if (empty($this->changeset) === false) {
+				$indent .= "\tA: ";
+			}
+
+			if (ob_get_level() > 0) {
+				ob_end_clean();
+			}
+
+			echo "$indent$sniff (line $line) replaced token $stackPtr ($type) \"$oldContent\" => \"$newContent\"".PHP_EOL;
+			ob_start();
+		}
+
+		return true;
+
+	}//end replaceToken()
+
+
+	/**
+	 * Reverts the previous fix made to a token.
+	 *
+	 * @param int $stackPtr The position of the token in the token stack.
+	 *
+	 * @return bool If a change was reverted.
+	 */
+	public function revertToken($stackPtr)
+	{
+		if (isset($this->fixedTokens[$stackPtr]) === false) {
+			return false;
+		}
+
+		if (PHP_CODESNIFFER_VERBOSITY > 1) {
+			$bt = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+			if ($bt[1]['class'] === 'PHP_CodeSniffer\Fixer') {
+				$sniff = $bt[2]['class'];
+				$line  = $bt[1]['line'];
+			} else {
+				$sniff = $bt[1]['class'];
+				$line  = $bt[0]['line'];
+			}
+
+			$tokens     = $this->currentFile->getTokens();
+			$type       = $tokens[$stackPtr]['type'];
+			$oldContent = Common::prepareForOutput($this->tokens[$stackPtr]);
+			$newContent = Common::prepareForOutput($this->fixedTokens[$stackPtr]);
+			if (trim($this->tokens[$stackPtr]) === '' && isset($tokens[($stackPtr + 1)]) === true) {
+				// Add some context for whitespace only changes.
+				$append      = Common::prepareForOutput($this->tokens[($stackPtr + 1)]);
+				$oldContent .= $append;
+				$newContent .= $append;
+			}
+		}//end if
+
+		$this->tokens[$stackPtr] = $this->fixedTokens[$stackPtr];
+		unset($this->fixedTokens[$stackPtr]);
+		$this->numFixes--;
+
+		if (PHP_CODESNIFFER_VERBOSITY > 1) {
+			$indent = "\t";
+			if (empty($this->changeset) === false) {
+				$indent .= "\tR: ";
+			}
+
+			@ob_end_clean();
+			echo "$indent$sniff (line $line) reverted token $stackPtr ($type) \"$oldContent\" => \"$newContent\"".PHP_EOL;
+			ob_start();
+		}
+
+		return true;
+
+	}//end revertToken()
+
+
+	/**
+	 * Replace the content of a token with a part of its current content.
+	 *
+	 * @param int $stackPtr The position of the token in the token stack.
+	 * @param int $start    The first character to keep.
+	 * @param int $length   The number of characters to keep. If NULL, the content of
+	 *                      the token from $start to the end of the content is kept.
+	 *
+	 * @return bool If the change was accepted.
+	 */
+	public function substrToken($stackPtr, $start, $length=null)
+	{
+		$current = $this->getTokenContent($stackPtr);
+
+		if ($length === null) {
+			$newContent = substr($current, $start);
+		} else {
+			$newContent = substr($current, $start, $length);
+		}
+
+		return $this->replaceToken($stackPtr, $newContent);
+
+	}//end substrToken()
+
+
+	/**
+	 * Adds a newline to end of a token's content.
+	 *
+	 * @param int $stackPtr The position of the token in the token stack.
+	 *
+	 * @return bool If the change was accepted.
+	 */
+	public function addNewline($stackPtr)
+	{
+		$current = $this->getTokenContent($stackPtr);
+		return $this->replaceToken($stackPtr, $current.$this->currentFile->eolChar);
+
+	}//end addNewline()
+
+
+	/**
+	 * Adds a newline to the start of a token's content.
+	 *
+	 * @param int $stackPtr The position of the token in the token stack.
+	 *
+	 * @return bool If the change was accepted.
+	 */
+	public function addNewlineBefore($stackPtr)
+	{
+		$current = $this->getTokenContent($stackPtr);
+		return $this->replaceToken($stackPtr, $this->currentFile->eolChar.$current);
+
+	}//end addNewlineBefore()
+
+
+	/**
+	 * Adds content to the end of a token's current content.
+	 *
+	 * @param int    $stackPtr The position of the token in the token stack.
+	 * @param string $content  The content to add.
+	 *
+	 * @return bool If the change was accepted.
+	 */
+	public function addContent($stackPtr, $content)
+	{
+		$current = $this->getTokenContent($stackPtr);
+		return $this->replaceToken($stackPtr, $current.$content);
+
+	}//end addContent()
+
+
+	/**
+	 * Adds content to the start of a token's current content.
+	 *
+	 * @param int    $stackPtr The position of the token in the token stack.
+	 * @param string $content  The content to add.
+	 *
+	 * @return bool If the change was accepted.
+	 */
+	public function addContentBefore($stackPtr, $content)
+	{
+		$current = $this->getTokenContent($stackPtr);
+		return $this->replaceToken($stackPtr, $content.$current);
+
+	}//end addContentBefore()
 
 
 }//end class

Switch Indentation +8 added lines, -8 removed lines

@@ -269,14 +269,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 +178 added lines, -178 removed lines

@@ -52,7 +52,7 @@ 
      *
      * @var array<int, string>
      */
-    private $tokens = [];
+    private $tokens = [ ];
 
     /**
      * A list of tokens that have already been fixed.
@@ -62,7 +62,7 @@ 
      *
      * @var int[]
      */
-    private $fixedTokens = [];
+    private $fixedTokens = [ ];
 
     /**
      * The last value of each fixed token.
@@ -72,7 +72,7 @@ 
      *
      * @var array<int, string>
      */
-    private $oldTokenValues = [];
+    private $oldTokenValues = [ ];
 
     /**
      * A list of tokens that have been fixed during a changeset.
@@ -82,7 +82,7 @@ 
      *
      * @var array
      */
-    private $changeset = [];
+    private $changeset = [ ];
 
     /**
      * Is there an open changeset.
@@ -113,19 +113,19 @@ 
      *
      * @return void
      */
-    public function startFile(File $phpcsFile)
+    public function startFile( File $phpcsFile )
     {
         $this->currentFile = $phpcsFile;
         $this->numFixes    = 0;
-        $this->fixedTokens = [];
+        $this->fixedTokens = [ ];
 
         $tokens       = $phpcsFile->getTokens();
-        $this->tokens = [];
-        foreach ($tokens as $index => $token) {
-            if (isset($token['orig_content']) === true) {
-                $this->tokens[$index] = $token['orig_content'];
+        $this->tokens = [ ];
+        foreach ( $tokens as $index => $token ) {
+            if ( isset( $token[ 'orig_content' ] ) === true ) {
+                $this->tokens[ $index ] = $token[ 'orig_content' ];
             } else {
-                $this->tokens[$index] = $token['content'];
+                $this->tokens[ $index ] = $token[ 'content' ];
             }
         }
 
@@ -140,7 +140,7 @@ 
     public function fixFile()
     {
         $fixable = $this->currentFile->getFixableCount();
-        if ($fixable === 0) {
+        if ( $fixable === 0 ) {
             // Nothing to fix.
             return false;
         }
@@ -148,61 +148,61 @@ 
         $this->enabled = true;
 
         $this->loops = 0;
-        while ($this->loops < 50) {
+        while ( $this->loops < 50 ) {
             ob_start();
 
             // Only needed once file content has changed.
             $contents = $this->getContents();
 
-            if (PHP_CODESNIFFER_VERBOSITY > 2) {
+            if ( PHP_CODESNIFFER_VERBOSITY > 2 ) {
                 @ob_end_clean();
-                echo '---START FILE CONTENT---'.PHP_EOL;
-                $lines = explode($this->currentFile->eolChar, $contents);
-                $max   = strlen(count($lines));
-                foreach ($lines as $lineNum => $line) {
+                echo '---START FILE CONTENT---' . PHP_EOL;
+                $lines = explode( $this->currentFile->eolChar, $contents );
+                $max   = strlen( count( $lines ) );
+                foreach ( $lines as $lineNum => $line ) {
                     $lineNum++;
-                    echo str_pad($lineNum, $max, ' ', STR_PAD_LEFT).'|'.$line.PHP_EOL;
+                    echo str_pad( $lineNum, $max, ' ', STR_PAD_LEFT ) . '|' . $line . PHP_EOL;
                 }
 
-                echo '--- END FILE CONTENT ---'.PHP_EOL;
+                echo '--- END FILE CONTENT ---' . PHP_EOL;
                 ob_start();
             }
 
             $this->inConflict = false;
             $this->currentFile->ruleset->populateTokenListeners();
-            $this->currentFile->setContent($contents);
+            $this->currentFile->setContent( $contents );
             $this->currentFile->process();
             ob_end_clean();
 
             $this->loops++;
 
-            if (PHP_CODESNIFFER_CBF === true && PHP_CODESNIFFER_VERBOSITY > 0) {
-                echo "\r".str_repeat(' ', 80)."\r";
+            if ( PHP_CODESNIFFER_CBF === true && PHP_CODESNIFFER_VERBOSITY > 0 ) {
+                echo "\r" . str_repeat( ' ', 80 ) . "\r";
                 echo "\t=> Fixing file: $this->numFixes/$fixable violations remaining [made $this->loops pass";
-                if ($this->loops > 1) {
+                if ( $this->loops > 1 ) {
                     echo 'es';
                 }
 
                 echo ']... ';
             }
 
-            if ($this->numFixes === 0 && $this->inConflict === false) {
+            if ( $this->numFixes === 0 && $this->inConflict === false ) {
                 // Nothing left to do.
                 break;
-            } else if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                echo "\t* fixed $this->numFixes violations, starting loop ".($this->loops + 1).' *'.PHP_EOL;
+            } else if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                echo "\t* fixed $this->numFixes violations, starting loop " . ( $this->loops + 1 ) . ' *' . PHP_EOL;
             }
         }//end while
 
         $this->enabled = false;
 
-        if ($this->numFixes > 0) {
-            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                if (ob_get_level() > 0) {
+        if ( $this->numFixes > 0 ) {
+            if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                if ( ob_get_level() > 0 ) {
                     ob_end_clean();
                 }
 
-                echo "\t*** Reached maximum number of loops with $this->numFixes violations left unfixed ***".PHP_EOL;
+                echo "\t*** Reached maximum number of loops with $this->numFixes violations left unfixed ***" . PHP_EOL;
                 ob_start();
             }
 
@@ -224,64 +224,64 @@ 
      *
      * @return string
      */
-    public function generateDiff($filePath=null, $colors=true)
+    public function generateDiff( $filePath = null, $colors = true )
     {
-        if ($filePath === null) {
+        if ( $filePath === null ) {
             $filePath = $this->currentFile->getFilename();
         }
 
-        $cwd = getcwd().DIRECTORY_SEPARATOR;
-        if (strpos($filePath, $cwd) === 0) {
-            $filename = substr($filePath, strlen($cwd));
+        $cwd = getcwd() . DIRECTORY_SEPARATOR;
+        if ( strpos( $filePath, $cwd ) === 0 ) {
+            $filename = substr( $filePath, strlen( $cwd ) );
         } else {
             $filename = $filePath;
         }
 
         $contents = $this->getContents();
 
-        $tempName  = tempnam(sys_get_temp_dir(), 'phpcs-fixer');
-        $fixedFile = fopen($tempName, 'w');
-        fwrite($fixedFile, $contents);
+        $tempName  = tempnam( sys_get_temp_dir(), 'phpcs-fixer' );
+        $fixedFile = fopen( $tempName, 'w' );
+        fwrite( $fixedFile, $contents );
 
         // We must use something like shell_exec() because whitespace at the end
         // of lines is critical to diff files.
-        $filename = escapeshellarg($filename);
+        $filename = escapeshellarg( $filename );
         $cmd      = "diff -u -L$filename -LPHP_CodeSniffer $filename \"$tempName\"";
 
-        $diff = shell_exec($cmd);
+        $diff = shell_exec( $cmd );
 
-        fclose($fixedFile);
-        if (is_file($tempName) === true) {
-            unlink($tempName);
+        fclose( $fixedFile );
+        if ( is_file( $tempName ) === true ) {
+            unlink( $tempName );
         }
 
-        if ($colors === false) {
+        if ( $colors === false ) {
             return $diff;
         }
 
-        $diffLines = explode(PHP_EOL, $diff);
-        if (count($diffLines) === 1) {
+        $diffLines = explode( PHP_EOL, $diff );
+        if ( count( $diffLines ) === 1 ) {
             // Seems to be required for cygwin.
-            $diffLines = explode("\n", $diff);
+            $diffLines = explode( "\n", $diff );
         }
 
-        $diff = [];
-        foreach ($diffLines as $line) {
-            if (isset($line[0]) === true) {
-                switch ($line[0]) {
+        $diff = [ ];
+        foreach ( $diffLines as $line ) {
+            if ( isset( $line[ 0 ] ) === true ) {
+                switch ( $line[ 0 ] ) {
                 case '-':
-                    $diff[] = "\033[31m$line\033[0m";
+                    $diff[ ] = "\033[31m$line\033[0m";
                     break;
                 case '+':
-                    $diff[] = "\033[32m$line\033[0m";
+                    $diff[ ] = "\033[32m$line\033[0m";
                     break;
                 default:
-                    $diff[] = $line;
+                    $diff[ ] = $line;
                 }
             }
         }
 
-        $diff = implode(PHP_EOL, $diff);
+        $diff = implode( PHP_EOL, $diff );
 
         return $diff;
 
@@ -310,7 +310,7 @@ 
      */
     public function getContents()
     {
-        $contents = implode($this->tokens);
+        $contents = implode( $this->tokens );
         return $contents;
 
     }//end getContents()
@@ -326,14 +326,14 @@ 
      *
      * @return string
      */
-    public function getTokenContent($stackPtr)
+    public function getTokenContent( $stackPtr )
     {
-        if ($this->inChangeset === true
-            && isset($this->changeset[$stackPtr]) === true
+        if ( $this->inChangeset === true
+            && isset( $this->changeset[ $stackPtr ] ) === true
         ) {
-            return $this->changeset[$stackPtr];
+            return $this->changeset[ $stackPtr ];
         } else {
-            return $this->tokens[$stackPtr];
+            return $this->tokens[ $stackPtr ];
         }
 
     }//end getTokenContent()
@@ -346,21 +346,21 @@ 
      */
     public function beginChangeset()
     {
-        if ($this->inConflict === true) {
+        if ( $this->inConflict === true ) {
             return false;
         }
 
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            $bt    = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-            $sniff = $bt[1]['class'];
-            $line  = $bt[0]['line'];
+        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+            $bt    = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS );
+            $sniff = $bt[ 1 ][ 'class' ];
+            $line  = $bt[ 0 ][ 'line' ];
 
             @ob_end_clean();
-            echo "\t=> Changeset started by $sniff (line $line)".PHP_EOL;
+            echo "\t=> Changeset started by $sniff (line $line)" . PHP_EOL;
             ob_start();
         }
 
-        $this->changeset   = [];
+        $this->changeset   = [ ];
         $this->inChangeset = true;
 
     }//end beginChangeset()
@@ -373,42 +373,42 @@ 
      */
     public function endChangeset()
     {
-        if ($this->inConflict === true) {
+        if ( $this->inConflict === true ) {
             return false;
         }
 
         $this->inChangeset = false;
 
         $success = true;
-        $applied = [];
-        foreach ($this->changeset as $stackPtr => $content) {
-            $success = $this->replaceToken($stackPtr, $content);
-            if ($success === false) {
+        $applied = [ ];
+        foreach ( $this->changeset as $stackPtr => $content ) {
+            $success = $this->replaceToken( $stackPtr, $content );
+            if ( $success === false ) {
                 break;
             } else {
-                $applied[] = $stackPtr;
+                $applied[ ] = $stackPtr;
             }
         }
 
-        if ($success === false) {
+        if ( $success === false ) {
             // Rolling back all changes.
-            foreach ($applied as $stackPtr) {
-                $this->revertToken($stackPtr);
+            foreach ( $applied as $stackPtr ) {
+                $this->revertToken( $stackPtr );
             }
 
-            if (PHP_CODESNIFFER_VERBOSITY > 1) {
+            if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
                 @ob_end_clean();
-                echo "\t=> Changeset failed to apply".PHP_EOL;
+                echo "\t=> Changeset failed to apply" . PHP_EOL;
                 ob_start();
             }
-        } else if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            $fixes = count($this->changeset);
+        } else if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+            $fixes = count( $this->changeset );
             @ob_end_clean();
-            echo "\t=> Changeset ended: $fixes changes applied".PHP_EOL;
+            echo "\t=> Changeset ended: $fixes changes applied" . PHP_EOL;
             ob_start();
         }
 
-        $this->changeset = [];
+        $this->changeset = [ ];
 
     }//end endChangeset()
 
@@ -423,26 +423,26 @@ 
         $this->inChangeset = false;
         $this->inConflict  = false;
 
-        if (empty($this->changeset) === false) {
-            if (PHP_CODESNIFFER_VERBOSITY > 1) {
+        if ( empty( $this->changeset ) === false ) {
+            if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
                 $bt = debug_backtrace();
-                if ($bt[1]['class'] === 'PHP_CodeSniffer\Fixer') {
-                    $sniff = $bt[2]['class'];
-                    $line  = $bt[1]['line'];
+                if ( $bt[ 1 ][ 'class' ] === 'PHP_CodeSniffer\Fixer' ) {
+                    $sniff = $bt[ 2 ][ 'class' ];
+                    $line  = $bt[ 1 ][ 'line' ];
                 } else {
-                    $sniff = $bt[1]['class'];
-                    $line  = $bt[0]['line'];
+                    $sniff = $bt[ 1 ][ 'class' ];
+                    $line  = $bt[ 0 ][ 'line' ];
                 }
 
-                $numChanges = count($this->changeset);
+                $numChanges = count( $this->changeset );
 
                 @ob_end_clean();
-                echo "\t\tR: $sniff (line $line) rolled back the changeset ($numChanges changes)".PHP_EOL;
-                echo "\t=> Changeset rolled back".PHP_EOL;
+                echo "\t\tR: $sniff (line $line) rolled back the changeset ($numChanges changes)" . PHP_EOL;
+                echo "\t=> Changeset rolled back" . PHP_EOL;
                 ob_start();
             }
 
-            $this->changeset = [];
+            $this->changeset = [ ];
         }//end if
 
     }//end rollbackChangeset()
@@ -456,120 +456,120 @@ 
      *
      * @return bool If the change was accepted.
      */
-    public function replaceToken($stackPtr, $content)
+    public function replaceToken( $stackPtr, $content )
     {
-        if ($this->inConflict === true) {
+        if ( $this->inConflict === true ) {
             return false;
         }
 
-        if ($this->inChangeset === false
-            && isset($this->fixedTokens[$stackPtr]) === true
+        if ( $this->inChangeset === false
+            && isset( $this->fixedTokens[ $stackPtr ] ) === true
         ) {
             $indent = "\t";
-            if (empty($this->changeset) === false) {
+            if ( empty( $this->changeset ) === false ) {
                 $indent .= "\t";
             }
 
-            if (PHP_CODESNIFFER_VERBOSITY > 1) {
+            if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
                 @ob_end_clean();
-                echo "$indent* token $stackPtr has already been modified, skipping *".PHP_EOL;
+                echo "$indent* token $stackPtr has already been modified, skipping *" . PHP_EOL;
                 ob_start();
             }
 
             return false;
         }
 
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            $bt = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-            if ($bt[1]['class'] === 'PHP_CodeSniffer\Fixer') {
-                $sniff = $bt[2]['class'];
-                $line  = $bt[1]['line'];
+        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+            $bt = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS );
+            if ( $bt[ 1 ][ 'class' ] === 'PHP_CodeSniffer\Fixer' ) {
+                $sniff = $bt[ 2 ][ 'class' ];
+                $line  = $bt[ 1 ][ 'line' ];
             } else {
-                $sniff = $bt[1]['class'];
-                $line  = $bt[0]['line'];
+                $sniff = $bt[ 1 ][ 'class' ];
+                $line  = $bt[ 0 ][ 'line' ];
             }
 
             $tokens     = $this->currentFile->getTokens();
-            $type       = $tokens[$stackPtr]['type'];
-            $oldContent = Common::prepareForOutput($this->tokens[$stackPtr]);
-            $newContent = Common::prepareForOutput($content);
-            if (trim($this->tokens[$stackPtr]) === '' && isset($this->tokens[($stackPtr + 1)]) === true) {
+            $type       = $tokens[ $stackPtr ][ 'type' ];
+            $oldContent = Common::prepareForOutput( $this->tokens[ $stackPtr ] );
+            $newContent = Common::prepareForOutput( $content );
+            if ( trim( $this->tokens[ $stackPtr ] ) === '' && isset( $this->tokens[ ( $stackPtr + 1 ) ] ) === true ) {
                 // Add some context for whitespace only changes.
-                $append      = Common::prepareForOutput($this->tokens[($stackPtr + 1)]);
+                $append      = Common::prepareForOutput( $this->tokens[ ( $stackPtr + 1 ) ] );
                 $oldContent .= $append;
                 $newContent .= $append;
             }
         }//end if
 
-        if ($this->inChangeset === true) {
-            $this->changeset[$stackPtr] = $content;
+        if ( $this->inChangeset === true ) {
+            $this->changeset[ $stackPtr ] = $content;
 
-            if (PHP_CODESNIFFER_VERBOSITY > 1) {
+            if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
                 @ob_end_clean();
-                echo "\t\tQ: $sniff (line $line) replaced token $stackPtr ($type) \"$oldContent\" => \"$newContent\"".PHP_EOL;
+                echo "\t\tQ: $sniff (line $line) replaced token $stackPtr ($type) \"$oldContent\" => \"$newContent\"" . PHP_EOL;
                 ob_start();
             }
 
             return true;
         }
 
-        if (isset($this->oldTokenValues[$stackPtr]) === false) {
-            $this->oldTokenValues[$stackPtr] = [
+        if ( isset( $this->oldTokenValues[ $stackPtr ] ) === false ) {
+            $this->oldTokenValues[ $stackPtr ] = [
                 'curr' => $content,
-                'prev' => $this->tokens[$stackPtr],
+                'prev' => $this->tokens[ $stackPtr ],
                 'loop' => $this->loops,
             ];
         } else {
-            if ($this->oldTokenValues[$stackPtr]['prev'] === $content
-                && $this->oldTokenValues[$stackPtr]['loop'] === ($this->loops - 1)
+            if ( $this->oldTokenValues[ $stackPtr ][ 'prev' ] === $content
+                && $this->oldTokenValues[ $stackPtr ][ 'loop' ] === ( $this->loops - 1 )
             ) {
-                if (PHP_CODESNIFFER_VERBOSITY > 1) {
+                if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
                     $indent = "\t";
-                    if (empty($this->changeset) === false) {
+                    if ( empty( $this->changeset ) === false ) {
                         $indent .= "\t";
                     }
 
-                    $loop = $this->oldTokenValues[$stackPtr]['loop'];
+                    $loop = $this->oldTokenValues[ $stackPtr ][ 'loop' ];
 
                     @ob_end_clean();
-                    echo "$indent**** $sniff (line $line) has possible conflict with another sniff on loop $loop; caused by the following change ****".PHP_EOL;
-                    echo "$indent**** replaced token $stackPtr ($type) \"$oldContent\" => \"$newContent\" ****".PHP_EOL;
+                    echo "$indent**** $sniff (line $line) has possible conflict with another sniff on loop $loop; caused by the following change ****" . PHP_EOL;
+                    echo "$indent**** replaced token $stackPtr ($type) \"$oldContent\" => \"$newContent\" ****" . PHP_EOL;
                 }
 
-                if ($this->oldTokenValues[$stackPtr]['loop'] >= ($this->loops - 1)) {
+                if ( $this->oldTokenValues[ $stackPtr ][ 'loop' ] >= ( $this->loops - 1 ) ) {
                     $this->inConflict = true;
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        echo "$indent**** ignoring all changes until next loop ****".PHP_EOL;
+                    if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                        echo "$indent**** ignoring all changes until next loop ****" . PHP_EOL;
                     }
                 }
 
-                if (PHP_CODESNIFFER_VERBOSITY > 1) {
+                if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
                     ob_start();
                 }
 
                 return false;
             }//end if
 
-            $this->oldTokenValues[$stackPtr]['prev'] = $this->oldTokenValues[$stackPtr]['curr'];
-            $this->oldTokenValues[$stackPtr]['curr'] = $content;
-            $this->oldTokenValues[$stackPtr]['loop'] = $this->loops;
+            $this->oldTokenValues[ $stackPtr ][ 'prev' ] = $this->oldTokenValues[ $stackPtr ][ 'curr' ];
+            $this->oldTokenValues[ $stackPtr ][ 'curr' ] = $content;
+            $this->oldTokenValues[ $stackPtr ][ 'loop' ] = $this->loops;
         }//end if
 
-        $this->fixedTokens[$stackPtr] = $this->tokens[$stackPtr];
-        $this->tokens[$stackPtr]      = $content;
+        $this->fixedTokens[ $stackPtr ] = $this->tokens[ $stackPtr ];
+        $this->tokens[ $stackPtr ]      = $content;
         $this->numFixes++;
 
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
+        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
             $indent = "\t";
-            if (empty($this->changeset) === false) {
+            if ( empty( $this->changeset ) === false ) {
                 $indent .= "\tA: ";
             }
 
-            if (ob_get_level() > 0) {
+            if ( ob_get_level() > 0 ) {
                 ob_end_clean();
             }
 
-            echo "$indent$sniff (line $line) replaced token $stackPtr ($type) \"$oldContent\" => \"$newContent\"".PHP_EOL;
+            echo "$indent$sniff (line $line) replaced token $stackPtr ($type) \"$oldContent\" => \"$newContent\"" . PHP_EOL;
             ob_start();
         }
 
@@ -585,46 +585,46 @@ 
      *
      * @return bool If a change was reverted.
      */
-    public function revertToken($stackPtr)
+    public function revertToken( $stackPtr )
     {
-        if (isset($this->fixedTokens[$stackPtr]) === false) {
+        if ( isset( $this->fixedTokens[ $stackPtr ] ) === false ) {
             return false;
         }
 
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            $bt = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-            if ($bt[1]['class'] === 'PHP_CodeSniffer\Fixer') {
-                $sniff = $bt[2]['class'];
-                $line  = $bt[1]['line'];
+        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+            $bt = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS );
+            if ( $bt[ 1 ][ 'class' ] === 'PHP_CodeSniffer\Fixer' ) {
+                $sniff = $bt[ 2 ][ 'class' ];
+                $line  = $bt[ 1 ][ 'line' ];
             } else {
-                $sniff = $bt[1]['class'];
-                $line  = $bt[0]['line'];
+                $sniff = $bt[ 1 ][ 'class' ];
+                $line  = $bt[ 0 ][ 'line' ];
             }
 
             $tokens     = $this->currentFile->getTokens();
-            $type       = $tokens[$stackPtr]['type'];
-            $oldContent = Common::prepareForOutput($this->tokens[$stackPtr]);
-            $newContent = Common::prepareForOutput($this->fixedTokens[$stackPtr]);
-            if (trim($this->tokens[$stackPtr]) === '' && isset($tokens[($stackPtr + 1)]) === true) {
+            $type       = $tokens[ $stackPtr ][ 'type' ];
+            $oldContent = Common::prepareForOutput( $this->tokens[ $stackPtr ] );
+            $newContent = Common::prepareForOutput( $this->fixedTokens[ $stackPtr ] );
+            if ( trim( $this->tokens[ $stackPtr ] ) === '' && isset( $tokens[ ( $stackPtr + 1 ) ] ) === true ) {
                 // Add some context for whitespace only changes.
-                $append      = Common::prepareForOutput($this->tokens[($stackPtr + 1)]);
+                $append      = Common::prepareForOutput( $this->tokens[ ( $stackPtr + 1 ) ] );
                 $oldContent .= $append;
                 $newContent .= $append;
             }
         }//end if
 
-        $this->tokens[$stackPtr] = $this->fixedTokens[$stackPtr];
-        unset($this->fixedTokens[$stackPtr]);
+        $this->tokens[ $stackPtr ] = $this->fixedTokens[ $stackPtr ];
+        unset( $this->fixedTokens[ $stackPtr ] );
         $this->numFixes--;
 
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
+        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
             $indent = "\t";
-            if (empty($this->changeset) === false) {
+            if ( empty( $this->changeset ) === false ) {
                 $indent .= "\tR: ";
             }
 
             @ob_end_clean();
-            echo "$indent$sniff (line $line) reverted token $stackPtr ($type) \"$oldContent\" => \"$newContent\"".PHP_EOL;
+            echo "$indent$sniff (line $line) reverted token $stackPtr ($type) \"$oldContent\" => \"$newContent\"" . PHP_EOL;
             ob_start();
         }
 
@@ -643,17 +643,17 @@ 
      *
      * @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);
+        $current = $this->getTokenContent( $stackPtr );
 
-        if ($length === null) {
-            $newContent = substr($current, $start);
+        if ( $length === null ) {
+            $newContent = substr( $current, $start );
         } else {
-            $newContent = substr($current, $start, $length);
+            $newContent = substr( $current, $start, $length );
         }
 
-        return $this->replaceToken($stackPtr, $newContent);
+        return $this->replaceToken( $stackPtr, $newContent );
 
     }//end substrToken()
 
@@ -665,10 +665,10 @@ 
      *
      * @return bool If the change was accepted.
      */
-    public function addNewline($stackPtr)
+    public function addNewline( $stackPtr )
     {
-        $current = $this->getTokenContent($stackPtr);
-        return $this->replaceToken($stackPtr, $current.$this->currentFile->eolChar);
+        $current = $this->getTokenContent( $stackPtr );
+        return $this->replaceToken( $stackPtr, $current . $this->currentFile->eolChar );
 
     }//end addNewline()
 
@@ -680,10 +680,10 @@ 
      *
      * @return bool If the change was accepted.
      */
-    public function addNewlineBefore($stackPtr)
+    public function addNewlineBefore( $stackPtr )
     {
-        $current = $this->getTokenContent($stackPtr);
-        return $this->replaceToken($stackPtr, $this->currentFile->eolChar.$current);
+        $current = $this->getTokenContent( $stackPtr );
+        return $this->replaceToken( $stackPtr, $this->currentFile->eolChar . $current );
 
     }//end addNewlineBefore()
 
@@ -696,10 +696,10 @@ 
      *
      * @return bool If the change was accepted.
      */
-    public function addContent($stackPtr, $content)
+    public function addContent( $stackPtr, $content )
     {
-        $current = $this->getTokenContent($stackPtr);
-        return $this->replaceToken($stackPtr, $current.$content);
+        $current = $this->getTokenContent( $stackPtr );
+        return $this->replaceToken( $stackPtr, $current . $content );
 
     }//end addContent()
 
@@ -712,10 +712,10 @@ 
      *
      * @return bool If the change was accepted.
      */
-    public function addContentBefore($stackPtr, $content)
+    public function addContentBefore( $stackPtr, $content )
     {
-        $current = $this->getTokenContent($stackPtr);
-        return $this->replaceToken($stackPtr, $content.$current);
+        $current = $this->getTokenContent( $stackPtr );
+        return $this->replaceToken( $stackPtr, $content . $current );
 
     }//end addContentBefore()
 

Braces +17 added lines, -34 removed lines

@@ -15,8 +15,7 @@ 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Common;
 
-class Fixer
-{
+class Fixer {
 
     /**
      * Is the fixer enabled and fixing a file?
@@ -113,8 +112,7 @@ 
      *
      * @return void
      */
-    public function startFile(File $phpcsFile)
-    {
+    public function startFile(File $phpcsFile) {
         $this->currentFile = $phpcsFile;
         $this->numFixes    = 0;
         $this->fixedTokens = [];
@@ -137,8 +135,7 @@ 
      *
      * @return boolean
      */
-    public function fixFile()
-    {
+    public function fixFile() {
         $fixable = $this->currentFile->getFixableCount();
         if ($fixable === 0) {
             // Nothing to fix.
@@ -224,8 +221,7 @@ 
      *
      * @return string
      */
-    public function generateDiff($filePath=null, $colors=true)
-    {
+    public function generateDiff($filePath=null, $colors=true) {
         if ($filePath === null) {
             $filePath = $this->currentFile->getFilename();
         }
@@ -296,8 +292,7 @@ 
      *
      * @return int
      */
-    public function getFixCount()
-    {
+    public function getFixCount() {
         return $this->numFixes;
 
     }//end getFixCount()
@@ -308,8 +303,7 @@ 
      *
      * @return string
      */
-    public function getContents()
-    {
+    public function getContents() {
         $contents = implode($this->tokens);
         return $contents;
 
@@ -326,8 +320,7 @@ 
      *
      * @return string
      */
-    public function getTokenContent($stackPtr)
-    {
+    public function getTokenContent($stackPtr) {
         if ($this->inChangeset === true
             && isset($this->changeset[$stackPtr]) === true
         ) {
@@ -344,8 +337,7 @@ 
      *
      * @return void
      */
-    public function beginChangeset()
-    {
+    public function beginChangeset() {
         if ($this->inConflict === true) {
             return false;
         }
@@ -371,8 +363,7 @@ 
      *
      * @return boolean
      */
-    public function endChangeset()
-    {
+    public function endChangeset() {
         if ($this->inConflict === true) {
             return false;
         }
@@ -418,8 +409,7 @@ 
      *
      * @return void
      */
-    public function rollbackChangeset()
-    {
+    public function rollbackChangeset() {
         $this->inChangeset = false;
         $this->inConflict  = false;
 
@@ -456,8 +446,7 @@ 
      *
      * @return bool If the change was accepted.
      */
-    public function replaceToken($stackPtr, $content)
-    {
+    public function replaceToken($stackPtr, $content) {
         if ($this->inConflict === true) {
             return false;
         }
@@ -585,8 +574,7 @@ 
      *
      * @return bool If a change was reverted.
      */
-    public function revertToken($stackPtr)
-    {
+    public function revertToken($stackPtr) {
         if (isset($this->fixedTokens[$stackPtr]) === false) {
             return false;
         }
@@ -643,8 +631,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);
 
         if ($length === null) {
@@ -665,8 +652,7 @@ 
      *
      * @return bool If the change was accepted.
      */
-    public function addNewline($stackPtr)
-    {
+    public function addNewline($stackPtr) {
         $current = $this->getTokenContent($stackPtr);
         return $this->replaceToken($stackPtr, $current.$this->currentFile->eolChar);
 
@@ -680,8 +666,7 @@ 
      *
      * @return bool If the change was accepted.
      */
-    public function addNewlineBefore($stackPtr)
-    {
+    public function addNewlineBefore($stackPtr) {
         $current = $this->getTokenContent($stackPtr);
         return $this->replaceToken($stackPtr, $this->currentFile->eolChar.$current);
 
@@ -696,8 +681,7 @@ 
      *
      * @return bool If the change was accepted.
      */
-    public function addContent($stackPtr, $content)
-    {
+    public function addContent($stackPtr, $content) {
         $current = $this->getTokenContent($stackPtr);
         return $this->replaceToken($stackPtr, $current.$content);
 
@@ -712,8 +696,7 @@ 
      *
      * @return bool If the change was accepted.
      */
-    public function addContentBefore($stackPtr, $content)
-    {
+    public function addContentBefore($stackPtr, $content) {
         $current = $this->getTokenContent($stackPtr);
         return $this->replaceToken($stackPtr, $content.$current);
 

vendor/squizlabs/php_codesniffer/src/Reports/Cbf.php

Doc Comments +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
      * its data should be counted in the grand totals.
      *
      * @param array                 $report      Prepared report data.
-     * @param \PHP_CodeSniffer\File $phpcsFile   The file being reported on.
+     * @param File $phpcsFile   The file being reported on.
      * @param bool                  $showSources Show sources?
      * @param int                   $width       Maximum allowed line width.
      *

Indentation +223 added lines, -223 removed lines

@@ -21,229 +21,229 @@
 {
 
 
-    /**
-     * Generate a partial report for a single processed file.
-     *
-     * Function should return TRUE if it printed or stored data about the file
-     * and FALSE if it ignored the file. Returning TRUE indicates that the file and
-     * its data should be counted in the grand totals.
-     *
-     * @param array                 $report      Prepared report data.
-     * @param \PHP_CodeSniffer\File $phpcsFile   The file being reported on.
-     * @param bool                  $showSources Show sources?
-     * @param int                   $width       Maximum allowed line width.
-     *
-     * @return bool
-     */
-    public function generateFileReport($report, File $phpcsFile, $showSources=false, $width=80)
-    {
-        $errors = $phpcsFile->getFixableCount();
-        if ($errors !== 0) {
-            if (PHP_CODESNIFFER_VERBOSITY > 0) {
-                ob_end_clean();
-                $startTime = microtime(true);
-                echo "\t=> Fixing file: $errors/$errors violations remaining";
-            }
-
-            $fixed = $phpcsFile->fixer->fixFile();
-        }
-
-        if ($phpcsFile->config->stdin === true) {
-            // Replacing STDIN, so output current file to STDOUT
-            // even if nothing was fixed. Exit here because we
-            // can't process any more than 1 file in this setup.
-            $fixedContent = $phpcsFile->fixer->getContents();
-            throw new DeepExitException($fixedContent, 1);
-        }
-
-        if ($errors === 0) {
-            return false;
-        }
-
-        if (PHP_CODESNIFFER_VERBOSITY > 0) {
-            if ($fixed === false) {
-                echo 'ERROR';
-            } else {
-                echo 'DONE';
-            }
-
-            $timeTaken = ((microtime(true) - $startTime) * 1000);
-            if ($timeTaken < 1000) {
-                $timeTaken = round($timeTaken);
-                echo " in {$timeTaken}ms".PHP_EOL;
-            } else {
-                $timeTaken = round(($timeTaken / 1000), 2);
-                echo " in $timeTaken secs".PHP_EOL;
-            }
-        }
-
-        if ($fixed === true) {
-            // The filename in the report may be truncated due to a basepath setting
-            // but we are using it for writing here and not display,
-            // so find the correct path if basepath is in use.
-            $newFilename = $report['filename'].$phpcsFile->config->suffix;
-            if ($phpcsFile->config->basepath !== null) {
-                $newFilename = $phpcsFile->config->basepath.DIRECTORY_SEPARATOR.$newFilename;
-            }
-
-            $newContent = $phpcsFile->fixer->getContents();
-            file_put_contents($newFilename, $newContent);
-
-            if (PHP_CODESNIFFER_VERBOSITY > 0) {
-                if ($newFilename === $report['filename']) {
-                    echo "\t=> File was overwritten".PHP_EOL;
-                } else {
-                    echo "\t=> Fixed file written to ".basename($newFilename).PHP_EOL;
-                }
-            }
-        }
-
-        if (PHP_CODESNIFFER_VERBOSITY > 0) {
-            ob_start();
-        }
-
-        $errorCount   = $phpcsFile->getErrorCount();
-        $warningCount = $phpcsFile->getWarningCount();
-        $fixableCount = $phpcsFile->getFixableCount();
-        $fixedCount   = ($errors - $fixableCount);
-        echo $report['filename'].">>$errorCount>>$warningCount>>$fixableCount>>$fixedCount".PHP_EOL;
-
-        return $fixed;
-
-    }//end generateFileReport()
-
-
-    /**
-     * Prints a summary of fixed files.
-     *
-     * @param string $cachedData    Any partial report data that was returned from
-     *                              generateFileReport during the run.
-     * @param int    $totalFiles    Total number of files processed during the run.
-     * @param int    $totalErrors   Total number of errors found during the run.
-     * @param int    $totalWarnings Total number of warnings found during the run.
-     * @param int    $totalFixable  Total number of problems that can be fixed.
-     * @param bool   $showSources   Show sources?
-     * @param int    $width         Maximum allowed line width.
-     * @param bool   $interactive   Are we running in interactive mode?
-     * @param bool   $toScreen      Is the report being printed to screen?
-     *
-     * @return void
-     */
-    public function generate(
-        $cachedData,
-        $totalFiles,
-        $totalErrors,
-        $totalWarnings,
-        $totalFixable,
-        $showSources=false,
-        $width=80,
-        $interactive=false,
-        $toScreen=true
-    ) {
-        $lines = explode(PHP_EOL, $cachedData);
-        array_pop($lines);
-
-        if (empty($lines) === true) {
-            echo PHP_EOL.'No fixable errors were found'.PHP_EOL;
-            return;
-        }
-
-        $reportFiles = [];
-        $maxLength   = 0;
-        $totalFixed  = 0;
-        $failures    = 0;
-
-        foreach ($lines as $line) {
-            $parts   = explode('>>', $line);
-            $fileLen = strlen($parts[0]);
-            $reportFiles[$parts[0]] = [
-                'errors'   => $parts[1],
-                'warnings' => $parts[2],
-                'fixable'  => $parts[3],
-                'fixed'    => $parts[4],
-                'strlen'   => $fileLen,
-            ];
-
-            $maxLength = max($maxLength, $fileLen);
-
-            $totalFixed += $parts[4];
-
-            if ($parts[3] > 0) {
-                $failures++;
-            }
-        }
-
-        $width = min($width, ($maxLength + 21));
-        $width = max($width, 70);
-
-        echo PHP_EOL."\033[1m".'PHPCBF RESULT SUMMARY'."\033[0m".PHP_EOL;
-        echo str_repeat('-', $width).PHP_EOL;
-        echo "\033[1m".'FILE'.str_repeat(' ', ($width - 20)).'FIXED  REMAINING'."\033[0m".PHP_EOL;
-        echo str_repeat('-', $width).PHP_EOL;
-
-        foreach ($reportFiles as $file => $data) {
-            $padding = ($width - 18 - $data['strlen']);
-            if ($padding < 0) {
-                $file    = '...'.substr($file, (($padding * -1) + 3));
-                $padding = 0;
-            }
-
-            echo $file.str_repeat(' ', $padding).'  ';
-
-            if ($data['fixable'] > 0) {
-                echo "\033[31mFAILED TO FIX\033[0m".PHP_EOL;
-                continue;
-            }
-
-            $remaining = ($data['errors'] + $data['warnings']);
-
-            if ($data['fixed'] !== 0) {
-                echo $data['fixed'];
-                echo str_repeat(' ', (7 - strlen((string) $data['fixed'])));
-            } else {
-                echo '0      ';
-            }
-
-            if ($remaining !== 0) {
-                echo $remaining;
-            } else {
-                echo '0';
-            }
-
-            echo PHP_EOL;
-        }//end foreach
-
-        echo str_repeat('-', $width).PHP_EOL;
-        echo "\033[1mA TOTAL OF $totalFixed ERROR";
-        if ($totalFixed !== 1) {
-            echo 'S';
-        }
-
-        $numFiles = count($reportFiles);
-        echo ' WERE FIXED IN '.$numFiles.' FILE';
-        if ($numFiles !== 1) {
-            echo 'S';
-        }
-
-        echo "\033[0m";
-
-        if ($failures > 0) {
-            echo PHP_EOL.str_repeat('-', $width).PHP_EOL;
-            echo "\033[1mPHPCBF FAILED TO FIX $failures FILE";
-            if ($failures !== 1) {
-                echo 'S';
-            }
-
-            echo "\033[0m";
-        }
-
-        echo PHP_EOL.str_repeat('-', $width).PHP_EOL.PHP_EOL;
-
-        if ($toScreen === true && $interactive === false) {
-            Util\Timing::printRunTime();
-        }
-
-    }//end generate()
+	/**
+	 * Generate a partial report for a single processed file.
+	 *
+	 * Function should return TRUE if it printed or stored data about the file
+	 * and FALSE if it ignored the file. Returning TRUE indicates that the file and
+	 * its data should be counted in the grand totals.
+	 *
+	 * @param array                 $report      Prepared report data.
+	 * @param \PHP_CodeSniffer\File $phpcsFile   The file being reported on.
+	 * @param bool                  $showSources Show sources?
+	 * @param int                   $width       Maximum allowed line width.
+	 *
+	 * @return bool
+	 */
+	public function generateFileReport($report, File $phpcsFile, $showSources=false, $width=80)
+	{
+		$errors = $phpcsFile->getFixableCount();
+		if ($errors !== 0) {
+			if (PHP_CODESNIFFER_VERBOSITY > 0) {
+				ob_end_clean();
+				$startTime = microtime(true);
+				echo "\t=> Fixing file: $errors/$errors violations remaining";
+			}
+
+			$fixed = $phpcsFile->fixer->fixFile();
+		}
+
+		if ($phpcsFile->config->stdin === true) {
+			// Replacing STDIN, so output current file to STDOUT
+			// even if nothing was fixed. Exit here because we
+			// can't process any more than 1 file in this setup.
+			$fixedContent = $phpcsFile->fixer->getContents();
+			throw new DeepExitException($fixedContent, 1);
+		}
+
+		if ($errors === 0) {
+			return false;
+		}
+
+		if (PHP_CODESNIFFER_VERBOSITY > 0) {
+			if ($fixed === false) {
+				echo 'ERROR';
+			} else {
+				echo 'DONE';
+			}
+
+			$timeTaken = ((microtime(true) - $startTime) * 1000);
+			if ($timeTaken < 1000) {
+				$timeTaken = round($timeTaken);
+				echo " in {$timeTaken}ms".PHP_EOL;
+			} else {
+				$timeTaken = round(($timeTaken / 1000), 2);
+				echo " in $timeTaken secs".PHP_EOL;
+			}
+		}
+
+		if ($fixed === true) {
+			// The filename in the report may be truncated due to a basepath setting
+			// but we are using it for writing here and not display,
+			// so find the correct path if basepath is in use.
+			$newFilename = $report['filename'].$phpcsFile->config->suffix;
+			if ($phpcsFile->config->basepath !== null) {
+				$newFilename = $phpcsFile->config->basepath.DIRECTORY_SEPARATOR.$newFilename;
+			}
+
+			$newContent = $phpcsFile->fixer->getContents();
+			file_put_contents($newFilename, $newContent);
+
+			if (PHP_CODESNIFFER_VERBOSITY > 0) {
+				if ($newFilename === $report['filename']) {
+					echo "\t=> File was overwritten".PHP_EOL;
+				} else {
+					echo "\t=> Fixed file written to ".basename($newFilename).PHP_EOL;
+				}
+			}
+		}
+
+		if (PHP_CODESNIFFER_VERBOSITY > 0) {
+			ob_start();
+		}
+
+		$errorCount   = $phpcsFile->getErrorCount();
+		$warningCount = $phpcsFile->getWarningCount();
+		$fixableCount = $phpcsFile->getFixableCount();
+		$fixedCount   = ($errors - $fixableCount);
+		echo $report['filename'].">>$errorCount>>$warningCount>>$fixableCount>>$fixedCount".PHP_EOL;
+
+		return $fixed;
+
+	}//end generateFileReport()
+
+
+	/**
+	 * Prints a summary of fixed files.
+	 *
+	 * @param string $cachedData    Any partial report data that was returned from
+	 *                              generateFileReport during the run.
+	 * @param int    $totalFiles    Total number of files processed during the run.
+	 * @param int    $totalErrors   Total number of errors found during the run.
+	 * @param int    $totalWarnings Total number of warnings found during the run.
+	 * @param int    $totalFixable  Total number of problems that can be fixed.
+	 * @param bool   $showSources   Show sources?
+	 * @param int    $width         Maximum allowed line width.
+	 * @param bool   $interactive   Are we running in interactive mode?
+	 * @param bool   $toScreen      Is the report being printed to screen?
+	 *
+	 * @return void
+	 */
+	public function generate(
+		$cachedData,
+		$totalFiles,
+		$totalErrors,
+		$totalWarnings,
+		$totalFixable,
+		$showSources=false,
+		$width=80,
+		$interactive=false,
+		$toScreen=true
+	) {
+		$lines = explode(PHP_EOL, $cachedData);
+		array_pop($lines);
+
+		if (empty($lines) === true) {
+			echo PHP_EOL.'No fixable errors were found'.PHP_EOL;
+			return;
+		}
+
+		$reportFiles = [];
+		$maxLength   = 0;
+		$totalFixed  = 0;
+		$failures    = 0;
+
+		foreach ($lines as $line) {
+			$parts   = explode('>>', $line);
+			$fileLen = strlen($parts[0]);
+			$reportFiles[$parts[0]] = [
+				'errors'   => $parts[1],
+				'warnings' => $parts[2],
+				'fixable'  => $parts[3],
+				'fixed'    => $parts[4],
+				'strlen'   => $fileLen,
+			];
+
+			$maxLength = max($maxLength, $fileLen);
+
+			$totalFixed += $parts[4];
+
+			if ($parts[3] > 0) {
+				$failures++;
+			}
+		}
+
+		$width = min($width, ($maxLength + 21));
+		$width = max($width, 70);
+
+		echo PHP_EOL."\033[1m".'PHPCBF RESULT SUMMARY'."\033[0m".PHP_EOL;
+		echo str_repeat('-', $width).PHP_EOL;
+		echo "\033[1m".'FILE'.str_repeat(' ', ($width - 20)).'FIXED  REMAINING'."\033[0m".PHP_EOL;
+		echo str_repeat('-', $width).PHP_EOL;
+
+		foreach ($reportFiles as $file => $data) {
+			$padding = ($width - 18 - $data['strlen']);
+			if ($padding < 0) {
+				$file    = '...'.substr($file, (($padding * -1) + 3));
+				$padding = 0;
+			}
+
+			echo $file.str_repeat(' ', $padding).'  ';
+
+			if ($data['fixable'] > 0) {
+				echo "\033[31mFAILED TO FIX\033[0m".PHP_EOL;
+				continue;
+			}
+
+			$remaining = ($data['errors'] + $data['warnings']);
+
+			if ($data['fixed'] !== 0) {
+				echo $data['fixed'];
+				echo str_repeat(' ', (7 - strlen((string) $data['fixed'])));
+			} else {
+				echo '0      ';
+			}
+
+			if ($remaining !== 0) {
+				echo $remaining;
+			} else {
+				echo '0';
+			}
+
+			echo PHP_EOL;
+		}//end foreach
+
+		echo str_repeat('-', $width).PHP_EOL;
+		echo "\033[1mA TOTAL OF $totalFixed ERROR";
+		if ($totalFixed !== 1) {
+			echo 'S';
+		}
+
+		$numFiles = count($reportFiles);
+		echo ' WERE FIXED IN '.$numFiles.' FILE';
+		if ($numFiles !== 1) {
+			echo 'S';
+		}
+
+		echo "\033[0m";
+
+		if ($failures > 0) {
+			echo PHP_EOL.str_repeat('-', $width).PHP_EOL;
+			echo "\033[1mPHPCBF FAILED TO FIX $failures FILE";
+			if ($failures !== 1) {
+				echo 'S';
+			}
+
+			echo "\033[0m";
+		}
+
+		echo PHP_EOL.str_repeat('-', $width).PHP_EOL.PHP_EOL;
+
+		if ($toScreen === true && $interactive === false) {
+			Util\Timing::printRunTime();
+		}
+
+	}//end generate()
 
 
 }//end class

Spacing +75 added lines, -75 removed lines

@@ -35,78 +35,78 @@ 
      *
      * @return bool
      */
-    public function generateFileReport($report, File $phpcsFile, $showSources=false, $width=80)
+    public function generateFileReport( $report, File $phpcsFile, $showSources = false, $width = 80 )
     {
         $errors = $phpcsFile->getFixableCount();
-        if ($errors !== 0) {
-            if (PHP_CODESNIFFER_VERBOSITY > 0) {
+        if ( $errors !== 0 ) {
+            if ( PHP_CODESNIFFER_VERBOSITY > 0 ) {
                 ob_end_clean();
-                $startTime = microtime(true);
+                $startTime = microtime( true );
                 echo "\t=> Fixing file: $errors/$errors violations remaining";
             }
 
             $fixed = $phpcsFile->fixer->fixFile();
         }
 
-        if ($phpcsFile->config->stdin === true) {
+        if ( $phpcsFile->config->stdin === true ) {
             // Replacing STDIN, so output current file to STDOUT
             // even if nothing was fixed. Exit here because we
             // can't process any more than 1 file in this setup.
             $fixedContent = $phpcsFile->fixer->getContents();
-            throw new DeepExitException($fixedContent, 1);
+            throw new DeepExitException( $fixedContent, 1 );
         }
 
-        if ($errors === 0) {
+        if ( $errors === 0 ) {
             return false;
         }
 
-        if (PHP_CODESNIFFER_VERBOSITY > 0) {
-            if ($fixed === false) {
+        if ( PHP_CODESNIFFER_VERBOSITY > 0 ) {
+            if ( $fixed === false ) {
                 echo 'ERROR';
             } else {
                 echo 'DONE';
             }
 
-            $timeTaken = ((microtime(true) - $startTime) * 1000);
-            if ($timeTaken < 1000) {
-                $timeTaken = round($timeTaken);
-                echo " in {$timeTaken}ms".PHP_EOL;
+            $timeTaken = ( ( microtime( true ) - $startTime ) * 1000 );
+            if ( $timeTaken < 1000 ) {
+                $timeTaken = round( $timeTaken );
+                echo " in {$timeTaken}ms" . PHP_EOL;
             } else {
-                $timeTaken = round(($timeTaken / 1000), 2);
-                echo " in $timeTaken secs".PHP_EOL;
+                $timeTaken = round( ( $timeTaken / 1000 ), 2 );
+                echo " in $timeTaken secs" . PHP_EOL;
             }
         }
 
-        if ($fixed === true) {
+        if ( $fixed === true ) {
             // The filename in the report may be truncated due to a basepath setting
             // but we are using it for writing here and not display,
             // so find the correct path if basepath is in use.
-            $newFilename = $report['filename'].$phpcsFile->config->suffix;
-            if ($phpcsFile->config->basepath !== null) {
-                $newFilename = $phpcsFile->config->basepath.DIRECTORY_SEPARATOR.$newFilename;
+            $newFilename = $report[ 'filename' ] . $phpcsFile->config->suffix;
+            if ( $phpcsFile->config->basepath !== null ) {
+                $newFilename = $phpcsFile->config->basepath . DIRECTORY_SEPARATOR . $newFilename;
             }
 
             $newContent = $phpcsFile->fixer->getContents();
-            file_put_contents($newFilename, $newContent);
+            file_put_contents( $newFilename, $newContent );
 
-            if (PHP_CODESNIFFER_VERBOSITY > 0) {
-                if ($newFilename === $report['filename']) {
-                    echo "\t=> File was overwritten".PHP_EOL;
+            if ( PHP_CODESNIFFER_VERBOSITY > 0 ) {
+                if ( $newFilename === $report[ 'filename' ] ) {
+                    echo "\t=> File was overwritten" . PHP_EOL;
                 } else {
-                    echo "\t=> Fixed file written to ".basename($newFilename).PHP_EOL;
+                    echo "\t=> Fixed file written to " . basename( $newFilename ) . PHP_EOL;
                 }
             }
         }
 
-        if (PHP_CODESNIFFER_VERBOSITY > 0) {
+        if ( PHP_CODESNIFFER_VERBOSITY > 0 ) {
             ob_start();
         }
 
         $errorCount   = $phpcsFile->getErrorCount();
         $warningCount = $phpcsFile->getWarningCount();
         $fixableCount = $phpcsFile->getFixableCount();
-        $fixedCount   = ($errors - $fixableCount);
-        echo $report['filename'].">>$errorCount>>$warningCount>>$fixableCount>>$fixedCount".PHP_EOL;
+        $fixedCount   = ( $errors - $fixableCount );
+        echo $report[ 'filename' ] . ">>$errorCount>>$warningCount>>$fixableCount>>$fixedCount" . PHP_EOL;
 
         return $fixed;
 
@@ -135,76 +135,76 @@ 
         $totalErrors,
         $totalWarnings,
         $totalFixable,
-        $showSources=false,
-        $width=80,
-        $interactive=false,
-        $toScreen=true
+        $showSources = false,
+        $width = 80,
+        $interactive = false,
+        $toScreen = true
     ) {
-        $lines = explode(PHP_EOL, $cachedData);
-        array_pop($lines);
+        $lines = explode( PHP_EOL, $cachedData );
+        array_pop( $lines );
 
-        if (empty($lines) === true) {
-            echo PHP_EOL.'No fixable errors were found'.PHP_EOL;
+        if ( empty( $lines ) === true ) {
+            echo PHP_EOL . 'No fixable errors were found' . PHP_EOL;
             return;
         }
 
-        $reportFiles = [];
+        $reportFiles = [ ];
         $maxLength   = 0;
         $totalFixed  = 0;
         $failures    = 0;
 
-        foreach ($lines as $line) {
-            $parts   = explode('>>', $line);
-            $fileLen = strlen($parts[0]);
-            $reportFiles[$parts[0]] = [
-                'errors'   => $parts[1],
-                'warnings' => $parts[2],
-                'fixable'  => $parts[3],
-                'fixed'    => $parts[4],
+        foreach ( $lines as $line ) {
+            $parts   = explode( '>>', $line );
+            $fileLen = strlen( $parts[ 0 ] );
+            $reportFiles[ $parts[ 0 ] ] = [
+                'errors'   => $parts[ 1 ],
+                'warnings' => $parts[ 2 ],
+                'fixable'  => $parts[ 3 ],
+                'fixed'    => $parts[ 4 ],
                 'strlen'   => $fileLen,
             ];
 
-            $maxLength = max($maxLength, $fileLen);
+            $maxLength = max( $maxLength, $fileLen );
 
-            $totalFixed += $parts[4];
+            $totalFixed += $parts[ 4 ];
 
-            if ($parts[3] > 0) {
+            if ( $parts[ 3 ] > 0 ) {
                 $failures++;
             }
         }
 
-        $width = min($width, ($maxLength + 21));
-        $width = max($width, 70);
+        $width = min( $width, ( $maxLength + 21 ) );
+        $width = max( $width, 70 );
 
-        echo PHP_EOL."\033[1m".'PHPCBF RESULT SUMMARY'."\033[0m".PHP_EOL;
-        echo str_repeat('-', $width).PHP_EOL;
-        echo "\033[1m".'FILE'.str_repeat(' ', ($width - 20)).'FIXED  REMAINING'."\033[0m".PHP_EOL;
-        echo str_repeat('-', $width).PHP_EOL;
+        echo PHP_EOL . "\033[1m" . 'PHPCBF RESULT SUMMARY' . "\033[0m" . PHP_EOL;
+        echo str_repeat( '-', $width ) . PHP_EOL;
+        echo "\033[1m" . 'FILE' . str_repeat( ' ', ( $width - 20 ) ) . 'FIXED  REMAINING' . "\033[0m" . PHP_EOL;
+        echo str_repeat( '-', $width ) . PHP_EOL;
 
-        foreach ($reportFiles as $file => $data) {
-            $padding = ($width - 18 - $data['strlen']);
-            if ($padding < 0) {
-                $file    = '...'.substr($file, (($padding * -1) + 3));
+        foreach ( $reportFiles as $file => $data ) {
+            $padding = ( $width - 18 - $data[ 'strlen' ] );
+            if ( $padding < 0 ) {
+                $file    = '...' . substr( $file, ( ( $padding * -1 ) + 3 ) );
                 $padding = 0;
             }
 
-            echo $file.str_repeat(' ', $padding).'  ';
+            echo $file . str_repeat( ' ', $padding ) . '  ';
 
-            if ($data['fixable'] > 0) {
-                echo "\033[31mFAILED TO FIX\033[0m".PHP_EOL;
+            if ( $data[ 'fixable' ] > 0 ) {
+                echo "\033[31mFAILED TO FIX\033[0m" . PHP_EOL;
                 continue;
             }
 
-            $remaining = ($data['errors'] + $data['warnings']);
+            $remaining = ( $data[ 'errors' ] + $data[ 'warnings' ] );
 
-            if ($data['fixed'] !== 0) {
-                echo $data['fixed'];
-                echo str_repeat(' ', (7 - strlen((string) $data['fixed'])));
+            if ( $data[ 'fixed' ] !== 0 ) {
+                echo $data[ 'fixed' ];
+                echo str_repeat( ' ', ( 7 - strlen( (string)$data[ 'fixed' ] ) ) );
             } else {
                 echo '0      ';
             }
 
-            if ($remaining !== 0) {
+            if ( $remaining !== 0 ) {
                 echo $remaining;
             } else {
                 echo '0';
@@ -213,33 +213,33 @@ 
             echo PHP_EOL;
         }//end foreach
 
-        echo str_repeat('-', $width).PHP_EOL;
+        echo str_repeat( '-', $width ) . PHP_EOL;
         echo "\033[1mA TOTAL OF $totalFixed ERROR";
-        if ($totalFixed !== 1) {
+        if ( $totalFixed !== 1 ) {
             echo 'S';
         }
 
-        $numFiles = count($reportFiles);
-        echo ' WERE FIXED IN '.$numFiles.' FILE';
-        if ($numFiles !== 1) {
+        $numFiles = count( $reportFiles );
+        echo ' WERE FIXED IN ' . $numFiles . ' FILE';
+        if ( $numFiles !== 1 ) {
             echo 'S';
         }
 
         echo "\033[0m";
 
-        if ($failures > 0) {
-            echo PHP_EOL.str_repeat('-', $width).PHP_EOL;
+        if ( $failures > 0 ) {
+            echo PHP_EOL . str_repeat( '-', $width ) . PHP_EOL;
             echo "\033[1mPHPCBF FAILED TO FIX $failures FILE";
-            if ($failures !== 1) {
+            if ( $failures !== 1 ) {
                 echo 'S';
             }
 
             echo "\033[0m";
         }
 
-        echo PHP_EOL.str_repeat('-', $width).PHP_EOL.PHP_EOL;
+        echo PHP_EOL . str_repeat( '-', $width ) . PHP_EOL . PHP_EOL;
 
-        if ($toScreen === true && $interactive === false) {
+        if ( $toScreen === true && $interactive === false ) {
             Util\Timing::printRunTime();
         }
 

Braces +2 added lines, -4 removed lines

@@ -17,8 +17,7 @@ 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util;
 
-class Cbf implements Report
-{
+class Cbf implements Report {
 
 
     /**
@@ -35,8 +34,7 @@ 
      *
      * @return bool
      */
-    public function generateFileReport($report, File $phpcsFile, $showSources=false, $width=80)
-    {
+    public function generateFileReport($report, File $phpcsFile, $showSources=false, $width=80) {
         $errors = $phpcsFile->getFixableCount();
         if ($errors !== 0) {
             if (PHP_CODESNIFFER_VERBOSITY > 0) {

vendor/squizlabs/php_codesniffer/src/Runner.php

Doc Comments +2 added lines, -2 removed lines

@@ -593,7 +593,7 @@ 
      * @param string $file    The path of the file that raised the error.
      * @param int    $line    The line number the error was raised at.
      *
-     * @return void
+     * @return boolean
      * @throws \PHP_CodeSniffer\Exceptions\RuntimeException
      */
     public function handleErrors($code, $message, $file, $line)
@@ -708,7 +708,7 @@ 
      *
      * @param array $childProcs An array of child processes to wait for.
      *
-     * @return void
+     * @return boolean
      */
     private function processChildProcs($childProcs)
     {

Indentation +853 added lines, -853 removed lines

@@ -24,863 +24,863 @@
 class Runner
 {
 
-    /**
-     * The config data for the run.
-     *
-     * @var \PHP_CodeSniffer\Config
-     */
-    public $config = null;
-
-    /**
-     * The ruleset used for the run.
-     *
-     * @var \PHP_CodeSniffer\Ruleset
-     */
-    public $ruleset = null;
-
-    /**
-     * The reporter used for generating reports after the run.
-     *
-     * @var \PHP_CodeSniffer\Reporter
-     */
-    public $reporter = null;
-
-
-    /**
-     * Run the PHPCS script.
-     *
-     * @return array
-     */
-    public function runPHPCS()
-    {
-        try {
-            Util\Timing::startTiming();
-            Runner::checkRequirements();
-
-            if (defined('PHP_CODESNIFFER_CBF') === false) {
-                define('PHP_CODESNIFFER_CBF', false);
-            }
-
-            // Creating the Config object populates it with all required settings
-            // based on the CLI arguments provided to the script and any config
-            // values the user has set.
-            $this->config = new Config();
-
-            // Init the run and load the rulesets to set additional config vars.
-            $this->init();
-
-            // Print a list of sniffs in each of the supplied standards.
-            // We fudge the config here so that each standard is explained in isolation.
-            if ($this->config->explain === true) {
-                $standards = $this->config->standards;
-                foreach ($standards as $standard) {
-                    $this->config->standards = [$standard];
-                    $ruleset = new Ruleset($this->config);
-                    $ruleset->explain();
-                }
-
-                return 0;
-            }
-
-            // Generate documentation for each of the supplied standards.
-            if ($this->config->generator !== null) {
-                $standards = $this->config->standards;
-                foreach ($standards as $standard) {
-                    $this->config->standards = [$standard];
-                    $ruleset   = new Ruleset($this->config);
-                    $class     = 'PHP_CodeSniffer\Generators\\'.$this->config->generator;
-                    $generator = new $class($ruleset);
-                    $generator->generate();
-                }
-
-                return 0;
-            }
-
-            // Other report formats don't really make sense in interactive mode
-            // so we hard-code the full report here and when outputting.
-            // We also ensure parallel processing is off because we need to do one file at a time.
-            if ($this->config->interactive === true) {
-                $this->config->reports      = ['full' => null];
-                $this->config->parallel     = 1;
-                $this->config->showProgress = false;
-            }
-
-            // Disable caching if we are processing STDIN as we can't be 100%
-            // sure where the file came from or if it will change in the future.
-            if ($this->config->stdin === true) {
-                $this->config->cache = false;
-            }
-
-            $numErrors = $this->run();
-
-            // Print all the reports for this run.
-            $toScreen = $this->reporter->printReports();
-
-            // Only print timer output if no reports were
-            // printed to the screen so we don't put additional output
-            // in something like an XML report. If we are printing to screen,
-            // the report types would have already worked out who should
-            // print the timer info.
-            if ($this->config->interactive === false
-                && ($toScreen === false
-                || (($this->reporter->totalErrors + $this->reporter->totalWarnings) === 0 && $this->config->showProgress === true))
-            ) {
-                Util\Timing::printRunTime();
-            }
-        } catch (DeepExitException $e) {
-            echo $e->getMessage();
-            return $e->getCode();
-        }//end try
-
-        if ($numErrors === 0) {
-            // No errors found.
-            return 0;
-        } else if ($this->reporter->totalFixable === 0) {
-            // Errors found, but none of them can be fixed by PHPCBF.
-            return 1;
-        } else {
-            // Errors found, and some can be fixed by PHPCBF.
-            return 2;
-        }
-
-    }//end runPHPCS()
-
-
-    /**
-     * Run the PHPCBF script.
-     *
-     * @return array
-     */
-    public function runPHPCBF()
-    {
-        if (defined('PHP_CODESNIFFER_CBF') === false) {
-            define('PHP_CODESNIFFER_CBF', true);
-        }
-
-        try {
-            Util\Timing::startTiming();
-            Runner::checkRequirements();
-
-            // Creating the Config object populates it with all required settings
-            // based on the CLI arguments provided to the script and any config
-            // values the user has set.
-            $this->config = new Config();
-
-            // When processing STDIN, we can't output anything to the screen
-            // or it will end up mixed in with the file output.
-            if ($this->config->stdin === true) {
-                $this->config->verbosity = 0;
-            }
-
-            // Init the run and load the rulesets to set additional config vars.
-            $this->init();
-
-            // When processing STDIN, we only process one file at a time and
-            // we don't process all the way through, so we can't use the parallel
-            // running system.
-            if ($this->config->stdin === true) {
-                $this->config->parallel = 1;
-            }
-
-            // Override some of the command line settings that might break the fixes.
-            $this->config->generator    = null;
-            $this->config->explain      = false;
-            $this->config->interactive  = false;
-            $this->config->cache        = false;
-            $this->config->showSources  = false;
-            $this->config->recordErrors = false;
-            $this->config->reportFile   = null;
-            $this->config->reports      = ['cbf' => null];
-
-            // If a standard tries to set command line arguments itself, some
-            // may be blocked because PHPCBF is running, so stop the script
-            // dying if any are found.
-            $this->config->dieOnUnknownArg = false;
-
-            $this->run();
-            $this->reporter->printReports();
-
-            echo PHP_EOL;
-            Util\Timing::printRunTime();
-        } catch (DeepExitException $e) {
-            echo $e->getMessage();
-            return $e->getCode();
-        }//end try
-
-        if ($this->reporter->totalFixed === 0) {
-            // Nothing was fixed by PHPCBF.
-            if ($this->reporter->totalFixable === 0) {
-                // Nothing found that could be fixed.
-                return 0;
-            } else {
-                // Something failed to fix.
-                return 2;
-            }
-        }
-
-        if ($this->reporter->totalFixable === 0) {
-            // PHPCBF fixed all fixable errors.
-            return 1;
-        }
-
-        // PHPCBF fixed some fixable errors, but others failed to fix.
-        return 2;
-
-    }//end runPHPCBF()
-
-
-    /**
-     * Exits if the minimum requirements of PHP_CodeSniffer are not met.
-     *
-     * @return array
-     * @throws \PHP_CodeSniffer\Exceptions\DeepExitException
-     */
-    public function checkRequirements()
-    {
-        // Check the PHP version.
-        if (PHP_VERSION_ID < 50400) {
-            $error = 'ERROR: PHP_CodeSniffer requires PHP version 5.4.0 or greater.'.PHP_EOL;
-            throw new DeepExitException($error, 3);
-        }
-
-        $requiredExtensions = [
-            'tokenizer',
-            'xmlwriter',
-            'SimpleXML',
-        ];
-        $missingExtensions  = [];
-
-        foreach ($requiredExtensions as $extension) {
-            if (extension_loaded($extension) === false) {
-                $missingExtensions[] = $extension;
-            }
-        }
-
-        if (empty($missingExtensions) === false) {
-            $last      = array_pop($requiredExtensions);
-            $required  = implode(', ', $requiredExtensions);
-            $required .= ' and '.$last;
-
-            if (count($missingExtensions) === 1) {
-                $missing = $missingExtensions[0];
-            } else {
-                $last     = array_pop($missingExtensions);
-                $missing  = implode(', ', $missingExtensions);
-                $missing .= ' and '.$last;
-            }
-
-            $error = 'ERROR: PHP_CodeSniffer requires the %s extensions to be enabled. Please enable %s.'.PHP_EOL;
-            $error = sprintf($error, $required, $missing);
-            throw new DeepExitException($error, 3);
-        }
-
-    }//end checkRequirements()
-
-
-    /**
-     * Init the rulesets and other high-level settings.
-     *
-     * @return void
-     * @throws \PHP_CodeSniffer\Exceptions\DeepExitException
-     */
-    public function init()
-    {
-        if (defined('PHP_CODESNIFFER_CBF') === false) {
-            define('PHP_CODESNIFFER_CBF', false);
-        }
-
-        // Ensure this option is enabled or else line endings will not always
-        // be detected properly for files created on a Mac with the /r line ending.
-        ini_set('auto_detect_line_endings', true);
-
-        // Disable the PCRE JIT as this caused issues with parallel running.
-        ini_set('pcre.jit', false);
-
-        // Check that the standards are valid.
-        foreach ($this->config->standards as $standard) {
-            if (Util\Standards::isInstalledStandard($standard) === false) {
-                // They didn't select a valid coding standard, so help them
-                // out by letting them know which standards are installed.
-                $error = 'ERROR: the "'.$standard.'" coding standard is not installed. ';
-                ob_start();
-                Util\Standards::printInstalledStandards();
-                $error .= ob_get_contents();
-                ob_end_clean();
-                throw new DeepExitException($error, 3);
-            }
-        }
-
-        // Saves passing the Config object into other objects that only need
-        // the verbosity flag for debug output.
-        if (defined('PHP_CODESNIFFER_VERBOSITY') === false) {
-            define('PHP_CODESNIFFER_VERBOSITY', $this->config->verbosity);
-        }
-
-        // Create this class so it is autoloaded and sets up a bunch
-        // of PHP_CodeSniffer-specific token type constants.
-        $tokens = new Util\Tokens();
-
-        // Allow autoloading of custom files inside installed standards.
-        $installedStandards = Standards::getInstalledStandardDetails();
-        foreach ($installedStandards as $name => $details) {
-            Autoload::addSearchPath($details['path'], $details['namespace']);
-        }
-
-        // The ruleset contains all the information about how the files
-        // should be checked and/or fixed.
-        try {
-            $this->ruleset = new Ruleset($this->config);
-        } catch (RuntimeException $e) {
-            $error  = 'ERROR: '.$e->getMessage().PHP_EOL.PHP_EOL;
-            $error .= $this->config->printShortUsage(true);
-            throw new DeepExitException($error, 3);
-        }
-
-    }//end init()
-
-
-    /**
-     * Performs the run.
-     *
-     * @return int The number of errors and warnings found.
-     * @throws \PHP_CodeSniffer\Exceptions\DeepExitException
-     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException
-     */
-    private function run()
-    {
-        // The class that manages all reporters for the run.
-        $this->reporter = new Reporter($this->config);
-
-        // Include bootstrap files.
-        foreach ($this->config->bootstrap as $bootstrap) {
-            include $bootstrap;
-        }
-
-        if ($this->config->stdin === true) {
-            $fileContents = $this->config->stdinContent;
-            if ($fileContents === null) {
-                $handle = fopen('php://stdin', 'r');
-                stream_set_blocking($handle, true);
-                $fileContents = stream_get_contents($handle);
-                fclose($handle);
-            }
-
-            $todo  = new FileList($this->config, $this->ruleset);
-            $dummy = new DummyFile($fileContents, $this->ruleset, $this->config);
-            $todo->addFile($dummy->path, $dummy);
-        } else {
-            if (empty($this->config->files) === true) {
-                $error  = 'ERROR: You must supply at least one file or directory to process.'.PHP_EOL.PHP_EOL;
-                $error .= $this->config->printShortUsage(true);
-                throw new DeepExitException($error, 3);
-            }
-
-            if (PHP_CODESNIFFER_VERBOSITY > 0) {
-                echo 'Creating file list... ';
-            }
-
-            $todo = new FileList($this->config, $this->ruleset);
-
-            if (PHP_CODESNIFFER_VERBOSITY > 0) {
-                $numFiles = count($todo);
-                echo "DONE ($numFiles files in queue)".PHP_EOL;
-            }
-
-            if ($this->config->cache === true) {
-                if (PHP_CODESNIFFER_VERBOSITY > 0) {
-                    echo 'Loading cache... ';
-                }
-
-                Cache::load($this->ruleset, $this->config);
-
-                if (PHP_CODESNIFFER_VERBOSITY > 0) {
-                    $size = Cache::getSize();
-                    echo "DONE ($size files in cache)".PHP_EOL;
-                }
-            }
-        }//end if
-
-        // Turn all sniff errors into exceptions.
-        set_error_handler([$this, 'handleErrors']);
-
-        // If verbosity is too high, turn off parallelism so the
-        // debug output is clean.
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            $this->config->parallel = 1;
-        }
-
-        // If the PCNTL extension isn't installed, we can't fork.
-        if (function_exists('pcntl_fork') === false) {
-            $this->config->parallel = 1;
-        }
-
-        $lastDir  = '';
-        $numFiles = count($todo);
-
-        if ($this->config->parallel === 1) {
-            // Running normally.
-            $numProcessed = 0;
-            foreach ($todo as $path => $file) {
-                if ($file->ignored === false) {
-                    $currDir = dirname($path);
-                    if ($lastDir !== $currDir) {
-                        if (PHP_CODESNIFFER_VERBOSITY > 0) {
-                            echo 'Changing into directory '.Common::stripBasepath($currDir, $this->config->basepath).PHP_EOL;
-                        }
-
-                        $lastDir = $currDir;
-                    }
-
-                    $this->processFile($file);
-                } else if (PHP_CODESNIFFER_VERBOSITY > 0) {
-                    echo 'Skipping '.basename($file->path).PHP_EOL;
-                }
-
-                $numProcessed++;
-                $this->printProgress($file, $numFiles, $numProcessed);
-            }
-        } else {
-            // Batching and forking.
-            $childProcs  = [];
-            $numPerBatch = ceil($numFiles / $this->config->parallel);
-
-            for ($batch = 0; $batch < $this->config->parallel; $batch++) {
-                $startAt = ($batch * $numPerBatch);
-                if ($startAt >= $numFiles) {
-                    break;
-                }
-
-                $endAt = ($startAt + $numPerBatch);
-                if ($endAt > $numFiles) {
-                    $endAt = $numFiles;
-                }
-
-                $childOutFilename = tempnam(sys_get_temp_dir(), 'phpcs-child');
-                $pid = pcntl_fork();
-                if ($pid === -1) {
-                    throw new RuntimeException('Failed to create child process');
-                } else if ($pid !== 0) {
-                    $childProcs[] = [
-                        'pid' => $pid,
-                        'out' => $childOutFilename,
-                    ];
-                } else {
-                    // Move forward to the start of the batch.
-                    $todo->rewind();
-                    for ($i = 0; $i < $startAt; $i++) {
-                        $todo->next();
-                    }
-
-                    // Reset the reporter to make sure only figures from this
-                    // file batch are recorded.
-                    $this->reporter->totalFiles    = 0;
-                    $this->reporter->totalErrors   = 0;
-                    $this->reporter->totalWarnings = 0;
-                    $this->reporter->totalFixable  = 0;
-                    $this->reporter->totalFixed    = 0;
-
-                    // Process the files.
-                    $pathsProcessed = [];
-                    ob_start();
-                    for ($i = $startAt; $i < $endAt; $i++) {
-                        $path = $todo->key();
-                        $file = $todo->current();
-
-                        if ($file->ignored === true) {
-                            continue;
-                        }
-
-                        $currDir = dirname($path);
-                        if ($lastDir !== $currDir) {
-                            if (PHP_CODESNIFFER_VERBOSITY > 0) {
-                                echo 'Changing into directory '.Common::stripBasepath($currDir, $this->config->basepath).PHP_EOL;
-                            }
-
-                            $lastDir = $currDir;
-                        }
-
-                        $this->processFile($file);
-
-                        $pathsProcessed[] = $path;
-                        $todo->next();
-                    }//end for
-
-                    $debugOutput = ob_get_contents();
-                    ob_end_clean();
-
-                    // Write information about the run to the filesystem
-                    // so it can be picked up by the main process.
-                    $childOutput = [
-                        'totalFiles'    => $this->reporter->totalFiles,
-                        'totalErrors'   => $this->reporter->totalErrors,
-                        'totalWarnings' => $this->reporter->totalWarnings,
-                        'totalFixable'  => $this->reporter->totalFixable,
-                        'totalFixed'    => $this->reporter->totalFixed,
-                    ];
-
-                    $output  = '<'.'?php'."\n".' $childOutput = ';
-                    $output .= var_export($childOutput, true);
-                    $output .= ";\n\$debugOutput = ";
-                    $output .= var_export($debugOutput, true);
-
-                    if ($this->config->cache === true) {
-                        $childCache = [];
-                        foreach ($pathsProcessed as $path) {
-                            $childCache[$path] = Cache::get($path);
-                        }
-
-                        $output .= ";\n\$childCache = ";
-                        $output .= var_export($childCache, true);
-                    }
-
-                    $output .= ";\n?".'>';
-                    file_put_contents($childOutFilename, $output);
-                    exit($pid);
-                }//end if
-            }//end for
-
-            $success = $this->processChildProcs($childProcs);
-            if ($success === false) {
-                throw new RuntimeException('One or more child processes failed to run');
-            }
-        }//end if
-
-        restore_error_handler();
-
-        if (PHP_CODESNIFFER_VERBOSITY === 0
-            && $this->config->interactive === false
-            && $this->config->showProgress === true
-        ) {
-            echo PHP_EOL.PHP_EOL;
-        }
-
-        if ($this->config->cache === true) {
-            Cache::save();
-        }
-
-        $ignoreWarnings = Config::getConfigData('ignore_warnings_on_exit');
-        $ignoreErrors   = Config::getConfigData('ignore_errors_on_exit');
-
-        $return = ($this->reporter->totalErrors + $this->reporter->totalWarnings);
-        if ($ignoreErrors !== null) {
-            $ignoreErrors = (bool) $ignoreErrors;
-            if ($ignoreErrors === true) {
-                $return -= $this->reporter->totalErrors;
-            }
-        }
-
-        if ($ignoreWarnings !== null) {
-            $ignoreWarnings = (bool) $ignoreWarnings;
-            if ($ignoreWarnings === true) {
-                $return -= $this->reporter->totalWarnings;
-            }
-        }
-
-        return $return;
-
-    }//end run()
-
-
-    /**
-     * Converts all PHP errors into exceptions.
-     *
-     * This method forces a sniff to stop processing if it is not
-     * able to handle a specific piece of code, instead of continuing
-     * and potentially getting into a loop.
-     *
-     * @param int    $code    The level of error raised.
-     * @param string $message The error message.
-     * @param string $file    The path of the file that raised the error.
-     * @param int    $line    The line number the error was raised at.
-     *
-     * @return void
-     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException
-     */
-    public function handleErrors($code, $message, $file, $line)
-    {
-        if ((error_reporting() & $code) === 0) {
-            // This type of error is being muted.
-            return true;
-        }
-
-        throw new RuntimeException("$message in $file on line $line");
-
-    }//end handleErrors()
-
-
-    /**
-     * Processes a single file, including checking and fixing.
-     *
-     * @param \PHP_CodeSniffer\Files\File $file The file to be processed.
-     *
-     * @return void
-     * @throws \PHP_CodeSniffer\Exceptions\DeepExitException
-     */
-    public function processFile($file)
-    {
-        if (PHP_CODESNIFFER_VERBOSITY > 0) {
-            $startTime = microtime(true);
-            echo 'Processing '.basename($file->path).' ';
-            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                echo PHP_EOL;
-            }
-        }
-
-        try {
-            $file->process();
-
-            if (PHP_CODESNIFFER_VERBOSITY > 0) {
-                $timeTaken = ((microtime(true) - $startTime) * 1000);
-                if ($timeTaken < 1000) {
-                    $timeTaken = round($timeTaken);
-                    echo "DONE in {$timeTaken}ms";
-                } else {
-                    $timeTaken = round(($timeTaken / 1000), 2);
-                    echo "DONE in $timeTaken secs";
-                }
-
-                if (PHP_CODESNIFFER_CBF === true) {
-                    $errors = $file->getFixableCount();
-                    echo " ($errors fixable violations)".PHP_EOL;
-                } else {
-                    $errors   = $file->getErrorCount();
-                    $warnings = $file->getWarningCount();
-                    echo " ($errors errors, $warnings warnings)".PHP_EOL;
-                }
-            }
-        } catch (\Exception $e) {
-            $error = 'An error occurred during processing; checking has been aborted. The error message was: '.$e->getMessage();
-            $file->addErrorOnLine($error, 1, 'Internal.Exception');
-        }//end try
-
-        $this->reporter->cacheFileReport($file, $this->config);
-
-        if ($this->config->interactive === true) {
-            /*
+	/**
+	 * The config data for the run.
+	 *
+	 * @var \PHP_CodeSniffer\Config
+	 */
+	public $config = null;
+
+	/**
+	 * The ruleset used for the run.
+	 *
+	 * @var \PHP_CodeSniffer\Ruleset
+	 */
+	public $ruleset = null;
+
+	/**
+	 * The reporter used for generating reports after the run.
+	 *
+	 * @var \PHP_CodeSniffer\Reporter
+	 */
+	public $reporter = null;
+
+
+	/**
+	 * Run the PHPCS script.
+	 *
+	 * @return array
+	 */
+	public function runPHPCS()
+	{
+		try {
+			Util\Timing::startTiming();
+			Runner::checkRequirements();
+
+			if (defined('PHP_CODESNIFFER_CBF') === false) {
+				define('PHP_CODESNIFFER_CBF', false);
+			}
+
+			// Creating the Config object populates it with all required settings
+			// based on the CLI arguments provided to the script and any config
+			// values the user has set.
+			$this->config = new Config();
+
+			// Init the run and load the rulesets to set additional config vars.
+			$this->init();
+
+			// Print a list of sniffs in each of the supplied standards.
+			// We fudge the config here so that each standard is explained in isolation.
+			if ($this->config->explain === true) {
+				$standards = $this->config->standards;
+				foreach ($standards as $standard) {
+					$this->config->standards = [$standard];
+					$ruleset = new Ruleset($this->config);
+					$ruleset->explain();
+				}
+
+				return 0;
+			}
+
+			// Generate documentation for each of the supplied standards.
+			if ($this->config->generator !== null) {
+				$standards = $this->config->standards;
+				foreach ($standards as $standard) {
+					$this->config->standards = [$standard];
+					$ruleset   = new Ruleset($this->config);
+					$class     = 'PHP_CodeSniffer\Generators\\'.$this->config->generator;
+					$generator = new $class($ruleset);
+					$generator->generate();
+				}
+
+				return 0;
+			}
+
+			// Other report formats don't really make sense in interactive mode
+			// so we hard-code the full report here and when outputting.
+			// We also ensure parallel processing is off because we need to do one file at a time.
+			if ($this->config->interactive === true) {
+				$this->config->reports      = ['full' => null];
+				$this->config->parallel     = 1;
+				$this->config->showProgress = false;
+			}
+
+			// Disable caching if we are processing STDIN as we can't be 100%
+			// sure where the file came from or if it will change in the future.
+			if ($this->config->stdin === true) {
+				$this->config->cache = false;
+			}
+
+			$numErrors = $this->run();
+
+			// Print all the reports for this run.
+			$toScreen = $this->reporter->printReports();
+
+			// Only print timer output if no reports were
+			// printed to the screen so we don't put additional output
+			// in something like an XML report. If we are printing to screen,
+			// the report types would have already worked out who should
+			// print the timer info.
+			if ($this->config->interactive === false
+				&& ($toScreen === false
+				|| (($this->reporter->totalErrors + $this->reporter->totalWarnings) === 0 && $this->config->showProgress === true))
+			) {
+				Util\Timing::printRunTime();
+			}
+		} catch (DeepExitException $e) {
+			echo $e->getMessage();
+			return $e->getCode();
+		}//end try
+
+		if ($numErrors === 0) {
+			// No errors found.
+			return 0;
+		} else if ($this->reporter->totalFixable === 0) {
+			// Errors found, but none of them can be fixed by PHPCBF.
+			return 1;
+		} else {
+			// Errors found, and some can be fixed by PHPCBF.
+			return 2;
+		}
+
+	}//end runPHPCS()
+
+
+	/**
+	 * Run the PHPCBF script.
+	 *
+	 * @return array
+	 */
+	public function runPHPCBF()
+	{
+		if (defined('PHP_CODESNIFFER_CBF') === false) {
+			define('PHP_CODESNIFFER_CBF', true);
+		}
+
+		try {
+			Util\Timing::startTiming();
+			Runner::checkRequirements();
+
+			// Creating the Config object populates it with all required settings
+			// based on the CLI arguments provided to the script and any config
+			// values the user has set.
+			$this->config = new Config();
+
+			// When processing STDIN, we can't output anything to the screen
+			// or it will end up mixed in with the file output.
+			if ($this->config->stdin === true) {
+				$this->config->verbosity = 0;
+			}
+
+			// Init the run and load the rulesets to set additional config vars.
+			$this->init();
+
+			// When processing STDIN, we only process one file at a time and
+			// we don't process all the way through, so we can't use the parallel
+			// running system.
+			if ($this->config->stdin === true) {
+				$this->config->parallel = 1;
+			}
+
+			// Override some of the command line settings that might break the fixes.
+			$this->config->generator    = null;
+			$this->config->explain      = false;
+			$this->config->interactive  = false;
+			$this->config->cache        = false;
+			$this->config->showSources  = false;
+			$this->config->recordErrors = false;
+			$this->config->reportFile   = null;
+			$this->config->reports      = ['cbf' => null];
+
+			// If a standard tries to set command line arguments itself, some
+			// may be blocked because PHPCBF is running, so stop the script
+			// dying if any are found.
+			$this->config->dieOnUnknownArg = false;
+
+			$this->run();
+			$this->reporter->printReports();
+
+			echo PHP_EOL;
+			Util\Timing::printRunTime();
+		} catch (DeepExitException $e) {
+			echo $e->getMessage();
+			return $e->getCode();
+		}//end try
+
+		if ($this->reporter->totalFixed === 0) {
+			// Nothing was fixed by PHPCBF.
+			if ($this->reporter->totalFixable === 0) {
+				// Nothing found that could be fixed.
+				return 0;
+			} else {
+				// Something failed to fix.
+				return 2;
+			}
+		}
+
+		if ($this->reporter->totalFixable === 0) {
+			// PHPCBF fixed all fixable errors.
+			return 1;
+		}
+
+		// PHPCBF fixed some fixable errors, but others failed to fix.
+		return 2;
+
+	}//end runPHPCBF()
+
+
+	/**
+	 * Exits if the minimum requirements of PHP_CodeSniffer are not met.
+	 *
+	 * @return array
+	 * @throws \PHP_CodeSniffer\Exceptions\DeepExitException
+	 */
+	public function checkRequirements()
+	{
+		// Check the PHP version.
+		if (PHP_VERSION_ID < 50400) {
+			$error = 'ERROR: PHP_CodeSniffer requires PHP version 5.4.0 or greater.'.PHP_EOL;
+			throw new DeepExitException($error, 3);
+		}
+
+		$requiredExtensions = [
+			'tokenizer',
+			'xmlwriter',
+			'SimpleXML',
+		];
+		$missingExtensions  = [];
+
+		foreach ($requiredExtensions as $extension) {
+			if (extension_loaded($extension) === false) {
+				$missingExtensions[] = $extension;
+			}
+		}
+
+		if (empty($missingExtensions) === false) {
+			$last      = array_pop($requiredExtensions);
+			$required  = implode(', ', $requiredExtensions);
+			$required .= ' and '.$last;
+
+			if (count($missingExtensions) === 1) {
+				$missing = $missingExtensions[0];
+			} else {
+				$last     = array_pop($missingExtensions);
+				$missing  = implode(', ', $missingExtensions);
+				$missing .= ' and '.$last;
+			}
+
+			$error = 'ERROR: PHP_CodeSniffer requires the %s extensions to be enabled. Please enable %s.'.PHP_EOL;
+			$error = sprintf($error, $required, $missing);
+			throw new DeepExitException($error, 3);
+		}
+
+	}//end checkRequirements()
+
+
+	/**
+	 * Init the rulesets and other high-level settings.
+	 *
+	 * @return void
+	 * @throws \PHP_CodeSniffer\Exceptions\DeepExitException
+	 */
+	public function init()
+	{
+		if (defined('PHP_CODESNIFFER_CBF') === false) {
+			define('PHP_CODESNIFFER_CBF', false);
+		}
+
+		// Ensure this option is enabled or else line endings will not always
+		// be detected properly for files created on a Mac with the /r line ending.
+		ini_set('auto_detect_line_endings', true);
+
+		// Disable the PCRE JIT as this caused issues with parallel running.
+		ini_set('pcre.jit', false);
+
+		// Check that the standards are valid.
+		foreach ($this->config->standards as $standard) {
+			if (Util\Standards::isInstalledStandard($standard) === false) {
+				// They didn't select a valid coding standard, so help them
+				// out by letting them know which standards are installed.
+				$error = 'ERROR: the "'.$standard.'" coding standard is not installed. ';
+				ob_start();
+				Util\Standards::printInstalledStandards();
+				$error .= ob_get_contents();
+				ob_end_clean();
+				throw new DeepExitException($error, 3);
+			}
+		}
+
+		// Saves passing the Config object into other objects that only need
+		// the verbosity flag for debug output.
+		if (defined('PHP_CODESNIFFER_VERBOSITY') === false) {
+			define('PHP_CODESNIFFER_VERBOSITY', $this->config->verbosity);
+		}
+
+		// Create this class so it is autoloaded and sets up a bunch
+		// of PHP_CodeSniffer-specific token type constants.
+		$tokens = new Util\Tokens();
+
+		// Allow autoloading of custom files inside installed standards.
+		$installedStandards = Standards::getInstalledStandardDetails();
+		foreach ($installedStandards as $name => $details) {
+			Autoload::addSearchPath($details['path'], $details['namespace']);
+		}
+
+		// The ruleset contains all the information about how the files
+		// should be checked and/or fixed.
+		try {
+			$this->ruleset = new Ruleset($this->config);
+		} catch (RuntimeException $e) {
+			$error  = 'ERROR: '.$e->getMessage().PHP_EOL.PHP_EOL;
+			$error .= $this->config->printShortUsage(true);
+			throw new DeepExitException($error, 3);
+		}
+
+	}//end init()
+
+
+	/**
+	 * Performs the run.
+	 *
+	 * @return int The number of errors and warnings found.
+	 * @throws \PHP_CodeSniffer\Exceptions\DeepExitException
+	 * @throws \PHP_CodeSniffer\Exceptions\RuntimeException
+	 */
+	private function run()
+	{
+		// The class that manages all reporters for the run.
+		$this->reporter = new Reporter($this->config);
+
+		// Include bootstrap files.
+		foreach ($this->config->bootstrap as $bootstrap) {
+			include $bootstrap;
+		}
+
+		if ($this->config->stdin === true) {
+			$fileContents = $this->config->stdinContent;
+			if ($fileContents === null) {
+				$handle = fopen('php://stdin', 'r');
+				stream_set_blocking($handle, true);
+				$fileContents = stream_get_contents($handle);
+				fclose($handle);
+			}
+
+			$todo  = new FileList($this->config, $this->ruleset);
+			$dummy = new DummyFile($fileContents, $this->ruleset, $this->config);
+			$todo->addFile($dummy->path, $dummy);
+		} else {
+			if (empty($this->config->files) === true) {
+				$error  = 'ERROR: You must supply at least one file or directory to process.'.PHP_EOL.PHP_EOL;
+				$error .= $this->config->printShortUsage(true);
+				throw new DeepExitException($error, 3);
+			}
+
+			if (PHP_CODESNIFFER_VERBOSITY > 0) {
+				echo 'Creating file list... ';
+			}
+
+			$todo = new FileList($this->config, $this->ruleset);
+
+			if (PHP_CODESNIFFER_VERBOSITY > 0) {
+				$numFiles = count($todo);
+				echo "DONE ($numFiles files in queue)".PHP_EOL;
+			}
+
+			if ($this->config->cache === true) {
+				if (PHP_CODESNIFFER_VERBOSITY > 0) {
+					echo 'Loading cache... ';
+				}
+
+				Cache::load($this->ruleset, $this->config);
+
+				if (PHP_CODESNIFFER_VERBOSITY > 0) {
+					$size = Cache::getSize();
+					echo "DONE ($size files in cache)".PHP_EOL;
+				}
+			}
+		}//end if
+
+		// Turn all sniff errors into exceptions.
+		set_error_handler([$this, 'handleErrors']);
+
+		// If verbosity is too high, turn off parallelism so the
+		// debug output is clean.
+		if (PHP_CODESNIFFER_VERBOSITY > 1) {
+			$this->config->parallel = 1;
+		}
+
+		// If the PCNTL extension isn't installed, we can't fork.
+		if (function_exists('pcntl_fork') === false) {
+			$this->config->parallel = 1;
+		}
+
+		$lastDir  = '';
+		$numFiles = count($todo);
+
+		if ($this->config->parallel === 1) {
+			// Running normally.
+			$numProcessed = 0;
+			foreach ($todo as $path => $file) {
+				if ($file->ignored === false) {
+					$currDir = dirname($path);
+					if ($lastDir !== $currDir) {
+						if (PHP_CODESNIFFER_VERBOSITY > 0) {
+							echo 'Changing into directory '.Common::stripBasepath($currDir, $this->config->basepath).PHP_EOL;
+						}
+
+						$lastDir = $currDir;
+					}
+
+					$this->processFile($file);
+				} else if (PHP_CODESNIFFER_VERBOSITY > 0) {
+					echo 'Skipping '.basename($file->path).PHP_EOL;
+				}
+
+				$numProcessed++;
+				$this->printProgress($file, $numFiles, $numProcessed);
+			}
+		} else {
+			// Batching and forking.
+			$childProcs  = [];
+			$numPerBatch = ceil($numFiles / $this->config->parallel);
+
+			for ($batch = 0; $batch < $this->config->parallel; $batch++) {
+				$startAt = ($batch * $numPerBatch);
+				if ($startAt >= $numFiles) {
+					break;
+				}
+
+				$endAt = ($startAt + $numPerBatch);
+				if ($endAt > $numFiles) {
+					$endAt = $numFiles;
+				}
+
+				$childOutFilename = tempnam(sys_get_temp_dir(), 'phpcs-child');
+				$pid = pcntl_fork();
+				if ($pid === -1) {
+					throw new RuntimeException('Failed to create child process');
+				} else if ($pid !== 0) {
+					$childProcs[] = [
+						'pid' => $pid,
+						'out' => $childOutFilename,
+					];
+				} else {
+					// Move forward to the start of the batch.
+					$todo->rewind();
+					for ($i = 0; $i < $startAt; $i++) {
+						$todo->next();
+					}
+
+					// Reset the reporter to make sure only figures from this
+					// file batch are recorded.
+					$this->reporter->totalFiles    = 0;
+					$this->reporter->totalErrors   = 0;
+					$this->reporter->totalWarnings = 0;
+					$this->reporter->totalFixable  = 0;
+					$this->reporter->totalFixed    = 0;
+
+					// Process the files.
+					$pathsProcessed = [];
+					ob_start();
+					for ($i = $startAt; $i < $endAt; $i++) {
+						$path = $todo->key();
+						$file = $todo->current();
+
+						if ($file->ignored === true) {
+							continue;
+						}
+
+						$currDir = dirname($path);
+						if ($lastDir !== $currDir) {
+							if (PHP_CODESNIFFER_VERBOSITY > 0) {
+								echo 'Changing into directory '.Common::stripBasepath($currDir, $this->config->basepath).PHP_EOL;
+							}
+
+							$lastDir = $currDir;
+						}
+
+						$this->processFile($file);
+
+						$pathsProcessed[] = $path;
+						$todo->next();
+					}//end for
+
+					$debugOutput = ob_get_contents();
+					ob_end_clean();
+
+					// Write information about the run to the filesystem
+					// so it can be picked up by the main process.
+					$childOutput = [
+						'totalFiles'    => $this->reporter->totalFiles,
+						'totalErrors'   => $this->reporter->totalErrors,
+						'totalWarnings' => $this->reporter->totalWarnings,
+						'totalFixable'  => $this->reporter->totalFixable,
+						'totalFixed'    => $this->reporter->totalFixed,
+					];
+
+					$output  = '<'.'?php'."\n".' $childOutput = ';
+					$output .= var_export($childOutput, true);
+					$output .= ";\n\$debugOutput = ";
+					$output .= var_export($debugOutput, true);
+
+					if ($this->config->cache === true) {
+						$childCache = [];
+						foreach ($pathsProcessed as $path) {
+							$childCache[$path] = Cache::get($path);
+						}
+
+						$output .= ";\n\$childCache = ";
+						$output .= var_export($childCache, true);
+					}
+
+					$output .= ";\n?".'>';
+					file_put_contents($childOutFilename, $output);
+					exit($pid);
+				}//end if
+			}//end for
+
+			$success = $this->processChildProcs($childProcs);
+			if ($success === false) {
+				throw new RuntimeException('One or more child processes failed to run');
+			}
+		}//end if
+
+		restore_error_handler();
+
+		if (PHP_CODESNIFFER_VERBOSITY === 0
+			&& $this->config->interactive === false
+			&& $this->config->showProgress === true
+		) {
+			echo PHP_EOL.PHP_EOL;
+		}
+
+		if ($this->config->cache === true) {
+			Cache::save();
+		}
+
+		$ignoreWarnings = Config::getConfigData('ignore_warnings_on_exit');
+		$ignoreErrors   = Config::getConfigData('ignore_errors_on_exit');
+
+		$return = ($this->reporter->totalErrors + $this->reporter->totalWarnings);
+		if ($ignoreErrors !== null) {
+			$ignoreErrors = (bool) $ignoreErrors;
+			if ($ignoreErrors === true) {
+				$return -= $this->reporter->totalErrors;
+			}
+		}
+
+		if ($ignoreWarnings !== null) {
+			$ignoreWarnings = (bool) $ignoreWarnings;
+			if ($ignoreWarnings === true) {
+				$return -= $this->reporter->totalWarnings;
+			}
+		}
+
+		return $return;
+
+	}//end run()
+
+
+	/**
+	 * Converts all PHP errors into exceptions.
+	 *
+	 * This method forces a sniff to stop processing if it is not
+	 * able to handle a specific piece of code, instead of continuing
+	 * and potentially getting into a loop.
+	 *
+	 * @param int    $code    The level of error raised.
+	 * @param string $message The error message.
+	 * @param string $file    The path of the file that raised the error.
+	 * @param int    $line    The line number the error was raised at.
+	 *
+	 * @return void
+	 * @throws \PHP_CodeSniffer\Exceptions\RuntimeException
+	 */
+	public function handleErrors($code, $message, $file, $line)
+	{
+		if ((error_reporting() & $code) === 0) {
+			// This type of error is being muted.
+			return true;
+		}
+
+		throw new RuntimeException("$message in $file on line $line");
+
+	}//end handleErrors()
+
+
+	/**
+	 * Processes a single file, including checking and fixing.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $file The file to be processed.
+	 *
+	 * @return void
+	 * @throws \PHP_CodeSniffer\Exceptions\DeepExitException
+	 */
+	public function processFile($file)
+	{
+		if (PHP_CODESNIFFER_VERBOSITY > 0) {
+			$startTime = microtime(true);
+			echo 'Processing '.basename($file->path).' ';
+			if (PHP_CODESNIFFER_VERBOSITY > 1) {
+				echo PHP_EOL;
+			}
+		}
+
+		try {
+			$file->process();
+
+			if (PHP_CODESNIFFER_VERBOSITY > 0) {
+				$timeTaken = ((microtime(true) - $startTime) * 1000);
+				if ($timeTaken < 1000) {
+					$timeTaken = round($timeTaken);
+					echo "DONE in {$timeTaken}ms";
+				} else {
+					$timeTaken = round(($timeTaken / 1000), 2);
+					echo "DONE in $timeTaken secs";
+				}
+
+				if (PHP_CODESNIFFER_CBF === true) {
+					$errors = $file->getFixableCount();
+					echo " ($errors fixable violations)".PHP_EOL;
+				} else {
+					$errors   = $file->getErrorCount();
+					$warnings = $file->getWarningCount();
+					echo " ($errors errors, $warnings warnings)".PHP_EOL;
+				}
+			}
+		} catch (\Exception $e) {
+			$error = 'An error occurred during processing; checking has been aborted. The error message was: '.$e->getMessage();
+			$file->addErrorOnLine($error, 1, 'Internal.Exception');
+		}//end try
+
+		$this->reporter->cacheFileReport($file, $this->config);
+
+		if ($this->config->interactive === true) {
+			/*
                 Running interactively.
                 Print the error report for the current file and then wait for user input.
             */
 
-            // Get current violations and then clear the list to make sure
-            // we only print violations for a single file each time.
-            $numErrors = null;
-            while ($numErrors !== 0) {
-                $numErrors = ($file->getErrorCount() + $file->getWarningCount());
-                if ($numErrors === 0) {
-                    continue;
-                }
-
-                $this->reporter->printReport('full');
-
-                echo '<ENTER> to recheck, [s] to skip or [q] to quit : ';
-                $input = fgets(STDIN);
-                $input = trim($input);
-
-                switch ($input) {
-                case 's':
-                    break(2);
-                case 'q':
-                    throw new DeepExitException('', 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
-
-        // Clean up the file to save (a lot of) memory.
-        $file->cleanUp();
-
-    }//end processFile()
-
-
-    /**
-     * Waits for child processes to complete and cleans up after them.
-     *
-     * The reporting information returned by each child process is merged
-     * into the main reporter class.
-     *
-     * @param array $childProcs An array of child processes to wait for.
-     *
-     * @return void
-     */
-    private function processChildProcs($childProcs)
-    {
-        $numProcessed = 0;
-        $totalBatches = count($childProcs);
-
-        $success = true;
-
-        while (count($childProcs) > 0) {
-            foreach ($childProcs as $key => $procData) {
-                $res = pcntl_waitpid($procData['pid'], $status, WNOHANG);
-                if ($res === $procData['pid']) {
-                    if (file_exists($procData['out']) === true) {
-                        include $procData['out'];
-
-                        unlink($procData['out']);
-                        unset($childProcs[$key]);
-
-                        $numProcessed++;
-
-                        if (isset($childOutput) === false) {
-                            // The child process died, so the run has failed.
-                            $file = new DummyFile(null, $this->ruleset, $this->config);
-                            $file->setErrorCounts(1, 0, 0, 0);
-                            $this->printProgress($file, $totalBatches, $numProcessed);
-                            $success = false;
-                            continue;
-                        }
-
-                        $this->reporter->totalFiles    += $childOutput['totalFiles'];
-                        $this->reporter->totalErrors   += $childOutput['totalErrors'];
-                        $this->reporter->totalWarnings += $childOutput['totalWarnings'];
-                        $this->reporter->totalFixable  += $childOutput['totalFixable'];
-                        $this->reporter->totalFixed    += $childOutput['totalFixed'];
-
-                        if (isset($debugOutput) === true) {
-                            echo $debugOutput;
-                        }
-
-                        if (isset($childCache) === true) {
-                            foreach ($childCache as $path => $cache) {
-                                Cache::set($path, $cache);
-                            }
-                        }
-
-                        // Fake a processed file so we can print progress output for the batch.
-                        $file = new DummyFile(null, $this->ruleset, $this->config);
-                        $file->setErrorCounts(
-                            $childOutput['totalErrors'],
-                            $childOutput['totalWarnings'],
-                            $childOutput['totalFixable'],
-                            $childOutput['totalFixed']
-                        );
-                        $this->printProgress($file, $totalBatches, $numProcessed);
-                    }//end if
-                }//end if
-            }//end foreach
-        }//end while
-
-        return $success;
-
-    }//end processChildProcs()
-
-
-    /**
-     * Print progress information for a single processed file.
-     *
-     * @param \PHP_CodeSniffer\Files\File $file         The file that was processed.
-     * @param int                         $numFiles     The total number of files to process.
-     * @param int                         $numProcessed The number of files that have been processed,
-     *                                                  including this one.
-     *
-     * @return void
-     */
-    public function printProgress(File $file, $numFiles, $numProcessed)
-    {
-        if (PHP_CODESNIFFER_VERBOSITY > 0
-            || $this->config->showProgress === false
-        ) {
-            return;
-        }
-
-        // Show progress information.
-        if ($file->ignored === true) {
-            echo 'S';
-        } else {
-            $errors   = $file->getErrorCount();
-            $warnings = $file->getWarningCount();
-            $fixable  = $file->getFixableCount();
-            $fixed    = $file->getFixedCount();
-
-            if (PHP_CODESNIFFER_CBF === true) {
-                // Files with fixed errors or warnings are F (green).
-                // Files with unfixable errors or warnings are E (red).
-                // Files with no errors or warnings are . (black).
-                if ($fixable > 0) {
-                    if ($this->config->colors === true) {
-                        echo "\033[31m";
-                    }
-
-                    echo 'E';
-
-                    if ($this->config->colors === true) {
-                        echo "\033[0m";
-                    }
-                } else if ($fixed > 0) {
-                    if ($this->config->colors === true) {
-                        echo "\033[32m";
-                    }
-
-                    echo 'F';
-
-                    if ($this->config->colors === true) {
-                        echo "\033[0m";
-                    }
-                } else {
-                    echo '.';
-                }//end if
-            } else {
-                // Files with errors are E (red).
-                // Files with fixable errors are E (green).
-                // Files with warnings are W (yellow).
-                // Files with fixable warnings are W (green).
-                // Files with no errors or warnings are . (black).
-                if ($errors > 0) {
-                    if ($this->config->colors === true) {
-                        if ($fixable > 0) {
-                            echo "\033[32m";
-                        } else {
-                            echo "\033[31m";
-                        }
-                    }
-
-                    echo 'E';
-
-                    if ($this->config->colors === true) {
-                        echo "\033[0m";
-                    }
-                } else if ($warnings > 0) {
-                    if ($this->config->colors === true) {
-                        if ($fixable > 0) {
-                            echo "\033[32m";
-                        } else {
-                            echo "\033[33m";
-                        }
-                    }
-
-                    echo 'W';
-
-                    if ($this->config->colors === true) {
-                        echo "\033[0m";
-                    }
-                } else {
-                    echo '.';
-                }//end if
-            }//end if
-        }//end if
-
-        $numPerLine = 60;
-        if ($numProcessed !== $numFiles && ($numProcessed % $numPerLine) !== 0) {
-            return;
-        }
-
-        $percent = round(($numProcessed / $numFiles) * 100);
-        $padding = (strlen($numFiles) - strlen($numProcessed));
-        if ($numProcessed === $numFiles && $numFiles > $numPerLine) {
-            $padding += ($numPerLine - ($numFiles - (floor($numFiles / $numPerLine) * $numPerLine)));
-        }
-
-        echo str_repeat(' ', $padding)." $numProcessed / $numFiles ($percent%)".PHP_EOL;
-
-    }//end printProgress()
+			// Get current violations and then clear the list to make sure
+			// we only print violations for a single file each time.
+			$numErrors = null;
+			while ($numErrors !== 0) {
+				$numErrors = ($file->getErrorCount() + $file->getWarningCount());
+				if ($numErrors === 0) {
+					continue;
+				}
+
+				$this->reporter->printReport('full');
+
+				echo '<ENTER> to recheck, [s] to skip or [q] to quit : ';
+				$input = fgets(STDIN);
+				$input = trim($input);
+
+				switch ($input) {
+				case 's':
+					break(2);
+				case 'q':
+					throw new DeepExitException('', 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
+
+		// Clean up the file to save (a lot of) memory.
+		$file->cleanUp();
+
+	}//end processFile()
+
+
+	/**
+	 * Waits for child processes to complete and cleans up after them.
+	 *
+	 * The reporting information returned by each child process is merged
+	 * into the main reporter class.
+	 *
+	 * @param array $childProcs An array of child processes to wait for.
+	 *
+	 * @return void
+	 */
+	private function processChildProcs($childProcs)
+	{
+		$numProcessed = 0;
+		$totalBatches = count($childProcs);
+
+		$success = true;
+
+		while (count($childProcs) > 0) {
+			foreach ($childProcs as $key => $procData) {
+				$res = pcntl_waitpid($procData['pid'], $status, WNOHANG);
+				if ($res === $procData['pid']) {
+					if (file_exists($procData['out']) === true) {
+						include $procData['out'];
+
+						unlink($procData['out']);
+						unset($childProcs[$key]);
+
+						$numProcessed++;
+
+						if (isset($childOutput) === false) {
+							// The child process died, so the run has failed.
+							$file = new DummyFile(null, $this->ruleset, $this->config);
+							$file->setErrorCounts(1, 0, 0, 0);
+							$this->printProgress($file, $totalBatches, $numProcessed);
+							$success = false;
+							continue;
+						}
+
+						$this->reporter->totalFiles    += $childOutput['totalFiles'];
+						$this->reporter->totalErrors   += $childOutput['totalErrors'];
+						$this->reporter->totalWarnings += $childOutput['totalWarnings'];
+						$this->reporter->totalFixable  += $childOutput['totalFixable'];
+						$this->reporter->totalFixed    += $childOutput['totalFixed'];
+
+						if (isset($debugOutput) === true) {
+							echo $debugOutput;
+						}
+
+						if (isset($childCache) === true) {
+							foreach ($childCache as $path => $cache) {
+								Cache::set($path, $cache);
+							}
+						}
+
+						// Fake a processed file so we can print progress output for the batch.
+						$file = new DummyFile(null, $this->ruleset, $this->config);
+						$file->setErrorCounts(
+							$childOutput['totalErrors'],
+							$childOutput['totalWarnings'],
+							$childOutput['totalFixable'],
+							$childOutput['totalFixed']
+						);
+						$this->printProgress($file, $totalBatches, $numProcessed);
+					}//end if
+				}//end if
+			}//end foreach
+		}//end while
+
+		return $success;
+
+	}//end processChildProcs()
+
+
+	/**
+	 * Print progress information for a single processed file.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $file         The file that was processed.
+	 * @param int                         $numFiles     The total number of files to process.
+	 * @param int                         $numProcessed The number of files that have been processed,
+	 *                                                  including this one.
+	 *
+	 * @return void
+	 */
+	public function printProgress(File $file, $numFiles, $numProcessed)
+	{
+		if (PHP_CODESNIFFER_VERBOSITY > 0
+			|| $this->config->showProgress === false
+		) {
+			return;
+		}
+
+		// Show progress information.
+		if ($file->ignored === true) {
+			echo 'S';
+		} else {
+			$errors   = $file->getErrorCount();
+			$warnings = $file->getWarningCount();
+			$fixable  = $file->getFixableCount();
+			$fixed    = $file->getFixedCount();
+
+			if (PHP_CODESNIFFER_CBF === true) {
+				// Files with fixed errors or warnings are F (green).
+				// Files with unfixable errors or warnings are E (red).
+				// Files with no errors or warnings are . (black).
+				if ($fixable > 0) {
+					if ($this->config->colors === true) {
+						echo "\033[31m";
+					}
+
+					echo 'E';
+
+					if ($this->config->colors === true) {
+						echo "\033[0m";
+					}
+				} else if ($fixed > 0) {
+					if ($this->config->colors === true) {
+						echo "\033[32m";
+					}
+
+					echo 'F';
+
+					if ($this->config->colors === true) {
+						echo "\033[0m";
+					}
+				} else {
+					echo '.';
+				}//end if
+			} else {
+				// Files with errors are E (red).
+				// Files with fixable errors are E (green).
+				// Files with warnings are W (yellow).
+				// Files with fixable warnings are W (green).
+				// Files with no errors or warnings are . (black).
+				if ($errors > 0) {
+					if ($this->config->colors === true) {
+						if ($fixable > 0) {
+							echo "\033[32m";
+						} else {
+							echo "\033[31m";
+						}
+					}
+
+					echo 'E';
+
+					if ($this->config->colors === true) {
+						echo "\033[0m";
+					}
+				} else if ($warnings > 0) {
+					if ($this->config->colors === true) {
+						if ($fixable > 0) {
+							echo "\033[32m";
+						} else {
+							echo "\033[33m";
+						}
+					}
+
+					echo 'W';
+
+					if ($this->config->colors === true) {
+						echo "\033[0m";
+					}
+				} else {
+					echo '.';
+				}//end if
+			}//end if
+		}//end if
+
+		$numPerLine = 60;
+		if ($numProcessed !== $numFiles && ($numProcessed % $numPerLine) !== 0) {
+			return;
+		}
+
+		$percent = round(($numProcessed / $numFiles) * 100);
+		$padding = (strlen($numFiles) - strlen($numProcessed));
+		if ($numProcessed === $numFiles && $numFiles > $numPerLine) {
+			$padding += ($numPerLine - ($numFiles - (floor($numFiles / $numPerLine) * $numPerLine)));
+		}
+
+		echo str_repeat(' ', $padding)." $numProcessed / $numFiles ($percent%)".PHP_EOL;
+
+	}//end printProgress()
 
 
 }//end class

Switch Indentation +13 added lines, -13 removed lines

@@ -677,19 +677,19 @@
                 $input = trim($input);
 
                 switch ($input) {
-                case 's':
-                    break(2);
-                case 'q':
-                    throw new DeepExitException('', 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':
+                    	throw new DeepExitException('', 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

Spacing +238 added lines, -238 removed lines

@@ -57,8 +57,8 @@ 
             Util\Timing::startTiming();
             Runner::checkRequirements();
 
-            if (defined('PHP_CODESNIFFER_CBF') === false) {
-                define('PHP_CODESNIFFER_CBF', false);
+            if ( defined( 'PHP_CODESNIFFER_CBF' ) === false ) {
+                define( 'PHP_CODESNIFFER_CBF', false );
             }
 
             // Creating the Config object populates it with all required settings
@@ -71,11 +71,11 @@ 
 
             // Print a list of sniffs in each of the supplied standards.
             // We fudge the config here so that each standard is explained in isolation.
-            if ($this->config->explain === true) {
+            if ( $this->config->explain === true ) {
                 $standards = $this->config->standards;
-                foreach ($standards as $standard) {
-                    $this->config->standards = [$standard];
-                    $ruleset = new Ruleset($this->config);
+                foreach ( $standards as $standard ) {
+                    $this->config->standards = [ $standard ];
+                    $ruleset = new Ruleset( $this->config );
                     $ruleset->explain();
                 }
 
@@ -83,13 +83,13 @@ 
             }
 
             // Generate documentation for each of the supplied standards.
-            if ($this->config->generator !== null) {
+            if ( $this->config->generator !== null ) {
                 $standards = $this->config->standards;
-                foreach ($standards as $standard) {
-                    $this->config->standards = [$standard];
-                    $ruleset   = new Ruleset($this->config);
-                    $class     = 'PHP_CodeSniffer\Generators\\'.$this->config->generator;
-                    $generator = new $class($ruleset);
+                foreach ( $standards as $standard ) {
+                    $this->config->standards = [ $standard ];
+                    $ruleset   = new Ruleset( $this->config );
+                    $class     = 'PHP_CodeSniffer\Generators\\' . $this->config->generator;
+                    $generator = new $class( $ruleset );
                     $generator->generate();
                 }
 
@@ -99,15 +99,15 @@ 
             // Other report formats don't really make sense in interactive mode
             // so we hard-code the full report here and when outputting.
             // We also ensure parallel processing is off because we need to do one file at a time.
-            if ($this->config->interactive === true) {
-                $this->config->reports      = ['full' => null];
+            if ( $this->config->interactive === true ) {
+                $this->config->reports      = [ 'full' => null ];
                 $this->config->parallel     = 1;
                 $this->config->showProgress = false;
             }
 
             // Disable caching if we are processing STDIN as we can't be 100%
             // sure where the file came from or if it will change in the future.
-            if ($this->config->stdin === true) {
+            if ( $this->config->stdin === true ) {
                 $this->config->cache = false;
             }
 
@@ -121,21 +121,21 @@ 
             // in something like an XML report. If we are printing to screen,
             // the report types would have already worked out who should
             // print the timer info.
-            if ($this->config->interactive === false
-                && ($toScreen === false
-                || (($this->reporter->totalErrors + $this->reporter->totalWarnings) === 0 && $this->config->showProgress === true))
+            if ( $this->config->interactive === false
+                && ( $toScreen === false
+                || ( ( $this->reporter->totalErrors + $this->reporter->totalWarnings ) === 0 && $this->config->showProgress === true ) )
             ) {
                 Util\Timing::printRunTime();
             }
-        } catch (DeepExitException $e) {
+        } catch ( DeepExitException $e ) {
             echo $e->getMessage();
             return $e->getCode();
         }//end try
 
-        if ($numErrors === 0) {
+        if ( $numErrors === 0 ) {
             // No errors found.
             return 0;
-        } else if ($this->reporter->totalFixable === 0) {
+        } else if ( $this->reporter->totalFixable === 0 ) {
             // Errors found, but none of them can be fixed by PHPCBF.
             return 1;
         } else {
@@ -153,8 +153,8 @@ 
      */
     public function runPHPCBF()
     {
-        if (defined('PHP_CODESNIFFER_CBF') === false) {
-            define('PHP_CODESNIFFER_CBF', true);
+        if ( defined( 'PHP_CODESNIFFER_CBF' ) === false ) {
+            define( 'PHP_CODESNIFFER_CBF', true );
         }
 
         try {
@@ -168,7 +168,7 @@ 
 
             // When processing STDIN, we can't output anything to the screen
             // or it will end up mixed in with the file output.
-            if ($this->config->stdin === true) {
+            if ( $this->config->stdin === true ) {
                 $this->config->verbosity = 0;
             }
 
@@ -178,7 +178,7 @@ 
             // When processing STDIN, we only process one file at a time and
             // we don't process all the way through, so we can't use the parallel
             // running system.
-            if ($this->config->stdin === true) {
+            if ( $this->config->stdin === true ) {
                 $this->config->parallel = 1;
             }
 
@@ -190,7 +190,7 @@ 
             $this->config->showSources  = false;
             $this->config->recordErrors = false;
             $this->config->reportFile   = null;
-            $this->config->reports      = ['cbf' => null];
+            $this->config->reports      = [ 'cbf' => null ];
 
             // If a standard tries to set command line arguments itself, some
             // may be blocked because PHPCBF is running, so stop the script
@@ -202,14 +202,14 @@ 
 
             echo PHP_EOL;
             Util\Timing::printRunTime();
-        } catch (DeepExitException $e) {
+        } catch ( DeepExitException $e ) {
             echo $e->getMessage();
             return $e->getCode();
         }//end try
 
-        if ($this->reporter->totalFixed === 0) {
+        if ( $this->reporter->totalFixed === 0 ) {
             // Nothing was fixed by PHPCBF.
-            if ($this->reporter->totalFixable === 0) {
+            if ( $this->reporter->totalFixable === 0 ) {
                 // Nothing found that could be fixed.
                 return 0;
             } else {
@@ -218,7 +218,7 @@ 
             }
         }
 
-        if ($this->reporter->totalFixable === 0) {
+        if ( $this->reporter->totalFixable === 0 ) {
             // PHPCBF fixed all fixable errors.
             return 1;
         }
@@ -238,9 +238,9 @@ 
     public function checkRequirements()
     {
         // Check the PHP version.
-        if (PHP_VERSION_ID < 50400) {
-            $error = 'ERROR: PHP_CodeSniffer requires PHP version 5.4.0 or greater.'.PHP_EOL;
-            throw new DeepExitException($error, 3);
+        if ( PHP_VERSION_ID < 50400 ) {
+            $error = 'ERROR: PHP_CodeSniffer requires PHP version 5.4.0 or greater.' . PHP_EOL;
+            throw new DeepExitException( $error, 3 );
         }
 
         $requiredExtensions = [
@@ -248,30 +248,30 @@ 
             'xmlwriter',
             'SimpleXML',
         ];
-        $missingExtensions  = [];
+        $missingExtensions = [ ];
 
-        foreach ($requiredExtensions as $extension) {
-            if (extension_loaded($extension) === false) {
-                $missingExtensions[] = $extension;
+        foreach ( $requiredExtensions as $extension ) {
+            if ( extension_loaded( $extension ) === false ) {
+                $missingExtensions[ ] = $extension;
             }
         }
 
-        if (empty($missingExtensions) === false) {
-            $last      = array_pop($requiredExtensions);
-            $required  = implode(', ', $requiredExtensions);
-            $required .= ' and '.$last;
+        if ( empty( $missingExtensions ) === false ) {
+            $last      = array_pop( $requiredExtensions );
+            $required  = implode( ', ', $requiredExtensions );
+            $required .= ' and ' . $last;
 
-            if (count($missingExtensions) === 1) {
-                $missing = $missingExtensions[0];
+            if ( count( $missingExtensions ) === 1 ) {
+                $missing = $missingExtensions[ 0 ];
             } else {
-                $last     = array_pop($missingExtensions);
-                $missing  = implode(', ', $missingExtensions);
-                $missing .= ' and '.$last;
+                $last     = array_pop( $missingExtensions );
+                $missing  = implode( ', ', $missingExtensions );
+                $missing .= ' and ' . $last;
             }
 
-            $error = 'ERROR: PHP_CodeSniffer requires the %s extensions to be enabled. Please enable %s.'.PHP_EOL;
-            $error = sprintf($error, $required, $missing);
-            throw new DeepExitException($error, 3);
+            $error = 'ERROR: PHP_CodeSniffer requires the %s extensions to be enabled. Please enable %s.' . PHP_EOL;
+            $error = sprintf( $error, $required, $missing );
+            throw new DeepExitException( $error, 3 );
         }
 
     }//end checkRequirements()
@@ -285,35 +285,35 @@ 
      */
     public function init()
     {
-        if (defined('PHP_CODESNIFFER_CBF') === false) {
-            define('PHP_CODESNIFFER_CBF', false);
+        if ( defined( 'PHP_CODESNIFFER_CBF' ) === false ) {
+            define( 'PHP_CODESNIFFER_CBF', false );
         }
 
         // Ensure this option is enabled or else line endings will not always
         // be detected properly for files created on a Mac with the /r line ending.
-        ini_set('auto_detect_line_endings', true);
+        ini_set( 'auto_detect_line_endings', true );
 
         // Disable the PCRE JIT as this caused issues with parallel running.
-        ini_set('pcre.jit', false);
+        ini_set( 'pcre.jit', false );
 
         // Check that the standards are valid.
-        foreach ($this->config->standards as $standard) {
-            if (Util\Standards::isInstalledStandard($standard) === false) {
+        foreach ( $this->config->standards as $standard ) {
+            if ( Util\Standards::isInstalledStandard( $standard ) === false ) {
                 // They didn't select a valid coding standard, so help them
                 // out by letting them know which standards are installed.
-                $error = 'ERROR: the "'.$standard.'" coding standard is not installed. ';
+                $error = 'ERROR: the "' . $standard . '" coding standard is not installed. ';
                 ob_start();
                 Util\Standards::printInstalledStandards();
                 $error .= ob_get_contents();
                 ob_end_clean();
-                throw new DeepExitException($error, 3);
+                throw new DeepExitException( $error, 3 );
             }
         }
 
         // Saves passing the Config object into other objects that only need
         // the verbosity flag for debug output.
-        if (defined('PHP_CODESNIFFER_VERBOSITY') === false) {
-            define('PHP_CODESNIFFER_VERBOSITY', $this->config->verbosity);
+        if ( defined( 'PHP_CODESNIFFER_VERBOSITY' ) === false ) {
+            define( 'PHP_CODESNIFFER_VERBOSITY', $this->config->verbosity );
         }
 
         // Create this class so it is autoloaded and sets up a bunch
@@ -322,18 +322,18 @@ 
 
         // Allow autoloading of custom files inside installed standards.
         $installedStandards = Standards::getInstalledStandardDetails();
-        foreach ($installedStandards as $name => $details) {
-            Autoload::addSearchPath($details['path'], $details['namespace']);
+        foreach ( $installedStandards as $name => $details ) {
+            Autoload::addSearchPath( $details[ 'path' ], $details[ 'namespace' ] );
         }
 
         // The ruleset contains all the information about how the files
         // should be checked and/or fixed.
         try {
-            $this->ruleset = new Ruleset($this->config);
-        } catch (RuntimeException $e) {
-            $error  = 'ERROR: '.$e->getMessage().PHP_EOL.PHP_EOL;
-            $error .= $this->config->printShortUsage(true);
-            throw new DeepExitException($error, 3);
+            $this->ruleset = new Ruleset( $this->config );
+        } catch ( RuntimeException $e ) {
+            $error  = 'ERROR: ' . $e->getMessage() . PHP_EOL . PHP_EOL;
+            $error .= $this->config->printShortUsage( true );
+            throw new DeepExitException( $error, 3 );
         }
 
     }//end init()
@@ -349,125 +349,125 @@ 
     private function run()
     {
         // The class that manages all reporters for the run.
-        $this->reporter = new Reporter($this->config);
+        $this->reporter = new Reporter( $this->config );
 
         // Include bootstrap files.
-        foreach ($this->config->bootstrap as $bootstrap) {
+        foreach ( $this->config->bootstrap as $bootstrap ) {
             include $bootstrap;
         }
 
-        if ($this->config->stdin === true) {
+        if ( $this->config->stdin === true ) {
             $fileContents = $this->config->stdinContent;
-            if ($fileContents === null) {
-                $handle = fopen('php://stdin', 'r');
-                stream_set_blocking($handle, true);
-                $fileContents = stream_get_contents($handle);
-                fclose($handle);
+            if ( $fileContents === null ) {
+                $handle = fopen( 'php://stdin', 'r' );
+                stream_set_blocking( $handle, true );
+                $fileContents = stream_get_contents( $handle );
+                fclose( $handle );
             }
 
-            $todo  = new FileList($this->config, $this->ruleset);
-            $dummy = new DummyFile($fileContents, $this->ruleset, $this->config);
-            $todo->addFile($dummy->path, $dummy);
+            $todo  = new FileList( $this->config, $this->ruleset );
+            $dummy = new DummyFile( $fileContents, $this->ruleset, $this->config );
+            $todo->addFile( $dummy->path, $dummy );
         } else {
-            if (empty($this->config->files) === true) {
-                $error  = 'ERROR: You must supply at least one file or directory to process.'.PHP_EOL.PHP_EOL;
-                $error .= $this->config->printShortUsage(true);
-                throw new DeepExitException($error, 3);
+            if ( empty( $this->config->files ) === true ) {
+                $error  = 'ERROR: You must supply at least one file or directory to process.' . PHP_EOL . PHP_EOL;
+                $error .= $this->config->printShortUsage( true );
+                throw new DeepExitException( $error, 3 );
             }
 
-            if (PHP_CODESNIFFER_VERBOSITY > 0) {
+            if ( PHP_CODESNIFFER_VERBOSITY > 0 ) {
                 echo 'Creating file list... ';
             }
 
-            $todo = new FileList($this->config, $this->ruleset);
+            $todo = new FileList( $this->config, $this->ruleset );
 
-            if (PHP_CODESNIFFER_VERBOSITY > 0) {
-                $numFiles = count($todo);
-                echo "DONE ($numFiles files in queue)".PHP_EOL;
+            if ( PHP_CODESNIFFER_VERBOSITY > 0 ) {
+                $numFiles = count( $todo );
+                echo "DONE ($numFiles files in queue)" . PHP_EOL;
             }
 
-            if ($this->config->cache === true) {
-                if (PHP_CODESNIFFER_VERBOSITY > 0) {
+            if ( $this->config->cache === true ) {
+                if ( PHP_CODESNIFFER_VERBOSITY > 0 ) {
                     echo 'Loading cache... ';
                 }
 
-                Cache::load($this->ruleset, $this->config);
+                Cache::load( $this->ruleset, $this->config );
 
-                if (PHP_CODESNIFFER_VERBOSITY > 0) {
+                if ( PHP_CODESNIFFER_VERBOSITY > 0 ) {
                     $size = Cache::getSize();
-                    echo "DONE ($size files in cache)".PHP_EOL;
+                    echo "DONE ($size files in cache)" . PHP_EOL;
                 }
             }
         }//end if
 
         // Turn all sniff errors into exceptions.
-        set_error_handler([$this, 'handleErrors']);
+        set_error_handler( [ $this, 'handleErrors' ] );
 
         // If verbosity is too high, turn off parallelism so the
         // debug output is clean.
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
+        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
             $this->config->parallel = 1;
         }
 
         // If the PCNTL extension isn't installed, we can't fork.
-        if (function_exists('pcntl_fork') === false) {
+        if ( function_exists( 'pcntl_fork' ) === false ) {
             $this->config->parallel = 1;
         }
 
         $lastDir  = '';
-        $numFiles = count($todo);
+        $numFiles = count( $todo );
 
-        if ($this->config->parallel === 1) {
+        if ( $this->config->parallel === 1 ) {
             // Running normally.
             $numProcessed = 0;
-            foreach ($todo as $path => $file) {
-                if ($file->ignored === false) {
-                    $currDir = dirname($path);
-                    if ($lastDir !== $currDir) {
-                        if (PHP_CODESNIFFER_VERBOSITY > 0) {
-                            echo 'Changing into directory '.Common::stripBasepath($currDir, $this->config->basepath).PHP_EOL;
+            foreach ( $todo as $path => $file ) {
+                if ( $file->ignored === false ) {
+                    $currDir = dirname( $path );
+                    if ( $lastDir !== $currDir ) {
+                        if ( PHP_CODESNIFFER_VERBOSITY > 0 ) {
+                            echo 'Changing into directory ' . Common::stripBasepath( $currDir, $this->config->basepath ) . PHP_EOL;
                         }
 
                         $lastDir = $currDir;
                     }
 
-                    $this->processFile($file);
-                } else if (PHP_CODESNIFFER_VERBOSITY > 0) {
-                    echo 'Skipping '.basename($file->path).PHP_EOL;
+                    $this->processFile( $file );
+                } else if ( PHP_CODESNIFFER_VERBOSITY > 0 ) {
+                    echo 'Skipping ' . basename( $file->path ) . PHP_EOL;
                 }
 
                 $numProcessed++;
-                $this->printProgress($file, $numFiles, $numProcessed);
+                $this->printProgress( $file, $numFiles, $numProcessed );
             }
         } else {
             // Batching and forking.
-            $childProcs  = [];
-            $numPerBatch = ceil($numFiles / $this->config->parallel);
+            $childProcs  = [ ];
+            $numPerBatch = ceil( $numFiles / $this->config->parallel );
 
-            for ($batch = 0; $batch < $this->config->parallel; $batch++) {
-                $startAt = ($batch * $numPerBatch);
-                if ($startAt >= $numFiles) {
+            for ( $batch = 0; $batch < $this->config->parallel; $batch++ ) {
+                $startAt = ( $batch * $numPerBatch );
+                if ( $startAt >= $numFiles ) {
                     break;
                 }
 
-                $endAt = ($startAt + $numPerBatch);
-                if ($endAt > $numFiles) {
+                $endAt = ( $startAt + $numPerBatch );
+                if ( $endAt > $numFiles ) {
                     $endAt = $numFiles;
                 }
 
-                $childOutFilename = tempnam(sys_get_temp_dir(), 'phpcs-child');
+                $childOutFilename = tempnam( sys_get_temp_dir(), 'phpcs-child' );
                 $pid = pcntl_fork();
-                if ($pid === -1) {
-                    throw new RuntimeException('Failed to create child process');
-                } else if ($pid !== 0) {
-                    $childProcs[] = [
+                if ( $pid === -1 ) {
+                    throw new RuntimeException( 'Failed to create child process' );
+                } else if ( $pid !== 0 ) {
+                    $childProcs[ ] = [
                         'pid' => $pid,
                         'out' => $childOutFilename,
                     ];
                 } else {
                     // Move forward to the start of the batch.
                     $todo->rewind();
-                    for ($i = 0; $i < $startAt; $i++) {
+                    for ( $i = 0; $i < $startAt; $i++ ) {
                         $todo->next();
                     }
 
@@ -480,28 +480,28 @@ 
                     $this->reporter->totalFixed    = 0;
 
                     // Process the files.
-                    $pathsProcessed = [];
+                    $pathsProcessed = [ ];
                     ob_start();
-                    for ($i = $startAt; $i < $endAt; $i++) {
+                    for ( $i = $startAt; $i < $endAt; $i++ ) {
                         $path = $todo->key();
                         $file = $todo->current();
 
-                        if ($file->ignored === true) {
+                        if ( $file->ignored === true ) {
                             continue;
                         }
 
-                        $currDir = dirname($path);
-                        if ($lastDir !== $currDir) {
-                            if (PHP_CODESNIFFER_VERBOSITY > 0) {
-                                echo 'Changing into directory '.Common::stripBasepath($currDir, $this->config->basepath).PHP_EOL;
+                        $currDir = dirname( $path );
+                        if ( $lastDir !== $currDir ) {
+                            if ( PHP_CODESNIFFER_VERBOSITY > 0 ) {
+                                echo 'Changing into directory ' . Common::stripBasepath( $currDir, $this->config->basepath ) . PHP_EOL;
                             }
 
                             $lastDir = $currDir;
                         }
 
-                        $this->processFile($file);
+                        $this->processFile( $file );
 
-                        $pathsProcessed[] = $path;
+                        $pathsProcessed[ ] = $path;
                         $todo->next();
                     }//end for
 
@@ -518,60 +518,60 @@ 
                         'totalFixed'    => $this->reporter->totalFixed,
                     ];
 
-                    $output  = '<'.'?php'."\n".' $childOutput = ';
-                    $output .= var_export($childOutput, true);
+                    $output  = '<' . '?php' . "\n" . ' $childOutput = ';
+                    $output .= var_export( $childOutput, true );
                     $output .= ";\n\$debugOutput = ";
-                    $output .= var_export($debugOutput, true);
+                    $output .= var_export( $debugOutput, true );
 
-                    if ($this->config->cache === true) {
-                        $childCache = [];
-                        foreach ($pathsProcessed as $path) {
-                            $childCache[$path] = Cache::get($path);
+                    if ( $this->config->cache === true ) {
+                        $childCache = [ ];
+                        foreach ( $pathsProcessed as $path ) {
+                            $childCache[ $path ] = Cache::get( $path );
                         }
 
                         $output .= ";\n\$childCache = ";
-                        $output .= var_export($childCache, true);
+                        $output .= var_export( $childCache, true );
                     }
 
-                    $output .= ";\n?".'>';
-                    file_put_contents($childOutFilename, $output);
-                    exit($pid);
+                    $output .= ";\n?" . '>';
+                    file_put_contents( $childOutFilename, $output );
+                    exit( $pid );
                 }//end if
             }//end for
 
-            $success = $this->processChildProcs($childProcs);
-            if ($success === false) {
-                throw new RuntimeException('One or more child processes failed to run');
+            $success = $this->processChildProcs( $childProcs );
+            if ( $success === false ) {
+                throw new RuntimeException( 'One or more child processes failed to run' );
             }
         }//end if
 
         restore_error_handler();
 
-        if (PHP_CODESNIFFER_VERBOSITY === 0
+        if ( PHP_CODESNIFFER_VERBOSITY === 0
             && $this->config->interactive === false
             && $this->config->showProgress === true
         ) {
-            echo PHP_EOL.PHP_EOL;
+            echo PHP_EOL . PHP_EOL;
         }
 
-        if ($this->config->cache === true) {
+        if ( $this->config->cache === true ) {
             Cache::save();
         }
 
-        $ignoreWarnings = Config::getConfigData('ignore_warnings_on_exit');
-        $ignoreErrors   = Config::getConfigData('ignore_errors_on_exit');
+        $ignoreWarnings = Config::getConfigData( 'ignore_warnings_on_exit' );
+        $ignoreErrors   = Config::getConfigData( 'ignore_errors_on_exit' );
 
-        $return = ($this->reporter->totalErrors + $this->reporter->totalWarnings);
-        if ($ignoreErrors !== null) {
-            $ignoreErrors = (bool) $ignoreErrors;
-            if ($ignoreErrors === true) {
+        $return = ( $this->reporter->totalErrors + $this->reporter->totalWarnings );
+        if ( $ignoreErrors !== null ) {
+            $ignoreErrors = (bool)$ignoreErrors;
+            if ( $ignoreErrors === true ) {
                 $return -= $this->reporter->totalErrors;
             }
         }
 
-        if ($ignoreWarnings !== null) {
-            $ignoreWarnings = (bool) $ignoreWarnings;
-            if ($ignoreWarnings === true) {
+        if ( $ignoreWarnings !== null ) {
+            $ignoreWarnings = (bool)$ignoreWarnings;
+            if ( $ignoreWarnings === true ) {
                 $return -= $this->reporter->totalWarnings;
             }
         }
@@ -596,14 +596,14 @@ 
      * @return void
      * @throws \PHP_CodeSniffer\Exceptions\RuntimeException
      */
-    public function handleErrors($code, $message, $file, $line)
+    public function handleErrors( $code, $message, $file, $line )
     {
-        if ((error_reporting() & $code) === 0) {
+        if ( ( error_reporting() & $code ) === 0 ) {
             // This type of error is being muted.
             return true;
         }
 
-        throw new RuntimeException("$message in $file on line $line");
+        throw new RuntimeException( "$message in $file on line $line" );
 
     }//end handleErrors()
 
@@ -616,12 +616,12 @@ 
      * @return void
      * @throws \PHP_CodeSniffer\Exceptions\DeepExitException
      */
-    public function processFile($file)
+    public function processFile( $file )
     {
-        if (PHP_CODESNIFFER_VERBOSITY > 0) {
-            $startTime = microtime(true);
-            echo 'Processing '.basename($file->path).' ';
-            if (PHP_CODESNIFFER_VERBOSITY > 1) {
+        if ( PHP_CODESNIFFER_VERBOSITY > 0 ) {
+            $startTime = microtime( true );
+            echo 'Processing ' . basename( $file->path ) . ' ';
+            if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
                 echo PHP_EOL;
             }
         }
@@ -629,33 +629,33 @@ 
         try {
             $file->process();
 
-            if (PHP_CODESNIFFER_VERBOSITY > 0) {
-                $timeTaken = ((microtime(true) - $startTime) * 1000);
-                if ($timeTaken < 1000) {
-                    $timeTaken = round($timeTaken);
+            if ( PHP_CODESNIFFER_VERBOSITY > 0 ) {
+                $timeTaken = ( ( microtime( true ) - $startTime ) * 1000 );
+                if ( $timeTaken < 1000 ) {
+                    $timeTaken = round( $timeTaken );
                     echo "DONE in {$timeTaken}ms";
                 } else {
-                    $timeTaken = round(($timeTaken / 1000), 2);
+                    $timeTaken = round( ( $timeTaken / 1000 ), 2 );
                     echo "DONE in $timeTaken secs";
                 }
 
-                if (PHP_CODESNIFFER_CBF === true) {
+                if ( PHP_CODESNIFFER_CBF === true ) {
                     $errors = $file->getFixableCount();
-                    echo " ($errors fixable violations)".PHP_EOL;
+                    echo " ($errors fixable violations)" . PHP_EOL;
                 } else {
                     $errors   = $file->getErrorCount();
                     $warnings = $file->getWarningCount();
-                    echo " ($errors errors, $warnings warnings)".PHP_EOL;
+                    echo " ($errors errors, $warnings warnings)" . PHP_EOL;
                 }
             }
-        } catch (\Exception $e) {
-            $error = 'An error occurred during processing; checking has been aborted. The error message was: '.$e->getMessage();
-            $file->addErrorOnLine($error, 1, 'Internal.Exception');
+        } catch ( \Exception $e ) {
+            $error = 'An error occurred during processing; checking has been aborted. The error message was: ' . $e->getMessage();
+            $file->addErrorOnLine( $error, 1, 'Internal.Exception' );
         }//end try
 
-        $this->reporter->cacheFileReport($file, $this->config);
+        $this->reporter->cacheFileReport( $file, $this->config );
 
-        if ($this->config->interactive === true) {
+        if ( $this->config->interactive === true ) {
             /*
                 Running interactively.
                 Print the error report for the current file and then wait for user input.
@@ -664,23 +664,23 @@ 
             // Get current violations and then clear the list to make sure
             // we only print violations for a single file each time.
             $numErrors = null;
-            while ($numErrors !== 0) {
-                $numErrors = ($file->getErrorCount() + $file->getWarningCount());
-                if ($numErrors === 0) {
+            while ( $numErrors !== 0 ) {
+                $numErrors = ( $file->getErrorCount() + $file->getWarningCount() );
+                if ( $numErrors === 0 ) {
                     continue;
                 }
 
-                $this->reporter->printReport('full');
+                $this->reporter->printReport( 'full' );
 
                 echo '<ENTER> to recheck, [s] to skip or [q] to quit : ';
-                $input = fgets(STDIN);
-                $input = trim($input);
+                $input = fgets( STDIN );
+                $input = trim( $input );
 
-                switch ($input) {
+                switch ( $input ) {
                 case 's':
-                    break(2);
+                    break( 2 );
                 case 'q':
-                    throw new DeepExitException('', 0);
+                    throw new DeepExitException( '', 0 );
                 default:
                     // Repopulate the sniffs because some of them save their state
                     // and only clear it when the file changes, but we are rechecking
@@ -688,7 +688,7 @@ 
                     $file->ruleset->populateTokenListeners();
                     $file->reloadContent();
                     $file->process();
-                    $this->reporter->cacheFileReport($file, $this->config);
+                    $this->reporter->cacheFileReport( $file, $this->config );
                     break;
                 }
             }//end while
@@ -710,59 +710,59 @@ 
      *
      * @return void
      */
-    private function processChildProcs($childProcs)
+    private function processChildProcs( $childProcs )
     {
         $numProcessed = 0;
-        $totalBatches = count($childProcs);
+        $totalBatches = count( $childProcs );
 
         $success = true;
 
-        while (count($childProcs) > 0) {
-            foreach ($childProcs as $key => $procData) {
-                $res = pcntl_waitpid($procData['pid'], $status, WNOHANG);
-                if ($res === $procData['pid']) {
-                    if (file_exists($procData['out']) === true) {
-                        include $procData['out'];
+        while ( count( $childProcs ) > 0 ) {
+            foreach ( $childProcs as $key => $procData ) {
+                $res = pcntl_waitpid( $procData[ 'pid' ], $status, WNOHANG );
+                if ( $res === $procData[ 'pid' ] ) {
+                    if ( file_exists( $procData[ 'out' ] ) === true ) {
+                        include $procData[ 'out' ];
 
-                        unlink($procData['out']);
-                        unset($childProcs[$key]);
+                        unlink( $procData[ 'out' ] );
+                        unset( $childProcs[ $key ] );
 
                         $numProcessed++;
 
-                        if (isset($childOutput) === false) {
+                        if ( isset( $childOutput ) === false ) {
                             // The child process died, so the run has failed.
-                            $file = new DummyFile(null, $this->ruleset, $this->config);
-                            $file->setErrorCounts(1, 0, 0, 0);
-                            $this->printProgress($file, $totalBatches, $numProcessed);
+                            $file = new DummyFile( null, $this->ruleset, $this->config );
+                            $file->setErrorCounts( 1, 0, 0, 0 );
+                            $this->printProgress( $file, $totalBatches, $numProcessed );
                             $success = false;
                             continue;
                         }
 
-                        $this->reporter->totalFiles    += $childOutput['totalFiles'];
-                        $this->reporter->totalErrors   += $childOutput['totalErrors'];
-                        $this->reporter->totalWarnings += $childOutput['totalWarnings'];
-                        $this->reporter->totalFixable  += $childOutput['totalFixable'];
-                        $this->reporter->totalFixed    += $childOutput['totalFixed'];
+                        $this->reporter->totalFiles    += $childOutput[ 'totalFiles' ];
+                        $this->reporter->totalErrors   += $childOutput[ 'totalErrors' ];
+                        $this->reporter->totalWarnings += $childOutput[ 'totalWarnings' ];
+                        $this->reporter->totalFixable  += $childOutput[ 'totalFixable' ];
+                        $this->reporter->totalFixed    += $childOutput[ 'totalFixed' ];
 
-                        if (isset($debugOutput) === true) {
+                        if ( isset( $debugOutput ) === true ) {
                             echo $debugOutput;
                         }
 
-                        if (isset($childCache) === true) {
-                            foreach ($childCache as $path => $cache) {
-                                Cache::set($path, $cache);
+                        if ( isset( $childCache ) === true ) {
+                            foreach ( $childCache as $path => $cache ) {
+                                Cache::set( $path, $cache );
                             }
                         }
 
                         // Fake a processed file so we can print progress output for the batch.
-                        $file = new DummyFile(null, $this->ruleset, $this->config);
+                        $file = new DummyFile( null, $this->ruleset, $this->config );
                         $file->setErrorCounts(
-                            $childOutput['totalErrors'],
-                            $childOutput['totalWarnings'],
-                            $childOutput['totalFixable'],
-                            $childOutput['totalFixed']
+                            $childOutput[ 'totalErrors' ],
+                            $childOutput[ 'totalWarnings' ],
+                            $childOutput[ 'totalFixable' ],
+                            $childOutput[ 'totalFixed' ]
                         );
-                        $this->printProgress($file, $totalBatches, $numProcessed);
+                        $this->printProgress( $file, $totalBatches, $numProcessed );
                     }//end if
                 }//end if
             }//end foreach
@@ -783,16 +783,16 @@ 
      *
      * @return void
      */
-    public function printProgress(File $file, $numFiles, $numProcessed)
+    public function printProgress( File $file, $numFiles, $numProcessed )
     {
-        if (PHP_CODESNIFFER_VERBOSITY > 0
+        if ( PHP_CODESNIFFER_VERBOSITY > 0
             || $this->config->showProgress === false
         ) {
             return;
         }
 
         // Show progress information.
-        if ($file->ignored === true) {
+        if ( $file->ignored === true ) {
             echo 'S';
         } else {
             $errors   = $file->getErrorCount();
@@ -800,28 +800,28 @@ 
             $fixable  = $file->getFixableCount();
             $fixed    = $file->getFixedCount();
 
-            if (PHP_CODESNIFFER_CBF === true) {
+            if ( PHP_CODESNIFFER_CBF === true ) {
                 // Files with fixed errors or warnings are F (green).
                 // Files with unfixable errors or warnings are E (red).
                 // Files with no errors or warnings are . (black).
-                if ($fixable > 0) {
-                    if ($this->config->colors === true) {
+                if ( $fixable > 0 ) {
+                    if ( $this->config->colors === true ) {
                         echo "\033[31m";
                     }
 
                     echo 'E';
 
-                    if ($this->config->colors === true) {
+                    if ( $this->config->colors === true ) {
                         echo "\033[0m";
                     }
-                } else if ($fixed > 0) {
-                    if ($this->config->colors === true) {
+                } else if ( $fixed > 0 ) {
+                    if ( $this->config->colors === true ) {
                         echo "\033[32m";
                     }
 
                     echo 'F';
 
-                    if ($this->config->colors === true) {
+                    if ( $this->config->colors === true ) {
                         echo "\033[0m";
                     }
                 } else {
@@ -833,9 +833,9 @@ 
                 // Files with warnings are W (yellow).
                 // Files with fixable warnings are W (green).
                 // Files with no errors or warnings are . (black).
-                if ($errors > 0) {
-                    if ($this->config->colors === true) {
-                        if ($fixable > 0) {
+                if ( $errors > 0 ) {
+                    if ( $this->config->colors === true ) {
+                        if ( $fixable > 0 ) {
                             echo "\033[32m";
                         } else {
                             echo "\033[31m";
@@ -844,12 +844,12 @@ 
 
                     echo 'E';
 
-                    if ($this->config->colors === true) {
+                    if ( $this->config->colors === true ) {
                         echo "\033[0m";
                     }
-                } else if ($warnings > 0) {
-                    if ($this->config->colors === true) {
-                        if ($fixable > 0) {
+                } else if ( $warnings > 0 ) {
+                    if ( $this->config->colors === true ) {
+                        if ( $fixable > 0 ) {
                             echo "\033[32m";
                         } else {
                             echo "\033[33m";
@@ -858,7 +858,7 @@ 
 
                     echo 'W';
 
-                    if ($this->config->colors === true) {
+                    if ( $this->config->colors === true ) {
                         echo "\033[0m";
                     }
                 } else {
@@ -868,17 +868,17 @@ 
         }//end if
 
         $numPerLine = 60;
-        if ($numProcessed !== $numFiles && ($numProcessed % $numPerLine) !== 0) {
+        if ( $numProcessed !== $numFiles && ( $numProcessed % $numPerLine ) !== 0 ) {
             return;
         }
 
-        $percent = round(($numProcessed / $numFiles) * 100);
-        $padding = (strlen($numFiles) - strlen($numProcessed));
-        if ($numProcessed === $numFiles && $numFiles > $numPerLine) {
-            $padding += ($numPerLine - ($numFiles - (floor($numFiles / $numPerLine) * $numPerLine)));
+        $percent = round( ( $numProcessed / $numFiles ) * 100 );
+        $padding = ( strlen( $numFiles ) - strlen( $numProcessed ) );
+        if ( $numProcessed === $numFiles && $numFiles > $numPerLine ) {
+            $padding += ( $numPerLine - ( $numFiles - ( floor( $numFiles / $numPerLine ) * $numPerLine ) ) );
         }
 
-        echo str_repeat(' ', $padding)." $numProcessed / $numFiles ($percent%)".PHP_EOL;
+        echo str_repeat( ' ', $padding ) . " $numProcessed / $numFiles ($percent%)" . PHP_EOL;
 
     }//end printProgress()
 

Braces +10 added lines, -20 removed lines

@@ -21,8 +21,7 @@ 
 use PHP_CodeSniffer\Exceptions\RuntimeException;
 use PHP_CodeSniffer\Exceptions\DeepExitException;
 
-class Runner
-{
+class Runner {
 
     /**
      * The config data for the run.
@@ -51,8 +50,7 @@ 
      *
      * @return array
      */
-    public function runPHPCS()
-    {
+    public function runPHPCS() {
         try {
             Util\Timing::startTiming();
             Runner::checkRequirements();
@@ -151,8 +149,7 @@ 
      *
      * @return array
      */
-    public function runPHPCBF()
-    {
+    public function runPHPCBF() {
         if (defined('PHP_CODESNIFFER_CBF') === false) {
             define('PHP_CODESNIFFER_CBF', true);
         }
@@ -235,8 +232,7 @@ 
      * @return array
      * @throws \PHP_CodeSniffer\Exceptions\DeepExitException
      */
-    public function checkRequirements()
-    {
+    public function checkRequirements() {
         // Check the PHP version.
         if (PHP_VERSION_ID < 50400) {
             $error = 'ERROR: PHP_CodeSniffer requires PHP version 5.4.0 or greater.'.PHP_EOL;
@@ -283,8 +279,7 @@ 
      * @return void
      * @throws \PHP_CodeSniffer\Exceptions\DeepExitException
      */
-    public function init()
-    {
+    public function init() {
         if (defined('PHP_CODESNIFFER_CBF') === false) {
             define('PHP_CODESNIFFER_CBF', false);
         }
@@ -346,8 +341,7 @@ 
      * @throws \PHP_CodeSniffer\Exceptions\DeepExitException
      * @throws \PHP_CodeSniffer\Exceptions\RuntimeException
      */
-    private function run()
-    {
+    private function run() {
         // The class that manages all reporters for the run.
         $this->reporter = new Reporter($this->config);
 
@@ -596,8 +590,7 @@ 
      * @return void
      * @throws \PHP_CodeSniffer\Exceptions\RuntimeException
      */
-    public function handleErrors($code, $message, $file, $line)
-    {
+    public function handleErrors($code, $message, $file, $line) {
         if ((error_reporting() & $code) === 0) {
             // This type of error is being muted.
             return true;
@@ -616,8 +609,7 @@ 
      * @return void
      * @throws \PHP_CodeSniffer\Exceptions\DeepExitException
      */
-    public function processFile($file)
-    {
+    public function processFile($file) {
         if (PHP_CODESNIFFER_VERBOSITY > 0) {
             $startTime = microtime(true);
             echo 'Processing '.basename($file->path).' ';
@@ -710,8 +702,7 @@ 
      *
      * @return void
      */
-    private function processChildProcs($childProcs)
-    {
+    private function processChildProcs($childProcs) {
         $numProcessed = 0;
         $totalBatches = count($childProcs);
 
@@ -783,8 +774,7 @@ 
      *
      * @return void
      */
-    public function printProgress(File $file, $numFiles, $numProcessed)
-    {
+    public function printProgress(File $file, $numFiles, $numProcessed) {
         if (PHP_CODESNIFFER_VERBOSITY > 0
             || $this->config->showProgress === false
         ) {

vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/CodeAnalysis/JumbledIncrementerSniff.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +93 added lines, -93 removed lines

@@ -36,99 +36,99 @@
 {
 
 
-    /**
-     * Registers the tokens that this sniff wants to listen for.
-     *
-     * @return int[]
-     */
-    public function register()
-    {
-        return [T_FOR];
-
-    }//end register()
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token
-     *                                               in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-        $token  = $tokens[$stackPtr];
-
-        // Skip for-loop without body.
-        if (isset($token['scope_opener']) === false) {
-            return;
-        }
-
-        // Find incrementors for outer loop.
-        $outer = $this->findIncrementers($tokens, $token);
-
-        // Skip if empty.
-        if (count($outer) === 0) {
-            return;
-        }
-
-        // Find nested for loops.
-        $start = ++$token['scope_opener'];
-        $end   = --$token['scope_closer'];
-
-        for (; $start <= $end; ++$start) {
-            if ($tokens[$start]['code'] !== T_FOR) {
-                continue;
-            }
-
-            $inner = $this->findIncrementers($tokens, $tokens[$start]);
-            $diff  = array_intersect($outer, $inner);
-
-            if (count($diff) !== 0) {
-                $error = 'Loop incrementor (%s) jumbling with inner loop';
-                $data  = [join(', ', $diff)];
-                $phpcsFile->addWarning($error, $stackPtr, 'Found', $data);
-            }
-        }
-
-    }//end process()
-
-
-    /**
-     * Get all used variables in the incrementer part of a for statement.
-     *
-     * @param array(integer=>array) $tokens Array with all code sniffer tokens.
-     * @param array(string=>mixed)  $token  Current for loop token
-     *
-     * @return string[] List of all found incrementer variables.
-     */
-    protected function findIncrementers(array $tokens, array $token)
-    {
-        // Skip invalid statement.
-        if (isset($token['parenthesis_opener']) === false) {
-            return [];
-        }
-
-        $start = ++$token['parenthesis_opener'];
-        $end   = --$token['parenthesis_closer'];
-
-        $incrementers = [];
-        $semicolons   = 0;
-        for ($next = $start; $next <= $end; ++$next) {
-            $code = $tokens[$next]['code'];
-            if ($code === T_SEMICOLON) {
-                ++$semicolons;
-            } else if ($semicolons === 2 && $code === T_VARIABLE) {
-                $incrementers[] = $tokens[$next]['content'];
-            }
-        }
-
-        return $incrementers;
-
-    }//end findIncrementers()
+	/**
+	 * Registers the tokens that this sniff wants to listen for.
+	 *
+	 * @return int[]
+	 */
+	public function register()
+	{
+		return [T_FOR];
+
+	}//end register()
+
+
+	/**
+	 * Processes this test, when one of its tokens is encountered.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $stackPtr  The position of the current token
+	 *                                               in the stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+		$token  = $tokens[$stackPtr];
+
+		// Skip for-loop without body.
+		if (isset($token['scope_opener']) === false) {
+			return;
+		}
+
+		// Find incrementors for outer loop.
+		$outer = $this->findIncrementers($tokens, $token);
+
+		// Skip if empty.
+		if (count($outer) === 0) {
+			return;
+		}
+
+		// Find nested for loops.
+		$start = ++$token['scope_opener'];
+		$end   = --$token['scope_closer'];
+
+		for (; $start <= $end; ++$start) {
+			if ($tokens[$start]['code'] !== T_FOR) {
+				continue;
+			}
+
+			$inner = $this->findIncrementers($tokens, $tokens[$start]);
+			$diff  = array_intersect($outer, $inner);
+
+			if (count($diff) !== 0) {
+				$error = 'Loop incrementor (%s) jumbling with inner loop';
+				$data  = [join(', ', $diff)];
+				$phpcsFile->addWarning($error, $stackPtr, 'Found', $data);
+			}
+		}
+
+	}//end process()
+
+
+	/**
+	 * Get all used variables in the incrementer part of a for statement.
+	 *
+	 * @param array(integer=>array) $tokens Array with all code sniffer tokens.
+	 * @param array(string=>mixed)  $token  Current for loop token
+	 *
+	 * @return string[] List of all found incrementer variables.
+	 */
+	protected function findIncrementers(array $tokens, array $token)
+	{
+		// Skip invalid statement.
+		if (isset($token['parenthesis_opener']) === false) {
+			return [];
+		}
+
+		$start = ++$token['parenthesis_opener'];
+		$end   = --$token['parenthesis_closer'];
+
+		$incrementers = [];
+		$semicolons   = 0;
+		for ($next = $start; $next <= $end; ++$next) {
+			$code = $tokens[$next]['code'];
+			if ($code === T_SEMICOLON) {
+				++$semicolons;
+			} else if ($semicolons === 2 && $code === T_VARIABLE) {
+				$incrementers[] = $tokens[$next]['content'];
+			}
+		}
+
+		return $incrementers;
+
+	}//end findIncrementers()
 
 
 }//end class

Spacing +26 added lines, -26 removed lines

@@ -43,7 +43,7 @@ 
      */
     public function register()
     {
-        return [T_FOR];
+        return [ T_FOR ];
 
     }//end register()
 
@@ -57,40 +57,40 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
-        $token  = $tokens[$stackPtr];
+        $token  = $tokens[ $stackPtr ];
 
         // Skip for-loop without body.
-        if (isset($token['scope_opener']) === false) {
+        if ( isset( $token[ 'scope_opener' ] ) === false ) {
             return;
         }
 
         // Find incrementors for outer loop.
-        $outer = $this->findIncrementers($tokens, $token);
+        $outer = $this->findIncrementers( $tokens, $token );
 
         // Skip if empty.
-        if (count($outer) === 0) {
+        if ( count( $outer ) === 0 ) {
             return;
         }
 
         // Find nested for loops.
-        $start = ++$token['scope_opener'];
-        $end   = --$token['scope_closer'];
+        $start = ++$token[ 'scope_opener' ];
+        $end   = --$token[ 'scope_closer' ];
 
-        for (; $start <= $end; ++$start) {
-            if ($tokens[$start]['code'] !== T_FOR) {
+        for ( ; $start <= $end; ++$start ) {
+            if ( $tokens[ $start ][ 'code' ] !== T_FOR ) {
                 continue;
             }
 
-            $inner = $this->findIncrementers($tokens, $tokens[$start]);
-            $diff  = array_intersect($outer, $inner);
+            $inner = $this->findIncrementers( $tokens, $tokens[ $start ] );
+            $diff  = array_intersect( $outer, $inner );
 
-            if (count($diff) !== 0) {
+            if ( count( $diff ) !== 0 ) {
                 $error = 'Loop incrementor (%s) jumbling with inner loop';
-                $data  = [join(', ', $diff)];
-                $phpcsFile->addWarning($error, $stackPtr, 'Found', $data);
+                $data  = [ join( ', ', $diff ) ];
+                $phpcsFile->addWarning( $error, $stackPtr, 'Found', $data );
             }
         }
 
@@ -105,24 +105,24 @@ 
      *
      * @return string[] List of all found incrementer variables.
      */
-    protected function findIncrementers(array $tokens, array $token)
+    protected function findIncrementers( array $tokens, array $token )
     {
         // Skip invalid statement.
-        if (isset($token['parenthesis_opener']) === false) {
-            return [];
+        if ( isset( $token[ 'parenthesis_opener' ] ) === false ) {
+            return [ ];
         }
 
-        $start = ++$token['parenthesis_opener'];
-        $end   = --$token['parenthesis_closer'];
+        $start = ++$token[ 'parenthesis_opener' ];
+        $end   = --$token[ 'parenthesis_closer' ];
 
-        $incrementers = [];
+        $incrementers = [ ];
         $semicolons   = 0;
-        for ($next = $start; $next <= $end; ++$next) {
-            $code = $tokens[$next]['code'];
-            if ($code === T_SEMICOLON) {
+        for ( $next = $start; $next <= $end; ++$next ) {
+            $code = $tokens[ $next ][ 'code' ];
+            if ( $code === T_SEMICOLON ) {
                 ++$semicolons;
-            } else if ($semicolons === 2 && $code === T_VARIABLE) {
-                $incrementers[] = $tokens[$next]['content'];
+            } else if ( $semicolons === 2 && $code === T_VARIABLE ) {
+                $incrementers[ ] = $tokens[ $next ][ 'content' ];
             }
         }
 

Braces +4 added lines, -8 removed lines

@@ -32,8 +32,7 @@ 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
 
-class JumbledIncrementerSniff implements Sniff
-{
+class JumbledIncrementerSniff implements Sniff {
 
 
     /**
@@ -41,8 +40,7 @@ 
      *
      * @return int[]
      */
-    public function register()
-    {
+    public function register() {
         return [T_FOR];
 
     }//end register()
@@ -57,8 +55,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
         $token  = $tokens[$stackPtr];
 
@@ -105,8 +102,7 @@ 
      *
      * @return string[] List of all found incrementer variables.
      */
-    protected function findIncrementers(array $tokens, array $token)
-    {
+    protected function findIncrementers(array $tokens, array $token) {
         // Skip invalid statement.
         if (isset($token['parenthesis_opener']) === false) {
             return [];

vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php

Doc Comments +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return integer[]
      */
     public function register()
     {
@@ -53,7 +53,7 @@ 
      * @param int                         $stackPtr  The position of the current token in
      *                                               the stack passed in $tokens.
      *
-     * @return void
+     * @return integer
      */
     public function process(File $phpcsFile, $stackPtr)
     {

Indentation +197 added lines, -197 removed lines

@@ -15,203 +15,203 @@
 class DisallowSpaceIndentSniff implements Sniff
 {
 
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = [
-        'PHP',
-        'JS',
-        'CSS',
-    ];
-
-    /**
-     * The --tab-width CLI value that is being used.
-     *
-     * @var integer
-     */
-    private $tabWidth = null;
-
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return [T_OPEN_TAG];
-
-    }//end register()
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile All the tokens found in the document.
-     * @param int                         $stackPtr  The position of the current token in
-     *                                               the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tabsReplaced = false;
-        if ($this->tabWidth === null) {
-            if (isset($phpcsFile->config->tabWidth) === false || $phpcsFile->config->tabWidth === 0) {
-                // We have no idea how wide tabs are, so assume 4 spaces for fixing.
-                // It shouldn't really matter because indent checks elsewhere in the
-                // standard should fix things up.
-                $this->tabWidth = 4;
-            } else {
-                $this->tabWidth = $phpcsFile->config->tabWidth;
-                $tabsReplaced   = true;
-            }
-        }
-
-        $checkTokens = [
-            T_WHITESPACE             => true,
-            T_INLINE_HTML            => true,
-            T_DOC_COMMENT_WHITESPACE => true,
-            T_COMMENT                => true,
-        ];
-
-        $eolLen = strlen($phpcsFile->eolChar);
-
-        $tokens = $phpcsFile->getTokens();
-        for ($i = 0; $i < $phpcsFile->numTokens; $i++) {
-            if ($tokens[$i]['column'] !== 1 || isset($checkTokens[$tokens[$i]['code']]) === false) {
-                continue;
-            }
-
-            // If the tokenizer hasn't replaced tabs with spaces, we need to do it manually.
-            $token = $tokens[$i];
-            if ($tabsReplaced === false) {
-                $phpcsFile->tokenizer->replaceTabsInToken($token, ' ', ' ', $this->tabWidth);
-                if (strpos($token['content'], $phpcsFile->eolChar) !== false) {
-                    // Newline chars are not counted in the token length.
-                    $token['length'] -= $eolLen;
-                }
-            }
-
-            if (isset($tokens[$i]['orig_content']) === true) {
-                $content = $tokens[$i]['orig_content'];
-            } else {
-                $content = $tokens[$i]['content'];
-            }
-
-            $expectedIndentSize = $token['length'];
-
-            $recordMetrics = true;
-
-            // If this is an inline HTML token or a subsequent line of a multi-line comment,
-            // split the content into indentation whitespace and the actual HTML/text.
-            $nonWhitespace = '';
-            if (($tokens[$i]['code'] === T_INLINE_HTML
-                || $tokens[$i]['code'] === T_COMMENT)
-                && preg_match('`^(\s*)(\S.*)`s', $content, $matches) > 0
-            ) {
-                if (isset($matches[1]) === true) {
-                    $content = $matches[1];
-
-                    // Tabs are not replaced in content, so the "length" is wrong.
-                    $matches[1]         = str_replace("\t", str_repeat(' ', $this->tabWidth), $matches[1]);
-                    $expectedIndentSize = strlen($matches[1]);
-                }
-
-                if (isset($matches[2]) === true) {
-                    $nonWhitespace = $matches[2];
-                }
-            } else if (isset($tokens[($i + 1)]) === true
-                && $tokens[$i]['line'] < $tokens[($i + 1)]['line']
-            ) {
-                // There is no content after this whitespace except for a newline.
-                $content       = rtrim($content, "\r\n");
-                $nonWhitespace = $phpcsFile->eolChar;
-
-                // Don't record metrics for empty lines.
-                $recordMetrics = false;
-            }//end if
-
-            $foundSpaces = substr_count($content, ' ');
-            $foundTabs   = substr_count($content, "\t");
-
-            if ($foundSpaces === 0 && $foundTabs === 0) {
-                // Empty line.
-                continue;
-            }
-
-            if ($foundSpaces === 0 && $foundTabs > 0) {
-                // All ok, nothing to do.
-                if ($recordMetrics === true) {
-                    $phpcsFile->recordMetric($i, 'Line indent', 'tabs');
-                }
-
-                continue;
-            }
-
-            if (($tokens[$i]['code'] === T_DOC_COMMENT_WHITESPACE
-                || $tokens[$i]['code'] === T_COMMENT)
-                && $content === ' '
-            ) {
-                // Ignore all non-indented comments, especially for recording metrics.
-                continue;
-            }
-
-            // OK, by now we know there will be spaces.
-            // We just don't know yet whether they need to be replaced or
-            // are precision indentation, nor whether they are correctly
-            // placed at the end of the whitespace.
-            $tabAfterSpaces = strpos($content, "\t", strpos($content, ' '));
-
-            // Calculate the expected tabs and spaces.
-            $expectedTabs   = (int) floor($expectedIndentSize / $this->tabWidth);
-            $expectedSpaces = ($expectedIndentSize % $this->tabWidth);
-
-            if ($foundTabs === 0) {
-                if ($recordMetrics === true) {
-                    $phpcsFile->recordMetric($i, 'Line indent', 'spaces');
-                }
-
-                if ($foundTabs === $expectedTabs && $foundSpaces === $expectedSpaces) {
-                    // Ignore: precision indentation.
-                    continue;
-                }
-            } else {
-                if ($foundTabs === $expectedTabs && $foundSpaces === $expectedSpaces) {
-                    // Precision indentation.
-                    if ($recordMetrics === true) {
-                        if ($tabAfterSpaces !== false) {
-                            $phpcsFile->recordMetric($i, 'Line indent', 'mixed');
-                        } else {
-                            $phpcsFile->recordMetric($i, 'Line indent', 'tabs');
-                        }
-                    }
-
-                    if ($tabAfterSpaces === false) {
-                        // Ignore: precision indentation is already at the
-                        // end of the whitespace.
-                        continue;
-                    }
-                } else if ($recordMetrics === true) {
-                    $phpcsFile->recordMetric($i, 'Line indent', 'mixed');
-                }
-            }//end if
-
-            $error = 'Tabs must be used to indent lines; spaces are not allowed';
-            $fix   = $phpcsFile->addFixableError($error, $i, 'SpacesUsed');
-            if ($fix === true) {
-                $padding  = str_repeat("\t", $expectedTabs);
-                $padding .= str_repeat(' ', $expectedSpaces);
-                $phpcsFile->fixer->replaceToken($i, $padding.$nonWhitespace);
-            }
-        }//end for
-
-        // Ignore the rest of the file.
-        return ($phpcsFile->numTokens + 1);
-
-    }//end process()
+	/**
+	 * A list of tokenizers this sniff supports.
+	 *
+	 * @var array
+	 */
+	public $supportedTokenizers = [
+		'PHP',
+		'JS',
+		'CSS',
+	];
+
+	/**
+	 * The --tab-width CLI value that is being used.
+	 *
+	 * @var integer
+	 */
+	private $tabWidth = null;
+
+
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return [T_OPEN_TAG];
+
+	}//end register()
+
+
+	/**
+	 * Processes this test, when one of its tokens is encountered.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile All the tokens found in the document.
+	 * @param int                         $stackPtr  The position of the current token in
+	 *                                               the stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		$tabsReplaced = false;
+		if ($this->tabWidth === null) {
+			if (isset($phpcsFile->config->tabWidth) === false || $phpcsFile->config->tabWidth === 0) {
+				// We have no idea how wide tabs are, so assume 4 spaces for fixing.
+				// It shouldn't really matter because indent checks elsewhere in the
+				// standard should fix things up.
+				$this->tabWidth = 4;
+			} else {
+				$this->tabWidth = $phpcsFile->config->tabWidth;
+				$tabsReplaced   = true;
+			}
+		}
+
+		$checkTokens = [
+			T_WHITESPACE             => true,
+			T_INLINE_HTML            => true,
+			T_DOC_COMMENT_WHITESPACE => true,
+			T_COMMENT                => true,
+		];
+
+		$eolLen = strlen($phpcsFile->eolChar);
+
+		$tokens = $phpcsFile->getTokens();
+		for ($i = 0; $i < $phpcsFile->numTokens; $i++) {
+			if ($tokens[$i]['column'] !== 1 || isset($checkTokens[$tokens[$i]['code']]) === false) {
+				continue;
+			}
+
+			// If the tokenizer hasn't replaced tabs with spaces, we need to do it manually.
+			$token = $tokens[$i];
+			if ($tabsReplaced === false) {
+				$phpcsFile->tokenizer->replaceTabsInToken($token, ' ', ' ', $this->tabWidth);
+				if (strpos($token['content'], $phpcsFile->eolChar) !== false) {
+					// Newline chars are not counted in the token length.
+					$token['length'] -= $eolLen;
+				}
+			}
+
+			if (isset($tokens[$i]['orig_content']) === true) {
+				$content = $tokens[$i]['orig_content'];
+			} else {
+				$content = $tokens[$i]['content'];
+			}
+
+			$expectedIndentSize = $token['length'];
+
+			$recordMetrics = true;
+
+			// If this is an inline HTML token or a subsequent line of a multi-line comment,
+			// split the content into indentation whitespace and the actual HTML/text.
+			$nonWhitespace = '';
+			if (($tokens[$i]['code'] === T_INLINE_HTML
+				|| $tokens[$i]['code'] === T_COMMENT)
+				&& preg_match('`^(\s*)(\S.*)`s', $content, $matches) > 0
+			) {
+				if (isset($matches[1]) === true) {
+					$content = $matches[1];
+
+					// Tabs are not replaced in content, so the "length" is wrong.
+					$matches[1]         = str_replace("\t", str_repeat(' ', $this->tabWidth), $matches[1]);
+					$expectedIndentSize = strlen($matches[1]);
+				}
+
+				if (isset($matches[2]) === true) {
+					$nonWhitespace = $matches[2];
+				}
+			} else if (isset($tokens[($i + 1)]) === true
+				&& $tokens[$i]['line'] < $tokens[($i + 1)]['line']
+			) {
+				// There is no content after this whitespace except for a newline.
+				$content       = rtrim($content, "\r\n");
+				$nonWhitespace = $phpcsFile->eolChar;
+
+				// Don't record metrics for empty lines.
+				$recordMetrics = false;
+			}//end if
+
+			$foundSpaces = substr_count($content, ' ');
+			$foundTabs   = substr_count($content, "\t");
+
+			if ($foundSpaces === 0 && $foundTabs === 0) {
+				// Empty line.
+				continue;
+			}
+
+			if ($foundSpaces === 0 && $foundTabs > 0) {
+				// All ok, nothing to do.
+				if ($recordMetrics === true) {
+					$phpcsFile->recordMetric($i, 'Line indent', 'tabs');
+				}
+
+				continue;
+			}
+
+			if (($tokens[$i]['code'] === T_DOC_COMMENT_WHITESPACE
+				|| $tokens[$i]['code'] === T_COMMENT)
+				&& $content === ' '
+			) {
+				// Ignore all non-indented comments, especially for recording metrics.
+				continue;
+			}
+
+			// OK, by now we know there will be spaces.
+			// We just don't know yet whether they need to be replaced or
+			// are precision indentation, nor whether they are correctly
+			// placed at the end of the whitespace.
+			$tabAfterSpaces = strpos($content, "\t", strpos($content, ' '));
+
+			// Calculate the expected tabs and spaces.
+			$expectedTabs   = (int) floor($expectedIndentSize / $this->tabWidth);
+			$expectedSpaces = ($expectedIndentSize % $this->tabWidth);
+
+			if ($foundTabs === 0) {
+				if ($recordMetrics === true) {
+					$phpcsFile->recordMetric($i, 'Line indent', 'spaces');
+				}
+
+				if ($foundTabs === $expectedTabs && $foundSpaces === $expectedSpaces) {
+					// Ignore: precision indentation.
+					continue;
+				}
+			} else {
+				if ($foundTabs === $expectedTabs && $foundSpaces === $expectedSpaces) {
+					// Precision indentation.
+					if ($recordMetrics === true) {
+						if ($tabAfterSpaces !== false) {
+							$phpcsFile->recordMetric($i, 'Line indent', 'mixed');
+						} else {
+							$phpcsFile->recordMetric($i, 'Line indent', 'tabs');
+						}
+					}
+
+					if ($tabAfterSpaces === false) {
+						// Ignore: precision indentation is already at the
+						// end of the whitespace.
+						continue;
+					}
+				} else if ($recordMetrics === true) {
+					$phpcsFile->recordMetric($i, 'Line indent', 'mixed');
+				}
+			}//end if
+
+			$error = 'Tabs must be used to indent lines; spaces are not allowed';
+			$fix   = $phpcsFile->addFixableError($error, $i, 'SpacesUsed');
+			if ($fix === true) {
+				$padding  = str_repeat("\t", $expectedTabs);
+				$padding .= str_repeat(' ', $expectedSpaces);
+				$phpcsFile->fixer->replaceToken($i, $padding.$nonWhitespace);
+			}
+		}//end for
+
+		// Ignore the rest of the file.
+		return ($phpcsFile->numTokens + 1);
+
+	}//end process()
 
 
 }//end class

Spacing +57 added lines, -57 removed lines

@@ -41,7 +41,7 @@ 
      */
     public function register()
     {
-        return [T_OPEN_TAG];
+        return [ T_OPEN_TAG ];
 
     }//end register()
 
@@ -55,11 +55,11 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
         $tabsReplaced = false;
-        if ($this->tabWidth === null) {
-            if (isset($phpcsFile->config->tabWidth) === false || $phpcsFile->config->tabWidth === 0) {
+        if ( $this->tabWidth === null ) {
+            if ( isset( $phpcsFile->config->tabWidth ) === false || $phpcsFile->config->tabWidth === 0 ) {
                 // We have no idea how wide tabs are, so assume 4 spaces for fixing.
                 // It shouldn't really matter because indent checks elsewhere in the
                 // standard should fix things up.
@@ -77,82 +77,82 @@ 
             T_COMMENT                => true,
         ];
 
-        $eolLen = strlen($phpcsFile->eolChar);
+        $eolLen = strlen( $phpcsFile->eolChar );
 
         $tokens = $phpcsFile->getTokens();
-        for ($i = 0; $i < $phpcsFile->numTokens; $i++) {
-            if ($tokens[$i]['column'] !== 1 || isset($checkTokens[$tokens[$i]['code']]) === false) {
+        for ( $i = 0; $i < $phpcsFile->numTokens; $i++ ) {
+            if ( $tokens[ $i ][ 'column' ] !== 1 || isset( $checkTokens[ $tokens[ $i ][ 'code' ] ] ) === false ) {
                 continue;
             }
 
             // If the tokenizer hasn't replaced tabs with spaces, we need to do it manually.
-            $token = $tokens[$i];
-            if ($tabsReplaced === false) {
-                $phpcsFile->tokenizer->replaceTabsInToken($token, ' ', ' ', $this->tabWidth);
-                if (strpos($token['content'], $phpcsFile->eolChar) !== false) {
+            $token = $tokens[ $i ];
+            if ( $tabsReplaced === false ) {
+                $phpcsFile->tokenizer->replaceTabsInToken( $token, ' ', ' ', $this->tabWidth );
+                if ( strpos( $token[ 'content' ], $phpcsFile->eolChar ) !== false ) {
                     // Newline chars are not counted in the token length.
-                    $token['length'] -= $eolLen;
+                    $token[ 'length' ] -= $eolLen;
                 }
             }
 
-            if (isset($tokens[$i]['orig_content']) === true) {
-                $content = $tokens[$i]['orig_content'];
+            if ( isset( $tokens[ $i ][ 'orig_content' ] ) === true ) {
+                $content = $tokens[ $i ][ 'orig_content' ];
             } else {
-                $content = $tokens[$i]['content'];
+                $content = $tokens[ $i ][ 'content' ];
             }
 
-            $expectedIndentSize = $token['length'];
+            $expectedIndentSize = $token[ 'length' ];
 
             $recordMetrics = true;
 
             // If this is an inline HTML token or a subsequent line of a multi-line comment,
             // split the content into indentation whitespace and the actual HTML/text.
             $nonWhitespace = '';
-            if (($tokens[$i]['code'] === T_INLINE_HTML
-                || $tokens[$i]['code'] === T_COMMENT)
-                && preg_match('`^(\s*)(\S.*)`s', $content, $matches) > 0
+            if ( ( $tokens[ $i ][ 'code' ] === T_INLINE_HTML
+                || $tokens[ $i ][ 'code' ] === T_COMMENT )
+                && preg_match( '`^(\s*)(\S.*)`s', $content, $matches ) > 0
             ) {
-                if (isset($matches[1]) === true) {
-                    $content = $matches[1];
+                if ( isset( $matches[ 1 ] ) === true ) {
+                    $content = $matches[ 1 ];
 
                     // Tabs are not replaced in content, so the "length" is wrong.
-                    $matches[1]         = str_replace("\t", str_repeat(' ', $this->tabWidth), $matches[1]);
-                    $expectedIndentSize = strlen($matches[1]);
+                    $matches[ 1 ]         = str_replace( "\t", str_repeat( ' ', $this->tabWidth ), $matches[ 1 ] );
+                    $expectedIndentSize = strlen( $matches[ 1 ] );
                 }
 
-                if (isset($matches[2]) === true) {
-                    $nonWhitespace = $matches[2];
+                if ( isset( $matches[ 2 ] ) === true ) {
+                    $nonWhitespace = $matches[ 2 ];
                 }
-            } else if (isset($tokens[($i + 1)]) === true
-                && $tokens[$i]['line'] < $tokens[($i + 1)]['line']
+            } else if ( isset( $tokens[ ( $i + 1 ) ] ) === true
+                && $tokens[ $i ][ 'line' ] < $tokens[ ( $i + 1 ) ][ 'line' ]
             ) {
                 // There is no content after this whitespace except for a newline.
-                $content       = rtrim($content, "\r\n");
+                $content       = rtrim( $content, "\r\n" );
                 $nonWhitespace = $phpcsFile->eolChar;
 
                 // Don't record metrics for empty lines.
                 $recordMetrics = false;
             }//end if
 
-            $foundSpaces = substr_count($content, ' ');
-            $foundTabs   = substr_count($content, "\t");
+            $foundSpaces = substr_count( $content, ' ' );
+            $foundTabs   = substr_count( $content, "\t" );
 
-            if ($foundSpaces === 0 && $foundTabs === 0) {
+            if ( $foundSpaces === 0 && $foundTabs === 0 ) {
                 // Empty line.
                 continue;
             }
 
-            if ($foundSpaces === 0 && $foundTabs > 0) {
+            if ( $foundSpaces === 0 && $foundTabs > 0 ) {
                 // All ok, nothing to do.
-                if ($recordMetrics === true) {
-                    $phpcsFile->recordMetric($i, 'Line indent', 'tabs');
+                if ( $recordMetrics === true ) {
+                    $phpcsFile->recordMetric( $i, 'Line indent', 'tabs' );
                 }
 
                 continue;
             }
 
-            if (($tokens[$i]['code'] === T_DOC_COMMENT_WHITESPACE
-                || $tokens[$i]['code'] === T_COMMENT)
+            if ( ( $tokens[ $i ][ 'code' ] === T_DOC_COMMENT_WHITESPACE
+                || $tokens[ $i ][ 'code' ] === T_COMMENT )
                 && $content === ' '
             ) {
                 // Ignore all non-indented comments, especially for recording metrics.
@@ -163,53 +163,53 @@ 
             // We just don't know yet whether they need to be replaced or
             // are precision indentation, nor whether they are correctly
             // placed at the end of the whitespace.
-            $tabAfterSpaces = strpos($content, "\t", strpos($content, ' '));
+            $tabAfterSpaces = strpos( $content, "\t", strpos( $content, ' ' ) );
 
             // Calculate the expected tabs and spaces.
-            $expectedTabs   = (int) floor($expectedIndentSize / $this->tabWidth);
-            $expectedSpaces = ($expectedIndentSize % $this->tabWidth);
+            $expectedTabs   = (int)floor( $expectedIndentSize / $this->tabWidth );
+            $expectedSpaces = ( $expectedIndentSize % $this->tabWidth );
 
-            if ($foundTabs === 0) {
-                if ($recordMetrics === true) {
-                    $phpcsFile->recordMetric($i, 'Line indent', 'spaces');
+            if ( $foundTabs === 0 ) {
+                if ( $recordMetrics === true ) {
+                    $phpcsFile->recordMetric( $i, 'Line indent', 'spaces' );
                 }
 
-                if ($foundTabs === $expectedTabs && $foundSpaces === $expectedSpaces) {
+                if ( $foundTabs === $expectedTabs && $foundSpaces === $expectedSpaces ) {
                     // Ignore: precision indentation.
                     continue;
                 }
             } else {
-                if ($foundTabs === $expectedTabs && $foundSpaces === $expectedSpaces) {
+                if ( $foundTabs === $expectedTabs && $foundSpaces === $expectedSpaces ) {
                     // Precision indentation.
-                    if ($recordMetrics === true) {
-                        if ($tabAfterSpaces !== false) {
-                            $phpcsFile->recordMetric($i, 'Line indent', 'mixed');
+                    if ( $recordMetrics === true ) {
+                        if ( $tabAfterSpaces !== false ) {
+                            $phpcsFile->recordMetric( $i, 'Line indent', 'mixed' );
                         } else {
-                            $phpcsFile->recordMetric($i, 'Line indent', 'tabs');
+                            $phpcsFile->recordMetric( $i, 'Line indent', 'tabs' );
                         }
                     }
 
-                    if ($tabAfterSpaces === false) {
+                    if ( $tabAfterSpaces === false ) {
                         // Ignore: precision indentation is already at the
                         // end of the whitespace.
                         continue;
                     }
-                } else if ($recordMetrics === true) {
-                    $phpcsFile->recordMetric($i, 'Line indent', 'mixed');
+                } else if ( $recordMetrics === true ) {
+                    $phpcsFile->recordMetric( $i, 'Line indent', 'mixed' );
                 }
             }//end if
 
             $error = 'Tabs must be used to indent lines; spaces are not allowed';
-            $fix   = $phpcsFile->addFixableError($error, $i, 'SpacesUsed');
-            if ($fix === true) {
-                $padding  = str_repeat("\t", $expectedTabs);
-                $padding .= str_repeat(' ', $expectedSpaces);
-                $phpcsFile->fixer->replaceToken($i, $padding.$nonWhitespace);
+            $fix   = $phpcsFile->addFixableError( $error, $i, 'SpacesUsed' );
+            if ( $fix === true ) {
+                $padding  = str_repeat( "\t", $expectedTabs );
+                $padding .= str_repeat( ' ', $expectedSpaces );
+                $phpcsFile->fixer->replaceToken( $i, $padding . $nonWhitespace );
             }
         }//end for
 
         // Ignore the rest of the file.
-        return ($phpcsFile->numTokens + 1);
+        return ( $phpcsFile->numTokens + 1 );
 
     }//end process()
 

Braces +3 added lines, -6 removed lines

@@ -12,8 +12,7 @@ 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
 
-class DisallowSpaceIndentSniff implements Sniff
-{
+class DisallowSpaceIndentSniff implements Sniff {
 
     /**
      * A list of tokenizers this sniff supports.
@@ -39,8 +38,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return [T_OPEN_TAG];
 
     }//end register()
@@ -55,8 +53,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         $tabsReplaced = false;
         if ($this->tabWidth === null) {
             if (isset($phpcsFile->config->tabWidth) === false || $phpcsFile->config->tabWidth === 0) {

vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php

Doc Comments +2 added lines, -2 removed lines

@@ -102,7 +102,7 @@ 
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return integer[]
      */
     public function register()
     {
@@ -122,7 +122,7 @@ 
      * @param int                         $stackPtr  The position of the current token
      *                                               in the stack passed in $tokens.
      *
-     * @return void
+     * @return integer
      */
     public function process(File $phpcsFile, $stackPtr)
     {

Indentation +1441 added lines, -1441 removed lines

@@ -17,904 +17,904 @@ 
 class ScopeIndentSniff implements Sniff
 {
 
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = [
-        'PHP',
-        'JS',
-    ];
-
-    /**
-     * The number of spaces code should be indented.
-     *
-     * @var integer
-     */
-    public $indent = 4;
-
-    /**
-     * Does the indent need to be exactly right?
-     *
-     * If TRUE, indent needs to be exactly $indent spaces. If FALSE,
-     * indent needs to be at least $indent spaces (but can be more).
-     *
-     * @var boolean
-     */
-    public $exact = false;
-
-    /**
-     * Should tabs be used for indenting?
-     *
-     * If TRUE, fixes will be made using tabs instead of spaces.
-     * The size of each tab is important, so it should be specified
-     * using the --tab-width CLI argument.
-     *
-     * @var boolean
-     */
-    public $tabIndent = false;
-
-    /**
-     * The --tab-width CLI value that is being used.
-     *
-     * @var integer
-     */
-    private $tabWidth = null;
-
-    /**
-     * List of tokens not needing to be checked for indentation.
-     *
-     * Useful to allow Sniffs based on this to easily ignore/skip some
-     * tokens from verification. For example, inline HTML sections
-     * or PHP open/close tags can escape from here and have their own
-     * rules elsewhere.
-     *
-     * @var int[]
-     */
-    public $ignoreIndentationTokens = [];
-
-    /**
-     * List of tokens not needing to be checked for indentation.
-     *
-     * This is a cached copy of the public version of this var, which
-     * can be set in a ruleset file, and some core ignored tokens.
-     *
-     * @var int[]
-     */
-    private $ignoreIndentation = [];
-
-    /**
-     * Any scope openers that should not cause an indent.
-     *
-     * @var int[]
-     */
-    protected $nonIndentingScopes = [];
-
-    /**
-     * Show debug output for this sniff.
-     *
-     * @var boolean
-     */
-    private $debug = false;
-
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        if (defined('PHP_CODESNIFFER_IN_TESTS') === true) {
-            $this->debug = false;
-        }
-
-        return [T_OPEN_TAG];
-
-    }//end register()
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile All the tokens found in the document.
-     * @param int                         $stackPtr  The position of the current token
-     *                                               in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $debug = Config::getConfigData('scope_indent_debug');
-        if ($debug !== null) {
-            $this->debug = (bool) $debug;
-        }
-
-        if ($this->tabWidth === null) {
-            if (isset($phpcsFile->config->tabWidth) === false || $phpcsFile->config->tabWidth === 0) {
-                // We have no idea how wide tabs are, so assume 4 spaces for fixing.
-                // It shouldn't really matter because indent checks elsewhere in the
-                // standard should fix things up.
-                $this->tabWidth = 4;
-            } else {
-                $this->tabWidth = $phpcsFile->config->tabWidth;
-            }
-        }
-
-        $lastOpenTag     = $stackPtr;
-        $lastCloseTag    = null;
-        $openScopes      = [];
-        $adjustments     = [];
-        $setIndents      = [];
-        $disableExactEnd = 0;
-
-        $tokens  = $phpcsFile->getTokens();
-        $first   = $phpcsFile->findFirstOnLine(T_INLINE_HTML, $stackPtr);
-        $trimmed = ltrim($tokens[$first]['content']);
-        if ($trimmed === '') {
-            $currentIndent = ($tokens[$stackPtr]['column'] - 1);
-        } else {
-            $currentIndent = (strlen($tokens[$first]['content']) - strlen($trimmed));
-        }
-
-        if ($this->debug === true) {
-            $line = $tokens[$stackPtr]['line'];
-            echo "Start with token $stackPtr on line $line with indent $currentIndent".PHP_EOL;
-        }
-
-        if (empty($this->ignoreIndentation) === true) {
-            $this->ignoreIndentation = [T_INLINE_HTML => true];
-            foreach ($this->ignoreIndentationTokens as $token) {
-                if (is_int($token) === false) {
-                    if (defined($token) === false) {
-                        continue;
-                    }
-
-                    $token = constant($token);
-                }
-
-                $this->ignoreIndentation[$token] = true;
-            }
-        }//end if
-
-        $this->exact     = (bool) $this->exact;
-        $this->tabIndent = (bool) $this->tabIndent;
-
-        $checkAnnotations = $phpcsFile->config->annotations;
-
-        for ($i = ($stackPtr + 1); $i < $phpcsFile->numTokens; $i++) {
-            if ($i === false) {
-                // Something has gone very wrong; maybe a parse error.
-                break;
-            }
-
-            if ($checkAnnotations === true
-                && $tokens[$i]['code'] === T_PHPCS_SET
-                && isset($tokens[$i]['sniffCode']) === true
-                && $tokens[$i]['sniffCode'] === 'Generic.WhiteSpace.ScopeIndent'
-                && $tokens[$i]['sniffProperty'] === 'exact'
-            ) {
-                $value = $tokens[$i]['sniffPropertyValue'];
-                if ($value === 'true') {
-                    $value = true;
-                } else if ($value === 'false') {
-                    $value = false;
-                } else {
-                    $value = (bool) $value;
-                }
-
-                $this->exact = $value;
-
-                if ($this->debug === true) {
-                    $line = $tokens[$i]['line'];
-                    if ($this->exact === true) {
-                        $value = 'true';
-                    } else {
-                        $value = 'false';
-                    }
-
-                    echo "* token $i on line $line set exact flag to $value *".PHP_EOL;
-                }
-            }//end if
-
-            $checkToken  = null;
-            $checkIndent = null;
-
-            /*
+	/**
+	 * A list of tokenizers this sniff supports.
+	 *
+	 * @var array
+	 */
+	public $supportedTokenizers = [
+		'PHP',
+		'JS',
+	];
+
+	/**
+	 * The number of spaces code should be indented.
+	 *
+	 * @var integer
+	 */
+	public $indent = 4;
+
+	/**
+	 * Does the indent need to be exactly right?
+	 *
+	 * If TRUE, indent needs to be exactly $indent spaces. If FALSE,
+	 * indent needs to be at least $indent spaces (but can be more).
+	 *
+	 * @var boolean
+	 */
+	public $exact = false;
+
+	/**
+	 * Should tabs be used for indenting?
+	 *
+	 * If TRUE, fixes will be made using tabs instead of spaces.
+	 * The size of each tab is important, so it should be specified
+	 * using the --tab-width CLI argument.
+	 *
+	 * @var boolean
+	 */
+	public $tabIndent = false;
+
+	/**
+	 * The --tab-width CLI value that is being used.
+	 *
+	 * @var integer
+	 */
+	private $tabWidth = null;
+
+	/**
+	 * List of tokens not needing to be checked for indentation.
+	 *
+	 * Useful to allow Sniffs based on this to easily ignore/skip some
+	 * tokens from verification. For example, inline HTML sections
+	 * or PHP open/close tags can escape from here and have their own
+	 * rules elsewhere.
+	 *
+	 * @var int[]
+	 */
+	public $ignoreIndentationTokens = [];
+
+	/**
+	 * List of tokens not needing to be checked for indentation.
+	 *
+	 * This is a cached copy of the public version of this var, which
+	 * can be set in a ruleset file, and some core ignored tokens.
+	 *
+	 * @var int[]
+	 */
+	private $ignoreIndentation = [];
+
+	/**
+	 * Any scope openers that should not cause an indent.
+	 *
+	 * @var int[]
+	 */
+	protected $nonIndentingScopes = [];
+
+	/**
+	 * Show debug output for this sniff.
+	 *
+	 * @var boolean
+	 */
+	private $debug = false;
+
+
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		if (defined('PHP_CODESNIFFER_IN_TESTS') === true) {
+			$this->debug = false;
+		}
+
+		return [T_OPEN_TAG];
+
+	}//end register()
+
+
+	/**
+	 * Processes this test, when one of its tokens is encountered.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile All the tokens found in the document.
+	 * @param int                         $stackPtr  The position of the current token
+	 *                                               in the stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		$debug = Config::getConfigData('scope_indent_debug');
+		if ($debug !== null) {
+			$this->debug = (bool) $debug;
+		}
+
+		if ($this->tabWidth === null) {
+			if (isset($phpcsFile->config->tabWidth) === false || $phpcsFile->config->tabWidth === 0) {
+				// We have no idea how wide tabs are, so assume 4 spaces for fixing.
+				// It shouldn't really matter because indent checks elsewhere in the
+				// standard should fix things up.
+				$this->tabWidth = 4;
+			} else {
+				$this->tabWidth = $phpcsFile->config->tabWidth;
+			}
+		}
+
+		$lastOpenTag     = $stackPtr;
+		$lastCloseTag    = null;
+		$openScopes      = [];
+		$adjustments     = [];
+		$setIndents      = [];
+		$disableExactEnd = 0;
+
+		$tokens  = $phpcsFile->getTokens();
+		$first   = $phpcsFile->findFirstOnLine(T_INLINE_HTML, $stackPtr);
+		$trimmed = ltrim($tokens[$first]['content']);
+		if ($trimmed === '') {
+			$currentIndent = ($tokens[$stackPtr]['column'] - 1);
+		} else {
+			$currentIndent = (strlen($tokens[$first]['content']) - strlen($trimmed));
+		}
+
+		if ($this->debug === true) {
+			$line = $tokens[$stackPtr]['line'];
+			echo "Start with token $stackPtr on line $line with indent $currentIndent".PHP_EOL;
+		}
+
+		if (empty($this->ignoreIndentation) === true) {
+			$this->ignoreIndentation = [T_INLINE_HTML => true];
+			foreach ($this->ignoreIndentationTokens as $token) {
+				if (is_int($token) === false) {
+					if (defined($token) === false) {
+						continue;
+					}
+
+					$token = constant($token);
+				}
+
+				$this->ignoreIndentation[$token] = true;
+			}
+		}//end if
+
+		$this->exact     = (bool) $this->exact;
+		$this->tabIndent = (bool) $this->tabIndent;
+
+		$checkAnnotations = $phpcsFile->config->annotations;
+
+		for ($i = ($stackPtr + 1); $i < $phpcsFile->numTokens; $i++) {
+			if ($i === false) {
+				// Something has gone very wrong; maybe a parse error.
+				break;
+			}
+
+			if ($checkAnnotations === true
+				&& $tokens[$i]['code'] === T_PHPCS_SET
+				&& isset($tokens[$i]['sniffCode']) === true
+				&& $tokens[$i]['sniffCode'] === 'Generic.WhiteSpace.ScopeIndent'
+				&& $tokens[$i]['sniffProperty'] === 'exact'
+			) {
+				$value = $tokens[$i]['sniffPropertyValue'];
+				if ($value === 'true') {
+					$value = true;
+				} else if ($value === 'false') {
+					$value = false;
+				} else {
+					$value = (bool) $value;
+				}
+
+				$this->exact = $value;
+
+				if ($this->debug === true) {
+					$line = $tokens[$i]['line'];
+					if ($this->exact === true) {
+						$value = 'true';
+					} else {
+						$value = 'false';
+					}
+
+					echo "* token $i on line $line set exact flag to $value *".PHP_EOL;
+				}
+			}//end if
+
+			$checkToken  = null;
+			$checkIndent = null;
+
+			/*
                 Don't check indents exactly between parenthesis or arrays as they
                 tend to have custom rules, such as with multi-line function calls
                 and control structure conditions.
             */
 
-            $exact = $this->exact;
-
-            if ($tokens[$i]['code'] === T_OPEN_SHORT_ARRAY) {
-                $disableExactEnd = max($disableExactEnd, $tokens[$i]['bracket_closer']);
-            }
-
-            if ($tokens[$i]['code'] === T_OPEN_PARENTHESIS
-                && isset($tokens[$i]['parenthesis_closer']) === true
-            ) {
-                $disableExactEnd = max($disableExactEnd, $tokens[$i]['parenthesis_closer']);
-            }
-
-            if ($exact === true && $i < $disableExactEnd) {
-                $exact = false;
-            }
-
-            // Detect line changes and figure out where the indent is.
-            if ($tokens[$i]['column'] === 1) {
-                $trimmed = ltrim($tokens[$i]['content']);
-                if ($trimmed === '') {
-                    if (isset($tokens[($i + 1)]) === true
-                        && $tokens[$i]['line'] === $tokens[($i + 1)]['line']
-                    ) {
-                        $checkToken  = ($i + 1);
-                        $tokenIndent = ($tokens[($i + 1)]['column'] - 1);
-                    }
-                } else {
-                    $checkToken  = $i;
-                    $tokenIndent = (strlen($tokens[$i]['content']) - strlen($trimmed));
-                }
-            }
-
-            // Closing parenthesis should just be indented to at least
-            // the same level as where they were opened (but can be more).
-            if (($checkToken !== null
-                && $tokens[$checkToken]['code'] === T_CLOSE_PARENTHESIS
-                && isset($tokens[$checkToken]['parenthesis_opener']) === true)
-                || ($tokens[$i]['code'] === T_CLOSE_PARENTHESIS
-                && isset($tokens[$i]['parenthesis_opener']) === true)
-            ) {
-                if ($checkToken !== null) {
-                    $parenCloser = $checkToken;
-                } else {
-                    $parenCloser = $i;
-                }
-
-                if ($this->debug === true) {
-                    $line = $tokens[$i]['line'];
-                    echo "Closing parenthesis found on line $line".PHP_EOL;
-                }
-
-                $parenOpener = $tokens[$parenCloser]['parenthesis_opener'];
-                if ($tokens[$parenCloser]['line'] !== $tokens[$parenOpener]['line']) {
-                    $parens = 0;
-                    if (isset($tokens[$parenCloser]['nested_parenthesis']) === true
-                        && empty($tokens[$parenCloser]['nested_parenthesis']) === false
-                    ) {
-                        $parens = $tokens[$parenCloser]['nested_parenthesis'];
-                        end($parens);
-                        $parens = key($parens);
-                        if ($this->debug === true) {
-                            $line = $tokens[$parens]['line'];
-                            echo "\t* token has nested parenthesis $parens on line $line *".PHP_EOL;
-                        }
-                    }
-
-                    $condition = 0;
-                    if (isset($tokens[$parenCloser]['conditions']) === true
-                        && empty($tokens[$parenCloser]['conditions']) === false
-                        && (isset($tokens[$parenCloser]['parenthesis_owner']) === false
-                        || $parens > 0)
-                    ) {
-                        $condition = $tokens[$parenCloser]['conditions'];
-                        end($condition);
-                        $condition = key($condition);
-                        if ($this->debug === true) {
-                            $line = $tokens[$condition]['line'];
-                            $type = $tokens[$condition]['type'];
-                            echo "\t* token is inside condition $condition ($type) on line $line *".PHP_EOL;
-                        }
-                    }
-
-                    if ($parens > $condition) {
-                        if ($this->debug === true) {
-                            echo "\t* using parenthesis *".PHP_EOL;
-                        }
-
-                        $parenOpener = $parens;
-                        $condition   = 0;
-                    } else if ($condition > 0) {
-                        if ($this->debug === true) {
-                            echo "\t* using condition *".PHP_EOL;
-                        }
-
-                        $parenOpener = $condition;
-                        $parens      = 0;
-                    }
-
-                    $exact = false;
-
-                    $lastOpenTagConditions = array_keys($tokens[$lastOpenTag]['conditions']);
-                    $lastOpenTagCondition  = array_pop($lastOpenTagConditions);
-
-                    if ($condition > 0 && $lastOpenTagCondition === $condition) {
-                        if ($this->debug === true) {
-                            echo "\t* open tag is inside condition; using open tag *".PHP_EOL;
-                        }
-
-                        $checkIndent = ($tokens[$lastOpenTag]['column'] - 1);
-                        if (isset($adjustments[$condition]) === true) {
-                            $checkIndent += $adjustments[$condition];
-                        }
-
-                        $currentIndent = $checkIndent;
-
-                        if ($this->debug === true) {
-                            $type = $tokens[$lastOpenTag]['type'];
-                            echo "\t=> checking indent of $checkIndent; main indent set to $currentIndent by token $lastOpenTag ($type)".PHP_EOL;
-                        }
-                    } else if ($condition > 0
-                        && isset($tokens[$condition]['scope_opener']) === true
-                        && isset($setIndents[$tokens[$condition]['scope_opener']]) === true
-                    ) {
-                        $checkIndent = $setIndents[$tokens[$condition]['scope_opener']];
-                        if (isset($adjustments[$condition]) === true) {
-                            $checkIndent += $adjustments[$condition];
-                        }
-
-                        $currentIndent = $checkIndent;
-
-                        if ($this->debug === true) {
-                            $type = $tokens[$condition]['type'];
-                            echo "\t=> checking indent of $checkIndent; main indent set to $currentIndent by token $condition ($type)".PHP_EOL;
-                        }
-                    } else {
-                        $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $parenOpener, true);
-
-                        $checkIndent = ($tokens[$first]['column'] - 1);
-                        if (isset($adjustments[$first]) === true) {
-                            $checkIndent += $adjustments[$first];
-                        }
-
-                        if ($this->debug === true) {
-                            $line = $tokens[$first]['line'];
-                            $type = $tokens[$first]['type'];
-                            echo "\t* first token on line $line is $first ($type) *".PHP_EOL;
-                        }
-
-                        if ($first === $tokens[$parenCloser]['parenthesis_opener']
-                            && $tokens[($first - 1)]['line'] === $tokens[$first]['line']
-                        ) {
-                            // This is unlikely to be the start of the statement, so look
-                            // back further to find it.
-                            $first--;
-                            if ($this->debug === true) {
-                                $line = $tokens[$first]['line'];
-                                $type = $tokens[$first]['type'];
-                                echo "\t* first token is the parenthesis opener *".PHP_EOL;
-                                echo "\t* amended first token is $first ($type) on line $line *".PHP_EOL;
-                            }
-                        }
-
-                        $prev = $phpcsFile->findStartOfStatement($first, T_COMMA);
-                        if ($prev !== $first) {
-                            // This is not the start of the statement.
-                            if ($this->debug === true) {
-                                $line = $tokens[$prev]['line'];
-                                $type = $tokens[$prev]['type'];
-                                echo "\t* previous is $type on line $line *".PHP_EOL;
-                            }
-
-                            $first = $phpcsFile->findFirstOnLine([T_WHITESPACE, T_INLINE_HTML], $prev, true);
-                            if ($first !== false) {
-                                $prev  = $phpcsFile->findStartOfStatement($first, T_COMMA);
-                                $first = $phpcsFile->findFirstOnLine([T_WHITESPACE, T_INLINE_HTML], $prev, true);
-                            } else {
-                                $first = $prev;
-                            }
-
-                            if ($this->debug === true) {
-                                $line = $tokens[$first]['line'];
-                                $type = $tokens[$first]['type'];
-                                echo "\t* amended first token is $first ($type) on line $line *".PHP_EOL;
-                            }
-                        }//end if
-
-                        if (isset($tokens[$first]['scope_closer']) === true
-                            && $tokens[$first]['scope_closer'] === $first
-                        ) {
-                            if ($this->debug === true) {
-                                echo "\t* first token is a scope closer *".PHP_EOL;
-                            }
-
-                            if (isset($tokens[$first]['scope_condition']) === true) {
-                                $scopeCloser = $first;
-                                $first       = $phpcsFile->findFirstOnLine(T_WHITESPACE, $tokens[$scopeCloser]['scope_condition'], true);
-
-                                $currentIndent = ($tokens[$first]['column'] - 1);
-                                if (isset($adjustments[$first]) === true) {
-                                    $currentIndent += $adjustments[$first];
-                                }
-
-                                // Make sure it is divisible by our expected indent.
-                                if ($tokens[$tokens[$scopeCloser]['scope_condition']]['code'] !== T_CLOSURE) {
-                                    $currentIndent = (int) (ceil($currentIndent / $this->indent) * $this->indent);
-                                }
-
-                                $setIndents[$first] = $currentIndent;
-
-                                if ($this->debug === true) {
-                                    $type = $tokens[$first]['type'];
-                                    echo "\t=> indent set to $currentIndent by token $first ($type)".PHP_EOL;
-                                }
-                            }//end if
-                        } else {
-                            // Don't force current indent to be divisible because there could be custom
-                            // rules in place between parenthesis, such as with arrays.
-                            $currentIndent = ($tokens[$first]['column'] - 1);
-                            if (isset($adjustments[$first]) === true) {
-                                $currentIndent += $adjustments[$first];
-                            }
-
-                            $setIndents[$first] = $currentIndent;
-
-                            if ($this->debug === true) {
-                                $type = $tokens[$first]['type'];
-                                echo "\t=> checking indent of $checkIndent; main indent set to $currentIndent by token $first ($type)".PHP_EOL;
-                            }
-                        }//end if
-                    }//end if
-                } else if ($this->debug === true) {
-                    echo "\t * ignoring single-line definition *".PHP_EOL;
-                }//end if
-            }//end if
-
-            // Closing short array bracket should just be indented to at least
-            // the same level as where it was opened (but can be more).
-            if ($tokens[$i]['code'] === T_CLOSE_SHORT_ARRAY
-                || ($checkToken !== null
-                && $tokens[$checkToken]['code'] === T_CLOSE_SHORT_ARRAY)
-            ) {
-                if ($checkToken !== null) {
-                    $arrayCloser = $checkToken;
-                } else {
-                    $arrayCloser = $i;
-                }
-
-                if ($this->debug === true) {
-                    $line = $tokens[$arrayCloser]['line'];
-                    echo "Closing short array bracket found on line $line".PHP_EOL;
-                }
-
-                $arrayOpener = $tokens[$arrayCloser]['bracket_opener'];
-                if ($tokens[$arrayCloser]['line'] !== $tokens[$arrayOpener]['line']) {
-                    $first       = $phpcsFile->findFirstOnLine(T_WHITESPACE, $arrayOpener, true);
-                    $checkIndent = ($tokens[$first]['column'] - 1);
-                    if (isset($adjustments[$first]) === true) {
-                        $checkIndent += $adjustments[$first];
-                    }
-
-                    $exact = false;
-
-                    if ($this->debug === true) {
-                        $line = $tokens[$first]['line'];
-                        $type = $tokens[$first]['type'];
-                        echo "\t* first token on line $line is $first ($type) *".PHP_EOL;
-                    }
-
-                    if ($first === $tokens[$arrayCloser]['bracket_opener']) {
-                        // This is unlikely to be the start of the statement, so look
-                        // back further to find it.
-                        $first--;
-                    }
-
-                    $prev = $phpcsFile->findStartOfStatement($first, [T_COMMA, T_DOUBLE_ARROW]);
-                    if ($prev !== $first) {
-                        // This is not the start of the statement.
-                        if ($this->debug === true) {
-                            $line = $tokens[$prev]['line'];
-                            $type = $tokens[$prev]['type'];
-                            echo "\t* previous is $type on line $line *".PHP_EOL;
-                        }
-
-                        $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $prev, true);
-                        $prev  = $phpcsFile->findStartOfStatement($first, [T_COMMA, T_DOUBLE_ARROW]);
-                        $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $prev, true);
-                        if ($this->debug === true) {
-                            $line = $tokens[$first]['line'];
-                            $type = $tokens[$first]['type'];
-                            echo "\t* amended first token is $first ($type) on line $line *".PHP_EOL;
-                        }
-                    } else if ($tokens[$first]['code'] === T_WHITESPACE) {
-                        $first = $phpcsFile->findNext(T_WHITESPACE, ($first + 1), null, true);
-                    }
-
-                    if (isset($tokens[$first]['scope_closer']) === true
-                        && $tokens[$first]['scope_closer'] === $first
-                    ) {
-                        // The first token is a scope closer and would have already
-                        // been processed and set the indent level correctly, so
-                        // don't adjust it again.
-                        if ($this->debug === true) {
-                            echo "\t* first token is a scope closer; ignoring closing short array bracket *".PHP_EOL;
-                        }
-
-                        if (isset($setIndents[$first]) === true) {
-                            $currentIndent = $setIndents[$first];
-                            if ($this->debug === true) {
-                                echo "\t=> indent reset to $currentIndent".PHP_EOL;
-                            }
-                        }
-                    } else {
-                        // Don't force current indent to be divisible because there could be custom
-                        // rules in place for arrays.
-                        $currentIndent = ($tokens[$first]['column'] - 1);
-                        if (isset($adjustments[$first]) === true) {
-                            $currentIndent += $adjustments[$first];
-                        }
-
-                        $setIndents[$first] = $currentIndent;
-
-                        if ($this->debug === true) {
-                            $type = $tokens[$first]['type'];
-                            echo "\t=> checking indent of $checkIndent; main indent set to $currentIndent by token $first ($type)".PHP_EOL;
-                        }
-                    }//end if
-                } else if ($this->debug === true) {
-                    echo "\t * ignoring single-line definition *".PHP_EOL;
-                }//end if
-            }//end if
-
-            // Adjust lines within scopes while auto-fixing.
-            if ($checkToken !== null
-                && $exact === false
-                && (empty($tokens[$checkToken]['conditions']) === false
-                || (isset($tokens[$checkToken]['scope_opener']) === true
-                && $tokens[$checkToken]['scope_opener'] === $checkToken))
-            ) {
-                if (empty($tokens[$checkToken]['conditions']) === false) {
-                    $condition = $tokens[$checkToken]['conditions'];
-                    end($condition);
-                    $condition = key($condition);
-                } else {
-                    $condition = $tokens[$checkToken]['scope_condition'];
-                }
-
-                $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $condition, true);
-
-                if (isset($adjustments[$first]) === true
-                    && (($adjustments[$first] < 0 && $tokenIndent > $currentIndent)
-                    || ($adjustments[$first] > 0 && $tokenIndent < $currentIndent))
-                ) {
-                    $length = ($tokenIndent + $adjustments[$first]);
-
-                    // When fixing, we're going to adjust the indent of this line
-                    // here automatically, so use this new padding value when
-                    // comparing the expected padding to the actual padding.
-                    if ($phpcsFile->fixer->enabled === true) {
-                        $tokenIndent = $length;
-                        $this->adjustIndent($phpcsFile, $checkToken, $length, $adjustments[$first]);
-                    }
-
-                    if ($this->debug === true) {
-                        $line = $tokens[$checkToken]['line'];
-                        $type = $tokens[$checkToken]['type'];
-                        echo "Indent adjusted to $length for $type on line $line".PHP_EOL;
-                    }
-
-                    $adjustments[$checkToken] = $adjustments[$first];
-
-                    if ($this->debug === true) {
-                        $line = $tokens[$checkToken]['line'];
-                        $type = $tokens[$checkToken]['type'];
-                        echo "\t=> add adjustment of ".$adjustments[$checkToken]." for token $checkToken ($type) on line $line".PHP_EOL;
-                    }
-                }//end if
-            }//end if
-
-            // Scope closers reset the required indent to the same level as the opening condition.
-            if (($checkToken !== null
-                && isset($openScopes[$checkToken]) === true
-                || (isset($tokens[$checkToken]['scope_condition']) === true
-                && isset($tokens[$checkToken]['scope_closer']) === true
-                && $tokens[$checkToken]['scope_closer'] === $checkToken
-                && $tokens[$checkToken]['line'] !== $tokens[$tokens[$checkToken]['scope_opener']]['line']))
-                || ($checkToken === null
-                && isset($openScopes[$i]) === true
-                || (isset($tokens[$i]['scope_condition']) === true
-                && isset($tokens[$i]['scope_closer']) === true
-                && $tokens[$i]['scope_closer'] === $i
-                && $tokens[$i]['line'] !== $tokens[$tokens[$i]['scope_opener']]['line']))
-            ) {
-                if ($this->debug === true) {
-                    if ($checkToken === null) {
-                        $type = $tokens[$tokens[$i]['scope_condition']]['type'];
-                        $line = $tokens[$i]['line'];
-                    } else {
-                        $type = $tokens[$tokens[$checkToken]['scope_condition']]['type'];
-                        $line = $tokens[$checkToken]['line'];
-                    }
-
-                    echo "Close scope ($type) on line $line".PHP_EOL;
-                }
-
-                $scopeCloser = $checkToken;
-                if ($scopeCloser === null) {
-                    $scopeCloser = $i;
-                }
-
-                $conditionToken = array_pop($openScopes);
-                if ($this->debug === true) {
-                    $line = $tokens[$conditionToken]['line'];
-                    $type = $tokens[$conditionToken]['type'];
-                    echo "\t=> removed open scope $conditionToken ($type) on line $line".PHP_EOL;
-                }
-
-                if (isset($tokens[$scopeCloser]['scope_condition']) === true) {
-                    $first = $phpcsFile->findFirstOnLine([T_WHITESPACE, T_INLINE_HTML], $tokens[$scopeCloser]['scope_condition'], true);
-                    if ($this->debug === true) {
-                        $line = $tokens[$first]['line'];
-                        $type = $tokens[$first]['type'];
-                        echo "\t* first token is $first ($type) on line $line *".PHP_EOL;
-                    }
-
-                    while ($tokens[$first]['code'] === T_CONSTANT_ENCAPSED_STRING
-                        && $tokens[($first - 1)]['code'] === T_CONSTANT_ENCAPSED_STRING
-                    ) {
-                        $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, ($first - 1), true);
-                        if ($this->debug === true) {
-                            $line = $tokens[$first]['line'];
-                            $type = $tokens[$first]['type'];
-                            echo "\t* found multi-line string; amended first token is $first ($type) on line $line *".PHP_EOL;
-                        }
-                    }
-
-                    $currentIndent = ($tokens[$first]['column'] - 1);
-                    if (isset($adjustments[$first]) === true) {
-                        $currentIndent += $adjustments[$first];
-                    }
-
-                    $setIndents[$scopeCloser] = $currentIndent;
-
-                    if ($this->debug === true) {
-                        $type = $tokens[$scopeCloser]['type'];
-                        echo "\t=> indent set to $currentIndent by token $scopeCloser ($type)".PHP_EOL;
-                    }
-
-                    // We only check the indent of scope closers if they are
-                    // curly braces because other constructs tend to have different rules.
-                    if ($tokens[$scopeCloser]['code'] === T_CLOSE_CURLY_BRACKET) {
-                        $exact = true;
-                    } else {
-                        $checkToken = null;
-                    }
-                }//end if
-            }//end if
-
-            // Handle scope for JS object notation.
-            if ($phpcsFile->tokenizerType === 'JS'
-                && (($checkToken !== null
-                && $tokens[$checkToken]['code'] === T_CLOSE_OBJECT
-                && $tokens[$checkToken]['line'] !== $tokens[$tokens[$checkToken]['bracket_opener']]['line'])
-                || ($checkToken === null
-                && $tokens[$i]['code'] === T_CLOSE_OBJECT
-                && $tokens[$i]['line'] !== $tokens[$tokens[$i]['bracket_opener']]['line']))
-            ) {
-                if ($this->debug === true) {
-                    $line = $tokens[$i]['line'];
-                    echo "Close JS object on line $line".PHP_EOL;
-                }
-
-                $scopeCloser = $checkToken;
-                if ($scopeCloser === null) {
-                    $scopeCloser = $i;
-                } else {
-                    $conditionToken = array_pop($openScopes);
-                    if ($this->debug === true) {
-                        $line = $tokens[$conditionToken]['line'];
-                        $type = $tokens[$conditionToken]['type'];
-                        echo "\t=> removed open scope $conditionToken ($type) on line $line".PHP_EOL;
-                    }
-                }
-
-                $parens = 0;
-                if (isset($tokens[$scopeCloser]['nested_parenthesis']) === true
-                    && empty($tokens[$scopeCloser]['nested_parenthesis']) === false
-                ) {
-                    $parens = $tokens[$scopeCloser]['nested_parenthesis'];
-                    end($parens);
-                    $parens = key($parens);
-                    if ($this->debug === true) {
-                        $line = $tokens[$parens]['line'];
-                        echo "\t* token has nested parenthesis $parens on line $line *".PHP_EOL;
-                    }
-                }
-
-                $condition = 0;
-                if (isset($tokens[$scopeCloser]['conditions']) === true
-                    && empty($tokens[$scopeCloser]['conditions']) === false
-                ) {
-                    $condition = $tokens[$scopeCloser]['conditions'];
-                    end($condition);
-                    $condition = key($condition);
-                    if ($this->debug === true) {
-                        $line = $tokens[$condition]['line'];
-                        $type = $tokens[$condition]['type'];
-                        echo "\t* token is inside condition $condition ($type) on line $line *".PHP_EOL;
-                    }
-                }
-
-                if ($parens > $condition) {
-                    if ($this->debug === true) {
-                        echo "\t* using parenthesis *".PHP_EOL;
-                    }
-
-                    $first     = $phpcsFile->findFirstOnLine(T_WHITESPACE, $parens, true);
-                    $condition = 0;
-                } else if ($condition > 0) {
-                    if ($this->debug === true) {
-                        echo "\t* using condition *".PHP_EOL;
-                    }
-
-                    $first  = $phpcsFile->findFirstOnLine(T_WHITESPACE, $condition, true);
-                    $parens = 0;
-                } else {
-                    if ($this->debug === true) {
-                        $line = $tokens[$tokens[$scopeCloser]['bracket_opener']]['line'];
-                        echo "\t* token is not in parenthesis or condition; using opener on line $line *".PHP_EOL;
-                    }
-
-                    $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $tokens[$scopeCloser]['bracket_opener'], true);
-                }//end if
-
-                $currentIndent = ($tokens[$first]['column'] - 1);
-                if (isset($adjustments[$first]) === true) {
-                    $currentIndent += $adjustments[$first];
-                }
-
-                if ($parens > 0 || $condition > 0) {
-                    $checkIndent = ($tokens[$first]['column'] - 1);
-                    if (isset($adjustments[$first]) === true) {
-                        $checkIndent += $adjustments[$first];
-                    }
-
-                    if ($condition > 0) {
-                        $checkIndent   += $this->indent;
-                        $currentIndent += $this->indent;
-                        $exact          = true;
-                    }
-                } else {
-                    $checkIndent = $currentIndent;
-                }
-
-                // Make sure it is divisible by our expected indent.
-                $currentIndent      = (int) (ceil($currentIndent / $this->indent) * $this->indent);
-                $checkIndent        = (int) (ceil($checkIndent / $this->indent) * $this->indent);
-                $setIndents[$first] = $currentIndent;
-
-                if ($this->debug === true) {
-                    $type = $tokens[$first]['type'];
-                    echo "\t=> checking indent of $checkIndent; main indent set to $currentIndent by token $first ($type)".PHP_EOL;
-                }
-            }//end if
-
-            if ($checkToken !== null
-                && isset(Tokens::$scopeOpeners[$tokens[$checkToken]['code']]) === true
-                && in_array($tokens[$checkToken]['code'], $this->nonIndentingScopes, true) === false
-                && isset($tokens[$checkToken]['scope_opener']) === true
-            ) {
-                $exact = true;
-
-                $lastOpener = null;
-                if (empty($openScopes) === false) {
-                    end($openScopes);
-                    $lastOpener = current($openScopes);
-                }
-
-                // A scope opener that shares a closer with another token (like multiple
-                // CASEs using the same BREAK) needs to reduce the indent level so its
-                // indent is checked correctly. It will then increase the indent again
-                // (as all openers do) after being checked.
-                if ($lastOpener !== null
-                    && isset($tokens[$lastOpener]['scope_closer']) === true
-                    && $tokens[$lastOpener]['level'] === $tokens[$checkToken]['level']
-                    && $tokens[$lastOpener]['scope_closer'] === $tokens[$checkToken]['scope_closer']
-                ) {
-                    $currentIndent          -= $this->indent;
-                    $setIndents[$lastOpener] = $currentIndent;
-                    if ($this->debug === true) {
-                        $line = $tokens[$i]['line'];
-                        $type = $tokens[$lastOpener]['type'];
-                        echo "Shared closer found on line $line".PHP_EOL;
-                        echo "\t=> indent set to $currentIndent by token $lastOpener ($type)".PHP_EOL;
-                    }
-                }
-
-                if ($tokens[$checkToken]['code'] === T_CLOSURE
-                    && $tokenIndent > $currentIndent
-                ) {
-                    // The opener is indented more than needed, which is fine.
-                    // But just check that it is divisible by our expected indent.
-                    $checkIndent = (int) (ceil($tokenIndent / $this->indent) * $this->indent);
-                    $exact       = false;
-
-                    if ($this->debug === true) {
-                        $line = $tokens[$i]['line'];
-                        echo "Closure found on line $line".PHP_EOL;
-                        echo "\t=> checking indent of $checkIndent; main indent remains at $currentIndent".PHP_EOL;
-                    }
-                }
-            }//end if
-
-            // Method prefix indentation has to be exact or else it will break
-            // the rest of the function declaration, and potentially future ones.
-            if ($checkToken !== null
-                && isset(Tokens::$methodPrefixes[$tokens[$checkToken]['code']]) === true
-                && $tokens[($checkToken + 1)]['code'] !== T_DOUBLE_COLON
-            ) {
-                $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($checkToken + 1), null, true);
-                if ($next === false || $tokens[$next]['code'] !== T_CLOSURE) {
-                    if ($this->debug === true) {
-                        $line = $tokens[$checkToken]['line'];
-                        $type = $tokens[$checkToken]['type'];
-                        echo "\t* method prefix ($type) found on line $line; indent set to exact *".PHP_EOL;
-                    }
-
-                    $exact = true;
-                }
-            }
-
-            // JS property indentation has to be exact or else if will break
-            // things like function and object indentation.
-            if ($checkToken !== null && $tokens[$checkToken]['code'] === T_PROPERTY) {
-                $exact = true;
-            }
-
-            // Open PHP tags needs to be indented to exact column positions
-            // so they don't cause problems with indent checks for the code
-            // within them, but they don't need to line up with the current indent
-            // in most cases.
-            if ($checkToken !== null
-                && ($tokens[$checkToken]['code'] === T_OPEN_TAG
-                || $tokens[$checkToken]['code'] === T_OPEN_TAG_WITH_ECHO)
-            ) {
-                $checkIndent = ($tokens[$checkToken]['column'] - 1);
-
-                // If we are re-opening a block that was closed in the same
-                // scope as us, then reset the indent back to what the scope opener
-                // set instead of using whatever indent this open tag has set.
-                if (empty($tokens[$checkToken]['conditions']) === false) {
-                    $close = $phpcsFile->findPrevious(T_CLOSE_TAG, ($checkToken - 1));
-                    if ($close !== false
-                        && $tokens[$checkToken]['conditions'] === $tokens[$close]['conditions']
-                    ) {
-                        $conditions    = array_keys($tokens[$checkToken]['conditions']);
-                        $lastCondition = array_pop($conditions);
-                        $lastOpener    = $tokens[$lastCondition]['scope_opener'];
-                        $lastCloser    = $tokens[$lastCondition]['scope_closer'];
-                        if ($tokens[$lastCloser]['line'] !== $tokens[$checkToken]['line']
-                            && isset($setIndents[$lastOpener]) === true
-                        ) {
-                            $checkIndent = $setIndents[$lastOpener];
-                        }
-                    }
-                }
-
-                $checkIndent = (int) (ceil($checkIndent / $this->indent) * $this->indent);
-            }//end if
-
-            // Close tags needs to be indented to exact column positions.
-            if ($checkToken !== null && $tokens[$checkToken]['code'] === T_CLOSE_TAG) {
-                $exact       = true;
-                $checkIndent = $currentIndent;
-                $checkIndent = (int) (ceil($checkIndent / $this->indent) * $this->indent);
-            }
-
-            // Special case for ELSE statements that are not on the same
-            // line as the previous IF statements closing brace. They still need
-            // to have the same indent or it will break code after the block.
-            if ($checkToken !== null && $tokens[$checkToken]['code'] === T_ELSE) {
-                $exact = true;
-            }
-
-            if ($checkIndent === null) {
-                $checkIndent = $currentIndent;
-            }
-
-            /*
+			$exact = $this->exact;
+
+			if ($tokens[$i]['code'] === T_OPEN_SHORT_ARRAY) {
+				$disableExactEnd = max($disableExactEnd, $tokens[$i]['bracket_closer']);
+			}
+
+			if ($tokens[$i]['code'] === T_OPEN_PARENTHESIS
+				&& isset($tokens[$i]['parenthesis_closer']) === true
+			) {
+				$disableExactEnd = max($disableExactEnd, $tokens[$i]['parenthesis_closer']);
+			}
+
+			if ($exact === true && $i < $disableExactEnd) {
+				$exact = false;
+			}
+
+			// Detect line changes and figure out where the indent is.
+			if ($tokens[$i]['column'] === 1) {
+				$trimmed = ltrim($tokens[$i]['content']);
+				if ($trimmed === '') {
+					if (isset($tokens[($i + 1)]) === true
+						&& $tokens[$i]['line'] === $tokens[($i + 1)]['line']
+					) {
+						$checkToken  = ($i + 1);
+						$tokenIndent = ($tokens[($i + 1)]['column'] - 1);
+					}
+				} else {
+					$checkToken  = $i;
+					$tokenIndent = (strlen($tokens[$i]['content']) - strlen($trimmed));
+				}
+			}
+
+			// Closing parenthesis should just be indented to at least
+			// the same level as where they were opened (but can be more).
+			if (($checkToken !== null
+				&& $tokens[$checkToken]['code'] === T_CLOSE_PARENTHESIS
+				&& isset($tokens[$checkToken]['parenthesis_opener']) === true)
+				|| ($tokens[$i]['code'] === T_CLOSE_PARENTHESIS
+				&& isset($tokens[$i]['parenthesis_opener']) === true)
+			) {
+				if ($checkToken !== null) {
+					$parenCloser = $checkToken;
+				} else {
+					$parenCloser = $i;
+				}
+
+				if ($this->debug === true) {
+					$line = $tokens[$i]['line'];
+					echo "Closing parenthesis found on line $line".PHP_EOL;
+				}
+
+				$parenOpener = $tokens[$parenCloser]['parenthesis_opener'];
+				if ($tokens[$parenCloser]['line'] !== $tokens[$parenOpener]['line']) {
+					$parens = 0;
+					if (isset($tokens[$parenCloser]['nested_parenthesis']) === true
+						&& empty($tokens[$parenCloser]['nested_parenthesis']) === false
+					) {
+						$parens = $tokens[$parenCloser]['nested_parenthesis'];
+						end($parens);
+						$parens = key($parens);
+						if ($this->debug === true) {
+							$line = $tokens[$parens]['line'];
+							echo "\t* token has nested parenthesis $parens on line $line *".PHP_EOL;
+						}
+					}
+
+					$condition = 0;
+					if (isset($tokens[$parenCloser]['conditions']) === true
+						&& empty($tokens[$parenCloser]['conditions']) === false
+						&& (isset($tokens[$parenCloser]['parenthesis_owner']) === false
+						|| $parens > 0)
+					) {
+						$condition = $tokens[$parenCloser]['conditions'];
+						end($condition);
+						$condition = key($condition);
+						if ($this->debug === true) {
+							$line = $tokens[$condition]['line'];
+							$type = $tokens[$condition]['type'];
+							echo "\t* token is inside condition $condition ($type) on line $line *".PHP_EOL;
+						}
+					}
+
+					if ($parens > $condition) {
+						if ($this->debug === true) {
+							echo "\t* using parenthesis *".PHP_EOL;
+						}
+
+						$parenOpener = $parens;
+						$condition   = 0;
+					} else if ($condition > 0) {
+						if ($this->debug === true) {
+							echo "\t* using condition *".PHP_EOL;
+						}
+
+						$parenOpener = $condition;
+						$parens      = 0;
+					}
+
+					$exact = false;
+
+					$lastOpenTagConditions = array_keys($tokens[$lastOpenTag]['conditions']);
+					$lastOpenTagCondition  = array_pop($lastOpenTagConditions);
+
+					if ($condition > 0 && $lastOpenTagCondition === $condition) {
+						if ($this->debug === true) {
+							echo "\t* open tag is inside condition; using open tag *".PHP_EOL;
+						}
+
+						$checkIndent = ($tokens[$lastOpenTag]['column'] - 1);
+						if (isset($adjustments[$condition]) === true) {
+							$checkIndent += $adjustments[$condition];
+						}
+
+						$currentIndent = $checkIndent;
+
+						if ($this->debug === true) {
+							$type = $tokens[$lastOpenTag]['type'];
+							echo "\t=> checking indent of $checkIndent; main indent set to $currentIndent by token $lastOpenTag ($type)".PHP_EOL;
+						}
+					} else if ($condition > 0
+						&& isset($tokens[$condition]['scope_opener']) === true
+						&& isset($setIndents[$tokens[$condition]['scope_opener']]) === true
+					) {
+						$checkIndent = $setIndents[$tokens[$condition]['scope_opener']];
+						if (isset($adjustments[$condition]) === true) {
+							$checkIndent += $adjustments[$condition];
+						}
+
+						$currentIndent = $checkIndent;
+
+						if ($this->debug === true) {
+							$type = $tokens[$condition]['type'];
+							echo "\t=> checking indent of $checkIndent; main indent set to $currentIndent by token $condition ($type)".PHP_EOL;
+						}
+					} else {
+						$first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $parenOpener, true);
+
+						$checkIndent = ($tokens[$first]['column'] - 1);
+						if (isset($adjustments[$first]) === true) {
+							$checkIndent += $adjustments[$first];
+						}
+
+						if ($this->debug === true) {
+							$line = $tokens[$first]['line'];
+							$type = $tokens[$first]['type'];
+							echo "\t* first token on line $line is $first ($type) *".PHP_EOL;
+						}
+
+						if ($first === $tokens[$parenCloser]['parenthesis_opener']
+							&& $tokens[($first - 1)]['line'] === $tokens[$first]['line']
+						) {
+							// This is unlikely to be the start of the statement, so look
+							// back further to find it.
+							$first--;
+							if ($this->debug === true) {
+								$line = $tokens[$first]['line'];
+								$type = $tokens[$first]['type'];
+								echo "\t* first token is the parenthesis opener *".PHP_EOL;
+								echo "\t* amended first token is $first ($type) on line $line *".PHP_EOL;
+							}
+						}
+
+						$prev = $phpcsFile->findStartOfStatement($first, T_COMMA);
+						if ($prev !== $first) {
+							// This is not the start of the statement.
+							if ($this->debug === true) {
+								$line = $tokens[$prev]['line'];
+								$type = $tokens[$prev]['type'];
+								echo "\t* previous is $type on line $line *".PHP_EOL;
+							}
+
+							$first = $phpcsFile->findFirstOnLine([T_WHITESPACE, T_INLINE_HTML], $prev, true);
+							if ($first !== false) {
+								$prev  = $phpcsFile->findStartOfStatement($first, T_COMMA);
+								$first = $phpcsFile->findFirstOnLine([T_WHITESPACE, T_INLINE_HTML], $prev, true);
+							} else {
+								$first = $prev;
+							}
+
+							if ($this->debug === true) {
+								$line = $tokens[$first]['line'];
+								$type = $tokens[$first]['type'];
+								echo "\t* amended first token is $first ($type) on line $line *".PHP_EOL;
+							}
+						}//end if
+
+						if (isset($tokens[$first]['scope_closer']) === true
+							&& $tokens[$first]['scope_closer'] === $first
+						) {
+							if ($this->debug === true) {
+								echo "\t* first token is a scope closer *".PHP_EOL;
+							}
+
+							if (isset($tokens[$first]['scope_condition']) === true) {
+								$scopeCloser = $first;
+								$first       = $phpcsFile->findFirstOnLine(T_WHITESPACE, $tokens[$scopeCloser]['scope_condition'], true);
+
+								$currentIndent = ($tokens[$first]['column'] - 1);
+								if (isset($adjustments[$first]) === true) {
+									$currentIndent += $adjustments[$first];
+								}
+
+								// Make sure it is divisible by our expected indent.
+								if ($tokens[$tokens[$scopeCloser]['scope_condition']]['code'] !== T_CLOSURE) {
+									$currentIndent = (int) (ceil($currentIndent / $this->indent) * $this->indent);
+								}
+
+								$setIndents[$first] = $currentIndent;
+
+								if ($this->debug === true) {
+									$type = $tokens[$first]['type'];
+									echo "\t=> indent set to $currentIndent by token $first ($type)".PHP_EOL;
+								}
+							}//end if
+						} else {
+							// Don't force current indent to be divisible because there could be custom
+							// rules in place between parenthesis, such as with arrays.
+							$currentIndent = ($tokens[$first]['column'] - 1);
+							if (isset($adjustments[$first]) === true) {
+								$currentIndent += $adjustments[$first];
+							}
+
+							$setIndents[$first] = $currentIndent;
+
+							if ($this->debug === true) {
+								$type = $tokens[$first]['type'];
+								echo "\t=> checking indent of $checkIndent; main indent set to $currentIndent by token $first ($type)".PHP_EOL;
+							}
+						}//end if
+					}//end if
+				} else if ($this->debug === true) {
+					echo "\t * ignoring single-line definition *".PHP_EOL;
+				}//end if
+			}//end if
+
+			// Closing short array bracket should just be indented to at least
+			// the same level as where it was opened (but can be more).
+			if ($tokens[$i]['code'] === T_CLOSE_SHORT_ARRAY
+				|| ($checkToken !== null
+				&& $tokens[$checkToken]['code'] === T_CLOSE_SHORT_ARRAY)
+			) {
+				if ($checkToken !== null) {
+					$arrayCloser = $checkToken;
+				} else {
+					$arrayCloser = $i;
+				}
+
+				if ($this->debug === true) {
+					$line = $tokens[$arrayCloser]['line'];
+					echo "Closing short array bracket found on line $line".PHP_EOL;
+				}
+
+				$arrayOpener = $tokens[$arrayCloser]['bracket_opener'];
+				if ($tokens[$arrayCloser]['line'] !== $tokens[$arrayOpener]['line']) {
+					$first       = $phpcsFile->findFirstOnLine(T_WHITESPACE, $arrayOpener, true);
+					$checkIndent = ($tokens[$first]['column'] - 1);
+					if (isset($adjustments[$first]) === true) {
+						$checkIndent += $adjustments[$first];
+					}
+
+					$exact = false;
+
+					if ($this->debug === true) {
+						$line = $tokens[$first]['line'];
+						$type = $tokens[$first]['type'];
+						echo "\t* first token on line $line is $first ($type) *".PHP_EOL;
+					}
+
+					if ($first === $tokens[$arrayCloser]['bracket_opener']) {
+						// This is unlikely to be the start of the statement, so look
+						// back further to find it.
+						$first--;
+					}
+
+					$prev = $phpcsFile->findStartOfStatement($first, [T_COMMA, T_DOUBLE_ARROW]);
+					if ($prev !== $first) {
+						// This is not the start of the statement.
+						if ($this->debug === true) {
+							$line = $tokens[$prev]['line'];
+							$type = $tokens[$prev]['type'];
+							echo "\t* previous is $type on line $line *".PHP_EOL;
+						}
+
+						$first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $prev, true);
+						$prev  = $phpcsFile->findStartOfStatement($first, [T_COMMA, T_DOUBLE_ARROW]);
+						$first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $prev, true);
+						if ($this->debug === true) {
+							$line = $tokens[$first]['line'];
+							$type = $tokens[$first]['type'];
+							echo "\t* amended first token is $first ($type) on line $line *".PHP_EOL;
+						}
+					} else if ($tokens[$first]['code'] === T_WHITESPACE) {
+						$first = $phpcsFile->findNext(T_WHITESPACE, ($first + 1), null, true);
+					}
+
+					if (isset($tokens[$first]['scope_closer']) === true
+						&& $tokens[$first]['scope_closer'] === $first
+					) {
+						// The first token is a scope closer and would have already
+						// been processed and set the indent level correctly, so
+						// don't adjust it again.
+						if ($this->debug === true) {
+							echo "\t* first token is a scope closer; ignoring closing short array bracket *".PHP_EOL;
+						}
+
+						if (isset($setIndents[$first]) === true) {
+							$currentIndent = $setIndents[$first];
+							if ($this->debug === true) {
+								echo "\t=> indent reset to $currentIndent".PHP_EOL;
+							}
+						}
+					} else {
+						// Don't force current indent to be divisible because there could be custom
+						// rules in place for arrays.
+						$currentIndent = ($tokens[$first]['column'] - 1);
+						if (isset($adjustments[$first]) === true) {
+							$currentIndent += $adjustments[$first];
+						}
+
+						$setIndents[$first] = $currentIndent;
+
+						if ($this->debug === true) {
+							$type = $tokens[$first]['type'];
+							echo "\t=> checking indent of $checkIndent; main indent set to $currentIndent by token $first ($type)".PHP_EOL;
+						}
+					}//end if
+				} else if ($this->debug === true) {
+					echo "\t * ignoring single-line definition *".PHP_EOL;
+				}//end if
+			}//end if
+
+			// Adjust lines within scopes while auto-fixing.
+			if ($checkToken !== null
+				&& $exact === false
+				&& (empty($tokens[$checkToken]['conditions']) === false
+				|| (isset($tokens[$checkToken]['scope_opener']) === true
+				&& $tokens[$checkToken]['scope_opener'] === $checkToken))
+			) {
+				if (empty($tokens[$checkToken]['conditions']) === false) {
+					$condition = $tokens[$checkToken]['conditions'];
+					end($condition);
+					$condition = key($condition);
+				} else {
+					$condition = $tokens[$checkToken]['scope_condition'];
+				}
+
+				$first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $condition, true);
+
+				if (isset($adjustments[$first]) === true
+					&& (($adjustments[$first] < 0 && $tokenIndent > $currentIndent)
+					|| ($adjustments[$first] > 0 && $tokenIndent < $currentIndent))
+				) {
+					$length = ($tokenIndent + $adjustments[$first]);
+
+					// When fixing, we're going to adjust the indent of this line
+					// here automatically, so use this new padding value when
+					// comparing the expected padding to the actual padding.
+					if ($phpcsFile->fixer->enabled === true) {
+						$tokenIndent = $length;
+						$this->adjustIndent($phpcsFile, $checkToken, $length, $adjustments[$first]);
+					}
+
+					if ($this->debug === true) {
+						$line = $tokens[$checkToken]['line'];
+						$type = $tokens[$checkToken]['type'];
+						echo "Indent adjusted to $length for $type on line $line".PHP_EOL;
+					}
+
+					$adjustments[$checkToken] = $adjustments[$first];
+
+					if ($this->debug === true) {
+						$line = $tokens[$checkToken]['line'];
+						$type = $tokens[$checkToken]['type'];
+						echo "\t=> add adjustment of ".$adjustments[$checkToken]." for token $checkToken ($type) on line $line".PHP_EOL;
+					}
+				}//end if
+			}//end if
+
+			// Scope closers reset the required indent to the same level as the opening condition.
+			if (($checkToken !== null
+				&& isset($openScopes[$checkToken]) === true
+				|| (isset($tokens[$checkToken]['scope_condition']) === true
+				&& isset($tokens[$checkToken]['scope_closer']) === true
+				&& $tokens[$checkToken]['scope_closer'] === $checkToken
+				&& $tokens[$checkToken]['line'] !== $tokens[$tokens[$checkToken]['scope_opener']]['line']))
+				|| ($checkToken === null
+				&& isset($openScopes[$i]) === true
+				|| (isset($tokens[$i]['scope_condition']) === true
+				&& isset($tokens[$i]['scope_closer']) === true
+				&& $tokens[$i]['scope_closer'] === $i
+				&& $tokens[$i]['line'] !== $tokens[$tokens[$i]['scope_opener']]['line']))
+			) {
+				if ($this->debug === true) {
+					if ($checkToken === null) {
+						$type = $tokens[$tokens[$i]['scope_condition']]['type'];
+						$line = $tokens[$i]['line'];
+					} else {
+						$type = $tokens[$tokens[$checkToken]['scope_condition']]['type'];
+						$line = $tokens[$checkToken]['line'];
+					}
+
+					echo "Close scope ($type) on line $line".PHP_EOL;
+				}
+
+				$scopeCloser = $checkToken;
+				if ($scopeCloser === null) {
+					$scopeCloser = $i;
+				}
+
+				$conditionToken = array_pop($openScopes);
+				if ($this->debug === true) {
+					$line = $tokens[$conditionToken]['line'];
+					$type = $tokens[$conditionToken]['type'];
+					echo "\t=> removed open scope $conditionToken ($type) on line $line".PHP_EOL;
+				}
+
+				if (isset($tokens[$scopeCloser]['scope_condition']) === true) {
+					$first = $phpcsFile->findFirstOnLine([T_WHITESPACE, T_INLINE_HTML], $tokens[$scopeCloser]['scope_condition'], true);
+					if ($this->debug === true) {
+						$line = $tokens[$first]['line'];
+						$type = $tokens[$first]['type'];
+						echo "\t* first token is $first ($type) on line $line *".PHP_EOL;
+					}
+
+					while ($tokens[$first]['code'] === T_CONSTANT_ENCAPSED_STRING
+						&& $tokens[($first - 1)]['code'] === T_CONSTANT_ENCAPSED_STRING
+					) {
+						$first = $phpcsFile->findFirstOnLine(T_WHITESPACE, ($first - 1), true);
+						if ($this->debug === true) {
+							$line = $tokens[$first]['line'];
+							$type = $tokens[$first]['type'];
+							echo "\t* found multi-line string; amended first token is $first ($type) on line $line *".PHP_EOL;
+						}
+					}
+
+					$currentIndent = ($tokens[$first]['column'] - 1);
+					if (isset($adjustments[$first]) === true) {
+						$currentIndent += $adjustments[$first];
+					}
+
+					$setIndents[$scopeCloser] = $currentIndent;
+
+					if ($this->debug === true) {
+						$type = $tokens[$scopeCloser]['type'];
+						echo "\t=> indent set to $currentIndent by token $scopeCloser ($type)".PHP_EOL;
+					}
+
+					// We only check the indent of scope closers if they are
+					// curly braces because other constructs tend to have different rules.
+					if ($tokens[$scopeCloser]['code'] === T_CLOSE_CURLY_BRACKET) {
+						$exact = true;
+					} else {
+						$checkToken = null;
+					}
+				}//end if
+			}//end if
+
+			// Handle scope for JS object notation.
+			if ($phpcsFile->tokenizerType === 'JS'
+				&& (($checkToken !== null
+				&& $tokens[$checkToken]['code'] === T_CLOSE_OBJECT
+				&& $tokens[$checkToken]['line'] !== $tokens[$tokens[$checkToken]['bracket_opener']]['line'])
+				|| ($checkToken === null
+				&& $tokens[$i]['code'] === T_CLOSE_OBJECT
+				&& $tokens[$i]['line'] !== $tokens[$tokens[$i]['bracket_opener']]['line']))
+			) {
+				if ($this->debug === true) {
+					$line = $tokens[$i]['line'];
+					echo "Close JS object on line $line".PHP_EOL;
+				}
+
+				$scopeCloser = $checkToken;
+				if ($scopeCloser === null) {
+					$scopeCloser = $i;
+				} else {
+					$conditionToken = array_pop($openScopes);
+					if ($this->debug === true) {
+						$line = $tokens[$conditionToken]['line'];
+						$type = $tokens[$conditionToken]['type'];
+						echo "\t=> removed open scope $conditionToken ($type) on line $line".PHP_EOL;
+					}
+				}
+
+				$parens = 0;
+				if (isset($tokens[$scopeCloser]['nested_parenthesis']) === true
+					&& empty($tokens[$scopeCloser]['nested_parenthesis']) === false
+				) {
+					$parens = $tokens[$scopeCloser]['nested_parenthesis'];
+					end($parens);
+					$parens = key($parens);
+					if ($this->debug === true) {
+						$line = $tokens[$parens]['line'];
+						echo "\t* token has nested parenthesis $parens on line $line *".PHP_EOL;
+					}
+				}
+
+				$condition = 0;
+				if (isset($tokens[$scopeCloser]['conditions']) === true
+					&& empty($tokens[$scopeCloser]['conditions']) === false
+				) {
+					$condition = $tokens[$scopeCloser]['conditions'];
+					end($condition);
+					$condition = key($condition);
+					if ($this->debug === true) {
+						$line = $tokens[$condition]['line'];
+						$type = $tokens[$condition]['type'];
+						echo "\t* token is inside condition $condition ($type) on line $line *".PHP_EOL;
+					}
+				}
+
+				if ($parens > $condition) {
+					if ($this->debug === true) {
+						echo "\t* using parenthesis *".PHP_EOL;
+					}
+
+					$first     = $phpcsFile->findFirstOnLine(T_WHITESPACE, $parens, true);
+					$condition = 0;
+				} else if ($condition > 0) {
+					if ($this->debug === true) {
+						echo "\t* using condition *".PHP_EOL;
+					}
+
+					$first  = $phpcsFile->findFirstOnLine(T_WHITESPACE, $condition, true);
+					$parens = 0;
+				} else {
+					if ($this->debug === true) {
+						$line = $tokens[$tokens[$scopeCloser]['bracket_opener']]['line'];
+						echo "\t* token is not in parenthesis or condition; using opener on line $line *".PHP_EOL;
+					}
+
+					$first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $tokens[$scopeCloser]['bracket_opener'], true);
+				}//end if
+
+				$currentIndent = ($tokens[$first]['column'] - 1);
+				if (isset($adjustments[$first]) === true) {
+					$currentIndent += $adjustments[$first];
+				}
+
+				if ($parens > 0 || $condition > 0) {
+					$checkIndent = ($tokens[$first]['column'] - 1);
+					if (isset($adjustments[$first]) === true) {
+						$checkIndent += $adjustments[$first];
+					}
+
+					if ($condition > 0) {
+						$checkIndent   += $this->indent;
+						$currentIndent += $this->indent;
+						$exact          = true;
+					}
+				} else {
+					$checkIndent = $currentIndent;
+				}
+
+				// Make sure it is divisible by our expected indent.
+				$currentIndent      = (int) (ceil($currentIndent / $this->indent) * $this->indent);
+				$checkIndent        = (int) (ceil($checkIndent / $this->indent) * $this->indent);
+				$setIndents[$first] = $currentIndent;
+
+				if ($this->debug === true) {
+					$type = $tokens[$first]['type'];
+					echo "\t=> checking indent of $checkIndent; main indent set to $currentIndent by token $first ($type)".PHP_EOL;
+				}
+			}//end if
+
+			if ($checkToken !== null
+				&& isset(Tokens::$scopeOpeners[$tokens[$checkToken]['code']]) === true
+				&& in_array($tokens[$checkToken]['code'], $this->nonIndentingScopes, true) === false
+				&& isset($tokens[$checkToken]['scope_opener']) === true
+			) {
+				$exact = true;
+
+				$lastOpener = null;
+				if (empty($openScopes) === false) {
+					end($openScopes);
+					$lastOpener = current($openScopes);
+				}
+
+				// A scope opener that shares a closer with another token (like multiple
+				// CASEs using the same BREAK) needs to reduce the indent level so its
+				// indent is checked correctly. It will then increase the indent again
+				// (as all openers do) after being checked.
+				if ($lastOpener !== null
+					&& isset($tokens[$lastOpener]['scope_closer']) === true
+					&& $tokens[$lastOpener]['level'] === $tokens[$checkToken]['level']
+					&& $tokens[$lastOpener]['scope_closer'] === $tokens[$checkToken]['scope_closer']
+				) {
+					$currentIndent          -= $this->indent;
+					$setIndents[$lastOpener] = $currentIndent;
+					if ($this->debug === true) {
+						$line = $tokens[$i]['line'];
+						$type = $tokens[$lastOpener]['type'];
+						echo "Shared closer found on line $line".PHP_EOL;
+						echo "\t=> indent set to $currentIndent by token $lastOpener ($type)".PHP_EOL;
+					}
+				}
+
+				if ($tokens[$checkToken]['code'] === T_CLOSURE
+					&& $tokenIndent > $currentIndent
+				) {
+					// The opener is indented more than needed, which is fine.
+					// But just check that it is divisible by our expected indent.
+					$checkIndent = (int) (ceil($tokenIndent / $this->indent) * $this->indent);
+					$exact       = false;
+
+					if ($this->debug === true) {
+						$line = $tokens[$i]['line'];
+						echo "Closure found on line $line".PHP_EOL;
+						echo "\t=> checking indent of $checkIndent; main indent remains at $currentIndent".PHP_EOL;
+					}
+				}
+			}//end if
+
+			// Method prefix indentation has to be exact or else it will break
+			// the rest of the function declaration, and potentially future ones.
+			if ($checkToken !== null
+				&& isset(Tokens::$methodPrefixes[$tokens[$checkToken]['code']]) === true
+				&& $tokens[($checkToken + 1)]['code'] !== T_DOUBLE_COLON
+			) {
+				$next = $phpcsFile->findNext(Tokens::$emptyTokens, ($checkToken + 1), null, true);
+				if ($next === false || $tokens[$next]['code'] !== T_CLOSURE) {
+					if ($this->debug === true) {
+						$line = $tokens[$checkToken]['line'];
+						$type = $tokens[$checkToken]['type'];
+						echo "\t* method prefix ($type) found on line $line; indent set to exact *".PHP_EOL;
+					}
+
+					$exact = true;
+				}
+			}
+
+			// JS property indentation has to be exact or else if will break
+			// things like function and object indentation.
+			if ($checkToken !== null && $tokens[$checkToken]['code'] === T_PROPERTY) {
+				$exact = true;
+			}
+
+			// Open PHP tags needs to be indented to exact column positions
+			// so they don't cause problems with indent checks for the code
+			// within them, but they don't need to line up with the current indent
+			// in most cases.
+			if ($checkToken !== null
+				&& ($tokens[$checkToken]['code'] === T_OPEN_TAG
+				|| $tokens[$checkToken]['code'] === T_OPEN_TAG_WITH_ECHO)
+			) {
+				$checkIndent = ($tokens[$checkToken]['column'] - 1);
+
+				// If we are re-opening a block that was closed in the same
+				// scope as us, then reset the indent back to what the scope opener
+				// set instead of using whatever indent this open tag has set.
+				if (empty($tokens[$checkToken]['conditions']) === false) {
+					$close = $phpcsFile->findPrevious(T_CLOSE_TAG, ($checkToken - 1));
+					if ($close !== false
+						&& $tokens[$checkToken]['conditions'] === $tokens[$close]['conditions']
+					) {
+						$conditions    = array_keys($tokens[$checkToken]['conditions']);
+						$lastCondition = array_pop($conditions);
+						$lastOpener    = $tokens[$lastCondition]['scope_opener'];
+						$lastCloser    = $tokens[$lastCondition]['scope_closer'];
+						if ($tokens[$lastCloser]['line'] !== $tokens[$checkToken]['line']
+							&& isset($setIndents[$lastOpener]) === true
+						) {
+							$checkIndent = $setIndents[$lastOpener];
+						}
+					}
+				}
+
+				$checkIndent = (int) (ceil($checkIndent / $this->indent) * $this->indent);
+			}//end if
+
+			// Close tags needs to be indented to exact column positions.
+			if ($checkToken !== null && $tokens[$checkToken]['code'] === T_CLOSE_TAG) {
+				$exact       = true;
+				$checkIndent = $currentIndent;
+				$checkIndent = (int) (ceil($checkIndent / $this->indent) * $this->indent);
+			}
+
+			// Special case for ELSE statements that are not on the same
+			// line as the previous IF statements closing brace. They still need
+			// to have the same indent or it will break code after the block.
+			if ($checkToken !== null && $tokens[$checkToken]['code'] === T_ELSE) {
+				$exact = true;
+			}
+
+			if ($checkIndent === null) {
+				$checkIndent = $currentIndent;
+			}
+
+			/*
                 The indent of the line is checked by the following IF block.
 
                 Up until now, we've just been figuring out what the indent
@@ -924,554 +924,554 @@ 
                 the checking of future lines
             */
 
-            if ($checkToken !== null
-                && isset($this->ignoreIndentation[$tokens[$checkToken]['code']]) === false
-                && (($tokenIndent !== $checkIndent && $exact === true)
-                || ($tokenIndent < $checkIndent && $exact === false))
-            ) {
-                $type  = 'IncorrectExact';
-                $error = 'Line indented incorrectly; expected ';
-                if ($exact === false) {
-                    $error .= 'at least ';
-                    $type   = 'Incorrect';
-                }
-
-                if ($this->tabIndent === true) {
-                    $error .= '%s tabs, found %s';
-                    $data   = [
-                        floor($checkIndent / $this->tabWidth),
-                        floor($tokenIndent / $this->tabWidth),
-                    ];
-                } else {
-                    $error .= '%s spaces, found %s';
-                    $data   = [
-                        $checkIndent,
-                        $tokenIndent,
-                    ];
-                }
-
-                if ($this->debug === true) {
-                    $line    = $tokens[$checkToken]['line'];
-                    $message = vsprintf($error, $data);
-                    echo "[Line $line] $message".PHP_EOL;
-                }
-
-                // Assume the change would be applied and continue
-                // checking indents under this assumption. This gives more
-                // technically accurate error messages.
-                $adjustments[$checkToken] = ($checkIndent - $tokenIndent);
-
-                $fix = $phpcsFile->addFixableError($error, $checkToken, $type, $data);
-                if ($fix === true || $this->debug === true) {
-                    $accepted = $this->adjustIndent($phpcsFile, $checkToken, $checkIndent, ($checkIndent - $tokenIndent));
-
-                    if ($accepted === true && $this->debug === true) {
-                        $line = $tokens[$checkToken]['line'];
-                        $type = $tokens[$checkToken]['type'];
-                        echo "\t=> add adjustment of ".$adjustments[$checkToken]." for token $checkToken ($type) on line $line".PHP_EOL;
-                    }
-                }
-            }//end if
-
-            if ($checkToken !== null) {
-                $i = $checkToken;
-            }
-
-            // Completely skip here/now docs as the indent is a part of the
-            // content itself.
-            if ($tokens[$i]['code'] === T_START_HEREDOC
-                || $tokens[$i]['code'] === T_START_NOWDOC
-            ) {
-                $i = $phpcsFile->findNext([T_END_HEREDOC, T_END_NOWDOC], ($i + 1));
-                $i = $phpcsFile->findNext(Tokens::$emptyTokens, ($i + 1), null, true);
-                continue;
-            }
-
-            // Completely skip multi-line strings as the indent is a part of the
-            // content itself.
-            if ($tokens[$i]['code'] === T_CONSTANT_ENCAPSED_STRING
-                || $tokens[$i]['code'] === T_DOUBLE_QUOTED_STRING
-            ) {
-                $i = $phpcsFile->findNext($tokens[$i]['code'], ($i + 1), null, true);
-                $i--;
-                continue;
-            }
-
-            // Completely skip doc comments as they tend to have complex
-            // indentation rules.
-            if ($tokens[$i]['code'] === T_DOC_COMMENT_OPEN_TAG) {
-                $i = $tokens[$i]['comment_closer'];
-                continue;
-            }
-
-            // Open tags reset the indent level.
-            if ($tokens[$i]['code'] === T_OPEN_TAG
-                || $tokens[$i]['code'] === T_OPEN_TAG_WITH_ECHO
-            ) {
-                if ($this->debug === true) {
-                    $line = $tokens[$i]['line'];
-                    echo "Open PHP tag found on line $line".PHP_EOL;
-                }
-
-                if ($checkToken === null) {
-                    $first         = $phpcsFile->findFirstOnLine(T_WHITESPACE, $i, true);
-                    $currentIndent = (strlen($tokens[$first]['content']) - strlen(ltrim($tokens[$first]['content'])));
-                } else {
-                    $currentIndent = ($tokens[$i]['column'] - 1);
-                }
-
-                $lastOpenTag = $i;
-
-                if (isset($adjustments[$i]) === true) {
-                    $currentIndent += $adjustments[$i];
-                }
-
-                // Make sure it is divisible by our expected indent.
-                $currentIndent  = (int) (ceil($currentIndent / $this->indent) * $this->indent);
-                $setIndents[$i] = $currentIndent;
-
-                if ($this->debug === true) {
-                    $type = $tokens[$i]['type'];
-                    echo "\t=> indent set to $currentIndent by token $i ($type)".PHP_EOL;
-                }
-
-                continue;
-            }//end if
-
-            // Close tags reset the indent level, unless they are closing a tag
-            // opened on the same line.
-            if ($tokens[$i]['code'] === T_CLOSE_TAG) {
-                if ($this->debug === true) {
-                    $line = $tokens[$i]['line'];
-                    echo "Close PHP tag found on line $line".PHP_EOL;
-                }
-
-                if ($tokens[$lastOpenTag]['line'] !== $tokens[$i]['line']) {
-                    $currentIndent = ($tokens[$i]['column'] - 1);
-                    $lastCloseTag  = $i;
-                } else {
-                    if ($lastCloseTag === null) {
-                        $currentIndent = 0;
-                    } else {
-                        $currentIndent = ($tokens[$lastCloseTag]['column'] - 1);
-                    }
-                }
-
-                if (isset($adjustments[$i]) === true) {
-                    $currentIndent += $adjustments[$i];
-                }
-
-                // Make sure it is divisible by our expected indent.
-                $currentIndent  = (int) (ceil($currentIndent / $this->indent) * $this->indent);
-                $setIndents[$i] = $currentIndent;
-
-                if ($this->debug === true) {
-                    $type = $tokens[$i]['type'];
-                    echo "\t=> indent set to $currentIndent by token $i ($type)".PHP_EOL;
-                }
-
-                continue;
-            }//end if
-
-            // Anon classes and functions set the indent based on their own indent level.
-            if ($tokens[$i]['code'] === T_CLOSURE || $tokens[$i]['code'] === T_ANON_CLASS) {
-                $closer = $tokens[$i]['scope_closer'];
-                if ($tokens[$i]['line'] === $tokens[$closer]['line']) {
-                    if ($this->debug === true) {
-                        $type = str_replace('_', ' ', strtolower(substr($tokens[$i]['type'], 2)));
-                        $line = $tokens[$i]['line'];
-                        echo "* ignoring single-line $type on line $line".PHP_EOL;
-                    }
-
-                    $i = $closer;
-                    continue;
-                }
-
-                if ($this->debug === true) {
-                    $type = str_replace('_', ' ', strtolower(substr($tokens[$i]['type'], 2)));
-                    $line = $tokens[$i]['line'];
-                    echo "Open $type on line $line".PHP_EOL;
-                }
-
-                $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $i, true);
-                if ($this->debug === true) {
-                    $line = $tokens[$first]['line'];
-                    $type = $tokens[$first]['type'];
-                    echo "\t* first token is $first ($type) on line $line *".PHP_EOL;
-                }
-
-                while ($tokens[$first]['code'] === T_CONSTANT_ENCAPSED_STRING
-                    && $tokens[($first - 1)]['code'] === T_CONSTANT_ENCAPSED_STRING
-                ) {
-                    $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, ($first - 1), true);
-                    if ($this->debug === true) {
-                        $line = $tokens[$first]['line'];
-                        $type = $tokens[$first]['type'];
-                        echo "\t* found multi-line string; amended first token is $first ($type) on line $line *".PHP_EOL;
-                    }
-                }
-
-                $currentIndent = (($tokens[$first]['column'] - 1) + $this->indent);
-                $openScopes[$tokens[$i]['scope_closer']] = $tokens[$i]['scope_condition'];
-                if ($this->debug === true) {
-                    $closerToken    = $tokens[$i]['scope_closer'];
-                    $closerLine     = $tokens[$closerToken]['line'];
-                    $closerType     = $tokens[$closerToken]['type'];
-                    $conditionToken = $tokens[$i]['scope_condition'];
-                    $conditionLine  = $tokens[$conditionToken]['line'];
-                    $conditionType  = $tokens[$conditionToken]['type'];
-                    echo "\t=> added open scope $closerToken ($closerType) on line $closerLine, pointing to condition $conditionToken ($conditionType) on line $conditionLine".PHP_EOL;
-                }
-
-                if (isset($adjustments[$first]) === true) {
-                    $currentIndent += $adjustments[$first];
-                }
-
-                // Make sure it is divisible by our expected indent.
-                $currentIndent = (int) (floor($currentIndent / $this->indent) * $this->indent);
-                $i = $tokens[$i]['scope_opener'];
-                $setIndents[$i] = $currentIndent;
-
-                if ($this->debug === true) {
-                    $type = $tokens[$i]['type'];
-                    echo "\t=> indent set to $currentIndent by token $i ($type)".PHP_EOL;
-                }
-
-                continue;
-            }//end if
-
-            // Scope openers increase the indent level.
-            if (isset($tokens[$i]['scope_condition']) === true
-                && isset($tokens[$i]['scope_opener']) === true
-                && $tokens[$i]['scope_opener'] === $i
-            ) {
-                $closer = $tokens[$i]['scope_closer'];
-                if ($tokens[$i]['line'] === $tokens[$closer]['line']) {
-                    if ($this->debug === true) {
-                        $line = $tokens[$i]['line'];
-                        $type = $tokens[$i]['type'];
-                        echo "* ignoring single-line $type on line $line".PHP_EOL;
-                    }
-
-                    $i = $closer;
-                    continue;
-                }
-
-                $condition = $tokens[$tokens[$i]['scope_condition']]['code'];
-                if (isset(Tokens::$scopeOpeners[$condition]) === true
-                    && in_array($condition, $this->nonIndentingScopes, true) === false
-                ) {
-                    if ($this->debug === true) {
-                        $line = $tokens[$i]['line'];
-                        $type = $tokens[$tokens[$i]['scope_condition']]['type'];
-                        echo "Open scope ($type) on line $line".PHP_EOL;
-                    }
-
-                    $currentIndent += $this->indent;
-                    $setIndents[$i] = $currentIndent;
-                    $openScopes[$tokens[$i]['scope_closer']] = $tokens[$i]['scope_condition'];
-                    if ($this->debug === true) {
-                        $closerToken    = $tokens[$i]['scope_closer'];
-                        $closerLine     = $tokens[$closerToken]['line'];
-                        $closerType     = $tokens[$closerToken]['type'];
-                        $conditionToken = $tokens[$i]['scope_condition'];
-                        $conditionLine  = $tokens[$conditionToken]['line'];
-                        $conditionType  = $tokens[$conditionToken]['type'];
-                        echo "\t=> added open scope $closerToken ($closerType) on line $closerLine, pointing to condition $conditionToken ($conditionType) on line $conditionLine".PHP_EOL;
-                    }
-
-                    if ($this->debug === true) {
-                        $type = $tokens[$i]['type'];
-                        echo "\t=> indent set to $currentIndent by token $i ($type)".PHP_EOL;
-                    }
-
-                    continue;
-                }//end if
-            }//end if
-
-            // JS objects set the indent level.
-            if ($phpcsFile->tokenizerType === 'JS'
-                && $tokens[$i]['code'] === T_OBJECT
-            ) {
-                $closer = $tokens[$i]['bracket_closer'];
-                if ($tokens[$i]['line'] === $tokens[$closer]['line']) {
-                    if ($this->debug === true) {
-                        $line = $tokens[$i]['line'];
-                        echo "* ignoring single-line JS object on line $line".PHP_EOL;
-                    }
-
-                    $i = $closer;
-                    continue;
-                }
-
-                if ($this->debug === true) {
-                    $line = $tokens[$i]['line'];
-                    echo "Open JS object on line $line".PHP_EOL;
-                }
-
-                $first         = $phpcsFile->findFirstOnLine(T_WHITESPACE, $i, true);
-                $currentIndent = (($tokens[$first]['column'] - 1) + $this->indent);
-                if (isset($adjustments[$first]) === true) {
-                    $currentIndent += $adjustments[$first];
-                }
-
-                // Make sure it is divisible by our expected indent.
-                $currentIndent      = (int) (ceil($currentIndent / $this->indent) * $this->indent);
-                $setIndents[$first] = $currentIndent;
-
-                if ($this->debug === true) {
-                    $type = $tokens[$first]['type'];
-                    echo "\t=> indent set to $currentIndent by token $first ($type)".PHP_EOL;
-                }
-
-                continue;
-            }//end if
-
-            // Closing an anon class or function.
-            if (isset($tokens[$i]['scope_condition']) === true
-                && $tokens[$i]['scope_closer'] === $i
-                && ($tokens[$tokens[$i]['scope_condition']]['code'] === T_CLOSURE
-                || $tokens[$tokens[$i]['scope_condition']]['code'] === T_ANON_CLASS)
-            ) {
-                if ($this->debug === true) {
-                    $type = str_replace('_', ' ', strtolower(substr($tokens[$tokens[$i]['scope_condition']]['type'], 2)));
-                    $line = $tokens[$i]['line'];
-                    echo "Close $type on line $line".PHP_EOL;
-                }
-
-                $prev = false;
-
-                $object = 0;
-                if ($phpcsFile->tokenizerType === 'JS') {
-                    $conditions = $tokens[$i]['conditions'];
-                    krsort($conditions, SORT_NUMERIC);
-                    foreach ($conditions as $token => $condition) {
-                        if ($condition === T_OBJECT) {
-                            $object = $token;
-                            break;
-                        }
-                    }
-
-                    if ($this->debug === true && $object !== 0) {
-                        $line = $tokens[$object]['line'];
-                        echo "\t* token is inside JS object $object on line $line *".PHP_EOL;
-                    }
-                }
-
-                $parens = 0;
-                if (isset($tokens[$i]['nested_parenthesis']) === true
-                    && empty($tokens[$i]['nested_parenthesis']) === false
-                ) {
-                    $parens = $tokens[$i]['nested_parenthesis'];
-                    end($parens);
-                    $parens = key($parens);
-                    if ($this->debug === true) {
-                        $line = $tokens[$parens]['line'];
-                        echo "\t* token has nested parenthesis $parens on line $line *".PHP_EOL;
-                    }
-                }
-
-                $condition = 0;
-                if (isset($tokens[$i]['conditions']) === true
-                    && empty($tokens[$i]['conditions']) === false
-                ) {
-                    $condition = $tokens[$i]['conditions'];
-                    end($condition);
-                    $condition = key($condition);
-                    if ($this->debug === true) {
-                        $line = $tokens[$condition]['line'];
-                        $type = $tokens[$condition]['type'];
-                        echo "\t* token is inside condition $condition ($type) on line $line *".PHP_EOL;
-                    }
-                }
-
-                if ($parens > $object && $parens > $condition) {
-                    if ($this->debug === true) {
-                        echo "\t* using parenthesis *".PHP_EOL;
-                    }
-
-                    $prev      = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($parens - 1), null, true);
-                    $object    = 0;
-                    $condition = 0;
-                } else if ($object > 0 && $object >= $condition) {
-                    if ($this->debug === true) {
-                        echo "\t* using object *".PHP_EOL;
-                    }
-
-                    $prev      = $object;
-                    $parens    = 0;
-                    $condition = 0;
-                } else if ($condition > 0) {
-                    if ($this->debug === true) {
-                        echo "\t* using condition *".PHP_EOL;
-                    }
-
-                    $prev   = $condition;
-                    $object = 0;
-                    $parens = 0;
-                }//end if
-
-                if ($prev === false) {
-                    $prev = $phpcsFile->findPrevious([T_EQUAL, T_RETURN], ($tokens[$i]['scope_condition'] - 1), null, false, null, true);
-                    if ($prev === false) {
-                        $prev = $i;
-                        if ($this->debug === true) {
-                            echo "\t* could not find a previous T_EQUAL or T_RETURN token; will use current token *".PHP_EOL;
-                        }
-                    }
-                }
-
-                if ($this->debug === true) {
-                    $line = $tokens[$prev]['line'];
-                    $type = $tokens[$prev]['type'];
-                    echo "\t* previous token is $type on line $line *".PHP_EOL;
-                }
-
-                $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $prev, true);
-                if ($this->debug === true) {
-                    $line = $tokens[$first]['line'];
-                    $type = $tokens[$first]['type'];
-                    echo "\t* first token on line $line is $first ($type) *".PHP_EOL;
-                }
-
-                $prev = $phpcsFile->findStartOfStatement($first);
-                if ($prev !== $first) {
-                    // This is not the start of the statement.
-                    if ($this->debug === true) {
-                        $line = $tokens[$prev]['line'];
-                        $type = $tokens[$prev]['type'];
-                        echo "\t* amended previous is $type on line $line *".PHP_EOL;
-                    }
-
-                    $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $prev, true);
-                    if ($this->debug === true) {
-                        $line = $tokens[$first]['line'];
-                        $type = $tokens[$first]['type'];
-                        echo "\t* amended first token is $first ($type) on line $line *".PHP_EOL;
-                    }
-                }
-
-                $currentIndent = ($tokens[$first]['column'] - 1);
-                if ($object > 0 || $condition > 0) {
-                    $currentIndent += $this->indent;
-                }
-
-                if (isset($tokens[$first]['scope_closer']) === true
-                    && $tokens[$first]['scope_closer'] === $first
-                ) {
-                    if ($this->debug === true) {
-                        echo "\t* first token is a scope closer *".PHP_EOL;
-                    }
-
-                    if ($condition === 0 || $tokens[$condition]['scope_opener'] < $first) {
-                        $currentIndent = $setIndents[$first];
-                    } else if ($this->debug === true) {
-                        echo "\t* ignoring scope closer *".PHP_EOL;
-                    }
-                }
-
-                // Make sure it is divisible by our expected indent.
-                $currentIndent      = (int) (ceil($currentIndent / $this->indent) * $this->indent);
-                $setIndents[$first] = $currentIndent;
-
-                if ($this->debug === true) {
-                    $type = $tokens[$first]['type'];
-                    echo "\t=> indent set to $currentIndent by token $first ($type)".PHP_EOL;
-                }
-            }//end if
-        }//end for
-
-        // Don't process the rest of the file.
-        return $phpcsFile->numTokens;
-
-    }//end process()
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile All the tokens found in the document.
-     * @param int                         $stackPtr  The position of the current token
-     *                                               in the stack passed in $tokens.
-     * @param int                         $length    The length of the new indent.
-     * @param int                         $change    The difference in length between
-     *                                               the old and new indent.
-     *
-     * @return bool
-     */
-    protected function adjustIndent(File $phpcsFile, $stackPtr, $length, $change)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // We don't adjust indents outside of PHP.
-        if ($tokens[$stackPtr]['code'] === T_INLINE_HTML) {
-            return false;
-        }
-
-        $padding = '';
-        if ($length > 0) {
-            if ($this->tabIndent === true) {
-                $numTabs = floor($length / $this->tabWidth);
-                if ($numTabs > 0) {
-                    $numSpaces = ($length - ($numTabs * $this->tabWidth));
-                    $padding   = str_repeat("\t", $numTabs).str_repeat(' ', $numSpaces);
-                }
-            } else {
-                $padding = str_repeat(' ', $length);
-            }
-        }
-
-        if ($tokens[$stackPtr]['column'] === 1) {
-            $trimmed  = ltrim($tokens[$stackPtr]['content']);
-            $accepted = $phpcsFile->fixer->replaceToken($stackPtr, $padding.$trimmed);
-        } else {
-            // Easier to just replace the entire indent.
-            $accepted = $phpcsFile->fixer->replaceToken(($stackPtr - 1), $padding);
-        }
-
-        if ($accepted === false) {
-            return false;
-        }
-
-        if ($tokens[$stackPtr]['code'] === T_DOC_COMMENT_OPEN_TAG) {
-            // We adjusted the start of a comment, so adjust the rest of it
-            // as well so the alignment remains correct.
-            for ($x = ($stackPtr + 1); $x < $tokens[$stackPtr]['comment_closer']; $x++) {
-                if ($tokens[$x]['column'] !== 1) {
-                    continue;
-                }
-
-                $length = 0;
-                if ($tokens[$x]['code'] === T_DOC_COMMENT_WHITESPACE) {
-                    $length = $tokens[$x]['length'];
-                }
-
-                $padding = ($length + $change);
-                if ($padding > 0) {
-                    if ($this->tabIndent === true) {
-                        $numTabs   = floor($padding / $this->tabWidth);
-                        $numSpaces = ($padding - ($numTabs * $this->tabWidth));
-                        $padding   = str_repeat("\t", $numTabs).str_repeat(' ', $numSpaces);
-                    } else {
-                        $padding = str_repeat(' ', $padding);
-                    }
-                } else {
-                    $padding = '';
-                }
-
-                $phpcsFile->fixer->replaceToken($x, $padding);
-                if ($this->debug === true) {
-                    $length = strlen($padding);
-                    $line   = $tokens[$x]['line'];
-                    $type   = $tokens[$x]['type'];
-                    echo "\t=> Indent adjusted to $length for $type on line $line".PHP_EOL;
-                }
-            }//end for
-        }//end if
-
-        return true;
-
-    }//end adjustIndent()
+			if ($checkToken !== null
+				&& isset($this->ignoreIndentation[$tokens[$checkToken]['code']]) === false
+				&& (($tokenIndent !== $checkIndent && $exact === true)
+				|| ($tokenIndent < $checkIndent && $exact === false))
+			) {
+				$type  = 'IncorrectExact';
+				$error = 'Line indented incorrectly; expected ';
+				if ($exact === false) {
+					$error .= 'at least ';
+					$type   = 'Incorrect';
+				}
+
+				if ($this->tabIndent === true) {
+					$error .= '%s tabs, found %s';
+					$data   = [
+						floor($checkIndent / $this->tabWidth),
+						floor($tokenIndent / $this->tabWidth),
+					];
+				} else {
+					$error .= '%s spaces, found %s';
+					$data   = [
+						$checkIndent,
+						$tokenIndent,
+					];
+				}
+
+				if ($this->debug === true) {
+					$line    = $tokens[$checkToken]['line'];
+					$message = vsprintf($error, $data);
+					echo "[Line $line] $message".PHP_EOL;
+				}
+
+				// Assume the change would be applied and continue
+				// checking indents under this assumption. This gives more
+				// technically accurate error messages.
+				$adjustments[$checkToken] = ($checkIndent - $tokenIndent);
+
+				$fix = $phpcsFile->addFixableError($error, $checkToken, $type, $data);
+				if ($fix === true || $this->debug === true) {
+					$accepted = $this->adjustIndent($phpcsFile, $checkToken, $checkIndent, ($checkIndent - $tokenIndent));
+
+					if ($accepted === true && $this->debug === true) {
+						$line = $tokens[$checkToken]['line'];
+						$type = $tokens[$checkToken]['type'];
+						echo "\t=> add adjustment of ".$adjustments[$checkToken]." for token $checkToken ($type) on line $line".PHP_EOL;
+					}
+				}
+			}//end if
+
+			if ($checkToken !== null) {
+				$i = $checkToken;
+			}
+
+			// Completely skip here/now docs as the indent is a part of the
+			// content itself.
+			if ($tokens[$i]['code'] === T_START_HEREDOC
+				|| $tokens[$i]['code'] === T_START_NOWDOC
+			) {
+				$i = $phpcsFile->findNext([T_END_HEREDOC, T_END_NOWDOC], ($i + 1));
+				$i = $phpcsFile->findNext(Tokens::$emptyTokens, ($i + 1), null, true);
+				continue;
+			}
+
+			// Completely skip multi-line strings as the indent is a part of the
+			// content itself.
+			if ($tokens[$i]['code'] === T_CONSTANT_ENCAPSED_STRING
+				|| $tokens[$i]['code'] === T_DOUBLE_QUOTED_STRING
+			) {
+				$i = $phpcsFile->findNext($tokens[$i]['code'], ($i + 1), null, true);
+				$i--;
+				continue;
+			}
+
+			// Completely skip doc comments as they tend to have complex
+			// indentation rules.
+			if ($tokens[$i]['code'] === T_DOC_COMMENT_OPEN_TAG) {
+				$i = $tokens[$i]['comment_closer'];
+				continue;
+			}
+
+			// Open tags reset the indent level.
+			if ($tokens[$i]['code'] === T_OPEN_TAG
+				|| $tokens[$i]['code'] === T_OPEN_TAG_WITH_ECHO
+			) {
+				if ($this->debug === true) {
+					$line = $tokens[$i]['line'];
+					echo "Open PHP tag found on line $line".PHP_EOL;
+				}
+
+				if ($checkToken === null) {
+					$first         = $phpcsFile->findFirstOnLine(T_WHITESPACE, $i, true);
+					$currentIndent = (strlen($tokens[$first]['content']) - strlen(ltrim($tokens[$first]['content'])));
+				} else {
+					$currentIndent = ($tokens[$i]['column'] - 1);
+				}
+
+				$lastOpenTag = $i;
+
+				if (isset($adjustments[$i]) === true) {
+					$currentIndent += $adjustments[$i];
+				}
+
+				// Make sure it is divisible by our expected indent.
+				$currentIndent  = (int) (ceil($currentIndent / $this->indent) * $this->indent);
+				$setIndents[$i] = $currentIndent;
+
+				if ($this->debug === true) {
+					$type = $tokens[$i]['type'];
+					echo "\t=> indent set to $currentIndent by token $i ($type)".PHP_EOL;
+				}
+
+				continue;
+			}//end if
+
+			// Close tags reset the indent level, unless they are closing a tag
+			// opened on the same line.
+			if ($tokens[$i]['code'] === T_CLOSE_TAG) {
+				if ($this->debug === true) {
+					$line = $tokens[$i]['line'];
+					echo "Close PHP tag found on line $line".PHP_EOL;
+				}
+
+				if ($tokens[$lastOpenTag]['line'] !== $tokens[$i]['line']) {
+					$currentIndent = ($tokens[$i]['column'] - 1);
+					$lastCloseTag  = $i;
+				} else {
+					if ($lastCloseTag === null) {
+						$currentIndent = 0;
+					} else {
+						$currentIndent = ($tokens[$lastCloseTag]['column'] - 1);
+					}
+				}
+
+				if (isset($adjustments[$i]) === true) {
+					$currentIndent += $adjustments[$i];
+				}
+
+				// Make sure it is divisible by our expected indent.
+				$currentIndent  = (int) (ceil($currentIndent / $this->indent) * $this->indent);
+				$setIndents[$i] = $currentIndent;
+
+				if ($this->debug === true) {
+					$type = $tokens[$i]['type'];
+					echo "\t=> indent set to $currentIndent by token $i ($type)".PHP_EOL;
+				}
+
+				continue;
+			}//end if
+
+			// Anon classes and functions set the indent based on their own indent level.
+			if ($tokens[$i]['code'] === T_CLOSURE || $tokens[$i]['code'] === T_ANON_CLASS) {
+				$closer = $tokens[$i]['scope_closer'];
+				if ($tokens[$i]['line'] === $tokens[$closer]['line']) {
+					if ($this->debug === true) {
+						$type = str_replace('_', ' ', strtolower(substr($tokens[$i]['type'], 2)));
+						$line = $tokens[$i]['line'];
+						echo "* ignoring single-line $type on line $line".PHP_EOL;
+					}
+
+					$i = $closer;
+					continue;
+				}
+
+				if ($this->debug === true) {
+					$type = str_replace('_', ' ', strtolower(substr($tokens[$i]['type'], 2)));
+					$line = $tokens[$i]['line'];
+					echo "Open $type on line $line".PHP_EOL;
+				}
+
+				$first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $i, true);
+				if ($this->debug === true) {
+					$line = $tokens[$first]['line'];
+					$type = $tokens[$first]['type'];
+					echo "\t* first token is $first ($type) on line $line *".PHP_EOL;
+				}
+
+				while ($tokens[$first]['code'] === T_CONSTANT_ENCAPSED_STRING
+					&& $tokens[($first - 1)]['code'] === T_CONSTANT_ENCAPSED_STRING
+				) {
+					$first = $phpcsFile->findFirstOnLine(T_WHITESPACE, ($first - 1), true);
+					if ($this->debug === true) {
+						$line = $tokens[$first]['line'];
+						$type = $tokens[$first]['type'];
+						echo "\t* found multi-line string; amended first token is $first ($type) on line $line *".PHP_EOL;
+					}
+				}
+
+				$currentIndent = (($tokens[$first]['column'] - 1) + $this->indent);
+				$openScopes[$tokens[$i]['scope_closer']] = $tokens[$i]['scope_condition'];
+				if ($this->debug === true) {
+					$closerToken    = $tokens[$i]['scope_closer'];
+					$closerLine     = $tokens[$closerToken]['line'];
+					$closerType     = $tokens[$closerToken]['type'];
+					$conditionToken = $tokens[$i]['scope_condition'];
+					$conditionLine  = $tokens[$conditionToken]['line'];
+					$conditionType  = $tokens[$conditionToken]['type'];
+					echo "\t=> added open scope $closerToken ($closerType) on line $closerLine, pointing to condition $conditionToken ($conditionType) on line $conditionLine".PHP_EOL;
+				}
+
+				if (isset($adjustments[$first]) === true) {
+					$currentIndent += $adjustments[$first];
+				}
+
+				// Make sure it is divisible by our expected indent.
+				$currentIndent = (int) (floor($currentIndent / $this->indent) * $this->indent);
+				$i = $tokens[$i]['scope_opener'];
+				$setIndents[$i] = $currentIndent;
+
+				if ($this->debug === true) {
+					$type = $tokens[$i]['type'];
+					echo "\t=> indent set to $currentIndent by token $i ($type)".PHP_EOL;
+				}
+
+				continue;
+			}//end if
+
+			// Scope openers increase the indent level.
+			if (isset($tokens[$i]['scope_condition']) === true
+				&& isset($tokens[$i]['scope_opener']) === true
+				&& $tokens[$i]['scope_opener'] === $i
+			) {
+				$closer = $tokens[$i]['scope_closer'];
+				if ($tokens[$i]['line'] === $tokens[$closer]['line']) {
+					if ($this->debug === true) {
+						$line = $tokens[$i]['line'];
+						$type = $tokens[$i]['type'];
+						echo "* ignoring single-line $type on line $line".PHP_EOL;
+					}
+
+					$i = $closer;
+					continue;
+				}
+
+				$condition = $tokens[$tokens[$i]['scope_condition']]['code'];
+				if (isset(Tokens::$scopeOpeners[$condition]) === true
+					&& in_array($condition, $this->nonIndentingScopes, true) === false
+				) {
+					if ($this->debug === true) {
+						$line = $tokens[$i]['line'];
+						$type = $tokens[$tokens[$i]['scope_condition']]['type'];
+						echo "Open scope ($type) on line $line".PHP_EOL;
+					}
+
+					$currentIndent += $this->indent;
+					$setIndents[$i] = $currentIndent;
+					$openScopes[$tokens[$i]['scope_closer']] = $tokens[$i]['scope_condition'];
+					if ($this->debug === true) {
+						$closerToken    = $tokens[$i]['scope_closer'];
+						$closerLine     = $tokens[$closerToken]['line'];
+						$closerType     = $tokens[$closerToken]['type'];
+						$conditionToken = $tokens[$i]['scope_condition'];
+						$conditionLine  = $tokens[$conditionToken]['line'];
+						$conditionType  = $tokens[$conditionToken]['type'];
+						echo "\t=> added open scope $closerToken ($closerType) on line $closerLine, pointing to condition $conditionToken ($conditionType) on line $conditionLine".PHP_EOL;
+					}
+
+					if ($this->debug === true) {
+						$type = $tokens[$i]['type'];
+						echo "\t=> indent set to $currentIndent by token $i ($type)".PHP_EOL;
+					}
+
+					continue;
+				}//end if
+			}//end if
+
+			// JS objects set the indent level.
+			if ($phpcsFile->tokenizerType === 'JS'
+				&& $tokens[$i]['code'] === T_OBJECT
+			) {
+				$closer = $tokens[$i]['bracket_closer'];
+				if ($tokens[$i]['line'] === $tokens[$closer]['line']) {
+					if ($this->debug === true) {
+						$line = $tokens[$i]['line'];
+						echo "* ignoring single-line JS object on line $line".PHP_EOL;
+					}
+
+					$i = $closer;
+					continue;
+				}
+
+				if ($this->debug === true) {
+					$line = $tokens[$i]['line'];
+					echo "Open JS object on line $line".PHP_EOL;
+				}
+
+				$first         = $phpcsFile->findFirstOnLine(T_WHITESPACE, $i, true);
+				$currentIndent = (($tokens[$first]['column'] - 1) + $this->indent);
+				if (isset($adjustments[$first]) === true) {
+					$currentIndent += $adjustments[$first];
+				}
+
+				// Make sure it is divisible by our expected indent.
+				$currentIndent      = (int) (ceil($currentIndent / $this->indent) * $this->indent);
+				$setIndents[$first] = $currentIndent;
+
+				if ($this->debug === true) {
+					$type = $tokens[$first]['type'];
+					echo "\t=> indent set to $currentIndent by token $first ($type)".PHP_EOL;
+				}
+
+				continue;
+			}//end if
+
+			// Closing an anon class or function.
+			if (isset($tokens[$i]['scope_condition']) === true
+				&& $tokens[$i]['scope_closer'] === $i
+				&& ($tokens[$tokens[$i]['scope_condition']]['code'] === T_CLOSURE
+				|| $tokens[$tokens[$i]['scope_condition']]['code'] === T_ANON_CLASS)
+			) {
+				if ($this->debug === true) {
+					$type = str_replace('_', ' ', strtolower(substr($tokens[$tokens[$i]['scope_condition']]['type'], 2)));
+					$line = $tokens[$i]['line'];
+					echo "Close $type on line $line".PHP_EOL;
+				}
+
+				$prev = false;
+
+				$object = 0;
+				if ($phpcsFile->tokenizerType === 'JS') {
+					$conditions = $tokens[$i]['conditions'];
+					krsort($conditions, SORT_NUMERIC);
+					foreach ($conditions as $token => $condition) {
+						if ($condition === T_OBJECT) {
+							$object = $token;
+							break;
+						}
+					}
+
+					if ($this->debug === true && $object !== 0) {
+						$line = $tokens[$object]['line'];
+						echo "\t* token is inside JS object $object on line $line *".PHP_EOL;
+					}
+				}
+
+				$parens = 0;
+				if (isset($tokens[$i]['nested_parenthesis']) === true
+					&& empty($tokens[$i]['nested_parenthesis']) === false
+				) {
+					$parens = $tokens[$i]['nested_parenthesis'];
+					end($parens);
+					$parens = key($parens);
+					if ($this->debug === true) {
+						$line = $tokens[$parens]['line'];
+						echo "\t* token has nested parenthesis $parens on line $line *".PHP_EOL;
+					}
+				}
+
+				$condition = 0;
+				if (isset($tokens[$i]['conditions']) === true
+					&& empty($tokens[$i]['conditions']) === false
+				) {
+					$condition = $tokens[$i]['conditions'];
+					end($condition);
+					$condition = key($condition);
+					if ($this->debug === true) {
+						$line = $tokens[$condition]['line'];
+						$type = $tokens[$condition]['type'];
+						echo "\t* token is inside condition $condition ($type) on line $line *".PHP_EOL;
+					}
+				}
+
+				if ($parens > $object && $parens > $condition) {
+					if ($this->debug === true) {
+						echo "\t* using parenthesis *".PHP_EOL;
+					}
+
+					$prev      = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($parens - 1), null, true);
+					$object    = 0;
+					$condition = 0;
+				} else if ($object > 0 && $object >= $condition) {
+					if ($this->debug === true) {
+						echo "\t* using object *".PHP_EOL;
+					}
+
+					$prev      = $object;
+					$parens    = 0;
+					$condition = 0;
+				} else if ($condition > 0) {
+					if ($this->debug === true) {
+						echo "\t* using condition *".PHP_EOL;
+					}
+
+					$prev   = $condition;
+					$object = 0;
+					$parens = 0;
+				}//end if
+
+				if ($prev === false) {
+					$prev = $phpcsFile->findPrevious([T_EQUAL, T_RETURN], ($tokens[$i]['scope_condition'] - 1), null, false, null, true);
+					if ($prev === false) {
+						$prev = $i;
+						if ($this->debug === true) {
+							echo "\t* could not find a previous T_EQUAL or T_RETURN token; will use current token *".PHP_EOL;
+						}
+					}
+				}
+
+				if ($this->debug === true) {
+					$line = $tokens[$prev]['line'];
+					$type = $tokens[$prev]['type'];
+					echo "\t* previous token is $type on line $line *".PHP_EOL;
+				}
+
+				$first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $prev, true);
+				if ($this->debug === true) {
+					$line = $tokens[$first]['line'];
+					$type = $tokens[$first]['type'];
+					echo "\t* first token on line $line is $first ($type) *".PHP_EOL;
+				}
+
+				$prev = $phpcsFile->findStartOfStatement($first);
+				if ($prev !== $first) {
+					// This is not the start of the statement.
+					if ($this->debug === true) {
+						$line = $tokens[$prev]['line'];
+						$type = $tokens[$prev]['type'];
+						echo "\t* amended previous is $type on line $line *".PHP_EOL;
+					}
+
+					$first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $prev, true);
+					if ($this->debug === true) {
+						$line = $tokens[$first]['line'];
+						$type = $tokens[$first]['type'];
+						echo "\t* amended first token is $first ($type) on line $line *".PHP_EOL;
+					}
+				}
+
+				$currentIndent = ($tokens[$first]['column'] - 1);
+				if ($object > 0 || $condition > 0) {
+					$currentIndent += $this->indent;
+				}
+
+				if (isset($tokens[$first]['scope_closer']) === true
+					&& $tokens[$first]['scope_closer'] === $first
+				) {
+					if ($this->debug === true) {
+						echo "\t* first token is a scope closer *".PHP_EOL;
+					}
+
+					if ($condition === 0 || $tokens[$condition]['scope_opener'] < $first) {
+						$currentIndent = $setIndents[$first];
+					} else if ($this->debug === true) {
+						echo "\t* ignoring scope closer *".PHP_EOL;
+					}
+				}
+
+				// Make sure it is divisible by our expected indent.
+				$currentIndent      = (int) (ceil($currentIndent / $this->indent) * $this->indent);
+				$setIndents[$first] = $currentIndent;
+
+				if ($this->debug === true) {
+					$type = $tokens[$first]['type'];
+					echo "\t=> indent set to $currentIndent by token $first ($type)".PHP_EOL;
+				}
+			}//end if
+		}//end for
+
+		// Don't process the rest of the file.
+		return $phpcsFile->numTokens;
+
+	}//end process()
+
+
+	/**
+	 * Processes this test, when one of its tokens is encountered.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile All the tokens found in the document.
+	 * @param int                         $stackPtr  The position of the current token
+	 *                                               in the stack passed in $tokens.
+	 * @param int                         $length    The length of the new indent.
+	 * @param int                         $change    The difference in length between
+	 *                                               the old and new indent.
+	 *
+	 * @return bool
+	 */
+	protected function adjustIndent(File $phpcsFile, $stackPtr, $length, $change)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		// We don't adjust indents outside of PHP.
+		if ($tokens[$stackPtr]['code'] === T_INLINE_HTML) {
+			return false;
+		}
+
+		$padding = '';
+		if ($length > 0) {
+			if ($this->tabIndent === true) {
+				$numTabs = floor($length / $this->tabWidth);
+				if ($numTabs > 0) {
+					$numSpaces = ($length - ($numTabs * $this->tabWidth));
+					$padding   = str_repeat("\t", $numTabs).str_repeat(' ', $numSpaces);
+				}
+			} else {
+				$padding = str_repeat(' ', $length);
+			}
+		}
+
+		if ($tokens[$stackPtr]['column'] === 1) {
+			$trimmed  = ltrim($tokens[$stackPtr]['content']);
+			$accepted = $phpcsFile->fixer->replaceToken($stackPtr, $padding.$trimmed);
+		} else {
+			// Easier to just replace the entire indent.
+			$accepted = $phpcsFile->fixer->replaceToken(($stackPtr - 1), $padding);
+		}
+
+		if ($accepted === false) {
+			return false;
+		}
+
+		if ($tokens[$stackPtr]['code'] === T_DOC_COMMENT_OPEN_TAG) {
+			// We adjusted the start of a comment, so adjust the rest of it
+			// as well so the alignment remains correct.
+			for ($x = ($stackPtr + 1); $x < $tokens[$stackPtr]['comment_closer']; $x++) {
+				if ($tokens[$x]['column'] !== 1) {
+					continue;
+				}
+
+				$length = 0;
+				if ($tokens[$x]['code'] === T_DOC_COMMENT_WHITESPACE) {
+					$length = $tokens[$x]['length'];
+				}
+
+				$padding = ($length + $change);
+				if ($padding > 0) {
+					if ($this->tabIndent === true) {
+						$numTabs   = floor($padding / $this->tabWidth);
+						$numSpaces = ($padding - ($numTabs * $this->tabWidth));
+						$padding   = str_repeat("\t", $numTabs).str_repeat(' ', $numSpaces);
+					} else {
+						$padding = str_repeat(' ', $padding);
+					}
+				} else {
+					$padding = '';
+				}
+
+				$phpcsFile->fixer->replaceToken($x, $padding);
+				if ($this->debug === true) {
+					$length = strlen($padding);
+					$line   = $tokens[$x]['line'];
+					$type   = $tokens[$x]['type'];
+					echo "\t=> Indent adjusted to $length for $type on line $line".PHP_EOL;
+				}
+			}//end for
+		}//end if
+
+		return true;
+
+	}//end adjustIndent()
 
 
 }//end class

Spacing +667 added lines, -667 removed lines

@@ -72,7 +72,7 @@ 
      *
      * @var int[]
      */
-    public $ignoreIndentationTokens = [];
+    public $ignoreIndentationTokens = [ ];
 
     /**
      * List of tokens not needing to be checked for indentation.
@@ -82,14 +82,14 @@ 
      *
      * @var int[]
      */
-    private $ignoreIndentation = [];
+    private $ignoreIndentation = [ ];
 
     /**
      * Any scope openers that should not cause an indent.
      *
      * @var int[]
      */
-    protected $nonIndentingScopes = [];
+    protected $nonIndentingScopes = [ ];
 
     /**
      * Show debug output for this sniff.
@@ -106,11 +106,11 @@ 
      */
     public function register()
     {
-        if (defined('PHP_CODESNIFFER_IN_TESTS') === true) {
+        if ( defined( 'PHP_CODESNIFFER_IN_TESTS' ) === true ) {
             $this->debug = false;
         }
 
-        return [T_OPEN_TAG];
+        return [ T_OPEN_TAG ];
 
     }//end register()
 
@@ -124,15 +124,15 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
-        $debug = Config::getConfigData('scope_indent_debug');
-        if ($debug !== null) {
-            $this->debug = (bool) $debug;
+        $debug = Config::getConfigData( 'scope_indent_debug' );
+        if ( $debug !== null ) {
+            $this->debug = (bool)$debug;
         }
 
-        if ($this->tabWidth === null) {
-            if (isset($phpcsFile->config->tabWidth) === false || $phpcsFile->config->tabWidth === 0) {
+        if ( $this->tabWidth === null ) {
+            if ( isset( $phpcsFile->config->tabWidth ) === false || $phpcsFile->config->tabWidth === 0 ) {
                 // We have no idea how wide tabs are, so assume 4 spaces for fixing.
                 // It shouldn't really matter because indent checks elsewhere in the
                 // standard should fix things up.
@@ -144,77 +144,77 @@ 
 
         $lastOpenTag     = $stackPtr;
         $lastCloseTag    = null;
-        $openScopes      = [];
-        $adjustments     = [];
-        $setIndents      = [];
+        $openScopes      = [ ];
+        $adjustments     = [ ];
+        $setIndents      = [ ];
         $disableExactEnd = 0;
 
         $tokens  = $phpcsFile->getTokens();
-        $first   = $phpcsFile->findFirstOnLine(T_INLINE_HTML, $stackPtr);
-        $trimmed = ltrim($tokens[$first]['content']);
-        if ($trimmed === '') {
-            $currentIndent = ($tokens[$stackPtr]['column'] - 1);
+        $first   = $phpcsFile->findFirstOnLine( T_INLINE_HTML, $stackPtr );
+        $trimmed = ltrim( $tokens[ $first ][ 'content' ] );
+        if ( $trimmed === '' ) {
+            $currentIndent = ( $tokens[ $stackPtr ][ 'column' ] - 1 );
         } else {
-            $currentIndent = (strlen($tokens[$first]['content']) - strlen($trimmed));
+            $currentIndent = ( strlen( $tokens[ $first ][ 'content' ] ) - strlen( $trimmed ) );
         }
 
-        if ($this->debug === true) {
-            $line = $tokens[$stackPtr]['line'];
-            echo "Start with token $stackPtr on line $line with indent $currentIndent".PHP_EOL;
+        if ( $this->debug === true ) {
+            $line = $tokens[ $stackPtr ][ 'line' ];
+            echo "Start with token $stackPtr on line $line with indent $currentIndent" . PHP_EOL;
         }
 
-        if (empty($this->ignoreIndentation) === true) {
-            $this->ignoreIndentation = [T_INLINE_HTML => true];
-            foreach ($this->ignoreIndentationTokens as $token) {
-                if (is_int($token) === false) {
-                    if (defined($token) === false) {
+        if ( empty( $this->ignoreIndentation ) === true ) {
+            $this->ignoreIndentation = [ T_INLINE_HTML => true ];
+            foreach ( $this->ignoreIndentationTokens as $token ) {
+                if ( is_int( $token ) === false ) {
+                    if ( defined( $token ) === false ) {
                         continue;
                     }
 
-                    $token = constant($token);
+                    $token = constant( $token );
                 }
 
-                $this->ignoreIndentation[$token] = true;
+                $this->ignoreIndentation[ $token ] = true;
             }
         }//end if
 
-        $this->exact     = (bool) $this->exact;
-        $this->tabIndent = (bool) $this->tabIndent;
+        $this->exact     = (bool)$this->exact;
+        $this->tabIndent = (bool)$this->tabIndent;
 
         $checkAnnotations = $phpcsFile->config->annotations;
 
-        for ($i = ($stackPtr + 1); $i < $phpcsFile->numTokens; $i++) {
-            if ($i === false) {
+        for ( $i = ( $stackPtr + 1 ); $i < $phpcsFile->numTokens; $i++ ) {
+            if ( $i === false ) {
                 // Something has gone very wrong; maybe a parse error.
                 break;
             }
 
-            if ($checkAnnotations === true
-                && $tokens[$i]['code'] === T_PHPCS_SET
-                && isset($tokens[$i]['sniffCode']) === true
-                && $tokens[$i]['sniffCode'] === 'Generic.WhiteSpace.ScopeIndent'
-                && $tokens[$i]['sniffProperty'] === 'exact'
+            if ( $checkAnnotations === true
+                && $tokens[ $i ][ 'code' ] === T_PHPCS_SET
+                && isset( $tokens[ $i ][ 'sniffCode' ] ) === true
+                && $tokens[ $i ][ 'sniffCode' ] === 'Generic.WhiteSpace.ScopeIndent'
+                && $tokens[ $i ][ 'sniffProperty' ] === 'exact'
             ) {
-                $value = $tokens[$i]['sniffPropertyValue'];
-                if ($value === 'true') {
+                $value = $tokens[ $i ][ 'sniffPropertyValue' ];
+                if ( $value === 'true' ) {
                     $value = true;
-                } else if ($value === 'false') {
+                } else if ( $value === 'false' ) {
                     $value = false;
                 } else {
-                    $value = (bool) $value;
+                    $value = (bool)$value;
                 }
 
                 $this->exact = $value;
 
-                if ($this->debug === true) {
-                    $line = $tokens[$i]['line'];
-                    if ($this->exact === true) {
+                if ( $this->debug === true ) {
+                    $line = $tokens[ $i ][ 'line' ];
+                    if ( $this->exact === true ) {
                         $value = 'true';
                     } else {
                         $value = 'false';
                     }
 
-                    echo "* token $i on line $line set exact flag to $value *".PHP_EOL;
+                    echo "* token $i on line $line set exact flag to $value *" . PHP_EOL;
                 }
             }//end if
 
@@ -229,96 +229,96 @@ 
 
             $exact = $this->exact;
 
-            if ($tokens[$i]['code'] === T_OPEN_SHORT_ARRAY) {
-                $disableExactEnd = max($disableExactEnd, $tokens[$i]['bracket_closer']);
+            if ( $tokens[ $i ][ 'code' ] === T_OPEN_SHORT_ARRAY ) {
+                $disableExactEnd = max( $disableExactEnd, $tokens[ $i ][ 'bracket_closer' ] );
             }
 
-            if ($tokens[$i]['code'] === T_OPEN_PARENTHESIS
-                && isset($tokens[$i]['parenthesis_closer']) === true
+            if ( $tokens[ $i ][ 'code' ] === T_OPEN_PARENTHESIS
+                && isset( $tokens[ $i ][ 'parenthesis_closer' ] ) === true
             ) {
-                $disableExactEnd = max($disableExactEnd, $tokens[$i]['parenthesis_closer']);
+                $disableExactEnd = max( $disableExactEnd, $tokens[ $i ][ 'parenthesis_closer' ] );
             }
 
-            if ($exact === true && $i < $disableExactEnd) {
+            if ( $exact === true && $i < $disableExactEnd ) {
                 $exact = false;
             }
 
             // Detect line changes and figure out where the indent is.
-            if ($tokens[$i]['column'] === 1) {
-                $trimmed = ltrim($tokens[$i]['content']);
-                if ($trimmed === '') {
-                    if (isset($tokens[($i + 1)]) === true
-                        && $tokens[$i]['line'] === $tokens[($i + 1)]['line']
+            if ( $tokens[ $i ][ 'column' ] === 1 ) {
+                $trimmed = ltrim( $tokens[ $i ][ 'content' ] );
+                if ( $trimmed === '' ) {
+                    if ( isset( $tokens[ ( $i + 1 ) ] ) === true
+                        && $tokens[ $i ][ 'line' ] === $tokens[ ( $i + 1 ) ][ 'line' ]
                     ) {
-                        $checkToken  = ($i + 1);
-                        $tokenIndent = ($tokens[($i + 1)]['column'] - 1);
+                        $checkToken  = ( $i + 1 );
+                        $tokenIndent = ( $tokens[ ( $i + 1 ) ][ 'column' ] - 1 );
                     }
                 } else {
                     $checkToken  = $i;
-                    $tokenIndent = (strlen($tokens[$i]['content']) - strlen($trimmed));
+                    $tokenIndent = ( strlen( $tokens[ $i ][ 'content' ] ) - strlen( $trimmed ) );
                 }
             }
 
             // Closing parenthesis should just be indented to at least
             // the same level as where they were opened (but can be more).
-            if (($checkToken !== null
-                && $tokens[$checkToken]['code'] === T_CLOSE_PARENTHESIS
-                && isset($tokens[$checkToken]['parenthesis_opener']) === true)
-                || ($tokens[$i]['code'] === T_CLOSE_PARENTHESIS
-                && isset($tokens[$i]['parenthesis_opener']) === true)
+            if ( ( $checkToken !== null
+                && $tokens[ $checkToken ][ 'code' ] === T_CLOSE_PARENTHESIS
+                && isset( $tokens[ $checkToken ][ 'parenthesis_opener' ] ) === true )
+                || ( $tokens[ $i ][ 'code' ] === T_CLOSE_PARENTHESIS
+                && isset( $tokens[ $i ][ 'parenthesis_opener' ] ) === true )
             ) {
-                if ($checkToken !== null) {
+                if ( $checkToken !== null ) {
                     $parenCloser = $checkToken;
                 } else {
                     $parenCloser = $i;
                 }
 
-                if ($this->debug === true) {
-                    $line = $tokens[$i]['line'];
-                    echo "Closing parenthesis found on line $line".PHP_EOL;
+                if ( $this->debug === true ) {
+                    $line = $tokens[ $i ][ 'line' ];
+                    echo "Closing parenthesis found on line $line" . PHP_EOL;
                 }
 
-                $parenOpener = $tokens[$parenCloser]['parenthesis_opener'];
-                if ($tokens[$parenCloser]['line'] !== $tokens[$parenOpener]['line']) {
+                $parenOpener = $tokens[ $parenCloser ][ 'parenthesis_opener' ];
+                if ( $tokens[ $parenCloser ][ 'line' ] !== $tokens[ $parenOpener ][ 'line' ] ) {
                     $parens = 0;
-                    if (isset($tokens[$parenCloser]['nested_parenthesis']) === true
-                        && empty($tokens[$parenCloser]['nested_parenthesis']) === false
+                    if ( isset( $tokens[ $parenCloser ][ 'nested_parenthesis' ] ) === true
+                        && empty( $tokens[ $parenCloser ][ 'nested_parenthesis' ] ) === false
                     ) {
-                        $parens = $tokens[$parenCloser]['nested_parenthesis'];
-                        end($parens);
-                        $parens = key($parens);
-                        if ($this->debug === true) {
-                            $line = $tokens[$parens]['line'];
-                            echo "\t* token has nested parenthesis $parens on line $line *".PHP_EOL;
+                        $parens = $tokens[ $parenCloser ][ 'nested_parenthesis' ];
+                        end( $parens );
+                        $parens = key( $parens );
+                        if ( $this->debug === true ) {
+                            $line = $tokens[ $parens ][ 'line' ];
+                            echo "\t* token has nested parenthesis $parens on line $line *" . PHP_EOL;
                         }
                     }
 
                     $condition = 0;
-                    if (isset($tokens[$parenCloser]['conditions']) === true
-                        && empty($tokens[$parenCloser]['conditions']) === false
-                        && (isset($tokens[$parenCloser]['parenthesis_owner']) === false
-                        || $parens > 0)
+                    if ( isset( $tokens[ $parenCloser ][ 'conditions' ] ) === true
+                        && empty( $tokens[ $parenCloser ][ 'conditions' ] ) === false
+                        && ( isset( $tokens[ $parenCloser ][ 'parenthesis_owner' ] ) === false
+                        || $parens > 0 )
                     ) {
-                        $condition = $tokens[$parenCloser]['conditions'];
-                        end($condition);
-                        $condition = key($condition);
-                        if ($this->debug === true) {
-                            $line = $tokens[$condition]['line'];
-                            $type = $tokens[$condition]['type'];
-                            echo "\t* token is inside condition $condition ($type) on line $line *".PHP_EOL;
+                        $condition = $tokens[ $parenCloser ][ 'conditions' ];
+                        end( $condition );
+                        $condition = key( $condition );
+                        if ( $this->debug === true ) {
+                            $line = $tokens[ $condition ][ 'line' ];
+                            $type = $tokens[ $condition ][ 'type' ];
+                            echo "\t* token is inside condition $condition ($type) on line $line *" . PHP_EOL;
                         }
                     }
 
-                    if ($parens > $condition) {
-                        if ($this->debug === true) {
-                            echo "\t* using parenthesis *".PHP_EOL;
+                    if ( $parens > $condition ) {
+                        if ( $this->debug === true ) {
+                            echo "\t* using parenthesis *" . PHP_EOL;
                         }
 
                         $parenOpener = $parens;
                         $condition   = 0;
-                    } else if ($condition > 0) {
-                        if ($this->debug === true) {
-                            echo "\t* using condition *".PHP_EOL;
+                    } else if ( $condition > 0 ) {
+                        if ( $this->debug === true ) {
+                            echo "\t* using condition *" . PHP_EOL;
                         }
 
                         $parenOpener = $condition;
@@ -327,356 +327,356 @@ 
 
                     $exact = false;
 
-                    $lastOpenTagConditions = array_keys($tokens[$lastOpenTag]['conditions']);
-                    $lastOpenTagCondition  = array_pop($lastOpenTagConditions);
+                    $lastOpenTagConditions = array_keys( $tokens[ $lastOpenTag ][ 'conditions' ] );
+                    $lastOpenTagCondition  = array_pop( $lastOpenTagConditions );
 
-                    if ($condition > 0 && $lastOpenTagCondition === $condition) {
-                        if ($this->debug === true) {
-                            echo "\t* open tag is inside condition; using open tag *".PHP_EOL;
+                    if ( $condition > 0 && $lastOpenTagCondition === $condition ) {
+                        if ( $this->debug === true ) {
+                            echo "\t* open tag is inside condition; using open tag *" . PHP_EOL;
                         }
 
-                        $checkIndent = ($tokens[$lastOpenTag]['column'] - 1);
-                        if (isset($adjustments[$condition]) === true) {
-                            $checkIndent += $adjustments[$condition];
+                        $checkIndent = ( $tokens[ $lastOpenTag ][ 'column' ] - 1 );
+                        if ( isset( $adjustments[ $condition ] ) === true ) {
+                            $checkIndent += $adjustments[ $condition ];
                         }
 
                         $currentIndent = $checkIndent;
 
-                        if ($this->debug === true) {
-                            $type = $tokens[$lastOpenTag]['type'];
-                            echo "\t=> checking indent of $checkIndent; main indent set to $currentIndent by token $lastOpenTag ($type)".PHP_EOL;
+                        if ( $this->debug === true ) {
+                            $type = $tokens[ $lastOpenTag ][ 'type' ];
+                            echo "\t=> checking indent of $checkIndent; main indent set to $currentIndent by token $lastOpenTag ($type)" . PHP_EOL;
                         }
-                    } else if ($condition > 0
-                        && isset($tokens[$condition]['scope_opener']) === true
-                        && isset($setIndents[$tokens[$condition]['scope_opener']]) === true
+                    } else if ( $condition > 0
+                        && isset( $tokens[ $condition ][ 'scope_opener' ] ) === true
+                        && isset( $setIndents[ $tokens[ $condition ][ 'scope_opener' ] ] ) === true
                     ) {
-                        $checkIndent = $setIndents[$tokens[$condition]['scope_opener']];
-                        if (isset($adjustments[$condition]) === true) {
-                            $checkIndent += $adjustments[$condition];
+                        $checkIndent = $setIndents[ $tokens[ $condition ][ 'scope_opener' ] ];
+                        if ( isset( $adjustments[ $condition ] ) === true ) {
+                            $checkIndent += $adjustments[ $condition ];
                         }
 
                         $currentIndent = $checkIndent;
 
-                        if ($this->debug === true) {
-                            $type = $tokens[$condition]['type'];
-                            echo "\t=> checking indent of $checkIndent; main indent set to $currentIndent by token $condition ($type)".PHP_EOL;
+                        if ( $this->debug === true ) {
+                            $type = $tokens[ $condition ][ 'type' ];
+                            echo "\t=> checking indent of $checkIndent; main indent set to $currentIndent by token $condition ($type)" . PHP_EOL;
                         }
                     } else {
-                        $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $parenOpener, true);
+                        $first = $phpcsFile->findFirstOnLine( T_WHITESPACE, $parenOpener, true );
 
-                        $checkIndent = ($tokens[$first]['column'] - 1);
-                        if (isset($adjustments[$first]) === true) {
-                            $checkIndent += $adjustments[$first];
+                        $checkIndent = ( $tokens[ $first ][ 'column' ] - 1 );
+                        if ( isset( $adjustments[ $first ] ) === true ) {
+                            $checkIndent += $adjustments[ $first ];
                         }
 
-                        if ($this->debug === true) {
-                            $line = $tokens[$first]['line'];
-                            $type = $tokens[$first]['type'];
-                            echo "\t* first token on line $line is $first ($type) *".PHP_EOL;
+                        if ( $this->debug === true ) {
+                            $line = $tokens[ $first ][ 'line' ];
+                            $type = $tokens[ $first ][ 'type' ];
+                            echo "\t* first token on line $line is $first ($type) *" . PHP_EOL;
                         }
 
-                        if ($first === $tokens[$parenCloser]['parenthesis_opener']
-                            && $tokens[($first - 1)]['line'] === $tokens[$first]['line']
+                        if ( $first === $tokens[ $parenCloser ][ 'parenthesis_opener' ]
+                            && $tokens[ ( $first - 1 ) ][ 'line' ] === $tokens[ $first ][ 'line' ]
                         ) {
                             // This is unlikely to be the start of the statement, so look
                             // back further to find it.
                             $first--;
-                            if ($this->debug === true) {
-                                $line = $tokens[$first]['line'];
-                                $type = $tokens[$first]['type'];
-                                echo "\t* first token is the parenthesis opener *".PHP_EOL;
-                                echo "\t* amended first token is $first ($type) on line $line *".PHP_EOL;
+                            if ( $this->debug === true ) {
+                                $line = $tokens[ $first ][ 'line' ];
+                                $type = $tokens[ $first ][ 'type' ];
+                                echo "\t* first token is the parenthesis opener *" . PHP_EOL;
+                                echo "\t* amended first token is $first ($type) on line $line *" . PHP_EOL;
                             }
                         }
 
-                        $prev = $phpcsFile->findStartOfStatement($first, T_COMMA);
-                        if ($prev !== $first) {
+                        $prev = $phpcsFile->findStartOfStatement( $first, T_COMMA );
+                        if ( $prev !== $first ) {
                             // This is not the start of the statement.
-                            if ($this->debug === true) {
-                                $line = $tokens[$prev]['line'];
-                                $type = $tokens[$prev]['type'];
-                                echo "\t* previous is $type on line $line *".PHP_EOL;
+                            if ( $this->debug === true ) {
+                                $line = $tokens[ $prev ][ 'line' ];
+                                $type = $tokens[ $prev ][ 'type' ];
+                                echo "\t* previous is $type on line $line *" . PHP_EOL;
                             }
 
-                            $first = $phpcsFile->findFirstOnLine([T_WHITESPACE, T_INLINE_HTML], $prev, true);
-                            if ($first !== false) {
-                                $prev  = $phpcsFile->findStartOfStatement($first, T_COMMA);
-                                $first = $phpcsFile->findFirstOnLine([T_WHITESPACE, T_INLINE_HTML], $prev, true);
+                            $first = $phpcsFile->findFirstOnLine( [ T_WHITESPACE, T_INLINE_HTML ], $prev, true );
+                            if ( $first !== false ) {
+                                $prev  = $phpcsFile->findStartOfStatement( $first, T_COMMA );
+                                $first = $phpcsFile->findFirstOnLine( [ T_WHITESPACE, T_INLINE_HTML ], $prev, true );
                             } else {
                                 $first = $prev;
                             }
 
-                            if ($this->debug === true) {
-                                $line = $tokens[$first]['line'];
-                                $type = $tokens[$first]['type'];
-                                echo "\t* amended first token is $first ($type) on line $line *".PHP_EOL;
+                            if ( $this->debug === true ) {
+                                $line = $tokens[ $first ][ 'line' ];
+                                $type = $tokens[ $first ][ 'type' ];
+                                echo "\t* amended first token is $first ($type) on line $line *" . PHP_EOL;
                             }
                         }//end if
 
-                        if (isset($tokens[$first]['scope_closer']) === true
-                            && $tokens[$first]['scope_closer'] === $first
+                        if ( isset( $tokens[ $first ][ 'scope_closer' ] ) === true
+                            && $tokens[ $first ][ 'scope_closer' ] === $first
                         ) {
-                            if ($this->debug === true) {
-                                echo "\t* first token is a scope closer *".PHP_EOL;
+                            if ( $this->debug === true ) {
+                                echo "\t* first token is a scope closer *" . PHP_EOL;
                             }
 
-                            if (isset($tokens[$first]['scope_condition']) === true) {
+                            if ( isset( $tokens[ $first ][ 'scope_condition' ] ) === true ) {
                                 $scopeCloser = $first;
-                                $first       = $phpcsFile->findFirstOnLine(T_WHITESPACE, $tokens[$scopeCloser]['scope_condition'], true);
+                                $first       = $phpcsFile->findFirstOnLine( T_WHITESPACE, $tokens[ $scopeCloser ][ 'scope_condition' ], true );
 
-                                $currentIndent = ($tokens[$first]['column'] - 1);
-                                if (isset($adjustments[$first]) === true) {
-                                    $currentIndent += $adjustments[$first];
+                                $currentIndent = ( $tokens[ $first ][ 'column' ] - 1 );
+                                if ( isset( $adjustments[ $first ] ) === true ) {
+                                    $currentIndent += $adjustments[ $first ];
                                 }
 
                                 // Make sure it is divisible by our expected indent.
-                                if ($tokens[$tokens[$scopeCloser]['scope_condition']]['code'] !== T_CLOSURE) {
-                                    $currentIndent = (int) (ceil($currentIndent / $this->indent) * $this->indent);
+                                if ( $tokens[ $tokens[ $scopeCloser ][ 'scope_condition' ] ][ 'code' ] !== T_CLOSURE ) {
+                                    $currentIndent = (int)( ceil( $currentIndent / $this->indent ) * $this->indent );
                                 }
 
-                                $setIndents[$first] = $currentIndent;
+                                $setIndents[ $first ] = $currentIndent;
 
-                                if ($this->debug === true) {
-                                    $type = $tokens[$first]['type'];
-                                    echo "\t=> indent set to $currentIndent by token $first ($type)".PHP_EOL;
+                                if ( $this->debug === true ) {
+                                    $type = $tokens[ $first ][ 'type' ];
+                                    echo "\t=> indent set to $currentIndent by token $first ($type)" . PHP_EOL;
                                 }
                             }//end if
                         } else {
                             // Don't force current indent to be divisible because there could be custom
                             // rules in place between parenthesis, such as with arrays.
-                            $currentIndent = ($tokens[$first]['column'] - 1);
-                            if (isset($adjustments[$first]) === true) {
-                                $currentIndent += $adjustments[$first];
+                            $currentIndent = ( $tokens[ $first ][ 'column' ] - 1 );
+                            if ( isset( $adjustments[ $first ] ) === true ) {
+                                $currentIndent += $adjustments[ $first ];
                             }
 
-                            $setIndents[$first] = $currentIndent;
+                            $setIndents[ $first ] = $currentIndent;
 
-                            if ($this->debug === true) {
-                                $type = $tokens[$first]['type'];
-                                echo "\t=> checking indent of $checkIndent; main indent set to $currentIndent by token $first ($type)".PHP_EOL;
+                            if ( $this->debug === true ) {
+                                $type = $tokens[ $first ][ 'type' ];
+                                echo "\t=> checking indent of $checkIndent; main indent set to $currentIndent by token $first ($type)" . PHP_EOL;
                             }
                         }//end if
                     }//end if
-                } else if ($this->debug === true) {
-                    echo "\t * ignoring single-line definition *".PHP_EOL;
+                } else if ( $this->debug === true ) {
+                    echo "\t * ignoring single-line definition *" . PHP_EOL;
                 }//end if
             }//end if
 
             // Closing short array bracket should just be indented to at least
             // the same level as where it was opened (but can be more).
-            if ($tokens[$i]['code'] === T_CLOSE_SHORT_ARRAY
-                || ($checkToken !== null
-                && $tokens[$checkToken]['code'] === T_CLOSE_SHORT_ARRAY)
+            if ( $tokens[ $i ][ 'code' ] === T_CLOSE_SHORT_ARRAY
+                || ( $checkToken !== null
+                && $tokens[ $checkToken ][ 'code' ] === T_CLOSE_SHORT_ARRAY )
             ) {
-                if ($checkToken !== null) {
+                if ( $checkToken !== null ) {
                     $arrayCloser = $checkToken;
                 } else {
                     $arrayCloser = $i;
                 }
 
-                if ($this->debug === true) {
-                    $line = $tokens[$arrayCloser]['line'];
-                    echo "Closing short array bracket found on line $line".PHP_EOL;
+                if ( $this->debug === true ) {
+                    $line = $tokens[ $arrayCloser ][ 'line' ];
+                    echo "Closing short array bracket found on line $line" . PHP_EOL;
                 }
 
-                $arrayOpener = $tokens[$arrayCloser]['bracket_opener'];
-                if ($tokens[$arrayCloser]['line'] !== $tokens[$arrayOpener]['line']) {
-                    $first       = $phpcsFile->findFirstOnLine(T_WHITESPACE, $arrayOpener, true);
-                    $checkIndent = ($tokens[$first]['column'] - 1);
-                    if (isset($adjustments[$first]) === true) {
-                        $checkIndent += $adjustments[$first];
+                $arrayOpener = $tokens[ $arrayCloser ][ 'bracket_opener' ];
+                if ( $tokens[ $arrayCloser ][ 'line' ] !== $tokens[ $arrayOpener ][ 'line' ] ) {
+                    $first       = $phpcsFile->findFirstOnLine( T_WHITESPACE, $arrayOpener, true );
+                    $checkIndent = ( $tokens[ $first ][ 'column' ] - 1 );
+                    if ( isset( $adjustments[ $first ] ) === true ) {
+                        $checkIndent += $adjustments[ $first ];
                     }
 
                     $exact = false;
 
-                    if ($this->debug === true) {
-                        $line = $tokens[$first]['line'];
-                        $type = $tokens[$first]['type'];
-                        echo "\t* first token on line $line is $first ($type) *".PHP_EOL;
+                    if ( $this->debug === true ) {
+                        $line = $tokens[ $first ][ 'line' ];
+                        $type = $tokens[ $first ][ 'type' ];
+                        echo "\t* first token on line $line is $first ($type) *" . PHP_EOL;
                     }
 
-                    if ($first === $tokens[$arrayCloser]['bracket_opener']) {
+                    if ( $first === $tokens[ $arrayCloser ][ 'bracket_opener' ] ) {
                         // This is unlikely to be the start of the statement, so look
                         // back further to find it.
                         $first--;
                     }
 
-                    $prev = $phpcsFile->findStartOfStatement($first, [T_COMMA, T_DOUBLE_ARROW]);
-                    if ($prev !== $first) {
+                    $prev = $phpcsFile->findStartOfStatement( $first, [ T_COMMA, T_DOUBLE_ARROW ] );
+                    if ( $prev !== $first ) {
                         // This is not the start of the statement.
-                        if ($this->debug === true) {
-                            $line = $tokens[$prev]['line'];
-                            $type = $tokens[$prev]['type'];
-                            echo "\t* previous is $type on line $line *".PHP_EOL;
+                        if ( $this->debug === true ) {
+                            $line = $tokens[ $prev ][ 'line' ];
+                            $type = $tokens[ $prev ][ 'type' ];
+                            echo "\t* previous is $type on line $line *" . PHP_EOL;
                         }
 
-                        $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $prev, true);
-                        $prev  = $phpcsFile->findStartOfStatement($first, [T_COMMA, T_DOUBLE_ARROW]);
-                        $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $prev, true);
-                        if ($this->debug === true) {
-                            $line = $tokens[$first]['line'];
-                            $type = $tokens[$first]['type'];
-                            echo "\t* amended first token is $first ($type) on line $line *".PHP_EOL;
+                        $first = $phpcsFile->findFirstOnLine( T_WHITESPACE, $prev, true );
+                        $prev  = $phpcsFile->findStartOfStatement( $first, [ T_COMMA, T_DOUBLE_ARROW ] );
+                        $first = $phpcsFile->findFirstOnLine( T_WHITESPACE, $prev, true );
+                        if ( $this->debug === true ) {
+                            $line = $tokens[ $first ][ 'line' ];
+                            $type = $tokens[ $first ][ 'type' ];
+                            echo "\t* amended first token is $first ($type) on line $line *" . PHP_EOL;
                         }
-                    } else if ($tokens[$first]['code'] === T_WHITESPACE) {
-                        $first = $phpcsFile->findNext(T_WHITESPACE, ($first + 1), null, true);
+                    } else if ( $tokens[ $first ][ 'code' ] === T_WHITESPACE ) {
+                        $first = $phpcsFile->findNext( T_WHITESPACE, ( $first + 1 ), null, true );
                     }
 
-                    if (isset($tokens[$first]['scope_closer']) === true
-                        && $tokens[$first]['scope_closer'] === $first
+                    if ( isset( $tokens[ $first ][ 'scope_closer' ] ) === true
+                        && $tokens[ $first ][ 'scope_closer' ] === $first
                     ) {
                         // The first token is a scope closer and would have already
                         // been processed and set the indent level correctly, so
                         // don't adjust it again.
-                        if ($this->debug === true) {
-                            echo "\t* first token is a scope closer; ignoring closing short array bracket *".PHP_EOL;
+                        if ( $this->debug === true ) {
+                            echo "\t* first token is a scope closer; ignoring closing short array bracket *" . PHP_EOL;
                         }
 
-                        if (isset($setIndents[$first]) === true) {
-                            $currentIndent = $setIndents[$first];
-                            if ($this->debug === true) {
-                                echo "\t=> indent reset to $currentIndent".PHP_EOL;
+                        if ( isset( $setIndents[ $first ] ) === true ) {
+                            $currentIndent = $setIndents[ $first ];
+                            if ( $this->debug === true ) {
+                                echo "\t=> indent reset to $currentIndent" . PHP_EOL;
                             }
                         }
                     } else {
                         // Don't force current indent to be divisible because there could be custom
                         // rules in place for arrays.
-                        $currentIndent = ($tokens[$first]['column'] - 1);
-                        if (isset($adjustments[$first]) === true) {
-                            $currentIndent += $adjustments[$first];
+                        $currentIndent = ( $tokens[ $first ][ 'column' ] - 1 );
+                        if ( isset( $adjustments[ $first ] ) === true ) {
+                            $currentIndent += $adjustments[ $first ];
                         }
 
-                        $setIndents[$first] = $currentIndent;
+                        $setIndents[ $first ] = $currentIndent;
 
-                        if ($this->debug === true) {
-                            $type = $tokens[$first]['type'];
-                            echo "\t=> checking indent of $checkIndent; main indent set to $currentIndent by token $first ($type)".PHP_EOL;
+                        if ( $this->debug === true ) {
+                            $type = $tokens[ $first ][ 'type' ];
+                            echo "\t=> checking indent of $checkIndent; main indent set to $currentIndent by token $first ($type)" . PHP_EOL;
                         }
                     }//end if
-                } else if ($this->debug === true) {
-                    echo "\t * ignoring single-line definition *".PHP_EOL;
+                } else if ( $this->debug === true ) {
+                    echo "\t * ignoring single-line definition *" . PHP_EOL;
                 }//end if
             }//end if
 
             // Adjust lines within scopes while auto-fixing.
-            if ($checkToken !== null
+            if ( $checkToken !== null
                 && $exact === false
-                && (empty($tokens[$checkToken]['conditions']) === false
-                || (isset($tokens[$checkToken]['scope_opener']) === true
-                && $tokens[$checkToken]['scope_opener'] === $checkToken))
+                && ( empty( $tokens[ $checkToken ][ 'conditions' ] ) === false
+                || ( isset( $tokens[ $checkToken ][ 'scope_opener' ] ) === true
+                && $tokens[ $checkToken ][ 'scope_opener' ] === $checkToken ) )
             ) {
-                if (empty($tokens[$checkToken]['conditions']) === false) {
-                    $condition = $tokens[$checkToken]['conditions'];
-                    end($condition);
-                    $condition = key($condition);
+                if ( empty( $tokens[ $checkToken ][ 'conditions' ] ) === false ) {
+                    $condition = $tokens[ $checkToken ][ 'conditions' ];
+                    end( $condition );
+                    $condition = key( $condition );
                 } else {
-                    $condition = $tokens[$checkToken]['scope_condition'];
+                    $condition = $tokens[ $checkToken ][ 'scope_condition' ];
                 }
 
-                $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $condition, true);
+                $first = $phpcsFile->findFirstOnLine( T_WHITESPACE, $condition, true );
 
-                if (isset($adjustments[$first]) === true
-                    && (($adjustments[$first] < 0 && $tokenIndent > $currentIndent)
-                    || ($adjustments[$first] > 0 && $tokenIndent < $currentIndent))
+                if ( isset( $adjustments[ $first ] ) === true
+                    && ( ( $adjustments[ $first ] < 0 && $tokenIndent > $currentIndent )
+                    || ( $adjustments[ $first ] > 0 && $tokenIndent < $currentIndent ) )
                 ) {
-                    $length = ($tokenIndent + $adjustments[$first]);
+                    $length = ( $tokenIndent + $adjustments[ $first ] );
 
                     // When fixing, we're going to adjust the indent of this line
                     // here automatically, so use this new padding value when
                     // comparing the expected padding to the actual padding.
-                    if ($phpcsFile->fixer->enabled === true) {
+                    if ( $phpcsFile->fixer->enabled === true ) {
                         $tokenIndent = $length;
-                        $this->adjustIndent($phpcsFile, $checkToken, $length, $adjustments[$first]);
+                        $this->adjustIndent( $phpcsFile, $checkToken, $length, $adjustments[ $first ] );
                     }
 
-                    if ($this->debug === true) {
-                        $line = $tokens[$checkToken]['line'];
-                        $type = $tokens[$checkToken]['type'];
-                        echo "Indent adjusted to $length for $type on line $line".PHP_EOL;
+                    if ( $this->debug === true ) {
+                        $line = $tokens[ $checkToken ][ 'line' ];
+                        $type = $tokens[ $checkToken ][ 'type' ];
+                        echo "Indent adjusted to $length for $type on line $line" . PHP_EOL;
                     }
 
-                    $adjustments[$checkToken] = $adjustments[$first];
+                    $adjustments[ $checkToken ] = $adjustments[ $first ];
 
-                    if ($this->debug === true) {
-                        $line = $tokens[$checkToken]['line'];
-                        $type = $tokens[$checkToken]['type'];
-                        echo "\t=> add adjustment of ".$adjustments[$checkToken]." for token $checkToken ($type) on line $line".PHP_EOL;
+                    if ( $this->debug === true ) {
+                        $line = $tokens[ $checkToken ][ 'line' ];
+                        $type = $tokens[ $checkToken ][ 'type' ];
+                        echo "\t=> add adjustment of " . $adjustments[ $checkToken ] . " for token $checkToken ($type) on line $line" . PHP_EOL;
                     }
                 }//end if
             }//end if
 
             // Scope closers reset the required indent to the same level as the opening condition.
-            if (($checkToken !== null
-                && isset($openScopes[$checkToken]) === true
-                || (isset($tokens[$checkToken]['scope_condition']) === true
-                && isset($tokens[$checkToken]['scope_closer']) === true
-                && $tokens[$checkToken]['scope_closer'] === $checkToken
-                && $tokens[$checkToken]['line'] !== $tokens[$tokens[$checkToken]['scope_opener']]['line']))
-                || ($checkToken === null
-                && isset($openScopes[$i]) === true
-                || (isset($tokens[$i]['scope_condition']) === true
-                && isset($tokens[$i]['scope_closer']) === true
-                && $tokens[$i]['scope_closer'] === $i
-                && $tokens[$i]['line'] !== $tokens[$tokens[$i]['scope_opener']]['line']))
+            if ( ( $checkToken !== null
+                && isset( $openScopes[ $checkToken ] ) === true
+                || ( isset( $tokens[ $checkToken ][ 'scope_condition' ] ) === true
+                && isset( $tokens[ $checkToken ][ 'scope_closer' ] ) === true
+                && $tokens[ $checkToken ][ 'scope_closer' ] === $checkToken
+                && $tokens[ $checkToken ][ 'line' ] !== $tokens[ $tokens[ $checkToken ][ 'scope_opener' ] ][ 'line' ] ) )
+                || ( $checkToken === null
+                && isset( $openScopes[ $i ] ) === true
+                || ( isset( $tokens[ $i ][ 'scope_condition' ] ) === true
+                && isset( $tokens[ $i ][ 'scope_closer' ] ) === true
+                && $tokens[ $i ][ 'scope_closer' ] === $i
+                && $tokens[ $i ][ 'line' ] !== $tokens[ $tokens[ $i ][ 'scope_opener' ] ][ 'line' ] ) )
             ) {
-                if ($this->debug === true) {
-                    if ($checkToken === null) {
-                        $type = $tokens[$tokens[$i]['scope_condition']]['type'];
-                        $line = $tokens[$i]['line'];
+                if ( $this->debug === true ) {
+                    if ( $checkToken === null ) {
+                        $type = $tokens[ $tokens[ $i ][ 'scope_condition' ] ][ 'type' ];
+                        $line = $tokens[ $i ][ 'line' ];
                     } else {
-                        $type = $tokens[$tokens[$checkToken]['scope_condition']]['type'];
-                        $line = $tokens[$checkToken]['line'];
+                        $type = $tokens[ $tokens[ $checkToken ][ 'scope_condition' ] ][ 'type' ];
+                        $line = $tokens[ $checkToken ][ 'line' ];
                     }
 
-                    echo "Close scope ($type) on line $line".PHP_EOL;
+                    echo "Close scope ($type) on line $line" . PHP_EOL;
                 }
 
                 $scopeCloser = $checkToken;
-                if ($scopeCloser === null) {
+                if ( $scopeCloser === null ) {
                     $scopeCloser = $i;
                 }
 
-                $conditionToken = array_pop($openScopes);
-                if ($this->debug === true) {
-                    $line = $tokens[$conditionToken]['line'];
-                    $type = $tokens[$conditionToken]['type'];
-                    echo "\t=> removed open scope $conditionToken ($type) on line $line".PHP_EOL;
+                $conditionToken = array_pop( $openScopes );
+                if ( $this->debug === true ) {
+                    $line = $tokens[ $conditionToken ][ 'line' ];
+                    $type = $tokens[ $conditionToken ][ 'type' ];
+                    echo "\t=> removed open scope $conditionToken ($type) on line $line" . PHP_EOL;
                 }
 
-                if (isset($tokens[$scopeCloser]['scope_condition']) === true) {
-                    $first = $phpcsFile->findFirstOnLine([T_WHITESPACE, T_INLINE_HTML], $tokens[$scopeCloser]['scope_condition'], true);
-                    if ($this->debug === true) {
-                        $line = $tokens[$first]['line'];
-                        $type = $tokens[$first]['type'];
-                        echo "\t* first token is $first ($type) on line $line *".PHP_EOL;
+                if ( isset( $tokens[ $scopeCloser ][ 'scope_condition' ] ) === true ) {
+                    $first = $phpcsFile->findFirstOnLine( [ T_WHITESPACE, T_INLINE_HTML ], $tokens[ $scopeCloser ][ 'scope_condition' ], true );
+                    if ( $this->debug === true ) {
+                        $line = $tokens[ $first ][ 'line' ];
+                        $type = $tokens[ $first ][ 'type' ];
+                        echo "\t* first token is $first ($type) on line $line *" . PHP_EOL;
                     }
 
-                    while ($tokens[$first]['code'] === T_CONSTANT_ENCAPSED_STRING
-                        && $tokens[($first - 1)]['code'] === T_CONSTANT_ENCAPSED_STRING
+                    while ( $tokens[ $first ][ 'code' ] === T_CONSTANT_ENCAPSED_STRING
+                        && $tokens[ ( $first - 1 ) ][ 'code' ] === T_CONSTANT_ENCAPSED_STRING
                     ) {
-                        $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, ($first - 1), true);
-                        if ($this->debug === true) {
-                            $line = $tokens[$first]['line'];
-                            $type = $tokens[$first]['type'];
-                            echo "\t* found multi-line string; amended first token is $first ($type) on line $line *".PHP_EOL;
+                        $first = $phpcsFile->findFirstOnLine( T_WHITESPACE, ( $first - 1 ), true );
+                        if ( $this->debug === true ) {
+                            $line = $tokens[ $first ][ 'line' ];
+                            $type = $tokens[ $first ][ 'type' ];
+                            echo "\t* found multi-line string; amended first token is $first ($type) on line $line *" . PHP_EOL;
                         }
                     }
 
-                    $currentIndent = ($tokens[$first]['column'] - 1);
-                    if (isset($adjustments[$first]) === true) {
-                        $currentIndent += $adjustments[$first];
+                    $currentIndent = ( $tokens[ $first ][ 'column' ] - 1 );
+                    if ( isset( $adjustments[ $first ] ) === true ) {
+                        $currentIndent += $adjustments[ $first ];
                     }
 
-                    $setIndents[$scopeCloser] = $currentIndent;
+                    $setIndents[ $scopeCloser ] = $currentIndent;
 
-                    if ($this->debug === true) {
-                        $type = $tokens[$scopeCloser]['type'];
-                        echo "\t=> indent set to $currentIndent by token $scopeCloser ($type)".PHP_EOL;
+                    if ( $this->debug === true ) {
+                        $type = $tokens[ $scopeCloser ][ 'type' ];
+                        echo "\t=> indent set to $currentIndent by token $scopeCloser ($type)" . PHP_EOL;
                     }
 
                     // We only check the indent of scope closers if they are
                     // curly braces because other constructs tend to have different rules.
-                    if ($tokens[$scopeCloser]['code'] === T_CLOSE_CURLY_BRACKET) {
+                    if ( $tokens[ $scopeCloser ][ 'code' ] === T_CLOSE_CURLY_BRACKET ) {
                         $exact = true;
                     } else {
                         $checkToken = null;
@@ -685,93 +685,93 @@ 
             }//end if
 
             // Handle scope for JS object notation.
-            if ($phpcsFile->tokenizerType === 'JS'
-                && (($checkToken !== null
-                && $tokens[$checkToken]['code'] === T_CLOSE_OBJECT
-                && $tokens[$checkToken]['line'] !== $tokens[$tokens[$checkToken]['bracket_opener']]['line'])
-                || ($checkToken === null
-                && $tokens[$i]['code'] === T_CLOSE_OBJECT
-                && $tokens[$i]['line'] !== $tokens[$tokens[$i]['bracket_opener']]['line']))
+            if ( $phpcsFile->tokenizerType === 'JS'
+                && ( ( $checkToken !== null
+                && $tokens[ $checkToken ][ 'code' ] === T_CLOSE_OBJECT
+                && $tokens[ $checkToken ][ 'line' ] !== $tokens[ $tokens[ $checkToken ][ 'bracket_opener' ] ][ 'line' ] )
+                || ( $checkToken === null
+                && $tokens[ $i ][ 'code' ] === T_CLOSE_OBJECT
+                && $tokens[ $i ][ 'line' ] !== $tokens[ $tokens[ $i ][ 'bracket_opener' ] ][ 'line' ] ) )
             ) {
-                if ($this->debug === true) {
-                    $line = $tokens[$i]['line'];
-                    echo "Close JS object on line $line".PHP_EOL;
+                if ( $this->debug === true ) {
+                    $line = $tokens[ $i ][ 'line' ];
+                    echo "Close JS object on line $line" . PHP_EOL;
                 }
 
                 $scopeCloser = $checkToken;
-                if ($scopeCloser === null) {
+                if ( $scopeCloser === null ) {
                     $scopeCloser = $i;
                 } else {
-                    $conditionToken = array_pop($openScopes);
-                    if ($this->debug === true) {
-                        $line = $tokens[$conditionToken]['line'];
-                        $type = $tokens[$conditionToken]['type'];
-                        echo "\t=> removed open scope $conditionToken ($type) on line $line".PHP_EOL;
+                    $conditionToken = array_pop( $openScopes );
+                    if ( $this->debug === true ) {
+                        $line = $tokens[ $conditionToken ][ 'line' ];
+                        $type = $tokens[ $conditionToken ][ 'type' ];
+                        echo "\t=> removed open scope $conditionToken ($type) on line $line" . PHP_EOL;
                     }
                 }
 
                 $parens = 0;
-                if (isset($tokens[$scopeCloser]['nested_parenthesis']) === true
-                    && empty($tokens[$scopeCloser]['nested_parenthesis']) === false
+                if ( isset( $tokens[ $scopeCloser ][ 'nested_parenthesis' ] ) === true
+                    && empty( $tokens[ $scopeCloser ][ 'nested_parenthesis' ] ) === false
                 ) {
-                    $parens = $tokens[$scopeCloser]['nested_parenthesis'];
-                    end($parens);
-                    $parens = key($parens);
-                    if ($this->debug === true) {
-                        $line = $tokens[$parens]['line'];
-                        echo "\t* token has nested parenthesis $parens on line $line *".PHP_EOL;
+                    $parens = $tokens[ $scopeCloser ][ 'nested_parenthesis' ];
+                    end( $parens );
+                    $parens = key( $parens );
+                    if ( $this->debug === true ) {
+                        $line = $tokens[ $parens ][ 'line' ];
+                        echo "\t* token has nested parenthesis $parens on line $line *" . PHP_EOL;
                     }
                 }
 
                 $condition = 0;
-                if (isset($tokens[$scopeCloser]['conditions']) === true
-                    && empty($tokens[$scopeCloser]['conditions']) === false
+                if ( isset( $tokens[ $scopeCloser ][ 'conditions' ] ) === true
+                    && empty( $tokens[ $scopeCloser ][ 'conditions' ] ) === false
                 ) {
-                    $condition = $tokens[$scopeCloser]['conditions'];
-                    end($condition);
-                    $condition = key($condition);
-                    if ($this->debug === true) {
-                        $line = $tokens[$condition]['line'];
-                        $type = $tokens[$condition]['type'];
-                        echo "\t* token is inside condition $condition ($type) on line $line *".PHP_EOL;
+                    $condition = $tokens[ $scopeCloser ][ 'conditions' ];
+                    end( $condition );
+                    $condition = key( $condition );
+                    if ( $this->debug === true ) {
+                        $line = $tokens[ $condition ][ 'line' ];
+                        $type = $tokens[ $condition ][ 'type' ];
+                        echo "\t* token is inside condition $condition ($type) on line $line *" . PHP_EOL;
                     }
                 }
 
-                if ($parens > $condition) {
-                    if ($this->debug === true) {
-                        echo "\t* using parenthesis *".PHP_EOL;
+                if ( $parens > $condition ) {
+                    if ( $this->debug === true ) {
+                        echo "\t* using parenthesis *" . PHP_EOL;
                     }
 
-                    $first     = $phpcsFile->findFirstOnLine(T_WHITESPACE, $parens, true);
+                    $first     = $phpcsFile->findFirstOnLine( T_WHITESPACE, $parens, true );
                     $condition = 0;
-                } else if ($condition > 0) {
-                    if ($this->debug === true) {
-                        echo "\t* using condition *".PHP_EOL;
+                } else if ( $condition > 0 ) {
+                    if ( $this->debug === true ) {
+                        echo "\t* using condition *" . PHP_EOL;
                     }
 
-                    $first  = $phpcsFile->findFirstOnLine(T_WHITESPACE, $condition, true);
+                    $first  = $phpcsFile->findFirstOnLine( T_WHITESPACE, $condition, true );
                     $parens = 0;
                 } else {
-                    if ($this->debug === true) {
-                        $line = $tokens[$tokens[$scopeCloser]['bracket_opener']]['line'];
-                        echo "\t* token is not in parenthesis or condition; using opener on line $line *".PHP_EOL;
+                    if ( $this->debug === true ) {
+                        $line = $tokens[ $tokens[ $scopeCloser ][ 'bracket_opener' ] ][ 'line' ];
+                        echo "\t* token is not in parenthesis or condition; using opener on line $line *" . PHP_EOL;
                     }
 
-                    $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $tokens[$scopeCloser]['bracket_opener'], true);
+                    $first = $phpcsFile->findFirstOnLine( T_WHITESPACE, $tokens[ $scopeCloser ][ 'bracket_opener' ], true );
                 }//end if
 
-                $currentIndent = ($tokens[$first]['column'] - 1);
-                if (isset($adjustments[$first]) === true) {
-                    $currentIndent += $adjustments[$first];
+                $currentIndent = ( $tokens[ $first ][ 'column' ] - 1 );
+                if ( isset( $adjustments[ $first ] ) === true ) {
+                    $currentIndent += $adjustments[ $first ];
                 }
 
-                if ($parens > 0 || $condition > 0) {
-                    $checkIndent = ($tokens[$first]['column'] - 1);
-                    if (isset($adjustments[$first]) === true) {
-                        $checkIndent += $adjustments[$first];
+                if ( $parens > 0 || $condition > 0 ) {
+                    $checkIndent = ( $tokens[ $first ][ 'column' ] - 1 );
+                    if ( isset( $adjustments[ $first ] ) === true ) {
+                        $checkIndent += $adjustments[ $first ];
                     }
 
-                    if ($condition > 0) {
+                    if ( $condition > 0 ) {
                         $checkIndent   += $this->indent;
                         $currentIndent += $this->indent;
                         $exact          = true;
@@ -781,76 +781,76 @@ 
                 }
 
                 // Make sure it is divisible by our expected indent.
-                $currentIndent      = (int) (ceil($currentIndent / $this->indent) * $this->indent);
-                $checkIndent        = (int) (ceil($checkIndent / $this->indent) * $this->indent);
-                $setIndents[$first] = $currentIndent;
+                $currentIndent      = (int)( ceil( $currentIndent / $this->indent ) * $this->indent );
+                $checkIndent        = (int)( ceil( $checkIndent / $this->indent ) * $this->indent );
+                $setIndents[ $first ] = $currentIndent;
 
-                if ($this->debug === true) {
-                    $type = $tokens[$first]['type'];
-                    echo "\t=> checking indent of $checkIndent; main indent set to $currentIndent by token $first ($type)".PHP_EOL;
+                if ( $this->debug === true ) {
+                    $type = $tokens[ $first ][ 'type' ];
+                    echo "\t=> checking indent of $checkIndent; main indent set to $currentIndent by token $first ($type)" . PHP_EOL;
                 }
             }//end if
 
-            if ($checkToken !== null
-                && isset(Tokens::$scopeOpeners[$tokens[$checkToken]['code']]) === true
-                && in_array($tokens[$checkToken]['code'], $this->nonIndentingScopes, true) === false
-                && isset($tokens[$checkToken]['scope_opener']) === true
+            if ( $checkToken !== null
+                && isset( Tokens::$scopeOpeners[ $tokens[ $checkToken ][ 'code' ] ] ) === true
+                && in_array( $tokens[ $checkToken ][ 'code' ], $this->nonIndentingScopes, true ) === false
+                && isset( $tokens[ $checkToken ][ 'scope_opener' ] ) === true
             ) {
                 $exact = true;
 
                 $lastOpener = null;
-                if (empty($openScopes) === false) {
-                    end($openScopes);
-                    $lastOpener = current($openScopes);
+                if ( empty( $openScopes ) === false ) {
+                    end( $openScopes );
+                    $lastOpener = current( $openScopes );
                 }
 
                 // A scope opener that shares a closer with another token (like multiple
                 // CASEs using the same BREAK) needs to reduce the indent level so its
                 // indent is checked correctly. It will then increase the indent again
                 // (as all openers do) after being checked.
-                if ($lastOpener !== null
-                    && isset($tokens[$lastOpener]['scope_closer']) === true
-                    && $tokens[$lastOpener]['level'] === $tokens[$checkToken]['level']
-                    && $tokens[$lastOpener]['scope_closer'] === $tokens[$checkToken]['scope_closer']
+                if ( $lastOpener !== null
+                    && isset( $tokens[ $lastOpener ][ 'scope_closer' ] ) === true
+                    && $tokens[ $lastOpener ][ 'level' ] === $tokens[ $checkToken ][ 'level' ]
+                    && $tokens[ $lastOpener ][ 'scope_closer' ] === $tokens[ $checkToken ][ 'scope_closer' ]
                 ) {
                     $currentIndent          -= $this->indent;
-                    $setIndents[$lastOpener] = $currentIndent;
-                    if ($this->debug === true) {
-                        $line = $tokens[$i]['line'];
-                        $type = $tokens[$lastOpener]['type'];
-                        echo "Shared closer found on line $line".PHP_EOL;
-                        echo "\t=> indent set to $currentIndent by token $lastOpener ($type)".PHP_EOL;
+                    $setIndents[ $lastOpener ] = $currentIndent;
+                    if ( $this->debug === true ) {
+                        $line = $tokens[ $i ][ 'line' ];
+                        $type = $tokens[ $lastOpener ][ 'type' ];
+                        echo "Shared closer found on line $line" . PHP_EOL;
+                        echo "\t=> indent set to $currentIndent by token $lastOpener ($type)" . PHP_EOL;
                     }
                 }
 
-                if ($tokens[$checkToken]['code'] === T_CLOSURE
+                if ( $tokens[ $checkToken ][ 'code' ] === T_CLOSURE
                     && $tokenIndent > $currentIndent
                 ) {
                     // The opener is indented more than needed, which is fine.
                     // But just check that it is divisible by our expected indent.
-                    $checkIndent = (int) (ceil($tokenIndent / $this->indent) * $this->indent);
+                    $checkIndent = (int)( ceil( $tokenIndent / $this->indent ) * $this->indent );
                     $exact       = false;
 
-                    if ($this->debug === true) {
-                        $line = $tokens[$i]['line'];
-                        echo "Closure found on line $line".PHP_EOL;
-                        echo "\t=> checking indent of $checkIndent; main indent remains at $currentIndent".PHP_EOL;
+                    if ( $this->debug === true ) {
+                        $line = $tokens[ $i ][ 'line' ];
+                        echo "Closure found on line $line" . PHP_EOL;
+                        echo "\t=> checking indent of $checkIndent; main indent remains at $currentIndent" . PHP_EOL;
                     }
                 }
             }//end if
 
             // Method prefix indentation has to be exact or else it will break
             // the rest of the function declaration, and potentially future ones.
-            if ($checkToken !== null
-                && isset(Tokens::$methodPrefixes[$tokens[$checkToken]['code']]) === true
-                && $tokens[($checkToken + 1)]['code'] !== T_DOUBLE_COLON
+            if ( $checkToken !== null
+                && isset( Tokens::$methodPrefixes[ $tokens[ $checkToken ][ 'code' ] ] ) === true
+                && $tokens[ ( $checkToken + 1 ) ][ 'code' ] !== T_DOUBLE_COLON
             ) {
-                $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($checkToken + 1), null, true);
-                if ($next === false || $tokens[$next]['code'] !== T_CLOSURE) {
-                    if ($this->debug === true) {
-                        $line = $tokens[$checkToken]['line'];
-                        $type = $tokens[$checkToken]['type'];
-                        echo "\t* method prefix ($type) found on line $line; indent set to exact *".PHP_EOL;
+                $next = $phpcsFile->findNext( Tokens::$emptyTokens, ( $checkToken + 1 ), null, true );
+                if ( $next === false || $tokens[ $next ][ 'code' ] !== T_CLOSURE ) {
+                    if ( $this->debug === true ) {
+                        $line = $tokens[ $checkToken ][ 'line' ];
+                        $type = $tokens[ $checkToken ][ 'type' ];
+                        echo "\t* method prefix ($type) found on line $line; indent set to exact *" . PHP_EOL;
                     }
 
                     $exact = true;
@@ -859,7 +859,7 @@ 
 
             // JS property indentation has to be exact or else if will break
             // things like function and object indentation.
-            if ($checkToken !== null && $tokens[$checkToken]['code'] === T_PROPERTY) {
+            if ( $checkToken !== null && $tokens[ $checkToken ][ 'code' ] === T_PROPERTY ) {
                 $exact = true;
             }
 
@@ -867,50 +867,50 @@ 
             // so they don't cause problems with indent checks for the code
             // within them, but they don't need to line up with the current indent
             // in most cases.
-            if ($checkToken !== null
-                && ($tokens[$checkToken]['code'] === T_OPEN_TAG
-                || $tokens[$checkToken]['code'] === T_OPEN_TAG_WITH_ECHO)
+            if ( $checkToken !== null
+                && ( $tokens[ $checkToken ][ 'code' ] === T_OPEN_TAG
+                || $tokens[ $checkToken ][ 'code' ] === T_OPEN_TAG_WITH_ECHO )
             ) {
-                $checkIndent = ($tokens[$checkToken]['column'] - 1);
+                $checkIndent = ( $tokens[ $checkToken ][ 'column' ] - 1 );
 
                 // If we are re-opening a block that was closed in the same
                 // scope as us, then reset the indent back to what the scope opener
                 // set instead of using whatever indent this open tag has set.
-                if (empty($tokens[$checkToken]['conditions']) === false) {
-                    $close = $phpcsFile->findPrevious(T_CLOSE_TAG, ($checkToken - 1));
-                    if ($close !== false
-                        && $tokens[$checkToken]['conditions'] === $tokens[$close]['conditions']
+                if ( empty( $tokens[ $checkToken ][ 'conditions' ] ) === false ) {
+                    $close = $phpcsFile->findPrevious( T_CLOSE_TAG, ( $checkToken - 1 ) );
+                    if ( $close !== false
+                        && $tokens[ $checkToken ][ 'conditions' ] === $tokens[ $close ][ 'conditions' ]
                     ) {
-                        $conditions    = array_keys($tokens[$checkToken]['conditions']);
-                        $lastCondition = array_pop($conditions);
-                        $lastOpener    = $tokens[$lastCondition]['scope_opener'];
-                        $lastCloser    = $tokens[$lastCondition]['scope_closer'];
-                        if ($tokens[$lastCloser]['line'] !== $tokens[$checkToken]['line']
-                            && isset($setIndents[$lastOpener]) === true
+                        $conditions    = array_keys( $tokens[ $checkToken ][ 'conditions' ] );
+                        $lastCondition = array_pop( $conditions );
+                        $lastOpener    = $tokens[ $lastCondition ][ 'scope_opener' ];
+                        $lastCloser    = $tokens[ $lastCondition ][ 'scope_closer' ];
+                        if ( $tokens[ $lastCloser ][ 'line' ] !== $tokens[ $checkToken ][ 'line' ]
+                            && isset( $setIndents[ $lastOpener ] ) === true
                         ) {
-                            $checkIndent = $setIndents[$lastOpener];
+                            $checkIndent = $setIndents[ $lastOpener ];
                         }
                     }
                 }
 
-                $checkIndent = (int) (ceil($checkIndent / $this->indent) * $this->indent);
+                $checkIndent = (int)( ceil( $checkIndent / $this->indent ) * $this->indent );
             }//end if
 
             // Close tags needs to be indented to exact column positions.
-            if ($checkToken !== null && $tokens[$checkToken]['code'] === T_CLOSE_TAG) {
+            if ( $checkToken !== null && $tokens[ $checkToken ][ 'code' ] === T_CLOSE_TAG ) {
                 $exact       = true;
                 $checkIndent = $currentIndent;
-                $checkIndent = (int) (ceil($checkIndent / $this->indent) * $this->indent);
+                $checkIndent = (int)( ceil( $checkIndent / $this->indent ) * $this->indent );
             }
 
             // Special case for ELSE statements that are not on the same
             // line as the previous IF statements closing brace. They still need
             // to have the same indent or it will break code after the block.
-            if ($checkToken !== null && $tokens[$checkToken]['code'] === T_ELSE) {
+            if ( $checkToken !== null && $tokens[ $checkToken ][ 'code' ] === T_ELSE ) {
                 $exact = true;
             }
 
-            if ($checkIndent === null) {
+            if ( $checkIndent === null ) {
                 $checkIndent = $currentIndent;
             }
 
@@ -924,23 +924,23 @@ 
                 the checking of future lines
             */
 
-            if ($checkToken !== null
-                && isset($this->ignoreIndentation[$tokens[$checkToken]['code']]) === false
-                && (($tokenIndent !== $checkIndent && $exact === true)
-                || ($tokenIndent < $checkIndent && $exact === false))
+            if ( $checkToken !== null
+                && isset( $this->ignoreIndentation[ $tokens[ $checkToken ][ 'code' ] ] ) === false
+                && ( ( $tokenIndent !== $checkIndent && $exact === true )
+                || ( $tokenIndent < $checkIndent && $exact === false ) )
             ) {
                 $type  = 'IncorrectExact';
                 $error = 'Line indented incorrectly; expected ';
-                if ($exact === false) {
+                if ( $exact === false ) {
                     $error .= 'at least ';
                     $type   = 'Incorrect';
                 }
 
-                if ($this->tabIndent === true) {
+                if ( $this->tabIndent === true ) {
                     $error .= '%s tabs, found %s';
                     $data   = [
-                        floor($checkIndent / $this->tabWidth),
-                        floor($tokenIndent / $this->tabWidth),
+                        floor( $checkIndent / $this->tabWidth ),
+                        floor( $tokenIndent / $this->tabWidth ),
                     ];
                 } else {
                     $error .= '%s spaces, found %s';
@@ -950,89 +950,89 @@ 
                     ];
                 }
 
-                if ($this->debug === true) {
-                    $line    = $tokens[$checkToken]['line'];
-                    $message = vsprintf($error, $data);
-                    echo "[Line $line] $message".PHP_EOL;
+                if ( $this->debug === true ) {
+                    $line    = $tokens[ $checkToken ][ 'line' ];
+                    $message = vsprintf( $error, $data );
+                    echo "[Line $line] $message" . PHP_EOL;
                 }
 
                 // Assume the change would be applied and continue
                 // checking indents under this assumption. This gives more
                 // technically accurate error messages.
-                $adjustments[$checkToken] = ($checkIndent - $tokenIndent);
+                $adjustments[ $checkToken ] = ( $checkIndent - $tokenIndent );
 
-                $fix = $phpcsFile->addFixableError($error, $checkToken, $type, $data);
-                if ($fix === true || $this->debug === true) {
-                    $accepted = $this->adjustIndent($phpcsFile, $checkToken, $checkIndent, ($checkIndent - $tokenIndent));
+                $fix = $phpcsFile->addFixableError( $error, $checkToken, $type, $data );
+                if ( $fix === true || $this->debug === true ) {
+                    $accepted = $this->adjustIndent( $phpcsFile, $checkToken, $checkIndent, ( $checkIndent - $tokenIndent ) );
 
-                    if ($accepted === true && $this->debug === true) {
-                        $line = $tokens[$checkToken]['line'];
-                        $type = $tokens[$checkToken]['type'];
-                        echo "\t=> add adjustment of ".$adjustments[$checkToken]." for token $checkToken ($type) on line $line".PHP_EOL;
+                    if ( $accepted === true && $this->debug === true ) {
+                        $line = $tokens[ $checkToken ][ 'line' ];
+                        $type = $tokens[ $checkToken ][ 'type' ];
+                        echo "\t=> add adjustment of " . $adjustments[ $checkToken ] . " for token $checkToken ($type) on line $line" . PHP_EOL;
                     }
                 }
             }//end if
 
-            if ($checkToken !== null) {
+            if ( $checkToken !== null ) {
                 $i = $checkToken;
             }
 
             // Completely skip here/now docs as the indent is a part of the
             // content itself.
-            if ($tokens[$i]['code'] === T_START_HEREDOC
-                || $tokens[$i]['code'] === T_START_NOWDOC
+            if ( $tokens[ $i ][ 'code' ] === T_START_HEREDOC
+                || $tokens[ $i ][ 'code' ] === T_START_NOWDOC
             ) {
-                $i = $phpcsFile->findNext([T_END_HEREDOC, T_END_NOWDOC], ($i + 1));
-                $i = $phpcsFile->findNext(Tokens::$emptyTokens, ($i + 1), null, true);
+                $i = $phpcsFile->findNext( [ T_END_HEREDOC, T_END_NOWDOC ], ( $i + 1 ) );
+                $i = $phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), null, true );
                 continue;
             }
 
             // Completely skip multi-line strings as the indent is a part of the
             // content itself.
-            if ($tokens[$i]['code'] === T_CONSTANT_ENCAPSED_STRING
-                || $tokens[$i]['code'] === T_DOUBLE_QUOTED_STRING
+            if ( $tokens[ $i ][ 'code' ] === T_CONSTANT_ENCAPSED_STRING
+                || $tokens[ $i ][ 'code' ] === T_DOUBLE_QUOTED_STRING
             ) {
-                $i = $phpcsFile->findNext($tokens[$i]['code'], ($i + 1), null, true);
+                $i = $phpcsFile->findNext( $tokens[ $i ][ 'code' ], ( $i + 1 ), null, true );
                 $i--;
                 continue;
             }
 
             // Completely skip doc comments as they tend to have complex
             // indentation rules.
-            if ($tokens[$i]['code'] === T_DOC_COMMENT_OPEN_TAG) {
-                $i = $tokens[$i]['comment_closer'];
+            if ( $tokens[ $i ][ 'code' ] === T_DOC_COMMENT_OPEN_TAG ) {
+                $i = $tokens[ $i ][ 'comment_closer' ];
                 continue;
             }
 
             // Open tags reset the indent level.
-            if ($tokens[$i]['code'] === T_OPEN_TAG
-                || $tokens[$i]['code'] === T_OPEN_TAG_WITH_ECHO
+            if ( $tokens[ $i ][ 'code' ] === T_OPEN_TAG
+                || $tokens[ $i ][ 'code' ] === T_OPEN_TAG_WITH_ECHO
             ) {
-                if ($this->debug === true) {
-                    $line = $tokens[$i]['line'];
-                    echo "Open PHP tag found on line $line".PHP_EOL;
+                if ( $this->debug === true ) {
+                    $line = $tokens[ $i ][ 'line' ];
+                    echo "Open PHP tag found on line $line" . PHP_EOL;
                 }
 
-                if ($checkToken === null) {
-                    $first         = $phpcsFile->findFirstOnLine(T_WHITESPACE, $i, true);
-                    $currentIndent = (strlen($tokens[$first]['content']) - strlen(ltrim($tokens[$first]['content'])));
+                if ( $checkToken === null ) {
+                    $first         = $phpcsFile->findFirstOnLine( T_WHITESPACE, $i, true );
+                    $currentIndent = ( strlen( $tokens[ $first ][ 'content' ] ) - strlen( ltrim( $tokens[ $first ][ 'content' ] ) ) );
                 } else {
-                    $currentIndent = ($tokens[$i]['column'] - 1);
+                    $currentIndent = ( $tokens[ $i ][ 'column' ] - 1 );
                 }
 
                 $lastOpenTag = $i;
 
-                if (isset($adjustments[$i]) === true) {
-                    $currentIndent += $adjustments[$i];
+                if ( isset( $adjustments[ $i ] ) === true ) {
+                    $currentIndent += $adjustments[ $i ];
                 }
 
                 // Make sure it is divisible by our expected indent.
-                $currentIndent  = (int) (ceil($currentIndent / $this->indent) * $this->indent);
-                $setIndents[$i] = $currentIndent;
+                $currentIndent  = (int)( ceil( $currentIndent / $this->indent ) * $this->indent );
+                $setIndents[ $i ] = $currentIndent;
 
-                if ($this->debug === true) {
-                    $type = $tokens[$i]['type'];
-                    echo "\t=> indent set to $currentIndent by token $i ($type)".PHP_EOL;
+                if ( $this->debug === true ) {
+                    $type = $tokens[ $i ][ 'type' ];
+                    echo "\t=> indent set to $currentIndent by token $i ($type)" . PHP_EOL;
                 }
 
                 continue;
@@ -1040,149 +1040,149 @@ 
 
             // Close tags reset the indent level, unless they are closing a tag
             // opened on the same line.
-            if ($tokens[$i]['code'] === T_CLOSE_TAG) {
-                if ($this->debug === true) {
-                    $line = $tokens[$i]['line'];
-                    echo "Close PHP tag found on line $line".PHP_EOL;
+            if ( $tokens[ $i ][ 'code' ] === T_CLOSE_TAG ) {
+                if ( $this->debug === true ) {
+                    $line = $tokens[ $i ][ 'line' ];
+                    echo "Close PHP tag found on line $line" . PHP_EOL;
                 }
 
-                if ($tokens[$lastOpenTag]['line'] !== $tokens[$i]['line']) {
-                    $currentIndent = ($tokens[$i]['column'] - 1);
+                if ( $tokens[ $lastOpenTag ][ 'line' ] !== $tokens[ $i ][ 'line' ] ) {
+                    $currentIndent = ( $tokens[ $i ][ 'column' ] - 1 );
                     $lastCloseTag  = $i;
                 } else {
-                    if ($lastCloseTag === null) {
+                    if ( $lastCloseTag === null ) {
                         $currentIndent = 0;
                     } else {
-                        $currentIndent = ($tokens[$lastCloseTag]['column'] - 1);
+                        $currentIndent = ( $tokens[ $lastCloseTag ][ 'column' ] - 1 );
                     }
                 }
 
-                if (isset($adjustments[$i]) === true) {
-                    $currentIndent += $adjustments[$i];
+                if ( isset( $adjustments[ $i ] ) === true ) {
+                    $currentIndent += $adjustments[ $i ];
                 }
 
                 // Make sure it is divisible by our expected indent.
-                $currentIndent  = (int) (ceil($currentIndent / $this->indent) * $this->indent);
-                $setIndents[$i] = $currentIndent;
+                $currentIndent  = (int)( ceil( $currentIndent / $this->indent ) * $this->indent );
+                $setIndents[ $i ] = $currentIndent;
 
-                if ($this->debug === true) {
-                    $type = $tokens[$i]['type'];
-                    echo "\t=> indent set to $currentIndent by token $i ($type)".PHP_EOL;
+                if ( $this->debug === true ) {
+                    $type = $tokens[ $i ][ 'type' ];
+                    echo "\t=> indent set to $currentIndent by token $i ($type)" . PHP_EOL;
                 }
 
                 continue;
             }//end if
 
             // Anon classes and functions set the indent based on their own indent level.
-            if ($tokens[$i]['code'] === T_CLOSURE || $tokens[$i]['code'] === T_ANON_CLASS) {
-                $closer = $tokens[$i]['scope_closer'];
-                if ($tokens[$i]['line'] === $tokens[$closer]['line']) {
-                    if ($this->debug === true) {
-                        $type = str_replace('_', ' ', strtolower(substr($tokens[$i]['type'], 2)));
-                        $line = $tokens[$i]['line'];
-                        echo "* ignoring single-line $type on line $line".PHP_EOL;
+            if ( $tokens[ $i ][ 'code' ] === T_CLOSURE || $tokens[ $i ][ 'code' ] === T_ANON_CLASS ) {
+                $closer = $tokens[ $i ][ 'scope_closer' ];
+                if ( $tokens[ $i ][ 'line' ] === $tokens[ $closer ][ 'line' ] ) {
+                    if ( $this->debug === true ) {
+                        $type = str_replace( '_', ' ', strtolower( substr( $tokens[ $i ][ 'type' ], 2 ) ) );
+                        $line = $tokens[ $i ][ 'line' ];
+                        echo "* ignoring single-line $type on line $line" . PHP_EOL;
                     }
 
                     $i = $closer;
                     continue;
                 }
 
-                if ($this->debug === true) {
-                    $type = str_replace('_', ' ', strtolower(substr($tokens[$i]['type'], 2)));
-                    $line = $tokens[$i]['line'];
-                    echo "Open $type on line $line".PHP_EOL;
+                if ( $this->debug === true ) {
+                    $type = str_replace( '_', ' ', strtolower( substr( $tokens[ $i ][ 'type' ], 2 ) ) );
+                    $line = $tokens[ $i ][ 'line' ];
+                    echo "Open $type on line $line" . PHP_EOL;
                 }
 
-                $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $i, true);
-                if ($this->debug === true) {
-                    $line = $tokens[$first]['line'];
-                    $type = $tokens[$first]['type'];
-                    echo "\t* first token is $first ($type) on line $line *".PHP_EOL;
+                $first = $phpcsFile->findFirstOnLine( T_WHITESPACE, $i, true );
+                if ( $this->debug === true ) {
+                    $line = $tokens[ $first ][ 'line' ];
+                    $type = $tokens[ $first ][ 'type' ];
+                    echo "\t* first token is $first ($type) on line $line *" . PHP_EOL;
                 }
 
-                while ($tokens[$first]['code'] === T_CONSTANT_ENCAPSED_STRING
-                    && $tokens[($first - 1)]['code'] === T_CONSTANT_ENCAPSED_STRING
+                while ( $tokens[ $first ][ 'code' ] === T_CONSTANT_ENCAPSED_STRING
+                    && $tokens[ ( $first - 1 ) ][ 'code' ] === T_CONSTANT_ENCAPSED_STRING
                 ) {
-                    $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, ($first - 1), true);
-                    if ($this->debug === true) {
-                        $line = $tokens[$first]['line'];
-                        $type = $tokens[$first]['type'];
-                        echo "\t* found multi-line string; amended first token is $first ($type) on line $line *".PHP_EOL;
+                    $first = $phpcsFile->findFirstOnLine( T_WHITESPACE, ( $first - 1 ), true );
+                    if ( $this->debug === true ) {
+                        $line = $tokens[ $first ][ 'line' ];
+                        $type = $tokens[ $first ][ 'type' ];
+                        echo "\t* found multi-line string; amended first token is $first ($type) on line $line *" . PHP_EOL;
                     }
                 }
 
-                $currentIndent = (($tokens[$first]['column'] - 1) + $this->indent);
-                $openScopes[$tokens[$i]['scope_closer']] = $tokens[$i]['scope_condition'];
-                if ($this->debug === true) {
-                    $closerToken    = $tokens[$i]['scope_closer'];
-                    $closerLine     = $tokens[$closerToken]['line'];
-                    $closerType     = $tokens[$closerToken]['type'];
-                    $conditionToken = $tokens[$i]['scope_condition'];
-                    $conditionLine  = $tokens[$conditionToken]['line'];
-                    $conditionType  = $tokens[$conditionToken]['type'];
-                    echo "\t=> added open scope $closerToken ($closerType) on line $closerLine, pointing to condition $conditionToken ($conditionType) on line $conditionLine".PHP_EOL;
+                $currentIndent = ( ( $tokens[ $first ][ 'column' ] - 1 ) + $this->indent );
+                $openScopes[ $tokens[ $i ][ 'scope_closer' ] ] = $tokens[ $i ][ 'scope_condition' ];
+                if ( $this->debug === true ) {
+                    $closerToken    = $tokens[ $i ][ 'scope_closer' ];
+                    $closerLine     = $tokens[ $closerToken ][ 'line' ];
+                    $closerType     = $tokens[ $closerToken ][ 'type' ];
+                    $conditionToken = $tokens[ $i ][ 'scope_condition' ];
+                    $conditionLine  = $tokens[ $conditionToken ][ 'line' ];
+                    $conditionType  = $tokens[ $conditionToken ][ 'type' ];
+                    echo "\t=> added open scope $closerToken ($closerType) on line $closerLine, pointing to condition $conditionToken ($conditionType) on line $conditionLine" . PHP_EOL;
                 }
 
-                if (isset($adjustments[$first]) === true) {
-                    $currentIndent += $adjustments[$first];
+                if ( isset( $adjustments[ $first ] ) === true ) {
+                    $currentIndent += $adjustments[ $first ];
                 }
 
                 // Make sure it is divisible by our expected indent.
-                $currentIndent = (int) (floor($currentIndent / $this->indent) * $this->indent);
-                $i = $tokens[$i]['scope_opener'];
-                $setIndents[$i] = $currentIndent;
+                $currentIndent = (int)( floor( $currentIndent / $this->indent ) * $this->indent );
+                $i = $tokens[ $i ][ 'scope_opener' ];
+                $setIndents[ $i ] = $currentIndent;
 
-                if ($this->debug === true) {
-                    $type = $tokens[$i]['type'];
-                    echo "\t=> indent set to $currentIndent by token $i ($type)".PHP_EOL;
+                if ( $this->debug === true ) {
+                    $type = $tokens[ $i ][ 'type' ];
+                    echo "\t=> indent set to $currentIndent by token $i ($type)" . PHP_EOL;
                 }
 
                 continue;
             }//end if
 
             // Scope openers increase the indent level.
-            if (isset($tokens[$i]['scope_condition']) === true
-                && isset($tokens[$i]['scope_opener']) === true
-                && $tokens[$i]['scope_opener'] === $i
+            if ( isset( $tokens[ $i ][ 'scope_condition' ] ) === true
+                && isset( $tokens[ $i ][ 'scope_opener' ] ) === true
+                && $tokens[ $i ][ 'scope_opener' ] === $i
             ) {
-                $closer = $tokens[$i]['scope_closer'];
-                if ($tokens[$i]['line'] === $tokens[$closer]['line']) {
-                    if ($this->debug === true) {
-                        $line = $tokens[$i]['line'];
-                        $type = $tokens[$i]['type'];
-                        echo "* ignoring single-line $type on line $line".PHP_EOL;
+                $closer = $tokens[ $i ][ 'scope_closer' ];
+                if ( $tokens[ $i ][ 'line' ] === $tokens[ $closer ][ 'line' ] ) {
+                    if ( $this->debug === true ) {
+                        $line = $tokens[ $i ][ 'line' ];
+                        $type = $tokens[ $i ][ 'type' ];
+                        echo "* ignoring single-line $type on line $line" . PHP_EOL;
                     }
 
                     $i = $closer;
                     continue;
                 }
 
-                $condition = $tokens[$tokens[$i]['scope_condition']]['code'];
-                if (isset(Tokens::$scopeOpeners[$condition]) === true
-                    && in_array($condition, $this->nonIndentingScopes, true) === false
+                $condition = $tokens[ $tokens[ $i ][ 'scope_condition' ] ][ 'code' ];
+                if ( isset( Tokens::$scopeOpeners[ $condition ] ) === true
+                    && in_array( $condition, $this->nonIndentingScopes, true ) === false
                 ) {
-                    if ($this->debug === true) {
-                        $line = $tokens[$i]['line'];
-                        $type = $tokens[$tokens[$i]['scope_condition']]['type'];
-                        echo "Open scope ($type) on line $line".PHP_EOL;
+                    if ( $this->debug === true ) {
+                        $line = $tokens[ $i ][ 'line' ];
+                        $type = $tokens[ $tokens[ $i ][ 'scope_condition' ] ][ 'type' ];
+                        echo "Open scope ($type) on line $line" . PHP_EOL;
                     }
 
                     $currentIndent += $this->indent;
-                    $setIndents[$i] = $currentIndent;
-                    $openScopes[$tokens[$i]['scope_closer']] = $tokens[$i]['scope_condition'];
-                    if ($this->debug === true) {
-                        $closerToken    = $tokens[$i]['scope_closer'];
-                        $closerLine     = $tokens[$closerToken]['line'];
-                        $closerType     = $tokens[$closerToken]['type'];
-                        $conditionToken = $tokens[$i]['scope_condition'];
-                        $conditionLine  = $tokens[$conditionToken]['line'];
-                        $conditionType  = $tokens[$conditionToken]['type'];
-                        echo "\t=> added open scope $closerToken ($closerType) on line $closerLine, pointing to condition $conditionToken ($conditionType) on line $conditionLine".PHP_EOL;
+                    $setIndents[ $i ] = $currentIndent;
+                    $openScopes[ $tokens[ $i ][ 'scope_closer' ] ] = $tokens[ $i ][ 'scope_condition' ];
+                    if ( $this->debug === true ) {
+                        $closerToken    = $tokens[ $i ][ 'scope_closer' ];
+                        $closerLine     = $tokens[ $closerToken ][ 'line' ];
+                        $closerType     = $tokens[ $closerToken ][ 'type' ];
+                        $conditionToken = $tokens[ $i ][ 'scope_condition' ];
+                        $conditionLine  = $tokens[ $conditionToken ][ 'line' ];
+                        $conditionType  = $tokens[ $conditionToken ][ 'type' ];
+                        echo "\t=> added open scope $closerToken ($closerType) on line $closerLine, pointing to condition $conditionToken ($conditionType) on line $conditionLine" . PHP_EOL;
                     }
 
-                    if ($this->debug === true) {
-                        $type = $tokens[$i]['type'];
-                        echo "\t=> indent set to $currentIndent by token $i ($type)".PHP_EOL;
+                    if ( $this->debug === true ) {
+                        $type = $tokens[ $i ][ 'type' ];
+                        echo "\t=> indent set to $currentIndent by token $i ($type)" . PHP_EOL;
                     }
 
                     continue;
@@ -1190,120 +1190,120 @@ 
             }//end if
 
             // JS objects set the indent level.
-            if ($phpcsFile->tokenizerType === 'JS'
-                && $tokens[$i]['code'] === T_OBJECT
+            if ( $phpcsFile->tokenizerType === 'JS'
+                && $tokens[ $i ][ 'code' ] === T_OBJECT
             ) {
-                $closer = $tokens[$i]['bracket_closer'];
-                if ($tokens[$i]['line'] === $tokens[$closer]['line']) {
-                    if ($this->debug === true) {
-                        $line = $tokens[$i]['line'];
-                        echo "* ignoring single-line JS object on line $line".PHP_EOL;
+                $closer = $tokens[ $i ][ 'bracket_closer' ];
+                if ( $tokens[ $i ][ 'line' ] === $tokens[ $closer ][ 'line' ] ) {
+                    if ( $this->debug === true ) {
+                        $line = $tokens[ $i ][ 'line' ];
+                        echo "* ignoring single-line JS object on line $line" . PHP_EOL;
                     }
 
                     $i = $closer;
                     continue;
                 }
 
-                if ($this->debug === true) {
-                    $line = $tokens[$i]['line'];
-                    echo "Open JS object on line $line".PHP_EOL;
+                if ( $this->debug === true ) {
+                    $line = $tokens[ $i ][ 'line' ];
+                    echo "Open JS object on line $line" . PHP_EOL;
                 }
 
-                $first         = $phpcsFile->findFirstOnLine(T_WHITESPACE, $i, true);
-                $currentIndent = (($tokens[$first]['column'] - 1) + $this->indent);
-                if (isset($adjustments[$first]) === true) {
-                    $currentIndent += $adjustments[$first];
+                $first         = $phpcsFile->findFirstOnLine( T_WHITESPACE, $i, true );
+                $currentIndent = ( ( $tokens[ $first ][ 'column' ] - 1 ) + $this->indent );
+                if ( isset( $adjustments[ $first ] ) === true ) {
+                    $currentIndent += $adjustments[ $first ];
                 }
 
                 // Make sure it is divisible by our expected indent.
-                $currentIndent      = (int) (ceil($currentIndent / $this->indent) * $this->indent);
-                $setIndents[$first] = $currentIndent;
+                $currentIndent      = (int)( ceil( $currentIndent / $this->indent ) * $this->indent );
+                $setIndents[ $first ] = $currentIndent;
 
-                if ($this->debug === true) {
-                    $type = $tokens[$first]['type'];
-                    echo "\t=> indent set to $currentIndent by token $first ($type)".PHP_EOL;
+                if ( $this->debug === true ) {
+                    $type = $tokens[ $first ][ 'type' ];
+                    echo "\t=> indent set to $currentIndent by token $first ($type)" . PHP_EOL;
                 }
 
                 continue;
             }//end if
 
             // Closing an anon class or function.
-            if (isset($tokens[$i]['scope_condition']) === true
-                && $tokens[$i]['scope_closer'] === $i
-                && ($tokens[$tokens[$i]['scope_condition']]['code'] === T_CLOSURE
-                || $tokens[$tokens[$i]['scope_condition']]['code'] === T_ANON_CLASS)
+            if ( isset( $tokens[ $i ][ 'scope_condition' ] ) === true
+                && $tokens[ $i ][ 'scope_closer' ] === $i
+                && ( $tokens[ $tokens[ $i ][ 'scope_condition' ] ][ 'code' ] === T_CLOSURE
+                || $tokens[ $tokens[ $i ][ 'scope_condition' ] ][ 'code' ] === T_ANON_CLASS )
             ) {
-                if ($this->debug === true) {
-                    $type = str_replace('_', ' ', strtolower(substr($tokens[$tokens[$i]['scope_condition']]['type'], 2)));
-                    $line = $tokens[$i]['line'];
-                    echo "Close $type on line $line".PHP_EOL;
+                if ( $this->debug === true ) {
+                    $type = str_replace( '_', ' ', strtolower( substr( $tokens[ $tokens[ $i ][ 'scope_condition' ] ][ 'type' ], 2 ) ) );
+                    $line = $tokens[ $i ][ 'line' ];
+                    echo "Close $type on line $line" . PHP_EOL;
                 }
 
                 $prev = false;
 
                 $object = 0;
-                if ($phpcsFile->tokenizerType === 'JS') {
-                    $conditions = $tokens[$i]['conditions'];
-                    krsort($conditions, SORT_NUMERIC);
-                    foreach ($conditions as $token => $condition) {
-                        if ($condition === T_OBJECT) {
+                if ( $phpcsFile->tokenizerType === 'JS' ) {
+                    $conditions = $tokens[ $i ][ 'conditions' ];
+                    krsort( $conditions, SORT_NUMERIC );
+                    foreach ( $conditions as $token => $condition ) {
+                        if ( $condition === T_OBJECT ) {
                             $object = $token;
                             break;
                         }
                     }
 
-                    if ($this->debug === true && $object !== 0) {
-                        $line = $tokens[$object]['line'];
-                        echo "\t* token is inside JS object $object on line $line *".PHP_EOL;
+                    if ( $this->debug === true && $object !== 0 ) {
+                        $line = $tokens[ $object ][ 'line' ];
+                        echo "\t* token is inside JS object $object on line $line *" . PHP_EOL;
                     }
                 }
 
                 $parens = 0;
-                if (isset($tokens[$i]['nested_parenthesis']) === true
-                    && empty($tokens[$i]['nested_parenthesis']) === false
+                if ( isset( $tokens[ $i ][ 'nested_parenthesis' ] ) === true
+                    && empty( $tokens[ $i ][ 'nested_parenthesis' ] ) === false
                 ) {
-                    $parens = $tokens[$i]['nested_parenthesis'];
-                    end($parens);
-                    $parens = key($parens);
-                    if ($this->debug === true) {
-                        $line = $tokens[$parens]['line'];
-                        echo "\t* token has nested parenthesis $parens on line $line *".PHP_EOL;
+                    $parens = $tokens[ $i ][ 'nested_parenthesis' ];
+                    end( $parens );
+                    $parens = key( $parens );
+                    if ( $this->debug === true ) {
+                        $line = $tokens[ $parens ][ 'line' ];
+                        echo "\t* token has nested parenthesis $parens on line $line *" . PHP_EOL;
                     }
                 }
 
                 $condition = 0;
-                if (isset($tokens[$i]['conditions']) === true
-                    && empty($tokens[$i]['conditions']) === false
+                if ( isset( $tokens[ $i ][ 'conditions' ] ) === true
+                    && empty( $tokens[ $i ][ 'conditions' ] ) === false
                 ) {
-                    $condition = $tokens[$i]['conditions'];
-                    end($condition);
-                    $condition = key($condition);
-                    if ($this->debug === true) {
-                        $line = $tokens[$condition]['line'];
-                        $type = $tokens[$condition]['type'];
-                        echo "\t* token is inside condition $condition ($type) on line $line *".PHP_EOL;
+                    $condition = $tokens[ $i ][ 'conditions' ];
+                    end( $condition );
+                    $condition = key( $condition );
+                    if ( $this->debug === true ) {
+                        $line = $tokens[ $condition ][ 'line' ];
+                        $type = $tokens[ $condition ][ 'type' ];
+                        echo "\t* token is inside condition $condition ($type) on line $line *" . PHP_EOL;
                     }
                 }
 
-                if ($parens > $object && $parens > $condition) {
-                    if ($this->debug === true) {
-                        echo "\t* using parenthesis *".PHP_EOL;
+                if ( $parens > $object && $parens > $condition ) {
+                    if ( $this->debug === true ) {
+                        echo "\t* using parenthesis *" . PHP_EOL;
                     }
 
-                    $prev      = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($parens - 1), null, true);
+                    $prev      = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $parens - 1 ), null, true );
                     $object    = 0;
                     $condition = 0;
-                } else if ($object > 0 && $object >= $condition) {
-                    if ($this->debug === true) {
-                        echo "\t* using object *".PHP_EOL;
+                } else if ( $object > 0 && $object >= $condition ) {
+                    if ( $this->debug === true ) {
+                        echo "\t* using object *" . PHP_EOL;
                     }
 
                     $prev      = $object;
                     $parens    = 0;
                     $condition = 0;
-                } else if ($condition > 0) {
-                    if ($this->debug === true) {
-                        echo "\t* using condition *".PHP_EOL;
+                } else if ( $condition > 0 ) {
+                    if ( $this->debug === true ) {
+                        echo "\t* using condition *" . PHP_EOL;
                     }
 
                     $prev   = $condition;
@@ -1311,72 +1311,72 @@ 
                     $parens = 0;
                 }//end if
 
-                if ($prev === false) {
-                    $prev = $phpcsFile->findPrevious([T_EQUAL, T_RETURN], ($tokens[$i]['scope_condition'] - 1), null, false, null, true);
-                    if ($prev === false) {
+                if ( $prev === false ) {
+                    $prev = $phpcsFile->findPrevious( [ T_EQUAL, T_RETURN ], ( $tokens[ $i ][ 'scope_condition' ] - 1 ), null, false, null, true );
+                    if ( $prev === false ) {
                         $prev = $i;
-                        if ($this->debug === true) {
-                            echo "\t* could not find a previous T_EQUAL or T_RETURN token; will use current token *".PHP_EOL;
+                        if ( $this->debug === true ) {
+                            echo "\t* could not find a previous T_EQUAL or T_RETURN token; will use current token *" . PHP_EOL;
                         }
                     }
                 }
 
-                if ($this->debug === true) {
-                    $line = $tokens[$prev]['line'];
-                    $type = $tokens[$prev]['type'];
-                    echo "\t* previous token is $type on line $line *".PHP_EOL;
+                if ( $this->debug === true ) {
+                    $line = $tokens[ $prev ][ 'line' ];
+                    $type = $tokens[ $prev ][ 'type' ];
+                    echo "\t* previous token is $type on line $line *" . PHP_EOL;
                 }
 
-                $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $prev, true);
-                if ($this->debug === true) {
-                    $line = $tokens[$first]['line'];
-                    $type = $tokens[$first]['type'];
-                    echo "\t* first token on line $line is $first ($type) *".PHP_EOL;
+                $first = $phpcsFile->findFirstOnLine( T_WHITESPACE, $prev, true );
+                if ( $this->debug === true ) {
+                    $line = $tokens[ $first ][ 'line' ];
+                    $type = $tokens[ $first ][ 'type' ];
+                    echo "\t* first token on line $line is $first ($type) *" . PHP_EOL;
                 }
 
-                $prev = $phpcsFile->findStartOfStatement($first);
-                if ($prev !== $first) {
+                $prev = $phpcsFile->findStartOfStatement( $first );
+                if ( $prev !== $first ) {
                     // This is not the start of the statement.
-                    if ($this->debug === true) {
-                        $line = $tokens[$prev]['line'];
-                        $type = $tokens[$prev]['type'];
-                        echo "\t* amended previous is $type on line $line *".PHP_EOL;
+                    if ( $this->debug === true ) {
+                        $line = $tokens[ $prev ][ 'line' ];
+                        $type = $tokens[ $prev ][ 'type' ];
+                        echo "\t* amended previous is $type on line $line *" . PHP_EOL;
                     }
 
-                    $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $prev, true);
-                    if ($this->debug === true) {
-                        $line = $tokens[$first]['line'];
-                        $type = $tokens[$first]['type'];
-                        echo "\t* amended first token is $first ($type) on line $line *".PHP_EOL;
+                    $first = $phpcsFile->findFirstOnLine( T_WHITESPACE, $prev, true );
+                    if ( $this->debug === true ) {
+                        $line = $tokens[ $first ][ 'line' ];
+                        $type = $tokens[ $first ][ 'type' ];
+                        echo "\t* amended first token is $first ($type) on line $line *" . PHP_EOL;
                     }
                 }
 
-                $currentIndent = ($tokens[$first]['column'] - 1);
-                if ($object > 0 || $condition > 0) {
+                $currentIndent = ( $tokens[ $first ][ 'column' ] - 1 );
+                if ( $object > 0 || $condition > 0 ) {
                     $currentIndent += $this->indent;
                 }
 
-                if (isset($tokens[$first]['scope_closer']) === true
-                    && $tokens[$first]['scope_closer'] === $first
+                if ( isset( $tokens[ $first ][ 'scope_closer' ] ) === true
+                    && $tokens[ $first ][ 'scope_closer' ] === $first
                 ) {
-                    if ($this->debug === true) {
-                        echo "\t* first token is a scope closer *".PHP_EOL;
+                    if ( $this->debug === true ) {
+                        echo "\t* first token is a scope closer *" . PHP_EOL;
                     }
 
-                    if ($condition === 0 || $tokens[$condition]['scope_opener'] < $first) {
-                        $currentIndent = $setIndents[$first];
-                    } else if ($this->debug === true) {
-                        echo "\t* ignoring scope closer *".PHP_EOL;
+                    if ( $condition === 0 || $tokens[ $condition ][ 'scope_opener' ] < $first ) {
+                        $currentIndent = $setIndents[ $first ];
+                    } else if ( $this->debug === true ) {
+                        echo "\t* ignoring scope closer *" . PHP_EOL;
                     }
                 }
 
                 // Make sure it is divisible by our expected indent.
-                $currentIndent      = (int) (ceil($currentIndent / $this->indent) * $this->indent);
-                $setIndents[$first] = $currentIndent;
+                $currentIndent      = (int)( ceil( $currentIndent / $this->indent ) * $this->indent );
+                $setIndents[ $first ] = $currentIndent;
 
-                if ($this->debug === true) {
-                    $type = $tokens[$first]['type'];
-                    echo "\t=> indent set to $currentIndent by token $first ($type)".PHP_EOL;
+                if ( $this->debug === true ) {
+                    $type = $tokens[ $first ][ 'type' ];
+                    echo "\t=> indent set to $currentIndent by token $first ($type)" . PHP_EOL;
                 }
             }//end if
         }//end for
@@ -1399,72 +1399,72 @@ 
      *
      * @return bool
      */
-    protected function adjustIndent(File $phpcsFile, $stackPtr, $length, $change)
+    protected function adjustIndent( File $phpcsFile, $stackPtr, $length, $change )
     {
         $tokens = $phpcsFile->getTokens();
 
         // We don't adjust indents outside of PHP.
-        if ($tokens[$stackPtr]['code'] === T_INLINE_HTML) {
+        if ( $tokens[ $stackPtr ][ 'code' ] === T_INLINE_HTML ) {
             return false;
         }
 
         $padding = '';
-        if ($length > 0) {
-            if ($this->tabIndent === true) {
-                $numTabs = floor($length / $this->tabWidth);
-                if ($numTabs > 0) {
-                    $numSpaces = ($length - ($numTabs * $this->tabWidth));
-                    $padding   = str_repeat("\t", $numTabs).str_repeat(' ', $numSpaces);
+        if ( $length > 0 ) {
+            if ( $this->tabIndent === true ) {
+                $numTabs = floor( $length / $this->tabWidth );
+                if ( $numTabs > 0 ) {
+                    $numSpaces = ( $length - ( $numTabs * $this->tabWidth ) );
+                    $padding   = str_repeat( "\t", $numTabs ) . str_repeat( ' ', $numSpaces );
                 }
             } else {
-                $padding = str_repeat(' ', $length);
+                $padding = str_repeat( ' ', $length );
             }
         }
 
-        if ($tokens[$stackPtr]['column'] === 1) {
-            $trimmed  = ltrim($tokens[$stackPtr]['content']);
-            $accepted = $phpcsFile->fixer->replaceToken($stackPtr, $padding.$trimmed);
+        if ( $tokens[ $stackPtr ][ 'column' ] === 1 ) {
+            $trimmed  = ltrim( $tokens[ $stackPtr ][ 'content' ] );
+            $accepted = $phpcsFile->fixer->replaceToken( $stackPtr, $padding . $trimmed );
         } else {
             // Easier to just replace the entire indent.
-            $accepted = $phpcsFile->fixer->replaceToken(($stackPtr - 1), $padding);
+            $accepted = $phpcsFile->fixer->replaceToken( ( $stackPtr - 1 ), $padding );
         }
 
-        if ($accepted === false) {
+        if ( $accepted === false ) {
             return false;
         }
 
-        if ($tokens[$stackPtr]['code'] === T_DOC_COMMENT_OPEN_TAG) {
+        if ( $tokens[ $stackPtr ][ 'code' ] === T_DOC_COMMENT_OPEN_TAG ) {
             // We adjusted the start of a comment, so adjust the rest of it
             // as well so the alignment remains correct.
-            for ($x = ($stackPtr + 1); $x < $tokens[$stackPtr]['comment_closer']; $x++) {
-                if ($tokens[$x]['column'] !== 1) {
+            for ( $x = ( $stackPtr + 1 ); $x < $tokens[ $stackPtr ][ 'comment_closer' ]; $x++ ) {
+                if ( $tokens[ $x ][ 'column' ] !== 1 ) {
                     continue;
                 }
 
                 $length = 0;
-                if ($tokens[$x]['code'] === T_DOC_COMMENT_WHITESPACE) {
-                    $length = $tokens[$x]['length'];
+                if ( $tokens[ $x ][ 'code' ] === T_DOC_COMMENT_WHITESPACE ) {
+                    $length = $tokens[ $x ][ 'length' ];
                 }
 
-                $padding = ($length + $change);
-                if ($padding > 0) {
-                    if ($this->tabIndent === true) {
-                        $numTabs   = floor($padding / $this->tabWidth);
-                        $numSpaces = ($padding - ($numTabs * $this->tabWidth));
-                        $padding   = str_repeat("\t", $numTabs).str_repeat(' ', $numSpaces);
+                $padding = ( $length + $change );
+                if ( $padding > 0 ) {
+                    if ( $this->tabIndent === true ) {
+                        $numTabs   = floor( $padding / $this->tabWidth );
+                        $numSpaces = ( $padding - ( $numTabs * $this->tabWidth ) );
+                        $padding   = str_repeat( "\t", $numTabs ) . str_repeat( ' ', $numSpaces );
                     } else {
-                        $padding = str_repeat(' ', $padding);
+                        $padding = str_repeat( ' ', $padding );
                     }
                 } else {
                     $padding = '';
                 }
 
-                $phpcsFile->fixer->replaceToken($x, $padding);
-                if ($this->debug === true) {
-                    $length = strlen($padding);
-                    $line   = $tokens[$x]['line'];
-                    $type   = $tokens[$x]['type'];
-                    echo "\t=> Indent adjusted to $length for $type on line $line".PHP_EOL;
+                $phpcsFile->fixer->replaceToken( $x, $padding );
+                if ( $this->debug === true ) {
+                    $length = strlen( $padding );
+                    $line   = $tokens[ $x ][ 'line' ];
+                    $type   = $tokens[ $x ][ 'type' ];
+                    echo "\t=> Indent adjusted to $length for $type on line $line" . PHP_EOL;
                 }
             }//end for
         }//end if

Braces +4 added lines, -8 removed lines

@@ -14,8 +14,7 @@ 
 use PHP_CodeSniffer\Util\Tokens;
 use PHP_CodeSniffer\Config;
 
-class ScopeIndentSniff implements Sniff
-{
+class ScopeIndentSniff implements Sniff {
 
     /**
      * A list of tokenizers this sniff supports.
@@ -104,8 +103,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         if (defined('PHP_CODESNIFFER_IN_TESTS') === true) {
             $this->debug = false;
         }
@@ -124,8 +122,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         $debug = Config::getConfigData('scope_indent_debug');
         if ($debug !== null) {
             $this->debug = (bool) $debug;
@@ -1399,8 +1396,7 @@ 
      *
      * @return bool
      */
-    protected function adjustIndent(File $phpcsFile, $stackPtr, $length, $change)
-    {
+    protected function adjustIndent(File $phpcsFile, $stackPtr, $length, $change) {
         $tokens = $phpcsFile->getTokens();
 
         // We don't adjust indents outside of PHP.

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -1090,7 +1090,7 @@ 
                 if ($this->debug === true) {
                     $type = str_replace('_', ' ', strtolower(substr($tokens[$i]['type'], 2)));
                     $line = $tokens[$i]['line'];
-                    echo "Open $type on line $line".PHP_EOL;
+                    echo "open $type on line $line".PHP_EOL;
                 }
 
                 $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $i, true);
@@ -1236,7 +1236,7 @@ 
                 if ($this->debug === true) {
                     $type = str_replace('_', ' ', strtolower(substr($tokens[$tokens[$i]['scope_condition']]['type'], 2)));
                     $line = $tokens[$i]['line'];
-                    echo "Close $type on line $line".PHP_EOL;
+                    echo "close $type on line $line".PHP_EOL;
                 }
 
                 $prev = false;

vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Arrays/DisallowLongArraySyntaxUnitTest.2.inc

Doc Comments -6 removed lines

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

Indentation +3 added lines, -9 removed lines

@@ -5,13 +5,7 @@
 // This is not a merge conflict - it is a valid test case to test handling of arrays without associated closer.
 // Please do not remove.
 function test()
-    {
-        $arr = array(
-            'a' => 'a',
+	{
+		$arr = array(
+			'a' => 'a',
 <<<<<<< HEAD
-            'b' => 'b'
-=======
-            'c' => 'c'
->>>>>>> master
-        );
-    }

Switch Indentation -6 removed lines

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

Spacing +1 added lines, -7 removed lines

@@ -8,10 +8,4 @@
     {
         $arr = array(
             'a' => 'a',
-<<<<<<< HEAD
-            'b' => 'b'
-=======
-            'c' => 'c'
->>>>>>> master
-        );
-    }
+<< << <<< HEAD

Braces +1 added lines, -8 removed lines

@@ -4,14 +4,7 @@
 // The following function has a simulated git conflict for testing.
 // This is not a merge conflict - it is a valid test case to test handling of arrays without associated closer.
 // Please do not remove.
-function test()
-    {
+function test() {
         $arr = array(
             'a' => 'a',
 <<<<<<< HEAD
-            'b' => 'b'
-=======
-            'c' => 'c'
->>>>>>> master
-        );
-    }

Upper-Lower-Casing -6 removed lines

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