jazzsequence / games-collector

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/PHP/DisallowAlternativePHPTagsSniff.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +231 added lines, -231 removed lines

@@ -33,237 +33,237 @@
 {
 
 
-    /**
-     * Whether ASP tags are enabled or not.
-     *
-     * @var bool
-     */
-    private $_aspTags = false;
-
-    /**
-     * The current PHP version.
-     *
-     * @var integer
-     */
-    private $_phpVersion = null;
-
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        if ($this->_phpVersion === null) {
-            $this->_phpVersion = PHP_CodeSniffer::getConfigData('php_version');
-            if ($this->_phpVersion === null) {
-                $this->_phpVersion = PHP_VERSION_ID;
-            }
-        }
-
-        if ($this->_phpVersion < 70000) {
-            $this->_aspTags = (boolean) ini_get('asp_tags');
-        }
-
-        return array(
-                T_OPEN_TAG,
-                T_OPEN_TAG_WITH_ECHO,
-                T_INLINE_HTML,
-               );
-
-    }//end register()
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens  = $phpcsFile->getTokens();
-        $openTag = $tokens[$stackPtr];
-        $content = $openTag['content'];
-
-        if (trim($content) === '') {
-            return;
-        }
-
-        if ($openTag['code'] === T_OPEN_TAG) {
-            if ($content === '<%') {
-                $error     = 'ASP style opening tag used; expected "<?php" but found "%s"';
-                $closer    = $this->findClosingTag($phpcsFile, $tokens, $stackPtr, '%>');
-                $errorCode = 'ASPOpenTagFound';
-            } else if (strpos($content, '<script ') !== false) {
-                $error     = 'Script style opening tag used; expected "<?php" but found "%s"';
-                $closer    = $this->findClosingTag($phpcsFile, $tokens, $stackPtr, '</script>');
-                $errorCode = 'ScriptOpenTagFound';
-            }
-
-            if (isset($error, $closer, $errorCode) === true) {
-                $data = array($content);
-
-                if ($closer === false) {
-                    $phpcsFile->addError($error, $stackPtr, $errorCode, $data);
-                } else {
-                    $fix = $phpcsFile->addFixableError($error, $stackPtr, $errorCode, $data);
-                    if ($fix === true) {
-                        $this->addChangeset($phpcsFile, $tokens, $stackPtr, $closer);
-                    }
-                }
-            }
-
-            return;
-        }//end if
-
-        if ($openTag['code'] === T_OPEN_TAG_WITH_ECHO && $content === '<%=') {
-            $error   = 'ASP style opening tag used with echo; expected "<?php echo %s ..." but found "%s %s ..."';
-            $nextVar = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-            $snippet = $this->getSnippet($tokens[$nextVar]['content']);
-            $data    = array(
-                        $snippet,
-                        $content,
-                        $snippet,
-                       );
-
-            $closer = $this->findClosingTag($phpcsFile, $tokens, $stackPtr, '%>');
-
-            if ($closer === false) {
-                $phpcsFile->addError($error, $stackPtr, 'ASPShortOpenTagFound', $data);
-            } else {
-                $fix = $phpcsFile->addFixableError($error, $stackPtr, 'ASPShortOpenTagFound', $data);
-                if ($fix === true) {
-                    $this->addChangeset($phpcsFile, $tokens, $stackPtr, $closer, true);
-                }
-            }
-
-            return;
-        }//end if
-
-        // Account for incorrect script open tags.
-        // The "(?:<s)?" in the regex is to work-around a bug in PHP 5.2.
-        if ($openTag['code'] === T_INLINE_HTML
-            && preg_match('`((?:<s)?cript (?:[^>]+)?language=[\'"]?php[\'"]?(?:[^>]+)?>)`i', $content, $match) === 1
-        ) {
-            $error   = 'Script style opening tag used; expected "<?php" but found "%s"';
-            $snippet = $this->getSnippet($content, $match[1]);
-            $data    = array($match[1].$snippet);
-
-            $phpcsFile->addError($error, $stackPtr, 'ScriptOpenTagFound', $data);
-            return;
-        }
-
-        if ($openTag['code'] === T_INLINE_HTML && $this->_aspTags === false) {
-            if (strpos($content, '<%=') !== false) {
-                $error   = 'Possible use of ASP style short opening tags detected. Needs manual inspection. Found: %s';
-                $snippet = $this->getSnippet($content, '<%=');
-                $data    = array('<%='.$snippet);
-
-                $phpcsFile->addWarning($error, $stackPtr, 'MaybeASPShortOpenTagFound', $data);
-            } else if (strpos($content, '<%') !== false) {
-                $error   = 'Possible use of ASP style opening tags detected. Needs manual inspection. Found: %s';
-                $snippet = $this->getSnippet($content, '<%');
-                $data    = array('<%'.$snippet);
-
-                $phpcsFile->addWarning($error, $stackPtr, 'MaybeASPOpenTagFound', $data);
-            }
-        }
-
-    }//end process()
-
-
-    /**
-     * Get a snippet from a HTML token.
-     *
-     * @param string $content  The content of the HTML token.
-     * @param string $start_at Partial string to use as a starting point for the snippet.
-     * @param int    $length   The target length of the snippet to get. Defaults to 40.
-     *
-     * @return string
-     */
-    protected function getSnippet($content, $start_at = '', $length = 40)
-    {
-        $start_pos = 0;
-
-        if ($start_at !== '') {
-            $start_pos = strpos($content, $start_at);
-            if ($start_pos !== false) {
-                $start_pos += strlen($start_at);
-            }
-        }
-
-        $snippet = substr($content, $start_pos, $length);
-        if ((strlen($content) - $start_pos) > $length) {
-            $snippet .= '...';
-        }
-
-        return $snippet;
-
-    }//end getSnippet()
-
-
-    /**
-     * Try and find a matching PHP closing tag.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param array                $tokens    The token stack.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     * @param string               $content   The expected content of the closing tag to match the opener.
-     *
-     * @return int|false Pointer to the position in the stack for the closing tag or false if not found.
-     */
-    protected function findClosingTag(PHP_CodeSniffer_File $phpcsFile, $tokens, $stackPtr, $content)
-    {
-        $closer = $phpcsFile->findNext(T_CLOSE_TAG, ($stackPtr + 1));
-
-        if ($closer !== false && $content === trim($tokens[$closer]['content'])) {
-            return $closer;
-        }
-
-        return false;
-
-    }//end findClosingTag()
-
-
-    /**
-     * Add a changeset to replace the alternative PHP tags.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile         The file being scanned.
-     * @param array                $tokens            The token stack.
-     * @param int                  $open_tag_pointer  Stack pointer to the PHP open tag.
-     * @param int                  $close_tag_pointer Stack pointer to the PHP close tag.
-     * @param bool                 $echo              Whether to add 'echo' or not.
-     *
-     * @return void
-     */
-    protected function addChangeset(PHP_CodeSniffer_File $phpcsFile, $tokens, $open_tag_pointer, $close_tag_pointer, $echo = false)
-    {
-        // Build up the open tag replacement and make sure there's always whitespace behind it.
-        $open_replacement = '<?php';
-        if ($echo === true) {
-            $open_replacement .= ' echo';
-        }
-
-        if ($tokens[($open_tag_pointer + 1)]['code'] !== T_WHITESPACE) {
-            $open_replacement .= ' ';
-        }
-
-        // Make sure we don't remove any line breaks after the closing tag.
-        $regex = '`'.preg_quote(trim($tokens[$close_tag_pointer]['content'])).'`';
-        $close_replacement = preg_replace($regex, '?>', $tokens[$close_tag_pointer]['content']);
-
-        $phpcsFile->fixer->beginChangeset();
-        $phpcsFile->fixer->replaceToken($open_tag_pointer, $open_replacement);
-        $phpcsFile->fixer->replaceToken($close_tag_pointer, $close_replacement);
-        $phpcsFile->fixer->endChangeset();
-
-    }//end addChangeset()
+	 /**
+	  * Whether ASP tags are enabled or not.
+	  *
+	  * @var bool
+	  */
+	 private $_aspTags = false;
+
+	 /**
+	  * The current PHP version.
+	  *
+	  * @var integer
+	  */
+	 private $_phpVersion = null;
+
+
+	 /**
+	  * Returns an array of tokens this test wants to listen for.
+	  *
+	  * @return array
+	  */
+	 public function register()
+	 {
+		  if ($this->_phpVersion === null) {
+				$this->_phpVersion = PHP_CodeSniffer::getConfigData('php_version');
+				if ($this->_phpVersion === null) {
+					 $this->_phpVersion = PHP_VERSION_ID;
+				}
+		  }
+
+		  if ($this->_phpVersion < 70000) {
+				$this->_aspTags = (boolean) ini_get('asp_tags');
+		  }
+
+		  return array(
+					 T_OPEN_TAG,
+					 T_OPEN_TAG_WITH_ECHO,
+					 T_INLINE_HTML,
+					);
+
+	 }//end register()
+
+
+	 /**
+	  * Processes this test, when one of its tokens is encountered.
+	  *
+	  * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	  * @param int                  $stackPtr  The position of the current token
+	  *                                        in the stack passed in $tokens.
+	  *
+	  * @return void
+	  */
+	 public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+	 {
+		  $tokens  = $phpcsFile->getTokens();
+		  $openTag = $tokens[$stackPtr];
+		  $content = $openTag['content'];
+
+		  if (trim($content) === '') {
+				return;
+		  }
+
+		  if ($openTag['code'] === T_OPEN_TAG) {
+				if ($content === '<%') {
+					 $error     = 'ASP style opening tag used; expected "<?php" but found "%s"';
+					 $closer    = $this->findClosingTag($phpcsFile, $tokens, $stackPtr, '%>');
+					 $errorCode = 'ASPOpenTagFound';
+				} else if (strpos($content, '<script ') !== false) {
+					 $error     = 'Script style opening tag used; expected "<?php" but found "%s"';
+					 $closer    = $this->findClosingTag($phpcsFile, $tokens, $stackPtr, '</script>');
+					 $errorCode = 'ScriptOpenTagFound';
+				}
+
+				if (isset($error, $closer, $errorCode) === true) {
+					 $data = array($content);
+
+					 if ($closer === false) {
+						  $phpcsFile->addError($error, $stackPtr, $errorCode, $data);
+					 } else {
+						  $fix = $phpcsFile->addFixableError($error, $stackPtr, $errorCode, $data);
+						  if ($fix === true) {
+								$this->addChangeset($phpcsFile, $tokens, $stackPtr, $closer);
+						  }
+					 }
+				}
+
+				return;
+		  }//end if
+
+		  if ($openTag['code'] === T_OPEN_TAG_WITH_ECHO && $content === '<%=') {
+				$error   = 'ASP style opening tag used with echo; expected "<?php echo %s ..." but found "%s %s ..."';
+				$nextVar = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
+				$snippet = $this->getSnippet($tokens[$nextVar]['content']);
+				$data    = array(
+								$snippet,
+								$content,
+								$snippet,
+							  );
+
+				$closer = $this->findClosingTag($phpcsFile, $tokens, $stackPtr, '%>');
+
+				if ($closer === false) {
+					 $phpcsFile->addError($error, $stackPtr, 'ASPShortOpenTagFound', $data);
+				} else {
+					 $fix = $phpcsFile->addFixableError($error, $stackPtr, 'ASPShortOpenTagFound', $data);
+					 if ($fix === true) {
+						  $this->addChangeset($phpcsFile, $tokens, $stackPtr, $closer, true);
+					 }
+				}
+
+				return;
+		  }//end if
+
+		  // Account for incorrect script open tags.
+		  // The "(?:<s)?" in the regex is to work-around a bug in PHP 5.2.
+		  if ($openTag['code'] === T_INLINE_HTML
+				&& preg_match('`((?:<s)?cript (?:[^>]+)?language=[\'"]?php[\'"]?(?:[^>]+)?>)`i', $content, $match) === 1
+		  ) {
+				$error   = 'Script style opening tag used; expected "<?php" but found "%s"';
+				$snippet = $this->getSnippet($content, $match[1]);
+				$data    = array($match[1].$snippet);
+
+				$phpcsFile->addError($error, $stackPtr, 'ScriptOpenTagFound', $data);
+				return;
+		  }
+
+		  if ($openTag['code'] === T_INLINE_HTML && $this->_aspTags === false) {
+				if (strpos($content, '<%=') !== false) {
+					 $error   = 'Possible use of ASP style short opening tags detected. Needs manual inspection. Found: %s';
+					 $snippet = $this->getSnippet($content, '<%=');
+					 $data    = array('<%='.$snippet);
+
+					 $phpcsFile->addWarning($error, $stackPtr, 'MaybeASPShortOpenTagFound', $data);
+				} else if (strpos($content, '<%') !== false) {
+					 $error   = 'Possible use of ASP style opening tags detected. Needs manual inspection. Found: %s';
+					 $snippet = $this->getSnippet($content, '<%');
+					 $data    = array('<%'.$snippet);
+
+					 $phpcsFile->addWarning($error, $stackPtr, 'MaybeASPOpenTagFound', $data);
+				}
+		  }
+
+	 }//end process()
+
+
+	 /**
+	  * Get a snippet from a HTML token.
+	  *
+	  * @param string $content  The content of the HTML token.
+	  * @param string $start_at Partial string to use as a starting point for the snippet.
+	  * @param int    $length   The target length of the snippet to get. Defaults to 40.
+	  *
+	  * @return string
+	  */
+	 protected function getSnippet($content, $start_at = '', $length = 40)
+	 {
+		  $start_pos = 0;
+
+		  if ($start_at !== '') {
+				$start_pos = strpos($content, $start_at);
+				if ($start_pos !== false) {
+					 $start_pos += strlen($start_at);
+				}
+		  }
+
+		  $snippet = substr($content, $start_pos, $length);
+		  if ((strlen($content) - $start_pos) > $length) {
+				$snippet .= '...';
+		  }
+
+		  return $snippet;
+
+	 }//end getSnippet()
+
+
+	 /**
+	  * Try and find a matching PHP closing tag.
+	  *
+	  * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	  * @param array                $tokens    The token stack.
+	  * @param int                  $stackPtr  The position of the current token
+	  *                                        in the stack passed in $tokens.
+	  * @param string               $content   The expected content of the closing tag to match the opener.
+	  *
+	  * @return int|false Pointer to the position in the stack for the closing tag or false if not found.
+	  */
+	 protected function findClosingTag(PHP_CodeSniffer_File $phpcsFile, $tokens, $stackPtr, $content)
+	 {
+		  $closer = $phpcsFile->findNext(T_CLOSE_TAG, ($stackPtr + 1));
+
+		  if ($closer !== false && $content === trim($tokens[$closer]['content'])) {
+				return $closer;
+		  }
+
+		  return false;
+
+	 }//end findClosingTag()
+
+
+	 /**
+	  * Add a changeset to replace the alternative PHP tags.
+	  *
+	  * @param PHP_CodeSniffer_File $phpcsFile         The file being scanned.
+	  * @param array                $tokens            The token stack.
+	  * @param int                  $open_tag_pointer  Stack pointer to the PHP open tag.
+	  * @param int                  $close_tag_pointer Stack pointer to the PHP close tag.
+	  * @param bool                 $echo              Whether to add 'echo' or not.
+	  *
+	  * @return void
+	  */
+	 protected function addChangeset(PHP_CodeSniffer_File $phpcsFile, $tokens, $open_tag_pointer, $close_tag_pointer, $echo = false)
+	 {
+		  // Build up the open tag replacement and make sure there's always whitespace behind it.
+		  $open_replacement = '<?php';
+		  if ($echo === true) {
+				$open_replacement .= ' echo';
+		  }
+
+		  if ($tokens[($open_tag_pointer + 1)]['code'] !== T_WHITESPACE) {
+				$open_replacement .= ' ';
+		  }
+
+		  // Make sure we don't remove any line breaks after the closing tag.
+		  $regex = '`'.preg_quote(trim($tokens[$close_tag_pointer]['content'])).'`';
+		  $close_replacement = preg_replace($regex, '?>', $tokens[$close_tag_pointer]['content']);
+
+		  $phpcsFile->fixer->beginChangeset();
+		  $phpcsFile->fixer->replaceToken($open_tag_pointer, $open_replacement);
+		  $phpcsFile->fixer->replaceToken($close_tag_pointer, $close_replacement);
+		  $phpcsFile->fixer->endChangeset();
+
+	 }//end addChangeset()
 
 
 }//end class

Spacing +61 added lines, -61 removed lines

@@ -55,15 +55,15 @@ 
      */
     public function register()
     {
-        if ($this->_phpVersion === null) {
-            $this->_phpVersion = PHP_CodeSniffer::getConfigData('php_version');
-            if ($this->_phpVersion === null) {
+        if ( $this->_phpVersion === null ) {
+            $this->_phpVersion = PHP_CodeSniffer::getConfigData( 'php_version' );
+            if ( $this->_phpVersion === null ) {
                 $this->_phpVersion = PHP_VERSION_ID;
             }
         }
 
-        if ($this->_phpVersion < 70000) {
-            $this->_aspTags = (boolean) ini_get('asp_tags');
+        if ( $this->_phpVersion < 70000 ) {
+            $this->_aspTags = (boolean) ini_get( 'asp_tags' );
         }
 
         return array(
@@ -84,36 +84,36 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $tokens  = $phpcsFile->getTokens();
-        $openTag = $tokens[$stackPtr];
-        $content = $openTag['content'];
+        $openTag = $tokens[ $stackPtr ];
+        $content = $openTag[ 'content' ];
 
-        if (trim($content) === '') {
+        if ( trim( $content ) === '' ) {
             return;
         }
 
-        if ($openTag['code'] === T_OPEN_TAG) {
-            if ($content === '<%') {
+        if ( $openTag[ 'code' ] === T_OPEN_TAG ) {
+            if ( $content === '<%' ) {
                 $error     = 'ASP style opening tag used; expected "<?php" but found "%s"';
-                $closer    = $this->findClosingTag($phpcsFile, $tokens, $stackPtr, '%>');
+                $closer    = $this->findClosingTag( $phpcsFile, $tokens, $stackPtr, '%>' );
                 $errorCode = 'ASPOpenTagFound';
-            } else if (strpos($content, '<script ') !== false) {
+            } else if ( strpos( $content, '<script ' ) !== false ) {
                 $error     = 'Script style opening tag used; expected "<?php" but found "%s"';
-                $closer    = $this->findClosingTag($phpcsFile, $tokens, $stackPtr, '</script>');
+                $closer    = $this->findClosingTag( $phpcsFile, $tokens, $stackPtr, '</script>' );
                 $errorCode = 'ScriptOpenTagFound';
             }
 
-            if (isset($error, $closer, $errorCode) === true) {
-                $data = array($content);
+            if ( isset( $error, $closer, $errorCode ) === true ) {
+                $data = array( $content );
 
-                if ($closer === false) {
-                    $phpcsFile->addError($error, $stackPtr, $errorCode, $data);
+                if ( $closer === false ) {
+                    $phpcsFile->addError( $error, $stackPtr, $errorCode, $data );
                 } else {
-                    $fix = $phpcsFile->addFixableError($error, $stackPtr, $errorCode, $data);
-                    if ($fix === true) {
-                        $this->addChangeset($phpcsFile, $tokens, $stackPtr, $closer);
+                    $fix = $phpcsFile->addFixableError( $error, $stackPtr, $errorCode, $data );
+                    if ( $fix === true ) {
+                        $this->addChangeset( $phpcsFile, $tokens, $stackPtr, $closer );
                     }
                 }
             }
@@ -121,24 +121,24 @@ 
             return;
         }//end if
 
-        if ($openTag['code'] === T_OPEN_TAG_WITH_ECHO && $content === '<%=') {
+        if ( $openTag[ 'code' ] === T_OPEN_TAG_WITH_ECHO && $content === '<%=' ) {
             $error   = 'ASP style opening tag used with echo; expected "<?php echo %s ..." but found "%s %s ..."';
-            $nextVar = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-            $snippet = $this->getSnippet($tokens[$nextVar]['content']);
+            $nextVar = $phpcsFile->findNext( T_WHITESPACE, ( $stackPtr + 1 ), null, true );
+            $snippet = $this->getSnippet( $tokens[ $nextVar ][ 'content' ] );
             $data    = array(
                         $snippet,
                         $content,
                         $snippet,
                        );
 
-            $closer = $this->findClosingTag($phpcsFile, $tokens, $stackPtr, '%>');
+            $closer = $this->findClosingTag( $phpcsFile, $tokens, $stackPtr, '%>' );
 
-            if ($closer === false) {
-                $phpcsFile->addError($error, $stackPtr, 'ASPShortOpenTagFound', $data);
+            if ( $closer === false ) {
+                $phpcsFile->addError( $error, $stackPtr, 'ASPShortOpenTagFound', $data );
             } else {
-                $fix = $phpcsFile->addFixableError($error, $stackPtr, 'ASPShortOpenTagFound', $data);
-                if ($fix === true) {
-                    $this->addChangeset($phpcsFile, $tokens, $stackPtr, $closer, true);
+                $fix = $phpcsFile->addFixableError( $error, $stackPtr, 'ASPShortOpenTagFound', $data );
+                if ( $fix === true ) {
+                    $this->addChangeset( $phpcsFile, $tokens, $stackPtr, $closer, true );
                 }
             }
 
@@ -147,30 +147,30 @@ 
 
         // Account for incorrect script open tags.
         // The "(?:<s)?" in the regex is to work-around a bug in PHP 5.2.
-        if ($openTag['code'] === T_INLINE_HTML
-            && preg_match('`((?:<s)?cript (?:[^>]+)?language=[\'"]?php[\'"]?(?:[^>]+)?>)`i', $content, $match) === 1
+        if ( $openTag[ 'code' ] === T_INLINE_HTML
+            && preg_match( '`((?:<s)?cript (?:[^>]+)?language=[\'"]?php[\'"]?(?:[^>]+)?>)`i', $content, $match ) === 1
         ) {
             $error   = 'Script style opening tag used; expected "<?php" but found "%s"';
-            $snippet = $this->getSnippet($content, $match[1]);
-            $data    = array($match[1].$snippet);
+            $snippet = $this->getSnippet( $content, $match[ 1 ] );
+            $data    = array( $match[ 1 ] . $snippet );
 
-            $phpcsFile->addError($error, $stackPtr, 'ScriptOpenTagFound', $data);
+            $phpcsFile->addError( $error, $stackPtr, 'ScriptOpenTagFound', $data );
             return;
         }
 
-        if ($openTag['code'] === T_INLINE_HTML && $this->_aspTags === false) {
-            if (strpos($content, '<%=') !== false) {
+        if ( $openTag[ 'code' ] === T_INLINE_HTML && $this->_aspTags === false ) {
+            if ( strpos( $content, '<%=' ) !== false ) {
                 $error   = 'Possible use of ASP style short opening tags detected. Needs manual inspection. Found: %s';
-                $snippet = $this->getSnippet($content, '<%=');
-                $data    = array('<%='.$snippet);
+                $snippet = $this->getSnippet( $content, '<%=' );
+                $data    = array( '<%=' . $snippet );
 
-                $phpcsFile->addWarning($error, $stackPtr, 'MaybeASPShortOpenTagFound', $data);
-            } else if (strpos($content, '<%') !== false) {
+                $phpcsFile->addWarning( $error, $stackPtr, 'MaybeASPShortOpenTagFound', $data );
+            } else if ( strpos( $content, '<%' ) !== false ) {
                 $error   = 'Possible use of ASP style opening tags detected. Needs manual inspection. Found: %s';
-                $snippet = $this->getSnippet($content, '<%');
-                $data    = array('<%'.$snippet);
+                $snippet = $this->getSnippet( $content, '<%' );
+                $data    = array( '<%' . $snippet );
 
-                $phpcsFile->addWarning($error, $stackPtr, 'MaybeASPOpenTagFound', $data);
+                $phpcsFile->addWarning( $error, $stackPtr, 'MaybeASPOpenTagFound', $data );
             }
         }
 
@@ -186,19 +186,19 @@ 
      *
      * @return string
      */
-    protected function getSnippet($content, $start_at = '', $length = 40)
+    protected function getSnippet( $content, $start_at = '', $length = 40 )
     {
         $start_pos = 0;
 
-        if ($start_at !== '') {
-            $start_pos = strpos($content, $start_at);
-            if ($start_pos !== false) {
-                $start_pos += strlen($start_at);
+        if ( $start_at !== '' ) {
+            $start_pos = strpos( $content, $start_at );
+            if ( $start_pos !== false ) {
+                $start_pos += strlen( $start_at );
             }
         }
 
-        $snippet = substr($content, $start_pos, $length);
-        if ((strlen($content) - $start_pos) > $length) {
+        $snippet = substr( $content, $start_pos, $length );
+        if ( ( strlen( $content ) - $start_pos ) > $length ) {
             $snippet .= '...';
         }
 
@@ -218,11 +218,11 @@ 
      *
      * @return int|false Pointer to the position in the stack for the closing tag or false if not found.
      */
-    protected function findClosingTag(PHP_CodeSniffer_File $phpcsFile, $tokens, $stackPtr, $content)
+    protected function findClosingTag( PHP_CodeSniffer_File $phpcsFile, $tokens, $stackPtr, $content )
     {
-        $closer = $phpcsFile->findNext(T_CLOSE_TAG, ($stackPtr + 1));
+        $closer = $phpcsFile->findNext( T_CLOSE_TAG, ( $stackPtr + 1 ) );
 
-        if ($closer !== false && $content === trim($tokens[$closer]['content'])) {
+        if ( $closer !== false && $content === trim( $tokens[ $closer ][ 'content' ] ) ) {
             return $closer;
         }
 
@@ -242,25 +242,25 @@ 
      *
      * @return void
      */
-    protected function addChangeset(PHP_CodeSniffer_File $phpcsFile, $tokens, $open_tag_pointer, $close_tag_pointer, $echo = false)
+    protected function addChangeset( PHP_CodeSniffer_File $phpcsFile, $tokens, $open_tag_pointer, $close_tag_pointer, $echo = false )
     {
         // Build up the open tag replacement and make sure there's always whitespace behind it.
         $open_replacement = '<?php';
-        if ($echo === true) {
+        if ( $echo === true ) {
             $open_replacement .= ' echo';
         }
 
-        if ($tokens[($open_tag_pointer + 1)]['code'] !== T_WHITESPACE) {
+        if ( $tokens[ ( $open_tag_pointer + 1 ) ][ 'code' ] !== T_WHITESPACE ) {
             $open_replacement .= ' ';
         }
 
         // Make sure we don't remove any line breaks after the closing tag.
-        $regex = '`'.preg_quote(trim($tokens[$close_tag_pointer]['content'])).'`';
-        $close_replacement = preg_replace($regex, '?>', $tokens[$close_tag_pointer]['content']);
+        $regex = '`' . preg_quote( trim( $tokens[ $close_tag_pointer ][ 'content' ] ) ) . '`';
+        $close_replacement = preg_replace( $regex, '?>', $tokens[ $close_tag_pointer ][ 'content' ] );
 
         $phpcsFile->fixer->beginChangeset();
-        $phpcsFile->fixer->replaceToken($open_tag_pointer, $open_replacement);
-        $phpcsFile->fixer->replaceToken($close_tag_pointer, $close_replacement);
+        $phpcsFile->fixer->replaceToken( $open_tag_pointer, $open_replacement );
+        $phpcsFile->fixer->replaceToken( $close_tag_pointer, $close_replacement );
         $phpcsFile->fixer->endChangeset();
 
     }//end addChangeset()

Braces +6 added lines, -12 removed lines

@@ -29,8 +29,7 @@ 
  * @version   Release: @package_version@
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
-class Generic_Sniffs_PHP_DisallowAlternativePHPTagsSniff implements PHP_CodeSniffer_Sniff
-{
+class Generic_Sniffs_PHP_DisallowAlternativePHPTagsSniff implements PHP_CodeSniffer_Sniff {
 
 
     /**
@@ -53,8 +52,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         if ($this->_phpVersion === null) {
             $this->_phpVersion = PHP_CodeSniffer::getConfigData('php_version');
             if ($this->_phpVersion === null) {
@@ -84,8 +82,7 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         $tokens  = $phpcsFile->getTokens();
         $openTag = $tokens[$stackPtr];
         $content = $openTag['content'];
@@ -186,8 +183,7 @@ 
      *
      * @return string
      */
-    protected function getSnippet($content, $start_at = '', $length = 40)
-    {
+    protected function getSnippet($content, $start_at = '', $length = 40) {
         $start_pos = 0;
 
         if ($start_at !== '') {
@@ -218,8 +214,7 @@ 
      *
      * @return int|false Pointer to the position in the stack for the closing tag or false if not found.
      */
-    protected function findClosingTag(PHP_CodeSniffer_File $phpcsFile, $tokens, $stackPtr, $content)
-    {
+    protected function findClosingTag(PHP_CodeSniffer_File $phpcsFile, $tokens, $stackPtr, $content) {
         $closer = $phpcsFile->findNext(T_CLOSE_TAG, ($stackPtr + 1));
 
         if ($closer !== false && $content === trim($tokens[$closer]['content'])) {
@@ -242,8 +237,7 @@ 
      *
      * @return void
      */
-    protected function addChangeset(PHP_CodeSniffer_File $phpcsFile, $tokens, $open_tag_pointer, $close_tag_pointer, $echo = false)
-    {
+    protected function addChangeset(PHP_CodeSniffer_File $phpcsFile, $tokens, $open_tag_pointer, $close_tag_pointer, $echo = false) {
         // Build up the open tag replacement and make sure there's always whitespace behind it.
         $open_replacement = '<?php';
         if ($echo === true) {

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/PHP/NoSilencedErrorsSniff.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +35 added lines, -35 removed lines

@@ -33,47 +33,47 @@
 class Generic_Sniffs_PHP_NoSilencedErrorsSniff implements PHP_CodeSniffer_Sniff
 {
 
-    /**
-     * If true, an error will be thrown; otherwise a warning.
-     *
-     * @var bool
-     */
-    public $error = false;
+	 /**
+	  * If true, an error will be thrown; otherwise a warning.
+	  *
+	  * @var bool
+	  */
+	 public $error = false;
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(T_ASPERAND);
+	 /**
+	  * Returns an array of tokens this test wants to listen for.
+	  *
+	  * @return array
+	  */
+	 public function register()
+	 {
+		  return array(T_ASPERAND);
 
-    }//end register()
+	 }//end register()
 
 
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $error = 'Silencing errors is forbidden';
-        if ($this->error === true) {
-            $error = 'Silencing errors is forbidden';
-            $phpcsFile->addError($error, $stackPtr, 'Forbidden');
-        } else {
-            $error = 'Silencing errors is discouraged';
-            $phpcsFile->addWarning($error, $stackPtr, 'Discouraged');
-        }
+	 /**
+	  * Processes this test, when one of its tokens is encountered.
+	  *
+	  * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	  * @param int                  $stackPtr  The position of the current token
+	  *                                        in the stack passed in $tokens.
+	  *
+	  * @return void
+	  */
+	 public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+	 {
+		  $error = 'Silencing errors is forbidden';
+		  if ($this->error === true) {
+				$error = 'Silencing errors is forbidden';
+				$phpcsFile->addError($error, $stackPtr, 'Forbidden');
+		  } else {
+				$error = 'Silencing errors is discouraged';
+				$phpcsFile->addWarning($error, $stackPtr, 'Discouraged');
+		  }
 
-    }//end process()
+	 }//end process()
 
 
 }//end class

Spacing +5 added lines, -5 removed lines

@@ -48,7 +48,7 @@ 
      */
     public function register()
     {
-        return array(T_ASPERAND);
+        return array( T_ASPERAND );
 
     }//end register()
 
@@ -62,15 +62,15 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $error = 'Silencing errors is forbidden';
-        if ($this->error === true) {
+        if ( $this->error === true ) {
             $error = 'Silencing errors is forbidden';
-            $phpcsFile->addError($error, $stackPtr, 'Forbidden');
+            $phpcsFile->addError( $error, $stackPtr, 'Forbidden' );
         } else {
             $error = 'Silencing errors is discouraged';
-            $phpcsFile->addWarning($error, $stackPtr, 'Discouraged');
+            $phpcsFile->addWarning( $error, $stackPtr, 'Discouraged' );
         }
 
     }//end process()

Braces +3 added lines, -6 removed lines

@@ -30,8 +30,7 @@ 
  * @version  Release: @package_version@
  * @link     http://pear.php.net/package/PHP_CodeSniffer
  */
-class Generic_Sniffs_PHP_NoSilencedErrorsSniff implements PHP_CodeSniffer_Sniff
-{
+class Generic_Sniffs_PHP_NoSilencedErrorsSniff implements PHP_CodeSniffer_Sniff {
 
     /**
      * If true, an error will be thrown; otherwise a warning.
@@ -46,8 +45,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(T_ASPERAND);
 
     }//end register()
@@ -62,8 +60,7 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         $error = 'Silencing errors is forbidden';
         if ($this->error === true) {
             $error = 'Silencing errors is forbidden';

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/VersionControl/SubversionPropertiesSniff.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +171 added lines, -171 removed lines

@@ -28,177 +28,177 @@
 class Generic_Sniffs_VersionControl_SubversionPropertiesSniff implements PHP_CodeSniffer_Sniff
 {
 
-    /**
-     * The Subversion properties that should be set.
-     *
-     * Key of array is the SVN property and the value is the
-     * exact value the property should have or NULL if the
-     * property should just be set but the value is not fixed.
-     *
-     * @var array
-     */
-    protected $properties = array(
-                             'svn:keywords'  => 'Author Id Revision',
-                             'svn:eol-style' => 'native',
-                            );
-
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(T_OPEN_TAG);
-
-    }//end register()
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // Make sure this is the first PHP open tag so we don't process the
-        // same file twice.
-        $prevOpenTag = $phpcsFile->findPrevious(T_OPEN_TAG, ($stackPtr - 1));
-        if ($prevOpenTag !== false) {
-            return;
-        }
-
-        $path       = $phpcsFile->getFileName();
-        $properties = $this->getProperties($path);
-        if ($properties === null) {
-            // Not under version control.
-            return;
-        }
-
-        $allProperties = ($properties + $this->properties);
-        foreach ($allProperties as $key => $value) {
-            if (isset($properties[$key]) === true
-                && isset($this->properties[$key]) === false
-            ) {
-                $error = 'Unexpected Subversion property "%s" = "%s"';
-                $data  = array(
-                          $key,
-                          $properties[$key],
-                         );
-                $phpcsFile->addError($error, $stackPtr, 'Unexpected', $data);
-                continue;
-            }
-
-            if (isset($properties[$key]) === false
-                && isset($this->properties[$key]) === true
-            ) {
-                $error = 'Missing Subversion property "%s" = "%s"';
-                $data  = array(
-                          $key,
-                          $this->properties[$key],
-                         );
-                $phpcsFile->addError($error, $stackPtr, 'Missing', $data);
-                continue;
-            }
-
-            if ($properties[$key] !== null
-                && $properties[$key] !== $this->properties[$key]
-            ) {
-                $error = 'Subversion property "%s" = "%s" does not match "%s"';
-                $data  = array(
-                          $key,
-                          $properties[$key],
-                          $this->properties[$key],
-                         );
-                $phpcsFile->addError($error, $stackPtr, 'NoMatch', $data);
-            }
-        }//end foreach
-
-    }//end process()
-
-
-    /**
-     * Returns the Subversion properties which are actually set on a path.
-     *
-     * Returns NULL if the file is not under version control.
-     *
-     * @param string $path The path to return Subversion properties on.
-     *
-     * @return array
-     * @throws PHP_CodeSniffer_Exception If Subversion properties file could
-     *                                   not be opened.
-     */
-    protected function getProperties($path)
-    {
-        $properties = array();
-
-        $paths   = array();
-        $paths[] = dirname($path).'/.svn/props/'.basename($path).'.svn-work';
-        $paths[] = dirname($path).'/.svn/prop-base/'.basename($path).'.svn-base';
-
-        $foundPath = false;
-        foreach ($paths as $path) {
-            if (file_exists($path) === true) {
-                $foundPath = true;
-
-                $handle = fopen($path, 'r');
-                if ($handle === false) {
-                    $error = 'Error opening file; could not get Subversion properties';
-                    throw new PHP_CodeSniffer_Exception($error);
-                }
-
-                while (feof($handle) === false) {
-                    // Read a key length line. Might be END, though.
-                    $buffer = trim(fgets($handle));
-
-                    // Check for the end of the hash.
-                    if ($buffer === 'END') {
-                        break;
-                    }
-
-                    // Now read that much into a buffer.
-                    $key = fread($handle, substr($buffer, 2));
-
-                    // Suck up extra newline after key data.
-                    fgetc($handle);
-
-                    // Read a value length line.
-                    $buffer = trim(fgets($handle));
-
-                    // Now read that much into a buffer.
-                    $length = substr($buffer, 2);
-                    if ($length === '0') {
-                        // Length of value is ZERO characters, so
-                        // value is actually empty.
-                        $value = '';
-                    } else {
-                        $value = fread($handle, $length);
-                    }
-
-                    // Suck up extra newline after value data.
-                    fgetc($handle);
-
-                    $properties[$key] = $value;
-                }//end while
-
-                fclose($handle);
-            }//end if
-        }//end foreach
-
-        if ($foundPath === false) {
-            return null;
-        }
-
-        return $properties;
-
-    }//end getProperties()
+	 /**
+	  * The Subversion properties that should be set.
+	  *
+	  * Key of array is the SVN property and the value is the
+	  * exact value the property should have or NULL if the
+	  * property should just be set but the value is not fixed.
+	  *
+	  * @var array
+	  */
+	 protected $properties = array(
+									  'svn:keywords'  => 'Author Id Revision',
+									  'svn:eol-style' => 'native',
+									 );
+
+
+	 /**
+	  * Returns an array of tokens this test wants to listen for.
+	  *
+	  * @return array
+	  */
+	 public function register()
+	 {
+		  return array(T_OPEN_TAG);
+
+	 }//end register()
+
+
+	 /**
+	  * Processes this test, when one of its tokens is encountered.
+	  *
+	  * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	  * @param int                  $stackPtr  The position of the current token
+	  *                                        in the stack passed in $tokens.
+	  *
+	  * @return void
+	  */
+	 public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+	 {
+		  $tokens = $phpcsFile->getTokens();
+
+		  // Make sure this is the first PHP open tag so we don't process the
+		  // same file twice.
+		  $prevOpenTag = $phpcsFile->findPrevious(T_OPEN_TAG, ($stackPtr - 1));
+		  if ($prevOpenTag !== false) {
+				return;
+		  }
+
+		  $path       = $phpcsFile->getFileName();
+		  $properties = $this->getProperties($path);
+		  if ($properties === null) {
+				// Not under version control.
+				return;
+		  }
+
+		  $allProperties = ($properties + $this->properties);
+		  foreach ($allProperties as $key => $value) {
+				if (isset($properties[$key]) === true
+					 && isset($this->properties[$key]) === false
+				) {
+					 $error = 'Unexpected Subversion property "%s" = "%s"';
+					 $data  = array(
+								  $key,
+								  $properties[$key],
+								 );
+					 $phpcsFile->addError($error, $stackPtr, 'Unexpected', $data);
+					 continue;
+				}
+
+				if (isset($properties[$key]) === false
+					 && isset($this->properties[$key]) === true
+				) {
+					 $error = 'Missing Subversion property "%s" = "%s"';
+					 $data  = array(
+								  $key,
+								  $this->properties[$key],
+								 );
+					 $phpcsFile->addError($error, $stackPtr, 'Missing', $data);
+					 continue;
+				}
+
+				if ($properties[$key] !== null
+					 && $properties[$key] !== $this->properties[$key]
+				) {
+					 $error = 'Subversion property "%s" = "%s" does not match "%s"';
+					 $data  = array(
+								  $key,
+								  $properties[$key],
+								  $this->properties[$key],
+								 );
+					 $phpcsFile->addError($error, $stackPtr, 'NoMatch', $data);
+				}
+		  }//end foreach
+
+	 }//end process()
+
+
+	 /**
+	  * Returns the Subversion properties which are actually set on a path.
+	  *
+	  * Returns NULL if the file is not under version control.
+	  *
+	  * @param string $path The path to return Subversion properties on.
+	  *
+	  * @return array
+	  * @throws PHP_CodeSniffer_Exception If Subversion properties file could
+	  *                                   not be opened.
+	  */
+	 protected function getProperties($path)
+	 {
+		  $properties = array();
+
+		  $paths   = array();
+		  $paths[] = dirname($path).'/.svn/props/'.basename($path).'.svn-work';
+		  $paths[] = dirname($path).'/.svn/prop-base/'.basename($path).'.svn-base';
+
+		  $foundPath = false;
+		  foreach ($paths as $path) {
+				if (file_exists($path) === true) {
+					 $foundPath = true;
+
+					 $handle = fopen($path, 'r');
+					 if ($handle === false) {
+						  $error = 'Error opening file; could not get Subversion properties';
+						  throw new PHP_CodeSniffer_Exception($error);
+					 }
+
+					 while (feof($handle) === false) {
+						  // Read a key length line. Might be END, though.
+						  $buffer = trim(fgets($handle));
+
+						  // Check for the end of the hash.
+						  if ($buffer === 'END') {
+								break;
+						  }
+
+						  // Now read that much into a buffer.
+						  $key = fread($handle, substr($buffer, 2));
+
+						  // Suck up extra newline after key data.
+						  fgetc($handle);
+
+						  // Read a value length line.
+						  $buffer = trim(fgets($handle));
+
+						  // Now read that much into a buffer.
+						  $length = substr($buffer, 2);
+						  if ($length === '0') {
+								// Length of value is ZERO characters, so
+								// value is actually empty.
+								$value = '';
+						  } else {
+								$value = fread($handle, $length);
+						  }
+
+						  // Suck up extra newline after value data.
+						  fgetc($handle);
+
+						  $properties[$key] = $value;
+					 }//end while
+
+					 fclose($handle);
+				}//end if
+		  }//end foreach
+
+		  if ($foundPath === false) {
+				return null;
+		  }
+
+		  return $properties;
+
+	 }//end getProperties()
 
 
 }//end class

Spacing +42 added lines, -42 removed lines

@@ -50,7 +50,7 @@ 
      */
     public function register()
     {
-        return array(T_OPEN_TAG);
+        return array( T_OPEN_TAG );
 
     }//end register()
 
@@ -64,60 +64,60 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
         // Make sure this is the first PHP open tag so we don't process the
         // same file twice.
-        $prevOpenTag = $phpcsFile->findPrevious(T_OPEN_TAG, ($stackPtr - 1));
-        if ($prevOpenTag !== false) {
+        $prevOpenTag = $phpcsFile->findPrevious( T_OPEN_TAG, ( $stackPtr - 1 ) );
+        if ( $prevOpenTag !== false ) {
             return;
         }
 
         $path       = $phpcsFile->getFileName();
-        $properties = $this->getProperties($path);
-        if ($properties === null) {
+        $properties = $this->getProperties( $path );
+        if ( $properties === null ) {
             // Not under version control.
             return;
         }
 
-        $allProperties = ($properties + $this->properties);
-        foreach ($allProperties as $key => $value) {
-            if (isset($properties[$key]) === true
-                && isset($this->properties[$key]) === false
+        $allProperties = ( $properties + $this->properties );
+        foreach ( $allProperties as $key => $value ) {
+            if ( isset( $properties[ $key ] ) === true
+                && isset( $this->properties[ $key ] ) === false
             ) {
                 $error = 'Unexpected Subversion property "%s" = "%s"';
                 $data  = array(
                           $key,
-                          $properties[$key],
+                          $properties[ $key ],
                          );
-                $phpcsFile->addError($error, $stackPtr, 'Unexpected', $data);
+                $phpcsFile->addError( $error, $stackPtr, 'Unexpected', $data );
                 continue;
             }
 
-            if (isset($properties[$key]) === false
-                && isset($this->properties[$key]) === true
+            if ( isset( $properties[ $key ] ) === false
+                && isset( $this->properties[ $key ] ) === true
             ) {
                 $error = 'Missing Subversion property "%s" = "%s"';
                 $data  = array(
                           $key,
-                          $this->properties[$key],
+                          $this->properties[ $key ],
                          );
-                $phpcsFile->addError($error, $stackPtr, 'Missing', $data);
+                $phpcsFile->addError( $error, $stackPtr, 'Missing', $data );
                 continue;
             }
 
-            if ($properties[$key] !== null
-                && $properties[$key] !== $this->properties[$key]
+            if ( $properties[ $key ] !== null
+                && $properties[ $key ] !== $this->properties[ $key ]
             ) {
                 $error = 'Subversion property "%s" = "%s" does not match "%s"';
                 $data  = array(
                           $key,
-                          $properties[$key],
-                          $this->properties[$key],
+                          $properties[ $key ],
+                          $this->properties[ $key ],
                          );
-                $phpcsFile->addError($error, $stackPtr, 'NoMatch', $data);
+                $phpcsFile->addError( $error, $stackPtr, 'NoMatch', $data );
             }
         }//end foreach
 
@@ -135,64 +135,64 @@ 
      * @throws PHP_CodeSniffer_Exception If Subversion properties file could
      *                                   not be opened.
      */
-    protected function getProperties($path)
+    protected function getProperties( $path )
     {
         $properties = array();
 
         $paths   = array();
-        $paths[] = dirname($path).'/.svn/props/'.basename($path).'.svn-work';
-        $paths[] = dirname($path).'/.svn/prop-base/'.basename($path).'.svn-base';
+        $paths[ ] = dirname( $path ) . '/.svn/props/' . basename( $path ) . '.svn-work';
+        $paths[ ] = dirname( $path ) . '/.svn/prop-base/' . basename( $path ) . '.svn-base';
 
         $foundPath = false;
-        foreach ($paths as $path) {
-            if (file_exists($path) === true) {
+        foreach ( $paths as $path ) {
+            if ( file_exists( $path ) === true ) {
                 $foundPath = true;
 
-                $handle = fopen($path, 'r');
-                if ($handle === false) {
+                $handle = fopen( $path, 'r' );
+                if ( $handle === false ) {
                     $error = 'Error opening file; could not get Subversion properties';
-                    throw new PHP_CodeSniffer_Exception($error);
+                    throw new PHP_CodeSniffer_Exception( $error );
                 }
 
-                while (feof($handle) === false) {
+                while ( feof( $handle ) === false ) {
                     // Read a key length line. Might be END, though.
-                    $buffer = trim(fgets($handle));
+                    $buffer = trim( fgets( $handle ) );
 
                     // Check for the end of the hash.
-                    if ($buffer === 'END') {
+                    if ( $buffer === 'END' ) {
                         break;
                     }
 
                     // Now read that much into a buffer.
-                    $key = fread($handle, substr($buffer, 2));
+                    $key = fread( $handle, substr( $buffer, 2 ) );
 
                     // Suck up extra newline after key data.
-                    fgetc($handle);
+                    fgetc( $handle );
 
                     // Read a value length line.
-                    $buffer = trim(fgets($handle));
+                    $buffer = trim( fgets( $handle ) );
 
                     // Now read that much into a buffer.
-                    $length = substr($buffer, 2);
-                    if ($length === '0') {
+                    $length = substr( $buffer, 2 );
+                    if ( $length === '0' ) {
                         // Length of value is ZERO characters, so
                         // value is actually empty.
                         $value = '';
                     } else {
-                        $value = fread($handle, $length);
+                        $value = fread( $handle, $length );
                     }
 
                     // Suck up extra newline after value data.
-                    fgetc($handle);
+                    fgetc( $handle );
 
-                    $properties[$key] = $value;
+                    $properties[ $key ] = $value;
                 }//end while
 
-                fclose($handle);
+                fclose( $handle );
             }//end if
         }//end foreach
 
-        if ($foundPath === false) {
+        if ( $foundPath === false ) {
             return null;
         }
 

Braces +4 added lines, -8 removed lines

@@ -25,8 +25,7 @@ 
  * @version   Release: @package_version@
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
-class Generic_Sniffs_VersionControl_SubversionPropertiesSniff implements PHP_CodeSniffer_Sniff
-{
+class Generic_Sniffs_VersionControl_SubversionPropertiesSniff implements PHP_CodeSniffer_Sniff {
 
     /**
      * The Subversion properties that should be set.
@@ -48,8 +47,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(T_OPEN_TAG);
 
     }//end register()
@@ -64,8 +62,7 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         // Make sure this is the first PHP open tag so we don't process the
@@ -135,8 +132,7 @@ 
      * @throws PHP_CodeSniffer_Exception If Subversion properties file could
      *                                   not be opened.
      */
-    protected function getProperties($path)
-    {
+    protected function getProperties($path) {
         $properties = array();
 
         $paths   = array();

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

Doc Comments +2 added lines, -2 removed lines

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

Indentation +108 added lines, -108 removed lines

@@ -28,114 +28,114 @@
 class Generic_Sniffs_WhiteSpace_DisallowSpaceIndentSniff implements PHP_CodeSniffer_Sniff
 {
 
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = array(
-                                   'PHP',
-                                   'JS',
-                                   'CSS',
-                                  );
-
-    /**
-     * The --tab-width CLI value that is being used.
-     *
-     * @var int
-     */
-    private $_tabWidth = null;
-
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(T_OPEN_TAG);
-
-    }//end register()
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile All the tokens found in the document.
-     * @param int                  $stackPtr  The position of the current token in
-     *                                        the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        if ($this->_tabWidth === null) {
-            $cliValues = $phpcsFile->phpcs->cli->getCommandLineValues();
-            if (isset($cliValues['tabWidth']) === false || $cliValues['tabWidth'] === 0) {
-                // We have no idea how wide tabs are, so assume 4 spaces for fixing.
-                // It shouldn't really matter because indent checks elsewhere in the
-                // standard should fix things up.
-                $this->_tabWidth = 4;
-            } else {
-                $this->_tabWidth = $cliValues['tabWidth'];
-            }
-        }
-
-        $checkTokens = array(
-                        T_WHITESPACE             => true,
-                        T_INLINE_HTML            => true,
-                        T_DOC_COMMENT_WHITESPACE => true,
-                       );
-
-        $tokens = $phpcsFile->getTokens();
-        for ($i = ($stackPtr + 1); $i < $phpcsFile->numTokens; $i++) {
-            if ($tokens[$i]['column'] !== 1 || isset($checkTokens[$tokens[$i]['code']]) === false) {
-                continue;
-            }
-
-            // If tabs are being converted to spaces, the original content
-            // should be used instead of the converted content.
-            if (isset($tokens[$i]['orig_content']) === true) {
-                $content = $tokens[$i]['orig_content'];
-            } else {
-                $content = $tokens[$i]['content'];
-            }
-
-            if ($content[0] === ' ') {
-                if ($tokens[$i]['code'] === T_DOC_COMMENT_WHITESPACE && $content === ' ') {
-                    // Ignore file/class-level DocBlock.
-                    continue;
-                }
-
-                // Space are considered ok if they are proceeded by tabs and not followed
-                // by tabs, as is the case with standard docblock comments.
-                $phpcsFile->recordMetric($i, 'Line indent', 'spaces');
-                $error = 'Tabs must be used to indent lines; spaces are not allowed';
-                $fix   = $phpcsFile->addFixableError($error, $i, 'SpacesUsed');
-                if ($fix === true) {
-                    $trimmed   = ltrim($content, ' ');
-                    $numSpaces = (strlen($content) - strlen($trimmed));
-                    if ($numSpaces < $this->_tabWidth) {
-                        $numTabs = 1;
-                        $padding = "\t";
-                    } else {
-                        $numTabs   = floor($numSpaces / $this->_tabWidth);
-                        $remaining = ($numSpaces - ($numTabs * $this->_tabWidth));
-                        $padding   = str_repeat("\t", $numTabs).$padding = str_repeat(' ', $remaining);
-                    }
-
-                    $phpcsFile->fixer->replaceToken($i, $padding.$trimmed);
-                }
-            } else if ($content[0] === "\t") {
-                $phpcsFile->recordMetric($i, 'Line indent', 'tabs');
-            }//end if
-        }//end for
-
-        // Ignore the rest of the file.
-        return ($phpcsFile->numTokens + 1);
-
-    }//end process()
+	 /**
+	  * A list of tokenizers this sniff supports.
+	  *
+	  * @var array
+	  */
+	 public $supportedTokenizers = array(
+											  'PHP',
+											  'JS',
+											  'CSS',
+											 );
+
+	 /**
+	  * The --tab-width CLI value that is being used.
+	  *
+	  * @var int
+	  */
+	 private $_tabWidth = null;
+
+
+	 /**
+	  * Returns an array of tokens this test wants to listen for.
+	  *
+	  * @return array
+	  */
+	 public function register()
+	 {
+		  return array(T_OPEN_TAG);
+
+	 }//end register()
+
+
+	 /**
+	  * Processes this test, when one of its tokens is encountered.
+	  *
+	  * @param PHP_CodeSniffer_File $phpcsFile All the tokens found in the document.
+	  * @param int                  $stackPtr  The position of the current token in
+	  *                                        the stack passed in $tokens.
+	  *
+	  * @return void
+	  */
+	 public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+	 {
+		  if ($this->_tabWidth === null) {
+				$cliValues = $phpcsFile->phpcs->cli->getCommandLineValues();
+				if (isset($cliValues['tabWidth']) === false || $cliValues['tabWidth'] === 0) {
+					 // We have no idea how wide tabs are, so assume 4 spaces for fixing.
+					 // It shouldn't really matter because indent checks elsewhere in the
+					 // standard should fix things up.
+					 $this->_tabWidth = 4;
+				} else {
+					 $this->_tabWidth = $cliValues['tabWidth'];
+				}
+		  }
+
+		  $checkTokens = array(
+								T_WHITESPACE             => true,
+								T_INLINE_HTML            => true,
+								T_DOC_COMMENT_WHITESPACE => true,
+							  );
+
+		  $tokens = $phpcsFile->getTokens();
+		  for ($i = ($stackPtr + 1); $i < $phpcsFile->numTokens; $i++) {
+				if ($tokens[$i]['column'] !== 1 || isset($checkTokens[$tokens[$i]['code']]) === false) {
+					 continue;
+				}
+
+				// If tabs are being converted to spaces, the original content
+				// should be used instead of the converted content.
+				if (isset($tokens[$i]['orig_content']) === true) {
+					 $content = $tokens[$i]['orig_content'];
+				} else {
+					 $content = $tokens[$i]['content'];
+				}
+
+				if ($content[0] === ' ') {
+					 if ($tokens[$i]['code'] === T_DOC_COMMENT_WHITESPACE && $content === ' ') {
+						  // Ignore file/class-level DocBlock.
+						  continue;
+					 }
+
+					 // Space are considered ok if they are proceeded by tabs and not followed
+					 // by tabs, as is the case with standard docblock comments.
+					 $phpcsFile->recordMetric($i, 'Line indent', 'spaces');
+					 $error = 'Tabs must be used to indent lines; spaces are not allowed';
+					 $fix   = $phpcsFile->addFixableError($error, $i, 'SpacesUsed');
+					 if ($fix === true) {
+						  $trimmed   = ltrim($content, ' ');
+						  $numSpaces = (strlen($content) - strlen($trimmed));
+						  if ($numSpaces < $this->_tabWidth) {
+								$numTabs = 1;
+								$padding = "\t";
+						  } else {
+								$numTabs   = floor($numSpaces / $this->_tabWidth);
+								$remaining = ($numSpaces - ($numTabs * $this->_tabWidth));
+								$padding   = str_repeat("\t", $numTabs).$padding = str_repeat(' ', $remaining);
+						  }
+
+						  $phpcsFile->fixer->replaceToken($i, $padding.$trimmed);
+					 }
+				} else if ($content[0] === "\t") {
+					 $phpcsFile->recordMetric($i, 'Line indent', 'tabs');
+				}//end if
+		  }//end for
+
+		  // Ignore the rest of the file.
+		  return ($phpcsFile->numTokens + 1);
+
+	 }//end process()
 
 
 }//end class

Spacing +25 added lines, -25 removed lines

@@ -54,7 +54,7 @@ 
      */
     public function register()
     {
-        return array(T_OPEN_TAG);
+        return array( T_OPEN_TAG );
 
     }//end register()
 
@@ -68,17 +68,17 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
-        if ($this->_tabWidth === null) {
+        if ( $this->_tabWidth === null ) {
             $cliValues = $phpcsFile->phpcs->cli->getCommandLineValues();
-            if (isset($cliValues['tabWidth']) === false || $cliValues['tabWidth'] === 0) {
+            if ( isset( $cliValues[ 'tabWidth' ] ) === false || $cliValues[ 'tabWidth' ] === 0 ) {
                 // We have no idea how wide tabs are, so assume 4 spaces for fixing.
                 // It shouldn't really matter because indent checks elsewhere in the
                 // standard should fix things up.
                 $this->_tabWidth = 4;
             } else {
-                $this->_tabWidth = $cliValues['tabWidth'];
+                $this->_tabWidth = $cliValues[ 'tabWidth' ];
             }
         }
 
@@ -89,51 +89,51 @@ 
                        );
 
         $tokens = $phpcsFile->getTokens();
-        for ($i = ($stackPtr + 1); $i < $phpcsFile->numTokens; $i++) {
-            if ($tokens[$i]['column'] !== 1 || isset($checkTokens[$tokens[$i]['code']]) === false) {
+        for ( $i = ( $stackPtr + 1 ); $i < $phpcsFile->numTokens; $i++ ) {
+            if ( $tokens[ $i ][ 'column' ] !== 1 || isset( $checkTokens[ $tokens[ $i ][ 'code' ] ] ) === false ) {
                 continue;
             }
 
             // If tabs are being converted to spaces, the original content
             // should be used instead of the converted content.
-            if (isset($tokens[$i]['orig_content']) === true) {
-                $content = $tokens[$i]['orig_content'];
+            if ( isset( $tokens[ $i ][ 'orig_content' ] ) === true ) {
+                $content = $tokens[ $i ][ 'orig_content' ];
             } else {
-                $content = $tokens[$i]['content'];
+                $content = $tokens[ $i ][ 'content' ];
             }
 
-            if ($content[0] === ' ') {
-                if ($tokens[$i]['code'] === T_DOC_COMMENT_WHITESPACE && $content === ' ') {
+            if ( $content[ 0 ] === ' ' ) {
+                if ( $tokens[ $i ][ 'code' ] === T_DOC_COMMENT_WHITESPACE && $content === ' ' ) {
                     // Ignore file/class-level DocBlock.
                     continue;
                 }
 
                 // Space are considered ok if they are proceeded by tabs and not followed
                 // by tabs, as is the case with standard docblock comments.
-                $phpcsFile->recordMetric($i, 'Line indent', 'spaces');
+                $phpcsFile->recordMetric( $i, 'Line indent', 'spaces' );
                 $error = 'Tabs must be used to indent lines; spaces are not allowed';
-                $fix   = $phpcsFile->addFixableError($error, $i, 'SpacesUsed');
-                if ($fix === true) {
-                    $trimmed   = ltrim($content, ' ');
-                    $numSpaces = (strlen($content) - strlen($trimmed));
-                    if ($numSpaces < $this->_tabWidth) {
+                $fix   = $phpcsFile->addFixableError( $error, $i, 'SpacesUsed' );
+                if ( $fix === true ) {
+                    $trimmed   = ltrim( $content, ' ' );
+                    $numSpaces = ( strlen( $content ) - strlen( $trimmed ) );
+                    if ( $numSpaces < $this->_tabWidth ) {
                         $numTabs = 1;
                         $padding = "\t";
                     } else {
-                        $numTabs   = floor($numSpaces / $this->_tabWidth);
-                        $remaining = ($numSpaces - ($numTabs * $this->_tabWidth));
-                        $padding   = str_repeat("\t", $numTabs).$padding = str_repeat(' ', $remaining);
+                        $numTabs   = floor( $numSpaces / $this->_tabWidth );
+                        $remaining = ( $numSpaces - ( $numTabs * $this->_tabWidth ) );
+                        $padding   = str_repeat( "\t", $numTabs ) . $padding = str_repeat( ' ', $remaining );
                     }
 
-                    $phpcsFile->fixer->replaceToken($i, $padding.$trimmed);
+                    $phpcsFile->fixer->replaceToken( $i, $padding . $trimmed );
                 }
-            } else if ($content[0] === "\t") {
-                $phpcsFile->recordMetric($i, 'Line indent', 'tabs');
+            } else if ( $content[ 0 ] === "\t" ) {
+                $phpcsFile->recordMetric( $i, 'Line indent', 'tabs' );
             }//end if
         }//end for
 
         // Ignore the rest of the file.
-        return ($phpcsFile->numTokens + 1);
+        return ( $phpcsFile->numTokens + 1 );
 
     }//end process()
 

Braces +3 added lines, -6 removed lines

@@ -25,8 +25,7 @@ 
  * @version   Release: @package_version@
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
-class Generic_Sniffs_WhiteSpace_DisallowSpaceIndentSniff implements PHP_CodeSniffer_Sniff
-{
+class Generic_Sniffs_WhiteSpace_DisallowSpaceIndentSniff implements PHP_CodeSniffer_Sniff {
 
     /**
      * A list of tokenizers this sniff supports.
@@ -52,8 +51,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(T_OPEN_TAG);
 
     }//end register()
@@ -68,8 +66,7 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         if ($this->_tabWidth === null) {
             $cliValues = $phpcsFile->phpcs->cli->getCommandLineValues();
             if (isset($cliValues['tabWidth']) === false || $cliValues['tabWidth'] === 0) {

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

Doc Comments +2 added lines, -2 removed lines

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

Indentation +1221 added lines, -1221 removed lines

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

Spacing +545 added lines, -545 removed lines

@@ -121,11 +121,11 @@ 
      */
     public function register()
     {
-        if (defined('PHP_CODESNIFFER_IN_TESTS') === true) {
+        if ( defined( 'PHP_CODESNIFFER_IN_TESTS' ) === true ) {
             $this->_debug = false;
         }
 
-        return array(T_OPEN_TAG);
+        return array( T_OPEN_TAG );
 
     }//end register()
 
@@ -139,22 +139,22 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
-        $debug = PHP_CodeSniffer::getConfigData('scope_indent_debug');
-        if ($debug !== null) {
+        $debug = PHP_CodeSniffer::getConfigData( 'scope_indent_debug' );
+        if ( $debug !== null ) {
             $this->_debug = (bool) $debug;
         }
 
-        if ($this->_tabWidth === null) {
+        if ( $this->_tabWidth === null ) {
             $cliValues = $phpcsFile->phpcs->cli->getCommandLineValues();
-            if (isset($cliValues['tabWidth']) === false || $cliValues['tabWidth'] === 0) {
+            if ( isset( $cliValues[ 'tabWidth' ] ) === false || $cliValues[ 'tabWidth' ] === 0 ) {
                 // We have no idea how wide tabs are, so assume 4 spaces for fixing.
                 // It shouldn't really matter because indent checks elsewhere in the
                 // standard should fix things up.
                 $this->_tabWidth = 4;
             } else {
-                $this->_tabWidth = $cliValues['tabWidth'];
+                $this->_tabWidth = $cliValues[ 'tabWidth' ];
             }
         }
 
@@ -166,39 +166,39 @@ 
         $setIndents    = array();
 
         $tokens  = $phpcsFile->getTokens();
-        $first   = $phpcsFile->findFirstOnLine(T_INLINE_HTML, $stackPtr);
-        $trimmed = ltrim($tokens[$first]['content']);
-        if ($trimmed === '') {
-            $currentIndent = ($tokens[$stackPtr]['column'] - 1);
+        $first   = $phpcsFile->findFirstOnLine( T_INLINE_HTML, $stackPtr );
+        $trimmed = ltrim( $tokens[ $first ][ 'content' ] );
+        if ( $trimmed === '' ) {
+            $currentIndent = ( $tokens[ $stackPtr ][ 'column' ] - 1 );
         } else {
-            $currentIndent = (strlen($tokens[$first]['content']) - strlen($trimmed));
+            $currentIndent = ( strlen( $tokens[ $first ][ 'content' ] ) - strlen( $trimmed ) );
         }
 
-        if ($this->_debug === true) {
-            $line = $tokens[$stackPtr]['line'];
-            echo "Start with token $stackPtr on line $line with indent $currentIndent".PHP_EOL;
+        if ( $this->_debug === true ) {
+            $line = $tokens[ $stackPtr ][ 'line' ];
+            echo "Start with token $stackPtr on line $line with indent $currentIndent" . PHP_EOL;
         }
 
-        if (empty($this->_ignoreIndentationTokens) === true) {
-            $this->_ignoreIndentationTokens = array(T_INLINE_HTML => true);
-            foreach ($this->ignoreIndentationTokens as $token) {
-                if (is_int($token) === false) {
-                    if (defined($token) === false) {
+        if ( empty( $this->_ignoreIndentationTokens ) === true ) {
+            $this->_ignoreIndentationTokens = array( T_INLINE_HTML => true );
+            foreach ( $this->ignoreIndentationTokens as $token ) {
+                if ( is_int( $token ) === false ) {
+                    if ( defined( $token ) === false ) {
                         continue;
                     }
 
-                    $token = constant($token);
+                    $token = constant( $token );
                 }
 
-                $this->_ignoreIndentationTokens[$token] = true;
+                $this->_ignoreIndentationTokens[ $token ] = true;
             }
         }//end if
 
         $this->exact     = (bool) $this->exact;
         $this->tabIndent = (bool) $this->tabIndent;
 
-        for ($i = ($stackPtr + 1); $i < $phpcsFile->numTokens; $i++) {
-            if ($i === false) {
+        for ( $i = ( $stackPtr + 1 ); $i < $phpcsFile->numTokens; $i++ ) {
+            if ( $i === false ) {
                 // Something has gone very wrong; maybe a parse error.
                 break;
             }
@@ -207,7 +207,7 @@ 
             $checkIndent = null;
 
             $exact = (bool) $this->exact;
-            if ($exact === true && isset($tokens[$i]['nested_parenthesis']) === true) {
+            if ( $exact === true && isset( $tokens[ $i ][ 'nested_parenthesis' ] ) === true ) {
                 // Don't check indents exactly between parenthesis as they
                 // tend to have custom rules, such as with multi-line function calls
                 // and control structure conditions.
@@ -215,77 +215,77 @@ 
             }
 
             // Detect line changes and figure out where the indent is.
-            if ($tokens[$i]['column'] === 1) {
-                $trimmed = ltrim($tokens[$i]['content']);
-                if ($trimmed === '') {
-                    if (isset($tokens[($i + 1)]) === true
-                        && $tokens[$i]['line'] === $tokens[($i + 1)]['line']
+            if ( $tokens[ $i ][ 'column' ] === 1 ) {
+                $trimmed = ltrim( $tokens[ $i ][ 'content' ] );
+                if ( $trimmed === '' ) {
+                    if ( isset( $tokens[ ( $i + 1 ) ] ) === true
+                        && $tokens[ $i ][ 'line' ] === $tokens[ ( $i + 1 ) ][ 'line' ]
                     ) {
-                        $checkToken  = ($i + 1);
-                        $tokenIndent = ($tokens[($i + 1)]['column'] - 1);
+                        $checkToken  = ( $i + 1 );
+                        $tokenIndent = ( $tokens[ ( $i + 1 ) ][ 'column' ] - 1 );
                     }
                 } else {
                     $checkToken  = $i;
-                    $tokenIndent = (strlen($tokens[$i]['content']) - strlen($trimmed));
+                    $tokenIndent = ( strlen( $tokens[ $i ][ 'content' ] ) - strlen( $trimmed ) );
                 }
             }
 
             // Closing parenthesis should just be indented to at least
             // the same level as where they were opened (but can be more).
-            if (($checkToken !== null
-                && $tokens[$checkToken]['code'] === T_CLOSE_PARENTHESIS
-                && isset($tokens[$checkToken]['parenthesis_opener']) === true)
-                || ($tokens[$i]['code'] === T_CLOSE_PARENTHESIS
-                && isset($tokens[$i]['parenthesis_opener']) === true)
+            if ( ( $checkToken !== null
+                && $tokens[ $checkToken ][ 'code' ] === T_CLOSE_PARENTHESIS
+                && isset( $tokens[ $checkToken ][ 'parenthesis_opener' ] ) === true )
+                || ( $tokens[ $i ][ 'code' ] === T_CLOSE_PARENTHESIS
+                && isset( $tokens[ $i ][ 'parenthesis_opener' ] ) === true )
             ) {
-                if ($checkToken !== null) {
+                if ( $checkToken !== null ) {
                     $parenCloser = $checkToken;
                 } else {
                     $parenCloser = $i;
                 }
 
-                if ($this->_debug === true) {
-                    $line = $tokens[$i]['line'];
-                    echo "Closing parenthesis found on line $line".PHP_EOL;
+                if ( $this->_debug === true ) {
+                    $line = $tokens[ $i ][ 'line' ];
+                    echo "Closing parenthesis found on line $line" . PHP_EOL;
                 }
 
-                $parenOpener = $tokens[$parenCloser]['parenthesis_opener'];
-                if ($tokens[$parenCloser]['line'] !== $tokens[$parenOpener]['line']) {
+                $parenOpener = $tokens[ $parenCloser ][ 'parenthesis_opener' ];
+                if ( $tokens[ $parenCloser ][ 'line' ] !== $tokens[ $parenOpener ][ 'line' ] ) {
                     $parens = 0;
-                    if (isset($tokens[$parenCloser]['nested_parenthesis']) === true
-                        && empty($tokens[$parenCloser]['nested_parenthesis']) === false
+                    if ( isset( $tokens[ $parenCloser ][ 'nested_parenthesis' ] ) === true
+                        && empty( $tokens[ $parenCloser ][ 'nested_parenthesis' ] ) === false
                     ) {
-                        end($tokens[$parenCloser]['nested_parenthesis']);
-                        $parens = key($tokens[$parenCloser]['nested_parenthesis']);
-                        if ($this->_debug === true) {
-                            $line = $tokens[$parens]['line'];
-                            echo "\t* token has nested parenthesis $parens on line $line *".PHP_EOL;
+                        end( $tokens[ $parenCloser ][ 'nested_parenthesis' ] );
+                        $parens = key( $tokens[ $parenCloser ][ 'nested_parenthesis' ] );
+                        if ( $this->_debug === true ) {
+                            $line = $tokens[ $parens ][ 'line' ];
+                            echo "\t* token has nested parenthesis $parens on line $line *" . PHP_EOL;
                         }
                     }
 
                     $condition = 0;
-                    if (isset($tokens[$parenCloser]['conditions']) === true
-                        && empty($tokens[$parenCloser]['conditions']) === false
+                    if ( isset( $tokens[ $parenCloser ][ 'conditions' ] ) === true
+                        && empty( $tokens[ $parenCloser ][ 'conditions' ] ) === false
                     ) {
-                        end($tokens[$parenCloser]['conditions']);
-                        $condition = key($tokens[$parenCloser]['conditions']);
-                        if ($this->_debug === true) {
-                            $line = $tokens[$condition]['line'];
-                            $type = $tokens[$condition]['type'];
-                            echo "\t* token is inside condition $condition ($type) on line $line *".PHP_EOL;
+                        end( $tokens[ $parenCloser ][ 'conditions' ] );
+                        $condition = key( $tokens[ $parenCloser ][ 'conditions' ] );
+                        if ( $this->_debug === true ) {
+                            $line = $tokens[ $condition ][ 'line' ];
+                            $type = $tokens[ $condition ][ 'type' ];
+                            echo "\t* token is inside condition $condition ($type) on line $line *" . PHP_EOL;
                         }
                     }
 
-                    if ($parens > $condition) {
-                        if ($this->_debug === true) {
-                            echo "\t* using parenthesis *".PHP_EOL;
+                    if ( $parens > $condition ) {
+                        if ( $this->_debug === true ) {
+                            echo "\t* using parenthesis *" . PHP_EOL;
                         }
 
                         $parenOpener = $parens;
                         $condition   = 0;
-                    } else if ($condition > 0) {
-                        if ($this->_debug === true) {
-                            echo "\t* using condition *".PHP_EOL;
+                    } else if ( $condition > 0 ) {
+                        if ( $this->_debug === true ) {
+                            echo "\t* using condition *" . PHP_EOL;
                         }
 
                         $parenOpener = $condition;
@@ -294,335 +294,335 @@ 
 
                     $exact = false;
 
-                    $lastOpenTagConditions = array_keys($tokens[$lastOpenTag]['conditions']);
-                    $lastOpenTagCondition  = array_pop($lastOpenTagConditions);
+                    $lastOpenTagConditions = array_keys( $tokens[ $lastOpenTag ][ 'conditions' ] );
+                    $lastOpenTagCondition  = array_pop( $lastOpenTagConditions );
 
-                    if ($condition > 0 && $lastOpenTagCondition === $condition) {
-                        if ($this->_debug === true) {
-                            echo "\t* open tag is inside condition; using open tag *".PHP_EOL;
+                    if ( $condition > 0 && $lastOpenTagCondition === $condition ) {
+                        if ( $this->_debug === true ) {
+                            echo "\t* open tag is inside condition; using open tag *" . PHP_EOL;
                         }
 
-                        $checkIndent = ($tokens[$lastOpenTag]['column'] - 1);
-                        if (isset($adjustments[$condition]) === true) {
-                            $checkIndent += $adjustments[$condition];
+                        $checkIndent = ( $tokens[ $lastOpenTag ][ 'column' ] - 1 );
+                        if ( isset( $adjustments[ $condition ] ) === true ) {
+                            $checkIndent += $adjustments[ $condition ];
                         }
 
                         $currentIndent = $checkIndent;
 
-                        if ($this->_debug === true) {
-                            $type = $tokens[$lastOpenTag]['type'];
-                            echo "\t=> checking indent of $checkIndent; main indent set to $currentIndent by token $lastOpenTag ($type)".PHP_EOL;
+                        if ( $this->_debug === true ) {
+                            $type = $tokens[ $lastOpenTag ][ 'type' ];
+                            echo "\t=> checking indent of $checkIndent; main indent set to $currentIndent by token $lastOpenTag ($type)" . PHP_EOL;
                         }
-                    } else if ($condition > 0
-                        && isset($tokens[$condition]['scope_opener']) === true
-                        && isset($setIndents[$tokens[$condition]['scope_opener']]) === true
+                    } else if ( $condition > 0
+                        && isset( $tokens[ $condition ][ 'scope_opener' ] ) === true
+                        && isset( $setIndents[ $tokens[ $condition ][ 'scope_opener' ] ] ) === true
                     ) {
-                        $checkIndent = $setIndents[$tokens[$condition]['scope_opener']];
-                        if (isset($adjustments[$condition]) === true) {
-                            $checkIndent += $adjustments[$condition];
+                        $checkIndent = $setIndents[ $tokens[ $condition ][ 'scope_opener' ] ];
+                        if ( isset( $adjustments[ $condition ] ) === true ) {
+                            $checkIndent += $adjustments[ $condition ];
                         }
 
                         $currentIndent = $checkIndent;
 
-                        if ($this->_debug === true) {
-                            $type = $tokens[$condition]['type'];
-                            echo "\t=> checking indent of $checkIndent; main indent set to $currentIndent by token $condition ($type)".PHP_EOL;
+                        if ( $this->_debug === true ) {
+                            $type = $tokens[ $condition ][ 'type' ];
+                            echo "\t=> checking indent of $checkIndent; main indent set to $currentIndent by token $condition ($type)" . PHP_EOL;
                         }
                     } else {
-                        $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $parenOpener, true);
+                        $first = $phpcsFile->findFirstOnLine( T_WHITESPACE, $parenOpener, true );
 
-                        $checkIndent = ($tokens[$first]['column'] - 1);
-                        if (isset($adjustments[$first]) === true) {
-                            $checkIndent += $adjustments[$first];
+                        $checkIndent = ( $tokens[ $first ][ 'column' ] - 1 );
+                        if ( isset( $adjustments[ $first ] ) === true ) {
+                            $checkIndent += $adjustments[ $first ];
                         }
 
-                        if ($this->_debug === true) {
-                            $line = $tokens[$first]['line'];
-                            $type = $tokens[$first]['type'];
-                            echo "\t* first token on line $line is $first ($type) *".PHP_EOL;
+                        if ( $this->_debug === true ) {
+                            $line = $tokens[ $first ][ 'line' ];
+                            $type = $tokens[ $first ][ 'type' ];
+                            echo "\t* first token on line $line is $first ($type) *" . PHP_EOL;
                         }
 
-                        if ($first === $tokens[$parenCloser]['parenthesis_opener']) {
+                        if ( $first === $tokens[ $parenCloser ][ 'parenthesis_opener' ] ) {
                             // This is unlikely to be the start of the statement, so look
                             // back further to find it.
                             $first--;
                         }
 
-                        $prev = $phpcsFile->findStartOfStatement($first, T_COMMA);
-                        if ($prev !== $first) {
+                        $prev = $phpcsFile->findStartOfStatement( $first, T_COMMA );
+                        if ( $prev !== $first ) {
                             // This is not the start of the statement.
-                            if ($this->_debug === true) {
-                                $line = $tokens[$prev]['line'];
-                                $type = $tokens[$prev]['type'];
-                                echo "\t* previous is $type on line $line *".PHP_EOL;
+                            if ( $this->_debug === true ) {
+                                $line = $tokens[ $prev ][ 'line' ];
+                                $type = $tokens[ $prev ][ 'type' ];
+                                echo "\t* previous is $type on line $line *" . PHP_EOL;
                             }
 
-                            $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $prev, true);
-                            $prev  = $phpcsFile->findStartOfStatement($first, T_COMMA);
-                            $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $prev, true);
-                            if ($this->_debug === true) {
-                                $line = $tokens[$first]['line'];
-                                $type = $tokens[$first]['type'];
-                                echo "\t* amended first token is $first ($type) on line $line *".PHP_EOL;
+                            $first = $phpcsFile->findFirstOnLine( T_WHITESPACE, $prev, true );
+                            $prev  = $phpcsFile->findStartOfStatement( $first, T_COMMA );
+                            $first = $phpcsFile->findFirstOnLine( T_WHITESPACE, $prev, true );
+                            if ( $this->_debug === true ) {
+                                $line = $tokens[ $first ][ 'line' ];
+                                $type = $tokens[ $first ][ 'type' ];
+                                echo "\t* amended first token is $first ($type) on line $line *" . PHP_EOL;
                             }
                         }
 
-                        if (isset($tokens[$first]['scope_closer']) === true
-                            && $tokens[$first]['scope_closer'] === $first
+                        if ( isset( $tokens[ $first ][ 'scope_closer' ] ) === true
+                            && $tokens[ $first ][ 'scope_closer' ] === $first
                         ) {
-                            if ($this->_debug === true) {
-                                echo "\t* first token is a scope closer *".PHP_EOL;
+                            if ( $this->_debug === true ) {
+                                echo "\t* first token is a scope closer *" . PHP_EOL;
                             }
 
-                            if (isset($tokens[$first]['scope_condition']) === true) {
+                            if ( isset( $tokens[ $first ][ 'scope_condition' ] ) === true ) {
                                 $scopeCloser = $first;
-                                $first       = $phpcsFile->findFirstOnLine(T_WHITESPACE, $tokens[$scopeCloser]['scope_condition'], true);
+                                $first       = $phpcsFile->findFirstOnLine( T_WHITESPACE, $tokens[ $scopeCloser ][ 'scope_condition' ], true );
 
-                                $currentIndent = ($tokens[$first]['column'] - 1);
-                                if (isset($adjustments[$first]) === true) {
-                                    $currentIndent += $adjustments[$first];
+                                $currentIndent = ( $tokens[ $first ][ 'column' ] - 1 );
+                                if ( isset( $adjustments[ $first ] ) === true ) {
+                                    $currentIndent += $adjustments[ $first ];
                                 }
 
                                 // Make sure it is divisible by our expected indent.
-                                if ($tokens[$tokens[$scopeCloser]['scope_condition']]['code'] !== T_CLOSURE) {
-                                    $currentIndent = (int) (ceil($currentIndent / $this->indent) * $this->indent);
+                                if ( $tokens[ $tokens[ $scopeCloser ][ 'scope_condition' ] ][ 'code' ] !== T_CLOSURE ) {
+                                    $currentIndent = (int) ( ceil( $currentIndent / $this->indent ) * $this->indent );
                                 }
 
-                                $setIndents[$first] = $currentIndent;
+                                $setIndents[ $first ] = $currentIndent;
 
-                                if ($this->_debug === true) {
-                                    $type = $tokens[$first]['type'];
-                                    echo "\t=> indent set to $currentIndent by token $first ($type)".PHP_EOL;
+                                if ( $this->_debug === true ) {
+                                    $type = $tokens[ $first ][ 'type' ];
+                                    echo "\t=> indent set to $currentIndent by token $first ($type)" . PHP_EOL;
                                 }
                             }//end if
                         } else {
                             // Don't force current indent to divisible because there could be custom
                             // rules in place between parenthesis, such as with arrays.
-                            $currentIndent = ($tokens[$first]['column'] - 1);
-                            if (isset($adjustments[$first]) === true) {
-                                $currentIndent += $adjustments[$first];
+                            $currentIndent = ( $tokens[ $first ][ 'column' ] - 1 );
+                            if ( isset( $adjustments[ $first ] ) === true ) {
+                                $currentIndent += $adjustments[ $first ];
                             }
 
-                            $setIndents[$first] = $currentIndent;
+                            $setIndents[ $first ] = $currentIndent;
 
-                            if ($this->_debug === true) {
-                                $type = $tokens[$first]['type'];
-                                echo "\t=> checking indent of $checkIndent; main indent set to $currentIndent by token $first ($type)".PHP_EOL;
+                            if ( $this->_debug === true ) {
+                                $type = $tokens[ $first ][ 'type' ];
+                                echo "\t=> checking indent of $checkIndent; main indent set to $currentIndent by token $first ($type)" . PHP_EOL;
                             }
                         }//end if
                     }//end if
-                } else if ($this->_debug === true) {
-                    echo "\t * ignoring single-line definition *".PHP_EOL;
+                } else if ( $this->_debug === true ) {
+                    echo "\t * ignoring single-line definition *" . PHP_EOL;
                 }//end if
             }//end if
 
             // Closing short array bracket should just be indented to at least
             // the same level as where it was opened (but can be more).
-            if ($tokens[$i]['code'] === T_CLOSE_SHORT_ARRAY
-                || ($checkToken !== null
-                && $tokens[$checkToken]['code'] === T_CLOSE_SHORT_ARRAY)
+            if ( $tokens[ $i ][ 'code' ] === T_CLOSE_SHORT_ARRAY
+                || ( $checkToken !== null
+                && $tokens[ $checkToken ][ 'code' ] === T_CLOSE_SHORT_ARRAY )
             ) {
-                if ($checkToken !== null) {
+                if ( $checkToken !== null ) {
                     $arrayCloser = $checkToken;
                 } else {
                     $arrayCloser = $i;
                 }
 
-                if ($this->_debug === true) {
-                    $line = $tokens[$arrayCloser]['line'];
-                    echo "Closing short array bracket found on line $line".PHP_EOL;
+                if ( $this->_debug === true ) {
+                    $line = $tokens[ $arrayCloser ][ 'line' ];
+                    echo "Closing short array bracket found on line $line" . PHP_EOL;
                 }
 
-                $arrayOpener = $tokens[$arrayCloser]['bracket_opener'];
-                if ($tokens[$arrayCloser]['line'] !== $tokens[$arrayOpener]['line']) {
-                    $first       = $phpcsFile->findFirstOnLine(T_WHITESPACE, $arrayOpener, true);
-                    $checkIndent = ($tokens[$first]['column'] - 1);
-                    if (isset($adjustments[$first]) === true) {
-                        $checkIndent += $adjustments[$first];
+                $arrayOpener = $tokens[ $arrayCloser ][ 'bracket_opener' ];
+                if ( $tokens[ $arrayCloser ][ 'line' ] !== $tokens[ $arrayOpener ][ 'line' ] ) {
+                    $first       = $phpcsFile->findFirstOnLine( T_WHITESPACE, $arrayOpener, true );
+                    $checkIndent = ( $tokens[ $first ][ 'column' ] - 1 );
+                    if ( isset( $adjustments[ $first ] ) === true ) {
+                        $checkIndent += $adjustments[ $first ];
                     }
 
                     $exact = false;
 
-                    if ($this->_debug === true) {
-                        $line = $tokens[$first]['line'];
-                        $type = $tokens[$first]['type'];
-                        echo "\t* first token on line $line is $first ($type) *".PHP_EOL;
+                    if ( $this->_debug === true ) {
+                        $line = $tokens[ $first ][ 'line' ];
+                        $type = $tokens[ $first ][ 'type' ];
+                        echo "\t* first token on line $line is $first ($type) *" . PHP_EOL;
                     }
 
-                    if ($first === $tokens[$arrayCloser]['bracket_opener']) {
+                    if ( $first === $tokens[ $arrayCloser ][ 'bracket_opener' ] ) {
                         // This is unlikely to be the start of the statement, so look
                         // back further to find it.
                         $first--;
                     }
 
-                    $prev = $phpcsFile->findStartOfStatement($first, T_COMMA);
-                    if ($prev !== $first) {
+                    $prev = $phpcsFile->findStartOfStatement( $first, T_COMMA );
+                    if ( $prev !== $first ) {
                         // This is not the start of the statement.
-                        if ($this->_debug === true) {
-                            $line = $tokens[$prev]['line'];
-                            $type = $tokens[$prev]['type'];
-                            echo "\t* previous is $type on line $line *".PHP_EOL;
+                        if ( $this->_debug === true ) {
+                            $line = $tokens[ $prev ][ 'line' ];
+                            $type = $tokens[ $prev ][ 'type' ];
+                            echo "\t* previous is $type on line $line *" . PHP_EOL;
                         }
 
-                        $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $prev, true);
-                        $prev  = $phpcsFile->findStartOfStatement($first, T_COMMA);
-                        $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $prev, true);
-                        if ($this->_debug === true) {
-                            $line = $tokens[$first]['line'];
-                            $type = $tokens[$first]['type'];
-                            echo "\t* amended first token is $first ($type) on line $line *".PHP_EOL;
+                        $first = $phpcsFile->findFirstOnLine( T_WHITESPACE, $prev, true );
+                        $prev  = $phpcsFile->findStartOfStatement( $first, T_COMMA );
+                        $first = $phpcsFile->findFirstOnLine( T_WHITESPACE, $prev, true );
+                        if ( $this->_debug === true ) {
+                            $line = $tokens[ $first ][ 'line' ];
+                            $type = $tokens[ $first ][ 'type' ];
+                            echo "\t* amended first token is $first ($type) on line $line *" . PHP_EOL;
                         }
                     }
 
-                    if (isset($tokens[$first]['scope_closer']) === true
-                        && $tokens[$first]['scope_closer'] === $first
+                    if ( isset( $tokens[ $first ][ 'scope_closer' ] ) === true
+                        && $tokens[ $first ][ 'scope_closer' ] === $first
                     ) {
                         // The first token is a scope closer and would have already
                         // been processed and set the indent level correctly, so
                         // don't adjust it again.
-                        if ($this->_debug === true) {
-                            echo "\t* first token is a scope closer; ignoring closing short array bracket *".PHP_EOL;
+                        if ( $this->_debug === true ) {
+                            echo "\t* first token is a scope closer; ignoring closing short array bracket *" . PHP_EOL;
                         }
 
-                        if (isset($setIndents[$first]) === true) {
-                            $currentIndent = $setIndents[$first];
-                            if ($this->_debug === true) {
-                                echo "\t=> indent reset to $currentIndent".PHP_EOL;
+                        if ( isset( $setIndents[ $first ] ) === true ) {
+                            $currentIndent = $setIndents[ $first ];
+                            if ( $this->_debug === true ) {
+                                echo "\t=> indent reset to $currentIndent" . PHP_EOL;
                             }
                         }
                     } else {
                         // Don't force current indent to be divisible because there could be custom
                         // rules in place for arrays.
-                        $currentIndent = ($tokens[$first]['column'] - 1);
-                        if (isset($adjustments[$first]) === true) {
-                            $currentIndent += $adjustments[$first];
+                        $currentIndent = ( $tokens[ $first ][ 'column' ] - 1 );
+                        if ( isset( $adjustments[ $first ] ) === true ) {
+                            $currentIndent += $adjustments[ $first ];
                         }
 
-                        $setIndents[$first] = $currentIndent;
+                        $setIndents[ $first ] = $currentIndent;
 
-                        if ($this->_debug === true) {
-                            $type = $tokens[$first]['type'];
-                            echo "\t=> checking indent of $checkIndent; main indent set to $currentIndent by token $first ($type)".PHP_EOL;
+                        if ( $this->_debug === true ) {
+                            $type = $tokens[ $first ][ 'type' ];
+                            echo "\t=> checking indent of $checkIndent; main indent set to $currentIndent by token $first ($type)" . PHP_EOL;
                         }
                     }//end if
-                } else if ($this->_debug === true) {
-                    echo "\t * ignoring single-line definition *".PHP_EOL;
+                } else if ( $this->_debug === true ) {
+                    echo "\t * ignoring single-line definition *" . PHP_EOL;
                 }//end if
             }//end if
 
             // Adjust lines within scopes while auto-fixing.
-            if ($checkToken !== null
+            if ( $checkToken !== null
                 && $exact === false
-                && (empty($tokens[$checkToken]['conditions']) === false
-                || (isset($tokens[$checkToken]['scope_opener']) === true
-                && $tokens[$checkToken]['scope_opener'] === $checkToken))
+                && ( empty( $tokens[ $checkToken ][ 'conditions' ] ) === false
+                || ( isset( $tokens[ $checkToken ][ 'scope_opener' ] ) === true
+                && $tokens[ $checkToken ][ 'scope_opener' ] === $checkToken ) )
             ) {
-                if (empty($tokens[$checkToken]['conditions']) === false) {
-                    end($tokens[$checkToken]['conditions']);
-                    $condition = key($tokens[$checkToken]['conditions']);
+                if ( empty( $tokens[ $checkToken ][ 'conditions' ] ) === false ) {
+                    end( $tokens[ $checkToken ][ 'conditions' ] );
+                    $condition = key( $tokens[ $checkToken ][ 'conditions' ] );
                 } else {
-                    $condition = $tokens[$checkToken]['scope_condition'];
+                    $condition = $tokens[ $checkToken ][ 'scope_condition' ];
                 }
 
-                $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $condition, true);
+                $first = $phpcsFile->findFirstOnLine( T_WHITESPACE, $condition, true );
 
-                if (isset($adjustments[$first]) === true
-                    && (($adjustments[$first] < 0 && $tokenIndent > $currentIndent)
-                    || ($adjustments[$first] > 0 && $tokenIndent < $currentIndent))
+                if ( isset( $adjustments[ $first ] ) === true
+                    && ( ( $adjustments[ $first ] < 0 && $tokenIndent > $currentIndent )
+                    || ( $adjustments[ $first ] > 0 && $tokenIndent < $currentIndent ) )
                 ) {
-                    $padding = ($tokenIndent + $adjustments[$first]);
-                    if ($padding > 0) {
-                        if ($this->tabIndent === true) {
-                            $numTabs   = floor($padding / $this->_tabWidth);
-                            $numSpaces = ($padding - ($numTabs * $this->_tabWidth));
-                            $padding   = str_repeat("\t", $numTabs).str_repeat(' ', $numSpaces);
+                    $padding = ( $tokenIndent + $adjustments[ $first ] );
+                    if ( $padding > 0 ) {
+                        if ( $this->tabIndent === true ) {
+                            $numTabs   = floor( $padding / $this->_tabWidth );
+                            $numSpaces = ( $padding - ( $numTabs * $this->_tabWidth ) );
+                            $padding   = str_repeat( "\t", $numTabs ) . str_repeat( ' ', $numSpaces );
                         } else {
-                            $padding = str_repeat(' ', $padding);
+                            $padding = str_repeat( ' ', $padding );
                         }
                     } else {
                         $padding = '';
                     }
 
-                    if ($checkToken === $i) {
-                        $phpcsFile->fixer->replaceToken($checkToken, $padding.$trimmed);
+                    if ( $checkToken === $i ) {
+                        $phpcsFile->fixer->replaceToken( $checkToken, $padding . $trimmed );
                     } else {
                         // Easier to just replace the entire indent.
-                        $phpcsFile->fixer->replaceToken(($checkToken - 1), $padding);
+                        $phpcsFile->fixer->replaceToken( ( $checkToken - 1 ), $padding );
                     }
 
-                    if ($this->_debug === true) {
-                        $length = strlen($padding);
-                        $line   = $tokens[$checkToken]['line'];
-                        $type   = $tokens[$checkToken]['type'];
-                        echo "Indent adjusted to $length for $type on line $line".PHP_EOL;
+                    if ( $this->_debug === true ) {
+                        $length = strlen( $padding );
+                        $line   = $tokens[ $checkToken ][ 'line' ];
+                        $type   = $tokens[ $checkToken ][ 'type' ];
+                        echo "Indent adjusted to $length for $type on line $line" . PHP_EOL;
                     }
 
-                    $adjustments[$checkToken] = $adjustments[$first];
+                    $adjustments[ $checkToken ] = $adjustments[ $first ];
 
-                    if ($this->_debug === true) {
-                        $line = $tokens[$checkToken]['line'];
-                        $type = $tokens[$checkToken]['type'];
-                        echo "\t=> Add adjustment of ".$adjustments[$checkToken]." for token $checkToken ($type) on line $line".PHP_EOL;
+                    if ( $this->_debug === true ) {
+                        $line = $tokens[ $checkToken ][ 'line' ];
+                        $type = $tokens[ $checkToken ][ 'type' ];
+                        echo "\t=> Add adjustment of " . $adjustments[ $checkToken ] . " for token $checkToken ($type) on line $line" . PHP_EOL;
                     }
                 }//end if
             }//end if
 
             // Scope closers reset the required indent to the same level as the opening condition.
-            if (($checkToken !== null
-                && isset($openScopes[$checkToken]) === true
-                || (isset($tokens[$checkToken]['scope_condition']) === true
-                && isset($tokens[$checkToken]['scope_closer']) === true
-                && $tokens[$checkToken]['scope_closer'] === $checkToken
-                && $tokens[$checkToken]['line'] !== $tokens[$tokens[$checkToken]['scope_opener']]['line']))
-                || ($checkToken === null
-                && isset($openScopes[$i]) === true
-                || (isset($tokens[$i]['scope_condition']) === true
-                && isset($tokens[$i]['scope_closer']) === true
-                && $tokens[$i]['scope_closer'] === $i
-                && $tokens[$i]['line'] !== $tokens[$tokens[$i]['scope_opener']]['line']))
+            if ( ( $checkToken !== null
+                && isset( $openScopes[ $checkToken ] ) === true
+                || ( isset( $tokens[ $checkToken ][ 'scope_condition' ] ) === true
+                && isset( $tokens[ $checkToken ][ 'scope_closer' ] ) === true
+                && $tokens[ $checkToken ][ 'scope_closer' ] === $checkToken
+                && $tokens[ $checkToken ][ 'line' ] !== $tokens[ $tokens[ $checkToken ][ 'scope_opener' ] ][ 'line' ] ) )
+                || ( $checkToken === null
+                && isset( $openScopes[ $i ] ) === true
+                || ( isset( $tokens[ $i ][ 'scope_condition' ] ) === true
+                && isset( $tokens[ $i ][ 'scope_closer' ] ) === true
+                && $tokens[ $i ][ 'scope_closer' ] === $i
+                && $tokens[ $i ][ 'line' ] !== $tokens[ $tokens[ $i ][ 'scope_opener' ] ][ 'line' ] ) )
             ) {
-                if ($this->_debug === true) {
-                    if ($checkToken === null) {
-                        $type = $tokens[$tokens[$i]['scope_condition']]['type'];
-                        $line = $tokens[$i]['line'];
+                if ( $this->_debug === true ) {
+                    if ( $checkToken === null ) {
+                        $type = $tokens[ $tokens[ $i ][ 'scope_condition' ] ][ 'type' ];
+                        $line = $tokens[ $i ][ 'line' ];
                     } else {
-                        $type = $tokens[$tokens[$checkToken]['scope_condition']]['type'];
-                        $line = $tokens[$checkToken]['line'];
+                        $type = $tokens[ $tokens[ $checkToken ][ 'scope_condition' ] ][ 'type' ];
+                        $line = $tokens[ $checkToken ][ 'line' ];
                     }
 
-                    echo "Close scope ($type) on line $line".PHP_EOL;
+                    echo "Close scope ($type) on line $line" . PHP_EOL;
                 }
 
                 $scopeCloser = $checkToken;
-                if ($scopeCloser === null) {
+                if ( $scopeCloser === null ) {
                     $scopeCloser = $i;
                 } else {
-                    array_pop($openScopes);
+                    array_pop( $openScopes );
                 }
 
-                if (isset($tokens[$scopeCloser]['scope_condition']) === true) {
-                    $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $tokens[$scopeCloser]['scope_condition'], true);
+                if ( isset( $tokens[ $scopeCloser ][ 'scope_condition' ] ) === true ) {
+                    $first = $phpcsFile->findFirstOnLine( T_WHITESPACE, $tokens[ $scopeCloser ][ 'scope_condition' ], true );
 
-                    $currentIndent = ($tokens[$first]['column'] - 1);
-                    if (isset($adjustments[$first]) === true) {
-                        $currentIndent += $adjustments[$first];
+                    $currentIndent = ( $tokens[ $first ][ 'column' ] - 1 );
+                    if ( isset( $adjustments[ $first ] ) === true ) {
+                        $currentIndent += $adjustments[ $first ];
                     }
 
                     // Make sure it is divisible by our expected indent.
-                    if ($tokens[$tokens[$scopeCloser]['scope_condition']]['code'] !== T_CLOSURE) {
-                        $currentIndent = (int) (ceil($currentIndent / $this->indent) * $this->indent);
+                    if ( $tokens[ $tokens[ $scopeCloser ][ 'scope_condition' ] ][ 'code' ] !== T_CLOSURE ) {
+                        $currentIndent = (int) ( ceil( $currentIndent / $this->indent ) * $this->indent );
                     }
 
-                    $setIndents[$scopeCloser] = $currentIndent;
+                    $setIndents[ $scopeCloser ] = $currentIndent;
 
-                    if ($this->_debug === true) {
-                        $type = $tokens[$scopeCloser]['type'];
-                        echo "\t=> indent set to $currentIndent by token $scopeCloser ($type)".PHP_EOL;
+                    if ( $this->_debug === true ) {
+                        $type = $tokens[ $scopeCloser ][ 'type' ];
+                        echo "\t=> indent set to $currentIndent by token $scopeCloser ($type)" . PHP_EOL;
                     }
 
                     // We only check the indent of scope closers if they are
                     // curly braces because other constructs tend to have different rules.
-                    if ($tokens[$scopeCloser]['code'] === T_CLOSE_CURLY_BRACKET) {
+                    if ( $tokens[ $scopeCloser ][ 'code' ] === T_CLOSE_CURLY_BRACKET ) {
                         $exact = true;
                     } else {
                         $checkToken = null;
@@ -631,86 +631,86 @@ 
             }//end if
 
             // Handle scope for JS object notation.
-            if ($phpcsFile->tokenizerType === 'JS'
-                && (($checkToken !== null
-                && $tokens[$checkToken]['code'] === T_CLOSE_OBJECT
-                && $tokens[$checkToken]['line'] !== $tokens[$tokens[$checkToken]['bracket_opener']]['line'])
-                || ($checkToken === null
-                && $tokens[$i]['code'] === T_CLOSE_OBJECT
-                && $tokens[$i]['line'] !== $tokens[$tokens[$i]['bracket_opener']]['line']))
+            if ( $phpcsFile->tokenizerType === 'JS'
+                && ( ( $checkToken !== null
+                && $tokens[ $checkToken ][ 'code' ] === T_CLOSE_OBJECT
+                && $tokens[ $checkToken ][ 'line' ] !== $tokens[ $tokens[ $checkToken ][ 'bracket_opener' ] ][ 'line' ] )
+                || ( $checkToken === null
+                && $tokens[ $i ][ 'code' ] === T_CLOSE_OBJECT
+                && $tokens[ $i ][ 'line' ] !== $tokens[ $tokens[ $i ][ 'bracket_opener' ] ][ 'line' ] ) )
             ) {
-                if ($this->_debug === true) {
-                    $line = $tokens[$i]['line'];
-                    echo "Close JS object on line $line".PHP_EOL;
+                if ( $this->_debug === true ) {
+                    $line = $tokens[ $i ][ 'line' ];
+                    echo "Close JS object on line $line" . PHP_EOL;
                 }
 
                 $scopeCloser = $checkToken;
-                if ($scopeCloser === null) {
+                if ( $scopeCloser === null ) {
                     $scopeCloser = $i;
                 } else {
-                    array_pop($openScopes);
+                    array_pop( $openScopes );
                 }
 
                 $parens = 0;
-                if (isset($tokens[$scopeCloser]['nested_parenthesis']) === true
-                    && empty($tokens[$scopeCloser]['nested_parenthesis']) === false
+                if ( isset( $tokens[ $scopeCloser ][ 'nested_parenthesis' ] ) === true
+                    && empty( $tokens[ $scopeCloser ][ 'nested_parenthesis' ] ) === false
                 ) {
-                    end($tokens[$scopeCloser]['nested_parenthesis']);
-                    $parens = key($tokens[$scopeCloser]['nested_parenthesis']);
-                    if ($this->_debug === true) {
-                        $line = $tokens[$parens]['line'];
-                        echo "\t* token has nested parenthesis $parens on line $line *".PHP_EOL;
+                    end( $tokens[ $scopeCloser ][ 'nested_parenthesis' ] );
+                    $parens = key( $tokens[ $scopeCloser ][ 'nested_parenthesis' ] );
+                    if ( $this->_debug === true ) {
+                        $line = $tokens[ $parens ][ 'line' ];
+                        echo "\t* token has nested parenthesis $parens on line $line *" . PHP_EOL;
                     }
                 }
 
                 $condition = 0;
-                if (isset($tokens[$scopeCloser]['conditions']) === true
-                    && empty($tokens[$scopeCloser]['conditions']) === false
+                if ( isset( $tokens[ $scopeCloser ][ 'conditions' ] ) === true
+                    && empty( $tokens[ $scopeCloser ][ 'conditions' ] ) === false
                 ) {
-                    end($tokens[$scopeCloser]['conditions']);
-                    $condition = key($tokens[$scopeCloser]['conditions']);
-                    if ($this->_debug === true) {
-                        $line = $tokens[$condition]['line'];
-                        $type = $tokens[$condition]['type'];
-                        echo "\t* token is inside condition $condition ($type) on line $line *".PHP_EOL;
+                    end( $tokens[ $scopeCloser ][ 'conditions' ] );
+                    $condition = key( $tokens[ $scopeCloser ][ 'conditions' ] );
+                    if ( $this->_debug === true ) {
+                        $line = $tokens[ $condition ][ 'line' ];
+                        $type = $tokens[ $condition ][ 'type' ];
+                        echo "\t* token is inside condition $condition ($type) on line $line *" . PHP_EOL;
                     }
                 }
 
-                if ($parens > $condition) {
-                    if ($this->_debug === true) {
-                        echo "\t* using parenthesis *".PHP_EOL;
+                if ( $parens > $condition ) {
+                    if ( $this->_debug === true ) {
+                        echo "\t* using parenthesis *" . PHP_EOL;
                     }
 
-                    $first     = $phpcsFile->findFirstOnLine(T_WHITESPACE, $parens, true);
+                    $first     = $phpcsFile->findFirstOnLine( T_WHITESPACE, $parens, true );
                     $condition = 0;
-                } else if ($condition > 0) {
-                    if ($this->_debug === true) {
-                        echo "\t* using condition *".PHP_EOL;
+                } else if ( $condition > 0 ) {
+                    if ( $this->_debug === true ) {
+                        echo "\t* using condition *" . PHP_EOL;
                     }
 
-                    $first  = $phpcsFile->findFirstOnLine(T_WHITESPACE, $condition, true);
+                    $first  = $phpcsFile->findFirstOnLine( T_WHITESPACE, $condition, true );
                     $parens = 0;
                 } else {
-                    if ($this->_debug === true) {
-                        $line = $tokens[$tokens[$scopeCloser]['bracket_opener']]['line'];
-                        echo "\t* token is not in parenthesis or condition; using opener on line $line *".PHP_EOL;
+                    if ( $this->_debug === true ) {
+                        $line = $tokens[ $tokens[ $scopeCloser ][ 'bracket_opener' ] ][ 'line' ];
+                        echo "\t* token is not in parenthesis or condition; using opener on line $line *" . PHP_EOL;
                     }
 
-                    $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $tokens[$scopeCloser]['bracket_opener'], true);
+                    $first = $phpcsFile->findFirstOnLine( T_WHITESPACE, $tokens[ $scopeCloser ][ 'bracket_opener' ], true );
                 }//end if
 
-                $currentIndent = ($tokens[$first]['column'] - 1);
-                if (isset($adjustments[$first]) === true) {
-                    $currentIndent += $adjustments[$first];
+                $currentIndent = ( $tokens[ $first ][ 'column' ] - 1 );
+                if ( isset( $adjustments[ $first ] ) === true ) {
+                    $currentIndent += $adjustments[ $first ];
                 }
 
-                if ($parens > 0 || $condition > 0) {
-                    $checkIndent = ($tokens[$first]['column'] - 1);
-                    if (isset($adjustments[$first]) === true) {
-                        $checkIndent += $adjustments[$first];
+                if ( $parens > 0 || $condition > 0 ) {
+                    $checkIndent = ( $tokens[ $first ][ 'column' ] - 1 );
+                    if ( isset( $adjustments[ $first ] ) === true ) {
+                        $checkIndent += $adjustments[ $first ];
                     }
 
-                    if ($condition > 0) {
+                    if ( $condition > 0 ) {
                         $checkIndent   += $this->indent;
                         $currentIndent += $this->indent;
                         $exact          = true;
@@ -720,115 +720,115 @@ 
                 }
 
                 // Make sure it is divisible by our expected indent.
-                $currentIndent      = (int) (ceil($currentIndent / $this->indent) * $this->indent);
-                $checkIndent        = (int) (ceil($checkIndent / $this->indent) * $this->indent);
-                $setIndents[$first] = $currentIndent;
+                $currentIndent      = (int) ( ceil( $currentIndent / $this->indent ) * $this->indent );
+                $checkIndent        = (int) ( ceil( $checkIndent / $this->indent ) * $this->indent );
+                $setIndents[ $first ] = $currentIndent;
 
-                if ($this->_debug === true) {
-                    $type = $tokens[$first]['type'];
-                    echo "\t=> checking indent of $checkIndent; main indent set to $currentIndent by token $first ($type)".PHP_EOL;
+                if ( $this->_debug === true ) {
+                    $type = $tokens[ $first ][ 'type' ];
+                    echo "\t=> checking indent of $checkIndent; main indent set to $currentIndent by token $first ($type)" . PHP_EOL;
                 }
             }//end if
 
-            if ($checkToken !== null
-                && isset(PHP_CodeSniffer_Tokens::$scopeOpeners[$tokens[$checkToken]['code']]) === true
-                && in_array($tokens[$checkToken]['code'], $this->nonIndentingScopes) === false
-                && isset($tokens[$checkToken]['scope_opener']) === true
+            if ( $checkToken !== null
+                && isset( PHP_CodeSniffer_Tokens::$scopeOpeners[ $tokens[ $checkToken ][ 'code' ] ] ) === true
+                && in_array( $tokens[ $checkToken ][ 'code' ], $this->nonIndentingScopes ) === false
+                && isset( $tokens[ $checkToken ][ 'scope_opener' ] ) === true
             ) {
                 $exact = true;
 
                 $lastOpener = null;
-                if (empty($openScopes) === false) {
-                    end($openScopes);
-                    $lastOpener = current($openScopes);
+                if ( empty( $openScopes ) === false ) {
+                    end( $openScopes );
+                    $lastOpener = current( $openScopes );
                 }
 
                 // A scope opener that shares a closer with another token (like multiple
                 // CASEs using the same BREAK) needs to reduce the indent level so its
                 // indent is checked correctly. It will then increase the indent again
                 // (as all openers do) after being checked.
-                if ($lastOpener !== null
-                    && isset($tokens[$lastOpener]['scope_closer']) === true
-                    && $tokens[$lastOpener]['level'] === $tokens[$checkToken]['level']
-                    && $tokens[$lastOpener]['scope_closer'] === $tokens[$checkToken]['scope_closer']
+                if ( $lastOpener !== null
+                    && isset( $tokens[ $lastOpener ][ 'scope_closer' ] ) === true
+                    && $tokens[ $lastOpener ][ 'level' ] === $tokens[ $checkToken ][ 'level' ]
+                    && $tokens[ $lastOpener ][ 'scope_closer' ] === $tokens[ $checkToken ][ 'scope_closer' ]
                 ) {
                     $currentIndent          -= $this->indent;
-                    $setIndents[$lastOpener] = $currentIndent;
-                    if ($this->_debug === true) {
-                        $line = $tokens[$i]['line'];
-                        $type = $tokens[$lastOpener]['type'];
-                        echo "Shared closer found on line $line".PHP_EOL;
-                        echo "\t=> indent set to $currentIndent by token $lastOpener ($type)".PHP_EOL;
+                    $setIndents[ $lastOpener ] = $currentIndent;
+                    if ( $this->_debug === true ) {
+                        $line = $tokens[ $i ][ 'line' ];
+                        $type = $tokens[ $lastOpener ][ 'type' ];
+                        echo "Shared closer found on line $line" . PHP_EOL;
+                        echo "\t=> indent set to $currentIndent by token $lastOpener ($type)" . PHP_EOL;
                     }
                 }
 
-                if ($tokens[$checkToken]['code'] === T_CLOSURE
+                if ( $tokens[ $checkToken ][ 'code' ] === T_CLOSURE
                     && $tokenIndent > $currentIndent
                 ) {
                     // The opener is indented more than needed, which is fine.
                     // But just check that it is divisible by our expected indent.
-                    $checkIndent = (int) (ceil($tokenIndent / $this->indent) * $this->indent);
+                    $checkIndent = (int) ( ceil( $tokenIndent / $this->indent ) * $this->indent );
                     $exact       = false;
 
-                    if ($this->_debug === true) {
-                        $line = $tokens[$i]['line'];
-                        echo "Closure found on line $line".PHP_EOL;
-                        echo "\t=> checking indent of $checkIndent; main indent remains at $currentIndent".PHP_EOL;
+                    if ( $this->_debug === true ) {
+                        $line = $tokens[ $i ][ 'line' ];
+                        echo "Closure found on line $line" . PHP_EOL;
+                        echo "\t=> checking indent of $checkIndent; main indent remains at $currentIndent" . PHP_EOL;
                     }
                 }
             }//end if
 
             // Method prefix indentation has to be exact or else if will break
             // the rest of the function declaration, and potentially future ones.
-            if ($checkToken !== null
-                && isset(PHP_CodeSniffer_Tokens::$methodPrefixes[$tokens[$checkToken]['code']]) === true
-                && $tokens[($checkToken + 1)]['code'] !== T_DOUBLE_COLON
+            if ( $checkToken !== null
+                && isset( PHP_CodeSniffer_Tokens::$methodPrefixes[ $tokens[ $checkToken ][ 'code' ] ] ) === true
+                && $tokens[ ( $checkToken + 1 ) ][ 'code' ] !== T_DOUBLE_COLON
             ) {
                 $exact = true;
             }
 
             // JS property indentation has to be exact or else if will break
             // things like function and object indentation.
-            if ($checkToken !== null && $tokens[$checkToken]['code'] === T_PROPERTY) {
+            if ( $checkToken !== null && $tokens[ $checkToken ][ 'code' ] === T_PROPERTY ) {
                 $exact = true;
             }
 
             // PHP tags needs to be indented to exact column positions
             // so they don't cause problems with indent checks for the code
             // within them, but they don't need to line up with the current indent.
-            if ($checkToken !== null
-                && ($tokens[$checkToken]['code'] === T_OPEN_TAG
-                || $tokens[$checkToken]['code'] === T_OPEN_TAG_WITH_ECHO
-                || $tokens[$checkToken]['code'] === T_CLOSE_TAG)
+            if ( $checkToken !== null
+                && ( $tokens[ $checkToken ][ 'code' ] === T_OPEN_TAG
+                || $tokens[ $checkToken ][ 'code' ] === T_OPEN_TAG_WITH_ECHO
+                || $tokens[ $checkToken ][ 'code' ] === T_CLOSE_TAG )
             ) {
                 $exact       = true;
-                $checkIndent = ($tokens[$checkToken]['column'] - 1);
-                $checkIndent = (int) (ceil($checkIndent / $this->indent) * $this->indent);
+                $checkIndent = ( $tokens[ $checkToken ][ 'column' ] - 1 );
+                $checkIndent = (int) ( ceil( $checkIndent / $this->indent ) * $this->indent );
             }
 
             // Check the line indent.
-            if ($checkIndent === null) {
+            if ( $checkIndent === null ) {
                 $checkIndent = $currentIndent;
             }
 
             $adjusted = false;
-            if ($checkToken !== null
-                && isset($this->_ignoreIndentationTokens[$tokens[$checkToken]['code']]) === false
-                && (($tokenIndent !== $checkIndent && $exact === true)
-                || ($tokenIndent < $checkIndent && $exact === false))
+            if ( $checkToken !== null
+                && isset( $this->_ignoreIndentationTokens[ $tokens[ $checkToken ][ 'code' ] ] ) === false
+                && ( ( $tokenIndent !== $checkIndent && $exact === true )
+                || ( $tokenIndent < $checkIndent && $exact === false ) )
             ) {
                 $type  = 'IncorrectExact';
                 $error = 'Line indented incorrectly; expected ';
-                if ($exact === false) {
+                if ( $exact === false ) {
                     $error .= 'at least ';
                     $type   = 'Incorrect';
                 }
 
-                if ($this->tabIndent === true) {
+                if ( $this->tabIndent === true ) {
                     $error .= '%s tabs, found %s';
                     $data   = array(
-                               floor($checkIndent / $this->_tabWidth),
-                               floor($tokenIndent / $this->_tabWidth),
+                               floor( $checkIndent / $this->_tabWidth ),
+                               floor( $tokenIndent / $this->_tabWidth ),
                               );
                 } else {
                     $error .= '%s spaces, found %s';
@@ -838,107 +838,107 @@ 
                               );
                 }
 
-                if ($this->_debug === true) {
-                    $line    = $tokens[$checkToken]['line'];
-                    $message = vsprintf($error, $data);
-                    echo "[Line $line] $message".PHP_EOL;
+                if ( $this->_debug === true ) {
+                    $line    = $tokens[ $checkToken ][ 'line' ];
+                    $message = vsprintf( $error, $data );
+                    echo "[Line $line] $message" . PHP_EOL;
                 }
 
-                $fix = $phpcsFile->addFixableError($error, $checkToken, $type, $data);
-                if ($fix === true || $this->_debug === true) {
+                $fix = $phpcsFile->addFixableError( $error, $checkToken, $type, $data );
+                if ( $fix === true || $this->_debug === true ) {
                     $padding = '';
-                    if ($this->tabIndent === true) {
-                        $numTabs = floor($checkIndent / $this->_tabWidth);
-                        if ($numTabs > 0) {
-                            $numSpaces = ($checkIndent - ($numTabs * $this->_tabWidth));
-                            $padding   = str_repeat("\t", $numTabs).str_repeat(' ', $numSpaces);
+                    if ( $this->tabIndent === true ) {
+                        $numTabs = floor( $checkIndent / $this->_tabWidth );
+                        if ( $numTabs > 0 ) {
+                            $numSpaces = ( $checkIndent - ( $numTabs * $this->_tabWidth ) );
+                            $padding   = str_repeat( "\t", $numTabs ) . str_repeat( ' ', $numSpaces );
                         }
-                    } else if ($checkIndent > 0) {
-                        $padding = str_repeat(' ', $checkIndent);
+                    } else if ( $checkIndent > 0 ) {
+                        $padding = str_repeat( ' ', $checkIndent );
                     }
 
-                    if ($checkToken === $i) {
-                        $accepted = $phpcsFile->fixer->replaceToken($checkToken, $padding.$trimmed);
+                    if ( $checkToken === $i ) {
+                        $accepted = $phpcsFile->fixer->replaceToken( $checkToken, $padding . $trimmed );
                     } else {
                         // Easier to just replace the entire indent.
-                        $accepted = $phpcsFile->fixer->replaceToken(($checkToken - 1), $padding);
+                        $accepted = $phpcsFile->fixer->replaceToken( ( $checkToken - 1 ), $padding );
                     }
 
-                    if ($accepted === true) {
-                        $adjustments[$checkToken] = ($checkIndent - $tokenIndent);
-                        if ($this->_debug === true) {
-                            $line = $tokens[$checkToken]['line'];
-                            $type = $tokens[$checkToken]['type'];
-                            echo "\t=> Add adjustment of ".$adjustments[$checkToken]." for token $checkToken ($type) on line $line".PHP_EOL;
+                    if ( $accepted === true ) {
+                        $adjustments[ $checkToken ] = ( $checkIndent - $tokenIndent );
+                        if ( $this->_debug === true ) {
+                            $line = $tokens[ $checkToken ][ 'line' ];
+                            $type = $tokens[ $checkToken ][ 'type' ];
+                            echo "\t=> Add adjustment of " . $adjustments[ $checkToken ] . " for token $checkToken ($type) on line $line" . PHP_EOL;
                         }
                     }
                 } else {
                     // Assume the change would be applied and continue
                     // checking indents under this assumption. This gives more
                     // technically accurate error messages.
-                    $adjustments[$checkToken] = ($checkIndent - $tokenIndent);
+                    $adjustments[ $checkToken ] = ( $checkIndent - $tokenIndent );
                 }//end if
             }//end if
 
-            if ($checkToken !== null) {
+            if ( $checkToken !== null ) {
                 $i = $checkToken;
             }
 
             // Completely skip here/now docs as the indent is a part of the
             // content itself.
-            if ($tokens[$i]['code'] === T_START_HEREDOC
-                || $tokens[$i]['code'] === T_START_NOWDOC
+            if ( $tokens[ $i ][ 'code' ] === T_START_HEREDOC
+                || $tokens[ $i ][ 'code' ] === T_START_NOWDOC
             ) {
-                $i = $phpcsFile->findNext(array(T_END_HEREDOC, T_END_NOWDOC), ($i + 1));
+                $i = $phpcsFile->findNext( array( T_END_HEREDOC, T_END_NOWDOC ), ( $i + 1 ) );
                 continue;
             }
 
             // Completely skip multi-line strings as the indent is a part of the
             // content itself.
-            if ($tokens[$i]['code'] === T_CONSTANT_ENCAPSED_STRING
-                || $tokens[$i]['code'] === T_DOUBLE_QUOTED_STRING
+            if ( $tokens[ $i ][ 'code' ] === T_CONSTANT_ENCAPSED_STRING
+                || $tokens[ $i ][ 'code' ] === T_DOUBLE_QUOTED_STRING
             ) {
-                $i = $phpcsFile->findNext($tokens[$i]['code'], ($i + 1), null, true);
+                $i = $phpcsFile->findNext( $tokens[ $i ][ 'code' ], ( $i + 1 ), null, true );
                 $i--;
                 continue;
             }
 
             // Completely skip doc comments as they tend to have complex
             // indentation rules.
-            if ($tokens[$i]['code'] === T_DOC_COMMENT_OPEN_TAG) {
-                $i = $tokens[$i]['comment_closer'];
+            if ( $tokens[ $i ][ 'code' ] === T_DOC_COMMENT_OPEN_TAG ) {
+                $i = $tokens[ $i ][ 'comment_closer' ];
                 continue;
             }
 
             // Open tags reset the indent level.
-            if ($tokens[$i]['code'] === T_OPEN_TAG
-                || $tokens[$i]['code'] === T_OPEN_TAG_WITH_ECHO
+            if ( $tokens[ $i ][ 'code' ] === T_OPEN_TAG
+                || $tokens[ $i ][ 'code' ] === T_OPEN_TAG_WITH_ECHO
             ) {
-                if ($this->_debug === true) {
-                    $line = $tokens[$i]['line'];
-                    echo "Open PHP tag found on line $line".PHP_EOL;
+                if ( $this->_debug === true ) {
+                    $line = $tokens[ $i ][ 'line' ];
+                    echo "Open PHP tag found on line $line" . PHP_EOL;
                 }
 
-                if ($checkToken === null) {
-                    $first         = $phpcsFile->findFirstOnLine(T_WHITESPACE, $i, true);
-                    $currentIndent = (strlen($tokens[$first]['content']) - strlen(ltrim($tokens[$first]['content'])));
+                if ( $checkToken === null ) {
+                    $first         = $phpcsFile->findFirstOnLine( T_WHITESPACE, $i, true );
+                    $currentIndent = ( strlen( $tokens[ $first ][ 'content' ] ) - strlen( ltrim( $tokens[ $first ][ 'content' ] ) ) );
                 } else {
-                    $currentIndent = ($tokens[$i]['column'] - 1);
+                    $currentIndent = ( $tokens[ $i ][ 'column' ] - 1 );
                 }
 
                 $lastOpenTag = $i;
 
-                if (isset($adjustments[$i]) === true) {
-                    $currentIndent += $adjustments[$i];
+                if ( isset( $adjustments[ $i ] ) === true ) {
+                    $currentIndent += $adjustments[ $i ];
                 }
 
                 // Make sure it is divisible by our expected indent.
-                $currentIndent  = (int) (ceil($currentIndent / $this->indent) * $this->indent);
-                $setIndents[$i] = $currentIndent;
+                $currentIndent  = (int) ( ceil( $currentIndent / $this->indent ) * $this->indent );
+                $setIndents[ $i ] = $currentIndent;
 
-                if ($this->_debug === true) {
-                    $type = $tokens[$i]['type'];
-                    echo "\t=> indent set to $currentIndent by token $i ($type)".PHP_EOL;
+                if ( $this->_debug === true ) {
+                    $type = $tokens[ $i ][ 'type' ];
+                    echo "\t=> indent set to $currentIndent by token $i ($type)" . PHP_EOL;
                 }
 
                 continue;
@@ -946,113 +946,113 @@ 
 
             // Close tags reset the indent level, unless they are closing a tag
             // opened on the same line.
-            if ($tokens[$i]['code'] === T_CLOSE_TAG) {
-                if ($this->_debug === true) {
-                    $line = $tokens[$i]['line'];
-                    echo "Close PHP tag found on line $line".PHP_EOL;
+            if ( $tokens[ $i ][ 'code' ] === T_CLOSE_TAG ) {
+                if ( $this->_debug === true ) {
+                    $line = $tokens[ $i ][ 'line' ];
+                    echo "Close PHP tag found on line $line" . PHP_EOL;
                 }
 
-                if ($tokens[$lastOpenTag]['line'] !== $tokens[$i]['line']) {
-                    $currentIndent = ($tokens[$i]['column'] - 1);
+                if ( $tokens[ $lastOpenTag ][ 'line' ] !== $tokens[ $i ][ 'line' ] ) {
+                    $currentIndent = ( $tokens[ $i ][ 'column' ] - 1 );
                     $lastCloseTag  = $i;
                 } else {
-                    if ($lastCloseTag === null) {
+                    if ( $lastCloseTag === null ) {
                         $currentIndent = 0;
                     } else {
-                        $currentIndent = ($tokens[$lastCloseTag]['column'] - 1);
+                        $currentIndent = ( $tokens[ $lastCloseTag ][ 'column' ] - 1 );
                     }
                 }
 
-                if (isset($adjustments[$i]) === true) {
-                    $currentIndent += $adjustments[$i];
+                if ( isset( $adjustments[ $i ] ) === true ) {
+                    $currentIndent += $adjustments[ $i ];
                 }
 
                 // Make sure it is divisible by our expected indent.
-                $currentIndent  = (int) (ceil($currentIndent / $this->indent) * $this->indent);
-                $setIndents[$i] = $currentIndent;
+                $currentIndent  = (int) ( ceil( $currentIndent / $this->indent ) * $this->indent );
+                $setIndents[ $i ] = $currentIndent;
 
-                if ($this->_debug === true) {
-                    $type = $tokens[$i]['type'];
-                    echo "\t=> indent set to $currentIndent by token $i ($type)".PHP_EOL;
+                if ( $this->_debug === true ) {
+                    $type = $tokens[ $i ][ 'type' ];
+                    echo "\t=> indent set to $currentIndent by token $i ($type)" . PHP_EOL;
                 }
 
                 continue;
             }//end if
 
             // Anon classes and functions set the indent based on their own indent level.
-            if ($tokens[$i]['code'] === T_CLOSURE || $tokens[$i]['code'] === T_ANON_CLASS) {
-                $closer = $tokens[$i]['scope_closer'];
-                if ($tokens[$i]['line'] === $tokens[$closer]['line']) {
-                    if ($this->_debug === true) {
-                        $type = str_replace('_', ' ', strtolower(substr($tokens[$i]['type'], 2)));
-                        $line = $tokens[$i]['line'];
-                        echo "* ignoring single-line $type on line $line".PHP_EOL;
+            if ( $tokens[ $i ][ 'code' ] === T_CLOSURE || $tokens[ $i ][ 'code' ] === T_ANON_CLASS ) {
+                $closer = $tokens[ $i ][ 'scope_closer' ];
+                if ( $tokens[ $i ][ 'line' ] === $tokens[ $closer ][ 'line' ] ) {
+                    if ( $this->_debug === true ) {
+                        $type = str_replace( '_', ' ', strtolower( substr( $tokens[ $i ][ 'type' ], 2 ) ) );
+                        $line = $tokens[ $i ][ 'line' ];
+                        echo "* ignoring single-line $type on line $line" . PHP_EOL;
                     }
 
                     $i = $closer;
                     continue;
                 }
 
-                if ($this->_debug === true) {
-                    $type = str_replace('_', ' ', strtolower(substr($tokens[$i]['type'], 2)));
-                    $line = $tokens[$i]['line'];
-                    echo "Open $type on line $line".PHP_EOL;
+                if ( $this->_debug === true ) {
+                    $type = str_replace( '_', ' ', strtolower( substr( $tokens[ $i ][ 'type' ], 2 ) ) );
+                    $line = $tokens[ $i ][ 'line' ];
+                    echo "Open $type on line $line" . PHP_EOL;
                 }
 
-                $first         = $phpcsFile->findFirstOnLine(T_WHITESPACE, $i, true);
-                $currentIndent = (($tokens[$first]['column'] - 1) + $this->indent);
+                $first         = $phpcsFile->findFirstOnLine( T_WHITESPACE, $i, true );
+                $currentIndent = ( ( $tokens[ $first ][ 'column' ] - 1 ) + $this->indent );
 
-                if (isset($adjustments[$first]) === true) {
-                    $currentIndent += $adjustments[$first];
+                if ( isset( $adjustments[ $first ] ) === true ) {
+                    $currentIndent += $adjustments[ $first ];
                 }
 
                 // Make sure it is divisible by our expected indent.
-                $currentIndent = (int) (floor($currentIndent / $this->indent) * $this->indent);
-                $i = $tokens[$i]['scope_opener'];
-                $setIndents[$i] = $currentIndent;
+                $currentIndent = (int) ( floor( $currentIndent / $this->indent ) * $this->indent );
+                $i = $tokens[ $i ][ 'scope_opener' ];
+                $setIndents[ $i ] = $currentIndent;
 
-                if ($this->_debug === true) {
-                    $type = $tokens[$i]['type'];
-                    echo "\t=> indent set to $currentIndent by token $i ($type)".PHP_EOL;
+                if ( $this->_debug === true ) {
+                    $type = $tokens[ $i ][ 'type' ];
+                    echo "\t=> indent set to $currentIndent by token $i ($type)" . PHP_EOL;
                 }
 
                 continue;
             }//end if
 
             // Scope openers increase the indent level.
-            if (isset($tokens[$i]['scope_condition']) === true
-                && isset($tokens[$i]['scope_opener']) === true
-                && $tokens[$i]['scope_opener'] === $i
+            if ( isset( $tokens[ $i ][ 'scope_condition' ] ) === true
+                && isset( $tokens[ $i ][ 'scope_opener' ] ) === true
+                && $tokens[ $i ][ 'scope_opener' ] === $i
             ) {
-                $closer = $tokens[$i]['scope_closer'];
-                if ($tokens[$i]['line'] === $tokens[$closer]['line']) {
-                    if ($this->_debug === true) {
-                        $line = $tokens[$i]['line'];
-                        $type = $tokens[$i]['type'];
-                        echo "* ignoring single-line $type on line $line".PHP_EOL;
+                $closer = $tokens[ $i ][ 'scope_closer' ];
+                if ( $tokens[ $i ][ 'line' ] === $tokens[ $closer ][ 'line' ] ) {
+                    if ( $this->_debug === true ) {
+                        $line = $tokens[ $i ][ 'line' ];
+                        $type = $tokens[ $i ][ 'type' ];
+                        echo "* ignoring single-line $type on line $line" . PHP_EOL;
                     }
 
                     $i = $closer;
                     continue;
                 }
 
-                $condition = $tokens[$tokens[$i]['scope_condition']]['code'];
-                if (isset(PHP_CodeSniffer_Tokens::$scopeOpeners[$condition]) === true
-                    && in_array($condition, $this->nonIndentingScopes) === false
+                $condition = $tokens[ $tokens[ $i ][ 'scope_condition' ] ][ 'code' ];
+                if ( isset( PHP_CodeSniffer_Tokens::$scopeOpeners[ $condition ] ) === true
+                    && in_array( $condition, $this->nonIndentingScopes ) === false
                 ) {
-                    if ($this->_debug === true) {
-                        $line = $tokens[$i]['line'];
-                        $type = $tokens[$tokens[$i]['scope_condition']]['type'];
-                        echo "Open scope ($type) on line $line".PHP_EOL;
+                    if ( $this->_debug === true ) {
+                        $line = $tokens[ $i ][ 'line' ];
+                        $type = $tokens[ $tokens[ $i ][ 'scope_condition' ] ][ 'type' ];
+                        echo "Open scope ($type) on line $line" . PHP_EOL;
                     }
 
                     $currentIndent += $this->indent;
-                    $setIndents[$i] = $currentIndent;
-                    $openScopes[$tokens[$i]['scope_closer']] = $tokens[$i]['scope_condition'];
+                    $setIndents[ $i ] = $currentIndent;
+                    $openScopes[ $tokens[ $i ][ 'scope_closer' ] ] = $tokens[ $i ][ 'scope_condition' ];
 
-                    if ($this->_debug === true) {
-                        $type = $tokens[$i]['type'];
-                        echo "\t=> indent set to $currentIndent by token $i ($type)".PHP_EOL;
+                    if ( $this->_debug === true ) {
+                        $type = $tokens[ $i ][ 'type' ];
+                        echo "\t=> indent set to $currentIndent by token $i ($type)" . PHP_EOL;
                     }
 
                     continue;
@@ -1060,118 +1060,118 @@ 
             }//end if
 
             // JS objects set the indent level.
-            if ($phpcsFile->tokenizerType === 'JS'
-                && $tokens[$i]['code'] === T_OBJECT
+            if ( $phpcsFile->tokenizerType === 'JS'
+                && $tokens[ $i ][ 'code' ] === T_OBJECT
             ) {
-                $closer = $tokens[$i]['bracket_closer'];
-                if ($tokens[$i]['line'] === $tokens[$closer]['line']) {
-                    if ($this->_debug === true) {
-                        $line = $tokens[$i]['line'];
-                        echo "* ignoring single-line JS object on line $line".PHP_EOL;
+                $closer = $tokens[ $i ][ 'bracket_closer' ];
+                if ( $tokens[ $i ][ 'line' ] === $tokens[ $closer ][ 'line' ] ) {
+                    if ( $this->_debug === true ) {
+                        $line = $tokens[ $i ][ 'line' ];
+                        echo "* ignoring single-line JS object on line $line" . PHP_EOL;
                     }
 
                     $i = $closer;
                     continue;
                 }
 
-                if ($this->_debug === true) {
-                    $line = $tokens[$i]['line'];
-                    echo "Open JS object on line $line".PHP_EOL;
+                if ( $this->_debug === true ) {
+                    $line = $tokens[ $i ][ 'line' ];
+                    echo "Open JS object on line $line" . PHP_EOL;
                 }
 
-                $first         = $phpcsFile->findFirstOnLine(T_WHITESPACE, $i, true);
-                $currentIndent = (($tokens[$first]['column'] - 1) + $this->indent);
-                if (isset($adjustments[$first]) === true) {
-                    $currentIndent += $adjustments[$first];
+                $first         = $phpcsFile->findFirstOnLine( T_WHITESPACE, $i, true );
+                $currentIndent = ( ( $tokens[ $first ][ 'column' ] - 1 ) + $this->indent );
+                if ( isset( $adjustments[ $first ] ) === true ) {
+                    $currentIndent += $adjustments[ $first ];
                 }
 
                 // Make sure it is divisible by our expected indent.
-                $currentIndent      = (int) (ceil($currentIndent / $this->indent) * $this->indent);
-                $setIndents[$first] = $currentIndent;
+                $currentIndent      = (int) ( ceil( $currentIndent / $this->indent ) * $this->indent );
+                $setIndents[ $first ] = $currentIndent;
 
-                if ($this->_debug === true) {
-                    $type = $tokens[$first]['type'];
-                    echo "\t=> indent set to $currentIndent by token $first ($type)".PHP_EOL;
+                if ( $this->_debug === true ) {
+                    $type = $tokens[ $first ][ 'type' ];
+                    echo "\t=> indent set to $currentIndent by token $first ($type)" . PHP_EOL;
                 }
 
                 continue;
             }//end if
 
             // Closing an anon class or function.
-            if (isset($tokens[$i]['scope_condition']) === true
-                && $tokens[$i]['scope_closer'] === $i
-                && ($tokens[$tokens[$i]['scope_condition']]['code'] === T_CLOSURE
-                || $tokens[$tokens[$i]['scope_condition']]['code'] === T_ANON_CLASS)
+            if ( isset( $tokens[ $i ][ 'scope_condition' ] ) === true
+                && $tokens[ $i ][ 'scope_closer' ] === $i
+                && ( $tokens[ $tokens[ $i ][ 'scope_condition' ] ][ 'code' ] === T_CLOSURE
+                || $tokens[ $tokens[ $i ][ 'scope_condition' ] ][ 'code' ] === T_ANON_CLASS )
             ) {
-                if ($this->_debug === true) {
-                    $type = str_replace('_', ' ', strtolower(substr($tokens[$tokens[$i]['scope_condition']]['type'], 2)));
-                    $line = $tokens[$i]['line'];
-                    echo "Close $type on line $line".PHP_EOL;
+                if ( $this->_debug === true ) {
+                    $type = str_replace( '_', ' ', strtolower( substr( $tokens[ $tokens[ $i ][ 'scope_condition' ] ][ 'type' ], 2 ) ) );
+                    $line = $tokens[ $i ][ 'line' ];
+                    echo "Close $type on line $line" . PHP_EOL;
                 }
 
                 $prev = false;
 
                 $object = 0;
-                if ($phpcsFile->tokenizerType === 'JS') {
-                    $conditions = $tokens[$i]['conditions'];
-                    krsort($conditions, SORT_NUMERIC);
-                    foreach ($conditions as $token => $condition) {
-                        if ($condition === T_OBJECT) {
+                if ( $phpcsFile->tokenizerType === 'JS' ) {
+                    $conditions = $tokens[ $i ][ 'conditions' ];
+                    krsort( $conditions, SORT_NUMERIC );
+                    foreach ( $conditions as $token => $condition ) {
+                        if ( $condition === T_OBJECT ) {
                             $object = $token;
                             break;
                         }
                     }
 
-                    if ($this->_debug === true && $object !== 0) {
-                        $line = $tokens[$object]['line'];
-                        echo "\t* token is inside JS object $object on line $line *".PHP_EOL;
+                    if ( $this->_debug === true && $object !== 0 ) {
+                        $line = $tokens[ $object ][ 'line' ];
+                        echo "\t* token is inside JS object $object on line $line *" . PHP_EOL;
                     }
                 }
 
                 $parens = 0;
-                if (isset($tokens[$i]['nested_parenthesis']) === true
-                    && empty($tokens[$i]['nested_parenthesis']) === false
+                if ( isset( $tokens[ $i ][ 'nested_parenthesis' ] ) === true
+                    && empty( $tokens[ $i ][ 'nested_parenthesis' ] ) === false
                 ) {
-                    end($tokens[$i]['nested_parenthesis']);
-                    $parens = key($tokens[$i]['nested_parenthesis']);
-                    if ($this->_debug === true) {
-                        $line = $tokens[$parens]['line'];
-                        echo "\t* token has nested parenthesis $parens on line $line *".PHP_EOL;
+                    end( $tokens[ $i ][ 'nested_parenthesis' ] );
+                    $parens = key( $tokens[ $i ][ 'nested_parenthesis' ] );
+                    if ( $this->_debug === true ) {
+                        $line = $tokens[ $parens ][ 'line' ];
+                        echo "\t* token has nested parenthesis $parens on line $line *" . PHP_EOL;
                     }
                 }
 
                 $condition = 0;
-                if (isset($tokens[$i]['conditions']) === true
-                    && empty($tokens[$i]['conditions']) === false
+                if ( isset( $tokens[ $i ][ 'conditions' ] ) === true
+                    && empty( $tokens[ $i ][ 'conditions' ] ) === false
                 ) {
-                    end($tokens[$i]['conditions']);
-                    $condition = key($tokens[$i]['conditions']);
-                    if ($this->_debug === true) {
-                        $line = $tokens[$condition]['line'];
-                        $type = $tokens[$condition]['type'];
-                        echo "\t* token is inside condition $condition ($type) on line $line *".PHP_EOL;
+                    end( $tokens[ $i ][ 'conditions' ] );
+                    $condition = key( $tokens[ $i ][ 'conditions' ] );
+                    if ( $this->_debug === true ) {
+                        $line = $tokens[ $condition ][ 'line' ];
+                        $type = $tokens[ $condition ][ 'type' ];
+                        echo "\t* token is inside condition $condition ($type) on line $line *" . PHP_EOL;
                     }
                 }
 
-                if ($parens > $object && $parens > $condition) {
-                    if ($this->_debug === true) {
-                        echo "\t* using parenthesis *".PHP_EOL;
+                if ( $parens > $object && $parens > $condition ) {
+                    if ( $this->_debug === true ) {
+                        echo "\t* using parenthesis *" . PHP_EOL;
                     }
 
-                    $prev      = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$emptyTokens, ($parens - 1), null, true);
+                    $prev      = $phpcsFile->findPrevious( PHP_CodeSniffer_Tokens::$emptyTokens, ( $parens - 1 ), null, true );
                     $object    = 0;
                     $condition = 0;
-                } else if ($object > 0 && $object >= $condition) {
-                    if ($this->_debug === true) {
-                        echo "\t* using object *".PHP_EOL;
+                } else if ( $object > 0 && $object >= $condition ) {
+                    if ( $this->_debug === true ) {
+                        echo "\t* using object *" . PHP_EOL;
                     }
 
                     $prev      = $object;
                     $parens    = 0;
                     $condition = 0;
-                } else if ($condition > 0) {
-                    if ($this->_debug === true) {
-                        echo "\t* using condition *".PHP_EOL;
+                } else if ( $condition > 0 ) {
+                    if ( $this->_debug === true ) {
+                        echo "\t* using condition *" . PHP_EOL;
                     }
 
                     $prev   = $condition;
@@ -1179,72 +1179,72 @@ 
                     $parens = 0;
                 }//end if
 
-                if ($prev === false) {
-                    $prev = $phpcsFile->findPrevious(array(T_EQUAL, T_RETURN), ($tokens[$i]['scope_condition'] - 1), null, false, null, true);
-                    if ($prev === false) {
+                if ( $prev === false ) {
+                    $prev = $phpcsFile->findPrevious( array( T_EQUAL, T_RETURN ), ( $tokens[ $i ][ 'scope_condition' ] - 1 ), null, false, null, true );
+                    if ( $prev === false ) {
                         $prev = $i;
-                        if ($this->_debug === true) {
-                            echo "\t* could not find a previous T_EQUAL or T_RETURN token; will use current token *".PHP_EOL;
+                        if ( $this->_debug === true ) {
+                            echo "\t* could not find a previous T_EQUAL or T_RETURN token; will use current token *" . PHP_EOL;
                         }
                     }
                 }
 
-                if ($this->_debug === true) {
-                    $line = $tokens[$prev]['line'];
-                    $type = $tokens[$prev]['type'];
-                    echo "\t* previous token is $type on line $line *".PHP_EOL;
+                if ( $this->_debug === true ) {
+                    $line = $tokens[ $prev ][ 'line' ];
+                    $type = $tokens[ $prev ][ 'type' ];
+                    echo "\t* previous token is $type on line $line *" . PHP_EOL;
                 }
 
-                $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $prev, true);
-                if ($this->_debug === true) {
-                    $line = $tokens[$first]['line'];
-                    $type = $tokens[$first]['type'];
-                    echo "\t* first token on line $line is $first ($type) *".PHP_EOL;
+                $first = $phpcsFile->findFirstOnLine( T_WHITESPACE, $prev, true );
+                if ( $this->_debug === true ) {
+                    $line = $tokens[ $first ][ 'line' ];
+                    $type = $tokens[ $first ][ 'type' ];
+                    echo "\t* first token on line $line is $first ($type) *" . PHP_EOL;
                 }
 
-                $prev = $phpcsFile->findStartOfStatement($first);
-                if ($prev !== $first) {
+                $prev = $phpcsFile->findStartOfStatement( $first );
+                if ( $prev !== $first ) {
                     // This is not the start of the statement.
-                    if ($this->_debug === true) {
-                        $line = $tokens[$prev]['line'];
-                        $type = $tokens[$prev]['type'];
-                        echo "\t* amended previous is $type on line $line *".PHP_EOL;
+                    if ( $this->_debug === true ) {
+                        $line = $tokens[ $prev ][ 'line' ];
+                        $type = $tokens[ $prev ][ 'type' ];
+                        echo "\t* amended previous is $type on line $line *" . PHP_EOL;
                     }
 
-                    $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $prev, true);
-                    if ($this->_debug === true) {
-                        $line = $tokens[$first]['line'];
-                        $type = $tokens[$first]['type'];
-                        echo "\t* amended first token is $first ($type) on line $line *".PHP_EOL;
+                    $first = $phpcsFile->findFirstOnLine( T_WHITESPACE, $prev, true );
+                    if ( $this->_debug === true ) {
+                        $line = $tokens[ $first ][ 'line' ];
+                        $type = $tokens[ $first ][ 'type' ];
+                        echo "\t* amended first token is $first ($type) on line $line *" . PHP_EOL;
                     }
                 }
 
-                $currentIndent = ($tokens[$first]['column'] - 1);
-                if ($object > 0 || $condition > 0) {
+                $currentIndent = ( $tokens[ $first ][ 'column' ] - 1 );
+                if ( $object > 0 || $condition > 0 ) {
                     $currentIndent += $this->indent;
                 }
 
-                if (isset($tokens[$first]['scope_closer']) === true
-                    && $tokens[$first]['scope_closer'] === $first
+                if ( isset( $tokens[ $first ][ 'scope_closer' ] ) === true
+                    && $tokens[ $first ][ 'scope_closer' ] === $first
                 ) {
-                    if ($this->_debug === true) {
-                        echo "\t* first token is a scope closer *".PHP_EOL;
+                    if ( $this->_debug === true ) {
+                        echo "\t* first token is a scope closer *" . PHP_EOL;
                     }
 
-                    if ($condition === 0 || $tokens[$condition]['scope_opener'] < $first) {
-                        $currentIndent = $setIndents[$first];
-                    } else if ($this->_debug === true) {
-                        echo "\t* ignoring scope closer *".PHP_EOL;
+                    if ( $condition === 0 || $tokens[ $condition ][ 'scope_opener' ] < $first ) {
+                        $currentIndent = $setIndents[ $first ];
+                    } else if ( $this->_debug === true ) {
+                        echo "\t* ignoring scope closer *" . PHP_EOL;
                     }
                 }
 
                 // Make sure it is divisible by our expected indent.
-                $currentIndent      = (int) (ceil($currentIndent / $this->indent) * $this->indent);
-                $setIndents[$first] = $currentIndent;
+                $currentIndent      = (int) ( ceil( $currentIndent / $this->indent ) * $this->indent );
+                $setIndents[ $first ] = $currentIndent;
 
-                if ($this->_debug === true) {
-                    $type = $tokens[$first]['type'];
-                    echo "\t=> indent set to $currentIndent by token $first ($type)".PHP_EOL;
+                if ( $this->_debug === true ) {
+                    $type = $tokens[ $first ][ 'type' ];
+                    echo "\t=> indent set to $currentIndent by token $first ($type)" . PHP_EOL;
                 }
             }//end if
         }//end for

Braces +3 added lines, -6 removed lines

@@ -29,8 +29,7 @@ 
  * @version   Release: @package_version@
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
-class Generic_Sniffs_WhiteSpace_ScopeIndentSniff implements PHP_CodeSniffer_Sniff
-{
+class Generic_Sniffs_WhiteSpace_ScopeIndentSniff implements PHP_CodeSniffer_Sniff {
 
     /**
      * A list of tokenizers this sniff supports.
@@ -119,8 +118,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         if (defined('PHP_CODESNIFFER_IN_TESTS') === true) {
             $this->_debug = false;
         }
@@ -139,8 +137,7 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         $debug = PHP_CodeSniffer::getConfigData('scope_indent_debug');
         if ($debug !== null) {
             $this->_debug = (bool) $debug;

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Channels/DisallowSelfActionsSniff.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +103 added lines, -103 removed lines

@@ -27,109 +27,109 @@
 {
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(T_CLASS);
-
-    }//end register()
-
-
-    /**
-     * Processes this sniff, when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                  $stackPtr  The position of the current token in
-     *                                        the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // We are not interested in abstract classes.
-        $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
-        if ($prev !== false && $tokens[$prev]['code'] === T_ABSTRACT) {
-            return;
-        }
-
-        // We are only interested in Action classes.
-        $classNameToken = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-        $className      = $tokens[$classNameToken]['content'];
-        if (substr($className, -7) !== 'Actions') {
-            return;
-        }
-
-        $foundFunctions = array();
-        $foundCalls     = array();
-
-        // Find all static method calls in the form self::method() in the class.
-        $classEnd = $tokens[$stackPtr]['scope_closer'];
-        for ($i = ($classNameToken + 1); $i < $classEnd; $i++) {
-            if ($tokens[$i]['code'] !== T_DOUBLE_COLON) {
-                if ($tokens[$i]['code'] === T_FUNCTION) {
-                    // Cache the function information.
-                    $funcName  = $phpcsFile->findNext(T_STRING, ($i + 1));
-                    $funcScope = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$scopeModifiers, ($i - 1));
-
-                    $foundFunctions[$tokens[$funcName]['content']] = strtolower($tokens[$funcScope]['content']);
-                }
-
-                continue;
-            }
-
-            $prevToken = $phpcsFile->findPrevious(T_WHITESPACE, ($i - 1), null, true);
-            if ($tokens[$prevToken]['content'] !== 'self'
-                && $tokens[$prevToken]['content'] !== 'static'
-            ) {
-                continue;
-            }
-
-            $funcNameToken = $phpcsFile->findNext(T_WHITESPACE, ($i + 1), null, true);
-            if ($tokens[$funcNameToken]['code'] === T_VARIABLE) {
-                // We are only interested in function calls.
-                continue;
-            }
-
-            $funcName = $tokens[$funcNameToken]['content'];
-
-            // We've found the function, now we need to find it and see if it is
-            // public, private or protected. If it starts with an underscore we
-            // can assume it is private.
-            if ($funcName{0} === '_') {
-                continue;
-            }
-
-            $foundCalls[$i] = array(
-                               'name' => $funcName,
-                               'type' => strtolower($tokens[$prevToken]['content']),
-                              );
-        }//end for
-
-        $errorClassName = substr($className, 0, -7);
-
-        foreach ($foundCalls as $token => $funcData) {
-            if (isset($foundFunctions[$funcData['name']]) === false) {
-                // Function was not in this class, might have come from the parent.
-                // Either way, we can't really check this.
-                continue;
-            } else if ($foundFunctions[$funcData['name']] === 'public') {
-                $type  = $funcData['type'];
-                $error = "Static calls to public methods in Action classes must not use the $type keyword; use %s::%s() instead";
-                $data  = array(
-                          $errorClassName,
-                          $funcName,
-                         );
-                $phpcsFile->addError($error, $token, 'Found'.ucfirst($funcData['type']), $data);
-            }
-        }
-
-    }//end process()
+	 /**
+	  * Returns an array of tokens this test wants to listen for.
+	  *
+	  * @return array
+	  */
+	 public function register()
+	 {
+		  return array(T_CLASS);
+
+	 }//end register()
+
+
+	 /**
+	  * Processes this sniff, when one of its tokens is encountered.
+	  *
+	  * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	  * @param int                  $stackPtr  The position of the current token in
+	  *                                        the stack passed in $tokens.
+	  *
+	  * @return void
+	  */
+	 public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+	 {
+		  $tokens = $phpcsFile->getTokens();
+
+		  // We are not interested in abstract classes.
+		  $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
+		  if ($prev !== false && $tokens[$prev]['code'] === T_ABSTRACT) {
+				return;
+		  }
+
+		  // We are only interested in Action classes.
+		  $classNameToken = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
+		  $className      = $tokens[$classNameToken]['content'];
+		  if (substr($className, -7) !== 'Actions') {
+				return;
+		  }
+
+		  $foundFunctions = array();
+		  $foundCalls     = array();
+
+		  // Find all static method calls in the form self::method() in the class.
+		  $classEnd = $tokens[$stackPtr]['scope_closer'];
+		  for ($i = ($classNameToken + 1); $i < $classEnd; $i++) {
+				if ($tokens[$i]['code'] !== T_DOUBLE_COLON) {
+					 if ($tokens[$i]['code'] === T_FUNCTION) {
+						  // Cache the function information.
+						  $funcName  = $phpcsFile->findNext(T_STRING, ($i + 1));
+						  $funcScope = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$scopeModifiers, ($i - 1));
+
+						  $foundFunctions[$tokens[$funcName]['content']] = strtolower($tokens[$funcScope]['content']);
+					 }
+
+					 continue;
+				}
+
+				$prevToken = $phpcsFile->findPrevious(T_WHITESPACE, ($i - 1), null, true);
+				if ($tokens[$prevToken]['content'] !== 'self'
+					 && $tokens[$prevToken]['content'] !== 'static'
+				) {
+					 continue;
+				}
+
+				$funcNameToken = $phpcsFile->findNext(T_WHITESPACE, ($i + 1), null, true);
+				if ($tokens[$funcNameToken]['code'] === T_VARIABLE) {
+					 // We are only interested in function calls.
+					 continue;
+				}
+
+				$funcName = $tokens[$funcNameToken]['content'];
+
+				// We've found the function, now we need to find it and see if it is
+				// public, private or protected. If it starts with an underscore we
+				// can assume it is private.
+				if ($funcName{0} === '_') {
+					 continue;
+				}
+
+				$foundCalls[$i] = array(
+										 'name' => $funcName,
+										 'type' => strtolower($tokens[$prevToken]['content']),
+										);
+		  }//end for
+
+		  $errorClassName = substr($className, 0, -7);
+
+		  foreach ($foundCalls as $token => $funcData) {
+				if (isset($foundFunctions[$funcData['name']]) === false) {
+					 // Function was not in this class, might have come from the parent.
+					 // Either way, we can't really check this.
+					 continue;
+				} else if ($foundFunctions[$funcData['name']] === 'public') {
+					 $type  = $funcData['type'];
+					 $error = "Static calls to public methods in Action classes must not use the $type keyword; use %s::%s() instead";
+					 $data  = array(
+								  $errorClassName,
+								  $funcName,
+								 );
+					 $phpcsFile->addError($error, $token, 'Found'.ucfirst($funcData['type']), $data);
+				}
+		  }
+
+	 }//end process()
 
 
 }//end class

Spacing +29 added lines, -29 removed lines

@@ -34,7 +34,7 @@ 
      */
     public function register()
     {
-        return array(T_CLASS);
+        return array( T_CLASS );
 
     }//end register()
 
@@ -48,20 +48,20 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
         // We are not interested in abstract classes.
-        $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
-        if ($prev !== false && $tokens[$prev]['code'] === T_ABSTRACT) {
+        $prev = $phpcsFile->findPrevious( T_WHITESPACE, ( $stackPtr - 1 ), null, true );
+        if ( $prev !== false && $tokens[ $prev ][ 'code' ] === T_ABSTRACT ) {
             return;
         }
 
         // We are only interested in Action classes.
-        $classNameToken = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-        $className      = $tokens[$classNameToken]['content'];
-        if (substr($className, -7) !== 'Actions') {
+        $classNameToken = $phpcsFile->findNext( T_WHITESPACE, ( $stackPtr + 1 ), null, true );
+        $className      = $tokens[ $classNameToken ][ 'content' ];
+        if ( substr( $className, -7 ) !== 'Actions' ) {
             return;
         }
 
@@ -69,63 +69,63 @@ 
         $foundCalls     = array();
 
         // Find all static method calls in the form self::method() in the class.
-        $classEnd = $tokens[$stackPtr]['scope_closer'];
-        for ($i = ($classNameToken + 1); $i < $classEnd; $i++) {
-            if ($tokens[$i]['code'] !== T_DOUBLE_COLON) {
-                if ($tokens[$i]['code'] === T_FUNCTION) {
+        $classEnd = $tokens[ $stackPtr ][ 'scope_closer' ];
+        for ( $i = ( $classNameToken + 1 ); $i < $classEnd; $i++ ) {
+            if ( $tokens[ $i ][ 'code' ] !== T_DOUBLE_COLON ) {
+                if ( $tokens[ $i ][ 'code' ] === T_FUNCTION ) {
                     // Cache the function information.
-                    $funcName  = $phpcsFile->findNext(T_STRING, ($i + 1));
-                    $funcScope = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$scopeModifiers, ($i - 1));
+                    $funcName  = $phpcsFile->findNext( T_STRING, ( $i + 1 ) );
+                    $funcScope = $phpcsFile->findPrevious( PHP_CodeSniffer_Tokens::$scopeModifiers, ( $i - 1 ) );
 
-                    $foundFunctions[$tokens[$funcName]['content']] = strtolower($tokens[$funcScope]['content']);
+                    $foundFunctions[ $tokens[ $funcName ][ 'content' ] ] = strtolower( $tokens[ $funcScope ][ 'content' ] );
                 }
 
                 continue;
             }
 
-            $prevToken = $phpcsFile->findPrevious(T_WHITESPACE, ($i - 1), null, true);
-            if ($tokens[$prevToken]['content'] !== 'self'
-                && $tokens[$prevToken]['content'] !== 'static'
+            $prevToken = $phpcsFile->findPrevious( T_WHITESPACE, ( $i - 1 ), null, true );
+            if ( $tokens[ $prevToken ][ 'content' ] !== 'self'
+                && $tokens[ $prevToken ][ 'content' ] !== 'static'
             ) {
                 continue;
             }
 
-            $funcNameToken = $phpcsFile->findNext(T_WHITESPACE, ($i + 1), null, true);
-            if ($tokens[$funcNameToken]['code'] === T_VARIABLE) {
+            $funcNameToken = $phpcsFile->findNext( T_WHITESPACE, ( $i + 1 ), null, true );
+            if ( $tokens[ $funcNameToken ][ 'code' ] === T_VARIABLE ) {
                 // We are only interested in function calls.
                 continue;
             }
 
-            $funcName = $tokens[$funcNameToken]['content'];
+            $funcName = $tokens[ $funcNameToken ][ 'content' ];
 
             // We've found the function, now we need to find it and see if it is
             // public, private or protected. If it starts with an underscore we
             // can assume it is private.
-            if ($funcName{0} === '_') {
+            if ( $funcName{0} === '_' ) {
                 continue;
             }
 
-            $foundCalls[$i] = array(
+            $foundCalls[ $i ] = array(
                                'name' => $funcName,
-                               'type' => strtolower($tokens[$prevToken]['content']),
+                               'type' => strtolower( $tokens[ $prevToken ][ 'content' ] ),
                               );
         }//end for
 
-        $errorClassName = substr($className, 0, -7);
+        $errorClassName = substr( $className, 0, -7 );
 
-        foreach ($foundCalls as $token => $funcData) {
-            if (isset($foundFunctions[$funcData['name']]) === false) {
+        foreach ( $foundCalls as $token => $funcData ) {
+            if ( isset( $foundFunctions[ $funcData[ 'name' ] ] ) === false ) {
                 // Function was not in this class, might have come from the parent.
                 // Either way, we can't really check this.
                 continue;
-            } else if ($foundFunctions[$funcData['name']] === 'public') {
-                $type  = $funcData['type'];
+            } else if ( $foundFunctions[ $funcData[ 'name' ] ] === 'public' ) {
+                $type  = $funcData[ 'type' ];
                 $error = "Static calls to public methods in Action classes must not use the $type keyword; use %s::%s() instead";
                 $data  = array(
                           $errorClassName,
                           $funcName,
                          );
-                $phpcsFile->addError($error, $token, 'Found'.ucfirst($funcData['type']), $data);
+                $phpcsFile->addError( $error, $token, 'Found' . ucfirst( $funcData[ 'type' ] ), $data );
             }
         }
 

Braces +3 added lines, -6 removed lines

@@ -23,8 +23,7 @@ 
  * @version   Release: @package_version@
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
-class MySource_Sniffs_Channels_DisallowSelfActionsSniff implements PHP_CodeSniffer_Sniff
-{
+class MySource_Sniffs_Channels_DisallowSelfActionsSniff implements PHP_CodeSniffer_Sniff {
 
 
     /**
@@ -32,8 +31,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(T_CLASS);
 
     }//end register()
@@ -48,8 +46,7 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         // We are not interested in abstract classes.

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Channels/IncludeOwnSystemSniff.php

Doc Comments +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return integer[]
      */
     public function register()
     {
@@ -93,7 +93,7 @@ 
      * @param int                  $stackPtr  The position in the tokens array of the
      *                                        potentially included class.
      *
-     * @return string
+     * @return boolean
      */
     protected function getIncludedClassFromToken(
         PHP_CodeSniffer_File $phpcsFile,

Indentation +77 added lines, -77 removed lines

@@ -27,83 +27,83 @@
 {
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(T_DOUBLE_COLON);
-
-    }//end register()
-
-
-    /**
-     * Processes this sniff, when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                  $stackPtr  The position of the current token in
-     *                                        the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $fileName = $phpcsFile->getFilename();
-        $matches  = array();
-        if (preg_match('|/systems/(.*)/([^/]+)?actions.inc$|i', $fileName, $matches) === 0) {
-            // Not an actions file.
-            return;
-        }
-
-        $ownClass = $matches[2];
-        $tokens   = $phpcsFile->getTokens();
-
-        $typeName = $phpcsFile->findNext(T_CONSTANT_ENCAPSED_STRING, ($stackPtr + 2), null, false, true);
-        $typeName = trim($tokens[$typeName]['content'], " '");
-        switch (strtolower($tokens[($stackPtr + 1)]['content'])) {
-        case 'includesystem' :
-            $included = strtolower($typeName);
-            break;
-        case 'includeasset' :
-            $included = strtolower($typeName).'assettype';
-            break;
-        case 'includewidget' :
-            $included = strtolower($typeName).'widgettype';
-            break;
-        default:
-            return;
-        }
-
-        if ($included === strtolower($ownClass)) {
-            $error = "You do not need to include \"%s\" from within the system's own actions file";
-            $data  = array($ownClass);
-            $phpcsFile->addError($error, $stackPtr, 'NotRequired', $data);
-        }
-
-    }//end process()
-
-
-    /**
-     * Determines the included class name from given token.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file where this token was found.
-     * @param array                $tokens    The array of file tokens.
-     * @param int                  $stackPtr  The position in the tokens array of the
-     *                                        potentially included class.
-     *
-     * @return string
-     */
-    protected function getIncludedClassFromToken(
-        PHP_CodeSniffer_File $phpcsFile,
-        array $tokens,
-        $stackPtr
-    ) {
-
-        return false;
-
-    }//end getIncludedClassFromToken()
+	 /**
+	  * Returns an array of tokens this test wants to listen for.
+	  *
+	  * @return array
+	  */
+	 public function register()
+	 {
+		  return array(T_DOUBLE_COLON);
+
+	 }//end register()
+
+
+	 /**
+	  * Processes this sniff, when one of its tokens is encountered.
+	  *
+	  * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	  * @param int                  $stackPtr  The position of the current token in
+	  *                                        the stack passed in $tokens.
+	  *
+	  * @return void
+	  */
+	 public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+	 {
+		  $fileName = $phpcsFile->getFilename();
+		  $matches  = array();
+		  if (preg_match('|/systems/(.*)/([^/]+)?actions.inc$|i', $fileName, $matches) === 0) {
+				// Not an actions file.
+				return;
+		  }
+
+		  $ownClass = $matches[2];
+		  $tokens   = $phpcsFile->getTokens();
+
+		  $typeName = $phpcsFile->findNext(T_CONSTANT_ENCAPSED_STRING, ($stackPtr + 2), null, false, true);
+		  $typeName = trim($tokens[$typeName]['content'], " '");
+		  switch (strtolower($tokens[($stackPtr + 1)]['content'])) {
+		  case 'includesystem' :
+				$included = strtolower($typeName);
+				break;
+		  case 'includeasset' :
+				$included = strtolower($typeName).'assettype';
+				break;
+		  case 'includewidget' :
+				$included = strtolower($typeName).'widgettype';
+				break;
+		  default:
+				return;
+		  }
+
+		  if ($included === strtolower($ownClass)) {
+				$error = "You do not need to include \"%s\" from within the system's own actions file";
+				$data  = array($ownClass);
+				$phpcsFile->addError($error, $stackPtr, 'NotRequired', $data);
+		  }
+
+	 }//end process()
+
+
+	 /**
+	  * Determines the included class name from given token.
+	  *
+	  * @param PHP_CodeSniffer_File $phpcsFile The file where this token was found.
+	  * @param array                $tokens    The array of file tokens.
+	  * @param int                  $stackPtr  The position in the tokens array of the
+	  *                                        potentially included class.
+	  *
+	  * @return string
+	  */
+	 protected function getIncludedClassFromToken(
+		  PHP_CodeSniffer_File $phpcsFile,
+		  array $tokens,
+		  $stackPtr
+	 ) {
+
+		  return false;
+
+	 }//end getIncludedClassFromToken()
 
 
 }//end class

Switch Indentation +11 added lines, -11 removed lines

@@ -63,17 +63,17 @@
         $typeName = $phpcsFile->findNext(T_CONSTANT_ENCAPSED_STRING, ($stackPtr + 2), null, false, true);
         $typeName = trim($tokens[$typeName]['content'], " '");
         switch (strtolower($tokens[($stackPtr + 1)]['content'])) {
-        case 'includesystem' :
-            $included = strtolower($typeName);
-            break;
-        case 'includeasset' :
-            $included = strtolower($typeName).'assettype';
-            break;
-        case 'includewidget' :
-            $included = strtolower($typeName).'widgettype';
-            break;
-        default:
-            return;
+        	case 'includesystem' :
+            	$included = strtolower($typeName);
+            	break;
+        	case 'includeasset' :
+            	$included = strtolower($typeName).'assettype';
+            	break;
+        	case 'includewidget' :
+            	$included = strtolower($typeName).'widgettype';
+            	break;
+        	default:
+            	return;
         }
 
         if ($included === strtolower($ownClass)) {

Spacing +13 added lines, -13 removed lines

@@ -34,7 +34,7 @@ 
      */
     public function register()
     {
-        return array(T_DOUBLE_COLON);
+        return array( T_DOUBLE_COLON );
 
     }//end register()
 
@@ -48,38 +48,38 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $fileName = $phpcsFile->getFilename();
         $matches  = array();
-        if (preg_match('|/systems/(.*)/([^/]+)?actions.inc$|i', $fileName, $matches) === 0) {
+        if ( preg_match( '|/systems/(.*)/([^/]+)?actions.inc$|i', $fileName, $matches ) === 0 ) {
             // Not an actions file.
             return;
         }
 
-        $ownClass = $matches[2];
+        $ownClass = $matches[ 2 ];
         $tokens   = $phpcsFile->getTokens();
 
-        $typeName = $phpcsFile->findNext(T_CONSTANT_ENCAPSED_STRING, ($stackPtr + 2), null, false, true);
-        $typeName = trim($tokens[$typeName]['content'], " '");
-        switch (strtolower($tokens[($stackPtr + 1)]['content'])) {
+        $typeName = $phpcsFile->findNext( T_CONSTANT_ENCAPSED_STRING, ( $stackPtr + 2 ), null, false, true );
+        $typeName = trim( $tokens[ $typeName ][ 'content' ], " '" );
+        switch ( strtolower( $tokens[ ( $stackPtr + 1 ) ][ 'content' ] ) ) {
         case 'includesystem' :
-            $included = strtolower($typeName);
+            $included = strtolower( $typeName );
             break;
         case 'includeasset' :
-            $included = strtolower($typeName).'assettype';
+            $included = strtolower( $typeName ) . 'assettype';
             break;
         case 'includewidget' :
-            $included = strtolower($typeName).'widgettype';
+            $included = strtolower( $typeName ) . 'widgettype';
             break;
         default:
             return;
         }
 
-        if ($included === strtolower($ownClass)) {
+        if ( $included === strtolower( $ownClass ) ) {
             $error = "You do not need to include \"%s\" from within the system's own actions file";
-            $data  = array($ownClass);
-            $phpcsFile->addError($error, $stackPtr, 'NotRequired', $data);
+            $data  = array( $ownClass );
+            $phpcsFile->addError( $error, $stackPtr, 'NotRequired', $data );
         }
 
     }//end process()

Braces +3 added lines, -6 removed lines

@@ -23,8 +23,7 @@ 
  * @version   Release: @package_version@
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
-class MySource_Sniffs_Channels_IncludeOwnSystemSniff implements PHP_CodeSniffer_Sniff
-{
+class MySource_Sniffs_Channels_IncludeOwnSystemSniff implements PHP_CodeSniffer_Sniff {
 
 
     /**
@@ -32,8 +31,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(T_DOUBLE_COLON);
 
     }//end register()
@@ -48,8 +46,7 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         $fileName = $phpcsFile->getFilename();
         $matches  = array();
         if (preg_match('|/systems/(.*)/([^/]+)?actions.inc$|i', $fileName, $matches) === 0) {

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Objects/AssignThisSniff.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +51 added lines, -51 removed lines

@@ -26,67 +26,67 @@
 class MySource_Sniffs_Objects_AssignThisSniff implements PHP_CodeSniffer_Sniff
 {
 
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = array('JS');
+	 /**
+	  * A list of tokenizers this sniff supports.
+	  *
+	  * @var array
+	  */
+	 public $supportedTokenizers = array('JS');
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(T_THIS);
+	 /**
+	  * Returns an array of tokens this test wants to listen for.
+	  *
+	  * @return array
+	  */
+	 public function register()
+	 {
+		  return array(T_THIS);
 
-    }//end register()
+	 }//end register()
 
 
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
+	 /**
+	  * Processes this test, when one of its tokens is encountered.
+	  *
+	  * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	  * @param int                  $stackPtr  The position of the current token
+	  *                                        in the stack passed in $tokens.
+	  *
+	  * @return void
+	  */
+	 public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+	 {
+		  $tokens = $phpcsFile->getTokens();
 
-        // Ignore this.something and other uses of "this" that are not
-        // direct assignments.
-        $next = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-        if ($tokens[$next]['code'] !== T_SEMICOLON) {
-            if ($tokens[$next]['line'] === $tokens[$stackPtr]['line']) {
-                return;
-            }
-        }
+		  // Ignore this.something and other uses of "this" that are not
+		  // direct assignments.
+		  $next = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
+		  if ($tokens[$next]['code'] !== T_SEMICOLON) {
+				if ($tokens[$next]['line'] === $tokens[$stackPtr]['line']) {
+					 return;
+				}
+		  }
 
-        // Something must be assigned to "this".
-        $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
-        if ($tokens[$prev]['code'] !== T_EQUAL) {
-            return;
-        }
+		  // Something must be assigned to "this".
+		  $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
+		  if ($tokens[$prev]['code'] !== T_EQUAL) {
+				return;
+		  }
 
-        // A variable needs to be assigned to "this".
-        $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($prev - 1), null, true);
-        if ($tokens[$prev]['code'] !== T_STRING) {
-            return;
-        }
+		  // A variable needs to be assigned to "this".
+		  $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($prev - 1), null, true);
+		  if ($tokens[$prev]['code'] !== T_STRING) {
+				return;
+		  }
 
-        // We can only assign "this" to a var called "self".
-        if ($tokens[$prev]['content'] !== 'self' && $tokens[$prev]['content'] !== '_self') {
-            $error = 'Keyword "this" can only be assigned to a variable called "self" or "_self"';
-            $phpcsFile->addError($error, $prev, 'NotSelf');
-        }
+		  // We can only assign "this" to a var called "self".
+		  if ($tokens[$prev]['content'] !== 'self' && $tokens[$prev]['content'] !== '_self') {
+				$error = 'Keyword "this" can only be assigned to a variable called "self" or "_self"';
+				$phpcsFile->addError($error, $prev, 'NotSelf');
+		  }
 
-    }//end process()
+	 }//end process()
 
 
 }//end class

Spacing +12 added lines, -12 removed lines

@@ -31,7 +31,7 @@ 
      *
      * @var array
      */
-    public $supportedTokenizers = array('JS');
+    public $supportedTokenizers = array( 'JS' );
 
 
     /**
@@ -41,7 +41,7 @@ 
      */
     public function register()
     {
-        return array(T_THIS);
+        return array( T_THIS );
 
     }//end register()
 
@@ -55,35 +55,35 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
         // Ignore this.something and other uses of "this" that are not
         // direct assignments.
-        $next = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-        if ($tokens[$next]['code'] !== T_SEMICOLON) {
-            if ($tokens[$next]['line'] === $tokens[$stackPtr]['line']) {
+        $next = $phpcsFile->findNext( T_WHITESPACE, ( $stackPtr + 1 ), null, true );
+        if ( $tokens[ $next ][ 'code' ] !== T_SEMICOLON ) {
+            if ( $tokens[ $next ][ 'line' ] === $tokens[ $stackPtr ][ 'line' ] ) {
                 return;
             }
         }
 
         // Something must be assigned to "this".
-        $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
-        if ($tokens[$prev]['code'] !== T_EQUAL) {
+        $prev = $phpcsFile->findPrevious( T_WHITESPACE, ( $stackPtr - 1 ), null, true );
+        if ( $tokens[ $prev ][ 'code' ] !== T_EQUAL ) {
             return;
         }
 
         // A variable needs to be assigned to "this".
-        $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($prev - 1), null, true);
-        if ($tokens[$prev]['code'] !== T_STRING) {
+        $prev = $phpcsFile->findPrevious( T_WHITESPACE, ( $prev - 1 ), null, true );
+        if ( $tokens[ $prev ][ 'code' ] !== T_STRING ) {
             return;
         }
 
         // We can only assign "this" to a var called "self".
-        if ($tokens[$prev]['content'] !== 'self' && $tokens[$prev]['content'] !== '_self') {
+        if ( $tokens[ $prev ][ 'content' ] !== 'self' && $tokens[ $prev ][ 'content' ] !== '_self' ) {
             $error = 'Keyword "this" can only be assigned to a variable called "self" or "_self"';
-            $phpcsFile->addError($error, $prev, 'NotSelf');
+            $phpcsFile->addError( $error, $prev, 'NotSelf' );
         }
 
     }//end process()

Braces +3 added lines, -6 removed lines

@@ -23,8 +23,7 @@ 
  * @version   Release: @package_version@
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
-class MySource_Sniffs_Objects_AssignThisSniff implements PHP_CodeSniffer_Sniff
-{
+class MySource_Sniffs_Objects_AssignThisSniff implements PHP_CodeSniffer_Sniff {
 
     /**
      * A list of tokenizers this sniff supports.
@@ -39,8 +38,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(T_THIS);
 
     }//end register()
@@ -55,8 +53,7 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         // Ignore this.something and other uses of "this" that are not

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Objects/CreateWidgetTypeCallbackSniff.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +188 added lines, -188 removed lines

@@ -26,68 +26,68 @@ 
 class MySource_Sniffs_Objects_CreateWidgetTypeCallbackSniff implements PHP_CodeSniffer_Sniff
 {
 
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = array('JS');
-
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(T_OBJECT);
-
-    }//end register()
-
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        $className = $phpcsFile->findPrevious(T_STRING, ($stackPtr - 1));
-        if (substr(strtolower($tokens[$className]['content']), -10) !== 'widgettype') {
-            return;
-        }
-
-        // Search for a create method.
-        $create = $phpcsFile->findNext(T_PROPERTY, $stackPtr, $tokens[$stackPtr]['bracket_closer'], null, 'create');
-        if ($create === false) {
-            return;
-        }
-
-        $function = $phpcsFile->findNext(array(T_WHITESPACE, T_COLON), ($create + 1), null, true);
-        if ($tokens[$function]['code'] !== T_FUNCTION
-            && $tokens[$function]['code'] !== T_CLOSURE
-        ) {
-            return;
-        }
-
-        $start = ($tokens[$function]['scope_opener'] + 1);
-        $end   = ($tokens[$function]['scope_closer'] - 1);
-
-        // Check that the first argument is called "callback".
-        $arg = $phpcsFile->findNext(T_WHITESPACE, ($tokens[$function]['parenthesis_opener'] + 1), null, true);
-        if ($tokens[$arg]['content'] !== 'callback') {
-            $error = 'The first argument of the create() method of a widget type must be called "callback"';
-            $phpcsFile->addError($error, $arg, 'FirstArgNotCallback');
-        }
-
-        /*
+	 /**
+	  * A list of tokenizers this sniff supports.
+	  *
+	  * @var array
+	  */
+	 public $supportedTokenizers = array('JS');
+
+
+	 /**
+	  * Returns an array of tokens this test wants to listen for.
+	  *
+	  * @return array
+	  */
+	 public function register()
+	 {
+		  return array(T_OBJECT);
+
+	 }//end register()
+
+
+	 /**
+	  * Processes this test, when one of its tokens is encountered.
+	  *
+	  * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	  * @param int                  $stackPtr  The position of the current token
+	  *                                        in the stack passed in $tokens.
+	  *
+	  * @return void
+	  */
+	 public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+	 {
+		  $tokens = $phpcsFile->getTokens();
+
+		  $className = $phpcsFile->findPrevious(T_STRING, ($stackPtr - 1));
+		  if (substr(strtolower($tokens[$className]['content']), -10) !== 'widgettype') {
+				return;
+		  }
+
+		  // Search for a create method.
+		  $create = $phpcsFile->findNext(T_PROPERTY, $stackPtr, $tokens[$stackPtr]['bracket_closer'], null, 'create');
+		  if ($create === false) {
+				return;
+		  }
+
+		  $function = $phpcsFile->findNext(array(T_WHITESPACE, T_COLON), ($create + 1), null, true);
+		  if ($tokens[$function]['code'] !== T_FUNCTION
+				&& $tokens[$function]['code'] !== T_CLOSURE
+		  ) {
+				return;
+		  }
+
+		  $start = ($tokens[$function]['scope_opener'] + 1);
+		  $end   = ($tokens[$function]['scope_closer'] - 1);
+
+		  // Check that the first argument is called "callback".
+		  $arg = $phpcsFile->findNext(T_WHITESPACE, ($tokens[$function]['parenthesis_opener'] + 1), null, true);
+		  if ($tokens[$arg]['content'] !== 'callback') {
+				$error = 'The first argument of the create() method of a widget type must be called "callback"';
+				$phpcsFile->addError($error, $arg, 'FirstArgNotCallback');
+		  }
+
+		  /*
             Look for return statements within the function. They cannot return
             anything and must be preceded by the callback.call() line. The
             callback itself must contain "self" or "this" as the first argument
@@ -96,132 +96,132 @@ 
             followed by a return statement or the end of the method.
         */
 
-        $foundCallback  = false;
-        $passedCallback = false;
-        $nestedFunction = null;
-        for ($i = $start; $i <= $end; $i++) {
-            // Keep track of nested functions.
-            if ($nestedFunction !== null) {
-                if ($i === $nestedFunction) {
-                    $nestedFunction = null;
-                    continue;
-                }
-            } else if (($tokens[$i]['code'] === T_FUNCTION
-                || $tokens[$i]['code'] === T_CLOSURE)
-                && isset($tokens[$i]['scope_closer']) === true
-            ) {
-                $nestedFunction = $tokens[$i]['scope_closer'];
-                continue;
-            }
-
-            if ($nestedFunction === null && $tokens[$i]['code'] === T_RETURN) {
-                // Make sure return statements are not returning anything.
-                if ($tokens[($i + 1)]['code'] !== T_SEMICOLON) {
-                    $error = 'The create() method of a widget type must not return a value';
-                    $phpcsFile->addError($error, $i, 'ReturnValue');
-                }
-
-                continue;
-            } else if ($tokens[$i]['code'] !== T_STRING
-                || $tokens[$i]['content'] !== 'callback'
-            ) {
-                continue;
-            }
-
-            // If this is the form "callback.call(" then it is a call
-            // to the callback function.
-            if ($tokens[($i + 1)]['code'] !== T_OBJECT_OPERATOR
-                || $tokens[($i + 2)]['content'] !== 'call'
-                || $tokens[($i + 3)]['code'] !== T_OPEN_PARENTHESIS
-            ) {
-                // One last chance; this might be the callback function
-                // being passed to another function, like this
-                // "this.init(something, callback, something)".
-                if (isset($tokens[$i]['nested_parenthesis']) === false) {
-                    continue;
-                }
-
-                // Just make sure those brackets dont belong to anyone,
-                // like an IF or FOR statement.
-                foreach ($tokens[$i]['nested_parenthesis'] as $bracket) {
-                    if (isset($tokens[$bracket]['parenthesis_owner']) === true) {
-                        continue(2);
-                    }
-                }
-
-                // Note that we use this endBracket down further when checking
-                // for a RETURN statement.
-                $endBracket = end($tokens[$i]['nested_parenthesis']);
-                $bracket    = key($tokens[$i]['nested_parenthesis']);
-
-                $prev = $phpcsFile->findPrevious(
-                    PHP_CodeSniffer_Tokens::$emptyTokens,
-                    ($bracket - 1),
-                    null,
-                    true
-                );
-
-                if ($tokens[$prev]['code'] !== T_STRING) {
-                    // This is not a function passing the callback.
-                    continue;
-                }
-
-                $passedCallback = true;
-            }//end if
-
-            $foundCallback = true;
-
-            if ($passedCallback === false) {
-                // The first argument must be "this" or "self".
-                $arg = $phpcsFile->findNext(T_WHITESPACE, ($i + 4), null, true);
-                if ($tokens[$arg]['content'] !== 'this'
-                    && $tokens[$arg]['content'] !== 'self'
-                ) {
-                    $error = 'The first argument passed to the callback function must be "this" or "self"';
-                    $phpcsFile->addError($error, $arg, 'FirstArgNotSelf');
-                }
-            }
-
-            // Now it must be followed by a return statement or the end of the function.
-            if ($passedCallback === false) {
-                $endBracket = $tokens[($i + 3)]['parenthesis_closer'];
-            }
-
-            for ($next = $endBracket; $next <= $end; $next++) {
-                // Skip whitespace so we find the next content after the call.
-                if (isset(PHP_CodeSniffer_Tokens::$emptyTokens[$tokens[$next]['code']]) === true) {
-                    continue;
-                }
-
-                // Skip closing braces like END IF because it is not executable code.
-                if ($tokens[$next]['code'] === T_CLOSE_CURLY_BRACKET) {
-                    continue;
-                }
-
-                // We don't care about anything on the current line, like a
-                // semicolon. It doesn't matter if there are other statements on the
-                // line because another sniff will check for those.
-                if ($tokens[$next]['line'] === $tokens[$endBracket]['line']) {
-                    continue;
-                }
-
-                break;
-            }
-
-            if ($next !== $tokens[$function]['scope_closer']
-                && $tokens[$next]['code'] !== T_RETURN
-            ) {
-                $error = 'The call to the callback function must be followed by a return statement if it is not the last statement in the create() method';
-                $phpcsFile->addError($error, $i, 'NoReturn');
-            }
-        }//end for
-
-        if ($foundCallback === false) {
-            $error = 'The create() method of a widget type must call the callback function';
-            $phpcsFile->addError($error, $create, 'CallbackNotCalled');
-        }
-
-    }//end process()
+		  $foundCallback  = false;
+		  $passedCallback = false;
+		  $nestedFunction = null;
+		  for ($i = $start; $i <= $end; $i++) {
+				// Keep track of nested functions.
+				if ($nestedFunction !== null) {
+					 if ($i === $nestedFunction) {
+						  $nestedFunction = null;
+						  continue;
+					 }
+				} else if (($tokens[$i]['code'] === T_FUNCTION
+					 || $tokens[$i]['code'] === T_CLOSURE)
+					 && isset($tokens[$i]['scope_closer']) === true
+				) {
+					 $nestedFunction = $tokens[$i]['scope_closer'];
+					 continue;
+				}
+
+				if ($nestedFunction === null && $tokens[$i]['code'] === T_RETURN) {
+					 // Make sure return statements are not returning anything.
+					 if ($tokens[($i + 1)]['code'] !== T_SEMICOLON) {
+						  $error = 'The create() method of a widget type must not return a value';
+						  $phpcsFile->addError($error, $i, 'ReturnValue');
+					 }
+
+					 continue;
+				} else if ($tokens[$i]['code'] !== T_STRING
+					 || $tokens[$i]['content'] !== 'callback'
+				) {
+					 continue;
+				}
+
+				// If this is the form "callback.call(" then it is a call
+				// to the callback function.
+				if ($tokens[($i + 1)]['code'] !== T_OBJECT_OPERATOR
+					 || $tokens[($i + 2)]['content'] !== 'call'
+					 || $tokens[($i + 3)]['code'] !== T_OPEN_PARENTHESIS
+				) {
+					 // One last chance; this might be the callback function
+					 // being passed to another function, like this
+					 // "this.init(something, callback, something)".
+					 if (isset($tokens[$i]['nested_parenthesis']) === false) {
+						  continue;
+					 }
+
+					 // Just make sure those brackets dont belong to anyone,
+					 // like an IF or FOR statement.
+					 foreach ($tokens[$i]['nested_parenthesis'] as $bracket) {
+						  if (isset($tokens[$bracket]['parenthesis_owner']) === true) {
+								continue(2);
+						  }
+					 }
+
+					 // Note that we use this endBracket down further when checking
+					 // for a RETURN statement.
+					 $endBracket = end($tokens[$i]['nested_parenthesis']);
+					 $bracket    = key($tokens[$i]['nested_parenthesis']);
+
+					 $prev = $phpcsFile->findPrevious(
+						  PHP_CodeSniffer_Tokens::$emptyTokens,
+						  ($bracket - 1),
+						  null,
+						  true
+					 );
+
+					 if ($tokens[$prev]['code'] !== T_STRING) {
+						  // This is not a function passing the callback.
+						  continue;
+					 }
+
+					 $passedCallback = true;
+				}//end if
+
+				$foundCallback = true;
+
+				if ($passedCallback === false) {
+					 // The first argument must be "this" or "self".
+					 $arg = $phpcsFile->findNext(T_WHITESPACE, ($i + 4), null, true);
+					 if ($tokens[$arg]['content'] !== 'this'
+						  && $tokens[$arg]['content'] !== 'self'
+					 ) {
+						  $error = 'The first argument passed to the callback function must be "this" or "self"';
+						  $phpcsFile->addError($error, $arg, 'FirstArgNotSelf');
+					 }
+				}
+
+				// Now it must be followed by a return statement or the end of the function.
+				if ($passedCallback === false) {
+					 $endBracket = $tokens[($i + 3)]['parenthesis_closer'];
+				}
+
+				for ($next = $endBracket; $next <= $end; $next++) {
+					 // Skip whitespace so we find the next content after the call.
+					 if (isset(PHP_CodeSniffer_Tokens::$emptyTokens[$tokens[$next]['code']]) === true) {
+						  continue;
+					 }
+
+					 // Skip closing braces like END IF because it is not executable code.
+					 if ($tokens[$next]['code'] === T_CLOSE_CURLY_BRACKET) {
+						  continue;
+					 }
+
+					 // We don't care about anything on the current line, like a
+					 // semicolon. It doesn't matter if there are other statements on the
+					 // line because another sniff will check for those.
+					 if ($tokens[$next]['line'] === $tokens[$endBracket]['line']) {
+						  continue;
+					 }
+
+					 break;
+				}
+
+				if ($next !== $tokens[$function]['scope_closer']
+					 && $tokens[$next]['code'] !== T_RETURN
+				) {
+					 $error = 'The call to the callback function must be followed by a return statement if it is not the last statement in the create() method';
+					 $phpcsFile->addError($error, $i, 'NoReturn');
+				}
+		  }//end for
+
+		  if ($foundCallback === false) {
+				$error = 'The create() method of a widget type must call the callback function';
+				$phpcsFile->addError($error, $create, 'CallbackNotCalled');
+		  }
+
+	 }//end process()
 
 
 }//end class

Spacing +54 added lines, -54 removed lines

@@ -31,7 +31,7 @@ 
      *
      * @var array
      */
-    public $supportedTokenizers = array('JS');
+    public $supportedTokenizers = array( 'JS' );
 
 
     /**
@@ -41,7 +41,7 @@ 
      */
     public function register()
     {
-        return array(T_OBJECT);
+        return array( T_OBJECT );
 
     }//end register()
 
@@ -55,36 +55,36 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
-        $className = $phpcsFile->findPrevious(T_STRING, ($stackPtr - 1));
-        if (substr(strtolower($tokens[$className]['content']), -10) !== 'widgettype') {
+        $className = $phpcsFile->findPrevious( T_STRING, ( $stackPtr - 1 ) );
+        if ( substr( strtolower( $tokens[ $className ][ 'content' ] ), -10 ) !== 'widgettype' ) {
             return;
         }
 
         // Search for a create method.
-        $create = $phpcsFile->findNext(T_PROPERTY, $stackPtr, $tokens[$stackPtr]['bracket_closer'], null, 'create');
-        if ($create === false) {
+        $create = $phpcsFile->findNext( T_PROPERTY, $stackPtr, $tokens[ $stackPtr ][ 'bracket_closer' ], null, 'create' );
+        if ( $create === false ) {
             return;
         }
 
-        $function = $phpcsFile->findNext(array(T_WHITESPACE, T_COLON), ($create + 1), null, true);
-        if ($tokens[$function]['code'] !== T_FUNCTION
-            && $tokens[$function]['code'] !== T_CLOSURE
+        $function = $phpcsFile->findNext( array( T_WHITESPACE, T_COLON ), ( $create + 1 ), null, true );
+        if ( $tokens[ $function ][ 'code' ] !== T_FUNCTION
+            && $tokens[ $function ][ 'code' ] !== T_CLOSURE
         ) {
             return;
         }
 
-        $start = ($tokens[$function]['scope_opener'] + 1);
-        $end   = ($tokens[$function]['scope_closer'] - 1);
+        $start = ( $tokens[ $function ][ 'scope_opener' ] + 1 );
+        $end   = ( $tokens[ $function ][ 'scope_closer' ] - 1 );
 
         // Check that the first argument is called "callback".
-        $arg = $phpcsFile->findNext(T_WHITESPACE, ($tokens[$function]['parenthesis_opener'] + 1), null, true);
-        if ($tokens[$arg]['content'] !== 'callback') {
+        $arg = $phpcsFile->findNext( T_WHITESPACE, ( $tokens[ $function ][ 'parenthesis_opener' ] + 1 ), null, true );
+        if ( $tokens[ $arg ][ 'content' ] !== 'callback' ) {
             $error = 'The first argument of the create() method of a widget type must be called "callback"';
-            $phpcsFile->addError($error, $arg, 'FirstArgNotCallback');
+            $phpcsFile->addError( $error, $arg, 'FirstArgNotCallback' );
         }
 
         /*
@@ -99,69 +99,69 @@ 
         $foundCallback  = false;
         $passedCallback = false;
         $nestedFunction = null;
-        for ($i = $start; $i <= $end; $i++) {
+        for ( $i = $start; $i <= $end; $i++ ) {
             // Keep track of nested functions.
-            if ($nestedFunction !== null) {
-                if ($i === $nestedFunction) {
+            if ( $nestedFunction !== null ) {
+                if ( $i === $nestedFunction ) {
                     $nestedFunction = null;
                     continue;
                 }
-            } else if (($tokens[$i]['code'] === T_FUNCTION
-                || $tokens[$i]['code'] === T_CLOSURE)
-                && isset($tokens[$i]['scope_closer']) === true
+            } else if ( ( $tokens[ $i ][ 'code' ] === T_FUNCTION
+                || $tokens[ $i ][ 'code' ] === T_CLOSURE )
+                && isset( $tokens[ $i ][ 'scope_closer' ] ) === true
             ) {
-                $nestedFunction = $tokens[$i]['scope_closer'];
+                $nestedFunction = $tokens[ $i ][ 'scope_closer' ];
                 continue;
             }
 
-            if ($nestedFunction === null && $tokens[$i]['code'] === T_RETURN) {
+            if ( $nestedFunction === null && $tokens[ $i ][ 'code' ] === T_RETURN ) {
                 // Make sure return statements are not returning anything.
-                if ($tokens[($i + 1)]['code'] !== T_SEMICOLON) {
+                if ( $tokens[ ( $i + 1 ) ][ 'code' ] !== T_SEMICOLON ) {
                     $error = 'The create() method of a widget type must not return a value';
-                    $phpcsFile->addError($error, $i, 'ReturnValue');
+                    $phpcsFile->addError( $error, $i, 'ReturnValue' );
                 }
 
                 continue;
-            } else if ($tokens[$i]['code'] !== T_STRING
-                || $tokens[$i]['content'] !== 'callback'
+            } else if ( $tokens[ $i ][ 'code' ] !== T_STRING
+                || $tokens[ $i ][ 'content' ] !== 'callback'
             ) {
                 continue;
             }
 
             // If this is the form "callback.call(" then it is a call
             // to the callback function.
-            if ($tokens[($i + 1)]['code'] !== T_OBJECT_OPERATOR
-                || $tokens[($i + 2)]['content'] !== 'call'
-                || $tokens[($i + 3)]['code'] !== T_OPEN_PARENTHESIS
+            if ( $tokens[ ( $i + 1 ) ][ 'code' ] !== T_OBJECT_OPERATOR
+                || $tokens[ ( $i + 2 ) ][ 'content' ] !== 'call'
+                || $tokens[ ( $i + 3 ) ][ 'code' ] !== T_OPEN_PARENTHESIS
             ) {
                 // One last chance; this might be the callback function
                 // being passed to another function, like this
                 // "this.init(something, callback, something)".
-                if (isset($tokens[$i]['nested_parenthesis']) === false) {
+                if ( isset( $tokens[ $i ][ 'nested_parenthesis' ] ) === false ) {
                     continue;
                 }
 
                 // Just make sure those brackets dont belong to anyone,
                 // like an IF or FOR statement.
-                foreach ($tokens[$i]['nested_parenthesis'] as $bracket) {
-                    if (isset($tokens[$bracket]['parenthesis_owner']) === true) {
-                        continue(2);
+                foreach ( $tokens[ $i ][ 'nested_parenthesis' ] as $bracket ) {
+                    if ( isset( $tokens[ $bracket ][ 'parenthesis_owner' ] ) === true ) {
+                        continue( 2 );
                     }
                 }
 
                 // Note that we use this endBracket down further when checking
                 // for a RETURN statement.
-                $endBracket = end($tokens[$i]['nested_parenthesis']);
-                $bracket    = key($tokens[$i]['nested_parenthesis']);
+                $endBracket = end( $tokens[ $i ][ 'nested_parenthesis' ] );
+                $bracket    = key( $tokens[ $i ][ 'nested_parenthesis' ] );
 
                 $prev = $phpcsFile->findPrevious(
                     PHP_CodeSniffer_Tokens::$emptyTokens,
-                    ($bracket - 1),
+                    ( $bracket - 1 ),
                     null,
                     true
                 );
 
-                if ($tokens[$prev]['code'] !== T_STRING) {
+                if ( $tokens[ $prev ][ 'code' ] !== T_STRING ) {
                     // This is not a function passing the callback.
                     continue;
                 }
@@ -171,54 +171,54 @@ 
 
             $foundCallback = true;
 
-            if ($passedCallback === false) {
+            if ( $passedCallback === false ) {
                 // The first argument must be "this" or "self".
-                $arg = $phpcsFile->findNext(T_WHITESPACE, ($i + 4), null, true);
-                if ($tokens[$arg]['content'] !== 'this'
-                    && $tokens[$arg]['content'] !== 'self'
+                $arg = $phpcsFile->findNext( T_WHITESPACE, ( $i + 4 ), null, true );
+                if ( $tokens[ $arg ][ 'content' ] !== 'this'
+                    && $tokens[ $arg ][ 'content' ] !== 'self'
                 ) {
                     $error = 'The first argument passed to the callback function must be "this" or "self"';
-                    $phpcsFile->addError($error, $arg, 'FirstArgNotSelf');
+                    $phpcsFile->addError( $error, $arg, 'FirstArgNotSelf' );
                 }
             }
 
             // Now it must be followed by a return statement or the end of the function.
-            if ($passedCallback === false) {
-                $endBracket = $tokens[($i + 3)]['parenthesis_closer'];
+            if ( $passedCallback === false ) {
+                $endBracket = $tokens[ ( $i + 3 ) ][ 'parenthesis_closer' ];
             }
 
-            for ($next = $endBracket; $next <= $end; $next++) {
+            for ( $next = $endBracket; $next <= $end; $next++ ) {
                 // Skip whitespace so we find the next content after the call.
-                if (isset(PHP_CodeSniffer_Tokens::$emptyTokens[$tokens[$next]['code']]) === true) {
+                if ( isset( PHP_CodeSniffer_Tokens::$emptyTokens[ $tokens[ $next ][ 'code' ] ] ) === true ) {
                     continue;
                 }
 
                 // Skip closing braces like END IF because it is not executable code.
-                if ($tokens[$next]['code'] === T_CLOSE_CURLY_BRACKET) {
+                if ( $tokens[ $next ][ 'code' ] === T_CLOSE_CURLY_BRACKET ) {
                     continue;
                 }
 
                 // We don't care about anything on the current line, like a
                 // semicolon. It doesn't matter if there are other statements on the
                 // line because another sniff will check for those.
-                if ($tokens[$next]['line'] === $tokens[$endBracket]['line']) {
+                if ( $tokens[ $next ][ 'line' ] === $tokens[ $endBracket ][ 'line' ] ) {
                     continue;
                 }
 
                 break;
             }
 
-            if ($next !== $tokens[$function]['scope_closer']
-                && $tokens[$next]['code'] !== T_RETURN
+            if ( $next !== $tokens[ $function ][ 'scope_closer' ]
+                && $tokens[ $next ][ 'code' ] !== T_RETURN
             ) {
                 $error = 'The call to the callback function must be followed by a return statement if it is not the last statement in the create() method';
-                $phpcsFile->addError($error, $i, 'NoReturn');
+                $phpcsFile->addError( $error, $i, 'NoReturn' );
             }
         }//end for
 
-        if ($foundCallback === false) {
+        if ( $foundCallback === false ) {
             $error = 'The create() method of a widget type must call the callback function';
-            $phpcsFile->addError($error, $create, 'CallbackNotCalled');
+            $phpcsFile->addError( $error, $create, 'CallbackNotCalled' );
         }
 
     }//end process()

Braces +3 added lines, -6 removed lines

@@ -23,8 +23,7 @@ 
  * @version   Release: @package_version@
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
-class MySource_Sniffs_Objects_CreateWidgetTypeCallbackSniff implements PHP_CodeSniffer_Sniff
-{
+class MySource_Sniffs_Objects_CreateWidgetTypeCallbackSniff implements PHP_CodeSniffer_Sniff {
 
     /**
      * A list of tokenizers this sniff supports.
@@ -39,8 +38,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(T_OBJECT);
 
     }//end register()
@@ -55,8 +53,7 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         $className = $phpcsFile->findPrevious(T_STRING, ($stackPtr - 1));