gravityview / GravityView

vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Commenting/FunctionCommentUnitTest.inc

Doc Comments +2 added lines, -3 removed lines

@@ -9,10 +9,10 @@ 
      *
      * @param int $stackPtr   The position in @ @unknown the stack of the token
      *                        that opened the scope
-     * @param int $detph    How many scope levels down we are.
+     * @param int $depth    How many scope levels down we are.
      * @param int    $index    The index
      * @return
-     * @throws
+     integer @throws
      */
     private function _functionCall($stackPtr, $depth=1, $index)
     {
@@ -121,7 +121,6 @@ 
      *
      * @return
      * @param   int   $threeSpaces
-     * @param int     $superfluous
      * @param missing
      * @param
      */

Indentation +161 added lines, -161 removed lines

@@ -2,148 +2,148 @@ 
 class PHP_CodeSniffer_File
 {
 
-    /**
-     * A simple function comment.
-     *
-     * long desc here
-     *
-     * @param int $stackPtr   The position in @ @unknown the stack of the token
-     *                        that opened the scope
-     * @param int $detph    How many scope levels down we are.
-     * @param int    $index    The index
-     * @return
-     * @throws
-     */
-    private function _functionCall($stackPtr, $depth=1, $index)
-    {
-        return $stackPtr;
-
-    }//end _functionCall()
-
-    //
-    // Sample function comment
-    //
-    //
-    //
-    public function invalidCommentStyle()
-    {
-
-    }//end invalidCommentStyle()
-
-
-    /**
-     *
-     *
-     * A simple function comment
-     *
-     *
-     * Long description with extra blank line before and after
-     *
-     *
-     * @return void
-     */
-    public function extraDescriptionNewlines()
-    {
-
-    }//end extraDescriptionNewlines()
-
-
-    /**
-     * A simple function comment
-     * @return void
-     */
-    public function missingNewlinesBeforeTags()
-    {
-
-    }//end missingNewlinesBeforeTags()
-
-
-    /**
-     * Access tag should not be treated as a long description
-     *
-     * @access public
-     * @return void
-     */
-    public function accessTag()
-    {
-
-    }//end accessTag()
-
-    /**
-     * Constructor
-     *
-     * No return tag
-     */
-    function PHP_CodeSniffer_File()
-    {
-        return;
-    }
-
-
-    /**
-     * Destructor
-     *
-     * No return tag too
-     */
-    function _PHP_CodeSniffer_File()
-    {
-        return;
-    }
-
-
-    /**
-     * Destructor PHP5
-     */
-    function __destruct()
-    {
-        return;
-    }
-
-
-    function missingComment()
-    {
-        return;
-    }
-
-
-    /**
-     * no return tag
-     *
-     */
-    public function noReturn($one)
-    {
-
-    }//end noReturn()
-
-
-    /**
-     * Param not immediate
-     *
-     * @return
-     * @param   int   $threeSpaces
-     * @param int     $superfluous
-     * @param missing
-     * @param
-     */
-    public function missingDescription($threeSpaces)
-    {
-
-    }//end missingDescription()
-
-
-    /**
-     * Param not immediate
-     *
-     * @param int      $one   comment
-     * @param int      $two   comment
-     * @param string   $three comment
-     *
-     * @return void
-     */
-    public function oneSpaceAfterLongestVar($one, $two, $three)
-    {
-
-    }//end oneSpaceAfterLongestVar()
+	/**
+	 * A simple function comment.
+	 *
+	 * long desc here
+	 *
+	 * @param int $stackPtr   The position in @ @unknown the stack of the token
+	 *                        that opened the scope
+	 * @param int $detph    How many scope levels down we are.
+	 * @param int    $index    The index
+	 * @return
+	 * @throws
+	 */
+	private function _functionCall($stackPtr, $depth=1, $index)
+	{
+		return $stackPtr;
+
+	}//end _functionCall()
+
+	//
+	// Sample function comment
+	//
+	//
+	//
+	public function invalidCommentStyle()
+	{
+
+	}//end invalidCommentStyle()
+
+
+	/**
+	 *
+	 *
+	 * A simple function comment
+	 *
+	 *
+	 * Long description with extra blank line before and after
+	 *
+	 *
+	 * @return void
+	 */
+	public function extraDescriptionNewlines()
+	{
+
+	}//end extraDescriptionNewlines()
+
+
+	/**
+	 * A simple function comment
+	 * @return void
+	 */
+	public function missingNewlinesBeforeTags()
+	{
+
+	}//end missingNewlinesBeforeTags()
+
+
+	/**
+	 * Access tag should not be treated as a long description
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function accessTag()
+	{
+
+	}//end accessTag()
+
+	/**
+	 * Constructor
+	 *
+	 * No return tag
+	 */
+	function PHP_CodeSniffer_File()
+	{
+		return;
+	}
+
+
+	/**
+	 * Destructor
+	 *
+	 * No return tag too
+	 */
+	function _PHP_CodeSniffer_File()
+	{
+		return;
+	}
+
+
+	/**
+	 * Destructor PHP5
+	 */
+	function __destruct()
+	{
+		return;
+	}
+
+
+	function missingComment()
+	{
+		return;
+	}
+
+
+	/**
+	 * no return tag
+	 *
+	 */
+	public function noReturn($one)
+	{
+
+	}//end noReturn()
+
+
+	/**
+	 * Param not immediate
+	 *
+	 * @return
+	 * @param   int   $threeSpaces
+	 * @param int     $superfluous
+	 * @param missing
+	 * @param
+	 */
+	public function missingDescription($threeSpaces)
+	{
+
+	}//end missingDescription()
+
+
+	/**
+	 * Param not immediate
+	 *
+	 * @param int      $one   comment
+	 * @param int      $two   comment
+	 * @param string   $three comment
+	 *
+	 * @return void
+	 */
+	public function oneSpaceAfterLongestVar($one, $two, $three)
+	{
+
+	}//end oneSpaceAfterLongestVar()
 
 
 }//end class
@@ -159,19 +159,19 @@ 
  */
 function functionOutsideClass(&$str, &$foo)
 {
-    return;
+	return;
 }//end functionOutsideClass()
 
 function missingCommentOutsideClass()
 {
-    return;
+	return;
 }//end missingCommentOutsideClass()
 
 
 ?><?php
 function tagBeforeComment()
 {
-    return;
+	return;
 }//end tagBeforeComment()
 
 
@@ -244,12 +244,12 @@ 
 function myFunction() {}
 
 abstract class MyClass {
-    /**
-     * An abstract function.
-     *
-     * @return string[]
-     */
-    abstract protected function myFunction();
+	/**
+	 * An abstract function.
+	 *
+	 * @return string[]
+	 */
+	abstract protected function myFunction();
 }
 
 /**
@@ -271,18 +271,18 @@ 
  *
  */
 function _() {
-    return $foo;
+	return $foo;
 }
 
 class Baz {
-    /**
-     * The PHP5 constructor
-     *
-     * No return tag
-     */
-    public function __construct() {
-
-    }
+	/**
+	 * The PHP5 constructor
+	 *
+	 * No return tag
+	 */
+	public function __construct() {
+
+	}
 }
 
 /**
@@ -295,7 +295,7 @@ 
  * @return void
  */
 function completeStep($status, array $array = [Class1::class, 'test'], $note = '') {
-    echo 'foo';
+	echo 'foo';
 }
 
 /**

Spacing +15 added lines, -15 removed lines

@@ -14,7 +14,7 @@ 
      * @return
      * @throws
      */
-    private function _functionCall($stackPtr, $depth=1, $index)
+    private function _functionCall( $stackPtr, $depth = 1, $index )
     {
         return $stackPtr;
 
@@ -110,7 +110,7 @@ 
      * no return tag
      *
      */
-    public function noReturn($one)
+    public function noReturn( $one )
     {
 
     }//end noReturn()
@@ -125,7 +125,7 @@ 
      * @param missing
      * @param
      */
-    public function missingDescription($threeSpaces)
+    public function missingDescription( $threeSpaces )
     {
 
     }//end missingDescription()
@@ -140,7 +140,7 @@ 
      *
      * @return void
      */
-    public function oneSpaceAfterLongestVar($one, $two, $three)
+    public function oneSpaceAfterLongestVar( $one, $two, $three )
     {
 
     }//end oneSpaceAfterLongestVar()
@@ -157,7 +157,7 @@ 
  *
  * @return void
  */
-function functionOutsideClass(&$str, &$foo)
+function functionOutsideClass( &$str, &$foo )
 {
     return;
 }//end functionOutsideClass()
@@ -195,7 +195,7 @@ 
  * @return void
  * @fine  Unknown tag
  */
-function missingTwoParamComment($one, $two, $three)
+function missingTwoParamComment( $one, $two, $three )
 {
 
 }//end missingTwoParamComment()
@@ -217,7 +217,7 @@ 
  * @access public
  * @return bool
  */
-function myFunction($arg1) {}
+function myFunction( $arg1 ) {}
 
 
 /**
@@ -231,7 +231,7 @@ 
 
 echo $blah;
 
-function myFunction($arg1) {}
+function myFunction( $arg1 ) {}
 
 /**
  * Test function.
@@ -261,7 +261,7 @@ 
  *
  * @return void
  */
-function foo(&$tokens, $tokenizer, $eolChar)
+function foo( &$tokens, $tokenizer, $eolChar )
 {
 
 }//end foo()
@@ -294,7 +294,7 @@ 
  *
  * @return void
  */
-function completeStep($status, array $array = [Class1::class, 'test'], $note = '') {
+function completeStep( $status, array $array = [ Class1::class, 'test' ], $note = '' ) {
     echo 'foo';
 }
 
@@ -306,7 +306,7 @@ 
  *
  * @return void
  */
-function myFunction(string $name1, string ...$name2) {
+function myFunction( string $name1, string ...$name2 ) {
 }
 
 
@@ -318,7 +318,7 @@ 
  *
  * @return void
  */
-function myFunction(string $name1, string ...$name2) {
+function myFunction( string $name1, string ...$name2 ) {
 }
 
 /**
@@ -333,7 +333,7 @@ 
  *   Return value
  *
  */
-function foo($bar) {
+function foo( $bar ) {
 }
 
 /**
@@ -348,7 +348,7 @@ 
  * @return void
  * @see    register()
  */
-function process(File $phpcsFile, $stackPtr)
+function process( File $phpcsFile, $stackPtr )
 {
 
 }//end process()
@@ -366,7 +366,7 @@ 
  * @return void
  * @see    register()
  */
-function process(File $phpcsFile, $stackPtr)
+function process( File $phpcsFile, $stackPtr )
 {
 
 }//end process()

Braces +22 added lines, -44 removed lines

@@ -1,6 +1,5 @@ 
 <?php
-class PHP_CodeSniffer_File
-{
+class PHP_CodeSniffer_File {
 
     /**
      * A simple function comment.
@@ -14,8 +13,7 @@ 
      * @return
      * @throws
      */
-    private function _functionCall($stackPtr, $depth=1, $index)
-    {
+    private function _functionCall($stackPtr, $depth=1, $index) {
         return $stackPtr;
 
     }//end _functionCall()
@@ -25,8 +23,7 @@ 
     //
     //
     //
-    public function invalidCommentStyle()
-    {
+    public function invalidCommentStyle() {
 
     }//end invalidCommentStyle()
 
@@ -42,8 +39,7 @@ 
      *
      * @return void
      */
-    public function extraDescriptionNewlines()
-    {
+    public function extraDescriptionNewlines() {
 
     }//end extraDescriptionNewlines()
 
@@ -52,8 +48,7 @@ 
      * A simple function comment
      * @return void
      */
-    public function missingNewlinesBeforeTags()
-    {
+    public function missingNewlinesBeforeTags() {
 
     }//end missingNewlinesBeforeTags()
 
@@ -64,8 +59,7 @@ 
      * @access public
      * @return void
      */
-    public function accessTag()
-    {
+    public function accessTag() {
 
     }//end accessTag()
 
@@ -74,8 +68,7 @@ 
      *
      * No return tag
      */
-    function PHP_CodeSniffer_File()
-    {
+    function PHP_CodeSniffer_File() {
         return;
     }
 
@@ -85,8 +78,7 @@ 
      *
      * No return tag too
      */
-    function _PHP_CodeSniffer_File()
-    {
+    function _PHP_CodeSniffer_File() {
         return;
     }
 
@@ -94,14 +86,12 @@ 
     /**
      * Destructor PHP5
      */
-    function __destruct()
-    {
+    function __destruct() {
         return;
     }
 
 
-    function missingComment()
-    {
+    function missingComment() {
         return;
     }
 
@@ -110,8 +100,7 @@ 
      * no return tag
      *
      */
-    public function noReturn($one)
-    {
+    public function noReturn($one) {
 
     }//end noReturn()
 
@@ -125,8 +114,7 @@ 
      * @param missing
      * @param
      */
-    public function missingDescription($threeSpaces)
-    {
+    public function missingDescription($threeSpaces) {
 
     }//end missingDescription()
 
@@ -140,8 +128,7 @@ 
      *
      * @return void
      */
-    public function oneSpaceAfterLongestVar($one, $two, $three)
-    {
+    public function oneSpaceAfterLongestVar($one, $two, $three) {
 
     }//end oneSpaceAfterLongestVar()
 
@@ -157,20 +144,17 @@ 
  *
  * @return void
  */
-function functionOutsideClass(&$str, &$foo)
-{
+function functionOutsideClass(&$str, &$foo) {
     return;
 }//end functionOutsideClass()
 
-function missingCommentOutsideClass()
-{
+function missingCommentOutsideClass() {
     return;
 }//end missingCommentOutsideClass()
 
 
 ?><?php
-function tagBeforeComment()
-{
+function tagBeforeComment() {
     return;
 }//end tagBeforeComment()
 
@@ -181,8 +165,7 @@ 
  *
  *
  */
-function noReturnOutsideClass()
-{
+function noReturnOutsideClass() {
 
 }//end noReturnOutsideClass()
 
@@ -195,8 +178,7 @@ 
  * @return void
  * @fine  Unknown tag
  */
-function missingTwoParamComment($one, $two, $three)
-{
+function missingTwoParamComment($one, $two, $three) {
 
 }//end missingTwoParamComment()
 
@@ -204,8 +186,7 @@ 
 /**
  *
  */
-function emptyFunctionDocComment()
-{
+function emptyFunctionDocComment() {
 }//end emptyFunctionDocComment()
 
 
@@ -261,8 +242,7 @@ 
  *
  * @return void
  */
-function foo(&$tokens, $tokenizer, $eolChar)
-{
+function foo(&$tokens, $tokenizer, $eolChar) {
 
 }//end foo()
 
@@ -348,8 +328,7 @@ 
  * @return void
  * @see    register()
  */
-function process(File $phpcsFile, $stackPtr)
-{
+function process(File $phpcsFile, $stackPtr) {
 
 }//end process()
 
@@ -366,7 +345,6 @@ 
  * @return void
  * @see    register()
  */
-function process(File $phpcsFile, $stackPtr)
-{
+function process(File $phpcsFile, $stackPtr) {
 
 }//end process()

vendor/squizlabs/php_codesniffer/src/Standards/PSR1/Sniffs/Files/SideEffectsSniff.php

Doc Comments +2 added lines, -2 removed lines

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

Indentation +259 added lines, -259 removed lines

@@ -17,265 +17,265 @@
 {
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return [T_OPEN_TAG];
-
-    }//end register()
-
-
-    /**
-     * Processes this sniff, 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 token stack.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-        $result = $this->searchForConflict($phpcsFile, 0, ($phpcsFile->numTokens - 1), $tokens);
-
-        if ($result['symbol'] !== null && $result['effect'] !== null) {
-            $error = 'A file should declare new symbols (classes, functions, constants, etc.) and cause no other side effects, or it should execute logic with side effects, but should not do both. The first symbol is defined on line %s and the first side effect is on line %s.';
-            $data  = [
-                $tokens[$result['symbol']]['line'],
-                $tokens[$result['effect']]['line'],
-            ];
-            $phpcsFile->addWarning($error, 0, 'FoundWithSymbols', $data);
-            $phpcsFile->recordMetric($stackPtr, 'Declarations and side effects mixed', 'yes');
-        } else {
-            $phpcsFile->recordMetric($stackPtr, 'Declarations and side effects mixed', 'no');
-        }
-
-        // Ignore the rest of the file.
-        return ($phpcsFile->numTokens + 1);
-
-    }//end process()
-
-
-    /**
-     * Searches for symbol declarations and side effects.
-     *
-     * Returns the positions of both the first symbol declared and the first
-     * side effect in the file. A NULL value for either indicates nothing was
-     * found.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $start     The token to start searching from.
-     * @param int                         $end       The token to search to.
-     * @param array                       $tokens    The stack of tokens that make up
-     *                                               the file.
-     *
-     * @return array
-     */
-    private function searchForConflict($phpcsFile, $start, $end, $tokens)
-    {
-        $symbols = [
-            T_CLASS     => T_CLASS,
-            T_INTERFACE => T_INTERFACE,
-            T_TRAIT     => T_TRAIT,
-            T_FUNCTION  => T_FUNCTION,
-        ];
-
-        $conditions = [
-            T_IF     => T_IF,
-            T_ELSE   => T_ELSE,
-            T_ELSEIF => T_ELSEIF,
-        ];
-
-        $checkAnnotations = $phpcsFile->config->annotations;
-
-        $firstSymbol = null;
-        $firstEffect = null;
-        for ($i = $start; $i <= $end; $i++) {
-            // Respect phpcs:disable comments.
-            if ($checkAnnotations === true
-                && $tokens[$i]['code'] === T_PHPCS_DISABLE
-                && (empty($tokens[$i]['sniffCodes']) === true
-                || isset($tokens[$i]['sniffCodes']['PSR1']) === true
-                || isset($tokens[$i]['sniffCodes']['PSR1.Files']) === true
-                || isset($tokens[$i]['sniffCodes']['PSR1.Files.SideEffects']) === true)
-            ) {
-                do {
-                    $i = $phpcsFile->findNext(T_PHPCS_ENABLE, ($i + 1));
-                } while ($i !== false
-                    && empty($tokens[$i]['sniffCodes']) === false
-                    && isset($tokens[$i]['sniffCodes']['PSR1']) === false
-                    && isset($tokens[$i]['sniffCodes']['PSR1.Files']) === false
-                    && isset($tokens[$i]['sniffCodes']['PSR1.Files.SideEffects']) === false);
-
-                if ($i === false) {
-                    // The entire rest of the file is disabled,
-                    // so return what we have so far.
-                    break;
-                }
-
-                continue;
-            }
-
-            // Ignore whitespace and comments.
-            if (isset(Tokens::$emptyTokens[$tokens[$i]['code']]) === true) {
-                continue;
-            }
-
-            // Ignore PHP tags.
-            if ($tokens[$i]['code'] === T_OPEN_TAG
-                || $tokens[$i]['code'] === T_CLOSE_TAG
-            ) {
-                continue;
-            }
-
-            // Ignore shebang.
-            if (substr($tokens[$i]['content'], 0, 2) === '#!') {
-                continue;
-            }
-
-            // Ignore logical operators.
-            if (isset(Tokens::$booleanOperators[$tokens[$i]['code']]) === true) {
-                continue;
-            }
-
-            // Ignore entire namespace, declare, const and use statements.
-            if ($tokens[$i]['code'] === T_NAMESPACE
-                || $tokens[$i]['code'] === T_USE
-                || $tokens[$i]['code'] === T_DECLARE
-                || $tokens[$i]['code'] === T_CONST
-            ) {
-                if (isset($tokens[$i]['scope_opener']) === true) {
-                    $i = $tokens[$i]['scope_closer'];
-                } else {
-                    $semicolon = $phpcsFile->findNext(T_SEMICOLON, ($i + 1));
-                    if ($semicolon !== false) {
-                        $i = $semicolon;
-                    }
-                }
-
-                continue;
-            }
-
-            // Ignore function/class prefixes.
-            if (isset(Tokens::$methodPrefixes[$tokens[$i]['code']]) === true) {
-                continue;
-            }
-
-            // Ignore anon classes.
-            if ($tokens[$i]['code'] === T_ANON_CLASS) {
-                $i = $tokens[$i]['scope_closer'];
-                continue;
-            }
-
-            // Detect and skip over symbols.
-            if (isset($symbols[$tokens[$i]['code']]) === true
-                && isset($tokens[$i]['scope_closer']) === true
-            ) {
-                if ($firstSymbol === null) {
-                    $firstSymbol = $i;
-                }
-
-                $i = $tokens[$i]['scope_closer'];
-                continue;
-            } else if ($tokens[$i]['code'] === T_STRING
-                && strtolower($tokens[$i]['content']) === 'define'
-            ) {
-                $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($i - 1), null, true);
-                if ($tokens[$prev]['code'] !== T_OBJECT_OPERATOR
-                    && $tokens[$prev]['code'] !== T_DOUBLE_COLON
-                    && $tokens[$prev]['code'] !== T_FUNCTION
-                ) {
-                    if ($firstSymbol === null) {
-                        $firstSymbol = $i;
-                    }
-
-                    $semicolon = $phpcsFile->findNext(T_SEMICOLON, ($i + 1));
-                    if ($semicolon !== false) {
-                        $i = $semicolon;
-                    }
-
-                    continue;
-                }
-            }//end if
-
-            // Special case for defined() as it can be used to see
-            // if a constant (a symbol) should be defined or not and
-            // doesn't need to use a full conditional block.
-            if ($tokens[$i]['code'] === T_STRING
-                && strtolower($tokens[$i]['content']) === 'defined'
-            ) {
-                $openBracket = $phpcsFile->findNext(Tokens::$emptyTokens, ($i + 1), null, true);
-                if ($tokens[$openBracket]['code'] === T_OPEN_PARENTHESIS
-                    && isset($tokens[$openBracket]['parenthesis_closer']) === true
-                ) {
-                    $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($i - 1), null, true);
-                    if ($tokens[$prev]['code'] !== T_OBJECT_OPERATOR
-                        && $tokens[$prev]['code'] !== T_DOUBLE_COLON
-                        && $tokens[$prev]['code'] !== T_FUNCTION
-                    ) {
-                        $i = $tokens[$openBracket]['parenthesis_closer'];
-                        continue;
-                    }
-                }
-            }//end if
-
-            // Conditional statements are allowed in symbol files as long as the
-            // contents is only a symbol definition. So don't count these as effects
-            // in this case.
-            if (isset($conditions[$tokens[$i]['code']]) === true) {
-                if (isset($tokens[$i]['scope_opener']) === false) {
-                    // Probably an "else if", so just ignore.
-                    continue;
-                }
-
-                $result = $this->searchForConflict(
-                    $phpcsFile,
-                    ($tokens[$i]['scope_opener'] + 1),
-                    ($tokens[$i]['scope_closer'] - 1),
-                    $tokens
-                );
-
-                if ($result['symbol'] !== null) {
-                    if ($firstSymbol === null) {
-                        $firstSymbol = $result['symbol'];
-                    }
-
-                    if ($result['effect'] !== null) {
-                        // Found a conflict.
-                        $firstEffect = $result['effect'];
-                        break;
-                    }
-                }
-
-                if ($firstEffect === null) {
-                    $firstEffect = $result['effect'];
-                }
-
-                $i = $tokens[$i]['scope_closer'];
-                continue;
-            }//end if
-
-            if ($firstEffect === null) {
-                $firstEffect = $i;
-            }
-
-            if ($firstSymbol !== null) {
-                // We have a conflict we have to report, so no point continuing.
-                break;
-            }
-        }//end for
-
-        return [
-            'symbol' => $firstSymbol,
-            'effect' => $firstEffect,
-        ];
-
-    }//end searchForConflict()
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return [T_OPEN_TAG];
+
+	}//end register()
+
+
+	/**
+	 * Processes this sniff, 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 token stack.
+	 *
+	 * @return void
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+		$result = $this->searchForConflict($phpcsFile, 0, ($phpcsFile->numTokens - 1), $tokens);
+
+		if ($result['symbol'] !== null && $result['effect'] !== null) {
+			$error = 'A file should declare new symbols (classes, functions, constants, etc.) and cause no other side effects, or it should execute logic with side effects, but should not do both. The first symbol is defined on line %s and the first side effect is on line %s.';
+			$data  = [
+				$tokens[$result['symbol']]['line'],
+				$tokens[$result['effect']]['line'],
+			];
+			$phpcsFile->addWarning($error, 0, 'FoundWithSymbols', $data);
+			$phpcsFile->recordMetric($stackPtr, 'Declarations and side effects mixed', 'yes');
+		} else {
+			$phpcsFile->recordMetric($stackPtr, 'Declarations and side effects mixed', 'no');
+		}
+
+		// Ignore the rest of the file.
+		return ($phpcsFile->numTokens + 1);
+
+	}//end process()
+
+
+	/**
+	 * Searches for symbol declarations and side effects.
+	 *
+	 * Returns the positions of both the first symbol declared and the first
+	 * side effect in the file. A NULL value for either indicates nothing was
+	 * found.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
+	 * @param int                         $start     The token to start searching from.
+	 * @param int                         $end       The token to search to.
+	 * @param array                       $tokens    The stack of tokens that make up
+	 *                                               the file.
+	 *
+	 * @return array
+	 */
+	private function searchForConflict($phpcsFile, $start, $end, $tokens)
+	{
+		$symbols = [
+			T_CLASS     => T_CLASS,
+			T_INTERFACE => T_INTERFACE,
+			T_TRAIT     => T_TRAIT,
+			T_FUNCTION  => T_FUNCTION,
+		];
+
+		$conditions = [
+			T_IF     => T_IF,
+			T_ELSE   => T_ELSE,
+			T_ELSEIF => T_ELSEIF,
+		];
+
+		$checkAnnotations = $phpcsFile->config->annotations;
+
+		$firstSymbol = null;
+		$firstEffect = null;
+		for ($i = $start; $i <= $end; $i++) {
+			// Respect phpcs:disable comments.
+			if ($checkAnnotations === true
+				&& $tokens[$i]['code'] === T_PHPCS_DISABLE
+				&& (empty($tokens[$i]['sniffCodes']) === true
+				|| isset($tokens[$i]['sniffCodes']['PSR1']) === true
+				|| isset($tokens[$i]['sniffCodes']['PSR1.Files']) === true
+				|| isset($tokens[$i]['sniffCodes']['PSR1.Files.SideEffects']) === true)
+			) {
+				do {
+					$i = $phpcsFile->findNext(T_PHPCS_ENABLE, ($i + 1));
+				} while ($i !== false
+					&& empty($tokens[$i]['sniffCodes']) === false
+					&& isset($tokens[$i]['sniffCodes']['PSR1']) === false
+					&& isset($tokens[$i]['sniffCodes']['PSR1.Files']) === false
+					&& isset($tokens[$i]['sniffCodes']['PSR1.Files.SideEffects']) === false);
+
+				if ($i === false) {
+					// The entire rest of the file is disabled,
+					// so return what we have so far.
+					break;
+				}
+
+				continue;
+			}
+
+			// Ignore whitespace and comments.
+			if (isset(Tokens::$emptyTokens[$tokens[$i]['code']]) === true) {
+				continue;
+			}
+
+			// Ignore PHP tags.
+			if ($tokens[$i]['code'] === T_OPEN_TAG
+				|| $tokens[$i]['code'] === T_CLOSE_TAG
+			) {
+				continue;
+			}
+
+			// Ignore shebang.
+			if (substr($tokens[$i]['content'], 0, 2) === '#!') {
+				continue;
+			}
+
+			// Ignore logical operators.
+			if (isset(Tokens::$booleanOperators[$tokens[$i]['code']]) === true) {
+				continue;
+			}
+
+			// Ignore entire namespace, declare, const and use statements.
+			if ($tokens[$i]['code'] === T_NAMESPACE
+				|| $tokens[$i]['code'] === T_USE
+				|| $tokens[$i]['code'] === T_DECLARE
+				|| $tokens[$i]['code'] === T_CONST
+			) {
+				if (isset($tokens[$i]['scope_opener']) === true) {
+					$i = $tokens[$i]['scope_closer'];
+				} else {
+					$semicolon = $phpcsFile->findNext(T_SEMICOLON, ($i + 1));
+					if ($semicolon !== false) {
+						$i = $semicolon;
+					}
+				}
+
+				continue;
+			}
+
+			// Ignore function/class prefixes.
+			if (isset(Tokens::$methodPrefixes[$tokens[$i]['code']]) === true) {
+				continue;
+			}
+
+			// Ignore anon classes.
+			if ($tokens[$i]['code'] === T_ANON_CLASS) {
+				$i = $tokens[$i]['scope_closer'];
+				continue;
+			}
+
+			// Detect and skip over symbols.
+			if (isset($symbols[$tokens[$i]['code']]) === true
+				&& isset($tokens[$i]['scope_closer']) === true
+			) {
+				if ($firstSymbol === null) {
+					$firstSymbol = $i;
+				}
+
+				$i = $tokens[$i]['scope_closer'];
+				continue;
+			} else if ($tokens[$i]['code'] === T_STRING
+				&& strtolower($tokens[$i]['content']) === 'define'
+			) {
+				$prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($i - 1), null, true);
+				if ($tokens[$prev]['code'] !== T_OBJECT_OPERATOR
+					&& $tokens[$prev]['code'] !== T_DOUBLE_COLON
+					&& $tokens[$prev]['code'] !== T_FUNCTION
+				) {
+					if ($firstSymbol === null) {
+						$firstSymbol = $i;
+					}
+
+					$semicolon = $phpcsFile->findNext(T_SEMICOLON, ($i + 1));
+					if ($semicolon !== false) {
+						$i = $semicolon;
+					}
+
+					continue;
+				}
+			}//end if
+
+			// Special case for defined() as it can be used to see
+			// if a constant (a symbol) should be defined or not and
+			// doesn't need to use a full conditional block.
+			if ($tokens[$i]['code'] === T_STRING
+				&& strtolower($tokens[$i]['content']) === 'defined'
+			) {
+				$openBracket = $phpcsFile->findNext(Tokens::$emptyTokens, ($i + 1), null, true);
+				if ($tokens[$openBracket]['code'] === T_OPEN_PARENTHESIS
+					&& isset($tokens[$openBracket]['parenthesis_closer']) === true
+				) {
+					$prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($i - 1), null, true);
+					if ($tokens[$prev]['code'] !== T_OBJECT_OPERATOR
+						&& $tokens[$prev]['code'] !== T_DOUBLE_COLON
+						&& $tokens[$prev]['code'] !== T_FUNCTION
+					) {
+						$i = $tokens[$openBracket]['parenthesis_closer'];
+						continue;
+					}
+				}
+			}//end if
+
+			// Conditional statements are allowed in symbol files as long as the
+			// contents is only a symbol definition. So don't count these as effects
+			// in this case.
+			if (isset($conditions[$tokens[$i]['code']]) === true) {
+				if (isset($tokens[$i]['scope_opener']) === false) {
+					// Probably an "else if", so just ignore.
+					continue;
+				}
+
+				$result = $this->searchForConflict(
+					$phpcsFile,
+					($tokens[$i]['scope_opener'] + 1),
+					($tokens[$i]['scope_closer'] - 1),
+					$tokens
+				);
+
+				if ($result['symbol'] !== null) {
+					if ($firstSymbol === null) {
+						$firstSymbol = $result['symbol'];
+					}
+
+					if ($result['effect'] !== null) {
+						// Found a conflict.
+						$firstEffect = $result['effect'];
+						break;
+					}
+				}
+
+				if ($firstEffect === null) {
+					$firstEffect = $result['effect'];
+				}
+
+				$i = $tokens[$i]['scope_closer'];
+				continue;
+			}//end if
+
+			if ($firstEffect === null) {
+				$firstEffect = $i;
+			}
+
+			if ($firstSymbol !== null) {
+				// We have a conflict we have to report, so no point continuing.
+				break;
+			}
+		}//end for
+
+		return [
+			'symbol' => $firstSymbol,
+			'effect' => $firstEffect,
+		];
+
+	}//end searchForConflict()
 
 
 }//end class

Spacing +79 added lines, -79 removed lines

@@ -24,7 +24,7 @@ 
      */
     public function register()
     {
-        return [T_OPEN_TAG];
+        return [ T_OPEN_TAG ];
 
     }//end register()
 
@@ -38,25 +38,25 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
-        $result = $this->searchForConflict($phpcsFile, 0, ($phpcsFile->numTokens - 1), $tokens);
+        $result = $this->searchForConflict( $phpcsFile, 0, ( $phpcsFile->numTokens - 1 ), $tokens );
 
-        if ($result['symbol'] !== null && $result['effect'] !== null) {
+        if ( $result[ 'symbol' ] !== null && $result[ 'effect' ] !== null ) {
             $error = 'A file should declare new symbols (classes, functions, constants, etc.) and cause no other side effects, or it should execute logic with side effects, but should not do both. The first symbol is defined on line %s and the first side effect is on line %s.';
             $data  = [
-                $tokens[$result['symbol']]['line'],
-                $tokens[$result['effect']]['line'],
+                $tokens[ $result[ 'symbol' ] ][ 'line' ],
+                $tokens[ $result[ 'effect' ] ][ 'line' ],
             ];
-            $phpcsFile->addWarning($error, 0, 'FoundWithSymbols', $data);
-            $phpcsFile->recordMetric($stackPtr, 'Declarations and side effects mixed', 'yes');
+            $phpcsFile->addWarning( $error, 0, 'FoundWithSymbols', $data );
+            $phpcsFile->recordMetric( $stackPtr, 'Declarations and side effects mixed', 'yes' );
         } else {
-            $phpcsFile->recordMetric($stackPtr, 'Declarations and side effects mixed', 'no');
+            $phpcsFile->recordMetric( $stackPtr, 'Declarations and side effects mixed', 'no' );
         }
 
         // Ignore the rest of the file.
-        return ($phpcsFile->numTokens + 1);
+        return ( $phpcsFile->numTokens + 1 );
 
     }//end process()
 
@@ -76,7 +76,7 @@ 
      *
      * @return array
      */
-    private function searchForConflict($phpcsFile, $start, $end, $tokens)
+    private function searchForConflict( $phpcsFile, $start, $end, $tokens )
     {
         $symbols = [
             T_CLASS     => T_CLASS,
@@ -95,24 +95,24 @@ 
 
         $firstSymbol = null;
         $firstEffect = null;
-        for ($i = $start; $i <= $end; $i++) {
+        for ( $i = $start; $i <= $end; $i++ ) {
             // Respect phpcs:disable comments.
-            if ($checkAnnotations === true
-                && $tokens[$i]['code'] === T_PHPCS_DISABLE
-                && (empty($tokens[$i]['sniffCodes']) === true
-                || isset($tokens[$i]['sniffCodes']['PSR1']) === true
-                || isset($tokens[$i]['sniffCodes']['PSR1.Files']) === true
-                || isset($tokens[$i]['sniffCodes']['PSR1.Files.SideEffects']) === true)
+            if ( $checkAnnotations === true
+                && $tokens[ $i ][ 'code' ] === T_PHPCS_DISABLE
+                && ( empty( $tokens[ $i ][ 'sniffCodes' ] ) === true
+                || isset( $tokens[ $i ][ 'sniffCodes' ][ 'PSR1' ] ) === true
+                || isset( $tokens[ $i ][ 'sniffCodes' ][ 'PSR1.Files' ] ) === true
+                || isset( $tokens[ $i ][ 'sniffCodes' ][ 'PSR1.Files.SideEffects' ] ) === true )
             ) {
                 do {
-                    $i = $phpcsFile->findNext(T_PHPCS_ENABLE, ($i + 1));
-                } while ($i !== false
-                    && empty($tokens[$i]['sniffCodes']) === false
-                    && isset($tokens[$i]['sniffCodes']['PSR1']) === false
-                    && isset($tokens[$i]['sniffCodes']['PSR1.Files']) === false
-                    && isset($tokens[$i]['sniffCodes']['PSR1.Files.SideEffects']) === false);
-
-                if ($i === false) {
+                    $i = $phpcsFile->findNext( T_PHPCS_ENABLE, ( $i + 1 ) );
+                } while ( $i !== false
+                    && empty( $tokens[ $i ][ 'sniffCodes' ] ) === false
+                    && isset( $tokens[ $i ][ 'sniffCodes' ][ 'PSR1' ] ) === false
+                    && isset( $tokens[ $i ][ 'sniffCodes' ][ 'PSR1.Files' ] ) === false
+                    && isset( $tokens[ $i ][ 'sniffCodes' ][ 'PSR1.Files.SideEffects' ] ) === false );
+
+                if ( $i === false ) {
                     // The entire rest of the file is disabled,
                     // so return what we have so far.
                     break;
@@ -122,38 +122,38 @@ 
             }
 
             // Ignore whitespace and comments.
-            if (isset(Tokens::$emptyTokens[$tokens[$i]['code']]) === true) {
+            if ( isset( Tokens::$emptyTokens[ $tokens[ $i ][ 'code' ] ] ) === true ) {
                 continue;
             }
 
             // Ignore PHP tags.
-            if ($tokens[$i]['code'] === T_OPEN_TAG
-                || $tokens[$i]['code'] === T_CLOSE_TAG
+            if ( $tokens[ $i ][ 'code' ] === T_OPEN_TAG
+                || $tokens[ $i ][ 'code' ] === T_CLOSE_TAG
             ) {
                 continue;
             }
 
             // Ignore shebang.
-            if (substr($tokens[$i]['content'], 0, 2) === '#!') {
+            if ( substr( $tokens[ $i ][ 'content' ], 0, 2 ) === '#!' ) {
                 continue;
             }
 
             // Ignore logical operators.
-            if (isset(Tokens::$booleanOperators[$tokens[$i]['code']]) === true) {
+            if ( isset( Tokens::$booleanOperators[ $tokens[ $i ][ 'code' ] ] ) === true ) {
                 continue;
             }
 
             // Ignore entire namespace, declare, const and use statements.
-            if ($tokens[$i]['code'] === T_NAMESPACE
-                || $tokens[$i]['code'] === T_USE
-                || $tokens[$i]['code'] === T_DECLARE
-                || $tokens[$i]['code'] === T_CONST
+            if ( $tokens[ $i ][ 'code' ] === T_NAMESPACE
+                || $tokens[ $i ][ 'code' ] === T_USE
+                || $tokens[ $i ][ 'code' ] === T_DECLARE
+                || $tokens[ $i ][ 'code' ] === T_CONST
             ) {
-                if (isset($tokens[$i]['scope_opener']) === true) {
-                    $i = $tokens[$i]['scope_closer'];
+                if ( isset( $tokens[ $i ][ 'scope_opener' ] ) === true ) {
+                    $i = $tokens[ $i ][ 'scope_closer' ];
                 } else {
-                    $semicolon = $phpcsFile->findNext(T_SEMICOLON, ($i + 1));
-                    if ($semicolon !== false) {
+                    $semicolon = $phpcsFile->findNext( T_SEMICOLON, ( $i + 1 ) );
+                    if ( $semicolon !== false ) {
                         $i = $semicolon;
                     }
                 }
@@ -162,40 +162,40 @@ 
             }
 
             // Ignore function/class prefixes.
-            if (isset(Tokens::$methodPrefixes[$tokens[$i]['code']]) === true) {
+            if ( isset( Tokens::$methodPrefixes[ $tokens[ $i ][ 'code' ] ] ) === true ) {
                 continue;
             }
 
             // Ignore anon classes.
-            if ($tokens[$i]['code'] === T_ANON_CLASS) {
-                $i = $tokens[$i]['scope_closer'];
+            if ( $tokens[ $i ][ 'code' ] === T_ANON_CLASS ) {
+                $i = $tokens[ $i ][ 'scope_closer' ];
                 continue;
             }
 
             // Detect and skip over symbols.
-            if (isset($symbols[$tokens[$i]['code']]) === true
-                && isset($tokens[$i]['scope_closer']) === true
+            if ( isset( $symbols[ $tokens[ $i ][ 'code' ] ] ) === true
+                && isset( $tokens[ $i ][ 'scope_closer' ] ) === true
             ) {
-                if ($firstSymbol === null) {
+                if ( $firstSymbol === null ) {
                     $firstSymbol = $i;
                 }
 
-                $i = $tokens[$i]['scope_closer'];
+                $i = $tokens[ $i ][ 'scope_closer' ];
                 continue;
-            } else if ($tokens[$i]['code'] === T_STRING
-                && strtolower($tokens[$i]['content']) === 'define'
+            } else if ( $tokens[ $i ][ 'code' ] === T_STRING
+                && strtolower( $tokens[ $i ][ 'content' ] ) === 'define'
             ) {
-                $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($i - 1), null, true);
-                if ($tokens[$prev]['code'] !== T_OBJECT_OPERATOR
-                    && $tokens[$prev]['code'] !== T_DOUBLE_COLON
-                    && $tokens[$prev]['code'] !== T_FUNCTION
+                $prev = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $i - 1 ), null, true );
+                if ( $tokens[ $prev ][ 'code' ] !== T_OBJECT_OPERATOR
+                    && $tokens[ $prev ][ 'code' ] !== T_DOUBLE_COLON
+                    && $tokens[ $prev ][ 'code' ] !== T_FUNCTION
                 ) {
-                    if ($firstSymbol === null) {
+                    if ( $firstSymbol === null ) {
                         $firstSymbol = $i;
                     }
 
-                    $semicolon = $phpcsFile->findNext(T_SEMICOLON, ($i + 1));
-                    if ($semicolon !== false) {
+                    $semicolon = $phpcsFile->findNext( T_SEMICOLON, ( $i + 1 ) );
+                    if ( $semicolon !== false ) {
                         $i = $semicolon;
                     }
 
@@ -206,19 +206,19 @@ 
             // Special case for defined() as it can be used to see
             // if a constant (a symbol) should be defined or not and
             // doesn't need to use a full conditional block.
-            if ($tokens[$i]['code'] === T_STRING
-                && strtolower($tokens[$i]['content']) === 'defined'
+            if ( $tokens[ $i ][ 'code' ] === T_STRING
+                && strtolower( $tokens[ $i ][ 'content' ] ) === 'defined'
             ) {
-                $openBracket = $phpcsFile->findNext(Tokens::$emptyTokens, ($i + 1), null, true);
-                if ($tokens[$openBracket]['code'] === T_OPEN_PARENTHESIS
-                    && isset($tokens[$openBracket]['parenthesis_closer']) === true
+                $openBracket = $phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), null, true );
+                if ( $tokens[ $openBracket ][ 'code' ] === T_OPEN_PARENTHESIS
+                    && isset( $tokens[ $openBracket ][ 'parenthesis_closer' ] ) === true
                 ) {
-                    $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($i - 1), null, true);
-                    if ($tokens[$prev]['code'] !== T_OBJECT_OPERATOR
-                        && $tokens[$prev]['code'] !== T_DOUBLE_COLON
-                        && $tokens[$prev]['code'] !== T_FUNCTION
+                    $prev = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $i - 1 ), null, true );
+                    if ( $tokens[ $prev ][ 'code' ] !== T_OBJECT_OPERATOR
+                        && $tokens[ $prev ][ 'code' ] !== T_DOUBLE_COLON
+                        && $tokens[ $prev ][ 'code' ] !== T_FUNCTION
                     ) {
-                        $i = $tokens[$openBracket]['parenthesis_closer'];
+                        $i = $tokens[ $openBracket ][ 'parenthesis_closer' ];
                         continue;
                     }
                 }
@@ -227,44 +227,44 @@ 
             // Conditional statements are allowed in symbol files as long as the
             // contents is only a symbol definition. So don't count these as effects
             // in this case.
-            if (isset($conditions[$tokens[$i]['code']]) === true) {
-                if (isset($tokens[$i]['scope_opener']) === false) {
+            if ( isset( $conditions[ $tokens[ $i ][ 'code' ] ] ) === true ) {
+                if ( isset( $tokens[ $i ][ 'scope_opener' ] ) === false ) {
                     // Probably an "else if", so just ignore.
                     continue;
                 }
 
                 $result = $this->searchForConflict(
                     $phpcsFile,
-                    ($tokens[$i]['scope_opener'] + 1),
-                    ($tokens[$i]['scope_closer'] - 1),
+                    ( $tokens[ $i ][ 'scope_opener' ] + 1 ),
+                    ( $tokens[ $i ][ 'scope_closer' ] - 1 ),
                     $tokens
                 );
 
-                if ($result['symbol'] !== null) {
-                    if ($firstSymbol === null) {
-                        $firstSymbol = $result['symbol'];
+                if ( $result[ 'symbol' ] !== null ) {
+                    if ( $firstSymbol === null ) {
+                        $firstSymbol = $result[ 'symbol' ];
                     }
 
-                    if ($result['effect'] !== null) {
+                    if ( $result[ 'effect' ] !== null ) {
                         // Found a conflict.
-                        $firstEffect = $result['effect'];
+                        $firstEffect = $result[ 'effect' ];
                         break;
                     }
                 }
 
-                if ($firstEffect === null) {
-                    $firstEffect = $result['effect'];
+                if ( $firstEffect === null ) {
+                    $firstEffect = $result[ 'effect' ];
                 }
 
-                $i = $tokens[$i]['scope_closer'];
+                $i = $tokens[ $i ][ 'scope_closer' ];
                 continue;
             }//end if
 
-            if ($firstEffect === null) {
+            if ( $firstEffect === null ) {
                 $firstEffect = $i;
             }
 
-            if ($firstSymbol !== null) {
+            if ( $firstSymbol !== null ) {
                 // We have a conflict we have to report, so no point continuing.
                 break;
             }

Braces +4 added lines, -8 removed lines

@@ -13,8 +13,7 @@ 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
 
-class SideEffectsSniff implements Sniff
-{
+class SideEffectsSniff implements Sniff {
 
 
     /**
@@ -22,8 +21,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return [T_OPEN_TAG];
 
     }//end register()
@@ -38,8 +36,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
         $result = $this->searchForConflict($phpcsFile, 0, ($phpcsFile->numTokens - 1), $tokens);
 
@@ -76,8 +73,7 @@ 
      *
      * @return array
      */
-    private function searchForConflict($phpcsFile, $start, $end, $tokens)
-    {
+    private function searchForConflict($phpcsFile, $start, $end, $tokens) {
         $symbols = [
             T_CLASS     => T_CLASS,
             T_INTERFACE => T_INTERFACE,

vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Commenting/InlineCommentSniff.php

Doc Comments +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
      * @param int                         $stackPtr  The position of the current token in the
      *                                               stack passed in $tokens.
      *
-     * @return void
+     * @return null|integer
      */
     public function process(File $phpcsFile, $stackPtr)
     {

Indentation +322 added lines, -322 removed lines

@@ -16,328 +16,328 @@
 class InlineCommentSniff implements Sniff
 {
 
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = [
-        'PHP',
-        'JS',
-    ];
-
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return [
-            T_COMMENT,
-            T_DOC_COMMENT_OPEN_TAG,
-        ];
-
-    }//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();
-
-        // If this is a function/class/interface doc block comment, skip it.
-        // We are only interested in inline doc block comments, which are
-        // not allowed.
-        if ($tokens[$stackPtr]['code'] === T_DOC_COMMENT_OPEN_TAG) {
-            $nextToken = $phpcsFile->findNext(
-                Tokens::$emptyTokens,
-                ($stackPtr + 1),
-                null,
-                true
-            );
-
-            $ignore = [
-                T_CLASS,
-                T_INTERFACE,
-                T_TRAIT,
-                T_FUNCTION,
-                T_CLOSURE,
-                T_PUBLIC,
-                T_PRIVATE,
-                T_PROTECTED,
-                T_FINAL,
-                T_STATIC,
-                T_ABSTRACT,
-                T_CONST,
-                T_PROPERTY,
-                T_INCLUDE,
-                T_INCLUDE_ONCE,
-                T_REQUIRE,
-                T_REQUIRE_ONCE,
-            ];
-
-            if (in_array($tokens[$nextToken]['code'], $ignore, true) === true) {
-                return;
-            }
-
-            if ($phpcsFile->tokenizerType === 'JS') {
-                // We allow block comments if a function or object
-                // is being assigned to a variable.
-                $ignore    = Tokens::$emptyTokens;
-                $ignore[]  = T_EQUAL;
-                $ignore[]  = T_STRING;
-                $ignore[]  = T_OBJECT_OPERATOR;
-                $nextToken = $phpcsFile->findNext($ignore, ($nextToken + 1), null, true);
-                if ($tokens[$nextToken]['code'] === T_FUNCTION
-                    || $tokens[$nextToken]['code'] === T_CLOSURE
-                    || $tokens[$nextToken]['code'] === T_OBJECT
-                    || $tokens[$nextToken]['code'] === T_PROTOTYPE
-                ) {
-                    return;
-                }
-            }
-
-            $prevToken = $phpcsFile->findPrevious(
-                Tokens::$emptyTokens,
-                ($stackPtr - 1),
-                null,
-                true
-            );
-
-            if ($tokens[$prevToken]['code'] === T_OPEN_TAG) {
-                return;
-            }
-
-            if ($tokens[$stackPtr]['content'] === '/**') {
-                $error = 'Inline doc block comments are not allowed; use "/* Comment */" or "// Comment" instead';
-                $phpcsFile->addError($error, $stackPtr, 'DocBlock');
-            }
-        }//end if
-
-        if ($tokens[$stackPtr]['content']{0} === '#') {
-            $error = 'Perl-style comments are not allowed; use "// Comment" instead';
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'WrongStyle');
-            if ($fix === true) {
-                $comment = ltrim($tokens[$stackPtr]['content'], "# \t");
-                $phpcsFile->fixer->replaceToken($stackPtr, "// $comment");
-            }
-        }
-
-        // We don't want end of block comments. Check if the last token before the
-        // comment is a closing curly brace.
-        $previousContent = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
-        if ($tokens[$previousContent]['line'] === $tokens[$stackPtr]['line']) {
-            if ($tokens[$previousContent]['code'] === T_CLOSE_CURLY_BRACKET) {
-                return;
-            }
-
-            // Special case for JS files.
-            if ($tokens[$previousContent]['code'] === T_COMMA
-                || $tokens[$previousContent]['code'] === T_SEMICOLON
-            ) {
-                $lastContent = $phpcsFile->findPrevious(T_WHITESPACE, ($previousContent - 1), null, true);
-                if ($tokens[$lastContent]['code'] === T_CLOSE_CURLY_BRACKET) {
-                    return;
-                }
-            }
-        }
-
-        // Only want inline comments.
-        if (substr($tokens[$stackPtr]['content'], 0, 2) !== '//') {
-            return;
-        }
-
-        $commentTokens = [$stackPtr];
-
-        $nextComment = $stackPtr;
-        $lastComment = $stackPtr;
-        while (($nextComment = $phpcsFile->findNext(T_COMMENT, ($nextComment + 1), null, false)) !== false) {
-            if ($tokens[$nextComment]['line'] !== ($tokens[$lastComment]['line'] + 1)) {
-                break;
-            }
-
-            // Only want inline comments.
-            if (substr($tokens[$nextComment]['content'], 0, 2) !== '//') {
-                break;
-            }
-
-            // There is a comment on the very next line. If there is
-            // no code between the comments, they are part of the same
-            // comment block.
-            $prevNonWhitespace = $phpcsFile->findPrevious(T_WHITESPACE, ($nextComment - 1), $lastComment, true);
-            if ($prevNonWhitespace !== $lastComment) {
-                break;
-            }
-
-            $commentTokens[] = $nextComment;
-            $lastComment     = $nextComment;
-        }//end while
-
-        $commentText = '';
-        foreach ($commentTokens as $lastCommentToken) {
-            $comment = rtrim($tokens[$lastCommentToken]['content']);
-
-            if (trim(substr($comment, 2)) === '') {
-                continue;
-            }
-
-            $spaceCount = 0;
-            $tabFound   = false;
-
-            $commentLength = strlen($comment);
-            for ($i = 2; $i < $commentLength; $i++) {
-                if ($comment[$i] === "\t") {
-                    $tabFound = true;
-                    break;
-                }
-
-                if ($comment[$i] !== ' ') {
-                    break;
-                }
-
-                $spaceCount++;
-            }
-
-            $fix = false;
-            if ($tabFound === true) {
-                $error = 'Tab found before comment text; expected "// %s" but found "%s"';
-                $data  = [
-                    ltrim(substr($comment, 2)),
-                    $comment,
-                ];
-                $fix   = $phpcsFile->addFixableError($error, $lastCommentToken, 'TabBefore', $data);
-            } else if ($spaceCount === 0) {
-                $error = 'No space found before comment text; expected "// %s" but found "%s"';
-                $data  = [
-                    substr($comment, 2),
-                    $comment,
-                ];
-                $fix   = $phpcsFile->addFixableError($error, $lastCommentToken, 'NoSpaceBefore', $data);
-            } else if ($spaceCount > 1) {
-                $error = 'Expected 1 space before comment text but found %s; use block comment if you need indentation';
-                $data  = [
-                    $spaceCount,
-                    substr($comment, (2 + $spaceCount)),
-                    $comment,
-                ];
-                $fix   = $phpcsFile->addFixableError($error, $lastCommentToken, 'SpacingBefore', $data);
-            }//end if
-
-            if ($fix === true) {
-                $newComment = '// '.ltrim($tokens[$lastCommentToken]['content'], "/\t ");
-                $phpcsFile->fixer->replaceToken($lastCommentToken, $newComment);
-            }
-
-            $commentText .= trim(substr($tokens[$lastCommentToken]['content'], 2));
-        }//end foreach
-
-        if ($commentText === '') {
-            $error = 'Blank comments are not allowed';
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'Empty');
-            if ($fix === true) {
-                $phpcsFile->fixer->replaceToken($stackPtr, '');
-            }
-
-            return ($lastCommentToken + 1);
-        }
-
-        if (preg_match('/^\p{Ll}/u', $commentText) === 1) {
-            $error = 'Inline comments must start with a capital letter';
-            $phpcsFile->addError($error, $stackPtr, 'NotCapital');
-        }
-
-        // Only check the end of comment character if the start of the comment
-        // is a letter, indicating that the comment is just standard text.
-        if (preg_match('/^\p{L}/u', $commentText) === 1) {
-            $commentCloser   = $commentText[(strlen($commentText) - 1)];
-            $acceptedClosers = [
-                'full-stops'        => '.',
-                'exclamation marks' => '!',
-                'or question marks' => '?',
-            ];
-
-            if (in_array($commentCloser, $acceptedClosers, true) === false) {
-                $error = 'Inline comments must end in %s';
-                $ender = '';
-                foreach ($acceptedClosers as $closerName => $symbol) {
-                    $ender .= ' '.$closerName.',';
-                }
-
-                $ender = trim($ender, ' ,');
-                $data  = [$ender];
-                $phpcsFile->addError($error, $lastCommentToken, 'InvalidEndChar', $data);
-            }
-        }
-
-        // Finally, the line below the last comment cannot be empty if this inline
-        // comment is on a line by itself.
-        if ($tokens[$previousContent]['line'] < $tokens[$stackPtr]['line']) {
-            $next = $phpcsFile->findNext(T_WHITESPACE, ($lastCommentToken + 1), null, true);
-            if ($next === false) {
-                // Ignore if the comment is the last non-whitespace token in a file.
-                return ($lastCommentToken + 1);
-            }
-
-            if ($tokens[$next]['code'] === T_DOC_COMMENT_OPEN_TAG) {
-                // If this inline comment is followed by a docblock,
-                // ignore spacing as docblock/function etc spacing rules
-                // are likely to conflict with our rules.
-                return ($lastCommentToken + 1);
-            }
-
-            $errorCode = 'SpacingAfter';
-
-            if (isset($tokens[$stackPtr]['conditions']) === true) {
-                $conditions   = $tokens[$stackPtr]['conditions'];
-                $type         = end($conditions);
-                $conditionPtr = key($conditions);
-
-                if (($type === T_FUNCTION || $type === T_CLOSURE)
-                    && $tokens[$conditionPtr]['scope_closer'] === $next
-                ) {
-                    $errorCode = 'SpacingAfterAtFunctionEnd';
-                }
-            }
-
-            for ($i = ($lastCommentToken + 1); $i < $phpcsFile->numTokens; $i++) {
-                if ($tokens[$i]['line'] === ($tokens[$lastCommentToken]['line'] + 1)) {
-                    if ($tokens[$i]['code'] !== T_WHITESPACE) {
-                        return ($lastCommentToken + 1);
-                    }
-                } else if ($tokens[$i]['line'] > ($tokens[$lastCommentToken]['line'] + 1)) {
-                    break;
-                }
-            }
-
-            $error = 'There must be no blank line following an inline comment';
-            $fix   = $phpcsFile->addFixableError($error, $lastCommentToken, $errorCode);
-            if ($fix === true) {
-                $phpcsFile->fixer->beginChangeset();
-                for ($i = ($lastCommentToken + 1); $i < $next; $i++) {
-                    if ($tokens[$i]['line'] === $tokens[$next]['line']) {
-                        break;
-                    }
-
-                    $phpcsFile->fixer->replaceToken($i, '');
-                }
-
-                $phpcsFile->fixer->endChangeset();
-            }
-        }//end if
-
-        return ($lastCommentToken + 1);
-
-    }//end process()
+	/**
+	 * A list of tokenizers this sniff supports.
+	 *
+	 * @var array
+	 */
+	public $supportedTokenizers = [
+		'PHP',
+		'JS',
+	];
+
+
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return [
+			T_COMMENT,
+			T_DOC_COMMENT_OPEN_TAG,
+		];
+
+	}//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();
+
+		// If this is a function/class/interface doc block comment, skip it.
+		// We are only interested in inline doc block comments, which are
+		// not allowed.
+		if ($tokens[$stackPtr]['code'] === T_DOC_COMMENT_OPEN_TAG) {
+			$nextToken = $phpcsFile->findNext(
+				Tokens::$emptyTokens,
+				($stackPtr + 1),
+				null,
+				true
+			);
+
+			$ignore = [
+				T_CLASS,
+				T_INTERFACE,
+				T_TRAIT,
+				T_FUNCTION,
+				T_CLOSURE,
+				T_PUBLIC,
+				T_PRIVATE,
+				T_PROTECTED,
+				T_FINAL,
+				T_STATIC,
+				T_ABSTRACT,
+				T_CONST,
+				T_PROPERTY,
+				T_INCLUDE,
+				T_INCLUDE_ONCE,
+				T_REQUIRE,
+				T_REQUIRE_ONCE,
+			];
+
+			if (in_array($tokens[$nextToken]['code'], $ignore, true) === true) {
+				return;
+			}
+
+			if ($phpcsFile->tokenizerType === 'JS') {
+				// We allow block comments if a function or object
+				// is being assigned to a variable.
+				$ignore    = Tokens::$emptyTokens;
+				$ignore[]  = T_EQUAL;
+				$ignore[]  = T_STRING;
+				$ignore[]  = T_OBJECT_OPERATOR;
+				$nextToken = $phpcsFile->findNext($ignore, ($nextToken + 1), null, true);
+				if ($tokens[$nextToken]['code'] === T_FUNCTION
+					|| $tokens[$nextToken]['code'] === T_CLOSURE
+					|| $tokens[$nextToken]['code'] === T_OBJECT
+					|| $tokens[$nextToken]['code'] === T_PROTOTYPE
+				) {
+					return;
+				}
+			}
+
+			$prevToken = $phpcsFile->findPrevious(
+				Tokens::$emptyTokens,
+				($stackPtr - 1),
+				null,
+				true
+			);
+
+			if ($tokens[$prevToken]['code'] === T_OPEN_TAG) {
+				return;
+			}
+
+			if ($tokens[$stackPtr]['content'] === '/**') {
+				$error = 'Inline doc block comments are not allowed; use "/* Comment */" or "// Comment" instead';
+				$phpcsFile->addError($error, $stackPtr, 'DocBlock');
+			}
+		}//end if
+
+		if ($tokens[$stackPtr]['content']{0} === '#') {
+			$error = 'Perl-style comments are not allowed; use "// Comment" instead';
+			$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'WrongStyle');
+			if ($fix === true) {
+				$comment = ltrim($tokens[$stackPtr]['content'], "# \t");
+				$phpcsFile->fixer->replaceToken($stackPtr, "// $comment");
+			}
+		}
+
+		// We don't want end of block comments. Check if the last token before the
+		// comment is a closing curly brace.
+		$previousContent = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
+		if ($tokens[$previousContent]['line'] === $tokens[$stackPtr]['line']) {
+			if ($tokens[$previousContent]['code'] === T_CLOSE_CURLY_BRACKET) {
+				return;
+			}
+
+			// Special case for JS files.
+			if ($tokens[$previousContent]['code'] === T_COMMA
+				|| $tokens[$previousContent]['code'] === T_SEMICOLON
+			) {
+				$lastContent = $phpcsFile->findPrevious(T_WHITESPACE, ($previousContent - 1), null, true);
+				if ($tokens[$lastContent]['code'] === T_CLOSE_CURLY_BRACKET) {
+					return;
+				}
+			}
+		}
+
+		// Only want inline comments.
+		if (substr($tokens[$stackPtr]['content'], 0, 2) !== '//') {
+			return;
+		}
+
+		$commentTokens = [$stackPtr];
+
+		$nextComment = $stackPtr;
+		$lastComment = $stackPtr;
+		while (($nextComment = $phpcsFile->findNext(T_COMMENT, ($nextComment + 1), null, false)) !== false) {
+			if ($tokens[$nextComment]['line'] !== ($tokens[$lastComment]['line'] + 1)) {
+				break;
+			}
+
+			// Only want inline comments.
+			if (substr($tokens[$nextComment]['content'], 0, 2) !== '//') {
+				break;
+			}
+
+			// There is a comment on the very next line. If there is
+			// no code between the comments, they are part of the same
+			// comment block.
+			$prevNonWhitespace = $phpcsFile->findPrevious(T_WHITESPACE, ($nextComment - 1), $lastComment, true);
+			if ($prevNonWhitespace !== $lastComment) {
+				break;
+			}
+
+			$commentTokens[] = $nextComment;
+			$lastComment     = $nextComment;
+		}//end while
+
+		$commentText = '';
+		foreach ($commentTokens as $lastCommentToken) {
+			$comment = rtrim($tokens[$lastCommentToken]['content']);
+
+			if (trim(substr($comment, 2)) === '') {
+				continue;
+			}
+
+			$spaceCount = 0;
+			$tabFound   = false;
+
+			$commentLength = strlen($comment);
+			for ($i = 2; $i < $commentLength; $i++) {
+				if ($comment[$i] === "\t") {
+					$tabFound = true;
+					break;
+				}
+
+				if ($comment[$i] !== ' ') {
+					break;
+				}
+
+				$spaceCount++;
+			}
+
+			$fix = false;
+			if ($tabFound === true) {
+				$error = 'Tab found before comment text; expected "// %s" but found "%s"';
+				$data  = [
+					ltrim(substr($comment, 2)),
+					$comment,
+				];
+				$fix   = $phpcsFile->addFixableError($error, $lastCommentToken, 'TabBefore', $data);
+			} else if ($spaceCount === 0) {
+				$error = 'No space found before comment text; expected "// %s" but found "%s"';
+				$data  = [
+					substr($comment, 2),
+					$comment,
+				];
+				$fix   = $phpcsFile->addFixableError($error, $lastCommentToken, 'NoSpaceBefore', $data);
+			} else if ($spaceCount > 1) {
+				$error = 'Expected 1 space before comment text but found %s; use block comment if you need indentation';
+				$data  = [
+					$spaceCount,
+					substr($comment, (2 + $spaceCount)),
+					$comment,
+				];
+				$fix   = $phpcsFile->addFixableError($error, $lastCommentToken, 'SpacingBefore', $data);
+			}//end if
+
+			if ($fix === true) {
+				$newComment = '// '.ltrim($tokens[$lastCommentToken]['content'], "/\t ");
+				$phpcsFile->fixer->replaceToken($lastCommentToken, $newComment);
+			}
+
+			$commentText .= trim(substr($tokens[$lastCommentToken]['content'], 2));
+		}//end foreach
+
+		if ($commentText === '') {
+			$error = 'Blank comments are not allowed';
+			$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'Empty');
+			if ($fix === true) {
+				$phpcsFile->fixer->replaceToken($stackPtr, '');
+			}
+
+			return ($lastCommentToken + 1);
+		}
+
+		if (preg_match('/^\p{Ll}/u', $commentText) === 1) {
+			$error = 'Inline comments must start with a capital letter';
+			$phpcsFile->addError($error, $stackPtr, 'NotCapital');
+		}
+
+		// Only check the end of comment character if the start of the comment
+		// is a letter, indicating that the comment is just standard text.
+		if (preg_match('/^\p{L}/u', $commentText) === 1) {
+			$commentCloser   = $commentText[(strlen($commentText) - 1)];
+			$acceptedClosers = [
+				'full-stops'        => '.',
+				'exclamation marks' => '!',
+				'or question marks' => '?',
+			];
+
+			if (in_array($commentCloser, $acceptedClosers, true) === false) {
+				$error = 'Inline comments must end in %s';
+				$ender = '';
+				foreach ($acceptedClosers as $closerName => $symbol) {
+					$ender .= ' '.$closerName.',';
+				}
+
+				$ender = trim($ender, ' ,');
+				$data  = [$ender];
+				$phpcsFile->addError($error, $lastCommentToken, 'InvalidEndChar', $data);
+			}
+		}
+
+		// Finally, the line below the last comment cannot be empty if this inline
+		// comment is on a line by itself.
+		if ($tokens[$previousContent]['line'] < $tokens[$stackPtr]['line']) {
+			$next = $phpcsFile->findNext(T_WHITESPACE, ($lastCommentToken + 1), null, true);
+			if ($next === false) {
+				// Ignore if the comment is the last non-whitespace token in a file.
+				return ($lastCommentToken + 1);
+			}
+
+			if ($tokens[$next]['code'] === T_DOC_COMMENT_OPEN_TAG) {
+				// If this inline comment is followed by a docblock,
+				// ignore spacing as docblock/function etc spacing rules
+				// are likely to conflict with our rules.
+				return ($lastCommentToken + 1);
+			}
+
+			$errorCode = 'SpacingAfter';
+
+			if (isset($tokens[$stackPtr]['conditions']) === true) {
+				$conditions   = $tokens[$stackPtr]['conditions'];
+				$type         = end($conditions);
+				$conditionPtr = key($conditions);
+
+				if (($type === T_FUNCTION || $type === T_CLOSURE)
+					&& $tokens[$conditionPtr]['scope_closer'] === $next
+				) {
+					$errorCode = 'SpacingAfterAtFunctionEnd';
+				}
+			}
+
+			for ($i = ($lastCommentToken + 1); $i < $phpcsFile->numTokens; $i++) {
+				if ($tokens[$i]['line'] === ($tokens[$lastCommentToken]['line'] + 1)) {
+					if ($tokens[$i]['code'] !== T_WHITESPACE) {
+						return ($lastCommentToken + 1);
+					}
+				} else if ($tokens[$i]['line'] > ($tokens[$lastCommentToken]['line'] + 1)) {
+					break;
+				}
+			}
+
+			$error = 'There must be no blank line following an inline comment';
+			$fix   = $phpcsFile->addFixableError($error, $lastCommentToken, $errorCode);
+			if ($fix === true) {
+				$phpcsFile->fixer->beginChangeset();
+				for ($i = ($lastCommentToken + 1); $i < $next; $i++) {
+					if ($tokens[$i]['line'] === $tokens[$next]['line']) {
+						break;
+					}
+
+					$phpcsFile->fixer->replaceToken($i, '');
+				}
+
+				$phpcsFile->fixer->endChangeset();
+			}
+		}//end if
+
+		return ($lastCommentToken + 1);
+
+	}//end process()
 
 
 }//end class

Spacing +95 added lines, -95 removed lines

@@ -51,17 +51,17 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
         // If this is a function/class/interface doc block comment, skip it.
         // We are only interested in inline doc block comments, which are
         // not allowed.
-        if ($tokens[$stackPtr]['code'] === T_DOC_COMMENT_OPEN_TAG) {
+        if ( $tokens[ $stackPtr ][ 'code' ] === T_DOC_COMMENT_OPEN_TAG ) {
             $nextToken = $phpcsFile->findNext(
                 Tokens::$emptyTokens,
-                ($stackPtr + 1),
+                ( $stackPtr + 1 ),
                 null,
                 true
             );
@@ -86,22 +86,22 @@ 
                 T_REQUIRE_ONCE,
             ];
 
-            if (in_array($tokens[$nextToken]['code'], $ignore, true) === true) {
+            if ( in_array( $tokens[ $nextToken ][ 'code' ], $ignore, true ) === true ) {
                 return;
             }
 
-            if ($phpcsFile->tokenizerType === 'JS') {
+            if ( $phpcsFile->tokenizerType === 'JS' ) {
                 // We allow block comments if a function or object
                 // is being assigned to a variable.
                 $ignore    = Tokens::$emptyTokens;
-                $ignore[]  = T_EQUAL;
-                $ignore[]  = T_STRING;
-                $ignore[]  = T_OBJECT_OPERATOR;
-                $nextToken = $phpcsFile->findNext($ignore, ($nextToken + 1), null, true);
-                if ($tokens[$nextToken]['code'] === T_FUNCTION
-                    || $tokens[$nextToken]['code'] === T_CLOSURE
-                    || $tokens[$nextToken]['code'] === T_OBJECT
-                    || $tokens[$nextToken]['code'] === T_PROTOTYPE
+                $ignore[ ]  = T_EQUAL;
+                $ignore[ ]  = T_STRING;
+                $ignore[ ]  = T_OBJECT_OPERATOR;
+                $nextToken = $phpcsFile->findNext( $ignore, ( $nextToken + 1 ), null, true );
+                if ( $tokens[ $nextToken ][ 'code' ] === T_FUNCTION
+                    || $tokens[ $nextToken ][ 'code' ] === T_CLOSURE
+                    || $tokens[ $nextToken ][ 'code' ] === T_OBJECT
+                    || $tokens[ $nextToken ][ 'code' ] === T_PROTOTYPE
                 ) {
                     return;
                 }
@@ -109,99 +109,99 @@ 
 
             $prevToken = $phpcsFile->findPrevious(
                 Tokens::$emptyTokens,
-                ($stackPtr - 1),
+                ( $stackPtr - 1 ),
                 null,
                 true
             );
 
-            if ($tokens[$prevToken]['code'] === T_OPEN_TAG) {
+            if ( $tokens[ $prevToken ][ 'code' ] === T_OPEN_TAG ) {
                 return;
             }
 
-            if ($tokens[$stackPtr]['content'] === '/**') {
+            if ( $tokens[ $stackPtr ][ 'content' ] === '/**' ) {
                 $error = 'Inline doc block comments are not allowed; use "/* Comment */" or "// Comment" instead';
-                $phpcsFile->addError($error, $stackPtr, 'DocBlock');
+                $phpcsFile->addError( $error, $stackPtr, 'DocBlock' );
             }
         }//end if
 
-        if ($tokens[$stackPtr]['content']{0} === '#') {
+        if ( $tokens[ $stackPtr ][ 'content' ]{0} === '#' ) {
             $error = 'Perl-style comments are not allowed; use "// Comment" instead';
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'WrongStyle');
-            if ($fix === true) {
-                $comment = ltrim($tokens[$stackPtr]['content'], "# \t");
-                $phpcsFile->fixer->replaceToken($stackPtr, "// $comment");
+            $fix   = $phpcsFile->addFixableError( $error, $stackPtr, 'WrongStyle' );
+            if ( $fix === true ) {
+                $comment = ltrim( $tokens[ $stackPtr ][ 'content' ], "# \t" );
+                $phpcsFile->fixer->replaceToken( $stackPtr, "// $comment" );
             }
         }
 
         // We don't want end of block comments. Check if the last token before the
         // comment is a closing curly brace.
-        $previousContent = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
-        if ($tokens[$previousContent]['line'] === $tokens[$stackPtr]['line']) {
-            if ($tokens[$previousContent]['code'] === T_CLOSE_CURLY_BRACKET) {
+        $previousContent = $phpcsFile->findPrevious( T_WHITESPACE, ( $stackPtr - 1 ), null, true );
+        if ( $tokens[ $previousContent ][ 'line' ] === $tokens[ $stackPtr ][ 'line' ] ) {
+            if ( $tokens[ $previousContent ][ 'code' ] === T_CLOSE_CURLY_BRACKET ) {
                 return;
             }
 
             // Special case for JS files.
-            if ($tokens[$previousContent]['code'] === T_COMMA
-                || $tokens[$previousContent]['code'] === T_SEMICOLON
+            if ( $tokens[ $previousContent ][ 'code' ] === T_COMMA
+                || $tokens[ $previousContent ][ 'code' ] === T_SEMICOLON
             ) {
-                $lastContent = $phpcsFile->findPrevious(T_WHITESPACE, ($previousContent - 1), null, true);
-                if ($tokens[$lastContent]['code'] === T_CLOSE_CURLY_BRACKET) {
+                $lastContent = $phpcsFile->findPrevious( T_WHITESPACE, ( $previousContent - 1 ), null, true );
+                if ( $tokens[ $lastContent ][ 'code' ] === T_CLOSE_CURLY_BRACKET ) {
                     return;
                 }
             }
         }
 
         // Only want inline comments.
-        if (substr($tokens[$stackPtr]['content'], 0, 2) !== '//') {
+        if ( substr( $tokens[ $stackPtr ][ 'content' ], 0, 2 ) !== '//' ) {
             return;
         }
 
-        $commentTokens = [$stackPtr];
+        $commentTokens = [ $stackPtr ];
 
         $nextComment = $stackPtr;
         $lastComment = $stackPtr;
-        while (($nextComment = $phpcsFile->findNext(T_COMMENT, ($nextComment + 1), null, false)) !== false) {
-            if ($tokens[$nextComment]['line'] !== ($tokens[$lastComment]['line'] + 1)) {
+        while ( ( $nextComment = $phpcsFile->findNext( T_COMMENT, ( $nextComment + 1 ), null, false ) ) !== false ) {
+            if ( $tokens[ $nextComment ][ 'line' ] !== ( $tokens[ $lastComment ][ 'line' ] + 1 ) ) {
                 break;
             }
 
             // Only want inline comments.
-            if (substr($tokens[$nextComment]['content'], 0, 2) !== '//') {
+            if ( substr( $tokens[ $nextComment ][ 'content' ], 0, 2 ) !== '//' ) {
                 break;
             }
 
             // There is a comment on the very next line. If there is
             // no code between the comments, they are part of the same
             // comment block.
-            $prevNonWhitespace = $phpcsFile->findPrevious(T_WHITESPACE, ($nextComment - 1), $lastComment, true);
-            if ($prevNonWhitespace !== $lastComment) {
+            $prevNonWhitespace = $phpcsFile->findPrevious( T_WHITESPACE, ( $nextComment - 1 ), $lastComment, true );
+            if ( $prevNonWhitespace !== $lastComment ) {
                 break;
             }
 
-            $commentTokens[] = $nextComment;
+            $commentTokens[ ] = $nextComment;
             $lastComment     = $nextComment;
         }//end while
 
         $commentText = '';
-        foreach ($commentTokens as $lastCommentToken) {
-            $comment = rtrim($tokens[$lastCommentToken]['content']);
+        foreach ( $commentTokens as $lastCommentToken ) {
+            $comment = rtrim( $tokens[ $lastCommentToken ][ 'content' ] );
 
-            if (trim(substr($comment, 2)) === '') {
+            if ( trim( substr( $comment, 2 ) ) === '' ) {
                 continue;
             }
 
             $spaceCount = 0;
             $tabFound   = false;
 
-            $commentLength = strlen($comment);
-            for ($i = 2; $i < $commentLength; $i++) {
-                if ($comment[$i] === "\t") {
+            $commentLength = strlen( $comment );
+            for ( $i = 2; $i < $commentLength; $i++ ) {
+                if ( $comment[ $i ] === "\t" ) {
                     $tabFound = true;
                     break;
                 }
 
-                if ($comment[$i] !== ' ') {
+                if ( $comment[ $i ] !== ' ' ) {
                     break;
                 }
 
@@ -209,133 +209,133 @@ 
             }
 
             $fix = false;
-            if ($tabFound === true) {
+            if ( $tabFound === true ) {
                 $error = 'Tab found before comment text; expected "// %s" but found "%s"';
                 $data  = [
-                    ltrim(substr($comment, 2)),
+                    ltrim( substr( $comment, 2 ) ),
                     $comment,
                 ];
-                $fix   = $phpcsFile->addFixableError($error, $lastCommentToken, 'TabBefore', $data);
-            } else if ($spaceCount === 0) {
+                $fix   = $phpcsFile->addFixableError( $error, $lastCommentToken, 'TabBefore', $data );
+            } else if ( $spaceCount === 0 ) {
                 $error = 'No space found before comment text; expected "// %s" but found "%s"';
                 $data  = [
-                    substr($comment, 2),
+                    substr( $comment, 2 ),
                     $comment,
                 ];
-                $fix   = $phpcsFile->addFixableError($error, $lastCommentToken, 'NoSpaceBefore', $data);
-            } else if ($spaceCount > 1) {
+                $fix   = $phpcsFile->addFixableError( $error, $lastCommentToken, 'NoSpaceBefore', $data );
+            } else if ( $spaceCount > 1 ) {
                 $error = 'Expected 1 space before comment text but found %s; use block comment if you need indentation';
                 $data  = [
                     $spaceCount,
-                    substr($comment, (2 + $spaceCount)),
+                    substr( $comment, ( 2 + $spaceCount ) ),
                     $comment,
                 ];
-                $fix   = $phpcsFile->addFixableError($error, $lastCommentToken, 'SpacingBefore', $data);
+                $fix = $phpcsFile->addFixableError( $error, $lastCommentToken, 'SpacingBefore', $data );
             }//end if
 
-            if ($fix === true) {
-                $newComment = '// '.ltrim($tokens[$lastCommentToken]['content'], "/\t ");
-                $phpcsFile->fixer->replaceToken($lastCommentToken, $newComment);
+            if ( $fix === true ) {
+                $newComment = '// ' . ltrim( $tokens[ $lastCommentToken ][ 'content' ], "/\t " );
+                $phpcsFile->fixer->replaceToken( $lastCommentToken, $newComment );
             }
 
-            $commentText .= trim(substr($tokens[$lastCommentToken]['content'], 2));
+            $commentText .= trim( substr( $tokens[ $lastCommentToken ][ 'content' ], 2 ) );
         }//end foreach
 
-        if ($commentText === '') {
+        if ( $commentText === '' ) {
             $error = 'Blank comments are not allowed';
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'Empty');
-            if ($fix === true) {
-                $phpcsFile->fixer->replaceToken($stackPtr, '');
+            $fix   = $phpcsFile->addFixableError( $error, $stackPtr, 'Empty' );
+            if ( $fix === true ) {
+                $phpcsFile->fixer->replaceToken( $stackPtr, '' );
             }
 
-            return ($lastCommentToken + 1);
+            return ( $lastCommentToken + 1 );
         }
 
-        if (preg_match('/^\p{Ll}/u', $commentText) === 1) {
+        if ( preg_match( '/^\p{Ll}/u', $commentText ) === 1 ) {
             $error = 'Inline comments must start with a capital letter';
-            $phpcsFile->addError($error, $stackPtr, 'NotCapital');
+            $phpcsFile->addError( $error, $stackPtr, 'NotCapital' );
         }
 
         // Only check the end of comment character if the start of the comment
         // is a letter, indicating that the comment is just standard text.
-        if (preg_match('/^\p{L}/u', $commentText) === 1) {
-            $commentCloser   = $commentText[(strlen($commentText) - 1)];
+        if ( preg_match( '/^\p{L}/u', $commentText ) === 1 ) {
+            $commentCloser   = $commentText[ ( strlen( $commentText ) - 1 ) ];
             $acceptedClosers = [
                 'full-stops'        => '.',
                 'exclamation marks' => '!',
                 'or question marks' => '?',
             ];
 
-            if (in_array($commentCloser, $acceptedClosers, true) === false) {
+            if ( in_array( $commentCloser, $acceptedClosers, true ) === false ) {
                 $error = 'Inline comments must end in %s';
                 $ender = '';
-                foreach ($acceptedClosers as $closerName => $symbol) {
-                    $ender .= ' '.$closerName.',';
+                foreach ( $acceptedClosers as $closerName => $symbol ) {
+                    $ender .= ' ' . $closerName . ',';
                 }
 
-                $ender = trim($ender, ' ,');
-                $data  = [$ender];
-                $phpcsFile->addError($error, $lastCommentToken, 'InvalidEndChar', $data);
+                $ender = trim( $ender, ' ,' );
+                $data  = [ $ender ];
+                $phpcsFile->addError( $error, $lastCommentToken, 'InvalidEndChar', $data );
             }
         }
 
         // Finally, the line below the last comment cannot be empty if this inline
         // comment is on a line by itself.
-        if ($tokens[$previousContent]['line'] < $tokens[$stackPtr]['line']) {
-            $next = $phpcsFile->findNext(T_WHITESPACE, ($lastCommentToken + 1), null, true);
-            if ($next === false) {
+        if ( $tokens[ $previousContent ][ 'line' ] < $tokens[ $stackPtr ][ 'line' ] ) {
+            $next = $phpcsFile->findNext( T_WHITESPACE, ( $lastCommentToken + 1 ), null, true );
+            if ( $next === false ) {
                 // Ignore if the comment is the last non-whitespace token in a file.
-                return ($lastCommentToken + 1);
+                return ( $lastCommentToken + 1 );
             }
 
-            if ($tokens[$next]['code'] === T_DOC_COMMENT_OPEN_TAG) {
+            if ( $tokens[ $next ][ 'code' ] === T_DOC_COMMENT_OPEN_TAG ) {
                 // If this inline comment is followed by a docblock,
                 // ignore spacing as docblock/function etc spacing rules
                 // are likely to conflict with our rules.
-                return ($lastCommentToken + 1);
+                return ( $lastCommentToken + 1 );
             }
 
             $errorCode = 'SpacingAfter';
 
-            if (isset($tokens[$stackPtr]['conditions']) === true) {
-                $conditions   = $tokens[$stackPtr]['conditions'];
-                $type         = end($conditions);
-                $conditionPtr = key($conditions);
+            if ( isset( $tokens[ $stackPtr ][ 'conditions' ] ) === true ) {
+                $conditions   = $tokens[ $stackPtr ][ 'conditions' ];
+                $type         = end( $conditions );
+                $conditionPtr = key( $conditions );
 
-                if (($type === T_FUNCTION || $type === T_CLOSURE)
-                    && $tokens[$conditionPtr]['scope_closer'] === $next
+                if ( ( $type === T_FUNCTION || $type === T_CLOSURE )
+                    && $tokens[ $conditionPtr ][ 'scope_closer' ] === $next
                 ) {
                     $errorCode = 'SpacingAfterAtFunctionEnd';
                 }
             }
 
-            for ($i = ($lastCommentToken + 1); $i < $phpcsFile->numTokens; $i++) {
-                if ($tokens[$i]['line'] === ($tokens[$lastCommentToken]['line'] + 1)) {
-                    if ($tokens[$i]['code'] !== T_WHITESPACE) {
-                        return ($lastCommentToken + 1);
+            for ( $i = ( $lastCommentToken + 1 ); $i < $phpcsFile->numTokens; $i++ ) {
+                if ( $tokens[ $i ][ 'line' ] === ( $tokens[ $lastCommentToken ][ 'line' ] + 1 ) ) {
+                    if ( $tokens[ $i ][ 'code' ] !== T_WHITESPACE ) {
+                        return ( $lastCommentToken + 1 );
                     }
-                } else if ($tokens[$i]['line'] > ($tokens[$lastCommentToken]['line'] + 1)) {
+                } else if ( $tokens[ $i ][ 'line' ] > ( $tokens[ $lastCommentToken ][ 'line' ] + 1 ) ) {
                     break;
                 }
             }
 
             $error = 'There must be no blank line following an inline comment';
-            $fix   = $phpcsFile->addFixableError($error, $lastCommentToken, $errorCode);
-            if ($fix === true) {
+            $fix   = $phpcsFile->addFixableError( $error, $lastCommentToken, $errorCode );
+            if ( $fix === true ) {
                 $phpcsFile->fixer->beginChangeset();
-                for ($i = ($lastCommentToken + 1); $i < $next; $i++) {
-                    if ($tokens[$i]['line'] === $tokens[$next]['line']) {
+                for ( $i = ( $lastCommentToken + 1 ); $i < $next; $i++ ) {
+                    if ( $tokens[ $i ][ 'line' ] === $tokens[ $next ][ 'line' ] ) {
                         break;
                     }
 
-                    $phpcsFile->fixer->replaceToken($i, '');
+                    $phpcsFile->fixer->replaceToken( $i, '' );
                 }
 
                 $phpcsFile->fixer->endChangeset();
             }
         }//end if
 
-        return ($lastCommentToken + 1);
+        return ( $lastCommentToken + 1 );
 
     }//end process()
 

Braces +3 added lines, -6 removed lines

@@ -13,8 +13,7 @@ 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
 
-class InlineCommentSniff implements Sniff
-{
+class InlineCommentSniff implements Sniff {
 
     /**
      * A list of tokenizers this sniff supports.
@@ -32,8 +31,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return [
             T_COMMENT,
             T_DOC_COMMENT_OPEN_TAG,
@@ -51,8 +49,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         // If this is a function/class/interface doc block comment, skip it.

vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.inc

Doc Comments -3 removed lines

@@ -61,9 +61,6 @@
  *   - three
  *
  * @param array  &$tokens   The array of tokens to process.
- * @param object $tokenizer The tokenizer being used to
- *                          process this file.
- * @param string $eolChar   The EOL character to use for splitting strings.
  *
  * @return void
  */

Indentation +29 added lines, -29 removed lines

@@ -5,40 +5,40 @@ 
  */
 class MyClass
 {
-    /**
-     * Some info about the function here.
-     *
-     *@return void
-     */
-    function myFunction() {}
+	/**
+	 * Some info about the function here.
+	 *
+	 *@return void
+	 */
+	function myFunction() {}
 }
 
 /**
-  *  Some info about the class here
-  *
-  */
+ *  Some info about the class here
+ *
+ */
 class MyClass
 {
-    /**
-      *Some info about the function here.
-      *
-      *  @return void
-      */
-    function myFunction() {}
+	/**
+	 *Some info about the function here.
+	 *
+	 *  @return void
+	 */
+	function myFunction() {}
 }
 
 /**
  * Some info about the class here
-  *
+ *
 */
 class MyClass
 {
-    /**
-     * Some info about the function here.
-      *
-    * @return void
-     */
-    function myFunction() {}
+	/**
+	 * Some info about the function here.
+	 *
+	 * @return void
+	 */
+	function myFunction() {}
 }
 
 /** @var Database $mockedDatabase */
@@ -46,10 +46,10 @@ 
 
 function myFunction()
 {
-    echo 'hi';
-    /**
+	echo 'hi';
+	/**
         Comment here.
-        */
+	 */
 }
 
 /**
@@ -71,10 +71,10 @@ 
 
 class MyClass2
 {
-    /**
-       * Some info about the variable here.
-     */
-    var $x;
+	/**
+	 * Some info about the variable here.
+	 */
+	var $x;
 }
 
 /** ************************************************************************

Braces +5 added lines, -10 removed lines

@@ -3,8 +3,7 @@ 
 * Some info about the class here
  *
  */
-class MyClass
-{
+class MyClass {
     /**
      * Some info about the function here.
      *
@@ -17,8 +16,7 @@ 
   *  Some info about the class here
   *
   */
-class MyClass
-{
+class MyClass {
     /**
       *Some info about the function here.
       *
@@ -31,8 +29,7 @@ 
  * Some info about the class here
   *
 */
-class MyClass
-{
+class MyClass {
     /**
      * Some info about the function here.
       *
@@ -44,8 +41,7 @@ 
 /** @var Database $mockedDatabase */
 /** @var Container $mockedContainer */
 
-function myFunction()
-{
+function myFunction() {
     echo 'hi';
     /**
         Comment here.
@@ -69,8 +65,7 @@ 
  */
 function myFunction() {}
 
-class MyClass2
-{
+class MyClass2 {
     /**
        * Some info about the variable here.
      */

vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/ControlStructures/InlineIfDeclarationUnitTest.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +48 added lines, -48 removed lines

@@ -15,61 +15,61 @@
 {
 
 
-    /**
-     * Get a list of CLI values to set before the file is tested.
-     *
-     * @param string $testFile The name of the file being tested.
-     *
-     * @return array
-     */
-    public function getCliValues($testFile)
-    {
-        return ['--encoding=utf-8'];
+	/**
+	 * Get a list of CLI values to set before the file is tested.
+	 *
+	 * @param string $testFile The name of the file being tested.
+	 *
+	 * @return array
+	 */
+	public function getCliValues($testFile)
+	{
+		return ['--encoding=utf-8'];
 
-    }//end getCliValues()
+	}//end getCliValues()
 
 
-    /**
-     * Returns the lines where errors should occur.
-     *
-     * The key of the array should represent the line number and the value
-     * should represent the number of errors that should occur on that line.
-     *
-     * @return array<int, int>
-     */
-    public function getErrorList()
-    {
-        return [
-            4  => 1,
-            5  => 1,
-            6  => 1,
-            7  => 1,
-            8  => 1,
-            9  => 1,
-            10 => 1,
-            13 => 1,
-            20 => 1,
-            24 => 4,
-            44 => 1,
-            47 => 1,
-        ];
+	/**
+	 * Returns the lines where errors should occur.
+	 *
+	 * The key of the array should represent the line number and the value
+	 * should represent the number of errors that should occur on that line.
+	 *
+	 * @return array<int, int>
+	 */
+	public function getErrorList()
+	{
+		return [
+			4  => 1,
+			5  => 1,
+			6  => 1,
+			7  => 1,
+			8  => 1,
+			9  => 1,
+			10 => 1,
+			13 => 1,
+			20 => 1,
+			24 => 4,
+			44 => 1,
+			47 => 1,
+		];
 
-    }//end getErrorList()
+	}//end getErrorList()
 
 
-    /**
-     * Returns the lines where warnings should occur.
-     *
-     * The key of the array should represent the line number and the value
-     * should represent the number of warnings that should occur on that line.
-     *
-     * @return array<int, int>
-     */
-    public function getWarningList()
-    {
-        return [];
+	/**
+	 * Returns the lines where warnings should occur.
+	 *
+	 * The key of the array should represent the line number and the value
+	 * should represent the number of warnings that should occur on that line.
+	 *
+	 * @return array<int, int>
+	 */
+	public function getWarningList()
+	{
+		return [];
 
-    }//end getWarningList()
+	}//end getWarningList()
 
 
 }//end class

Spacing +3 added lines, -3 removed lines

@@ -22,9 +22,9 @@ 
      *
      * @return array
      */
-    public function getCliValues($testFile)
+    public function getCliValues( $testFile )
     {
-        return ['--encoding=utf-8'];
+        return [ '--encoding=utf-8' ];
 
     }//end getCliValues()
 
@@ -67,7 +67,7 @@ 
      */
     public function getWarningList()
     {
-        return [];
+        return [ ];
 
     }//end getWarningList()
 

Braces +4 added lines, -8 removed lines

@@ -11,8 +11,7 @@ 
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
-class InlineIfDeclarationUnitTest extends AbstractSniffUnitTest
-{
+class InlineIfDeclarationUnitTest extends AbstractSniffUnitTest {
 
 
     /**
@@ -22,8 +21,7 @@ 
      *
      * @return array
      */
-    public function getCliValues($testFile)
-    {
+    public function getCliValues($testFile) {
         return ['--encoding=utf-8'];
 
     }//end getCliValues()
@@ -37,8 +35,7 @@ 
      *
      * @return array<int, int>
      */
-    public function getErrorList()
-    {
+    public function getErrorList() {
         return [
             4  => 1,
             5  => 1,
@@ -65,8 +62,7 @@ 
      *
      * @return array<int, int>
      */
-    public function getWarningList()
-    {
+    public function getWarningList() {
         return [];
 
     }//end getWarningList()

vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/HeredocUnitTest.inc

Doc Comments -6 removed lines

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

Indentation +3 added lines, -9 removed lines

@@ -15,13 +15,7 @@
 // This is not a merge conflict - it is a valid test case.
 // 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

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

Spacing +1 added lines, -7 removed lines

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

Braces +1 added lines, -8 removed lines

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

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

@@ -3,13 +3,13 @@ 
 Example of string
 spanning multiple lines
 using heredoc syntax.
-EOD;
+eod;
 
 echo <<<'EOT'
 My name is "$name". I am printing some $foo->foo.
 Now, I am printing some {$foo->bar[1]}.
 This should not print a capital 'A': \x41
-EOT;
+eot;
 
 // The following function has a simulated git conflict for testing.
 // This is not a merge conflict - it is a valid test case.
@@ -19,9 +19,3 @@ 
         $arr = array(
             'a' => 'a'
 <<<<<<< HEAD
-            'b' => 'b'
-=======
-            'c' => 'c'
->>>>>>> master
-        );
-    }

vendor/squizlabs/php_codesniffer/src/Tokenizers/Tokenizer.php

Doc Comments +1 added lines

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

Indentation +1620 added lines, -1620 removed lines

@@ -15,1632 +15,1632 @@
 abstract class Tokenizer
 {
 
-    /**
-     * The config data for the run.
-     *
-     * @var \PHP_CodeSniffer\Config
-     */
-    protected $config = null;
-
-    /**
-     * The EOL char used in the content.
-     *
-     * @var string
-     */
-    protected $eolChar = [];
-
-    /**
-     * A token-based representation of the content.
-     *
-     * @var array
-     */
-    protected $tokens = [];
-
-    /**
-     * The number of tokens in the tokens array.
-     *
-     * @var integer
-     */
-    protected $numTokens = 0;
-
-    /**
-     * A list of tokens that are allowed to open a scope.
-     *
-     * @var array
-     */
-    public $scopeOpeners = [];
-
-    /**
-     * A list of tokens that end the scope.
-     *
-     * @var array
-     */
-    public $endScopeTokens = [];
-
-    /**
-     * Known lengths of tokens.
-     *
-     * @var array<int, int>
-     */
-    public $knownLengths = [];
-
-    /**
-     * A list of lines being ignored due to error suppression comments.
-     *
-     * @var array
-     */
-    public $ignoredLines = [];
-
-
-    /**
-     * Initialise and run the tokenizer.
-     *
-     * @param string                         $content The content to tokenize,
-     * @param \PHP_CodeSniffer\Config | null $config  The config data for the run.
-     * @param string                         $eolChar The EOL char used in the content.
-     *
-     * @return void
-     * @throws \PHP_CodeSniffer\Exceptions\TokenizerException If the file appears to be minified.
-     */
-    public function __construct($content, $config, $eolChar='\n')
-    {
-        $this->eolChar = $eolChar;
-
-        $this->config = $config;
-        $this->tokens = $this->tokenize($content);
-
-        if ($config === null) {
-            return;
-        }
-
-        $this->createPositionMap();
-        $this->createTokenMap();
-        $this->createParenthesisNestingMap();
-        $this->createScopeMap();
-        $this->createLevelMap();
-
-        // Allow the tokenizer to do additional processing if required.
-        $this->processAdditional();
-
-    }//end __construct()
-
-
-    /**
-     * Checks the content to see if it looks minified.
-     *
-     * @param string $content The content to tokenize.
-     * @param string $eolChar The EOL char used in the content.
-     *
-     * @return boolean
-     */
-    protected function isMinifiedContent($content, $eolChar='\n')
-    {
-        // Minified files often have a very large number of characters per line
-        // and cause issues when tokenizing.
-        $numChars = strlen($content);
-        $numLines = (substr_count($content, $eolChar) + 1);
-        $average  = ($numChars / $numLines);
-        if ($average > 100) {
-            return true;
-        }
-
-        return false;
-
-    }//end isMinifiedContent()
-
-
-    /**
-     * Gets the array of tokens.
-     *
-     * @return array
-     */
-    public function getTokens()
-    {
-        return $this->tokens;
-
-    }//end getTokens()
-
-
-    /**
-     * Creates an array of tokens when given some content.
-     *
-     * @param string $string The string to tokenize.
-     *
-     * @return array
-     */
-    abstract protected function tokenize($string);
-
-
-    /**
-     * Performs additional processing after main tokenizing.
-     *
-     * @return void
-     */
-    abstract protected function processAdditional();
-
-
-    /**
-     * Sets token position information.
-     *
-     * Can also convert tabs into spaces. Each tab can represent between
-     * 1 and $width spaces, so this cannot be a straight string replace.
-     *
-     * @return void
-     */
-    private function createPositionMap()
-    {
-        $currColumn = 1;
-        $lineNumber = 1;
-        $eolLen     = strlen($this->eolChar);
-        $ignoring   = null;
-        $inTests    = defined('PHP_CODESNIFFER_IN_TESTS');
-
-        $checkEncoding = false;
-        if (function_exists('iconv_strlen') === true) {
-            $checkEncoding = true;
-        }
-
-        $checkAnnotations = $this->config->annotations;
-        $encoding         = $this->config->encoding;
-        $tabWidth         = $this->config->tabWidth;
-
-        $tokensWithTabs = [
-            T_WHITESPACE               => true,
-            T_COMMENT                  => true,
-            T_DOC_COMMENT              => true,
-            T_DOC_COMMENT_WHITESPACE   => true,
-            T_DOC_COMMENT_STRING       => true,
-            T_CONSTANT_ENCAPSED_STRING => true,
-            T_DOUBLE_QUOTED_STRING     => true,
-            T_HEREDOC                  => true,
-            T_NOWDOC                   => true,
-            T_INLINE_HTML              => true,
-        ];
-
-        $this->numTokens = count($this->tokens);
-        for ($i = 0; $i < $this->numTokens; $i++) {
-            $this->tokens[$i]['line']   = $lineNumber;
-            $this->tokens[$i]['column'] = $currColumn;
-
-            if (isset($this->knownLengths[$this->tokens[$i]['code']]) === true) {
-                // There are no tabs in the tokens we know the length of.
-                $length      = $this->knownLengths[$this->tokens[$i]['code']];
-                $currColumn += $length;
-            } else if ($tabWidth === 0
-                || isset($tokensWithTabs[$this->tokens[$i]['code']]) === false
-                || strpos($this->tokens[$i]['content'], "\t") === false
-            ) {
-                // There are no tabs in this content, or we aren't replacing them.
-                if ($checkEncoding === true) {
-                    // Not using the default encoding, so take a bit more care.
-                    $oldLevel = error_reporting();
-                    error_reporting(0);
-                    $length = iconv_strlen($this->tokens[$i]['content'], $encoding);
-                    error_reporting($oldLevel);
-
-                    if ($length === false) {
-                        // String contained invalid characters, so revert to default.
-                        $length = strlen($this->tokens[$i]['content']);
-                    }
-                } else {
-                    $length = strlen($this->tokens[$i]['content']);
-                }
-
-                $currColumn += $length;
-            } else {
-                $this->replaceTabsInToken($this->tokens[$i]);
-                $length      = $this->tokens[$i]['length'];
-                $currColumn += $length;
-            }//end if
-
-            $this->tokens[$i]['length'] = $length;
-
-            if (isset($this->knownLengths[$this->tokens[$i]['code']]) === false
-                && strpos($this->tokens[$i]['content'], $this->eolChar) !== false
-            ) {
-                $lineNumber++;
-                $currColumn = 1;
-
-                // Newline chars are not counted in the token length.
-                $this->tokens[$i]['length'] -= $eolLen;
-            }
-
-            if ($this->tokens[$i]['code'] === T_COMMENT
-                || $this->tokens[$i]['code'] === T_DOC_COMMENT_STRING
-                || $this->tokens[$i]['code'] === T_DOC_COMMENT_TAG
-                || ($inTests === true && $this->tokens[$i]['code'] === T_INLINE_HTML)
-            ) {
-                $commentText      = ltrim($this->tokens[$i]['content'], " \t/*");
-                $commentText      = rtrim($commentText, " */\t\r\n");
-                $commentTextLower = strtolower($commentText);
-                if (strpos($commentText, '@codingStandards') !== false) {
-                    // If this comment is the only thing on the line, it tells us
-                    // to ignore the following line. If the line contains other content
-                    // then we are just ignoring this one single line.
-                    $ownLine = false;
-                    if ($i > 0) {
-                        for ($prev = ($i - 1); $prev >= 0; $prev--) {
-                            if ($this->tokens[$prev]['code'] === T_WHITESPACE) {
-                                continue;
-                            }
-
-                            break;
-                        }
-
-                        if ($this->tokens[$prev]['line'] !== $this->tokens[$i]['line']) {
-                            $ownLine = true;
-                        }
-                    }
-
-                    if ($ignoring === null
-                        && strpos($commentText, '@codingStandardsIgnoreStart') !== false
-                    ) {
-                        $ignoring = ['.all' => true];
-                        if ($ownLine === true) {
-                            $this->ignoredLines[$this->tokens[$i]['line']] = $ignoring;
-                        }
-                    } else if ($ignoring !== null
-                        && strpos($commentText, '@codingStandardsIgnoreEnd') !== false
-                    ) {
-                        if ($ownLine === true) {
-                            $this->ignoredLines[$this->tokens[$i]['line']] = ['.all' => true];
-                        } else {
-                            $this->ignoredLines[$this->tokens[$i]['line']] = $ignoring;
-                        }
-
-                        $ignoring = null;
-                    } else if ($ignoring === null
-                        && strpos($commentText, '@codingStandardsIgnoreLine') !== false
-                    ) {
-                        $ignoring = ['.all' => true];
-                        if ($ownLine === true) {
-                            $this->ignoredLines[$this->tokens[$i]['line']]       = $ignoring;
-                            $this->ignoredLines[($this->tokens[$i]['line'] + 1)] = $ignoring;
-                        } else {
-                            $this->ignoredLines[$this->tokens[$i]['line']] = $ignoring;
-                        }
-
-                        $ignoring = null;
-                    }//end if
-                } else if (substr($commentTextLower, 0, 6) === 'phpcs:'
-                    || substr($commentTextLower, 0, 7) === '@phpcs:'
-                ) {
-                    // If the @phpcs: syntax is being used, strip the @ to make
-                    // comparisons easier.
-                    if ($commentText[0] === '@') {
-                        $commentText      = substr($commentText, 1);
-                        $commentTextLower = strtolower($commentText);
-                    }
-
-                    // If there is a comment on the end, strip it off.
-                    $commentStart = strpos($commentTextLower, ' --');
-                    if ($commentStart !== false) {
-                        $commentText      = substr($commentText, 0, $commentStart);
-                        $commentTextLower = strtolower($commentText);
-                    }
-
-                    // If this comment is the only thing on the line, it tells us
-                    // to ignore the following line. If the line contains other content
-                    // then we are just ignoring this one single line.
-                    $lineHasOtherContent = false;
-                    $lineHasOtherTokens  = false;
-                    if ($i > 0) {
-                        for ($prev = ($i - 1); $prev > 0; $prev--) {
-                            if ($this->tokens[$prev]['line'] !== $this->tokens[$i]['line']) {
-                                // Changed lines.
-                                break;
-                            }
-
-                            if ($this->tokens[$prev]['code'] === T_WHITESPACE
-                                || ($this->tokens[$prev]['code'] === T_INLINE_HTML
-                                && trim($this->tokens[$prev]['content']) === '')
-                            ) {
-                                continue;
-                            }
-
-                            $lineHasOtherTokens = true;
-
-                            if ($this->tokens[$prev]['code'] === T_OPEN_TAG) {
-                                continue;
-                            }
-
-                            $lineHasOtherContent = true;
-                            break;
-                        }//end for
-
-                        $changedLines = false;
-                        for ($next = $i; $next < $this->numTokens; $next++) {
-                            if ($changedLines === true) {
-                                // Changed lines.
-                                break;
-                            }
-
-                            if (isset($this->knownLengths[$this->tokens[$next]['code']]) === false
-                                && strpos($this->tokens[$next]['content'], $this->eolChar) !== false
-                            ) {
-                                // Last token on the current line.
-                                $changedLines = true;
-                            }
-
-                            if ($next === $i) {
-                                continue;
-                            }
-
-                            if ($this->tokens[$next]['code'] === T_WHITESPACE
-                                || ($this->tokens[$next]['code'] === T_INLINE_HTML
-                                && trim($this->tokens[$next]['content']) === '')
-                            ) {
-                                continue;
-                            }
-
-                            $lineHasOtherTokens = true;
-
-                            if ($this->tokens[$next]['code'] === T_CLOSE_TAG) {
-                                continue;
-                            }
-
-                            $lineHasOtherContent = true;
-                            break;
-                        }//end for
-                    }//end if
-
-                    if (substr($commentTextLower, 0, 9) === 'phpcs:set') {
-                        // Ignore standards for complete lines that change sniff settings.
-                        if ($lineHasOtherTokens === false) {
-                            $this->ignoredLines[$this->tokens[$i]['line']] = ['.all' => true];
-                        }
-
-                        // Need to maintain case here, to get the correct sniff code.
-                        $parts = explode(' ', substr($commentText, 10));
-                        if (count($parts) >= 2) {
-                            $sniffParts = explode('.', $parts[0]);
-                            if (count($sniffParts) >= 3) {
-                                $this->tokens[$i]['sniffCode']          = array_shift($parts);
-                                $this->tokens[$i]['sniffProperty']      = array_shift($parts);
-                                $this->tokens[$i]['sniffPropertyValue'] = rtrim(implode(' ', $parts), " */\r\n");
-                            }
-                        }
-
-                        $this->tokens[$i]['code'] = T_PHPCS_SET;
-                        $this->tokens[$i]['type'] = 'T_PHPCS_SET';
-                    } else if (substr($commentTextLower, 0, 16) === 'phpcs:ignorefile') {
-                        // The whole file will be ignored, but at least set the correct token.
-                        $this->tokens[$i]['code'] = T_PHPCS_IGNORE_FILE;
-                        $this->tokens[$i]['type'] = 'T_PHPCS_IGNORE_FILE';
-                    } else if (substr($commentTextLower, 0, 13) === 'phpcs:disable') {
-                        if ($lineHasOtherContent === false) {
-                            // Completely ignore the comment line.
-                            $this->ignoredLines[$this->tokens[$i]['line']] = ['.all' => true];
-                        }
-
-                        if ($ignoring === null) {
-                            $ignoring = [];
-                        }
-
-                        $disabledSniffs = [];
-
-                        $additionalText = substr($commentText, 14);
-                        if ($additionalText === false) {
-                            $ignoring = ['.all' => true];
-                        } else {
-                            $parts = explode(',', substr($commentText, 13));
-                            foreach ($parts as $sniffCode) {
-                                $sniffCode = trim($sniffCode);
-                                $disabledSniffs[$sniffCode] = true;
-                                $ignoring[$sniffCode]       = true;
-
-                                // This newly disabled sniff might be disabling an existing
-                                // enabled exception that we are tracking.
-                                if (isset($ignoring['.except']) === true) {
-                                    foreach (array_keys($ignoring['.except']) as $ignoredSniffCode) {
-                                        if ($ignoredSniffCode === $sniffCode
-                                            || strpos($ignoredSniffCode, $sniffCode.'.') === 0
-                                        ) {
-                                            unset($ignoring['.except'][$ignoredSniffCode]);
-                                        }
-                                    }
-
-                                    if (empty($ignoring['.except']) === true) {
-                                        unset($ignoring['.except']);
-                                    }
-                                }
-                            }//end foreach
-                        }//end if
-
-                        $this->tokens[$i]['code']       = T_PHPCS_DISABLE;
-                        $this->tokens[$i]['type']       = 'T_PHPCS_DISABLE';
-                        $this->tokens[$i]['sniffCodes'] = $disabledSniffs;
-                    } else if (substr($commentTextLower, 0, 12) === 'phpcs:enable') {
-                        if ($ignoring !== null) {
-                            $enabledSniffs = [];
-
-                            $additionalText = substr($commentText, 13);
-                            if ($additionalText === false) {
-                                $ignoring = null;
-                            } else {
-                                $parts = explode(',', substr($commentText, 13));
-                                foreach ($parts as $sniffCode) {
-                                    $sniffCode = trim($sniffCode);
-                                    $enabledSniffs[$sniffCode] = true;
-
-                                    // This new enabled sniff might remove previously disabled
-                                    // sniffs if it is actually a standard or category of sniffs.
-                                    foreach (array_keys($ignoring) as $ignoredSniffCode) {
-                                        if ($ignoredSniffCode === $sniffCode
-                                            || strpos($ignoredSniffCode, $sniffCode.'.') === 0
-                                        ) {
-                                            unset($ignoring[$ignoredSniffCode]);
-                                        }
-                                    }
-
-                                    // This new enabled sniff might be able to clear up
-                                    // previously enabled sniffs if it is actually a standard or
-                                    // category of sniffs.
-                                    if (isset($ignoring['.except']) === true) {
-                                        foreach (array_keys($ignoring['.except']) as $ignoredSniffCode) {
-                                            if ($ignoredSniffCode === $sniffCode
-                                                || strpos($ignoredSniffCode, $sniffCode.'.') === 0
-                                            ) {
-                                                unset($ignoring['.except'][$ignoredSniffCode]);
-                                            }
-                                        }
-                                    }
-                                }//end foreach
-
-                                if (empty($ignoring) === true) {
-                                    $ignoring = null;
-                                } else {
-                                    if (isset($ignoring['.except']) === true) {
-                                        $ignoring['.except'] += $enabledSniffs;
-                                    } else {
-                                        $ignoring['.except'] = $enabledSniffs;
-                                    }
-                                }
-                            }//end if
-
-                            if ($lineHasOtherContent === false) {
-                                // Completely ignore the comment line.
-                                $this->ignoredLines[$this->tokens[$i]['line']] = ['.all' => true];
-                            } else {
-                                // The comment is on the same line as the code it is ignoring,
-                                // so respect the new ignore rules.
-                                $this->ignoredLines[$this->tokens[$i]['line']] = $ignoring;
-                            }
-
-                            $this->tokens[$i]['sniffCodes'] = $enabledSniffs;
-                        }//end if
-
-                        $this->tokens[$i]['code'] = T_PHPCS_ENABLE;
-                        $this->tokens[$i]['type'] = 'T_PHPCS_ENABLE';
-                    } else if (substr($commentTextLower, 0, 12) === 'phpcs:ignore') {
-                        $ignoreRules = [];
-
-                        $additionalText = substr($commentText, 13);
-                        if ($additionalText === false) {
-                            $ignoreRules = ['.all' => true];
-                        } else {
-                            $parts = explode(',', substr($commentText, 13));
-                            foreach ($parts as $sniffCode) {
-                                $ignoreRules[trim($sniffCode)] = true;
-                            }
-                        }
-
-                        $this->tokens[$i]['code']       = T_PHPCS_IGNORE;
-                        $this->tokens[$i]['type']       = 'T_PHPCS_IGNORE';
-                        $this->tokens[$i]['sniffCodes'] = $ignoreRules;
-
-                        if ($ignoring !== null) {
-                            $ignoreRules += $ignoring;
-                        }
-
-                        if ($lineHasOtherContent === false) {
-                            // Completely ignore the comment line, and set the following
-                            // line to include the ignore rules we've set.
-                            $this->ignoredLines[$this->tokens[$i]['line']]       = ['.all' => true];
-                            $this->ignoredLines[($this->tokens[$i]['line'] + 1)] = $ignoreRules;
-                        } else {
-                            // The comment is on the same line as the code it is ignoring,
-                            // so respect the ignore rules it set.
-                            $this->ignoredLines[$this->tokens[$i]['line']] = $ignoreRules;
-                        }
-                    }//end if
-                }//end if
-            }//end if
-
-            if ($ignoring !== null && isset($this->ignoredLines[$this->tokens[$i]['line']]) === false) {
-                $this->ignoredLines[$this->tokens[$i]['line']] = $ignoring;
-            }
-        }//end for
-
-        // If annotations are being ignored, we clear out all the ignore rules
-        // but leave the annotations tokenized as normal.
-        if ($checkAnnotations === false) {
-            $this->ignoredLines = [];
-        }
-
-    }//end createPositionMap()
-
-
-    /**
-     * Replaces tabs in original token content with spaces.
-     *
-     * Each tab can represent between 1 and $config->tabWidth spaces,
-     * so this cannot be a straight string replace. The original content
-     * is placed into an orig_content index and the new token length is also
-     * set in the length index.
-     *
-     * @param array  $token    The token to replace tabs inside.
-     * @param string $prefix   The character to use to represent the start of a tab.
-     * @param string $padding  The character to use to represent the end of a tab.
-     * @param int    $tabWidth The number of spaces each tab represents.
-     *
-     * @return void
-     */
-    public function replaceTabsInToken(&$token, $prefix=' ', $padding=' ', $tabWidth=null)
-    {
-        $checkEncoding = false;
-        if (function_exists('iconv_strlen') === true) {
-            $checkEncoding = true;
-        }
-
-        $currColumn = $token['column'];
-        if ($tabWidth === null) {
-            $tabWidth = $this->config->tabWidth;
-            if ($tabWidth === 0) {
-                $tabWidth = 1;
-            }
-        }
-
-        if (rtrim($token['content'], "\t") === '') {
-            // String only contains tabs, so we can shortcut the process.
-            $numTabs = strlen($token['content']);
-
-            $firstTabSize = ($tabWidth - (($currColumn - 1) % $tabWidth));
-            $length       = ($firstTabSize + ($tabWidth * ($numTabs - 1)));
-            $newContent   = $prefix.str_repeat($padding, ($length - 1));
-        } else {
-            // We need to determine the length of each tab.
-            $tabs = explode("\t", $token['content']);
-
-            $numTabs    = (count($tabs) - 1);
-            $tabNum     = 0;
-            $newContent = '';
-            $length     = 0;
-
-            foreach ($tabs as $content) {
-                if ($content !== '') {
-                    $newContent .= $content;
-                    if ($checkEncoding === true) {
-                        // Not using the default encoding, so take a bit more care.
-                        $oldLevel = error_reporting();
-                        error_reporting(0);
-                        $contentLength = iconv_strlen($content, $this->config->encoding);
-                        error_reporting($oldLevel);
-                        if ($contentLength === false) {
-                            // String contained invalid characters, so revert to default.
-                            $contentLength = strlen($content);
-                        }
-                    } else {
-                        $contentLength = strlen($content);
-                    }
-
-                    $currColumn += $contentLength;
-                    $length     += $contentLength;
-                }
-
-                // The last piece of content does not have a tab after it.
-                if ($tabNum === $numTabs) {
-                    break;
-                }
-
-                // Process the tab that comes after the content.
-                $lastCurrColumn = $currColumn;
-                $tabNum++;
-
-                // Move the pointer to the next tab stop.
-                if (($currColumn % $tabWidth) === 0) {
-                    // This is the first tab, and we are already at a
-                    // tab stop, so this tab counts as a single space.
-                    $currColumn++;
-                } else {
-                    $currColumn++;
-                    while (($currColumn % $tabWidth) !== 0) {
-                        $currColumn++;
-                    }
-
-                    $currColumn++;
-                }
-
-                $length     += ($currColumn - $lastCurrColumn);
-                $newContent .= $prefix.str_repeat($padding, ($currColumn - $lastCurrColumn - 1));
-            }//end foreach
-        }//end if
-
-        $token['orig_content'] = $token['content'];
-        $token['content']      = $newContent;
-        $token['length']       = $length;
-
-    }//end replaceTabsInToken()
-
-
-    /**
-     * Creates a map of brackets positions.
-     *
-     * @return void
-     */
-    private function createTokenMap()
-    {
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            echo "\t*** START TOKEN MAP ***".PHP_EOL;
-        }
-
-        $squareOpeners   = [];
-        $curlyOpeners    = [];
-        $this->numTokens = count($this->tokens);
-
-        $openers   = [];
-        $openOwner = null;
-
-        for ($i = 0; $i < $this->numTokens; $i++) {
-            /*
+	/**
+	 * The config data for the run.
+	 *
+	 * @var \PHP_CodeSniffer\Config
+	 */
+	protected $config = null;
+
+	/**
+	 * The EOL char used in the content.
+	 *
+	 * @var string
+	 */
+	protected $eolChar = [];
+
+	/**
+	 * A token-based representation of the content.
+	 *
+	 * @var array
+	 */
+	protected $tokens = [];
+
+	/**
+	 * The number of tokens in the tokens array.
+	 *
+	 * @var integer
+	 */
+	protected $numTokens = 0;
+
+	/**
+	 * A list of tokens that are allowed to open a scope.
+	 *
+	 * @var array
+	 */
+	public $scopeOpeners = [];
+
+	/**
+	 * A list of tokens that end the scope.
+	 *
+	 * @var array
+	 */
+	public $endScopeTokens = [];
+
+	/**
+	 * Known lengths of tokens.
+	 *
+	 * @var array<int, int>
+	 */
+	public $knownLengths = [];
+
+	/**
+	 * A list of lines being ignored due to error suppression comments.
+	 *
+	 * @var array
+	 */
+	public $ignoredLines = [];
+
+
+	/**
+	 * Initialise and run the tokenizer.
+	 *
+	 * @param string                         $content The content to tokenize,
+	 * @param \PHP_CodeSniffer\Config | null $config  The config data for the run.
+	 * @param string                         $eolChar The EOL char used in the content.
+	 *
+	 * @return void
+	 * @throws \PHP_CodeSniffer\Exceptions\TokenizerException If the file appears to be minified.
+	 */
+	public function __construct($content, $config, $eolChar='\n')
+	{
+		$this->eolChar = $eolChar;
+
+		$this->config = $config;
+		$this->tokens = $this->tokenize($content);
+
+		if ($config === null) {
+			return;
+		}
+
+		$this->createPositionMap();
+		$this->createTokenMap();
+		$this->createParenthesisNestingMap();
+		$this->createScopeMap();
+		$this->createLevelMap();
+
+		// Allow the tokenizer to do additional processing if required.
+		$this->processAdditional();
+
+	}//end __construct()
+
+
+	/**
+	 * Checks the content to see if it looks minified.
+	 *
+	 * @param string $content The content to tokenize.
+	 * @param string $eolChar The EOL char used in the content.
+	 *
+	 * @return boolean
+	 */
+	protected function isMinifiedContent($content, $eolChar='\n')
+	{
+		// Minified files often have a very large number of characters per line
+		// and cause issues when tokenizing.
+		$numChars = strlen($content);
+		$numLines = (substr_count($content, $eolChar) + 1);
+		$average  = ($numChars / $numLines);
+		if ($average > 100) {
+			return true;
+		}
+
+		return false;
+
+	}//end isMinifiedContent()
+
+
+	/**
+	 * Gets the array of tokens.
+	 *
+	 * @return array
+	 */
+	public function getTokens()
+	{
+		return $this->tokens;
+
+	}//end getTokens()
+
+
+	/**
+	 * Creates an array of tokens when given some content.
+	 *
+	 * @param string $string The string to tokenize.
+	 *
+	 * @return array
+	 */
+	abstract protected function tokenize($string);
+
+
+	/**
+	 * Performs additional processing after main tokenizing.
+	 *
+	 * @return void
+	 */
+	abstract protected function processAdditional();
+
+
+	/**
+	 * Sets token position information.
+	 *
+	 * Can also convert tabs into spaces. Each tab can represent between
+	 * 1 and $width spaces, so this cannot be a straight string replace.
+	 *
+	 * @return void
+	 */
+	private function createPositionMap()
+	{
+		$currColumn = 1;
+		$lineNumber = 1;
+		$eolLen     = strlen($this->eolChar);
+		$ignoring   = null;
+		$inTests    = defined('PHP_CODESNIFFER_IN_TESTS');
+
+		$checkEncoding = false;
+		if (function_exists('iconv_strlen') === true) {
+			$checkEncoding = true;
+		}
+
+		$checkAnnotations = $this->config->annotations;
+		$encoding         = $this->config->encoding;
+		$tabWidth         = $this->config->tabWidth;
+
+		$tokensWithTabs = [
+			T_WHITESPACE               => true,
+			T_COMMENT                  => true,
+			T_DOC_COMMENT              => true,
+			T_DOC_COMMENT_WHITESPACE   => true,
+			T_DOC_COMMENT_STRING       => true,
+			T_CONSTANT_ENCAPSED_STRING => true,
+			T_DOUBLE_QUOTED_STRING     => true,
+			T_HEREDOC                  => true,
+			T_NOWDOC                   => true,
+			T_INLINE_HTML              => true,
+		];
+
+		$this->numTokens = count($this->tokens);
+		for ($i = 0; $i < $this->numTokens; $i++) {
+			$this->tokens[$i]['line']   = $lineNumber;
+			$this->tokens[$i]['column'] = $currColumn;
+
+			if (isset($this->knownLengths[$this->tokens[$i]['code']]) === true) {
+				// There are no tabs in the tokens we know the length of.
+				$length      = $this->knownLengths[$this->tokens[$i]['code']];
+				$currColumn += $length;
+			} else if ($tabWidth === 0
+				|| isset($tokensWithTabs[$this->tokens[$i]['code']]) === false
+				|| strpos($this->tokens[$i]['content'], "\t") === false
+			) {
+				// There are no tabs in this content, or we aren't replacing them.
+				if ($checkEncoding === true) {
+					// Not using the default encoding, so take a bit more care.
+					$oldLevel = error_reporting();
+					error_reporting(0);
+					$length = iconv_strlen($this->tokens[$i]['content'], $encoding);
+					error_reporting($oldLevel);
+
+					if ($length === false) {
+						// String contained invalid characters, so revert to default.
+						$length = strlen($this->tokens[$i]['content']);
+					}
+				} else {
+					$length = strlen($this->tokens[$i]['content']);
+				}
+
+				$currColumn += $length;
+			} else {
+				$this->replaceTabsInToken($this->tokens[$i]);
+				$length      = $this->tokens[$i]['length'];
+				$currColumn += $length;
+			}//end if
+
+			$this->tokens[$i]['length'] = $length;
+
+			if (isset($this->knownLengths[$this->tokens[$i]['code']]) === false
+				&& strpos($this->tokens[$i]['content'], $this->eolChar) !== false
+			) {
+				$lineNumber++;
+				$currColumn = 1;
+
+				// Newline chars are not counted in the token length.
+				$this->tokens[$i]['length'] -= $eolLen;
+			}
+
+			if ($this->tokens[$i]['code'] === T_COMMENT
+				|| $this->tokens[$i]['code'] === T_DOC_COMMENT_STRING
+				|| $this->tokens[$i]['code'] === T_DOC_COMMENT_TAG
+				|| ($inTests === true && $this->tokens[$i]['code'] === T_INLINE_HTML)
+			) {
+				$commentText      = ltrim($this->tokens[$i]['content'], " \t/*");
+				$commentText      = rtrim($commentText, " */\t\r\n");
+				$commentTextLower = strtolower($commentText);
+				if (strpos($commentText, '@codingStandards') !== false) {
+					// If this comment is the only thing on the line, it tells us
+					// to ignore the following line. If the line contains other content
+					// then we are just ignoring this one single line.
+					$ownLine = false;
+					if ($i > 0) {
+						for ($prev = ($i - 1); $prev >= 0; $prev--) {
+							if ($this->tokens[$prev]['code'] === T_WHITESPACE) {
+								continue;
+							}
+
+							break;
+						}
+
+						if ($this->tokens[$prev]['line'] !== $this->tokens[$i]['line']) {
+							$ownLine = true;
+						}
+					}
+
+					if ($ignoring === null
+						&& strpos($commentText, '@codingStandardsIgnoreStart') !== false
+					) {
+						$ignoring = ['.all' => true];
+						if ($ownLine === true) {
+							$this->ignoredLines[$this->tokens[$i]['line']] = $ignoring;
+						}
+					} else if ($ignoring !== null
+						&& strpos($commentText, '@codingStandardsIgnoreEnd') !== false
+					) {
+						if ($ownLine === true) {
+							$this->ignoredLines[$this->tokens[$i]['line']] = ['.all' => true];
+						} else {
+							$this->ignoredLines[$this->tokens[$i]['line']] = $ignoring;
+						}
+
+						$ignoring = null;
+					} else if ($ignoring === null
+						&& strpos($commentText, '@codingStandardsIgnoreLine') !== false
+					) {
+						$ignoring = ['.all' => true];
+						if ($ownLine === true) {
+							$this->ignoredLines[$this->tokens[$i]['line']]       = $ignoring;
+							$this->ignoredLines[($this->tokens[$i]['line'] + 1)] = $ignoring;
+						} else {
+							$this->ignoredLines[$this->tokens[$i]['line']] = $ignoring;
+						}
+
+						$ignoring = null;
+					}//end if
+				} else if (substr($commentTextLower, 0, 6) === 'phpcs:'
+					|| substr($commentTextLower, 0, 7) === '@phpcs:'
+				) {
+					// If the @phpcs: syntax is being used, strip the @ to make
+					// comparisons easier.
+					if ($commentText[0] === '@') {
+						$commentText      = substr($commentText, 1);
+						$commentTextLower = strtolower($commentText);
+					}
+
+					// If there is a comment on the end, strip it off.
+					$commentStart = strpos($commentTextLower, ' --');
+					if ($commentStart !== false) {
+						$commentText      = substr($commentText, 0, $commentStart);
+						$commentTextLower = strtolower($commentText);
+					}
+
+					// If this comment is the only thing on the line, it tells us
+					// to ignore the following line. If the line contains other content
+					// then we are just ignoring this one single line.
+					$lineHasOtherContent = false;
+					$lineHasOtherTokens  = false;
+					if ($i > 0) {
+						for ($prev = ($i - 1); $prev > 0; $prev--) {
+							if ($this->tokens[$prev]['line'] !== $this->tokens[$i]['line']) {
+								// Changed lines.
+								break;
+							}
+
+							if ($this->tokens[$prev]['code'] === T_WHITESPACE
+								|| ($this->tokens[$prev]['code'] === T_INLINE_HTML
+								&& trim($this->tokens[$prev]['content']) === '')
+							) {
+								continue;
+							}
+
+							$lineHasOtherTokens = true;
+
+							if ($this->tokens[$prev]['code'] === T_OPEN_TAG) {
+								continue;
+							}
+
+							$lineHasOtherContent = true;
+							break;
+						}//end for
+
+						$changedLines = false;
+						for ($next = $i; $next < $this->numTokens; $next++) {
+							if ($changedLines === true) {
+								// Changed lines.
+								break;
+							}
+
+							if (isset($this->knownLengths[$this->tokens[$next]['code']]) === false
+								&& strpos($this->tokens[$next]['content'], $this->eolChar) !== false
+							) {
+								// Last token on the current line.
+								$changedLines = true;
+							}
+
+							if ($next === $i) {
+								continue;
+							}
+
+							if ($this->tokens[$next]['code'] === T_WHITESPACE
+								|| ($this->tokens[$next]['code'] === T_INLINE_HTML
+								&& trim($this->tokens[$next]['content']) === '')
+							) {
+								continue;
+							}
+
+							$lineHasOtherTokens = true;
+
+							if ($this->tokens[$next]['code'] === T_CLOSE_TAG) {
+								continue;
+							}
+
+							$lineHasOtherContent = true;
+							break;
+						}//end for
+					}//end if
+
+					if (substr($commentTextLower, 0, 9) === 'phpcs:set') {
+						// Ignore standards for complete lines that change sniff settings.
+						if ($lineHasOtherTokens === false) {
+							$this->ignoredLines[$this->tokens[$i]['line']] = ['.all' => true];
+						}
+
+						// Need to maintain case here, to get the correct sniff code.
+						$parts = explode(' ', substr($commentText, 10));
+						if (count($parts) >= 2) {
+							$sniffParts = explode('.', $parts[0]);
+							if (count($sniffParts) >= 3) {
+								$this->tokens[$i]['sniffCode']          = array_shift($parts);
+								$this->tokens[$i]['sniffProperty']      = array_shift($parts);
+								$this->tokens[$i]['sniffPropertyValue'] = rtrim(implode(' ', $parts), " */\r\n");
+							}
+						}
+
+						$this->tokens[$i]['code'] = T_PHPCS_SET;
+						$this->tokens[$i]['type'] = 'T_PHPCS_SET';
+					} else if (substr($commentTextLower, 0, 16) === 'phpcs:ignorefile') {
+						// The whole file will be ignored, but at least set the correct token.
+						$this->tokens[$i]['code'] = T_PHPCS_IGNORE_FILE;
+						$this->tokens[$i]['type'] = 'T_PHPCS_IGNORE_FILE';
+					} else if (substr($commentTextLower, 0, 13) === 'phpcs:disable') {
+						if ($lineHasOtherContent === false) {
+							// Completely ignore the comment line.
+							$this->ignoredLines[$this->tokens[$i]['line']] = ['.all' => true];
+						}
+
+						if ($ignoring === null) {
+							$ignoring = [];
+						}
+
+						$disabledSniffs = [];
+
+						$additionalText = substr($commentText, 14);
+						if ($additionalText === false) {
+							$ignoring = ['.all' => true];
+						} else {
+							$parts = explode(',', substr($commentText, 13));
+							foreach ($parts as $sniffCode) {
+								$sniffCode = trim($sniffCode);
+								$disabledSniffs[$sniffCode] = true;
+								$ignoring[$sniffCode]       = true;
+
+								// This newly disabled sniff might be disabling an existing
+								// enabled exception that we are tracking.
+								if (isset($ignoring['.except']) === true) {
+									foreach (array_keys($ignoring['.except']) as $ignoredSniffCode) {
+										if ($ignoredSniffCode === $sniffCode
+											|| strpos($ignoredSniffCode, $sniffCode.'.') === 0
+										) {
+											unset($ignoring['.except'][$ignoredSniffCode]);
+										}
+									}
+
+									if (empty($ignoring['.except']) === true) {
+										unset($ignoring['.except']);
+									}
+								}
+							}//end foreach
+						}//end if
+
+						$this->tokens[$i]['code']       = T_PHPCS_DISABLE;
+						$this->tokens[$i]['type']       = 'T_PHPCS_DISABLE';
+						$this->tokens[$i]['sniffCodes'] = $disabledSniffs;
+					} else if (substr($commentTextLower, 0, 12) === 'phpcs:enable') {
+						if ($ignoring !== null) {
+							$enabledSniffs = [];
+
+							$additionalText = substr($commentText, 13);
+							if ($additionalText === false) {
+								$ignoring = null;
+							} else {
+								$parts = explode(',', substr($commentText, 13));
+								foreach ($parts as $sniffCode) {
+									$sniffCode = trim($sniffCode);
+									$enabledSniffs[$sniffCode] = true;
+
+									// This new enabled sniff might remove previously disabled
+									// sniffs if it is actually a standard or category of sniffs.
+									foreach (array_keys($ignoring) as $ignoredSniffCode) {
+										if ($ignoredSniffCode === $sniffCode
+											|| strpos($ignoredSniffCode, $sniffCode.'.') === 0
+										) {
+											unset($ignoring[$ignoredSniffCode]);
+										}
+									}
+
+									// This new enabled sniff might be able to clear up
+									// previously enabled sniffs if it is actually a standard or
+									// category of sniffs.
+									if (isset($ignoring['.except']) === true) {
+										foreach (array_keys($ignoring['.except']) as $ignoredSniffCode) {
+											if ($ignoredSniffCode === $sniffCode
+												|| strpos($ignoredSniffCode, $sniffCode.'.') === 0
+											) {
+												unset($ignoring['.except'][$ignoredSniffCode]);
+											}
+										}
+									}
+								}//end foreach
+
+								if (empty($ignoring) === true) {
+									$ignoring = null;
+								} else {
+									if (isset($ignoring['.except']) === true) {
+										$ignoring['.except'] += $enabledSniffs;
+									} else {
+										$ignoring['.except'] = $enabledSniffs;
+									}
+								}
+							}//end if
+
+							if ($lineHasOtherContent === false) {
+								// Completely ignore the comment line.
+								$this->ignoredLines[$this->tokens[$i]['line']] = ['.all' => true];
+							} else {
+								// The comment is on the same line as the code it is ignoring,
+								// so respect the new ignore rules.
+								$this->ignoredLines[$this->tokens[$i]['line']] = $ignoring;
+							}
+
+							$this->tokens[$i]['sniffCodes'] = $enabledSniffs;
+						}//end if
+
+						$this->tokens[$i]['code'] = T_PHPCS_ENABLE;
+						$this->tokens[$i]['type'] = 'T_PHPCS_ENABLE';
+					} else if (substr($commentTextLower, 0, 12) === 'phpcs:ignore') {
+						$ignoreRules = [];
+
+						$additionalText = substr($commentText, 13);
+						if ($additionalText === false) {
+							$ignoreRules = ['.all' => true];
+						} else {
+							$parts = explode(',', substr($commentText, 13));
+							foreach ($parts as $sniffCode) {
+								$ignoreRules[trim($sniffCode)] = true;
+							}
+						}
+
+						$this->tokens[$i]['code']       = T_PHPCS_IGNORE;
+						$this->tokens[$i]['type']       = 'T_PHPCS_IGNORE';
+						$this->tokens[$i]['sniffCodes'] = $ignoreRules;
+
+						if ($ignoring !== null) {
+							$ignoreRules += $ignoring;
+						}
+
+						if ($lineHasOtherContent === false) {
+							// Completely ignore the comment line, and set the following
+							// line to include the ignore rules we've set.
+							$this->ignoredLines[$this->tokens[$i]['line']]       = ['.all' => true];
+							$this->ignoredLines[($this->tokens[$i]['line'] + 1)] = $ignoreRules;
+						} else {
+							// The comment is on the same line as the code it is ignoring,
+							// so respect the ignore rules it set.
+							$this->ignoredLines[$this->tokens[$i]['line']] = $ignoreRules;
+						}
+					}//end if
+				}//end if
+			}//end if
+
+			if ($ignoring !== null && isset($this->ignoredLines[$this->tokens[$i]['line']]) === false) {
+				$this->ignoredLines[$this->tokens[$i]['line']] = $ignoring;
+			}
+		}//end for
+
+		// If annotations are being ignored, we clear out all the ignore rules
+		// but leave the annotations tokenized as normal.
+		if ($checkAnnotations === false) {
+			$this->ignoredLines = [];
+		}
+
+	}//end createPositionMap()
+
+
+	/**
+	 * Replaces tabs in original token content with spaces.
+	 *
+	 * Each tab can represent between 1 and $config->tabWidth spaces,
+	 * so this cannot be a straight string replace. The original content
+	 * is placed into an orig_content index and the new token length is also
+	 * set in the length index.
+	 *
+	 * @param array  $token    The token to replace tabs inside.
+	 * @param string $prefix   The character to use to represent the start of a tab.
+	 * @param string $padding  The character to use to represent the end of a tab.
+	 * @param int    $tabWidth The number of spaces each tab represents.
+	 *
+	 * @return void
+	 */
+	public function replaceTabsInToken(&$token, $prefix=' ', $padding=' ', $tabWidth=null)
+	{
+		$checkEncoding = false;
+		if (function_exists('iconv_strlen') === true) {
+			$checkEncoding = true;
+		}
+
+		$currColumn = $token['column'];
+		if ($tabWidth === null) {
+			$tabWidth = $this->config->tabWidth;
+			if ($tabWidth === 0) {
+				$tabWidth = 1;
+			}
+		}
+
+		if (rtrim($token['content'], "\t") === '') {
+			// String only contains tabs, so we can shortcut the process.
+			$numTabs = strlen($token['content']);
+
+			$firstTabSize = ($tabWidth - (($currColumn - 1) % $tabWidth));
+			$length       = ($firstTabSize + ($tabWidth * ($numTabs - 1)));
+			$newContent   = $prefix.str_repeat($padding, ($length - 1));
+		} else {
+			// We need to determine the length of each tab.
+			$tabs = explode("\t", $token['content']);
+
+			$numTabs    = (count($tabs) - 1);
+			$tabNum     = 0;
+			$newContent = '';
+			$length     = 0;
+
+			foreach ($tabs as $content) {
+				if ($content !== '') {
+					$newContent .= $content;
+					if ($checkEncoding === true) {
+						// Not using the default encoding, so take a bit more care.
+						$oldLevel = error_reporting();
+						error_reporting(0);
+						$contentLength = iconv_strlen($content, $this->config->encoding);
+						error_reporting($oldLevel);
+						if ($contentLength === false) {
+							// String contained invalid characters, so revert to default.
+							$contentLength = strlen($content);
+						}
+					} else {
+						$contentLength = strlen($content);
+					}
+
+					$currColumn += $contentLength;
+					$length     += $contentLength;
+				}
+
+				// The last piece of content does not have a tab after it.
+				if ($tabNum === $numTabs) {
+					break;
+				}
+
+				// Process the tab that comes after the content.
+				$lastCurrColumn = $currColumn;
+				$tabNum++;
+
+				// Move the pointer to the next tab stop.
+				if (($currColumn % $tabWidth) === 0) {
+					// This is the first tab, and we are already at a
+					// tab stop, so this tab counts as a single space.
+					$currColumn++;
+				} else {
+					$currColumn++;
+					while (($currColumn % $tabWidth) !== 0) {
+						$currColumn++;
+					}
+
+					$currColumn++;
+				}
+
+				$length     += ($currColumn - $lastCurrColumn);
+				$newContent .= $prefix.str_repeat($padding, ($currColumn - $lastCurrColumn - 1));
+			}//end foreach
+		}//end if
+
+		$token['orig_content'] = $token['content'];
+		$token['content']      = $newContent;
+		$token['length']       = $length;
+
+	}//end replaceTabsInToken()
+
+
+	/**
+	 * Creates a map of brackets positions.
+	 *
+	 * @return void
+	 */
+	private function createTokenMap()
+	{
+		if (PHP_CODESNIFFER_VERBOSITY > 1) {
+			echo "\t*** START TOKEN MAP ***".PHP_EOL;
+		}
+
+		$squareOpeners   = [];
+		$curlyOpeners    = [];
+		$this->numTokens = count($this->tokens);
+
+		$openers   = [];
+		$openOwner = null;
+
+		for ($i = 0; $i < $this->numTokens; $i++) {
+			/*
                 Parenthesis mapping.
             */
 
-            if (isset(Util\Tokens::$parenthesisOpeners[$this->tokens[$i]['code']]) === true) {
-                $this->tokens[$i]['parenthesis_opener'] = null;
-                $this->tokens[$i]['parenthesis_closer'] = null;
-                $this->tokens[$i]['parenthesis_owner']  = $i;
-                $openOwner = $i;
-            } else if ($this->tokens[$i]['code'] === T_OPEN_PARENTHESIS) {
-                $openers[] = $i;
-                $this->tokens[$i]['parenthesis_opener'] = $i;
-                if ($openOwner !== null) {
-                    $this->tokens[$openOwner]['parenthesis_opener'] = $i;
-                    $this->tokens[$i]['parenthesis_owner']          = $openOwner;
-                    $openOwner = null;
-                }
-            } else if ($this->tokens[$i]['code'] === T_CLOSE_PARENTHESIS) {
-                // Did we set an owner for this set of parenthesis?
-                $numOpeners = count($openers);
-                if ($numOpeners !== 0) {
-                    $opener = array_pop($openers);
-                    if (isset($this->tokens[$opener]['parenthesis_owner']) === true) {
-                        $owner = $this->tokens[$opener]['parenthesis_owner'];
-
-                        $this->tokens[$owner]['parenthesis_closer'] = $i;
-                        $this->tokens[$i]['parenthesis_owner']      = $owner;
-                    }
-
-                    $this->tokens[$i]['parenthesis_opener']      = $opener;
-                    $this->tokens[$i]['parenthesis_closer']      = $i;
-                    $this->tokens[$opener]['parenthesis_closer'] = $i;
-                }
-            }//end if
-
-            /*
+			if (isset(Util\Tokens::$parenthesisOpeners[$this->tokens[$i]['code']]) === true) {
+				$this->tokens[$i]['parenthesis_opener'] = null;
+				$this->tokens[$i]['parenthesis_closer'] = null;
+				$this->tokens[$i]['parenthesis_owner']  = $i;
+				$openOwner = $i;
+			} else if ($this->tokens[$i]['code'] === T_OPEN_PARENTHESIS) {
+				$openers[] = $i;
+				$this->tokens[$i]['parenthesis_opener'] = $i;
+				if ($openOwner !== null) {
+					$this->tokens[$openOwner]['parenthesis_opener'] = $i;
+					$this->tokens[$i]['parenthesis_owner']          = $openOwner;
+					$openOwner = null;
+				}
+			} else if ($this->tokens[$i]['code'] === T_CLOSE_PARENTHESIS) {
+				// Did we set an owner for this set of parenthesis?
+				$numOpeners = count($openers);
+				if ($numOpeners !== 0) {
+					$opener = array_pop($openers);
+					if (isset($this->tokens[$opener]['parenthesis_owner']) === true) {
+						$owner = $this->tokens[$opener]['parenthesis_owner'];
+
+						$this->tokens[$owner]['parenthesis_closer'] = $i;
+						$this->tokens[$i]['parenthesis_owner']      = $owner;
+					}
+
+					$this->tokens[$i]['parenthesis_opener']      = $opener;
+					$this->tokens[$i]['parenthesis_closer']      = $i;
+					$this->tokens[$opener]['parenthesis_closer'] = $i;
+				}
+			}//end if
+
+			/*
                 Bracket mapping.
             */
 
-            switch ($this->tokens[$i]['code']) {
-            case T_OPEN_SQUARE_BRACKET:
-                $squareOpeners[] = $i;
-
-                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                    echo str_repeat("\t", count($squareOpeners));
-                    echo str_repeat("\t", count($curlyOpeners));
-                    echo "=> Found square bracket opener at $i".PHP_EOL;
-                }
-                break;
-            case T_OPEN_CURLY_BRACKET:
-                if (isset($this->tokens[$i]['scope_closer']) === false) {
-                    $curlyOpeners[] = $i;
-
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        echo str_repeat("\t", count($squareOpeners));
-                        echo str_repeat("\t", count($curlyOpeners));
-                        echo "=> Found curly bracket opener at $i".PHP_EOL;
-                    }
-                }
-                break;
-            case T_CLOSE_SQUARE_BRACKET:
-                if (empty($squareOpeners) === false) {
-                    $opener = array_pop($squareOpeners);
-                    $this->tokens[$i]['bracket_opener']      = $opener;
-                    $this->tokens[$i]['bracket_closer']      = $i;
-                    $this->tokens[$opener]['bracket_opener'] = $opener;
-                    $this->tokens[$opener]['bracket_closer'] = $i;
-
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        echo str_repeat("\t", count($squareOpeners));
-                        echo str_repeat("\t", count($curlyOpeners));
-                        echo "\t=> Found square bracket closer at $i for $opener".PHP_EOL;
-                    }
-                }
-                break;
-            case T_CLOSE_CURLY_BRACKET:
-                if (empty($curlyOpeners) === false
-                    && isset($this->tokens[$i]['scope_opener']) === false
-                ) {
-                    $opener = array_pop($curlyOpeners);
-                    $this->tokens[$i]['bracket_opener']      = $opener;
-                    $this->tokens[$i]['bracket_closer']      = $i;
-                    $this->tokens[$opener]['bracket_opener'] = $opener;
-                    $this->tokens[$opener]['bracket_closer'] = $i;
-
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        echo str_repeat("\t", count($squareOpeners));
-                        echo str_repeat("\t", count($curlyOpeners));
-                        echo "\t=> Found curly bracket closer at $i for $opener".PHP_EOL;
-                    }
-                }
-                break;
-            default:
-                continue 2;
-            }//end switch
-        }//end for
-
-        // Cleanup for any openers that we didn't find closers for.
-        // This typically means there was a syntax error breaking things.
-        foreach ($openers as $opener) {
-            unset($this->tokens[$opener]['parenthesis_opener']);
-            unset($this->tokens[$opener]['parenthesis_owner']);
-        }
-
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            echo "\t*** END TOKEN MAP ***".PHP_EOL;
-        }
-
-    }//end createTokenMap()
-
-
-    /**
-     * Creates a map for the parenthesis tokens that surround other tokens.
-     *
-     * @return void
-     */
-    private function createParenthesisNestingMap()
-    {
-        $map = [];
-        for ($i = 0; $i < $this->numTokens; $i++) {
-            if (isset($this->tokens[$i]['parenthesis_opener']) === true
-                && $i === $this->tokens[$i]['parenthesis_opener']
-            ) {
-                if (empty($map) === false) {
-                    $this->tokens[$i]['nested_parenthesis'] = $map;
-                }
-
-                if (isset($this->tokens[$i]['parenthesis_closer']) === true) {
-                    $map[$this->tokens[$i]['parenthesis_opener']]
-                        = $this->tokens[$i]['parenthesis_closer'];
-                }
-            } else if (isset($this->tokens[$i]['parenthesis_closer']) === true
-                && $i === $this->tokens[$i]['parenthesis_closer']
-            ) {
-                array_pop($map);
-                if (empty($map) === false) {
-                    $this->tokens[$i]['nested_parenthesis'] = $map;
-                }
-            } else {
-                if (empty($map) === false) {
-                    $this->tokens[$i]['nested_parenthesis'] = $map;
-                }
-            }//end if
-        }//end for
-
-    }//end createParenthesisNestingMap()
-
-
-    /**
-     * Creates a scope map of tokens that open scopes.
-     *
-     * @return void
-     * @see    recurseScopeMap()
-     */
-    private function createScopeMap()
-    {
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            echo "\t*** START SCOPE MAP ***".PHP_EOL;
-        }
-
-        for ($i = 0; $i < $this->numTokens; $i++) {
-            // Check to see if the current token starts a new scope.
-            if (isset($this->scopeOpeners[$this->tokens[$i]['code']]) === true) {
-                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                    $type    = $this->tokens[$i]['type'];
-                    $content = Util\Common::prepareForOutput($this->tokens[$i]['content']);
-                    echo "\tStart scope map at $i:$type => $content".PHP_EOL;
-                }
-
-                if (isset($this->tokens[$i]['scope_condition']) === true) {
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        echo "\t* already processed, skipping *".PHP_EOL;
-                    }
-
-                    continue;
-                }
-
-                $i = $this->recurseScopeMap($i);
-            }//end if
-        }//end for
-
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            echo "\t*** END SCOPE MAP ***".PHP_EOL;
-        }
-
-    }//end createScopeMap()
-
-
-    /**
-     * Recurses though the scope openers to build a scope map.
-     *
-     * @param int $stackPtr The position in the stack of the token that
-     *                      opened the scope (eg. an IF token or FOR token).
-     * @param int $depth    How many scope levels down we are.
-     * @param int $ignore   How many curly braces we are ignoring.
-     *
-     * @return int The position in the stack that closed the scope.
-     */
-    private function recurseScopeMap($stackPtr, $depth=1, &$ignore=0)
-    {
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            echo str_repeat("\t", $depth);
-            echo "=> Begin scope map recursion at token $stackPtr with depth $depth".PHP_EOL;
-        }
-
-        $opener    = null;
-        $currType  = $this->tokens[$stackPtr]['code'];
-        $startLine = $this->tokens[$stackPtr]['line'];
-
-        // We will need this to restore the value if we end up
-        // returning a token ID that causes our calling function to go back
-        // over already ignored braces.
-        $originalIgnore = $ignore;
-
-        // If the start token for this scope opener is the same as
-        // the scope token, we have already found our opener.
-        if (isset($this->scopeOpeners[$currType]['start'][$currType]) === true) {
-            $opener = $stackPtr;
-        }
-
-        for ($i = ($stackPtr + 1); $i < $this->numTokens; $i++) {
-            $tokenType = $this->tokens[$i]['code'];
-
-            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                $type    = $this->tokens[$i]['type'];
-                $line    = $this->tokens[$i]['line'];
-                $content = Util\Common::prepareForOutput($this->tokens[$i]['content']);
-
-                echo str_repeat("\t", $depth);
-                echo "Process token $i on line $line [";
-                if ($opener !== null) {
-                    echo "opener:$opener;";
-                }
-
-                if ($ignore > 0) {
-                    echo "ignore=$ignore;";
-                }
-
-                echo "]: $type => $content".PHP_EOL;
-            }//end if
-
-            // Very special case for IF statements in PHP that can be defined without
-            // scope tokens. E.g., if (1) 1; 1 ? (1 ? 1 : 1) : 1;
-            // If an IF statement below this one has an opener but no
-            // keyword, the opener will be incorrectly assigned to this IF statement.
-            // The same case also applies to USE statements, which don't have to have
-            // openers, so a following USE statement can cause an incorrect brace match.
-            if (($currType === T_IF || $currType === T_ELSE || $currType === T_USE)
-                && $opener === null
-                && ($this->tokens[$i]['code'] === T_SEMICOLON
-                || $this->tokens[$i]['code'] === T_CLOSE_TAG)
-            ) {
-                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                    $type = $this->tokens[$stackPtr]['type'];
-                    echo str_repeat("\t", $depth);
-                    if ($this->tokens[$i]['code'] === T_SEMICOLON) {
-                        $closerType = 'semicolon';
-                    } else {
-                        $closerType = 'close tag';
-                    }
-
-                    echo "=> Found $closerType before scope opener for $stackPtr:$type, bailing".PHP_EOL;
-                }
-
-                return $i;
-            }
-
-            // Special case for PHP control structures that have no braces.
-            // If we find a curly brace closer before we find the opener,
-            // we're not going to find an opener. That closer probably belongs to
-            // a control structure higher up.
-            if ($opener === null
-                && $ignore === 0
-                && $tokenType === T_CLOSE_CURLY_BRACKET
-                && isset($this->scopeOpeners[$currType]['end'][$tokenType]) === true
-            ) {
-                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                    $type = $this->tokens[$stackPtr]['type'];
-                    echo str_repeat("\t", $depth);
-                    echo "=> Found curly brace closer before scope opener for $stackPtr:$type, bailing".PHP_EOL;
-                }
-
-                return ($i - 1);
-            }
-
-            if ($opener !== null
-                && (isset($this->tokens[$i]['scope_opener']) === false
-                || $this->scopeOpeners[$this->tokens[$stackPtr]['code']]['shared'] === true)
-                && isset($this->scopeOpeners[$currType]['end'][$tokenType]) === true
-            ) {
-                if ($ignore > 0 && $tokenType === T_CLOSE_CURLY_BRACKET) {
-                    // The last opening bracket must have been for a string
-                    // offset or alike, so let's ignore it.
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        echo str_repeat("\t", $depth);
-                        echo '* finished ignoring curly brace *'.PHP_EOL;
-                    }
-
-                    $ignore--;
-                    continue;
-                } else if ($this->tokens[$opener]['code'] === T_OPEN_CURLY_BRACKET
-                    && $tokenType !== T_CLOSE_CURLY_BRACKET
-                ) {
-                    // The opener is a curly bracket so the closer must be a curly bracket as well.
-                    // We ignore this closer to handle cases such as T_ELSE or T_ELSEIF being considered
-                    // a closer of T_IF when it should not.
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        $type = $this->tokens[$stackPtr]['type'];
-                        echo str_repeat("\t", $depth);
-                        echo "=> Ignoring non-curly scope closer for $stackPtr:$type".PHP_EOL;
-                    }
-                } else {
-                    $scopeCloser = $i;
-                    $todo        = [
-                        $stackPtr,
-                        $opener,
-                    ];
-
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        $type       = $this->tokens[$stackPtr]['type'];
-                        $closerType = $this->tokens[$scopeCloser]['type'];
-                        echo str_repeat("\t", $depth);
-                        echo "=> Found scope closer ($scopeCloser:$closerType) for $stackPtr:$type".PHP_EOL;
-                    }
-
-                    $validCloser = true;
-                    if (($this->tokens[$stackPtr]['code'] === T_IF || $this->tokens[$stackPtr]['code'] === T_ELSEIF)
-                        && ($tokenType === T_ELSE || $tokenType === T_ELSEIF)
-                    ) {
-                        // To be a closer, this token must have an opener.
-                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            echo str_repeat("\t", $depth);
-                            echo "* closer needs to be tested *".PHP_EOL;
-                        }
-
-                        $i = self::recurseScopeMap($i, ($depth + 1), $ignore);
-
-                        if (isset($this->tokens[$scopeCloser]['scope_opener']) === false) {
-                            $validCloser = false;
-                            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                echo str_repeat("\t", $depth);
-                                echo "* closer is not valid (no opener found) *".PHP_EOL;
-                            }
-                        } else if ($this->tokens[$this->tokens[$scopeCloser]['scope_opener']]['code'] !== $this->tokens[$opener]['code']) {
-                            $validCloser = false;
-                            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                echo str_repeat("\t", $depth);
-                                $type       = $this->tokens[$this->tokens[$scopeCloser]['scope_opener']]['type'];
-                                $openerType = $this->tokens[$opener]['type'];
-                                echo "* closer is not valid (mismatched opener type; $type != $openerType) *".PHP_EOL;
-                            }
-                        } else if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            echo str_repeat("\t", $depth);
-                            echo "* closer was valid *".PHP_EOL;
-                        }
-                    } else {
-                        // The closer was not processed, so we need to
-                        // complete that token as well.
-                        $todo[] = $scopeCloser;
-                    }//end if
-
-                    if ($validCloser === true) {
-                        foreach ($todo as $token) {
-                            $this->tokens[$token]['scope_condition'] = $stackPtr;
-                            $this->tokens[$token]['scope_opener']    = $opener;
-                            $this->tokens[$token]['scope_closer']    = $scopeCloser;
-                        }
-
-                        if ($this->scopeOpeners[$this->tokens[$stackPtr]['code']]['shared'] === true) {
-                            // As we are going back to where we started originally, restore
-                            // the ignore value back to its original value.
-                            $ignore = $originalIgnore;
-                            return $opener;
-                        } else if ($scopeCloser === $i
-                            && isset($this->scopeOpeners[$tokenType]) === true
-                        ) {
-                            // Unset scope_condition here or else the token will appear to have
-                            // already been processed, and it will be skipped. Normally we want that,
-                            // but in this case, the token is both a closer and an opener, so
-                            // it needs to act like an opener. This is also why we return the
-                            // token before this one; so the closer has a chance to be processed
-                            // a second time, but as an opener.
-                            unset($this->tokens[$scopeCloser]['scope_condition']);
-                            return ($i - 1);
-                        } else {
-                            return $i;
-                        }
-                    } else {
-                        continue;
-                    }//end if
-                }//end if
-            }//end if
-
-            // Is this an opening condition ?
-            if (isset($this->scopeOpeners[$tokenType]) === true) {
-                if ($opener === null) {
-                    if ($tokenType === T_USE) {
-                        // PHP use keywords are special because they can be
-                        // used as blocks but also inline in function definitions.
-                        // So if we find them nested inside another opener, just skip them.
-                        continue;
-                    }
-
-                    if ($tokenType === T_FUNCTION
-                        && $this->tokens[$stackPtr]['code'] !== T_FUNCTION
-                    ) {
-                        // Probably a closure, so process it manually.
-                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            $type = $this->tokens[$stackPtr]['type'];
-                            echo str_repeat("\t", $depth);
-                            echo "=> Found function before scope opener for $stackPtr:$type, processing manually".PHP_EOL;
-                        }
-
-                        if (isset($this->tokens[$i]['scope_closer']) === true) {
-                            // We've already processed this closure.
-                            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                echo str_repeat("\t", $depth);
-                                echo '* already processed, skipping *'.PHP_EOL;
-                            }
-
-                            $i = $this->tokens[$i]['scope_closer'];
-                            continue;
-                        }
-
-                        $i = self::recurseScopeMap($i, ($depth + 1), $ignore);
-                        continue;
-                    }//end if
-
-                    if ($tokenType === T_CLASS) {
-                        // Probably an anonymous class inside another anonymous class,
-                        // so process it manually.
-                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            $type = $this->tokens[$stackPtr]['type'];
-                            echo str_repeat("\t", $depth);
-                            echo "=> Found class before scope opener for $stackPtr:$type, processing manually".PHP_EOL;
-                        }
-
-                        if (isset($this->tokens[$i]['scope_closer']) === true) {
-                            // We've already processed this anon class.
-                            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                echo str_repeat("\t", $depth);
-                                echo '* already processed, skipping *'.PHP_EOL;
-                            }
-
-                            $i = $this->tokens[$i]['scope_closer'];
-                            continue;
-                        }
-
-                        $i = self::recurseScopeMap($i, ($depth + 1), $ignore);
-                        continue;
-                    }//end if
-
-                    // Found another opening condition but still haven't
-                    // found our opener, so we are never going to find one.
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        $type = $this->tokens[$stackPtr]['type'];
-                        echo str_repeat("\t", $depth);
-                        echo "=> Found new opening condition before scope opener for $stackPtr:$type, ";
-                    }
-
-                    if (($this->tokens[$stackPtr]['code'] === T_IF
-                        || $this->tokens[$stackPtr]['code'] === T_ELSEIF
-                        || $this->tokens[$stackPtr]['code'] === T_ELSE)
-                        && ($this->tokens[$i]['code'] === T_ELSE
-                        || $this->tokens[$i]['code'] === T_ELSEIF)
-                    ) {
-                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            echo "continuing".PHP_EOL;
-                        }
-
-                        return ($i - 1);
-                    } else {
-                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            echo "backtracking".PHP_EOL;
-                        }
-
-                        return $stackPtr;
-                    }
-                }//end if
-
-                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                    echo str_repeat("\t", $depth);
-                    echo '* token is an opening condition *'.PHP_EOL;
-                }
-
-                $isShared = ($this->scopeOpeners[$tokenType]['shared'] === true);
-
-                if (isset($this->tokens[$i]['scope_condition']) === true) {
-                    // We've been here before.
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        echo str_repeat("\t", $depth);
-                        echo '* already processed, skipping *'.PHP_EOL;
-                    }
-
-                    if ($isShared === false
-                        && isset($this->tokens[$i]['scope_closer']) === true
-                    ) {
-                        $i = $this->tokens[$i]['scope_closer'];
-                    }
-
-                    continue;
-                } else if ($currType === $tokenType
-                    && $isShared === false
-                    && $opener === null
-                ) {
-                    // We haven't yet found our opener, but we have found another
-                    // scope opener which is the same type as us, and we don't
-                    // share openers, so we will never find one.
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        echo str_repeat("\t", $depth);
-                        echo '* it was another token\'s opener, bailing *'.PHP_EOL;
-                    }
-
-                    return $stackPtr;
-                } else {
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        echo str_repeat("\t", $depth);
-                        echo '* searching for opener *'.PHP_EOL;
-                    }
-
-                    if (isset($this->scopeOpeners[$tokenType]['end'][T_CLOSE_CURLY_BRACKET]) === true) {
-                        $oldIgnore = $ignore;
-                        $ignore    = 0;
-                    }
-
-                    // PHP has a max nesting level for functions. Stop before we hit that limit
-                    // because too many loops means we've run into trouble anyway.
-                    if ($depth > 50) {
-                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            echo str_repeat("\t", $depth);
-                            echo '* reached maximum nesting level; aborting *'.PHP_EOL;
-                        }
-
-                        throw new RuntimeException('Maximum nesting level reached; file could not be processed');
-                    }
-
-                    $oldDepth = $depth;
-                    if ($isShared === true
-                        && isset($this->scopeOpeners[$tokenType]['with'][$currType]) === true
-                    ) {
-                        // Don't allow the depth to increment because this is
-                        // possibly not a true nesting if we are sharing our closer.
-                        // This can happen, for example, when a SWITCH has a large
-                        // number of CASE statements with the same shared BREAK.
-                        $depth--;
-                    }
-
-                    $i     = self::recurseScopeMap($i, ($depth + 1), $ignore);
-                    $depth = $oldDepth;
-
-                    if (isset($this->scopeOpeners[$tokenType]['end'][T_CLOSE_CURLY_BRACKET]) === true) {
-                        $ignore = $oldIgnore;
-                    }
-                }//end if
-            }//end if
-
-            if (isset($this->scopeOpeners[$currType]['start'][$tokenType]) === true
-                && $opener === null
-            ) {
-                if ($tokenType === T_OPEN_CURLY_BRACKET) {
-                    if (isset($this->tokens[$stackPtr]['parenthesis_closer']) === true
-                        && $i < $this->tokens[$stackPtr]['parenthesis_closer']
-                    ) {
-                        // We found a curly brace inside the condition of the
-                        // current scope opener, so it must be a string offset.
-                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            echo str_repeat("\t", $depth);
-                            echo '* ignoring curly brace inside condition *'.PHP_EOL;
-                        }
-
-                        $ignore++;
-                    } else {
-                        // Make sure this is actually an opener and not a
-                        // string offset (e.g., $var{0}).
-                        for ($x = ($i - 1); $x > 0; $x--) {
-                            if (isset(Util\Tokens::$emptyTokens[$this->tokens[$x]['code']]) === true) {
-                                continue;
-                            } else {
-                                // If the first non-whitespace/comment token looks like this
-                                // brace is a string offset, or this brace is mid-way through
-                                // a new statement, it isn't a scope opener.
-                                $disallowed  = Util\Tokens::$assignmentTokens;
-                                $disallowed += [
-                                    T_DOLLAR           => true,
-                                    T_VARIABLE         => true,
-                                    T_OBJECT_OPERATOR  => true,
-                                    T_COMMA            => true,
-                                    T_OPEN_PARENTHESIS => true,
-                                ];
-
-                                if (isset($disallowed[$this->tokens[$x]['code']]) === true) {
-                                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                        echo str_repeat("\t", $depth);
-                                        echo '* ignoring curly brace *'.PHP_EOL;
-                                    }
-
-                                    $ignore++;
-                                }
-
-                                break;
-                            }//end if
-                        }//end for
-                    }//end if
-                }//end if
-
-                if ($ignore === 0 || $tokenType !== T_OPEN_CURLY_BRACKET) {
-                    // We found the opening scope token for $currType.
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        $type = $this->tokens[$stackPtr]['type'];
-                        echo str_repeat("\t", $depth);
-                        echo "=> Found scope opener for $stackPtr:$type".PHP_EOL;
-                    }
-
-                    $opener = $i;
-                }
-            } else if ($tokenType === T_OPEN_PARENTHESIS) {
-                if (isset($this->tokens[$i]['parenthesis_owner']) === true) {
-                    $owner = $this->tokens[$i]['parenthesis_owner'];
-                    if (isset(Util\Tokens::$scopeOpeners[$this->tokens[$owner]['code']]) === true
-                        && isset($this->tokens[$i]['parenthesis_closer']) === true
-                    ) {
-                        // If we get into here, then we opened a parenthesis for
-                        // a scope (eg. an if or else if) so we need to update the
-                        // start of the line so that when we check to see
-                        // if the closing parenthesis is more than 3 lines away from
-                        // the statement, we check from the closing parenthesis.
-                        $startLine = $this->tokens[$this->tokens[$i]['parenthesis_closer']]['line'];
-                    }
-                }
-            } else if ($tokenType === T_OPEN_CURLY_BRACKET && $opener !== null) {
-                // We opened something that we don't have a scope opener for.
-                // Examples of this are curly brackets for string offsets etc.
-                // We want to ignore this so that we don't have an invalid scope
-                // map.
-                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                    echo str_repeat("\t", $depth);
-                    echo '* ignoring curly brace *'.PHP_EOL;
-                }
-
-                $ignore++;
-            } else if ($tokenType === T_CLOSE_CURLY_BRACKET && $ignore > 0) {
-                // We found the end token for the opener we were ignoring.
-                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                    echo str_repeat("\t", $depth);
-                    echo '* finished ignoring curly brace *'.PHP_EOL;
-                }
-
-                $ignore--;
-            } else if ($opener === null
-                && isset($this->scopeOpeners[$currType]) === true
-            ) {
-                // If we still haven't found the opener after 30 lines,
-                // we're not going to find it, unless we know it requires
-                // an opener (in which case we better keep looking) or the last
-                // token was empty (in which case we'll just confirm there is
-                // more code in this file and not just a big comment).
-                if ($this->tokens[$i]['line'] >= ($startLine + 30)
-                    && isset(Util\Tokens::$emptyTokens[$this->tokens[($i - 1)]['code']]) === false
-                ) {
-                    if ($this->scopeOpeners[$currType]['strict'] === true) {
-                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            $type  = $this->tokens[$stackPtr]['type'];
-                            $lines = ($this->tokens[$i]['line'] - $startLine);
-                            echo str_repeat("\t", $depth);
-                            echo "=> Still looking for $stackPtr:$type scope opener after $lines lines".PHP_EOL;
-                        }
-                    } else {
-                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            $type = $this->tokens[$stackPtr]['type'];
-                            echo str_repeat("\t", $depth);
-                            echo "=> Couldn't find scope opener for $stackPtr:$type, bailing".PHP_EOL;
-                        }
-
-                        return $stackPtr;
-                    }
-                }
-            } else if ($opener !== null
-                && $tokenType !== T_BREAK
-                && isset($this->endScopeTokens[$tokenType]) === true
-            ) {
-                if (isset($this->tokens[$i]['scope_condition']) === false) {
-                    if ($ignore > 0) {
-                        // We found the end token for the opener we were ignoring.
-                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            echo str_repeat("\t", $depth);
-                            echo '* finished ignoring curly brace *'.PHP_EOL;
-                        }
-
-                        $ignore--;
-                    } else {
-                        // We found a token that closes the scope but it doesn't
-                        // have a condition, so it belongs to another token and
-                        // our token doesn't have a closer, so pretend this is
-                        // the closer.
-                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            $type = $this->tokens[$stackPtr]['type'];
-                            echo str_repeat("\t", $depth);
-                            echo "=> Found (unexpected) scope closer for $stackPtr:$type".PHP_EOL;
-                        }
-
-                        foreach ([$stackPtr, $opener] as $token) {
-                            $this->tokens[$token]['scope_condition'] = $stackPtr;
-                            $this->tokens[$token]['scope_opener']    = $opener;
-                            $this->tokens[$token]['scope_closer']    = $i;
-                        }
-
-                        return ($i - 1);
-                    }//end if
-                }//end if
-            }//end if
-        }//end for
-
-        return $stackPtr;
-
-    }//end recurseScopeMap()
-
-
-    /**
-     * Constructs the level map.
-     *
-     * The level map adds a 'level' index to each token which indicates the
-     * depth that a token within a set of scope blocks. It also adds a
-     * 'conditions' index which is an array of the scope conditions that opened
-     * each of the scopes - position 0 being the first scope opener.
-     *
-     * @return void
-     */
-    private function createLevelMap()
-    {
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            echo "\t*** START LEVEL MAP ***".PHP_EOL;
-        }
-
-        $this->numTokens = count($this->tokens);
-        $level           = 0;
-        $conditions      = [];
-        $lastOpener      = null;
-        $openers         = [];
-
-        for ($i = 0; $i < $this->numTokens; $i++) {
-            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                $type = $this->tokens[$i]['type'];
-                $line = $this->tokens[$i]['line'];
-                $len  = $this->tokens[$i]['length'];
-                $col  = $this->tokens[$i]['column'];
-
-                $content = Util\Common::prepareForOutput($this->tokens[$i]['content']);
-
-                echo str_repeat("\t", ($level + 1));
-                echo "Process token $i on line $line [col:$col;len:$len;lvl:$level;";
-                if (empty($conditions) !== true) {
-                    $condString = 'conds;';
-                    foreach ($conditions as $condition) {
-                        $condString .= Util\Tokens::tokenName($condition).',';
-                    }
-
-                    echo rtrim($condString, ',').';';
-                }
-
-                echo "]: $type => $content".PHP_EOL;
-            }//end if
-
-            $this->tokens[$i]['level']      = $level;
-            $this->tokens[$i]['conditions'] = $conditions;
-
-            if (isset($this->tokens[$i]['scope_condition']) === true) {
-                // Check to see if this token opened the scope.
-                if ($this->tokens[$i]['scope_opener'] === $i) {
-                    $stackPtr = $this->tokens[$i]['scope_condition'];
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        $type = $this->tokens[$stackPtr]['type'];
-                        echo str_repeat("\t", ($level + 1));
-                        echo "=> Found scope opener for $stackPtr:$type".PHP_EOL;
-                    }
-
-                    $stackPtr = $this->tokens[$i]['scope_condition'];
-
-                    // If we find a scope opener that has a shared closer,
-                    // then we need to go back over the condition map that we
-                    // just created and fix ourselves as we just added some
-                    // conditions where there was none. This happens for T_CASE
-                    // statements that are using the same break statement.
-                    if ($lastOpener !== null && $this->tokens[$lastOpener]['scope_closer'] === $this->tokens[$i]['scope_closer']) {
-                        // This opener shares its closer with the previous opener,
-                        // but we still need to check if the two openers share their
-                        // closer with each other directly (like CASE and DEFAULT)
-                        // or if they are just sharing because one doesn't have a
-                        // closer (like CASE with no BREAK using a SWITCHes closer).
-                        $thisType = $this->tokens[$this->tokens[$i]['scope_condition']]['code'];
-                        $opener   = $this->tokens[$lastOpener]['scope_condition'];
-
-                        $isShared = isset($this->scopeOpeners[$thisType]['with'][$this->tokens[$opener]['code']]);
-
-                        reset($this->scopeOpeners[$thisType]['end']);
-                        reset($this->scopeOpeners[$this->tokens[$opener]['code']]['end']);
-                        $sameEnd = (current($this->scopeOpeners[$thisType]['end']) === current($this->scopeOpeners[$this->tokens[$opener]['code']]['end']));
-
-                        if ($isShared === true && $sameEnd === true) {
-                            $badToken = $opener;
-                            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                $type = $this->tokens[$badToken]['type'];
-                                echo str_repeat("\t", ($level + 1));
-                                echo "* shared closer, cleaning up $badToken:$type *".PHP_EOL;
-                            }
-
-                            for ($x = $this->tokens[$i]['scope_condition']; $x <= $i; $x++) {
-                                $oldConditions = $this->tokens[$x]['conditions'];
-                                $oldLevel      = $this->tokens[$x]['level'];
-                                $this->tokens[$x]['level']--;
-                                unset($this->tokens[$x]['conditions'][$badToken]);
-                                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                    $type     = $this->tokens[$x]['type'];
-                                    $oldConds = '';
-                                    foreach ($oldConditions as $condition) {
-                                        $oldConds .= Util\Tokens::tokenName($condition).',';
-                                    }
-
-                                    $oldConds = rtrim($oldConds, ',');
-
-                                    $newConds = '';
-                                    foreach ($this->tokens[$x]['conditions'] as $condition) {
-                                        $newConds .= Util\Tokens::tokenName($condition).',';
-                                    }
-
-                                    $newConds = rtrim($newConds, ',');
-
-                                    $newLevel = $this->tokens[$x]['level'];
-                                    echo str_repeat("\t", ($level + 1));
-                                    echo "* cleaned $x:$type *".PHP_EOL;
-                                    echo str_repeat("\t", ($level + 2));
-                                    echo "=> level changed from $oldLevel to $newLevel".PHP_EOL;
-                                    echo str_repeat("\t", ($level + 2));
-                                    echo "=> conditions changed from $oldConds to $newConds".PHP_EOL;
-                                }//end if
-                            }//end for
-
-                            unset($conditions[$badToken]);
-                            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                $type = $this->tokens[$badToken]['type'];
-                                echo str_repeat("\t", ($level + 1));
-                                echo "* token $badToken:$type removed from conditions array *".PHP_EOL;
-                            }
-
-                            unset($openers[$lastOpener]);
-
-                            $level--;
-                            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                echo str_repeat("\t", ($level + 2));
-                                echo '* level decreased *'.PHP_EOL;
-                            }
-                        }//end if
-                    }//end if
-
-                    $level++;
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        echo str_repeat("\t", ($level + 1));
-                        echo '* level increased *'.PHP_EOL;
-                    }
-
-                    $conditions[$stackPtr] = $this->tokens[$stackPtr]['code'];
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        $type = $this->tokens[$stackPtr]['type'];
-                        echo str_repeat("\t", ($level + 1));
-                        echo "* token $stackPtr:$type added to conditions array *".PHP_EOL;
-                    }
-
-                    $lastOpener = $this->tokens[$i]['scope_opener'];
-                    if ($lastOpener !== null) {
-                        $openers[$lastOpener] = $lastOpener;
-                    }
-                } else if ($lastOpener !== null && $this->tokens[$lastOpener]['scope_closer'] === $i) {
-                    foreach (array_reverse($openers) as $opener) {
-                        if ($this->tokens[$opener]['scope_closer'] === $i) {
-                            $oldOpener = array_pop($openers);
-                            if (empty($openers) === false) {
-                                $lastOpener           = array_pop($openers);
-                                $openers[$lastOpener] = $lastOpener;
-                            } else {
-                                $lastOpener = null;
-                            }
-
-                            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                $type = $this->tokens[$oldOpener]['type'];
-                                echo str_repeat("\t", ($level + 1));
-                                echo "=> Found scope closer for $oldOpener:$type".PHP_EOL;
-                            }
-
-                            $oldCondition = array_pop($conditions);
-                            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                echo str_repeat("\t", ($level + 1));
-                                echo '* token '.Util\Tokens::tokenName($oldCondition).' removed from conditions array *'.PHP_EOL;
-                            }
-
-                            // Make sure this closer actually belongs to us.
-                            // Either the condition also has to think this is the
-                            // closer, or it has to allow sharing with us.
-                            $condition = $this->tokens[$this->tokens[$i]['scope_condition']]['code'];
-                            if ($condition !== $oldCondition) {
-                                if (isset($this->scopeOpeners[$oldCondition]['with'][$condition]) === false) {
-                                    $badToken = $this->tokens[$oldOpener]['scope_condition'];
-
-                                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                        $type = Util\Tokens::tokenName($oldCondition);
-                                        echo str_repeat("\t", ($level + 1));
-                                        echo "* scope closer was bad, cleaning up $badToken:$type *".PHP_EOL;
-                                    }
-
-                                    for ($x = ($oldOpener + 1); $x <= $i; $x++) {
-                                        $oldConditions = $this->tokens[$x]['conditions'];
-                                        $oldLevel      = $this->tokens[$x]['level'];
-                                        $this->tokens[$x]['level']--;
-                                        unset($this->tokens[$x]['conditions'][$badToken]);
-                                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                            $type     = $this->tokens[$x]['type'];
-                                            $oldConds = '';
-                                            foreach ($oldConditions as $condition) {
-                                                $oldConds .= Util\Tokens::tokenName($condition).',';
-                                            }
-
-                                            $oldConds = rtrim($oldConds, ',');
-
-                                            $newConds = '';
-                                            foreach ($this->tokens[$x]['conditions'] as $condition) {
-                                                $newConds .= Util\Tokens::tokenName($condition).',';
-                                            }
-
-                                            $newConds = rtrim($newConds, ',');
-
-                                            $newLevel = $this->tokens[$x]['level'];
-                                            echo str_repeat("\t", ($level + 1));
-                                            echo "* cleaned $x:$type *".PHP_EOL;
-                                            echo str_repeat("\t", ($level + 2));
-                                            echo "=> level changed from $oldLevel to $newLevel".PHP_EOL;
-                                            echo str_repeat("\t", ($level + 2));
-                                            echo "=> conditions changed from $oldConds to $newConds".PHP_EOL;
-                                        }//end if
-                                    }//end for
-                                }//end if
-                            }//end if
-
-                            $level--;
-                            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                echo str_repeat("\t", ($level + 2));
-                                echo '* level decreased *'.PHP_EOL;
-                            }
-
-                            $this->tokens[$i]['level']      = $level;
-                            $this->tokens[$i]['conditions'] = $conditions;
-                        }//end if
-                    }//end foreach
-                }//end if
-            }//end if
-        }//end for
-
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            echo "\t*** END LEVEL MAP ***".PHP_EOL;
-        }
-
-    }//end createLevelMap()
+			switch ($this->tokens[$i]['code']) {
+			case T_OPEN_SQUARE_BRACKET:
+				$squareOpeners[] = $i;
+
+				if (PHP_CODESNIFFER_VERBOSITY > 1) {
+					echo str_repeat("\t", count($squareOpeners));
+					echo str_repeat("\t", count($curlyOpeners));
+					echo "=> Found square bracket opener at $i".PHP_EOL;
+				}
+				break;
+			case T_OPEN_CURLY_BRACKET:
+				if (isset($this->tokens[$i]['scope_closer']) === false) {
+					$curlyOpeners[] = $i;
+
+					if (PHP_CODESNIFFER_VERBOSITY > 1) {
+						echo str_repeat("\t", count($squareOpeners));
+						echo str_repeat("\t", count($curlyOpeners));
+						echo "=> Found curly bracket opener at $i".PHP_EOL;
+					}
+				}
+				break;
+			case T_CLOSE_SQUARE_BRACKET:
+				if (empty($squareOpeners) === false) {
+					$opener = array_pop($squareOpeners);
+					$this->tokens[$i]['bracket_opener']      = $opener;
+					$this->tokens[$i]['bracket_closer']      = $i;
+					$this->tokens[$opener]['bracket_opener'] = $opener;
+					$this->tokens[$opener]['bracket_closer'] = $i;
+
+					if (PHP_CODESNIFFER_VERBOSITY > 1) {
+						echo str_repeat("\t", count($squareOpeners));
+						echo str_repeat("\t", count($curlyOpeners));
+						echo "\t=> Found square bracket closer at $i for $opener".PHP_EOL;
+					}
+				}
+				break;
+			case T_CLOSE_CURLY_BRACKET:
+				if (empty($curlyOpeners) === false
+					&& isset($this->tokens[$i]['scope_opener']) === false
+				) {
+					$opener = array_pop($curlyOpeners);
+					$this->tokens[$i]['bracket_opener']      = $opener;
+					$this->tokens[$i]['bracket_closer']      = $i;
+					$this->tokens[$opener]['bracket_opener'] = $opener;
+					$this->tokens[$opener]['bracket_closer'] = $i;
+
+					if (PHP_CODESNIFFER_VERBOSITY > 1) {
+						echo str_repeat("\t", count($squareOpeners));
+						echo str_repeat("\t", count($curlyOpeners));
+						echo "\t=> Found curly bracket closer at $i for $opener".PHP_EOL;
+					}
+				}
+				break;
+			default:
+				continue 2;
+			}//end switch
+		}//end for
+
+		// Cleanup for any openers that we didn't find closers for.
+		// This typically means there was a syntax error breaking things.
+		foreach ($openers as $opener) {
+			unset($this->tokens[$opener]['parenthesis_opener']);
+			unset($this->tokens[$opener]['parenthesis_owner']);
+		}
+
+		if (PHP_CODESNIFFER_VERBOSITY > 1) {
+			echo "\t*** END TOKEN MAP ***".PHP_EOL;
+		}
+
+	}//end createTokenMap()
+
+
+	/**
+	 * Creates a map for the parenthesis tokens that surround other tokens.
+	 *
+	 * @return void
+	 */
+	private function createParenthesisNestingMap()
+	{
+		$map = [];
+		for ($i = 0; $i < $this->numTokens; $i++) {
+			if (isset($this->tokens[$i]['parenthesis_opener']) === true
+				&& $i === $this->tokens[$i]['parenthesis_opener']
+			) {
+				if (empty($map) === false) {
+					$this->tokens[$i]['nested_parenthesis'] = $map;
+				}
+
+				if (isset($this->tokens[$i]['parenthesis_closer']) === true) {
+					$map[$this->tokens[$i]['parenthesis_opener']]
+						= $this->tokens[$i]['parenthesis_closer'];
+				}
+			} else if (isset($this->tokens[$i]['parenthesis_closer']) === true
+				&& $i === $this->tokens[$i]['parenthesis_closer']
+			) {
+				array_pop($map);
+				if (empty($map) === false) {
+					$this->tokens[$i]['nested_parenthesis'] = $map;
+				}
+			} else {
+				if (empty($map) === false) {
+					$this->tokens[$i]['nested_parenthesis'] = $map;
+				}
+			}//end if
+		}//end for
+
+	}//end createParenthesisNestingMap()
+
+
+	/**
+	 * Creates a scope map of tokens that open scopes.
+	 *
+	 * @return void
+	 * @see    recurseScopeMap()
+	 */
+	private function createScopeMap()
+	{
+		if (PHP_CODESNIFFER_VERBOSITY > 1) {
+			echo "\t*** START SCOPE MAP ***".PHP_EOL;
+		}
+
+		for ($i = 0; $i < $this->numTokens; $i++) {
+			// Check to see if the current token starts a new scope.
+			if (isset($this->scopeOpeners[$this->tokens[$i]['code']]) === true) {
+				if (PHP_CODESNIFFER_VERBOSITY > 1) {
+					$type    = $this->tokens[$i]['type'];
+					$content = Util\Common::prepareForOutput($this->tokens[$i]['content']);
+					echo "\tStart scope map at $i:$type => $content".PHP_EOL;
+				}
+
+				if (isset($this->tokens[$i]['scope_condition']) === true) {
+					if (PHP_CODESNIFFER_VERBOSITY > 1) {
+						echo "\t* already processed, skipping *".PHP_EOL;
+					}
+
+					continue;
+				}
+
+				$i = $this->recurseScopeMap($i);
+			}//end if
+		}//end for
+
+		if (PHP_CODESNIFFER_VERBOSITY > 1) {
+			echo "\t*** END SCOPE MAP ***".PHP_EOL;
+		}
+
+	}//end createScopeMap()
+
+
+	/**
+	 * Recurses though the scope openers to build a scope map.
+	 *
+	 * @param int $stackPtr The position in the stack of the token that
+	 *                      opened the scope (eg. an IF token or FOR token).
+	 * @param int $depth    How many scope levels down we are.
+	 * @param int $ignore   How many curly braces we are ignoring.
+	 *
+	 * @return int The position in the stack that closed the scope.
+	 */
+	private function recurseScopeMap($stackPtr, $depth=1, &$ignore=0)
+	{
+		if (PHP_CODESNIFFER_VERBOSITY > 1) {
+			echo str_repeat("\t", $depth);
+			echo "=> Begin scope map recursion at token $stackPtr with depth $depth".PHP_EOL;
+		}
+
+		$opener    = null;
+		$currType  = $this->tokens[$stackPtr]['code'];
+		$startLine = $this->tokens[$stackPtr]['line'];
+
+		// We will need this to restore the value if we end up
+		// returning a token ID that causes our calling function to go back
+		// over already ignored braces.
+		$originalIgnore = $ignore;
+
+		// If the start token for this scope opener is the same as
+		// the scope token, we have already found our opener.
+		if (isset($this->scopeOpeners[$currType]['start'][$currType]) === true) {
+			$opener = $stackPtr;
+		}
+
+		for ($i = ($stackPtr + 1); $i < $this->numTokens; $i++) {
+			$tokenType = $this->tokens[$i]['code'];
+
+			if (PHP_CODESNIFFER_VERBOSITY > 1) {
+				$type    = $this->tokens[$i]['type'];
+				$line    = $this->tokens[$i]['line'];
+				$content = Util\Common::prepareForOutput($this->tokens[$i]['content']);
+
+				echo str_repeat("\t", $depth);
+				echo "Process token $i on line $line [";
+				if ($opener !== null) {
+					echo "opener:$opener;";
+				}
+
+				if ($ignore > 0) {
+					echo "ignore=$ignore;";
+				}
+
+				echo "]: $type => $content".PHP_EOL;
+			}//end if
+
+			// Very special case for IF statements in PHP that can be defined without
+			// scope tokens. E.g., if (1) 1; 1 ? (1 ? 1 : 1) : 1;
+			// If an IF statement below this one has an opener but no
+			// keyword, the opener will be incorrectly assigned to this IF statement.
+			// The same case also applies to USE statements, which don't have to have
+			// openers, so a following USE statement can cause an incorrect brace match.
+			if (($currType === T_IF || $currType === T_ELSE || $currType === T_USE)
+				&& $opener === null
+				&& ($this->tokens[$i]['code'] === T_SEMICOLON
+				|| $this->tokens[$i]['code'] === T_CLOSE_TAG)
+			) {
+				if (PHP_CODESNIFFER_VERBOSITY > 1) {
+					$type = $this->tokens[$stackPtr]['type'];
+					echo str_repeat("\t", $depth);
+					if ($this->tokens[$i]['code'] === T_SEMICOLON) {
+						$closerType = 'semicolon';
+					} else {
+						$closerType = 'close tag';
+					}
+
+					echo "=> Found $closerType before scope opener for $stackPtr:$type, bailing".PHP_EOL;
+				}
+
+				return $i;
+			}
+
+			// Special case for PHP control structures that have no braces.
+			// If we find a curly brace closer before we find the opener,
+			// we're not going to find an opener. That closer probably belongs to
+			// a control structure higher up.
+			if ($opener === null
+				&& $ignore === 0
+				&& $tokenType === T_CLOSE_CURLY_BRACKET
+				&& isset($this->scopeOpeners[$currType]['end'][$tokenType]) === true
+			) {
+				if (PHP_CODESNIFFER_VERBOSITY > 1) {
+					$type = $this->tokens[$stackPtr]['type'];
+					echo str_repeat("\t", $depth);
+					echo "=> Found curly brace closer before scope opener for $stackPtr:$type, bailing".PHP_EOL;
+				}
+
+				return ($i - 1);
+			}
+
+			if ($opener !== null
+				&& (isset($this->tokens[$i]['scope_opener']) === false
+				|| $this->scopeOpeners[$this->tokens[$stackPtr]['code']]['shared'] === true)
+				&& isset($this->scopeOpeners[$currType]['end'][$tokenType]) === true
+			) {
+				if ($ignore > 0 && $tokenType === T_CLOSE_CURLY_BRACKET) {
+					// The last opening bracket must have been for a string
+					// offset or alike, so let's ignore it.
+					if (PHP_CODESNIFFER_VERBOSITY > 1) {
+						echo str_repeat("\t", $depth);
+						echo '* finished ignoring curly brace *'.PHP_EOL;
+					}
+
+					$ignore--;
+					continue;
+				} else if ($this->tokens[$opener]['code'] === T_OPEN_CURLY_BRACKET
+					&& $tokenType !== T_CLOSE_CURLY_BRACKET
+				) {
+					// The opener is a curly bracket so the closer must be a curly bracket as well.
+					// We ignore this closer to handle cases such as T_ELSE or T_ELSEIF being considered
+					// a closer of T_IF when it should not.
+					if (PHP_CODESNIFFER_VERBOSITY > 1) {
+						$type = $this->tokens[$stackPtr]['type'];
+						echo str_repeat("\t", $depth);
+						echo "=> Ignoring non-curly scope closer for $stackPtr:$type".PHP_EOL;
+					}
+				} else {
+					$scopeCloser = $i;
+					$todo        = [
+						$stackPtr,
+						$opener,
+					];
+
+					if (PHP_CODESNIFFER_VERBOSITY > 1) {
+						$type       = $this->tokens[$stackPtr]['type'];
+						$closerType = $this->tokens[$scopeCloser]['type'];
+						echo str_repeat("\t", $depth);
+						echo "=> Found scope closer ($scopeCloser:$closerType) for $stackPtr:$type".PHP_EOL;
+					}
+
+					$validCloser = true;
+					if (($this->tokens[$stackPtr]['code'] === T_IF || $this->tokens[$stackPtr]['code'] === T_ELSEIF)
+						&& ($tokenType === T_ELSE || $tokenType === T_ELSEIF)
+					) {
+						// To be a closer, this token must have an opener.
+						if (PHP_CODESNIFFER_VERBOSITY > 1) {
+							echo str_repeat("\t", $depth);
+							echo "* closer needs to be tested *".PHP_EOL;
+						}
+
+						$i = self::recurseScopeMap($i, ($depth + 1), $ignore);
+
+						if (isset($this->tokens[$scopeCloser]['scope_opener']) === false) {
+							$validCloser = false;
+							if (PHP_CODESNIFFER_VERBOSITY > 1) {
+								echo str_repeat("\t", $depth);
+								echo "* closer is not valid (no opener found) *".PHP_EOL;
+							}
+						} else if ($this->tokens[$this->tokens[$scopeCloser]['scope_opener']]['code'] !== $this->tokens[$opener]['code']) {
+							$validCloser = false;
+							if (PHP_CODESNIFFER_VERBOSITY > 1) {
+								echo str_repeat("\t", $depth);
+								$type       = $this->tokens[$this->tokens[$scopeCloser]['scope_opener']]['type'];
+								$openerType = $this->tokens[$opener]['type'];
+								echo "* closer is not valid (mismatched opener type; $type != $openerType) *".PHP_EOL;
+							}
+						} else if (PHP_CODESNIFFER_VERBOSITY > 1) {
+							echo str_repeat("\t", $depth);
+							echo "* closer was valid *".PHP_EOL;
+						}
+					} else {
+						// The closer was not processed, so we need to
+						// complete that token as well.
+						$todo[] = $scopeCloser;
+					}//end if
+
+					if ($validCloser === true) {
+						foreach ($todo as $token) {
+							$this->tokens[$token]['scope_condition'] = $stackPtr;
+							$this->tokens[$token]['scope_opener']    = $opener;
+							$this->tokens[$token]['scope_closer']    = $scopeCloser;
+						}
+
+						if ($this->scopeOpeners[$this->tokens[$stackPtr]['code']]['shared'] === true) {
+							// As we are going back to where we started originally, restore
+							// the ignore value back to its original value.
+							$ignore = $originalIgnore;
+							return $opener;
+						} else if ($scopeCloser === $i
+							&& isset($this->scopeOpeners[$tokenType]) === true
+						) {
+							// Unset scope_condition here or else the token will appear to have
+							// already been processed, and it will be skipped. Normally we want that,
+							// but in this case, the token is both a closer and an opener, so
+							// it needs to act like an opener. This is also why we return the
+							// token before this one; so the closer has a chance to be processed
+							// a second time, but as an opener.
+							unset($this->tokens[$scopeCloser]['scope_condition']);
+							return ($i - 1);
+						} else {
+							return $i;
+						}
+					} else {
+						continue;
+					}//end if
+				}//end if
+			}//end if
+
+			// Is this an opening condition ?
+			if (isset($this->scopeOpeners[$tokenType]) === true) {
+				if ($opener === null) {
+					if ($tokenType === T_USE) {
+						// PHP use keywords are special because they can be
+						// used as blocks but also inline in function definitions.
+						// So if we find them nested inside another opener, just skip them.
+						continue;
+					}
+
+					if ($tokenType === T_FUNCTION
+						&& $this->tokens[$stackPtr]['code'] !== T_FUNCTION
+					) {
+						// Probably a closure, so process it manually.
+						if (PHP_CODESNIFFER_VERBOSITY > 1) {
+							$type = $this->tokens[$stackPtr]['type'];
+							echo str_repeat("\t", $depth);
+							echo "=> Found function before scope opener for $stackPtr:$type, processing manually".PHP_EOL;
+						}
+
+						if (isset($this->tokens[$i]['scope_closer']) === true) {
+							// We've already processed this closure.
+							if (PHP_CODESNIFFER_VERBOSITY > 1) {
+								echo str_repeat("\t", $depth);
+								echo '* already processed, skipping *'.PHP_EOL;
+							}
+
+							$i = $this->tokens[$i]['scope_closer'];
+							continue;
+						}
+
+						$i = self::recurseScopeMap($i, ($depth + 1), $ignore);
+						continue;
+					}//end if
+
+					if ($tokenType === T_CLASS) {
+						// Probably an anonymous class inside another anonymous class,
+						// so process it manually.
+						if (PHP_CODESNIFFER_VERBOSITY > 1) {
+							$type = $this->tokens[$stackPtr]['type'];
+							echo str_repeat("\t", $depth);
+							echo "=> Found class before scope opener for $stackPtr:$type, processing manually".PHP_EOL;
+						}
+
+						if (isset($this->tokens[$i]['scope_closer']) === true) {
+							// We've already processed this anon class.
+							if (PHP_CODESNIFFER_VERBOSITY > 1) {
+								echo str_repeat("\t", $depth);
+								echo '* already processed, skipping *'.PHP_EOL;
+							}
+
+							$i = $this->tokens[$i]['scope_closer'];
+							continue;
+						}
+
+						$i = self::recurseScopeMap($i, ($depth + 1), $ignore);
+						continue;
+					}//end if
+
+					// Found another opening condition but still haven't
+					// found our opener, so we are never going to find one.
+					if (PHP_CODESNIFFER_VERBOSITY > 1) {
+						$type = $this->tokens[$stackPtr]['type'];
+						echo str_repeat("\t", $depth);
+						echo "=> Found new opening condition before scope opener for $stackPtr:$type, ";
+					}
+
+					if (($this->tokens[$stackPtr]['code'] === T_IF
+						|| $this->tokens[$stackPtr]['code'] === T_ELSEIF
+						|| $this->tokens[$stackPtr]['code'] === T_ELSE)
+						&& ($this->tokens[$i]['code'] === T_ELSE
+						|| $this->tokens[$i]['code'] === T_ELSEIF)
+					) {
+						if (PHP_CODESNIFFER_VERBOSITY > 1) {
+							echo "continuing".PHP_EOL;
+						}
+
+						return ($i - 1);
+					} else {
+						if (PHP_CODESNIFFER_VERBOSITY > 1) {
+							echo "backtracking".PHP_EOL;
+						}
+
+						return $stackPtr;
+					}
+				}//end if
+
+				if (PHP_CODESNIFFER_VERBOSITY > 1) {
+					echo str_repeat("\t", $depth);
+					echo '* token is an opening condition *'.PHP_EOL;
+				}
+
+				$isShared = ($this->scopeOpeners[$tokenType]['shared'] === true);
+
+				if (isset($this->tokens[$i]['scope_condition']) === true) {
+					// We've been here before.
+					if (PHP_CODESNIFFER_VERBOSITY > 1) {
+						echo str_repeat("\t", $depth);
+						echo '* already processed, skipping *'.PHP_EOL;
+					}
+
+					if ($isShared === false
+						&& isset($this->tokens[$i]['scope_closer']) === true
+					) {
+						$i = $this->tokens[$i]['scope_closer'];
+					}
+
+					continue;
+				} else if ($currType === $tokenType
+					&& $isShared === false
+					&& $opener === null
+				) {
+					// We haven't yet found our opener, but we have found another
+					// scope opener which is the same type as us, and we don't
+					// share openers, so we will never find one.
+					if (PHP_CODESNIFFER_VERBOSITY > 1) {
+						echo str_repeat("\t", $depth);
+						echo '* it was another token\'s opener, bailing *'.PHP_EOL;
+					}
+
+					return $stackPtr;
+				} else {
+					if (PHP_CODESNIFFER_VERBOSITY > 1) {
+						echo str_repeat("\t", $depth);
+						echo '* searching for opener *'.PHP_EOL;
+					}
+
+					if (isset($this->scopeOpeners[$tokenType]['end'][T_CLOSE_CURLY_BRACKET]) === true) {
+						$oldIgnore = $ignore;
+						$ignore    = 0;
+					}
+
+					// PHP has a max nesting level for functions. Stop before we hit that limit
+					// because too many loops means we've run into trouble anyway.
+					if ($depth > 50) {
+						if (PHP_CODESNIFFER_VERBOSITY > 1) {
+							echo str_repeat("\t", $depth);
+							echo '* reached maximum nesting level; aborting *'.PHP_EOL;
+						}
+
+						throw new RuntimeException('Maximum nesting level reached; file could not be processed');
+					}
+
+					$oldDepth = $depth;
+					if ($isShared === true
+						&& isset($this->scopeOpeners[$tokenType]['with'][$currType]) === true
+					) {
+						// Don't allow the depth to increment because this is
+						// possibly not a true nesting if we are sharing our closer.
+						// This can happen, for example, when a SWITCH has a large
+						// number of CASE statements with the same shared BREAK.
+						$depth--;
+					}
+
+					$i     = self::recurseScopeMap($i, ($depth + 1), $ignore);
+					$depth = $oldDepth;
+
+					if (isset($this->scopeOpeners[$tokenType]['end'][T_CLOSE_CURLY_BRACKET]) === true) {
+						$ignore = $oldIgnore;
+					}
+				}//end if
+			}//end if
+
+			if (isset($this->scopeOpeners[$currType]['start'][$tokenType]) === true
+				&& $opener === null
+			) {
+				if ($tokenType === T_OPEN_CURLY_BRACKET) {
+					if (isset($this->tokens[$stackPtr]['parenthesis_closer']) === true
+						&& $i < $this->tokens[$stackPtr]['parenthesis_closer']
+					) {
+						// We found a curly brace inside the condition of the
+						// current scope opener, so it must be a string offset.
+						if (PHP_CODESNIFFER_VERBOSITY > 1) {
+							echo str_repeat("\t", $depth);
+							echo '* ignoring curly brace inside condition *'.PHP_EOL;
+						}
+
+						$ignore++;
+					} else {
+						// Make sure this is actually an opener and not a
+						// string offset (e.g., $var{0}).
+						for ($x = ($i - 1); $x > 0; $x--) {
+							if (isset(Util\Tokens::$emptyTokens[$this->tokens[$x]['code']]) === true) {
+								continue;
+							} else {
+								// If the first non-whitespace/comment token looks like this
+								// brace is a string offset, or this brace is mid-way through
+								// a new statement, it isn't a scope opener.
+								$disallowed  = Util\Tokens::$assignmentTokens;
+								$disallowed += [
+									T_DOLLAR           => true,
+									T_VARIABLE         => true,
+									T_OBJECT_OPERATOR  => true,
+									T_COMMA            => true,
+									T_OPEN_PARENTHESIS => true,
+								];
+
+								if (isset($disallowed[$this->tokens[$x]['code']]) === true) {
+									if (PHP_CODESNIFFER_VERBOSITY > 1) {
+										echo str_repeat("\t", $depth);
+										echo '* ignoring curly brace *'.PHP_EOL;
+									}
+
+									$ignore++;
+								}
+
+								break;
+							}//end if
+						}//end for
+					}//end if
+				}//end if
+
+				if ($ignore === 0 || $tokenType !== T_OPEN_CURLY_BRACKET) {
+					// We found the opening scope token for $currType.
+					if (PHP_CODESNIFFER_VERBOSITY > 1) {
+						$type = $this->tokens[$stackPtr]['type'];
+						echo str_repeat("\t", $depth);
+						echo "=> Found scope opener for $stackPtr:$type".PHP_EOL;
+					}
+
+					$opener = $i;
+				}
+			} else if ($tokenType === T_OPEN_PARENTHESIS) {
+				if (isset($this->tokens[$i]['parenthesis_owner']) === true) {
+					$owner = $this->tokens[$i]['parenthesis_owner'];
+					if (isset(Util\Tokens::$scopeOpeners[$this->tokens[$owner]['code']]) === true
+						&& isset($this->tokens[$i]['parenthesis_closer']) === true
+					) {
+						// If we get into here, then we opened a parenthesis for
+						// a scope (eg. an if or else if) so we need to update the
+						// start of the line so that when we check to see
+						// if the closing parenthesis is more than 3 lines away from
+						// the statement, we check from the closing parenthesis.
+						$startLine = $this->tokens[$this->tokens[$i]['parenthesis_closer']]['line'];
+					}
+				}
+			} else if ($tokenType === T_OPEN_CURLY_BRACKET && $opener !== null) {
+				// We opened something that we don't have a scope opener for.
+				// Examples of this are curly brackets for string offsets etc.
+				// We want to ignore this so that we don't have an invalid scope
+				// map.
+				if (PHP_CODESNIFFER_VERBOSITY > 1) {
+					echo str_repeat("\t", $depth);
+					echo '* ignoring curly brace *'.PHP_EOL;
+				}
+
+				$ignore++;
+			} else if ($tokenType === T_CLOSE_CURLY_BRACKET && $ignore > 0) {
+				// We found the end token for the opener we were ignoring.
+				if (PHP_CODESNIFFER_VERBOSITY > 1) {
+					echo str_repeat("\t", $depth);
+					echo '* finished ignoring curly brace *'.PHP_EOL;
+				}
+
+				$ignore--;
+			} else if ($opener === null
+				&& isset($this->scopeOpeners[$currType]) === true
+			) {
+				// If we still haven't found the opener after 30 lines,
+				// we're not going to find it, unless we know it requires
+				// an opener (in which case we better keep looking) or the last
+				// token was empty (in which case we'll just confirm there is
+				// more code in this file and not just a big comment).
+				if ($this->tokens[$i]['line'] >= ($startLine + 30)
+					&& isset(Util\Tokens::$emptyTokens[$this->tokens[($i - 1)]['code']]) === false
+				) {
+					if ($this->scopeOpeners[$currType]['strict'] === true) {
+						if (PHP_CODESNIFFER_VERBOSITY > 1) {
+							$type  = $this->tokens[$stackPtr]['type'];
+							$lines = ($this->tokens[$i]['line'] - $startLine);
+							echo str_repeat("\t", $depth);
+							echo "=> Still looking for $stackPtr:$type scope opener after $lines lines".PHP_EOL;
+						}
+					} else {
+						if (PHP_CODESNIFFER_VERBOSITY > 1) {
+							$type = $this->tokens[$stackPtr]['type'];
+							echo str_repeat("\t", $depth);
+							echo "=> Couldn't find scope opener for $stackPtr:$type, bailing".PHP_EOL;
+						}
+
+						return $stackPtr;
+					}
+				}
+			} else if ($opener !== null
+				&& $tokenType !== T_BREAK
+				&& isset($this->endScopeTokens[$tokenType]) === true
+			) {
+				if (isset($this->tokens[$i]['scope_condition']) === false) {
+					if ($ignore > 0) {
+						// We found the end token for the opener we were ignoring.
+						if (PHP_CODESNIFFER_VERBOSITY > 1) {
+							echo str_repeat("\t", $depth);
+							echo '* finished ignoring curly brace *'.PHP_EOL;
+						}
+
+						$ignore--;
+					} else {
+						// We found a token that closes the scope but it doesn't
+						// have a condition, so it belongs to another token and
+						// our token doesn't have a closer, so pretend this is
+						// the closer.
+						if (PHP_CODESNIFFER_VERBOSITY > 1) {
+							$type = $this->tokens[$stackPtr]['type'];
+							echo str_repeat("\t", $depth);
+							echo "=> Found (unexpected) scope closer for $stackPtr:$type".PHP_EOL;
+						}
+
+						foreach ([$stackPtr, $opener] as $token) {
+							$this->tokens[$token]['scope_condition'] = $stackPtr;
+							$this->tokens[$token]['scope_opener']    = $opener;
+							$this->tokens[$token]['scope_closer']    = $i;
+						}
+
+						return ($i - 1);
+					}//end if
+				}//end if
+			}//end if
+		}//end for
+
+		return $stackPtr;
+
+	}//end recurseScopeMap()
+
+
+	/**
+	 * Constructs the level map.
+	 *
+	 * The level map adds a 'level' index to each token which indicates the
+	 * depth that a token within a set of scope blocks. It also adds a
+	 * 'conditions' index which is an array of the scope conditions that opened
+	 * each of the scopes - position 0 being the first scope opener.
+	 *
+	 * @return void
+	 */
+	private function createLevelMap()
+	{
+		if (PHP_CODESNIFFER_VERBOSITY > 1) {
+			echo "\t*** START LEVEL MAP ***".PHP_EOL;
+		}
+
+		$this->numTokens = count($this->tokens);
+		$level           = 0;
+		$conditions      = [];
+		$lastOpener      = null;
+		$openers         = [];
+
+		for ($i = 0; $i < $this->numTokens; $i++) {
+			if (PHP_CODESNIFFER_VERBOSITY > 1) {
+				$type = $this->tokens[$i]['type'];
+				$line = $this->tokens[$i]['line'];
+				$len  = $this->tokens[$i]['length'];
+				$col  = $this->tokens[$i]['column'];
+
+				$content = Util\Common::prepareForOutput($this->tokens[$i]['content']);
+
+				echo str_repeat("\t", ($level + 1));
+				echo "Process token $i on line $line [col:$col;len:$len;lvl:$level;";
+				if (empty($conditions) !== true) {
+					$condString = 'conds;';
+					foreach ($conditions as $condition) {
+						$condString .= Util\Tokens::tokenName($condition).',';
+					}
+
+					echo rtrim($condString, ',').';';
+				}
+
+				echo "]: $type => $content".PHP_EOL;
+			}//end if
+
+			$this->tokens[$i]['level']      = $level;
+			$this->tokens[$i]['conditions'] = $conditions;
+
+			if (isset($this->tokens[$i]['scope_condition']) === true) {
+				// Check to see if this token opened the scope.
+				if ($this->tokens[$i]['scope_opener'] === $i) {
+					$stackPtr = $this->tokens[$i]['scope_condition'];
+					if (PHP_CODESNIFFER_VERBOSITY > 1) {
+						$type = $this->tokens[$stackPtr]['type'];
+						echo str_repeat("\t", ($level + 1));
+						echo "=> Found scope opener for $stackPtr:$type".PHP_EOL;
+					}
+
+					$stackPtr = $this->tokens[$i]['scope_condition'];
+
+					// If we find a scope opener that has a shared closer,
+					// then we need to go back over the condition map that we
+					// just created and fix ourselves as we just added some
+					// conditions where there was none. This happens for T_CASE
+					// statements that are using the same break statement.
+					if ($lastOpener !== null && $this->tokens[$lastOpener]['scope_closer'] === $this->tokens[$i]['scope_closer']) {
+						// This opener shares its closer with the previous opener,
+						// but we still need to check if the two openers share their
+						// closer with each other directly (like CASE and DEFAULT)
+						// or if they are just sharing because one doesn't have a
+						// closer (like CASE with no BREAK using a SWITCHes closer).
+						$thisType = $this->tokens[$this->tokens[$i]['scope_condition']]['code'];
+						$opener   = $this->tokens[$lastOpener]['scope_condition'];
+
+						$isShared = isset($this->scopeOpeners[$thisType]['with'][$this->tokens[$opener]['code']]);
+
+						reset($this->scopeOpeners[$thisType]['end']);
+						reset($this->scopeOpeners[$this->tokens[$opener]['code']]['end']);
+						$sameEnd = (current($this->scopeOpeners[$thisType]['end']) === current($this->scopeOpeners[$this->tokens[$opener]['code']]['end']));
+
+						if ($isShared === true && $sameEnd === true) {
+							$badToken = $opener;
+							if (PHP_CODESNIFFER_VERBOSITY > 1) {
+								$type = $this->tokens[$badToken]['type'];
+								echo str_repeat("\t", ($level + 1));
+								echo "* shared closer, cleaning up $badToken:$type *".PHP_EOL;
+							}
+
+							for ($x = $this->tokens[$i]['scope_condition']; $x <= $i; $x++) {
+								$oldConditions = $this->tokens[$x]['conditions'];
+								$oldLevel      = $this->tokens[$x]['level'];
+								$this->tokens[$x]['level']--;
+								unset($this->tokens[$x]['conditions'][$badToken]);
+								if (PHP_CODESNIFFER_VERBOSITY > 1) {
+									$type     = $this->tokens[$x]['type'];
+									$oldConds = '';
+									foreach ($oldConditions as $condition) {
+										$oldConds .= Util\Tokens::tokenName($condition).',';
+									}
+
+									$oldConds = rtrim($oldConds, ',');
+
+									$newConds = '';
+									foreach ($this->tokens[$x]['conditions'] as $condition) {
+										$newConds .= Util\Tokens::tokenName($condition).',';
+									}
+
+									$newConds = rtrim($newConds, ',');
+
+									$newLevel = $this->tokens[$x]['level'];
+									echo str_repeat("\t", ($level + 1));
+									echo "* cleaned $x:$type *".PHP_EOL;
+									echo str_repeat("\t", ($level + 2));
+									echo "=> level changed from $oldLevel to $newLevel".PHP_EOL;
+									echo str_repeat("\t", ($level + 2));
+									echo "=> conditions changed from $oldConds to $newConds".PHP_EOL;
+								}//end if
+							}//end for
+
+							unset($conditions[$badToken]);
+							if (PHP_CODESNIFFER_VERBOSITY > 1) {
+								$type = $this->tokens[$badToken]['type'];
+								echo str_repeat("\t", ($level + 1));
+								echo "* token $badToken:$type removed from conditions array *".PHP_EOL;
+							}
+
+							unset($openers[$lastOpener]);
+
+							$level--;
+							if (PHP_CODESNIFFER_VERBOSITY > 1) {
+								echo str_repeat("\t", ($level + 2));
+								echo '* level decreased *'.PHP_EOL;
+							}
+						}//end if
+					}//end if
+
+					$level++;
+					if (PHP_CODESNIFFER_VERBOSITY > 1) {
+						echo str_repeat("\t", ($level + 1));
+						echo '* level increased *'.PHP_EOL;
+					}
+
+					$conditions[$stackPtr] = $this->tokens[$stackPtr]['code'];
+					if (PHP_CODESNIFFER_VERBOSITY > 1) {
+						$type = $this->tokens[$stackPtr]['type'];
+						echo str_repeat("\t", ($level + 1));
+						echo "* token $stackPtr:$type added to conditions array *".PHP_EOL;
+					}
+
+					$lastOpener = $this->tokens[$i]['scope_opener'];
+					if ($lastOpener !== null) {
+						$openers[$lastOpener] = $lastOpener;
+					}
+				} else if ($lastOpener !== null && $this->tokens[$lastOpener]['scope_closer'] === $i) {
+					foreach (array_reverse($openers) as $opener) {
+						if ($this->tokens[$opener]['scope_closer'] === $i) {
+							$oldOpener = array_pop($openers);
+							if (empty($openers) === false) {
+								$lastOpener           = array_pop($openers);
+								$openers[$lastOpener] = $lastOpener;
+							} else {
+								$lastOpener = null;
+							}
+
+							if (PHP_CODESNIFFER_VERBOSITY > 1) {
+								$type = $this->tokens[$oldOpener]['type'];
+								echo str_repeat("\t", ($level + 1));
+								echo "=> Found scope closer for $oldOpener:$type".PHP_EOL;
+							}
+
+							$oldCondition = array_pop($conditions);
+							if (PHP_CODESNIFFER_VERBOSITY > 1) {
+								echo str_repeat("\t", ($level + 1));
+								echo '* token '.Util\Tokens::tokenName($oldCondition).' removed from conditions array *'.PHP_EOL;
+							}
+
+							// Make sure this closer actually belongs to us.
+							// Either the condition also has to think this is the
+							// closer, or it has to allow sharing with us.
+							$condition = $this->tokens[$this->tokens[$i]['scope_condition']]['code'];
+							if ($condition !== $oldCondition) {
+								if (isset($this->scopeOpeners[$oldCondition]['with'][$condition]) === false) {
+									$badToken = $this->tokens[$oldOpener]['scope_condition'];
+
+									if (PHP_CODESNIFFER_VERBOSITY > 1) {
+										$type = Util\Tokens::tokenName($oldCondition);
+										echo str_repeat("\t", ($level + 1));
+										echo "* scope closer was bad, cleaning up $badToken:$type *".PHP_EOL;
+									}
+
+									for ($x = ($oldOpener + 1); $x <= $i; $x++) {
+										$oldConditions = $this->tokens[$x]['conditions'];
+										$oldLevel      = $this->tokens[$x]['level'];
+										$this->tokens[$x]['level']--;
+										unset($this->tokens[$x]['conditions'][$badToken]);
+										if (PHP_CODESNIFFER_VERBOSITY > 1) {
+											$type     = $this->tokens[$x]['type'];
+											$oldConds = '';
+											foreach ($oldConditions as $condition) {
+												$oldConds .= Util\Tokens::tokenName($condition).',';
+											}
+
+											$oldConds = rtrim($oldConds, ',');
+
+											$newConds = '';
+											foreach ($this->tokens[$x]['conditions'] as $condition) {
+												$newConds .= Util\Tokens::tokenName($condition).',';
+											}
+
+											$newConds = rtrim($newConds, ',');
+
+											$newLevel = $this->tokens[$x]['level'];
+											echo str_repeat("\t", ($level + 1));
+											echo "* cleaned $x:$type *".PHP_EOL;
+											echo str_repeat("\t", ($level + 2));
+											echo "=> level changed from $oldLevel to $newLevel".PHP_EOL;
+											echo str_repeat("\t", ($level + 2));
+											echo "=> conditions changed from $oldConds to $newConds".PHP_EOL;
+										}//end if
+									}//end for
+								}//end if
+							}//end if
+
+							$level--;
+							if (PHP_CODESNIFFER_VERBOSITY > 1) {
+								echo str_repeat("\t", ($level + 2));
+								echo '* level decreased *'.PHP_EOL;
+							}
+
+							$this->tokens[$i]['level']      = $level;
+							$this->tokens[$i]['conditions'] = $conditions;
+						}//end if
+					}//end foreach
+				}//end if
+			}//end if
+		}//end for
+
+		if (PHP_CODESNIFFER_VERBOSITY > 1) {
+			echo "\t*** END LEVEL MAP ***".PHP_EOL;
+		}
+
+	}//end createLevelMap()
 
 
 }//end class

Switch Indentation +54 added lines, -54 removed lines

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

Spacing +649 added lines, -649 removed lines

@@ -27,14 +27,14 @@ 
      *
      * @var string
      */
-    protected $eolChar = [];
+    protected $eolChar = [ ];
 
     /**
      * A token-based representation of the content.
      *
      * @var array
      */
-    protected $tokens = [];
+    protected $tokens = [ ];
 
     /**
      * The number of tokens in the tokens array.
@@ -48,28 +48,28 @@ 
      *
      * @var array
      */
-    public $scopeOpeners = [];
+    public $scopeOpeners = [ ];
 
     /**
      * A list of tokens that end the scope.
      *
      * @var array
      */
-    public $endScopeTokens = [];
+    public $endScopeTokens = [ ];
 
     /**
      * Known lengths of tokens.
      *
      * @var array<int, int>
      */
-    public $knownLengths = [];
+    public $knownLengths = [ ];
 
     /**
      * A list of lines being ignored due to error suppression comments.
      *
      * @var array
      */
-    public $ignoredLines = [];
+    public $ignoredLines = [ ];
 
 
     /**
@@ -82,14 +82,14 @@ 
      * @return void
      * @throws \PHP_CodeSniffer\Exceptions\TokenizerException If the file appears to be minified.
      */
-    public function __construct($content, $config, $eolChar='\n')
+    public function __construct( $content, $config, $eolChar = '\n' )
     {
         $this->eolChar = $eolChar;
 
         $this->config = $config;
-        $this->tokens = $this->tokenize($content);
+        $this->tokens = $this->tokenize( $content );
 
-        if ($config === null) {
+        if ( $config === null ) {
             return;
         }
 
@@ -113,14 +113,14 @@ 
      *
      * @return boolean
      */
-    protected function isMinifiedContent($content, $eolChar='\n')
+    protected function isMinifiedContent( $content, $eolChar = '\n' )
     {
         // Minified files often have a very large number of characters per line
         // and cause issues when tokenizing.
-        $numChars = strlen($content);
-        $numLines = (substr_count($content, $eolChar) + 1);
-        $average  = ($numChars / $numLines);
-        if ($average > 100) {
+        $numChars = strlen( $content );
+        $numLines = ( substr_count( $content, $eolChar ) + 1 );
+        $average  = ( $numChars / $numLines );
+        if ( $average > 100 ) {
             return true;
         }
 
@@ -148,7 +148,7 @@ 
      *
      * @return array
      */
-    abstract protected function tokenize($string);
+    abstract protected function tokenize( $string );
 
 
     /**
@@ -171,12 +171,12 @@ 
     {
         $currColumn = 1;
         $lineNumber = 1;
-        $eolLen     = strlen($this->eolChar);
+        $eolLen     = strlen( $this->eolChar );
         $ignoring   = null;
-        $inTests    = defined('PHP_CODESNIFFER_IN_TESTS');
+        $inTests    = defined( 'PHP_CODESNIFFER_IN_TESTS' );
 
         $checkEncoding = false;
-        if (function_exists('iconv_strlen') === true) {
+        if ( function_exists( 'iconv_strlen' ) === true ) {
             $checkEncoding = true;
         }
 
@@ -197,126 +197,126 @@ 
             T_INLINE_HTML              => true,
         ];
 
-        $this->numTokens = count($this->tokens);
-        for ($i = 0; $i < $this->numTokens; $i++) {
-            $this->tokens[$i]['line']   = $lineNumber;
-            $this->tokens[$i]['column'] = $currColumn;
+        $this->numTokens = count( $this->tokens );
+        for ( $i = 0; $i < $this->numTokens; $i++ ) {
+            $this->tokens[ $i ][ 'line' ]   = $lineNumber;
+            $this->tokens[ $i ][ 'column' ] = $currColumn;
 
-            if (isset($this->knownLengths[$this->tokens[$i]['code']]) === true) {
+            if ( isset( $this->knownLengths[ $this->tokens[ $i ][ 'code' ] ] ) === true ) {
                 // There are no tabs in the tokens we know the length of.
-                $length      = $this->knownLengths[$this->tokens[$i]['code']];
+                $length      = $this->knownLengths[ $this->tokens[ $i ][ 'code' ] ];
                 $currColumn += $length;
-            } else if ($tabWidth === 0
-                || isset($tokensWithTabs[$this->tokens[$i]['code']]) === false
-                || strpos($this->tokens[$i]['content'], "\t") === false
+            } else if ( $tabWidth === 0
+                || isset( $tokensWithTabs[ $this->tokens[ $i ][ 'code' ] ] ) === false
+                || strpos( $this->tokens[ $i ][ 'content' ], "\t" ) === false
             ) {
                 // There are no tabs in this content, or we aren't replacing them.
-                if ($checkEncoding === true) {
+                if ( $checkEncoding === true ) {
                     // Not using the default encoding, so take a bit more care.
                     $oldLevel = error_reporting();
-                    error_reporting(0);
-                    $length = iconv_strlen($this->tokens[$i]['content'], $encoding);
-                    error_reporting($oldLevel);
+                    error_reporting( 0 );
+                    $length = iconv_strlen( $this->tokens[ $i ][ 'content' ], $encoding );
+                    error_reporting( $oldLevel );
 
-                    if ($length === false) {
+                    if ( $length === false ) {
                         // String contained invalid characters, so revert to default.
-                        $length = strlen($this->tokens[$i]['content']);
+                        $length = strlen( $this->tokens[ $i ][ 'content' ] );
                     }
                 } else {
-                    $length = strlen($this->tokens[$i]['content']);
+                    $length = strlen( $this->tokens[ $i ][ 'content' ] );
                 }
 
                 $currColumn += $length;
             } else {
-                $this->replaceTabsInToken($this->tokens[$i]);
-                $length      = $this->tokens[$i]['length'];
+                $this->replaceTabsInToken( $this->tokens[ $i ] );
+                $length      = $this->tokens[ $i ][ 'length' ];
                 $currColumn += $length;
             }//end if
 
-            $this->tokens[$i]['length'] = $length;
+            $this->tokens[ $i ][ 'length' ] = $length;
 
-            if (isset($this->knownLengths[$this->tokens[$i]['code']]) === false
-                && strpos($this->tokens[$i]['content'], $this->eolChar) !== false
+            if ( isset( $this->knownLengths[ $this->tokens[ $i ][ 'code' ] ] ) === false
+                && strpos( $this->tokens[ $i ][ 'content' ], $this->eolChar ) !== false
             ) {
                 $lineNumber++;
                 $currColumn = 1;
 
                 // Newline chars are not counted in the token length.
-                $this->tokens[$i]['length'] -= $eolLen;
+                $this->tokens[ $i ][ 'length' ] -= $eolLen;
             }
 
-            if ($this->tokens[$i]['code'] === T_COMMENT
-                || $this->tokens[$i]['code'] === T_DOC_COMMENT_STRING
-                || $this->tokens[$i]['code'] === T_DOC_COMMENT_TAG
-                || ($inTests === true && $this->tokens[$i]['code'] === T_INLINE_HTML)
+            if ( $this->tokens[ $i ][ 'code' ] === T_COMMENT
+                || $this->tokens[ $i ][ 'code' ] === T_DOC_COMMENT_STRING
+                || $this->tokens[ $i ][ 'code' ] === T_DOC_COMMENT_TAG
+                || ( $inTests === true && $this->tokens[ $i ][ 'code' ] === T_INLINE_HTML )
             ) {
-                $commentText      = ltrim($this->tokens[$i]['content'], " \t/*");
-                $commentText      = rtrim($commentText, " */\t\r\n");
-                $commentTextLower = strtolower($commentText);
-                if (strpos($commentText, '@codingStandards') !== false) {
+                $commentText      = ltrim( $this->tokens[ $i ][ 'content' ], " \t/*" );
+                $commentText      = rtrim( $commentText, " */\t\r\n" );
+                $commentTextLower = strtolower( $commentText );
+                if ( strpos( $commentText, '@codingStandards' ) !== false ) {
                     // If this comment is the only thing on the line, it tells us
                     // to ignore the following line. If the line contains other content
                     // then we are just ignoring this one single line.
                     $ownLine = false;
-                    if ($i > 0) {
-                        for ($prev = ($i - 1); $prev >= 0; $prev--) {
-                            if ($this->tokens[$prev]['code'] === T_WHITESPACE) {
+                    if ( $i > 0 ) {
+                        for ( $prev = ( $i - 1 ); $prev >= 0; $prev-- ) {
+                            if ( $this->tokens[ $prev ][ 'code' ] === T_WHITESPACE ) {
                                 continue;
                             }
 
                             break;
                         }
 
-                        if ($this->tokens[$prev]['line'] !== $this->tokens[$i]['line']) {
+                        if ( $this->tokens[ $prev ][ 'line' ] !== $this->tokens[ $i ][ 'line' ] ) {
                             $ownLine = true;
                         }
                     }
 
-                    if ($ignoring === null
-                        && strpos($commentText, '@codingStandardsIgnoreStart') !== false
+                    if ( $ignoring === null
+                        && strpos( $commentText, '@codingStandardsIgnoreStart' ) !== false
                     ) {
-                        $ignoring = ['.all' => true];
-                        if ($ownLine === true) {
-                            $this->ignoredLines[$this->tokens[$i]['line']] = $ignoring;
+                        $ignoring = [ '.all' => true ];
+                        if ( $ownLine === true ) {
+                            $this->ignoredLines[ $this->tokens[ $i ][ 'line' ] ] = $ignoring;
                         }
-                    } else if ($ignoring !== null
-                        && strpos($commentText, '@codingStandardsIgnoreEnd') !== false
+                    } else if ( $ignoring !== null
+                        && strpos( $commentText, '@codingStandardsIgnoreEnd' ) !== false
                     ) {
-                        if ($ownLine === true) {
-                            $this->ignoredLines[$this->tokens[$i]['line']] = ['.all' => true];
+                        if ( $ownLine === true ) {
+                            $this->ignoredLines[ $this->tokens[ $i ][ 'line' ] ] = [ '.all' => true ];
                         } else {
-                            $this->ignoredLines[$this->tokens[$i]['line']] = $ignoring;
+                            $this->ignoredLines[ $this->tokens[ $i ][ 'line' ] ] = $ignoring;
                         }
 
                         $ignoring = null;
-                    } else if ($ignoring === null
-                        && strpos($commentText, '@codingStandardsIgnoreLine') !== false
+                    } else if ( $ignoring === null
+                        && strpos( $commentText, '@codingStandardsIgnoreLine' ) !== false
                     ) {
-                        $ignoring = ['.all' => true];
-                        if ($ownLine === true) {
-                            $this->ignoredLines[$this->tokens[$i]['line']]       = $ignoring;
-                            $this->ignoredLines[($this->tokens[$i]['line'] + 1)] = $ignoring;
+                        $ignoring = [ '.all' => true ];
+                        if ( $ownLine === true ) {
+                            $this->ignoredLines[ $this->tokens[ $i ][ 'line' ] ]       = $ignoring;
+                            $this->ignoredLines[ ( $this->tokens[ $i ][ 'line' ] + 1 ) ] = $ignoring;
                         } else {
-                            $this->ignoredLines[$this->tokens[$i]['line']] = $ignoring;
+                            $this->ignoredLines[ $this->tokens[ $i ][ 'line' ] ] = $ignoring;
                         }
 
                         $ignoring = null;
                     }//end if
-                } else if (substr($commentTextLower, 0, 6) === 'phpcs:'
-                    || substr($commentTextLower, 0, 7) === '@phpcs:'
+                } else if ( substr( $commentTextLower, 0, 6 ) === 'phpcs:'
+                    || substr( $commentTextLower, 0, 7 ) === '@phpcs:'
                 ) {
                     // If the @phpcs: syntax is being used, strip the @ to make
                     // comparisons easier.
-                    if ($commentText[0] === '@') {
-                        $commentText      = substr($commentText, 1);
-                        $commentTextLower = strtolower($commentText);
+                    if ( $commentText[ 0 ] === '@' ) {
+                        $commentText      = substr( $commentText, 1 );
+                        $commentTextLower = strtolower( $commentText );
                     }
 
                     // If there is a comment on the end, strip it off.
-                    $commentStart = strpos($commentTextLower, ' --');
-                    if ($commentStart !== false) {
-                        $commentText      = substr($commentText, 0, $commentStart);
-                        $commentTextLower = strtolower($commentText);
+                    $commentStart = strpos( $commentTextLower, ' --' );
+                    if ( $commentStart !== false ) {
+                        $commentText      = substr( $commentText, 0, $commentStart );
+                        $commentTextLower = strtolower( $commentText );
                     }
 
                     // If this comment is the only thing on the line, it tells us
@@ -324,23 +324,23 @@ 
                     // then we are just ignoring this one single line.
                     $lineHasOtherContent = false;
                     $lineHasOtherTokens  = false;
-                    if ($i > 0) {
-                        for ($prev = ($i - 1); $prev > 0; $prev--) {
-                            if ($this->tokens[$prev]['line'] !== $this->tokens[$i]['line']) {
+                    if ( $i > 0 ) {
+                        for ( $prev = ( $i - 1 ); $prev > 0; $prev-- ) {
+                            if ( $this->tokens[ $prev ][ 'line' ] !== $this->tokens[ $i ][ 'line' ] ) {
                                 // Changed lines.
                                 break;
                             }
 
-                            if ($this->tokens[$prev]['code'] === T_WHITESPACE
-                                || ($this->tokens[$prev]['code'] === T_INLINE_HTML
-                                && trim($this->tokens[$prev]['content']) === '')
+                            if ( $this->tokens[ $prev ][ 'code' ] === T_WHITESPACE
+                                || ( $this->tokens[ $prev ][ 'code' ] === T_INLINE_HTML
+                                && trim( $this->tokens[ $prev ][ 'content' ] ) === '' )
                             ) {
                                 continue;
                             }
 
                             $lineHasOtherTokens = true;
 
-                            if ($this->tokens[$prev]['code'] === T_OPEN_TAG) {
+                            if ( $this->tokens[ $prev ][ 'code' ] === T_OPEN_TAG ) {
                                 continue;
                             }
 
@@ -349,33 +349,33 @@ 
                         }//end for
 
                         $changedLines = false;
-                        for ($next = $i; $next < $this->numTokens; $next++) {
-                            if ($changedLines === true) {
+                        for ( $next = $i; $next < $this->numTokens; $next++ ) {
+                            if ( $changedLines === true ) {
                                 // Changed lines.
                                 break;
                             }
 
-                            if (isset($this->knownLengths[$this->tokens[$next]['code']]) === false
-                                && strpos($this->tokens[$next]['content'], $this->eolChar) !== false
+                            if ( isset( $this->knownLengths[ $this->tokens[ $next ][ 'code' ] ] ) === false
+                                && strpos( $this->tokens[ $next ][ 'content' ], $this->eolChar ) !== false
                             ) {
                                 // Last token on the current line.
                                 $changedLines = true;
                             }
 
-                            if ($next === $i) {
+                            if ( $next === $i ) {
                                 continue;
                             }
 
-                            if ($this->tokens[$next]['code'] === T_WHITESPACE
-                                || ($this->tokens[$next]['code'] === T_INLINE_HTML
-                                && trim($this->tokens[$next]['content']) === '')
+                            if ( $this->tokens[ $next ][ 'code' ] === T_WHITESPACE
+                                || ( $this->tokens[ $next ][ 'code' ] === T_INLINE_HTML
+                                && trim( $this->tokens[ $next ][ 'content' ] ) === '' )
                             ) {
                                 continue;
                             }
 
                             $lineHasOtherTokens = true;
 
-                            if ($this->tokens[$next]['code'] === T_CLOSE_TAG) {
+                            if ( $this->tokens[ $next ][ 'code' ] === T_CLOSE_TAG ) {
                                 continue;
                             }
 
@@ -384,178 +384,178 @@ 
                         }//end for
                     }//end if
 
-                    if (substr($commentTextLower, 0, 9) === 'phpcs:set') {
+                    if ( substr( $commentTextLower, 0, 9 ) === 'phpcs:set' ) {
                         // Ignore standards for complete lines that change sniff settings.
-                        if ($lineHasOtherTokens === false) {
-                            $this->ignoredLines[$this->tokens[$i]['line']] = ['.all' => true];
+                        if ( $lineHasOtherTokens === false ) {
+                            $this->ignoredLines[ $this->tokens[ $i ][ 'line' ] ] = [ '.all' => true ];
                         }
 
                         // Need to maintain case here, to get the correct sniff code.
-                        $parts = explode(' ', substr($commentText, 10));
-                        if (count($parts) >= 2) {
-                            $sniffParts = explode('.', $parts[0]);
-                            if (count($sniffParts) >= 3) {
-                                $this->tokens[$i]['sniffCode']          = array_shift($parts);
-                                $this->tokens[$i]['sniffProperty']      = array_shift($parts);
-                                $this->tokens[$i]['sniffPropertyValue'] = rtrim(implode(' ', $parts), " */\r\n");
+                        $parts = explode( ' ', substr( $commentText, 10 ) );
+                        if ( count( $parts ) >= 2 ) {
+                            $sniffParts = explode( '.', $parts[ 0 ] );
+                            if ( count( $sniffParts ) >= 3 ) {
+                                $this->tokens[ $i ][ 'sniffCode' ]          = array_shift( $parts );
+                                $this->tokens[ $i ][ 'sniffProperty' ]      = array_shift( $parts );
+                                $this->tokens[ $i ][ 'sniffPropertyValue' ] = rtrim( implode( ' ', $parts ), " */\r\n" );
                             }
                         }
 
-                        $this->tokens[$i]['code'] = T_PHPCS_SET;
-                        $this->tokens[$i]['type'] = 'T_PHPCS_SET';
-                    } else if (substr($commentTextLower, 0, 16) === 'phpcs:ignorefile') {
+                        $this->tokens[ $i ][ 'code' ] = T_PHPCS_SET;
+                        $this->tokens[ $i ][ 'type' ] = 'T_PHPCS_SET';
+                    } else if ( substr( $commentTextLower, 0, 16 ) === 'phpcs:ignorefile' ) {
                         // The whole file will be ignored, but at least set the correct token.
-                        $this->tokens[$i]['code'] = T_PHPCS_IGNORE_FILE;
-                        $this->tokens[$i]['type'] = 'T_PHPCS_IGNORE_FILE';
-                    } else if (substr($commentTextLower, 0, 13) === 'phpcs:disable') {
-                        if ($lineHasOtherContent === false) {
+                        $this->tokens[ $i ][ 'code' ] = T_PHPCS_IGNORE_FILE;
+                        $this->tokens[ $i ][ 'type' ] = 'T_PHPCS_IGNORE_FILE';
+                    } else if ( substr( $commentTextLower, 0, 13 ) === 'phpcs:disable' ) {
+                        if ( $lineHasOtherContent === false ) {
                             // Completely ignore the comment line.
-                            $this->ignoredLines[$this->tokens[$i]['line']] = ['.all' => true];
+                            $this->ignoredLines[ $this->tokens[ $i ][ 'line' ] ] = [ '.all' => true ];
                         }
 
-                        if ($ignoring === null) {
-                            $ignoring = [];
+                        if ( $ignoring === null ) {
+                            $ignoring = [ ];
                         }
 
-                        $disabledSniffs = [];
+                        $disabledSniffs = [ ];
 
-                        $additionalText = substr($commentText, 14);
-                        if ($additionalText === false) {
-                            $ignoring = ['.all' => true];
+                        $additionalText = substr( $commentText, 14 );
+                        if ( $additionalText === false ) {
+                            $ignoring = [ '.all' => true ];
                         } else {
-                            $parts = explode(',', substr($commentText, 13));
-                            foreach ($parts as $sniffCode) {
-                                $sniffCode = trim($sniffCode);
-                                $disabledSniffs[$sniffCode] = true;
-                                $ignoring[$sniffCode]       = true;
+                            $parts = explode( ',', substr( $commentText, 13 ) );
+                            foreach ( $parts as $sniffCode ) {
+                                $sniffCode = trim( $sniffCode );
+                                $disabledSniffs[ $sniffCode ] = true;
+                                $ignoring[ $sniffCode ]       = true;
 
                                 // This newly disabled sniff might be disabling an existing
                                 // enabled exception that we are tracking.
-                                if (isset($ignoring['.except']) === true) {
-                                    foreach (array_keys($ignoring['.except']) as $ignoredSniffCode) {
-                                        if ($ignoredSniffCode === $sniffCode
-                                            || strpos($ignoredSniffCode, $sniffCode.'.') === 0
+                                if ( isset( $ignoring[ '.except' ] ) === true ) {
+                                    foreach ( array_keys( $ignoring[ '.except' ] ) as $ignoredSniffCode ) {
+                                        if ( $ignoredSniffCode === $sniffCode
+                                            || strpos( $ignoredSniffCode, $sniffCode . '.' ) === 0
                                         ) {
-                                            unset($ignoring['.except'][$ignoredSniffCode]);
+                                            unset( $ignoring[ '.except' ][ $ignoredSniffCode ] );
                                         }
                                     }
 
-                                    if (empty($ignoring['.except']) === true) {
-                                        unset($ignoring['.except']);
+                                    if ( empty( $ignoring[ '.except' ] ) === true ) {
+                                        unset( $ignoring[ '.except' ] );
                                     }
                                 }
                             }//end foreach
                         }//end if
 
-                        $this->tokens[$i]['code']       = T_PHPCS_DISABLE;
-                        $this->tokens[$i]['type']       = 'T_PHPCS_DISABLE';
-                        $this->tokens[$i]['sniffCodes'] = $disabledSniffs;
-                    } else if (substr($commentTextLower, 0, 12) === 'phpcs:enable') {
-                        if ($ignoring !== null) {
-                            $enabledSniffs = [];
+                        $this->tokens[ $i ][ 'code' ]       = T_PHPCS_DISABLE;
+                        $this->tokens[ $i ][ 'type' ]       = 'T_PHPCS_DISABLE';
+                        $this->tokens[ $i ][ 'sniffCodes' ] = $disabledSniffs;
+                    } else if ( substr( $commentTextLower, 0, 12 ) === 'phpcs:enable' ) {
+                        if ( $ignoring !== null ) {
+                            $enabledSniffs = [ ];
 
-                            $additionalText = substr($commentText, 13);
-                            if ($additionalText === false) {
+                            $additionalText = substr( $commentText, 13 );
+                            if ( $additionalText === false ) {
                                 $ignoring = null;
                             } else {
-                                $parts = explode(',', substr($commentText, 13));
-                                foreach ($parts as $sniffCode) {
-                                    $sniffCode = trim($sniffCode);
-                                    $enabledSniffs[$sniffCode] = true;
+                                $parts = explode( ',', substr( $commentText, 13 ) );
+                                foreach ( $parts as $sniffCode ) {
+                                    $sniffCode = trim( $sniffCode );
+                                    $enabledSniffs[ $sniffCode ] = true;
 
                                     // This new enabled sniff might remove previously disabled
                                     // sniffs if it is actually a standard or category of sniffs.
-                                    foreach (array_keys($ignoring) as $ignoredSniffCode) {
-                                        if ($ignoredSniffCode === $sniffCode
-                                            || strpos($ignoredSniffCode, $sniffCode.'.') === 0
+                                    foreach ( array_keys( $ignoring ) as $ignoredSniffCode ) {
+                                        if ( $ignoredSniffCode === $sniffCode
+                                            || strpos( $ignoredSniffCode, $sniffCode . '.' ) === 0
                                         ) {
-                                            unset($ignoring[$ignoredSniffCode]);
+                                            unset( $ignoring[ $ignoredSniffCode ] );
                                         }
                                     }
 
                                     // This new enabled sniff might be able to clear up
                                     // previously enabled sniffs if it is actually a standard or
                                     // category of sniffs.
-                                    if (isset($ignoring['.except']) === true) {
-                                        foreach (array_keys($ignoring['.except']) as $ignoredSniffCode) {
-                                            if ($ignoredSniffCode === $sniffCode
-                                                || strpos($ignoredSniffCode, $sniffCode.'.') === 0
+                                    if ( isset( $ignoring[ '.except' ] ) === true ) {
+                                        foreach ( array_keys( $ignoring[ '.except' ] ) as $ignoredSniffCode ) {
+                                            if ( $ignoredSniffCode === $sniffCode
+                                                || strpos( $ignoredSniffCode, $sniffCode . '.' ) === 0
                                             ) {
-                                                unset($ignoring['.except'][$ignoredSniffCode]);
+                                                unset( $ignoring[ '.except' ][ $ignoredSniffCode ] );
                                             }
                                         }
                                     }
                                 }//end foreach
 
-                                if (empty($ignoring) === true) {
+                                if ( empty( $ignoring ) === true ) {
                                     $ignoring = null;
                                 } else {
-                                    if (isset($ignoring['.except']) === true) {
-                                        $ignoring['.except'] += $enabledSniffs;
+                                    if ( isset( $ignoring[ '.except' ] ) === true ) {
+                                        $ignoring[ '.except' ] += $enabledSniffs;
                                     } else {
-                                        $ignoring['.except'] = $enabledSniffs;
+                                        $ignoring[ '.except' ] = $enabledSniffs;
                                     }
                                 }
                             }//end if
 
-                            if ($lineHasOtherContent === false) {
+                            if ( $lineHasOtherContent === false ) {
                                 // Completely ignore the comment line.
-                                $this->ignoredLines[$this->tokens[$i]['line']] = ['.all' => true];
+                                $this->ignoredLines[ $this->tokens[ $i ][ 'line' ] ] = [ '.all' => true ];
                             } else {
                                 // The comment is on the same line as the code it is ignoring,
                                 // so respect the new ignore rules.
-                                $this->ignoredLines[$this->tokens[$i]['line']] = $ignoring;
+                                $this->ignoredLines[ $this->tokens[ $i ][ 'line' ] ] = $ignoring;
                             }
 
-                            $this->tokens[$i]['sniffCodes'] = $enabledSniffs;
+                            $this->tokens[ $i ][ 'sniffCodes' ] = $enabledSniffs;
                         }//end if
 
-                        $this->tokens[$i]['code'] = T_PHPCS_ENABLE;
-                        $this->tokens[$i]['type'] = 'T_PHPCS_ENABLE';
-                    } else if (substr($commentTextLower, 0, 12) === 'phpcs:ignore') {
-                        $ignoreRules = [];
+                        $this->tokens[ $i ][ 'code' ] = T_PHPCS_ENABLE;
+                        $this->tokens[ $i ][ 'type' ] = 'T_PHPCS_ENABLE';
+                    } else if ( substr( $commentTextLower, 0, 12 ) === 'phpcs:ignore' ) {
+                        $ignoreRules = [ ];
 
-                        $additionalText = substr($commentText, 13);
-                        if ($additionalText === false) {
-                            $ignoreRules = ['.all' => true];
+                        $additionalText = substr( $commentText, 13 );
+                        if ( $additionalText === false ) {
+                            $ignoreRules = [ '.all' => true ];
                         } else {
-                            $parts = explode(',', substr($commentText, 13));
-                            foreach ($parts as $sniffCode) {
-                                $ignoreRules[trim($sniffCode)] = true;
+                            $parts = explode( ',', substr( $commentText, 13 ) );
+                            foreach ( $parts as $sniffCode ) {
+                                $ignoreRules[ trim( $sniffCode ) ] = true;
                             }
                         }
 
-                        $this->tokens[$i]['code']       = T_PHPCS_IGNORE;
-                        $this->tokens[$i]['type']       = 'T_PHPCS_IGNORE';
-                        $this->tokens[$i]['sniffCodes'] = $ignoreRules;
+                        $this->tokens[ $i ][ 'code' ]       = T_PHPCS_IGNORE;
+                        $this->tokens[ $i ][ 'type' ]       = 'T_PHPCS_IGNORE';
+                        $this->tokens[ $i ][ 'sniffCodes' ] = $ignoreRules;
 
-                        if ($ignoring !== null) {
+                        if ( $ignoring !== null ) {
                             $ignoreRules += $ignoring;
                         }
 
-                        if ($lineHasOtherContent === false) {
+                        if ( $lineHasOtherContent === false ) {
                             // Completely ignore the comment line, and set the following
                             // line to include the ignore rules we've set.
-                            $this->ignoredLines[$this->tokens[$i]['line']]       = ['.all' => true];
-                            $this->ignoredLines[($this->tokens[$i]['line'] + 1)] = $ignoreRules;
+                            $this->ignoredLines[ $this->tokens[ $i ][ 'line' ] ]       = [ '.all' => true ];
+                            $this->ignoredLines[ ( $this->tokens[ $i ][ 'line' ] + 1 ) ] = $ignoreRules;
                         } else {
                             // The comment is on the same line as the code it is ignoring,
                             // so respect the ignore rules it set.
-                            $this->ignoredLines[$this->tokens[$i]['line']] = $ignoreRules;
+                            $this->ignoredLines[ $this->tokens[ $i ][ 'line' ] ] = $ignoreRules;
                         }
                     }//end if
                 }//end if
             }//end if
 
-            if ($ignoring !== null && isset($this->ignoredLines[$this->tokens[$i]['line']]) === false) {
-                $this->ignoredLines[$this->tokens[$i]['line']] = $ignoring;
+            if ( $ignoring !== null && isset( $this->ignoredLines[ $this->tokens[ $i ][ 'line' ] ] ) === false ) {
+                $this->ignoredLines[ $this->tokens[ $i ][ 'line' ] ] = $ignoring;
             }
         }//end for
 
         // If annotations are being ignored, we clear out all the ignore rules
         // but leave the annotations tokenized as normal.
-        if ($checkAnnotations === false) {
-            $this->ignoredLines = [];
+        if ( $checkAnnotations === false ) {
+            $this->ignoredLines = [ ];
         }
 
     }//end createPositionMap()
@@ -576,52 +576,52 @@ 
      *
      * @return void
      */
-    public function replaceTabsInToken(&$token, $prefix=' ', $padding=' ', $tabWidth=null)
+    public function replaceTabsInToken( &$token, $prefix = ' ', $padding = ' ', $tabWidth = null )
     {
         $checkEncoding = false;
-        if (function_exists('iconv_strlen') === true) {
+        if ( function_exists( 'iconv_strlen' ) === true ) {
             $checkEncoding = true;
         }
 
-        $currColumn = $token['column'];
-        if ($tabWidth === null) {
+        $currColumn = $token[ 'column' ];
+        if ( $tabWidth === null ) {
             $tabWidth = $this->config->tabWidth;
-            if ($tabWidth === 0) {
+            if ( $tabWidth === 0 ) {
                 $tabWidth = 1;
             }
         }
 
-        if (rtrim($token['content'], "\t") === '') {
+        if ( rtrim( $token[ 'content' ], "\t" ) === '' ) {
             // String only contains tabs, so we can shortcut the process.
-            $numTabs = strlen($token['content']);
+            $numTabs = strlen( $token[ 'content' ] );
 
-            $firstTabSize = ($tabWidth - (($currColumn - 1) % $tabWidth));
-            $length       = ($firstTabSize + ($tabWidth * ($numTabs - 1)));
-            $newContent   = $prefix.str_repeat($padding, ($length - 1));
+            $firstTabSize = ( $tabWidth - ( ( $currColumn - 1 ) % $tabWidth ) );
+            $length       = ( $firstTabSize + ( $tabWidth * ( $numTabs - 1 ) ) );
+            $newContent   = $prefix . str_repeat( $padding, ( $length - 1 ) );
         } else {
             // We need to determine the length of each tab.
-            $tabs = explode("\t", $token['content']);
+            $tabs = explode( "\t", $token[ 'content' ] );
 
-            $numTabs    = (count($tabs) - 1);
+            $numTabs    = ( count( $tabs ) - 1 );
             $tabNum     = 0;
             $newContent = '';
             $length     = 0;
 
-            foreach ($tabs as $content) {
-                if ($content !== '') {
+            foreach ( $tabs as $content ) {
+                if ( $content !== '' ) {
                     $newContent .= $content;
-                    if ($checkEncoding === true) {
+                    if ( $checkEncoding === true ) {
                         // Not using the default encoding, so take a bit more care.
                         $oldLevel = error_reporting();
-                        error_reporting(0);
-                        $contentLength = iconv_strlen($content, $this->config->encoding);
-                        error_reporting($oldLevel);
-                        if ($contentLength === false) {
+                        error_reporting( 0 );
+                        $contentLength = iconv_strlen( $content, $this->config->encoding );
+                        error_reporting( $oldLevel );
+                        if ( $contentLength === false ) {
                             // String contained invalid characters, so revert to default.
-                            $contentLength = strlen($content);
+                            $contentLength = strlen( $content );
                         }
                     } else {
-                        $contentLength = strlen($content);
+                        $contentLength = strlen( $content );
                     }
 
                     $currColumn += $contentLength;
@@ -629,7 +629,7 @@ 
                 }
 
                 // The last piece of content does not have a tab after it.
-                if ($tabNum === $numTabs) {
+                if ( $tabNum === $numTabs ) {
                     break;
                 }
 
@@ -638,27 +638,27 @@ 
                 $tabNum++;
 
                 // Move the pointer to the next tab stop.
-                if (($currColumn % $tabWidth) === 0) {
+                if ( ( $currColumn % $tabWidth ) === 0 ) {
                     // This is the first tab, and we are already at a
                     // tab stop, so this tab counts as a single space.
                     $currColumn++;
                 } else {
                     $currColumn++;
-                    while (($currColumn % $tabWidth) !== 0) {
+                    while ( ( $currColumn % $tabWidth ) !== 0 ) {
                         $currColumn++;
                     }
 
                     $currColumn++;
                 }
 
-                $length     += ($currColumn - $lastCurrColumn);
-                $newContent .= $prefix.str_repeat($padding, ($currColumn - $lastCurrColumn - 1));
+                $length     += ( $currColumn - $lastCurrColumn );
+                $newContent .= $prefix . str_repeat( $padding, ( $currColumn - $lastCurrColumn - 1 ) );
             }//end foreach
         }//end if
 
-        $token['orig_content'] = $token['content'];
-        $token['content']      = $newContent;
-        $token['length']       = $length;
+        $token[ 'orig_content' ] = $token[ 'content' ];
+        $token[ 'content' ]      = $newContent;
+        $token[ 'length' ]       = $length;
 
     }//end replaceTabsInToken()
 
@@ -670,50 +670,50 @@ 
      */
     private function createTokenMap()
     {
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            echo "\t*** START TOKEN MAP ***".PHP_EOL;
+        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+            echo "\t*** START TOKEN MAP ***" . PHP_EOL;
         }
 
-        $squareOpeners   = [];
-        $curlyOpeners    = [];
-        $this->numTokens = count($this->tokens);
+        $squareOpeners   = [ ];
+        $curlyOpeners    = [ ];
+        $this->numTokens = count( $this->tokens );
 
-        $openers   = [];
+        $openers   = [ ];
         $openOwner = null;
 
-        for ($i = 0; $i < $this->numTokens; $i++) {
+        for ( $i = 0; $i < $this->numTokens; $i++ ) {
             /*
                 Parenthesis mapping.
             */
 
-            if (isset(Util\Tokens::$parenthesisOpeners[$this->tokens[$i]['code']]) === true) {
-                $this->tokens[$i]['parenthesis_opener'] = null;
-                $this->tokens[$i]['parenthesis_closer'] = null;
-                $this->tokens[$i]['parenthesis_owner']  = $i;
+            if ( isset( Util\Tokens::$parenthesisOpeners[ $this->tokens[ $i ][ 'code' ] ] ) === true ) {
+                $this->tokens[ $i ][ 'parenthesis_opener' ] = null;
+                $this->tokens[ $i ][ 'parenthesis_closer' ] = null;
+                $this->tokens[ $i ][ 'parenthesis_owner' ]  = $i;
                 $openOwner = $i;
-            } else if ($this->tokens[$i]['code'] === T_OPEN_PARENTHESIS) {
-                $openers[] = $i;
-                $this->tokens[$i]['parenthesis_opener'] = $i;
-                if ($openOwner !== null) {
-                    $this->tokens[$openOwner]['parenthesis_opener'] = $i;
-                    $this->tokens[$i]['parenthesis_owner']          = $openOwner;
+            } else if ( $this->tokens[ $i ][ 'code' ] === T_OPEN_PARENTHESIS ) {
+                $openers[ ] = $i;
+                $this->tokens[ $i ][ 'parenthesis_opener' ] = $i;
+                if ( $openOwner !== null ) {
+                    $this->tokens[ $openOwner ][ 'parenthesis_opener' ] = $i;
+                    $this->tokens[ $i ][ 'parenthesis_owner' ]          = $openOwner;
                     $openOwner = null;
                 }
-            } else if ($this->tokens[$i]['code'] === T_CLOSE_PARENTHESIS) {
+            } else if ( $this->tokens[ $i ][ 'code' ] === T_CLOSE_PARENTHESIS ) {
                 // Did we set an owner for this set of parenthesis?
-                $numOpeners = count($openers);
-                if ($numOpeners !== 0) {
-                    $opener = array_pop($openers);
-                    if (isset($this->tokens[$opener]['parenthesis_owner']) === true) {
-                        $owner = $this->tokens[$opener]['parenthesis_owner'];
-
-                        $this->tokens[$owner]['parenthesis_closer'] = $i;
-                        $this->tokens[$i]['parenthesis_owner']      = $owner;
+                $numOpeners = count( $openers );
+                if ( $numOpeners !== 0 ) {
+                    $opener = array_pop( $openers );
+                    if ( isset( $this->tokens[ $opener ][ 'parenthesis_owner' ] ) === true ) {
+                        $owner = $this->tokens[ $opener ][ 'parenthesis_owner' ];
+
+                        $this->tokens[ $owner ][ 'parenthesis_closer' ] = $i;
+                        $this->tokens[ $i ][ 'parenthesis_owner' ]      = $owner;
                     }
 
-                    $this->tokens[$i]['parenthesis_opener']      = $opener;
-                    $this->tokens[$i]['parenthesis_closer']      = $i;
-                    $this->tokens[$opener]['parenthesis_closer'] = $i;
+                    $this->tokens[ $i ][ 'parenthesis_opener' ]      = $opener;
+                    $this->tokens[ $i ][ 'parenthesis_closer' ]      = $i;
+                    $this->tokens[ $opener ][ 'parenthesis_closer' ] = $i;
                 }
             }//end if
 
@@ -721,56 +721,56 @@ 
                 Bracket mapping.
             */
 
-            switch ($this->tokens[$i]['code']) {
+            switch ( $this->tokens[ $i ][ 'code' ] ) {
             case T_OPEN_SQUARE_BRACKET:
-                $squareOpeners[] = $i;
+                $squareOpeners[ ] = $i;
 
-                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                    echo str_repeat("\t", count($squareOpeners));
-                    echo str_repeat("\t", count($curlyOpeners));
-                    echo "=> Found square bracket opener at $i".PHP_EOL;
+                if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                    echo str_repeat( "\t", count( $squareOpeners ) );
+                    echo str_repeat( "\t", count( $curlyOpeners ) );
+                    echo "=> Found square bracket opener at $i" . PHP_EOL;
                 }
                 break;
             case T_OPEN_CURLY_BRACKET:
-                if (isset($this->tokens[$i]['scope_closer']) === false) {
-                    $curlyOpeners[] = $i;
+                if ( isset( $this->tokens[ $i ][ 'scope_closer' ] ) === false ) {
+                    $curlyOpeners[ ] = $i;
 
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        echo str_repeat("\t", count($squareOpeners));
-                        echo str_repeat("\t", count($curlyOpeners));
-                        echo "=> Found curly bracket opener at $i".PHP_EOL;
+                    if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                        echo str_repeat( "\t", count( $squareOpeners ) );
+                        echo str_repeat( "\t", count( $curlyOpeners ) );
+                        echo "=> Found curly bracket opener at $i" . PHP_EOL;
                     }
                 }
                 break;
             case T_CLOSE_SQUARE_BRACKET:
-                if (empty($squareOpeners) === false) {
-                    $opener = array_pop($squareOpeners);
-                    $this->tokens[$i]['bracket_opener']      = $opener;
-                    $this->tokens[$i]['bracket_closer']      = $i;
-                    $this->tokens[$opener]['bracket_opener'] = $opener;
-                    $this->tokens[$opener]['bracket_closer'] = $i;
-
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        echo str_repeat("\t", count($squareOpeners));
-                        echo str_repeat("\t", count($curlyOpeners));
-                        echo "\t=> Found square bracket closer at $i for $opener".PHP_EOL;
+                if ( empty( $squareOpeners ) === false ) {
+                    $opener = array_pop( $squareOpeners );
+                    $this->tokens[ $i ][ 'bracket_opener' ]      = $opener;
+                    $this->tokens[ $i ][ 'bracket_closer' ]      = $i;
+                    $this->tokens[ $opener ][ 'bracket_opener' ] = $opener;
+                    $this->tokens[ $opener ][ 'bracket_closer' ] = $i;
+
+                    if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                        echo str_repeat( "\t", count( $squareOpeners ) );
+                        echo str_repeat( "\t", count( $curlyOpeners ) );
+                        echo "\t=> Found square bracket closer at $i for $opener" . PHP_EOL;
                     }
                 }
                 break;
             case T_CLOSE_CURLY_BRACKET:
-                if (empty($curlyOpeners) === false
-                    && isset($this->tokens[$i]['scope_opener']) === false
+                if ( empty( $curlyOpeners ) === false
+                    && isset( $this->tokens[ $i ][ 'scope_opener' ] ) === false
                 ) {
-                    $opener = array_pop($curlyOpeners);
-                    $this->tokens[$i]['bracket_opener']      = $opener;
-                    $this->tokens[$i]['bracket_closer']      = $i;
-                    $this->tokens[$opener]['bracket_opener'] = $opener;
-                    $this->tokens[$opener]['bracket_closer'] = $i;
-
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        echo str_repeat("\t", count($squareOpeners));
-                        echo str_repeat("\t", count($curlyOpeners));
-                        echo "\t=> Found curly bracket closer at $i for $opener".PHP_EOL;
+                    $opener = array_pop( $curlyOpeners );
+                    $this->tokens[ $i ][ 'bracket_opener' ]      = $opener;
+                    $this->tokens[ $i ][ 'bracket_closer' ]      = $i;
+                    $this->tokens[ $opener ][ 'bracket_opener' ] = $opener;
+                    $this->tokens[ $opener ][ 'bracket_closer' ] = $i;
+
+                    if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                        echo str_repeat( "\t", count( $squareOpeners ) );
+                        echo str_repeat( "\t", count( $curlyOpeners ) );
+                        echo "\t=> Found curly bracket closer at $i for $opener" . PHP_EOL;
                     }
                 }
                 break;
@@ -781,13 +781,13 @@ 
 
         // Cleanup for any openers that we didn't find closers for.
         // This typically means there was a syntax error breaking things.
-        foreach ($openers as $opener) {
-            unset($this->tokens[$opener]['parenthesis_opener']);
-            unset($this->tokens[$opener]['parenthesis_owner']);
+        foreach ( $openers as $opener ) {
+            unset( $this->tokens[ $opener ][ 'parenthesis_opener' ] );
+            unset( $this->tokens[ $opener ][ 'parenthesis_owner' ] );
         }
 
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            echo "\t*** END TOKEN MAP ***".PHP_EOL;
+        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+            echo "\t*** END TOKEN MAP ***" . PHP_EOL;
         }
 
     }//end createTokenMap()
@@ -800,29 +800,29 @@ 
      */
     private function createParenthesisNestingMap()
     {
-        $map = [];
-        for ($i = 0; $i < $this->numTokens; $i++) {
-            if (isset($this->tokens[$i]['parenthesis_opener']) === true
-                && $i === $this->tokens[$i]['parenthesis_opener']
+        $map = [ ];
+        for ( $i = 0; $i < $this->numTokens; $i++ ) {
+            if ( isset( $this->tokens[ $i ][ 'parenthesis_opener' ] ) === true
+                && $i === $this->tokens[ $i ][ 'parenthesis_opener' ]
             ) {
-                if (empty($map) === false) {
-                    $this->tokens[$i]['nested_parenthesis'] = $map;
+                if ( empty( $map ) === false ) {
+                    $this->tokens[ $i ][ 'nested_parenthesis' ] = $map;
                 }
 
-                if (isset($this->tokens[$i]['parenthesis_closer']) === true) {
-                    $map[$this->tokens[$i]['parenthesis_opener']]
-                        = $this->tokens[$i]['parenthesis_closer'];
+                if ( isset( $this->tokens[ $i ][ 'parenthesis_closer' ] ) === true ) {
+                    $map[ $this->tokens[ $i ][ 'parenthesis_opener' ] ]
+                        = $this->tokens[ $i ][ 'parenthesis_closer' ];
                 }
-            } else if (isset($this->tokens[$i]['parenthesis_closer']) === true
-                && $i === $this->tokens[$i]['parenthesis_closer']
+            } else if ( isset( $this->tokens[ $i ][ 'parenthesis_closer' ] ) === true
+                && $i === $this->tokens[ $i ][ 'parenthesis_closer' ]
             ) {
-                array_pop($map);
-                if (empty($map) === false) {
-                    $this->tokens[$i]['nested_parenthesis'] = $map;
+                array_pop( $map );
+                if ( empty( $map ) === false ) {
+                    $this->tokens[ $i ][ 'nested_parenthesis' ] = $map;
                 }
             } else {
-                if (empty($map) === false) {
-                    $this->tokens[$i]['nested_parenthesis'] = $map;
+                if ( empty( $map ) === false ) {
+                    $this->tokens[ $i ][ 'nested_parenthesis' ] = $map;
                 }
             }//end if
         }//end for
@@ -838,33 +838,33 @@ 
      */
     private function createScopeMap()
     {
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            echo "\t*** START SCOPE MAP ***".PHP_EOL;
+        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+            echo "\t*** START SCOPE MAP ***" . PHP_EOL;
         }
 
-        for ($i = 0; $i < $this->numTokens; $i++) {
+        for ( $i = 0; $i < $this->numTokens; $i++ ) {
             // Check to see if the current token starts a new scope.
-            if (isset($this->scopeOpeners[$this->tokens[$i]['code']]) === true) {
-                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                    $type    = $this->tokens[$i]['type'];
-                    $content = Util\Common::prepareForOutput($this->tokens[$i]['content']);
-                    echo "\tStart scope map at $i:$type => $content".PHP_EOL;
+            if ( isset( $this->scopeOpeners[ $this->tokens[ $i ][ 'code' ] ] ) === true ) {
+                if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                    $type    = $this->tokens[ $i ][ 'type' ];
+                    $content = Util\Common::prepareForOutput( $this->tokens[ $i ][ 'content' ] );
+                    echo "\tStart scope map at $i:$type => $content" . PHP_EOL;
                 }
 
-                if (isset($this->tokens[$i]['scope_condition']) === true) {
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        echo "\t* already processed, skipping *".PHP_EOL;
+                if ( isset( $this->tokens[ $i ][ 'scope_condition' ] ) === true ) {
+                    if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                        echo "\t* already processed, skipping *" . PHP_EOL;
                     }
 
                     continue;
                 }
 
-                $i = $this->recurseScopeMap($i);
+                $i = $this->recurseScopeMap( $i );
             }//end if
         }//end for
 
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            echo "\t*** END SCOPE MAP ***".PHP_EOL;
+        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+            echo "\t*** END SCOPE MAP ***" . PHP_EOL;
         }
 
     }//end createScopeMap()
@@ -880,16 +880,16 @@ 
      *
      * @return int The position in the stack that closed the scope.
      */
-    private function recurseScopeMap($stackPtr, $depth=1, &$ignore=0)
+    private function recurseScopeMap( $stackPtr, $depth = 1, &$ignore = 0 )
     {
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            echo str_repeat("\t", $depth);
-            echo "=> Begin scope map recursion at token $stackPtr with depth $depth".PHP_EOL;
+        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+            echo str_repeat( "\t", $depth );
+            echo "=> Begin scope map recursion at token $stackPtr with depth $depth" . PHP_EOL;
         }
 
         $opener    = null;
-        $currType  = $this->tokens[$stackPtr]['code'];
-        $startLine = $this->tokens[$stackPtr]['line'];
+        $currType  = $this->tokens[ $stackPtr ][ 'code' ];
+        $startLine = $this->tokens[ $stackPtr ][ 'line' ];
 
         // We will need this to restore the value if we end up
         // returning a token ID that causes our calling function to go back
@@ -898,29 +898,29 @@ 
 
         // If the start token for this scope opener is the same as
         // the scope token, we have already found our opener.
-        if (isset($this->scopeOpeners[$currType]['start'][$currType]) === true) {
+        if ( isset( $this->scopeOpeners[ $currType ][ 'start' ][ $currType ] ) === true ) {
             $opener = $stackPtr;
         }
 
-        for ($i = ($stackPtr + 1); $i < $this->numTokens; $i++) {
-            $tokenType = $this->tokens[$i]['code'];
+        for ( $i = ( $stackPtr + 1 ); $i < $this->numTokens; $i++ ) {
+            $tokenType = $this->tokens[ $i ][ 'code' ];
 
-            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                $type    = $this->tokens[$i]['type'];
-                $line    = $this->tokens[$i]['line'];
-                $content = Util\Common::prepareForOutput($this->tokens[$i]['content']);
+            if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                $type    = $this->tokens[ $i ][ 'type' ];
+                $line    = $this->tokens[ $i ][ 'line' ];
+                $content = Util\Common::prepareForOutput( $this->tokens[ $i ][ 'content' ] );
 
-                echo str_repeat("\t", $depth);
+                echo str_repeat( "\t", $depth );
                 echo "Process token $i on line $line [";
-                if ($opener !== null) {
+                if ( $opener !== null ) {
                     echo "opener:$opener;";
                 }
 
-                if ($ignore > 0) {
+                if ( $ignore > 0 ) {
                     echo "ignore=$ignore;";
                 }
 
-                echo "]: $type => $content".PHP_EOL;
+                echo "]: $type => $content" . PHP_EOL;
             }//end if
 
             // Very special case for IF statements in PHP that can be defined without
@@ -929,21 +929,21 @@ 
             // keyword, the opener will be incorrectly assigned to this IF statement.
             // The same case also applies to USE statements, which don't have to have
             // openers, so a following USE statement can cause an incorrect brace match.
-            if (($currType === T_IF || $currType === T_ELSE || $currType === T_USE)
+            if ( ( $currType === T_IF || $currType === T_ELSE || $currType === T_USE )
                 && $opener === null
-                && ($this->tokens[$i]['code'] === T_SEMICOLON
-                || $this->tokens[$i]['code'] === T_CLOSE_TAG)
+                && ( $this->tokens[ $i ][ 'code' ] === T_SEMICOLON
+                || $this->tokens[ $i ][ 'code' ] === T_CLOSE_TAG )
             ) {
-                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                    $type = $this->tokens[$stackPtr]['type'];
-                    echo str_repeat("\t", $depth);
-                    if ($this->tokens[$i]['code'] === T_SEMICOLON) {
+                if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                    $type = $this->tokens[ $stackPtr ][ 'type' ];
+                    echo str_repeat( "\t", $depth );
+                    if ( $this->tokens[ $i ][ 'code' ] === T_SEMICOLON ) {
                         $closerType = 'semicolon';
                     } else {
                         $closerType = 'close tag';
                     }
 
-                    echo "=> Found $closerType before scope opener for $stackPtr:$type, bailing".PHP_EOL;
+                    echo "=> Found $closerType before scope opener for $stackPtr:$type, bailing" . PHP_EOL;
                 }
 
                 return $i;
@@ -953,45 +953,45 @@ 
             // If we find a curly brace closer before we find the opener,
             // we're not going to find an opener. That closer probably belongs to
             // a control structure higher up.
-            if ($opener === null
+            if ( $opener === null
                 && $ignore === 0
                 && $tokenType === T_CLOSE_CURLY_BRACKET
-                && isset($this->scopeOpeners[$currType]['end'][$tokenType]) === true
+                && isset( $this->scopeOpeners[ $currType ][ 'end' ][ $tokenType ] ) === true
             ) {
-                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                    $type = $this->tokens[$stackPtr]['type'];
-                    echo str_repeat("\t", $depth);
-                    echo "=> Found curly brace closer before scope opener for $stackPtr:$type, bailing".PHP_EOL;
+                if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                    $type = $this->tokens[ $stackPtr ][ 'type' ];
+                    echo str_repeat( "\t", $depth );
+                    echo "=> Found curly brace closer before scope opener for $stackPtr:$type, bailing" . PHP_EOL;
                 }
 
-                return ($i - 1);
+                return ( $i - 1 );
             }
 
-            if ($opener !== null
-                && (isset($this->tokens[$i]['scope_opener']) === false
-                || $this->scopeOpeners[$this->tokens[$stackPtr]['code']]['shared'] === true)
-                && isset($this->scopeOpeners[$currType]['end'][$tokenType]) === true
+            if ( $opener !== null
+                && ( isset( $this->tokens[ $i ][ 'scope_opener' ] ) === false
+                || $this->scopeOpeners[ $this->tokens[ $stackPtr ][ 'code' ] ][ 'shared' ] === true )
+                && isset( $this->scopeOpeners[ $currType ][ 'end' ][ $tokenType ] ) === true
             ) {
-                if ($ignore > 0 && $tokenType === T_CLOSE_CURLY_BRACKET) {
+                if ( $ignore > 0 && $tokenType === T_CLOSE_CURLY_BRACKET ) {
                     // The last opening bracket must have been for a string
                     // offset or alike, so let's ignore it.
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        echo str_repeat("\t", $depth);
-                        echo '* finished ignoring curly brace *'.PHP_EOL;
+                    if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                        echo str_repeat( "\t", $depth );
+                        echo '* finished ignoring curly brace *' . PHP_EOL;
                     }
 
                     $ignore--;
                     continue;
-                } else if ($this->tokens[$opener]['code'] === T_OPEN_CURLY_BRACKET
+                } else if ( $this->tokens[ $opener ][ 'code' ] === T_OPEN_CURLY_BRACKET
                     && $tokenType !== T_CLOSE_CURLY_BRACKET
                 ) {
                     // The opener is a curly bracket so the closer must be a curly bracket as well.
                     // We ignore this closer to handle cases such as T_ELSE or T_ELSEIF being considered
                     // a closer of T_IF when it should not.
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        $type = $this->tokens[$stackPtr]['type'];
-                        echo str_repeat("\t", $depth);
-                        echo "=> Ignoring non-curly scope closer for $stackPtr:$type".PHP_EOL;
+                    if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                        $type = $this->tokens[ $stackPtr ][ 'type' ];
+                        echo str_repeat( "\t", $depth );
+                        echo "=> Ignoring non-curly scope closer for $stackPtr:$type" . PHP_EOL;
                     }
                 } else {
                     $scopeCloser = $i;
@@ -1000,63 +1000,63 @@ 
                         $opener,
                     ];
 
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        $type       = $this->tokens[$stackPtr]['type'];
-                        $closerType = $this->tokens[$scopeCloser]['type'];
-                        echo str_repeat("\t", $depth);
-                        echo "=> Found scope closer ($scopeCloser:$closerType) for $stackPtr:$type".PHP_EOL;
+                    if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                        $type       = $this->tokens[ $stackPtr ][ 'type' ];
+                        $closerType = $this->tokens[ $scopeCloser ][ 'type' ];
+                        echo str_repeat( "\t", $depth );
+                        echo "=> Found scope closer ($scopeCloser:$closerType) for $stackPtr:$type" . PHP_EOL;
                     }
 
                     $validCloser = true;
-                    if (($this->tokens[$stackPtr]['code'] === T_IF || $this->tokens[$stackPtr]['code'] === T_ELSEIF)
-                        && ($tokenType === T_ELSE || $tokenType === T_ELSEIF)
+                    if ( ( $this->tokens[ $stackPtr ][ 'code' ] === T_IF || $this->tokens[ $stackPtr ][ 'code' ] === T_ELSEIF )
+                        && ( $tokenType === T_ELSE || $tokenType === T_ELSEIF )
                     ) {
                         // To be a closer, this token must have an opener.
-                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            echo str_repeat("\t", $depth);
-                            echo "* closer needs to be tested *".PHP_EOL;
+                        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                            echo str_repeat( "\t", $depth );
+                            echo "* closer needs to be tested *" . PHP_EOL;
                         }
 
-                        $i = self::recurseScopeMap($i, ($depth + 1), $ignore);
+                        $i = self::recurseScopeMap( $i, ( $depth + 1 ), $ignore );
 
-                        if (isset($this->tokens[$scopeCloser]['scope_opener']) === false) {
+                        if ( isset( $this->tokens[ $scopeCloser ][ 'scope_opener' ] ) === false ) {
                             $validCloser = false;
-                            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                echo str_repeat("\t", $depth);
-                                echo "* closer is not valid (no opener found) *".PHP_EOL;
+                            if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                                echo str_repeat( "\t", $depth );
+                                echo "* closer is not valid (no opener found) *" . PHP_EOL;
                             }
-                        } else if ($this->tokens[$this->tokens[$scopeCloser]['scope_opener']]['code'] !== $this->tokens[$opener]['code']) {
+                        } else if ( $this->tokens[ $this->tokens[ $scopeCloser ][ 'scope_opener' ] ][ 'code' ] !== $this->tokens[ $opener ][ 'code' ] ) {
                             $validCloser = false;
-                            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                echo str_repeat("\t", $depth);
-                                $type       = $this->tokens[$this->tokens[$scopeCloser]['scope_opener']]['type'];
-                                $openerType = $this->tokens[$opener]['type'];
-                                echo "* closer is not valid (mismatched opener type; $type != $openerType) *".PHP_EOL;
+                            if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                                echo str_repeat( "\t", $depth );
+                                $type       = $this->tokens[ $this->tokens[ $scopeCloser ][ 'scope_opener' ] ][ 'type' ];
+                                $openerType = $this->tokens[ $opener ][ 'type' ];
+                                echo "* closer is not valid (mismatched opener type; $type != $openerType) *" . PHP_EOL;
                             }
-                        } else if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            echo str_repeat("\t", $depth);
-                            echo "* closer was valid *".PHP_EOL;
+                        } else if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                            echo str_repeat( "\t", $depth );
+                            echo "* closer was valid *" . PHP_EOL;
                         }
                     } else {
                         // The closer was not processed, so we need to
                         // complete that token as well.
-                        $todo[] = $scopeCloser;
+                        $todo[ ] = $scopeCloser;
                     }//end if
 
-                    if ($validCloser === true) {
-                        foreach ($todo as $token) {
-                            $this->tokens[$token]['scope_condition'] = $stackPtr;
-                            $this->tokens[$token]['scope_opener']    = $opener;
-                            $this->tokens[$token]['scope_closer']    = $scopeCloser;
+                    if ( $validCloser === true ) {
+                        foreach ( $todo as $token ) {
+                            $this->tokens[ $token ][ 'scope_condition' ] = $stackPtr;
+                            $this->tokens[ $token ][ 'scope_opener' ]    = $opener;
+                            $this->tokens[ $token ][ 'scope_closer' ]    = $scopeCloser;
                         }
 
-                        if ($this->scopeOpeners[$this->tokens[$stackPtr]['code']]['shared'] === true) {
+                        if ( $this->scopeOpeners[ $this->tokens[ $stackPtr ][ 'code' ] ][ 'shared' ] === true ) {
                             // As we are going back to where we started originally, restore
                             // the ignore value back to its original value.
                             $ignore = $originalIgnore;
                             return $opener;
-                        } else if ($scopeCloser === $i
-                            && isset($this->scopeOpeners[$tokenType]) === true
+                        } else if ( $scopeCloser === $i
+                            && isset( $this->scopeOpeners[ $tokenType ] ) === true
                         ) {
                             // Unset scope_condition here or else the token will appear to have
                             // already been processed, and it will be skipped. Normally we want that,
@@ -1064,8 +1064,8 @@ 
                             // it needs to act like an opener. This is also why we return the
                             // token before this one; so the closer has a chance to be processed
                             // a second time, but as an opener.
-                            unset($this->tokens[$scopeCloser]['scope_condition']);
-                            return ($i - 1);
+                            unset( $this->tokens[ $scopeCloser ][ 'scope_condition' ] );
+                            return ( $i - 1 );
                         } else {
                             return $i;
                         }
@@ -1076,151 +1076,151 @@ 
             }//end if
 
             // Is this an opening condition ?
-            if (isset($this->scopeOpeners[$tokenType]) === true) {
-                if ($opener === null) {
-                    if ($tokenType === T_USE) {
+            if ( isset( $this->scopeOpeners[ $tokenType ] ) === true ) {
+                if ( $opener === null ) {
+                    if ( $tokenType === T_USE ) {
                         // PHP use keywords are special because they can be
                         // used as blocks but also inline in function definitions.
                         // So if we find them nested inside another opener, just skip them.
                         continue;
                     }
 
-                    if ($tokenType === T_FUNCTION
-                        && $this->tokens[$stackPtr]['code'] !== T_FUNCTION
+                    if ( $tokenType === T_FUNCTION
+                        && $this->tokens[ $stackPtr ][ 'code' ] !== T_FUNCTION
                     ) {
                         // Probably a closure, so process it manually.
-                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            $type = $this->tokens[$stackPtr]['type'];
-                            echo str_repeat("\t", $depth);
-                            echo "=> Found function before scope opener for $stackPtr:$type, processing manually".PHP_EOL;
+                        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                            $type = $this->tokens[ $stackPtr ][ 'type' ];
+                            echo str_repeat( "\t", $depth );
+                            echo "=> Found function before scope opener for $stackPtr:$type, processing manually" . PHP_EOL;
                         }
 
-                        if (isset($this->tokens[$i]['scope_closer']) === true) {
+                        if ( isset( $this->tokens[ $i ][ 'scope_closer' ] ) === true ) {
                             // We've already processed this closure.
-                            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                echo str_repeat("\t", $depth);
-                                echo '* already processed, skipping *'.PHP_EOL;
+                            if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                                echo str_repeat( "\t", $depth );
+                                echo '* already processed, skipping *' . PHP_EOL;
                             }
 
-                            $i = $this->tokens[$i]['scope_closer'];
+                            $i = $this->tokens[ $i ][ 'scope_closer' ];
                             continue;
                         }
 
-                        $i = self::recurseScopeMap($i, ($depth + 1), $ignore);
+                        $i = self::recurseScopeMap( $i, ( $depth + 1 ), $ignore );
                         continue;
                     }//end if
 
-                    if ($tokenType === T_CLASS) {
+                    if ( $tokenType === T_CLASS ) {
                         // Probably an anonymous class inside another anonymous class,
                         // so process it manually.
-                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            $type = $this->tokens[$stackPtr]['type'];
-                            echo str_repeat("\t", $depth);
-                            echo "=> Found class before scope opener for $stackPtr:$type, processing manually".PHP_EOL;
+                        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                            $type = $this->tokens[ $stackPtr ][ 'type' ];
+                            echo str_repeat( "\t", $depth );
+                            echo "=> Found class before scope opener for $stackPtr:$type, processing manually" . PHP_EOL;
                         }
 
-                        if (isset($this->tokens[$i]['scope_closer']) === true) {
+                        if ( isset( $this->tokens[ $i ][ 'scope_closer' ] ) === true ) {
                             // We've already processed this anon class.
-                            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                echo str_repeat("\t", $depth);
-                                echo '* already processed, skipping *'.PHP_EOL;
+                            if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                                echo str_repeat( "\t", $depth );
+                                echo '* already processed, skipping *' . PHP_EOL;
                             }
 
-                            $i = $this->tokens[$i]['scope_closer'];
+                            $i = $this->tokens[ $i ][ 'scope_closer' ];
                             continue;
                         }
 
-                        $i = self::recurseScopeMap($i, ($depth + 1), $ignore);
+                        $i = self::recurseScopeMap( $i, ( $depth + 1 ), $ignore );
                         continue;
                     }//end if
 
                     // Found another opening condition but still haven't
                     // found our opener, so we are never going to find one.
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        $type = $this->tokens[$stackPtr]['type'];
-                        echo str_repeat("\t", $depth);
+                    if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                        $type = $this->tokens[ $stackPtr ][ 'type' ];
+                        echo str_repeat( "\t", $depth );
                         echo "=> Found new opening condition before scope opener for $stackPtr:$type, ";
                     }
 
-                    if (($this->tokens[$stackPtr]['code'] === T_IF
-                        || $this->tokens[$stackPtr]['code'] === T_ELSEIF
-                        || $this->tokens[$stackPtr]['code'] === T_ELSE)
-                        && ($this->tokens[$i]['code'] === T_ELSE
-                        || $this->tokens[$i]['code'] === T_ELSEIF)
+                    if ( ( $this->tokens[ $stackPtr ][ 'code' ] === T_IF
+                        || $this->tokens[ $stackPtr ][ 'code' ] === T_ELSEIF
+                        || $this->tokens[ $stackPtr ][ 'code' ] === T_ELSE )
+                        && ( $this->tokens[ $i ][ 'code' ] === T_ELSE
+                        || $this->tokens[ $i ][ 'code' ] === T_ELSEIF )
                     ) {
-                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            echo "continuing".PHP_EOL;
+                        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                            echo "continuing" . PHP_EOL;
                         }
 
-                        return ($i - 1);
+                        return ( $i - 1 );
                     } else {
-                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            echo "backtracking".PHP_EOL;
+                        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                            echo "backtracking" . PHP_EOL;
                         }
 
                         return $stackPtr;
                     }
                 }//end if
 
-                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                    echo str_repeat("\t", $depth);
-                    echo '* token is an opening condition *'.PHP_EOL;
+                if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                    echo str_repeat( "\t", $depth );
+                    echo '* token is an opening condition *' . PHP_EOL;
                 }
 
-                $isShared = ($this->scopeOpeners[$tokenType]['shared'] === true);
+                $isShared = ( $this->scopeOpeners[ $tokenType ][ 'shared' ] === true );
 
-                if (isset($this->tokens[$i]['scope_condition']) === true) {
+                if ( isset( $this->tokens[ $i ][ 'scope_condition' ] ) === true ) {
                     // We've been here before.
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        echo str_repeat("\t", $depth);
-                        echo '* already processed, skipping *'.PHP_EOL;
+                    if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                        echo str_repeat( "\t", $depth );
+                        echo '* already processed, skipping *' . PHP_EOL;
                     }
 
-                    if ($isShared === false
-                        && isset($this->tokens[$i]['scope_closer']) === true
+                    if ( $isShared === false
+                        && isset( $this->tokens[ $i ][ 'scope_closer' ] ) === true
                     ) {
-                        $i = $this->tokens[$i]['scope_closer'];
+                        $i = $this->tokens[ $i ][ 'scope_closer' ];
                     }
 
                     continue;
-                } else if ($currType === $tokenType
+                } else if ( $currType === $tokenType
                     && $isShared === false
                     && $opener === null
                 ) {
                     // We haven't yet found our opener, but we have found another
                     // scope opener which is the same type as us, and we don't
                     // share openers, so we will never find one.
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        echo str_repeat("\t", $depth);
-                        echo '* it was another token\'s opener, bailing *'.PHP_EOL;
+                    if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                        echo str_repeat( "\t", $depth );
+                        echo '* it was another token\'s opener, bailing *' . PHP_EOL;
                     }
 
                     return $stackPtr;
                 } else {
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        echo str_repeat("\t", $depth);
-                        echo '* searching for opener *'.PHP_EOL;
+                    if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                        echo str_repeat( "\t", $depth );
+                        echo '* searching for opener *' . PHP_EOL;
                     }
 
-                    if (isset($this->scopeOpeners[$tokenType]['end'][T_CLOSE_CURLY_BRACKET]) === true) {
+                    if ( isset( $this->scopeOpeners[ $tokenType ][ 'end' ][ T_CLOSE_CURLY_BRACKET ] ) === true ) {
                         $oldIgnore = $ignore;
                         $ignore    = 0;
                     }
 
                     // PHP has a max nesting level for functions. Stop before we hit that limit
                     // because too many loops means we've run into trouble anyway.
-                    if ($depth > 50) {
-                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            echo str_repeat("\t", $depth);
-                            echo '* reached maximum nesting level; aborting *'.PHP_EOL;
+                    if ( $depth > 50 ) {
+                        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                            echo str_repeat( "\t", $depth );
+                            echo '* reached maximum nesting level; aborting *' . PHP_EOL;
                         }
 
-                        throw new RuntimeException('Maximum nesting level reached; file could not be processed');
+                        throw new RuntimeException( 'Maximum nesting level reached; file could not be processed' );
                     }
 
                     $oldDepth = $depth;
-                    if ($isShared === true
-                        && isset($this->scopeOpeners[$tokenType]['with'][$currType]) === true
+                    if ( $isShared === true
+                        && isset( $this->scopeOpeners[ $tokenType ][ 'with' ][ $currType ] ) === true
                     ) {
                         // Don't allow the depth to increment because this is
                         // possibly not a true nesting if we are sharing our closer.
@@ -1229,35 +1229,35 @@ 
                         $depth--;
                     }
 
-                    $i     = self::recurseScopeMap($i, ($depth + 1), $ignore);
+                    $i     = self::recurseScopeMap( $i, ( $depth + 1 ), $ignore );
                     $depth = $oldDepth;
 
-                    if (isset($this->scopeOpeners[$tokenType]['end'][T_CLOSE_CURLY_BRACKET]) === true) {
+                    if ( isset( $this->scopeOpeners[ $tokenType ][ 'end' ][ T_CLOSE_CURLY_BRACKET ] ) === true ) {
                         $ignore = $oldIgnore;
                     }
                 }//end if
             }//end if
 
-            if (isset($this->scopeOpeners[$currType]['start'][$tokenType]) === true
+            if ( isset( $this->scopeOpeners[ $currType ][ 'start' ][ $tokenType ] ) === true
                 && $opener === null
             ) {
-                if ($tokenType === T_OPEN_CURLY_BRACKET) {
-                    if (isset($this->tokens[$stackPtr]['parenthesis_closer']) === true
-                        && $i < $this->tokens[$stackPtr]['parenthesis_closer']
+                if ( $tokenType === T_OPEN_CURLY_BRACKET ) {
+                    if ( isset( $this->tokens[ $stackPtr ][ 'parenthesis_closer' ] ) === true
+                        && $i < $this->tokens[ $stackPtr ][ 'parenthesis_closer' ]
                     ) {
                         // We found a curly brace inside the condition of the
                         // current scope opener, so it must be a string offset.
-                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            echo str_repeat("\t", $depth);
-                            echo '* ignoring curly brace inside condition *'.PHP_EOL;
+                        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                            echo str_repeat( "\t", $depth );
+                            echo '* ignoring curly brace inside condition *' . PHP_EOL;
                         }
 
                         $ignore++;
                     } else {
                         // Make sure this is actually an opener and not a
                         // string offset (e.g., $var{0}).
-                        for ($x = ($i - 1); $x > 0; $x--) {
-                            if (isset(Util\Tokens::$emptyTokens[$this->tokens[$x]['code']]) === true) {
+                        for ( $x = ( $i - 1 ); $x > 0; $x-- ) {
+                            if ( isset( Util\Tokens::$emptyTokens[ $this->tokens[ $x ][ 'code' ] ] ) === true ) {
                                 continue;
                             } else {
                                 // If the first non-whitespace/comment token looks like this
@@ -1272,10 +1272,10 @@ 
                                     T_OPEN_PARENTHESIS => true,
                                 ];
 
-                                if (isset($disallowed[$this->tokens[$x]['code']]) === true) {
-                                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                        echo str_repeat("\t", $depth);
-                                        echo '* ignoring curly brace *'.PHP_EOL;
+                                if ( isset( $disallowed[ $this->tokens[ $x ][ 'code' ] ] ) === true ) {
+                                    if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                                        echo str_repeat( "\t", $depth );
+                                        echo '* ignoring curly brace *' . PHP_EOL;
                                     }
 
                                     $ignore++;
@@ -1287,87 +1287,87 @@ 
                     }//end if
                 }//end if
 
-                if ($ignore === 0 || $tokenType !== T_OPEN_CURLY_BRACKET) {
+                if ( $ignore === 0 || $tokenType !== T_OPEN_CURLY_BRACKET ) {
                     // We found the opening scope token for $currType.
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        $type = $this->tokens[$stackPtr]['type'];
-                        echo str_repeat("\t", $depth);
-                        echo "=> Found scope opener for $stackPtr:$type".PHP_EOL;
+                    if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                        $type = $this->tokens[ $stackPtr ][ 'type' ];
+                        echo str_repeat( "\t", $depth );
+                        echo "=> Found scope opener for $stackPtr:$type" . PHP_EOL;
                     }
 
                     $opener = $i;
                 }
-            } else if ($tokenType === T_OPEN_PARENTHESIS) {
-                if (isset($this->tokens[$i]['parenthesis_owner']) === true) {
-                    $owner = $this->tokens[$i]['parenthesis_owner'];
-                    if (isset(Util\Tokens::$scopeOpeners[$this->tokens[$owner]['code']]) === true
-                        && isset($this->tokens[$i]['parenthesis_closer']) === true
+            } else if ( $tokenType === T_OPEN_PARENTHESIS ) {
+                if ( isset( $this->tokens[ $i ][ 'parenthesis_owner' ] ) === true ) {
+                    $owner = $this->tokens[ $i ][ 'parenthesis_owner' ];
+                    if ( isset( Util\Tokens::$scopeOpeners[ $this->tokens[ $owner ][ 'code' ] ] ) === true
+                        && isset( $this->tokens[ $i ][ 'parenthesis_closer' ] ) === true
                     ) {
                         // If we get into here, then we opened a parenthesis for
                         // a scope (eg. an if or else if) so we need to update the
                         // start of the line so that when we check to see
                         // if the closing parenthesis is more than 3 lines away from
                         // the statement, we check from the closing parenthesis.
-                        $startLine = $this->tokens[$this->tokens[$i]['parenthesis_closer']]['line'];
+                        $startLine = $this->tokens[ $this->tokens[ $i ][ 'parenthesis_closer' ] ][ 'line' ];
                     }
                 }
-            } else if ($tokenType === T_OPEN_CURLY_BRACKET && $opener !== null) {
+            } else if ( $tokenType === T_OPEN_CURLY_BRACKET && $opener !== null ) {
                 // We opened something that we don't have a scope opener for.
                 // Examples of this are curly brackets for string offsets etc.
                 // We want to ignore this so that we don't have an invalid scope
                 // map.
-                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                    echo str_repeat("\t", $depth);
-                    echo '* ignoring curly brace *'.PHP_EOL;
+                if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                    echo str_repeat( "\t", $depth );
+                    echo '* ignoring curly brace *' . PHP_EOL;
                 }
 
                 $ignore++;
-            } else if ($tokenType === T_CLOSE_CURLY_BRACKET && $ignore > 0) {
+            } else if ( $tokenType === T_CLOSE_CURLY_BRACKET && $ignore > 0 ) {
                 // We found the end token for the opener we were ignoring.
-                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                    echo str_repeat("\t", $depth);
-                    echo '* finished ignoring curly brace *'.PHP_EOL;
+                if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                    echo str_repeat( "\t", $depth );
+                    echo '* finished ignoring curly brace *' . PHP_EOL;
                 }
 
                 $ignore--;
-            } else if ($opener === null
-                && isset($this->scopeOpeners[$currType]) === true
+            } else if ( $opener === null
+                && isset( $this->scopeOpeners[ $currType ] ) === true
             ) {
                 // If we still haven't found the opener after 30 lines,
                 // we're not going to find it, unless we know it requires
                 // an opener (in which case we better keep looking) or the last
                 // token was empty (in which case we'll just confirm there is
                 // more code in this file and not just a big comment).
-                if ($this->tokens[$i]['line'] >= ($startLine + 30)
-                    && isset(Util\Tokens::$emptyTokens[$this->tokens[($i - 1)]['code']]) === false
+                if ( $this->tokens[ $i ][ 'line' ] >= ( $startLine + 30 )
+                    && isset( Util\Tokens::$emptyTokens[ $this->tokens[ ( $i - 1 ) ][ 'code' ] ] ) === false
                 ) {
-                    if ($this->scopeOpeners[$currType]['strict'] === true) {
-                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            $type  = $this->tokens[$stackPtr]['type'];
-                            $lines = ($this->tokens[$i]['line'] - $startLine);
-                            echo str_repeat("\t", $depth);
-                            echo "=> Still looking for $stackPtr:$type scope opener after $lines lines".PHP_EOL;
+                    if ( $this->scopeOpeners[ $currType ][ 'strict' ] === true ) {
+                        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                            $type  = $this->tokens[ $stackPtr ][ 'type' ];
+                            $lines = ( $this->tokens[ $i ][ 'line' ] - $startLine );
+                            echo str_repeat( "\t", $depth );
+                            echo "=> Still looking for $stackPtr:$type scope opener after $lines lines" . PHP_EOL;
                         }
                     } else {
-                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            $type = $this->tokens[$stackPtr]['type'];
-                            echo str_repeat("\t", $depth);
-                            echo "=> Couldn't find scope opener for $stackPtr:$type, bailing".PHP_EOL;
+                        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                            $type = $this->tokens[ $stackPtr ][ 'type' ];
+                            echo str_repeat( "\t", $depth );
+                            echo "=> Couldn't find scope opener for $stackPtr:$type, bailing" . PHP_EOL;
                         }
 
                         return $stackPtr;
                     }
                 }
-            } else if ($opener !== null
+            } else if ( $opener !== null
                 && $tokenType !== T_BREAK
-                && isset($this->endScopeTokens[$tokenType]) === true
+                && isset( $this->endScopeTokens[ $tokenType ] ) === true
             ) {
-                if (isset($this->tokens[$i]['scope_condition']) === false) {
-                    if ($ignore > 0) {
+                if ( isset( $this->tokens[ $i ][ 'scope_condition' ] ) === false ) {
+                    if ( $ignore > 0 ) {
                         // We found the end token for the opener we were ignoring.
-                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            echo str_repeat("\t", $depth);
-                            echo '* finished ignoring curly brace *'.PHP_EOL;
+                        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                            echo str_repeat( "\t", $depth );
+                            echo '* finished ignoring curly brace *' . PHP_EOL;
                         }
 
                         $ignore--;
@@ -1376,19 +1376,19 @@ 
                         // have a condition, so it belongs to another token and
                         // our token doesn't have a closer, so pretend this is
                         // the closer.
-                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            $type = $this->tokens[$stackPtr]['type'];
-                            echo str_repeat("\t", $depth);
-                            echo "=> Found (unexpected) scope closer for $stackPtr:$type".PHP_EOL;
+                        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                            $type = $this->tokens[ $stackPtr ][ 'type' ];
+                            echo str_repeat( "\t", $depth );
+                            echo "=> Found (unexpected) scope closer for $stackPtr:$type" . PHP_EOL;
                         }
 
-                        foreach ([$stackPtr, $opener] as $token) {
-                            $this->tokens[$token]['scope_condition'] = $stackPtr;
-                            $this->tokens[$token]['scope_opener']    = $opener;
-                            $this->tokens[$token]['scope_closer']    = $i;
+                        foreach ( [ $stackPtr, $opener ] as $token ) {
+                            $this->tokens[ $token ][ 'scope_condition' ] = $stackPtr;
+                            $this->tokens[ $token ][ 'scope_opener' ]    = $opener;
+                            $this->tokens[ $token ][ 'scope_closer' ]    = $i;
                         }
 
-                        return ($i - 1);
+                        return ( $i - 1 );
                     }//end if
                 }//end if
             }//end if
@@ -1411,233 +1411,233 @@ 
      */
     private function createLevelMap()
     {
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            echo "\t*** START LEVEL MAP ***".PHP_EOL;
+        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+            echo "\t*** START LEVEL MAP ***" . PHP_EOL;
         }
 
-        $this->numTokens = count($this->tokens);
+        $this->numTokens = count( $this->tokens );
         $level           = 0;
-        $conditions      = [];
+        $conditions      = [ ];
         $lastOpener      = null;
-        $openers         = [];
+        $openers         = [ ];
 
-        for ($i = 0; $i < $this->numTokens; $i++) {
-            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                $type = $this->tokens[$i]['type'];
-                $line = $this->tokens[$i]['line'];
-                $len  = $this->tokens[$i]['length'];
-                $col  = $this->tokens[$i]['column'];
+        for ( $i = 0; $i < $this->numTokens; $i++ ) {
+            if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                $type = $this->tokens[ $i ][ 'type' ];
+                $line = $this->tokens[ $i ][ 'line' ];
+                $len  = $this->tokens[ $i ][ 'length' ];
+                $col  = $this->tokens[ $i ][ 'column' ];
 
-                $content = Util\Common::prepareForOutput($this->tokens[$i]['content']);
+                $content = Util\Common::prepareForOutput( $this->tokens[ $i ][ 'content' ] );
 
-                echo str_repeat("\t", ($level + 1));
+                echo str_repeat( "\t", ( $level + 1 ) );
                 echo "Process token $i on line $line [col:$col;len:$len;lvl:$level;";
-                if (empty($conditions) !== true) {
+                if ( empty( $conditions ) !== true ) {
                     $condString = 'conds;';
-                    foreach ($conditions as $condition) {
-                        $condString .= Util\Tokens::tokenName($condition).',';
+                    foreach ( $conditions as $condition ) {
+                        $condString .= Util\Tokens::tokenName( $condition ) . ',';
                     }
 
-                    echo rtrim($condString, ',').';';
+                    echo rtrim( $condString, ',' ) . ';';
                 }
 
-                echo "]: $type => $content".PHP_EOL;
+                echo "]: $type => $content" . PHP_EOL;
             }//end if
 
-            $this->tokens[$i]['level']      = $level;
-            $this->tokens[$i]['conditions'] = $conditions;
+            $this->tokens[ $i ][ 'level' ]      = $level;
+            $this->tokens[ $i ][ 'conditions' ] = $conditions;
 
-            if (isset($this->tokens[$i]['scope_condition']) === true) {
+            if ( isset( $this->tokens[ $i ][ 'scope_condition' ] ) === true ) {
                 // Check to see if this token opened the scope.
-                if ($this->tokens[$i]['scope_opener'] === $i) {
-                    $stackPtr = $this->tokens[$i]['scope_condition'];
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        $type = $this->tokens[$stackPtr]['type'];
-                        echo str_repeat("\t", ($level + 1));
-                        echo "=> Found scope opener for $stackPtr:$type".PHP_EOL;
+                if ( $this->tokens[ $i ][ 'scope_opener' ] === $i ) {
+                    $stackPtr = $this->tokens[ $i ][ 'scope_condition' ];
+                    if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                        $type = $this->tokens[ $stackPtr ][ 'type' ];
+                        echo str_repeat( "\t", ( $level + 1 ) );
+                        echo "=> Found scope opener for $stackPtr:$type" . PHP_EOL;
                     }
 
-                    $stackPtr = $this->tokens[$i]['scope_condition'];
+                    $stackPtr = $this->tokens[ $i ][ 'scope_condition' ];
 
                     // If we find a scope opener that has a shared closer,
                     // then we need to go back over the condition map that we
                     // just created and fix ourselves as we just added some
                     // conditions where there was none. This happens for T_CASE
                     // statements that are using the same break statement.
-                    if ($lastOpener !== null && $this->tokens[$lastOpener]['scope_closer'] === $this->tokens[$i]['scope_closer']) {
+                    if ( $lastOpener !== null && $this->tokens[ $lastOpener ][ 'scope_closer' ] === $this->tokens[ $i ][ 'scope_closer' ] ) {
                         // This opener shares its closer with the previous opener,
                         // but we still need to check if the two openers share their
                         // closer with each other directly (like CASE and DEFAULT)
                         // or if they are just sharing because one doesn't have a
                         // closer (like CASE with no BREAK using a SWITCHes closer).
-                        $thisType = $this->tokens[$this->tokens[$i]['scope_condition']]['code'];
-                        $opener   = $this->tokens[$lastOpener]['scope_condition'];
+                        $thisType = $this->tokens[ $this->tokens[ $i ][ 'scope_condition' ] ][ 'code' ];
+                        $opener   = $this->tokens[ $lastOpener ][ 'scope_condition' ];
 
-                        $isShared = isset($this->scopeOpeners[$thisType]['with'][$this->tokens[$opener]['code']]);
+                        $isShared = isset( $this->scopeOpeners[ $thisType ][ 'with' ][ $this->tokens[ $opener ][ 'code' ] ] );
 
-                        reset($this->scopeOpeners[$thisType]['end']);
-                        reset($this->scopeOpeners[$this->tokens[$opener]['code']]['end']);
-                        $sameEnd = (current($this->scopeOpeners[$thisType]['end']) === current($this->scopeOpeners[$this->tokens[$opener]['code']]['end']));
+                        reset( $this->scopeOpeners[ $thisType ][ 'end' ] );
+                        reset( $this->scopeOpeners[ $this->tokens[ $opener ][ 'code' ] ][ 'end' ] );
+                        $sameEnd = ( current( $this->scopeOpeners[ $thisType ][ 'end' ] ) === current( $this->scopeOpeners[ $this->tokens[ $opener ][ 'code' ] ][ 'end' ] ) );
 
-                        if ($isShared === true && $sameEnd === true) {
+                        if ( $isShared === true && $sameEnd === true ) {
                             $badToken = $opener;
-                            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                $type = $this->tokens[$badToken]['type'];
-                                echo str_repeat("\t", ($level + 1));
-                                echo "* shared closer, cleaning up $badToken:$type *".PHP_EOL;
+                            if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                                $type = $this->tokens[ $badToken ][ 'type' ];
+                                echo str_repeat( "\t", ( $level + 1 ) );
+                                echo "* shared closer, cleaning up $badToken:$type *" . PHP_EOL;
                             }
 
-                            for ($x = $this->tokens[$i]['scope_condition']; $x <= $i; $x++) {
-                                $oldConditions = $this->tokens[$x]['conditions'];
-                                $oldLevel      = $this->tokens[$x]['level'];
-                                $this->tokens[$x]['level']--;
-                                unset($this->tokens[$x]['conditions'][$badToken]);
-                                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                    $type     = $this->tokens[$x]['type'];
+                            for ( $x = $this->tokens[ $i ][ 'scope_condition' ]; $x <= $i; $x++ ) {
+                                $oldConditions = $this->tokens[ $x ][ 'conditions' ];
+                                $oldLevel      = $this->tokens[ $x ][ 'level' ];
+                                $this->tokens[ $x ][ 'level' ]--;
+                                unset( $this->tokens[ $x ][ 'conditions' ][ $badToken ] );
+                                if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                                    $type     = $this->tokens[ $x ][ 'type' ];
                                     $oldConds = '';
-                                    foreach ($oldConditions as $condition) {
-                                        $oldConds .= Util\Tokens::tokenName($condition).',';
+                                    foreach ( $oldConditions as $condition ) {
+                                        $oldConds .= Util\Tokens::tokenName( $condition ) . ',';
                                     }
 
-                                    $oldConds = rtrim($oldConds, ',');
+                                    $oldConds = rtrim( $oldConds, ',' );
 
                                     $newConds = '';
-                                    foreach ($this->tokens[$x]['conditions'] as $condition) {
-                                        $newConds .= Util\Tokens::tokenName($condition).',';
+                                    foreach ( $this->tokens[ $x ][ 'conditions' ] as $condition ) {
+                                        $newConds .= Util\Tokens::tokenName( $condition ) . ',';
                                     }
 
-                                    $newConds = rtrim($newConds, ',');
+                                    $newConds = rtrim( $newConds, ',' );
 
-                                    $newLevel = $this->tokens[$x]['level'];
-                                    echo str_repeat("\t", ($level + 1));
-                                    echo "* cleaned $x:$type *".PHP_EOL;
-                                    echo str_repeat("\t", ($level + 2));
-                                    echo "=> level changed from $oldLevel to $newLevel".PHP_EOL;
-                                    echo str_repeat("\t", ($level + 2));
-                                    echo "=> conditions changed from $oldConds to $newConds".PHP_EOL;
+                                    $newLevel = $this->tokens[ $x ][ 'level' ];
+                                    echo str_repeat( "\t", ( $level + 1 ) );
+                                    echo "* cleaned $x:$type *" . PHP_EOL;
+                                    echo str_repeat( "\t", ( $level + 2 ) );
+                                    echo "=> level changed from $oldLevel to $newLevel" . PHP_EOL;
+                                    echo str_repeat( "\t", ( $level + 2 ) );
+                                    echo "=> conditions changed from $oldConds to $newConds" . PHP_EOL;
                                 }//end if
                             }//end for
 
-                            unset($conditions[$badToken]);
-                            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                $type = $this->tokens[$badToken]['type'];
-                                echo str_repeat("\t", ($level + 1));
-                                echo "* token $badToken:$type removed from conditions array *".PHP_EOL;
+                            unset( $conditions[ $badToken ] );
+                            if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                                $type = $this->tokens[ $badToken ][ 'type' ];
+                                echo str_repeat( "\t", ( $level + 1 ) );
+                                echo "* token $badToken:$type removed from conditions array *" . PHP_EOL;
                             }
 
-                            unset($openers[$lastOpener]);
+                            unset( $openers[ $lastOpener ] );
 
                             $level--;
-                            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                echo str_repeat("\t", ($level + 2));
-                                echo '* level decreased *'.PHP_EOL;
+                            if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                                echo str_repeat( "\t", ( $level + 2 ) );
+                                echo '* level decreased *' . PHP_EOL;
                             }
                         }//end if
                     }//end if
 
                     $level++;
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        echo str_repeat("\t", ($level + 1));
-                        echo '* level increased *'.PHP_EOL;
+                    if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                        echo str_repeat( "\t", ( $level + 1 ) );
+                        echo '* level increased *' . PHP_EOL;
                     }
 
-                    $conditions[$stackPtr] = $this->tokens[$stackPtr]['code'];
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        $type = $this->tokens[$stackPtr]['type'];
-                        echo str_repeat("\t", ($level + 1));
-                        echo "* token $stackPtr:$type added to conditions array *".PHP_EOL;
+                    $conditions[ $stackPtr ] = $this->tokens[ $stackPtr ][ 'code' ];
+                    if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                        $type = $this->tokens[ $stackPtr ][ 'type' ];
+                        echo str_repeat( "\t", ( $level + 1 ) );
+                        echo "* token $stackPtr:$type added to conditions array *" . PHP_EOL;
                     }
 
-                    $lastOpener = $this->tokens[$i]['scope_opener'];
-                    if ($lastOpener !== null) {
-                        $openers[$lastOpener] = $lastOpener;
+                    $lastOpener = $this->tokens[ $i ][ 'scope_opener' ];
+                    if ( $lastOpener !== null ) {
+                        $openers[ $lastOpener ] = $lastOpener;
                     }
-                } else if ($lastOpener !== null && $this->tokens[$lastOpener]['scope_closer'] === $i) {
-                    foreach (array_reverse($openers) as $opener) {
-                        if ($this->tokens[$opener]['scope_closer'] === $i) {
-                            $oldOpener = array_pop($openers);
-                            if (empty($openers) === false) {
-                                $lastOpener           = array_pop($openers);
-                                $openers[$lastOpener] = $lastOpener;
+                } else if ( $lastOpener !== null && $this->tokens[ $lastOpener ][ 'scope_closer' ] === $i ) {
+                    foreach ( array_reverse( $openers ) as $opener ) {
+                        if ( $this->tokens[ $opener ][ 'scope_closer' ] === $i ) {
+                            $oldOpener = array_pop( $openers );
+                            if ( empty( $openers ) === false ) {
+                                $lastOpener           = array_pop( $openers );
+                                $openers[ $lastOpener ] = $lastOpener;
                             } else {
                                 $lastOpener = null;
                             }
 
-                            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                $type = $this->tokens[$oldOpener]['type'];
-                                echo str_repeat("\t", ($level + 1));
-                                echo "=> Found scope closer for $oldOpener:$type".PHP_EOL;
+                            if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                                $type = $this->tokens[ $oldOpener ][ 'type' ];
+                                echo str_repeat( "\t", ( $level + 1 ) );
+                                echo "=> Found scope closer for $oldOpener:$type" . PHP_EOL;
                             }
 
-                            $oldCondition = array_pop($conditions);
-                            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                echo str_repeat("\t", ($level + 1));
-                                echo '* token '.Util\Tokens::tokenName($oldCondition).' removed from conditions array *'.PHP_EOL;
+                            $oldCondition = array_pop( $conditions );
+                            if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                                echo str_repeat( "\t", ( $level + 1 ) );
+                                echo '* token ' . Util\Tokens::tokenName( $oldCondition ) . ' removed from conditions array *' . PHP_EOL;
                             }
 
                             // Make sure this closer actually belongs to us.
                             // Either the condition also has to think this is the
                             // closer, or it has to allow sharing with us.
-                            $condition = $this->tokens[$this->tokens[$i]['scope_condition']]['code'];
-                            if ($condition !== $oldCondition) {
-                                if (isset($this->scopeOpeners[$oldCondition]['with'][$condition]) === false) {
-                                    $badToken = $this->tokens[$oldOpener]['scope_condition'];
-
-                                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                        $type = Util\Tokens::tokenName($oldCondition);
-                                        echo str_repeat("\t", ($level + 1));
-                                        echo "* scope closer was bad, cleaning up $badToken:$type *".PHP_EOL;
+                            $condition = $this->tokens[ $this->tokens[ $i ][ 'scope_condition' ] ][ 'code' ];
+                            if ( $condition !== $oldCondition ) {
+                                if ( isset( $this->scopeOpeners[ $oldCondition ][ 'with' ][ $condition ] ) === false ) {
+                                    $badToken = $this->tokens[ $oldOpener ][ 'scope_condition' ];
+
+                                    if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                                        $type = Util\Tokens::tokenName( $oldCondition );
+                                        echo str_repeat( "\t", ( $level + 1 ) );
+                                        echo "* scope closer was bad, cleaning up $badToken:$type *" . PHP_EOL;
                                     }
 
-                                    for ($x = ($oldOpener + 1); $x <= $i; $x++) {
-                                        $oldConditions = $this->tokens[$x]['conditions'];
-                                        $oldLevel      = $this->tokens[$x]['level'];
-                                        $this->tokens[$x]['level']--;
-                                        unset($this->tokens[$x]['conditions'][$badToken]);
-                                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                            $type     = $this->tokens[$x]['type'];
+                                    for ( $x = ( $oldOpener + 1 ); $x <= $i; $x++ ) {
+                                        $oldConditions = $this->tokens[ $x ][ 'conditions' ];
+                                        $oldLevel      = $this->tokens[ $x ][ 'level' ];
+                                        $this->tokens[ $x ][ 'level' ]--;
+                                        unset( $this->tokens[ $x ][ 'conditions' ][ $badToken ] );
+                                        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                                            $type     = $this->tokens[ $x ][ 'type' ];
                                             $oldConds = '';
-                                            foreach ($oldConditions as $condition) {
-                                                $oldConds .= Util\Tokens::tokenName($condition).',';
+                                            foreach ( $oldConditions as $condition ) {
+                                                $oldConds .= Util\Tokens::tokenName( $condition ) . ',';
                                             }
 
-                                            $oldConds = rtrim($oldConds, ',');
+                                            $oldConds = rtrim( $oldConds, ',' );
 
                                             $newConds = '';
-                                            foreach ($this->tokens[$x]['conditions'] as $condition) {
-                                                $newConds .= Util\Tokens::tokenName($condition).',';
+                                            foreach ( $this->tokens[ $x ][ 'conditions' ] as $condition ) {
+                                                $newConds .= Util\Tokens::tokenName( $condition ) . ',';
                                             }
 
-                                            $newConds = rtrim($newConds, ',');
+                                            $newConds = rtrim( $newConds, ',' );
 
-                                            $newLevel = $this->tokens[$x]['level'];
-                                            echo str_repeat("\t", ($level + 1));
-                                            echo "* cleaned $x:$type *".PHP_EOL;
-                                            echo str_repeat("\t", ($level + 2));
-                                            echo "=> level changed from $oldLevel to $newLevel".PHP_EOL;
-                                            echo str_repeat("\t", ($level + 2));
-                                            echo "=> conditions changed from $oldConds to $newConds".PHP_EOL;
+                                            $newLevel = $this->tokens[ $x ][ 'level' ];
+                                            echo str_repeat( "\t", ( $level + 1 ) );
+                                            echo "* cleaned $x:$type *" . PHP_EOL;
+                                            echo str_repeat( "\t", ( $level + 2 ) );
+                                            echo "=> level changed from $oldLevel to $newLevel" . PHP_EOL;
+                                            echo str_repeat( "\t", ( $level + 2 ) );
+                                            echo "=> conditions changed from $oldConds to $newConds" . PHP_EOL;
                                         }//end if
                                     }//end for
                                 }//end if
                             }//end if
 
                             $level--;
-                            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                echo str_repeat("\t", ($level + 2));
-                                echo '* level decreased *'.PHP_EOL;
+                            if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                                echo str_repeat( "\t", ( $level + 2 ) );
+                                echo '* level decreased *' . PHP_EOL;
                             }
 
-                            $this->tokens[$i]['level']      = $level;
-                            $this->tokens[$i]['conditions'] = $conditions;
+                            $this->tokens[ $i ][ 'level' ]      = $level;
+                            $this->tokens[ $i ][ 'conditions' ] = $conditions;
                         }//end if
                     }//end foreach
                 }//end if
             }//end if
         }//end for
 
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            echo "\t*** END LEVEL MAP ***".PHP_EOL;
+        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+            echo "\t*** END LEVEL MAP ***" . PHP_EOL;
         }
 
     }//end createLevelMap()

Braces +11 added lines, -22 removed lines

@@ -12,8 +12,7 @@ 
 use PHP_CodeSniffer\Exceptions\RuntimeException;
 use PHP_CodeSniffer\Util;
 
-abstract class Tokenizer
-{
+abstract class Tokenizer {
 
     /**
      * The config data for the run.
@@ -82,8 +81,7 @@ 
      * @return void
      * @throws \PHP_CodeSniffer\Exceptions\TokenizerException If the file appears to be minified.
      */
-    public function __construct($content, $config, $eolChar='\n')
-    {
+    public function __construct($content, $config, $eolChar='\n') {
         $this->eolChar = $eolChar;
 
         $this->config = $config;
@@ -113,8 +111,7 @@ 
      *
      * @return boolean
      */
-    protected function isMinifiedContent($content, $eolChar='\n')
-    {
+    protected function isMinifiedContent($content, $eolChar='\n') {
         // Minified files often have a very large number of characters per line
         // and cause issues when tokenizing.
         $numChars = strlen($content);
@@ -134,8 +131,7 @@ 
      *
      * @return array
      */
-    public function getTokens()
-    {
+    public function getTokens() {
         return $this->tokens;
 
     }//end getTokens()
@@ -167,8 +163,7 @@ 
      *
      * @return void
      */
-    private function createPositionMap()
-    {
+    private function createPositionMap() {
         $currColumn = 1;
         $lineNumber = 1;
         $eolLen     = strlen($this->eolChar);
@@ -576,8 +571,7 @@ 
      *
      * @return void
      */
-    public function replaceTabsInToken(&$token, $prefix=' ', $padding=' ', $tabWidth=null)
-    {
+    public function replaceTabsInToken(&$token, $prefix=' ', $padding=' ', $tabWidth=null) {
         $checkEncoding = false;
         if (function_exists('iconv_strlen') === true) {
             $checkEncoding = true;
@@ -668,8 +662,7 @@ 
      *
      * @return void
      */
-    private function createTokenMap()
-    {
+    private function createTokenMap() {
         if (PHP_CODESNIFFER_VERBOSITY > 1) {
             echo "\t*** START TOKEN MAP ***".PHP_EOL;
         }
@@ -798,8 +791,7 @@ 
      *
      * @return void
      */
-    private function createParenthesisNestingMap()
-    {
+    private function createParenthesisNestingMap() {
         $map = [];
         for ($i = 0; $i < $this->numTokens; $i++) {
             if (isset($this->tokens[$i]['parenthesis_opener']) === true
@@ -836,8 +828,7 @@ 
      * @return void
      * @see    recurseScopeMap()
      */
-    private function createScopeMap()
-    {
+    private function createScopeMap() {
         if (PHP_CODESNIFFER_VERBOSITY > 1) {
             echo "\t*** START SCOPE MAP ***".PHP_EOL;
         }
@@ -880,8 +871,7 @@ 
      *
      * @return int The position in the stack that closed the scope.
      */
-    private function recurseScopeMap($stackPtr, $depth=1, &$ignore=0)
-    {
+    private function recurseScopeMap($stackPtr, $depth=1, &$ignore=0) {
         if (PHP_CODESNIFFER_VERBOSITY > 1) {
             echo str_repeat("\t", $depth);
             echo "=> Begin scope map recursion at token $stackPtr with depth $depth".PHP_EOL;
@@ -1409,8 +1399,7 @@ 
      *
      * @return void
      */
-    private function createLevelMap()
-    {
+    private function createLevelMap() {
         if (PHP_CODESNIFFER_VERBOSITY > 1) {
             echo "\t*** START LEVEL MAP ***".PHP_EOL;
         }

vendor/wp-coding-standards/wpcs/WordPress/PHPCSHelper.php

Doc Comments +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
 	 *
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile Optional. The current file being processed.
 	 *
-	 * @return bool True if annotations should be ignored, false otherwise.
+	 * @return boolean|null True if annotations should be ignored, false otherwise.
 	 */
 	public static function ignore_annotations( File $phpcsFile = null ) {
 		if ( isset( $phpcsFile, $phpcsFile->config->annotations ) ) {

vendor/wp-coding-standards/wpcs/WordPress/Sniff.php

Doc Comments +2 added lines, -2 removed lines

@@ -951,7 +951,7 @@ 
 	 * @param bool   $is_error  Optional. Whether to report the message as an 'error' or 'warning'.
 	 *                          Defaults to true (error).
 	 * @param string $code      Optional error code for the message. Defaults to 'Found'.
-	 * @param array  $data      Optional input for the data replacements.
+	 * @param string[]  $data      Optional input for the data replacements.
 	 * @param int    $severity  Optional. Severity level. Defaults to 0 which will translate to
 	 *                          the PHPCS default severity level.
 	 * @return bool
@@ -970,7 +970,7 @@ 
 	 * @param bool   $is_error  Optional. Whether to report the message as an 'error' or 'warning'.
 	 *                          Defaults to true (error).
 	 * @param string $code      Optional error code for the message. Defaults to 'Found'.
-	 * @param array  $data      Optional input for the data replacements.
+	 * @param string[]  $data      Optional input for the data replacements.
 	 * @param int    $severity  Optional. Severity level. Defaults to 0 which will translate to
 	 *                          the PHPCS default severity level.
 	 * @return bool

Spacing +193 added lines, -193 removed lines

@@ -1105,10 +1105,10 @@ 
 	protected function get_last_ptr_on_line( $stackPtr ) {
 
 		$tokens      = $this->tokens;
-		$currentLine = $tokens[ $stackPtr ]['line'];
+		$currentLine = $tokens[ $stackPtr ][ 'line' ];
 		$nextPtr     = ( $stackPtr + 1 );
 
-		while ( isset( $tokens[ $nextPtr ] ) && $tokens[ $nextPtr ]['line'] === $currentLine ) {
+		while ( isset( $tokens[ $nextPtr ] ) && $tokens[ $nextPtr ][ 'line' ] === $currentLine ) {
 			$nextPtr++;
 			// Do nothing, we just want the last token of the line.
 		}
@@ -1186,27 +1186,27 @@ 
 
 		if ( false !== $end_of_statement ) {
 			// If the statement was ended by a semicolon, check if there is a whitelist comment directly after it.
-			if ( \T_SEMICOLON === $this->tokens[ $end_of_statement ]['code'] ) {
+			if ( \T_SEMICOLON === $this->tokens[ $end_of_statement ][ 'code' ] ) {
 				$lastPtr = $this->phpcsFile->findNext( \T_WHITESPACE, ( $end_of_statement + 1 ), null, true );
-			} elseif ( \T_CLOSE_TAG === $this->tokens[ $end_of_statement ]['code'] ) {
+			} elseif ( \T_CLOSE_TAG === $this->tokens[ $end_of_statement ][ 'code' ] ) {
 				// If the semicolon was left out and it was terminated by an ending tag, we need to look backwards.
 				$lastPtr = $this->phpcsFile->findPrevious( \T_WHITESPACE, ( $end_of_statement - 1 ), null, true );
 			}
 
-			if ( ( \T_COMMENT === $this->tokens[ $lastPtr ]['code']
-					|| ( isset( Tokens::$phpcsCommentTokens[ $this->tokens[ $lastPtr ]['code'] ] )
-					&& \T_PHPCS_SET !== $this->tokens[ $lastPtr ]['code'] ) )
-				&& $this->tokens[ $lastPtr ]['line'] === $this->tokens[ $end_of_statement ]['line']
-				&& preg_match( $regex, $this->tokens[ $lastPtr ]['content'] ) === 1
+			if ( ( \T_COMMENT === $this->tokens[ $lastPtr ][ 'code' ]
+					|| ( isset( Tokens::$phpcsCommentTokens[ $this->tokens[ $lastPtr ][ 'code' ] ] )
+					&& \T_PHPCS_SET !== $this->tokens[ $lastPtr ][ 'code' ] ) )
+				&& $this->tokens[ $lastPtr ][ 'line' ] === $this->tokens[ $end_of_statement ][ 'line' ]
+				&& preg_match( $regex, $this->tokens[ $lastPtr ][ 'content' ] ) === 1
 			) {
 				if ( isset( $thrown_notices[ $filename ][ $lastPtr ] ) === false
-					&& isset( Tokens::$phpcsCommentTokens[ $this->tokens[ $lastPtr ]['code'] ] ) === false
+					&& isset( Tokens::$phpcsCommentTokens[ $this->tokens[ $lastPtr ][ 'code' ] ] ) === false
 				) {
 					$this->phpcsFile->addWarning(
 						$deprecation_notice,
 						$lastPtr,
 						$deprecation_code,
-						array( $this->tokens[ $lastPtr ]['content'] )
+						array( $this->tokens[ $lastPtr ][ 'content' ] )
 					);
 
 					$thrown_notices[ $filename ][ $lastPtr ] = true;
@@ -1221,20 +1221,20 @@ 
 		$end_of_line = $this->get_last_ptr_on_line( $stackPtr );
 		$lastPtr     = $this->phpcsFile->findPrevious( \T_WHITESPACE, $end_of_line, null, true );
 
-		if ( ( \T_COMMENT === $this->tokens[ $lastPtr ]['code']
-				|| ( isset( Tokens::$phpcsCommentTokens[ $this->tokens[ $lastPtr ]['code'] ] )
-				&& \T_PHPCS_SET !== $this->tokens[ $lastPtr ]['code'] ) )
-			&& $this->tokens[ $lastPtr ]['line'] === $this->tokens[ $stackPtr ]['line']
-			&& preg_match( $regex, $this->tokens[ $lastPtr ]['content'] ) === 1
+		if ( ( \T_COMMENT === $this->tokens[ $lastPtr ][ 'code' ]
+				|| ( isset( Tokens::$phpcsCommentTokens[ $this->tokens[ $lastPtr ][ 'code' ] ] )
+				&& \T_PHPCS_SET !== $this->tokens[ $lastPtr ][ 'code' ] ) )
+			&& $this->tokens[ $lastPtr ][ 'line' ] === $this->tokens[ $stackPtr ][ 'line' ]
+			&& preg_match( $regex, $this->tokens[ $lastPtr ][ 'content' ] ) === 1
 		) {
 			if ( isset( $thrown_notices[ $filename ][ $lastPtr ] ) === false
-				&& isset( Tokens::$phpcsCommentTokens[ $this->tokens[ $lastPtr ]['code'] ] ) === false
+				&& isset( Tokens::$phpcsCommentTokens[ $this->tokens[ $lastPtr ][ 'code' ] ] ) === false
 			) {
 				$this->phpcsFile->addWarning(
 					$deprecation_notice,
 					$lastPtr,
 					$deprecation_code,
-					array( $this->tokens[ $lastPtr ]['content'] )
+					array( $this->tokens[ $lastPtr ][ 'content' ] )
 				);
 
 				$thrown_notices[ $filename ][ $lastPtr ] = true;
@@ -1268,7 +1268,7 @@ 
 			return false;
 		}
 
-		$conditions = $this->tokens[ $stackPtr ]['conditions'];
+		$conditions = $this->tokens[ $stackPtr ][ 'conditions' ];
 		foreach ( $conditions as $token => $condition ) {
 			if ( $token === $functionToken ) {
 				// Only examine the conditions the function is nested in, not those nested within the function.
@@ -1303,7 +1303,7 @@ 
 	 */
 	protected function is_test_class( $stackPtr ) {
 
-		if ( isset( $this->tokens[ $stackPtr ], Tokens::$ooScopeTokens[ $this->tokens[ $stackPtr ]['code'] ] ) === false ) {
+		if ( isset( $this->tokens[ $stackPtr ], Tokens::$ooScopeTokens[ $this->tokens[ $stackPtr ][ 'code' ] ] ) === false ) {
 			return false;
 		}
 
@@ -1334,7 +1334,7 @@ 
 
 		// Does the class/trait extend one of the whitelisted test classes ?
 		$extendedClassName = $this->phpcsFile->findExtendedClassName( $stackPtr );
-		if ( '\\' === $extendedClassName[0] ) {
+		if ( '\\' === $extendedClassName[ 0 ] ) {
 			if ( isset( $whitelist[ substr( $extendedClassName, 1 ) ] ) ) {
 				return true;
 			}
@@ -1380,7 +1380,7 @@ 
 		);
 
 		// Must be a variable, constant or closing square bracket (see below).
-		if ( ! isset( $valid[ $this->tokens[ $stackPtr ]['code'] ] ) ) {
+		if ( ! isset( $valid[ $this->tokens[ $stackPtr ][ 'code' ] ] ) ) {
 			return false;
 		}
 
@@ -1399,15 +1399,15 @@ 
 		}
 
 		// If the next token is an assignment, that's all we need to know.
-		if ( isset( Tokens::$assignmentTokens[ $this->tokens[ $next_non_empty ]['code'] ] ) ) {
+		if ( isset( Tokens::$assignmentTokens[ $this->tokens[ $next_non_empty ][ 'code' ] ] ) ) {
 			return true;
 		}
 
 		// Check if this is an array assignment, e.g., `$var['key'] = 'val';` .
-		if ( \T_OPEN_SQUARE_BRACKET === $this->tokens[ $next_non_empty ]['code']
-			&& isset( $this->tokens[ $next_non_empty ]['bracket_closer'] )
+		if ( \T_OPEN_SQUARE_BRACKET === $this->tokens[ $next_non_empty ][ 'code' ]
+			&& isset( $this->tokens[ $next_non_empty ][ 'bracket_closer' ] )
 		) {
-			return $this->is_assignment( $this->tokens[ $next_non_empty ]['bracket_closer'] );
+			return $this->is_assignment( $this->tokens[ $next_non_empty ][ 'bracket_closer' ] );
 		}
 
 		return false;
@@ -1444,12 +1444,12 @@ 
 
 		// If we're in a function, only look inside of it.
 		// Once PHPCS 3.5.0 comes out this should be changed to the new Conditions::GetLastCondition() method.
-		if ( isset( $tokens[ $stackPtr ]['conditions'] ) === true ) {
-			$conditions = $tokens[ $stackPtr ]['conditions'];
+		if ( isset( $tokens[ $stackPtr ][ 'conditions' ] ) === true ) {
+			$conditions = $tokens[ $stackPtr ][ 'conditions' ];
 			$conditions = array_reverse( $conditions, true );
 			foreach ( $conditions as $tokenPtr => $condition ) {
 				if ( \T_FUNCTION === $condition || \T_CLOSURE === $condition ) {
-					$start = $tokens[ $tokenPtr ]['scope_opener'];
+					$start = $tokens[ $tokenPtr ][ 'scope_opener' ];
 					break;
 				}
 			}
@@ -1470,23 +1470,23 @@ 
 		// If this superglobal is inside such a check, look for the nonce after it as well,
 		// all the way to the end of the scope.
 		if ( true === $allow_nonce_after ) {
-			$end = ( 0 === $start ) ? $this->phpcsFile->numTokens : $tokens[ $start ]['scope_closer'];
+			$end = ( 0 === $start ) ? $this->phpcsFile->numTokens : $tokens[ $start ][ 'scope_closer' ];
 		}
 
 		// Check if we've looked here before.
 		$filename = $this->phpcsFile->getFilename();
 
 		if (
-			$filename === $last['file']
-			&& $start === $last['start']
+			$filename === $last[ 'file' ]
+			&& $start === $last[ 'start' ]
 		) {
 
-			if ( false !== $last['nonce_check'] ) {
+			if ( false !== $last[ 'nonce_check' ] ) {
 				// If we have already found an nonce check in this scope, we just
 				// need to check whether it comes before this token. It is OK if the
 				// check is after the token though, if this was only a isset() check.
-				return ( true === $allow_nonce_after || $last['nonce_check'] < $stackPtr );
-			} elseif ( $end <= $last['end'] ) {
+				return ( true === $allow_nonce_after || $last[ 'nonce_check' ] < $stackPtr );
+			} elseif ( $end <= $last[ 'end' ] ) {
 				// If not, we can still go ahead and return false if we've already
 				// checked to the end of the search area.
 				return false;
@@ -1494,7 +1494,7 @@ 
 
 			// We haven't checked this far yet, but we can still save work by
 			// skipping over the part we've already checked.
-			$start = $last['end'];
+			$start = $last[ 'end' ];
 		} else {
 			$last = array(
 				'file'  => $filename,
@@ -1506,23 +1506,23 @@ 
 		// Loop through the tokens looking for nonce verification functions.
 		for ( $i = $start; $i < $end; $i++ ) {
 			// Skip over nested closed scope constructs.
-			if ( \T_FUNCTION === $tokens[ $i ]['code']
-				|| \T_CLOSURE === $tokens[ $i ]['code']
-				|| isset( Tokens::$ooScopeTokens[ $tokens[ $i ]['code'] ] )
+			if ( \T_FUNCTION === $tokens[ $i ][ 'code' ]
+				|| \T_CLOSURE === $tokens[ $i ][ 'code' ]
+				|| isset( Tokens::$ooScopeTokens[ $tokens[ $i ][ 'code' ] ] )
 			) {
-				if ( isset( $tokens[ $i ]['scope_closer'] ) ) {
-					$i = $tokens[ $i ]['scope_closer'];
+				if ( isset( $tokens[ $i ][ 'scope_closer' ] ) ) {
+					$i = $tokens[ $i ][ 'scope_closer' ];
 				}
 				continue;
 			}
 
 			// If this isn't a function name, skip it.
-			if ( \T_STRING !== $tokens[ $i ]['code'] ) {
+			if ( \T_STRING !== $tokens[ $i ][ 'code' ] ) {
 				continue;
 			}
 
 			// If this is one of the nonce verification functions, we can bail out.
-			if ( isset( $this->nonceVerificationFunctions[ $tokens[ $i ]['content'] ] ) ) {
+			if ( isset( $this->nonceVerificationFunctions[ $tokens[ $i ][ 'content' ] ] ) ) {
 				/*
 				 * Now, make sure it is a call to a global function.
 				 */
@@ -1534,13 +1534,13 @@ 
 					continue;
 				}
 
-				$last['nonce_check'] = $i;
+				$last[ 'nonce_check' ] = $i;
 				return true;
 			}
 		}
 
 		// We're still here, so no luck.
-		$last['nonce_check'] = false;
+		$last[ 'nonce_check' ] = false;
 
 		return false;
 	}
@@ -1558,11 +1558,11 @@ 
 	 */
 	protected function is_in_isset_or_empty( $stackPtr ) {
 
-		if ( ! isset( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
+		if ( ! isset( $this->tokens[ $stackPtr ][ 'nested_parenthesis' ] ) ) {
 			return false;
 		}
 
-		$nested_parenthesis = $this->tokens[ $stackPtr ]['nested_parenthesis'];
+		$nested_parenthesis = $this->tokens[ $stackPtr ][ 'nested_parenthesis' ];
 
 		end( $nested_parenthesis );
 		$open_parenthesis = key( $nested_parenthesis );
@@ -1572,7 +1572,7 @@ 
 			return false;
 		}
 
-		$previous_code = $this->tokens[ $previous_non_empty ]['code'];
+		$previous_code = $this->tokens[ $previous_non_empty ][ 'code' ];
 		if ( \T_ISSET === $previous_code || \T_EMPTY === $previous_code ) {
 			return true;
 		}
@@ -1585,7 +1585,7 @@ 
 		$functionPtr = $this->is_in_function_call( $stackPtr, $valid_functions );
 		if ( false !== $functionPtr ) {
 			$second_param = $this->get_function_call_parameter( $functionPtr, 2 );
-			if ( $stackPtr >= $second_param['start'] && $stackPtr <= $second_param['end'] ) {
+			if ( $stackPtr >= $second_param[ 'start' ] && $stackPtr <= $second_param[ 'end' ] ) {
 				return true;
 			}
 		}
@@ -1612,8 +1612,8 @@ 
 			return false;
 		}
 
-		if ( \T_OBJECT_OPERATOR !== $this->tokens[ $before ]['code']
-			&& \T_DOUBLE_COLON !== $this->tokens[ $before ]['code']
+		if ( \T_OBJECT_OPERATOR !== $this->tokens[ $before ][ 'code' ]
+			&& \T_DOUBLE_COLON !== $this->tokens[ $before ][ 'code' ]
 		) {
 			return false;
 		}
@@ -1640,7 +1640,7 @@ 
 			return false;
 		}
 
-		if ( \T_NS_SEPARATOR !== $this->tokens[ $prev ]['code'] ) {
+		if ( \T_NS_SEPARATOR !== $this->tokens[ $prev ][ 'code' ] ) {
 			return false;
 		}
 
@@ -1649,8 +1649,8 @@ 
 			return false;
 		}
 
-		if ( \T_STRING !== $this->tokens[ $before_prev ]['code']
-			&& \T_NAMESPACE !== $this->tokens[ $before_prev ]['code']
+		if ( \T_STRING !== $this->tokens[ $before_prev ][ 'code' ]
+			&& \T_NAMESPACE !== $this->tokens[ $before_prev ][ 'code' ]
 		) {
 			return false;
 		}
@@ -1691,11 +1691,11 @@ 
 	 * @return int|bool Stack pointer to the function call T_STRING token or false otherwise.
 	 */
 	protected function is_in_function_call( $stackPtr, $valid_functions, $global = true, $allow_nested = false ) {
-		if ( ! isset( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
+		if ( ! isset( $this->tokens[ $stackPtr ][ 'nested_parenthesis' ] ) ) {
 			return false;
 		}
 
-		$nested_parenthesis = $this->tokens[ $stackPtr ]['nested_parenthesis'];
+		$nested_parenthesis = $this->tokens[ $stackPtr ][ 'nested_parenthesis' ];
 		if ( false === $allow_nested ) {
 			$nested_parenthesis = array_reverse( $nested_parenthesis, true );
 		}
@@ -1703,11 +1703,11 @@ 
 		foreach ( $nested_parenthesis as $open => $close ) {
 
 			$prev_non_empty = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $open - 1 ), null, true, null, true );
-			if ( false === $prev_non_empty || \T_STRING !== $this->tokens[ $prev_non_empty ]['code'] ) {
+			if ( false === $prev_non_empty || \T_STRING !== $this->tokens[ $prev_non_empty ][ 'code' ] ) {
 				continue;
 			}
 
-			if ( isset( $valid_functions[ strtolower( $this->tokens[ $prev_non_empty ]['content'] ) ] ) === false ) {
+			if ( isset( $valid_functions[ strtolower( $this->tokens[ $prev_non_empty ][ 'content' ] ) ] ) === false ) {
 				if ( false === $allow_nested ) {
 					// Function call encountered, but not to one of the allowed functions.
 					return false;
@@ -1752,7 +1752,7 @@ 
 		 * The return can never be `0` as there will always be a PHP open tag before the
 		 * function call.
 		 */
-		return (bool) $this->is_in_function_call( $stackPtr, $this->typeTestFunctions );
+		return (bool)$this->is_in_function_call( $stackPtr, $this->typeTestFunctions );
 	}
 
 	/**
@@ -1773,7 +1773,7 @@ 
 
 		// If this isn't set, we know the value must have only been casted, because
 		// is_sanitized() would have returned false otherwise.
-		if ( ! isset( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
+		if ( ! isset( $this->tokens[ $stackPtr ][ 'nested_parenthesis' ] ) ) {
 			return true;
 		}
 
@@ -1785,7 +1785,7 @@ 
 
 		// The only parentheses should belong to the sanitizing function. If there's
 		// more than one set, this isn't *only* sanitization.
-		return ( \count( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) === 1 );
+		return ( \count( $this->tokens[ $stackPtr ][ 'nested_parenthesis' ] ) === 1 );
 	}
 
 	/**
@@ -1812,7 +1812,7 @@ 
 		}
 
 		// Check if it is a safe cast.
-		return isset( $this->safe_casts[ $this->tokens[ $prev ]['code'] ] );
+		return isset( $this->safe_casts[ $this->tokens[ $prev ][ 'code' ] ] );
 	}
 
 	/**
@@ -1834,7 +1834,7 @@ 
 		}
 
 		// If this isn't within a function call, we know already that it's not safe.
-		if ( ! isset( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
+		if ( ! isset( $this->tokens[ $stackPtr ][ 'nested_parenthesis' ] ) ) {
 			if ( $require_unslash ) {
 				$this->add_unslash_error( $stackPtr );
 			}
@@ -1843,13 +1843,13 @@ 
 		}
 
 		// Get the function that it's in.
-		$nested_parenthesis = $this->tokens[ $stackPtr ]['nested_parenthesis'];
+		$nested_parenthesis = $this->tokens[ $stackPtr ][ 'nested_parenthesis' ];
 		$nested_openers     = array_keys( $nested_parenthesis );
 		$function_opener    = array_pop( $nested_openers );
 		$functionPtr        = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $function_opener - 1 ), null, true, null, true );
 
 		// If it is just being unset, the value isn't used at all, so it's safe.
-		if ( \T_UNSET === $this->tokens[ $functionPtr ]['code'] ) {
+		if ( \T_UNSET === $this->tokens[ $functionPtr ][ 'code' ] ) {
 			return true;
 		}
 
@@ -1869,7 +1869,7 @@ 
 			return false;
 		}
 
-		$functionName = $this->tokens[ $functionPtr ]['content'];
+		$functionName = $this->tokens[ $functionPtr ][ 'content' ];
 
 		// Check if an unslashing function is being used.
 		if ( isset( $this->unslashingFunctions[ $functionName ] ) ) {
@@ -1888,7 +1888,7 @@ 
 			}
 
 			$functionPtr  = $higherFunctionPtr;
-			$functionName = $this->tokens[ $functionPtr ]['content'];
+			$functionName = $this->tokens[ $functionPtr ][ 'content' ];
 
 		} else {
 			$is_unslashed = false;
@@ -1907,13 +1907,13 @@ 
 				 */
 				$first_non_empty = $this->phpcsFile->findNext(
 					Tokens::$emptyTokens,
-					$callback['start'],
-					( $callback['end'] + 1 ),
+					$callback[ 'start' ],
+					( $callback[ 'end' ] + 1 ),
 					true
 				);
 
-				if ( false !== $first_non_empty && \T_CONSTANT_ENCAPSED_STRING === $this->tokens[ $first_non_empty ]['code'] ) {
-					$functionName = $this->strip_quotes( $this->tokens[ $first_non_empty ]['content'] );
+				if ( false !== $first_non_empty && \T_CONSTANT_ENCAPSED_STRING === $this->tokens[ $first_non_empty ][ 'code' ] ) {
+					$functionName = $this->strip_quotes( $this->tokens[ $first_non_empty ][ 'content' ] );
 				}
 			}
 		}
@@ -1944,7 +1944,7 @@ 
 			'%s data not unslashed before sanitization. Use wp_unslash() or similar',
 			$stackPtr,
 			'MissingUnslash',
-			array( $this->tokens[ $stackPtr ]['content'] )
+			array( $this->tokens[ $stackPtr ][ 'content' ] )
 		);
 	}
 
@@ -1966,7 +1966,7 @@ 
 
 		$keys = array();
 
-		if ( \T_VARIABLE !== $this->tokens[ $stackPtr ]['code'] ) {
+		if ( \T_VARIABLE !== $this->tokens[ $stackPtr ][ 'code' ] ) {
 			return $keys;
 		}
 
@@ -1983,19 +1983,19 @@ 
 
 			// If it isn't a bracket, this isn't an array-access.
 			if ( false === $open_bracket
-				|| \T_OPEN_SQUARE_BRACKET !== $this->tokens[ $open_bracket ]['code']
-				|| ! isset( $this->tokens[ $open_bracket ]['bracket_closer'] )
+				|| \T_OPEN_SQUARE_BRACKET !== $this->tokens[ $open_bracket ][ 'code' ]
+				|| ! isset( $this->tokens[ $open_bracket ][ 'bracket_closer' ] )
 			) {
 				break;
 			}
 
 			$key = $this->phpcsFile->getTokensAsString(
 				( $open_bracket + 1 ),
-				( $this->tokens[ $open_bracket ]['bracket_closer'] - $open_bracket - 1 )
+				( $this->tokens[ $open_bracket ][ 'bracket_closer' ] - $open_bracket - 1 )
 			);
 
-			$keys[]  = trim( $key );
-			$current = $this->tokens[ $open_bracket ]['bracket_closer'];
+			$keys[ ]  = trim( $key );
+			$current = $this->tokens[ $open_bracket ][ 'bracket_closer' ];
 		} while ( isset( $this->tokens[ $current ] ) && true === $all );
 
 		return $keys;
@@ -2017,8 +2017,8 @@ 
 
 		$keys = $this->get_array_access_keys( $stackPtr, false );
 
-		if ( isset( $keys[0] ) ) {
-			return $keys[0];
+		if ( isset( $keys[ 0 ] ) ) {
+			return $keys[ 0 ];
 		}
 
 		return false;
@@ -2072,22 +2072,22 @@ 
 			 */
 
 			// If there are no conditions, there's no validation.
-			if ( empty( $this->tokens[ $stackPtr ]['conditions'] ) ) {
+			if ( empty( $this->tokens[ $stackPtr ][ 'conditions' ] ) ) {
 				return false;
 			}
 
-			$conditions = $this->tokens[ $stackPtr ]['conditions'];
+			$conditions = $this->tokens[ $stackPtr ][ 'conditions' ];
 			end( $conditions ); // Get closest condition.
 			$conditionPtr = key( $conditions );
 			$condition    = $this->tokens[ $conditionPtr ];
 
-			if ( ! isset( $condition['parenthesis_opener'] ) ) {
+			if ( ! isset( $condition[ 'parenthesis_opener' ] ) ) {
 				// Live coding or parse error.
 				return false;
 			}
 
-			$scope_start = $condition['parenthesis_opener'];
-			$scope_end   = $condition['parenthesis_closer'];
+			$scope_start = $condition[ 'parenthesis_opener' ];
+			$scope_end   = $condition[ 'parenthesis_closer' ];
 
 		} else {
 			/*
@@ -2102,14 +2102,14 @@ 
 
 			// If so, we check only within the function, otherwise the whole file.
 			if ( false !== $function ) {
-				$scope_start = $this->tokens[ $function ]['scope_opener'];
+				$scope_start = $this->tokens[ $function ][ 'scope_opener' ];
 			} else {
 				// Check if we are in a closure.
 				$closure = $this->phpcsFile->getCondition( $stackPtr, \T_CLOSURE );
 
 				// If so, we check only within the closure.
 				if ( false !== $closure ) {
-					$scope_start = $this->tokens[ $closure ]['scope_opener'];
+					$scope_start = $this->tokens[ $closure ][ 'scope_opener' ];
 				}
 			}
 
@@ -2117,7 +2117,7 @@ 
 		}
 
 		if ( ! empty( $array_keys ) && ! is_array( $array_keys ) ) {
-			$array_keys = (array) $array_keys;
+			$array_keys = (array)$array_keys;
 		}
 
 		$bare_array_keys = array_map( array( $this, 'strip_quotes' ), $array_keys );
@@ -2133,28 +2133,28 @@ 
 		// phpcs:ignore Generic.CodeAnalysis.JumbledIncrementer.Found -- On purpose, see below.
 		for ( $i = ( $scope_start + 1 ); $i < $scope_end; $i++ ) {
 
-			if ( isset( $targets[ $this->tokens[ $i ]['code'] ] ) === false ) {
+			if ( isset( $targets[ $this->tokens[ $i ][ 'code' ] ] ) === false ) {
 				continue;
 			}
 
-			switch ( $targets[ $this->tokens[ $i ]['code'] ] ) {
+			switch ( $targets[ $this->tokens[ $i ][ 'code' ] ] ) {
 				case 'construct':
 					$issetOpener = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), null, true, null, true );
-					if ( false === $issetOpener || \T_OPEN_PARENTHESIS !== $this->tokens[ $issetOpener ]['code'] ) {
+					if ( false === $issetOpener || \T_OPEN_PARENTHESIS !== $this->tokens[ $issetOpener ][ 'code' ] ) {
 						// Parse error or live coding.
 						continue 2;
 					}
 
-					$issetCloser = $this->tokens[ $issetOpener ]['parenthesis_closer'];
+					$issetCloser = $this->tokens[ $issetOpener ][ 'parenthesis_closer' ];
 
 					// Look for this variable. We purposely stomp $i from the parent loop.
 					for ( $i = ( $issetOpener + 1 ); $i < $issetCloser; $i++ ) {
 
-						if ( \T_VARIABLE !== $this->tokens[ $i ]['code'] ) {
+						if ( \T_VARIABLE !== $this->tokens[ $i ][ 'code' ] ) {
 							continue;
 						}
 
-						if ( $this->tokens[ $stackPtr ]['content'] !== $this->tokens[ $i ]['content'] ) {
+						if ( $this->tokens[ $stackPtr ][ 'content' ] !== $this->tokens[ $i ][ 'content' ] ) {
 							continue;
 						}
 
@@ -2176,14 +2176,14 @@ 
 
 				case 'function_call':
 					// Only check calls to array_key_exists() and key_exists().
-					if ( 'array_key_exists' !== $this->tokens[ $i ]['content']
-						&& 'key_exists' !== $this->tokens[ $i ]['content']
+					if ( 'array_key_exists' !== $this->tokens[ $i ][ 'content' ]
+						&& 'key_exists' !== $this->tokens[ $i ][ 'content' ]
 					) {
 						continue 2;
 					}
 
 					$next_non_empty = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), null, true, null, true );
-					if ( false === $next_non_empty || \T_OPEN_PARENTHESIS !== $this->tokens[ $next_non_empty ]['code'] ) {
+					if ( false === $next_non_empty || \T_OPEN_PARENTHESIS !== $this->tokens[ $next_non_empty ][ 'code' ] ) {
 						// Not a function call.
 						continue 2;
 					}
@@ -2203,10 +2203,10 @@ 
 						continue 2;
 					}
 
-					$param2_first_token = $this->phpcsFile->findNext( Tokens::$emptyTokens, $params[2]['start'], ( $params[2]['end'] + 1 ), true );
+					$param2_first_token = $this->phpcsFile->findNext( Tokens::$emptyTokens, $params[ 2 ][ 'start' ], ( $params[ 2 ][ 'end' ] + 1 ), true );
 					if ( false === $param2_first_token
-						|| \T_VARIABLE !== $this->tokens[ $param2_first_token ]['code']
-						|| $this->tokens[ $param2_first_token ]['content'] !== $this->tokens[ $stackPtr ]['content']
+						|| \T_VARIABLE !== $this->tokens[ $param2_first_token ][ 'code' ]
+						|| $this->tokens[ $param2_first_token ][ 'content' ] !== $this->tokens[ $stackPtr ][ 'content' ]
 					) {
 						continue 2;
 					}
@@ -2233,7 +2233,7 @@ 
 
 						// If that failed, try getting an exact match for the subset against the
 						// second parameter and the last key against the first.
-						if ( $bare_keys === $found_keys && $this->strip_quotes( $params[1]['raw'] ) === $last_key ) {
+						if ( $bare_keys === $found_keys && $this->strip_quotes( $params[ 1 ][ 'raw' ] ) === $last_key ) {
 							return true;
 						}
 
@@ -2248,8 +2248,8 @@ 
 					do {
 						$prev = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $prev - 1 ), null, true, null, true );
 						// Skip over array keys, like $_GET['key']['subkey'].
-						if ( \T_CLOSE_SQUARE_BRACKET === $this->tokens[ $prev ]['code'] ) {
-							$prev = $this->tokens[ $prev ]['bracket_opener'];
+						if ( \T_CLOSE_SQUARE_BRACKET === $this->tokens[ $prev ][ 'code' ] ) {
+							$prev = $this->tokens[ $prev ][ 'bracket_opener' ];
 							continue;
 						}
 
@@ -2257,11 +2257,11 @@ 
 					} while ( $prev >= ( $scope_start + 1 ) );
 
 					// We should now have reached the variable.
-					if ( \T_VARIABLE !== $this->tokens[ $prev ]['code'] ) {
+					if ( \T_VARIABLE !== $this->tokens[ $prev ][ 'code' ] ) {
 						continue 2;
 					}
 
-					if ( $this->tokens[ $prev ]['content'] !== $this->tokens[ $stackPtr ]['content'] ) {
+					if ( $this->tokens[ $prev ][ 'content' ] !== $this->tokens[ $stackPtr ][ 'content' ] ) {
 						continue 2;
 					}
 
@@ -2310,13 +2310,13 @@ 
 		}
 
 		// We first check if this is a switch statement (switch ( $var )).
-		if ( isset( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
-			$nested_parenthesis = $this->tokens[ $stackPtr ]['nested_parenthesis'];
+		if ( isset( $this->tokens[ $stackPtr ][ 'nested_parenthesis' ] ) ) {
+			$nested_parenthesis = $this->tokens[ $stackPtr ][ 'nested_parenthesis' ];
 			$close_parenthesis  = end( $nested_parenthesis );
 
 			if (
-				isset( $this->tokens[ $close_parenthesis ]['parenthesis_owner'] )
-				&& \T_SWITCH === $this->tokens[ $this->tokens[ $close_parenthesis ]['parenthesis_owner'] ]['code']
+				isset( $this->tokens[ $close_parenthesis ][ 'parenthesis_owner' ] )
+				&& \T_SWITCH === $this->tokens[ $this->tokens[ $close_parenthesis ][ 'parenthesis_owner' ] ][ 'code' ]
 			) {
 				return true;
 			}
@@ -2331,7 +2331,7 @@ 
 			true
 		);
 
-		if ( isset( $comparisonTokens[ $this->tokens[ $previous_token ]['code'] ] ) ) {
+		if ( isset( $comparisonTokens[ $this->tokens[ $previous_token ][ 'code' ] ] ) ) {
 			return true;
 		}
 
@@ -2344,17 +2344,17 @@ 
 		);
 
 		// This might be an opening square bracket in the case of arrays ($var['a']).
-		while ( false !== $next_token && \T_OPEN_SQUARE_BRACKET === $this->tokens[ $next_token ]['code'] ) {
+		while ( false !== $next_token && \T_OPEN_SQUARE_BRACKET === $this->tokens[ $next_token ][ 'code' ] ) {
 
 			$next_token = $this->phpcsFile->findNext(
 				Tokens::$emptyTokens,
-				( $this->tokens[ $next_token ]['bracket_closer'] + 1 ),
+				( $this->tokens[ $next_token ][ 'bracket_closer' ] + 1 ),
 				null,
 				true
 			);
 		}
 
-		if ( false !== $next_token && isset( $comparisonTokens[ $this->tokens[ $next_token ]['code'] ] ) ) {
+		if ( false !== $next_token && isset( $comparisonTokens[ $this->tokens[ $next_token ][ 'code' ] ] ) ) {
 			return true;
 		}
 
@@ -2377,7 +2377,7 @@ 
 			return false;
 		}
 
-		$function_name = $this->tokens[ $function_ptr ]['content'];
+		$function_name = $this->tokens[ $function_ptr ][ 'content' ];
 		if ( true === $this->arrayCompareFunctions[ $function_name ] ) {
 			return true;
 		}
@@ -2412,7 +2412,7 @@ 
 		// USE keywords inside closures.
 		$next = $this->phpcsFile->findNext( \T_WHITESPACE, ( $stackPtr + 1 ), null, true );
 
-		if ( \T_OPEN_PARENTHESIS === $this->tokens[ $next ]['code'] ) {
+		if ( \T_OPEN_PARENTHESIS === $this->tokens[ $next ][ 'code' ] ) {
 			return 'closure';
 		}
 
@@ -2445,8 +2445,8 @@ 
 		$variables = array();
 		if ( preg_match_all( '/(?P<backslashes>\\\\*)\$(?P<symbol>\w+)/', $string, $match_sets, \PREG_SET_ORDER ) ) {
 			foreach ( $match_sets as $matches ) {
-				if ( ! isset( $matches['backslashes'] ) || ( \strlen( $matches['backslashes'] ) % 2 ) === 0 ) {
-					$variables[] = $matches['symbol'];
+				if ( ! isset( $matches[ 'backslashes' ] ) || ( \strlen( $matches[ 'backslashes' ] ) % 2 ) === 0 ) {
+					$variables[ ] = $matches[ 'symbol' ];
 				}
 			}
 		}
@@ -2498,19 +2498,19 @@ 
 		}
 
 		// Is this one of the tokens this function handles ?
-		if ( false === \in_array( $this->tokens[ $stackPtr ]['code'], array( \T_STRING, \T_ARRAY, \T_OPEN_SHORT_ARRAY ), true ) ) {
+		if ( false === \in_array( $this->tokens[ $stackPtr ][ 'code' ], array( \T_STRING, \T_ARRAY, \T_OPEN_SHORT_ARRAY ), true ) ) {
 			return false;
 		}
 
 		$next_non_empty = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true, null, true );
 
 		// Deal with short array syntax.
-		if ( 'T_OPEN_SHORT_ARRAY' === $this->tokens[ $stackPtr ]['type'] ) {
-			if ( false === isset( $this->tokens[ $stackPtr ]['bracket_closer'] ) ) {
+		if ( 'T_OPEN_SHORT_ARRAY' === $this->tokens[ $stackPtr ][ 'type' ] ) {
+			if ( false === isset( $this->tokens[ $stackPtr ][ 'bracket_closer' ] ) ) {
 				return false;
 			}
 
-			if ( $next_non_empty === $this->tokens[ $stackPtr ]['bracket_closer'] ) {
+			if ( $next_non_empty === $this->tokens[ $stackPtr ][ 'bracket_closer' ] ) {
 				// No parameters.
 				return false;
 			} else {
@@ -2520,15 +2520,15 @@ 
 
 		// Deal with function calls & long arrays.
 		// Next non-empty token should be the open parenthesis.
-		if ( false === $next_non_empty && \T_OPEN_PARENTHESIS !== $this->tokens[ $next_non_empty ]['code'] ) {
+		if ( false === $next_non_empty && \T_OPEN_PARENTHESIS !== $this->tokens[ $next_non_empty ][ 'code' ] ) {
 			return false;
 		}
 
-		if ( false === isset( $this->tokens[ $next_non_empty ]['parenthesis_closer'] ) ) {
+		if ( false === isset( $this->tokens[ $next_non_empty ][ 'parenthesis_closer' ] ) ) {
 			return false;
 		}
 
-		$close_parenthesis   = $this->tokens[ $next_non_empty ]['parenthesis_closer'];
+		$close_parenthesis   = $this->tokens[ $next_non_empty ][ 'parenthesis_closer' ];
 		$next_next_non_empty = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $next_non_empty + 1 ), ( $close_parenthesis + 1 ), true );
 
 		if ( $next_next_non_empty === $close_parenthesis ) {
@@ -2599,67 +2599,67 @@ 
 		 */
 
 		// Mark the beginning and end tokens.
-		if ( 'T_OPEN_SHORT_ARRAY' === $this->tokens[ $stackPtr ]['type'] ) {
+		if ( 'T_OPEN_SHORT_ARRAY' === $this->tokens[ $stackPtr ][ 'type' ] ) {
 			$opener = $stackPtr;
-			$closer = $this->tokens[ $stackPtr ]['bracket_closer'];
+			$closer = $this->tokens[ $stackPtr ][ 'bracket_closer' ];
 
 			$nestedParenthesisCount = 0;
 		} else {
 			$opener = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true, null, true );
-			$closer = $this->tokens[ $opener ]['parenthesis_closer'];
+			$closer = $this->tokens[ $opener ][ 'parenthesis_closer' ];
 
 			$nestedParenthesisCount = 1;
 		}
 
 		// Which nesting level is the one we are interested in ?
-		if ( isset( $this->tokens[ $opener ]['nested_parenthesis'] ) ) {
-			$nestedParenthesisCount += \count( $this->tokens[ $opener ]['nested_parenthesis'] );
+		if ( isset( $this->tokens[ $opener ][ 'nested_parenthesis' ] ) ) {
+			$nestedParenthesisCount += \count( $this->tokens[ $opener ][ 'nested_parenthesis' ] );
 		}
 
 		$parameters  = array();
 		$next_comma  = $opener;
 		$param_start = ( $opener + 1 );
 		$cnt         = 1;
-		while ( $next_comma = $this->phpcsFile->findNext( array( \T_COMMA, $this->tokens[ $closer ]['code'], \T_OPEN_SHORT_ARRAY, \T_CLOSURE ), ( $next_comma + 1 ), ( $closer + 1 ) ) ) {
+		while ( $next_comma = $this->phpcsFile->findNext( array( \T_COMMA, $this->tokens[ $closer ][ 'code' ], \T_OPEN_SHORT_ARRAY, \T_CLOSURE ), ( $next_comma + 1 ), ( $closer + 1 ) ) ) {
 			// Ignore anything within short array definition brackets.
-			if ( 'T_OPEN_SHORT_ARRAY' === $this->tokens[ $next_comma ]['type']
-				&& ( isset( $this->tokens[ $next_comma ]['bracket_opener'] )
-					&& $this->tokens[ $next_comma ]['bracket_opener'] === $next_comma )
-				&& isset( $this->tokens[ $next_comma ]['bracket_closer'] )
+			if ( 'T_OPEN_SHORT_ARRAY' === $this->tokens[ $next_comma ][ 'type' ]
+				&& ( isset( $this->tokens[ $next_comma ][ 'bracket_opener' ] )
+					&& $this->tokens[ $next_comma ][ 'bracket_opener' ] === $next_comma )
+				&& isset( $this->tokens[ $next_comma ][ 'bracket_closer' ] )
 			) {
 				// Skip forward to the end of the short array definition.
-				$next_comma = $this->tokens[ $next_comma ]['bracket_closer'];
+				$next_comma = $this->tokens[ $next_comma ][ 'bracket_closer' ];
 				continue;
 			}
 
 			// Skip past closures passed as function parameters.
-			if ( 'T_CLOSURE' === $this->tokens[ $next_comma ]['type']
-				&& ( isset( $this->tokens[ $next_comma ]['scope_condition'] )
-					&& $this->tokens[ $next_comma ]['scope_condition'] === $next_comma )
-				&& isset( $this->tokens[ $next_comma ]['scope_closer'] )
+			if ( 'T_CLOSURE' === $this->tokens[ $next_comma ][ 'type' ]
+				&& ( isset( $this->tokens[ $next_comma ][ 'scope_condition' ] )
+					&& $this->tokens[ $next_comma ][ 'scope_condition' ] === $next_comma )
+				&& isset( $this->tokens[ $next_comma ][ 'scope_closer' ] )
 			) {
 				// Skip forward to the end of the closure declaration.
-				$next_comma = $this->tokens[ $next_comma ]['scope_closer'];
+				$next_comma = $this->tokens[ $next_comma ][ 'scope_closer' ];
 				continue;
 			}
 
 			// Ignore comma's at a lower nesting level.
-			if ( \T_COMMA === $this->tokens[ $next_comma ]['code']
-				&& isset( $this->tokens[ $next_comma ]['nested_parenthesis'] )
-				&& \count( $this->tokens[ $next_comma ]['nested_parenthesis'] ) !== $nestedParenthesisCount
+			if ( \T_COMMA === $this->tokens[ $next_comma ][ 'code' ]
+				&& isset( $this->tokens[ $next_comma ][ 'nested_parenthesis' ] )
+				&& \count( $this->tokens[ $next_comma ][ 'nested_parenthesis' ] ) !== $nestedParenthesisCount
 			) {
 				continue;
 			}
 
 			// Ignore closing parenthesis/bracket if not 'ours'.
-			if ( $this->tokens[ $next_comma ]['type'] === $this->tokens[ $closer ]['type'] && $next_comma !== $closer ) {
+			if ( $this->tokens[ $next_comma ][ 'type' ] === $this->tokens[ $closer ][ 'type' ] && $next_comma !== $closer ) {
 				continue;
 			}
 
 			// Ok, we've reached the end of the parameter.
-			$parameters[ $cnt ]['start'] = $param_start;
-			$parameters[ $cnt ]['end']   = ( $next_comma - 1 );
-			$parameters[ $cnt ]['raw']   = trim( $this->phpcsFile->getTokensAsString( $param_start, ( $next_comma - $param_start ) ) );
+			$parameters[ $cnt ][ 'start' ] = $param_start;
+			$parameters[ $cnt ][ 'end' ]   = ( $next_comma - 1 );
+			$parameters[ $cnt ][ 'raw' ]   = trim( $this->phpcsFile->getTokensAsString( $param_start, ( $next_comma - $param_start ) ) );
 
 			/*
 			 * Check if there are more tokens before the closing parenthesis.
@@ -2720,20 +2720,20 @@ 
 		/*
 		 * Determine the array opener & closer.
 		 */
-		if ( \T_ARRAY === $this->tokens[ $stackPtr ]['code'] ) {
-			if ( isset( $this->tokens[ $stackPtr ]['parenthesis_opener'] ) ) {
-				$opener = $this->tokens[ $stackPtr ]['parenthesis_opener'];
+		if ( \T_ARRAY === $this->tokens[ $stackPtr ][ 'code' ] ) {
+			if ( isset( $this->tokens[ $stackPtr ][ 'parenthesis_opener' ] ) ) {
+				$opener = $this->tokens[ $stackPtr ][ 'parenthesis_opener' ];
 
-				if ( isset( $this->tokens[ $opener ]['parenthesis_closer'] ) ) {
-					$closer = $this->tokens[ $opener ]['parenthesis_closer'];
+				if ( isset( $this->tokens[ $opener ][ 'parenthesis_closer' ] ) ) {
+					$closer = $this->tokens[ $opener ][ 'parenthesis_closer' ];
 				}
 			}
 		} else {
 			// Short array syntax.
 			$opener = $stackPtr;
 
-			if ( isset( $this->tokens[ $stackPtr ]['bracket_closer'] ) ) {
-				$closer = $this->tokens[ $stackPtr ]['bracket_closer'];
+			if ( isset( $this->tokens[ $stackPtr ][ 'bracket_closer' ] ) ) {
+				$closer = $this->tokens[ $stackPtr ][ 'bracket_closer' ];
 			}
 		}
 
@@ -2765,7 +2765,7 @@ 
 		}
 
 		// Check for scoped namespace {}.
-		if ( ! empty( $this->tokens[ $stackPtr ]['conditions'] ) ) {
+		if ( ! empty( $this->tokens[ $stackPtr ][ 'conditions' ] ) ) {
 			$namespacePtr = $this->phpcsFile->getCondition( $stackPtr, \T_NAMESPACE );
 			if ( false !== $namespacePtr ) {
 				$namespace = $this->get_declared_namespace_name( $namespacePtr );
@@ -2792,8 +2792,8 @@ 
 			$previousNSToken = $this->phpcsFile->findPrevious( \T_NAMESPACE, ( $previousNSToken - 1 ) );
 
 			// Stop if we encounter a scoped namespace declaration as we already know we're not in one.
-			if ( ! empty( $this->tokens[ $previousNSToken ]['scope_condition'] )
-				&& $this->tokens[ $previousNSToken ]['scope_condition'] === $previousNSToken
+			if ( ! empty( $this->tokens[ $previousNSToken ][ 'scope_condition' ] )
+				&& $this->tokens[ $previousNSToken ][ 'scope_condition' ] === $previousNSToken
 			) {
 				break;
 			}
@@ -2831,17 +2831,17 @@ 
 			return false;
 		}
 
-		if ( \T_NAMESPACE !== $this->tokens[ $stackPtr ]['code'] ) {
+		if ( \T_NAMESPACE !== $this->tokens[ $stackPtr ][ 'code' ] ) {
 			return false;
 		}
 
 		$nextToken = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true, null, true );
-		if ( \T_NS_SEPARATOR === $this->tokens[ $nextToken ]['code'] ) {
+		if ( \T_NS_SEPARATOR === $this->tokens[ $nextToken ][ 'code' ] ) {
 			// Not a namespace declaration, but use of, i.e. `namespace\someFunction();`.
 			return false;
 		}
 
-		if ( \T_OPEN_CURLY_BRACKET === $this->tokens[ $nextToken ]['code'] ) {
+		if ( \T_OPEN_CURLY_BRACKET === $this->tokens[ $nextToken ][ 'code' ] ) {
 			// Declaration for global namespace when using multiple namespaces in a file.
 			// I.e.: `namespace {}`.
 			return '';
@@ -2852,12 +2852,12 @@ 
 			\T_STRING       => true,
 			\T_NS_SEPARATOR => true,
 		);
-		$validTokens    = $acceptedTokens + Tokens::$emptyTokens;
+		$validTokens = $acceptedTokens + Tokens::$emptyTokens;
 
 		$namespaceName = '';
-		while ( isset( $validTokens[ $this->tokens[ $nextToken ]['code'] ] ) ) {
-			if ( isset( $acceptedTokens[ $this->tokens[ $nextToken ]['code'] ] ) ) {
-				$namespaceName .= trim( $this->tokens[ $nextToken ]['content'] );
+		while ( isset( $validTokens[ $this->tokens[ $nextToken ][ 'code' ] ] ) ) {
+			if ( isset( $acceptedTokens[ $this->tokens[ $nextToken ][ 'code' ] ] ) ) {
+				$namespaceName .= trim( $this->tokens[ $nextToken ][ 'content' ] );
 			}
 			++$nextToken;
 		}
@@ -2875,7 +2875,7 @@ 
 	 * @return bool
 	 */
 	public function is_class_constant( $stackPtr ) {
-		if ( ! isset( $this->tokens[ $stackPtr ] ) || \T_CONST !== $this->tokens[ $stackPtr ]['code'] ) {
+		if ( ! isset( $this->tokens[ $stackPtr ] ) || \T_CONST !== $this->tokens[ $stackPtr ][ 'code' ] ) {
 			return false;
 		}
 
@@ -2899,7 +2899,7 @@ 
 	 * @return bool
 	 */
 	public function is_class_property( $stackPtr ) {
-		if ( ! isset( $this->tokens[ $stackPtr ] ) || \T_VARIABLE !== $this->tokens[ $stackPtr ]['code'] ) {
+		if ( ! isset( $this->tokens[ $stackPtr ] ) || \T_VARIABLE !== $this->tokens[ $stackPtr ][ 'code' ] ) {
 			return false;
 		}
 
@@ -2913,14 +2913,14 @@ 
 		$scopePtr = $this->valid_direct_scope( $stackPtr, $valid_scopes );
 		if ( false !== $scopePtr ) {
 			// Make sure it's not a method parameter.
-			if ( empty( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
+			if ( empty( $this->tokens[ $stackPtr ][ 'nested_parenthesis' ] ) ) {
 				return true;
 			} else {
-				$parenthesis  = array_keys( $this->tokens[ $stackPtr ]['nested_parenthesis'] );
+				$parenthesis  = array_keys( $this->tokens[ $stackPtr ][ 'nested_parenthesis' ] );
 				$deepest_open = array_pop( $parenthesis );
 				if ( $deepest_open < $scopePtr
-					|| isset( $this->tokens[ $deepest_open ]['parenthesis_owner'] ) === false
-					|| \T_FUNCTION !== $this->tokens[ $this->tokens[ $deepest_open ]['parenthesis_owner'] ]['code']
+					|| isset( $this->tokens[ $deepest_open ][ 'parenthesis_owner' ] ) === false
+					|| \T_FUNCTION !== $this->tokens[ $this->tokens[ $deepest_open ][ 'parenthesis_owner' ] ][ 'code' ]
 				) {
 					return true;
 				}
@@ -2947,21 +2947,21 @@ 
 	 * @return int|bool StackPtr to the scope if valid, false otherwise.
 	 */
 	protected function valid_direct_scope( $stackPtr, array $valid_scopes ) {
-		if ( empty( $this->tokens[ $stackPtr ]['conditions'] ) ) {
+		if ( empty( $this->tokens[ $stackPtr ][ 'conditions' ] ) ) {
 			return false;
 		}
 
 		/*
 		 * Check only the direct wrapping scope of the token.
 		 */
-		$conditions = array_keys( $this->tokens[ $stackPtr ]['conditions'] );
+		$conditions = array_keys( $this->tokens[ $stackPtr ][ 'conditions' ] );
 		$ptr        = array_pop( $conditions );
 
 		if ( ! isset( $this->tokens[ $ptr ] ) ) {
 			return false;
 		}
 
-		if ( isset( $valid_scopes[ $this->tokens[ $ptr ]['type'] ] ) ) {
+		if ( isset( $valid_scopes[ $this->tokens[ $ptr ][ 'type' ] ] ) ) {
 			return $ptr;
 		}
 
@@ -2991,8 +2991,8 @@ 
 	protected function is_wpdb_method_call( $stackPtr, $target_methods ) {
 
 		// Check for wpdb.
-		if ( ( \T_VARIABLE === $this->tokens[ $stackPtr ]['code'] && '$wpdb' !== $this->tokens[ $stackPtr ]['content'] )
-			|| ( \T_STRING === $this->tokens[ $stackPtr ]['code'] && 'wpdb' !== $this->tokens[ $stackPtr ]['content'] )
+		if ( ( \T_VARIABLE === $this->tokens[ $stackPtr ][ 'code' ] && '$wpdb' !== $this->tokens[ $stackPtr ][ 'content' ] )
+			|| ( \T_STRING === $this->tokens[ $stackPtr ][ 'code' ] && 'wpdb' !== $this->tokens[ $stackPtr ][ 'content' ] )
 		) {
 			return false;
 		}
@@ -3015,7 +3015,7 @@ 
 			return false;
 		}
 
-		if ( \T_STRING === $this->tokens[ $methodPtr ]['code'] && property_exists( $this, 'methodPtr' ) ) {
+		if ( \T_STRING === $this->tokens[ $methodPtr ][ 'code' ] && property_exists( $this, 'methodPtr' ) ) {
 			$this->methodPtr = $methodPtr;
 		}
 
@@ -3030,21 +3030,21 @@ 
 			$this->i = $opening_paren;
 		}
 
-		if ( \T_OPEN_PARENTHESIS !== $this->tokens[ $opening_paren ]['code']
-			|| ! isset( $this->tokens[ $opening_paren ]['parenthesis_closer'] )
+		if ( \T_OPEN_PARENTHESIS !== $this->tokens[ $opening_paren ][ 'code' ]
+			|| ! isset( $this->tokens[ $opening_paren ][ 'parenthesis_closer' ] )
 		) {
 			return false;
 		}
 
 		// Check that this is one of the methods that we are interested in.
-		if ( ! isset( $target_methods[ $this->tokens[ $methodPtr ]['content'] ] ) ) {
+		if ( ! isset( $target_methods[ $this->tokens[ $methodPtr ][ 'content' ] ] ) ) {
 			return false;
 		}
 
 		// Find the end of the first parameter.
 		$end = $this->phpcsFile->findEndOfStatement( $opening_paren + 1 );
 
-		if ( \T_COMMA !== $this->tokens[ $end ]['code'] ) {
+		if ( \T_COMMA !== $this->tokens[ $end ][ 'code' ] ) {
 			++$end;
 		}
 
@@ -3071,14 +3071,14 @@ 
 		}
 
 		// Is this one of the tokens this function handles ?
-		if ( \T_STRING !== $this->tokens[ $stackPtr ]['code'] ) {
+		if ( \T_STRING !== $this->tokens[ $stackPtr ][ 'code' ] ) {
 			return false;
 		}
 
 		$next = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
 		if ( false !== $next
-			&& ( \T_OPEN_PARENTHESIS === $this->tokens[ $next ]['code']
-				|| \T_DOUBLE_COLON === $this->tokens[ $next ]['code'] )
+			&& ( \T_OPEN_PARENTHESIS === $this->tokens[ $next ][ 'code' ]
+				|| \T_DOUBLE_COLON === $this->tokens[ $next ][ 'code' ] )
 		) {
 			// Function call or declaration.
 			return false;
@@ -3108,7 +3108,7 @@ 
 
 		$prev = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
 		if ( false !== $prev
-			&& isset( $tokens_to_ignore[ $this->tokens[ $prev ]['type'] ] )
+			&& isset( $tokens_to_ignore[ $this->tokens[ $prev ][ 'type' ] ] )
 		) {
 			// Not the use of a constant.
 			return false;
@@ -3120,7 +3120,7 @@ 
 		}
 
 		if ( false !== $prev
-			&& \T_CONST === $this->tokens[ $prev ]['code']
+			&& \T_CONST === $this->tokens[ $prev ][ 'code' ]
 			&& $this->is_class_constant( $prev )
 		) {
 			// Class constant declaration of the same name.
@@ -3131,17 +3131,17 @@ 
 		 * Deal with a number of variations of use statements.
 		 */
 		for ( $i = $stackPtr; $i > 0; $i-- ) {
-			if ( $this->tokens[ $i ]['line'] !== $this->tokens[ $stackPtr ]['line'] ) {
+			if ( $this->tokens[ $i ][ 'line' ] !== $this->tokens[ $stackPtr ][ 'line' ] ) {
 				break;
 			}
 		}
 
 		$firstOnLine = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), null, true );
-		if ( false !== $firstOnLine && \T_USE === $this->tokens[ $firstOnLine ]['code'] ) {
+		if ( false !== $firstOnLine && \T_USE === $this->tokens[ $firstOnLine ][ 'code' ] ) {
 			$nextOnLine = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $firstOnLine + 1 ), null, true );
 			if ( false !== $nextOnLine ) {
-				if ( \T_STRING === $this->tokens[ $nextOnLine ]['code']
-					&& 'const' === $this->tokens[ $nextOnLine ]['content']
+				if ( \T_STRING === $this->tokens[ $nextOnLine ][ 'code' ]
+					&& 'const' === $this->tokens[ $nextOnLine ][ 'content' ]
 				) {
 					$hasNsSep = $this->phpcsFile->findNext( \T_NS_SEPARATOR, ( $nextOnLine + 1 ), $stackPtr );
 					if ( false !== $hasNsSep ) {
@@ -3169,18 +3169,18 @@ 
 	 * @return bool True if it is. False otherwise.
 	 */
 	protected function is_foreach_as( $stackPtr ) {
-		if ( ! isset( $this->tokens[ $stackPtr ]['nested_parenthesis'] ) ) {
+		if ( ! isset( $this->tokens[ $stackPtr ][ 'nested_parenthesis' ] ) ) {
 			return false;
 		}
 
-		$nested_parenthesis = $this->tokens[ $stackPtr ]['nested_parenthesis'];
+		$nested_parenthesis = $this->tokens[ $stackPtr ][ 'nested_parenthesis' ];
 		$close_parenthesis  = end( $nested_parenthesis );
 		$open_parenthesis   = key( $nested_parenthesis );
-		if ( ! isset( $this->tokens[ $close_parenthesis ]['parenthesis_owner'] ) ) {
+		if ( ! isset( $this->tokens[ $close_parenthesis ][ 'parenthesis_owner' ] ) ) {
 			return false;
 		}
 
-		if ( \T_FOREACH !== $this->tokens[ $this->tokens[ $close_parenthesis ]['parenthesis_owner'] ]['code'] ) {
+		if ( \T_FOREACH !== $this->tokens[ $this->tokens[ $close_parenthesis ][ 'parenthesis_owner' ] ][ 'code' ] ) {
 			return false;
 		}