jazzsequence / games-collector

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Functions/MultiLineFunctionDeclarationSniff.php

Doc Comments +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
      * @param array                $tokens      The stack of tokens that make up
      *                                          the file.
      *
-     * @return void
+     * @return boolean
      */
     public function isMultiLineDeclaration(PHP_CodeSniffer_File $phpcsFile, $stackPtr, $openBracket, $tokens)
     {

Indentation +184 added lines, -184 removed lines

@@ -13,8 +13,8 @@ 
  */
 
 if (class_exists('PEAR_Sniffs_Functions_FunctionDeclarationSniff', true) === false) {
-    $error = 'Class PEAR_Sniffs_Functions_FunctionDeclarationSniff not found';
-    throw new PHP_CodeSniffer_Exception($error);
+	 $error = 'Class PEAR_Sniffs_Functions_FunctionDeclarationSniff not found';
+	 throw new PHP_CodeSniffer_Exception($error);
 }
 
 /**
@@ -33,188 +33,188 @@ 
 class Squiz_Sniffs_Functions_MultiLineFunctionDeclarationSniff extends PEAR_Sniffs_Functions_FunctionDeclarationSniff
 {
 
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = array(
-                                   'PHP',
-                                   'JS',
-                                  );
-
-
-    /**
-     * Determine if this is a multi-line function declaration.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile   The file being scanned.
-     * @param int                  $stackPtr    The position of the current token
-     *                                          in the stack passed in $tokens.
-     * @param int                  $openBracket The position of the opening bracket
-     *                                          in the stack passed in $tokens.
-     * @param array                $tokens      The stack of tokens that make up
-     *                                          the file.
-     *
-     * @return void
-     */
-    public function isMultiLineDeclaration(PHP_CodeSniffer_File $phpcsFile, $stackPtr, $openBracket, $tokens)
-    {
-        $bracketsToCheck = array($stackPtr => $openBracket);
-
-        // Closures may use the USE keyword and so be multi-line in this way.
-        if ($tokens[$stackPtr]['code'] === T_CLOSURE) {
-            $use = $phpcsFile->findNext(T_USE, ($tokens[$openBracket]['parenthesis_closer'] + 1), $tokens[$stackPtr]['scope_opener']);
-            if ($use !== false) {
-                $open = $phpcsFile->findNext(T_OPEN_PARENTHESIS, ($use + 1));
-                if ($open !== false) {
-                    $bracketsToCheck[$use] = $open;
-                }
-            }
-        }
-
-        foreach ($bracketsToCheck as $stackPtr => $openBracket) {
-            // If the first argument is on a new line, this is a multi-line
-            // function declaration, even if there is only one argument.
-            $next = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($openBracket + 1), null, true);
-            if ($tokens[$next]['line'] !== $tokens[$stackPtr]['line']) {
-                return true;
-            }
-
-            $closeBracket = $tokens[$openBracket]['parenthesis_closer'];
-
-            $end = $phpcsFile->findEndOfStatement($openBracket + 1);
-            while ($tokens[$end]['code'] === T_COMMA) {
-                // If the next bit of code is not on the same line, this is a
-                // multi-line function declaration.
-                $next = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($end + 1), $closeBracket, true);
-                if ($next === false) {
-                    continue(2);
-                }
-
-                if ($tokens[$next]['line'] !== $tokens[$end]['line']) {
-                    return true;
-                }
-
-                $end = $phpcsFile->findEndOfStatement($next);
-            }
-
-            // We've reached the last argument, so see if the next content
-            // (should be the close bracket) is also on the same line.
-            $next = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($end + 1), $closeBracket, true);
-            if ($next !== false && $tokens[$next]['line'] !== $tokens[$end]['line']) {
-                return true;
-            }
-        }//end foreach
-
-        return false;
-
-    }//end isMultiLineDeclaration()
-
-
-    /**
-     * Processes multi-line declarations.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     * @param array                $tokens    The stack of tokens that make up
-     *                                        the file.
-     *
-     * @return void
-     */
-    public function processMultiLineDeclaration(PHP_CodeSniffer_File $phpcsFile, $stackPtr, $tokens)
-    {
-        // We do everything the parent sniff does, and a bit more.
-        parent::processMultiLineDeclaration($phpcsFile, $stackPtr, $tokens);
-
-        $openBracket = $tokens[$stackPtr]['parenthesis_opener'];
-        $this->processBracket($phpcsFile, $openBracket, $tokens, 'function');
-
-        if ($tokens[$stackPtr]['code'] !== T_CLOSURE) {
-            return;
-        }
-
-        $use = $phpcsFile->findNext(T_USE, ($tokens[$stackPtr]['parenthesis_closer'] + 1), $tokens[$stackPtr]['scope_opener']);
-        if ($use === false) {
-            return;
-        }
-
-        $openBracket = $phpcsFile->findNext(T_OPEN_PARENTHESIS, ($use + 1), null);
-        $this->processBracket($phpcsFile, $openBracket, $tokens, 'use');
-
-        // Also check spacing.
-        if ($tokens[($use - 1)]['code'] === T_WHITESPACE) {
-            $gap = strlen($tokens[($use - 1)]['content']);
-        } else {
-            $gap = 0;
-        }
-
-    }//end processMultiLineDeclaration()
-
-
-    /**
-     * Processes the contents of a single set of brackets.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile   The file being scanned.
-     * @param int                  $openBracket The position of the open bracket
-     *                                          in the stack passed in $tokens.
-     * @param array                $tokens      The stack of tokens that make up
-     *                                          the file.
-     * @param string               $type        The type of the token the brackets
-     *                                          belong to (function or use).
-     *
-     * @return void
-     */
-    public function processBracket(PHP_CodeSniffer_File $phpcsFile, $openBracket, $tokens, $type='function')
-    {
-        $errorPrefix = '';
-        if ($type === 'use') {
-            $errorPrefix = 'Use';
-        }
-
-        $closeBracket = $tokens[$openBracket]['parenthesis_closer'];
-
-        // The open bracket should be the last thing on the line.
-        if ($tokens[$openBracket]['line'] !== $tokens[$closeBracket]['line']) {
-            $next = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($openBracket + 1), null, true);
-            if ($tokens[$next]['line'] !== ($tokens[$openBracket]['line'] + 1)) {
-                $error = 'The first parameter of a multi-line '.$type.' declaration must be on the line after the opening bracket';
-                $fix   = $phpcsFile->addFixableError($error, $next, $errorPrefix.'FirstParamSpacing');
-                if ($fix === true) {
-                    $phpcsFile->fixer->addNewline($openBracket);
-                }
-            }
-        }
-
-        // Each line between the brackets should contain a single parameter.
-        $lastComma = null;
-        for ($i = ($openBracket + 1); $i < $closeBracket; $i++) {
-            // Skip brackets, like arrays, as they can contain commas.
-            if (isset($tokens[$i]['bracket_opener']) === true) {
-                $i = $tokens[$i]['bracket_closer'];
-                continue;
-            }
-
-            if (isset($tokens[$i]['parenthesis_opener']) === true) {
-                $i = $tokens[$i]['parenthesis_closer'];
-                continue;
-            }
-
-            if ($tokens[$i]['code'] !== T_COMMA) {
-                continue;
-            }
-
-            $next = $phpcsFile->findNext(T_WHITESPACE, ($i + 1), null, true);
-            if ($tokens[$next]['line'] !== ($tokens[$i]['line'] + 1)) {
-                $error = 'Multi-line '.$type.' declarations must define one parameter per line';
-                $fix   = $phpcsFile->addFixableError($error, $next, $errorPrefix.'OneParamPerLine');
-                if ($fix === true) {
-                    $phpcsFile->fixer->addNewline($i);
-                }
-            }
-        }//end for
-
-    }//end processBracket()
+	 /**
+	  * A list of tokenizers this sniff supports.
+	  *
+	  * @var array
+	  */
+	 public $supportedTokenizers = array(
+											  'PHP',
+											  'JS',
+											 );
+
+
+	 /**
+	  * Determine if this is a multi-line function declaration.
+	  *
+	  * @param PHP_CodeSniffer_File $phpcsFile   The file being scanned.
+	  * @param int                  $stackPtr    The position of the current token
+	  *                                          in the stack passed in $tokens.
+	  * @param int                  $openBracket The position of the opening bracket
+	  *                                          in the stack passed in $tokens.
+	  * @param array                $tokens      The stack of tokens that make up
+	  *                                          the file.
+	  *
+	  * @return void
+	  */
+	 public function isMultiLineDeclaration(PHP_CodeSniffer_File $phpcsFile, $stackPtr, $openBracket, $tokens)
+	 {
+		  $bracketsToCheck = array($stackPtr => $openBracket);
+
+		  // Closures may use the USE keyword and so be multi-line in this way.
+		  if ($tokens[$stackPtr]['code'] === T_CLOSURE) {
+				$use = $phpcsFile->findNext(T_USE, ($tokens[$openBracket]['parenthesis_closer'] + 1), $tokens[$stackPtr]['scope_opener']);
+				if ($use !== false) {
+					 $open = $phpcsFile->findNext(T_OPEN_PARENTHESIS, ($use + 1));
+					 if ($open !== false) {
+						  $bracketsToCheck[$use] = $open;
+					 }
+				}
+		  }
+
+		  foreach ($bracketsToCheck as $stackPtr => $openBracket) {
+				// If the first argument is on a new line, this is a multi-line
+				// function declaration, even if there is only one argument.
+				$next = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($openBracket + 1), null, true);
+				if ($tokens[$next]['line'] !== $tokens[$stackPtr]['line']) {
+					 return true;
+				}
+
+				$closeBracket = $tokens[$openBracket]['parenthesis_closer'];
+
+				$end = $phpcsFile->findEndOfStatement($openBracket + 1);
+				while ($tokens[$end]['code'] === T_COMMA) {
+					 // If the next bit of code is not on the same line, this is a
+					 // multi-line function declaration.
+					 $next = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($end + 1), $closeBracket, true);
+					 if ($next === false) {
+						  continue(2);
+					 }
+
+					 if ($tokens[$next]['line'] !== $tokens[$end]['line']) {
+						  return true;
+					 }
+
+					 $end = $phpcsFile->findEndOfStatement($next);
+				}
+
+				// We've reached the last argument, so see if the next content
+				// (should be the close bracket) is also on the same line.
+				$next = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($end + 1), $closeBracket, true);
+				if ($next !== false && $tokens[$next]['line'] !== $tokens[$end]['line']) {
+					 return true;
+				}
+		  }//end foreach
+
+		  return false;
+
+	 }//end isMultiLineDeclaration()
+
+
+	 /**
+	  * Processes multi-line declarations.
+	  *
+	  * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	  * @param int                  $stackPtr  The position of the current token
+	  *                                        in the stack passed in $tokens.
+	  * @param array                $tokens    The stack of tokens that make up
+	  *                                        the file.
+	  *
+	  * @return void
+	  */
+	 public function processMultiLineDeclaration(PHP_CodeSniffer_File $phpcsFile, $stackPtr, $tokens)
+	 {
+		  // We do everything the parent sniff does, and a bit more.
+		  parent::processMultiLineDeclaration($phpcsFile, $stackPtr, $tokens);
+
+		  $openBracket = $tokens[$stackPtr]['parenthesis_opener'];
+		  $this->processBracket($phpcsFile, $openBracket, $tokens, 'function');
+
+		  if ($tokens[$stackPtr]['code'] !== T_CLOSURE) {
+				return;
+		  }
+
+		  $use = $phpcsFile->findNext(T_USE, ($tokens[$stackPtr]['parenthesis_closer'] + 1), $tokens[$stackPtr]['scope_opener']);
+		  if ($use === false) {
+				return;
+		  }
+
+		  $openBracket = $phpcsFile->findNext(T_OPEN_PARENTHESIS, ($use + 1), null);
+		  $this->processBracket($phpcsFile, $openBracket, $tokens, 'use');
+
+		  // Also check spacing.
+		  if ($tokens[($use - 1)]['code'] === T_WHITESPACE) {
+				$gap = strlen($tokens[($use - 1)]['content']);
+		  } else {
+				$gap = 0;
+		  }
+
+	 }//end processMultiLineDeclaration()
+
+
+	 /**
+	  * Processes the contents of a single set of brackets.
+	  *
+	  * @param PHP_CodeSniffer_File $phpcsFile   The file being scanned.
+	  * @param int                  $openBracket The position of the open bracket
+	  *                                          in the stack passed in $tokens.
+	  * @param array                $tokens      The stack of tokens that make up
+	  *                                          the file.
+	  * @param string               $type        The type of the token the brackets
+	  *                                          belong to (function or use).
+	  *
+	  * @return void
+	  */
+	 public function processBracket(PHP_CodeSniffer_File $phpcsFile, $openBracket, $tokens, $type='function')
+	 {
+		  $errorPrefix = '';
+		  if ($type === 'use') {
+				$errorPrefix = 'Use';
+		  }
+
+		  $closeBracket = $tokens[$openBracket]['parenthesis_closer'];
+
+		  // The open bracket should be the last thing on the line.
+		  if ($tokens[$openBracket]['line'] !== $tokens[$closeBracket]['line']) {
+				$next = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($openBracket + 1), null, true);
+				if ($tokens[$next]['line'] !== ($tokens[$openBracket]['line'] + 1)) {
+					 $error = 'The first parameter of a multi-line '.$type.' declaration must be on the line after the opening bracket';
+					 $fix   = $phpcsFile->addFixableError($error, $next, $errorPrefix.'FirstParamSpacing');
+					 if ($fix === true) {
+						  $phpcsFile->fixer->addNewline($openBracket);
+					 }
+				}
+		  }
+
+		  // Each line between the brackets should contain a single parameter.
+		  $lastComma = null;
+		  for ($i = ($openBracket + 1); $i < $closeBracket; $i++) {
+				// Skip brackets, like arrays, as they can contain commas.
+				if (isset($tokens[$i]['bracket_opener']) === true) {
+					 $i = $tokens[$i]['bracket_closer'];
+					 continue;
+				}
+
+				if (isset($tokens[$i]['parenthesis_opener']) === true) {
+					 $i = $tokens[$i]['parenthesis_closer'];
+					 continue;
+				}
+
+				if ($tokens[$i]['code'] !== T_COMMA) {
+					 continue;
+				}
+
+				$next = $phpcsFile->findNext(T_WHITESPACE, ($i + 1), null, true);
+				if ($tokens[$next]['line'] !== ($tokens[$i]['line'] + 1)) {
+					 $error = 'Multi-line '.$type.' declarations must define one parameter per line';
+					 $fix   = $phpcsFile->addFixableError($error, $next, $errorPrefix.'OneParamPerLine');
+					 if ($fix === true) {
+						  $phpcsFile->fixer->addNewline($i);
+					 }
+				}
+		  }//end for
+
+	 }//end processBracket()
 
 
 }//end class

Spacing +56 added lines, -56 removed lines

@@ -12,9 +12,9 @@ 
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
 
-if (class_exists('PEAR_Sniffs_Functions_FunctionDeclarationSniff', true) === false) {
+if ( class_exists( 'PEAR_Sniffs_Functions_FunctionDeclarationSniff', true ) === false ) {
     $error = 'Class PEAR_Sniffs_Functions_FunctionDeclarationSniff not found';
-    throw new PHP_CodeSniffer_Exception($error);
+    throw new PHP_CodeSniffer_Exception( $error );
 }
 
 /**
@@ -57,51 +57,51 @@ 
      *
      * @return void
      */
-    public function isMultiLineDeclaration(PHP_CodeSniffer_File $phpcsFile, $stackPtr, $openBracket, $tokens)
+    public function isMultiLineDeclaration( PHP_CodeSniffer_File $phpcsFile, $stackPtr, $openBracket, $tokens )
     {
-        $bracketsToCheck = array($stackPtr => $openBracket);
+        $bracketsToCheck = array( $stackPtr => $openBracket );
 
         // Closures may use the USE keyword and so be multi-line in this way.
-        if ($tokens[$stackPtr]['code'] === T_CLOSURE) {
-            $use = $phpcsFile->findNext(T_USE, ($tokens[$openBracket]['parenthesis_closer'] + 1), $tokens[$stackPtr]['scope_opener']);
-            if ($use !== false) {
-                $open = $phpcsFile->findNext(T_OPEN_PARENTHESIS, ($use + 1));
-                if ($open !== false) {
-                    $bracketsToCheck[$use] = $open;
+        if ( $tokens[ $stackPtr ][ 'code' ] === T_CLOSURE ) {
+            $use = $phpcsFile->findNext( T_USE, ( $tokens[ $openBracket ][ 'parenthesis_closer' ] + 1 ), $tokens[ $stackPtr ][ 'scope_opener' ] );
+            if ( $use !== false ) {
+                $open = $phpcsFile->findNext( T_OPEN_PARENTHESIS, ( $use + 1 ) );
+                if ( $open !== false ) {
+                    $bracketsToCheck[ $use ] = $open;
                 }
             }
         }
 
-        foreach ($bracketsToCheck as $stackPtr => $openBracket) {
+        foreach ( $bracketsToCheck as $stackPtr => $openBracket ) {
             // If the first argument is on a new line, this is a multi-line
             // function declaration, even if there is only one argument.
-            $next = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($openBracket + 1), null, true);
-            if ($tokens[$next]['line'] !== $tokens[$stackPtr]['line']) {
+            $next = $phpcsFile->findNext( PHP_CodeSniffer_Tokens::$emptyTokens, ( $openBracket + 1 ), null, true );
+            if ( $tokens[ $next ][ 'line' ] !== $tokens[ $stackPtr ][ 'line' ] ) {
                 return true;
             }
 
-            $closeBracket = $tokens[$openBracket]['parenthesis_closer'];
+            $closeBracket = $tokens[ $openBracket ][ 'parenthesis_closer' ];
 
-            $end = $phpcsFile->findEndOfStatement($openBracket + 1);
-            while ($tokens[$end]['code'] === T_COMMA) {
+            $end = $phpcsFile->findEndOfStatement( $openBracket + 1 );
+            while ( $tokens[ $end ][ 'code' ] === T_COMMA ) {
                 // If the next bit of code is not on the same line, this is a
                 // multi-line function declaration.
-                $next = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($end + 1), $closeBracket, true);
-                if ($next === false) {
-                    continue(2);
+                $next = $phpcsFile->findNext( PHP_CodeSniffer_Tokens::$emptyTokens, ( $end + 1 ), $closeBracket, true );
+                if ( $next === false ) {
+                    continue( 2 );
                 }
 
-                if ($tokens[$next]['line'] !== $tokens[$end]['line']) {
+                if ( $tokens[ $next ][ 'line' ] !== $tokens[ $end ][ 'line' ] ) {
                     return true;
                 }
 
-                $end = $phpcsFile->findEndOfStatement($next);
+                $end = $phpcsFile->findEndOfStatement( $next );
             }
 
             // We've reached the last argument, so see if the next content
             // (should be the close bracket) is also on the same line.
-            $next = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($end + 1), $closeBracket, true);
-            if ($next !== false && $tokens[$next]['line'] !== $tokens[$end]['line']) {
+            $next = $phpcsFile->findNext( PHP_CodeSniffer_Tokens::$emptyTokens, ( $end + 1 ), $closeBracket, true );
+            if ( $next !== false && $tokens[ $next ][ 'line' ] !== $tokens[ $end ][ 'line' ] ) {
                 return true;
             }
         }//end foreach
@@ -122,29 +122,29 @@ 
      *
      * @return void
      */
-    public function processMultiLineDeclaration(PHP_CodeSniffer_File $phpcsFile, $stackPtr, $tokens)
+    public function processMultiLineDeclaration( PHP_CodeSniffer_File $phpcsFile, $stackPtr, $tokens )
     {
         // We do everything the parent sniff does, and a bit more.
-        parent::processMultiLineDeclaration($phpcsFile, $stackPtr, $tokens);
+        parent::processMultiLineDeclaration( $phpcsFile, $stackPtr, $tokens );
 
-        $openBracket = $tokens[$stackPtr]['parenthesis_opener'];
-        $this->processBracket($phpcsFile, $openBracket, $tokens, 'function');
+        $openBracket = $tokens[ $stackPtr ][ 'parenthesis_opener' ];
+        $this->processBracket( $phpcsFile, $openBracket, $tokens, 'function' );
 
-        if ($tokens[$stackPtr]['code'] !== T_CLOSURE) {
+        if ( $tokens[ $stackPtr ][ 'code' ] !== T_CLOSURE ) {
             return;
         }
 
-        $use = $phpcsFile->findNext(T_USE, ($tokens[$stackPtr]['parenthesis_closer'] + 1), $tokens[$stackPtr]['scope_opener']);
-        if ($use === false) {
+        $use = $phpcsFile->findNext( T_USE, ( $tokens[ $stackPtr ][ 'parenthesis_closer' ] + 1 ), $tokens[ $stackPtr ][ 'scope_opener' ] );
+        if ( $use === false ) {
             return;
         }
 
-        $openBracket = $phpcsFile->findNext(T_OPEN_PARENTHESIS, ($use + 1), null);
-        $this->processBracket($phpcsFile, $openBracket, $tokens, 'use');
+        $openBracket = $phpcsFile->findNext( T_OPEN_PARENTHESIS, ( $use + 1 ), null );
+        $this->processBracket( $phpcsFile, $openBracket, $tokens, 'use' );
 
         // Also check spacing.
-        if ($tokens[($use - 1)]['code'] === T_WHITESPACE) {
-            $gap = strlen($tokens[($use - 1)]['content']);
+        if ( $tokens[ ( $use - 1 ) ][ 'code' ] === T_WHITESPACE ) {
+            $gap = strlen( $tokens[ ( $use - 1 ) ][ 'content' ] );
         } else {
             $gap = 0;
         }
@@ -165,51 +165,51 @@ 
      *
      * @return void
      */
-    public function processBracket(PHP_CodeSniffer_File $phpcsFile, $openBracket, $tokens, $type='function')
+    public function processBracket( PHP_CodeSniffer_File $phpcsFile, $openBracket, $tokens, $type = 'function' )
     {
         $errorPrefix = '';
-        if ($type === 'use') {
+        if ( $type === 'use' ) {
             $errorPrefix = 'Use';
         }
 
-        $closeBracket = $tokens[$openBracket]['parenthesis_closer'];
+        $closeBracket = $tokens[ $openBracket ][ 'parenthesis_closer' ];
 
         // The open bracket should be the last thing on the line.
-        if ($tokens[$openBracket]['line'] !== $tokens[$closeBracket]['line']) {
-            $next = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($openBracket + 1), null, true);
-            if ($tokens[$next]['line'] !== ($tokens[$openBracket]['line'] + 1)) {
-                $error = 'The first parameter of a multi-line '.$type.' declaration must be on the line after the opening bracket';
-                $fix   = $phpcsFile->addFixableError($error, $next, $errorPrefix.'FirstParamSpacing');
-                if ($fix === true) {
-                    $phpcsFile->fixer->addNewline($openBracket);
+        if ( $tokens[ $openBracket ][ 'line' ] !== $tokens[ $closeBracket ][ 'line' ] ) {
+            $next = $phpcsFile->findNext( PHP_CodeSniffer_Tokens::$emptyTokens, ( $openBracket + 1 ), null, true );
+            if ( $tokens[ $next ][ 'line' ] !== ( $tokens[ $openBracket ][ 'line' ] + 1 ) ) {
+                $error = 'The first parameter of a multi-line ' . $type . ' declaration must be on the line after the opening bracket';
+                $fix   = $phpcsFile->addFixableError( $error, $next, $errorPrefix . 'FirstParamSpacing' );
+                if ( $fix === true ) {
+                    $phpcsFile->fixer->addNewline( $openBracket );
                 }
             }
         }
 
         // Each line between the brackets should contain a single parameter.
         $lastComma = null;
-        for ($i = ($openBracket + 1); $i < $closeBracket; $i++) {
+        for ( $i = ( $openBracket + 1 ); $i < $closeBracket; $i++ ) {
             // Skip brackets, like arrays, as they can contain commas.
-            if (isset($tokens[$i]['bracket_opener']) === true) {
-                $i = $tokens[$i]['bracket_closer'];
+            if ( isset( $tokens[ $i ][ 'bracket_opener' ] ) === true ) {
+                $i = $tokens[ $i ][ 'bracket_closer' ];
                 continue;
             }
 
-            if (isset($tokens[$i]['parenthesis_opener']) === true) {
-                $i = $tokens[$i]['parenthesis_closer'];
+            if ( isset( $tokens[ $i ][ 'parenthesis_opener' ] ) === true ) {
+                $i = $tokens[ $i ][ 'parenthesis_closer' ];
                 continue;
             }
 
-            if ($tokens[$i]['code'] !== T_COMMA) {
+            if ( $tokens[ $i ][ 'code' ] !== T_COMMA ) {
                 continue;
             }
 
-            $next = $phpcsFile->findNext(T_WHITESPACE, ($i + 1), null, true);
-            if ($tokens[$next]['line'] !== ($tokens[$i]['line'] + 1)) {
-                $error = 'Multi-line '.$type.' declarations must define one parameter per line';
-                $fix   = $phpcsFile->addFixableError($error, $next, $errorPrefix.'OneParamPerLine');
-                if ($fix === true) {
-                    $phpcsFile->fixer->addNewline($i);
+            $next = $phpcsFile->findNext( T_WHITESPACE, ( $i + 1 ), null, true );
+            if ( $tokens[ $next ][ 'line' ] !== ( $tokens[ $i ][ 'line' ] + 1 ) ) {
+                $error = 'Multi-line ' . $type . ' declarations must define one parameter per line';
+                $fix   = $phpcsFile->addFixableError( $error, $next, $errorPrefix . 'OneParamPerLine' );
+                if ( $fix === true ) {
+                    $phpcsFile->fixer->addNewline( $i );
                 }
             }
         }//end for

Braces +4 added lines, -8 removed lines

@@ -30,8 +30,7 @@ 
  * @version   Release: @package_version@
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
-class Squiz_Sniffs_Functions_MultiLineFunctionDeclarationSniff extends PEAR_Sniffs_Functions_FunctionDeclarationSniff
-{
+class Squiz_Sniffs_Functions_MultiLineFunctionDeclarationSniff extends PEAR_Sniffs_Functions_FunctionDeclarationSniff {
 
     /**
      * A list of tokenizers this sniff supports.
@@ -57,8 +56,7 @@ 
      *
      * @return void
      */
-    public function isMultiLineDeclaration(PHP_CodeSniffer_File $phpcsFile, $stackPtr, $openBracket, $tokens)
-    {
+    public function isMultiLineDeclaration(PHP_CodeSniffer_File $phpcsFile, $stackPtr, $openBracket, $tokens) {
         $bracketsToCheck = array($stackPtr => $openBracket);
 
         // Closures may use the USE keyword and so be multi-line in this way.
@@ -122,8 +120,7 @@ 
      *
      * @return void
      */
-    public function processMultiLineDeclaration(PHP_CodeSniffer_File $phpcsFile, $stackPtr, $tokens)
-    {
+    public function processMultiLineDeclaration(PHP_CodeSniffer_File $phpcsFile, $stackPtr, $tokens) {
         // We do everything the parent sniff does, and a bit more.
         parent::processMultiLineDeclaration($phpcsFile, $stackPtr, $tokens);
 
@@ -165,8 +162,7 @@ 
      *
      * @return void
      */
-    public function processBracket(PHP_CodeSniffer_File $phpcsFile, $openBracket, $tokens, $type='function')
-    {
+    public function processBracket(PHP_CodeSniffer_File $phpcsFile, $openBracket, $tokens, $type='function') {
         $errorPrefix = '';
         if ($type === 'use') {
             $errorPrefix = 'Use';

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Objects/DisallowObjectStringIndexSniff.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 +54 added lines, -54 removed lines

@@ -26,71 +26,71 @@
 class Squiz_Sniffs_Objects_DisallowObjectStringIndexSniff 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_OPEN_SQUARE_BRACKET);
+	 /**
+	  * Returns an array of tokens this test wants to listen for.
+	  *
+	  * @return array
+	  */
+	 public function register()
+	 {
+		  return array(T_OPEN_SQUARE_BRACKET);
 
-    }//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();
 
-        // Check if the next non whitespace token is a string.
-        $index = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-        if ($tokens[$index]['code'] !== T_CONSTANT_ENCAPSED_STRING) {
-            return;
-        }
+		  // Check if the next non whitespace token is a string.
+		  $index = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
+		  if ($tokens[$index]['code'] !== T_CONSTANT_ENCAPSED_STRING) {
+				return;
+		  }
 
-        // Make sure it is the only thing in the square brackets.
-        $next = $phpcsFile->findNext(T_WHITESPACE, ($index + 1), null, true);
-        if ($tokens[$next]['code'] !== T_CLOSE_SQUARE_BRACKET) {
-            return;
-        }
+		  // Make sure it is the only thing in the square brackets.
+		  $next = $phpcsFile->findNext(T_WHITESPACE, ($index + 1), null, true);
+		  if ($tokens[$next]['code'] !== T_CLOSE_SQUARE_BRACKET) {
+				return;
+		  }
 
-        // Allow indexes that have dots in them because we can't write
-        // them in dot notation.
-        $content = trim($tokens[$index]['content'], '"\' ');
-        if (strpos($content, '.') !== false) {
-            return;
-        }
+		  // Allow indexes that have dots in them because we can't write
+		  // them in dot notation.
+		  $content = trim($tokens[$index]['content'], '"\' ');
+		  if (strpos($content, '.') !== false) {
+				return;
+		  }
 
-        // Also ignore reserved words.
-        if ($content === 'super') {
-            return;
-        }
+		  // Also ignore reserved words.
+		  if ($content === 'super') {
+				return;
+		  }
 
-        // Token before the opening square bracket cannot be a var name.
-        $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
-        if ($tokens[$prev]['code'] === T_STRING) {
-            $error = 'Object indexes must be written in dot notation';
-            $phpcsFile->addError($error, $prev, 'Found');
-        }
+		  // Token before the opening square bracket cannot be a var name.
+		  $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
+		  if ($tokens[$prev]['code'] === T_STRING) {
+				$error = 'Object indexes must be written in dot notation';
+				$phpcsFile->addError($error, $prev, 'Found');
+		  }
 
-    }//end process()
+	 }//end process()
 
 
 }//end class

Spacing +13 added lines, -13 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_OPEN_SQUARE_BRACKET);
+        return array( T_OPEN_SQUARE_BRACKET );
 
     }//end register()
 
@@ -55,39 +55,39 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
         // Check if the next non whitespace token is a string.
-        $index = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-        if ($tokens[$index]['code'] !== T_CONSTANT_ENCAPSED_STRING) {
+        $index = $phpcsFile->findNext( T_WHITESPACE, ( $stackPtr + 1 ), null, true );
+        if ( $tokens[ $index ][ 'code' ] !== T_CONSTANT_ENCAPSED_STRING ) {
             return;
         }
 
         // Make sure it is the only thing in the square brackets.
-        $next = $phpcsFile->findNext(T_WHITESPACE, ($index + 1), null, true);
-        if ($tokens[$next]['code'] !== T_CLOSE_SQUARE_BRACKET) {
+        $next = $phpcsFile->findNext( T_WHITESPACE, ( $index + 1 ), null, true );
+        if ( $tokens[ $next ][ 'code' ] !== T_CLOSE_SQUARE_BRACKET ) {
             return;
         }
 
         // Allow indexes that have dots in them because we can't write
         // them in dot notation.
-        $content = trim($tokens[$index]['content'], '"\' ');
-        if (strpos($content, '.') !== false) {
+        $content = trim( $tokens[ $index ][ 'content' ], '"\' ' );
+        if ( strpos( $content, '.' ) !== false ) {
             return;
         }
 
         // Also ignore reserved words.
-        if ($content === 'super') {
+        if ( $content === 'super' ) {
             return;
         }
 
         // Token before the opening square bracket cannot be a var name.
-        $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
-        if ($tokens[$prev]['code'] === T_STRING) {
+        $prev = $phpcsFile->findPrevious( T_WHITESPACE, ( $stackPtr - 1 ), null, true );
+        if ( $tokens[ $prev ][ 'code' ] === T_STRING ) {
             $error = 'Object indexes must be written in dot notation';
-            $phpcsFile->addError($error, $prev, 'Found');
+            $phpcsFile->addError( $error, $prev, 'Found' );
         }
 
     }//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 Squiz_Sniffs_Objects_DisallowObjectStringIndexSniff implements PHP_CodeSniffer_Sniff
-{
+class Squiz_Sniffs_Objects_DisallowObjectStringIndexSniff 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_OPEN_SQUARE_BRACKET);
 
     }//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();
 
         // Check if the next non whitespace token is a string.

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Objects/ObjectMemberCommaSniff.php

Doc Comments +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
     /**
      * Registers the token types that this sniff wishes to listen to.
      *
-     * @return array
+     * @return string[]
      */
     public function register()
     {

Indentation +36 added lines, -36 removed lines

@@ -28,49 +28,49 @@
 class Squiz_Sniffs_Objects_ObjectMemberCommaSniff 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');
 
 
-    /**
-     * Registers the token types that this sniff wishes to listen to.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(T_CLOSE_OBJECT);
+	 /**
+	  * Registers the token types that this sniff wishes to listen to.
+	  *
+	  * @return array
+	  */
+	 public function register()
+	 {
+		  return array(T_CLOSE_OBJECT);
 
-    }//end register()
+	 }//end register()
 
 
-    /**
-     * Process the tokens that this sniff is listening for.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file where the token was found.
-     * @param int                  $stackPtr  The position in the stack where
-     *                                        the token was found.
-     *
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
+	 /**
+	  * Process the tokens that this sniff is listening for.
+	  *
+	  * @param PHP_CodeSniffer_File $phpcsFile The file where the token was found.
+	  * @param int                  $stackPtr  The position in the stack where
+	  *                                        the token was found.
+	  *
+	  * @return void
+	  */
+	 public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+	 {
+		  $tokens = $phpcsFile->getTokens();
 
-        $prev = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$emptyTokens, ($stackPtr - 1), null, true);
-        if ($tokens[$prev]['code'] === T_COMMA) {
-            $error = 'Last member of object must not be followed by a comma';
-            $fix   = $phpcsFile->addFixableError($error, $prev, 'Missing');
-            if ($fix === true) {
-                $phpcsFile->fixer->replaceToken($prev, '');
-            }
-        }
+		  $prev = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+		  if ($tokens[$prev]['code'] === T_COMMA) {
+				$error = 'Last member of object must not be followed by a comma';
+				$fix   = $phpcsFile->addFixableError($error, $prev, 'Missing');
+				if ($fix === true) {
+					 $phpcsFile->fixer->replaceToken($prev, '');
+				}
+		  }
 
-    }//end process()
+	 }//end process()
 
 
 }//end class

Spacing +8 added lines, -8 removed lines

@@ -33,7 +33,7 @@ 
      *
      * @var array
      */
-    public $supportedTokenizers = array('JS');
+    public $supportedTokenizers = array( 'JS' );
 
 
     /**
@@ -43,7 +43,7 @@ 
      */
     public function register()
     {
-        return array(T_CLOSE_OBJECT);
+        return array( T_CLOSE_OBJECT );
 
     }//end register()
 
@@ -57,16 +57,16 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
-        $prev = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$emptyTokens, ($stackPtr - 1), null, true);
-        if ($tokens[$prev]['code'] === T_COMMA) {
+        $prev = $phpcsFile->findPrevious( PHP_CodeSniffer_Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
+        if ( $tokens[ $prev ][ 'code' ] === T_COMMA ) {
             $error = 'Last member of object must not be followed by a comma';
-            $fix   = $phpcsFile->addFixableError($error, $prev, 'Missing');
-            if ($fix === true) {
-                $phpcsFile->fixer->replaceToken($prev, '');
+            $fix   = $phpcsFile->addFixableError( $error, $prev, 'Missing' );
+            if ( $fix === true ) {
+                $phpcsFile->fixer->replaceToken( $prev, '' );
             }
         }
 

Braces +3 added lines, -6 removed lines

@@ -25,8 +25,7 @@ 
  * @version   Release: @package_version@
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
-class Squiz_Sniffs_Objects_ObjectMemberCommaSniff implements PHP_CodeSniffer_Sniff
-{
+class Squiz_Sniffs_Objects_ObjectMemberCommaSniff implements PHP_CodeSniffer_Sniff {
 
     /**
      * A list of tokenizers this sniff supports.
@@ -41,8 +40,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(T_CLOSE_OBJECT);
 
     }//end register()
@@ -57,8 +55,7 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         $prev = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$emptyTokens, ($stackPtr - 1), null, true);

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/EmbeddedPhpSniff.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +369 added lines, -369 removed lines

@@ -31,375 +31,375 @@
 {
 
 
-    /**
-     * 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();
-
-        // If the close php tag is on the same line as the opening
-        // then we have an inline embedded PHP block.
-        $closeTag = $phpcsFile->findNext(T_CLOSE_TAG, $stackPtr);
-        if ($closeTag === false || $tokens[$stackPtr]['line'] !== $tokens[$closeTag]['line']) {
-            $this->_validateMultilineEmbeddedPhp($phpcsFile, $stackPtr);
-        } else {
-            $this->_validateInlineEmbeddedPhp($phpcsFile, $stackPtr);
-        }
-
-    }//end process()
-
-
-    /**
-     * Validates embedded PHP that exists on multiple lines.
-     *
-     * @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
-     */
-    private function _validateMultilineEmbeddedPhp(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        $prevTag = $phpcsFile->findPrevious(T_OPEN_TAG, ($stackPtr - 1));
-        if ($prevTag === false) {
-            // This is the first open tag.
-            return;
-        }
-
-        $firstContent = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-        $closingTag   = $phpcsFile->findNext(T_CLOSE_TAG, $stackPtr);
-        if ($closingTag !== false) {
-            $nextContent = $phpcsFile->findNext(T_WHITESPACE, ($closingTag + 1), $phpcsFile->numTokens, true);
-            if ($nextContent === false) {
-                // Final closing tag. It will be handled elsewhere.
-                return;
-            }
-
-            // We have an opening and a closing tag, that lie within other content.
-            if ($firstContent === $closingTag) {
-                $error = 'Empty embedded PHP tag found';
-                $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'Empty');
-                if ($fix === true) {
-                    $phpcsFile->fixer->beginChangeset();
-                    for ($i = $stackPtr; $i <= $closingTag; $i++) {
-                        $phpcsFile->fixer->replaceToken($i, '');
-                    }
-
-                    $phpcsFile->fixer->endChangeset();
-                }
-
-                return;
-            }
-        }//end if
-
-        if ($tokens[$firstContent]['line'] === $tokens[$stackPtr]['line']) {
-            $error = 'Opening PHP tag must be on a line by itself';
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'ContentAfterOpen');
-            if ($fix === true) {
-                $first   = $phpcsFile->findFirstOnLine(T_WHITESPACE, $stackPtr, true);
-                $padding = (strlen($tokens[$first]['content']) - strlen(ltrim($tokens[$first]['content'])));
-                $phpcsFile->fixer->beginChangeset();
-                $phpcsFile->fixer->addNewline($stackPtr);
-                $phpcsFile->fixer->addContent($stackPtr, str_repeat(' ', $padding));
-                $phpcsFile->fixer->endChangeset();
-            }
-        } else {
-            // Check the indent of the first line, except if it is a scope closer.
-            if (isset($tokens[$firstContent]['scope_closer']) === false
-                || $tokens[$firstContent]['scope_closer'] !== $firstContent
-            ) {
-                // Check for a blank line at the top.
-                if ($tokens[$firstContent]['line'] > ($tokens[$stackPtr]['line'] + 1)) {
-                    // Find a token on the blank line to throw the error on.
-                    $i = $stackPtr;
-                    do {
-                        $i++;
-                    } while ($tokens[$i]['line'] !== ($tokens[$stackPtr]['line'] + 1));
-
-                    $error = 'Blank line found at start of embedded PHP content';
-                    $fix   = $phpcsFile->addFixableError($error, $i, 'SpacingBefore');
-                    if ($fix === true) {
-                        $phpcsFile->fixer->beginChangeset();
-                        for ($i = ($stackPtr + 1); $i < $firstContent; $i++) {
-                            if ($tokens[$i]['line'] === $tokens[$firstContent]['line']
-                                || $tokens[$i]['line'] === $tokens[$stackPtr]['line']
-                            ) {
-                                continue;
-                            }
-
-                            $phpcsFile->fixer->replaceToken($i, '');
-                        }
-
-                        $phpcsFile->fixer->endChangeset();
-                    }
-                }//end if
-
-                $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $stackPtr);
-                if ($first === false) {
-                    $first  = $phpcsFile->findFirstOnLine(T_INLINE_HTML, $stackPtr);
-                    $indent = (strlen($tokens[$first]['content']) - strlen(ltrim($tokens[$first]['content'])));
-                } else {
-                    $indent = ($tokens[($first + 1)]['column'] - 1);
-                }
-
-                $contentColumn = ($tokens[$firstContent]['column'] - 1);
-                if ($contentColumn !== $indent) {
-                    $error = 'First line of embedded PHP code must be indented %s spaces; %s found';
-                    $data  = array(
-                              $indent,
-                              $contentColumn,
-                             );
-                    $fix   = $phpcsFile->addFixableError($error, $firstContent, 'Indent', $data);
-                    if ($fix === true) {
-                        $padding = str_repeat(' ', $indent);
-                        if ($contentColumn === 0) {
-                            $phpcsFile->fixer->addContentBefore($firstContent, $padding);
-                        } else {
-                            $phpcsFile->fixer->replaceToken(($firstContent - 1), $padding);
-                        }
-                    }
-                }
-            }//end if
-        }//end if
-
-        $lastContent = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
-        if ($tokens[$lastContent]['line'] === $tokens[$stackPtr]['line']
-            && trim($tokens[$lastContent]['content']) !== ''
-        ) {
-            $error = 'Opening PHP tag must be on a line by itself';
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'ContentBeforeOpen');
-            if ($fix === true) {
-                $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $stackPtr);
-                if ($first === false) {
-                    $first   = $phpcsFile->findFirstOnLine(T_INLINE_HTML, $stackPtr);
-                    $padding = (strlen($tokens[$first]['content']) - strlen(ltrim($tokens[$first]['content'])));
-                } else {
-                    $padding = ($tokens[($first + 1)]['column'] - 1);
-                }
-
-                $phpcsFile->fixer->addContentBefore($stackPtr, $phpcsFile->eolChar.str_repeat(' ', $padding));
-            }
-        } else {
-            // Find the first token on the first non-empty line we find.
-            for ($first = ($stackPtr - 1); $first > 0; $first--) {
-                if ($tokens[$first]['line'] === $tokens[$stackPtr]['line']) {
-                    continue;
-                } else if (trim($tokens[$first]['content']) !== '') {
-                    $first = $phpcsFile->findFirstOnLine(array(), $first, true);
-                    break;
-                }
-            }
-
-            $expected = 0;
-            if ($tokens[$first]['code'] === T_INLINE_HTML
-                && trim($tokens[$first]['content']) !== ''
-            ) {
-                $expected = (strlen($tokens[$first]['content']) - strlen(ltrim($tokens[$first]['content'])));
-            } else if ($tokens[$first]['code'] === T_WHITESPACE) {
-                $expected = ($tokens[($first + 1)]['column'] - 1);
-            }
-
-            $expected += 4;
-            $found     = ($tokens[$stackPtr]['column'] - 1);
-            if ($found > $expected) {
-                $error = 'Opening PHP tag indent incorrect; expected no more than %s spaces but found %s';
-                $data  = array(
-                          $expected,
-                          $found,
-                         );
-                $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'OpenTagIndent', $data);
-                if ($fix === true) {
-                    $phpcsFile->fixer->replaceToken(($stackPtr - 1), str_repeat(' ', $expected));
-                }
-            }
-        }//end if
-
-        if ($closingTag === false) {
-            return;
-        }
-
-        $lastContent = $phpcsFile->findPrevious(T_WHITESPACE, ($closingTag - 1), ($stackPtr + 1), true);
-        $nextContent = $phpcsFile->findNext(T_WHITESPACE, ($closingTag + 1), null, true);
-
-        if ($tokens[$lastContent]['line'] === $tokens[$closingTag]['line']) {
-            $error = 'Closing PHP tag must be on a line by itself';
-            $fix   = $phpcsFile->addFixableError($error, $closingTag, 'ContentBeforeEnd');
-            if ($fix === true) {
-                $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $closingTag, true);
-                $phpcsFile->fixer->beginChangeset();
-                $phpcsFile->fixer->addContentBefore($closingTag, str_repeat(' ', ($tokens[$first]['column'] - 1)));
-                $phpcsFile->fixer->addNewlineBefore($closingTag);
-                $phpcsFile->fixer->endChangeset();
-            }
-        } else if ($tokens[$nextContent]['line'] === $tokens[$closingTag]['line']) {
-            $error = 'Closing PHP tag must be on a line by itself';
-            $fix   = $phpcsFile->addFixableError($error, $closingTag, 'ContentAfterEnd');
-            if ($fix === true) {
-                $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $closingTag, true);
-                $phpcsFile->fixer->beginChangeset();
-                $phpcsFile->fixer->addNewline($closingTag);
-                $phpcsFile->fixer->addContent($closingTag, str_repeat(' ', ($tokens[$first]['column'] - 1)));
-                $phpcsFile->fixer->endChangeset();
-            }
-        }//end if
-
-        $next = $phpcsFile->findNext(T_OPEN_TAG, ($closingTag + 1));
-        if ($next === false) {
-            return;
-        }
-
-        // Check for a blank line at the bottom.
-        if ((isset($tokens[$lastContent]['scope_closer']) === false
-            || $tokens[$lastContent]['scope_closer'] !== $lastContent)
-            && $tokens[$lastContent]['line'] < ($tokens[$closingTag]['line'] - 1)
-        ) {
-            // Find a token on the blank line to throw the error on.
-            $i = $closingTag;
-            do {
-                $i--;
-            } while ($tokens[$i]['line'] !== ($tokens[$closingTag]['line'] - 1));
-
-            $error = 'Blank line found at end of embedded PHP content';
-            $fix   = $phpcsFile->addFixableError($error, $i, 'SpacingAfter');
-            if ($fix === true) {
-                $phpcsFile->fixer->beginChangeset();
-                for ($i = ($lastContent + 1); $i < $closingTag; $i++) {
-                    if ($tokens[$i]['line'] === $tokens[$lastContent]['line']
-                        || $tokens[$i]['line'] === $tokens[$closingTag]['line']
-                    ) {
-                        continue;
-                    }
-
-                    $phpcsFile->fixer->replaceToken($i, '');
-                }
-
-                $phpcsFile->fixer->endChangeset();
-            }
-        }//end if
-
-    }//end _validateMultilineEmbeddedPhp()
-
-
-    /**
-     * Validates embedded PHP that exists on one line.
-     *
-     * @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
-     */
-    private function _validateInlineEmbeddedPhp(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // We only want one line PHP sections, so return if the closing tag is
-        // on the next line.
-        $closeTag = $phpcsFile->findNext(T_CLOSE_TAG, $stackPtr, null, false);
-        if ($tokens[$stackPtr]['line'] !== $tokens[$closeTag]['line']) {
-            return;
-        }
-
-        // Check that there is one, and only one space at the start of the statement.
-        $firstContent = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), ($closeTag - 1), true);
-
-        if ($firstContent === false) {
-            $error = 'Empty embedded PHP tag found';
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'Empty');
-            if ($fix === true) {
-                $phpcsFile->fixer->beginChangeset();
-                for ($i = $stackPtr; $i <= $closeTag; $i++) {
-                    $phpcsFile->fixer->replaceToken($i, '');
-                }
-
-                $phpcsFile->fixer->endChangeset();
-            }
-
-            return;
-        }
-
-        // The open tag token always contains a single space after it.
-        $leadingSpace = 1;
-        if ($tokens[($stackPtr + 1)]['code'] === T_WHITESPACE) {
-            $leadingSpace = (strlen($tokens[($stackPtr + 1)]['content']) + 1);
-        }
-
-        if ($leadingSpace !== 1) {
-            $error = 'Expected 1 space after opening PHP tag; %s found';
-            $data  = array($leadingSpace);
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpacingAfterOpen', $data);
-            if ($fix === true) {
-                $phpcsFile->fixer->replaceToken(($stackPtr + 1), '');
-            }
-        }
-
-        $prev = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$emptyTokens, ($closeTag - 1), $stackPtr, true);
-        if ((isset($tokens[$prev]['scope_opener']) === false
-            || $tokens[$prev]['scope_opener'] !== $prev)
-            && (isset($tokens[$prev]['scope_closer']) === false
-            || $tokens[$prev]['scope_closer'] !== $prev)
-            && $tokens[$prev]['code'] !== T_SEMICOLON
-        ) {
-            $error = 'Inline PHP statement must end with a semicolon';
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'NoSemicolon');
-            if ($fix === true) {
-                $phpcsFile->fixer->addContent($prev, ';');
-            }
-        } else if ($tokens[$prev]['code'] === T_SEMICOLON) {
-            $statementCount = 1;
-            for ($i = ($stackPtr + 1); $i < $prev; $i++) {
-                if ($tokens[$i]['code'] === T_SEMICOLON) {
-                    $statementCount++;
-                }
-            }
-
-            if ($statementCount > 1) {
-                $error = 'Inline PHP statement must contain a single statement; %s found';
-                $data  = array($statementCount);
-                $phpcsFile->addError($error, $stackPtr, 'MultipleStatements', $data);
-            }
-        }
-
-        $trailingSpace = 0;
-        if ($tokens[($closeTag - 1)]['code'] === T_WHITESPACE) {
-            $trailingSpace = strlen($tokens[($closeTag - 1)]['content']);
-        }
-
-        if ($trailingSpace !== 1) {
-            $error = 'Expected 1 space before closing PHP tag; %s found';
-            $data  = array($trailingSpace);
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpacingBeforeClose', $data);
-            if ($fix === true) {
-                if ($trailingSpace === 0) {
-                    $phpcsFile->fixer->addContentBefore($closeTag, ' ');
-                } else {
-                    $phpcsFile->fixer->replaceToken(($closeTag - 1), ' ');
-                }
-            }
-        }
-
-    }//end _validateInlineEmbeddedPhp()
+	 /**
+	  * 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();
+
+		  // If the close php tag is on the same line as the opening
+		  // then we have an inline embedded PHP block.
+		  $closeTag = $phpcsFile->findNext(T_CLOSE_TAG, $stackPtr);
+		  if ($closeTag === false || $tokens[$stackPtr]['line'] !== $tokens[$closeTag]['line']) {
+				$this->_validateMultilineEmbeddedPhp($phpcsFile, $stackPtr);
+		  } else {
+				$this->_validateInlineEmbeddedPhp($phpcsFile, $stackPtr);
+		  }
+
+	 }//end process()
+
+
+	 /**
+	  * Validates embedded PHP that exists on multiple lines.
+	  *
+	  * @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
+	  */
+	 private function _validateMultilineEmbeddedPhp(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+	 {
+		  $tokens = $phpcsFile->getTokens();
+
+		  $prevTag = $phpcsFile->findPrevious(T_OPEN_TAG, ($stackPtr - 1));
+		  if ($prevTag === false) {
+				// This is the first open tag.
+				return;
+		  }
+
+		  $firstContent = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
+		  $closingTag   = $phpcsFile->findNext(T_CLOSE_TAG, $stackPtr);
+		  if ($closingTag !== false) {
+				$nextContent = $phpcsFile->findNext(T_WHITESPACE, ($closingTag + 1), $phpcsFile->numTokens, true);
+				if ($nextContent === false) {
+					 // Final closing tag. It will be handled elsewhere.
+					 return;
+				}
+
+				// We have an opening and a closing tag, that lie within other content.
+				if ($firstContent === $closingTag) {
+					 $error = 'Empty embedded PHP tag found';
+					 $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'Empty');
+					 if ($fix === true) {
+						  $phpcsFile->fixer->beginChangeset();
+						  for ($i = $stackPtr; $i <= $closingTag; $i++) {
+								$phpcsFile->fixer->replaceToken($i, '');
+						  }
+
+						  $phpcsFile->fixer->endChangeset();
+					 }
+
+					 return;
+				}
+		  }//end if
+
+		  if ($tokens[$firstContent]['line'] === $tokens[$stackPtr]['line']) {
+				$error = 'Opening PHP tag must be on a line by itself';
+				$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'ContentAfterOpen');
+				if ($fix === true) {
+					 $first   = $phpcsFile->findFirstOnLine(T_WHITESPACE, $stackPtr, true);
+					 $padding = (strlen($tokens[$first]['content']) - strlen(ltrim($tokens[$first]['content'])));
+					 $phpcsFile->fixer->beginChangeset();
+					 $phpcsFile->fixer->addNewline($stackPtr);
+					 $phpcsFile->fixer->addContent($stackPtr, str_repeat(' ', $padding));
+					 $phpcsFile->fixer->endChangeset();
+				}
+		  } else {
+				// Check the indent of the first line, except if it is a scope closer.
+				if (isset($tokens[$firstContent]['scope_closer']) === false
+					 || $tokens[$firstContent]['scope_closer'] !== $firstContent
+				) {
+					 // Check for a blank line at the top.
+					 if ($tokens[$firstContent]['line'] > ($tokens[$stackPtr]['line'] + 1)) {
+						  // Find a token on the blank line to throw the error on.
+						  $i = $stackPtr;
+						  do {
+								$i++;
+						  } while ($tokens[$i]['line'] !== ($tokens[$stackPtr]['line'] + 1));
+
+						  $error = 'Blank line found at start of embedded PHP content';
+						  $fix   = $phpcsFile->addFixableError($error, $i, 'SpacingBefore');
+						  if ($fix === true) {
+								$phpcsFile->fixer->beginChangeset();
+								for ($i = ($stackPtr + 1); $i < $firstContent; $i++) {
+									 if ($tokens[$i]['line'] === $tokens[$firstContent]['line']
+										  || $tokens[$i]['line'] === $tokens[$stackPtr]['line']
+									 ) {
+										  continue;
+									 }
+
+									 $phpcsFile->fixer->replaceToken($i, '');
+								}
+
+								$phpcsFile->fixer->endChangeset();
+						  }
+					 }//end if
+
+					 $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $stackPtr);
+					 if ($first === false) {
+						  $first  = $phpcsFile->findFirstOnLine(T_INLINE_HTML, $stackPtr);
+						  $indent = (strlen($tokens[$first]['content']) - strlen(ltrim($tokens[$first]['content'])));
+					 } else {
+						  $indent = ($tokens[($first + 1)]['column'] - 1);
+					 }
+
+					 $contentColumn = ($tokens[$firstContent]['column'] - 1);
+					 if ($contentColumn !== $indent) {
+						  $error = 'First line of embedded PHP code must be indented %s spaces; %s found';
+						  $data  = array(
+										$indent,
+										$contentColumn,
+									  );
+						  $fix   = $phpcsFile->addFixableError($error, $firstContent, 'Indent', $data);
+						  if ($fix === true) {
+								$padding = str_repeat(' ', $indent);
+								if ($contentColumn === 0) {
+									 $phpcsFile->fixer->addContentBefore($firstContent, $padding);
+								} else {
+									 $phpcsFile->fixer->replaceToken(($firstContent - 1), $padding);
+								}
+						  }
+					 }
+				}//end if
+		  }//end if
+
+		  $lastContent = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
+		  if ($tokens[$lastContent]['line'] === $tokens[$stackPtr]['line']
+				&& trim($tokens[$lastContent]['content']) !== ''
+		  ) {
+				$error = 'Opening PHP tag must be on a line by itself';
+				$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'ContentBeforeOpen');
+				if ($fix === true) {
+					 $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $stackPtr);
+					 if ($first === false) {
+						  $first   = $phpcsFile->findFirstOnLine(T_INLINE_HTML, $stackPtr);
+						  $padding = (strlen($tokens[$first]['content']) - strlen(ltrim($tokens[$first]['content'])));
+					 } else {
+						  $padding = ($tokens[($first + 1)]['column'] - 1);
+					 }
+
+					 $phpcsFile->fixer->addContentBefore($stackPtr, $phpcsFile->eolChar.str_repeat(' ', $padding));
+				}
+		  } else {
+				// Find the first token on the first non-empty line we find.
+				for ($first = ($stackPtr - 1); $first > 0; $first--) {
+					 if ($tokens[$first]['line'] === $tokens[$stackPtr]['line']) {
+						  continue;
+					 } else if (trim($tokens[$first]['content']) !== '') {
+						  $first = $phpcsFile->findFirstOnLine(array(), $first, true);
+						  break;
+					 }
+				}
+
+				$expected = 0;
+				if ($tokens[$first]['code'] === T_INLINE_HTML
+					 && trim($tokens[$first]['content']) !== ''
+				) {
+					 $expected = (strlen($tokens[$first]['content']) - strlen(ltrim($tokens[$first]['content'])));
+				} else if ($tokens[$first]['code'] === T_WHITESPACE) {
+					 $expected = ($tokens[($first + 1)]['column'] - 1);
+				}
+
+				$expected += 4;
+				$found     = ($tokens[$stackPtr]['column'] - 1);
+				if ($found > $expected) {
+					 $error = 'Opening PHP tag indent incorrect; expected no more than %s spaces but found %s';
+					 $data  = array(
+								  $expected,
+								  $found,
+								 );
+					 $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'OpenTagIndent', $data);
+					 if ($fix === true) {
+						  $phpcsFile->fixer->replaceToken(($stackPtr - 1), str_repeat(' ', $expected));
+					 }
+				}
+		  }//end if
+
+		  if ($closingTag === false) {
+				return;
+		  }
+
+		  $lastContent = $phpcsFile->findPrevious(T_WHITESPACE, ($closingTag - 1), ($stackPtr + 1), true);
+		  $nextContent = $phpcsFile->findNext(T_WHITESPACE, ($closingTag + 1), null, true);
+
+		  if ($tokens[$lastContent]['line'] === $tokens[$closingTag]['line']) {
+				$error = 'Closing PHP tag must be on a line by itself';
+				$fix   = $phpcsFile->addFixableError($error, $closingTag, 'ContentBeforeEnd');
+				if ($fix === true) {
+					 $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $closingTag, true);
+					 $phpcsFile->fixer->beginChangeset();
+					 $phpcsFile->fixer->addContentBefore($closingTag, str_repeat(' ', ($tokens[$first]['column'] - 1)));
+					 $phpcsFile->fixer->addNewlineBefore($closingTag);
+					 $phpcsFile->fixer->endChangeset();
+				}
+		  } else if ($tokens[$nextContent]['line'] === $tokens[$closingTag]['line']) {
+				$error = 'Closing PHP tag must be on a line by itself';
+				$fix   = $phpcsFile->addFixableError($error, $closingTag, 'ContentAfterEnd');
+				if ($fix === true) {
+					 $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $closingTag, true);
+					 $phpcsFile->fixer->beginChangeset();
+					 $phpcsFile->fixer->addNewline($closingTag);
+					 $phpcsFile->fixer->addContent($closingTag, str_repeat(' ', ($tokens[$first]['column'] - 1)));
+					 $phpcsFile->fixer->endChangeset();
+				}
+		  }//end if
+
+		  $next = $phpcsFile->findNext(T_OPEN_TAG, ($closingTag + 1));
+		  if ($next === false) {
+				return;
+		  }
+
+		  // Check for a blank line at the bottom.
+		  if ((isset($tokens[$lastContent]['scope_closer']) === false
+				|| $tokens[$lastContent]['scope_closer'] !== $lastContent)
+				&& $tokens[$lastContent]['line'] < ($tokens[$closingTag]['line'] - 1)
+		  ) {
+				// Find a token on the blank line to throw the error on.
+				$i = $closingTag;
+				do {
+					 $i--;
+				} while ($tokens[$i]['line'] !== ($tokens[$closingTag]['line'] - 1));
+
+				$error = 'Blank line found at end of embedded PHP content';
+				$fix   = $phpcsFile->addFixableError($error, $i, 'SpacingAfter');
+				if ($fix === true) {
+					 $phpcsFile->fixer->beginChangeset();
+					 for ($i = ($lastContent + 1); $i < $closingTag; $i++) {
+						  if ($tokens[$i]['line'] === $tokens[$lastContent]['line']
+								|| $tokens[$i]['line'] === $tokens[$closingTag]['line']
+						  ) {
+								continue;
+						  }
+
+						  $phpcsFile->fixer->replaceToken($i, '');
+					 }
+
+					 $phpcsFile->fixer->endChangeset();
+				}
+		  }//end if
+
+	 }//end _validateMultilineEmbeddedPhp()
+
+
+	 /**
+	  * Validates embedded PHP that exists on one line.
+	  *
+	  * @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
+	  */
+	 private function _validateInlineEmbeddedPhp(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+	 {
+		  $tokens = $phpcsFile->getTokens();
+
+		  // We only want one line PHP sections, so return if the closing tag is
+		  // on the next line.
+		  $closeTag = $phpcsFile->findNext(T_CLOSE_TAG, $stackPtr, null, false);
+		  if ($tokens[$stackPtr]['line'] !== $tokens[$closeTag]['line']) {
+				return;
+		  }
+
+		  // Check that there is one, and only one space at the start of the statement.
+		  $firstContent = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), ($closeTag - 1), true);
+
+		  if ($firstContent === false) {
+				$error = 'Empty embedded PHP tag found';
+				$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'Empty');
+				if ($fix === true) {
+					 $phpcsFile->fixer->beginChangeset();
+					 for ($i = $stackPtr; $i <= $closeTag; $i++) {
+						  $phpcsFile->fixer->replaceToken($i, '');
+					 }
+
+					 $phpcsFile->fixer->endChangeset();
+				}
+
+				return;
+		  }
+
+		  // The open tag token always contains a single space after it.
+		  $leadingSpace = 1;
+		  if ($tokens[($stackPtr + 1)]['code'] === T_WHITESPACE) {
+				$leadingSpace = (strlen($tokens[($stackPtr + 1)]['content']) + 1);
+		  }
+
+		  if ($leadingSpace !== 1) {
+				$error = 'Expected 1 space after opening PHP tag; %s found';
+				$data  = array($leadingSpace);
+				$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpacingAfterOpen', $data);
+				if ($fix === true) {
+					 $phpcsFile->fixer->replaceToken(($stackPtr + 1), '');
+				}
+		  }
+
+		  $prev = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$emptyTokens, ($closeTag - 1), $stackPtr, true);
+		  if ((isset($tokens[$prev]['scope_opener']) === false
+				|| $tokens[$prev]['scope_opener'] !== $prev)
+				&& (isset($tokens[$prev]['scope_closer']) === false
+				|| $tokens[$prev]['scope_closer'] !== $prev)
+				&& $tokens[$prev]['code'] !== T_SEMICOLON
+		  ) {
+				$error = 'Inline PHP statement must end with a semicolon';
+				$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'NoSemicolon');
+				if ($fix === true) {
+					 $phpcsFile->fixer->addContent($prev, ';');
+				}
+		  } else if ($tokens[$prev]['code'] === T_SEMICOLON) {
+				$statementCount = 1;
+				for ($i = ($stackPtr + 1); $i < $prev; $i++) {
+					 if ($tokens[$i]['code'] === T_SEMICOLON) {
+						  $statementCount++;
+					 }
+				}
+
+				if ($statementCount > 1) {
+					 $error = 'Inline PHP statement must contain a single statement; %s found';
+					 $data  = array($statementCount);
+					 $phpcsFile->addError($error, $stackPtr, 'MultipleStatements', $data);
+				}
+		  }
+
+		  $trailingSpace = 0;
+		  if ($tokens[($closeTag - 1)]['code'] === T_WHITESPACE) {
+				$trailingSpace = strlen($tokens[($closeTag - 1)]['content']);
+		  }
+
+		  if ($trailingSpace !== 1) {
+				$error = 'Expected 1 space before closing PHP tag; %s found';
+				$data  = array($trailingSpace);
+				$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpacingBeforeClose', $data);
+				if ($fix === true) {
+					 if ($trailingSpace === 0) {
+						  $phpcsFile->fixer->addContentBefore($closeTag, ' ');
+					 } else {
+						  $phpcsFile->fixer->replaceToken(($closeTag - 1), ' ');
+					 }
+				}
+		  }
+
+	 }//end _validateInlineEmbeddedPhp()
 
 
 }//end class

Spacing +141 added lines, -141 removed lines

@@ -38,7 +38,7 @@ 
      */
     public function register()
     {
-        return array(T_OPEN_TAG);
+        return array( T_OPEN_TAG );
 
     }//end register()
 
@@ -52,17 +52,17 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
         // If the close php tag is on the same line as the opening
         // then we have an inline embedded PHP block.
-        $closeTag = $phpcsFile->findNext(T_CLOSE_TAG, $stackPtr);
-        if ($closeTag === false || $tokens[$stackPtr]['line'] !== $tokens[$closeTag]['line']) {
-            $this->_validateMultilineEmbeddedPhp($phpcsFile, $stackPtr);
+        $closeTag = $phpcsFile->findNext( T_CLOSE_TAG, $stackPtr );
+        if ( $closeTag === false || $tokens[ $stackPtr ][ 'line' ] !== $tokens[ $closeTag ][ 'line' ] ) {
+            $this->_validateMultilineEmbeddedPhp( $phpcsFile, $stackPtr );
         } else {
-            $this->_validateInlineEmbeddedPhp($phpcsFile, $stackPtr);
+            $this->_validateInlineEmbeddedPhp( $phpcsFile, $stackPtr );
         }
 
     }//end process()
@@ -77,33 +77,33 @@ 
      *
      * @return void
      */
-    private function _validateMultilineEmbeddedPhp(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    private function _validateMultilineEmbeddedPhp( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
-        $prevTag = $phpcsFile->findPrevious(T_OPEN_TAG, ($stackPtr - 1));
-        if ($prevTag === false) {
+        $prevTag = $phpcsFile->findPrevious( T_OPEN_TAG, ( $stackPtr - 1 ) );
+        if ( $prevTag === false ) {
             // This is the first open tag.
             return;
         }
 
-        $firstContent = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-        $closingTag   = $phpcsFile->findNext(T_CLOSE_TAG, $stackPtr);
-        if ($closingTag !== false) {
-            $nextContent = $phpcsFile->findNext(T_WHITESPACE, ($closingTag + 1), $phpcsFile->numTokens, true);
-            if ($nextContent === false) {
+        $firstContent = $phpcsFile->findNext( T_WHITESPACE, ( $stackPtr + 1 ), null, true );
+        $closingTag   = $phpcsFile->findNext( T_CLOSE_TAG, $stackPtr );
+        if ( $closingTag !== false ) {
+            $nextContent = $phpcsFile->findNext( T_WHITESPACE, ( $closingTag + 1 ), $phpcsFile->numTokens, true );
+            if ( $nextContent === false ) {
                 // Final closing tag. It will be handled elsewhere.
                 return;
             }
 
             // We have an opening and a closing tag, that lie within other content.
-            if ($firstContent === $closingTag) {
+            if ( $firstContent === $closingTag ) {
                 $error = 'Empty embedded PHP tag found';
-                $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'Empty');
-                if ($fix === true) {
+                $fix   = $phpcsFile->addFixableError( $error, $stackPtr, 'Empty' );
+                if ( $fix === true ) {
                     $phpcsFile->fixer->beginChangeset();
-                    for ($i = $stackPtr; $i <= $closingTag; $i++) {
-                        $phpcsFile->fixer->replaceToken($i, '');
+                    for ( $i = $stackPtr; $i <= $closingTag; $i++ ) {
+                        $phpcsFile->fixer->replaceToken( $i, '' );
                     }
 
                     $phpcsFile->fixer->endChangeset();
@@ -113,185 +113,185 @@ 
             }
         }//end if
 
-        if ($tokens[$firstContent]['line'] === $tokens[$stackPtr]['line']) {
+        if ( $tokens[ $firstContent ][ 'line' ] === $tokens[ $stackPtr ][ 'line' ] ) {
             $error = 'Opening PHP tag must be on a line by itself';
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'ContentAfterOpen');
-            if ($fix === true) {
-                $first   = $phpcsFile->findFirstOnLine(T_WHITESPACE, $stackPtr, true);
-                $padding = (strlen($tokens[$first]['content']) - strlen(ltrim($tokens[$first]['content'])));
+            $fix   = $phpcsFile->addFixableError( $error, $stackPtr, 'ContentAfterOpen' );
+            if ( $fix === true ) {
+                $first   = $phpcsFile->findFirstOnLine( T_WHITESPACE, $stackPtr, true );
+                $padding = ( strlen( $tokens[ $first ][ 'content' ] ) - strlen( ltrim( $tokens[ $first ][ 'content' ] ) ) );
                 $phpcsFile->fixer->beginChangeset();
-                $phpcsFile->fixer->addNewline($stackPtr);
-                $phpcsFile->fixer->addContent($stackPtr, str_repeat(' ', $padding));
+                $phpcsFile->fixer->addNewline( $stackPtr );
+                $phpcsFile->fixer->addContent( $stackPtr, str_repeat( ' ', $padding ) );
                 $phpcsFile->fixer->endChangeset();
             }
         } else {
             // Check the indent of the first line, except if it is a scope closer.
-            if (isset($tokens[$firstContent]['scope_closer']) === false
-                || $tokens[$firstContent]['scope_closer'] !== $firstContent
+            if ( isset( $tokens[ $firstContent ][ 'scope_closer' ] ) === false
+                || $tokens[ $firstContent ][ 'scope_closer' ] !== $firstContent
             ) {
                 // Check for a blank line at the top.
-                if ($tokens[$firstContent]['line'] > ($tokens[$stackPtr]['line'] + 1)) {
+                if ( $tokens[ $firstContent ][ 'line' ] > ( $tokens[ $stackPtr ][ 'line' ] + 1 ) ) {
                     // Find a token on the blank line to throw the error on.
                     $i = $stackPtr;
                     do {
                         $i++;
-                    } while ($tokens[$i]['line'] !== ($tokens[$stackPtr]['line'] + 1));
+                    } while ( $tokens[ $i ][ 'line' ] !== ( $tokens[ $stackPtr ][ 'line' ] + 1 ) );
 
                     $error = 'Blank line found at start of embedded PHP content';
-                    $fix   = $phpcsFile->addFixableError($error, $i, 'SpacingBefore');
-                    if ($fix === true) {
+                    $fix   = $phpcsFile->addFixableError( $error, $i, 'SpacingBefore' );
+                    if ( $fix === true ) {
                         $phpcsFile->fixer->beginChangeset();
-                        for ($i = ($stackPtr + 1); $i < $firstContent; $i++) {
-                            if ($tokens[$i]['line'] === $tokens[$firstContent]['line']
-                                || $tokens[$i]['line'] === $tokens[$stackPtr]['line']
+                        for ( $i = ( $stackPtr + 1 ); $i < $firstContent; $i++ ) {
+                            if ( $tokens[ $i ][ 'line' ] === $tokens[ $firstContent ][ 'line' ]
+                                || $tokens[ $i ][ 'line' ] === $tokens[ $stackPtr ][ 'line' ]
                             ) {
                                 continue;
                             }
 
-                            $phpcsFile->fixer->replaceToken($i, '');
+                            $phpcsFile->fixer->replaceToken( $i, '' );
                         }
 
                         $phpcsFile->fixer->endChangeset();
                     }
                 }//end if
 
-                $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $stackPtr);
-                if ($first === false) {
-                    $first  = $phpcsFile->findFirstOnLine(T_INLINE_HTML, $stackPtr);
-                    $indent = (strlen($tokens[$first]['content']) - strlen(ltrim($tokens[$first]['content'])));
+                $first = $phpcsFile->findFirstOnLine( T_WHITESPACE, $stackPtr );
+                if ( $first === false ) {
+                    $first  = $phpcsFile->findFirstOnLine( T_INLINE_HTML, $stackPtr );
+                    $indent = ( strlen( $tokens[ $first ][ 'content' ] ) - strlen( ltrim( $tokens[ $first ][ 'content' ] ) ) );
                 } else {
-                    $indent = ($tokens[($first + 1)]['column'] - 1);
+                    $indent = ( $tokens[ ( $first + 1 ) ][ 'column' ] - 1 );
                 }
 
-                $contentColumn = ($tokens[$firstContent]['column'] - 1);
-                if ($contentColumn !== $indent) {
+                $contentColumn = ( $tokens[ $firstContent ][ 'column' ] - 1 );
+                if ( $contentColumn !== $indent ) {
                     $error = 'First line of embedded PHP code must be indented %s spaces; %s found';
                     $data  = array(
                               $indent,
                               $contentColumn,
                              );
-                    $fix   = $phpcsFile->addFixableError($error, $firstContent, 'Indent', $data);
-                    if ($fix === true) {
-                        $padding = str_repeat(' ', $indent);
-                        if ($contentColumn === 0) {
-                            $phpcsFile->fixer->addContentBefore($firstContent, $padding);
+                    $fix = $phpcsFile->addFixableError( $error, $firstContent, 'Indent', $data );
+                    if ( $fix === true ) {
+                        $padding = str_repeat( ' ', $indent );
+                        if ( $contentColumn === 0 ) {
+                            $phpcsFile->fixer->addContentBefore( $firstContent, $padding );
                         } else {
-                            $phpcsFile->fixer->replaceToken(($firstContent - 1), $padding);
+                            $phpcsFile->fixer->replaceToken( ( $firstContent - 1 ), $padding );
                         }
                     }
                 }
             }//end if
         }//end if
 
-        $lastContent = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
-        if ($tokens[$lastContent]['line'] === $tokens[$stackPtr]['line']
-            && trim($tokens[$lastContent]['content']) !== ''
+        $lastContent = $phpcsFile->findPrevious( T_WHITESPACE, ( $stackPtr - 1 ), null, true );
+        if ( $tokens[ $lastContent ][ 'line' ] === $tokens[ $stackPtr ][ 'line' ]
+            && trim( $tokens[ $lastContent ][ 'content' ] ) !== ''
         ) {
             $error = 'Opening PHP tag must be on a line by itself';
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'ContentBeforeOpen');
-            if ($fix === true) {
-                $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $stackPtr);
-                if ($first === false) {
-                    $first   = $phpcsFile->findFirstOnLine(T_INLINE_HTML, $stackPtr);
-                    $padding = (strlen($tokens[$first]['content']) - strlen(ltrim($tokens[$first]['content'])));
+            $fix   = $phpcsFile->addFixableError( $error, $stackPtr, 'ContentBeforeOpen' );
+            if ( $fix === true ) {
+                $first = $phpcsFile->findFirstOnLine( T_WHITESPACE, $stackPtr );
+                if ( $first === false ) {
+                    $first   = $phpcsFile->findFirstOnLine( T_INLINE_HTML, $stackPtr );
+                    $padding = ( strlen( $tokens[ $first ][ 'content' ] ) - strlen( ltrim( $tokens[ $first ][ 'content' ] ) ) );
                 } else {
-                    $padding = ($tokens[($first + 1)]['column'] - 1);
+                    $padding = ( $tokens[ ( $first + 1 ) ][ 'column' ] - 1 );
                 }
 
-                $phpcsFile->fixer->addContentBefore($stackPtr, $phpcsFile->eolChar.str_repeat(' ', $padding));
+                $phpcsFile->fixer->addContentBefore( $stackPtr, $phpcsFile->eolChar . str_repeat( ' ', $padding ) );
             }
         } else {
             // Find the first token on the first non-empty line we find.
-            for ($first = ($stackPtr - 1); $first > 0; $first--) {
-                if ($tokens[$first]['line'] === $tokens[$stackPtr]['line']) {
+            for ( $first = ( $stackPtr - 1 ); $first > 0; $first-- ) {
+                if ( $tokens[ $first ][ 'line' ] === $tokens[ $stackPtr ][ 'line' ] ) {
                     continue;
-                } else if (trim($tokens[$first]['content']) !== '') {
-                    $first = $phpcsFile->findFirstOnLine(array(), $first, true);
+                } else if ( trim( $tokens[ $first ][ 'content' ] ) !== '' ) {
+                    $first = $phpcsFile->findFirstOnLine( array(), $first, true );
                     break;
                 }
             }
 
             $expected = 0;
-            if ($tokens[$first]['code'] === T_INLINE_HTML
-                && trim($tokens[$first]['content']) !== ''
+            if ( $tokens[ $first ][ 'code' ] === T_INLINE_HTML
+                && trim( $tokens[ $first ][ 'content' ] ) !== ''
             ) {
-                $expected = (strlen($tokens[$first]['content']) - strlen(ltrim($tokens[$first]['content'])));
-            } else if ($tokens[$first]['code'] === T_WHITESPACE) {
-                $expected = ($tokens[($first + 1)]['column'] - 1);
+                $expected = ( strlen( $tokens[ $first ][ 'content' ] ) - strlen( ltrim( $tokens[ $first ][ 'content' ] ) ) );
+            } else if ( $tokens[ $first ][ 'code' ] === T_WHITESPACE ) {
+                $expected = ( $tokens[ ( $first + 1 ) ][ 'column' ] - 1 );
             }
 
             $expected += 4;
-            $found     = ($tokens[$stackPtr]['column'] - 1);
-            if ($found > $expected) {
+            $found     = ( $tokens[ $stackPtr ][ 'column' ] - 1 );
+            if ( $found > $expected ) {
                 $error = 'Opening PHP tag indent incorrect; expected no more than %s spaces but found %s';
                 $data  = array(
                           $expected,
                           $found,
                          );
-                $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'OpenTagIndent', $data);
-                if ($fix === true) {
-                    $phpcsFile->fixer->replaceToken(($stackPtr - 1), str_repeat(' ', $expected));
+                $fix = $phpcsFile->addFixableError( $error, $stackPtr, 'OpenTagIndent', $data );
+                if ( $fix === true ) {
+                    $phpcsFile->fixer->replaceToken( ( $stackPtr - 1 ), str_repeat( ' ', $expected ) );
                 }
             }
         }//end if
 
-        if ($closingTag === false) {
+        if ( $closingTag === false ) {
             return;
         }
 
-        $lastContent = $phpcsFile->findPrevious(T_WHITESPACE, ($closingTag - 1), ($stackPtr + 1), true);
-        $nextContent = $phpcsFile->findNext(T_WHITESPACE, ($closingTag + 1), null, true);
+        $lastContent = $phpcsFile->findPrevious( T_WHITESPACE, ( $closingTag - 1 ), ( $stackPtr + 1 ), true );
+        $nextContent = $phpcsFile->findNext( T_WHITESPACE, ( $closingTag + 1 ), null, true );
 
-        if ($tokens[$lastContent]['line'] === $tokens[$closingTag]['line']) {
+        if ( $tokens[ $lastContent ][ 'line' ] === $tokens[ $closingTag ][ 'line' ] ) {
             $error = 'Closing PHP tag must be on a line by itself';
-            $fix   = $phpcsFile->addFixableError($error, $closingTag, 'ContentBeforeEnd');
-            if ($fix === true) {
-                $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $closingTag, true);
+            $fix   = $phpcsFile->addFixableError( $error, $closingTag, 'ContentBeforeEnd' );
+            if ( $fix === true ) {
+                $first = $phpcsFile->findFirstOnLine( T_WHITESPACE, $closingTag, true );
                 $phpcsFile->fixer->beginChangeset();
-                $phpcsFile->fixer->addContentBefore($closingTag, str_repeat(' ', ($tokens[$first]['column'] - 1)));
-                $phpcsFile->fixer->addNewlineBefore($closingTag);
+                $phpcsFile->fixer->addContentBefore( $closingTag, str_repeat( ' ', ( $tokens[ $first ][ 'column' ] - 1 ) ) );
+                $phpcsFile->fixer->addNewlineBefore( $closingTag );
                 $phpcsFile->fixer->endChangeset();
             }
-        } else if ($tokens[$nextContent]['line'] === $tokens[$closingTag]['line']) {
+        } else if ( $tokens[ $nextContent ][ 'line' ] === $tokens[ $closingTag ][ 'line' ] ) {
             $error = 'Closing PHP tag must be on a line by itself';
-            $fix   = $phpcsFile->addFixableError($error, $closingTag, 'ContentAfterEnd');
-            if ($fix === true) {
-                $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $closingTag, true);
+            $fix   = $phpcsFile->addFixableError( $error, $closingTag, 'ContentAfterEnd' );
+            if ( $fix === true ) {
+                $first = $phpcsFile->findFirstOnLine( T_WHITESPACE, $closingTag, true );
                 $phpcsFile->fixer->beginChangeset();
-                $phpcsFile->fixer->addNewline($closingTag);
-                $phpcsFile->fixer->addContent($closingTag, str_repeat(' ', ($tokens[$first]['column'] - 1)));
+                $phpcsFile->fixer->addNewline( $closingTag );
+                $phpcsFile->fixer->addContent( $closingTag, str_repeat( ' ', ( $tokens[ $first ][ 'column' ] - 1 ) ) );
                 $phpcsFile->fixer->endChangeset();
             }
         }//end if
 
-        $next = $phpcsFile->findNext(T_OPEN_TAG, ($closingTag + 1));
-        if ($next === false) {
+        $next = $phpcsFile->findNext( T_OPEN_TAG, ( $closingTag + 1 ) );
+        if ( $next === false ) {
             return;
         }
 
         // Check for a blank line at the bottom.
-        if ((isset($tokens[$lastContent]['scope_closer']) === false
-            || $tokens[$lastContent]['scope_closer'] !== $lastContent)
-            && $tokens[$lastContent]['line'] < ($tokens[$closingTag]['line'] - 1)
+        if ( ( isset( $tokens[ $lastContent ][ 'scope_closer' ] ) === false
+            || $tokens[ $lastContent ][ 'scope_closer' ] !== $lastContent )
+            && $tokens[ $lastContent ][ 'line' ] < ( $tokens[ $closingTag ][ 'line' ] - 1 )
         ) {
             // Find a token on the blank line to throw the error on.
             $i = $closingTag;
             do {
                 $i--;
-            } while ($tokens[$i]['line'] !== ($tokens[$closingTag]['line'] - 1));
+            } while ( $tokens[ $i ][ 'line' ] !== ( $tokens[ $closingTag ][ 'line' ] - 1 ) );
 
             $error = 'Blank line found at end of embedded PHP content';
-            $fix   = $phpcsFile->addFixableError($error, $i, 'SpacingAfter');
-            if ($fix === true) {
+            $fix   = $phpcsFile->addFixableError( $error, $i, 'SpacingAfter' );
+            if ( $fix === true ) {
                 $phpcsFile->fixer->beginChangeset();
-                for ($i = ($lastContent + 1); $i < $closingTag; $i++) {
-                    if ($tokens[$i]['line'] === $tokens[$lastContent]['line']
-                        || $tokens[$i]['line'] === $tokens[$closingTag]['line']
+                for ( $i = ( $lastContent + 1 ); $i < $closingTag; $i++ ) {
+                    if ( $tokens[ $i ][ 'line' ] === $tokens[ $lastContent ][ 'line' ]
+                        || $tokens[ $i ][ 'line' ] === $tokens[ $closingTag ][ 'line' ]
                     ) {
                         continue;
                     }
 
-                    $phpcsFile->fixer->replaceToken($i, '');
+                    $phpcsFile->fixer->replaceToken( $i, '' );
                 }
 
                 $phpcsFile->fixer->endChangeset();
@@ -310,27 +310,27 @@ 
      *
      * @return void
      */
-    private function _validateInlineEmbeddedPhp(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    private function _validateInlineEmbeddedPhp( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
         // We only want one line PHP sections, so return if the closing tag is
         // on the next line.
-        $closeTag = $phpcsFile->findNext(T_CLOSE_TAG, $stackPtr, null, false);
-        if ($tokens[$stackPtr]['line'] !== $tokens[$closeTag]['line']) {
+        $closeTag = $phpcsFile->findNext( T_CLOSE_TAG, $stackPtr, null, false );
+        if ( $tokens[ $stackPtr ][ 'line' ] !== $tokens[ $closeTag ][ 'line' ] ) {
             return;
         }
 
         // Check that there is one, and only one space at the start of the statement.
-        $firstContent = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), ($closeTag - 1), true);
+        $firstContent = $phpcsFile->findNext( T_WHITESPACE, ( $stackPtr + 1 ), ( $closeTag - 1 ), true );
 
-        if ($firstContent === false) {
+        if ( $firstContent === false ) {
             $error = 'Empty embedded PHP tag found';
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'Empty');
-            if ($fix === true) {
+            $fix   = $phpcsFile->addFixableError( $error, $stackPtr, 'Empty' );
+            if ( $fix === true ) {
                 $phpcsFile->fixer->beginChangeset();
-                for ($i = $stackPtr; $i <= $closeTag; $i++) {
-                    $phpcsFile->fixer->replaceToken($i, '');
+                for ( $i = $stackPtr; $i <= $closeTag; $i++ ) {
+                    $phpcsFile->fixer->replaceToken( $i, '' );
                 }
 
                 $phpcsFile->fixer->endChangeset();
@@ -341,60 +341,60 @@ 
 
         // The open tag token always contains a single space after it.
         $leadingSpace = 1;
-        if ($tokens[($stackPtr + 1)]['code'] === T_WHITESPACE) {
-            $leadingSpace = (strlen($tokens[($stackPtr + 1)]['content']) + 1);
+        if ( $tokens[ ( $stackPtr + 1 ) ][ 'code' ] === T_WHITESPACE ) {
+            $leadingSpace = ( strlen( $tokens[ ( $stackPtr + 1 ) ][ 'content' ] ) + 1 );
         }
 
-        if ($leadingSpace !== 1) {
+        if ( $leadingSpace !== 1 ) {
             $error = 'Expected 1 space after opening PHP tag; %s found';
-            $data  = array($leadingSpace);
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpacingAfterOpen', $data);
-            if ($fix === true) {
-                $phpcsFile->fixer->replaceToken(($stackPtr + 1), '');
+            $data  = array( $leadingSpace );
+            $fix   = $phpcsFile->addFixableError( $error, $stackPtr, 'SpacingAfterOpen', $data );
+            if ( $fix === true ) {
+                $phpcsFile->fixer->replaceToken( ( $stackPtr + 1 ), '' );
             }
         }
 
-        $prev = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$emptyTokens, ($closeTag - 1), $stackPtr, true);
-        if ((isset($tokens[$prev]['scope_opener']) === false
-            || $tokens[$prev]['scope_opener'] !== $prev)
-            && (isset($tokens[$prev]['scope_closer']) === false
-            || $tokens[$prev]['scope_closer'] !== $prev)
-            && $tokens[$prev]['code'] !== T_SEMICOLON
+        $prev = $phpcsFile->findPrevious( PHP_CodeSniffer_Tokens::$emptyTokens, ( $closeTag - 1 ), $stackPtr, true );
+        if ( ( isset( $tokens[ $prev ][ 'scope_opener' ] ) === false
+            || $tokens[ $prev ][ 'scope_opener' ] !== $prev )
+            && ( isset( $tokens[ $prev ][ 'scope_closer' ] ) === false
+            || $tokens[ $prev ][ 'scope_closer' ] !== $prev )
+            && $tokens[ $prev ][ 'code' ] !== T_SEMICOLON
         ) {
             $error = 'Inline PHP statement must end with a semicolon';
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'NoSemicolon');
-            if ($fix === true) {
-                $phpcsFile->fixer->addContent($prev, ';');
+            $fix   = $phpcsFile->addFixableError( $error, $stackPtr, 'NoSemicolon' );
+            if ( $fix === true ) {
+                $phpcsFile->fixer->addContent( $prev, ';' );
             }
-        } else if ($tokens[$prev]['code'] === T_SEMICOLON) {
+        } else if ( $tokens[ $prev ][ 'code' ] === T_SEMICOLON ) {
             $statementCount = 1;
-            for ($i = ($stackPtr + 1); $i < $prev; $i++) {
-                if ($tokens[$i]['code'] === T_SEMICOLON) {
+            for ( $i = ( $stackPtr + 1 ); $i < $prev; $i++ ) {
+                if ( $tokens[ $i ][ 'code' ] === T_SEMICOLON ) {
                     $statementCount++;
                 }
             }
 
-            if ($statementCount > 1) {
+            if ( $statementCount > 1 ) {
                 $error = 'Inline PHP statement must contain a single statement; %s found';
-                $data  = array($statementCount);
-                $phpcsFile->addError($error, $stackPtr, 'MultipleStatements', $data);
+                $data  = array( $statementCount );
+                $phpcsFile->addError( $error, $stackPtr, 'MultipleStatements', $data );
             }
         }
 
         $trailingSpace = 0;
-        if ($tokens[($closeTag - 1)]['code'] === T_WHITESPACE) {
-            $trailingSpace = strlen($tokens[($closeTag - 1)]['content']);
+        if ( $tokens[ ( $closeTag - 1 ) ][ 'code' ] === T_WHITESPACE ) {
+            $trailingSpace = strlen( $tokens[ ( $closeTag - 1 ) ][ 'content' ] );
         }
 
-        if ($trailingSpace !== 1) {
+        if ( $trailingSpace !== 1 ) {
             $error = 'Expected 1 space before closing PHP tag; %s found';
-            $data  = array($trailingSpace);
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpacingBeforeClose', $data);
-            if ($fix === true) {
-                if ($trailingSpace === 0) {
-                    $phpcsFile->fixer->addContentBefore($closeTag, ' ');
+            $data  = array( $trailingSpace );
+            $fix   = $phpcsFile->addFixableError( $error, $stackPtr, 'SpacingBeforeClose', $data );
+            if ( $fix === true ) {
+                if ( $trailingSpace === 0 ) {
+                    $phpcsFile->fixer->addContentBefore( $closeTag, ' ' );
                 } else {
-                    $phpcsFile->fixer->replaceToken(($closeTag - 1), ' ');
+                    $phpcsFile->fixer->replaceToken( ( $closeTag - 1 ), ' ' );
                 }
             }
         }

Braces +5 added lines, -10 removed lines

@@ -27,8 +27,7 @@ 
  * @version   Release: @package_version@
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
-class Squiz_Sniffs_PHP_EmbeddedPhpSniff implements PHP_CodeSniffer_Sniff
-{
+class Squiz_Sniffs_PHP_EmbeddedPhpSniff implements PHP_CodeSniffer_Sniff {
 
 
     /**
@@ -36,8 +35,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(T_OPEN_TAG);
 
     }//end register()
@@ -52,8 +50,7 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         // If the close php tag is on the same line as the opening
@@ -77,8 +74,7 @@ 
      *
      * @return void
      */
-    private function _validateMultilineEmbeddedPhp(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    private function _validateMultilineEmbeddedPhp(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         $prevTag = $phpcsFile->findPrevious(T_OPEN_TAG, ($stackPtr - 1));
@@ -310,8 +306,7 @@ 
      *
      * @return void
      */
-    private function _validateInlineEmbeddedPhp(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    private function _validateInlineEmbeddedPhp(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         // We only want one line PHP sections, so return if the closing tag is

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Strings/EchoedStringsSniff.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +66 added lines, -66 removed lines

@@ -32,72 +32,72 @@
 {
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(T_ECHO);
-
-    }//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();
-
-        $firstContent = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-        // If the first non-whitespace token is not an opening parenthesis, then we are not concerned.
-        if ($tokens[$firstContent]['code'] !== T_OPEN_PARENTHESIS) {
-            $phpcsFile->recordMetric($stackPtr, 'Brackets around echoed strings', 'no');
-            return;
-        }
-
-        $end = $phpcsFile->findNext(array(T_SEMICOLON, T_CLOSE_TAG), $stackPtr, null, false);
-
-        // If the token before the semi-colon is not a closing parenthesis, then we are not concerned.
-        $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($end - 1), null, true);
-        if ($tokens[$prev]['code'] !== T_CLOSE_PARENTHESIS) {
-            $phpcsFile->recordMetric($stackPtr, 'Brackets around echoed strings', 'no');
-            return;
-        }
-
-        // If the parenthesis don't match, then we are not concerned.
-        if ($tokens[$firstContent]['parenthesis_closer'] !== $prev) {
-            $phpcsFile->recordMetric($stackPtr, 'Brackets around echoed strings', 'no');
-            return;
-        }
-
-        $phpcsFile->recordMetric($stackPtr, 'Brackets around echoed strings', 'yes');
-
-        if (($phpcsFile->findNext(PHP_CodeSniffer_Tokens::$operators, $stackPtr, $end, false)) === false) {
-            // There are no arithmetic operators in this.
-            $error = 'Echoed strings should not be bracketed';
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'HasBracket');
-            if ($fix === true) {
-                $phpcsFile->fixer->beginChangeset();
-                $phpcsFile->fixer->replaceToken($firstContent, '');
-                if ($tokens[($firstContent - 1)]['code'] !== T_WHITESPACE) {
-                    $phpcsFile->fixer->addContent(($firstContent - 1), ' ');
-                }
-
-                $phpcsFile->fixer->replaceToken($prev, '');
-                $phpcsFile->fixer->endChangeset();
-            }
-        }
-
-    }//end process()
+	 /**
+	  * Returns an array of tokens this test wants to listen for.
+	  *
+	  * @return array
+	  */
+	 public function register()
+	 {
+		  return array(T_ECHO);
+
+	 }//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();
+
+		  $firstContent = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
+		  // If the first non-whitespace token is not an opening parenthesis, then we are not concerned.
+		  if ($tokens[$firstContent]['code'] !== T_OPEN_PARENTHESIS) {
+				$phpcsFile->recordMetric($stackPtr, 'Brackets around echoed strings', 'no');
+				return;
+		  }
+
+		  $end = $phpcsFile->findNext(array(T_SEMICOLON, T_CLOSE_TAG), $stackPtr, null, false);
+
+		  // If the token before the semi-colon is not a closing parenthesis, then we are not concerned.
+		  $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($end - 1), null, true);
+		  if ($tokens[$prev]['code'] !== T_CLOSE_PARENTHESIS) {
+				$phpcsFile->recordMetric($stackPtr, 'Brackets around echoed strings', 'no');
+				return;
+		  }
+
+		  // If the parenthesis don't match, then we are not concerned.
+		  if ($tokens[$firstContent]['parenthesis_closer'] !== $prev) {
+				$phpcsFile->recordMetric($stackPtr, 'Brackets around echoed strings', 'no');
+				return;
+		  }
+
+		  $phpcsFile->recordMetric($stackPtr, 'Brackets around echoed strings', 'yes');
+
+		  if (($phpcsFile->findNext(PHP_CodeSniffer_Tokens::$operators, $stackPtr, $end, false)) === false) {
+				// There are no arithmetic operators in this.
+				$error = 'Echoed strings should not be bracketed';
+				$fix   = $phpcsFile->addFixableError($error, $stackPtr, 'HasBracket');
+				if ($fix === true) {
+					 $phpcsFile->fixer->beginChangeset();
+					 $phpcsFile->fixer->replaceToken($firstContent, '');
+					 if ($tokens[($firstContent - 1)]['code'] !== T_WHITESPACE) {
+						  $phpcsFile->fixer->addContent(($firstContent - 1), ' ');
+					 }
+
+					 $phpcsFile->fixer->replaceToken($prev, '');
+					 $phpcsFile->fixer->endChangeset();
+				}
+		  }
+
+	 }//end process()
 
 
 }//end class

Spacing +19 added lines, -19 removed lines

@@ -39,7 +39,7 @@ 
      */
     public function register()
     {
-        return array(T_ECHO);
+        return array( T_ECHO );
 
     }//end register()
 
@@ -53,46 +53,46 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
-        $firstContent = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
+        $firstContent = $phpcsFile->findNext( T_WHITESPACE, ( $stackPtr + 1 ), null, true );
         // If the first non-whitespace token is not an opening parenthesis, then we are not concerned.
-        if ($tokens[$firstContent]['code'] !== T_OPEN_PARENTHESIS) {
-            $phpcsFile->recordMetric($stackPtr, 'Brackets around echoed strings', 'no');
+        if ( $tokens[ $firstContent ][ 'code' ] !== T_OPEN_PARENTHESIS ) {
+            $phpcsFile->recordMetric( $stackPtr, 'Brackets around echoed strings', 'no' );
             return;
         }
 
-        $end = $phpcsFile->findNext(array(T_SEMICOLON, T_CLOSE_TAG), $stackPtr, null, false);
+        $end = $phpcsFile->findNext( array( T_SEMICOLON, T_CLOSE_TAG ), $stackPtr, null, false );
 
         // If the token before the semi-colon is not a closing parenthesis, then we are not concerned.
-        $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($end - 1), null, true);
-        if ($tokens[$prev]['code'] !== T_CLOSE_PARENTHESIS) {
-            $phpcsFile->recordMetric($stackPtr, 'Brackets around echoed strings', 'no');
+        $prev = $phpcsFile->findPrevious( T_WHITESPACE, ( $end - 1 ), null, true );
+        if ( $tokens[ $prev ][ 'code' ] !== T_CLOSE_PARENTHESIS ) {
+            $phpcsFile->recordMetric( $stackPtr, 'Brackets around echoed strings', 'no' );
             return;
         }
 
         // If the parenthesis don't match, then we are not concerned.
-        if ($tokens[$firstContent]['parenthesis_closer'] !== $prev) {
-            $phpcsFile->recordMetric($stackPtr, 'Brackets around echoed strings', 'no');
+        if ( $tokens[ $firstContent ][ 'parenthesis_closer' ] !== $prev ) {
+            $phpcsFile->recordMetric( $stackPtr, 'Brackets around echoed strings', 'no' );
             return;
         }
 
-        $phpcsFile->recordMetric($stackPtr, 'Brackets around echoed strings', 'yes');
+        $phpcsFile->recordMetric( $stackPtr, 'Brackets around echoed strings', 'yes' );
 
-        if (($phpcsFile->findNext(PHP_CodeSniffer_Tokens::$operators, $stackPtr, $end, false)) === false) {
+        if ( ( $phpcsFile->findNext( PHP_CodeSniffer_Tokens::$operators, $stackPtr, $end, false ) ) === false ) {
             // There are no arithmetic operators in this.
             $error = 'Echoed strings should not be bracketed';
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'HasBracket');
-            if ($fix === true) {
+            $fix   = $phpcsFile->addFixableError( $error, $stackPtr, 'HasBracket' );
+            if ( $fix === true ) {
                 $phpcsFile->fixer->beginChangeset();
-                $phpcsFile->fixer->replaceToken($firstContent, '');
-                if ($tokens[($firstContent - 1)]['code'] !== T_WHITESPACE) {
-                    $phpcsFile->fixer->addContent(($firstContent - 1), ' ');
+                $phpcsFile->fixer->replaceToken( $firstContent, '' );
+                if ( $tokens[ ( $firstContent - 1 ) ][ 'code' ] !== T_WHITESPACE ) {
+                    $phpcsFile->fixer->addContent( ( $firstContent - 1 ), ' ' );
                 }
 
-                $phpcsFile->fixer->replaceToken($prev, '');
+                $phpcsFile->fixer->replaceToken( $prev, '' );
                 $phpcsFile->fixer->endChangeset();
             }
         }

Braces +3 added lines, -6 removed lines

@@ -28,8 +28,7 @@ 
  * @version   Release: @package_version@
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
-class Squiz_Sniffs_Strings_EchoedStringsSniff implements PHP_CodeSniffer_Sniff
-{
+class Squiz_Sniffs_Strings_EchoedStringsSniff implements PHP_CodeSniffer_Sniff {
 
 
     /**
@@ -37,8 +36,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(T_ECHO);
 
     }//end register()
@@ -53,8 +51,7 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         $firstContent = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/ControlStructureSpacingSniff.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 integer[]
      */
     public function register()
     {

Indentation +281 added lines, -281 removed lines

@@ -30,287 +30,287 @@
 class Squiz_Sniffs_WhiteSpace_ControlStructureSpacingSniff implements PHP_CodeSniffer_Sniff
 {
 
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = array(
-                                   'PHP',
-                                   'JS',
-                                  );
-
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-                T_IF,
-                T_WHILE,
-                T_FOREACH,
-                T_FOR,
-                T_SWITCH,
-                T_DO,
-                T_ELSE,
-                T_ELSEIF,
-                T_TRY,
-                T_CATCH,
-               );
-
-    }//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();
-
-        if (isset($tokens[$stackPtr]['parenthesis_opener']) === true
-            && isset($tokens[$stackPtr]['parenthesis_closer']) === true
-        ) {
-            $parenOpener = $tokens[$stackPtr]['parenthesis_opener'];
-            $parenCloser = $tokens[$stackPtr]['parenthesis_closer'];
-            if ($tokens[($parenOpener + 1)]['code'] === T_WHITESPACE) {
-                $gap = $tokens[($parenOpener + 1)]['length'];
-
-                if ($gap === 0) {
-                    $phpcsFile->recordMetric($stackPtr, 'Spaces after control structure open parenthesis', 'newline');
-                    $gap = 'newline';
-                } else {
-                    $phpcsFile->recordMetric($stackPtr, 'Spaces after control structure open parenthesis', $gap);
-                }
-
-                $error = 'Expected 0 spaces after opening bracket; %s found';
-                $data  = array($gap);
-                $fix   = $phpcsFile->addFixableError($error, ($parenOpener + 1), 'SpacingAfterOpenBrace', $data);
-                if ($fix === true) {
-                    $phpcsFile->fixer->replaceToken(($parenOpener + 1), '');
-                }
-            } else {
-                $phpcsFile->recordMetric($stackPtr, 'Spaces after control structure open parenthesis', 0);
-            }
-
-            if ($tokens[$parenOpener]['line'] === $tokens[$parenCloser]['line']
-                && $tokens[($parenCloser - 1)]['code'] === T_WHITESPACE
-            ) {
-                $gap   = $tokens[($parenCloser - 1)]['length'];
-                $error = 'Expected 0 spaces before closing bracket; %s found';
-                $data  = array($gap);
-                $fix   = $phpcsFile->addFixableError($error, ($parenCloser - 1), 'SpaceBeforeCloseBrace', $data);
-                if ($fix === true) {
-                    $phpcsFile->fixer->replaceToken(($parenCloser - 1), '');
-                }
-
-                if ($gap === 0) {
-                    $phpcsFile->recordMetric($stackPtr, 'Spaces before control structure close parenthesis', 'newline');
-                } else {
-                    $phpcsFile->recordMetric($stackPtr, 'Spaces before control structure close parenthesis', $gap);
-                }
-            } else {
-                $phpcsFile->recordMetric($stackPtr, 'Spaces before control structure close parenthesis', 0);
-            }
-        }//end if
-
-        if (isset($tokens[$stackPtr]['scope_closer']) === false) {
-            return;
-        }
-
-        $scopeOpener = $tokens[$stackPtr]['scope_opener'];
-        $scopeCloser = $tokens[$stackPtr]['scope_closer'];
-
-        for ($firstContent = ($scopeOpener + 1); $firstContent < $phpcsFile->numTokens; $firstContent++) {
-            if ($tokens[$firstContent]['code'] !== T_WHITESPACE) {
-                break;
-            }
-        }
-
-        // We ignore spacing for some structures that tend to have their own rules.
-        $ignore = array(
-                   T_FUNCTION             => true,
-                   T_CLASS                => true,
-                   T_INTERFACE            => true,
-                   T_TRAIT                => true,
-                   T_DOC_COMMENT_OPEN_TAG => true,
-                  );
-
-        if (isset($ignore[$tokens[$firstContent]['code']]) === false
-            && $tokens[$firstContent]['line'] >= ($tokens[$scopeOpener]['line'] + 2)
-        ) {
-            $error = 'Blank line found at start of control structure';
-            $fix   = $phpcsFile->addFixableError($error, $scopeOpener, 'SpacingAfterOpen');
-
-            if ($fix === true) {
-                $phpcsFile->fixer->beginChangeset();
-                $i = ($scopeOpener + 1);
-                while ($tokens[$i]['line'] !== $tokens[$firstContent]['line']) {
-                    $phpcsFile->fixer->replaceToken($i, '');
-                    $i++;
-                }
-
-                $phpcsFile->fixer->addNewline($scopeOpener);
-                $phpcsFile->fixer->endChangeset();
-            }
-        }
-
-        if ($firstContent !== $scopeCloser) {
-            $lastContent = $phpcsFile->findPrevious(
-                T_WHITESPACE,
-                ($scopeCloser - 1),
-                null,
-                true
-            );
-
-            $lastNonEmptyContent = $phpcsFile->findPrevious(
-                PHP_CodeSniffer_Tokens::$emptyTokens,
-                ($scopeCloser - 1),
-                null,
-                true
-            );
-
-            $checkToken = $lastContent;
-            if (isset($tokens[$lastNonEmptyContent]['scope_condition']) === true) {
-                $checkToken = $tokens[$lastNonEmptyContent]['scope_condition'];
-            }
-
-            if (isset($ignore[$tokens[$checkToken]['code']]) === false
-                && $tokens[$lastContent]['line'] <= ($tokens[$scopeCloser]['line'] - 2)
-            ) {
-                $errorToken = $scopeCloser;
-                for ($i = ($scopeCloser - 1); $i > $lastContent; $i--) {
-                    if ($tokens[$i]['line'] < $tokens[$scopeCloser]['line']) {
-                        $errorToken = $i;
-                        break;
-                    }
-                }
-
-                $error = 'Blank line found at end of control structure';
-                $fix   = $phpcsFile->addFixableError($error, $errorToken, 'SpacingBeforeClose');
-
-                if ($fix === true) {
-                    $phpcsFile->fixer->beginChangeset();
-                    $i = ($scopeCloser - 1);
-                    for ($i = ($scopeCloser - 1); $i > $lastContent; $i--) {
-                        if ($tokens[$i]['line'] === $tokens[$scopeCloser]['line']) {
-                            continue;
-                        }
-
-                        if ($tokens[$i]['line'] === $tokens[$lastContent]['line']) {
-                            break;
-                        }
-
-                        $phpcsFile->fixer->replaceToken($i, '');
-                    }
-
-                    $phpcsFile->fixer->endChangeset();
-                }
-            }//end if
-        }//end if
-
-        $trailingContent = $phpcsFile->findNext(
-            T_WHITESPACE,
-            ($scopeCloser + 1),
-            null,
-            true
-        );
-
-        if ($tokens[$trailingContent]['code'] === T_COMMENT) {
-            // Special exception for code where the comment about
-            // an ELSE or ELSEIF is written between the control structures.
-            $nextCode = $phpcsFile->findNext(
-                PHP_CodeSniffer_Tokens::$emptyTokens,
-                ($scopeCloser + 1),
-                null,
-                true
-            );
-
-            if ($tokens[$nextCode]['code'] === T_ELSE
-                || $tokens[$nextCode]['code'] === T_ELSEIF
-            ) {
-                $trailingContent = $nextCode;
-            }
-        }//end if
-
-        if ($tokens[$trailingContent]['code'] === T_ELSE) {
-            if ($tokens[$stackPtr]['code'] === T_IF) {
-                // IF with ELSE.
-                return;
-            }
-        }
-
-        if ($tokens[$trailingContent]['code'] === T_WHILE
-            && $tokens[$stackPtr]['code'] === T_DO
-        ) {
-            // DO with WHILE.
-            return;
-        }
-
-        if ($tokens[$trailingContent]['code'] === T_CLOSE_TAG) {
-            // At the end of the script or embedded code.
-            return;
-        }
-
-        if (isset($tokens[$trailingContent]['scope_condition']) === true
-            && $tokens[$trailingContent]['scope_condition'] !== $trailingContent
-            && isset($tokens[$trailingContent]['scope_opener']) === true
-            && $tokens[$trailingContent]['scope_opener'] !== $trailingContent
-        ) {
-            // Another control structure's closing brace.
-            $owner = $tokens[$trailingContent]['scope_condition'];
-            if ($tokens[$owner]['code'] === T_FUNCTION) {
-                // The next content is the closing brace of a function
-                // so normal function rules apply and we can ignore it.
-                return;
-            }
-
-            if ($tokens[$owner]['code'] === T_CLOSURE
-                && ($phpcsFile->hasCondition($stackPtr, T_FUNCTION) === true
-                || $phpcsFile->hasCondition($stackPtr, T_CLOSURE) === true
-                || isset($tokens[$stackPtr]['nested_parenthesis']) === true)
-            ) {
-                return;
-            }
-
-            if ($tokens[$trailingContent]['line'] !== ($tokens[$scopeCloser]['line'] + 1)) {
-                $error = 'Blank line found after control structure';
-                $fix   = $phpcsFile->addFixableError($error, $scopeCloser, 'LineAfterClose');
-
-                if ($fix === true) {
-                    $phpcsFile->fixer->beginChangeset();
-                    $i = ($scopeCloser + 1);
-                    while ($tokens[$i]['line'] !== $tokens[$trailingContent]['line']) {
-                        $phpcsFile->fixer->replaceToken($i, '');
-                        $i++;
-                    }
-
-                    $phpcsFile->fixer->addNewline($scopeCloser);
-                    $phpcsFile->fixer->endChangeset();
-                }
-            }
-        } else if ($tokens[$trailingContent]['code'] !== T_ELSE
-            && $tokens[$trailingContent]['code'] !== T_ELSEIF
-            && $tokens[$trailingContent]['code'] !== T_CATCH
-            && $tokens[$trailingContent]['line'] === ($tokens[$scopeCloser]['line'] + 1)
-        ) {
-            $error = 'No blank line found after control structure';
-            $fix   = $phpcsFile->addFixableError($error, $scopeCloser, 'NoLineAfterClose');
-            if ($fix === true) {
-                $phpcsFile->fixer->addNewline($scopeCloser);
-            }
-        }//end if
-
-    }//end process()
+	 /**
+	  * A list of tokenizers this sniff supports.
+	  *
+	  * @var array
+	  */
+	 public $supportedTokenizers = array(
+											  'PHP',
+											  'JS',
+											 );
+
+
+	 /**
+	  * Returns an array of tokens this test wants to listen for.
+	  *
+	  * @return array
+	  */
+	 public function register()
+	 {
+		  return array(
+					 T_IF,
+					 T_WHILE,
+					 T_FOREACH,
+					 T_FOR,
+					 T_SWITCH,
+					 T_DO,
+					 T_ELSE,
+					 T_ELSEIF,
+					 T_TRY,
+					 T_CATCH,
+					);
+
+	 }//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();
+
+		  if (isset($tokens[$stackPtr]['parenthesis_opener']) === true
+				&& isset($tokens[$stackPtr]['parenthesis_closer']) === true
+		  ) {
+				$parenOpener = $tokens[$stackPtr]['parenthesis_opener'];
+				$parenCloser = $tokens[$stackPtr]['parenthesis_closer'];
+				if ($tokens[($parenOpener + 1)]['code'] === T_WHITESPACE) {
+					 $gap = $tokens[($parenOpener + 1)]['length'];
+
+					 if ($gap === 0) {
+						  $phpcsFile->recordMetric($stackPtr, 'Spaces after control structure open parenthesis', 'newline');
+						  $gap = 'newline';
+					 } else {
+						  $phpcsFile->recordMetric($stackPtr, 'Spaces after control structure open parenthesis', $gap);
+					 }
+
+					 $error = 'Expected 0 spaces after opening bracket; %s found';
+					 $data  = array($gap);
+					 $fix   = $phpcsFile->addFixableError($error, ($parenOpener + 1), 'SpacingAfterOpenBrace', $data);
+					 if ($fix === true) {
+						  $phpcsFile->fixer->replaceToken(($parenOpener + 1), '');
+					 }
+				} else {
+					 $phpcsFile->recordMetric($stackPtr, 'Spaces after control structure open parenthesis', 0);
+				}
+
+				if ($tokens[$parenOpener]['line'] === $tokens[$parenCloser]['line']
+					 && $tokens[($parenCloser - 1)]['code'] === T_WHITESPACE
+				) {
+					 $gap   = $tokens[($parenCloser - 1)]['length'];
+					 $error = 'Expected 0 spaces before closing bracket; %s found';
+					 $data  = array($gap);
+					 $fix   = $phpcsFile->addFixableError($error, ($parenCloser - 1), 'SpaceBeforeCloseBrace', $data);
+					 if ($fix === true) {
+						  $phpcsFile->fixer->replaceToken(($parenCloser - 1), '');
+					 }
+
+					 if ($gap === 0) {
+						  $phpcsFile->recordMetric($stackPtr, 'Spaces before control structure close parenthesis', 'newline');
+					 } else {
+						  $phpcsFile->recordMetric($stackPtr, 'Spaces before control structure close parenthesis', $gap);
+					 }
+				} else {
+					 $phpcsFile->recordMetric($stackPtr, 'Spaces before control structure close parenthesis', 0);
+				}
+		  }//end if
+
+		  if (isset($tokens[$stackPtr]['scope_closer']) === false) {
+				return;
+		  }
+
+		  $scopeOpener = $tokens[$stackPtr]['scope_opener'];
+		  $scopeCloser = $tokens[$stackPtr]['scope_closer'];
+
+		  for ($firstContent = ($scopeOpener + 1); $firstContent < $phpcsFile->numTokens; $firstContent++) {
+				if ($tokens[$firstContent]['code'] !== T_WHITESPACE) {
+					 break;
+				}
+		  }
+
+		  // We ignore spacing for some structures that tend to have their own rules.
+		  $ignore = array(
+						 T_FUNCTION             => true,
+						 T_CLASS                => true,
+						 T_INTERFACE            => true,
+						 T_TRAIT                => true,
+						 T_DOC_COMMENT_OPEN_TAG => true,
+						);
+
+		  if (isset($ignore[$tokens[$firstContent]['code']]) === false
+				&& $tokens[$firstContent]['line'] >= ($tokens[$scopeOpener]['line'] + 2)
+		  ) {
+				$error = 'Blank line found at start of control structure';
+				$fix   = $phpcsFile->addFixableError($error, $scopeOpener, 'SpacingAfterOpen');
+
+				if ($fix === true) {
+					 $phpcsFile->fixer->beginChangeset();
+					 $i = ($scopeOpener + 1);
+					 while ($tokens[$i]['line'] !== $tokens[$firstContent]['line']) {
+						  $phpcsFile->fixer->replaceToken($i, '');
+						  $i++;
+					 }
+
+					 $phpcsFile->fixer->addNewline($scopeOpener);
+					 $phpcsFile->fixer->endChangeset();
+				}
+		  }
+
+		  if ($firstContent !== $scopeCloser) {
+				$lastContent = $phpcsFile->findPrevious(
+					 T_WHITESPACE,
+					 ($scopeCloser - 1),
+					 null,
+					 true
+				);
+
+				$lastNonEmptyContent = $phpcsFile->findPrevious(
+					 PHP_CodeSniffer_Tokens::$emptyTokens,
+					 ($scopeCloser - 1),
+					 null,
+					 true
+				);
+
+				$checkToken = $lastContent;
+				if (isset($tokens[$lastNonEmptyContent]['scope_condition']) === true) {
+					 $checkToken = $tokens[$lastNonEmptyContent]['scope_condition'];
+				}
+
+				if (isset($ignore[$tokens[$checkToken]['code']]) === false
+					 && $tokens[$lastContent]['line'] <= ($tokens[$scopeCloser]['line'] - 2)
+				) {
+					 $errorToken = $scopeCloser;
+					 for ($i = ($scopeCloser - 1); $i > $lastContent; $i--) {
+						  if ($tokens[$i]['line'] < $tokens[$scopeCloser]['line']) {
+								$errorToken = $i;
+								break;
+						  }
+					 }
+
+					 $error = 'Blank line found at end of control structure';
+					 $fix   = $phpcsFile->addFixableError($error, $errorToken, 'SpacingBeforeClose');
+
+					 if ($fix === true) {
+						  $phpcsFile->fixer->beginChangeset();
+						  $i = ($scopeCloser - 1);
+						  for ($i = ($scopeCloser - 1); $i > $lastContent; $i--) {
+								if ($tokens[$i]['line'] === $tokens[$scopeCloser]['line']) {
+									 continue;
+								}
+
+								if ($tokens[$i]['line'] === $tokens[$lastContent]['line']) {
+									 break;
+								}
+
+								$phpcsFile->fixer->replaceToken($i, '');
+						  }
+
+						  $phpcsFile->fixer->endChangeset();
+					 }
+				}//end if
+		  }//end if
+
+		  $trailingContent = $phpcsFile->findNext(
+				T_WHITESPACE,
+				($scopeCloser + 1),
+				null,
+				true
+		  );
+
+		  if ($tokens[$trailingContent]['code'] === T_COMMENT) {
+				// Special exception for code where the comment about
+				// an ELSE or ELSEIF is written between the control structures.
+				$nextCode = $phpcsFile->findNext(
+					 PHP_CodeSniffer_Tokens::$emptyTokens,
+					 ($scopeCloser + 1),
+					 null,
+					 true
+				);
+
+				if ($tokens[$nextCode]['code'] === T_ELSE
+					 || $tokens[$nextCode]['code'] === T_ELSEIF
+				) {
+					 $trailingContent = $nextCode;
+				}
+		  }//end if
+
+		  if ($tokens[$trailingContent]['code'] === T_ELSE) {
+				if ($tokens[$stackPtr]['code'] === T_IF) {
+					 // IF with ELSE.
+					 return;
+				}
+		  }
+
+		  if ($tokens[$trailingContent]['code'] === T_WHILE
+				&& $tokens[$stackPtr]['code'] === T_DO
+		  ) {
+				// DO with WHILE.
+				return;
+		  }
+
+		  if ($tokens[$trailingContent]['code'] === T_CLOSE_TAG) {
+				// At the end of the script or embedded code.
+				return;
+		  }
+
+		  if (isset($tokens[$trailingContent]['scope_condition']) === true
+				&& $tokens[$trailingContent]['scope_condition'] !== $trailingContent
+				&& isset($tokens[$trailingContent]['scope_opener']) === true
+				&& $tokens[$trailingContent]['scope_opener'] !== $trailingContent
+		  ) {
+				// Another control structure's closing brace.
+				$owner = $tokens[$trailingContent]['scope_condition'];
+				if ($tokens[$owner]['code'] === T_FUNCTION) {
+					 // The next content is the closing brace of a function
+					 // so normal function rules apply and we can ignore it.
+					 return;
+				}
+
+				if ($tokens[$owner]['code'] === T_CLOSURE
+					 && ($phpcsFile->hasCondition($stackPtr, T_FUNCTION) === true
+					 || $phpcsFile->hasCondition($stackPtr, T_CLOSURE) === true
+					 || isset($tokens[$stackPtr]['nested_parenthesis']) === true)
+				) {
+					 return;
+				}
+
+				if ($tokens[$trailingContent]['line'] !== ($tokens[$scopeCloser]['line'] + 1)) {
+					 $error = 'Blank line found after control structure';
+					 $fix   = $phpcsFile->addFixableError($error, $scopeCloser, 'LineAfterClose');
+
+					 if ($fix === true) {
+						  $phpcsFile->fixer->beginChangeset();
+						  $i = ($scopeCloser + 1);
+						  while ($tokens[$i]['line'] !== $tokens[$trailingContent]['line']) {
+								$phpcsFile->fixer->replaceToken($i, '');
+								$i++;
+						  }
+
+						  $phpcsFile->fixer->addNewline($scopeCloser);
+						  $phpcsFile->fixer->endChangeset();
+					 }
+				}
+		  } else if ($tokens[$trailingContent]['code'] !== T_ELSE
+				&& $tokens[$trailingContent]['code'] !== T_ELSEIF
+				&& $tokens[$trailingContent]['code'] !== T_CATCH
+				&& $tokens[$trailingContent]['line'] === ($tokens[$scopeCloser]['line'] + 1)
+		  ) {
+				$error = 'No blank line found after control structure';
+				$fix   = $phpcsFile->addFixableError($error, $scopeCloser, 'NoLineAfterClose');
+				if ($fix === true) {
+					 $phpcsFile->fixer->addNewline($scopeCloser);
+				}
+		  }//end if
+
+	 }//end process()
 
 
 }//end class

Spacing +89 added lines, -89 removed lines

@@ -73,65 +73,65 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
-        if (isset($tokens[$stackPtr]['parenthesis_opener']) === true
-            && isset($tokens[$stackPtr]['parenthesis_closer']) === true
+        if ( isset( $tokens[ $stackPtr ][ 'parenthesis_opener' ] ) === true
+            && isset( $tokens[ $stackPtr ][ 'parenthesis_closer' ] ) === true
         ) {
-            $parenOpener = $tokens[$stackPtr]['parenthesis_opener'];
-            $parenCloser = $tokens[$stackPtr]['parenthesis_closer'];
-            if ($tokens[($parenOpener + 1)]['code'] === T_WHITESPACE) {
-                $gap = $tokens[($parenOpener + 1)]['length'];
+            $parenOpener = $tokens[ $stackPtr ][ 'parenthesis_opener' ];
+            $parenCloser = $tokens[ $stackPtr ][ 'parenthesis_closer' ];
+            if ( $tokens[ ( $parenOpener + 1 ) ][ 'code' ] === T_WHITESPACE ) {
+                $gap = $tokens[ ( $parenOpener + 1 ) ][ 'length' ];
 
-                if ($gap === 0) {
-                    $phpcsFile->recordMetric($stackPtr, 'Spaces after control structure open parenthesis', 'newline');
+                if ( $gap === 0 ) {
+                    $phpcsFile->recordMetric( $stackPtr, 'Spaces after control structure open parenthesis', 'newline' );
                     $gap = 'newline';
                 } else {
-                    $phpcsFile->recordMetric($stackPtr, 'Spaces after control structure open parenthesis', $gap);
+                    $phpcsFile->recordMetric( $stackPtr, 'Spaces after control structure open parenthesis', $gap );
                 }
 
                 $error = 'Expected 0 spaces after opening bracket; %s found';
-                $data  = array($gap);
-                $fix   = $phpcsFile->addFixableError($error, ($parenOpener + 1), 'SpacingAfterOpenBrace', $data);
-                if ($fix === true) {
-                    $phpcsFile->fixer->replaceToken(($parenOpener + 1), '');
+                $data  = array( $gap );
+                $fix   = $phpcsFile->addFixableError( $error, ( $parenOpener + 1 ), 'SpacingAfterOpenBrace', $data );
+                if ( $fix === true ) {
+                    $phpcsFile->fixer->replaceToken( ( $parenOpener + 1 ), '' );
                 }
             } else {
-                $phpcsFile->recordMetric($stackPtr, 'Spaces after control structure open parenthesis', 0);
+                $phpcsFile->recordMetric( $stackPtr, 'Spaces after control structure open parenthesis', 0 );
             }
 
-            if ($tokens[$parenOpener]['line'] === $tokens[$parenCloser]['line']
-                && $tokens[($parenCloser - 1)]['code'] === T_WHITESPACE
+            if ( $tokens[ $parenOpener ][ 'line' ] === $tokens[ $parenCloser ][ 'line' ]
+                && $tokens[ ( $parenCloser - 1 ) ][ 'code' ] === T_WHITESPACE
             ) {
-                $gap   = $tokens[($parenCloser - 1)]['length'];
+                $gap   = $tokens[ ( $parenCloser - 1 ) ][ 'length' ];
                 $error = 'Expected 0 spaces before closing bracket; %s found';
-                $data  = array($gap);
-                $fix   = $phpcsFile->addFixableError($error, ($parenCloser - 1), 'SpaceBeforeCloseBrace', $data);
-                if ($fix === true) {
-                    $phpcsFile->fixer->replaceToken(($parenCloser - 1), '');
+                $data  = array( $gap );
+                $fix   = $phpcsFile->addFixableError( $error, ( $parenCloser - 1 ), 'SpaceBeforeCloseBrace', $data );
+                if ( $fix === true ) {
+                    $phpcsFile->fixer->replaceToken( ( $parenCloser - 1 ), '' );
                 }
 
-                if ($gap === 0) {
-                    $phpcsFile->recordMetric($stackPtr, 'Spaces before control structure close parenthesis', 'newline');
+                if ( $gap === 0 ) {
+                    $phpcsFile->recordMetric( $stackPtr, 'Spaces before control structure close parenthesis', 'newline' );
                 } else {
-                    $phpcsFile->recordMetric($stackPtr, 'Spaces before control structure close parenthesis', $gap);
+                    $phpcsFile->recordMetric( $stackPtr, 'Spaces before control structure close parenthesis', $gap );
                 }
             } else {
-                $phpcsFile->recordMetric($stackPtr, 'Spaces before control structure close parenthesis', 0);
+                $phpcsFile->recordMetric( $stackPtr, 'Spaces before control structure close parenthesis', 0 );
             }
         }//end if
 
-        if (isset($tokens[$stackPtr]['scope_closer']) === false) {
+        if ( isset( $tokens[ $stackPtr ][ 'scope_closer' ] ) === false ) {
             return;
         }
 
-        $scopeOpener = $tokens[$stackPtr]['scope_opener'];
-        $scopeCloser = $tokens[$stackPtr]['scope_closer'];
+        $scopeOpener = $tokens[ $stackPtr ][ 'scope_opener' ];
+        $scopeCloser = $tokens[ $stackPtr ][ 'scope_closer' ];
 
-        for ($firstContent = ($scopeOpener + 1); $firstContent < $phpcsFile->numTokens; $firstContent++) {
-            if ($tokens[$firstContent]['code'] !== T_WHITESPACE) {
+        for ( $firstContent = ( $scopeOpener + 1 ); $firstContent < $phpcsFile->numTokens; $firstContent++ ) {
+            if ( $tokens[ $firstContent ][ 'code' ] !== T_WHITESPACE ) {
                 break;
             }
         }
@@ -145,72 +145,72 @@ 
                    T_DOC_COMMENT_OPEN_TAG => true,
                   );
 
-        if (isset($ignore[$tokens[$firstContent]['code']]) === false
-            && $tokens[$firstContent]['line'] >= ($tokens[$scopeOpener]['line'] + 2)
+        if ( isset( $ignore[ $tokens[ $firstContent ][ 'code' ] ] ) === false
+            && $tokens[ $firstContent ][ 'line' ] >= ( $tokens[ $scopeOpener ][ 'line' ] + 2 )
         ) {
             $error = 'Blank line found at start of control structure';
-            $fix   = $phpcsFile->addFixableError($error, $scopeOpener, 'SpacingAfterOpen');
+            $fix   = $phpcsFile->addFixableError( $error, $scopeOpener, 'SpacingAfterOpen' );
 
-            if ($fix === true) {
+            if ( $fix === true ) {
                 $phpcsFile->fixer->beginChangeset();
-                $i = ($scopeOpener + 1);
-                while ($tokens[$i]['line'] !== $tokens[$firstContent]['line']) {
-                    $phpcsFile->fixer->replaceToken($i, '');
+                $i = ( $scopeOpener + 1 );
+                while ( $tokens[ $i ][ 'line' ] !== $tokens[ $firstContent ][ 'line' ] ) {
+                    $phpcsFile->fixer->replaceToken( $i, '' );
                     $i++;
                 }
 
-                $phpcsFile->fixer->addNewline($scopeOpener);
+                $phpcsFile->fixer->addNewline( $scopeOpener );
                 $phpcsFile->fixer->endChangeset();
             }
         }
 
-        if ($firstContent !== $scopeCloser) {
+        if ( $firstContent !== $scopeCloser ) {
             $lastContent = $phpcsFile->findPrevious(
                 T_WHITESPACE,
-                ($scopeCloser - 1),
+                ( $scopeCloser - 1 ),
                 null,
                 true
             );
 
             $lastNonEmptyContent = $phpcsFile->findPrevious(
                 PHP_CodeSniffer_Tokens::$emptyTokens,
-                ($scopeCloser - 1),
+                ( $scopeCloser - 1 ),
                 null,
                 true
             );
 
             $checkToken = $lastContent;
-            if (isset($tokens[$lastNonEmptyContent]['scope_condition']) === true) {
-                $checkToken = $tokens[$lastNonEmptyContent]['scope_condition'];
+            if ( isset( $tokens[ $lastNonEmptyContent ][ 'scope_condition' ] ) === true ) {
+                $checkToken = $tokens[ $lastNonEmptyContent ][ 'scope_condition' ];
             }
 
-            if (isset($ignore[$tokens[$checkToken]['code']]) === false
-                && $tokens[$lastContent]['line'] <= ($tokens[$scopeCloser]['line'] - 2)
+            if ( isset( $ignore[ $tokens[ $checkToken ][ 'code' ] ] ) === false
+                && $tokens[ $lastContent ][ 'line' ] <= ( $tokens[ $scopeCloser ][ 'line' ] - 2 )
             ) {
                 $errorToken = $scopeCloser;
-                for ($i = ($scopeCloser - 1); $i > $lastContent; $i--) {
-                    if ($tokens[$i]['line'] < $tokens[$scopeCloser]['line']) {
+                for ( $i = ( $scopeCloser - 1 ); $i > $lastContent; $i-- ) {
+                    if ( $tokens[ $i ][ 'line' ] < $tokens[ $scopeCloser ][ 'line' ] ) {
                         $errorToken = $i;
                         break;
                     }
                 }
 
                 $error = 'Blank line found at end of control structure';
-                $fix   = $phpcsFile->addFixableError($error, $errorToken, 'SpacingBeforeClose');
+                $fix   = $phpcsFile->addFixableError( $error, $errorToken, 'SpacingBeforeClose' );
 
-                if ($fix === true) {
+                if ( $fix === true ) {
                     $phpcsFile->fixer->beginChangeset();
-                    $i = ($scopeCloser - 1);
-                    for ($i = ($scopeCloser - 1); $i > $lastContent; $i--) {
-                        if ($tokens[$i]['line'] === $tokens[$scopeCloser]['line']) {
+                    $i = ( $scopeCloser - 1 );
+                    for ( $i = ( $scopeCloser - 1 ); $i > $lastContent; $i-- ) {
+                        if ( $tokens[ $i ][ 'line' ] === $tokens[ $scopeCloser ][ 'line' ] ) {
                             continue;
                         }
 
-                        if ($tokens[$i]['line'] === $tokens[$lastContent]['line']) {
+                        if ( $tokens[ $i ][ 'line' ] === $tokens[ $lastContent ][ 'line' ] ) {
                             break;
                         }
 
-                        $phpcsFile->fixer->replaceToken($i, '');
+                        $phpcsFile->fixer->replaceToken( $i, '' );
                     }
 
                     $phpcsFile->fixer->endChangeset();
@@ -220,93 +220,93 @@ 
 
         $trailingContent = $phpcsFile->findNext(
             T_WHITESPACE,
-            ($scopeCloser + 1),
+            ( $scopeCloser + 1 ),
             null,
             true
         );
 
-        if ($tokens[$trailingContent]['code'] === T_COMMENT) {
+        if ( $tokens[ $trailingContent ][ 'code' ] === T_COMMENT ) {
             // Special exception for code where the comment about
             // an ELSE or ELSEIF is written between the control structures.
             $nextCode = $phpcsFile->findNext(
                 PHP_CodeSniffer_Tokens::$emptyTokens,
-                ($scopeCloser + 1),
+                ( $scopeCloser + 1 ),
                 null,
                 true
             );
 
-            if ($tokens[$nextCode]['code'] === T_ELSE
-                || $tokens[$nextCode]['code'] === T_ELSEIF
+            if ( $tokens[ $nextCode ][ 'code' ] === T_ELSE
+                || $tokens[ $nextCode ][ 'code' ] === T_ELSEIF
             ) {
                 $trailingContent = $nextCode;
             }
         }//end if
 
-        if ($tokens[$trailingContent]['code'] === T_ELSE) {
-            if ($tokens[$stackPtr]['code'] === T_IF) {
+        if ( $tokens[ $trailingContent ][ 'code' ] === T_ELSE ) {
+            if ( $tokens[ $stackPtr ][ 'code' ] === T_IF ) {
                 // IF with ELSE.
                 return;
             }
         }
 
-        if ($tokens[$trailingContent]['code'] === T_WHILE
-            && $tokens[$stackPtr]['code'] === T_DO
+        if ( $tokens[ $trailingContent ][ 'code' ] === T_WHILE
+            && $tokens[ $stackPtr ][ 'code' ] === T_DO
         ) {
             // DO with WHILE.
             return;
         }
 
-        if ($tokens[$trailingContent]['code'] === T_CLOSE_TAG) {
+        if ( $tokens[ $trailingContent ][ 'code' ] === T_CLOSE_TAG ) {
             // At the end of the script or embedded code.
             return;
         }
 
-        if (isset($tokens[$trailingContent]['scope_condition']) === true
-            && $tokens[$trailingContent]['scope_condition'] !== $trailingContent
-            && isset($tokens[$trailingContent]['scope_opener']) === true
-            && $tokens[$trailingContent]['scope_opener'] !== $trailingContent
+        if ( isset( $tokens[ $trailingContent ][ 'scope_condition' ] ) === true
+            && $tokens[ $trailingContent ][ 'scope_condition' ] !== $trailingContent
+            && isset( $tokens[ $trailingContent ][ 'scope_opener' ] ) === true
+            && $tokens[ $trailingContent ][ 'scope_opener' ] !== $trailingContent
         ) {
             // Another control structure's closing brace.
-            $owner = $tokens[$trailingContent]['scope_condition'];
-            if ($tokens[$owner]['code'] === T_FUNCTION) {
+            $owner = $tokens[ $trailingContent ][ 'scope_condition' ];
+            if ( $tokens[ $owner ][ 'code' ] === T_FUNCTION ) {
                 // The next content is the closing brace of a function
                 // so normal function rules apply and we can ignore it.
                 return;
             }
 
-            if ($tokens[$owner]['code'] === T_CLOSURE
-                && ($phpcsFile->hasCondition($stackPtr, T_FUNCTION) === true
-                || $phpcsFile->hasCondition($stackPtr, T_CLOSURE) === true
-                || isset($tokens[$stackPtr]['nested_parenthesis']) === true)
+            if ( $tokens[ $owner ][ 'code' ] === T_CLOSURE
+                && ( $phpcsFile->hasCondition( $stackPtr, T_FUNCTION ) === true
+                || $phpcsFile->hasCondition( $stackPtr, T_CLOSURE ) === true
+                || isset( $tokens[ $stackPtr ][ 'nested_parenthesis' ] ) === true )
             ) {
                 return;
             }
 
-            if ($tokens[$trailingContent]['line'] !== ($tokens[$scopeCloser]['line'] + 1)) {
+            if ( $tokens[ $trailingContent ][ 'line' ] !== ( $tokens[ $scopeCloser ][ 'line' ] + 1 ) ) {
                 $error = 'Blank line found after control structure';
-                $fix   = $phpcsFile->addFixableError($error, $scopeCloser, 'LineAfterClose');
+                $fix   = $phpcsFile->addFixableError( $error, $scopeCloser, 'LineAfterClose' );
 
-                if ($fix === true) {
+                if ( $fix === true ) {
                     $phpcsFile->fixer->beginChangeset();
-                    $i = ($scopeCloser + 1);
-                    while ($tokens[$i]['line'] !== $tokens[$trailingContent]['line']) {
-                        $phpcsFile->fixer->replaceToken($i, '');
+                    $i = ( $scopeCloser + 1 );
+                    while ( $tokens[ $i ][ 'line' ] !== $tokens[ $trailingContent ][ 'line' ] ) {
+                        $phpcsFile->fixer->replaceToken( $i, '' );
                         $i++;
                     }
 
-                    $phpcsFile->fixer->addNewline($scopeCloser);
+                    $phpcsFile->fixer->addNewline( $scopeCloser );
                     $phpcsFile->fixer->endChangeset();
                 }
             }
-        } else if ($tokens[$trailingContent]['code'] !== T_ELSE
-            && $tokens[$trailingContent]['code'] !== T_ELSEIF
-            && $tokens[$trailingContent]['code'] !== T_CATCH
-            && $tokens[$trailingContent]['line'] === ($tokens[$scopeCloser]['line'] + 1)
+        } else if ( $tokens[ $trailingContent ][ 'code' ] !== T_ELSE
+            && $tokens[ $trailingContent ][ 'code' ] !== T_ELSEIF
+            && $tokens[ $trailingContent ][ 'code' ] !== T_CATCH
+            && $tokens[ $trailingContent ][ 'line' ] === ( $tokens[ $scopeCloser ][ 'line' ] + 1 )
         ) {
             $error = 'No blank line found after control structure';
-            $fix   = $phpcsFile->addFixableError($error, $scopeCloser, 'NoLineAfterClose');
-            if ($fix === true) {
-                $phpcsFile->fixer->addNewline($scopeCloser);
+            $fix   = $phpcsFile->addFixableError( $error, $scopeCloser, 'NoLineAfterClose' );
+            if ( $fix === true ) {
+                $phpcsFile->fixer->addNewline( $scopeCloser );
             }
         }//end if
 

Braces +3 added lines, -6 removed lines

@@ -27,8 +27,7 @@ 
  * @version   Release: @package_version@
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
-class Squiz_Sniffs_WhiteSpace_ControlStructureSpacingSniff implements PHP_CodeSniffer_Sniff
-{
+class Squiz_Sniffs_WhiteSpace_ControlStructureSpacingSniff implements PHP_CodeSniffer_Sniff {
 
     /**
      * A list of tokenizers this sniff supports.
@@ -46,8 +45,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(
                 T_IF,
                 T_WHILE,
@@ -73,8 +71,7 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         if (isset($tokens[$stackPtr]['parenthesis_opener']) === true

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/FunctionSpacingSniff.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +196 added lines, -196 removed lines

@@ -30,210 +30,210 @@
 class Squiz_Sniffs_WhiteSpace_FunctionSpacingSniff implements PHP_CodeSniffer_Sniff
 {
 
-    /**
-     * The number of blank lines between functions.
-     *
-     * @var int
-     */
-    public $spacing = 2;
-
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(T_FUNCTION);
-
-    }//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();
-        $this->spacing = (int) $this->spacing;
-
-        /*
+	 /**
+	  * The number of blank lines between functions.
+	  *
+	  * @var int
+	  */
+	 public $spacing = 2;
+
+
+	 /**
+	  * Returns an array of tokens this test wants to listen for.
+	  *
+	  * @return array
+	  */
+	 public function register()
+	 {
+		  return array(T_FUNCTION);
+
+	 }//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();
+		  $this->spacing = (int) $this->spacing;
+
+		  /*
             Check the number of blank lines
             after the function.
         */
 
-        if (isset($tokens[$stackPtr]['scope_closer']) === false) {
-            // Must be an interface method, so the closer is the semicolon.
-            $closer = $phpcsFile->findNext(T_SEMICOLON, $stackPtr);
-        } else {
-            $closer = $tokens[$stackPtr]['scope_closer'];
-        }
-
-        // Allow for comments on the same line as the closer.
-        for ($nextLineToken = ($closer + 1); $nextLineToken < $phpcsFile->numTokens; $nextLineToken++) {
-            if ($tokens[$nextLineToken]['line'] !== $tokens[$closer]['line']) {
-                break;
-            }
-        }
-
-        $foundLines = 0;
-        if ($nextLineToken === ($phpcsFile->numTokens - 1)) {
-            // We are at the end of the file.
-            // Don't check spacing after the function because this
-            // should be done by an EOF sniff.
-            $foundLines = $this->spacing;
-        } else {
-            $nextContent = $phpcsFile->findNext(T_WHITESPACE, $nextLineToken, null, true);
-            if ($nextContent === false) {
-                // We are at the end of the file.
-                // Don't check spacing after the function because this
-                // should be done by an EOF sniff.
-                $foundLines = $this->spacing;
-            } else {
-                $foundLines += ($tokens[$nextContent]['line'] - $tokens[$nextLineToken]['line']);
-            }
-        }
-
-        if ($foundLines !== $this->spacing) {
-            $error = 'Expected %s blank line';
-            if ($this->spacing !== 1) {
-                $error .= 's';
-            }
-
-            $error .= ' after function; %s found';
-            $data   = array(
-                       $this->spacing,
-                       $foundLines,
-                      );
-
-            $fix = $phpcsFile->addFixableError($error, $closer, 'After', $data);
-            if ($fix === true) {
-                $phpcsFile->fixer->beginChangeset();
-                for ($i = $nextLineToken; $i <= $nextContent; $i++) {
-                    if ($tokens[$i]['line'] === $tokens[$nextContent]['line']) {
-                        $phpcsFile->fixer->addContentBefore($i, str_repeat($phpcsFile->eolChar, $this->spacing));
-                        break;
-                    }
-
-                    $phpcsFile->fixer->replaceToken($i, '');
-                }
-
-                $phpcsFile->fixer->endChangeset();
-            }//end if
-        }//end if
-
-        /*
+		  if (isset($tokens[$stackPtr]['scope_closer']) === false) {
+				// Must be an interface method, so the closer is the semicolon.
+				$closer = $phpcsFile->findNext(T_SEMICOLON, $stackPtr);
+		  } else {
+				$closer = $tokens[$stackPtr]['scope_closer'];
+		  }
+
+		  // Allow for comments on the same line as the closer.
+		  for ($nextLineToken = ($closer + 1); $nextLineToken < $phpcsFile->numTokens; $nextLineToken++) {
+				if ($tokens[$nextLineToken]['line'] !== $tokens[$closer]['line']) {
+					 break;
+				}
+		  }
+
+		  $foundLines = 0;
+		  if ($nextLineToken === ($phpcsFile->numTokens - 1)) {
+				// We are at the end of the file.
+				// Don't check spacing after the function because this
+				// should be done by an EOF sniff.
+				$foundLines = $this->spacing;
+		  } else {
+				$nextContent = $phpcsFile->findNext(T_WHITESPACE, $nextLineToken, null, true);
+				if ($nextContent === false) {
+					 // We are at the end of the file.
+					 // Don't check spacing after the function because this
+					 // should be done by an EOF sniff.
+					 $foundLines = $this->spacing;
+				} else {
+					 $foundLines += ($tokens[$nextContent]['line'] - $tokens[$nextLineToken]['line']);
+				}
+		  }
+
+		  if ($foundLines !== $this->spacing) {
+				$error = 'Expected %s blank line';
+				if ($this->spacing !== 1) {
+					 $error .= 's';
+				}
+
+				$error .= ' after function; %s found';
+				$data   = array(
+							  $this->spacing,
+							  $foundLines,
+							 );
+
+				$fix = $phpcsFile->addFixableError($error, $closer, 'After', $data);
+				if ($fix === true) {
+					 $phpcsFile->fixer->beginChangeset();
+					 for ($i = $nextLineToken; $i <= $nextContent; $i++) {
+						  if ($tokens[$i]['line'] === $tokens[$nextContent]['line']) {
+								$phpcsFile->fixer->addContentBefore($i, str_repeat($phpcsFile->eolChar, $this->spacing));
+								break;
+						  }
+
+						  $phpcsFile->fixer->replaceToken($i, '');
+					 }
+
+					 $phpcsFile->fixer->endChangeset();
+				}//end if
+		  }//end if
+
+		  /*
             Check the number of blank lines
             before the function.
         */
 
-        $prevLineToken = null;
-        for ($i = $stackPtr; $i > 0; $i--) {
-            if (strpos($tokens[$i]['content'], $phpcsFile->eolChar) === false) {
-                continue;
-            } else {
-                $prevLineToken = $i;
-                break;
-            }
-        }
-
-        if (is_null($prevLineToken) === true) {
-            // Never found the previous line, which means
-            // there are 0 blank lines before the function.
-            $foundLines  = 0;
-            $prevContent = 0;
-        } else {
-            $currentLine = $tokens[$stackPtr]['line'];
-
-            $prevContent = $phpcsFile->findPrevious(T_WHITESPACE, $prevLineToken, null, true);
-            if ($tokens[$prevContent]['code'] === T_DOC_COMMENT_CLOSE_TAG
-                && $tokens[$prevContent]['line'] === ($currentLine - 1)
-            ) {
-                // Account for function comments.
-                $prevContent = $phpcsFile->findPrevious(T_WHITESPACE, ($tokens[$prevContent]['comment_opener'] - 1), null, true);
-            }
-
-            // Before we throw an error, check that we are not throwing an error
-            // for another function. We don't want to error for no blank lines after
-            // the previous function and no blank lines before this one as well.
-            $prevLine   = ($tokens[$prevContent]['line'] - 1);
-            $i          = ($stackPtr - 1);
-            $foundLines = 0;
-            while ($currentLine !== $prevLine && $currentLine > 1 && $i > 0) {
-                if (isset($tokens[$i]['scope_condition']) === true) {
-                    $scopeCondition = $tokens[$i]['scope_condition'];
-                    if ($tokens[$scopeCondition]['code'] === T_FUNCTION) {
-                        // Found a previous function.
-                        return;
-                    }
-                } else if ($tokens[$i]['code'] === T_FUNCTION) {
-                    // Found another interface function.
-                    return;
-                }
-
-                $currentLine = $tokens[$i]['line'];
-                if ($currentLine === $prevLine) {
-                    break;
-                }
-
-                if ($tokens[($i - 1)]['line'] < $currentLine && $tokens[($i + 1)]['line'] > $currentLine) {
-                    // This token is on a line by itself. If it is whitespace, the line is empty.
-                    if ($tokens[$i]['code'] === T_WHITESPACE) {
-                        $foundLines++;
-                    }
-                }
-
-                $i--;
-            }//end while
-        }//end if
-
-        if ($foundLines !== $this->spacing) {
-            $error = 'Expected %s blank line';
-            if ($this->spacing !== 1) {
-                $error .= 's';
-            }
-
-            $error .= ' before function; %s found';
-            $data   = array(
-                       $this->spacing,
-                       $foundLines,
-                      );
-
-            $fix = $phpcsFile->addFixableError($error, $stackPtr, 'Before', $data);
-            if ($fix === true) {
-                if ($prevContent === 0) {
-                    $nextSpace = 0;
-                } else {
-                    $nextSpace = $phpcsFile->findNext(T_WHITESPACE, ($prevContent + 1), $stackPtr);
-                    if ($nextSpace === false) {
-                        $nextSpace = ($stackPtr - 1);
-                    }
-                }
-
-                if ($foundLines < $this->spacing) {
-                    $padding = str_repeat($phpcsFile->eolChar, ($this->spacing - $foundLines));
-                    $phpcsFile->fixer->addContent($nextSpace, $padding);
-                } else {
-                    $nextContent = $phpcsFile->findNext(T_WHITESPACE, ($nextSpace + 1), null, true);
-                    $phpcsFile->fixer->beginChangeset();
-                    for ($i = $nextSpace; $i < ($nextContent - 1); $i++) {
-                        $phpcsFile->fixer->replaceToken($i, '');
-                    }
-
-                    $phpcsFile->fixer->replaceToken($i, str_repeat($phpcsFile->eolChar, $this->spacing));
-                    $phpcsFile->fixer->endChangeset();
-                }
-            }//end if
-        }//end if
-
-    }//end process()
+		  $prevLineToken = null;
+		  for ($i = $stackPtr; $i > 0; $i--) {
+				if (strpos($tokens[$i]['content'], $phpcsFile->eolChar) === false) {
+					 continue;
+				} else {
+					 $prevLineToken = $i;
+					 break;
+				}
+		  }
+
+		  if (is_null($prevLineToken) === true) {
+				// Never found the previous line, which means
+				// there are 0 blank lines before the function.
+				$foundLines  = 0;
+				$prevContent = 0;
+		  } else {
+				$currentLine = $tokens[$stackPtr]['line'];
+
+				$prevContent = $phpcsFile->findPrevious(T_WHITESPACE, $prevLineToken, null, true);
+				if ($tokens[$prevContent]['code'] === T_DOC_COMMENT_CLOSE_TAG
+					 && $tokens[$prevContent]['line'] === ($currentLine - 1)
+				) {
+					 // Account for function comments.
+					 $prevContent = $phpcsFile->findPrevious(T_WHITESPACE, ($tokens[$prevContent]['comment_opener'] - 1), null, true);
+				}
+
+				// Before we throw an error, check that we are not throwing an error
+				// for another function. We don't want to error for no blank lines after
+				// the previous function and no blank lines before this one as well.
+				$prevLine   = ($tokens[$prevContent]['line'] - 1);
+				$i          = ($stackPtr - 1);
+				$foundLines = 0;
+				while ($currentLine !== $prevLine && $currentLine > 1 && $i > 0) {
+					 if (isset($tokens[$i]['scope_condition']) === true) {
+						  $scopeCondition = $tokens[$i]['scope_condition'];
+						  if ($tokens[$scopeCondition]['code'] === T_FUNCTION) {
+								// Found a previous function.
+								return;
+						  }
+					 } else if ($tokens[$i]['code'] === T_FUNCTION) {
+						  // Found another interface function.
+						  return;
+					 }
+
+					 $currentLine = $tokens[$i]['line'];
+					 if ($currentLine === $prevLine) {
+						  break;
+					 }
+
+					 if ($tokens[($i - 1)]['line'] < $currentLine && $tokens[($i + 1)]['line'] > $currentLine) {
+						  // This token is on a line by itself. If it is whitespace, the line is empty.
+						  if ($tokens[$i]['code'] === T_WHITESPACE) {
+								$foundLines++;
+						  }
+					 }
+
+					 $i--;
+				}//end while
+		  }//end if
+
+		  if ($foundLines !== $this->spacing) {
+				$error = 'Expected %s blank line';
+				if ($this->spacing !== 1) {
+					 $error .= 's';
+				}
+
+				$error .= ' before function; %s found';
+				$data   = array(
+							  $this->spacing,
+							  $foundLines,
+							 );
+
+				$fix = $phpcsFile->addFixableError($error, $stackPtr, 'Before', $data);
+				if ($fix === true) {
+					 if ($prevContent === 0) {
+						  $nextSpace = 0;
+					 } else {
+						  $nextSpace = $phpcsFile->findNext(T_WHITESPACE, ($prevContent + 1), $stackPtr);
+						  if ($nextSpace === false) {
+								$nextSpace = ($stackPtr - 1);
+						  }
+					 }
+
+					 if ($foundLines < $this->spacing) {
+						  $padding = str_repeat($phpcsFile->eolChar, ($this->spacing - $foundLines));
+						  $phpcsFile->fixer->addContent($nextSpace, $padding);
+					 } else {
+						  $nextContent = $phpcsFile->findNext(T_WHITESPACE, ($nextSpace + 1), null, true);
+						  $phpcsFile->fixer->beginChangeset();
+						  for ($i = $nextSpace; $i < ($nextContent - 1); $i++) {
+								$phpcsFile->fixer->replaceToken($i, '');
+						  }
+
+						  $phpcsFile->fixer->replaceToken($i, str_repeat($phpcsFile->eolChar, $this->spacing));
+						  $phpcsFile->fixer->endChangeset();
+					 }
+				}//end if
+		  }//end if
+
+	 }//end process()
 
 
 }//end class

Spacing +53 added lines, -53 removed lines

@@ -45,7 +45,7 @@ 
      */
     public function register()
     {
-        return array(T_FUNCTION);
+        return array( T_FUNCTION );
 
     }//end register()
 
@@ -59,7 +59,7 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $tokens        = $phpcsFile->getTokens();
         $this->spacing = (int) $this->spacing;
@@ -69,41 +69,41 @@ 
             after the function.
         */
 
-        if (isset($tokens[$stackPtr]['scope_closer']) === false) {
+        if ( isset( $tokens[ $stackPtr ][ 'scope_closer' ] ) === false ) {
             // Must be an interface method, so the closer is the semicolon.
-            $closer = $phpcsFile->findNext(T_SEMICOLON, $stackPtr);
+            $closer = $phpcsFile->findNext( T_SEMICOLON, $stackPtr );
         } else {
-            $closer = $tokens[$stackPtr]['scope_closer'];
+            $closer = $tokens[ $stackPtr ][ 'scope_closer' ];
         }
 
         // Allow for comments on the same line as the closer.
-        for ($nextLineToken = ($closer + 1); $nextLineToken < $phpcsFile->numTokens; $nextLineToken++) {
-            if ($tokens[$nextLineToken]['line'] !== $tokens[$closer]['line']) {
+        for ( $nextLineToken = ( $closer + 1 ); $nextLineToken < $phpcsFile->numTokens; $nextLineToken++ ) {
+            if ( $tokens[ $nextLineToken ][ 'line' ] !== $tokens[ $closer ][ 'line' ] ) {
                 break;
             }
         }
 
         $foundLines = 0;
-        if ($nextLineToken === ($phpcsFile->numTokens - 1)) {
+        if ( $nextLineToken === ( $phpcsFile->numTokens - 1 ) ) {
             // We are at the end of the file.
             // Don't check spacing after the function because this
             // should be done by an EOF sniff.
             $foundLines = $this->spacing;
         } else {
-            $nextContent = $phpcsFile->findNext(T_WHITESPACE, $nextLineToken, null, true);
-            if ($nextContent === false) {
+            $nextContent = $phpcsFile->findNext( T_WHITESPACE, $nextLineToken, null, true );
+            if ( $nextContent === false ) {
                 // We are at the end of the file.
                 // Don't check spacing after the function because this
                 // should be done by an EOF sniff.
                 $foundLines = $this->spacing;
             } else {
-                $foundLines += ($tokens[$nextContent]['line'] - $tokens[$nextLineToken]['line']);
+                $foundLines += ( $tokens[ $nextContent ][ 'line' ] - $tokens[ $nextLineToken ][ 'line' ] );
             }
         }
 
-        if ($foundLines !== $this->spacing) {
+        if ( $foundLines !== $this->spacing ) {
             $error = 'Expected %s blank line';
-            if ($this->spacing !== 1) {
+            if ( $this->spacing !== 1 ) {
                 $error .= 's';
             }
 
@@ -113,16 +113,16 @@ 
                        $foundLines,
                       );
 
-            $fix = $phpcsFile->addFixableError($error, $closer, 'After', $data);
-            if ($fix === true) {
+            $fix = $phpcsFile->addFixableError( $error, $closer, 'After', $data );
+            if ( $fix === true ) {
                 $phpcsFile->fixer->beginChangeset();
-                for ($i = $nextLineToken; $i <= $nextContent; $i++) {
-                    if ($tokens[$i]['line'] === $tokens[$nextContent]['line']) {
-                        $phpcsFile->fixer->addContentBefore($i, str_repeat($phpcsFile->eolChar, $this->spacing));
+                for ( $i = $nextLineToken; $i <= $nextContent; $i++ ) {
+                    if ( $tokens[ $i ][ 'line' ] === $tokens[ $nextContent ][ 'line' ] ) {
+                        $phpcsFile->fixer->addContentBefore( $i, str_repeat( $phpcsFile->eolChar, $this->spacing ) );
                         break;
                     }
 
-                    $phpcsFile->fixer->replaceToken($i, '');
+                    $phpcsFile->fixer->replaceToken( $i, '' );
                 }
 
                 $phpcsFile->fixer->endChangeset();
@@ -135,8 +135,8 @@ 
         */
 
         $prevLineToken = null;
-        for ($i = $stackPtr; $i > 0; $i--) {
-            if (strpos($tokens[$i]['content'], $phpcsFile->eolChar) === false) {
+        for ( $i = $stackPtr; $i > 0; $i-- ) {
+            if ( strpos( $tokens[ $i ][ 'content' ], $phpcsFile->eolChar ) === false ) {
                 continue;
             } else {
                 $prevLineToken = $i;
@@ -144,48 +144,48 @@ 
             }
         }
 
-        if (is_null($prevLineToken) === true) {
+        if ( is_null( $prevLineToken ) === true ) {
             // Never found the previous line, which means
             // there are 0 blank lines before the function.
             $foundLines  = 0;
             $prevContent = 0;
         } else {
-            $currentLine = $tokens[$stackPtr]['line'];
+            $currentLine = $tokens[ $stackPtr ][ 'line' ];
 
-            $prevContent = $phpcsFile->findPrevious(T_WHITESPACE, $prevLineToken, null, true);
-            if ($tokens[$prevContent]['code'] === T_DOC_COMMENT_CLOSE_TAG
-                && $tokens[$prevContent]['line'] === ($currentLine - 1)
+            $prevContent = $phpcsFile->findPrevious( T_WHITESPACE, $prevLineToken, null, true );
+            if ( $tokens[ $prevContent ][ 'code' ] === T_DOC_COMMENT_CLOSE_TAG
+                && $tokens[ $prevContent ][ 'line' ] === ( $currentLine - 1 )
             ) {
                 // Account for function comments.
-                $prevContent = $phpcsFile->findPrevious(T_WHITESPACE, ($tokens[$prevContent]['comment_opener'] - 1), null, true);
+                $prevContent = $phpcsFile->findPrevious( T_WHITESPACE, ( $tokens[ $prevContent ][ 'comment_opener' ] - 1 ), null, true );
             }
 
             // Before we throw an error, check that we are not throwing an error
             // for another function. We don't want to error for no blank lines after
             // the previous function and no blank lines before this one as well.
-            $prevLine   = ($tokens[$prevContent]['line'] - 1);
-            $i          = ($stackPtr - 1);
+            $prevLine   = ( $tokens[ $prevContent ][ 'line' ] - 1 );
+            $i          = ( $stackPtr - 1 );
             $foundLines = 0;
-            while ($currentLine !== $prevLine && $currentLine > 1 && $i > 0) {
-                if (isset($tokens[$i]['scope_condition']) === true) {
-                    $scopeCondition = $tokens[$i]['scope_condition'];
-                    if ($tokens[$scopeCondition]['code'] === T_FUNCTION) {
+            while ( $currentLine !== $prevLine && $currentLine > 1 && $i > 0 ) {
+                if ( isset( $tokens[ $i ][ 'scope_condition' ] ) === true ) {
+                    $scopeCondition = $tokens[ $i ][ 'scope_condition' ];
+                    if ( $tokens[ $scopeCondition ][ 'code' ] === T_FUNCTION ) {
                         // Found a previous function.
                         return;
                     }
-                } else if ($tokens[$i]['code'] === T_FUNCTION) {
+                } else if ( $tokens[ $i ][ 'code' ] === T_FUNCTION ) {
                     // Found another interface function.
                     return;
                 }
 
-                $currentLine = $tokens[$i]['line'];
-                if ($currentLine === $prevLine) {
+                $currentLine = $tokens[ $i ][ 'line' ];
+                if ( $currentLine === $prevLine ) {
                     break;
                 }
 
-                if ($tokens[($i - 1)]['line'] < $currentLine && $tokens[($i + 1)]['line'] > $currentLine) {
+                if ( $tokens[ ( $i - 1 ) ][ 'line' ] < $currentLine && $tokens[ ( $i + 1 ) ][ 'line' ] > $currentLine ) {
                     // This token is on a line by itself. If it is whitespace, the line is empty.
-                    if ($tokens[$i]['code'] === T_WHITESPACE) {
+                    if ( $tokens[ $i ][ 'code' ] === T_WHITESPACE ) {
                         $foundLines++;
                     }
                 }
@@ -194,9 +194,9 @@ 
             }//end while
         }//end if
 
-        if ($foundLines !== $this->spacing) {
+        if ( $foundLines !== $this->spacing ) {
             $error = 'Expected %s blank line';
-            if ($this->spacing !== 1) {
+            if ( $this->spacing !== 1 ) {
                 $error .= 's';
             }
 
@@ -206,28 +206,28 @@ 
                        $foundLines,
                       );
 
-            $fix = $phpcsFile->addFixableError($error, $stackPtr, 'Before', $data);
-            if ($fix === true) {
-                if ($prevContent === 0) {
+            $fix = $phpcsFile->addFixableError( $error, $stackPtr, 'Before', $data );
+            if ( $fix === true ) {
+                if ( $prevContent === 0 ) {
                     $nextSpace = 0;
                 } else {
-                    $nextSpace = $phpcsFile->findNext(T_WHITESPACE, ($prevContent + 1), $stackPtr);
-                    if ($nextSpace === false) {
-                        $nextSpace = ($stackPtr - 1);
+                    $nextSpace = $phpcsFile->findNext( T_WHITESPACE, ( $prevContent + 1 ), $stackPtr );
+                    if ( $nextSpace === false ) {
+                        $nextSpace = ( $stackPtr - 1 );
                     }
                 }
 
-                if ($foundLines < $this->spacing) {
-                    $padding = str_repeat($phpcsFile->eolChar, ($this->spacing - $foundLines));
-                    $phpcsFile->fixer->addContent($nextSpace, $padding);
+                if ( $foundLines < $this->spacing ) {
+                    $padding = str_repeat( $phpcsFile->eolChar, ( $this->spacing - $foundLines ) );
+                    $phpcsFile->fixer->addContent( $nextSpace, $padding );
                 } else {
-                    $nextContent = $phpcsFile->findNext(T_WHITESPACE, ($nextSpace + 1), null, true);
+                    $nextContent = $phpcsFile->findNext( T_WHITESPACE, ( $nextSpace + 1 ), null, true );
                     $phpcsFile->fixer->beginChangeset();
-                    for ($i = $nextSpace; $i < ($nextContent - 1); $i++) {
-                        $phpcsFile->fixer->replaceToken($i, '');
+                    for ( $i = $nextSpace; $i < ( $nextContent - 1 ); $i++ ) {
+                        $phpcsFile->fixer->replaceToken( $i, '' );
                     }
 
-                    $phpcsFile->fixer->replaceToken($i, str_repeat($phpcsFile->eolChar, $this->spacing));
+                    $phpcsFile->fixer->replaceToken( $i, str_repeat( $phpcsFile->eolChar, $this->spacing ) );
                     $phpcsFile->fixer->endChangeset();
                 }
             }//end if

Braces +3 added lines, -6 removed lines

@@ -27,8 +27,7 @@ 
  * @version   Release: @package_version@
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
-class Squiz_Sniffs_WhiteSpace_FunctionSpacingSniff implements PHP_CodeSniffer_Sniff
-{
+class Squiz_Sniffs_WhiteSpace_FunctionSpacingSniff implements PHP_CodeSniffer_Sniff {
 
     /**
      * The number of blank lines between functions.
@@ -43,8 +42,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(T_FUNCTION);
 
     }//end register()
@@ -59,8 +57,7 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         $tokens        = $phpcsFile->getTokens();
         $this->spacing = (int) $this->spacing;
 

vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/SemicolonSpacingSniff.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 +55 added lines, -55 removed lines

@@ -30,72 +30,72 @@
 class Squiz_Sniffs_WhiteSpace_SemicolonSpacingSniff implements PHP_CodeSniffer_Sniff
 {
 
-    /**
-     * A list of tokenizers this sniff supports.
-     *
-     * @var array
-     */
-    public $supportedTokenizers = array(
-                                   'PHP',
-                                   'JS',
-                                  );
+	 /**
+	  * A list of tokenizers this sniff supports.
+	  *
+	  * @var array
+	  */
+	 public $supportedTokenizers = array(
+											  'PHP',
+											  'JS',
+											 );
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(T_SEMICOLON);
+	 /**
+	  * Returns an array of tokens this test wants to listen for.
+	  *
+	  * @return array
+	  */
+	 public function register()
+	 {
+		  return array(T_SEMICOLON);
 
-    }//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();
 
-        $prevType = $tokens[($stackPtr - 1)]['code'];
-        if (isset(PHP_CodeSniffer_Tokens::$emptyTokens[$prevType]) === false) {
-            return;
-        }
+		  $prevType = $tokens[($stackPtr - 1)]['code'];
+		  if (isset(PHP_CodeSniffer_Tokens::$emptyTokens[$prevType]) === false) {
+				return;
+		  }
 
-        $nonSpace = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$emptyTokens, ($stackPtr - 2), null, true);
-        if ($tokens[$nonSpace]['code'] === T_SEMICOLON) {
-            // Empty statement.
-            return;
-        }
+		  $nonSpace = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$emptyTokens, ($stackPtr - 2), null, true);
+		  if ($tokens[$nonSpace]['code'] === T_SEMICOLON) {
+				// Empty statement.
+				return;
+		  }
 
-        $expected = $tokens[$nonSpace]['content'].';';
-        $found    = $phpcsFile->getTokensAsString($nonSpace, ($stackPtr - $nonSpace)).';';
-        $error    = 'Space found before semicolon; expected "%s" but found "%s"';
-        $data     = array(
-                     $expected,
-                     $found,
-                    );
+		  $expected = $tokens[$nonSpace]['content'].';';
+		  $found    = $phpcsFile->getTokensAsString($nonSpace, ($stackPtr - $nonSpace)).';';
+		  $error    = 'Space found before semicolon; expected "%s" but found "%s"';
+		  $data     = array(
+							$expected,
+							$found,
+						  );
 
-        $fix = $phpcsFile->addFixableError($error, $stackPtr, 'Incorrect', $data);
-        if ($fix === true) {
-            $phpcsFile->fixer->beginChangeset();
-            for ($i = ($stackPtr - 1); $i > $nonSpace; $i--) {
-                $phpcsFile->fixer->replaceToken($i, '');
-            }
+		  $fix = $phpcsFile->addFixableError($error, $stackPtr, 'Incorrect', $data);
+		  if ($fix === true) {
+				$phpcsFile->fixer->beginChangeset();
+				for ($i = ($stackPtr - 1); $i > $nonSpace; $i--) {
+					 $phpcsFile->fixer->replaceToken($i, '');
+				}
 
-            $phpcsFile->fixer->endChangeset();
-        }
+				$phpcsFile->fixer->endChangeset();
+		  }
 
-    }//end process()
+	 }//end process()
 
 
 }//end class

Spacing +12 added lines, -12 removed lines

@@ -48,7 +48,7 @@ 
      */
     public function register()
     {
-        return array(T_SEMICOLON);
+        return array( T_SEMICOLON );
 
     }//end register()
 
@@ -62,34 +62,34 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process( PHP_CodeSniffer_File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
-        $prevType = $tokens[($stackPtr - 1)]['code'];
-        if (isset(PHP_CodeSniffer_Tokens::$emptyTokens[$prevType]) === false) {
+        $prevType = $tokens[ ( $stackPtr - 1 ) ][ 'code' ];
+        if ( isset( PHP_CodeSniffer_Tokens::$emptyTokens[ $prevType ] ) === false ) {
             return;
         }
 
-        $nonSpace = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$emptyTokens, ($stackPtr - 2), null, true);
-        if ($tokens[$nonSpace]['code'] === T_SEMICOLON) {
+        $nonSpace = $phpcsFile->findPrevious( PHP_CodeSniffer_Tokens::$emptyTokens, ( $stackPtr - 2 ), null, true );
+        if ( $tokens[ $nonSpace ][ 'code' ] === T_SEMICOLON ) {
             // Empty statement.
             return;
         }
 
-        $expected = $tokens[$nonSpace]['content'].';';
-        $found    = $phpcsFile->getTokensAsString($nonSpace, ($stackPtr - $nonSpace)).';';
+        $expected = $tokens[ $nonSpace ][ 'content' ] . ';';
+        $found    = $phpcsFile->getTokensAsString( $nonSpace, ( $stackPtr - $nonSpace ) ) . ';';
         $error    = 'Space found before semicolon; expected "%s" but found "%s"';
         $data     = array(
                      $expected,
                      $found,
                     );
 
-        $fix = $phpcsFile->addFixableError($error, $stackPtr, 'Incorrect', $data);
-        if ($fix === true) {
+        $fix = $phpcsFile->addFixableError( $error, $stackPtr, 'Incorrect', $data );
+        if ( $fix === true ) {
             $phpcsFile->fixer->beginChangeset();
-            for ($i = ($stackPtr - 1); $i > $nonSpace; $i--) {
-                $phpcsFile->fixer->replaceToken($i, '');
+            for ( $i = ( $stackPtr - 1 ); $i > $nonSpace; $i-- ) {
+                $phpcsFile->fixer->replaceToken( $i, '' );
             }
 
             $phpcsFile->fixer->endChangeset();

Braces +3 added lines, -6 removed lines

@@ -27,8 +27,7 @@ 
  * @version   Release: @package_version@
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
-class Squiz_Sniffs_WhiteSpace_SemicolonSpacingSniff implements PHP_CodeSniffer_Sniff
-{
+class Squiz_Sniffs_WhiteSpace_SemicolonSpacingSniff implements PHP_CodeSniffer_Sniff {
 
     /**
      * A list of tokenizers this sniff supports.
@@ -46,8 +45,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(T_SEMICOLON);
 
     }//end register()
@@ -62,8 +60,7 @@ 
      *
      * @return void
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
+    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         $prevType = $tokens[($stackPtr - 1)]['code'];

vendor/wp-coding-standards/wpcs/WordPress/Sniffs/Arrays/ArrayKeySpacingRestrictionsSniff.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +6 added lines, -6 removed lines

@@ -44,7 +44,7 @@ 
 		$tokens = $phpcsFile->getTokens();
 
 		$token = $tokens[ $stackPtr ];
-		if ( ! isset( $token['bracket_closer'] ) ) {
+		if ( ! isset( $token[ 'bracket_closer' ] ) ) {
 			$phpcsFile->addWarning( 'Missing bracket closer.', $stackPtr, 'MissingBracketCloser' );
 			return;
 		}
@@ -52,12 +52,12 @@ 
 		$need_spaces = $phpcsFile->findNext(
 			array( T_CONSTANT_ENCAPSED_STRING, T_LNUMBER, T_WHITESPACE, T_MINUS ),
 			( $stackPtr + 1 ),
-			$token['bracket_closer'],
+			$token[ 'bracket_closer' ],
 			true
 		);
 
-		$spaced1 = ( T_WHITESPACE === $tokens[ ( $stackPtr + 1 ) ]['code'] );
-		$spaced2 = ( T_WHITESPACE === $tokens[ ( $token['bracket_closer'] - 1 ) ]['code'] );
+		$spaced1 = ( T_WHITESPACE === $tokens[ ( $stackPtr + 1 ) ][ 'code' ] );
+		$spaced2 = ( T_WHITESPACE === $tokens[ ( $token[ 'bracket_closer' ] - 1 ) ][ 'code' ] );
 
 		// It should have spaces only if it only has strings or numbers as the key.
 		if ( $need_spaces && ! ( $spaced1 && $spaced2 ) ) {
@@ -68,7 +68,7 @@ 
 					$phpcsFile->fixer->addContentBefore( ( $stackPtr + 1 ), ' ' );
 				}
 				if ( ! $spaced2 ) {
-					$phpcsFile->fixer->addContentBefore( $token['bracket_closer'], ' ' );
+					$phpcsFile->fixer->addContentBefore( $token[ 'bracket_closer' ], ' ' );
 				}
 			}
 		} elseif ( ! $need_spaces && ( $spaced1 || $spaced2 ) ) {
@@ -79,7 +79,7 @@ 
 					$phpcsFile->fixer->replaceToken( ( $stackPtr + 1 ), '' );
 				}
 				if ( $spaced2 ) {
-					$phpcsFile->fixer->replaceToken( ( $token['bracket_closer'] - 1 ), '' );
+					$phpcsFile->fixer->replaceToken( ( $token[ 'bracket_closer' ] - 1 ), '' );
 				}
 			}
 		}