gravityview / GravityView

vendor/squizlabs/php_codesniffer/scripts/ValidatePEAR/ValidatePEARPackageXML.php

Indentation +317 added lines, -317 removed lines

@@ -17,344 +17,344 @@
 class ValidatePEARPackageXML
 {
 
-    /**
-     * The root directory of the project.
-     *
-     * @var string
-     */
-    protected $projectRoot = '';
-
-    /**
-     * The contents of the package.xml file.
-     *
-     * @var \SimpleXMLElement
-     */
-    protected $packageXML;
-
-    /**
-     * List of all files in the repo.
-     *
-     * @var array
-     */
-    protected $allFiles = [];
-
-    /**
-     * Valid file roles.
-     *
-     * @var array
-     *
-     * @link https://pear.php.net/manual/en/developers.packagedef.intro.php#developers.packagedef.roles
-     */
-    private $validRoles = [
-        'data'   => true,
-        'doc'    => true,
-        'ext'    => true,
-        'extsrc' => true,
-        'php'    => true,
-        'script' => true,
-        'src'    => true,
-        'test'   => true,
-    ];
-
-    /**
-     * Files encountered in the package.xml <contents> tag.
-     *
-     * @var array
-     */
-    private $listedContents = [];
-
-
-    /**
-     * Constructor.
-     */
-    public function __construct()
-    {
-        $this->projectRoot = dirname(dirname(__DIR__)).'/';
-        $this->packageXML  = simplexml_load_file($this->projectRoot.'package.xml');
-
-        $allFiles       = (new FileList($this->projectRoot, $this->projectRoot))->getList();
-        $this->allFiles = array_flip($allFiles);
-
-    }//end __construct()
-
-
-    /**
-     * Validate the file listings in the package.xml file.
-     *
-     * @return void
-     */
-    public function validate()
-    {
-        $exitCode = 0;
-        if ($this->checkContents() !== true) {
-            $exitCode = 1;
-        }
-
-        if ($this->checkPHPRelease() !== true) {
-            $exitCode = 1;
-        }
-
-        exit($exitCode);
-
-    }//end validate()
-
-
-    /**
-     * Validate the file listings in the <contents> tag.
-     *
-     * @return bool
-     */
-    protected function checkContents()
-    {
-        echo PHP_EOL.'Checking Contents tag'.PHP_EOL;
-        echo '====================='.PHP_EOL;
-
-        $valid = true;
-
-        /*
+	/**
+	 * The root directory of the project.
+	 *
+	 * @var string
+	 */
+	protected $projectRoot = '';
+
+	/**
+	 * The contents of the package.xml file.
+	 *
+	 * @var \SimpleXMLElement
+	 */
+	protected $packageXML;
+
+	/**
+	 * List of all files in the repo.
+	 *
+	 * @var array
+	 */
+	protected $allFiles = [];
+
+	/**
+	 * Valid file roles.
+	 *
+	 * @var array
+	 *
+	 * @link https://pear.php.net/manual/en/developers.packagedef.intro.php#developers.packagedef.roles
+	 */
+	private $validRoles = [
+		'data'   => true,
+		'doc'    => true,
+		'ext'    => true,
+		'extsrc' => true,
+		'php'    => true,
+		'script' => true,
+		'src'    => true,
+		'test'   => true,
+	];
+
+	/**
+	 * Files encountered in the package.xml <contents> tag.
+	 *
+	 * @var array
+	 */
+	private $listedContents = [];
+
+
+	/**
+	 * Constructor.
+	 */
+	public function __construct()
+	{
+		$this->projectRoot = dirname(dirname(__DIR__)).'/';
+		$this->packageXML  = simplexml_load_file($this->projectRoot.'package.xml');
+
+		$allFiles       = (new FileList($this->projectRoot, $this->projectRoot))->getList();
+		$this->allFiles = array_flip($allFiles);
+
+	}//end __construct()
+
+
+	/**
+	 * Validate the file listings in the package.xml file.
+	 *
+	 * @return void
+	 */
+	public function validate()
+	{
+		$exitCode = 0;
+		if ($this->checkContents() !== true) {
+			$exitCode = 1;
+		}
+
+		if ($this->checkPHPRelease() !== true) {
+			$exitCode = 1;
+		}
+
+		exit($exitCode);
+
+	}//end validate()
+
+
+	/**
+	 * Validate the file listings in the <contents> tag.
+	 *
+	 * @return bool
+	 */
+	protected function checkContents()
+	{
+		echo PHP_EOL.'Checking Contents tag'.PHP_EOL;
+		echo '====================='.PHP_EOL;
+
+		$valid = true;
+
+		/*
          * - Check that every file that is mentioned in the `<content>` tag exists in the repo.
          * - Check that the "role" value is valid.
          * - Check that the "baseinstalldir" value is valid.
          */
 
-        $valid = $this->walkDirTag($this->packageXML->contents);
-        if ($valid === true) {
-            echo "Existing listings in the Contents tag are valid.".PHP_EOL;
-        }
+		$valid = $this->walkDirTag($this->packageXML->contents);
+		if ($valid === true) {
+			echo "Existing listings in the Contents tag are valid.".PHP_EOL;
+		}
 
-        /*
+		/*
          * Verify that all files in the `src` and the `tests` directories are listed in the `<contents>` tag.
          */
 
-        $srcFiles   = (new FileList(
-            $this->projectRoot.'src/',
-            $this->projectRoot,
-            '`\.(css|fixed|inc|js|php|xml)$`Di'
-        ))->getList();
-        $testsFiles = (new FileList(
-            $this->projectRoot.'tests/',
-            $this->projectRoot,
-            '`\.(css|inc|js|php|xml)$`Di'
-        ))->getList();
-        $files      = array_merge($srcFiles, $testsFiles);
-
-        foreach ($files as $file) {
-            if (isset($this->listedContents[$file]) === true) {
-                continue;
-            }
-
-            echo "- File '{$file}' is missing from Contents tag.".PHP_EOL;
-            $valid = false;
-        }
-
-        if ($valid === true) {
-            echo "No missing files in the Contents tag.".PHP_EOL;
-        }
-
-        return $valid;
-
-    }//end checkContents()
-
-
-    /**
-     * Validate all child tags within a <dir> tag.
-     *
-     * @param \SimpleXMLElement $tag              The current XML tag to examine.
-     * @param string            $currentDirectory The complete relative path to the
-     *                                            directory being examined.
-     *
-     * @return bool
-     */
-    protected function walkDirTag($tag, $currentDirectory='')
-    {
-        $valid = true;
-        $name  = (string) $tag['name'];
-        if ($name !== '/' && empty($name) === false) {
-            $currentDirectory .= $name.'/';
-        }
-
-        $children = $tag->children();
-        foreach ($children as $key => $value) {
-            if ($key === 'dir') {
-                if ($this->walkDirTag($value, $currentDirectory) === false) {
-                    $valid = false;
-                }
-            }
-
-            if ($key === 'file') {
-                if ($this->checkFileTag($value, $currentDirectory) === false) {
-                    $valid = false;
-                }
-            }
-        }
-
-        return $valid;
-
-    }//end walkDirTag()
-
-
-    /**
-     * Validate the information within a <file> tag.
-     *
-     * @param \SimpleXMLElement $tag              The current XML tag to examine.
-     * @param string            $currentDirectory The complete relative path to the
-     *                                            directory being examined.
-     *
-     * @return bool
-     */
-    protected function checkFileTag($tag, $currentDirectory='')
-    {
-        $valid          = true;
-        $attributes     = $tag->attributes();
-        $baseinstalldir = (string) $attributes['baseinstalldir'];
-        $name           = $currentDirectory.(string) $attributes['name'];
-        $role           = (string) $attributes['role'];
-
-        $this->listedContents[$name] = true;
-
-        if (empty($name) === true) {
-            echo "- Name attribute missing.".PHP_EOL;
-            $valid = false;
-        } else {
-            if (isset($this->allFiles[$name]) === false) {
-                echo "- File '{$name}' does not exist.".PHP_EOL;
-                $valid = false;
-            }
-
-            if (empty($role) === true) {
-                echo "- Role attribute missing for file '{$name}'.".PHP_EOL;
-                $valid = false;
-            } else {
-                if (isset($this->validRoles[$role]) === false) {
-                    echo "- Role for file '{$name}' is invalid.".PHP_EOL;
-                    $valid = false;
-                } else {
-                    // Limited validation of the "role" tags.
-                    if (strpos($name, 'Test.') !== false && $role !== 'test') {
-                        echo "- Test files should have the role 'test'. Found: '$role' for file '{$name}'.".PHP_EOL;
-                        $valid = false;
-                    } else if ((strpos($name, 'Standard.xml') !== false || strpos($name, 'Sniff.php') !== false)
-                        && $role !== 'php'
-                    ) {
-                        echo "- Sniff files, including sniff documentation files should have the role 'php'. Found: '$role' for file '{$name}'.".PHP_EOL;
-                        $valid = false;
-                    }
-                }
-
-                if (empty($baseinstalldir) === true) {
-                    if ($role !== 'script' && strpos($name, 'tests/') !== 0) {
-                        echo "- Baseinstalldir attribute missing for file '{$name}'.".PHP_EOL;
-                        $valid = false;
-                    }
-                } else {
-                    if ($role === 'script' ||  strpos($name, 'tests/') === 0) {
-                        echo "- Baseinstalldir for file '{$name}' should be empty.".PHP_EOL;
-                        $valid = false;
-                    }
-
-                    if ($role !== 'script' && $baseinstalldir !== 'PHP/CodeSniffer') {
-                        echo "- Baseinstalldir for file '{$name}' is invalid.".PHP_EOL;
-                        $valid = false;
-                    }
-                }
-            }//end if
-        }//end if
-
-        return $valid;
-
-    }//end checkFileTag()
-
-
-    /**
-     * Validate the file listings in the <phprelease> tags.
-     *
-     * @return bool True if the info in the "phprelease" tags is valid. False otherwise.
-     */
-    protected function checkPHPRelease()
-    {
-        echo PHP_EOL.'Checking PHPRelease tags'.PHP_EOL;
-        echo '========================'.PHP_EOL;
-
-        $valid       = true;
-        $listedFiles = [];
-        $releaseTags = 1;
-
-        /*
+		$srcFiles   = (new FileList(
+			$this->projectRoot.'src/',
+			$this->projectRoot,
+			'`\.(css|fixed|inc|js|php|xml)$`Di'
+		))->getList();
+		$testsFiles = (new FileList(
+			$this->projectRoot.'tests/',
+			$this->projectRoot,
+			'`\.(css|inc|js|php|xml)$`Di'
+		))->getList();
+		$files      = array_merge($srcFiles, $testsFiles);
+
+		foreach ($files as $file) {
+			if (isset($this->listedContents[$file]) === true) {
+				continue;
+			}
+
+			echo "- File '{$file}' is missing from Contents tag.".PHP_EOL;
+			$valid = false;
+		}
+
+		if ($valid === true) {
+			echo "No missing files in the Contents tag.".PHP_EOL;
+		}
+
+		return $valid;
+
+	}//end checkContents()
+
+
+	/**
+	 * Validate all child tags within a <dir> tag.
+	 *
+	 * @param \SimpleXMLElement $tag              The current XML tag to examine.
+	 * @param string            $currentDirectory The complete relative path to the
+	 *                                            directory being examined.
+	 *
+	 * @return bool
+	 */
+	protected function walkDirTag($tag, $currentDirectory='')
+	{
+		$valid = true;
+		$name  = (string) $tag['name'];
+		if ($name !== '/' && empty($name) === false) {
+			$currentDirectory .= $name.'/';
+		}
+
+		$children = $tag->children();
+		foreach ($children as $key => $value) {
+			if ($key === 'dir') {
+				if ($this->walkDirTag($value, $currentDirectory) === false) {
+					$valid = false;
+				}
+			}
+
+			if ($key === 'file') {
+				if ($this->checkFileTag($value, $currentDirectory) === false) {
+					$valid = false;
+				}
+			}
+		}
+
+		return $valid;
+
+	}//end walkDirTag()
+
+
+	/**
+	 * Validate the information within a <file> tag.
+	 *
+	 * @param \SimpleXMLElement $tag              The current XML tag to examine.
+	 * @param string            $currentDirectory The complete relative path to the
+	 *                                            directory being examined.
+	 *
+	 * @return bool
+	 */
+	protected function checkFileTag($tag, $currentDirectory='')
+	{
+		$valid          = true;
+		$attributes     = $tag->attributes();
+		$baseinstalldir = (string) $attributes['baseinstalldir'];
+		$name           = $currentDirectory.(string) $attributes['name'];
+		$role           = (string) $attributes['role'];
+
+		$this->listedContents[$name] = true;
+
+		if (empty($name) === true) {
+			echo "- Name attribute missing.".PHP_EOL;
+			$valid = false;
+		} else {
+			if (isset($this->allFiles[$name]) === false) {
+				echo "- File '{$name}' does not exist.".PHP_EOL;
+				$valid = false;
+			}
+
+			if (empty($role) === true) {
+				echo "- Role attribute missing for file '{$name}'.".PHP_EOL;
+				$valid = false;
+			} else {
+				if (isset($this->validRoles[$role]) === false) {
+					echo "- Role for file '{$name}' is invalid.".PHP_EOL;
+					$valid = false;
+				} else {
+					// Limited validation of the "role" tags.
+					if (strpos($name, 'Test.') !== false && $role !== 'test') {
+						echo "- Test files should have the role 'test'. Found: '$role' for file '{$name}'.".PHP_EOL;
+						$valid = false;
+					} else if ((strpos($name, 'Standard.xml') !== false || strpos($name, 'Sniff.php') !== false)
+						&& $role !== 'php'
+					) {
+						echo "- Sniff files, including sniff documentation files should have the role 'php'. Found: '$role' for file '{$name}'.".PHP_EOL;
+						$valid = false;
+					}
+				}
+
+				if (empty($baseinstalldir) === true) {
+					if ($role !== 'script' && strpos($name, 'tests/') !== 0) {
+						echo "- Baseinstalldir attribute missing for file '{$name}'.".PHP_EOL;
+						$valid = false;
+					}
+				} else {
+					if ($role === 'script' ||  strpos($name, 'tests/') === 0) {
+						echo "- Baseinstalldir for file '{$name}' should be empty.".PHP_EOL;
+						$valid = false;
+					}
+
+					if ($role !== 'script' && $baseinstalldir !== 'PHP/CodeSniffer') {
+						echo "- Baseinstalldir for file '{$name}' is invalid.".PHP_EOL;
+						$valid = false;
+					}
+				}
+			}//end if
+		}//end if
+
+		return $valid;
+
+	}//end checkFileTag()
+
+
+	/**
+	 * Validate the file listings in the <phprelease> tags.
+	 *
+	 * @return bool True if the info in the "phprelease" tags is valid. False otherwise.
+	 */
+	protected function checkPHPRelease()
+	{
+		echo PHP_EOL.'Checking PHPRelease tags'.PHP_EOL;
+		echo '========================'.PHP_EOL;
+
+		$valid       = true;
+		$listedFiles = [];
+		$releaseTags = 1;
+
+		/*
          * - Check that every file that is mentioned in the `<phprelease>` tags exists in the repo.
          * - Check that the "as" value is valid.
          */
 
-        foreach ($this->packageXML->phprelease as $release) {
-            foreach ($release->filelist->install as $install) {
-                $attributes = $install->attributes();
-                $name       = (string) $attributes['name'];
-                $as         = (string) $attributes['as'];
-
-                $listedFiles[$releaseTags][$name] = $as;
-
-                if (empty($as) === true || empty($name) === true) {
-                    continue;
-                }
-
-                if (isset($this->allFiles[$name]) === false) {
-                    echo "- File '{$name}' does not exist.".PHP_EOL;
-                    $valid = false;
-                }
-
-                // Rest of the checks only apply to the test files.
-                if (strpos($name, 'tests/') !== 0) {
-                    continue;
-                }
-
-                // Check validity of the tags for files in the tests root directory.
-                if (preg_match('`^tests/([^/]+\.php)$`', $name, $matches) === 1
-                    && ($as === $name || $as === $matches[1])
-                ) {
-                    continue;
-                }
-
-                // Check validity of the tags for files in the tests root subdirectories.
-                if (preg_match('`^tests/.+\.(php|inc|js|css|xml)$`', $name) === 1
-                    && $as === str_replace('tests/', 'CodeSniffer/', $name)
-                ) {
-                    continue;
-                }
-
-                echo "- Invalid 'as' attribute '{$as}' for test file '{$name}'.".PHP_EOL;
-                $valid = false;
-            }//end foreach
-
-            ++$releaseTags;
-        }//end foreach
-
-        if ($valid === true) {
-            echo "Existing PHPRelease tags are valid.".PHP_EOL;
-        }
-
-        /*
+		foreach ($this->packageXML->phprelease as $release) {
+			foreach ($release->filelist->install as $install) {
+				$attributes = $install->attributes();
+				$name       = (string) $attributes['name'];
+				$as         = (string) $attributes['as'];
+
+				$listedFiles[$releaseTags][$name] = $as;
+
+				if (empty($as) === true || empty($name) === true) {
+					continue;
+				}
+
+				if (isset($this->allFiles[$name]) === false) {
+					echo "- File '{$name}' does not exist.".PHP_EOL;
+					$valid = false;
+				}
+
+				// Rest of the checks only apply to the test files.
+				if (strpos($name, 'tests/') !== 0) {
+					continue;
+				}
+
+				// Check validity of the tags for files in the tests root directory.
+				if (preg_match('`^tests/([^/]+\.php)$`', $name, $matches) === 1
+					&& ($as === $name || $as === $matches[1])
+				) {
+					continue;
+				}
+
+				// Check validity of the tags for files in the tests root subdirectories.
+				if (preg_match('`^tests/.+\.(php|inc|js|css|xml)$`', $name) === 1
+					&& $as === str_replace('tests/', 'CodeSniffer/', $name)
+				) {
+					continue;
+				}
+
+				echo "- Invalid 'as' attribute '{$as}' for test file '{$name}'.".PHP_EOL;
+				$valid = false;
+			}//end foreach
+
+			++$releaseTags;
+		}//end foreach
+
+		if ($valid === true) {
+			echo "Existing PHPRelease tags are valid.".PHP_EOL;
+		}
+
+		/*
          * Verify that all files in the `tests` directory are listed in both `<phprelease>` tags.
          */
 
-        $testFiles = (new FileList($this->projectRoot.'tests/', $this->projectRoot, '`\.(inc|php|js|css|xml)$`Di'))->getList();
+		$testFiles = (new FileList($this->projectRoot.'tests/', $this->projectRoot, '`\.(inc|php|js|css|xml)$`Di'))->getList();
 
-        foreach ($testFiles as $file) {
-            foreach ($listedFiles as $key => $listed) {
-                if (isset($listed[$file]) === true) {
-                    continue;
-                }
+		foreach ($testFiles as $file) {
+			foreach ($listedFiles as $key => $listed) {
+				if (isset($listed[$file]) === true) {
+					continue;
+				}
 
-                echo "- File '{$file}' is missing from PHPRelease tag [{$key}] .".PHP_EOL;
-                $valid = false;
-            }
-        }
+				echo "- File '{$file}' is missing from PHPRelease tag [{$key}] .".PHP_EOL;
+				$valid = false;
+			}
+		}
 
-        if ($valid === true) {
-            echo "No missing PHPRelease tags.".PHP_EOL;
-        }
+		if ($valid === true) {
+			echo "No missing PHPRelease tags.".PHP_EOL;
+		}
 
-        return $valid;
+		return $valid;
 
-    }//end checkPHPRelease()
+	}//end checkPHPRelease()
 
 
 }//end class

Spacing +85 added lines, -85 removed lines

@@ -36,7 +36,7 @@ 
      *
      * @var array
      */
-    protected $allFiles = [];
+    protected $allFiles = [ ];
 
     /**
      * Valid file roles.
@@ -61,7 +61,7 @@ 
      *
      * @var array
      */
-    private $listedContents = [];
+    private $listedContents = [ ];
 
 
     /**
@@ -69,11 +69,11 @@ 
      */
     public function __construct()
     {
-        $this->projectRoot = dirname(dirname(__DIR__)).'/';
-        $this->packageXML  = simplexml_load_file($this->projectRoot.'package.xml');
+        $this->projectRoot = dirname( dirname( __DIR__ ) ) . '/';
+        $this->packageXML  = simplexml_load_file( $this->projectRoot . 'package.xml' );
 
-        $allFiles       = (new FileList($this->projectRoot, $this->projectRoot))->getList();
-        $this->allFiles = array_flip($allFiles);
+        $allFiles       = ( new FileList( $this->projectRoot, $this->projectRoot ) )->getList();
+        $this->allFiles = array_flip( $allFiles );
 
     }//end __construct()
 
@@ -86,15 +86,15 @@ 
     public function validate()
     {
         $exitCode = 0;
-        if ($this->checkContents() !== true) {
+        if ( $this->checkContents() !== true ) {
             $exitCode = 1;
         }
 
-        if ($this->checkPHPRelease() !== true) {
+        if ( $this->checkPHPRelease() !== true ) {
             $exitCode = 1;
         }
 
-        exit($exitCode);
+        exit( $exitCode );
 
     }//end validate()
 
@@ -106,8 +106,8 @@ 
      */
     protected function checkContents()
     {
-        echo PHP_EOL.'Checking Contents tag'.PHP_EOL;
-        echo '====================='.PHP_EOL;
+        echo PHP_EOL . 'Checking Contents tag' . PHP_EOL;
+        echo '=====================' . PHP_EOL;
 
         $valid = true;
 
@@ -117,38 +117,38 @@ 
          * - Check that the "baseinstalldir" value is valid.
          */
 
-        $valid = $this->walkDirTag($this->packageXML->contents);
-        if ($valid === true) {
-            echo "Existing listings in the Contents tag are valid.".PHP_EOL;
+        $valid = $this->walkDirTag( $this->packageXML->contents );
+        if ( $valid === true ) {
+            echo "Existing listings in the Contents tag are valid." . PHP_EOL;
         }
 
         /*
          * Verify that all files in the `src` and the `tests` directories are listed in the `<contents>` tag.
          */
 
-        $srcFiles   = (new FileList(
-            $this->projectRoot.'src/',
+        $srcFiles = ( new FileList(
+            $this->projectRoot . 'src/',
             $this->projectRoot,
             '`\.(css|fixed|inc|js|php|xml)$`Di'
-        ))->getList();
-        $testsFiles = (new FileList(
-            $this->projectRoot.'tests/',
+        ) )->getList();
+        $testsFiles = ( new FileList(
+            $this->projectRoot . 'tests/',
             $this->projectRoot,
             '`\.(css|inc|js|php|xml)$`Di'
-        ))->getList();
-        $files      = array_merge($srcFiles, $testsFiles);
+        ) )->getList();
+        $files = array_merge( $srcFiles, $testsFiles );
 
-        foreach ($files as $file) {
-            if (isset($this->listedContents[$file]) === true) {
+        foreach ( $files as $file ) {
+            if ( isset( $this->listedContents[ $file ] ) === true ) {
                 continue;
             }
 
-            echo "- File '{$file}' is missing from Contents tag.".PHP_EOL;
+            echo "- File '{$file}' is missing from Contents tag." . PHP_EOL;
             $valid = false;
         }
 
-        if ($valid === true) {
-            echo "No missing files in the Contents tag.".PHP_EOL;
+        if ( $valid === true ) {
+            echo "No missing files in the Contents tag." . PHP_EOL;
         }
 
         return $valid;
@@ -165,24 +165,24 @@ 
      *
      * @return bool
      */
-    protected function walkDirTag($tag, $currentDirectory='')
+    protected function walkDirTag( $tag, $currentDirectory = '' )
     {
         $valid = true;
-        $name  = (string) $tag['name'];
-        if ($name !== '/' && empty($name) === false) {
-            $currentDirectory .= $name.'/';
+        $name  = (string)$tag[ 'name' ];
+        if ( $name !== '/' && empty( $name ) === false ) {
+            $currentDirectory .= $name . '/';
         }
 
         $children = $tag->children();
-        foreach ($children as $key => $value) {
-            if ($key === 'dir') {
-                if ($this->walkDirTag($value, $currentDirectory) === false) {
+        foreach ( $children as $key => $value ) {
+            if ( $key === 'dir' ) {
+                if ( $this->walkDirTag( $value, $currentDirectory ) === false ) {
                     $valid = false;
                 }
             }
 
-            if ($key === 'file') {
-                if ($this->checkFileTag($value, $currentDirectory) === false) {
+            if ( $key === 'file' ) {
+                if ( $this->checkFileTag( $value, $currentDirectory ) === false ) {
                     $valid = false;
                 }
             }
@@ -202,58 +202,58 @@ 
      *
      * @return bool
      */
-    protected function checkFileTag($tag, $currentDirectory='')
+    protected function checkFileTag( $tag, $currentDirectory = '' )
     {
         $valid          = true;
         $attributes     = $tag->attributes();
-        $baseinstalldir = (string) $attributes['baseinstalldir'];
-        $name           = $currentDirectory.(string) $attributes['name'];
-        $role           = (string) $attributes['role'];
+        $baseinstalldir = (string)$attributes[ 'baseinstalldir' ];
+        $name           = $currentDirectory . (string)$attributes[ 'name' ];
+        $role           = (string)$attributes[ 'role' ];
 
-        $this->listedContents[$name] = true;
+        $this->listedContents[ $name ] = true;
 
-        if (empty($name) === true) {
-            echo "- Name attribute missing.".PHP_EOL;
+        if ( empty( $name ) === true ) {
+            echo "- Name attribute missing." . PHP_EOL;
             $valid = false;
         } else {
-            if (isset($this->allFiles[$name]) === false) {
-                echo "- File '{$name}' does not exist.".PHP_EOL;
+            if ( isset( $this->allFiles[ $name ] ) === false ) {
+                echo "- File '{$name}' does not exist." . PHP_EOL;
                 $valid = false;
             }
 
-            if (empty($role) === true) {
-                echo "- Role attribute missing for file '{$name}'.".PHP_EOL;
+            if ( empty( $role ) === true ) {
+                echo "- Role attribute missing for file '{$name}'." . PHP_EOL;
                 $valid = false;
             } else {
-                if (isset($this->validRoles[$role]) === false) {
-                    echo "- Role for file '{$name}' is invalid.".PHP_EOL;
+                if ( isset( $this->validRoles[ $role ] ) === false ) {
+                    echo "- Role for file '{$name}' is invalid." . PHP_EOL;
                     $valid = false;
                 } else {
                     // Limited validation of the "role" tags.
-                    if (strpos($name, 'Test.') !== false && $role !== 'test') {
-                        echo "- Test files should have the role 'test'. Found: '$role' for file '{$name}'.".PHP_EOL;
+                    if ( strpos( $name, 'Test.' ) !== false && $role !== 'test' ) {
+                        echo "- Test files should have the role 'test'. Found: '$role' for file '{$name}'." . PHP_EOL;
                         $valid = false;
-                    } else if ((strpos($name, 'Standard.xml') !== false || strpos($name, 'Sniff.php') !== false)
+                    } else if ( ( strpos( $name, 'Standard.xml' ) !== false || strpos( $name, 'Sniff.php' ) !== false )
                         && $role !== 'php'
                     ) {
-                        echo "- Sniff files, including sniff documentation files should have the role 'php'. Found: '$role' for file '{$name}'.".PHP_EOL;
+                        echo "- Sniff files, including sniff documentation files should have the role 'php'. Found: '$role' for file '{$name}'." . PHP_EOL;
                         $valid = false;
                     }
                 }
 
-                if (empty($baseinstalldir) === true) {
-                    if ($role !== 'script' && strpos($name, 'tests/') !== 0) {
-                        echo "- Baseinstalldir attribute missing for file '{$name}'.".PHP_EOL;
+                if ( empty( $baseinstalldir ) === true ) {
+                    if ( $role !== 'script' && strpos( $name, 'tests/' ) !== 0 ) {
+                        echo "- Baseinstalldir attribute missing for file '{$name}'." . PHP_EOL;
                         $valid = false;
                     }
                 } else {
-                    if ($role === 'script' ||  strpos($name, 'tests/') === 0) {
-                        echo "- Baseinstalldir for file '{$name}' should be empty.".PHP_EOL;
+                    if ( $role === 'script' || strpos( $name, 'tests/' ) === 0 ) {
+                        echo "- Baseinstalldir for file '{$name}' should be empty." . PHP_EOL;
                         $valid = false;
                     }
 
-                    if ($role !== 'script' && $baseinstalldir !== 'PHP/CodeSniffer') {
-                        echo "- Baseinstalldir for file '{$name}' is invalid.".PHP_EOL;
+                    if ( $role !== 'script' && $baseinstalldir !== 'PHP/CodeSniffer' ) {
+                        echo "- Baseinstalldir for file '{$name}' is invalid." . PHP_EOL;
                         $valid = false;
                     }
                 }
@@ -272,11 +272,11 @@ 
      */
     protected function checkPHPRelease()
     {
-        echo PHP_EOL.'Checking PHPRelease tags'.PHP_EOL;
-        echo '========================'.PHP_EOL;
+        echo PHP_EOL . 'Checking PHPRelease tags' . PHP_EOL;
+        echo '========================' . PHP_EOL;
 
         $valid       = true;
-        $listedFiles = [];
+        $listedFiles = [ ];
         $releaseTags = 1;
 
         /*
@@ -284,72 +284,72 @@ 
          * - Check that the "as" value is valid.
          */
 
-        foreach ($this->packageXML->phprelease as $release) {
-            foreach ($release->filelist->install as $install) {
+        foreach ( $this->packageXML->phprelease as $release ) {
+            foreach ( $release->filelist->install as $install ) {
                 $attributes = $install->attributes();
-                $name       = (string) $attributes['name'];
-                $as         = (string) $attributes['as'];
+                $name       = (string)$attributes[ 'name' ];
+                $as         = (string)$attributes[ 'as' ];
 
-                $listedFiles[$releaseTags][$name] = $as;
+                $listedFiles[ $releaseTags ][ $name ] = $as;
 
-                if (empty($as) === true || empty($name) === true) {
+                if ( empty( $as ) === true || empty( $name ) === true ) {
                     continue;
                 }
 
-                if (isset($this->allFiles[$name]) === false) {
-                    echo "- File '{$name}' does not exist.".PHP_EOL;
+                if ( isset( $this->allFiles[ $name ] ) === false ) {
+                    echo "- File '{$name}' does not exist." . PHP_EOL;
                     $valid = false;
                 }
 
                 // Rest of the checks only apply to the test files.
-                if (strpos($name, 'tests/') !== 0) {
+                if ( strpos( $name, 'tests/' ) !== 0 ) {
                     continue;
                 }
 
                 // Check validity of the tags for files in the tests root directory.
-                if (preg_match('`^tests/([^/]+\.php)$`', $name, $matches) === 1
-                    && ($as === $name || $as === $matches[1])
+                if ( preg_match( '`^tests/([^/]+\.php)$`', $name, $matches ) === 1
+                    && ( $as === $name || $as === $matches[ 1 ] )
                 ) {
                     continue;
                 }
 
                 // Check validity of the tags for files in the tests root subdirectories.
-                if (preg_match('`^tests/.+\.(php|inc|js|css|xml)$`', $name) === 1
-                    && $as === str_replace('tests/', 'CodeSniffer/', $name)
+                if ( preg_match( '`^tests/.+\.(php|inc|js|css|xml)$`', $name ) === 1
+                    && $as === str_replace( 'tests/', 'CodeSniffer/', $name )
                 ) {
                     continue;
                 }
 
-                echo "- Invalid 'as' attribute '{$as}' for test file '{$name}'.".PHP_EOL;
+                echo "- Invalid 'as' attribute '{$as}' for test file '{$name}'." . PHP_EOL;
                 $valid = false;
             }//end foreach
 
             ++$releaseTags;
         }//end foreach
 
-        if ($valid === true) {
-            echo "Existing PHPRelease tags are valid.".PHP_EOL;
+        if ( $valid === true ) {
+            echo "Existing PHPRelease tags are valid." . PHP_EOL;
         }
 
         /*
          * Verify that all files in the `tests` directory are listed in both `<phprelease>` tags.
          */
 
-        $testFiles = (new FileList($this->projectRoot.'tests/', $this->projectRoot, '`\.(inc|php|js|css|xml)$`Di'))->getList();
+        $testFiles = ( new FileList( $this->projectRoot . 'tests/', $this->projectRoot, '`\.(inc|php|js|css|xml)$`Di' ) )->getList();
 
-        foreach ($testFiles as $file) {
-            foreach ($listedFiles as $key => $listed) {
-                if (isset($listed[$file]) === true) {
+        foreach ( $testFiles as $file ) {
+            foreach ( $listedFiles as $key => $listed ) {
+                if ( isset( $listed[ $file ] ) === true ) {
                     continue;
                 }
 
-                echo "- File '{$file}' is missing from PHPRelease tag [{$key}] .".PHP_EOL;
+                echo "- File '{$file}' is missing from PHPRelease tag [{$key}] ." . PHP_EOL;
                 $valid = false;
             }
         }
 
-        if ($valid === true) {
-            echo "No missing PHPRelease tags.".PHP_EOL;
+        if ( $valid === true ) {
+            echo "No missing PHPRelease tags." . PHP_EOL;
         }
 
         return $valid;

Braces +7 added lines, -14 removed lines

@@ -14,8 +14,7 @@ 
 /**
  * Validate the PHP_CodeSniffer PEAR package.xml file.
  */
-class ValidatePEARPackageXML
-{
+class ValidatePEARPackageXML {
 
     /**
      * The root directory of the project.
@@ -67,8 +66,7 @@ 
     /**
      * Constructor.
      */
-    public function __construct()
-    {
+    public function __construct() {
         $this->projectRoot = dirname(dirname(__DIR__)).'/';
         $this->packageXML  = simplexml_load_file($this->projectRoot.'package.xml');
 
@@ -83,8 +81,7 @@ 
      *
      * @return void
      */
-    public function validate()
-    {
+    public function validate() {
         $exitCode = 0;
         if ($this->checkContents() !== true) {
             $exitCode = 1;
@@ -104,8 +101,7 @@ 
      *
      * @return bool
      */
-    protected function checkContents()
-    {
+    protected function checkContents() {
         echo PHP_EOL.'Checking Contents tag'.PHP_EOL;
         echo '====================='.PHP_EOL;
 
@@ -165,8 +161,7 @@ 
      *
      * @return bool
      */
-    protected function walkDirTag($tag, $currentDirectory='')
-    {
+    protected function walkDirTag($tag, $currentDirectory='') {
         $valid = true;
         $name  = (string) $tag['name'];
         if ($name !== '/' && empty($name) === false) {
@@ -202,8 +197,7 @@ 
      *
      * @return bool
      */
-    protected function checkFileTag($tag, $currentDirectory='')
-    {
+    protected function checkFileTag($tag, $currentDirectory='') {
         $valid          = true;
         $attributes     = $tag->attributes();
         $baseinstalldir = (string) $attributes['baseinstalldir'];
@@ -270,8 +264,7 @@ 
      *
      * @return bool True if the info in the "phprelease" tags is valid. False otherwise.
      */
-    protected function checkPHPRelease()
-    {
+    protected function checkPHPRelease() {
         echo PHP_EOL.'Checking PHPRelease tags'.PHP_EOL;
         echo '========================'.PHP_EOL;
 

vendor/squizlabs/php_codesniffer/scripts/ValidatePEAR/FileList.php

Indentation +77 added lines, -77 removed lines

@@ -17,83 +17,83 @@
 class FileList
 {
 
-    /**
-     * The path to the project root directory.
-     *
-     * @var string
-     */
-    protected $rootPath;
-
-    /**
-     * Recursive directory iterator.
-     *
-     * @var \DirectoryIterator
-     */
-    protected $fileIterator;
-
-    /**
-     * Base regex to use if no filter regex is provided.
-     *
-     * Matches based on:
-     * - File path starts with the project root (replacement done in constructor).
-     * - Don't match .git/ files.
-     * - Don't match dot files, i.e. "." or "..".
-     * - Don't match backup files.
-     * - Match everything else in a case-insensitive manner.
-     *
-     * @var string
-     */
-    private $baseRegex = '`^%s(?!\.git/)(?!(.*/)?\.+$)(?!.*\.(bak|orig)).*$`Dix';
-
-
-    /**
-     * Constructor.
-     *
-     * @param string $directory The directory to examine.
-     * @param string $rootPath  Path to the project root.
-     * @param string $filter    PCRE regular expression to filter the file list with.
-     */
-    public function __construct($directory, $rootPath='', $filter='')
-    {
-        $this->rootPath = $rootPath;
-
-        $directory = new \RecursiveDirectoryIterator(
-            $directory,
-            \RecursiveDirectoryIterator::UNIX_PATHS
-        );
-        $flattened = new \RecursiveIteratorIterator(
-            $directory,
-            \RecursiveIteratorIterator::LEAVES_ONLY,
-            \RecursiveIteratorIterator::CATCH_GET_CHILD
-        );
-
-        if ($filter === '') {
-            $filter = sprintf($this->baseRegex, preg_quote($this->rootPath));
-        }
-
-        $this->fileIterator = new \RegexIterator($flattened, $filter);
-
-        return $this;
-
-    }//end __construct()
-
-
-    /**
-     * Retrieve the filtered file list as an array.
-     *
-     * @return array
-     */
-    public function getList()
-    {
-        $fileList = [];
-
-        foreach ($this->fileIterator as $file) {
-            $fileList[] = str_replace($this->rootPath, '', $file);
-        }
-
-        return $fileList;
-
-    }//end getList()
+	/**
+	 * The path to the project root directory.
+	 *
+	 * @var string
+	 */
+	protected $rootPath;
+
+	/**
+	 * Recursive directory iterator.
+	 *
+	 * @var \DirectoryIterator
+	 */
+	protected $fileIterator;
+
+	/**
+	 * Base regex to use if no filter regex is provided.
+	 *
+	 * Matches based on:
+	 * - File path starts with the project root (replacement done in constructor).
+	 * - Don't match .git/ files.
+	 * - Don't match dot files, i.e. "." or "..".
+	 * - Don't match backup files.
+	 * - Match everything else in a case-insensitive manner.
+	 *
+	 * @var string
+	 */
+	private $baseRegex = '`^%s(?!\.git/)(?!(.*/)?\.+$)(?!.*\.(bak|orig)).*$`Dix';
+
+
+	/**
+	 * Constructor.
+	 *
+	 * @param string $directory The directory to examine.
+	 * @param string $rootPath  Path to the project root.
+	 * @param string $filter    PCRE regular expression to filter the file list with.
+	 */
+	public function __construct($directory, $rootPath='', $filter='')
+	{
+		$this->rootPath = $rootPath;
+
+		$directory = new \RecursiveDirectoryIterator(
+			$directory,
+			\RecursiveDirectoryIterator::UNIX_PATHS
+		);
+		$flattened = new \RecursiveIteratorIterator(
+			$directory,
+			\RecursiveIteratorIterator::LEAVES_ONLY,
+			\RecursiveIteratorIterator::CATCH_GET_CHILD
+		);
+
+		if ($filter === '') {
+			$filter = sprintf($this->baseRegex, preg_quote($this->rootPath));
+		}
+
+		$this->fileIterator = new \RegexIterator($flattened, $filter);
+
+		return $this;
+
+	}//end __construct()
+
+
+	/**
+	 * Retrieve the filtered file list as an array.
+	 *
+	 * @return array
+	 */
+	public function getList()
+	{
+		$fileList = [];
+
+		foreach ($this->fileIterator as $file) {
+			$fileList[] = str_replace($this->rootPath, '', $file);
+		}
+
+		return $fileList;
+
+	}//end getList()
 
 
 }//end class

Spacing +7 added lines, -7 removed lines

@@ -53,7 +53,7 @@ 
      * @param string $rootPath  Path to the project root.
      * @param string $filter    PCRE regular expression to filter the file list with.
      */
-    public function __construct($directory, $rootPath='', $filter='')
+    public function __construct( $directory, $rootPath = '', $filter = '' )
     {
         $this->rootPath = $rootPath;
 
@@ -67,11 +67,11 @@ 
             \RecursiveIteratorIterator::CATCH_GET_CHILD
         );
 
-        if ($filter === '') {
-            $filter = sprintf($this->baseRegex, preg_quote($this->rootPath));
+        if ( $filter === '' ) {
+            $filter = sprintf( $this->baseRegex, preg_quote( $this->rootPath ) );
         }
 
-        $this->fileIterator = new \RegexIterator($flattened, $filter);
+        $this->fileIterator = new \RegexIterator( $flattened, $filter );
 
         return $this;
 
@@ -85,10 +85,10 @@ 
      */
     public function getList()
     {
-        $fileList = [];
+        $fileList = [ ];
 
-        foreach ($this->fileIterator as $file) {
-            $fileList[] = str_replace($this->rootPath, '', $file);
+        foreach ( $this->fileIterator as $file ) {
+            $fileList[ ] = str_replace( $this->rootPath, '', $file );
         }
 
         return $fileList;

Braces +3 added lines, -6 removed lines

@@ -14,8 +14,7 @@ 
 /**
  * Class to create a file list with filtering.
  */
-class FileList
-{
+class FileList {
 
     /**
      * The path to the project root directory.
@@ -53,8 +52,7 @@ 
      * @param string $rootPath  Path to the project root.
      * @param string $filter    PCRE regular expression to filter the file list with.
      */
-    public function __construct($directory, $rootPath='', $filter='')
-    {
+    public function __construct($directory, $rootPath='', $filter='') {
         $this->rootPath = $rootPath;
 
         $directory = new \RecursiveDirectoryIterator(
@@ -83,8 +81,7 @@ 
      *
      * @return array
      */
-    public function getList()
-    {
+    public function getList() {
         $fileList = [];
 
         foreach ($this->fileIterator as $file) {

vendor/squizlabs/php_codesniffer/scripts/build-phar.php

Indentation +50 added lines, -50 removed lines

@@ -17,80 +17,80 @@
 error_reporting(E_ALL | E_STRICT);
 
 if (ini_get('phar.readonly') === '1') {
-    echo 'Unable to build, phar.readonly in php.ini is set to read only.'.PHP_EOL;
-    exit(1);
+	echo 'Unable to build, phar.readonly in php.ini is set to read only.'.PHP_EOL;
+	exit(1);
 }
 
 $scripts = [
-    'phpcs',
-    'phpcbf',
+	'phpcs',
+	'phpcbf',
 ];
 
 foreach ($scripts as $script) {
-    echo "Building $script phar".PHP_EOL;
+	echo "Building $script phar".PHP_EOL;
 
-    $pharName = $script.'.phar';
-    $pharFile = getcwd().'/'.$pharName;
-    echo "\t=> $pharFile".PHP_EOL;
-    if (file_exists($pharFile) === true) {
-        echo "\t** file exists, removing **".PHP_EOL;
-        unlink($pharFile);
-    }
+	$pharName = $script.'.phar';
+	$pharFile = getcwd().'/'.$pharName;
+	echo "\t=> $pharFile".PHP_EOL;
+	if (file_exists($pharFile) === true) {
+		echo "\t** file exists, removing **".PHP_EOL;
+		unlink($pharFile);
+	}
 
-    $phar = new Phar($pharFile, 0, $pharName);
+	$phar = new Phar($pharFile, 0, $pharName);
 
-    /*
+	/*
         Add the files.
     */
 
-    echo "\t=> adding files... ";
+	echo "\t=> adding files... ";
 
-    $srcDir    = realpath(__DIR__.'/../src');
-    $srcDirLen = strlen($srcDir);
+	$srcDir    = realpath(__DIR__.'/../src');
+	$srcDirLen = strlen($srcDir);
 
-    $rdi = new \RecursiveDirectoryIterator($srcDir, \RecursiveDirectoryIterator::FOLLOW_SYMLINKS);
-    $di  = new \RecursiveIteratorIterator($rdi, 0, \RecursiveIteratorIterator::CATCH_GET_CHILD);
+	$rdi = new \RecursiveDirectoryIterator($srcDir, \RecursiveDirectoryIterator::FOLLOW_SYMLINKS);
+	$di  = new \RecursiveIteratorIterator($rdi, 0, \RecursiveIteratorIterator::CATCH_GET_CHILD);
 
-    foreach ($di as $file) {
-        $filename = $file->getFilename();
+	foreach ($di as $file) {
+		$filename = $file->getFilename();
 
-        // Skip hidden files.
-        if (substr($filename, 0, 1) === '.') {
-            continue;
-        }
+		// Skip hidden files.
+		if (substr($filename, 0, 1) === '.') {
+			continue;
+		}
 
-        $fullpath = $file->getPathname();
-        if (strpos($fullpath, '/Tests/') !== false) {
-            continue;
-        }
+		$fullpath = $file->getPathname();
+		if (strpos($fullpath, '/Tests/') !== false) {
+			continue;
+		}
 
-        $path = 'src'.substr($fullpath, $srcDirLen);
+		$path = 'src'.substr($fullpath, $srcDirLen);
 
-        $phar->addFromString($path, php_strip_whitespace($fullpath));
-    }
+		$phar->addFromString($path, php_strip_whitespace($fullpath));
+	}
 
-    // Add autoloader.
-    $phar->addFromString('autoload.php', php_strip_whitespace(realpath(__DIR__.'/../autoload.php')));
+	// Add autoloader.
+	$phar->addFromString('autoload.php', php_strip_whitespace(realpath(__DIR__.'/../autoload.php')));
 
-    // Add licence file.
-    $phar->addFromString('licence.txt', php_strip_whitespace(realpath(__DIR__.'/../licence.txt')));
+	// Add licence file.
+	$phar->addFromString('licence.txt', php_strip_whitespace(realpath(__DIR__.'/../licence.txt')));
 
-    echo 'done'.PHP_EOL;
+	echo 'done'.PHP_EOL;
 
-    /*
+	/*
         Add the stub.
     */
 
-    echo "\t=> adding stub... ";
-    $stub  = '#!/usr/bin/env php'."\n";
-    $stub .= '<?php'."\n";
-    $stub .= 'Phar::mapPhar(\''.$pharName.'\');'."\n";
-    $stub .= 'require_once "phar://'.$pharName.'/autoload.php";'."\n";
-    $stub .= '$runner = new PHP_CodeSniffer\Runner();'."\n";
-    $stub .= '$exitCode = $runner->run'.$script.'();'."\n";
-    $stub .= 'exit($exitCode);'."\n";
-    $stub .= '__HALT_COMPILER();';
-    $phar->setStub($stub);
-
-    echo 'done'.PHP_EOL;
+	echo "\t=> adding stub... ";
+	$stub  = '#!/usr/bin/env php'."\n";
+	$stub .= '<?php'."\n";
+	$stub .= 'Phar::mapPhar(\''.$pharName.'\');'."\n";
+	$stub .= 'require_once "phar://'.$pharName.'/autoload.php";'."\n";
+	$stub .= '$runner = new PHP_CodeSniffer\Runner();'."\n";
+	$stub .= '$exitCode = $runner->run'.$script.'();'."\n";
+	$stub .= 'exit($exitCode);'."\n";
+	$stub .= '__HALT_COMPILER();';
+	$phar->setStub($stub);
+
+	echo 'done'.PHP_EOL;
 }//end foreach

Spacing +34 added lines, -34 removed lines

@@ -14,11 +14,11 @@ 
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
 
-error_reporting(E_ALL | E_STRICT);
+error_reporting( E_ALL | E_STRICT );
 
-if (ini_get('phar.readonly') === '1') {
-    echo 'Unable to build, phar.readonly in php.ini is set to read only.'.PHP_EOL;
-    exit(1);
+if ( ini_get( 'phar.readonly' ) === '1' ) {
+    echo 'Unable to build, phar.readonly in php.ini is set to read only.' . PHP_EOL;
+    exit( 1 );
 }
 
 $scripts = [
@@ -26,18 +26,18 @@ 
     'phpcbf',
 ];
 
-foreach ($scripts as $script) {
-    echo "Building $script phar".PHP_EOL;
+foreach ( $scripts as $script ) {
+    echo "Building $script phar" . PHP_EOL;
 
-    $pharName = $script.'.phar';
-    $pharFile = getcwd().'/'.$pharName;
-    echo "\t=> $pharFile".PHP_EOL;
-    if (file_exists($pharFile) === true) {
-        echo "\t** file exists, removing **".PHP_EOL;
-        unlink($pharFile);
+    $pharName = $script . '.phar';
+    $pharFile = getcwd() . '/' . $pharName;
+    echo "\t=> $pharFile" . PHP_EOL;
+    if ( file_exists( $pharFile ) === true ) {
+        echo "\t** file exists, removing **" . PHP_EOL;
+        unlink( $pharFile );
     }
 
-    $phar = new Phar($pharFile, 0, $pharName);
+    $phar = new Phar( $pharFile, 0, $pharName );
 
     /*
         Add the files.
@@ -45,52 +45,52 @@ 
 
     echo "\t=> adding files... ";
 
-    $srcDir    = realpath(__DIR__.'/../src');
-    $srcDirLen = strlen($srcDir);
+    $srcDir    = realpath( __DIR__ . '/../src' );
+    $srcDirLen = strlen( $srcDir );
 
-    $rdi = new \RecursiveDirectoryIterator($srcDir, \RecursiveDirectoryIterator::FOLLOW_SYMLINKS);
-    $di  = new \RecursiveIteratorIterator($rdi, 0, \RecursiveIteratorIterator::CATCH_GET_CHILD);
+    $rdi = new \RecursiveDirectoryIterator( $srcDir, \RecursiveDirectoryIterator::FOLLOW_SYMLINKS );
+    $di  = new \RecursiveIteratorIterator( $rdi, 0, \RecursiveIteratorIterator::CATCH_GET_CHILD );
 
-    foreach ($di as $file) {
+    foreach ( $di as $file ) {
         $filename = $file->getFilename();
 
         // Skip hidden files.
-        if (substr($filename, 0, 1) === '.') {
+        if ( substr( $filename, 0, 1 ) === '.' ) {
             continue;
         }
 
         $fullpath = $file->getPathname();
-        if (strpos($fullpath, '/Tests/') !== false) {
+        if ( strpos( $fullpath, '/Tests/' ) !== false ) {
             continue;
         }
 
-        $path = 'src'.substr($fullpath, $srcDirLen);
+        $path = 'src' . substr( $fullpath, $srcDirLen );
 
-        $phar->addFromString($path, php_strip_whitespace($fullpath));
+        $phar->addFromString( $path, php_strip_whitespace( $fullpath ) );
     }
 
     // Add autoloader.
-    $phar->addFromString('autoload.php', php_strip_whitespace(realpath(__DIR__.'/../autoload.php')));
+    $phar->addFromString( 'autoload.php', php_strip_whitespace( realpath( __DIR__ . '/../autoload.php' ) ) );
 
     // Add licence file.
-    $phar->addFromString('licence.txt', php_strip_whitespace(realpath(__DIR__.'/../licence.txt')));
+    $phar->addFromString( 'licence.txt', php_strip_whitespace( realpath( __DIR__ . '/../licence.txt' ) ) );
 
-    echo 'done'.PHP_EOL;
+    echo 'done' . PHP_EOL;
 
     /*
         Add the stub.
     */
 
     echo "\t=> adding stub... ";
-    $stub  = '#!/usr/bin/env php'."\n";
-    $stub .= '<?php'."\n";
-    $stub .= 'Phar::mapPhar(\''.$pharName.'\');'."\n";
-    $stub .= 'require_once "phar://'.$pharName.'/autoload.php";'."\n";
-    $stub .= '$runner = new PHP_CodeSniffer\Runner();'."\n";
-    $stub .= '$exitCode = $runner->run'.$script.'();'."\n";
-    $stub .= 'exit($exitCode);'."\n";
+    $stub  = '#!/usr/bin/env php' . "\n";
+    $stub .= '<?php' . "\n";
+    $stub .= 'Phar::mapPhar(\'' . $pharName . '\');' . "\n";
+    $stub .= 'require_once "phar://' . $pharName . '/autoload.php";' . "\n";
+    $stub .= '$runner = new PHP_CodeSniffer\Runner();' . "\n";
+    $stub .= '$exitCode = $runner->run' . $script . '();' . "\n";
+    $stub .= 'exit($exitCode);' . "\n";
     $stub .= '__HALT_COMPILER();';
-    $phar->setStub($stub);
+    $phar->setStub( $stub );
 
-    echo 'done'.PHP_EOL;
+    echo 'done' . PHP_EOL;
 }//end foreach

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

@@ -27,7 +27,7 @@
 ];
 
 foreach ($scripts as $script) {
-    echo "Building $script phar".PHP_EOL;
+    echo "building $script phar".PHP_EOL;
 
     $pharName = $script.'.phar';
     $pharFile = getcwd().'/'.$pharName;

vendor/squizlabs/php_codesniffer/scripts/validate-pear-package.php

Spacing +2 added lines, -2 removed lines

@@ -12,8 +12,8 @@
  * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-require_once __DIR__.'/ValidatePEAR/FileList.php';
-require_once __DIR__.'/ValidatePEAR/ValidatePEARPackageXML.php';
+require_once __DIR__ . '/ValidatePEAR/FileList.php';
+require_once __DIR__ . '/ValidatePEAR/ValidatePEARPackageXML.php';
 
 $validate = new ValidatePEARPackageXML();
 $validate->validate();

vendor/squizlabs/php_codesniffer/src/Filters/Filter.php

Indentation +250 added lines, -250 removed lines

@@ -15,256 +15,256 @@
 
 class Filter extends \RecursiveFilterIterator
 {
-    /**
-     * The top-level path we are filtering.
-     *
-     * @var string
-     */
-    protected $basedir = null;
-
-    /**
-     * The config data for the run.
-     *
-     * @var \PHP_CodeSniffer\Config
-     */
-    protected $config = null;
-
-    /**
-     * The ruleset used for the run.
-     *
-     * @var \PHP_CodeSniffer\Ruleset
-     */
-    protected $ruleset = null;
-
-    /**
-     * A list of ignore patterns that apply to directories only.
-     *
-     * @var array
-     */
-    protected $ignoreDirPatterns = null;
-
-    /**
-     * A list of ignore patterns that apply to files only.
-     *
-     * @var array
-     */
-    protected $ignoreFilePatterns = null;
-
-    /**
-     * A list of file paths we've already accepted.
-     *
-     * Used to ensure we aren't following circular symlinks.
-     *
-     * @var array
-     */
-    protected $acceptedPaths = [];
-
-
-    /**
-     * Constructs a filter.
-     *
-     * @param \RecursiveIterator       $iterator The iterator we are using to get file paths.
-     * @param string                   $basedir  The top-level path we are filtering.
-     * @param \PHP_CodeSniffer\Config  $config   The config data for the run.
-     * @param \PHP_CodeSniffer\Ruleset $ruleset  The ruleset used for the run.
-     *
-     * @return void
-     */
-    public function __construct($iterator, $basedir, Config $config, Ruleset $ruleset)
-    {
-        parent::__construct($iterator);
-        $this->basedir = $basedir;
-        $this->config  = $config;
-        $this->ruleset = $ruleset;
-
-    }//end __construct()
-
-
-    /**
-     * Check whether the current element of the iterator is acceptable.
-     *
-     * Files are checked for allowed extensions and ignore patterns.
-     * Directories are checked for ignore patterns only.
-     *
-     * @return bool
-     */
-    public function accept()
-    {
-        $filePath = $this->current();
-        $realPath = Util\Common::realpath($filePath);
-
-        if ($realPath !== false) {
-            // It's a real path somewhere, so record it
-            // to check for circular symlinks.
-            if (isset($this->acceptedPaths[$realPath]) === true) {
-                // We've been here before.
-                return false;
-            }
-        }
-
-        $filePath = $this->current();
-        if (is_dir($filePath) === true) {
-            if ($this->config->local === true) {
-                return false;
-            }
-        } else if ($this->shouldProcessFile($filePath) === false) {
-            return false;
-        }
-
-        if ($this->shouldIgnorePath($filePath) === true) {
-            return false;
-        }
-
-        $this->acceptedPaths[$realPath] = true;
-        return true;
-
-    }//end accept()
-
-
-    /**
-     * Returns an iterator for the current entry.
-     *
-     * Ensures that the ignore patterns are preserved so they don't have
-     * to be generated each time.
-     *
-     * @return \RecursiveIterator
-     */
-    public function getChildren()
-    {
-        $children = new static(
-            new \RecursiveDirectoryIterator($this->current(), (\RecursiveDirectoryIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS)),
-            $this->basedir,
-            $this->config,
-            $this->ruleset
-        );
-
-        // Set the ignore patterns so we don't have to generate them again.
-        $children->ignoreDirPatterns  = $this->ignoreDirPatterns;
-        $children->ignoreFilePatterns = $this->ignoreFilePatterns;
-        $children->acceptedPaths      = $this->acceptedPaths;
-        return $children;
-
-    }//end getChildren()
-
-
-    /**
-     * Checks filtering rules to see if a file should be checked.
-     *
-     * Checks both file extension filters and path ignore filters.
-     *
-     * @param string $path The path to the file being checked.
-     *
-     * @return bool
-     */
-    protected function shouldProcessFile($path)
-    {
-        // Check that the file's extension is one we are checking.
-        // We are strict about checking the extension and we don't
-        // let files through with no extension or that start with a dot.
-        $fileName  = basename($path);
-        $fileParts = explode('.', $fileName);
-        if ($fileParts[0] === $fileName || $fileParts[0] === '') {
-            return false;
-        }
-
-        // Checking multi-part file extensions, so need to create a
-        // complete extension list and make sure one is allowed.
-        $extensions = [];
-        array_shift($fileParts);
-        foreach ($fileParts as $part) {
-            $extensions[implode('.', $fileParts)] = 1;
-            array_shift($fileParts);
-        }
-
-        $matches = array_intersect_key($extensions, $this->config->extensions);
-        if (empty($matches) === true) {
-            return false;
-        }
-
-        return true;
-
-    }//end shouldProcessFile()
-
-
-    /**
-     * Checks filtering rules to see if a path should be ignored.
-     *
-     * @param string $path The path to the file or directory being checked.
-     *
-     * @return bool
-     */
-    protected function shouldIgnorePath($path)
-    {
-        if ($this->ignoreFilePatterns === null) {
-            $this->ignoreDirPatterns  = [];
-            $this->ignoreFilePatterns = [];
-
-            $ignorePatterns = array_merge($this->config->ignored, $this->ruleset->getIgnorePatterns());
-            foreach ($ignorePatterns as $pattern => $type) {
-                // If the ignore pattern ends with /* then it is ignoring an entire directory.
-                if (substr($pattern, -2) === '/*') {
-                    // Need to check this pattern for dirs as well as individual file paths.
-                    $this->ignoreFilePatterns[$pattern] = $type;
-
-                    $pattern = substr($pattern, 0, -2);
-                    $this->ignoreDirPatterns[$pattern] = $type;
-                } else {
-                    // This is a file-specific pattern, so only need to check this
-                    // for individual file paths.
-                    $this->ignoreFilePatterns[$pattern] = $type;
-                }
-            }
-        }
-
-        $relativePath = $path;
-        if (strpos($path, $this->basedir) === 0) {
-            // The +1 cuts off the directory separator as well.
-            $relativePath = substr($path, (strlen($this->basedir) + 1));
-        }
-
-        if (is_dir($path) === true) {
-            $ignorePatterns = $this->ignoreDirPatterns;
-        } else {
-            $ignorePatterns = $this->ignoreFilePatterns;
-        }
-
-        foreach ($ignorePatterns as $pattern => $type) {
-            // Maintains backwards compatibility in case the ignore pattern does
-            // not have a relative/absolute value.
-            if (is_int($pattern) === true) {
-                $pattern = $type;
-                $type    = 'absolute';
-            }
-
-            $replacements = [
-                '\\,' => ',',
-                '*'   => '.*',
-            ];
-
-            // We assume a / directory separator, as do the exclude rules
-            // most developers write, so we need a special case for any system
-            // that is different.
-            if (DIRECTORY_SEPARATOR === '\\') {
-                $replacements['/'] = '\\\\';
-            }
-
-            $pattern = strtr($pattern, $replacements);
-
-            if ($type === 'relative') {
-                $testPath = $relativePath;
-            } else {
-                $testPath = $path;
-            }
-
-            $pattern = '`'.$pattern.'`i';
-            if (preg_match($pattern, $testPath) === 1) {
-                return true;
-            }
-        }//end foreach
-
-        return false;
-
-    }//end shouldIgnorePath()
+	/**
+	 * The top-level path we are filtering.
+	 *
+	 * @var string
+	 */
+	protected $basedir = null;
+
+	/**
+	 * The config data for the run.
+	 *
+	 * @var \PHP_CodeSniffer\Config
+	 */
+	protected $config = null;
+
+	/**
+	 * The ruleset used for the run.
+	 *
+	 * @var \PHP_CodeSniffer\Ruleset
+	 */
+	protected $ruleset = null;
+
+	/**
+	 * A list of ignore patterns that apply to directories only.
+	 *
+	 * @var array
+	 */
+	protected $ignoreDirPatterns = null;
+
+	/**
+	 * A list of ignore patterns that apply to files only.
+	 *
+	 * @var array
+	 */
+	protected $ignoreFilePatterns = null;
+
+	/**
+	 * A list of file paths we've already accepted.
+	 *
+	 * Used to ensure we aren't following circular symlinks.
+	 *
+	 * @var array
+	 */
+	protected $acceptedPaths = [];
+
+
+	/**
+	 * Constructs a filter.
+	 *
+	 * @param \RecursiveIterator       $iterator The iterator we are using to get file paths.
+	 * @param string                   $basedir  The top-level path we are filtering.
+	 * @param \PHP_CodeSniffer\Config  $config   The config data for the run.
+	 * @param \PHP_CodeSniffer\Ruleset $ruleset  The ruleset used for the run.
+	 *
+	 * @return void
+	 */
+	public function __construct($iterator, $basedir, Config $config, Ruleset $ruleset)
+	{
+		parent::__construct($iterator);
+		$this->basedir = $basedir;
+		$this->config  = $config;
+		$this->ruleset = $ruleset;
+
+	}//end __construct()
+
+
+	/**
+	 * Check whether the current element of the iterator is acceptable.
+	 *
+	 * Files are checked for allowed extensions and ignore patterns.
+	 * Directories are checked for ignore patterns only.
+	 *
+	 * @return bool
+	 */
+	public function accept()
+	{
+		$filePath = $this->current();
+		$realPath = Util\Common::realpath($filePath);
+
+		if ($realPath !== false) {
+			// It's a real path somewhere, so record it
+			// to check for circular symlinks.
+			if (isset($this->acceptedPaths[$realPath]) === true) {
+				// We've been here before.
+				return false;
+			}
+		}
+
+		$filePath = $this->current();
+		if (is_dir($filePath) === true) {
+			if ($this->config->local === true) {
+				return false;
+			}
+		} else if ($this->shouldProcessFile($filePath) === false) {
+			return false;
+		}
+
+		if ($this->shouldIgnorePath($filePath) === true) {
+			return false;
+		}
+
+		$this->acceptedPaths[$realPath] = true;
+		return true;
+
+	}//end accept()
+
+
+	/**
+	 * Returns an iterator for the current entry.
+	 *
+	 * Ensures that the ignore patterns are preserved so they don't have
+	 * to be generated each time.
+	 *
+	 * @return \RecursiveIterator
+	 */
+	public function getChildren()
+	{
+		$children = new static(
+			new \RecursiveDirectoryIterator($this->current(), (\RecursiveDirectoryIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS)),
+			$this->basedir,
+			$this->config,
+			$this->ruleset
+		);
+
+		// Set the ignore patterns so we don't have to generate them again.
+		$children->ignoreDirPatterns  = $this->ignoreDirPatterns;
+		$children->ignoreFilePatterns = $this->ignoreFilePatterns;
+		$children->acceptedPaths      = $this->acceptedPaths;
+		return $children;
+
+	}//end getChildren()
+
+
+	/**
+	 * Checks filtering rules to see if a file should be checked.
+	 *
+	 * Checks both file extension filters and path ignore filters.
+	 *
+	 * @param string $path The path to the file being checked.
+	 *
+	 * @return bool
+	 */
+	protected function shouldProcessFile($path)
+	{
+		// Check that the file's extension is one we are checking.
+		// We are strict about checking the extension and we don't
+		// let files through with no extension or that start with a dot.
+		$fileName  = basename($path);
+		$fileParts = explode('.', $fileName);
+		if ($fileParts[0] === $fileName || $fileParts[0] === '') {
+			return false;
+		}
+
+		// Checking multi-part file extensions, so need to create a
+		// complete extension list and make sure one is allowed.
+		$extensions = [];
+		array_shift($fileParts);
+		foreach ($fileParts as $part) {
+			$extensions[implode('.', $fileParts)] = 1;
+			array_shift($fileParts);
+		}
+
+		$matches = array_intersect_key($extensions, $this->config->extensions);
+		if (empty($matches) === true) {
+			return false;
+		}
+
+		return true;
+
+	}//end shouldProcessFile()
+
+
+	/**
+	 * Checks filtering rules to see if a path should be ignored.
+	 *
+	 * @param string $path The path to the file or directory being checked.
+	 *
+	 * @return bool
+	 */
+	protected function shouldIgnorePath($path)
+	{
+		if ($this->ignoreFilePatterns === null) {
+			$this->ignoreDirPatterns  = [];
+			$this->ignoreFilePatterns = [];
+
+			$ignorePatterns = array_merge($this->config->ignored, $this->ruleset->getIgnorePatterns());
+			foreach ($ignorePatterns as $pattern => $type) {
+				// If the ignore pattern ends with /* then it is ignoring an entire directory.
+				if (substr($pattern, -2) === '/*') {
+					// Need to check this pattern for dirs as well as individual file paths.
+					$this->ignoreFilePatterns[$pattern] = $type;
+
+					$pattern = substr($pattern, 0, -2);
+					$this->ignoreDirPatterns[$pattern] = $type;
+				} else {
+					// This is a file-specific pattern, so only need to check this
+					// for individual file paths.
+					$this->ignoreFilePatterns[$pattern] = $type;
+				}
+			}
+		}
+
+		$relativePath = $path;
+		if (strpos($path, $this->basedir) === 0) {
+			// The +1 cuts off the directory separator as well.
+			$relativePath = substr($path, (strlen($this->basedir) + 1));
+		}
+
+		if (is_dir($path) === true) {
+			$ignorePatterns = $this->ignoreDirPatterns;
+		} else {
+			$ignorePatterns = $this->ignoreFilePatterns;
+		}
+
+		foreach ($ignorePatterns as $pattern => $type) {
+			// Maintains backwards compatibility in case the ignore pattern does
+			// not have a relative/absolute value.
+			if (is_int($pattern) === true) {
+				$pattern = $type;
+				$type    = 'absolute';
+			}
+
+			$replacements = [
+				'\\,' => ',',
+				'*'   => '.*',
+			];
+
+			// We assume a / directory separator, as do the exclude rules
+			// most developers write, so we need a special case for any system
+			// that is different.
+			if (DIRECTORY_SEPARATOR === '\\') {
+				$replacements['/'] = '\\\\';
+			}
+
+			$pattern = strtr($pattern, $replacements);
+
+			if ($type === 'relative') {
+				$testPath = $relativePath;
+			} else {
+				$testPath = $path;
+			}
+
+			$pattern = '`'.$pattern.'`i';
+			if (preg_match($pattern, $testPath) === 1) {
+				return true;
+			}
+		}//end foreach
+
+		return false;
+
+	}//end shouldIgnorePath()
 
 
 }//end class

Spacing +45 added lines, -45 removed lines

@@ -57,7 +57,7 @@ 
      *
      * @var array
      */
-    protected $acceptedPaths = [];
+    protected $acceptedPaths = [ ];
 
 
     /**
@@ -70,9 +70,9 @@ 
      *
      * @return void
      */
-    public function __construct($iterator, $basedir, Config $config, Ruleset $ruleset)
+    public function __construct( $iterator, $basedir, Config $config, Ruleset $ruleset )
     {
-        parent::__construct($iterator);
+        parent::__construct( $iterator );
         $this->basedir = $basedir;
         $this->config  = $config;
         $this->ruleset = $ruleset;
@@ -91,31 +91,31 @@ 
     public function accept()
     {
         $filePath = $this->current();
-        $realPath = Util\Common::realpath($filePath);
+        $realPath = Util\Common::realpath( $filePath );
 
-        if ($realPath !== false) {
+        if ( $realPath !== false ) {
             // It's a real path somewhere, so record it
             // to check for circular symlinks.
-            if (isset($this->acceptedPaths[$realPath]) === true) {
+            if ( isset( $this->acceptedPaths[ $realPath ] ) === true ) {
                 // We've been here before.
                 return false;
             }
         }
 
         $filePath = $this->current();
-        if (is_dir($filePath) === true) {
-            if ($this->config->local === true) {
+        if ( is_dir( $filePath ) === true ) {
+            if ( $this->config->local === true ) {
                 return false;
             }
-        } else if ($this->shouldProcessFile($filePath) === false) {
+        } else if ( $this->shouldProcessFile( $filePath ) === false ) {
             return false;
         }
 
-        if ($this->shouldIgnorePath($filePath) === true) {
+        if ( $this->shouldIgnorePath( $filePath ) === true ) {
             return false;
         }
 
-        $this->acceptedPaths[$realPath] = true;
+        $this->acceptedPaths[ $realPath ] = true;
         return true;
 
     }//end accept()
@@ -132,7 +132,7 @@ 
     public function getChildren()
     {
         $children = new static(
-            new \RecursiveDirectoryIterator($this->current(), (\RecursiveDirectoryIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS)),
+            new \RecursiveDirectoryIterator( $this->current(), ( \RecursiveDirectoryIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS ) ),
             $this->basedir,
             $this->config,
             $this->ruleset
@@ -156,28 +156,28 @@ 
      *
      * @return bool
      */
-    protected function shouldProcessFile($path)
+    protected function shouldProcessFile( $path )
     {
         // Check that the file's extension is one we are checking.
         // We are strict about checking the extension and we don't
         // let files through with no extension or that start with a dot.
-        $fileName  = basename($path);
-        $fileParts = explode('.', $fileName);
-        if ($fileParts[0] === $fileName || $fileParts[0] === '') {
+        $fileName  = basename( $path );
+        $fileParts = explode( '.', $fileName );
+        if ( $fileParts[ 0 ] === $fileName || $fileParts[ 0 ] === '' ) {
             return false;
         }
 
         // Checking multi-part file extensions, so need to create a
         // complete extension list and make sure one is allowed.
-        $extensions = [];
-        array_shift($fileParts);
-        foreach ($fileParts as $part) {
-            $extensions[implode('.', $fileParts)] = 1;
-            array_shift($fileParts);
+        $extensions = [ ];
+        array_shift( $fileParts );
+        foreach ( $fileParts as $part ) {
+            $extensions[ implode( '.', $fileParts ) ] = 1;
+            array_shift( $fileParts );
         }
 
-        $matches = array_intersect_key($extensions, $this->config->extensions);
-        if (empty($matches) === true) {
+        $matches = array_intersect_key( $extensions, $this->config->extensions );
+        if ( empty( $matches ) === true ) {
             return false;
         }
 
@@ -193,45 +193,45 @@ 
      *
      * @return bool
      */
-    protected function shouldIgnorePath($path)
+    protected function shouldIgnorePath( $path )
     {
-        if ($this->ignoreFilePatterns === null) {
-            $this->ignoreDirPatterns  = [];
-            $this->ignoreFilePatterns = [];
+        if ( $this->ignoreFilePatterns === null ) {
+            $this->ignoreDirPatterns  = [ ];
+            $this->ignoreFilePatterns = [ ];
 
-            $ignorePatterns = array_merge($this->config->ignored, $this->ruleset->getIgnorePatterns());
-            foreach ($ignorePatterns as $pattern => $type) {
+            $ignorePatterns = array_merge( $this->config->ignored, $this->ruleset->getIgnorePatterns() );
+            foreach ( $ignorePatterns as $pattern => $type ) {
                 // If the ignore pattern ends with /* then it is ignoring an entire directory.
-                if (substr($pattern, -2) === '/*') {
+                if ( substr( $pattern, -2 ) === '/*' ) {
                     // Need to check this pattern for dirs as well as individual file paths.
-                    $this->ignoreFilePatterns[$pattern] = $type;
+                    $this->ignoreFilePatterns[ $pattern ] = $type;
 
-                    $pattern = substr($pattern, 0, -2);
-                    $this->ignoreDirPatterns[$pattern] = $type;
+                    $pattern = substr( $pattern, 0, -2 );
+                    $this->ignoreDirPatterns[ $pattern ] = $type;
                 } else {
                     // This is a file-specific pattern, so only need to check this
                     // for individual file paths.
-                    $this->ignoreFilePatterns[$pattern] = $type;
+                    $this->ignoreFilePatterns[ $pattern ] = $type;
                 }
             }
         }
 
         $relativePath = $path;
-        if (strpos($path, $this->basedir) === 0) {
+        if ( strpos( $path, $this->basedir ) === 0 ) {
             // The +1 cuts off the directory separator as well.
-            $relativePath = substr($path, (strlen($this->basedir) + 1));
+            $relativePath = substr( $path, ( strlen( $this->basedir ) + 1 ) );
         }
 
-        if (is_dir($path) === true) {
+        if ( is_dir( $path ) === true ) {
             $ignorePatterns = $this->ignoreDirPatterns;
         } else {
             $ignorePatterns = $this->ignoreFilePatterns;
         }
 
-        foreach ($ignorePatterns as $pattern => $type) {
+        foreach ( $ignorePatterns as $pattern => $type ) {
             // Maintains backwards compatibility in case the ignore pattern does
             // not have a relative/absolute value.
-            if (is_int($pattern) === true) {
+            if ( is_int( $pattern ) === true ) {
                 $pattern = $type;
                 $type    = 'absolute';
             }
@@ -244,20 +244,20 @@ 
             // We assume a / directory separator, as do the exclude rules
             // most developers write, so we need a special case for any system
             // that is different.
-            if (DIRECTORY_SEPARATOR === '\\') {
-                $replacements['/'] = '\\\\';
+            if ( DIRECTORY_SEPARATOR === '\\' ) {
+                $replacements[ '/' ] = '\\\\';
             }
 
-            $pattern = strtr($pattern, $replacements);
+            $pattern = strtr( $pattern, $replacements );
 
-            if ($type === 'relative') {
+            if ( $type === 'relative' ) {
                 $testPath = $relativePath;
             } else {
                 $testPath = $path;
             }
 
-            $pattern = '`'.$pattern.'`i';
-            if (preg_match($pattern, $testPath) === 1) {
+            $pattern = '`' . $pattern . '`i';
+            if ( preg_match( $pattern, $testPath ) === 1 ) {
                 return true;
             }
         }//end foreach

Braces +6 added lines, -12 removed lines

@@ -13,8 +13,7 @@ 
 use PHP_CodeSniffer\Ruleset;
 use PHP_CodeSniffer\Config;
 
-class Filter extends \RecursiveFilterIterator
-{
+class Filter extends \RecursiveFilterIterator {
     /**
      * The top-level path we are filtering.
      *
@@ -70,8 +69,7 @@ 
      *
      * @return void
      */
-    public function __construct($iterator, $basedir, Config $config, Ruleset $ruleset)
-    {
+    public function __construct($iterator, $basedir, Config $config, Ruleset $ruleset) {
         parent::__construct($iterator);
         $this->basedir = $basedir;
         $this->config  = $config;
@@ -88,8 +86,7 @@ 
      *
      * @return bool
      */
-    public function accept()
-    {
+    public function accept() {
         $filePath = $this->current();
         $realPath = Util\Common::realpath($filePath);
 
@@ -129,8 +126,7 @@ 
      *
      * @return \RecursiveIterator
      */
-    public function getChildren()
-    {
+    public function getChildren() {
         $children = new static(
             new \RecursiveDirectoryIterator($this->current(), (\RecursiveDirectoryIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS)),
             $this->basedir,
@@ -156,8 +152,7 @@ 
      *
      * @return bool
      */
-    protected function shouldProcessFile($path)
-    {
+    protected function shouldProcessFile($path) {
         // Check that the file's extension is one we are checking.
         // We are strict about checking the extension and we don't
         // let files through with no extension or that start with a dot.
@@ -193,8 +188,7 @@ 
      *
      * @return bool
      */
-    protected function shouldIgnorePath($path)
-    {
+    protected function shouldIgnorePath($path) {
         if ($this->ignoreFilePatterns === null) {
             $this->ignoreDirPatterns  = [];
             $this->ignoreFilePatterns = [];

vendor/squizlabs/php_codesniffer/src/Filters/ExactMatch.php

Indentation +87 added lines, -87 removed lines

@@ -16,93 +16,93 @@
 abstract class ExactMatch extends Filter
 {
 
-    /**
-     * A list of files to exclude.
-     *
-     * @var array
-     */
-    private $blacklist = null;
-
-    /**
-     * A list of files to include.
-     *
-     * If the whitelist is empty, only files in the blacklist will be excluded.
-     *
-     * @var array
-     */
-    private $whitelist = null;
-
-
-    /**
-     * Check whether the current element of the iterator is acceptable.
-     *
-     * If a file is both blacklisted and whitelisted, it will be deemed unacceptable.
-     *
-     * @return bool
-     */
-    public function accept()
-    {
-        if (parent::accept() === false) {
-            return false;
-        }
-
-        if ($this->blacklist === null) {
-            $this->blacklist = $this->getblacklist();
-        }
-
-        if ($this->whitelist === null) {
-            $this->whitelist = $this->getwhitelist();
-        }
-
-        $filePath = Util\Common::realpath($this->current());
-
-        // If file is both blacklisted and whitelisted, the blacklist takes precedence.
-        if (isset($this->blacklist[$filePath]) === true) {
-            return false;
-        }
-
-        if (empty($this->whitelist) === true && empty($this->blacklist) === false) {
-            // We are only checking a blacklist, so everything else should be whitelisted.
-            return true;
-        }
-
-        return isset($this->whitelist[$filePath]);
-
-    }//end accept()
-
-
-    /**
-     * Returns an iterator for the current entry.
-     *
-     * Ensures that the blacklist and whitelist are preserved so they don't have
-     * to be generated each time.
-     *
-     * @return \RecursiveIterator
-     */
-    public function getChildren()
-    {
-        $children            = parent::getChildren();
-        $children->blacklist = $this->blacklist;
-        $children->whitelist = $this->whitelist;
-        return $children;
-
-    }//end getChildren()
-
-
-    /**
-     * Get a list of blacklisted file paths.
-     *
-     * @return array
-     */
-    abstract protected function getBlacklist();
-
-
-    /**
-     * Get a list of whitelisted file paths.
-     *
-     * @return array
-     */
-    abstract protected function getWhitelist();
+	/**
+	 * A list of files to exclude.
+	 *
+	 * @var array
+	 */
+	private $blacklist = null;
+
+	/**
+	 * A list of files to include.
+	 *
+	 * If the whitelist is empty, only files in the blacklist will be excluded.
+	 *
+	 * @var array
+	 */
+	private $whitelist = null;
+
+
+	/**
+	 * Check whether the current element of the iterator is acceptable.
+	 *
+	 * If a file is both blacklisted and whitelisted, it will be deemed unacceptable.
+	 *
+	 * @return bool
+	 */
+	public function accept()
+	{
+		if (parent::accept() === false) {
+			return false;
+		}
+
+		if ($this->blacklist === null) {
+			$this->blacklist = $this->getblacklist();
+		}
+
+		if ($this->whitelist === null) {
+			$this->whitelist = $this->getwhitelist();
+		}
+
+		$filePath = Util\Common::realpath($this->current());
+
+		// If file is both blacklisted and whitelisted, the blacklist takes precedence.
+		if (isset($this->blacklist[$filePath]) === true) {
+			return false;
+		}
+
+		if (empty($this->whitelist) === true && empty($this->blacklist) === false) {
+			// We are only checking a blacklist, so everything else should be whitelisted.
+			return true;
+		}
+
+		return isset($this->whitelist[$filePath]);
+
+	}//end accept()
+
+
+	/**
+	 * Returns an iterator for the current entry.
+	 *
+	 * Ensures that the blacklist and whitelist are preserved so they don't have
+	 * to be generated each time.
+	 *
+	 * @return \RecursiveIterator
+	 */
+	public function getChildren()
+	{
+		$children            = parent::getChildren();
+		$children->blacklist = $this->blacklist;
+		$children->whitelist = $this->whitelist;
+		return $children;
+
+	}//end getChildren()
+
+
+	/**
+	 * Get a list of blacklisted file paths.
+	 *
+	 * @return array
+	 */
+	abstract protected function getBlacklist();
+
+
+	/**
+	 * Get a list of whitelisted file paths.
+	 *
+	 * @return array
+	 */
+	abstract protected function getWhitelist();
 
 
 }//end class

Spacing +7 added lines, -7 removed lines

@@ -42,31 +42,31 @@
      */
     public function accept()
     {
-        if (parent::accept() === false) {
+        if ( parent::accept() === false ) {
             return false;
         }
 
-        if ($this->blacklist === null) {
+        if ( $this->blacklist === null ) {
             $this->blacklist = $this->getblacklist();
         }
 
-        if ($this->whitelist === null) {
+        if ( $this->whitelist === null ) {
             $this->whitelist = $this->getwhitelist();
         }
 
-        $filePath = Util\Common::realpath($this->current());
+        $filePath = Util\Common::realpath( $this->current() );
 
         // If file is both blacklisted and whitelisted, the blacklist takes precedence.
-        if (isset($this->blacklist[$filePath]) === true) {
+        if ( isset( $this->blacklist[ $filePath ] ) === true ) {
             return false;
         }
 
-        if (empty($this->whitelist) === true && empty($this->blacklist) === false) {
+        if ( empty( $this->whitelist ) === true && empty( $this->blacklist ) === false ) {
             // We are only checking a blacklist, so everything else should be whitelisted.
             return true;
         }
 
-        return isset($this->whitelist[$filePath]);
+        return isset( $this->whitelist[ $filePath ] );
 
     }//end accept()
 

Braces +3 added lines, -6 removed lines

@@ -13,8 +13,7 @@ 
 
 use PHP_CodeSniffer\Util;
 
-abstract class ExactMatch extends Filter
-{
+abstract class ExactMatch extends Filter {
 
     /**
      * A list of files to exclude.
@@ -40,8 +39,7 @@ 
      *
      * @return bool
      */
-    public function accept()
-    {
+    public function accept() {
         if (parent::accept() === false) {
             return false;
         }
@@ -79,8 +77,7 @@ 
      *
      * @return \RecursiveIterator
      */
-    public function getChildren()
-    {
+    public function getChildren() {
         $children            = parent::getChildren();
         $children->blacklist = $this->blacklist;
         $children->whitelist = $this->whitelist;

vendor/squizlabs/php_codesniffer/src/Filters/GitModified.php

Indentation +46 added lines, -46 removed lines

@@ -15,52 +15,52 @@
 {
 
 
-    /**
-     * Get a list of blacklisted file paths.
-     *
-     * @return array
-     */
-    protected function getBlacklist()
-    {
-        return [];
-
-    }//end getBlacklist()
-
-
-    /**
-     * Get a list of whitelisted file paths.
-     *
-     * @return array
-     */
-    protected function getWhitelist()
-    {
-        $modified = [];
-
-        $cmd    = 'git ls-files -o -m --exclude-standard -- '.escapeshellarg($this->basedir);
-        $output = [];
-        exec($cmd, $output);
-
-        $basedir = $this->basedir;
-        if (is_dir($basedir) === false) {
-            $basedir = dirname($basedir);
-        }
-
-        foreach ($output as $path) {
-            $path = Util\Common::realpath($path);
-
-            if ($path === false) {
-                continue;
-            }
-
-            do {
-                $modified[$path] = true;
-                $path            = dirname($path);
-            } while ($path !== $basedir);
-        }
-
-        return $modified;
-
-    }//end getWhitelist()
+	/**
+	 * Get a list of blacklisted file paths.
+	 *
+	 * @return array
+	 */
+	protected function getBlacklist()
+	{
+		return [];
+
+	}//end getBlacklist()
+
+
+	/**
+	 * Get a list of whitelisted file paths.
+	 *
+	 * @return array
+	 */
+	protected function getWhitelist()
+	{
+		$modified = [];
+
+		$cmd    = 'git ls-files -o -m --exclude-standard -- '.escapeshellarg($this->basedir);
+		$output = [];
+		exec($cmd, $output);
+
+		$basedir = $this->basedir;
+		if (is_dir($basedir) === false) {
+			$basedir = dirname($basedir);
+		}
+
+		foreach ($output as $path) {
+			$path = Util\Common::realpath($path);
+
+			if ($path === false) {
+				continue;
+			}
+
+			do {
+				$modified[$path] = true;
+				$path            = dirname($path);
+			} while ($path !== $basedir);
+		}
+
+		return $modified;
+
+	}//end getWhitelist()
 
 
 }//end class

Spacing +13 added lines, -13 removed lines

@@ -22,7 +22,7 @@ 
      */
     protected function getBlacklist()
     {
-        return [];
+        return [ ];
 
     }//end getBlacklist()
 
@@ -34,28 +34,28 @@ 
      */
     protected function getWhitelist()
     {
-        $modified = [];
+        $modified = [ ];
 
-        $cmd    = 'git ls-files -o -m --exclude-standard -- '.escapeshellarg($this->basedir);
-        $output = [];
-        exec($cmd, $output);
+        $cmd    = 'git ls-files -o -m --exclude-standard -- ' . escapeshellarg( $this->basedir );
+        $output = [ ];
+        exec( $cmd, $output );
 
         $basedir = $this->basedir;
-        if (is_dir($basedir) === false) {
-            $basedir = dirname($basedir);
+        if ( is_dir( $basedir ) === false ) {
+            $basedir = dirname( $basedir );
         }
 
-        foreach ($output as $path) {
-            $path = Util\Common::realpath($path);
+        foreach ( $output as $path ) {
+            $path = Util\Common::realpath( $path );
 
-            if ($path === false) {
+            if ( $path === false ) {
                 continue;
             }
 
             do {
-                $modified[$path] = true;
-                $path            = dirname($path);
-            } while ($path !== $basedir);
+                $modified[ $path ] = true;
+                $path            = dirname( $path );
+            } while ( $path !== $basedir );
         }
 
         return $modified;

Braces +3 added lines, -6 removed lines

@@ -11,8 +11,7 @@ 
 
 use PHP_CodeSniffer\Util;
 
-class GitModified extends ExactMatch
-{
+class GitModified extends ExactMatch {
 
 
     /**
@@ -20,8 +19,7 @@ 
      *
      * @return array
      */
-    protected function getBlacklist()
-    {
+    protected function getBlacklist() {
         return [];
 
     }//end getBlacklist()
@@ -32,8 +30,7 @@ 
      *
      * @return array
      */
-    protected function getWhitelist()
-    {
+    protected function getWhitelist() {
         $modified = [];
 
         $cmd    = 'git ls-files -o -m --exclude-standard -- '.escapeshellarg($this->basedir);

vendor/squizlabs/php_codesniffer/src/Reporter.php

Indentation +399 added lines, -399 removed lines

@@ -18,405 +18,405 @@
 class Reporter
 {
 
-    /**
-     * The config data for the run.
-     *
-     * @var \PHP_CodeSniffer\Config
-     */
-    public $config = null;
-
-    /**
-     * Total number of files that contain errors or warnings.
-     *
-     * @var integer
-     */
-    public $totalFiles = 0;
-
-    /**
-     * Total number of errors found during the run.
-     *
-     * @var integer
-     */
-    public $totalErrors = 0;
-
-    /**
-     * Total number of warnings found during the run.
-     *
-     * @var integer
-     */
-    public $totalWarnings = 0;
-
-    /**
-     * Total number of errors/warnings that can be fixed.
-     *
-     * @var integer
-     */
-    public $totalFixable = 0;
-
-    /**
-     * Total number of errors/warnings that were fixed.
-     *
-     * @var integer
-     */
-    public $totalFixed = 0;
-
-    /**
-     * When the PHPCS run started.
-     *
-     * @var float
-     */
-    public static $startTime = 0;
-
-    /**
-     * A cache of report objects.
-     *
-     * @var array
-     */
-    private $reports = [];
-
-    /**
-     * A cache of opened temporary files.
-     *
-     * @var array
-     */
-    private $tmpFiles = [];
-
-
-    /**
-     * Initialise the reporter.
-     *
-     * All reports specified in the config will be created and their
-     * output file (or a temp file if none is specified) initialised by
-     * clearing the current contents.
-     *
-     * @param \PHP_CodeSniffer\Config $config The config data for the run.
-     *
-     * @return void
-     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If a report is not available.
-     */
-    public function __construct(Config $config)
-    {
-        $this->config = $config;
-
-        foreach ($config->reports as $type => $output) {
-            if ($output === null) {
-                $output = $config->reportFile;
-            }
-
-            $reportClassName = '';
-            if (strpos($type, '.') !== false) {
-                // This is a path to a custom report class.
-                $filename = realpath($type);
-                if ($filename === false) {
-                    $error = "ERROR: Custom report \"$type\" not found".PHP_EOL;
-                    throw new DeepExitException($error, 3);
-                }
-
-                $reportClassName = Autoload::loadFile($filename);
-            } else if (class_exists('PHP_CodeSniffer\Reports\\'.ucfirst($type)) === true) {
-                // PHPCS native report.
-                $reportClassName = 'PHP_CodeSniffer\Reports\\'.ucfirst($type);
-            } else if (class_exists($type) === true) {
-                // FQN of a custom report.
-                $reportClassName = $type;
-            } else {
-                // OK, so not a FQN, try and find the report using the registered namespaces.
-                $registeredNamespaces = Autoload::getSearchPaths();
-                $trimmedType          = ltrim($type, '\\');
-
-                foreach ($registeredNamespaces as $nsPrefix) {
-                    if ($nsPrefix === '') {
-                        continue;
-                    }
-
-                    if (class_exists($nsPrefix.'\\'.$trimmedType) === true) {
-                        $reportClassName = $nsPrefix.'\\'.$trimmedType;
-                        break;
-                    }
-                }
-            }//end if
-
-            if ($reportClassName === '') {
-                $error = "ERROR: Class file for report \"$type\" not found".PHP_EOL;
-                throw new DeepExitException($error, 3);
-            }
-
-            $reportClass = new $reportClassName();
-            if (false === ($reportClass instanceof Report)) {
-                throw new RuntimeException('Class "'.$reportClassName.'" must implement the "PHP_CodeSniffer\Report" interface.');
-            }
-
-            $this->reports[$type] = [
-                'output' => $output,
-                'class'  => $reportClass,
-            ];
-
-            if ($output === null) {
-                // Using a temp file.
-                // This needs to be set in the constructor so that all
-                // child procs use the same report file when running in parallel.
-                $this->tmpFiles[$type] = tempnam(sys_get_temp_dir(), 'phpcs');
-                file_put_contents($this->tmpFiles[$type], '');
-            } else {
-                file_put_contents($output, '');
-            }
-        }//end foreach
-
-    }//end __construct()
-
-
-    /**
-     * Generates and prints final versions of all reports.
-     *
-     * Returns TRUE if any of the reports output content to the screen
-     * or FALSE if all reports were silently printed to a file.
-     *
-     * @return bool
-     */
-    public function printReports()
-    {
-        $toScreen = false;
-        foreach ($this->reports as $type => $report) {
-            if ($report['output'] === null) {
-                $toScreen = true;
-            }
-
-            $this->printReport($type);
-        }
-
-        return $toScreen;
-
-    }//end printReports()
-
-
-    /**
-     * Generates and prints a single final report.
-     *
-     * @param string $report The report type to print.
-     *
-     * @return void
-     */
-    public function printReport($report)
-    {
-        $reportClass = $this->reports[$report]['class'];
-        $reportFile  = $this->reports[$report]['output'];
-
-        if ($reportFile !== null) {
-            $filename = $reportFile;
-            $toScreen = false;
-        } else {
-            if (isset($this->tmpFiles[$report]) === true) {
-                $filename = $this->tmpFiles[$report];
-            } else {
-                $filename = null;
-            }
-
-            $toScreen = true;
-        }
-
-        $reportCache = '';
-        if ($filename !== null) {
-            $reportCache = file_get_contents($filename);
-        }
-
-        ob_start();
-        $reportClass->generate(
-            $reportCache,
-            $this->totalFiles,
-            $this->totalErrors,
-            $this->totalWarnings,
-            $this->totalFixable,
-            $this->config->showSources,
-            $this->config->reportWidth,
-            $this->config->interactive,
-            $toScreen
-        );
-        $generatedReport = ob_get_contents();
-        ob_end_clean();
-
-        if ($this->config->colors !== true || $reportFile !== null) {
-            $generatedReport = preg_replace('`\033\[[0-9;]+m`', '', $generatedReport);
-        }
-
-        if ($reportFile !== null) {
-            if (PHP_CODESNIFFER_VERBOSITY > 0) {
-                echo $generatedReport;
-            }
-
-            file_put_contents($reportFile, $generatedReport.PHP_EOL);
-        } else {
-            echo $generatedReport;
-            if ($filename !== null && file_exists($filename) === true) {
-                unlink($filename);
-                unset($this->tmpFiles[$report]);
-            }
-        }
-
-    }//end printReport()
-
-
-    /**
-     * Caches the result of a single processed file for all reports.
-     *
-     * The report content that is generated is appended to the output file
-     * assigned to each report. This content may be an intermediate report format
-     * and not reflect the final report output.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file that has been processed.
-     *
-     * @return void
-     */
-    public function cacheFileReport(File $phpcsFile)
-    {
-        if (isset($this->config->reports) === false) {
-            // This happens during unit testing, or any time someone just wants
-            // the error data and not the printed report.
-            return;
-        }
-
-        $reportData  = $this->prepareFileReport($phpcsFile);
-        $errorsShown = false;
-
-        foreach ($this->reports as $type => $report) {
-            $reportClass = $report['class'];
-
-            ob_start();
-            $result = $reportClass->generateFileReport($reportData, $phpcsFile, $this->config->showSources, $this->config->reportWidth);
-            if ($result === true) {
-                $errorsShown = true;
-            }
-
-            $generatedReport = ob_get_contents();
-            ob_end_clean();
-
-            if ($report['output'] === null) {
-                // Using a temp file.
-                if (isset($this->tmpFiles[$type]) === false) {
-                    // When running in interactive mode, the reporter prints the full
-                    // report many times, which will unlink the temp file. So we need
-                    // to create a new one if it doesn't exist.
-                    $this->tmpFiles[$type] = tempnam(sys_get_temp_dir(), 'phpcs');
-                    file_put_contents($this->tmpFiles[$type], '');
-                }
-
-                file_put_contents($this->tmpFiles[$type], $generatedReport, (FILE_APPEND | LOCK_EX));
-            } else {
-                file_put_contents($report['output'], $generatedReport, (FILE_APPEND | LOCK_EX));
-            }//end if
-        }//end foreach
-
-        if ($errorsShown === true || PHP_CODESNIFFER_CBF === true) {
-            $this->totalFiles++;
-            $this->totalErrors   += $reportData['errors'];
-            $this->totalWarnings += $reportData['warnings'];
-
-            // When PHPCBF is running, we need to use the fixable error values
-            // after the report has run and fixed what it can.
-            if (PHP_CODESNIFFER_CBF === true) {
-                $this->totalFixable += $phpcsFile->getFixableCount();
-                $this->totalFixed   += $phpcsFile->getFixedCount();
-            } else {
-                $this->totalFixable += $reportData['fixable'];
-            }
-        }
-
-    }//end cacheFileReport()
-
-
-    /**
-     * Generate summary information to be used during report generation.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file that has been processed.
-     *
-     * @return array
-     */
-    public function prepareFileReport(File $phpcsFile)
-    {
-        $report = [
-            'filename' => Common::stripBasepath($phpcsFile->getFilename(), $this->config->basepath),
-            'errors'   => $phpcsFile->getErrorCount(),
-            'warnings' => $phpcsFile->getWarningCount(),
-            'fixable'  => $phpcsFile->getFixableCount(),
-            'messages' => [],
-        ];
-
-        if ($report['errors'] === 0 && $report['warnings'] === 0) {
-            // Prefect score!
-            return $report;
-        }
-
-        if ($this->config->recordErrors === false) {
-            $message  = 'Errors are not being recorded but this report requires error messages. ';
-            $message .= 'This report will not show the correct information.';
-            $report['messages'][1][1] = [
-                [
-                    'message'  => $message,
-                    'source'   => 'Internal.RecordErrors',
-                    'severity' => 5,
-                    'fixable'  => false,
-                    'type'     => 'ERROR',
-                ],
-            ];
-            return $report;
-        }
-
-        $errors = [];
-
-        // Merge errors and warnings.
-        foreach ($phpcsFile->getErrors() as $line => $lineErrors) {
-            foreach ($lineErrors as $column => $colErrors) {
-                $newErrors = [];
-                foreach ($colErrors as $data) {
-                    $newErrors[] = [
-                        'message'  => $data['message'],
-                        'source'   => $data['source'],
-                        'severity' => $data['severity'],
-                        'fixable'  => $data['fixable'],
-                        'type'     => 'ERROR',
-                    ];
-                }
-
-                $errors[$line][$column] = $newErrors;
-            }
-
-            ksort($errors[$line]);
-        }//end foreach
-
-        foreach ($phpcsFile->getWarnings() as $line => $lineWarnings) {
-            foreach ($lineWarnings as $column => $colWarnings) {
-                $newWarnings = [];
-                foreach ($colWarnings as $data) {
-                    $newWarnings[] = [
-                        'message'  => $data['message'],
-                        'source'   => $data['source'],
-                        'severity' => $data['severity'],
-                        'fixable'  => $data['fixable'],
-                        'type'     => 'WARNING',
-                    ];
-                }
-
-                if (isset($errors[$line]) === false) {
-                    $errors[$line] = [];
-                }
-
-                if (isset($errors[$line][$column]) === true) {
-                    $errors[$line][$column] = array_merge(
-                        $newWarnings,
-                        $errors[$line][$column]
-                    );
-                } else {
-                    $errors[$line][$column] = $newWarnings;
-                }
-            }//end foreach
-
-            ksort($errors[$line]);
-        }//end foreach
-
-        ksort($errors);
-        $report['messages'] = $errors;
-        return $report;
-
-    }//end prepareFileReport()
+	/**
+	 * The config data for the run.
+	 *
+	 * @var \PHP_CodeSniffer\Config
+	 */
+	public $config = null;
+
+	/**
+	 * Total number of files that contain errors or warnings.
+	 *
+	 * @var integer
+	 */
+	public $totalFiles = 0;
+
+	/**
+	 * Total number of errors found during the run.
+	 *
+	 * @var integer
+	 */
+	public $totalErrors = 0;
+
+	/**
+	 * Total number of warnings found during the run.
+	 *
+	 * @var integer
+	 */
+	public $totalWarnings = 0;
+
+	/**
+	 * Total number of errors/warnings that can be fixed.
+	 *
+	 * @var integer
+	 */
+	public $totalFixable = 0;
+
+	/**
+	 * Total number of errors/warnings that were fixed.
+	 *
+	 * @var integer
+	 */
+	public $totalFixed = 0;
+
+	/**
+	 * When the PHPCS run started.
+	 *
+	 * @var float
+	 */
+	public static $startTime = 0;
+
+	/**
+	 * A cache of report objects.
+	 *
+	 * @var array
+	 */
+	private $reports = [];
+
+	/**
+	 * A cache of opened temporary files.
+	 *
+	 * @var array
+	 */
+	private $tmpFiles = [];
+
+
+	/**
+	 * Initialise the reporter.
+	 *
+	 * All reports specified in the config will be created and their
+	 * output file (or a temp file if none is specified) initialised by
+	 * clearing the current contents.
+	 *
+	 * @param \PHP_CodeSniffer\Config $config The config data for the run.
+	 *
+	 * @return void
+	 * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If a report is not available.
+	 */
+	public function __construct(Config $config)
+	{
+		$this->config = $config;
+
+		foreach ($config->reports as $type => $output) {
+			if ($output === null) {
+				$output = $config->reportFile;
+			}
+
+			$reportClassName = '';
+			if (strpos($type, '.') !== false) {
+				// This is a path to a custom report class.
+				$filename = realpath($type);
+				if ($filename === false) {
+					$error = "ERROR: Custom report \"$type\" not found".PHP_EOL;
+					throw new DeepExitException($error, 3);
+				}
+
+				$reportClassName = Autoload::loadFile($filename);
+			} else if (class_exists('PHP_CodeSniffer\Reports\\'.ucfirst($type)) === true) {
+				// PHPCS native report.
+				$reportClassName = 'PHP_CodeSniffer\Reports\\'.ucfirst($type);
+			} else if (class_exists($type) === true) {
+				// FQN of a custom report.
+				$reportClassName = $type;
+			} else {
+				// OK, so not a FQN, try and find the report using the registered namespaces.
+				$registeredNamespaces = Autoload::getSearchPaths();
+				$trimmedType          = ltrim($type, '\\');
+
+				foreach ($registeredNamespaces as $nsPrefix) {
+					if ($nsPrefix === '') {
+						continue;
+					}
+
+					if (class_exists($nsPrefix.'\\'.$trimmedType) === true) {
+						$reportClassName = $nsPrefix.'\\'.$trimmedType;
+						break;
+					}
+				}
+			}//end if
+
+			if ($reportClassName === '') {
+				$error = "ERROR: Class file for report \"$type\" not found".PHP_EOL;
+				throw new DeepExitException($error, 3);
+			}
+
+			$reportClass = new $reportClassName();
+			if (false === ($reportClass instanceof Report)) {
+				throw new RuntimeException('Class "'.$reportClassName.'" must implement the "PHP_CodeSniffer\Report" interface.');
+			}
+
+			$this->reports[$type] = [
+				'output' => $output,
+				'class'  => $reportClass,
+			];
+
+			if ($output === null) {
+				// Using a temp file.
+				// This needs to be set in the constructor so that all
+				// child procs use the same report file when running in parallel.
+				$this->tmpFiles[$type] = tempnam(sys_get_temp_dir(), 'phpcs');
+				file_put_contents($this->tmpFiles[$type], '');
+			} else {
+				file_put_contents($output, '');
+			}
+		}//end foreach
+
+	}//end __construct()
+
+
+	/**
+	 * Generates and prints final versions of all reports.
+	 *
+	 * Returns TRUE if any of the reports output content to the screen
+	 * or FALSE if all reports were silently printed to a file.
+	 *
+	 * @return bool
+	 */
+	public function printReports()
+	{
+		$toScreen = false;
+		foreach ($this->reports as $type => $report) {
+			if ($report['output'] === null) {
+				$toScreen = true;
+			}
+
+			$this->printReport($type);
+		}
+
+		return $toScreen;
+
+	}//end printReports()
+
+
+	/**
+	 * Generates and prints a single final report.
+	 *
+	 * @param string $report The report type to print.
+	 *
+	 * @return void
+	 */
+	public function printReport($report)
+	{
+		$reportClass = $this->reports[$report]['class'];
+		$reportFile  = $this->reports[$report]['output'];
+
+		if ($reportFile !== null) {
+			$filename = $reportFile;
+			$toScreen = false;
+		} else {
+			if (isset($this->tmpFiles[$report]) === true) {
+				$filename = $this->tmpFiles[$report];
+			} else {
+				$filename = null;
+			}
+
+			$toScreen = true;
+		}
+
+		$reportCache = '';
+		if ($filename !== null) {
+			$reportCache = file_get_contents($filename);
+		}
+
+		ob_start();
+		$reportClass->generate(
+			$reportCache,
+			$this->totalFiles,
+			$this->totalErrors,
+			$this->totalWarnings,
+			$this->totalFixable,
+			$this->config->showSources,
+			$this->config->reportWidth,
+			$this->config->interactive,
+			$toScreen
+		);
+		$generatedReport = ob_get_contents();
+		ob_end_clean();
+
+		if ($this->config->colors !== true || $reportFile !== null) {
+			$generatedReport = preg_replace('`\033\[[0-9;]+m`', '', $generatedReport);
+		}
+
+		if ($reportFile !== null) {
+			if (PHP_CODESNIFFER_VERBOSITY > 0) {
+				echo $generatedReport;
+			}
+
+			file_put_contents($reportFile, $generatedReport.PHP_EOL);
+		} else {
+			echo $generatedReport;
+			if ($filename !== null && file_exists($filename) === true) {
+				unlink($filename);
+				unset($this->tmpFiles[$report]);
+			}
+		}
+
+	}//end printReport()
+
+
+	/**
+	 * Caches the result of a single processed file for all reports.
+	 *
+	 * The report content that is generated is appended to the output file
+	 * assigned to each report. This content may be an intermediate report format
+	 * and not reflect the final report output.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file that has been processed.
+	 *
+	 * @return void
+	 */
+	public function cacheFileReport(File $phpcsFile)
+	{
+		if (isset($this->config->reports) === false) {
+			// This happens during unit testing, or any time someone just wants
+			// the error data and not the printed report.
+			return;
+		}
+
+		$reportData  = $this->prepareFileReport($phpcsFile);
+		$errorsShown = false;
+
+		foreach ($this->reports as $type => $report) {
+			$reportClass = $report['class'];
+
+			ob_start();
+			$result = $reportClass->generateFileReport($reportData, $phpcsFile, $this->config->showSources, $this->config->reportWidth);
+			if ($result === true) {
+				$errorsShown = true;
+			}
+
+			$generatedReport = ob_get_contents();
+			ob_end_clean();
+
+			if ($report['output'] === null) {
+				// Using a temp file.
+				if (isset($this->tmpFiles[$type]) === false) {
+					// When running in interactive mode, the reporter prints the full
+					// report many times, which will unlink the temp file. So we need
+					// to create a new one if it doesn't exist.
+					$this->tmpFiles[$type] = tempnam(sys_get_temp_dir(), 'phpcs');
+					file_put_contents($this->tmpFiles[$type], '');
+				}
+
+				file_put_contents($this->tmpFiles[$type], $generatedReport, (FILE_APPEND | LOCK_EX));
+			} else {
+				file_put_contents($report['output'], $generatedReport, (FILE_APPEND | LOCK_EX));
+			}//end if
+		}//end foreach
+
+		if ($errorsShown === true || PHP_CODESNIFFER_CBF === true) {
+			$this->totalFiles++;
+			$this->totalErrors   += $reportData['errors'];
+			$this->totalWarnings += $reportData['warnings'];
+
+			// When PHPCBF is running, we need to use the fixable error values
+			// after the report has run and fixed what it can.
+			if (PHP_CODESNIFFER_CBF === true) {
+				$this->totalFixable += $phpcsFile->getFixableCount();
+				$this->totalFixed   += $phpcsFile->getFixedCount();
+			} else {
+				$this->totalFixable += $reportData['fixable'];
+			}
+		}
+
+	}//end cacheFileReport()
+
+
+	/**
+	 * Generate summary information to be used during report generation.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file that has been processed.
+	 *
+	 * @return array
+	 */
+	public function prepareFileReport(File $phpcsFile)
+	{
+		$report = [
+			'filename' => Common::stripBasepath($phpcsFile->getFilename(), $this->config->basepath),
+			'errors'   => $phpcsFile->getErrorCount(),
+			'warnings' => $phpcsFile->getWarningCount(),
+			'fixable'  => $phpcsFile->getFixableCount(),
+			'messages' => [],
+		];
+
+		if ($report['errors'] === 0 && $report['warnings'] === 0) {
+			// Prefect score!
+			return $report;
+		}
+
+		if ($this->config->recordErrors === false) {
+			$message  = 'Errors are not being recorded but this report requires error messages. ';
+			$message .= 'This report will not show the correct information.';
+			$report['messages'][1][1] = [
+				[
+					'message'  => $message,
+					'source'   => 'Internal.RecordErrors',
+					'severity' => 5,
+					'fixable'  => false,
+					'type'     => 'ERROR',
+				],
+			];
+			return $report;
+		}
+
+		$errors = [];
+
+		// Merge errors and warnings.
+		foreach ($phpcsFile->getErrors() as $line => $lineErrors) {
+			foreach ($lineErrors as $column => $colErrors) {
+				$newErrors = [];
+				foreach ($colErrors as $data) {
+					$newErrors[] = [
+						'message'  => $data['message'],
+						'source'   => $data['source'],
+						'severity' => $data['severity'],
+						'fixable'  => $data['fixable'],
+						'type'     => 'ERROR',
+					];
+				}
+
+				$errors[$line][$column] = $newErrors;
+			}
+
+			ksort($errors[$line]);
+		}//end foreach
+
+		foreach ($phpcsFile->getWarnings() as $line => $lineWarnings) {
+			foreach ($lineWarnings as $column => $colWarnings) {
+				$newWarnings = [];
+				foreach ($colWarnings as $data) {
+					$newWarnings[] = [
+						'message'  => $data['message'],
+						'source'   => $data['source'],
+						'severity' => $data['severity'],
+						'fixable'  => $data['fixable'],
+						'type'     => 'WARNING',
+					];
+				}
+
+				if (isset($errors[$line]) === false) {
+					$errors[$line] = [];
+				}
+
+				if (isset($errors[$line][$column]) === true) {
+					$errors[$line][$column] = array_merge(
+						$newWarnings,
+						$errors[$line][$column]
+					);
+				} else {
+					$errors[$line][$column] = $newWarnings;
+				}
+			}//end foreach
+
+			ksort($errors[$line]);
+		}//end foreach
+
+		ksort($errors);
+		$report['messages'] = $errors;
+		return $report;
+
+	}//end prepareFileReport()
 
 
 }//end class

Spacing +102 added lines, -102 removed lines

@@ -72,14 +72,14 @@ 
      *
      * @var array
      */
-    private $reports = [];
+    private $reports = [ ];
 
     /**
      * A cache of opened temporary files.
      *
      * @var array
      */
-    private $tmpFiles = [];
+    private $tmpFiles = [ ];
 
 
     /**
@@ -94,71 +94,71 @@ 
      * @return void
      * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If a report is not available.
      */
-    public function __construct(Config $config)
+    public function __construct( Config $config )
     {
         $this->config = $config;
 
-        foreach ($config->reports as $type => $output) {
-            if ($output === null) {
+        foreach ( $config->reports as $type => $output ) {
+            if ( $output === null ) {
                 $output = $config->reportFile;
             }
 
             $reportClassName = '';
-            if (strpos($type, '.') !== false) {
+            if ( strpos( $type, '.' ) !== false ) {
                 // This is a path to a custom report class.
-                $filename = realpath($type);
-                if ($filename === false) {
-                    $error = "ERROR: Custom report \"$type\" not found".PHP_EOL;
-                    throw new DeepExitException($error, 3);
+                $filename = realpath( $type );
+                if ( $filename === false ) {
+                    $error = "ERROR: Custom report \"$type\" not found" . PHP_EOL;
+                    throw new DeepExitException( $error, 3 );
                 }
 
-                $reportClassName = Autoload::loadFile($filename);
-            } else if (class_exists('PHP_CodeSniffer\Reports\\'.ucfirst($type)) === true) {
+                $reportClassName = Autoload::loadFile( $filename );
+            } else if ( class_exists( 'PHP_CodeSniffer\Reports\\' . ucfirst( $type ) ) === true ) {
                 // PHPCS native report.
-                $reportClassName = 'PHP_CodeSniffer\Reports\\'.ucfirst($type);
-            } else if (class_exists($type) === true) {
+                $reportClassName = 'PHP_CodeSniffer\Reports\\' . ucfirst( $type );
+            } else if ( class_exists( $type ) === true ) {
                 // FQN of a custom report.
                 $reportClassName = $type;
             } else {
                 // OK, so not a FQN, try and find the report using the registered namespaces.
                 $registeredNamespaces = Autoload::getSearchPaths();
-                $trimmedType          = ltrim($type, '\\');
+                $trimmedType          = ltrim( $type, '\\' );
 
-                foreach ($registeredNamespaces as $nsPrefix) {
-                    if ($nsPrefix === '') {
+                foreach ( $registeredNamespaces as $nsPrefix ) {
+                    if ( $nsPrefix === '' ) {
                         continue;
                     }
 
-                    if (class_exists($nsPrefix.'\\'.$trimmedType) === true) {
-                        $reportClassName = $nsPrefix.'\\'.$trimmedType;
+                    if ( class_exists( $nsPrefix . '\\' . $trimmedType ) === true ) {
+                        $reportClassName = $nsPrefix . '\\' . $trimmedType;
                         break;
                     }
                 }
             }//end if
 
-            if ($reportClassName === '') {
-                $error = "ERROR: Class file for report \"$type\" not found".PHP_EOL;
-                throw new DeepExitException($error, 3);
+            if ( $reportClassName === '' ) {
+                $error = "ERROR: Class file for report \"$type\" not found" . PHP_EOL;
+                throw new DeepExitException( $error, 3 );
             }
 
             $reportClass = new $reportClassName();
-            if (false === ($reportClass instanceof Report)) {
-                throw new RuntimeException('Class "'.$reportClassName.'" must implement the "PHP_CodeSniffer\Report" interface.');
+            if ( false === ( $reportClass instanceof Report ) ) {
+                throw new RuntimeException( 'Class "' . $reportClassName . '" must implement the "PHP_CodeSniffer\Report" interface.' );
             }
 
-            $this->reports[$type] = [
+            $this->reports[ $type ] = [
                 'output' => $output,
                 'class'  => $reportClass,
             ];
 
-            if ($output === null) {
+            if ( $output === null ) {
                 // Using a temp file.
                 // This needs to be set in the constructor so that all
                 // child procs use the same report file when running in parallel.
-                $this->tmpFiles[$type] = tempnam(sys_get_temp_dir(), 'phpcs');
-                file_put_contents($this->tmpFiles[$type], '');
+                $this->tmpFiles[ $type ] = tempnam( sys_get_temp_dir(), 'phpcs' );
+                file_put_contents( $this->tmpFiles[ $type ], '' );
             } else {
-                file_put_contents($output, '');
+                file_put_contents( $output, '' );
             }
         }//end foreach
 
@@ -176,12 +176,12 @@ 
     public function printReports()
     {
         $toScreen = false;
-        foreach ($this->reports as $type => $report) {
-            if ($report['output'] === null) {
+        foreach ( $this->reports as $type => $report ) {
+            if ( $report[ 'output' ] === null ) {
                 $toScreen = true;
             }
 
-            $this->printReport($type);
+            $this->printReport( $type );
         }
 
         return $toScreen;
@@ -196,17 +196,17 @@ 
      *
      * @return void
      */
-    public function printReport($report)
+    public function printReport( $report )
     {
-        $reportClass = $this->reports[$report]['class'];
-        $reportFile  = $this->reports[$report]['output'];
+        $reportClass = $this->reports[ $report ][ 'class' ];
+        $reportFile  = $this->reports[ $report ][ 'output' ];
 
-        if ($reportFile !== null) {
+        if ( $reportFile !== null ) {
             $filename = $reportFile;
             $toScreen = false;
         } else {
-            if (isset($this->tmpFiles[$report]) === true) {
-                $filename = $this->tmpFiles[$report];
+            if ( isset( $this->tmpFiles[ $report ] ) === true ) {
+                $filename = $this->tmpFiles[ $report ];
             } else {
                 $filename = null;
             }
@@ -215,8 +215,8 @@ 
         }
 
         $reportCache = '';
-        if ($filename !== null) {
-            $reportCache = file_get_contents($filename);
+        if ( $filename !== null ) {
+            $reportCache = file_get_contents( $filename );
         }
 
         ob_start();
@@ -234,21 +234,21 @@ 
         $generatedReport = ob_get_contents();
         ob_end_clean();
 
-        if ($this->config->colors !== true || $reportFile !== null) {
-            $generatedReport = preg_replace('`\033\[[0-9;]+m`', '', $generatedReport);
+        if ( $this->config->colors !== true || $reportFile !== null ) {
+            $generatedReport = preg_replace( '`\033\[[0-9;]+m`', '', $generatedReport );
         }
 
-        if ($reportFile !== null) {
-            if (PHP_CODESNIFFER_VERBOSITY > 0) {
+        if ( $reportFile !== null ) {
+            if ( PHP_CODESNIFFER_VERBOSITY > 0 ) {
                 echo $generatedReport;
             }
 
-            file_put_contents($reportFile, $generatedReport.PHP_EOL);
+            file_put_contents( $reportFile, $generatedReport . PHP_EOL );
         } else {
             echo $generatedReport;
-            if ($filename !== null && file_exists($filename) === true) {
-                unlink($filename);
-                unset($this->tmpFiles[$report]);
+            if ( $filename !== null && file_exists( $filename ) === true ) {
+                unlink( $filename );
+                unset( $this->tmpFiles[ $report ] );
             }
         }
 
@@ -266,57 +266,57 @@ 
      *
      * @return void
      */
-    public function cacheFileReport(File $phpcsFile)
+    public function cacheFileReport( File $phpcsFile )
     {
-        if (isset($this->config->reports) === false) {
+        if ( isset( $this->config->reports ) === false ) {
             // This happens during unit testing, or any time someone just wants
             // the error data and not the printed report.
             return;
         }
 
-        $reportData  = $this->prepareFileReport($phpcsFile);
+        $reportData  = $this->prepareFileReport( $phpcsFile );
         $errorsShown = false;
 
-        foreach ($this->reports as $type => $report) {
-            $reportClass = $report['class'];
+        foreach ( $this->reports as $type => $report ) {
+            $reportClass = $report[ 'class' ];
 
             ob_start();
-            $result = $reportClass->generateFileReport($reportData, $phpcsFile, $this->config->showSources, $this->config->reportWidth);
-            if ($result === true) {
+            $result = $reportClass->generateFileReport( $reportData, $phpcsFile, $this->config->showSources, $this->config->reportWidth );
+            if ( $result === true ) {
                 $errorsShown = true;
             }
 
             $generatedReport = ob_get_contents();
             ob_end_clean();
 
-            if ($report['output'] === null) {
+            if ( $report[ 'output' ] === null ) {
                 // Using a temp file.
-                if (isset($this->tmpFiles[$type]) === false) {
+                if ( isset( $this->tmpFiles[ $type ] ) === false ) {
                     // When running in interactive mode, the reporter prints the full
                     // report many times, which will unlink the temp file. So we need
                     // to create a new one if it doesn't exist.
-                    $this->tmpFiles[$type] = tempnam(sys_get_temp_dir(), 'phpcs');
-                    file_put_contents($this->tmpFiles[$type], '');
+                    $this->tmpFiles[ $type ] = tempnam( sys_get_temp_dir(), 'phpcs' );
+                    file_put_contents( $this->tmpFiles[ $type ], '' );
                 }
 
-                file_put_contents($this->tmpFiles[$type], $generatedReport, (FILE_APPEND | LOCK_EX));
+                file_put_contents( $this->tmpFiles[ $type ], $generatedReport, ( FILE_APPEND | LOCK_EX ) );
             } else {
-                file_put_contents($report['output'], $generatedReport, (FILE_APPEND | LOCK_EX));
+                file_put_contents( $report[ 'output' ], $generatedReport, ( FILE_APPEND | LOCK_EX ) );
             }//end if
         }//end foreach
 
-        if ($errorsShown === true || PHP_CODESNIFFER_CBF === true) {
+        if ( $errorsShown === true || PHP_CODESNIFFER_CBF === true ) {
             $this->totalFiles++;
-            $this->totalErrors   += $reportData['errors'];
-            $this->totalWarnings += $reportData['warnings'];
+            $this->totalErrors   += $reportData[ 'errors' ];
+            $this->totalWarnings += $reportData[ 'warnings' ];
 
             // When PHPCBF is running, we need to use the fixable error values
             // after the report has run and fixed what it can.
-            if (PHP_CODESNIFFER_CBF === true) {
+            if ( PHP_CODESNIFFER_CBF === true ) {
                 $this->totalFixable += $phpcsFile->getFixableCount();
                 $this->totalFixed   += $phpcsFile->getFixedCount();
             } else {
-                $this->totalFixable += $reportData['fixable'];
+                $this->totalFixable += $reportData[ 'fixable' ];
             }
         }
 
@@ -330,25 +330,25 @@ 
      *
      * @return array
      */
-    public function prepareFileReport(File $phpcsFile)
+    public function prepareFileReport( File $phpcsFile )
     {
         $report = [
-            'filename' => Common::stripBasepath($phpcsFile->getFilename(), $this->config->basepath),
+            'filename' => Common::stripBasepath( $phpcsFile->getFilename(), $this->config->basepath ),
             'errors'   => $phpcsFile->getErrorCount(),
             'warnings' => $phpcsFile->getWarningCount(),
             'fixable'  => $phpcsFile->getFixableCount(),
-            'messages' => [],
+            'messages' => [ ],
         ];
 
-        if ($report['errors'] === 0 && $report['warnings'] === 0) {
+        if ( $report[ 'errors' ] === 0 && $report[ 'warnings' ] === 0 ) {
             // Prefect score!
             return $report;
         }
 
-        if ($this->config->recordErrors === false) {
+        if ( $this->config->recordErrors === false ) {
             $message  = 'Errors are not being recorded but this report requires error messages. ';
             $message .= 'This report will not show the correct information.';
-            $report['messages'][1][1] = [
+            $report[ 'messages' ][ 1 ][ 1 ] = [
                 [
                     'message'  => $message,
                     'source'   => 'Internal.RecordErrors',
@@ -360,60 +360,60 @@ 
             return $report;
         }
 
-        $errors = [];
+        $errors = [ ];
 
         // Merge errors and warnings.
-        foreach ($phpcsFile->getErrors() as $line => $lineErrors) {
-            foreach ($lineErrors as $column => $colErrors) {
-                $newErrors = [];
-                foreach ($colErrors as $data) {
-                    $newErrors[] = [
-                        'message'  => $data['message'],
-                        'source'   => $data['source'],
-                        'severity' => $data['severity'],
-                        'fixable'  => $data['fixable'],
+        foreach ( $phpcsFile->getErrors() as $line => $lineErrors ) {
+            foreach ( $lineErrors as $column => $colErrors ) {
+                $newErrors = [ ];
+                foreach ( $colErrors as $data ) {
+                    $newErrors[ ] = [
+                        'message'  => $data[ 'message' ],
+                        'source'   => $data[ 'source' ],
+                        'severity' => $data[ 'severity' ],
+                        'fixable'  => $data[ 'fixable' ],
                         'type'     => 'ERROR',
                     ];
                 }
 
-                $errors[$line][$column] = $newErrors;
+                $errors[ $line ][ $column ] = $newErrors;
             }
 
-            ksort($errors[$line]);
+            ksort( $errors[ $line ] );
         }//end foreach
 
-        foreach ($phpcsFile->getWarnings() as $line => $lineWarnings) {
-            foreach ($lineWarnings as $column => $colWarnings) {
-                $newWarnings = [];
-                foreach ($colWarnings as $data) {
-                    $newWarnings[] = [
-                        'message'  => $data['message'],
-                        'source'   => $data['source'],
-                        'severity' => $data['severity'],
-                        'fixable'  => $data['fixable'],
+        foreach ( $phpcsFile->getWarnings() as $line => $lineWarnings ) {
+            foreach ( $lineWarnings as $column => $colWarnings ) {
+                $newWarnings = [ ];
+                foreach ( $colWarnings as $data ) {
+                    $newWarnings[ ] = [
+                        'message'  => $data[ 'message' ],
+                        'source'   => $data[ 'source' ],
+                        'severity' => $data[ 'severity' ],
+                        'fixable'  => $data[ 'fixable' ],
                         'type'     => 'WARNING',
                     ];
                 }
 
-                if (isset($errors[$line]) === false) {
-                    $errors[$line] = [];
+                if ( isset( $errors[ $line ] ) === false ) {
+                    $errors[ $line ] = [ ];
                 }
 
-                if (isset($errors[$line][$column]) === true) {
-                    $errors[$line][$column] = array_merge(
+                if ( isset( $errors[ $line ][ $column ] ) === true ) {
+                    $errors[ $line ][ $column ] = array_merge(
                         $newWarnings,
-                        $errors[$line][$column]
+                        $errors[ $line ][ $column ]
                     );
                 } else {
-                    $errors[$line][$column] = $newWarnings;
+                    $errors[ $line ][ $column ] = $newWarnings;
                 }
             }//end foreach
 
-            ksort($errors[$line]);
+            ksort( $errors[ $line ] );
         }//end foreach
 
-        ksort($errors);
-        $report['messages'] = $errors;
+        ksort( $errors );
+        $report[ 'messages' ] = $errors;
         return $report;
 
     }//end prepareFileReport()

Braces +6 added lines, -12 removed lines

@@ -15,8 +15,7 @@ 
 use PHP_CodeSniffer\Exceptions\DeepExitException;
 use PHP_CodeSniffer\Util\Common;
 
-class Reporter
-{
+class Reporter {
 
     /**
      * The config data for the run.
@@ -94,8 +93,7 @@ 
      * @return void
      * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If a report is not available.
      */
-    public function __construct(Config $config)
-    {
+    public function __construct(Config $config) {
         $this->config = $config;
 
         foreach ($config->reports as $type => $output) {
@@ -173,8 +171,7 @@ 
      *
      * @return bool
      */
-    public function printReports()
-    {
+    public function printReports() {
         $toScreen = false;
         foreach ($this->reports as $type => $report) {
             if ($report['output'] === null) {
@@ -196,8 +193,7 @@ 
      *
      * @return void
      */
-    public function printReport($report)
-    {
+    public function printReport($report) {
         $reportClass = $this->reports[$report]['class'];
         $reportFile  = $this->reports[$report]['output'];
 
@@ -266,8 +262,7 @@ 
      *
      * @return void
      */
-    public function cacheFileReport(File $phpcsFile)
-    {
+    public function cacheFileReport(File $phpcsFile) {
         if (isset($this->config->reports) === false) {
             // This happens during unit testing, or any time someone just wants
             // the error data and not the printed report.
@@ -330,8 +325,7 @@ 
      *
      * @return array
      */
-    public function prepareFileReport(File $phpcsFile)
-    {
+    public function prepareFileReport(File $phpcsFile) {
         $report = [
             'filename' => Common::stripBasepath($phpcsFile->getFilename(), $this->config->basepath),
             'errors'   => $phpcsFile->getErrorCount(),

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

Indentation +1888 added lines, -1888 removed lines

@@ -15,660 +15,660 @@ 
 {
 
 
-    /**
-     * A list of tokens that are allowed to open a scope.
-     *
-     * This array also contains information about what kind of token the scope
-     * opener uses to open and close the scope, if the token strictly requires
-     * an opener, if the token can share a scope closer, and who it can be shared
-     * with. An example of a token that shares a scope closer is a CASE scope.
-     *
-     * @var array
-     */
-    public $scopeOpeners = [
-        T_IF            => [
-            'start'  => [
-                T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET,
-                T_COLON              => T_COLON,
-            ],
-            'end'    => [
-                T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET,
-                T_ENDIF               => T_ENDIF,
-                T_ELSE                => T_ELSE,
-                T_ELSEIF              => T_ELSEIF,
-            ],
-            'strict' => false,
-            'shared' => false,
-            'with'   => [
-                T_ELSE   => T_ELSE,
-                T_ELSEIF => T_ELSEIF,
-            ],
-        ],
-        T_TRY           => [
-            'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
-            'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
-            'strict' => true,
-            'shared' => false,
-            'with'   => [],
-        ],
-        T_CATCH         => [
-            'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
-            'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
-            'strict' => true,
-            'shared' => false,
-            'with'   => [],
-        ],
-        T_FINALLY       => [
-            'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
-            'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
-            'strict' => true,
-            'shared' => false,
-            'with'   => [],
-        ],
-        T_ELSE          => [
-            'start'  => [
-                T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET,
-                T_COLON              => T_COLON,
-            ],
-            'end'    => [
-                T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET,
-                T_ENDIF               => T_ENDIF,
-            ],
-            'strict' => false,
-            'shared' => false,
-            'with'   => [
-                T_IF     => T_IF,
-                T_ELSEIF => T_ELSEIF,
-            ],
-        ],
-        T_ELSEIF        => [
-            'start'  => [
-                T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET,
-                T_COLON              => T_COLON,
-            ],
-            'end'    => [
-                T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET,
-                T_ENDIF               => T_ENDIF,
-                T_ELSE                => T_ELSE,
-                T_ELSEIF              => T_ELSEIF,
-            ],
-            'strict' => false,
-            'shared' => false,
-            'with'   => [
-                T_IF   => T_IF,
-                T_ELSE => T_ELSE,
-            ],
-        ],
-        T_FOR           => [
-            'start'  => [
-                T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET,
-                T_COLON              => T_COLON,
-            ],
-            'end'    => [
-                T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET,
-                T_ENDFOR              => T_ENDFOR,
-            ],
-            'strict' => false,
-            'shared' => false,
-            'with'   => [],
-        ],
-        T_FOREACH       => [
-            'start'  => [
-                T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET,
-                T_COLON              => T_COLON,
-            ],
-            'end'    => [
-                T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET,
-                T_ENDFOREACH          => T_ENDFOREACH,
-            ],
-            'strict' => false,
-            'shared' => false,
-            'with'   => [],
-        ],
-        T_INTERFACE     => [
-            'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
-            'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
-            'strict' => true,
-            'shared' => false,
-            'with'   => [],
-        ],
-        T_FUNCTION      => [
-            'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
-            'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
-            'strict' => true,
-            'shared' => false,
-            'with'   => [],
-        ],
-        T_CLASS         => [
-            'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
-            'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
-            'strict' => true,
-            'shared' => false,
-            'with'   => [],
-        ],
-        T_TRAIT         => [
-            'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
-            'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
-            'strict' => true,
-            'shared' => false,
-            'with'   => [],
-        ],
-        T_USE           => [
-            'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
-            'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
-            'strict' => false,
-            'shared' => false,
-            'with'   => [],
-        ],
-        T_DECLARE       => [
-            'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
-            'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
-            'strict' => false,
-            'shared' => false,
-            'with'   => [],
-        ],
-        T_NAMESPACE     => [
-            'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
-            'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
-            'strict' => false,
-            'shared' => false,
-            'with'   => [],
-        ],
-        T_WHILE         => [
-            'start'  => [
-                T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET,
-                T_COLON              => T_COLON,
-            ],
-            'end'    => [
-                T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET,
-                T_ENDWHILE            => T_ENDWHILE,
-            ],
-            'strict' => false,
-            'shared' => false,
-            'with'   => [],
-        ],
-        T_DO            => [
-            'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
-            'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
-            'strict' => true,
-            'shared' => false,
-            'with'   => [],
-        ],
-        T_SWITCH        => [
-            'start'  => [
-                T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET,
-                T_COLON              => T_COLON,
-            ],
-            'end'    => [
-                T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET,
-                T_ENDSWITCH           => T_ENDSWITCH,
-            ],
-            'strict' => true,
-            'shared' => false,
-            'with'   => [],
-        ],
-        T_CASE          => [
-            'start'  => [
-                T_COLON     => T_COLON,
-                T_SEMICOLON => T_SEMICOLON,
-            ],
-            'end'    => [
-                T_BREAK    => T_BREAK,
-                T_RETURN   => T_RETURN,
-                T_CONTINUE => T_CONTINUE,
-                T_THROW    => T_THROW,
-                T_EXIT     => T_EXIT,
-            ],
-            'strict' => true,
-            'shared' => true,
-            'with'   => [
-                T_DEFAULT => T_DEFAULT,
-                T_CASE    => T_CASE,
-                T_SWITCH  => T_SWITCH,
-            ],
-        ],
-        T_DEFAULT       => [
-            'start'  => [
-                T_COLON     => T_COLON,
-                T_SEMICOLON => T_SEMICOLON,
-            ],
-            'end'    => [
-                T_BREAK    => T_BREAK,
-                T_RETURN   => T_RETURN,
-                T_CONTINUE => T_CONTINUE,
-                T_THROW    => T_THROW,
-                T_EXIT     => T_EXIT,
-            ],
-            'strict' => true,
-            'shared' => true,
-            'with'   => [
-                T_CASE   => T_CASE,
-                T_SWITCH => T_SWITCH,
-            ],
-        ],
-        T_START_HEREDOC => [
-            'start'  => [T_START_HEREDOC => T_START_HEREDOC],
-            'end'    => [T_END_HEREDOC => T_END_HEREDOC],
-            'strict' => true,
-            'shared' => false,
-            'with'   => [],
-        ],
-        T_START_NOWDOC  => [
-            'start'  => [T_START_NOWDOC => T_START_NOWDOC],
-            'end'    => [T_END_NOWDOC => T_END_NOWDOC],
-            'strict' => true,
-            'shared' => false,
-            'with'   => [],
-        ],
-    ];
-
-    /**
-     * A list of tokens that end the scope.
-     *
-     * This array is just a unique collection of the end tokens
-     * from the scopeOpeners array. The data is duplicated here to
-     * save time during parsing of the file.
-     *
-     * @var array
-     */
-    public $endScopeTokens = [
-        T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET,
-        T_ENDIF               => T_ENDIF,
-        T_ENDFOR              => T_ENDFOR,
-        T_ENDFOREACH          => T_ENDFOREACH,
-        T_ENDWHILE            => T_ENDWHILE,
-        T_ENDSWITCH           => T_ENDSWITCH,
-        T_BREAK               => T_BREAK,
-        T_END_HEREDOC         => T_END_HEREDOC,
-    ];
-
-    /**
-     * Known lengths of tokens.
-     *
-     * @var array<int, int>
-     */
-    public $knownLengths = [
-        T_ABSTRACT                 => 8,
-        T_AND_EQUAL                => 2,
-        T_ARRAY                    => 5,
-        T_AS                       => 2,
-        T_BOOLEAN_AND              => 2,
-        T_BOOLEAN_OR               => 2,
-        T_BREAK                    => 5,
-        T_CALLABLE                 => 8,
-        T_CASE                     => 4,
-        T_CATCH                    => 5,
-        T_CLASS                    => 5,
-        T_CLASS_C                  => 9,
-        T_CLONE                    => 5,
-        T_CONCAT_EQUAL             => 2,
-        T_CONST                    => 5,
-        T_CONTINUE                 => 8,
-        T_CURLY_OPEN               => 2,
-        T_DEC                      => 2,
-        T_DECLARE                  => 7,
-        T_DEFAULT                  => 7,
-        T_DIR                      => 7,
-        T_DIV_EQUAL                => 2,
-        T_DO                       => 2,
-        T_DOLLAR_OPEN_CURLY_BRACES => 2,
-        T_DOUBLE_ARROW             => 2,
-        T_DOUBLE_COLON             => 2,
-        T_ECHO                     => 4,
-        T_ELSE                     => 4,
-        T_ELSEIF                   => 6,
-        T_EMPTY                    => 5,
-        T_ENDDECLARE               => 10,
-        T_ENDFOR                   => 6,
-        T_ENDFOREACH               => 10,
-        T_ENDIF                    => 5,
-        T_ENDSWITCH                => 9,
-        T_ENDWHILE                 => 8,
-        T_EVAL                     => 4,
-        T_EXTENDS                  => 7,
-        T_FILE                     => 8,
-        T_FINAL                    => 5,
-        T_FINALLY                  => 7,
-        T_FOR                      => 3,
-        T_FOREACH                  => 7,
-        T_FUNCTION                 => 8,
-        T_FUNC_C                   => 12,
-        T_GLOBAL                   => 6,
-        T_GOTO                     => 4,
-        T_HALT_COMPILER            => 15,
-        T_IF                       => 2,
-        T_IMPLEMENTS               => 10,
-        T_INC                      => 2,
-        T_INCLUDE                  => 7,
-        T_INCLUDE_ONCE             => 12,
-        T_INSTANCEOF               => 10,
-        T_INSTEADOF                => 9,
-        T_INTERFACE                => 9,
-        T_ISSET                    => 5,
-        T_IS_EQUAL                 => 2,
-        T_IS_GREATER_OR_EQUAL      => 2,
-        T_IS_IDENTICAL             => 3,
-        T_IS_NOT_EQUAL             => 2,
-        T_IS_NOT_IDENTICAL         => 3,
-        T_IS_SMALLER_OR_EQUAL      => 2,
-        T_LINE                     => 8,
-        T_LIST                     => 4,
-        T_LOGICAL_AND              => 3,
-        T_LOGICAL_OR               => 2,
-        T_LOGICAL_XOR              => 3,
-        T_METHOD_C                 => 10,
-        T_MINUS_EQUAL              => 2,
-        T_POW_EQUAL                => 3,
-        T_MOD_EQUAL                => 2,
-        T_MUL_EQUAL                => 2,
-        T_NAMESPACE                => 9,
-        T_NS_C                     => 13,
-        T_NS_SEPARATOR             => 1,
-        T_NEW                      => 3,
-        T_OBJECT_OPERATOR          => 2,
-        T_OPEN_TAG_WITH_ECHO       => 3,
-        T_OR_EQUAL                 => 2,
-        T_PLUS_EQUAL               => 2,
-        T_PRINT                    => 5,
-        T_PRIVATE                  => 7,
-        T_PUBLIC                   => 6,
-        T_PROTECTED                => 9,
-        T_REQUIRE                  => 7,
-        T_REQUIRE_ONCE             => 12,
-        T_RETURN                   => 6,
-        T_STATIC                   => 6,
-        T_SWITCH                   => 6,
-        T_THROW                    => 5,
-        T_TRAIT                    => 5,
-        T_TRAIT_C                  => 9,
-        T_TRY                      => 3,
-        T_UNSET                    => 5,
-        T_USE                      => 3,
-        T_VAR                      => 3,
-        T_WHILE                    => 5,
-        T_XOR_EQUAL                => 2,
-        T_YIELD                    => 5,
-        T_OPEN_CURLY_BRACKET       => 1,
-        T_CLOSE_CURLY_BRACKET      => 1,
-        T_OPEN_SQUARE_BRACKET      => 1,
-        T_CLOSE_SQUARE_BRACKET     => 1,
-        T_OPEN_PARENTHESIS         => 1,
-        T_CLOSE_PARENTHESIS        => 1,
-        T_COLON                    => 1,
-        T_STRING_CONCAT            => 1,
-        T_INLINE_THEN              => 1,
-        T_INLINE_ELSE              => 1,
-        T_NULLABLE                 => 1,
-        T_NULL                     => 4,
-        T_FALSE                    => 5,
-        T_TRUE                     => 4,
-        T_SEMICOLON                => 1,
-        T_EQUAL                    => 1,
-        T_MULTIPLY                 => 1,
-        T_DIVIDE                   => 1,
-        T_PLUS                     => 1,
-        T_MINUS                    => 1,
-        T_MODULUS                  => 1,
-        T_POW                      => 2,
-        T_SPACESHIP                => 3,
-        T_COALESCE                 => 2,
-        T_COALESCE_EQUAL           => 3,
-        T_BITWISE_AND              => 1,
-        T_BITWISE_OR               => 1,
-        T_BITWISE_XOR              => 1,
-        T_SL                       => 2,
-        T_SR                       => 2,
-        T_SL_EQUAL                 => 3,
-        T_SR_EQUAL                 => 3,
-        T_GREATER_THAN             => 1,
-        T_LESS_THAN                => 1,
-        T_BOOLEAN_NOT              => 1,
-        T_SELF                     => 4,
-        T_PARENT                   => 6,
-        T_COMMA                    => 1,
-        T_THIS                     => 4,
-        T_CLOSURE                  => 8,
-        T_BACKTICK                 => 1,
-        T_OPEN_SHORT_ARRAY         => 1,
-        T_CLOSE_SHORT_ARRAY        => 1,
-    ];
-
-
-    /**
-     * A cache of different token types, resolved into arrays.
-     *
-     * @var array
-     * @see standardiseToken()
-     */
-    private static $resolveTokenCache = [];
-
-
-    /**
-     * Creates an array of tokens when given some PHP code.
-     *
-     * Starts by using token_get_all() but does a lot of extra processing
-     * to insert information about the context of the token.
-     *
-     * @param string $string The string to tokenize.
-     *
-     * @return array
-     */
-    protected function tokenize($string)
-    {
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            echo "\t*** START PHP TOKENIZING ***".PHP_EOL;
-            $isWin = false;
-            if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-                $isWin = true;
-            }
-        }
-
-        $tokens      = @token_get_all($string);
-        $finalTokens = [];
-
-        $newStackPtr       = 0;
-        $numTokens         = count($tokens);
-        $lastNotEmptyToken = 0;
-
-        $insideInlineIf = [];
-        $insideUseGroup = false;
-
-        $commentTokenizer = new Comment();
-
-        for ($stackPtr = 0; $stackPtr < $numTokens; $stackPtr++) {
-            // Special case for tokens we have needed to blank out.
-            if ($tokens[$stackPtr] === null) {
-                continue;
-            }
-
-            $token        = (array) $tokens[$stackPtr];
-            $tokenIsArray = isset($token[1]);
-
-            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                if ($tokenIsArray === true) {
-                    $type    = Util\Tokens::tokenName($token[0]);
-                    $content = Util\Common::prepareForOutput($token[1]);
-                } else {
-                    $newToken = self::resolveSimpleToken($token[0]);
-                    $type     = $newToken['type'];
-                    $content  = Util\Common::prepareForOutput($token[0]);
-                }
-
-                echo "\tProcess token ";
-                if ($tokenIsArray === true) {
-                    echo "[$stackPtr]";
-                } else {
-                    echo " $stackPtr ";
-                }
-
-                echo ": $type => $content";
-            }//end if
-
-            if ($newStackPtr > 0
-                && isset(Util\Tokens::$emptyTokens[$finalTokens[($newStackPtr - 1)]['code']]) === false
-            ) {
-                $lastNotEmptyToken = ($newStackPtr - 1);
-            }
-
-            /*
+	/**
+	 * A list of tokens that are allowed to open a scope.
+	 *
+	 * This array also contains information about what kind of token the scope
+	 * opener uses to open and close the scope, if the token strictly requires
+	 * an opener, if the token can share a scope closer, and who it can be shared
+	 * with. An example of a token that shares a scope closer is a CASE scope.
+	 *
+	 * @var array
+	 */
+	public $scopeOpeners = [
+		T_IF            => [
+			'start'  => [
+				T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET,
+				T_COLON              => T_COLON,
+			],
+			'end'    => [
+				T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET,
+				T_ENDIF               => T_ENDIF,
+				T_ELSE                => T_ELSE,
+				T_ELSEIF              => T_ELSEIF,
+			],
+			'strict' => false,
+			'shared' => false,
+			'with'   => [
+				T_ELSE   => T_ELSE,
+				T_ELSEIF => T_ELSEIF,
+			],
+		],
+		T_TRY           => [
+			'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
+			'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
+			'strict' => true,
+			'shared' => false,
+			'with'   => [],
+		],
+		T_CATCH         => [
+			'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
+			'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
+			'strict' => true,
+			'shared' => false,
+			'with'   => [],
+		],
+		T_FINALLY       => [
+			'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
+			'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
+			'strict' => true,
+			'shared' => false,
+			'with'   => [],
+		],
+		T_ELSE          => [
+			'start'  => [
+				T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET,
+				T_COLON              => T_COLON,
+			],
+			'end'    => [
+				T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET,
+				T_ENDIF               => T_ENDIF,
+			],
+			'strict' => false,
+			'shared' => false,
+			'with'   => [
+				T_IF     => T_IF,
+				T_ELSEIF => T_ELSEIF,
+			],
+		],
+		T_ELSEIF        => [
+			'start'  => [
+				T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET,
+				T_COLON              => T_COLON,
+			],
+			'end'    => [
+				T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET,
+				T_ENDIF               => T_ENDIF,
+				T_ELSE                => T_ELSE,
+				T_ELSEIF              => T_ELSEIF,
+			],
+			'strict' => false,
+			'shared' => false,
+			'with'   => [
+				T_IF   => T_IF,
+				T_ELSE => T_ELSE,
+			],
+		],
+		T_FOR           => [
+			'start'  => [
+				T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET,
+				T_COLON              => T_COLON,
+			],
+			'end'    => [
+				T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET,
+				T_ENDFOR              => T_ENDFOR,
+			],
+			'strict' => false,
+			'shared' => false,
+			'with'   => [],
+		],
+		T_FOREACH       => [
+			'start'  => [
+				T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET,
+				T_COLON              => T_COLON,
+			],
+			'end'    => [
+				T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET,
+				T_ENDFOREACH          => T_ENDFOREACH,
+			],
+			'strict' => false,
+			'shared' => false,
+			'with'   => [],
+		],
+		T_INTERFACE     => [
+			'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
+			'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
+			'strict' => true,
+			'shared' => false,
+			'with'   => [],
+		],
+		T_FUNCTION      => [
+			'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
+			'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
+			'strict' => true,
+			'shared' => false,
+			'with'   => [],
+		],
+		T_CLASS         => [
+			'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
+			'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
+			'strict' => true,
+			'shared' => false,
+			'with'   => [],
+		],
+		T_TRAIT         => [
+			'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
+			'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
+			'strict' => true,
+			'shared' => false,
+			'with'   => [],
+		],
+		T_USE           => [
+			'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
+			'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
+			'strict' => false,
+			'shared' => false,
+			'with'   => [],
+		],
+		T_DECLARE       => [
+			'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
+			'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
+			'strict' => false,
+			'shared' => false,
+			'with'   => [],
+		],
+		T_NAMESPACE     => [
+			'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
+			'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
+			'strict' => false,
+			'shared' => false,
+			'with'   => [],
+		],
+		T_WHILE         => [
+			'start'  => [
+				T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET,
+				T_COLON              => T_COLON,
+			],
+			'end'    => [
+				T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET,
+				T_ENDWHILE            => T_ENDWHILE,
+			],
+			'strict' => false,
+			'shared' => false,
+			'with'   => [],
+		],
+		T_DO            => [
+			'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
+			'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
+			'strict' => true,
+			'shared' => false,
+			'with'   => [],
+		],
+		T_SWITCH        => [
+			'start'  => [
+				T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET,
+				T_COLON              => T_COLON,
+			],
+			'end'    => [
+				T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET,
+				T_ENDSWITCH           => T_ENDSWITCH,
+			],
+			'strict' => true,
+			'shared' => false,
+			'with'   => [],
+		],
+		T_CASE          => [
+			'start'  => [
+				T_COLON     => T_COLON,
+				T_SEMICOLON => T_SEMICOLON,
+			],
+			'end'    => [
+				T_BREAK    => T_BREAK,
+				T_RETURN   => T_RETURN,
+				T_CONTINUE => T_CONTINUE,
+				T_THROW    => T_THROW,
+				T_EXIT     => T_EXIT,
+			],
+			'strict' => true,
+			'shared' => true,
+			'with'   => [
+				T_DEFAULT => T_DEFAULT,
+				T_CASE    => T_CASE,
+				T_SWITCH  => T_SWITCH,
+			],
+		],
+		T_DEFAULT       => [
+			'start'  => [
+				T_COLON     => T_COLON,
+				T_SEMICOLON => T_SEMICOLON,
+			],
+			'end'    => [
+				T_BREAK    => T_BREAK,
+				T_RETURN   => T_RETURN,
+				T_CONTINUE => T_CONTINUE,
+				T_THROW    => T_THROW,
+				T_EXIT     => T_EXIT,
+			],
+			'strict' => true,
+			'shared' => true,
+			'with'   => [
+				T_CASE   => T_CASE,
+				T_SWITCH => T_SWITCH,
+			],
+		],
+		T_START_HEREDOC => [
+			'start'  => [T_START_HEREDOC => T_START_HEREDOC],
+			'end'    => [T_END_HEREDOC => T_END_HEREDOC],
+			'strict' => true,
+			'shared' => false,
+			'with'   => [],
+		],
+		T_START_NOWDOC  => [
+			'start'  => [T_START_NOWDOC => T_START_NOWDOC],
+			'end'    => [T_END_NOWDOC => T_END_NOWDOC],
+			'strict' => true,
+			'shared' => false,
+			'with'   => [],
+		],
+	];
+
+	/**
+	 * A list of tokens that end the scope.
+	 *
+	 * This array is just a unique collection of the end tokens
+	 * from the scopeOpeners array. The data is duplicated here to
+	 * save time during parsing of the file.
+	 *
+	 * @var array
+	 */
+	public $endScopeTokens = [
+		T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET,
+		T_ENDIF               => T_ENDIF,
+		T_ENDFOR              => T_ENDFOR,
+		T_ENDFOREACH          => T_ENDFOREACH,
+		T_ENDWHILE            => T_ENDWHILE,
+		T_ENDSWITCH           => T_ENDSWITCH,
+		T_BREAK               => T_BREAK,
+		T_END_HEREDOC         => T_END_HEREDOC,
+	];
+
+	/**
+	 * Known lengths of tokens.
+	 *
+	 * @var array<int, int>
+	 */
+	public $knownLengths = [
+		T_ABSTRACT                 => 8,
+		T_AND_EQUAL                => 2,
+		T_ARRAY                    => 5,
+		T_AS                       => 2,
+		T_BOOLEAN_AND              => 2,
+		T_BOOLEAN_OR               => 2,
+		T_BREAK                    => 5,
+		T_CALLABLE                 => 8,
+		T_CASE                     => 4,
+		T_CATCH                    => 5,
+		T_CLASS                    => 5,
+		T_CLASS_C                  => 9,
+		T_CLONE                    => 5,
+		T_CONCAT_EQUAL             => 2,
+		T_CONST                    => 5,
+		T_CONTINUE                 => 8,
+		T_CURLY_OPEN               => 2,
+		T_DEC                      => 2,
+		T_DECLARE                  => 7,
+		T_DEFAULT                  => 7,
+		T_DIR                      => 7,
+		T_DIV_EQUAL                => 2,
+		T_DO                       => 2,
+		T_DOLLAR_OPEN_CURLY_BRACES => 2,
+		T_DOUBLE_ARROW             => 2,
+		T_DOUBLE_COLON             => 2,
+		T_ECHO                     => 4,
+		T_ELSE                     => 4,
+		T_ELSEIF                   => 6,
+		T_EMPTY                    => 5,
+		T_ENDDECLARE               => 10,
+		T_ENDFOR                   => 6,
+		T_ENDFOREACH               => 10,
+		T_ENDIF                    => 5,
+		T_ENDSWITCH                => 9,
+		T_ENDWHILE                 => 8,
+		T_EVAL                     => 4,
+		T_EXTENDS                  => 7,
+		T_FILE                     => 8,
+		T_FINAL                    => 5,
+		T_FINALLY                  => 7,
+		T_FOR                      => 3,
+		T_FOREACH                  => 7,
+		T_FUNCTION                 => 8,
+		T_FUNC_C                   => 12,
+		T_GLOBAL                   => 6,
+		T_GOTO                     => 4,
+		T_HALT_COMPILER            => 15,
+		T_IF                       => 2,
+		T_IMPLEMENTS               => 10,
+		T_INC                      => 2,
+		T_INCLUDE                  => 7,
+		T_INCLUDE_ONCE             => 12,
+		T_INSTANCEOF               => 10,
+		T_INSTEADOF                => 9,
+		T_INTERFACE                => 9,
+		T_ISSET                    => 5,
+		T_IS_EQUAL                 => 2,
+		T_IS_GREATER_OR_EQUAL      => 2,
+		T_IS_IDENTICAL             => 3,
+		T_IS_NOT_EQUAL             => 2,
+		T_IS_NOT_IDENTICAL         => 3,
+		T_IS_SMALLER_OR_EQUAL      => 2,
+		T_LINE                     => 8,
+		T_LIST                     => 4,
+		T_LOGICAL_AND              => 3,
+		T_LOGICAL_OR               => 2,
+		T_LOGICAL_XOR              => 3,
+		T_METHOD_C                 => 10,
+		T_MINUS_EQUAL              => 2,
+		T_POW_EQUAL                => 3,
+		T_MOD_EQUAL                => 2,
+		T_MUL_EQUAL                => 2,
+		T_NAMESPACE                => 9,
+		T_NS_C                     => 13,
+		T_NS_SEPARATOR             => 1,
+		T_NEW                      => 3,
+		T_OBJECT_OPERATOR          => 2,
+		T_OPEN_TAG_WITH_ECHO       => 3,
+		T_OR_EQUAL                 => 2,
+		T_PLUS_EQUAL               => 2,
+		T_PRINT                    => 5,
+		T_PRIVATE                  => 7,
+		T_PUBLIC                   => 6,
+		T_PROTECTED                => 9,
+		T_REQUIRE                  => 7,
+		T_REQUIRE_ONCE             => 12,
+		T_RETURN                   => 6,
+		T_STATIC                   => 6,
+		T_SWITCH                   => 6,
+		T_THROW                    => 5,
+		T_TRAIT                    => 5,
+		T_TRAIT_C                  => 9,
+		T_TRY                      => 3,
+		T_UNSET                    => 5,
+		T_USE                      => 3,
+		T_VAR                      => 3,
+		T_WHILE                    => 5,
+		T_XOR_EQUAL                => 2,
+		T_YIELD                    => 5,
+		T_OPEN_CURLY_BRACKET       => 1,
+		T_CLOSE_CURLY_BRACKET      => 1,
+		T_OPEN_SQUARE_BRACKET      => 1,
+		T_CLOSE_SQUARE_BRACKET     => 1,
+		T_OPEN_PARENTHESIS         => 1,
+		T_CLOSE_PARENTHESIS        => 1,
+		T_COLON                    => 1,
+		T_STRING_CONCAT            => 1,
+		T_INLINE_THEN              => 1,
+		T_INLINE_ELSE              => 1,
+		T_NULLABLE                 => 1,
+		T_NULL                     => 4,
+		T_FALSE                    => 5,
+		T_TRUE                     => 4,
+		T_SEMICOLON                => 1,
+		T_EQUAL                    => 1,
+		T_MULTIPLY                 => 1,
+		T_DIVIDE                   => 1,
+		T_PLUS                     => 1,
+		T_MINUS                    => 1,
+		T_MODULUS                  => 1,
+		T_POW                      => 2,
+		T_SPACESHIP                => 3,
+		T_COALESCE                 => 2,
+		T_COALESCE_EQUAL           => 3,
+		T_BITWISE_AND              => 1,
+		T_BITWISE_OR               => 1,
+		T_BITWISE_XOR              => 1,
+		T_SL                       => 2,
+		T_SR                       => 2,
+		T_SL_EQUAL                 => 3,
+		T_SR_EQUAL                 => 3,
+		T_GREATER_THAN             => 1,
+		T_LESS_THAN                => 1,
+		T_BOOLEAN_NOT              => 1,
+		T_SELF                     => 4,
+		T_PARENT                   => 6,
+		T_COMMA                    => 1,
+		T_THIS                     => 4,
+		T_CLOSURE                  => 8,
+		T_BACKTICK                 => 1,
+		T_OPEN_SHORT_ARRAY         => 1,
+		T_CLOSE_SHORT_ARRAY        => 1,
+	];
+
+
+	/**
+	 * A cache of different token types, resolved into arrays.
+	 *
+	 * @var array
+	 * @see standardiseToken()
+	 */
+	private static $resolveTokenCache = [];
+
+
+	/**
+	 * Creates an array of tokens when given some PHP code.
+	 *
+	 * Starts by using token_get_all() but does a lot of extra processing
+	 * to insert information about the context of the token.
+	 *
+	 * @param string $string The string to tokenize.
+	 *
+	 * @return array
+	 */
+	protected function tokenize($string)
+	{
+		if (PHP_CODESNIFFER_VERBOSITY > 1) {
+			echo "\t*** START PHP TOKENIZING ***".PHP_EOL;
+			$isWin = false;
+			if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+				$isWin = true;
+			}
+		}
+
+		$tokens      = @token_get_all($string);
+		$finalTokens = [];
+
+		$newStackPtr       = 0;
+		$numTokens         = count($tokens);
+		$lastNotEmptyToken = 0;
+
+		$insideInlineIf = [];
+		$insideUseGroup = false;
+
+		$commentTokenizer = new Comment();
+
+		for ($stackPtr = 0; $stackPtr < $numTokens; $stackPtr++) {
+			// Special case for tokens we have needed to blank out.
+			if ($tokens[$stackPtr] === null) {
+				continue;
+			}
+
+			$token        = (array) $tokens[$stackPtr];
+			$tokenIsArray = isset($token[1]);
+
+			if (PHP_CODESNIFFER_VERBOSITY > 1) {
+				if ($tokenIsArray === true) {
+					$type    = Util\Tokens::tokenName($token[0]);
+					$content = Util\Common::prepareForOutput($token[1]);
+				} else {
+					$newToken = self::resolveSimpleToken($token[0]);
+					$type     = $newToken['type'];
+					$content  = Util\Common::prepareForOutput($token[0]);
+				}
+
+				echo "\tProcess token ";
+				if ($tokenIsArray === true) {
+					echo "[$stackPtr]";
+				} else {
+					echo " $stackPtr ";
+				}
+
+				echo ": $type => $content";
+			}//end if
+
+			if ($newStackPtr > 0
+				&& isset(Util\Tokens::$emptyTokens[$finalTokens[($newStackPtr - 1)]['code']]) === false
+			) {
+				$lastNotEmptyToken = ($newStackPtr - 1);
+			}
+
+			/*
                 If we are using \r\n newline characters, the \r and \n are sometimes
                 split over two tokens. This normally occurs after comments. We need
                 to merge these two characters together so that our line endings are
                 consistent for all lines.
             */
 
-            if ($tokenIsArray === true && substr($token[1], -1) === "\r") {
-                if (isset($tokens[($stackPtr + 1)]) === true
-                    && is_array($tokens[($stackPtr + 1)]) === true
-                    && $tokens[($stackPtr + 1)][1][0] === "\n"
-                ) {
-                    $token[1] .= "\n";
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        if ($isWin === true) {
-                            echo '\n';
-                        } else {
-                            echo "\033[30;1m\\n\033[0m";
-                        }
-                    }
-
-                    if ($tokens[($stackPtr + 1)][1] === "\n") {
-                        // This token's content has been merged into the previous,
-                        // so we can skip it.
-                        $tokens[($stackPtr + 1)] = '';
-                    } else {
-                        $tokens[($stackPtr + 1)][1] = substr($tokens[($stackPtr + 1)][1], 1);
-                    }
-                }
-            }//end if
-
-            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                echo PHP_EOL;
-            }
-
-            /*
+			if ($tokenIsArray === true && substr($token[1], -1) === "\r") {
+				if (isset($tokens[($stackPtr + 1)]) === true
+					&& is_array($tokens[($stackPtr + 1)]) === true
+					&& $tokens[($stackPtr + 1)][1][0] === "\n"
+				) {
+					$token[1] .= "\n";
+					if (PHP_CODESNIFFER_VERBOSITY > 1) {
+						if ($isWin === true) {
+							echo '\n';
+						} else {
+							echo "\033[30;1m\\n\033[0m";
+						}
+					}
+
+					if ($tokens[($stackPtr + 1)][1] === "\n") {
+						// This token's content has been merged into the previous,
+						// so we can skip it.
+						$tokens[($stackPtr + 1)] = '';
+					} else {
+						$tokens[($stackPtr + 1)][1] = substr($tokens[($stackPtr + 1)][1], 1);
+					}
+				}
+			}//end if
+
+			if (PHP_CODESNIFFER_VERBOSITY > 1) {
+				echo PHP_EOL;
+			}
+
+			/*
                 Parse doc blocks into something that can be easily iterated over.
             */
 
-            if ($tokenIsArray === true
-                && ($token[0] === T_DOC_COMMENT
-                || ($token[0] === T_COMMENT && strpos($token[1], '/**') === 0))
-            ) {
-                $commentTokens = $commentTokenizer->tokenizeString($token[1], $this->eolChar, $newStackPtr);
-                foreach ($commentTokens as $commentToken) {
-                    $finalTokens[$newStackPtr] = $commentToken;
-                    $newStackPtr++;
-                }
+			if ($tokenIsArray === true
+				&& ($token[0] === T_DOC_COMMENT
+				|| ($token[0] === T_COMMENT && strpos($token[1], '/**') === 0))
+			) {
+				$commentTokens = $commentTokenizer->tokenizeString($token[1], $this->eolChar, $newStackPtr);
+				foreach ($commentTokens as $commentToken) {
+					$finalTokens[$newStackPtr] = $commentToken;
+					$newStackPtr++;
+				}
 
-                continue;
-            }
+				continue;
+			}
 
-            /*
+			/*
                 If this is a double quoted string, PHP will tokenize the whole
                 thing which causes problems with the scope map when braces are
                 within the string. So we need to merge the tokens together to
                 provide a single string.
             */
 
-            if ($tokenIsArray === false && ($token[0] === '"' || $token[0] === 'b"')) {
-                // Binary casts need a special token.
-                if ($token[0] === 'b"') {
-                    $finalTokens[$newStackPtr] = [
-                        'code'    => T_BINARY_CAST,
-                        'type'    => 'T_BINARY_CAST',
-                        'content' => 'b',
-                    ];
-                    $newStackPtr++;
-                }
-
-                $tokenContent = '"';
-                $nestedVars   = [];
-                for ($i = ($stackPtr + 1); $i < $numTokens; $i++) {
-                    $subToken        = (array) $tokens[$i];
-                    $subTokenIsArray = isset($subToken[1]);
-
-                    if ($subTokenIsArray === true) {
-                        $tokenContent .= $subToken[1];
-                        if ($subToken[1] === '{'
-                            && $subToken[0] !== T_ENCAPSED_AND_WHITESPACE
-                        ) {
-                            $nestedVars[] = $i;
-                        }
-                    } else {
-                        $tokenContent .= $subToken[0];
-                        if ($subToken[0] === '}') {
-                            array_pop($nestedVars);
-                        }
-                    }
-
-                    if ($subTokenIsArray === false
-                        && $subToken[0] === '"'
-                        && empty($nestedVars) === true
-                    ) {
-                        // We found the other end of the double quoted string.
-                        break;
-                    }
-                }//end for
-
-                $stackPtr = $i;
-
-                // Convert each line within the double quoted string to a
-                // new token, so it conforms with other multiple line tokens.
-                $tokenLines = explode($this->eolChar, $tokenContent);
-                $numLines   = count($tokenLines);
-                $newToken   = [];
-
-                for ($j = 0; $j < $numLines; $j++) {
-                    $newToken['content'] = $tokenLines[$j];
-                    if ($j === ($numLines - 1)) {
-                        if ($tokenLines[$j] === '') {
-                            break;
-                        }
-                    } else {
-                        $newToken['content'] .= $this->eolChar;
-                    }
-
-                    $newToken['code']          = T_DOUBLE_QUOTED_STRING;
-                    $newToken['type']          = 'T_DOUBLE_QUOTED_STRING';
-                    $finalTokens[$newStackPtr] = $newToken;
-                    $newStackPtr++;
-                }
-
-                // Continue, as we're done with this token.
-                continue;
-            }//end if
-
-            /*
+			if ($tokenIsArray === false && ($token[0] === '"' || $token[0] === 'b"')) {
+				// Binary casts need a special token.
+				if ($token[0] === 'b"') {
+					$finalTokens[$newStackPtr] = [
+						'code'    => T_BINARY_CAST,
+						'type'    => 'T_BINARY_CAST',
+						'content' => 'b',
+					];
+					$newStackPtr++;
+				}
+
+				$tokenContent = '"';
+				$nestedVars   = [];
+				for ($i = ($stackPtr + 1); $i < $numTokens; $i++) {
+					$subToken        = (array) $tokens[$i];
+					$subTokenIsArray = isset($subToken[1]);
+
+					if ($subTokenIsArray === true) {
+						$tokenContent .= $subToken[1];
+						if ($subToken[1] === '{'
+							&& $subToken[0] !== T_ENCAPSED_AND_WHITESPACE
+						) {
+							$nestedVars[] = $i;
+						}
+					} else {
+						$tokenContent .= $subToken[0];
+						if ($subToken[0] === '}') {
+							array_pop($nestedVars);
+						}
+					}
+
+					if ($subTokenIsArray === false
+						&& $subToken[0] === '"'
+						&& empty($nestedVars) === true
+					) {
+						// We found the other end of the double quoted string.
+						break;
+					}
+				}//end for
+
+				$stackPtr = $i;
+
+				// Convert each line within the double quoted string to a
+				// new token, so it conforms with other multiple line tokens.
+				$tokenLines = explode($this->eolChar, $tokenContent);
+				$numLines   = count($tokenLines);
+				$newToken   = [];
+
+				for ($j = 0; $j < $numLines; $j++) {
+					$newToken['content'] = $tokenLines[$j];
+					if ($j === ($numLines - 1)) {
+						if ($tokenLines[$j] === '') {
+							break;
+						}
+					} else {
+						$newToken['content'] .= $this->eolChar;
+					}
+
+					$newToken['code']          = T_DOUBLE_QUOTED_STRING;
+					$newToken['type']          = 'T_DOUBLE_QUOTED_STRING';
+					$finalTokens[$newStackPtr] = $newToken;
+					$newStackPtr++;
+				}
+
+				// Continue, as we're done with this token.
+				continue;
+			}//end if
+
+			/*
                 Detect binary casting and assign the casts their own token.
             */
 
-            if ($tokenIsArray === true
-                && $token[0] === T_CONSTANT_ENCAPSED_STRING
-                && (substr($token[1], 0, 2) === 'b"'
-                || substr($token[1], 0, 2) === "b'")
-            ) {
-                $finalTokens[$newStackPtr] = [
-                    'code'    => T_BINARY_CAST,
-                    'type'    => 'T_BINARY_CAST',
-                    'content' => 'b',
-                ];
-                $newStackPtr++;
-                $token[1] = substr($token[1], 1);
-            }
-
-            if ($tokenIsArray === true
-                && $token[0] === T_STRING_CAST
-                && preg_match('`^\(\s*binary\s*\)$`i', $token[1]) === 1
-            ) {
-                $finalTokens[$newStackPtr] = [
-                    'code'    => T_BINARY_CAST,
-                    'type'    => 'T_BINARY_CAST',
-                    'content' => $token[1],
-                ];
-                $newStackPtr++;
-                continue;
-            }
-
-            /*
+			if ($tokenIsArray === true
+				&& $token[0] === T_CONSTANT_ENCAPSED_STRING
+				&& (substr($token[1], 0, 2) === 'b"'
+				|| substr($token[1], 0, 2) === "b'")
+			) {
+				$finalTokens[$newStackPtr] = [
+					'code'    => T_BINARY_CAST,
+					'type'    => 'T_BINARY_CAST',
+					'content' => 'b',
+				];
+				$newStackPtr++;
+				$token[1] = substr($token[1], 1);
+			}
+
+			if ($tokenIsArray === true
+				&& $token[0] === T_STRING_CAST
+				&& preg_match('`^\(\s*binary\s*\)$`i', $token[1]) === 1
+			) {
+				$finalTokens[$newStackPtr] = [
+					'code'    => T_BINARY_CAST,
+					'type'    => 'T_BINARY_CAST',
+					'content' => $token[1],
+				];
+				$newStackPtr++;
+				continue;
+			}
+
+			/*
                 If this is a heredoc, PHP will tokenize the whole
                 thing which causes problems when heredocs don't
                 contain real PHP code, which is almost never.
@@ -676,243 +676,243 @@ 
                 alone though.
             */
 
-            if ($tokenIsArray === true && $token[0] === T_START_HEREDOC) {
-                // Add the start heredoc token to the final array.
-                $finalTokens[$newStackPtr] = self::standardiseToken($token);
-
-                // Check if this is actually a nowdoc and use a different token
-                // to help the sniffs.
-                $nowdoc = false;
-                if (strpos($token[1], "'") !== false) {
-                    $finalTokens[$newStackPtr]['code'] = T_START_NOWDOC;
-                    $finalTokens[$newStackPtr]['type'] = 'T_START_NOWDOC';
-                    $nowdoc = true;
-                }
-
-                $tokenContent = '';
-                for ($i = ($stackPtr + 1); $i < $numTokens; $i++) {
-                    $subTokenIsArray = is_array($tokens[$i]);
-                    if ($subTokenIsArray === true
-                        && $tokens[$i][0] === T_END_HEREDOC
-                    ) {
-                        // We found the other end of the heredoc.
-                        break;
-                    }
-
-                    if ($subTokenIsArray === true) {
-                        $tokenContent .= $tokens[$i][1];
-                    } else {
-                        $tokenContent .= $tokens[$i];
-                    }
-                }
-
-                if ($i === $numTokens) {
-                    // We got to the end of the file and never
-                    // found the closing token, so this probably wasn't
-                    // a heredoc.
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        $type = $finalTokens[$newStackPtr]['type'];
-                        echo "\t\t* failed to find the end of the here/nowdoc".PHP_EOL;
-                        echo "\t\t* token $stackPtr changed from $type to T_STRING".PHP_EOL;
-                    }
-
-                    $finalTokens[$newStackPtr]['code'] = T_STRING;
-                    $finalTokens[$newStackPtr]['type'] = 'T_STRING';
-                    $newStackPtr++;
-                    continue;
-                }
-
-                $stackPtr = $i;
-                $newStackPtr++;
-
-                // Convert each line within the heredoc to a
-                // new token, so it conforms with other multiple line tokens.
-                $tokenLines = explode($this->eolChar, $tokenContent);
-                $numLines   = count($tokenLines);
-                $newToken   = [];
-
-                for ($j = 0; $j < $numLines; $j++) {
-                    $newToken['content'] = $tokenLines[$j];
-                    if ($j === ($numLines - 1)) {
-                        if ($tokenLines[$j] === '') {
-                            break;
-                        }
-                    } else {
-                        $newToken['content'] .= $this->eolChar;
-                    }
-
-                    if ($nowdoc === true) {
-                        $newToken['code'] = T_NOWDOC;
-                        $newToken['type'] = 'T_NOWDOC';
-                    } else {
-                        $newToken['code'] = T_HEREDOC;
-                        $newToken['type'] = 'T_HEREDOC';
-                    }
-
-                    $finalTokens[$newStackPtr] = $newToken;
-                    $newStackPtr++;
-                }//end for
-
-                // Add the end heredoc token to the final array.
-                $finalTokens[$newStackPtr] = self::standardiseToken($tokens[$stackPtr]);
-
-                if ($nowdoc === true) {
-                    $finalTokens[$newStackPtr]['code'] = T_END_NOWDOC;
-                    $finalTokens[$newStackPtr]['type'] = 'T_END_NOWDOC';
-                }
-
-                $newStackPtr++;
-
-                // Continue, as we're done with this token.
-                continue;
-            }//end if
-
-            /*
+			if ($tokenIsArray === true && $token[0] === T_START_HEREDOC) {
+				// Add the start heredoc token to the final array.
+				$finalTokens[$newStackPtr] = self::standardiseToken($token);
+
+				// Check if this is actually a nowdoc and use a different token
+				// to help the sniffs.
+				$nowdoc = false;
+				if (strpos($token[1], "'") !== false) {
+					$finalTokens[$newStackPtr]['code'] = T_START_NOWDOC;
+					$finalTokens[$newStackPtr]['type'] = 'T_START_NOWDOC';
+					$nowdoc = true;
+				}
+
+				$tokenContent = '';
+				for ($i = ($stackPtr + 1); $i < $numTokens; $i++) {
+					$subTokenIsArray = is_array($tokens[$i]);
+					if ($subTokenIsArray === true
+						&& $tokens[$i][0] === T_END_HEREDOC
+					) {
+						// We found the other end of the heredoc.
+						break;
+					}
+
+					if ($subTokenIsArray === true) {
+						$tokenContent .= $tokens[$i][1];
+					} else {
+						$tokenContent .= $tokens[$i];
+					}
+				}
+
+				if ($i === $numTokens) {
+					// We got to the end of the file and never
+					// found the closing token, so this probably wasn't
+					// a heredoc.
+					if (PHP_CODESNIFFER_VERBOSITY > 1) {
+						$type = $finalTokens[$newStackPtr]['type'];
+						echo "\t\t* failed to find the end of the here/nowdoc".PHP_EOL;
+						echo "\t\t* token $stackPtr changed from $type to T_STRING".PHP_EOL;
+					}
+
+					$finalTokens[$newStackPtr]['code'] = T_STRING;
+					$finalTokens[$newStackPtr]['type'] = 'T_STRING';
+					$newStackPtr++;
+					continue;
+				}
+
+				$stackPtr = $i;
+				$newStackPtr++;
+
+				// Convert each line within the heredoc to a
+				// new token, so it conforms with other multiple line tokens.
+				$tokenLines = explode($this->eolChar, $tokenContent);
+				$numLines   = count($tokenLines);
+				$newToken   = [];
+
+				for ($j = 0; $j < $numLines; $j++) {
+					$newToken['content'] = $tokenLines[$j];
+					if ($j === ($numLines - 1)) {
+						if ($tokenLines[$j] === '') {
+							break;
+						}
+					} else {
+						$newToken['content'] .= $this->eolChar;
+					}
+
+					if ($nowdoc === true) {
+						$newToken['code'] = T_NOWDOC;
+						$newToken['type'] = 'T_NOWDOC';
+					} else {
+						$newToken['code'] = T_HEREDOC;
+						$newToken['type'] = 'T_HEREDOC';
+					}
+
+					$finalTokens[$newStackPtr] = $newToken;
+					$newStackPtr++;
+				}//end for
+
+				// Add the end heredoc token to the final array.
+				$finalTokens[$newStackPtr] = self::standardiseToken($tokens[$stackPtr]);
+
+				if ($nowdoc === true) {
+					$finalTokens[$newStackPtr]['code'] = T_END_NOWDOC;
+					$finalTokens[$newStackPtr]['type'] = 'T_END_NOWDOC';
+				}
+
+				$newStackPtr++;
+
+				// Continue, as we're done with this token.
+				continue;
+			}//end if
+
+			/*
                 Before PHP 7.0, the "yield from" was tokenized as
                 T_YIELD, T_WHITESPACE and T_STRING. So look for
                 and change this token in earlier versions.
             */
 
-            if (PHP_VERSION_ID < 70000
-                && PHP_VERSION_ID >= 50500
-                && $tokenIsArray === true
-                && $token[0] === T_YIELD
-                && isset($tokens[($stackPtr + 1)]) === true
-                && isset($tokens[($stackPtr + 2)]) === true
-                && $tokens[($stackPtr + 1)][0] === T_WHITESPACE
-                && $tokens[($stackPtr + 2)][0] === T_STRING
-                && strtolower($tokens[($stackPtr + 2)][1]) === 'from'
-            ) {
-                // Could be multi-line, so just the token stack.
-                $token[0]  = T_YIELD_FROM;
-                $token[1] .= $tokens[($stackPtr + 1)][1].$tokens[($stackPtr + 2)][1];
-
-                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                    for ($i = ($stackPtr + 1); $i <= ($stackPtr + 2); $i++) {
-                        $type    = Util\Tokens::tokenName($tokens[$i][0]);
-                        $content = Util\Common::prepareForOutput($tokens[$i][1]);
-                        echo "\t\t* token $i merged into T_YIELD_FROM; was: $type => $content".PHP_EOL;
-                    }
-                }
-
-                $tokens[($stackPtr + 1)] = null;
-                $tokens[($stackPtr + 2)] = null;
-            }
-
-            /*
+			if (PHP_VERSION_ID < 70000
+				&& PHP_VERSION_ID >= 50500
+				&& $tokenIsArray === true
+				&& $token[0] === T_YIELD
+				&& isset($tokens[($stackPtr + 1)]) === true
+				&& isset($tokens[($stackPtr + 2)]) === true
+				&& $tokens[($stackPtr + 1)][0] === T_WHITESPACE
+				&& $tokens[($stackPtr + 2)][0] === T_STRING
+				&& strtolower($tokens[($stackPtr + 2)][1]) === 'from'
+			) {
+				// Could be multi-line, so just the token stack.
+				$token[0]  = T_YIELD_FROM;
+				$token[1] .= $tokens[($stackPtr + 1)][1].$tokens[($stackPtr + 2)][1];
+
+				if (PHP_CODESNIFFER_VERBOSITY > 1) {
+					for ($i = ($stackPtr + 1); $i <= ($stackPtr + 2); $i++) {
+						$type    = Util\Tokens::tokenName($tokens[$i][0]);
+						$content = Util\Common::prepareForOutput($tokens[$i][1]);
+						echo "\t\t* token $i merged into T_YIELD_FROM; was: $type => $content".PHP_EOL;
+					}
+				}
+
+				$tokens[($stackPtr + 1)] = null;
+				$tokens[($stackPtr + 2)] = null;
+			}
+
+			/*
                 Before PHP 5.5, the yield keyword was tokenized as
                 T_STRING. So look for and change this token in
                 earlier versions.
                 Checks also if it is just "yield" or "yield from".
             */
 
-            if (PHP_VERSION_ID < 50500
-                && $tokenIsArray === true
-                && $token[0] === T_STRING
-                && strtolower($token[1]) === 'yield'
-            ) {
-                if (isset($tokens[($stackPtr + 1)]) === true
-                    && isset($tokens[($stackPtr + 2)]) === true
-                    && $tokens[($stackPtr + 1)][0] === T_WHITESPACE
-                    && $tokens[($stackPtr + 2)][0] === T_STRING
-                    && strtolower($tokens[($stackPtr + 2)][1]) === 'from'
-                ) {
-                    // Could be multi-line, so just just the token stack.
-                    $token[0]  = T_YIELD_FROM;
-                    $token[1] .= $tokens[($stackPtr + 1)][1].$tokens[($stackPtr + 2)][1];
-
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        for ($i = ($stackPtr + 1); $i <= ($stackPtr + 2); $i++) {
-                            $type    = Util\Tokens::tokenName($tokens[$i][0]);
-                            $content = Util\Common::prepareForOutput($tokens[$i][1]);
-                            echo "\t\t* token $i merged into T_YIELD_FROM; was: $type => $content".PHP_EOL;
-                        }
-                    }
-
-                    $tokens[($stackPtr + 1)] = null;
-                    $tokens[($stackPtr + 2)] = null;
-                } else {
-                    $newToken            = [];
-                    $newToken['code']    = T_YIELD;
-                    $newToken['type']    = 'T_YIELD';
-                    $newToken['content'] = $token[1];
-                    $finalTokens[$newStackPtr] = $newToken;
-
-                    $newStackPtr++;
-                    continue;
-                }//end if
-            }//end if
-
-            /*
+			if (PHP_VERSION_ID < 50500
+				&& $tokenIsArray === true
+				&& $token[0] === T_STRING
+				&& strtolower($token[1]) === 'yield'
+			) {
+				if (isset($tokens[($stackPtr + 1)]) === true
+					&& isset($tokens[($stackPtr + 2)]) === true
+					&& $tokens[($stackPtr + 1)][0] === T_WHITESPACE
+					&& $tokens[($stackPtr + 2)][0] === T_STRING
+					&& strtolower($tokens[($stackPtr + 2)][1]) === 'from'
+				) {
+					// Could be multi-line, so just just the token stack.
+					$token[0]  = T_YIELD_FROM;
+					$token[1] .= $tokens[($stackPtr + 1)][1].$tokens[($stackPtr + 2)][1];
+
+					if (PHP_CODESNIFFER_VERBOSITY > 1) {
+						for ($i = ($stackPtr + 1); $i <= ($stackPtr + 2); $i++) {
+							$type    = Util\Tokens::tokenName($tokens[$i][0]);
+							$content = Util\Common::prepareForOutput($tokens[$i][1]);
+							echo "\t\t* token $i merged into T_YIELD_FROM; was: $type => $content".PHP_EOL;
+						}
+					}
+
+					$tokens[($stackPtr + 1)] = null;
+					$tokens[($stackPtr + 2)] = null;
+				} else {
+					$newToken            = [];
+					$newToken['code']    = T_YIELD;
+					$newToken['type']    = 'T_YIELD';
+					$newToken['content'] = $token[1];
+					$finalTokens[$newStackPtr] = $newToken;
+
+					$newStackPtr++;
+					continue;
+				}//end if
+			}//end if
+
+			/*
                 Before PHP 5.6, the ... operator was tokenized as three
                 T_STRING_CONCAT tokens in a row. So look for and combine
                 these tokens in earlier versions.
             */
 
-            if ($tokenIsArray === false
-                && $token[0] === '.'
-                && isset($tokens[($stackPtr + 1)]) === true
-                && isset($tokens[($stackPtr + 2)]) === true
-                && $tokens[($stackPtr + 1)] === '.'
-                && $tokens[($stackPtr + 2)] === '.'
-            ) {
-                $newToken            = [];
-                $newToken['code']    = T_ELLIPSIS;
-                $newToken['type']    = 'T_ELLIPSIS';
-                $newToken['content'] = '...';
-                $finalTokens[$newStackPtr] = $newToken;
-
-                $newStackPtr++;
-                $stackPtr += 2;
-                continue;
-            }
-
-            /*
+			if ($tokenIsArray === false
+				&& $token[0] === '.'
+				&& isset($tokens[($stackPtr + 1)]) === true
+				&& isset($tokens[($stackPtr + 2)]) === true
+				&& $tokens[($stackPtr + 1)] === '.'
+				&& $tokens[($stackPtr + 2)] === '.'
+			) {
+				$newToken            = [];
+				$newToken['code']    = T_ELLIPSIS;
+				$newToken['type']    = 'T_ELLIPSIS';
+				$newToken['content'] = '...';
+				$finalTokens[$newStackPtr] = $newToken;
+
+				$newStackPtr++;
+				$stackPtr += 2;
+				continue;
+			}
+
+			/*
                 Before PHP 5.6, the ** operator was tokenized as two
                 T_MULTIPLY tokens in a row. So look for and combine
                 these tokens in earlier versions.
             */
 
-            if ($tokenIsArray === false
-                && $token[0] === '*'
-                && isset($tokens[($stackPtr + 1)]) === true
-                && $tokens[($stackPtr + 1)] === '*'
-            ) {
-                $newToken            = [];
-                $newToken['code']    = T_POW;
-                $newToken['type']    = 'T_POW';
-                $newToken['content'] = '**';
-                $finalTokens[$newStackPtr] = $newToken;
-
-                $newStackPtr++;
-                $stackPtr++;
-                continue;
-            }
-
-            /*
+			if ($tokenIsArray === false
+				&& $token[0] === '*'
+				&& isset($tokens[($stackPtr + 1)]) === true
+				&& $tokens[($stackPtr + 1)] === '*'
+			) {
+				$newToken            = [];
+				$newToken['code']    = T_POW;
+				$newToken['type']    = 'T_POW';
+				$newToken['content'] = '**';
+				$finalTokens[$newStackPtr] = $newToken;
+
+				$newStackPtr++;
+				$stackPtr++;
+				continue;
+			}
+
+			/*
                 Before PHP 5.6, the **= operator was tokenized as
                 T_MULTIPLY followed by T_MUL_EQUAL. So look for and combine
                 these tokens in earlier versions.
             */
 
-            if ($tokenIsArray === false
-                && $token[0] === '*'
-                && isset($tokens[($stackPtr + 1)]) === true
-                && is_array($tokens[($stackPtr + 1)]) === true
-                && $tokens[($stackPtr + 1)][1] === '*='
-            ) {
-                $newToken            = [];
-                $newToken['code']    = T_POW_EQUAL;
-                $newToken['type']    = 'T_POW_EQUAL';
-                $newToken['content'] = '**=';
-                $finalTokens[$newStackPtr] = $newToken;
-
-                $newStackPtr++;
-                $stackPtr++;
-                continue;
-            }
-
-            /*
+			if ($tokenIsArray === false
+				&& $token[0] === '*'
+				&& isset($tokens[($stackPtr + 1)]) === true
+				&& is_array($tokens[($stackPtr + 1)]) === true
+				&& $tokens[($stackPtr + 1)][1] === '*='
+			) {
+				$newToken            = [];
+				$newToken['code']    = T_POW_EQUAL;
+				$newToken['type']    = 'T_POW_EQUAL';
+				$newToken['content'] = '**=';
+				$finalTokens[$newStackPtr] = $newToken;
+
+				$newStackPtr++;
+				$stackPtr++;
+				continue;
+			}
+
+			/*
                 Before PHP 7, the ??= operator was tokenized as
                 T_INLINE_THEN, T_INLINE_THEN, T_EQUAL.
                 Between PHP 7.0 and 7.2, the ??= operator was tokenized as
@@ -920,277 +920,277 @@ 
                 So look for and combine these tokens in earlier versions.
             */
 
-            if (($tokenIsArray === false
-                && $token[0] === '?'
-                && isset($tokens[($stackPtr + 1)]) === true
-                && $tokens[($stackPtr + 1)][0] === '?'
-                && isset($tokens[($stackPtr + 2)]) === true
-                && $tokens[($stackPtr + 2)][0] === '=')
-                || ($tokenIsArray === true
-                && $token[0] === T_COALESCE
-                && isset($tokens[($stackPtr + 1)]) === true
-                && $tokens[($stackPtr + 1)][0] === '=')
-            ) {
-                $newToken            = [];
-                $newToken['code']    = T_COALESCE_EQUAL;
-                $newToken['type']    = 'T_COALESCE_EQUAL';
-                $newToken['content'] = '??=';
-                $finalTokens[$newStackPtr] = $newToken;
-
-                $newStackPtr++;
-                $stackPtr++;
-
-                if ($tokenIsArray === false) {
-                    // Pre PHP 7.
-                    $stackPtr++;
-                }
-
-                continue;
-            }
-
-            /*
+			if (($tokenIsArray === false
+				&& $token[0] === '?'
+				&& isset($tokens[($stackPtr + 1)]) === true
+				&& $tokens[($stackPtr + 1)][0] === '?'
+				&& isset($tokens[($stackPtr + 2)]) === true
+				&& $tokens[($stackPtr + 2)][0] === '=')
+				|| ($tokenIsArray === true
+				&& $token[0] === T_COALESCE
+				&& isset($tokens[($stackPtr + 1)]) === true
+				&& $tokens[($stackPtr + 1)][0] === '=')
+			) {
+				$newToken            = [];
+				$newToken['code']    = T_COALESCE_EQUAL;
+				$newToken['type']    = 'T_COALESCE_EQUAL';
+				$newToken['content'] = '??=';
+				$finalTokens[$newStackPtr] = $newToken;
+
+				$newStackPtr++;
+				$stackPtr++;
+
+				if ($tokenIsArray === false) {
+					// Pre PHP 7.
+					$stackPtr++;
+				}
+
+				continue;
+			}
+
+			/*
                 Before PHP 7, the ?? operator was tokenized as
                 T_INLINE_THEN followed by T_INLINE_THEN.
                 So look for and combine these tokens in earlier versions.
             */
 
-            if ($tokenIsArray === false
-                && $token[0] === '?'
-                && isset($tokens[($stackPtr + 1)]) === true
-                && $tokens[($stackPtr + 1)][0] === '?'
-            ) {
-                $newToken            = [];
-                $newToken['code']    = T_COALESCE;
-                $newToken['type']    = 'T_COALESCE';
-                $newToken['content'] = '??';
-                $finalTokens[$newStackPtr] = $newToken;
-
-                $newStackPtr++;
-                $stackPtr++;
-                continue;
-            }
-
-            /*
+			if ($tokenIsArray === false
+				&& $token[0] === '?'
+				&& isset($tokens[($stackPtr + 1)]) === true
+				&& $tokens[($stackPtr + 1)][0] === '?'
+			) {
+				$newToken            = [];
+				$newToken['code']    = T_COALESCE;
+				$newToken['type']    = 'T_COALESCE';
+				$newToken['content'] = '??';
+				$finalTokens[$newStackPtr] = $newToken;
+
+				$newStackPtr++;
+				$stackPtr++;
+				continue;
+			}
+
+			/*
                 Convert ? to T_NULLABLE OR T_INLINE_THEN
             */
 
-            if ($tokenIsArray === false && $token[0] === '?') {
-                $newToken            = [];
-                $newToken['content'] = '?';
-
-                $prevNonEmpty = null;
-                for ($i = ($stackPtr - 1); $i >= 0; $i--) {
-                    if (is_array($tokens[$i]) === true) {
-                        $tokenType = $tokens[$i][0];
-                    } else {
-                        $tokenType = $tokens[$i];
-                    }
-
-                    if ($prevNonEmpty === null
-                        && isset(Util\Tokens::$emptyTokens[$tokenType]) === false
-                    ) {
-                        // Found the previous non-empty token.
-                        if ($tokenType === ':' || $tokenType === ',') {
-                            $newToken['code'] = T_NULLABLE;
-                            $newToken['type'] = 'T_NULLABLE';
-                            break;
-                        }
-
-                        $prevNonEmpty = $tokenType;
-                    }
-
-                    if ($tokenType === T_FUNCTION) {
-                        $newToken['code'] = T_NULLABLE;
-                        $newToken['type'] = 'T_NULLABLE';
-                        break;
-                    } else if (in_array($tokenType, [T_OPEN_TAG, T_OPEN_TAG_WITH_ECHO, '=', '{', ';'], true) === true) {
-                        $newToken['code'] = T_INLINE_THEN;
-                        $newToken['type'] = 'T_INLINE_THEN';
-
-                        $insideInlineIf[] = $stackPtr;
-                        break;
-                    }
-                }//end for
-
-                $finalTokens[$newStackPtr] = $newToken;
-                $newStackPtr++;
-                continue;
-            }//end if
-
-            /*
+			if ($tokenIsArray === false && $token[0] === '?') {
+				$newToken            = [];
+				$newToken['content'] = '?';
+
+				$prevNonEmpty = null;
+				for ($i = ($stackPtr - 1); $i >= 0; $i--) {
+					if (is_array($tokens[$i]) === true) {
+						$tokenType = $tokens[$i][0];
+					} else {
+						$tokenType = $tokens[$i];
+					}
+
+					if ($prevNonEmpty === null
+						&& isset(Util\Tokens::$emptyTokens[$tokenType]) === false
+					) {
+						// Found the previous non-empty token.
+						if ($tokenType === ':' || $tokenType === ',') {
+							$newToken['code'] = T_NULLABLE;
+							$newToken['type'] = 'T_NULLABLE';
+							break;
+						}
+
+						$prevNonEmpty = $tokenType;
+					}
+
+					if ($tokenType === T_FUNCTION) {
+						$newToken['code'] = T_NULLABLE;
+						$newToken['type'] = 'T_NULLABLE';
+						break;
+					} else if (in_array($tokenType, [T_OPEN_TAG, T_OPEN_TAG_WITH_ECHO, '=', '{', ';'], true) === true) {
+						$newToken['code'] = T_INLINE_THEN;
+						$newToken['type'] = 'T_INLINE_THEN';
+
+						$insideInlineIf[] = $stackPtr;
+						break;
+					}
+				}//end for
+
+				$finalTokens[$newStackPtr] = $newToken;
+				$newStackPtr++;
+				continue;
+			}//end if
+
+			/*
                 Tokens after a double colon may be look like scope openers,
                 such as when writing code like Foo::NAMESPACE, but they are
                 only ever variables or strings.
             */
 
-            if ($stackPtr > 1
-                && (is_array($tokens[($stackPtr - 1)]) === true
-                && $tokens[($stackPtr - 1)][0] === T_PAAMAYIM_NEKUDOTAYIM)
-                && $tokenIsArray === true
-                && $token[0] !== T_STRING
-                && $token[0] !== T_VARIABLE
-                && $token[0] !== T_DOLLAR
-                && isset(Util\Tokens::$emptyTokens[$token[0]]) === false
-            ) {
-                $newToken            = [];
-                $newToken['code']    = T_STRING;
-                $newToken['type']    = 'T_STRING';
-                $newToken['content'] = $token[1];
-                $finalTokens[$newStackPtr] = $newToken;
-
-                $newStackPtr++;
-                continue;
-            }
-
-            /*
+			if ($stackPtr > 1
+				&& (is_array($tokens[($stackPtr - 1)]) === true
+				&& $tokens[($stackPtr - 1)][0] === T_PAAMAYIM_NEKUDOTAYIM)
+				&& $tokenIsArray === true
+				&& $token[0] !== T_STRING
+				&& $token[0] !== T_VARIABLE
+				&& $token[0] !== T_DOLLAR
+				&& isset(Util\Tokens::$emptyTokens[$token[0]]) === false
+			) {
+				$newToken            = [];
+				$newToken['code']    = T_STRING;
+				$newToken['type']    = 'T_STRING';
+				$newToken['content'] = $token[1];
+				$finalTokens[$newStackPtr] = $newToken;
+
+				$newStackPtr++;
+				continue;
+			}
+
+			/*
                 The string-like token after a function keyword should always be
                 tokenized as T_STRING even if it appears to be a different token,
                 such as when writing code like: function default(): foo
                 so go forward and change the token type before it is processed.
             */
 
-            if ($tokenIsArray === true
-                && $token[0] === T_FUNCTION
-                && $finalTokens[$lastNotEmptyToken]['code'] !== T_USE
-            ) {
-                for ($x = ($stackPtr + 1); $x < $numTokens; $x++) {
-                    if (is_array($tokens[$x]) === false
-                        || isset(Util\Tokens::$emptyTokens[$tokens[$x][0]]) === false
-                    ) {
-                        // Non-empty content.
-                        break;
-                    }
-                }
-
-                if ($x < $numTokens && is_array($tokens[$x]) === true) {
-                    $tokens[$x][0] = T_STRING;
-                }
-
-                /*
+			if ($tokenIsArray === true
+				&& $token[0] === T_FUNCTION
+				&& $finalTokens[$lastNotEmptyToken]['code'] !== T_USE
+			) {
+				for ($x = ($stackPtr + 1); $x < $numTokens; $x++) {
+					if (is_array($tokens[$x]) === false
+						|| isset(Util\Tokens::$emptyTokens[$tokens[$x][0]]) === false
+					) {
+						// Non-empty content.
+						break;
+					}
+				}
+
+				if ($x < $numTokens && is_array($tokens[$x]) === true) {
+					$tokens[$x][0] = T_STRING;
+				}
+
+				/*
                     This is a special condition for T_ARRAY tokens used for
                     function return types. We want to keep the parenthesis map clean,
                     so let's tag these tokens as T_STRING.
                 */
 
-                // Go looking for the colon to start the return type hint.
-                // Start by finding the closing parenthesis of the function.
-                $parenthesisStack  = [];
-                $parenthesisCloser = false;
-                for ($x = ($stackPtr + 1); $x < $numTokens; $x++) {
-                    if (is_array($tokens[$x]) === false && $tokens[$x] === '(') {
-                        $parenthesisStack[] = $x;
-                    } else if (is_array($tokens[$x]) === false && $tokens[$x] === ')') {
-                        array_pop($parenthesisStack);
-                        if (empty($parenthesisStack) === true) {
-                            $parenthesisCloser = $x;
-                            break;
-                        }
-                    }
-                }
-
-                if ($parenthesisCloser !== false) {
-                    for ($x = ($parenthesisCloser + 1); $x < $numTokens; $x++) {
-                        if (is_array($tokens[$x]) === false
-                            || isset(Util\Tokens::$emptyTokens[$tokens[$x][0]]) === false
-                        ) {
-                            // Non-empty content.
-                            if (is_array($tokens[$x]) === true && $tokens[$x][0] === T_USE) {
-                                // Found a use statements, so search ahead for the closing parenthesis.
-                                for ($x += 1; $x < $numTokens; $x++) {
-                                    if (is_array($tokens[$x]) === false && $tokens[$x] === ')') {
-                                        continue(2);
-                                    }
-                                }
-                            }
-
-                            break;
-                        }
-                    }
-
-                    if (isset($tokens[$x]) === true
-                        && is_array($tokens[$x]) === false
-                        && $tokens[$x] === ':'
-                    ) {
-                        $allowed = [
-                            T_STRING       => T_STRING,
-                            T_ARRAY        => T_ARRAY,
-                            T_CALLABLE     => T_CALLABLE,
-                            T_SELF         => T_SELF,
-                            T_PARENT       => T_PARENT,
-                            T_NS_SEPARATOR => T_NS_SEPARATOR,
-                        ];
-
-                        $allowed += Util\Tokens::$emptyTokens;
-
-                        // Find the start of the return type.
-                        for ($x += 1; $x < $numTokens; $x++) {
-                            if (is_array($tokens[$x]) === true
-                                && isset(Util\Tokens::$emptyTokens[$tokens[$x][0]]) === true
-                            ) {
-                                // Whitespace or comments before the return type.
-                                continue;
-                            }
-
-                            if (is_array($tokens[$x]) === false && $tokens[$x] === '?') {
-                                // Found a nullable operator, so skip it.
-                                // But also covert the token to save the tokenizer
-                                // a bit of time later on.
-                                $tokens[$x] = [
-                                    T_NULLABLE,
-                                    '?',
-                                ];
-
-                                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                    echo "\t\t* token $x changed from ? to T_NULLABLE".PHP_EOL;
-                                }
-
-                                continue;
-                            }
-
-                            break;
-                        }//end for
-
-                        // Any T_ARRAY tokens we find between here and the next
-                        // token that can't be part of the return type need to be
-                        // converted to T_STRING tokens.
-                        for ($x; $x < $numTokens; $x++) {
-                            if (is_array($tokens[$x]) === false || isset($allowed[$tokens[$x][0]]) === false) {
-                                break;
-                            } else if ($tokens[$x][0] === T_ARRAY) {
-                                $tokens[$x][0] = T_STRING;
-
-                                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                    echo "\t\t* token $x changed from T_ARRAY to T_STRING".PHP_EOL;
-                                }
-                            }
-                        }
-                    }//end if
-                }//end if
-            }//end if
-
-            /*
+				// Go looking for the colon to start the return type hint.
+				// Start by finding the closing parenthesis of the function.
+				$parenthesisStack  = [];
+				$parenthesisCloser = false;
+				for ($x = ($stackPtr + 1); $x < $numTokens; $x++) {
+					if (is_array($tokens[$x]) === false && $tokens[$x] === '(') {
+						$parenthesisStack[] = $x;
+					} else if (is_array($tokens[$x]) === false && $tokens[$x] === ')') {
+						array_pop($parenthesisStack);
+						if (empty($parenthesisStack) === true) {
+							$parenthesisCloser = $x;
+							break;
+						}
+					}
+				}
+
+				if ($parenthesisCloser !== false) {
+					for ($x = ($parenthesisCloser + 1); $x < $numTokens; $x++) {
+						if (is_array($tokens[$x]) === false
+							|| isset(Util\Tokens::$emptyTokens[$tokens[$x][0]]) === false
+						) {
+							// Non-empty content.
+							if (is_array($tokens[$x]) === true && $tokens[$x][0] === T_USE) {
+								// Found a use statements, so search ahead for the closing parenthesis.
+								for ($x += 1; $x < $numTokens; $x++) {
+									if (is_array($tokens[$x]) === false && $tokens[$x] === ')') {
+										continue(2);
+									}
+								}
+							}
+
+							break;
+						}
+					}
+
+					if (isset($tokens[$x]) === true
+						&& is_array($tokens[$x]) === false
+						&& $tokens[$x] === ':'
+					) {
+						$allowed = [
+							T_STRING       => T_STRING,
+							T_ARRAY        => T_ARRAY,
+							T_CALLABLE     => T_CALLABLE,
+							T_SELF         => T_SELF,
+							T_PARENT       => T_PARENT,
+							T_NS_SEPARATOR => T_NS_SEPARATOR,
+						];
+
+						$allowed += Util\Tokens::$emptyTokens;
+
+						// Find the start of the return type.
+						for ($x += 1; $x < $numTokens; $x++) {
+							if (is_array($tokens[$x]) === true
+								&& isset(Util\Tokens::$emptyTokens[$tokens[$x][0]]) === true
+							) {
+								// Whitespace or comments before the return type.
+								continue;
+							}
+
+							if (is_array($tokens[$x]) === false && $tokens[$x] === '?') {
+								// Found a nullable operator, so skip it.
+								// But also covert the token to save the tokenizer
+								// a bit of time later on.
+								$tokens[$x] = [
+									T_NULLABLE,
+									'?',
+								];
+
+								if (PHP_CODESNIFFER_VERBOSITY > 1) {
+									echo "\t\t* token $x changed from ? to T_NULLABLE".PHP_EOL;
+								}
+
+								continue;
+							}
+
+							break;
+						}//end for
+
+						// Any T_ARRAY tokens we find between here and the next
+						// token that can't be part of the return type need to be
+						// converted to T_STRING tokens.
+						for ($x; $x < $numTokens; $x++) {
+							if (is_array($tokens[$x]) === false || isset($allowed[$tokens[$x][0]]) === false) {
+								break;
+							} else if ($tokens[$x][0] === T_ARRAY) {
+								$tokens[$x][0] = T_STRING;
+
+								if (PHP_CODESNIFFER_VERBOSITY > 1) {
+									echo "\t\t* token $x changed from T_ARRAY to T_STRING".PHP_EOL;
+								}
+							}
+						}
+					}//end if
+				}//end if
+			}//end if
+
+			/*
                 Before PHP 7, the <=> operator was tokenized as
                 T_IS_SMALLER_OR_EQUAL followed by T_GREATER_THAN.
                 So look for and combine these tokens in earlier versions.
             */
 
-            if ($tokenIsArray === true
-                && $token[0] === T_IS_SMALLER_OR_EQUAL
-                && isset($tokens[($stackPtr + 1)]) === true
-                && $tokens[($stackPtr + 1)][0] === '>'
-            ) {
-                $newToken            = [];
-                $newToken['code']    = T_SPACESHIP;
-                $newToken['type']    = 'T_SPACESHIP';
-                $newToken['content'] = '<=>';
-                $finalTokens[$newStackPtr] = $newToken;
-
-                $newStackPtr++;
-                $stackPtr++;
-                continue;
-            }
-
-            /*
+			if ($tokenIsArray === true
+				&& $token[0] === T_IS_SMALLER_OR_EQUAL
+				&& isset($tokens[($stackPtr + 1)]) === true
+				&& $tokens[($stackPtr + 1)][0] === '>'
+			) {
+				$newToken            = [];
+				$newToken['code']    = T_SPACESHIP;
+				$newToken['type']    = 'T_SPACESHIP';
+				$newToken['content'] = '<=>';
+				$finalTokens[$newStackPtr] = $newToken;
+
+				$newStackPtr++;
+				$stackPtr++;
+				continue;
+			}
+
+			/*
                 PHP doesn't assign a token to goto labels, so we have to.
                 These are just string tokens with a single colon after them. Double
                 colons are already tokenized and so don't interfere with this check.
@@ -1198,820 +1198,820 @@ 
                 goto labels.
             */
 
-            if ($tokenIsArray === true
-                && $token[0] === T_STRING
-                && isset($tokens[($stackPtr + 1)]) === true
-                && $tokens[($stackPtr + 1)] === ':'
-                && $tokens[($stackPtr - 1)][0] !== T_PAAMAYIM_NEKUDOTAYIM
-            ) {
-                $stopTokens = [
-                    T_CASE               => true,
-                    T_SEMICOLON          => true,
-                    T_OPEN_CURLY_BRACKET => true,
-                    T_INLINE_THEN        => true,
-                ];
-
-                for ($x = ($newStackPtr - 1); $x > 0; $x--) {
-                    if (isset($stopTokens[$finalTokens[$x]['code']]) === true) {
-                        break;
-                    }
-                }
-
-                if ($finalTokens[$x]['code'] !== T_CASE
-                    && $finalTokens[$x]['code'] !== T_INLINE_THEN
-                ) {
-                    $finalTokens[$newStackPtr] = [
-                        'content' => $token[1].':',
-                        'code'    => T_GOTO_LABEL,
-                        'type'    => 'T_GOTO_LABEL',
-                    ];
-
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        echo "\t\t* token $stackPtr changed from T_STRING to T_GOTO_LABEL".PHP_EOL;
-                        echo "\t\t* skipping T_COLON token ".($stackPtr + 1).PHP_EOL;
-                    }
-
-                    $newStackPtr++;
-                    $stackPtr++;
-                    continue;
-                }
-            }//end if
-
-            /*
+			if ($tokenIsArray === true
+				&& $token[0] === T_STRING
+				&& isset($tokens[($stackPtr + 1)]) === true
+				&& $tokens[($stackPtr + 1)] === ':'
+				&& $tokens[($stackPtr - 1)][0] !== T_PAAMAYIM_NEKUDOTAYIM
+			) {
+				$stopTokens = [
+					T_CASE               => true,
+					T_SEMICOLON          => true,
+					T_OPEN_CURLY_BRACKET => true,
+					T_INLINE_THEN        => true,
+				];
+
+				for ($x = ($newStackPtr - 1); $x > 0; $x--) {
+					if (isset($stopTokens[$finalTokens[$x]['code']]) === true) {
+						break;
+					}
+				}
+
+				if ($finalTokens[$x]['code'] !== T_CASE
+					&& $finalTokens[$x]['code'] !== T_INLINE_THEN
+				) {
+					$finalTokens[$newStackPtr] = [
+						'content' => $token[1].':',
+						'code'    => T_GOTO_LABEL,
+						'type'    => 'T_GOTO_LABEL',
+					];
+
+					if (PHP_CODESNIFFER_VERBOSITY > 1) {
+						echo "\t\t* token $stackPtr changed from T_STRING to T_GOTO_LABEL".PHP_EOL;
+						echo "\t\t* skipping T_COLON token ".($stackPtr + 1).PHP_EOL;
+					}
+
+					$newStackPtr++;
+					$stackPtr++;
+					continue;
+				}
+			}//end if
+
+			/*
                 If this token has newlines in its content, split each line up
                 and create a new token for each line. We do this so it's easier
                 to ascertain where errors occur on a line.
                 Note that $token[1] is the token's content.
             */
 
-            if ($tokenIsArray === true && strpos($token[1], $this->eolChar) !== false) {
-                $tokenLines = explode($this->eolChar, $token[1]);
-                $numLines   = count($tokenLines);
-                $newToken   = [
-                    'type'    => Util\Tokens::tokenName($token[0]),
-                    'code'    => $token[0],
-                    'content' => '',
-                ];
-
-                for ($i = 0; $i < $numLines; $i++) {
-                    $newToken['content'] = $tokenLines[$i];
-                    if ($i === ($numLines - 1)) {
-                        if ($tokenLines[$i] === '') {
-                            break;
-                        }
-                    } else {
-                        $newToken['content'] .= $this->eolChar;
-                    }
-
-                    $finalTokens[$newStackPtr] = $newToken;
-                    $newStackPtr++;
-                }
-            } else {
-                if ($tokenIsArray === true && $token[0] === T_STRING) {
-                    // Some T_STRING tokens should remain that way
-                    // due to their context.
-                    $context = [
-                        T_OBJECT_OPERATOR      => true,
-                        T_FUNCTION             => true,
-                        T_CLASS                => true,
-                        T_EXTENDS              => true,
-                        T_IMPLEMENTS           => true,
-                        T_NEW                  => true,
-                        T_CONST                => true,
-                        T_NS_SEPARATOR         => true,
-                        T_USE                  => true,
-                        T_NAMESPACE            => true,
-                        T_PAAMAYIM_NEKUDOTAYIM => true,
-                    ];
-
-                    if (isset($context[$finalTokens[$lastNotEmptyToken]['code']]) === true) {
-                        // Special case for syntax like: return new self
-                        // where self should not be a string.
-                        if ($finalTokens[$lastNotEmptyToken]['code'] === T_NEW
-                            && strtolower($token[1]) === 'self'
-                        ) {
-                            $finalTokens[$newStackPtr] = [
-                                'content' => $token[1],
-                                'code'    => T_SELF,
-                                'type'    => 'T_SELF',
-                            ];
-                        } else {
-                            $finalTokens[$newStackPtr] = [
-                                'content' => $token[1],
-                                'code'    => T_STRING,
-                                'type'    => 'T_STRING',
-                            ];
-                        }
-
-                        $newStackPtr++;
-                        continue;
-                    }//end if
-                }//end if
-
-                $newToken = null;
-                if ($tokenIsArray === false) {
-                    if (isset(self::$resolveTokenCache[$token[0]]) === true) {
-                        $newToken = self::$resolveTokenCache[$token[0]];
-                    }
-                } else {
-                    $cacheKey = null;
-                    if ($token[0] === T_STRING) {
-                        $cacheKey = strtolower($token[1]);
-                    } else if ($token[0] !== T_CURLY_OPEN) {
-                        $cacheKey = $token[0];
-                    }
-
-                    if ($cacheKey !== null && isset(self::$resolveTokenCache[$cacheKey]) === true) {
-                        $newToken            = self::$resolveTokenCache[$cacheKey];
-                        $newToken['content'] = $token[1];
-                    }
-                }
-
-                if ($newToken === null) {
-                    $newToken = self::standardiseToken($token);
-                }
-
-                // Convert colons that are actually the ELSE component of an
-                // inline IF statement.
-                if (empty($insideInlineIf) === false && $newToken['code'] === T_COLON) {
-                    // Make sure this isn't the return type separator of a closure.
-                    $isReturnType = false;
-                    for ($i = ($stackPtr - 1); $i > 0; $i--) {
-                        if (is_array($tokens[$i]) === false
-                            || ($tokens[$i][0] !== T_DOC_COMMENT
-                            && $tokens[$i][0] !== T_COMMENT
-                            && $tokens[$i][0] !== T_WHITESPACE)
-                        ) {
-                            break;
-                        }
-                    }
-
-                    if ($tokens[$i] === ')') {
-                        $parenCount = 1;
-                        for ($i--; $i > 0; $i--) {
-                            if ($tokens[$i] === '(') {
-                                $parenCount--;
-                                if ($parenCount === 0) {
-                                    break;
-                                }
-                            } else if ($tokens[$i] === ')') {
-                                $parenCount++;
-                            }
-                        }
-
-                        // We've found the open parenthesis, so if the previous
-                        // non-empty token is FUNCTION or USE, this is a closure.
-                        for ($i--; $i > 0; $i--) {
-                            if (is_array($tokens[$i]) === false
-                                || ($tokens[$i][0] !== T_DOC_COMMENT
-                                && $tokens[$i][0] !== T_COMMENT
-                                && $tokens[$i][0] !== T_WHITESPACE)
-                            ) {
-                                break;
-                            }
-                        }
-
-                        if ($tokens[$i][0] === T_FUNCTION || $tokens[$i][0] === T_USE) {
-                            $isReturnType = true;
-                        }
-                    }//end if
-
-                    if ($isReturnType === false) {
-                        array_pop($insideInlineIf);
-                        $newToken['code'] = T_INLINE_ELSE;
-                        $newToken['type'] = 'T_INLINE_ELSE';
-                    }
-                }//end if
-
-                // This is a special condition for T_ARRAY tokens used for
-                // type hinting function arguments as being arrays. We want to keep
-                // the parenthesis map clean, so let's tag these tokens as
-                // T_STRING.
-                if ($newToken['code'] === T_ARRAY) {
-                    for ($i = $stackPtr; $i < $numTokens; $i++) {
-                        if ($tokens[$i] === '(') {
-                            break;
-                        } else if ($tokens[$i][0] === T_VARIABLE) {
-                            $newToken['code'] = T_STRING;
-                            $newToken['type'] = 'T_STRING';
-                            break;
-                        }
-                    }
-                }
-
-                // This is a special case when checking PHP 5.5+ code in PHP < 5.5
-                // where "finally" should be T_FINALLY instead of T_STRING.
-                if ($newToken['code'] === T_STRING
-                    && strtolower($newToken['content']) === 'finally'
-                ) {
-                    $newToken['code'] = T_FINALLY;
-                    $newToken['type'] = 'T_FINALLY';
-                }
-
-                // This is a special case for the PHP 5.5 classname::class syntax
-                // where "class" should be T_STRING instead of T_CLASS.
-                if (($newToken['code'] === T_CLASS
-                    || $newToken['code'] === T_FUNCTION)
-                    && $finalTokens[$lastNotEmptyToken]['code'] === T_DOUBLE_COLON
-                ) {
-                    $newToken['code'] = T_STRING;
-                    $newToken['type'] = 'T_STRING';
-                }
-
-                // This is a special case for PHP 5.6 use function and use const
-                // where "function" and "const" should be T_STRING instead of T_FUNCTION
-                // and T_CONST.
-                if (($newToken['code'] === T_FUNCTION
-                    || $newToken['code'] === T_CONST)
-                    && ($finalTokens[$lastNotEmptyToken]['code'] === T_USE || $insideUseGroup === true)
-                ) {
-                    $newToken['code'] = T_STRING;
-                    $newToken['type'] = 'T_STRING';
-                }
-
-                // This is a special case for use groups in PHP 7+ where leaving
-                // the curly braces as their normal tokens would confuse
-                // the scope map and sniffs.
-                if ($newToken['code'] === T_OPEN_CURLY_BRACKET
-                    && $finalTokens[$lastNotEmptyToken]['code'] === T_NS_SEPARATOR
-                ) {
-                    $newToken['code'] = T_OPEN_USE_GROUP;
-                    $newToken['type'] = 'T_OPEN_USE_GROUP';
-                    $insideUseGroup   = true;
-                }
-
-                if ($insideUseGroup === true && $newToken['code'] === T_CLOSE_CURLY_BRACKET) {
-                    $newToken['code'] = T_CLOSE_USE_GROUP;
-                    $newToken['type'] = 'T_CLOSE_USE_GROUP';
-                    $insideUseGroup   = false;
-                }
-
-                $finalTokens[$newStackPtr] = $newToken;
-                $newStackPtr++;
-            }//end if
-        }//end for
-
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            echo "\t*** END PHP TOKENIZING ***".PHP_EOL;
-        }
-
-        return $finalTokens;
-
-    }//end tokenize()
-
-
-    /**
-     * Performs additional processing after main tokenizing.
-     *
-     * This additional processing checks for CASE statements that are using curly
-     * braces for scope openers and closers. It also turns some T_FUNCTION tokens
-     * into T_CLOSURE when they are not standard function definitions. It also
-     * detects short array syntax and converts those square brackets into new tokens.
-     * It also corrects some usage of the static and class keywords. It also
-     * assigns tokens to function return types.
-     *
-     * @return void
-     */
-    protected function processAdditional()
-    {
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            echo "\t*** START ADDITIONAL PHP PROCESSING ***".PHP_EOL;
-        }
-
-        $numTokens = count($this->tokens);
-        for ($i = ($numTokens - 1); $i >= 0; $i--) {
-            // Check for any unset scope conditions due to alternate IF/ENDIF syntax.
-            if (isset($this->tokens[$i]['scope_opener']) === true
-                && isset($this->tokens[$i]['scope_condition']) === false
-            ) {
-                $this->tokens[$i]['scope_condition'] = $this->tokens[$this->tokens[$i]['scope_opener']]['scope_condition'];
-            }
-
-            if ($this->tokens[$i]['code'] === T_FUNCTION) {
-                /*
+			if ($tokenIsArray === true && strpos($token[1], $this->eolChar) !== false) {
+				$tokenLines = explode($this->eolChar, $token[1]);
+				$numLines   = count($tokenLines);
+				$newToken   = [
+					'type'    => Util\Tokens::tokenName($token[0]),
+					'code'    => $token[0],
+					'content' => '',
+				];
+
+				for ($i = 0; $i < $numLines; $i++) {
+					$newToken['content'] = $tokenLines[$i];
+					if ($i === ($numLines - 1)) {
+						if ($tokenLines[$i] === '') {
+							break;
+						}
+					} else {
+						$newToken['content'] .= $this->eolChar;
+					}
+
+					$finalTokens[$newStackPtr] = $newToken;
+					$newStackPtr++;
+				}
+			} else {
+				if ($tokenIsArray === true && $token[0] === T_STRING) {
+					// Some T_STRING tokens should remain that way
+					// due to their context.
+					$context = [
+						T_OBJECT_OPERATOR      => true,
+						T_FUNCTION             => true,
+						T_CLASS                => true,
+						T_EXTENDS              => true,
+						T_IMPLEMENTS           => true,
+						T_NEW                  => true,
+						T_CONST                => true,
+						T_NS_SEPARATOR         => true,
+						T_USE                  => true,
+						T_NAMESPACE            => true,
+						T_PAAMAYIM_NEKUDOTAYIM => true,
+					];
+
+					if (isset($context[$finalTokens[$lastNotEmptyToken]['code']]) === true) {
+						// Special case for syntax like: return new self
+						// where self should not be a string.
+						if ($finalTokens[$lastNotEmptyToken]['code'] === T_NEW
+							&& strtolower($token[1]) === 'self'
+						) {
+							$finalTokens[$newStackPtr] = [
+								'content' => $token[1],
+								'code'    => T_SELF,
+								'type'    => 'T_SELF',
+							];
+						} else {
+							$finalTokens[$newStackPtr] = [
+								'content' => $token[1],
+								'code'    => T_STRING,
+								'type'    => 'T_STRING',
+							];
+						}
+
+						$newStackPtr++;
+						continue;
+					}//end if
+				}//end if
+
+				$newToken = null;
+				if ($tokenIsArray === false) {
+					if (isset(self::$resolveTokenCache[$token[0]]) === true) {
+						$newToken = self::$resolveTokenCache[$token[0]];
+					}
+				} else {
+					$cacheKey = null;
+					if ($token[0] === T_STRING) {
+						$cacheKey = strtolower($token[1]);
+					} else if ($token[0] !== T_CURLY_OPEN) {
+						$cacheKey = $token[0];
+					}
+
+					if ($cacheKey !== null && isset(self::$resolveTokenCache[$cacheKey]) === true) {
+						$newToken            = self::$resolveTokenCache[$cacheKey];
+						$newToken['content'] = $token[1];
+					}
+				}
+
+				if ($newToken === null) {
+					$newToken = self::standardiseToken($token);
+				}
+
+				// Convert colons that are actually the ELSE component of an
+				// inline IF statement.
+				if (empty($insideInlineIf) === false && $newToken['code'] === T_COLON) {
+					// Make sure this isn't the return type separator of a closure.
+					$isReturnType = false;
+					for ($i = ($stackPtr - 1); $i > 0; $i--) {
+						if (is_array($tokens[$i]) === false
+							|| ($tokens[$i][0] !== T_DOC_COMMENT
+							&& $tokens[$i][0] !== T_COMMENT
+							&& $tokens[$i][0] !== T_WHITESPACE)
+						) {
+							break;
+						}
+					}
+
+					if ($tokens[$i] === ')') {
+						$parenCount = 1;
+						for ($i--; $i > 0; $i--) {
+							if ($tokens[$i] === '(') {
+								$parenCount--;
+								if ($parenCount === 0) {
+									break;
+								}
+							} else if ($tokens[$i] === ')') {
+								$parenCount++;
+							}
+						}
+
+						// We've found the open parenthesis, so if the previous
+						// non-empty token is FUNCTION or USE, this is a closure.
+						for ($i--; $i > 0; $i--) {
+							if (is_array($tokens[$i]) === false
+								|| ($tokens[$i][0] !== T_DOC_COMMENT
+								&& $tokens[$i][0] !== T_COMMENT
+								&& $tokens[$i][0] !== T_WHITESPACE)
+							) {
+								break;
+							}
+						}
+
+						if ($tokens[$i][0] === T_FUNCTION || $tokens[$i][0] === T_USE) {
+							$isReturnType = true;
+						}
+					}//end if
+
+					if ($isReturnType === false) {
+						array_pop($insideInlineIf);
+						$newToken['code'] = T_INLINE_ELSE;
+						$newToken['type'] = 'T_INLINE_ELSE';
+					}
+				}//end if
+
+				// This is a special condition for T_ARRAY tokens used for
+				// type hinting function arguments as being arrays. We want to keep
+				// the parenthesis map clean, so let's tag these tokens as
+				// T_STRING.
+				if ($newToken['code'] === T_ARRAY) {
+					for ($i = $stackPtr; $i < $numTokens; $i++) {
+						if ($tokens[$i] === '(') {
+							break;
+						} else if ($tokens[$i][0] === T_VARIABLE) {
+							$newToken['code'] = T_STRING;
+							$newToken['type'] = 'T_STRING';
+							break;
+						}
+					}
+				}
+
+				// This is a special case when checking PHP 5.5+ code in PHP < 5.5
+				// where "finally" should be T_FINALLY instead of T_STRING.
+				if ($newToken['code'] === T_STRING
+					&& strtolower($newToken['content']) === 'finally'
+				) {
+					$newToken['code'] = T_FINALLY;
+					$newToken['type'] = 'T_FINALLY';
+				}
+
+				// This is a special case for the PHP 5.5 classname::class syntax
+				// where "class" should be T_STRING instead of T_CLASS.
+				if (($newToken['code'] === T_CLASS
+					|| $newToken['code'] === T_FUNCTION)
+					&& $finalTokens[$lastNotEmptyToken]['code'] === T_DOUBLE_COLON
+				) {
+					$newToken['code'] = T_STRING;
+					$newToken['type'] = 'T_STRING';
+				}
+
+				// This is a special case for PHP 5.6 use function and use const
+				// where "function" and "const" should be T_STRING instead of T_FUNCTION
+				// and T_CONST.
+				if (($newToken['code'] === T_FUNCTION
+					|| $newToken['code'] === T_CONST)
+					&& ($finalTokens[$lastNotEmptyToken]['code'] === T_USE || $insideUseGroup === true)
+				) {
+					$newToken['code'] = T_STRING;
+					$newToken['type'] = 'T_STRING';
+				}
+
+				// This is a special case for use groups in PHP 7+ where leaving
+				// the curly braces as their normal tokens would confuse
+				// the scope map and sniffs.
+				if ($newToken['code'] === T_OPEN_CURLY_BRACKET
+					&& $finalTokens[$lastNotEmptyToken]['code'] === T_NS_SEPARATOR
+				) {
+					$newToken['code'] = T_OPEN_USE_GROUP;
+					$newToken['type'] = 'T_OPEN_USE_GROUP';
+					$insideUseGroup   = true;
+				}
+
+				if ($insideUseGroup === true && $newToken['code'] === T_CLOSE_CURLY_BRACKET) {
+					$newToken['code'] = T_CLOSE_USE_GROUP;
+					$newToken['type'] = 'T_CLOSE_USE_GROUP';
+					$insideUseGroup   = false;
+				}
+
+				$finalTokens[$newStackPtr] = $newToken;
+				$newStackPtr++;
+			}//end if
+		}//end for
+
+		if (PHP_CODESNIFFER_VERBOSITY > 1) {
+			echo "\t*** END PHP TOKENIZING ***".PHP_EOL;
+		}
+
+		return $finalTokens;
+
+	}//end tokenize()
+
+
+	/**
+	 * Performs additional processing after main tokenizing.
+	 *
+	 * This additional processing checks for CASE statements that are using curly
+	 * braces for scope openers and closers. It also turns some T_FUNCTION tokens
+	 * into T_CLOSURE when they are not standard function definitions. It also
+	 * detects short array syntax and converts those square brackets into new tokens.
+	 * It also corrects some usage of the static and class keywords. It also
+	 * assigns tokens to function return types.
+	 *
+	 * @return void
+	 */
+	protected function processAdditional()
+	{
+		if (PHP_CODESNIFFER_VERBOSITY > 1) {
+			echo "\t*** START ADDITIONAL PHP PROCESSING ***".PHP_EOL;
+		}
+
+		$numTokens = count($this->tokens);
+		for ($i = ($numTokens - 1); $i >= 0; $i--) {
+			// Check for any unset scope conditions due to alternate IF/ENDIF syntax.
+			if (isset($this->tokens[$i]['scope_opener']) === true
+				&& isset($this->tokens[$i]['scope_condition']) === false
+			) {
+				$this->tokens[$i]['scope_condition'] = $this->tokens[$this->tokens[$i]['scope_opener']]['scope_condition'];
+			}
+
+			if ($this->tokens[$i]['code'] === T_FUNCTION) {
+				/*
                     Detect functions that are actually closures and
                     assign them a different token.
                 */
 
-                if (isset($this->tokens[$i]['scope_opener']) === true) {
-                    for ($x = ($i + 1); $x < $numTokens; $x++) {
-                        if (isset(Util\Tokens::$emptyTokens[$this->tokens[$x]['code']]) === false
-                            && $this->tokens[$x]['code'] !== T_BITWISE_AND
-                        ) {
-                            break;
-                        }
-                    }
-
-                    if ($this->tokens[$x]['code'] === T_OPEN_PARENTHESIS) {
-                        $this->tokens[$i]['code'] = T_CLOSURE;
-                        $this->tokens[$i]['type'] = 'T_CLOSURE';
-                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            $line = $this->tokens[$i]['line'];
-                            echo "\t* token $i on line $line changed from T_FUNCTION to T_CLOSURE".PHP_EOL;
-                        }
-
-                        for ($x = ($this->tokens[$i]['scope_opener'] + 1); $x < $this->tokens[$i]['scope_closer']; $x++) {
-                            if (isset($this->tokens[$x]['conditions'][$i]) === false) {
-                                continue;
-                            }
-
-                            $this->tokens[$x]['conditions'][$i] = T_CLOSURE;
-                            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                $type = $this->tokens[$x]['type'];
-                                echo "\t\t* cleaned $x ($type) *".PHP_EOL;
-                            }
-                        }
-                    }
-                }//end if
-
-                continue;
-            } else if ($this->tokens[$i]['code'] === T_CLASS && isset($this->tokens[$i]['scope_opener']) === true) {
-                /*
+				if (isset($this->tokens[$i]['scope_opener']) === true) {
+					for ($x = ($i + 1); $x < $numTokens; $x++) {
+						if (isset(Util\Tokens::$emptyTokens[$this->tokens[$x]['code']]) === false
+							&& $this->tokens[$x]['code'] !== T_BITWISE_AND
+						) {
+							break;
+						}
+					}
+
+					if ($this->tokens[$x]['code'] === T_OPEN_PARENTHESIS) {
+						$this->tokens[$i]['code'] = T_CLOSURE;
+						$this->tokens[$i]['type'] = 'T_CLOSURE';
+						if (PHP_CODESNIFFER_VERBOSITY > 1) {
+							$line = $this->tokens[$i]['line'];
+							echo "\t* token $i on line $line changed from T_FUNCTION to T_CLOSURE".PHP_EOL;
+						}
+
+						for ($x = ($this->tokens[$i]['scope_opener'] + 1); $x < $this->tokens[$i]['scope_closer']; $x++) {
+							if (isset($this->tokens[$x]['conditions'][$i]) === false) {
+								continue;
+							}
+
+							$this->tokens[$x]['conditions'][$i] = T_CLOSURE;
+							if (PHP_CODESNIFFER_VERBOSITY > 1) {
+								$type = $this->tokens[$x]['type'];
+								echo "\t\t* cleaned $x ($type) *".PHP_EOL;
+							}
+						}
+					}
+				}//end if
+
+				continue;
+			} else if ($this->tokens[$i]['code'] === T_CLASS && isset($this->tokens[$i]['scope_opener']) === true) {
+				/*
                     Detect anonymous classes and assign them a different token.
                 */
 
-                for ($x = ($i + 1); $x < $numTokens; $x++) {
-                    if (isset(Util\Tokens::$emptyTokens[$this->tokens[$x]['code']]) === false) {
-                        break;
-                    }
-                }
-
-                if ($this->tokens[$x]['code'] === T_OPEN_PARENTHESIS
-                    || $this->tokens[$x]['code'] === T_OPEN_CURLY_BRACKET
-                    || $this->tokens[$x]['code'] === T_EXTENDS
-                    || $this->tokens[$x]['code'] === T_IMPLEMENTS
-                ) {
-                    $this->tokens[$i]['code'] = T_ANON_CLASS;
-                    $this->tokens[$i]['type'] = 'T_ANON_CLASS';
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        $line = $this->tokens[$i]['line'];
-                        echo "\t* token $i on line $line changed from T_CLASS to T_ANON_CLASS".PHP_EOL;
-                    }
-
-                    for ($x = ($this->tokens[$i]['scope_opener'] + 1); $x < $this->tokens[$i]['scope_closer']; $x++) {
-                        if (isset($this->tokens[$x]['conditions'][$i]) === false) {
-                            continue;
-                        }
-
-                        $this->tokens[$x]['conditions'][$i] = T_ANON_CLASS;
-                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            $type = $this->tokens[$x]['type'];
-                            echo "\t\t* cleaned $x ($type) *".PHP_EOL;
-                        }
-                    }
-                }
-
-                continue;
-            } else if ($this->tokens[$i]['code'] === T_OPEN_SQUARE_BRACKET) {
-                if (isset($this->tokens[$i]['bracket_closer']) === false) {
-                    continue;
-                }
-
-                // Unless there is a variable or a bracket before this token,
-                // it is the start of an array being defined using the short syntax.
-                $isShortArray = false;
-                $allowed      = [
-                    T_CLOSE_SQUARE_BRACKET     => T_CLOSE_SQUARE_BRACKET,
-                    T_CLOSE_CURLY_BRACKET      => T_CLOSE_CURLY_BRACKET,
-                    T_CLOSE_PARENTHESIS        => T_CLOSE_PARENTHESIS,
-                    T_VARIABLE                 => T_VARIABLE,
-                    T_OBJECT_OPERATOR          => T_OBJECT_OPERATOR,
-                    T_STRING                   => T_STRING,
-                    T_CONSTANT_ENCAPSED_STRING => T_CONSTANT_ENCAPSED_STRING,
-                ];
-
-                for ($x = ($i - 1); $x >= 0; $x--) {
-                    // If we hit a scope opener, the statement has ended
-                    // without finding anything, so it's probably an array
-                    // using PHP 7.1 short list syntax.
-                    if (isset($this->tokens[$x]['scope_opener']) === true) {
-                        $isShortArray = true;
-                        break;
-                    }
-
-                    if (isset(Util\Tokens::$emptyTokens[$this->tokens[$x]['code']]) === false) {
-                        if (isset($allowed[$this->tokens[$x]['code']]) === false) {
-                            $isShortArray = true;
-                        }
-
-                        break;
-                    }
-                }
-
-                if ($isShortArray === true) {
-                    $this->tokens[$i]['code'] = T_OPEN_SHORT_ARRAY;
-                    $this->tokens[$i]['type'] = 'T_OPEN_SHORT_ARRAY';
-
-                    $closer = $this->tokens[$i]['bracket_closer'];
-                    $this->tokens[$closer]['code'] = T_CLOSE_SHORT_ARRAY;
-                    $this->tokens[$closer]['type'] = 'T_CLOSE_SHORT_ARRAY';
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        $line = $this->tokens[$i]['line'];
-                        echo "\t* token $i on line $line changed from T_OPEN_SQUARE_BRACKET to T_OPEN_SHORT_ARRAY".PHP_EOL;
-                        $line = $this->tokens[$closer]['line'];
-                        echo "\t* token $closer on line $line changed from T_CLOSE_SQUARE_BRACKET to T_CLOSE_SHORT_ARRAY".PHP_EOL;
-                    }
-                }
-
-                continue;
-            } else if ($this->tokens[$i]['code'] === T_STATIC) {
-                for ($x = ($i - 1); $x > 0; $x--) {
-                    if (isset(Util\Tokens::$emptyTokens[$this->tokens[$x]['code']]) === false) {
-                        break;
-                    }
-                }
-
-                if ($this->tokens[$x]['code'] === T_INSTANCEOF) {
-                    $this->tokens[$i]['code'] = T_STRING;
-                    $this->tokens[$i]['type'] = 'T_STRING';
-
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        $line = $this->tokens[$i]['line'];
-                        echo "\t* token $i on line $line changed from T_STATIC to T_STRING".PHP_EOL;
-                    }
-                }
-
-                continue;
-            } else if ($this->tokens[$i]['code'] === T_TRUE
-                || $this->tokens[$i]['code'] === T_FALSE
-                || $this->tokens[$i]['code'] === T_NULL
-            ) {
-                for ($x = ($i + 1); $i < $numTokens; $x++) {
-                    if (isset(Util\Tokens::$emptyTokens[$this->tokens[$x]['code']]) === false) {
-                        // Non-whitespace content.
-                        break;
-                    }
-                }
-
-                $context = [
-                    T_OBJECT_OPERATOR      => true,
-                    T_NS_SEPARATOR         => true,
-                    T_PAAMAYIM_NEKUDOTAYIM => true,
-                ];
-                if (isset($context[$this->tokens[$x]['code']]) === true) {
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        $line = $this->tokens[$i]['line'];
-                        $type = $this->tokens[$i]['type'];
-                        echo "\t* token $i on line $line changed from $type to T_STRING".PHP_EOL;
-                    }
-
-                    $this->tokens[$i]['code'] = T_STRING;
-                    $this->tokens[$i]['type'] = 'T_STRING';
-                }
-            } else if ($this->tokens[$i]['code'] === T_CONST) {
-                // Context sensitive keywords support.
-                for ($x = ($i + 1); $i < $numTokens; $x++) {
-                    if (isset(Util\Tokens::$emptyTokens[$this->tokens[$x]['code']]) === false) {
-                        // Non-whitespace content.
-                        break;
-                    }
-                }
-
-                if ($this->tokens[$x]['code'] !== T_STRING) {
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        $line = $this->tokens[$x]['line'];
-                        $type = $this->tokens[$x]['type'];
-                        echo "\t* token $x on line $line changed from $type to T_STRING".PHP_EOL;
-                    }
-
-                    $this->tokens[$x]['code'] = T_STRING;
-                    $this->tokens[$x]['type'] = 'T_STRING';
-                }
-            }//end if
-
-            if (($this->tokens[$i]['code'] !== T_CASE
-                && $this->tokens[$i]['code'] !== T_DEFAULT)
-                || isset($this->tokens[$i]['scope_opener']) === false
-            ) {
-                // Only interested in CASE and DEFAULT statements from here on in.
-                continue;
-            }
-
-            $scopeOpener = $this->tokens[$i]['scope_opener'];
-            $scopeCloser = $this->tokens[$i]['scope_closer'];
-
-            // If the first char after the opener is a curly brace
-            // and that brace has been ignored, it is actually
-            // opening this case statement and the opener and closer are
-            // probably set incorrectly.
-            for ($x = ($scopeOpener + 1); $x < $numTokens; $x++) {
-                if (isset(Util\Tokens::$emptyTokens[$this->tokens[$x]['code']]) === false) {
-                    // Non-whitespace content.
-                    break;
-                }
-            }
-
-            if ($this->tokens[$x]['code'] === T_CASE || $this->tokens[$x]['code'] === T_DEFAULT) {
-                // Special case for multiple CASE statements that share the same
-                // closer. Because we are going backwards through the file, this next
-                // CASE statement is already fixed, so just use its closer and don't
-                // worry about fixing anything.
-                $newCloser = $this->tokens[$x]['scope_closer'];
-                $this->tokens[$i]['scope_closer'] = $newCloser;
-                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                    $oldType = $this->tokens[$scopeCloser]['type'];
-                    $newType = $this->tokens[$newCloser]['type'];
-                    $line    = $this->tokens[$i]['line'];
-                    echo "\t* token $i (T_CASE) on line $line closer changed from $scopeCloser ($oldType) to $newCloser ($newType)".PHP_EOL;
-                }
-
-                continue;
-            }
-
-            if ($this->tokens[$x]['code'] !== T_OPEN_CURLY_BRACKET
-                || isset($this->tokens[$x]['scope_condition']) === true
-            ) {
-                // Not a CASE/DEFAULT with a curly brace opener.
-                continue;
-            }
-
-            // The closer for this CASE/DEFAULT should be the closing curly brace and
-            // not whatever it already is. The opener needs to be the opening curly
-            // brace so everything matches up.
-            $newCloser = $this->tokens[$x]['bracket_closer'];
-            foreach ([$i, $x, $newCloser] as $index) {
-                $this->tokens[$index]['scope_condition'] = $i;
-                $this->tokens[$index]['scope_opener']    = $x;
-                $this->tokens[$index]['scope_closer']    = $newCloser;
-            }
-
-            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                $line      = $this->tokens[$i]['line'];
-                $tokenType = $this->tokens[$i]['type'];
-
-                $oldType = $this->tokens[$scopeOpener]['type'];
-                $newType = $this->tokens[$x]['type'];
-                echo "\t* token $i ($tokenType) on line $line opener changed from $scopeOpener ($oldType) to $x ($newType)".PHP_EOL;
-
-                $oldType = $this->tokens[$scopeCloser]['type'];
-                $newType = $this->tokens[$newCloser]['type'];
-                echo "\t* token $i ($tokenType) on line $line closer changed from $scopeCloser ($oldType) to $newCloser ($newType)".PHP_EOL;
-            }
-
-            if ($this->tokens[$scopeOpener]['scope_condition'] === $i) {
-                unset($this->tokens[$scopeOpener]['scope_condition']);
-                unset($this->tokens[$scopeOpener]['scope_opener']);
-                unset($this->tokens[$scopeOpener]['scope_closer']);
-            }
-
-            if ($this->tokens[$scopeCloser]['scope_condition'] === $i) {
-                unset($this->tokens[$scopeCloser]['scope_condition']);
-                unset($this->tokens[$scopeCloser]['scope_opener']);
-                unset($this->tokens[$scopeCloser]['scope_closer']);
-            } else {
-                // We were using a shared closer. All tokens that were
-                // sharing this closer with us, except for the scope condition
-                // and it's opener, need to now point to the new closer.
-                $condition = $this->tokens[$scopeCloser]['scope_condition'];
-                $start     = ($this->tokens[$condition]['scope_opener'] + 1);
-                for ($y = $start; $y < $scopeCloser; $y++) {
-                    if (isset($this->tokens[$y]['scope_closer']) === true
-                        && $this->tokens[$y]['scope_closer'] === $scopeCloser
-                    ) {
-                        $this->tokens[$y]['scope_closer'] = $newCloser;
-
-                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            $line      = $this->tokens[$y]['line'];
-                            $tokenType = $this->tokens[$y]['type'];
-                            $oldType   = $this->tokens[$scopeCloser]['type'];
-                            $newType   = $this->tokens[$newCloser]['type'];
-                            echo "\t\t* token $y ($tokenType) on line $line closer changed from $scopeCloser ($oldType) to $newCloser ($newType)".PHP_EOL;
-                        }
-                    }
-                }
-            }//end if
-
-            unset($this->tokens[$x]['bracket_opener']);
-            unset($this->tokens[$x]['bracket_closer']);
-            unset($this->tokens[$newCloser]['bracket_opener']);
-            unset($this->tokens[$newCloser]['bracket_closer']);
-            $this->tokens[$scopeCloser]['conditions'][] = $i;
-
-            // Now fix up all the tokens that think they are
-            // inside the CASE/DEFAULT statement when they are really outside.
-            for ($x = $newCloser; $x < $scopeCloser; $x++) {
-                foreach ($this->tokens[$x]['conditions'] as $num => $oldCond) {
-                    if ($oldCond === $this->tokens[$i]['code']) {
-                        $oldConditions = $this->tokens[$x]['conditions'];
-                        unset($this->tokens[$x]['conditions'][$num]);
-
-                        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, ',');
-
-                            echo "\t\t* cleaned $x ($type) *".PHP_EOL;
-                            echo "\t\t\t=> conditions changed from $oldConds to $newConds".PHP_EOL;
-                        }
-
-                        break;
-                    }//end if
-                }//end foreach
-            }//end for
-        }//end for
-
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            echo "\t*** END ADDITIONAL PHP PROCESSING ***".PHP_EOL;
-        }
-
-    }//end processAdditional()
-
-
-    /**
-     * Takes a token produced from <code>token_get_all()</code> and produces a
-     * more uniform token.
-     *
-     * @param string|array $token The token to convert.
-     *
-     * @return array The new token.
-     */
-    public static function standardiseToken($token)
-    {
-        if (isset($token[1]) === false) {
-            if (isset(self::$resolveTokenCache[$token[0]]) === true) {
-                return self::$resolveTokenCache[$token[0]];
-            }
-        } else {
-            $cacheKey = null;
-            if ($token[0] === T_STRING) {
-                $cacheKey = strtolower($token[1]);
-            } else if ($token[0] !== T_CURLY_OPEN) {
-                $cacheKey = $token[0];
-            }
-
-            if ($cacheKey !== null && isset(self::$resolveTokenCache[$cacheKey]) === true) {
-                $newToken            = self::$resolveTokenCache[$cacheKey];
-                $newToken['content'] = $token[1];
-                return $newToken;
-            }
-        }
-
-        if (isset($token[1]) === false) {
-            return self::resolveSimpleToken($token[0]);
-        }
-
-        if ($token[0] === T_STRING) {
-            switch ($cacheKey) {
-            case 'false':
-                $newToken['type'] = 'T_FALSE';
-                break;
-            case 'true':
-                $newToken['type'] = 'T_TRUE';
-                break;
-            case 'null':
-                $newToken['type'] = 'T_NULL';
-                break;
-            case 'self':
-                $newToken['type'] = 'T_SELF';
-                break;
-            case 'parent':
-                $newToken['type'] = 'T_PARENT';
-                break;
-            default:
-                $newToken['type'] = 'T_STRING';
-                break;
-            }
-
-            $newToken['code'] = constant($newToken['type']);
-
-            self::$resolveTokenCache[$cacheKey] = $newToken;
-        } else if ($token[0] === T_CURLY_OPEN) {
-            $newToken = [
-                'code' => T_OPEN_CURLY_BRACKET,
-                'type' => 'T_OPEN_CURLY_BRACKET',
-            ];
-        } else {
-            $newToken = [
-                'code' => $token[0],
-                'type' => Util\Tokens::tokenName($token[0]),
-            ];
-
-            self::$resolveTokenCache[$token[0]] = $newToken;
-        }//end if
-
-        $newToken['content'] = $token[1];
-        return $newToken;
-
-    }//end standardiseToken()
-
-
-    /**
-     * Converts simple tokens into a format that conforms to complex tokens
-     * produced by token_get_all().
-     *
-     * Simple tokens are tokens that are not in array form when produced from
-     * token_get_all().
-     *
-     * @param string $token The simple token to convert.
-     *
-     * @return array The new token in array format.
-     */
-    public static function resolveSimpleToken($token)
-    {
-        $newToken = [];
-
-        switch ($token) {
-        case '{':
-            $newToken['type'] = 'T_OPEN_CURLY_BRACKET';
-            break;
-        case '}':
-            $newToken['type'] = 'T_CLOSE_CURLY_BRACKET';
-            break;
-        case '[':
-            $newToken['type'] = 'T_OPEN_SQUARE_BRACKET';
-            break;
-        case ']':
-            $newToken['type'] = 'T_CLOSE_SQUARE_BRACKET';
-            break;
-        case '(':
-            $newToken['type'] = 'T_OPEN_PARENTHESIS';
-            break;
-        case ')':
-            $newToken['type'] = 'T_CLOSE_PARENTHESIS';
-            break;
-        case ':':
-            $newToken['type'] = 'T_COLON';
-            break;
-        case '.':
-            $newToken['type'] = 'T_STRING_CONCAT';
-            break;
-        case ';':
-            $newToken['type'] = 'T_SEMICOLON';
-            break;
-        case '=':
-            $newToken['type'] = 'T_EQUAL';
-            break;
-        case '*':
-            $newToken['type'] = 'T_MULTIPLY';
-            break;
-        case '/':
-            $newToken['type'] = 'T_DIVIDE';
-            break;
-        case '+':
-            $newToken['type'] = 'T_PLUS';
-            break;
-        case '-':
-            $newToken['type'] = 'T_MINUS';
-            break;
-        case '%':
-            $newToken['type'] = 'T_MODULUS';
-            break;
-        case '^':
-            $newToken['type'] = 'T_BITWISE_XOR';
-            break;
-        case '&':
-            $newToken['type'] = 'T_BITWISE_AND';
-            break;
-        case '|':
-            $newToken['type'] = 'T_BITWISE_OR';
-            break;
-        case '~':
-            $newToken['type'] = 'T_BITWISE_NOT';
-            break;
-        case '<':
-            $newToken['type'] = 'T_LESS_THAN';
-            break;
-        case '>':
-            $newToken['type'] = 'T_GREATER_THAN';
-            break;
-        case '!':
-            $newToken['type'] = 'T_BOOLEAN_NOT';
-            break;
-        case ',':
-            $newToken['type'] = 'T_COMMA';
-            break;
-        case '@':
-            $newToken['type'] = 'T_ASPERAND';
-            break;
-        case '$':
-            $newToken['type'] = 'T_DOLLAR';
-            break;
-        case '`':
-            $newToken['type'] = 'T_BACKTICK';
-            break;
-        default:
-            $newToken['type'] = 'T_NONE';
-            break;
-        }//end switch
-
-        $newToken['code']    = constant($newToken['type']);
-        $newToken['content'] = $token;
-
-        self::$resolveTokenCache[$token] = $newToken;
-        return $newToken;
-
-    }//end resolveSimpleToken()
+				for ($x = ($i + 1); $x < $numTokens; $x++) {
+					if (isset(Util\Tokens::$emptyTokens[$this->tokens[$x]['code']]) === false) {
+						break;
+					}
+				}
+
+				if ($this->tokens[$x]['code'] === T_OPEN_PARENTHESIS
+					|| $this->tokens[$x]['code'] === T_OPEN_CURLY_BRACKET
+					|| $this->tokens[$x]['code'] === T_EXTENDS
+					|| $this->tokens[$x]['code'] === T_IMPLEMENTS
+				) {
+					$this->tokens[$i]['code'] = T_ANON_CLASS;
+					$this->tokens[$i]['type'] = 'T_ANON_CLASS';
+					if (PHP_CODESNIFFER_VERBOSITY > 1) {
+						$line = $this->tokens[$i]['line'];
+						echo "\t* token $i on line $line changed from T_CLASS to T_ANON_CLASS".PHP_EOL;
+					}
+
+					for ($x = ($this->tokens[$i]['scope_opener'] + 1); $x < $this->tokens[$i]['scope_closer']; $x++) {
+						if (isset($this->tokens[$x]['conditions'][$i]) === false) {
+							continue;
+						}
+
+						$this->tokens[$x]['conditions'][$i] = T_ANON_CLASS;
+						if (PHP_CODESNIFFER_VERBOSITY > 1) {
+							$type = $this->tokens[$x]['type'];
+							echo "\t\t* cleaned $x ($type) *".PHP_EOL;
+						}
+					}
+				}
+
+				continue;
+			} else if ($this->tokens[$i]['code'] === T_OPEN_SQUARE_BRACKET) {
+				if (isset($this->tokens[$i]['bracket_closer']) === false) {
+					continue;
+				}
+
+				// Unless there is a variable or a bracket before this token,
+				// it is the start of an array being defined using the short syntax.
+				$isShortArray = false;
+				$allowed      = [
+					T_CLOSE_SQUARE_BRACKET     => T_CLOSE_SQUARE_BRACKET,
+					T_CLOSE_CURLY_BRACKET      => T_CLOSE_CURLY_BRACKET,
+					T_CLOSE_PARENTHESIS        => T_CLOSE_PARENTHESIS,
+					T_VARIABLE                 => T_VARIABLE,
+					T_OBJECT_OPERATOR          => T_OBJECT_OPERATOR,
+					T_STRING                   => T_STRING,
+					T_CONSTANT_ENCAPSED_STRING => T_CONSTANT_ENCAPSED_STRING,
+				];
+
+				for ($x = ($i - 1); $x >= 0; $x--) {
+					// If we hit a scope opener, the statement has ended
+					// without finding anything, so it's probably an array
+					// using PHP 7.1 short list syntax.
+					if (isset($this->tokens[$x]['scope_opener']) === true) {
+						$isShortArray = true;
+						break;
+					}
+
+					if (isset(Util\Tokens::$emptyTokens[$this->tokens[$x]['code']]) === false) {
+						if (isset($allowed[$this->tokens[$x]['code']]) === false) {
+							$isShortArray = true;
+						}
+
+						break;
+					}
+				}
+
+				if ($isShortArray === true) {
+					$this->tokens[$i]['code'] = T_OPEN_SHORT_ARRAY;
+					$this->tokens[$i]['type'] = 'T_OPEN_SHORT_ARRAY';
+
+					$closer = $this->tokens[$i]['bracket_closer'];
+					$this->tokens[$closer]['code'] = T_CLOSE_SHORT_ARRAY;
+					$this->tokens[$closer]['type'] = 'T_CLOSE_SHORT_ARRAY';
+					if (PHP_CODESNIFFER_VERBOSITY > 1) {
+						$line = $this->tokens[$i]['line'];
+						echo "\t* token $i on line $line changed from T_OPEN_SQUARE_BRACKET to T_OPEN_SHORT_ARRAY".PHP_EOL;
+						$line = $this->tokens[$closer]['line'];
+						echo "\t* token $closer on line $line changed from T_CLOSE_SQUARE_BRACKET to T_CLOSE_SHORT_ARRAY".PHP_EOL;
+					}
+				}
+
+				continue;
+			} else if ($this->tokens[$i]['code'] === T_STATIC) {
+				for ($x = ($i - 1); $x > 0; $x--) {
+					if (isset(Util\Tokens::$emptyTokens[$this->tokens[$x]['code']]) === false) {
+						break;
+					}
+				}
+
+				if ($this->tokens[$x]['code'] === T_INSTANCEOF) {
+					$this->tokens[$i]['code'] = T_STRING;
+					$this->tokens[$i]['type'] = 'T_STRING';
+
+					if (PHP_CODESNIFFER_VERBOSITY > 1) {
+						$line = $this->tokens[$i]['line'];
+						echo "\t* token $i on line $line changed from T_STATIC to T_STRING".PHP_EOL;
+					}
+				}
+
+				continue;
+			} else if ($this->tokens[$i]['code'] === T_TRUE
+				|| $this->tokens[$i]['code'] === T_FALSE
+				|| $this->tokens[$i]['code'] === T_NULL
+			) {
+				for ($x = ($i + 1); $i < $numTokens; $x++) {
+					if (isset(Util\Tokens::$emptyTokens[$this->tokens[$x]['code']]) === false) {
+						// Non-whitespace content.
+						break;
+					}
+				}
+
+				$context = [
+					T_OBJECT_OPERATOR      => true,
+					T_NS_SEPARATOR         => true,
+					T_PAAMAYIM_NEKUDOTAYIM => true,
+				];
+				if (isset($context[$this->tokens[$x]['code']]) === true) {
+					if (PHP_CODESNIFFER_VERBOSITY > 1) {
+						$line = $this->tokens[$i]['line'];
+						$type = $this->tokens[$i]['type'];
+						echo "\t* token $i on line $line changed from $type to T_STRING".PHP_EOL;
+					}
+
+					$this->tokens[$i]['code'] = T_STRING;
+					$this->tokens[$i]['type'] = 'T_STRING';
+				}
+			} else if ($this->tokens[$i]['code'] === T_CONST) {
+				// Context sensitive keywords support.
+				for ($x = ($i + 1); $i < $numTokens; $x++) {
+					if (isset(Util\Tokens::$emptyTokens[$this->tokens[$x]['code']]) === false) {
+						// Non-whitespace content.
+						break;
+					}
+				}
+
+				if ($this->tokens[$x]['code'] !== T_STRING) {
+					if (PHP_CODESNIFFER_VERBOSITY > 1) {
+						$line = $this->tokens[$x]['line'];
+						$type = $this->tokens[$x]['type'];
+						echo "\t* token $x on line $line changed from $type to T_STRING".PHP_EOL;
+					}
+
+					$this->tokens[$x]['code'] = T_STRING;
+					$this->tokens[$x]['type'] = 'T_STRING';
+				}
+			}//end if
+
+			if (($this->tokens[$i]['code'] !== T_CASE
+				&& $this->tokens[$i]['code'] !== T_DEFAULT)
+				|| isset($this->tokens[$i]['scope_opener']) === false
+			) {
+				// Only interested in CASE and DEFAULT statements from here on in.
+				continue;
+			}
+
+			$scopeOpener = $this->tokens[$i]['scope_opener'];
+			$scopeCloser = $this->tokens[$i]['scope_closer'];
+
+			// If the first char after the opener is a curly brace
+			// and that brace has been ignored, it is actually
+			// opening this case statement and the opener and closer are
+			// probably set incorrectly.
+			for ($x = ($scopeOpener + 1); $x < $numTokens; $x++) {
+				if (isset(Util\Tokens::$emptyTokens[$this->tokens[$x]['code']]) === false) {
+					// Non-whitespace content.
+					break;
+				}
+			}
+
+			if ($this->tokens[$x]['code'] === T_CASE || $this->tokens[$x]['code'] === T_DEFAULT) {
+				// Special case for multiple CASE statements that share the same
+				// closer. Because we are going backwards through the file, this next
+				// CASE statement is already fixed, so just use its closer and don't
+				// worry about fixing anything.
+				$newCloser = $this->tokens[$x]['scope_closer'];
+				$this->tokens[$i]['scope_closer'] = $newCloser;
+				if (PHP_CODESNIFFER_VERBOSITY > 1) {
+					$oldType = $this->tokens[$scopeCloser]['type'];
+					$newType = $this->tokens[$newCloser]['type'];
+					$line    = $this->tokens[$i]['line'];
+					echo "\t* token $i (T_CASE) on line $line closer changed from $scopeCloser ($oldType) to $newCloser ($newType)".PHP_EOL;
+				}
+
+				continue;
+			}
+
+			if ($this->tokens[$x]['code'] !== T_OPEN_CURLY_BRACKET
+				|| isset($this->tokens[$x]['scope_condition']) === true
+			) {
+				// Not a CASE/DEFAULT with a curly brace opener.
+				continue;
+			}
+
+			// The closer for this CASE/DEFAULT should be the closing curly brace and
+			// not whatever it already is. The opener needs to be the opening curly
+			// brace so everything matches up.
+			$newCloser = $this->tokens[$x]['bracket_closer'];
+			foreach ([$i, $x, $newCloser] as $index) {
+				$this->tokens[$index]['scope_condition'] = $i;
+				$this->tokens[$index]['scope_opener']    = $x;
+				$this->tokens[$index]['scope_closer']    = $newCloser;
+			}
+
+			if (PHP_CODESNIFFER_VERBOSITY > 1) {
+				$line      = $this->tokens[$i]['line'];
+				$tokenType = $this->tokens[$i]['type'];
+
+				$oldType = $this->tokens[$scopeOpener]['type'];
+				$newType = $this->tokens[$x]['type'];
+				echo "\t* token $i ($tokenType) on line $line opener changed from $scopeOpener ($oldType) to $x ($newType)".PHP_EOL;
+
+				$oldType = $this->tokens[$scopeCloser]['type'];
+				$newType = $this->tokens[$newCloser]['type'];
+				echo "\t* token $i ($tokenType) on line $line closer changed from $scopeCloser ($oldType) to $newCloser ($newType)".PHP_EOL;
+			}
+
+			if ($this->tokens[$scopeOpener]['scope_condition'] === $i) {
+				unset($this->tokens[$scopeOpener]['scope_condition']);
+				unset($this->tokens[$scopeOpener]['scope_opener']);
+				unset($this->tokens[$scopeOpener]['scope_closer']);
+			}
+
+			if ($this->tokens[$scopeCloser]['scope_condition'] === $i) {
+				unset($this->tokens[$scopeCloser]['scope_condition']);
+				unset($this->tokens[$scopeCloser]['scope_opener']);
+				unset($this->tokens[$scopeCloser]['scope_closer']);
+			} else {
+				// We were using a shared closer. All tokens that were
+				// sharing this closer with us, except for the scope condition
+				// and it's opener, need to now point to the new closer.
+				$condition = $this->tokens[$scopeCloser]['scope_condition'];
+				$start     = ($this->tokens[$condition]['scope_opener'] + 1);
+				for ($y = $start; $y < $scopeCloser; $y++) {
+					if (isset($this->tokens[$y]['scope_closer']) === true
+						&& $this->tokens[$y]['scope_closer'] === $scopeCloser
+					) {
+						$this->tokens[$y]['scope_closer'] = $newCloser;
+
+						if (PHP_CODESNIFFER_VERBOSITY > 1) {
+							$line      = $this->tokens[$y]['line'];
+							$tokenType = $this->tokens[$y]['type'];
+							$oldType   = $this->tokens[$scopeCloser]['type'];
+							$newType   = $this->tokens[$newCloser]['type'];
+							echo "\t\t* token $y ($tokenType) on line $line closer changed from $scopeCloser ($oldType) to $newCloser ($newType)".PHP_EOL;
+						}
+					}
+				}
+			}//end if
+
+			unset($this->tokens[$x]['bracket_opener']);
+			unset($this->tokens[$x]['bracket_closer']);
+			unset($this->tokens[$newCloser]['bracket_opener']);
+			unset($this->tokens[$newCloser]['bracket_closer']);
+			$this->tokens[$scopeCloser]['conditions'][] = $i;
+
+			// Now fix up all the tokens that think they are
+			// inside the CASE/DEFAULT statement when they are really outside.
+			for ($x = $newCloser; $x < $scopeCloser; $x++) {
+				foreach ($this->tokens[$x]['conditions'] as $num => $oldCond) {
+					if ($oldCond === $this->tokens[$i]['code']) {
+						$oldConditions = $this->tokens[$x]['conditions'];
+						unset($this->tokens[$x]['conditions'][$num]);
+
+						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, ',');
+
+							echo "\t\t* cleaned $x ($type) *".PHP_EOL;
+							echo "\t\t\t=> conditions changed from $oldConds to $newConds".PHP_EOL;
+						}
+
+						break;
+					}//end if
+				}//end foreach
+			}//end for
+		}//end for
+
+		if (PHP_CODESNIFFER_VERBOSITY > 1) {
+			echo "\t*** END ADDITIONAL PHP PROCESSING ***".PHP_EOL;
+		}
+
+	}//end processAdditional()
+
+
+	/**
+	 * Takes a token produced from <code>token_get_all()</code> and produces a
+	 * more uniform token.
+	 *
+	 * @param string|array $token The token to convert.
+	 *
+	 * @return array The new token.
+	 */
+	public static function standardiseToken($token)
+	{
+		if (isset($token[1]) === false) {
+			if (isset(self::$resolveTokenCache[$token[0]]) === true) {
+				return self::$resolveTokenCache[$token[0]];
+			}
+		} else {
+			$cacheKey = null;
+			if ($token[0] === T_STRING) {
+				$cacheKey = strtolower($token[1]);
+			} else if ($token[0] !== T_CURLY_OPEN) {
+				$cacheKey = $token[0];
+			}
+
+			if ($cacheKey !== null && isset(self::$resolveTokenCache[$cacheKey]) === true) {
+				$newToken            = self::$resolveTokenCache[$cacheKey];
+				$newToken['content'] = $token[1];
+				return $newToken;
+			}
+		}
+
+		if (isset($token[1]) === false) {
+			return self::resolveSimpleToken($token[0]);
+		}
+
+		if ($token[0] === T_STRING) {
+			switch ($cacheKey) {
+			case 'false':
+				$newToken['type'] = 'T_FALSE';
+				break;
+			case 'true':
+				$newToken['type'] = 'T_TRUE';
+				break;
+			case 'null':
+				$newToken['type'] = 'T_NULL';
+				break;
+			case 'self':
+				$newToken['type'] = 'T_SELF';
+				break;
+			case 'parent':
+				$newToken['type'] = 'T_PARENT';
+				break;
+			default:
+				$newToken['type'] = 'T_STRING';
+				break;
+			}
+
+			$newToken['code'] = constant($newToken['type']);
+
+			self::$resolveTokenCache[$cacheKey] = $newToken;
+		} else if ($token[0] === T_CURLY_OPEN) {
+			$newToken = [
+				'code' => T_OPEN_CURLY_BRACKET,
+				'type' => 'T_OPEN_CURLY_BRACKET',
+			];
+		} else {
+			$newToken = [
+				'code' => $token[0],
+				'type' => Util\Tokens::tokenName($token[0]),
+			];
+
+			self::$resolveTokenCache[$token[0]] = $newToken;
+		}//end if
+
+		$newToken['content'] = $token[1];
+		return $newToken;
+
+	}//end standardiseToken()
+
+
+	/**
+	 * Converts simple tokens into a format that conforms to complex tokens
+	 * produced by token_get_all().
+	 *
+	 * Simple tokens are tokens that are not in array form when produced from
+	 * token_get_all().
+	 *
+	 * @param string $token The simple token to convert.
+	 *
+	 * @return array The new token in array format.
+	 */
+	public static function resolveSimpleToken($token)
+	{
+		$newToken = [];
+
+		switch ($token) {
+		case '{':
+			$newToken['type'] = 'T_OPEN_CURLY_BRACKET';
+			break;
+		case '}':
+			$newToken['type'] = 'T_CLOSE_CURLY_BRACKET';
+			break;
+		case '[':
+			$newToken['type'] = 'T_OPEN_SQUARE_BRACKET';
+			break;
+		case ']':
+			$newToken['type'] = 'T_CLOSE_SQUARE_BRACKET';
+			break;
+		case '(':
+			$newToken['type'] = 'T_OPEN_PARENTHESIS';
+			break;
+		case ')':
+			$newToken['type'] = 'T_CLOSE_PARENTHESIS';
+			break;
+		case ':':
+			$newToken['type'] = 'T_COLON';
+			break;
+		case '.':
+			$newToken['type'] = 'T_STRING_CONCAT';
+			break;
+		case ';':
+			$newToken['type'] = 'T_SEMICOLON';
+			break;
+		case '=':
+			$newToken['type'] = 'T_EQUAL';
+			break;
+		case '*':
+			$newToken['type'] = 'T_MULTIPLY';
+			break;
+		case '/':
+			$newToken['type'] = 'T_DIVIDE';
+			break;
+		case '+':
+			$newToken['type'] = 'T_PLUS';
+			break;
+		case '-':
+			$newToken['type'] = 'T_MINUS';
+			break;
+		case '%':
+			$newToken['type'] = 'T_MODULUS';
+			break;
+		case '^':
+			$newToken['type'] = 'T_BITWISE_XOR';
+			break;
+		case '&':
+			$newToken['type'] = 'T_BITWISE_AND';
+			break;
+		case '|':
+			$newToken['type'] = 'T_BITWISE_OR';
+			break;
+		case '~':
+			$newToken['type'] = 'T_BITWISE_NOT';
+			break;
+		case '<':
+			$newToken['type'] = 'T_LESS_THAN';
+			break;
+		case '>':
+			$newToken['type'] = 'T_GREATER_THAN';
+			break;
+		case '!':
+			$newToken['type'] = 'T_BOOLEAN_NOT';
+			break;
+		case ',':
+			$newToken['type'] = 'T_COMMA';
+			break;
+		case '@':
+			$newToken['type'] = 'T_ASPERAND';
+			break;
+		case '$':
+			$newToken['type'] = 'T_DOLLAR';
+			break;
+		case '`':
+			$newToken['type'] = 'T_BACKTICK';
+			break;
+		default:
+			$newToken['type'] = 'T_NONE';
+			break;
+		}//end switch
+
+		$newToken['code']    = constant($newToken['type']);
+		$newToken['content'] = $token;
+
+		self::$resolveTokenCache[$token] = $newToken;
+		return $newToken;
+
+	}//end resolveSimpleToken()
 
 
 }//end class

Switch Indentation +99 added lines, -99 removed lines

@@ -1863,24 +1863,24 @@ 
 
         if ($token[0] === T_STRING) {
             switch ($cacheKey) {
-            case 'false':
-                $newToken['type'] = 'T_FALSE';
-                break;
-            case 'true':
-                $newToken['type'] = 'T_TRUE';
-                break;
-            case 'null':
-                $newToken['type'] = 'T_NULL';
-                break;
-            case 'self':
-                $newToken['type'] = 'T_SELF';
-                break;
-            case 'parent':
-                $newToken['type'] = 'T_PARENT';
-                break;
-            default:
-                $newToken['type'] = 'T_STRING';
-                break;
+            	case 'false':
+                	$newToken['type'] = 'T_FALSE';
+                	break;
+            	case 'true':
+                	$newToken['type'] = 'T_TRUE';
+                	break;
+            	case 'null':
+                	$newToken['type'] = 'T_NULL';
+                	break;
+            	case 'self':
+                	$newToken['type'] = 'T_SELF';
+                	break;
+            	case 'parent':
+                	$newToken['type'] = 'T_PARENT';
+                	break;
+            	default:
+                	$newToken['type'] = 'T_STRING';
+                	break;
             }
 
             $newToken['code'] = constant($newToken['type']);
@@ -1922,87 +1922,87 @@ 
         $newToken = [];
 
         switch ($token) {
-        case '{':
-            $newToken['type'] = 'T_OPEN_CURLY_BRACKET';
-            break;
-        case '}':
-            $newToken['type'] = 'T_CLOSE_CURLY_BRACKET';
-            break;
-        case '[':
-            $newToken['type'] = 'T_OPEN_SQUARE_BRACKET';
-            break;
-        case ']':
-            $newToken['type'] = 'T_CLOSE_SQUARE_BRACKET';
-            break;
-        case '(':
-            $newToken['type'] = 'T_OPEN_PARENTHESIS';
-            break;
-        case ')':
-            $newToken['type'] = 'T_CLOSE_PARENTHESIS';
-            break;
-        case ':':
-            $newToken['type'] = 'T_COLON';
-            break;
-        case '.':
-            $newToken['type'] = 'T_STRING_CONCAT';
-            break;
-        case ';':
-            $newToken['type'] = 'T_SEMICOLON';
-            break;
-        case '=':
-            $newToken['type'] = 'T_EQUAL';
-            break;
-        case '*':
-            $newToken['type'] = 'T_MULTIPLY';
-            break;
-        case '/':
-            $newToken['type'] = 'T_DIVIDE';
-            break;
-        case '+':
-            $newToken['type'] = 'T_PLUS';
-            break;
-        case '-':
-            $newToken['type'] = 'T_MINUS';
-            break;
-        case '%':
-            $newToken['type'] = 'T_MODULUS';
-            break;
-        case '^':
-            $newToken['type'] = 'T_BITWISE_XOR';
-            break;
-        case '&':
-            $newToken['type'] = 'T_BITWISE_AND';
-            break;
-        case '|':
-            $newToken['type'] = 'T_BITWISE_OR';
-            break;
-        case '~':
-            $newToken['type'] = 'T_BITWISE_NOT';
-            break;
-        case '<':
-            $newToken['type'] = 'T_LESS_THAN';
-            break;
-        case '>':
-            $newToken['type'] = 'T_GREATER_THAN';
-            break;
-        case '!':
-            $newToken['type'] = 'T_BOOLEAN_NOT';
-            break;
-        case ',':
-            $newToken['type'] = 'T_COMMA';
-            break;
-        case '@':
-            $newToken['type'] = 'T_ASPERAND';
-            break;
-        case '$':
-            $newToken['type'] = 'T_DOLLAR';
-            break;
-        case '`':
-            $newToken['type'] = 'T_BACKTICK';
-            break;
-        default:
-            $newToken['type'] = 'T_NONE';
-            break;
+        	case '{':
+            	$newToken['type'] = 'T_OPEN_CURLY_BRACKET';
+            	break;
+        	case '}':
+            	$newToken['type'] = 'T_CLOSE_CURLY_BRACKET';
+            	break;
+        	case '[':
+            	$newToken['type'] = 'T_OPEN_SQUARE_BRACKET';
+            	break;
+        	case ']':
+            	$newToken['type'] = 'T_CLOSE_SQUARE_BRACKET';
+            	break;
+        	case '(':
+            	$newToken['type'] = 'T_OPEN_PARENTHESIS';
+            	break;
+        	case ')':
+            	$newToken['type'] = 'T_CLOSE_PARENTHESIS';
+            	break;
+        	case ':':
+            	$newToken['type'] = 'T_COLON';
+            	break;
+        	case '.':
+            	$newToken['type'] = 'T_STRING_CONCAT';
+            	break;
+        	case ';':
+            	$newToken['type'] = 'T_SEMICOLON';
+            	break;
+        	case '=':
+            	$newToken['type'] = 'T_EQUAL';
+            	break;
+        	case '*':
+            	$newToken['type'] = 'T_MULTIPLY';
+            	break;
+        	case '/':
+            	$newToken['type'] = 'T_DIVIDE';
+            	break;
+        	case '+':
+            	$newToken['type'] = 'T_PLUS';
+            	break;
+        	case '-':
+            	$newToken['type'] = 'T_MINUS';
+            	break;
+        	case '%':
+            	$newToken['type'] = 'T_MODULUS';
+            	break;
+        	case '^':
+            	$newToken['type'] = 'T_BITWISE_XOR';
+            	break;
+        	case '&':
+            	$newToken['type'] = 'T_BITWISE_AND';
+            	break;
+        	case '|':
+            	$newToken['type'] = 'T_BITWISE_OR';
+            	break;
+        	case '~':
+            	$newToken['type'] = 'T_BITWISE_NOT';
+            	break;
+        	case '<':
+            	$newToken['type'] = 'T_LESS_THAN';
+            	break;
+        	case '>':
+            	$newToken['type'] = 'T_GREATER_THAN';
+            	break;
+        	case '!':
+            	$newToken['type'] = 'T_BOOLEAN_NOT';
+            	break;
+        	case ',':
+            	$newToken['type'] = 'T_COMMA';
+            	break;
+        	case '@':
+            	$newToken['type'] = 'T_ASPERAND';
+            	break;
+        	case '$':
+            	$newToken['type'] = 'T_DOLLAR';
+            	break;
+        	case '`':
+            	$newToken['type'] = 'T_BACKTICK';
+            	break;
+        	default:
+            	$newToken['type'] = 'T_NONE';
+            	break;
         }//end switch
 
         $newToken['code']    = constant($newToken['type']);

Spacing +662 added lines, -662 removed lines

@@ -45,25 +45,25 @@ 
             ],
         ],
         T_TRY           => [
-            'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
-            'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
+            'start'  => [ T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET ],
+            'end'    => [ T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET ],
             'strict' => true,
             'shared' => false,
-            'with'   => [],
+            'with'   => [ ],
         ],
         T_CATCH         => [
-            'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
-            'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
+            'start'  => [ T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET ],
+            'end'    => [ T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET ],
             'strict' => true,
             'shared' => false,
-            'with'   => [],
+            'with'   => [ ],
         ],
         T_FINALLY       => [
-            'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
-            'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
+            'start'  => [ T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET ],
+            'end'    => [ T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET ],
             'strict' => true,
             'shared' => false,
-            'with'   => [],
+            'with'   => [ ],
         ],
         T_ELSE          => [
             'start'  => [
@@ -110,7 +110,7 @@ 
             ],
             'strict' => false,
             'shared' => false,
-            'with'   => [],
+            'with'   => [ ],
         ],
         T_FOREACH       => [
             'start'  => [
@@ -123,56 +123,56 @@ 
             ],
             'strict' => false,
             'shared' => false,
-            'with'   => [],
+            'with'   => [ ],
         ],
         T_INTERFACE     => [
-            'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
-            'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
+            'start'  => [ T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET ],
+            'end'    => [ T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET ],
             'strict' => true,
             'shared' => false,
-            'with'   => [],
+            'with'   => [ ],
         ],
         T_FUNCTION      => [
-            'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
-            'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
+            'start'  => [ T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET ],
+            'end'    => [ T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET ],
             'strict' => true,
             'shared' => false,
-            'with'   => [],
+            'with'   => [ ],
         ],
         T_CLASS         => [
-            'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
-            'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
+            'start'  => [ T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET ],
+            'end'    => [ T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET ],
             'strict' => true,
             'shared' => false,
-            'with'   => [],
+            'with'   => [ ],
         ],
         T_TRAIT         => [
-            'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
-            'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
+            'start'  => [ T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET ],
+            'end'    => [ T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET ],
             'strict' => true,
             'shared' => false,
-            'with'   => [],
+            'with'   => [ ],
         ],
         T_USE           => [
-            'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
-            'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
+            'start'  => [ T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET ],
+            'end'    => [ T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET ],
             'strict' => false,
             'shared' => false,
-            'with'   => [],
+            'with'   => [ ],
         ],
         T_DECLARE       => [
-            'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
-            'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
+            'start'  => [ T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET ],
+            'end'    => [ T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET ],
             'strict' => false,
             'shared' => false,
-            'with'   => [],
+            'with'   => [ ],
         ],
         T_NAMESPACE     => [
-            'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
-            'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
+            'start'  => [ T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET ],
+            'end'    => [ T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET ],
             'strict' => false,
             'shared' => false,
-            'with'   => [],
+            'with'   => [ ],
         ],
         T_WHILE         => [
             'start'  => [
@@ -185,14 +185,14 @@ 
             ],
             'strict' => false,
             'shared' => false,
-            'with'   => [],
+            'with'   => [ ],
         ],
         T_DO            => [
-            'start'  => [T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET],
-            'end'    => [T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET],
+            'start'  => [ T_OPEN_CURLY_BRACKET => T_OPEN_CURLY_BRACKET ],
+            'end'    => [ T_CLOSE_CURLY_BRACKET => T_CLOSE_CURLY_BRACKET ],
             'strict' => true,
             'shared' => false,
-            'with'   => [],
+            'with'   => [ ],
         ],
         T_SWITCH        => [
             'start'  => [
@@ -205,7 +205,7 @@ 
             ],
             'strict' => true,
             'shared' => false,
-            'with'   => [],
+            'with'   => [ ],
         ],
         T_CASE          => [
             'start'  => [
@@ -247,18 +247,18 @@ 
             ],
         ],
         T_START_HEREDOC => [
-            'start'  => [T_START_HEREDOC => T_START_HEREDOC],
-            'end'    => [T_END_HEREDOC => T_END_HEREDOC],
+            'start'  => [ T_START_HEREDOC => T_START_HEREDOC ],
+            'end'    => [ T_END_HEREDOC => T_END_HEREDOC ],
             'strict' => true,
             'shared' => false,
-            'with'   => [],
+            'with'   => [ ],
         ],
         T_START_NOWDOC  => [
-            'start'  => [T_START_NOWDOC => T_START_NOWDOC],
-            'end'    => [T_END_NOWDOC => T_END_NOWDOC],
+            'start'  => [ T_START_NOWDOC => T_START_NOWDOC ],
+            'end'    => [ T_END_NOWDOC => T_END_NOWDOC ],
             'strict' => true,
             'shared' => false,
-            'with'   => [],
+            'with'   => [ ],
         ],
     ];
 
@@ -440,7 +440,7 @@ 
      * @var array
      * @see standardiseToken()
      */
-    private static $resolveTokenCache = [];
+    private static $resolveTokenCache = [ ];
 
 
     /**
@@ -453,49 +453,49 @@ 
      *
      * @return array
      */
-    protected function tokenize($string)
+    protected function tokenize( $string )
     {
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            echo "\t*** START PHP TOKENIZING ***".PHP_EOL;
+        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+            echo "\t*** START PHP TOKENIZING ***" . PHP_EOL;
             $isWin = false;
-            if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+            if ( strtoupper( substr( PHP_OS, 0, 3 ) ) === 'WIN' ) {
                 $isWin = true;
             }
         }
 
-        $tokens      = @token_get_all($string);
-        $finalTokens = [];
+        $tokens      = @token_get_all( $string );
+        $finalTokens = [ ];
 
         $newStackPtr       = 0;
-        $numTokens         = count($tokens);
+        $numTokens         = count( $tokens );
         $lastNotEmptyToken = 0;
 
-        $insideInlineIf = [];
+        $insideInlineIf = [ ];
         $insideUseGroup = false;
 
         $commentTokenizer = new Comment();
 
-        for ($stackPtr = 0; $stackPtr < $numTokens; $stackPtr++) {
+        for ( $stackPtr = 0; $stackPtr < $numTokens; $stackPtr++ ) {
             // Special case for tokens we have needed to blank out.
-            if ($tokens[$stackPtr] === null) {
+            if ( $tokens[ $stackPtr ] === null ) {
                 continue;
             }
 
-            $token        = (array) $tokens[$stackPtr];
-            $tokenIsArray = isset($token[1]);
+            $token        = (array)$tokens[ $stackPtr ];
+            $tokenIsArray = isset( $token[ 1 ] );
 
-            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                if ($tokenIsArray === true) {
-                    $type    = Util\Tokens::tokenName($token[0]);
-                    $content = Util\Common::prepareForOutput($token[1]);
+            if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                if ( $tokenIsArray === true ) {
+                    $type    = Util\Tokens::tokenName( $token[ 0 ] );
+                    $content = Util\Common::prepareForOutput( $token[ 1 ] );
                 } else {
-                    $newToken = self::resolveSimpleToken($token[0]);
-                    $type     = $newToken['type'];
-                    $content  = Util\Common::prepareForOutput($token[0]);
+                    $newToken = self::resolveSimpleToken( $token[ 0 ] );
+                    $type     = $newToken[ 'type' ];
+                    $content  = Util\Common::prepareForOutput( $token[ 0 ] );
                 }
 
                 echo "\tProcess token ";
-                if ($tokenIsArray === true) {
+                if ( $tokenIsArray === true ) {
                     echo "[$stackPtr]";
                 } else {
                     echo " $stackPtr ";
@@ -504,10 +504,10 @@ 
                 echo ": $type => $content";
             }//end if
 
-            if ($newStackPtr > 0
-                && isset(Util\Tokens::$emptyTokens[$finalTokens[($newStackPtr - 1)]['code']]) === false
+            if ( $newStackPtr > 0
+                && isset( Util\Tokens::$emptyTokens[ $finalTokens[ ( $newStackPtr - 1 ) ][ 'code' ] ] ) === false
             ) {
-                $lastNotEmptyToken = ($newStackPtr - 1);
+                $lastNotEmptyToken = ( $newStackPtr - 1 );
             }
 
             /*
@@ -517,31 +517,31 @@ 
                 consistent for all lines.
             */
 
-            if ($tokenIsArray === true && substr($token[1], -1) === "\r") {
-                if (isset($tokens[($stackPtr + 1)]) === true
-                    && is_array($tokens[($stackPtr + 1)]) === true
-                    && $tokens[($stackPtr + 1)][1][0] === "\n"
+            if ( $tokenIsArray === true && substr( $token[ 1 ], -1 ) === "\r" ) {
+                if ( isset( $tokens[ ( $stackPtr + 1 ) ] ) === true
+                    && is_array( $tokens[ ( $stackPtr + 1 ) ] ) === true
+                    && $tokens[ ( $stackPtr + 1 ) ][ 1 ][ 0 ] === "\n"
                 ) {
-                    $token[1] .= "\n";
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        if ($isWin === true) {
+                    $token[ 1 ] .= "\n";
+                    if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                        if ( $isWin === true ) {
                             echo '\n';
                         } else {
                             echo "\033[30;1m\\n\033[0m";
                         }
                     }
 
-                    if ($tokens[($stackPtr + 1)][1] === "\n") {
+                    if ( $tokens[ ( $stackPtr + 1 ) ][ 1 ] === "\n" ) {
                         // This token's content has been merged into the previous,
                         // so we can skip it.
-                        $tokens[($stackPtr + 1)] = '';
+                        $tokens[ ( $stackPtr + 1 ) ] = '';
                     } else {
-                        $tokens[($stackPtr + 1)][1] = substr($tokens[($stackPtr + 1)][1], 1);
+                        $tokens[ ( $stackPtr + 1 ) ][ 1 ] = substr( $tokens[ ( $stackPtr + 1 ) ][ 1 ], 1 );
                     }
                 }
             }//end if
 
-            if (PHP_CODESNIFFER_VERBOSITY > 1) {
+            if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
                 echo PHP_EOL;
             }
 
@@ -549,13 +549,13 @@ 
                 Parse doc blocks into something that can be easily iterated over.
             */
 
-            if ($tokenIsArray === true
-                && ($token[0] === T_DOC_COMMENT
-                || ($token[0] === T_COMMENT && strpos($token[1], '/**') === 0))
+            if ( $tokenIsArray === true
+                && ( $token[ 0 ] === T_DOC_COMMENT
+                || ( $token[ 0 ] === T_COMMENT && strpos( $token[ 1 ], '/**' ) === 0 ) )
             ) {
-                $commentTokens = $commentTokenizer->tokenizeString($token[1], $this->eolChar, $newStackPtr);
-                foreach ($commentTokens as $commentToken) {
-                    $finalTokens[$newStackPtr] = $commentToken;
+                $commentTokens = $commentTokenizer->tokenizeString( $token[ 1 ], $this->eolChar, $newStackPtr );
+                foreach ( $commentTokens as $commentToken ) {
+                    $finalTokens[ $newStackPtr ] = $commentToken;
                     $newStackPtr++;
                 }
 
@@ -569,10 +569,10 @@ 
                 provide a single string.
             */
 
-            if ($tokenIsArray === false && ($token[0] === '"' || $token[0] === 'b"')) {
+            if ( $tokenIsArray === false && ( $token[ 0 ] === '"' || $token[ 0 ] === 'b"' ) ) {
                 // Binary casts need a special token.
-                if ($token[0] === 'b"') {
-                    $finalTokens[$newStackPtr] = [
+                if ( $token[ 0 ] === 'b"' ) {
+                    $finalTokens[ $newStackPtr ] = [
                         'code'    => T_BINARY_CAST,
                         'type'    => 'T_BINARY_CAST',
                         'content' => 'b',
@@ -581,28 +581,28 @@ 
                 }
 
                 $tokenContent = '"';
-                $nestedVars   = [];
-                for ($i = ($stackPtr + 1); $i < $numTokens; $i++) {
-                    $subToken        = (array) $tokens[$i];
-                    $subTokenIsArray = isset($subToken[1]);
-
-                    if ($subTokenIsArray === true) {
-                        $tokenContent .= $subToken[1];
-                        if ($subToken[1] === '{'
-                            && $subToken[0] !== T_ENCAPSED_AND_WHITESPACE
+                $nestedVars   = [ ];
+                for ( $i = ( $stackPtr + 1 ); $i < $numTokens; $i++ ) {
+                    $subToken        = (array)$tokens[ $i ];
+                    $subTokenIsArray = isset( $subToken[ 1 ] );
+
+                    if ( $subTokenIsArray === true ) {
+                        $tokenContent .= $subToken[ 1 ];
+                        if ( $subToken[ 1 ] === '{'
+                            && $subToken[ 0 ] !== T_ENCAPSED_AND_WHITESPACE
                         ) {
-                            $nestedVars[] = $i;
+                            $nestedVars[ ] = $i;
                         }
                     } else {
-                        $tokenContent .= $subToken[0];
-                        if ($subToken[0] === '}') {
-                            array_pop($nestedVars);
+                        $tokenContent .= $subToken[ 0 ];
+                        if ( $subToken[ 0 ] === '}' ) {
+                            array_pop( $nestedVars );
                         }
                     }
 
-                    if ($subTokenIsArray === false
-                        && $subToken[0] === '"'
-                        && empty($nestedVars) === true
+                    if ( $subTokenIsArray === false
+                        && $subToken[ 0 ] === '"'
+                        && empty( $nestedVars ) === true
                     ) {
                         // We found the other end of the double quoted string.
                         break;
@@ -613,23 +613,23 @@ 
 
                 // Convert each line within the double quoted string to a
                 // new token, so it conforms with other multiple line tokens.
-                $tokenLines = explode($this->eolChar, $tokenContent);
-                $numLines   = count($tokenLines);
-                $newToken   = [];
-
-                for ($j = 0; $j < $numLines; $j++) {
-                    $newToken['content'] = $tokenLines[$j];
-                    if ($j === ($numLines - 1)) {
-                        if ($tokenLines[$j] === '') {
+                $tokenLines = explode( $this->eolChar, $tokenContent );
+                $numLines   = count( $tokenLines );
+                $newToken   = [ ];
+
+                for ( $j = 0; $j < $numLines; $j++ ) {
+                    $newToken[ 'content' ] = $tokenLines[ $j ];
+                    if ( $j === ( $numLines - 1 ) ) {
+                        if ( $tokenLines[ $j ] === '' ) {
                             break;
                         }
                     } else {
-                        $newToken['content'] .= $this->eolChar;
+                        $newToken[ 'content' ] .= $this->eolChar;
                     }
 
-                    $newToken['code']          = T_DOUBLE_QUOTED_STRING;
-                    $newToken['type']          = 'T_DOUBLE_QUOTED_STRING';
-                    $finalTokens[$newStackPtr] = $newToken;
+                    $newToken[ 'code' ]          = T_DOUBLE_QUOTED_STRING;
+                    $newToken[ 'type' ]          = 'T_DOUBLE_QUOTED_STRING';
+                    $finalTokens[ $newStackPtr ] = $newToken;
                     $newStackPtr++;
                 }
 
@@ -641,28 +641,28 @@ 
                 Detect binary casting and assign the casts their own token.
             */
 
-            if ($tokenIsArray === true
-                && $token[0] === T_CONSTANT_ENCAPSED_STRING
-                && (substr($token[1], 0, 2) === 'b"'
-                || substr($token[1], 0, 2) === "b'")
+            if ( $tokenIsArray === true
+                && $token[ 0 ] === T_CONSTANT_ENCAPSED_STRING
+                && ( substr( $token[ 1 ], 0, 2 ) === 'b"'
+                || substr( $token[ 1 ], 0, 2 ) === "b'" )
             ) {
-                $finalTokens[$newStackPtr] = [
+                $finalTokens[ $newStackPtr ] = [
                     'code'    => T_BINARY_CAST,
                     'type'    => 'T_BINARY_CAST',
                     'content' => 'b',
                 ];
                 $newStackPtr++;
-                $token[1] = substr($token[1], 1);
+                $token[ 1 ] = substr( $token[ 1 ], 1 );
             }
 
-            if ($tokenIsArray === true
-                && $token[0] === T_STRING_CAST
-                && preg_match('`^\(\s*binary\s*\)$`i', $token[1]) === 1
+            if ( $tokenIsArray === true
+                && $token[ 0 ] === T_STRING_CAST
+                && preg_match( '`^\(\s*binary\s*\)$`i', $token[ 1 ] ) === 1
             ) {
-                $finalTokens[$newStackPtr] = [
+                $finalTokens[ $newStackPtr ] = [
                     'code'    => T_BINARY_CAST,
                     'type'    => 'T_BINARY_CAST',
-                    'content' => $token[1],
+                    'content' => $token[ 1 ],
                 ];
                 $newStackPtr++;
                 continue;
@@ -676,48 +676,48 @@ 
                 alone though.
             */
 
-            if ($tokenIsArray === true && $token[0] === T_START_HEREDOC) {
+            if ( $tokenIsArray === true && $token[ 0 ] === T_START_HEREDOC ) {
                 // Add the start heredoc token to the final array.
-                $finalTokens[$newStackPtr] = self::standardiseToken($token);
+                $finalTokens[ $newStackPtr ] = self::standardiseToken( $token );
 
                 // Check if this is actually a nowdoc and use a different token
                 // to help the sniffs.
                 $nowdoc = false;
-                if (strpos($token[1], "'") !== false) {
-                    $finalTokens[$newStackPtr]['code'] = T_START_NOWDOC;
-                    $finalTokens[$newStackPtr]['type'] = 'T_START_NOWDOC';
+                if ( strpos( $token[ 1 ], "'" ) !== false ) {
+                    $finalTokens[ $newStackPtr ][ 'code' ] = T_START_NOWDOC;
+                    $finalTokens[ $newStackPtr ][ 'type' ] = 'T_START_NOWDOC';
                     $nowdoc = true;
                 }
 
                 $tokenContent = '';
-                for ($i = ($stackPtr + 1); $i < $numTokens; $i++) {
-                    $subTokenIsArray = is_array($tokens[$i]);
-                    if ($subTokenIsArray === true
-                        && $tokens[$i][0] === T_END_HEREDOC
+                for ( $i = ( $stackPtr + 1 ); $i < $numTokens; $i++ ) {
+                    $subTokenIsArray = is_array( $tokens[ $i ] );
+                    if ( $subTokenIsArray === true
+                        && $tokens[ $i ][ 0 ] === T_END_HEREDOC
                     ) {
                         // We found the other end of the heredoc.
                         break;
                     }
 
-                    if ($subTokenIsArray === true) {
-                        $tokenContent .= $tokens[$i][1];
+                    if ( $subTokenIsArray === true ) {
+                        $tokenContent .= $tokens[ $i ][ 1 ];
                     } else {
-                        $tokenContent .= $tokens[$i];
+                        $tokenContent .= $tokens[ $i ];
                     }
                 }
 
-                if ($i === $numTokens) {
+                if ( $i === $numTokens ) {
                     // We got to the end of the file and never
                     // found the closing token, so this probably wasn't
                     // a heredoc.
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        $type = $finalTokens[$newStackPtr]['type'];
-                        echo "\t\t* failed to find the end of the here/nowdoc".PHP_EOL;
-                        echo "\t\t* token $stackPtr changed from $type to T_STRING".PHP_EOL;
+                    if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                        $type = $finalTokens[ $newStackPtr ][ 'type' ];
+                        echo "\t\t* failed to find the end of the here/nowdoc" . PHP_EOL;
+                        echo "\t\t* token $stackPtr changed from $type to T_STRING" . PHP_EOL;
                     }
 
-                    $finalTokens[$newStackPtr]['code'] = T_STRING;
-                    $finalTokens[$newStackPtr]['type'] = 'T_STRING';
+                    $finalTokens[ $newStackPtr ][ 'code' ] = T_STRING;
+                    $finalTokens[ $newStackPtr ][ 'type' ] = 'T_STRING';
                     $newStackPtr++;
                     continue;
                 }
@@ -727,38 +727,38 @@ 
 
                 // Convert each line within the heredoc to a
                 // new token, so it conforms with other multiple line tokens.
-                $tokenLines = explode($this->eolChar, $tokenContent);
-                $numLines   = count($tokenLines);
-                $newToken   = [];
-
-                for ($j = 0; $j < $numLines; $j++) {
-                    $newToken['content'] = $tokenLines[$j];
-                    if ($j === ($numLines - 1)) {
-                        if ($tokenLines[$j] === '') {
+                $tokenLines = explode( $this->eolChar, $tokenContent );
+                $numLines   = count( $tokenLines );
+                $newToken   = [ ];
+
+                for ( $j = 0; $j < $numLines; $j++ ) {
+                    $newToken[ 'content' ] = $tokenLines[ $j ];
+                    if ( $j === ( $numLines - 1 ) ) {
+                        if ( $tokenLines[ $j ] === '' ) {
                             break;
                         }
                     } else {
-                        $newToken['content'] .= $this->eolChar;
+                        $newToken[ 'content' ] .= $this->eolChar;
                     }
 
-                    if ($nowdoc === true) {
-                        $newToken['code'] = T_NOWDOC;
-                        $newToken['type'] = 'T_NOWDOC';
+                    if ( $nowdoc === true ) {
+                        $newToken[ 'code' ] = T_NOWDOC;
+                        $newToken[ 'type' ] = 'T_NOWDOC';
                     } else {
-                        $newToken['code'] = T_HEREDOC;
-                        $newToken['type'] = 'T_HEREDOC';
+                        $newToken[ 'code' ] = T_HEREDOC;
+                        $newToken[ 'type' ] = 'T_HEREDOC';
                     }
 
-                    $finalTokens[$newStackPtr] = $newToken;
+                    $finalTokens[ $newStackPtr ] = $newToken;
                     $newStackPtr++;
                 }//end for
 
                 // Add the end heredoc token to the final array.
-                $finalTokens[$newStackPtr] = self::standardiseToken($tokens[$stackPtr]);
+                $finalTokens[ $newStackPtr ] = self::standardiseToken( $tokens[ $stackPtr ] );
 
-                if ($nowdoc === true) {
-                    $finalTokens[$newStackPtr]['code'] = T_END_NOWDOC;
-                    $finalTokens[$newStackPtr]['type'] = 'T_END_NOWDOC';
+                if ( $nowdoc === true ) {
+                    $finalTokens[ $newStackPtr ][ 'code' ] = T_END_NOWDOC;
+                    $finalTokens[ $newStackPtr ][ 'type' ] = 'T_END_NOWDOC';
                 }
 
                 $newStackPtr++;
@@ -773,30 +773,30 @@ 
                 and change this token in earlier versions.
             */
 
-            if (PHP_VERSION_ID < 70000
+            if ( PHP_VERSION_ID < 70000
                 && PHP_VERSION_ID >= 50500
                 && $tokenIsArray === true
-                && $token[0] === T_YIELD
-                && isset($tokens[($stackPtr + 1)]) === true
-                && isset($tokens[($stackPtr + 2)]) === true
-                && $tokens[($stackPtr + 1)][0] === T_WHITESPACE
-                && $tokens[($stackPtr + 2)][0] === T_STRING
-                && strtolower($tokens[($stackPtr + 2)][1]) === 'from'
+                && $token[ 0 ] === T_YIELD
+                && isset( $tokens[ ( $stackPtr + 1 ) ] ) === true
+                && isset( $tokens[ ( $stackPtr + 2 ) ] ) === true
+                && $tokens[ ( $stackPtr + 1 ) ][ 0 ] === T_WHITESPACE
+                && $tokens[ ( $stackPtr + 2 ) ][ 0 ] === T_STRING
+                && strtolower( $tokens[ ( $stackPtr + 2 ) ][ 1 ] ) === 'from'
             ) {
                 // Could be multi-line, so just the token stack.
-                $token[0]  = T_YIELD_FROM;
-                $token[1] .= $tokens[($stackPtr + 1)][1].$tokens[($stackPtr + 2)][1];
-
-                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                    for ($i = ($stackPtr + 1); $i <= ($stackPtr + 2); $i++) {
-                        $type    = Util\Tokens::tokenName($tokens[$i][0]);
-                        $content = Util\Common::prepareForOutput($tokens[$i][1]);
-                        echo "\t\t* token $i merged into T_YIELD_FROM; was: $type => $content".PHP_EOL;
+                $token[ 0 ]  = T_YIELD_FROM;
+                $token[ 1 ] .= $tokens[ ( $stackPtr + 1 ) ][ 1 ] . $tokens[ ( $stackPtr + 2 ) ][ 1 ];
+
+                if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                    for ( $i = ( $stackPtr + 1 ); $i <= ( $stackPtr + 2 ); $i++ ) {
+                        $type    = Util\Tokens::tokenName( $tokens[ $i ][ 0 ] );
+                        $content = Util\Common::prepareForOutput( $tokens[ $i ][ 1 ] );
+                        echo "\t\t* token $i merged into T_YIELD_FROM; was: $type => $content" . PHP_EOL;
                     }
                 }
 
-                $tokens[($stackPtr + 1)] = null;
-                $tokens[($stackPtr + 2)] = null;
+                $tokens[ ( $stackPtr + 1 ) ] = null;
+                $tokens[ ( $stackPtr + 2 ) ] = null;
             }
 
             /*
@@ -806,37 +806,37 @@ 
                 Checks also if it is just "yield" or "yield from".
             */
 
-            if (PHP_VERSION_ID < 50500
+            if ( PHP_VERSION_ID < 50500
                 && $tokenIsArray === true
-                && $token[0] === T_STRING
-                && strtolower($token[1]) === 'yield'
+                && $token[ 0 ] === T_STRING
+                && strtolower( $token[ 1 ] ) === 'yield'
             ) {
-                if (isset($tokens[($stackPtr + 1)]) === true
-                    && isset($tokens[($stackPtr + 2)]) === true
-                    && $tokens[($stackPtr + 1)][0] === T_WHITESPACE
-                    && $tokens[($stackPtr + 2)][0] === T_STRING
-                    && strtolower($tokens[($stackPtr + 2)][1]) === 'from'
+                if ( isset( $tokens[ ( $stackPtr + 1 ) ] ) === true
+                    && isset( $tokens[ ( $stackPtr + 2 ) ] ) === true
+                    && $tokens[ ( $stackPtr + 1 ) ][ 0 ] === T_WHITESPACE
+                    && $tokens[ ( $stackPtr + 2 ) ][ 0 ] === T_STRING
+                    && strtolower( $tokens[ ( $stackPtr + 2 ) ][ 1 ] ) === 'from'
                 ) {
                     // Could be multi-line, so just just the token stack.
-                    $token[0]  = T_YIELD_FROM;
-                    $token[1] .= $tokens[($stackPtr + 1)][1].$tokens[($stackPtr + 2)][1];
-
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        for ($i = ($stackPtr + 1); $i <= ($stackPtr + 2); $i++) {
-                            $type    = Util\Tokens::tokenName($tokens[$i][0]);
-                            $content = Util\Common::prepareForOutput($tokens[$i][1]);
-                            echo "\t\t* token $i merged into T_YIELD_FROM; was: $type => $content".PHP_EOL;
+                    $token[ 0 ]  = T_YIELD_FROM;
+                    $token[ 1 ] .= $tokens[ ( $stackPtr + 1 ) ][ 1 ] . $tokens[ ( $stackPtr + 2 ) ][ 1 ];
+
+                    if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                        for ( $i = ( $stackPtr + 1 ); $i <= ( $stackPtr + 2 ); $i++ ) {
+                            $type    = Util\Tokens::tokenName( $tokens[ $i ][ 0 ] );
+                            $content = Util\Common::prepareForOutput( $tokens[ $i ][ 1 ] );
+                            echo "\t\t* token $i merged into T_YIELD_FROM; was: $type => $content" . PHP_EOL;
                         }
                     }
 
-                    $tokens[($stackPtr + 1)] = null;
-                    $tokens[($stackPtr + 2)] = null;
+                    $tokens[ ( $stackPtr + 1 ) ] = null;
+                    $tokens[ ( $stackPtr + 2 ) ] = null;
                 } else {
-                    $newToken            = [];
-                    $newToken['code']    = T_YIELD;
-                    $newToken['type']    = 'T_YIELD';
-                    $newToken['content'] = $token[1];
-                    $finalTokens[$newStackPtr] = $newToken;
+                    $newToken            = [ ];
+                    $newToken[ 'code' ]    = T_YIELD;
+                    $newToken[ 'type' ]    = 'T_YIELD';
+                    $newToken[ 'content' ] = $token[ 1 ];
+                    $finalTokens[ $newStackPtr ] = $newToken;
 
                     $newStackPtr++;
                     continue;
@@ -849,18 +849,18 @@ 
                 these tokens in earlier versions.
             */
 
-            if ($tokenIsArray === false
-                && $token[0] === '.'
-                && isset($tokens[($stackPtr + 1)]) === true
-                && isset($tokens[($stackPtr + 2)]) === true
-                && $tokens[($stackPtr + 1)] === '.'
-                && $tokens[($stackPtr + 2)] === '.'
+            if ( $tokenIsArray === false
+                && $token[ 0 ] === '.'
+                && isset( $tokens[ ( $stackPtr + 1 ) ] ) === true
+                && isset( $tokens[ ( $stackPtr + 2 ) ] ) === true
+                && $tokens[ ( $stackPtr + 1 ) ] === '.'
+                && $tokens[ ( $stackPtr + 2 ) ] === '.'
             ) {
-                $newToken            = [];
-                $newToken['code']    = T_ELLIPSIS;
-                $newToken['type']    = 'T_ELLIPSIS';
-                $newToken['content'] = '...';
-                $finalTokens[$newStackPtr] = $newToken;
+                $newToken            = [ ];
+                $newToken[ 'code' ]    = T_ELLIPSIS;
+                $newToken[ 'type' ]    = 'T_ELLIPSIS';
+                $newToken[ 'content' ] = '...';
+                $finalTokens[ $newStackPtr ] = $newToken;
 
                 $newStackPtr++;
                 $stackPtr += 2;
@@ -873,16 +873,16 @@ 
                 these tokens in earlier versions.
             */
 
-            if ($tokenIsArray === false
-                && $token[0] === '*'
-                && isset($tokens[($stackPtr + 1)]) === true
-                && $tokens[($stackPtr + 1)] === '*'
+            if ( $tokenIsArray === false
+                && $token[ 0 ] === '*'
+                && isset( $tokens[ ( $stackPtr + 1 ) ] ) === true
+                && $tokens[ ( $stackPtr + 1 ) ] === '*'
             ) {
-                $newToken            = [];
-                $newToken['code']    = T_POW;
-                $newToken['type']    = 'T_POW';
-                $newToken['content'] = '**';
-                $finalTokens[$newStackPtr] = $newToken;
+                $newToken            = [ ];
+                $newToken[ 'code' ]    = T_POW;
+                $newToken[ 'type' ]    = 'T_POW';
+                $newToken[ 'content' ] = '**';
+                $finalTokens[ $newStackPtr ] = $newToken;
 
                 $newStackPtr++;
                 $stackPtr++;
@@ -895,17 +895,17 @@ 
                 these tokens in earlier versions.
             */
 
-            if ($tokenIsArray === false
-                && $token[0] === '*'
-                && isset($tokens[($stackPtr + 1)]) === true
-                && is_array($tokens[($stackPtr + 1)]) === true
-                && $tokens[($stackPtr + 1)][1] === '*='
+            if ( $tokenIsArray === false
+                && $token[ 0 ] === '*'
+                && isset( $tokens[ ( $stackPtr + 1 ) ] ) === true
+                && is_array( $tokens[ ( $stackPtr + 1 ) ] ) === true
+                && $tokens[ ( $stackPtr + 1 ) ][ 1 ] === '*='
             ) {
-                $newToken            = [];
-                $newToken['code']    = T_POW_EQUAL;
-                $newToken['type']    = 'T_POW_EQUAL';
-                $newToken['content'] = '**=';
-                $finalTokens[$newStackPtr] = $newToken;
+                $newToken            = [ ];
+                $newToken[ 'code' ]    = T_POW_EQUAL;
+                $newToken[ 'type' ]    = 'T_POW_EQUAL';
+                $newToken[ 'content' ] = '**=';
+                $finalTokens[ $newStackPtr ] = $newToken;
 
                 $newStackPtr++;
                 $stackPtr++;
@@ -920,27 +920,27 @@ 
                 So look for and combine these tokens in earlier versions.
             */
 
-            if (($tokenIsArray === false
-                && $token[0] === '?'
-                && isset($tokens[($stackPtr + 1)]) === true
-                && $tokens[($stackPtr + 1)][0] === '?'
-                && isset($tokens[($stackPtr + 2)]) === true
-                && $tokens[($stackPtr + 2)][0] === '=')
-                || ($tokenIsArray === true
-                && $token[0] === T_COALESCE
-                && isset($tokens[($stackPtr + 1)]) === true
-                && $tokens[($stackPtr + 1)][0] === '=')
+            if ( ( $tokenIsArray === false
+                && $token[ 0 ] === '?'
+                && isset( $tokens[ ( $stackPtr + 1 ) ] ) === true
+                && $tokens[ ( $stackPtr + 1 ) ][ 0 ] === '?'
+                && isset( $tokens[ ( $stackPtr + 2 ) ] ) === true
+                && $tokens[ ( $stackPtr + 2 ) ][ 0 ] === '=' )
+                || ( $tokenIsArray === true
+                && $token[ 0 ] === T_COALESCE
+                && isset( $tokens[ ( $stackPtr + 1 ) ] ) === true
+                && $tokens[ ( $stackPtr + 1 ) ][ 0 ] === '=' )
             ) {
-                $newToken            = [];
-                $newToken['code']    = T_COALESCE_EQUAL;
-                $newToken['type']    = 'T_COALESCE_EQUAL';
-                $newToken['content'] = '??=';
-                $finalTokens[$newStackPtr] = $newToken;
+                $newToken            = [ ];
+                $newToken[ 'code' ]    = T_COALESCE_EQUAL;
+                $newToken[ 'type' ]    = 'T_COALESCE_EQUAL';
+                $newToken[ 'content' ] = '??=';
+                $finalTokens[ $newStackPtr ] = $newToken;
 
                 $newStackPtr++;
                 $stackPtr++;
 
-                if ($tokenIsArray === false) {
+                if ( $tokenIsArray === false ) {
                     // Pre PHP 7.
                     $stackPtr++;
                 }
@@ -954,16 +954,16 @@ 
                 So look for and combine these tokens in earlier versions.
             */
 
-            if ($tokenIsArray === false
-                && $token[0] === '?'
-                && isset($tokens[($stackPtr + 1)]) === true
-                && $tokens[($stackPtr + 1)][0] === '?'
+            if ( $tokenIsArray === false
+                && $token[ 0 ] === '?'
+                && isset( $tokens[ ( $stackPtr + 1 ) ] ) === true
+                && $tokens[ ( $stackPtr + 1 ) ][ 0 ] === '?'
             ) {
-                $newToken            = [];
-                $newToken['code']    = T_COALESCE;
-                $newToken['type']    = 'T_COALESCE';
-                $newToken['content'] = '??';
-                $finalTokens[$newStackPtr] = $newToken;
+                $newToken            = [ ];
+                $newToken[ 'code' ]    = T_COALESCE;
+                $newToken[ 'type' ]    = 'T_COALESCE';
+                $newToken[ 'content' ] = '??';
+                $finalTokens[ $newStackPtr ] = $newToken;
 
                 $newStackPtr++;
                 $stackPtr++;
@@ -974,45 +974,45 @@ 
                 Convert ? to T_NULLABLE OR T_INLINE_THEN
             */
 
-            if ($tokenIsArray === false && $token[0] === '?') {
-                $newToken            = [];
-                $newToken['content'] = '?';
+            if ( $tokenIsArray === false && $token[ 0 ] === '?' ) {
+                $newToken            = [ ];
+                $newToken[ 'content' ] = '?';
 
                 $prevNonEmpty = null;
-                for ($i = ($stackPtr - 1); $i >= 0; $i--) {
-                    if (is_array($tokens[$i]) === true) {
-                        $tokenType = $tokens[$i][0];
+                for ( $i = ( $stackPtr - 1 ); $i >= 0; $i-- ) {
+                    if ( is_array( $tokens[ $i ] ) === true ) {
+                        $tokenType = $tokens[ $i ][ 0 ];
                     } else {
-                        $tokenType = $tokens[$i];
+                        $tokenType = $tokens[ $i ];
                     }
 
-                    if ($prevNonEmpty === null
-                        && isset(Util\Tokens::$emptyTokens[$tokenType]) === false
+                    if ( $prevNonEmpty === null
+                        && isset( Util\Tokens::$emptyTokens[ $tokenType ] ) === false
                     ) {
                         // Found the previous non-empty token.
-                        if ($tokenType === ':' || $tokenType === ',') {
-                            $newToken['code'] = T_NULLABLE;
-                            $newToken['type'] = 'T_NULLABLE';
+                        if ( $tokenType === ':' || $tokenType === ',' ) {
+                            $newToken[ 'code' ] = T_NULLABLE;
+                            $newToken[ 'type' ] = 'T_NULLABLE';
                             break;
                         }
 
                         $prevNonEmpty = $tokenType;
                     }
 
-                    if ($tokenType === T_FUNCTION) {
-                        $newToken['code'] = T_NULLABLE;
-                        $newToken['type'] = 'T_NULLABLE';
+                    if ( $tokenType === T_FUNCTION ) {
+                        $newToken[ 'code' ] = T_NULLABLE;
+                        $newToken[ 'type' ] = 'T_NULLABLE';
                         break;
-                    } else if (in_array($tokenType, [T_OPEN_TAG, T_OPEN_TAG_WITH_ECHO, '=', '{', ';'], true) === true) {
-                        $newToken['code'] = T_INLINE_THEN;
-                        $newToken['type'] = 'T_INLINE_THEN';
+                    } else if ( in_array( $tokenType, [ T_OPEN_TAG, T_OPEN_TAG_WITH_ECHO, '=', '{', ';' ], true ) === true ) {
+                        $newToken[ 'code' ] = T_INLINE_THEN;
+                        $newToken[ 'type' ] = 'T_INLINE_THEN';
 
-                        $insideInlineIf[] = $stackPtr;
+                        $insideInlineIf[ ] = $stackPtr;
                         break;
                     }
                 }//end for
 
-                $finalTokens[$newStackPtr] = $newToken;
+                $finalTokens[ $newStackPtr ] = $newToken;
                 $newStackPtr++;
                 continue;
             }//end if
@@ -1023,20 +1023,20 @@ 
                 only ever variables or strings.
             */
 
-            if ($stackPtr > 1
-                && (is_array($tokens[($stackPtr - 1)]) === true
-                && $tokens[($stackPtr - 1)][0] === T_PAAMAYIM_NEKUDOTAYIM)
+            if ( $stackPtr > 1
+                && ( is_array( $tokens[ ( $stackPtr - 1 ) ] ) === true
+                && $tokens[ ( $stackPtr - 1 ) ][ 0 ] === T_PAAMAYIM_NEKUDOTAYIM )
                 && $tokenIsArray === true
-                && $token[0] !== T_STRING
-                && $token[0] !== T_VARIABLE
-                && $token[0] !== T_DOLLAR
-                && isset(Util\Tokens::$emptyTokens[$token[0]]) === false
+                && $token[ 0 ] !== T_STRING
+                && $token[ 0 ] !== T_VARIABLE
+                && $token[ 0 ] !== T_DOLLAR
+                && isset( Util\Tokens::$emptyTokens[ $token[ 0 ] ] ) === false
             ) {
-                $newToken            = [];
-                $newToken['code']    = T_STRING;
-                $newToken['type']    = 'T_STRING';
-                $newToken['content'] = $token[1];
-                $finalTokens[$newStackPtr] = $newToken;
+                $newToken            = [ ];
+                $newToken[ 'code' ]    = T_STRING;
+                $newToken[ 'type' ]    = 'T_STRING';
+                $newToken[ 'content' ] = $token[ 1 ];
+                $finalTokens[ $newStackPtr ] = $newToken;
 
                 $newStackPtr++;
                 continue;
@@ -1049,21 +1049,21 @@ 
                 so go forward and change the token type before it is processed.
             */
 
-            if ($tokenIsArray === true
-                && $token[0] === T_FUNCTION
-                && $finalTokens[$lastNotEmptyToken]['code'] !== T_USE
+            if ( $tokenIsArray === true
+                && $token[ 0 ] === T_FUNCTION
+                && $finalTokens[ $lastNotEmptyToken ][ 'code' ] !== T_USE
             ) {
-                for ($x = ($stackPtr + 1); $x < $numTokens; $x++) {
-                    if (is_array($tokens[$x]) === false
-                        || isset(Util\Tokens::$emptyTokens[$tokens[$x][0]]) === false
+                for ( $x = ( $stackPtr + 1 ); $x < $numTokens; $x++ ) {
+                    if ( is_array( $tokens[ $x ] ) === false
+                        || isset( Util\Tokens::$emptyTokens[ $tokens[ $x ][ 0 ] ] ) === false
                     ) {
                         // Non-empty content.
                         break;
                     }
                 }
 
-                if ($x < $numTokens && is_array($tokens[$x]) === true) {
-                    $tokens[$x][0] = T_STRING;
+                if ( $x < $numTokens && is_array( $tokens[ $x ] ) === true ) {
+                    $tokens[ $x ][ 0 ] = T_STRING;
                 }
 
                 /*
@@ -1074,31 +1074,31 @@ 
 
                 // Go looking for the colon to start the return type hint.
                 // Start by finding the closing parenthesis of the function.
-                $parenthesisStack  = [];
+                $parenthesisStack  = [ ];
                 $parenthesisCloser = false;
-                for ($x = ($stackPtr + 1); $x < $numTokens; $x++) {
-                    if (is_array($tokens[$x]) === false && $tokens[$x] === '(') {
-                        $parenthesisStack[] = $x;
-                    } else if (is_array($tokens[$x]) === false && $tokens[$x] === ')') {
-                        array_pop($parenthesisStack);
-                        if (empty($parenthesisStack) === true) {
+                for ( $x = ( $stackPtr + 1 ); $x < $numTokens; $x++ ) {
+                    if ( is_array( $tokens[ $x ] ) === false && $tokens[ $x ] === '(' ) {
+                        $parenthesisStack[ ] = $x;
+                    } else if ( is_array( $tokens[ $x ] ) === false && $tokens[ $x ] === ')' ) {
+                        array_pop( $parenthesisStack );
+                        if ( empty( $parenthesisStack ) === true ) {
                             $parenthesisCloser = $x;
                             break;
                         }
                     }
                 }
 
-                if ($parenthesisCloser !== false) {
-                    for ($x = ($parenthesisCloser + 1); $x < $numTokens; $x++) {
-                        if (is_array($tokens[$x]) === false
-                            || isset(Util\Tokens::$emptyTokens[$tokens[$x][0]]) === false
+                if ( $parenthesisCloser !== false ) {
+                    for ( $x = ( $parenthesisCloser + 1 ); $x < $numTokens; $x++ ) {
+                        if ( is_array( $tokens[ $x ] ) === false
+                            || isset( Util\Tokens::$emptyTokens[ $tokens[ $x ][ 0 ] ] ) === false
                         ) {
                             // Non-empty content.
-                            if (is_array($tokens[$x]) === true && $tokens[$x][0] === T_USE) {
+                            if ( is_array( $tokens[ $x ] ) === true && $tokens[ $x ][ 0 ] === T_USE ) {
                                 // Found a use statements, so search ahead for the closing parenthesis.
-                                for ($x += 1; $x < $numTokens; $x++) {
-                                    if (is_array($tokens[$x]) === false && $tokens[$x] === ')') {
-                                        continue(2);
+                                for ( $x += 1; $x < $numTokens; $x++ ) {
+                                    if ( is_array( $tokens[ $x ] ) === false && $tokens[ $x ] === ')' ) {
+                                        continue( 2 );
                                     }
                                 }
                             }
@@ -1107,9 +1107,9 @@ 
                         }
                     }
 
-                    if (isset($tokens[$x]) === true
-                        && is_array($tokens[$x]) === false
-                        && $tokens[$x] === ':'
+                    if ( isset( $tokens[ $x ] ) === true
+                        && is_array( $tokens[ $x ] ) === false
+                        && $tokens[ $x ] === ':'
                     ) {
                         $allowed = [
                             T_STRING       => T_STRING,
@@ -1123,25 +1123,25 @@ 
                         $allowed += Util\Tokens::$emptyTokens;
 
                         // Find the start of the return type.
-                        for ($x += 1; $x < $numTokens; $x++) {
-                            if (is_array($tokens[$x]) === true
-                                && isset(Util\Tokens::$emptyTokens[$tokens[$x][0]]) === true
+                        for ( $x += 1; $x < $numTokens; $x++ ) {
+                            if ( is_array( $tokens[ $x ] ) === true
+                                && isset( Util\Tokens::$emptyTokens[ $tokens[ $x ][ 0 ] ] ) === true
                             ) {
                                 // Whitespace or comments before the return type.
                                 continue;
                             }
 
-                            if (is_array($tokens[$x]) === false && $tokens[$x] === '?') {
+                            if ( is_array( $tokens[ $x ] ) === false && $tokens[ $x ] === '?' ) {
                                 // Found a nullable operator, so skip it.
                                 // But also covert the token to save the tokenizer
                                 // a bit of time later on.
-                                $tokens[$x] = [
+                                $tokens[ $x ] = [
                                     T_NULLABLE,
                                     '?',
                                 ];
 
-                                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                    echo "\t\t* token $x changed from ? to T_NULLABLE".PHP_EOL;
+                                if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                                    echo "\t\t* token $x changed from ? to T_NULLABLE" . PHP_EOL;
                                 }
 
                                 continue;
@@ -1153,14 +1153,14 @@ 
                         // Any T_ARRAY tokens we find between here and the next
                         // token that can't be part of the return type need to be
                         // converted to T_STRING tokens.
-                        for ($x; $x < $numTokens; $x++) {
-                            if (is_array($tokens[$x]) === false || isset($allowed[$tokens[$x][0]]) === false) {
+                        for ( $x; $x < $numTokens; $x++ ) {
+                            if ( is_array( $tokens[ $x ] ) === false || isset( $allowed[ $tokens[ $x ][ 0 ] ] ) === false ) {
                                 break;
-                            } else if ($tokens[$x][0] === T_ARRAY) {
-                                $tokens[$x][0] = T_STRING;
+                            } else if ( $tokens[ $x ][ 0 ] === T_ARRAY ) {
+                                $tokens[ $x ][ 0 ] = T_STRING;
 
-                                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                    echo "\t\t* token $x changed from T_ARRAY to T_STRING".PHP_EOL;
+                                if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                                    echo "\t\t* token $x changed from T_ARRAY to T_STRING" . PHP_EOL;
                                 }
                             }
                         }
@@ -1174,16 +1174,16 @@ 
                 So look for and combine these tokens in earlier versions.
             */
 
-            if ($tokenIsArray === true
-                && $token[0] === T_IS_SMALLER_OR_EQUAL
-                && isset($tokens[($stackPtr + 1)]) === true
-                && $tokens[($stackPtr + 1)][0] === '>'
+            if ( $tokenIsArray === true
+                && $token[ 0 ] === T_IS_SMALLER_OR_EQUAL
+                && isset( $tokens[ ( $stackPtr + 1 ) ] ) === true
+                && $tokens[ ( $stackPtr + 1 ) ][ 0 ] === '>'
             ) {
-                $newToken            = [];
-                $newToken['code']    = T_SPACESHIP;
-                $newToken['type']    = 'T_SPACESHIP';
-                $newToken['content'] = '<=>';
-                $finalTokens[$newStackPtr] = $newToken;
+                $newToken            = [ ];
+                $newToken[ 'code' ]    = T_SPACESHIP;
+                $newToken[ 'type' ]    = 'T_SPACESHIP';
+                $newToken[ 'content' ] = '<=>';
+                $finalTokens[ $newStackPtr ] = $newToken;
 
                 $newStackPtr++;
                 $stackPtr++;
@@ -1198,11 +1198,11 @@ 
                 goto labels.
             */
 
-            if ($tokenIsArray === true
-                && $token[0] === T_STRING
-                && isset($tokens[($stackPtr + 1)]) === true
-                && $tokens[($stackPtr + 1)] === ':'
-                && $tokens[($stackPtr - 1)][0] !== T_PAAMAYIM_NEKUDOTAYIM
+            if ( $tokenIsArray === true
+                && $token[ 0 ] === T_STRING
+                && isset( $tokens[ ( $stackPtr + 1 ) ] ) === true
+                && $tokens[ ( $stackPtr + 1 ) ] === ':'
+                && $tokens[ ( $stackPtr - 1 ) ][ 0 ] !== T_PAAMAYIM_NEKUDOTAYIM
             ) {
                 $stopTokens = [
                     T_CASE               => true,
@@ -1211,24 +1211,24 @@ 
                     T_INLINE_THEN        => true,
                 ];
 
-                for ($x = ($newStackPtr - 1); $x > 0; $x--) {
-                    if (isset($stopTokens[$finalTokens[$x]['code']]) === true) {
+                for ( $x = ( $newStackPtr - 1 ); $x > 0; $x-- ) {
+                    if ( isset( $stopTokens[ $finalTokens[ $x ][ 'code' ] ] ) === true ) {
                         break;
                     }
                 }
 
-                if ($finalTokens[$x]['code'] !== T_CASE
-                    && $finalTokens[$x]['code'] !== T_INLINE_THEN
+                if ( $finalTokens[ $x ][ 'code' ] !== T_CASE
+                    && $finalTokens[ $x ][ 'code' ] !== T_INLINE_THEN
                 ) {
-                    $finalTokens[$newStackPtr] = [
-                        'content' => $token[1].':',
+                    $finalTokens[ $newStackPtr ] = [
+                        'content' => $token[ 1 ] . ':',
                         'code'    => T_GOTO_LABEL,
                         'type'    => 'T_GOTO_LABEL',
                     ];
 
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        echo "\t\t* token $stackPtr changed from T_STRING to T_GOTO_LABEL".PHP_EOL;
-                        echo "\t\t* skipping T_COLON token ".($stackPtr + 1).PHP_EOL;
+                    if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                        echo "\t\t* token $stackPtr changed from T_STRING to T_GOTO_LABEL" . PHP_EOL;
+                        echo "\t\t* skipping T_COLON token " . ( $stackPtr + 1 ) . PHP_EOL;
                     }
 
                     $newStackPtr++;
@@ -1244,30 +1244,30 @@ 
                 Note that $token[1] is the token's content.
             */
 
-            if ($tokenIsArray === true && strpos($token[1], $this->eolChar) !== false) {
-                $tokenLines = explode($this->eolChar, $token[1]);
-                $numLines   = count($tokenLines);
+            if ( $tokenIsArray === true && strpos( $token[ 1 ], $this->eolChar ) !== false ) {
+                $tokenLines = explode( $this->eolChar, $token[ 1 ] );
+                $numLines   = count( $tokenLines );
                 $newToken   = [
-                    'type'    => Util\Tokens::tokenName($token[0]),
-                    'code'    => $token[0],
+                    'type'    => Util\Tokens::tokenName( $token[ 0 ] ),
+                    'code'    => $token[ 0 ],
                     'content' => '',
                 ];
 
-                for ($i = 0; $i < $numLines; $i++) {
-                    $newToken['content'] = $tokenLines[$i];
-                    if ($i === ($numLines - 1)) {
-                        if ($tokenLines[$i] === '') {
+                for ( $i = 0; $i < $numLines; $i++ ) {
+                    $newToken[ 'content' ] = $tokenLines[ $i ];
+                    if ( $i === ( $numLines - 1 ) ) {
+                        if ( $tokenLines[ $i ] === '' ) {
                             break;
                         }
                     } else {
-                        $newToken['content'] .= $this->eolChar;
+                        $newToken[ 'content' ] .= $this->eolChar;
                     }
 
-                    $finalTokens[$newStackPtr] = $newToken;
+                    $finalTokens[ $newStackPtr ] = $newToken;
                     $newStackPtr++;
                 }
             } else {
-                if ($tokenIsArray === true && $token[0] === T_STRING) {
+                if ( $tokenIsArray === true && $token[ 0 ] === T_STRING ) {
                     // Some T_STRING tokens should remain that way
                     // due to their context.
                     $context = [
@@ -1284,20 +1284,20 @@ 
                         T_PAAMAYIM_NEKUDOTAYIM => true,
                     ];
 
-                    if (isset($context[$finalTokens[$lastNotEmptyToken]['code']]) === true) {
+                    if ( isset( $context[ $finalTokens[ $lastNotEmptyToken ][ 'code' ] ] ) === true ) {
                         // Special case for syntax like: return new self
                         // where self should not be a string.
-                        if ($finalTokens[$lastNotEmptyToken]['code'] === T_NEW
-                            && strtolower($token[1]) === 'self'
+                        if ( $finalTokens[ $lastNotEmptyToken ][ 'code' ] === T_NEW
+                            && strtolower( $token[ 1 ] ) === 'self'
                         ) {
-                            $finalTokens[$newStackPtr] = [
-                                'content' => $token[1],
+                            $finalTokens[ $newStackPtr ] = [
+                                'content' => $token[ 1 ],
                                 'code'    => T_SELF,
                                 'type'    => 'T_SELF',
                             ];
                         } else {
-                            $finalTokens[$newStackPtr] = [
-                                'content' => $token[1],
+                            $finalTokens[ $newStackPtr ] = [
+                                'content' => $token[ 1 ],
                                 'code'    => T_STRING,
                                 'type'    => 'T_STRING',
                             ];
@@ -1309,77 +1309,77 @@ 
                 }//end if
 
                 $newToken = null;
-                if ($tokenIsArray === false) {
-                    if (isset(self::$resolveTokenCache[$token[0]]) === true) {
-                        $newToken = self::$resolveTokenCache[$token[0]];
+                if ( $tokenIsArray === false ) {
+                    if ( isset( self::$resolveTokenCache[ $token[ 0 ] ] ) === true ) {
+                        $newToken = self::$resolveTokenCache[ $token[ 0 ] ];
                     }
                 } else {
                     $cacheKey = null;
-                    if ($token[0] === T_STRING) {
-                        $cacheKey = strtolower($token[1]);
-                    } else if ($token[0] !== T_CURLY_OPEN) {
-                        $cacheKey = $token[0];
+                    if ( $token[ 0 ] === T_STRING ) {
+                        $cacheKey = strtolower( $token[ 1 ] );
+                    } else if ( $token[ 0 ] !== T_CURLY_OPEN ) {
+                        $cacheKey = $token[ 0 ];
                     }
 
-                    if ($cacheKey !== null && isset(self::$resolveTokenCache[$cacheKey]) === true) {
-                        $newToken            = self::$resolveTokenCache[$cacheKey];
-                        $newToken['content'] = $token[1];
+                    if ( $cacheKey !== null && isset( self::$resolveTokenCache[ $cacheKey ] ) === true ) {
+                        $newToken            = self::$resolveTokenCache[ $cacheKey ];
+                        $newToken[ 'content' ] = $token[ 1 ];
                     }
                 }
 
-                if ($newToken === null) {
-                    $newToken = self::standardiseToken($token);
+                if ( $newToken === null ) {
+                    $newToken = self::standardiseToken( $token );
                 }
 
                 // Convert colons that are actually the ELSE component of an
                 // inline IF statement.
-                if (empty($insideInlineIf) === false && $newToken['code'] === T_COLON) {
+                if ( empty( $insideInlineIf ) === false && $newToken[ 'code' ] === T_COLON ) {
                     // Make sure this isn't the return type separator of a closure.
                     $isReturnType = false;
-                    for ($i = ($stackPtr - 1); $i > 0; $i--) {
-                        if (is_array($tokens[$i]) === false
-                            || ($tokens[$i][0] !== T_DOC_COMMENT
-                            && $tokens[$i][0] !== T_COMMENT
-                            && $tokens[$i][0] !== T_WHITESPACE)
+                    for ( $i = ( $stackPtr - 1 ); $i > 0; $i-- ) {
+                        if ( is_array( $tokens[ $i ] ) === false
+                            || ( $tokens[ $i ][ 0 ] !== T_DOC_COMMENT
+                            && $tokens[ $i ][ 0 ] !== T_COMMENT
+                            && $tokens[ $i ][ 0 ] !== T_WHITESPACE )
                         ) {
                             break;
                         }
                     }
 
-                    if ($tokens[$i] === ')') {
+                    if ( $tokens[ $i ] === ')' ) {
                         $parenCount = 1;
-                        for ($i--; $i > 0; $i--) {
-                            if ($tokens[$i] === '(') {
+                        for ( $i--; $i > 0; $i-- ) {
+                            if ( $tokens[ $i ] === '(' ) {
                                 $parenCount--;
-                                if ($parenCount === 0) {
+                                if ( $parenCount === 0 ) {
                                     break;
                                 }
-                            } else if ($tokens[$i] === ')') {
+                            } else if ( $tokens[ $i ] === ')' ) {
                                 $parenCount++;
                             }
                         }
 
                         // We've found the open parenthesis, so if the previous
                         // non-empty token is FUNCTION or USE, this is a closure.
-                        for ($i--; $i > 0; $i--) {
-                            if (is_array($tokens[$i]) === false
-                                || ($tokens[$i][0] !== T_DOC_COMMENT
-                                && $tokens[$i][0] !== T_COMMENT
-                                && $tokens[$i][0] !== T_WHITESPACE)
+                        for ( $i--; $i > 0; $i-- ) {
+                            if ( is_array( $tokens[ $i ] ) === false
+                                || ( $tokens[ $i ][ 0 ] !== T_DOC_COMMENT
+                                && $tokens[ $i ][ 0 ] !== T_COMMENT
+                                && $tokens[ $i ][ 0 ] !== T_WHITESPACE )
                             ) {
                                 break;
                             }
                         }
 
-                        if ($tokens[$i][0] === T_FUNCTION || $tokens[$i][0] === T_USE) {
+                        if ( $tokens[ $i ][ 0 ] === T_FUNCTION || $tokens[ $i ][ 0 ] === T_USE ) {
                             $isReturnType = true;
                         }
                     }//end if
 
-                    if ($isReturnType === false) {
-                        array_pop($insideInlineIf);
-                        $newToken['code'] = T_INLINE_ELSE;
-                        $newToken['type'] = 'T_INLINE_ELSE';
+                    if ( $isReturnType === false ) {
+                        array_pop( $insideInlineIf );
+                        $newToken[ 'code' ] = T_INLINE_ELSE;
+                        $newToken[ 'type' ] = 'T_INLINE_ELSE';
                     }
                 }//end if
 
@@ -1387,13 +1387,13 @@ 
                 // type hinting function arguments as being arrays. We want to keep
                 // the parenthesis map clean, so let's tag these tokens as
                 // T_STRING.
-                if ($newToken['code'] === T_ARRAY) {
-                    for ($i = $stackPtr; $i < $numTokens; $i++) {
-                        if ($tokens[$i] === '(') {
+                if ( $newToken[ 'code' ] === T_ARRAY ) {
+                    for ( $i = $stackPtr; $i < $numTokens; $i++ ) {
+                        if ( $tokens[ $i ] === '(' ) {
                             break;
-                        } else if ($tokens[$i][0] === T_VARIABLE) {
-                            $newToken['code'] = T_STRING;
-                            $newToken['type'] = 'T_STRING';
+                        } else if ( $tokens[ $i ][ 0 ] === T_VARIABLE ) {
+                            $newToken[ 'code' ] = T_STRING;
+                            $newToken[ 'type' ] = 'T_STRING';
                             break;
                         }
                     }
@@ -1401,58 +1401,58 @@ 
 
                 // This is a special case when checking PHP 5.5+ code in PHP < 5.5
                 // where "finally" should be T_FINALLY instead of T_STRING.
-                if ($newToken['code'] === T_STRING
-                    && strtolower($newToken['content']) === 'finally'
+                if ( $newToken[ 'code' ] === T_STRING
+                    && strtolower( $newToken[ 'content' ] ) === 'finally'
                 ) {
-                    $newToken['code'] = T_FINALLY;
-                    $newToken['type'] = 'T_FINALLY';
+                    $newToken[ 'code' ] = T_FINALLY;
+                    $newToken[ 'type' ] = 'T_FINALLY';
                 }
 
                 // This is a special case for the PHP 5.5 classname::class syntax
                 // where "class" should be T_STRING instead of T_CLASS.
-                if (($newToken['code'] === T_CLASS
-                    || $newToken['code'] === T_FUNCTION)
-                    && $finalTokens[$lastNotEmptyToken]['code'] === T_DOUBLE_COLON
+                if ( ( $newToken[ 'code' ] === T_CLASS
+                    || $newToken[ 'code' ] === T_FUNCTION )
+                    && $finalTokens[ $lastNotEmptyToken ][ 'code' ] === T_DOUBLE_COLON
                 ) {
-                    $newToken['code'] = T_STRING;
-                    $newToken['type'] = 'T_STRING';
+                    $newToken[ 'code' ] = T_STRING;
+                    $newToken[ 'type' ] = 'T_STRING';
                 }
 
                 // This is a special case for PHP 5.6 use function and use const
                 // where "function" and "const" should be T_STRING instead of T_FUNCTION
                 // and T_CONST.
-                if (($newToken['code'] === T_FUNCTION
-                    || $newToken['code'] === T_CONST)
-                    && ($finalTokens[$lastNotEmptyToken]['code'] === T_USE || $insideUseGroup === true)
+                if ( ( $newToken[ 'code' ] === T_FUNCTION
+                    || $newToken[ 'code' ] === T_CONST )
+                    && ( $finalTokens[ $lastNotEmptyToken ][ 'code' ] === T_USE || $insideUseGroup === true )
                 ) {
-                    $newToken['code'] = T_STRING;
-                    $newToken['type'] = 'T_STRING';
+                    $newToken[ 'code' ] = T_STRING;
+                    $newToken[ 'type' ] = 'T_STRING';
                 }
 
                 // This is a special case for use groups in PHP 7+ where leaving
                 // the curly braces as their normal tokens would confuse
                 // the scope map and sniffs.
-                if ($newToken['code'] === T_OPEN_CURLY_BRACKET
-                    && $finalTokens[$lastNotEmptyToken]['code'] === T_NS_SEPARATOR
+                if ( $newToken[ 'code' ] === T_OPEN_CURLY_BRACKET
+                    && $finalTokens[ $lastNotEmptyToken ][ 'code' ] === T_NS_SEPARATOR
                 ) {
-                    $newToken['code'] = T_OPEN_USE_GROUP;
-                    $newToken['type'] = 'T_OPEN_USE_GROUP';
+                    $newToken[ 'code' ] = T_OPEN_USE_GROUP;
+                    $newToken[ 'type' ] = 'T_OPEN_USE_GROUP';
                     $insideUseGroup   = true;
                 }
 
-                if ($insideUseGroup === true && $newToken['code'] === T_CLOSE_CURLY_BRACKET) {
-                    $newToken['code'] = T_CLOSE_USE_GROUP;
-                    $newToken['type'] = 'T_CLOSE_USE_GROUP';
+                if ( $insideUseGroup === true && $newToken[ 'code' ] === T_CLOSE_CURLY_BRACKET ) {
+                    $newToken[ 'code' ] = T_CLOSE_USE_GROUP;
+                    $newToken[ 'type' ] = 'T_CLOSE_USE_GROUP';
                     $insideUseGroup   = false;
                 }
 
-                $finalTokens[$newStackPtr] = $newToken;
+                $finalTokens[ $newStackPtr ] = $newToken;
                 $newStackPtr++;
             }//end if
         }//end for
 
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            echo "\t*** END PHP TOKENIZING ***".PHP_EOL;
+        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+            echo "\t*** END PHP TOKENIZING ***" . PHP_EOL;
         }
 
         return $finalTokens;
@@ -1474,96 +1474,96 @@ 
      */
     protected function processAdditional()
     {
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            echo "\t*** START ADDITIONAL PHP PROCESSING ***".PHP_EOL;
+        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+            echo "\t*** START ADDITIONAL PHP PROCESSING ***" . PHP_EOL;
         }
 
-        $numTokens = count($this->tokens);
-        for ($i = ($numTokens - 1); $i >= 0; $i--) {
+        $numTokens = count( $this->tokens );
+        for ( $i = ( $numTokens - 1 ); $i >= 0; $i-- ) {
             // Check for any unset scope conditions due to alternate IF/ENDIF syntax.
-            if (isset($this->tokens[$i]['scope_opener']) === true
-                && isset($this->tokens[$i]['scope_condition']) === false
+            if ( isset( $this->tokens[ $i ][ 'scope_opener' ] ) === true
+                && isset( $this->tokens[ $i ][ 'scope_condition' ] ) === false
             ) {
-                $this->tokens[$i]['scope_condition'] = $this->tokens[$this->tokens[$i]['scope_opener']]['scope_condition'];
+                $this->tokens[ $i ][ 'scope_condition' ] = $this->tokens[ $this->tokens[ $i ][ 'scope_opener' ] ][ 'scope_condition' ];
             }
 
-            if ($this->tokens[$i]['code'] === T_FUNCTION) {
+            if ( $this->tokens[ $i ][ 'code' ] === T_FUNCTION ) {
                 /*
                     Detect functions that are actually closures and
                     assign them a different token.
                 */
 
-                if (isset($this->tokens[$i]['scope_opener']) === true) {
-                    for ($x = ($i + 1); $x < $numTokens; $x++) {
-                        if (isset(Util\Tokens::$emptyTokens[$this->tokens[$x]['code']]) === false
-                            && $this->tokens[$x]['code'] !== T_BITWISE_AND
+                if ( isset( $this->tokens[ $i ][ 'scope_opener' ] ) === true ) {
+                    for ( $x = ( $i + 1 ); $x < $numTokens; $x++ ) {
+                        if ( isset( Util\Tokens::$emptyTokens[ $this->tokens[ $x ][ 'code' ] ] ) === false
+                            && $this->tokens[ $x ][ 'code' ] !== T_BITWISE_AND
                         ) {
                             break;
                         }
                     }
 
-                    if ($this->tokens[$x]['code'] === T_OPEN_PARENTHESIS) {
-                        $this->tokens[$i]['code'] = T_CLOSURE;
-                        $this->tokens[$i]['type'] = 'T_CLOSURE';
-                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            $line = $this->tokens[$i]['line'];
-                            echo "\t* token $i on line $line changed from T_FUNCTION to T_CLOSURE".PHP_EOL;
+                    if ( $this->tokens[ $x ][ 'code' ] === T_OPEN_PARENTHESIS ) {
+                        $this->tokens[ $i ][ 'code' ] = T_CLOSURE;
+                        $this->tokens[ $i ][ 'type' ] = 'T_CLOSURE';
+                        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                            $line = $this->tokens[ $i ][ 'line' ];
+                            echo "\t* token $i on line $line changed from T_FUNCTION to T_CLOSURE" . PHP_EOL;
                         }
 
-                        for ($x = ($this->tokens[$i]['scope_opener'] + 1); $x < $this->tokens[$i]['scope_closer']; $x++) {
-                            if (isset($this->tokens[$x]['conditions'][$i]) === false) {
+                        for ( $x = ( $this->tokens[ $i ][ 'scope_opener' ] + 1 ); $x < $this->tokens[ $i ][ 'scope_closer' ]; $x++ ) {
+                            if ( isset( $this->tokens[ $x ][ 'conditions' ][ $i ] ) === false ) {
                                 continue;
                             }
 
-                            $this->tokens[$x]['conditions'][$i] = T_CLOSURE;
-                            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                                $type = $this->tokens[$x]['type'];
-                                echo "\t\t* cleaned $x ($type) *".PHP_EOL;
+                            $this->tokens[ $x ][ 'conditions' ][ $i ] = T_CLOSURE;
+                            if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                                $type = $this->tokens[ $x ][ 'type' ];
+                                echo "\t\t* cleaned $x ($type) *" . PHP_EOL;
                             }
                         }
                     }
                 }//end if
 
                 continue;
-            } else if ($this->tokens[$i]['code'] === T_CLASS && isset($this->tokens[$i]['scope_opener']) === true) {
+            } else if ( $this->tokens[ $i ][ 'code' ] === T_CLASS && isset( $this->tokens[ $i ][ 'scope_opener' ] ) === true ) {
                 /*
                     Detect anonymous classes and assign them a different token.
                 */
 
-                for ($x = ($i + 1); $x < $numTokens; $x++) {
-                    if (isset(Util\Tokens::$emptyTokens[$this->tokens[$x]['code']]) === false) {
+                for ( $x = ( $i + 1 ); $x < $numTokens; $x++ ) {
+                    if ( isset( Util\Tokens::$emptyTokens[ $this->tokens[ $x ][ 'code' ] ] ) === false ) {
                         break;
                     }
                 }
 
-                if ($this->tokens[$x]['code'] === T_OPEN_PARENTHESIS
-                    || $this->tokens[$x]['code'] === T_OPEN_CURLY_BRACKET
-                    || $this->tokens[$x]['code'] === T_EXTENDS
-                    || $this->tokens[$x]['code'] === T_IMPLEMENTS
+                if ( $this->tokens[ $x ][ 'code' ] === T_OPEN_PARENTHESIS
+                    || $this->tokens[ $x ][ 'code' ] === T_OPEN_CURLY_BRACKET
+                    || $this->tokens[ $x ][ 'code' ] === T_EXTENDS
+                    || $this->tokens[ $x ][ 'code' ] === T_IMPLEMENTS
                 ) {
-                    $this->tokens[$i]['code'] = T_ANON_CLASS;
-                    $this->tokens[$i]['type'] = 'T_ANON_CLASS';
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        $line = $this->tokens[$i]['line'];
-                        echo "\t* token $i on line $line changed from T_CLASS to T_ANON_CLASS".PHP_EOL;
+                    $this->tokens[ $i ][ 'code' ] = T_ANON_CLASS;
+                    $this->tokens[ $i ][ 'type' ] = 'T_ANON_CLASS';
+                    if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                        $line = $this->tokens[ $i ][ 'line' ];
+                        echo "\t* token $i on line $line changed from T_CLASS to T_ANON_CLASS" . PHP_EOL;
                     }
 
-                    for ($x = ($this->tokens[$i]['scope_opener'] + 1); $x < $this->tokens[$i]['scope_closer']; $x++) {
-                        if (isset($this->tokens[$x]['conditions'][$i]) === false) {
+                    for ( $x = ( $this->tokens[ $i ][ 'scope_opener' ] + 1 ); $x < $this->tokens[ $i ][ 'scope_closer' ]; $x++ ) {
+                        if ( isset( $this->tokens[ $x ][ 'conditions' ][ $i ] ) === false ) {
                             continue;
                         }
 
-                        $this->tokens[$x]['conditions'][$i] = T_ANON_CLASS;
-                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            $type = $this->tokens[$x]['type'];
-                            echo "\t\t* cleaned $x ($type) *".PHP_EOL;
+                        $this->tokens[ $x ][ 'conditions' ][ $i ] = T_ANON_CLASS;
+                        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                            $type = $this->tokens[ $x ][ 'type' ];
+                            echo "\t\t* cleaned $x ($type) *" . PHP_EOL;
                         }
                     }
                 }
 
                 continue;
-            } else if ($this->tokens[$i]['code'] === T_OPEN_SQUARE_BRACKET) {
-                if (isset($this->tokens[$i]['bracket_closer']) === false) {
+            } else if ( $this->tokens[ $i ][ 'code' ] === T_OPEN_SQUARE_BRACKET ) {
+                if ( isset( $this->tokens[ $i ][ 'bracket_closer' ] ) === false ) {
                     continue;
                 }
 
@@ -1580,17 +1580,17 @@ 
                     T_CONSTANT_ENCAPSED_STRING => T_CONSTANT_ENCAPSED_STRING,
                 ];
 
-                for ($x = ($i - 1); $x >= 0; $x--) {
+                for ( $x = ( $i - 1 ); $x >= 0; $x-- ) {
                     // If we hit a scope opener, the statement has ended
                     // without finding anything, so it's probably an array
                     // using PHP 7.1 short list syntax.
-                    if (isset($this->tokens[$x]['scope_opener']) === true) {
+                    if ( isset( $this->tokens[ $x ][ 'scope_opener' ] ) === true ) {
                         $isShortArray = true;
                         break;
                     }
 
-                    if (isset(Util\Tokens::$emptyTokens[$this->tokens[$x]['code']]) === false) {
-                        if (isset($allowed[$this->tokens[$x]['code']]) === false) {
+                    if ( isset( Util\Tokens::$emptyTokens[ $this->tokens[ $x ][ 'code' ] ] ) === false ) {
+                        if ( isset( $allowed[ $this->tokens[ $x ][ 'code' ] ] ) === false ) {
                             $isShortArray = true;
                         }
 
@@ -1598,46 +1598,46 @@ 
                     }
                 }
 
-                if ($isShortArray === true) {
-                    $this->tokens[$i]['code'] = T_OPEN_SHORT_ARRAY;
-                    $this->tokens[$i]['type'] = 'T_OPEN_SHORT_ARRAY';
-
-                    $closer = $this->tokens[$i]['bracket_closer'];
-                    $this->tokens[$closer]['code'] = T_CLOSE_SHORT_ARRAY;
-                    $this->tokens[$closer]['type'] = 'T_CLOSE_SHORT_ARRAY';
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        $line = $this->tokens[$i]['line'];
-                        echo "\t* token $i on line $line changed from T_OPEN_SQUARE_BRACKET to T_OPEN_SHORT_ARRAY".PHP_EOL;
-                        $line = $this->tokens[$closer]['line'];
-                        echo "\t* token $closer on line $line changed from T_CLOSE_SQUARE_BRACKET to T_CLOSE_SHORT_ARRAY".PHP_EOL;
+                if ( $isShortArray === true ) {
+                    $this->tokens[ $i ][ 'code' ] = T_OPEN_SHORT_ARRAY;
+                    $this->tokens[ $i ][ 'type' ] = 'T_OPEN_SHORT_ARRAY';
+
+                    $closer = $this->tokens[ $i ][ 'bracket_closer' ];
+                    $this->tokens[ $closer ][ 'code' ] = T_CLOSE_SHORT_ARRAY;
+                    $this->tokens[ $closer ][ 'type' ] = 'T_CLOSE_SHORT_ARRAY';
+                    if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                        $line = $this->tokens[ $i ][ 'line' ];
+                        echo "\t* token $i on line $line changed from T_OPEN_SQUARE_BRACKET to T_OPEN_SHORT_ARRAY" . PHP_EOL;
+                        $line = $this->tokens[ $closer ][ 'line' ];
+                        echo "\t* token $closer on line $line changed from T_CLOSE_SQUARE_BRACKET to T_CLOSE_SHORT_ARRAY" . PHP_EOL;
                     }
                 }
 
                 continue;
-            } else if ($this->tokens[$i]['code'] === T_STATIC) {
-                for ($x = ($i - 1); $x > 0; $x--) {
-                    if (isset(Util\Tokens::$emptyTokens[$this->tokens[$x]['code']]) === false) {
+            } else if ( $this->tokens[ $i ][ 'code' ] === T_STATIC ) {
+                for ( $x = ( $i - 1 ); $x > 0; $x-- ) {
+                    if ( isset( Util\Tokens::$emptyTokens[ $this->tokens[ $x ][ 'code' ] ] ) === false ) {
                         break;
                     }
                 }
 
-                if ($this->tokens[$x]['code'] === T_INSTANCEOF) {
-                    $this->tokens[$i]['code'] = T_STRING;
-                    $this->tokens[$i]['type'] = 'T_STRING';
+                if ( $this->tokens[ $x ][ 'code' ] === T_INSTANCEOF ) {
+                    $this->tokens[ $i ][ 'code' ] = T_STRING;
+                    $this->tokens[ $i ][ 'type' ] = 'T_STRING';
 
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        $line = $this->tokens[$i]['line'];
-                        echo "\t* token $i on line $line changed from T_STATIC to T_STRING".PHP_EOL;
+                    if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                        $line = $this->tokens[ $i ][ 'line' ];
+                        echo "\t* token $i on line $line changed from T_STATIC to T_STRING" . PHP_EOL;
                     }
                 }
 
                 continue;
-            } else if ($this->tokens[$i]['code'] === T_TRUE
-                || $this->tokens[$i]['code'] === T_FALSE
-                || $this->tokens[$i]['code'] === T_NULL
+            } else if ( $this->tokens[ $i ][ 'code' ] === T_TRUE
+                || $this->tokens[ $i ][ 'code' ] === T_FALSE
+                || $this->tokens[ $i ][ 'code' ] === T_NULL
             ) {
-                for ($x = ($i + 1); $i < $numTokens; $x++) {
-                    if (isset(Util\Tokens::$emptyTokens[$this->tokens[$x]['code']]) === false) {
+                for ( $x = ( $i + 1 ); $i < $numTokens; $x++ ) {
+                    if ( isset( Util\Tokens::$emptyTokens[ $this->tokens[ $x ][ 'code' ] ] ) === false ) {
                         // Non-whitespace content.
                         break;
                     }
@@ -1648,78 +1648,78 @@ 
                     T_NS_SEPARATOR         => true,
                     T_PAAMAYIM_NEKUDOTAYIM => true,
                 ];
-                if (isset($context[$this->tokens[$x]['code']]) === true) {
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        $line = $this->tokens[$i]['line'];
-                        $type = $this->tokens[$i]['type'];
-                        echo "\t* token $i on line $line changed from $type to T_STRING".PHP_EOL;
+                if ( isset( $context[ $this->tokens[ $x ][ 'code' ] ] ) === true ) {
+                    if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                        $line = $this->tokens[ $i ][ 'line' ];
+                        $type = $this->tokens[ $i ][ 'type' ];
+                        echo "\t* token $i on line $line changed from $type to T_STRING" . PHP_EOL;
                     }
 
-                    $this->tokens[$i]['code'] = T_STRING;
-                    $this->tokens[$i]['type'] = 'T_STRING';
+                    $this->tokens[ $i ][ 'code' ] = T_STRING;
+                    $this->tokens[ $i ][ 'type' ] = 'T_STRING';
                 }
-            } else if ($this->tokens[$i]['code'] === T_CONST) {
+            } else if ( $this->tokens[ $i ][ 'code' ] === T_CONST ) {
                 // Context sensitive keywords support.
-                for ($x = ($i + 1); $i < $numTokens; $x++) {
-                    if (isset(Util\Tokens::$emptyTokens[$this->tokens[$x]['code']]) === false) {
+                for ( $x = ( $i + 1 ); $i < $numTokens; $x++ ) {
+                    if ( isset( Util\Tokens::$emptyTokens[ $this->tokens[ $x ][ 'code' ] ] ) === false ) {
                         // Non-whitespace content.
                         break;
                     }
                 }
 
-                if ($this->tokens[$x]['code'] !== T_STRING) {
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        $line = $this->tokens[$x]['line'];
-                        $type = $this->tokens[$x]['type'];
-                        echo "\t* token $x on line $line changed from $type to T_STRING".PHP_EOL;
+                if ( $this->tokens[ $x ][ 'code' ] !== T_STRING ) {
+                    if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                        $line = $this->tokens[ $x ][ 'line' ];
+                        $type = $this->tokens[ $x ][ 'type' ];
+                        echo "\t* token $x on line $line changed from $type to T_STRING" . PHP_EOL;
                     }
 
-                    $this->tokens[$x]['code'] = T_STRING;
-                    $this->tokens[$x]['type'] = 'T_STRING';
+                    $this->tokens[ $x ][ 'code' ] = T_STRING;
+                    $this->tokens[ $x ][ 'type' ] = 'T_STRING';
                 }
             }//end if
 
-            if (($this->tokens[$i]['code'] !== T_CASE
-                && $this->tokens[$i]['code'] !== T_DEFAULT)
-                || isset($this->tokens[$i]['scope_opener']) === false
+            if ( ( $this->tokens[ $i ][ 'code' ] !== T_CASE
+                && $this->tokens[ $i ][ 'code' ] !== T_DEFAULT )
+                || isset( $this->tokens[ $i ][ 'scope_opener' ] ) === false
             ) {
                 // Only interested in CASE and DEFAULT statements from here on in.
                 continue;
             }
 
-            $scopeOpener = $this->tokens[$i]['scope_opener'];
-            $scopeCloser = $this->tokens[$i]['scope_closer'];
+            $scopeOpener = $this->tokens[ $i ][ 'scope_opener' ];
+            $scopeCloser = $this->tokens[ $i ][ 'scope_closer' ];
 
             // If the first char after the opener is a curly brace
             // and that brace has been ignored, it is actually
             // opening this case statement and the opener and closer are
             // probably set incorrectly.
-            for ($x = ($scopeOpener + 1); $x < $numTokens; $x++) {
-                if (isset(Util\Tokens::$emptyTokens[$this->tokens[$x]['code']]) === false) {
+            for ( $x = ( $scopeOpener + 1 ); $x < $numTokens; $x++ ) {
+                if ( isset( Util\Tokens::$emptyTokens[ $this->tokens[ $x ][ 'code' ] ] ) === false ) {
                     // Non-whitespace content.
                     break;
                 }
             }
 
-            if ($this->tokens[$x]['code'] === T_CASE || $this->tokens[$x]['code'] === T_DEFAULT) {
+            if ( $this->tokens[ $x ][ 'code' ] === T_CASE || $this->tokens[ $x ][ 'code' ] === T_DEFAULT ) {
                 // Special case for multiple CASE statements that share the same
                 // closer. Because we are going backwards through the file, this next
                 // CASE statement is already fixed, so just use its closer and don't
                 // worry about fixing anything.
-                $newCloser = $this->tokens[$x]['scope_closer'];
-                $this->tokens[$i]['scope_closer'] = $newCloser;
-                if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                    $oldType = $this->tokens[$scopeCloser]['type'];
-                    $newType = $this->tokens[$newCloser]['type'];
-                    $line    = $this->tokens[$i]['line'];
-                    echo "\t* token $i (T_CASE) on line $line closer changed from $scopeCloser ($oldType) to $newCloser ($newType)".PHP_EOL;
+                $newCloser = $this->tokens[ $x ][ 'scope_closer' ];
+                $this->tokens[ $i ][ 'scope_closer' ] = $newCloser;
+                if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                    $oldType = $this->tokens[ $scopeCloser ][ 'type' ];
+                    $newType = $this->tokens[ $newCloser ][ 'type' ];
+                    $line    = $this->tokens[ $i ][ 'line' ];
+                    echo "\t* token $i (T_CASE) on line $line closer changed from $scopeCloser ($oldType) to $newCloser ($newType)" . PHP_EOL;
                 }
 
                 continue;
             }
 
-            if ($this->tokens[$x]['code'] !== T_OPEN_CURLY_BRACKET
-                || isset($this->tokens[$x]['scope_condition']) === true
+            if ( $this->tokens[ $x ][ 'code' ] !== T_OPEN_CURLY_BRACKET
+                || isset( $this->tokens[ $x ][ 'scope_condition' ] ) === true
             ) {
                 // Not a CASE/DEFAULT with a curly brace opener.
                 continue;
@@ -1728,91 +1728,91 @@ 
             // The closer for this CASE/DEFAULT should be the closing curly brace and
             // not whatever it already is. The opener needs to be the opening curly
             // brace so everything matches up.
-            $newCloser = $this->tokens[$x]['bracket_closer'];
-            foreach ([$i, $x, $newCloser] as $index) {
-                $this->tokens[$index]['scope_condition'] = $i;
-                $this->tokens[$index]['scope_opener']    = $x;
-                $this->tokens[$index]['scope_closer']    = $newCloser;
+            $newCloser = $this->tokens[ $x ][ 'bracket_closer' ];
+            foreach ( [ $i, $x, $newCloser ] as $index ) {
+                $this->tokens[ $index ][ 'scope_condition' ] = $i;
+                $this->tokens[ $index ][ 'scope_opener' ]    = $x;
+                $this->tokens[ $index ][ 'scope_closer' ]    = $newCloser;
             }
 
-            if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                $line      = $this->tokens[$i]['line'];
-                $tokenType = $this->tokens[$i]['type'];
+            if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                $line      = $this->tokens[ $i ][ 'line' ];
+                $tokenType = $this->tokens[ $i ][ 'type' ];
 
-                $oldType = $this->tokens[$scopeOpener]['type'];
-                $newType = $this->tokens[$x]['type'];
-                echo "\t* token $i ($tokenType) on line $line opener changed from $scopeOpener ($oldType) to $x ($newType)".PHP_EOL;
+                $oldType = $this->tokens[ $scopeOpener ][ 'type' ];
+                $newType = $this->tokens[ $x ][ 'type' ];
+                echo "\t* token $i ($tokenType) on line $line opener changed from $scopeOpener ($oldType) to $x ($newType)" . PHP_EOL;
 
-                $oldType = $this->tokens[$scopeCloser]['type'];
-                $newType = $this->tokens[$newCloser]['type'];
-                echo "\t* token $i ($tokenType) on line $line closer changed from $scopeCloser ($oldType) to $newCloser ($newType)".PHP_EOL;
+                $oldType = $this->tokens[ $scopeCloser ][ 'type' ];
+                $newType = $this->tokens[ $newCloser ][ 'type' ];
+                echo "\t* token $i ($tokenType) on line $line closer changed from $scopeCloser ($oldType) to $newCloser ($newType)" . PHP_EOL;
             }
 
-            if ($this->tokens[$scopeOpener]['scope_condition'] === $i) {
-                unset($this->tokens[$scopeOpener]['scope_condition']);
-                unset($this->tokens[$scopeOpener]['scope_opener']);
-                unset($this->tokens[$scopeOpener]['scope_closer']);
+            if ( $this->tokens[ $scopeOpener ][ 'scope_condition' ] === $i ) {
+                unset( $this->tokens[ $scopeOpener ][ 'scope_condition' ] );
+                unset( $this->tokens[ $scopeOpener ][ 'scope_opener' ] );
+                unset( $this->tokens[ $scopeOpener ][ 'scope_closer' ] );
             }
 
-            if ($this->tokens[$scopeCloser]['scope_condition'] === $i) {
-                unset($this->tokens[$scopeCloser]['scope_condition']);
-                unset($this->tokens[$scopeCloser]['scope_opener']);
-                unset($this->tokens[$scopeCloser]['scope_closer']);
+            if ( $this->tokens[ $scopeCloser ][ 'scope_condition' ] === $i ) {
+                unset( $this->tokens[ $scopeCloser ][ 'scope_condition' ] );
+                unset( $this->tokens[ $scopeCloser ][ 'scope_opener' ] );
+                unset( $this->tokens[ $scopeCloser ][ 'scope_closer' ] );
             } else {
                 // We were using a shared closer. All tokens that were
                 // sharing this closer with us, except for the scope condition
                 // and it's opener, need to now point to the new closer.
-                $condition = $this->tokens[$scopeCloser]['scope_condition'];
-                $start     = ($this->tokens[$condition]['scope_opener'] + 1);
-                for ($y = $start; $y < $scopeCloser; $y++) {
-                    if (isset($this->tokens[$y]['scope_closer']) === true
-                        && $this->tokens[$y]['scope_closer'] === $scopeCloser
+                $condition = $this->tokens[ $scopeCloser ][ 'scope_condition' ];
+                $start     = ( $this->tokens[ $condition ][ 'scope_opener' ] + 1 );
+                for ( $y = $start; $y < $scopeCloser; $y++ ) {
+                    if ( isset( $this->tokens[ $y ][ 'scope_closer' ] ) === true
+                        && $this->tokens[ $y ][ 'scope_closer' ] === $scopeCloser
                     ) {
-                        $this->tokens[$y]['scope_closer'] = $newCloser;
-
-                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            $line      = $this->tokens[$y]['line'];
-                            $tokenType = $this->tokens[$y]['type'];
-                            $oldType   = $this->tokens[$scopeCloser]['type'];
-                            $newType   = $this->tokens[$newCloser]['type'];
-                            echo "\t\t* token $y ($tokenType) on line $line closer changed from $scopeCloser ($oldType) to $newCloser ($newType)".PHP_EOL;
+                        $this->tokens[ $y ][ 'scope_closer' ] = $newCloser;
+
+                        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+                            $line      = $this->tokens[ $y ][ 'line' ];
+                            $tokenType = $this->tokens[ $y ][ 'type' ];
+                            $oldType   = $this->tokens[ $scopeCloser ][ 'type' ];
+                            $newType   = $this->tokens[ $newCloser ][ 'type' ];
+                            echo "\t\t* token $y ($tokenType) on line $line closer changed from $scopeCloser ($oldType) to $newCloser ($newType)" . PHP_EOL;
                         }
                     }
                 }
             }//end if
 
-            unset($this->tokens[$x]['bracket_opener']);
-            unset($this->tokens[$x]['bracket_closer']);
-            unset($this->tokens[$newCloser]['bracket_opener']);
-            unset($this->tokens[$newCloser]['bracket_closer']);
-            $this->tokens[$scopeCloser]['conditions'][] = $i;
+            unset( $this->tokens[ $x ][ 'bracket_opener' ] );
+            unset( $this->tokens[ $x ][ 'bracket_closer' ] );
+            unset( $this->tokens[ $newCloser ][ 'bracket_opener' ] );
+            unset( $this->tokens[ $newCloser ][ 'bracket_closer' ] );
+            $this->tokens[ $scopeCloser ][ 'conditions' ][ ] = $i;
 
             // Now fix up all the tokens that think they are
             // inside the CASE/DEFAULT statement when they are really outside.
-            for ($x = $newCloser; $x < $scopeCloser; $x++) {
-                foreach ($this->tokens[$x]['conditions'] as $num => $oldCond) {
-                    if ($oldCond === $this->tokens[$i]['code']) {
-                        $oldConditions = $this->tokens[$x]['conditions'];
-                        unset($this->tokens[$x]['conditions'][$num]);
-
-                        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                            $type     = $this->tokens[$x]['type'];
+            for ( $x = $newCloser; $x < $scopeCloser; $x++ ) {
+                foreach ( $this->tokens[ $x ][ 'conditions' ] as $num => $oldCond ) {
+                    if ( $oldCond === $this->tokens[ $i ][ 'code' ] ) {
+                        $oldConditions = $this->tokens[ $x ][ 'conditions' ];
+                        unset( $this->tokens[ $x ][ 'conditions' ][ $num ] );
+
+                        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, ',' );
 
-                            echo "\t\t* cleaned $x ($type) *".PHP_EOL;
-                            echo "\t\t\t=> conditions changed from $oldConds to $newConds".PHP_EOL;
+                            echo "\t\t* cleaned $x ($type) *" . PHP_EOL;
+                            echo "\t\t\t=> conditions changed from $oldConds to $newConds" . PHP_EOL;
                         }
 
                         break;
@@ -1821,8 +1821,8 @@ 
             }//end for
         }//end for
 
-        if (PHP_CODESNIFFER_VERBOSITY > 1) {
-            echo "\t*** END ADDITIONAL PHP PROCESSING ***".PHP_EOL;
+        if ( PHP_CODESNIFFER_VERBOSITY > 1 ) {
+            echo "\t*** END ADDITIONAL PHP PROCESSING ***" . PHP_EOL;
         }
 
     }//end processAdditional()
@@ -1836,71 +1836,71 @@ 
      *
      * @return array The new token.
      */
-    public static function standardiseToken($token)
+    public static function standardiseToken( $token )
     {
-        if (isset($token[1]) === false) {
-            if (isset(self::$resolveTokenCache[$token[0]]) === true) {
-                return self::$resolveTokenCache[$token[0]];
+        if ( isset( $token[ 1 ] ) === false ) {
+            if ( isset( self::$resolveTokenCache[ $token[ 0 ] ] ) === true ) {
+                return self::$resolveTokenCache[ $token[ 0 ] ];
             }
         } else {
             $cacheKey = null;
-            if ($token[0] === T_STRING) {
-                $cacheKey = strtolower($token[1]);
-            } else if ($token[0] !== T_CURLY_OPEN) {
-                $cacheKey = $token[0];
+            if ( $token[ 0 ] === T_STRING ) {
+                $cacheKey = strtolower( $token[ 1 ] );
+            } else if ( $token[ 0 ] !== T_CURLY_OPEN ) {
+                $cacheKey = $token[ 0 ];
             }
 
-            if ($cacheKey !== null && isset(self::$resolveTokenCache[$cacheKey]) === true) {
-                $newToken            = self::$resolveTokenCache[$cacheKey];
-                $newToken['content'] = $token[1];
+            if ( $cacheKey !== null && isset( self::$resolveTokenCache[ $cacheKey ] ) === true ) {
+                $newToken            = self::$resolveTokenCache[ $cacheKey ];
+                $newToken[ 'content' ] = $token[ 1 ];
                 return $newToken;
             }
         }
 
-        if (isset($token[1]) === false) {
-            return self::resolveSimpleToken($token[0]);
+        if ( isset( $token[ 1 ] ) === false ) {
+            return self::resolveSimpleToken( $token[ 0 ] );
         }
 
-        if ($token[0] === T_STRING) {
-            switch ($cacheKey) {
+        if ( $token[ 0 ] === T_STRING ) {
+            switch ( $cacheKey ) {
             case 'false':
-                $newToken['type'] = 'T_FALSE';
+                $newToken[ 'type' ] = 'T_FALSE';
                 break;
             case 'true':
-                $newToken['type'] = 'T_TRUE';
+                $newToken[ 'type' ] = 'T_TRUE';
                 break;
             case 'null':
-                $newToken['type'] = 'T_NULL';
+                $newToken[ 'type' ] = 'T_NULL';
                 break;
             case 'self':
-                $newToken['type'] = 'T_SELF';
+                $newToken[ 'type' ] = 'T_SELF';
                 break;
             case 'parent':
-                $newToken['type'] = 'T_PARENT';
+                $newToken[ 'type' ] = 'T_PARENT';
                 break;
             default:
-                $newToken['type'] = 'T_STRING';
+                $newToken[ 'type' ] = 'T_STRING';
                 break;
             }
 
-            $newToken['code'] = constant($newToken['type']);
+            $newToken[ 'code' ] = constant( $newToken[ 'type' ] );
 
-            self::$resolveTokenCache[$cacheKey] = $newToken;
-        } else if ($token[0] === T_CURLY_OPEN) {
+            self::$resolveTokenCache[ $cacheKey ] = $newToken;
+        } else if ( $token[ 0 ] === T_CURLY_OPEN ) {
             $newToken = [
                 'code' => T_OPEN_CURLY_BRACKET,
                 'type' => 'T_OPEN_CURLY_BRACKET',
             ];
         } else {
             $newToken = [
-                'code' => $token[0],
-                'type' => Util\Tokens::tokenName($token[0]),
+                'code' => $token[ 0 ],
+                'type' => Util\Tokens::tokenName( $token[ 0 ] ),
             ];
 
-            self::$resolveTokenCache[$token[0]] = $newToken;
+            self::$resolveTokenCache[ $token[ 0 ] ] = $newToken;
         }//end if
 
-        $newToken['content'] = $token[1];
+        $newToken[ 'content' ] = $token[ 1 ];
         return $newToken;
 
     }//end standardiseToken()
@@ -1917,98 +1917,98 @@ 
      *
      * @return array The new token in array format.
      */
-    public static function resolveSimpleToken($token)
+    public static function resolveSimpleToken( $token )
     {
-        $newToken = [];
+        $newToken = [ ];
 
-        switch ($token) {
+        switch ( $token ) {
         case '{':
-            $newToken['type'] = 'T_OPEN_CURLY_BRACKET';
+            $newToken[ 'type' ] = 'T_OPEN_CURLY_BRACKET';
             break;
         case '}':
-            $newToken['type'] = 'T_CLOSE_CURLY_BRACKET';
+            $newToken[ 'type' ] = 'T_CLOSE_CURLY_BRACKET';
             break;
         case '[':
-            $newToken['type'] = 'T_OPEN_SQUARE_BRACKET';
+            $newToken[ 'type' ] = 'T_OPEN_SQUARE_BRACKET';
             break;
         case ']':
-            $newToken['type'] = 'T_CLOSE_SQUARE_BRACKET';
+            $newToken[ 'type' ] = 'T_CLOSE_SQUARE_BRACKET';
             break;
         case '(':
-            $newToken['type'] = 'T_OPEN_PARENTHESIS';
+            $newToken[ 'type' ] = 'T_OPEN_PARENTHESIS';
             break;
         case ')':
-            $newToken['type'] = 'T_CLOSE_PARENTHESIS';
+            $newToken[ 'type' ] = 'T_CLOSE_PARENTHESIS';
             break;
         case ':':
-            $newToken['type'] = 'T_COLON';
+            $newToken[ 'type' ] = 'T_COLON';
             break;
         case '.':
-            $newToken['type'] = 'T_STRING_CONCAT';
+            $newToken[ 'type' ] = 'T_STRING_CONCAT';
             break;
         case ';':
-            $newToken['type'] = 'T_SEMICOLON';
+            $newToken[ 'type' ] = 'T_SEMICOLON';
             break;
         case '=':
-            $newToken['type'] = 'T_EQUAL';
+            $newToken[ 'type' ] = 'T_EQUAL';
             break;
         case '*':
-            $newToken['type'] = 'T_MULTIPLY';
+            $newToken[ 'type' ] = 'T_MULTIPLY';
             break;
         case '/':
-            $newToken['type'] = 'T_DIVIDE';
+            $newToken[ 'type' ] = 'T_DIVIDE';
             break;
         case '+':
-            $newToken['type'] = 'T_PLUS';
+            $newToken[ 'type' ] = 'T_PLUS';
             break;
         case '-':
-            $newToken['type'] = 'T_MINUS';
+            $newToken[ 'type' ] = 'T_MINUS';
             break;
         case '%':
-            $newToken['type'] = 'T_MODULUS';
+            $newToken[ 'type' ] = 'T_MODULUS';
             break;
         case '^':
-            $newToken['type'] = 'T_BITWISE_XOR';
+            $newToken[ 'type' ] = 'T_BITWISE_XOR';
             break;
         case '&':
-            $newToken['type'] = 'T_BITWISE_AND';
+            $newToken[ 'type' ] = 'T_BITWISE_AND';
             break;
         case '|':
-            $newToken['type'] = 'T_BITWISE_OR';
+            $newToken[ 'type' ] = 'T_BITWISE_OR';
             break;
         case '~':
-            $newToken['type'] = 'T_BITWISE_NOT';
+            $newToken[ 'type' ] = 'T_BITWISE_NOT';
             break;
         case '<':
-            $newToken['type'] = 'T_LESS_THAN';
+            $newToken[ 'type' ] = 'T_LESS_THAN';
             break;
         case '>':
-            $newToken['type'] = 'T_GREATER_THAN';
+            $newToken[ 'type' ] = 'T_GREATER_THAN';
             break;
         case '!':
-            $newToken['type'] = 'T_BOOLEAN_NOT';
+            $newToken[ 'type' ] = 'T_BOOLEAN_NOT';
             break;
         case ',':
-            $newToken['type'] = 'T_COMMA';
+            $newToken[ 'type' ] = 'T_COMMA';
             break;
         case '@':
-            $newToken['type'] = 'T_ASPERAND';
+            $newToken[ 'type' ] = 'T_ASPERAND';
             break;
         case '$':
-            $newToken['type'] = 'T_DOLLAR';
+            $newToken[ 'type' ] = 'T_DOLLAR';
             break;
         case '`':
-            $newToken['type'] = 'T_BACKTICK';
+            $newToken[ 'type' ] = 'T_BACKTICK';
             break;
         default:
-            $newToken['type'] = 'T_NONE';
+            $newToken[ 'type' ] = 'T_NONE';
             break;
         }//end switch
 
-        $newToken['code']    = constant($newToken['type']);
-        $newToken['content'] = $token;
+        $newToken[ 'code' ]    = constant( $newToken[ 'type' ] );
+        $newToken[ 'content' ] = $token;
 
-        self::$resolveTokenCache[$token] = $newToken;
+        self::$resolveTokenCache[ $token ] = $newToken;
         return $newToken;
 
     }//end resolveSimpleToken()

Braces +5 added lines, -10 removed lines

@@ -11,8 +11,7 @@ 
 
 use PHP_CodeSniffer\Util;
 
-class PHP extends Tokenizer
-{
+class PHP extends Tokenizer {
 
 
     /**
@@ -453,8 +452,7 @@ 
      *
      * @return array
      */
-    protected function tokenize($string)
-    {
+    protected function tokenize($string) {
         if (PHP_CODESNIFFER_VERBOSITY > 1) {
             echo "\t*** START PHP TOKENIZING ***".PHP_EOL;
             $isWin = false;
@@ -1472,8 +1470,7 @@ 
      *
      * @return void
      */
-    protected function processAdditional()
-    {
+    protected function processAdditional() {
         if (PHP_CODESNIFFER_VERBOSITY > 1) {
             echo "\t*** START ADDITIONAL PHP PROCESSING ***".PHP_EOL;
         }
@@ -1836,8 +1833,7 @@ 
      *
      * @return array The new token.
      */
-    public static function standardiseToken($token)
-    {
+    public static function standardiseToken($token) {
         if (isset($token[1]) === false) {
             if (isset(self::$resolveTokenCache[$token[0]]) === true) {
                 return self::$resolveTokenCache[$token[0]];
@@ -1917,8 +1913,7 @@ 
      *
      * @return array The new token in array format.
      */
-    public static function resolveSimpleToken($token)
-    {
+    public static function resolveSimpleToken($token) {
         $newToken = [];
 
         switch ($token) {