gravityview / GravityView

vendor/phpcompatibility/php-compatibility/PHPCompatibility/Sniffs/Operators/ForbiddenNegativeBitshiftSniff.php

Indentation +65 added lines, -65 removed lines

@@ -29,76 +29,76 @@
  */
 class ForbiddenNegativeBitshiftSniff extends Sniff
 {
-    /**
-     * Potential end tokens for which the end pointer has to be set back by one.
-     *
-     * {@internal The PHPCS `findEndOfStatement()` method is not completely consistent
-     * in how it returns the statement end. This is just a simple way to bypass
-     * the inconsistency for our purposes.}}
-     *
-     * @var array
-     */
-    private $inclusiveStopPoints = array(
-        \T_COLON        => true,
-        \T_COMMA        => true,
-        \T_DOUBLE_ARROW => true,
-        \T_SEMICOLON    => true,
-    );
+	/**
+	 * Potential end tokens for which the end pointer has to be set back by one.
+	 *
+	 * {@internal The PHPCS `findEndOfStatement()` method is not completely consistent
+	 * in how it returns the statement end. This is just a simple way to bypass
+	 * the inconsistency for our purposes.}}
+	 *
+	 * @var array
+	 */
+	private $inclusiveStopPoints = array(
+		\T_COLON        => true,
+		\T_COMMA        => true,
+		\T_DOUBLE_ARROW => true,
+		\T_SEMICOLON    => true,
+	);
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-            \T_SL,
-            \T_SL_EQUAL,
-            \T_SR,
-            \T_SR_EQUAL,
-        );
-    }
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return array(
+			\T_SL,
+			\T_SL_EQUAL,
+			\T_SR,
+			\T_SR_EQUAL,
+		);
+	}
 
-    /**
-     * 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(File $phpcsFile, $stackPtr)
-    {
-        if ($this->supportsAbove('7.0') === false) {
-            return;
-        }
+	/**
+	 * 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(File $phpcsFile, $stackPtr)
+	{
+		if ($this->supportsAbove('7.0') === false) {
+			return;
+		}
 
-        $tokens = $phpcsFile->getTokens();
+		$tokens = $phpcsFile->getTokens();
 
-        // Determine the start and end of the part of the statement we need to examine.
-        $start = ($stackPtr + 1);
-        $next  = $phpcsFile->findNext(Tokens::$emptyTokens, $start, null, true);
-        if ($next !== false && $tokens[$next]['code'] === \T_OPEN_PARENTHESIS) {
-            $start = ($next + 1);
-        }
+		// Determine the start and end of the part of the statement we need to examine.
+		$start = ($stackPtr + 1);
+		$next  = $phpcsFile->findNext(Tokens::$emptyTokens, $start, null, true);
+		if ($next !== false && $tokens[$next]['code'] === \T_OPEN_PARENTHESIS) {
+			$start = ($next + 1);
+		}
 
-        $end = PHPCSHelper::findEndOfStatement($phpcsFile, $start);
-        if (isset($this->inclusiveStopPoints[$tokens[$end]['code']]) === true) {
-            --$end;
-        }
+		$end = PHPCSHelper::findEndOfStatement($phpcsFile, $start);
+		if (isset($this->inclusiveStopPoints[$tokens[$end]['code']]) === true) {
+			--$end;
+		}
 
-        if ($this->isNegativeNumber($phpcsFile, $start, $end, true) !== true) {
-            // Not a negative number or undetermined.
-            return;
-        }
+		if ($this->isNegativeNumber($phpcsFile, $start, $end, true) !== true) {
+			// Not a negative number or undetermined.
+			return;
+		}
 
-        $phpcsFile->addError(
-            'Bitwise shifts by negative number will throw an ArithmeticError in PHP 7.0. Found: %s',
-            $stackPtr,
-            'Found',
-            array($phpcsFile->getTokensAsString($start, ($end - $start + 1)))
-        );
-    }
+		$phpcsFile->addError(
+			'Bitwise shifts by negative number will throw an ArithmeticError in PHP 7.0. Found: %s',
+			$stackPtr,
+			'Found',
+			array($phpcsFile->getTokensAsString($start, ($end - $start + 1)))
+		);
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -69,27 +69,27 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
-        if ($this->supportsAbove('7.0') === false) {
+        if ( $this->supportsAbove( '7.0' ) === false ) {
             return;
         }
 
         $tokens = $phpcsFile->getTokens();
 
         // Determine the start and end of the part of the statement we need to examine.
-        $start = ($stackPtr + 1);
-        $next  = $phpcsFile->findNext(Tokens::$emptyTokens, $start, null, true);
-        if ($next !== false && $tokens[$next]['code'] === \T_OPEN_PARENTHESIS) {
-            $start = ($next + 1);
+        $start = ( $stackPtr + 1 );
+        $next  = $phpcsFile->findNext( Tokens::$emptyTokens, $start, null, true );
+        if ( $next !== false && $tokens[ $next ][ 'code' ] === \T_OPEN_PARENTHESIS ) {
+            $start = ( $next + 1 );
         }
 
-        $end = PHPCSHelper::findEndOfStatement($phpcsFile, $start);
-        if (isset($this->inclusiveStopPoints[$tokens[$end]['code']]) === true) {
+        $end = PHPCSHelper::findEndOfStatement( $phpcsFile, $start );
+        if ( isset( $this->inclusiveStopPoints[ $tokens[ $end ][ 'code' ] ] ) === true ) {
             --$end;
         }
 
-        if ($this->isNegativeNumber($phpcsFile, $start, $end, true) !== true) {
+        if ( $this->isNegativeNumber( $phpcsFile, $start, $end, true ) !== true ) {
             // Not a negative number or undetermined.
             return;
         }
@@ -98,7 +98,7 @@ 
             'Bitwise shifts by negative number will throw an ArithmeticError in PHP 7.0. Found: %s',
             $stackPtr,
             'Found',
-            array($phpcsFile->getTokensAsString($start, ($end - $start + 1)))
+            array( $phpcsFile->getTokensAsString( $start, ( $end - $start + 1 ) ) )
         );
     }
 }

Braces +3 added lines, -6 removed lines

@@ -27,8 +27,7 @@ 
  * @package  PHPCompatibility
  * @author   Wim Godden <wim@cu.be>
  */
-class ForbiddenNegativeBitshiftSniff extends Sniff
-{
+class ForbiddenNegativeBitshiftSniff extends Sniff {
     /**
      * Potential end tokens for which the end pointer has to be set back by one.
      *
@@ -50,8 +49,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(
             \T_SL,
             \T_SL_EQUAL,
@@ -69,8 +67,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         if ($this->supportsAbove('7.0') === false) {
             return;
         }

Doc Comments +1 added lines, -1 removed lines

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

vendor/phpcompatibility/php-compatibility/PHPCompatibility/Sniffs/Operators/RemovedTernaryAssociativitySniff.php

Indentation +123 added lines, -123 removed lines

@@ -30,127 +30,127 @@
 class RemovedTernaryAssociativitySniff extends Sniff
 {
 
-    /**
-     * List of tokens with a lower operator precedence than ternary.
-     *
-     * @since 9.2.0
-     *
-     * @var array
-     */
-    private $tokensWithLowerPrecedence = array(
-        'T_YIELD_FROM'  => true,
-        'T_YIELD'       => true,
-        'T_LOGICAL_AND' => true,
-        'T_LOGICAL_OR'  => true,
-        'T_LOGICAL_XOR' => true,
-    );
-
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @since 9.2.0
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(\T_INLINE_THEN);
-    }
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @since 9.2.0
-     *
-     * @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(File $phpcsFile, $stackPtr)
-    {
-        if ($this->supportsAbove('7.4') === false) {
-            return;
-        }
-
-        $tokens         = $phpcsFile->getTokens();
-        $endOfStatement = PHPCSHelper::findEndOfStatement($phpcsFile, $stackPtr);
-        if ($tokens[$endOfStatement]['code'] !== \T_SEMICOLON
-            && $tokens[$endOfStatement]['code'] !== \T_COLON
-            && $tokens[$endOfStatement]['code'] !== \T_COMMA
-            && $tokens[$endOfStatement]['code'] !== \T_DOUBLE_ARROW
-            && $tokens[$endOfStatement]['code'] !== \T_OPEN_TAG
-            && $tokens[$endOfStatement]['code'] !== \T_CLOSE_TAG
-        ) {
-            // End of statement is last non-empty before close brace, so make sure we examine that token too.
-            ++$endOfStatement;
-        }
-
-        $ternaryCount      = 0;
-        $elseCount         = 0;
-        $shortTernaryCount = 0;
-
-        // Start at $stackPtr so we don't need duplicate code for short ternary determination.
-        for ($i = $stackPtr; $i < $endOfStatement; $i++) {
-            if (($tokens[$i]['code'] === \T_OPEN_SHORT_ARRAY
-                || $tokens[$i]['code'] === \T_OPEN_SQUARE_BRACKET
-                || $tokens[$i]['code'] === \T_OPEN_CURLY_BRACKET)
-                && isset($tokens[$i]['bracket_closer'])
-            ) {
-                // Skip over short arrays, array access keys and curlies.
-                $i = $tokens[$i]['bracket_closer'];
-                continue;
-            }
-
-            if ($tokens[$i]['code'] === \T_OPEN_PARENTHESIS
-                && isset($tokens[$i]['parenthesis_closer'])
-            ) {
-                // Skip over anything between parentheses.
-                $i = $tokens[$i]['parenthesis_closer'];
-                continue;
-            }
-
-            // Check for operators with lower operator precedence.
-            if (isset(Tokens::$assignmentTokens[$tokens[$i]['code']])
-                || isset($this->tokensWithLowerPrecedence[$tokens[$i]['code']])
-            ) {
-                break;
-            }
-
-            if ($tokens[$i]['code'] === \T_INLINE_THEN) {
-                ++$ternaryCount;
-
-                if ($this->isShortTernary($phpcsFile, $i) === true) {
-                    ++$shortTernaryCount;
-                }
-
-                continue;
-            }
-
-            if ($tokens[$i]['code'] === \T_INLINE_ELSE) {
-                if (($ternaryCount - $elseCount) >= 2) {
-                    // This is the `else` for a ternary in the middle part of a previous ternary.
-                    --$ternaryCount;
-                } else {
-                    ++$elseCount;
-                }
-                continue;
-            }
-        }
-
-        if ($ternaryCount > 1 && $ternaryCount === $elseCount && $ternaryCount > $shortTernaryCount) {
-            $message = 'The left-associativity of the ternary operator has been deprecated in PHP 7.4';
-            $isError = false;
-            if ($this->supportsAbove('8.0') === true) {
-                $message .= ' and removed in PHP 8.0';
-                $isError  = true;
-            }
-
-            $message .= '. Multiple consecutive ternaries detected. Use parenthesis to clarify the order in which the operations should be executed';
-
-            $this->addMessage($phpcsFile, $message, $stackPtr, $isError);
-        }
-    }
+	/**
+	 * List of tokens with a lower operator precedence than ternary.
+	 *
+	 * @since 9.2.0
+	 *
+	 * @var array
+	 */
+	private $tokensWithLowerPrecedence = array(
+		'T_YIELD_FROM'  => true,
+		'T_YIELD'       => true,
+		'T_LOGICAL_AND' => true,
+		'T_LOGICAL_OR'  => true,
+		'T_LOGICAL_XOR' => true,
+	);
+
+
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @since 9.2.0
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return array(\T_INLINE_THEN);
+	}
+
+	/**
+	 * Processes this test, when one of its tokens is encountered.
+	 *
+	 * @since 9.2.0
+	 *
+	 * @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(File $phpcsFile, $stackPtr)
+	{
+		if ($this->supportsAbove('7.4') === false) {
+			return;
+		}
+
+		$tokens         = $phpcsFile->getTokens();
+		$endOfStatement = PHPCSHelper::findEndOfStatement($phpcsFile, $stackPtr);
+		if ($tokens[$endOfStatement]['code'] !== \T_SEMICOLON
+			&& $tokens[$endOfStatement]['code'] !== \T_COLON
+			&& $tokens[$endOfStatement]['code'] !== \T_COMMA
+			&& $tokens[$endOfStatement]['code'] !== \T_DOUBLE_ARROW
+			&& $tokens[$endOfStatement]['code'] !== \T_OPEN_TAG
+			&& $tokens[$endOfStatement]['code'] !== \T_CLOSE_TAG
+		) {
+			// End of statement is last non-empty before close brace, so make sure we examine that token too.
+			++$endOfStatement;
+		}
+
+		$ternaryCount      = 0;
+		$elseCount         = 0;
+		$shortTernaryCount = 0;
+
+		// Start at $stackPtr so we don't need duplicate code for short ternary determination.
+		for ($i = $stackPtr; $i < $endOfStatement; $i++) {
+			if (($tokens[$i]['code'] === \T_OPEN_SHORT_ARRAY
+				|| $tokens[$i]['code'] === \T_OPEN_SQUARE_BRACKET
+				|| $tokens[$i]['code'] === \T_OPEN_CURLY_BRACKET)
+				&& isset($tokens[$i]['bracket_closer'])
+			) {
+				// Skip over short arrays, array access keys and curlies.
+				$i = $tokens[$i]['bracket_closer'];
+				continue;
+			}
+
+			if ($tokens[$i]['code'] === \T_OPEN_PARENTHESIS
+				&& isset($tokens[$i]['parenthesis_closer'])
+			) {
+				// Skip over anything between parentheses.
+				$i = $tokens[$i]['parenthesis_closer'];
+				continue;
+			}
+
+			// Check for operators with lower operator precedence.
+			if (isset(Tokens::$assignmentTokens[$tokens[$i]['code']])
+				|| isset($this->tokensWithLowerPrecedence[$tokens[$i]['code']])
+			) {
+				break;
+			}
+
+			if ($tokens[$i]['code'] === \T_INLINE_THEN) {
+				++$ternaryCount;
+
+				if ($this->isShortTernary($phpcsFile, $i) === true) {
+					++$shortTernaryCount;
+				}
+
+				continue;
+			}
+
+			if ($tokens[$i]['code'] === \T_INLINE_ELSE) {
+				if (($ternaryCount - $elseCount) >= 2) {
+					// This is the `else` for a ternary in the middle part of a previous ternary.
+					--$ternaryCount;
+				} else {
+					++$elseCount;
+				}
+				continue;
+			}
+		}
+
+		if ($ternaryCount > 1 && $ternaryCount === $elseCount && $ternaryCount > $shortTernaryCount) {
+			$message = 'The left-associativity of the ternary operator has been deprecated in PHP 7.4';
+			$isError = false;
+			if ($this->supportsAbove('8.0') === true) {
+				$message .= ' and removed in PHP 8.0';
+				$isError  = true;
+			}
+
+			$message .= '. Multiple consecutive ternaries detected. Use parenthesis to clarify the order in which the operations should be executed';
+
+			$this->addMessage($phpcsFile, $message, $stackPtr, $isError);
+		}
+	}
 }

Spacing +28 added lines, -28 removed lines

@@ -55,7 +55,7 @@ 
      */
     public function register()
     {
-        return array(\T_INLINE_THEN);
+        return array( \T_INLINE_THEN );
     }
 
     /**
@@ -69,20 +69,20 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
-        if ($this->supportsAbove('7.4') === false) {
+        if ( $this->supportsAbove( '7.4' ) === false ) {
             return;
         }
 
         $tokens         = $phpcsFile->getTokens();
-        $endOfStatement = PHPCSHelper::findEndOfStatement($phpcsFile, $stackPtr);
-        if ($tokens[$endOfStatement]['code'] !== \T_SEMICOLON
-            && $tokens[$endOfStatement]['code'] !== \T_COLON
-            && $tokens[$endOfStatement]['code'] !== \T_COMMA
-            && $tokens[$endOfStatement]['code'] !== \T_DOUBLE_ARROW
-            && $tokens[$endOfStatement]['code'] !== \T_OPEN_TAG
-            && $tokens[$endOfStatement]['code'] !== \T_CLOSE_TAG
+        $endOfStatement = PHPCSHelper::findEndOfStatement( $phpcsFile, $stackPtr );
+        if ( $tokens[ $endOfStatement ][ 'code' ] !== \T_SEMICOLON
+            && $tokens[ $endOfStatement ][ 'code' ] !== \T_COLON
+            && $tokens[ $endOfStatement ][ 'code' ] !== \T_COMMA
+            && $tokens[ $endOfStatement ][ 'code' ] !== \T_DOUBLE_ARROW
+            && $tokens[ $endOfStatement ][ 'code' ] !== \T_OPEN_TAG
+            && $tokens[ $endOfStatement ][ 'code' ] !== \T_CLOSE_TAG
         ) {
             // End of statement is last non-empty before close brace, so make sure we examine that token too.
             ++$endOfStatement;
@@ -93,44 +93,44 @@ 
         $shortTernaryCount = 0;
 
         // Start at $stackPtr so we don't need duplicate code for short ternary determination.
-        for ($i = $stackPtr; $i < $endOfStatement; $i++) {
-            if (($tokens[$i]['code'] === \T_OPEN_SHORT_ARRAY
-                || $tokens[$i]['code'] === \T_OPEN_SQUARE_BRACKET
-                || $tokens[$i]['code'] === \T_OPEN_CURLY_BRACKET)
-                && isset($tokens[$i]['bracket_closer'])
+        for ( $i = $stackPtr; $i < $endOfStatement; $i++ ) {
+            if ( ( $tokens[ $i ][ 'code' ] === \T_OPEN_SHORT_ARRAY
+                || $tokens[ $i ][ 'code' ] === \T_OPEN_SQUARE_BRACKET
+                || $tokens[ $i ][ 'code' ] === \T_OPEN_CURLY_BRACKET )
+                && isset( $tokens[ $i ][ 'bracket_closer' ] )
             ) {
                 // Skip over short arrays, array access keys and curlies.
-                $i = $tokens[$i]['bracket_closer'];
+                $i = $tokens[ $i ][ 'bracket_closer' ];
                 continue;
             }
 
-            if ($tokens[$i]['code'] === \T_OPEN_PARENTHESIS
-                && isset($tokens[$i]['parenthesis_closer'])
+            if ( $tokens[ $i ][ 'code' ] === \T_OPEN_PARENTHESIS
+                && isset( $tokens[ $i ][ 'parenthesis_closer' ] )
             ) {
                 // Skip over anything between parentheses.
-                $i = $tokens[$i]['parenthesis_closer'];
+                $i = $tokens[ $i ][ 'parenthesis_closer' ];
                 continue;
             }
 
             // Check for operators with lower operator precedence.
-            if (isset(Tokens::$assignmentTokens[$tokens[$i]['code']])
-                || isset($this->tokensWithLowerPrecedence[$tokens[$i]['code']])
+            if ( isset( Tokens::$assignmentTokens[ $tokens[ $i ][ 'code' ] ] )
+                || isset( $this->tokensWithLowerPrecedence[ $tokens[ $i ][ 'code' ] ] )
             ) {
                 break;
             }
 
-            if ($tokens[$i]['code'] === \T_INLINE_THEN) {
+            if ( $tokens[ $i ][ 'code' ] === \T_INLINE_THEN ) {
                 ++$ternaryCount;
 
-                if ($this->isShortTernary($phpcsFile, $i) === true) {
+                if ( $this->isShortTernary( $phpcsFile, $i ) === true ) {
                     ++$shortTernaryCount;
                 }
 
                 continue;
             }
 
-            if ($tokens[$i]['code'] === \T_INLINE_ELSE) {
-                if (($ternaryCount - $elseCount) >= 2) {
+            if ( $tokens[ $i ][ 'code' ] === \T_INLINE_ELSE ) {
+                if ( ( $ternaryCount - $elseCount ) >= 2 ) {
                     // This is the `else` for a ternary in the middle part of a previous ternary.
                     --$ternaryCount;
                 } else {
@@ -140,17 +140,17 @@ 
             }
         }
 
-        if ($ternaryCount > 1 && $ternaryCount === $elseCount && $ternaryCount > $shortTernaryCount) {
+        if ( $ternaryCount > 1 && $ternaryCount === $elseCount && $ternaryCount > $shortTernaryCount ) {
             $message = 'The left-associativity of the ternary operator has been deprecated in PHP 7.4';
             $isError = false;
-            if ($this->supportsAbove('8.0') === true) {
+            if ( $this->supportsAbove( '8.0' ) === true ) {
                 $message .= ' and removed in PHP 8.0';
                 $isError  = true;
             }
 
             $message .= '. Multiple consecutive ternaries detected. Use parenthesis to clarify the order in which the operations should be executed';
 
-            $this->addMessage($phpcsFile, $message, $stackPtr, $isError);
+            $this->addMessage( $phpcsFile, $message, $stackPtr, $isError );
         }
     }
 }

Braces +3 added lines, -6 removed lines

@@ -27,8 +27,7 @@ 
  *
  * @since 9.2.0
  */
-class RemovedTernaryAssociativitySniff extends Sniff
-{
+class RemovedTernaryAssociativitySniff extends Sniff {
 
     /**
      * List of tokens with a lower operator precedence than ternary.
@@ -53,8 +52,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(\T_INLINE_THEN);
     }
 
@@ -69,8 +67,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         if ($this->supportsAbove('7.4') === false) {
             return;
         }

Doc Comments +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
      *
      * @since 9.2.0
      *
-     * @return array
+     * @return string[]
      */
     public function register()
     {

vendor/phpcompatibility/php-compatibility/PHPCompatibility/Sniffs/Operators/NewOperatorsSniff.php

Indentation +239 added lines, -239 removed lines

@@ -24,271 +24,271 @@
 class NewOperatorsSniff extends AbstractNewFeatureSniff
 {
 
-    /**
-     * A list of new operators, not present in older versions.
-     *
-     * The array lists : version number with false (not present) or true (present).
-     * If's sufficient to list the first version where the keyword appears.
-     *
-     * @var array(string => array(string => int|string|null))
-     */
-    protected $newOperators = array(
-        'T_POW' => array(
-            '5.5' => false,
-            '5.6' => true,
-            'description' => 'power operator (**)',
-        ), // Identified in PHP < 5.6 icw PHPCS < 2.4.0 as T_MULTIPLY + T_MULTIPLY.
-        'T_POW_EQUAL' => array(
-            '5.5' => false,
-            '5.6' => true,
-            'description' => 'power assignment operator (**=)',
-        ), // Identified in PHP < 5.6 icw PHPCS < 2.6.0 as T_MULTIPLY + T_MUL_EQUAL.
-        'T_SPACESHIP' => array(
-            '5.6' => false,
-            '7.0' => true,
-            'description' => 'spaceship operator (<=>)',
-        ), // Identified in PHP < 7.0 icw PHPCS < 2.5.1 as T_IS_SMALLER_OR_EQUAL + T_GREATER_THAN.
-        'T_COALESCE' => array(
-            '5.6' => false,
-            '7.0' => true,
-            'description' => 'null coalescing operator (??)',
-        ), // Identified in PHP < 7.0 icw PHPCS < 2.6.2 as T_INLINE_THEN + T_INLINE_THEN.
-        /*
+	/**
+	 * A list of new operators, not present in older versions.
+	 *
+	 * The array lists : version number with false (not present) or true (present).
+	 * If's sufficient to list the first version where the keyword appears.
+	 *
+	 * @var array(string => array(string => int|string|null))
+	 */
+	protected $newOperators = array(
+		'T_POW' => array(
+			'5.5' => false,
+			'5.6' => true,
+			'description' => 'power operator (**)',
+		), // Identified in PHP < 5.6 icw PHPCS < 2.4.0 as T_MULTIPLY + T_MULTIPLY.
+		'T_POW_EQUAL' => array(
+			'5.5' => false,
+			'5.6' => true,
+			'description' => 'power assignment operator (**=)',
+		), // Identified in PHP < 5.6 icw PHPCS < 2.6.0 as T_MULTIPLY + T_MUL_EQUAL.
+		'T_SPACESHIP' => array(
+			'5.6' => false,
+			'7.0' => true,
+			'description' => 'spaceship operator (<=>)',
+		), // Identified in PHP < 7.0 icw PHPCS < 2.5.1 as T_IS_SMALLER_OR_EQUAL + T_GREATER_THAN.
+		'T_COALESCE' => array(
+			'5.6' => false,
+			'7.0' => true,
+			'description' => 'null coalescing operator (??)',
+		), // Identified in PHP < 7.0 icw PHPCS < 2.6.2 as T_INLINE_THEN + T_INLINE_THEN.
+		/*
          * Was slated for 7.2, but still not implemented. PHPCS however does already tokenize it.
          * @link https://wiki.php.net/rfc/null_coalesce_equal_operator
          */
-        'T_COALESCE_EQUAL' => array(
-            '7.3' => false,
-            '7.4' => true,
-            'description' => 'null coalesce equal operator (??=)',
-        ), // Identified in PHP < 7.0 icw PHPCS < 2.6.2 as T_INLINE_THEN + T_INLINE_THEN + T_EQUAL and between PHPCS 2.6.2 and PHPCS 2.8.1 as T_COALESCE + T_EQUAL.
-    );
+		'T_COALESCE_EQUAL' => array(
+			'7.3' => false,
+			'7.4' => true,
+			'description' => 'null coalesce equal operator (??=)',
+		), // Identified in PHP < 7.0 icw PHPCS < 2.6.2 as T_INLINE_THEN + T_INLINE_THEN + T_EQUAL and between PHPCS 2.6.2 and PHPCS 2.8.1 as T_COALESCE + T_EQUAL.
+	);
 
 
-    /**
-     * A list of new operators which are not recognized in older PHPCS versions.
-     *
-     * The array lists an alternative token to listen for.
-     *
-     * @var array(string => int)
-     */
-    protected $newOperatorsPHPCSCompat = array(
-        'T_POW'            => \T_MULTIPLY,
-        'T_POW_EQUAL'      => \T_MUL_EQUAL,
-        'T_SPACESHIP'      => \T_GREATER_THAN,
-        'T_COALESCE'       => \T_INLINE_THEN,
-        'T_COALESCE_EQUAL' => \T_EQUAL,
-    );
+	/**
+	 * A list of new operators which are not recognized in older PHPCS versions.
+	 *
+	 * The array lists an alternative token to listen for.
+	 *
+	 * @var array(string => int)
+	 */
+	protected $newOperatorsPHPCSCompat = array(
+		'T_POW'            => \T_MULTIPLY,
+		'T_POW_EQUAL'      => \T_MUL_EQUAL,
+		'T_SPACESHIP'      => \T_GREATER_THAN,
+		'T_COALESCE'       => \T_INLINE_THEN,
+		'T_COALESCE_EQUAL' => \T_EQUAL,
+	);
 
-    /**
-     * Token translation table for older PHPCS versions.
-     *
-     * The 'before' index lists the token which would have to be directly before the
-     * token found for it to be one of the new operators.
-     * The 'real_token' index indicates which operator was found in that case.
-     *
-     * If the token combination has multi-layer complexity, such as is the case
-     * with T_COALESCE(_EQUAL), a 'callback' index is added instead pointing to a
-     * separate function which can determine whether this is the targetted token across
-     * PHP and PHPCS versions.
-     *
-     * {@internal 'before' was chosen rather than 'after' as that allowed for a 1-on-1
-     * translation list with the current tokens.}}
-     *
-     * @var array(string => array(string => string))
-     */
-    protected $PHPCSCompatTranslate = array(
-        'T_MULTIPLY' => array(
-            'before'     => 'T_MULTIPLY',
-            'real_token' => 'T_POW',
-        ),
-        'T_MUL_EQUAL' => array(
-            'before'     => 'T_MULTIPLY',
-            'real_token' => 'T_POW_EQUAL',
-        ),
-        'T_GREATER_THAN' => array(
-            'before'     => 'T_IS_SMALLER_OR_EQUAL',
-            'real_token' => 'T_SPACESHIP',
-        ),
-        'T_INLINE_THEN' => array(
-            'callback'   => 'isTCoalesce',
-            'real_token' => 'T_COALESCE',
-        ),
-        'T_EQUAL' => array(
-            'callback'   => 'isTCoalesceEqual',
-            'real_token' => 'T_COALESCE_EQUAL',
-        ),
-    );
+	/**
+	 * Token translation table for older PHPCS versions.
+	 *
+	 * The 'before' index lists the token which would have to be directly before the
+	 * token found for it to be one of the new operators.
+	 * The 'real_token' index indicates which operator was found in that case.
+	 *
+	 * If the token combination has multi-layer complexity, such as is the case
+	 * with T_COALESCE(_EQUAL), a 'callback' index is added instead pointing to a
+	 * separate function which can determine whether this is the targetted token across
+	 * PHP and PHPCS versions.
+	 *
+	 * {@internal 'before' was chosen rather than 'after' as that allowed for a 1-on-1
+	 * translation list with the current tokens.}}
+	 *
+	 * @var array(string => array(string => string))
+	 */
+	protected $PHPCSCompatTranslate = array(
+		'T_MULTIPLY' => array(
+			'before'     => 'T_MULTIPLY',
+			'real_token' => 'T_POW',
+		),
+		'T_MUL_EQUAL' => array(
+			'before'     => 'T_MULTIPLY',
+			'real_token' => 'T_POW_EQUAL',
+		),
+		'T_GREATER_THAN' => array(
+			'before'     => 'T_IS_SMALLER_OR_EQUAL',
+			'real_token' => 'T_SPACESHIP',
+		),
+		'T_INLINE_THEN' => array(
+			'callback'   => 'isTCoalesce',
+			'real_token' => 'T_COALESCE',
+		),
+		'T_EQUAL' => array(
+			'callback'   => 'isTCoalesceEqual',
+			'real_token' => 'T_COALESCE_EQUAL',
+		),
+	);
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        $tokens = array();
-        foreach ($this->newOperators as $token => $versions) {
-            if (\defined($token)) {
-                $tokens[] = constant($token);
-            } elseif (isset($this->newOperatorsPHPCSCompat[$token])) {
-                $tokens[] = $this->newOperatorsPHPCSCompat[$token];
-            }
-        }
-        return $tokens;
-    }
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		$tokens = array();
+		foreach ($this->newOperators as $token => $versions) {
+			if (\defined($token)) {
+				$tokens[] = constant($token);
+			} elseif (isset($this->newOperatorsPHPCSCompat[$token])) {
+				$tokens[] = $this->newOperatorsPHPCSCompat[$token];
+			}
+		}
+		return $tokens;
+	}
 
 
-    /**
-     * 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(File $phpcsFile, $stackPtr)
-    {
-        $tokens    = $phpcsFile->getTokens();
-        $tokenType = $tokens[$stackPtr]['type'];
+	/**
+	 * 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(File $phpcsFile, $stackPtr)
+	{
+		$tokens    = $phpcsFile->getTokens();
+		$tokenType = $tokens[$stackPtr]['type'];
 
-        // Translate older PHPCS token combis for new operators to the actual operator.
-        if (isset($this->newOperators[$tokenType]) === false) {
-            if (isset($this->PHPCSCompatTranslate[$tokenType])
-                && ((isset($this->PHPCSCompatTranslate[$tokenType]['before'], $tokens[$stackPtr - 1]) === true
-                    && $tokens[$stackPtr - 1]['type'] === $this->PHPCSCompatTranslate[$tokenType]['before'])
-                || (isset($this->PHPCSCompatTranslate[$tokenType]['callback']) === true
-                    && \call_user_func(array($this, $this->PHPCSCompatTranslate[$tokenType]['callback']), $tokens, $stackPtr) === true))
-            ) {
-                $tokenType = $this->PHPCSCompatTranslate[$tokenType]['real_token'];
-            }
-        } elseif ($tokenType === 'T_COALESCE') {
-            // Make sure that T_COALESCE is not confused with T_COALESCE_EQUAL.
-            if (isset($tokens[($stackPtr + 1)]) !== false && $tokens[($stackPtr + 1)]['code'] === \T_EQUAL) {
-                // Ignore as will be dealt with via the T_EQUAL token.
-                return;
-            }
-        }
+		// Translate older PHPCS token combis for new operators to the actual operator.
+		if (isset($this->newOperators[$tokenType]) === false) {
+			if (isset($this->PHPCSCompatTranslate[$tokenType])
+				&& ((isset($this->PHPCSCompatTranslate[$tokenType]['before'], $tokens[$stackPtr - 1]) === true
+					&& $tokens[$stackPtr - 1]['type'] === $this->PHPCSCompatTranslate[$tokenType]['before'])
+				|| (isset($this->PHPCSCompatTranslate[$tokenType]['callback']) === true
+					&& \call_user_func(array($this, $this->PHPCSCompatTranslate[$tokenType]['callback']), $tokens, $stackPtr) === true))
+			) {
+				$tokenType = $this->PHPCSCompatTranslate[$tokenType]['real_token'];
+			}
+		} elseif ($tokenType === 'T_COALESCE') {
+			// Make sure that T_COALESCE is not confused with T_COALESCE_EQUAL.
+			if (isset($tokens[($stackPtr + 1)]) !== false && $tokens[($stackPtr + 1)]['code'] === \T_EQUAL) {
+				// Ignore as will be dealt with via the T_EQUAL token.
+				return;
+			}
+		}
 
-        // If the translation did not yield one of the tokens we are looking for, bow out.
-        if (isset($this->newOperators[$tokenType]) === false) {
-            return;
-        }
+		// If the translation did not yield one of the tokens we are looking for, bow out.
+		if (isset($this->newOperators[$tokenType]) === false) {
+			return;
+		}
 
-        $itemInfo = array(
-            'name' => $tokenType,
-        );
-        $this->handleFeature($phpcsFile, $stackPtr, $itemInfo);
-    }
+		$itemInfo = array(
+			'name' => $tokenType,
+		);
+		$this->handleFeature($phpcsFile, $stackPtr, $itemInfo);
+	}
 
 
-    /**
-     * Get the relevant sub-array for a specific item from a multi-dimensional array.
-     *
-     * @param array $itemInfo Base information about the item.
-     *
-     * @return array Version and other information about the item.
-     */
-    public function getItemArray(array $itemInfo)
-    {
-        return $this->newOperators[$itemInfo['name']];
-    }
+	/**
+	 * Get the relevant sub-array for a specific item from a multi-dimensional array.
+	 *
+	 * @param array $itemInfo Base information about the item.
+	 *
+	 * @return array Version and other information about the item.
+	 */
+	public function getItemArray(array $itemInfo)
+	{
+		return $this->newOperators[$itemInfo['name']];
+	}
 
 
-    /**
-     * Get an array of the non-PHP-version array keys used in a sub-array.
-     *
-     * @return array
-     */
-    protected function getNonVersionArrayKeys()
-    {
-        return array('description');
-    }
+	/**
+	 * Get an array of the non-PHP-version array keys used in a sub-array.
+	 *
+	 * @return array
+	 */
+	protected function getNonVersionArrayKeys()
+	{
+		return array('description');
+	}
 
 
-    /**
-     * Retrieve the relevant detail (version) information for use in an error message.
-     *
-     * @param array $itemArray Version and other information about the item.
-     * @param array $itemInfo  Base information about the item.
-     *
-     * @return array
-     */
-    public function getErrorInfo(array $itemArray, array $itemInfo)
-    {
-        $errorInfo                = parent::getErrorInfo($itemArray, $itemInfo);
-        $errorInfo['description'] = $itemArray['description'];
+	/**
+	 * Retrieve the relevant detail (version) information for use in an error message.
+	 *
+	 * @param array $itemArray Version and other information about the item.
+	 * @param array $itemInfo  Base information about the item.
+	 *
+	 * @return array
+	 */
+	public function getErrorInfo(array $itemArray, array $itemInfo)
+	{
+		$errorInfo                = parent::getErrorInfo($itemArray, $itemInfo);
+		$errorInfo['description'] = $itemArray['description'];
 
-        return $errorInfo;
-    }
+		return $errorInfo;
+	}
 
 
-    /**
-     * Allow for concrete child classes to filter the error data before it's passed to PHPCS.
-     *
-     * @param array $data      The error data array which was created.
-     * @param array $itemInfo  Base information about the item this error message applies to.
-     * @param array $errorInfo Detail information about an item this error message applies to.
-     *
-     * @return array
-     */
-    protected function filterErrorData(array $data, array $itemInfo, array $errorInfo)
-    {
-        $data[0] = $errorInfo['description'];
-        return $data;
-    }
+	/**
+	 * Allow for concrete child classes to filter the error data before it's passed to PHPCS.
+	 *
+	 * @param array $data      The error data array which was created.
+	 * @param array $itemInfo  Base information about the item this error message applies to.
+	 * @param array $errorInfo Detail information about an item this error message applies to.
+	 *
+	 * @return array
+	 */
+	protected function filterErrorData(array $data, array $itemInfo, array $errorInfo)
+	{
+		$data[0] = $errorInfo['description'];
+		return $data;
+	}
 
 
-    /**
-     * Callback function to determine whether a T_EQUAL token is really a T_COALESCE_EQUAL token.
-     *
-     * @param array $tokens   The token stack.
-     * @param int   $stackPtr The current position in the token stack.
-     *
-     * @return bool
-     */
-    private function isTCoalesceEqual($tokens, $stackPtr)
-    {
-        if ($tokens[$stackPtr]['code'] !== \T_EQUAL || isset($tokens[($stackPtr - 1)]) === false) {
-            // Function called for wrong token or token has no predecesor.
-            return false;
-        }
+	/**
+	 * Callback function to determine whether a T_EQUAL token is really a T_COALESCE_EQUAL token.
+	 *
+	 * @param array $tokens   The token stack.
+	 * @param int   $stackPtr The current position in the token stack.
+	 *
+	 * @return bool
+	 */
+	private function isTCoalesceEqual($tokens, $stackPtr)
+	{
+		if ($tokens[$stackPtr]['code'] !== \T_EQUAL || isset($tokens[($stackPtr - 1)]) === false) {
+			// Function called for wrong token or token has no predecesor.
+			return false;
+		}
 
-        if ($tokens[($stackPtr - 1)]['type'] === 'T_COALESCE') {
-            return true;
-        }
-        if ($tokens[($stackPtr - 1)]['type'] === 'T_INLINE_THEN'
-            && (isset($tokens[($stackPtr - 2)]) && $tokens[($stackPtr - 2)]['type'] === 'T_INLINE_THEN')
-        ) {
-            return true;
-        }
+		if ($tokens[($stackPtr - 1)]['type'] === 'T_COALESCE') {
+			return true;
+		}
+		if ($tokens[($stackPtr - 1)]['type'] === 'T_INLINE_THEN'
+			&& (isset($tokens[($stackPtr - 2)]) && $tokens[($stackPtr - 2)]['type'] === 'T_INLINE_THEN')
+		) {
+			return true;
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Callback function to determine whether a T_INLINE_THEN token is really a T_COALESCE token.
-     *
-     * @param array $tokens   The token stack.
-     * @param int   $stackPtr The current position in the token stack.
-     *
-     * @return bool
-     */
-    private function isTCoalesce($tokens, $stackPtr)
-    {
-        if ($tokens[$stackPtr]['code'] !== \T_INLINE_THEN || isset($tokens[($stackPtr - 1)]) === false) {
-            // Function called for wrong token or token has no predecesor.
-            return false;
-        }
+	/**
+	 * Callback function to determine whether a T_INLINE_THEN token is really a T_COALESCE token.
+	 *
+	 * @param array $tokens   The token stack.
+	 * @param int   $stackPtr The current position in the token stack.
+	 *
+	 * @return bool
+	 */
+	private function isTCoalesce($tokens, $stackPtr)
+	{
+		if ($tokens[$stackPtr]['code'] !== \T_INLINE_THEN || isset($tokens[($stackPtr - 1)]) === false) {
+			// Function called for wrong token or token has no predecesor.
+			return false;
+		}
 
-        if ($tokens[($stackPtr - 1)]['code'] === \T_INLINE_THEN) {
-            // Make sure not to confuse it with the T_COALESCE_EQUAL token.
-            if (isset($tokens[($stackPtr + 1)]) === false || $tokens[($stackPtr + 1)]['code'] !== \T_EQUAL) {
-                return true;
-            }
-        }
+		if ($tokens[($stackPtr - 1)]['code'] === \T_INLINE_THEN) {
+			// Make sure not to confuse it with the T_COALESCE_EQUAL token.
+			if (isset($tokens[($stackPtr + 1)]) === false || $tokens[($stackPtr + 1)]['code'] !== \T_EQUAL) {
+				return true;
+			}
+		}
 
-        return false;
-    }
+		return false;
+	}
 }

Spacing +35 added lines, -35 removed lines

@@ -128,11 +128,11 @@ 
     public function register()
     {
         $tokens = array();
-        foreach ($this->newOperators as $token => $versions) {
-            if (\defined($token)) {
-                $tokens[] = constant($token);
-            } elseif (isset($this->newOperatorsPHPCSCompat[$token])) {
-                $tokens[] = $this->newOperatorsPHPCSCompat[$token];
+        foreach ( $this->newOperators as $token => $versions ) {
+            if ( \defined( $token ) ) {
+                $tokens[ ] = constant( $token );
+            } elseif ( isset( $this->newOperatorsPHPCSCompat[ $token ] ) ) {
+                $tokens[ ] = $this->newOperatorsPHPCSCompat[ $token ];
             }
         }
         return $tokens;
@@ -148,38 +148,38 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
         $tokens    = $phpcsFile->getTokens();
-        $tokenType = $tokens[$stackPtr]['type'];
+        $tokenType = $tokens[ $stackPtr ][ 'type' ];
 
         // Translate older PHPCS token combis for new operators to the actual operator.
-        if (isset($this->newOperators[$tokenType]) === false) {
-            if (isset($this->PHPCSCompatTranslate[$tokenType])
-                && ((isset($this->PHPCSCompatTranslate[$tokenType]['before'], $tokens[$stackPtr - 1]) === true
-                    && $tokens[$stackPtr - 1]['type'] === $this->PHPCSCompatTranslate[$tokenType]['before'])
-                || (isset($this->PHPCSCompatTranslate[$tokenType]['callback']) === true
-                    && \call_user_func(array($this, $this->PHPCSCompatTranslate[$tokenType]['callback']), $tokens, $stackPtr) === true))
+        if ( isset( $this->newOperators[ $tokenType ] ) === false ) {
+            if ( isset( $this->PHPCSCompatTranslate[ $tokenType ] )
+                && ( ( isset( $this->PHPCSCompatTranslate[ $tokenType ][ 'before' ], $tokens[ $stackPtr - 1 ] ) === true
+                    && $tokens[ $stackPtr - 1 ][ 'type' ] === $this->PHPCSCompatTranslate[ $tokenType ][ 'before' ] )
+                || ( isset( $this->PHPCSCompatTranslate[ $tokenType ][ 'callback' ] ) === true
+                    && \call_user_func( array( $this, $this->PHPCSCompatTranslate[ $tokenType ][ 'callback' ] ), $tokens, $stackPtr ) === true ) )
             ) {
-                $tokenType = $this->PHPCSCompatTranslate[$tokenType]['real_token'];
+                $tokenType = $this->PHPCSCompatTranslate[ $tokenType ][ 'real_token' ];
             }
-        } elseif ($tokenType === 'T_COALESCE') {
+        } elseif ( $tokenType === 'T_COALESCE' ) {
             // Make sure that T_COALESCE is not confused with T_COALESCE_EQUAL.
-            if (isset($tokens[($stackPtr + 1)]) !== false && $tokens[($stackPtr + 1)]['code'] === \T_EQUAL) {
+            if ( isset( $tokens[ ( $stackPtr + 1 ) ] ) !== false && $tokens[ ( $stackPtr + 1 ) ][ 'code' ] === \T_EQUAL ) {
                 // Ignore as will be dealt with via the T_EQUAL token.
                 return;
             }
         }
 
         // If the translation did not yield one of the tokens we are looking for, bow out.
-        if (isset($this->newOperators[$tokenType]) === false) {
+        if ( isset( $this->newOperators[ $tokenType ] ) === false ) {
             return;
         }
 
         $itemInfo = array(
             'name' => $tokenType,
         );
-        $this->handleFeature($phpcsFile, $stackPtr, $itemInfo);
+        $this->handleFeature( $phpcsFile, $stackPtr, $itemInfo );
     }
 
 
@@ -190,9 +190,9 @@ 
      *
      * @return array Version and other information about the item.
      */
-    public function getItemArray(array $itemInfo)
+    public function getItemArray( array $itemInfo )
     {
-        return $this->newOperators[$itemInfo['name']];
+        return $this->newOperators[ $itemInfo[ 'name' ] ];
     }
 
 
@@ -203,7 +203,7 @@ 
      */
     protected function getNonVersionArrayKeys()
     {
-        return array('description');
+        return array( 'description' );
     }
 
 
@@ -215,10 +215,10 @@ 
      *
      * @return array
      */
-    public function getErrorInfo(array $itemArray, array $itemInfo)
+    public function getErrorInfo( array $itemArray, array $itemInfo )
     {
-        $errorInfo                = parent::getErrorInfo($itemArray, $itemInfo);
-        $errorInfo['description'] = $itemArray['description'];
+        $errorInfo                = parent::getErrorInfo( $itemArray, $itemInfo );
+        $errorInfo[ 'description' ] = $itemArray[ 'description' ];
 
         return $errorInfo;
     }
@@ -233,9 +233,9 @@ 
      *
      * @return array
      */
-    protected function filterErrorData(array $data, array $itemInfo, array $errorInfo)
+    protected function filterErrorData( array $data, array $itemInfo, array $errorInfo )
     {
-        $data[0] = $errorInfo['description'];
+        $data[ 0 ] = $errorInfo[ 'description' ];
         return $data;
     }
 
@@ -248,18 +248,18 @@ 
      *
      * @return bool
      */
-    private function isTCoalesceEqual($tokens, $stackPtr)
+    private function isTCoalesceEqual( $tokens, $stackPtr )
     {
-        if ($tokens[$stackPtr]['code'] !== \T_EQUAL || isset($tokens[($stackPtr - 1)]) === false) {
+        if ( $tokens[ $stackPtr ][ 'code' ] !== \T_EQUAL || isset( $tokens[ ( $stackPtr - 1 ) ] ) === false ) {
             // Function called for wrong token or token has no predecesor.
             return false;
         }
 
-        if ($tokens[($stackPtr - 1)]['type'] === 'T_COALESCE') {
+        if ( $tokens[ ( $stackPtr - 1 ) ][ 'type' ] === 'T_COALESCE' ) {
             return true;
         }
-        if ($tokens[($stackPtr - 1)]['type'] === 'T_INLINE_THEN'
-            && (isset($tokens[($stackPtr - 2)]) && $tokens[($stackPtr - 2)]['type'] === 'T_INLINE_THEN')
+        if ( $tokens[ ( $stackPtr - 1 ) ][ 'type' ] === 'T_INLINE_THEN'
+            && ( isset( $tokens[ ( $stackPtr - 2 ) ] ) && $tokens[ ( $stackPtr - 2 ) ][ 'type' ] === 'T_INLINE_THEN' )
         ) {
             return true;
         }
@@ -275,16 +275,16 @@ 
      *
      * @return bool
      */
-    private function isTCoalesce($tokens, $stackPtr)
+    private function isTCoalesce( $tokens, $stackPtr )
     {
-        if ($tokens[$stackPtr]['code'] !== \T_INLINE_THEN || isset($tokens[($stackPtr - 1)]) === false) {
+        if ( $tokens[ $stackPtr ][ 'code' ] !== \T_INLINE_THEN || isset( $tokens[ ( $stackPtr - 1 ) ] ) === false ) {
             // Function called for wrong token or token has no predecesor.
             return false;
         }
 
-        if ($tokens[($stackPtr - 1)]['code'] === \T_INLINE_THEN) {
+        if ( $tokens[ ( $stackPtr - 1 ) ][ 'code' ] === \T_INLINE_THEN ) {
             // Make sure not to confuse it with the T_COALESCE_EQUAL token.
-            if (isset($tokens[($stackPtr + 1)]) === false || $tokens[($stackPtr + 1)]['code'] !== \T_EQUAL) {
+            if ( isset( $tokens[ ( $stackPtr + 1 ) ] ) === false || $tokens[ ( $stackPtr + 1 ) ][ 'code' ] !== \T_EQUAL ) {
                 return true;
             }
         }

Braces +9 added lines, -18 removed lines

@@ -21,8 +21,7 @@ 
  * @author    Wim Godden <wim.godden@cu.be>
  * @copyright 2013 Cu.be Solutions bvba
  */
-class NewOperatorsSniff extends AbstractNewFeatureSniff
-{
+class NewOperatorsSniff extends AbstractNewFeatureSniff {
 
     /**
      * A list of new operators, not present in older versions.
@@ -125,8 +124,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         $tokens = array();
         foreach ($this->newOperators as $token => $versions) {
             if (\defined($token)) {
@@ -148,8 +146,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         $tokens    = $phpcsFile->getTokens();
         $tokenType = $tokens[$stackPtr]['type'];
 
@@ -190,8 +187,7 @@ 
      *
      * @return array Version and other information about the item.
      */
-    public function getItemArray(array $itemInfo)
-    {
+    public function getItemArray(array $itemInfo) {
         return $this->newOperators[$itemInfo['name']];
     }
 
@@ -201,8 +197,7 @@ 
      *
      * @return array
      */
-    protected function getNonVersionArrayKeys()
-    {
+    protected function getNonVersionArrayKeys() {
         return array('description');
     }
 
@@ -215,8 +210,7 @@ 
      *
      * @return array
      */
-    public function getErrorInfo(array $itemArray, array $itemInfo)
-    {
+    public function getErrorInfo(array $itemArray, array $itemInfo) {
         $errorInfo                = parent::getErrorInfo($itemArray, $itemInfo);
         $errorInfo['description'] = $itemArray['description'];
 
@@ -233,8 +227,7 @@ 
      *
      * @return array
      */
-    protected function filterErrorData(array $data, array $itemInfo, array $errorInfo)
-    {
+    protected function filterErrorData(array $data, array $itemInfo, array $errorInfo) {
         $data[0] = $errorInfo['description'];
         return $data;
     }
@@ -248,8 +241,7 @@ 
      *
      * @return bool
      */
-    private function isTCoalesceEqual($tokens, $stackPtr)
-    {
+    private function isTCoalesceEqual($tokens, $stackPtr) {
         if ($tokens[$stackPtr]['code'] !== \T_EQUAL || isset($tokens[($stackPtr - 1)]) === false) {
             // Function called for wrong token or token has no predecesor.
             return false;
@@ -275,8 +267,7 @@ 
      *
      * @return bool
      */
-    private function isTCoalesce($tokens, $stackPtr)
-    {
+    private function isTCoalesce($tokens, $stackPtr) {
         if ($tokens[$stackPtr]['code'] !== \T_INLINE_THEN || isset($tokens[($stackPtr - 1)]) === false) {
             // Function called for wrong token or token has no predecesor.
             return false;

Doc Comments +1 added lines, -1 removed lines

@@ -301,7 +301,7 @@
     /**
      * Get an array of the non-PHP-version array keys used in a sub-array.
      *
-     * @return array
+     * @return string[]
      */
     protected function getNonVersionArrayKeys()
     {

vendor/phpcompatibility/php-compatibility/PHPCompatibility/Sniffs/Upgrade/LowPHPCSSniff.php

Indentation +110 added lines, -110 removed lines

@@ -34,96 +34,96 @@ 
  */
 class LowPHPCSSniff extends Sniff
 {
-    /**
-     * The minimum supported PHPCS version.
-     *
-     * Users on PHPCS versions below this will see an ERROR message.
-     *
-     * @var string
-     */
-    protected $minSupportedVersion = '2.3.0';
-
-    /**
-     * The minimum recommended PHPCS version.
-     *
-     * Users on PHPCS versions below this will see a WARNING.
-     *
-     * @var string
-     */
-    protected $minRecommendedVersion = '2.6.0';
-
-    /**
-     * Keep track of whether this sniff needs to actually run.
-     *
-     * This will be set to `false` when either a high enough PHPCS
-     * version is detected or once the error/warning has been thrown,
-     * to make sure that the notice will only be thrown once per run.
-     *
-     * @var bool
-     */
-    private $examine = true;
-
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-            \T_OPEN_TAG,
-        );
-    }
-
-    /**
-     * 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 int|void Integer stack pointer to skip forward or void to continue
-     *                  normal file processing.
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        // Don't do anything if the warning has already been thrown or is not necessary.
-        if ($this->examine === false) {
-            return ($phpcsFile->numTokens + 1);
-        }
-
-        $phpcsVersion = PHPCSHelper::getVersion();
-
-        // Don't do anything if the PHPCS version used is above the minimum recommended version.
-        if (version_compare($phpcsVersion, $this->minRecommendedVersion, '>=')) {
-            $this->examine = false;
-            return ($phpcsFile->numTokens + 1);
-        }
-
-        if (version_compare($phpcsVersion, $this->minSupportedVersion, '<')) {
-            $isError      = true;
-            $message      = "IMPORTANT: Please be advised that the minimum PHP_CodeSniffer version the PHPCompatibility standard supports is %s. You are currently using PHP_CodeSniffer %s. Please upgrade your PHP_CodeSniffer installation. The recommended version of PHP_CodeSniffer for PHPCompatibility is %s or higher.";
-            $errorCode    = 'Unsupported_' . $this->stringToErrorCode($this->minSupportedVersion);
-            $replacements = array(
-                $this->minSupportedVersion,
-                $phpcsVersion,
-                $this->minRecommendedVersion,
-                $errorCode,
-            );
-        } else {
-            $isError      = false;
-            $message      = "IMPORTANT: Please be advised that for the most reliable PHPCompatibility results, PHP_CodeSniffer %s or higher should be used. Support for lower versions will be dropped in the foreseeable future. You are currently using PHP_CodeSniffer %s. Please upgrade your PHP_CodeSniffer installation to version %s or higher.";
-            $errorCode    = 'BelowRecommended_' . $this->stringToErrorCode($this->minRecommendedVersion);
-            $replacements = array(
-                $this->minRecommendedVersion,
-                $phpcsVersion,
-                $this->minRecommendedVersion,
-                $errorCode,
-            );
-        }
-
-        /*
+	/**
+	 * The minimum supported PHPCS version.
+	 *
+	 * Users on PHPCS versions below this will see an ERROR message.
+	 *
+	 * @var string
+	 */
+	protected $minSupportedVersion = '2.3.0';
+
+	/**
+	 * The minimum recommended PHPCS version.
+	 *
+	 * Users on PHPCS versions below this will see a WARNING.
+	 *
+	 * @var string
+	 */
+	protected $minRecommendedVersion = '2.6.0';
+
+	/**
+	 * Keep track of whether this sniff needs to actually run.
+	 *
+	 * This will be set to `false` when either a high enough PHPCS
+	 * version is detected or once the error/warning has been thrown,
+	 * to make sure that the notice will only be thrown once per run.
+	 *
+	 * @var bool
+	 */
+	private $examine = true;
+
+
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return array(
+			\T_OPEN_TAG,
+		);
+	}
+
+	/**
+	 * 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 int|void Integer stack pointer to skip forward or void to continue
+	 *                  normal file processing.
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		// Don't do anything if the warning has already been thrown or is not necessary.
+		if ($this->examine === false) {
+			return ($phpcsFile->numTokens + 1);
+		}
+
+		$phpcsVersion = PHPCSHelper::getVersion();
+
+		// Don't do anything if the PHPCS version used is above the minimum recommended version.
+		if (version_compare($phpcsVersion, $this->minRecommendedVersion, '>=')) {
+			$this->examine = false;
+			return ($phpcsFile->numTokens + 1);
+		}
+
+		if (version_compare($phpcsVersion, $this->minSupportedVersion, '<')) {
+			$isError      = true;
+			$message      = "IMPORTANT: Please be advised that the minimum PHP_CodeSniffer version the PHPCompatibility standard supports is %s. You are currently using PHP_CodeSniffer %s. Please upgrade your PHP_CodeSniffer installation. The recommended version of PHP_CodeSniffer for PHPCompatibility is %s or higher.";
+			$errorCode    = 'Unsupported_' . $this->stringToErrorCode($this->minSupportedVersion);
+			$replacements = array(
+				$this->minSupportedVersion,
+				$phpcsVersion,
+				$this->minRecommendedVersion,
+				$errorCode,
+			);
+		} else {
+			$isError      = false;
+			$message      = "IMPORTANT: Please be advised that for the most reliable PHPCompatibility results, PHP_CodeSniffer %s or higher should be used. Support for lower versions will be dropped in the foreseeable future. You are currently using PHP_CodeSniffer %s. Please upgrade your PHP_CodeSniffer installation to version %s or higher.";
+			$errorCode    = 'BelowRecommended_' . $this->stringToErrorCode($this->minRecommendedVersion);
+			$replacements = array(
+				$this->minRecommendedVersion,
+				$phpcsVersion,
+				$this->minRecommendedVersion,
+				$errorCode,
+			);
+		}
+
+		/*
          * Figure out the report width to determine how long the delimiter lines should be.
          *
          * This is not an exact calculation as there are a number of unknowns at the time the
@@ -149,24 +149,24 @@ 
          * If/when the upstream PR has been merged and the minimum supported/recommended version
          * of PHPCompatibility would go beyond that, the below code should be adjusted.}}
          */
-        $reportWidth = PHPCSHelper::getCommandLineData($phpcsFile, 'reportWidth');
-        $showSources = PHPCSHelper::getCommandLineData($phpcsFile, 'showSources');
-        if ($showSources === true && version_compare($phpcsVersion, '2.3.0', '>=')) {
-            $reportWidth += 6;
-        }
-
-        $messageWidth  = ($reportWidth - 15); // 15 is length of " # | WARNING | ".
-        $delimiterLine = str_repeat('-', ($messageWidth));
-        $disableNotice = 'To disable this notice, add --exclude=PHPCompatibility.Upgrade.LowPHPCS to your command or add <exclude name="PHPCompatibility.Upgrade.LowPHPCS.%s"/> to your custom ruleset. ';
-        $thankYou      = 'Thank you for using PHPCompatibility!';
-
-        $message .= ' ' . $delimiterLine;
-        $message .= ' ' . $disableNotice;
-        $message .= ' ' . $delimiterLine;
-        $message .= ' ' . $thankYou;
-
-        $this->addMessage($phpcsFile, $message, 0, $isError, $errorCode, $replacements);
-
-        $this->examine = false;
-    }
+		$reportWidth = PHPCSHelper::getCommandLineData($phpcsFile, 'reportWidth');
+		$showSources = PHPCSHelper::getCommandLineData($phpcsFile, 'showSources');
+		if ($showSources === true && version_compare($phpcsVersion, '2.3.0', '>=')) {
+			$reportWidth += 6;
+		}
+
+		$messageWidth  = ($reportWidth - 15); // 15 is length of " # | WARNING | ".
+		$delimiterLine = str_repeat('-', ($messageWidth));
+		$disableNotice = 'To disable this notice, add --exclude=PHPCompatibility.Upgrade.LowPHPCS to your command or add <exclude name="PHPCompatibility.Upgrade.LowPHPCS.%s"/> to your custom ruleset. ';
+		$thankYou      = 'Thank you for using PHPCompatibility!';
+
+		$message .= ' ' . $delimiterLine;
+		$message .= ' ' . $disableNotice;
+		$message .= ' ' . $delimiterLine;
+		$message .= ' ' . $thankYou;
+
+		$this->addMessage($phpcsFile, $message, 0, $isError, $errorCode, $replacements);
+
+		$this->examine = false;
+	}
 }

Spacing +14 added lines, -14 removed lines

@@ -86,25 +86,25 @@ 
      * @return int|void Integer stack pointer to skip forward or void to continue
      *                  normal file processing.
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
         // Don't do anything if the warning has already been thrown or is not necessary.
-        if ($this->examine === false) {
-            return ($phpcsFile->numTokens + 1);
+        if ( $this->examine === false ) {
+            return ( $phpcsFile->numTokens + 1 );
         }
 
         $phpcsVersion = PHPCSHelper::getVersion();
 
         // Don't do anything if the PHPCS version used is above the minimum recommended version.
-        if (version_compare($phpcsVersion, $this->minRecommendedVersion, '>=')) {
+        if ( version_compare( $phpcsVersion, $this->minRecommendedVersion, '>=' ) ) {
             $this->examine = false;
-            return ($phpcsFile->numTokens + 1);
+            return ( $phpcsFile->numTokens + 1 );
         }
 
-        if (version_compare($phpcsVersion, $this->minSupportedVersion, '<')) {
+        if ( version_compare( $phpcsVersion, $this->minSupportedVersion, '<' ) ) {
             $isError      = true;
             $message      = "IMPORTANT: Please be advised that the minimum PHP_CodeSniffer version the PHPCompatibility standard supports is %s. You are currently using PHP_CodeSniffer %s. Please upgrade your PHP_CodeSniffer installation. The recommended version of PHP_CodeSniffer for PHPCompatibility is %s or higher.";
-            $errorCode    = 'Unsupported_' . $this->stringToErrorCode($this->minSupportedVersion);
+            $errorCode    = 'Unsupported_' . $this->stringToErrorCode( $this->minSupportedVersion );
             $replacements = array(
                 $this->minSupportedVersion,
                 $phpcsVersion,
@@ -114,7 +114,7 @@ 
         } else {
             $isError      = false;
             $message      = "IMPORTANT: Please be advised that for the most reliable PHPCompatibility results, PHP_CodeSniffer %s or higher should be used. Support for lower versions will be dropped in the foreseeable future. You are currently using PHP_CodeSniffer %s. Please upgrade your PHP_CodeSniffer installation to version %s or higher.";
-            $errorCode    = 'BelowRecommended_' . $this->stringToErrorCode($this->minRecommendedVersion);
+            $errorCode    = 'BelowRecommended_' . $this->stringToErrorCode( $this->minRecommendedVersion );
             $replacements = array(
                 $this->minRecommendedVersion,
                 $phpcsVersion,
@@ -149,14 +149,14 @@ 
          * If/when the upstream PR has been merged and the minimum supported/recommended version
          * of PHPCompatibility would go beyond that, the below code should be adjusted.}}
          */
-        $reportWidth = PHPCSHelper::getCommandLineData($phpcsFile, 'reportWidth');
-        $showSources = PHPCSHelper::getCommandLineData($phpcsFile, 'showSources');
-        if ($showSources === true && version_compare($phpcsVersion, '2.3.0', '>=')) {
+        $reportWidth = PHPCSHelper::getCommandLineData( $phpcsFile, 'reportWidth' );
+        $showSources = PHPCSHelper::getCommandLineData( $phpcsFile, 'showSources' );
+        if ( $showSources === true && version_compare( $phpcsVersion, '2.3.0', '>=' ) ) {
             $reportWidth += 6;
         }
 
-        $messageWidth  = ($reportWidth - 15); // 15 is length of " # | WARNING | ".
-        $delimiterLine = str_repeat('-', ($messageWidth));
+        $messageWidth  = ( $reportWidth - 15 ); // 15 is length of " # | WARNING | ".
+        $delimiterLine = str_repeat( '-', ( $messageWidth ) );
         $disableNotice = 'To disable this notice, add --exclude=PHPCompatibility.Upgrade.LowPHPCS to your command or add <exclude name="PHPCompatibility.Upgrade.LowPHPCS.%s"/> to your custom ruleset. ';
         $thankYou      = 'Thank you for using PHPCompatibility!';
 
@@ -165,7 +165,7 @@ 
         $message .= ' ' . $delimiterLine;
         $message .= ' ' . $thankYou;
 
-        $this->addMessage($phpcsFile, $message, 0, $isError, $errorCode, $replacements);
+        $this->addMessage( $phpcsFile, $message, 0, $isError, $errorCode, $replacements );
 
         $this->examine = false;
     }

Braces +3 added lines, -6 removed lines

@@ -32,8 +32,7 @@ 
  * @package  PHPCompatibility
  * @author   Juliette Reinders Folmer <phpcompatibility_nospam@adviesenzo.nl>
  */
-class LowPHPCSSniff extends Sniff
-{
+class LowPHPCSSniff extends Sniff {
     /**
      * The minimum supported PHPCS version.
      *
@@ -69,8 +68,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(
             \T_OPEN_TAG,
         );
@@ -86,8 +84,7 @@ 
      * @return int|void Integer stack pointer to skip forward or void to continue
      *                  normal file processing.
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         // Don't do anything if the warning has already been thrown or is not necessary.
         if ($this->examine === false) {
             return ($phpcsFile->numTokens + 1);

Doc Comments +1 added lines, -1 removed lines

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

vendor/phpcompatibility/php-compatibility/PHPCompatibility/Sniffs/Variables/ForbiddenThisUseContextsSniff.php

Indentation +356 added lines, -356 removed lines

@@ -50,375 +50,375 @@
 class ForbiddenThisUseContextsSniff extends Sniff
 {
 
-    /**
-     * OO scope tokens.
-     *
-     * Duplicate of Tokens::$ooScopeTokens array in PHPCS which was added in 3.1.0.
-     *
-     * @since 9.1.0
-     *
-     * @var array
-     */
-    private $ooScopeTokens = array(
-        'T_CLASS'     => \T_CLASS,
-        'T_INTERFACE' => \T_INTERFACE,
-        'T_TRAIT'     => \T_TRAIT,
-    );
-
-    /**
-     * Scopes to skip over when examining the contents of functions.
-     *
-     * @since 9.1.0
-     *
-     * @var array
-     */
-    private $skipOverScopes = array(
-        'T_FUNCTION' => true,
-        'T_CLOSURE'  => true,
-    );
-
-    /**
-     * Valid uses of $this in plain functions or methods outside object context.
-     *
-     * @since 9.1.0
-     *
-     * @var array
-     */
-    private $validUseOutsideObject = array(
-        \T_ISSET => true,
-        \T_EMPTY => true,
-    );
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @since 9.1.0
-     *
-     * @return array
-     */
-    public function register()
-    {
-        if (\defined('T_ANON_CLASS')) {
-            $this->ooScopeTokens['T_ANON_CLASS'] = \T_ANON_CLASS;
-        }
-
-        $this->skipOverScopes += $this->ooScopeTokens;
-
-        return array(
-            \T_FUNCTION,
-            \T_CLOSURE,
-            \T_GLOBAL,
-            \T_CATCH,
-            \T_FOREACH,
-            \T_UNSET,
-        );
-    }
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @since 9.1.0
-     *
-     * @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(File $phpcsFile, $stackPtr)
-    {
-        if ($this->supportsAbove('7.1') === false) {
-            return;
-        }
-
-        $tokens = $phpcsFile->getTokens();
-
-        switch ($tokens[$stackPtr]['code']) {
-            case \T_FUNCTION:
-                $this->isThisUsedAsParameter($phpcsFile, $stackPtr);
-                $this->isThisUsedOutsideObjectContext($phpcsFile, $stackPtr);
-                break;
-
-            case \T_CLOSURE:
-                $this->isThisUsedAsParameter($phpcsFile, $stackPtr);
-                break;
-
-            case \T_GLOBAL:
-                /*
+	/**
+	 * OO scope tokens.
+	 *
+	 * Duplicate of Tokens::$ooScopeTokens array in PHPCS which was added in 3.1.0.
+	 *
+	 * @since 9.1.0
+	 *
+	 * @var array
+	 */
+	private $ooScopeTokens = array(
+		'T_CLASS'     => \T_CLASS,
+		'T_INTERFACE' => \T_INTERFACE,
+		'T_TRAIT'     => \T_TRAIT,
+	);
+
+	/**
+	 * Scopes to skip over when examining the contents of functions.
+	 *
+	 * @since 9.1.0
+	 *
+	 * @var array
+	 */
+	private $skipOverScopes = array(
+		'T_FUNCTION' => true,
+		'T_CLOSURE'  => true,
+	);
+
+	/**
+	 * Valid uses of $this in plain functions or methods outside object context.
+	 *
+	 * @since 9.1.0
+	 *
+	 * @var array
+	 */
+	private $validUseOutsideObject = array(
+		\T_ISSET => true,
+		\T_EMPTY => true,
+	);
+
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @since 9.1.0
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		if (\defined('T_ANON_CLASS')) {
+			$this->ooScopeTokens['T_ANON_CLASS'] = \T_ANON_CLASS;
+		}
+
+		$this->skipOverScopes += $this->ooScopeTokens;
+
+		return array(
+			\T_FUNCTION,
+			\T_CLOSURE,
+			\T_GLOBAL,
+			\T_CATCH,
+			\T_FOREACH,
+			\T_UNSET,
+		);
+	}
+
+	/**
+	 * Processes this test, when one of its tokens is encountered.
+	 *
+	 * @since 9.1.0
+	 *
+	 * @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(File $phpcsFile, $stackPtr)
+	{
+		if ($this->supportsAbove('7.1') === false) {
+			return;
+		}
+
+		$tokens = $phpcsFile->getTokens();
+
+		switch ($tokens[$stackPtr]['code']) {
+			case \T_FUNCTION:
+				$this->isThisUsedAsParameter($phpcsFile, $stackPtr);
+				$this->isThisUsedOutsideObjectContext($phpcsFile, $stackPtr);
+				break;
+
+			case \T_CLOSURE:
+				$this->isThisUsedAsParameter($phpcsFile, $stackPtr);
+				break;
+
+			case \T_GLOBAL:
+				/*
                  * $this can no longer be imported using the `global` keyword.
                  * This worked in PHP 7.0, though in PHP 5.x, it would throw a
                  * fatal "Cannot re-assign $this" error.
                  */
-                $endOfStatement = $phpcsFile->findNext(array(\T_SEMICOLON, \T_CLOSE_TAG), ($stackPtr + 1));
-                if ($endOfStatement === false) {
-                    // No semi-colon - live coding.
-                    return;
-                }
-
-                for ($i = ($stackPtr + 1); $i < $endOfStatement; $i++) {
-                    if ($tokens[$i]['code'] !== \T_VARIABLE || $tokens[$i]['content'] !== '$this') {
-                        continue;
-                    }
-
-                    $phpcsFile->addError(
-                        '"$this" can no longer be used with the "global" keyword since PHP 7.1.',
-                        $i,
-                        'Global'
-                    );
-                }
-
-                break;
-
-            case \T_CATCH:
-                /*
+				$endOfStatement = $phpcsFile->findNext(array(\T_SEMICOLON, \T_CLOSE_TAG), ($stackPtr + 1));
+				if ($endOfStatement === false) {
+					// No semi-colon - live coding.
+					return;
+				}
+
+				for ($i = ($stackPtr + 1); $i < $endOfStatement; $i++) {
+					if ($tokens[$i]['code'] !== \T_VARIABLE || $tokens[$i]['content'] !== '$this') {
+						continue;
+					}
+
+					$phpcsFile->addError(
+						'"$this" can no longer be used with the "global" keyword since PHP 7.1.',
+						$i,
+						'Global'
+					);
+				}
+
+				break;
+
+			case \T_CATCH:
+				/*
                  * $this can no longer be used as a catch variable.
                  */
-                if (isset($tokens[$stackPtr]['parenthesis_opener'], $tokens[$stackPtr]['parenthesis_closer']) === false) {
-                    return;
-                }
-
-                $varPtr = $phpcsFile->findNext(
-                    \T_VARIABLE,
-                    ($tokens[$stackPtr]['parenthesis_opener'] + 1),
-                    $tokens[$stackPtr]['parenthesis_closer']
-                );
-
-                if ($varPtr === false || $tokens[$varPtr]['content'] !== '$this') {
-                    return;
-                }
-
-                $phpcsFile->addError(
-                    '"$this" can no longer be used as a catch variable since PHP 7.1.',
-                    $varPtr,
-                    'Catch'
-                );
-
-                break;
-
-            case \T_FOREACH:
-                /*
+				if (isset($tokens[$stackPtr]['parenthesis_opener'], $tokens[$stackPtr]['parenthesis_closer']) === false) {
+					return;
+				}
+
+				$varPtr = $phpcsFile->findNext(
+					\T_VARIABLE,
+					($tokens[$stackPtr]['parenthesis_opener'] + 1),
+					$tokens[$stackPtr]['parenthesis_closer']
+				);
+
+				if ($varPtr === false || $tokens[$varPtr]['content'] !== '$this') {
+					return;
+				}
+
+				$phpcsFile->addError(
+					'"$this" can no longer be used as a catch variable since PHP 7.1.',
+					$varPtr,
+					'Catch'
+				);
+
+				break;
+
+			case \T_FOREACH:
+				/*
                  * $this can no longer be used as a foreach *value* variable.
                  * This worked in PHP 7.0, though in PHP 5.x, it would throw a
                  * fatal "Cannot re-assign $this" error.
                  */
-                if (isset($tokens[$stackPtr]['parenthesis_opener'], $tokens[$stackPtr]['parenthesis_closer']) === false) {
-                    return;
-                }
-
-                $stopPtr = $phpcsFile->findPrevious(
-                    array(\T_AS, \T_DOUBLE_ARROW),
-                    ($tokens[$stackPtr]['parenthesis_closer'] - 1),
-                    $tokens[$stackPtr]['parenthesis_opener']
-                );
-                if ($stopPtr === false) {
-                    return;
-                }
-
-                $valueVarPtr = $phpcsFile->findNext(
-                    \T_VARIABLE,
-                    ($stopPtr + 1),
-                    $tokens[$stackPtr]['parenthesis_closer']
-                );
-                if ($valueVarPtr === false || $tokens[$valueVarPtr]['content'] !== '$this') {
-                    return;
-                }
-
-                $afterThis = $phpcsFile->findNext(
-                    Tokens::$emptyTokens,
-                    ($valueVarPtr + 1),
-                    $tokens[$stackPtr]['parenthesis_closer'],
-                    true
-                );
-
-                if ($afterThis !== false
-                    && ($tokens[$afterThis]['code'] === \T_OBJECT_OPERATOR
-                        || $tokens[$afterThis]['code'] === \T_DOUBLE_COLON)
-                ) {
-                    return;
-                }
-
-                $phpcsFile->addError(
-                    '"$this" can no longer be used as value variable in a foreach control structure since PHP 7.1.',
-                    $valueVarPtr,
-                    'ForeachValueVar'
-                );
-
-                break;
-
-            case \T_UNSET:
-                /*
+				if (isset($tokens[$stackPtr]['parenthesis_opener'], $tokens[$stackPtr]['parenthesis_closer']) === false) {
+					return;
+				}
+
+				$stopPtr = $phpcsFile->findPrevious(
+					array(\T_AS, \T_DOUBLE_ARROW),
+					($tokens[$stackPtr]['parenthesis_closer'] - 1),
+					$tokens[$stackPtr]['parenthesis_opener']
+				);
+				if ($stopPtr === false) {
+					return;
+				}
+
+				$valueVarPtr = $phpcsFile->findNext(
+					\T_VARIABLE,
+					($stopPtr + 1),
+					$tokens[$stackPtr]['parenthesis_closer']
+				);
+				if ($valueVarPtr === false || $tokens[$valueVarPtr]['content'] !== '$this') {
+					return;
+				}
+
+				$afterThis = $phpcsFile->findNext(
+					Tokens::$emptyTokens,
+					($valueVarPtr + 1),
+					$tokens[$stackPtr]['parenthesis_closer'],
+					true
+				);
+
+				if ($afterThis !== false
+					&& ($tokens[$afterThis]['code'] === \T_OBJECT_OPERATOR
+						|| $tokens[$afterThis]['code'] === \T_DOUBLE_COLON)
+				) {
+					return;
+				}
+
+				$phpcsFile->addError(
+					'"$this" can no longer be used as value variable in a foreach control structure since PHP 7.1.',
+					$valueVarPtr,
+					'ForeachValueVar'
+				);
+
+				break;
+
+			case \T_UNSET:
+				/*
                  * $this can no longer be unset.
                  */
-                $openParenthesis = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
-                if ($openParenthesis === false
-                    || $tokens[$openParenthesis]['code'] !== \T_OPEN_PARENTHESIS
-                    || isset($tokens[$openParenthesis]['parenthesis_closer']) === false
-                ) {
-                    return;
-                }
-
-                for ($i = ($openParenthesis + 1); $i < $tokens[$openParenthesis]['parenthesis_closer']; $i++) {
-                    if ($tokens[$i]['code'] !== \T_VARIABLE || $tokens[$i]['content'] !== '$this') {
-                        continue;
-                    }
-
-                    $afterThis = $phpcsFile->findNext(
-                        Tokens::$emptyTokens,
-                        ($i + 1),
-                        $tokens[$openParenthesis]['parenthesis_closer'],
-                        true
-                    );
-
-                    if ($afterThis !== false
-                        && ($tokens[$afterThis]['code'] === \T_OBJECT_OPERATOR
-                            || $tokens[$afterThis]['code'] === \T_DOUBLE_COLON
-                            || $tokens[$afterThis]['code'] === \T_OPEN_SQUARE_BRACKET)
-                    ) {
-                        $i = $afterThis;
-                        continue;
-                    }
-
-                    $phpcsFile->addError(
-                        '"$this" can no longer be unset since PHP 7.1.',
-                        $i,
-                        'Unset'
-                    );
-                }
-
-                break;
-        }
-    }
-
-    /**
-     * Check if $this is used as a parameter in a function declaration.
-     *
-     * $this can no longer be used as a parameter in a *global* function.
-     * Use as a parameter in a method was already an error prior to PHP 7.1.
-     *
-     * @since 9.1.0
-     *
-     * @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
-     */
-    protected function isThisUsedAsParameter(File $phpcsFile, $stackPtr)
-    {
-        if ($this->validDirectScope($phpcsFile, $stackPtr, $this->ooScopeTokens) !== false) {
-            return;
-        }
-
-        $params = PHPCSHelper::getMethodParameters($phpcsFile, $stackPtr);
-        if (empty($params)) {
-            return;
-        }
-
-        $tokens = $phpcsFile->getTokens();
-
-        foreach ($params as $param) {
-            if ($param['name'] !== '$this') {
-                continue;
-            }
-
-            if ($tokens[$stackPtr]['code'] === \T_FUNCTION) {
-                $phpcsFile->addError(
-                    '"$this" can no longer be used as a parameter since PHP 7.1.',
-                    $param['token'],
-                    'FunctionParam'
-                );
-            } else {
-                $phpcsFile->addError(
-                    '"$this" can no longer be used as a closure parameter since PHP 7.0.7.',
-                    $param['token'],
-                    'ClosureParam'
-                );
-            }
-        }
-    }
-
-    /**
-     * Check if $this is used in a plain function or method.
-     *
-     * Prior to PHP 7.1, this would result in an "undefined variable" notice
-     * and execution would continue with $this regarded as `null`.
-     * As of PHP 7.1, this throws an exception.
-     *
-     * Note: use within isset() and empty() to check object context is still allowed.
-     * Note: $this can still be used within a closure.
-     *
-     * @since 9.1.0
-     *
-     * @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
-     */
-    protected function isThisUsedOutsideObjectContext(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        if (isset($tokens[$stackPtr]['scope_opener'], $tokens[$stackPtr]['scope_closer']) === false) {
-            return;
-        }
-
-        if ($this->validDirectScope($phpcsFile, $stackPtr, $this->ooScopeTokens) !== false) {
-            $methodProps = $phpcsFile->getMethodProperties($stackPtr);
-            if ($methodProps['is_static'] === false) {
-                return;
-            } else {
-                $methodName = $phpcsFile->getDeclarationName($stackPtr);
-                if ($methodName === '__call') {
-                    /*
+				$openParenthesis = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
+				if ($openParenthesis === false
+					|| $tokens[$openParenthesis]['code'] !== \T_OPEN_PARENTHESIS
+					|| isset($tokens[$openParenthesis]['parenthesis_closer']) === false
+				) {
+					return;
+				}
+
+				for ($i = ($openParenthesis + 1); $i < $tokens[$openParenthesis]['parenthesis_closer']; $i++) {
+					if ($tokens[$i]['code'] !== \T_VARIABLE || $tokens[$i]['content'] !== '$this') {
+						continue;
+					}
+
+					$afterThis = $phpcsFile->findNext(
+						Tokens::$emptyTokens,
+						($i + 1),
+						$tokens[$openParenthesis]['parenthesis_closer'],
+						true
+					);
+
+					if ($afterThis !== false
+						&& ($tokens[$afterThis]['code'] === \T_OBJECT_OPERATOR
+							|| $tokens[$afterThis]['code'] === \T_DOUBLE_COLON
+							|| $tokens[$afterThis]['code'] === \T_OPEN_SQUARE_BRACKET)
+					) {
+						$i = $afterThis;
+						continue;
+					}
+
+					$phpcsFile->addError(
+						'"$this" can no longer be unset since PHP 7.1.',
+						$i,
+						'Unset'
+					);
+				}
+
+				break;
+		}
+	}
+
+	/**
+	 * Check if $this is used as a parameter in a function declaration.
+	 *
+	 * $this can no longer be used as a parameter in a *global* function.
+	 * Use as a parameter in a method was already an error prior to PHP 7.1.
+	 *
+	 * @since 9.1.0
+	 *
+	 * @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
+	 */
+	protected function isThisUsedAsParameter(File $phpcsFile, $stackPtr)
+	{
+		if ($this->validDirectScope($phpcsFile, $stackPtr, $this->ooScopeTokens) !== false) {
+			return;
+		}
+
+		$params = PHPCSHelper::getMethodParameters($phpcsFile, $stackPtr);
+		if (empty($params)) {
+			return;
+		}
+
+		$tokens = $phpcsFile->getTokens();
+
+		foreach ($params as $param) {
+			if ($param['name'] !== '$this') {
+				continue;
+			}
+
+			if ($tokens[$stackPtr]['code'] === \T_FUNCTION) {
+				$phpcsFile->addError(
+					'"$this" can no longer be used as a parameter since PHP 7.1.',
+					$param['token'],
+					'FunctionParam'
+				);
+			} else {
+				$phpcsFile->addError(
+					'"$this" can no longer be used as a closure parameter since PHP 7.0.7.',
+					$param['token'],
+					'ClosureParam'
+				);
+			}
+		}
+	}
+
+	/**
+	 * Check if $this is used in a plain function or method.
+	 *
+	 * Prior to PHP 7.1, this would result in an "undefined variable" notice
+	 * and execution would continue with $this regarded as `null`.
+	 * As of PHP 7.1, this throws an exception.
+	 *
+	 * Note: use within isset() and empty() to check object context is still allowed.
+	 * Note: $this can still be used within a closure.
+	 *
+	 * @since 9.1.0
+	 *
+	 * @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
+	 */
+	protected function isThisUsedOutsideObjectContext(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		if (isset($tokens[$stackPtr]['scope_opener'], $tokens[$stackPtr]['scope_closer']) === false) {
+			return;
+		}
+
+		if ($this->validDirectScope($phpcsFile, $stackPtr, $this->ooScopeTokens) !== false) {
+			$methodProps = $phpcsFile->getMethodProperties($stackPtr);
+			if ($methodProps['is_static'] === false) {
+				return;
+			} else {
+				$methodName = $phpcsFile->getDeclarationName($stackPtr);
+				if ($methodName === '__call') {
+					/*
                      * This is an exception.
                      * @link https://wiki.php.net/rfc/this_var#always_show_true_this_value_in_magic_method_call
                      */
-                    return;
-                }
-            }
-        }
-
-        for ($i = ($tokens[$stackPtr]['scope_opener'] + 1); $i < $tokens[$stackPtr]['scope_closer']; $i++) {
-            if (isset($this->skipOverScopes[$tokens[$i]['type']])) {
-                if (isset($tokens[$i]['scope_closer']) === false) {
-                    // Live coding or parse error, will only lead to inaccurate results.
-                    return;
-                }
-
-                // Skip over nested structures.
-                $i = $tokens[$i]['scope_closer'];
-                continue;
-            }
-
-            if ($tokens[$i]['code'] !== \T_VARIABLE || $tokens[$i]['content'] !== '$this') {
-                continue;
-            }
-
-            if (isset($tokens[$i]['nested_parenthesis']) === true) {
-                $nestedParenthesis     = $tokens[$i]['nested_parenthesis'];
-                $nestedOpenParenthesis = array_keys($nestedParenthesis);
-                $lastOpenParenthesis   = array_pop($nestedOpenParenthesis);
-
-                $previousNonEmpty = $phpcsFile->findPrevious(
-                    Tokens::$emptyTokens,
-                    ($lastOpenParenthesis - 1),
-                    null,
-                    true,
-                    null,
-                    true
-                );
-
-                if (isset($this->validUseOutsideObject[$tokens[$previousNonEmpty]['code']])) {
-                    continue;
-                }
-            }
-
-            $phpcsFile->addError(
-                '"$this" can no longer be used in a plain function or method since PHP 7.1.',
-                $i,
-                'OutsideObjectContext'
-            );
-        }
-    }
+					return;
+				}
+			}
+		}
+
+		for ($i = ($tokens[$stackPtr]['scope_opener'] + 1); $i < $tokens[$stackPtr]['scope_closer']; $i++) {
+			if (isset($this->skipOverScopes[$tokens[$i]['type']])) {
+				if (isset($tokens[$i]['scope_closer']) === false) {
+					// Live coding or parse error, will only lead to inaccurate results.
+					return;
+				}
+
+				// Skip over nested structures.
+				$i = $tokens[$i]['scope_closer'];
+				continue;
+			}
+
+			if ($tokens[$i]['code'] !== \T_VARIABLE || $tokens[$i]['content'] !== '$this') {
+				continue;
+			}
+
+			if (isset($tokens[$i]['nested_parenthesis']) === true) {
+				$nestedParenthesis     = $tokens[$i]['nested_parenthesis'];
+				$nestedOpenParenthesis = array_keys($nestedParenthesis);
+				$lastOpenParenthesis   = array_pop($nestedOpenParenthesis);
+
+				$previousNonEmpty = $phpcsFile->findPrevious(
+					Tokens::$emptyTokens,
+					($lastOpenParenthesis - 1),
+					null,
+					true,
+					null,
+					true
+				);
+
+				if (isset($this->validUseOutsideObject[$tokens[$previousNonEmpty]['code']])) {
+					continue;
+				}
+			}
+
+			$phpcsFile->addError(
+				'"$this" can no longer be used in a plain function or method since PHP 7.1.',
+				$i,
+				'OutsideObjectContext'
+			);
+		}
+	}
 }

Spacing +68 added lines, -68 removed lines

@@ -98,8 +98,8 @@ 
      */
     public function register()
     {
-        if (\defined('T_ANON_CLASS')) {
-            $this->ooScopeTokens['T_ANON_CLASS'] = \T_ANON_CLASS;
+        if ( \defined( 'T_ANON_CLASS' ) ) {
+            $this->ooScopeTokens[ 'T_ANON_CLASS' ] = \T_ANON_CLASS;
         }
 
         $this->skipOverScopes += $this->ooScopeTokens;
@@ -125,22 +125,22 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
-        if ($this->supportsAbove('7.1') === false) {
+        if ( $this->supportsAbove( '7.1' ) === false ) {
             return;
         }
 
         $tokens = $phpcsFile->getTokens();
 
-        switch ($tokens[$stackPtr]['code']) {
+        switch ( $tokens[ $stackPtr ][ 'code' ] ) {
             case \T_FUNCTION:
-                $this->isThisUsedAsParameter($phpcsFile, $stackPtr);
-                $this->isThisUsedOutsideObjectContext($phpcsFile, $stackPtr);
+                $this->isThisUsedAsParameter( $phpcsFile, $stackPtr );
+                $this->isThisUsedOutsideObjectContext( $phpcsFile, $stackPtr );
                 break;
 
             case \T_CLOSURE:
-                $this->isThisUsedAsParameter($phpcsFile, $stackPtr);
+                $this->isThisUsedAsParameter( $phpcsFile, $stackPtr );
                 break;
 
             case \T_GLOBAL:
@@ -149,14 +149,14 @@ 
                  * This worked in PHP 7.0, though in PHP 5.x, it would throw a
                  * fatal "Cannot re-assign $this" error.
                  */
-                $endOfStatement = $phpcsFile->findNext(array(\T_SEMICOLON, \T_CLOSE_TAG), ($stackPtr + 1));
-                if ($endOfStatement === false) {
+                $endOfStatement = $phpcsFile->findNext( array( \T_SEMICOLON, \T_CLOSE_TAG ), ( $stackPtr + 1 ) );
+                if ( $endOfStatement === false ) {
                     // No semi-colon - live coding.
                     return;
                 }
 
-                for ($i = ($stackPtr + 1); $i < $endOfStatement; $i++) {
-                    if ($tokens[$i]['code'] !== \T_VARIABLE || $tokens[$i]['content'] !== '$this') {
+                for ( $i = ( $stackPtr + 1 ); $i < $endOfStatement; $i++ ) {
+                    if ( $tokens[ $i ][ 'code' ] !== \T_VARIABLE || $tokens[ $i ][ 'content' ] !== '$this' ) {
                         continue;
                     }
 
@@ -173,17 +173,17 @@ 
                 /*
                  * $this can no longer be used as a catch variable.
                  */
-                if (isset($tokens[$stackPtr]['parenthesis_opener'], $tokens[$stackPtr]['parenthesis_closer']) === false) {
+                if ( isset( $tokens[ $stackPtr ][ 'parenthesis_opener' ], $tokens[ $stackPtr ][ 'parenthesis_closer' ] ) === false ) {
                     return;
                 }
 
                 $varPtr = $phpcsFile->findNext(
                     \T_VARIABLE,
-                    ($tokens[$stackPtr]['parenthesis_opener'] + 1),
-                    $tokens[$stackPtr]['parenthesis_closer']
+                    ( $tokens[ $stackPtr ][ 'parenthesis_opener' ] + 1 ),
+                    $tokens[ $stackPtr ][ 'parenthesis_closer' ]
                 );
 
-                if ($varPtr === false || $tokens[$varPtr]['content'] !== '$this') {
+                if ( $varPtr === false || $tokens[ $varPtr ][ 'content' ] !== '$this' ) {
                     return;
                 }
 
@@ -201,38 +201,38 @@ 
                  * This worked in PHP 7.0, though in PHP 5.x, it would throw a
                  * fatal "Cannot re-assign $this" error.
                  */
-                if (isset($tokens[$stackPtr]['parenthesis_opener'], $tokens[$stackPtr]['parenthesis_closer']) === false) {
+                if ( isset( $tokens[ $stackPtr ][ 'parenthesis_opener' ], $tokens[ $stackPtr ][ 'parenthesis_closer' ] ) === false ) {
                     return;
                 }
 
                 $stopPtr = $phpcsFile->findPrevious(
-                    array(\T_AS, \T_DOUBLE_ARROW),
-                    ($tokens[$stackPtr]['parenthesis_closer'] - 1),
-                    $tokens[$stackPtr]['parenthesis_opener']
+                    array( \T_AS, \T_DOUBLE_ARROW ),
+                    ( $tokens[ $stackPtr ][ 'parenthesis_closer' ] - 1 ),
+                    $tokens[ $stackPtr ][ 'parenthesis_opener' ]
                 );
-                if ($stopPtr === false) {
+                if ( $stopPtr === false ) {
                     return;
                 }
 
                 $valueVarPtr = $phpcsFile->findNext(
                     \T_VARIABLE,
-                    ($stopPtr + 1),
-                    $tokens[$stackPtr]['parenthesis_closer']
+                    ( $stopPtr + 1 ),
+                    $tokens[ $stackPtr ][ 'parenthesis_closer' ]
                 );
-                if ($valueVarPtr === false || $tokens[$valueVarPtr]['content'] !== '$this') {
+                if ( $valueVarPtr === false || $tokens[ $valueVarPtr ][ 'content' ] !== '$this' ) {
                     return;
                 }
 
                 $afterThis = $phpcsFile->findNext(
                     Tokens::$emptyTokens,
-                    ($valueVarPtr + 1),
-                    $tokens[$stackPtr]['parenthesis_closer'],
+                    ( $valueVarPtr + 1 ),
+                    $tokens[ $stackPtr ][ 'parenthesis_closer' ],
                     true
                 );
 
-                if ($afterThis !== false
-                    && ($tokens[$afterThis]['code'] === \T_OBJECT_OPERATOR
-                        || $tokens[$afterThis]['code'] === \T_DOUBLE_COLON)
+                if ( $afterThis !== false
+                    && ( $tokens[ $afterThis ][ 'code' ] === \T_OBJECT_OPERATOR
+                        || $tokens[ $afterThis ][ 'code' ] === \T_DOUBLE_COLON )
                 ) {
                     return;
                 }
@@ -249,30 +249,30 @@ 
                 /*
                  * $this can no longer be unset.
                  */
-                $openParenthesis = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
-                if ($openParenthesis === false
-                    || $tokens[$openParenthesis]['code'] !== \T_OPEN_PARENTHESIS
-                    || isset($tokens[$openParenthesis]['parenthesis_closer']) === false
+                $openParenthesis = $phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
+                if ( $openParenthesis === false
+                    || $tokens[ $openParenthesis ][ 'code' ] !== \T_OPEN_PARENTHESIS
+                    || isset( $tokens[ $openParenthesis ][ 'parenthesis_closer' ] ) === false
                 ) {
                     return;
                 }
 
-                for ($i = ($openParenthesis + 1); $i < $tokens[$openParenthesis]['parenthesis_closer']; $i++) {
-                    if ($tokens[$i]['code'] !== \T_VARIABLE || $tokens[$i]['content'] !== '$this') {
+                for ( $i = ( $openParenthesis + 1 ); $i < $tokens[ $openParenthesis ][ 'parenthesis_closer' ]; $i++ ) {
+                    if ( $tokens[ $i ][ 'code' ] !== \T_VARIABLE || $tokens[ $i ][ 'content' ] !== '$this' ) {
                         continue;
                     }
 
                     $afterThis = $phpcsFile->findNext(
                         Tokens::$emptyTokens,
-                        ($i + 1),
-                        $tokens[$openParenthesis]['parenthesis_closer'],
+                        ( $i + 1 ),
+                        $tokens[ $openParenthesis ][ 'parenthesis_closer' ],
                         true
                     );
 
-                    if ($afterThis !== false
-                        && ($tokens[$afterThis]['code'] === \T_OBJECT_OPERATOR
-                            || $tokens[$afterThis]['code'] === \T_DOUBLE_COLON
-                            || $tokens[$afterThis]['code'] === \T_OPEN_SQUARE_BRACKET)
+                    if ( $afterThis !== false
+                        && ( $tokens[ $afterThis ][ 'code' ] === \T_OBJECT_OPERATOR
+                            || $tokens[ $afterThis ][ 'code' ] === \T_DOUBLE_COLON
+                            || $tokens[ $afterThis ][ 'code' ] === \T_OPEN_SQUARE_BRACKET )
                     ) {
                         $i = $afterThis;
                         continue;
@@ -303,34 +303,34 @@ 
      *
      * @return void
      */
-    protected function isThisUsedAsParameter(File $phpcsFile, $stackPtr)
+    protected function isThisUsedAsParameter( File $phpcsFile, $stackPtr )
     {
-        if ($this->validDirectScope($phpcsFile, $stackPtr, $this->ooScopeTokens) !== false) {
+        if ( $this->validDirectScope( $phpcsFile, $stackPtr, $this->ooScopeTokens ) !== false ) {
             return;
         }
 
-        $params = PHPCSHelper::getMethodParameters($phpcsFile, $stackPtr);
-        if (empty($params)) {
+        $params = PHPCSHelper::getMethodParameters( $phpcsFile, $stackPtr );
+        if ( empty( $params ) ) {
             return;
         }
 
         $tokens = $phpcsFile->getTokens();
 
-        foreach ($params as $param) {
-            if ($param['name'] !== '$this') {
+        foreach ( $params as $param ) {
+            if ( $param[ 'name' ] !== '$this' ) {
                 continue;
             }
 
-            if ($tokens[$stackPtr]['code'] === \T_FUNCTION) {
+            if ( $tokens[ $stackPtr ][ 'code' ] === \T_FUNCTION ) {
                 $phpcsFile->addError(
                     '"$this" can no longer be used as a parameter since PHP 7.1.',
-                    $param['token'],
+                    $param[ 'token' ],
                     'FunctionParam'
                 );
             } else {
                 $phpcsFile->addError(
                     '"$this" can no longer be used as a closure parameter since PHP 7.0.7.',
-                    $param['token'],
+                    $param[ 'token' ],
                     'ClosureParam'
                 );
             }
@@ -355,21 +355,21 @@ 
      *
      * @return void
      */
-    protected function isThisUsedOutsideObjectContext(File $phpcsFile, $stackPtr)
+    protected function isThisUsedOutsideObjectContext( File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
-        if (isset($tokens[$stackPtr]['scope_opener'], $tokens[$stackPtr]['scope_closer']) === false) {
+        if ( isset( $tokens[ $stackPtr ][ 'scope_opener' ], $tokens[ $stackPtr ][ 'scope_closer' ] ) === false ) {
             return;
         }
 
-        if ($this->validDirectScope($phpcsFile, $stackPtr, $this->ooScopeTokens) !== false) {
-            $methodProps = $phpcsFile->getMethodProperties($stackPtr);
-            if ($methodProps['is_static'] === false) {
+        if ( $this->validDirectScope( $phpcsFile, $stackPtr, $this->ooScopeTokens ) !== false ) {
+            $methodProps = $phpcsFile->getMethodProperties( $stackPtr );
+            if ( $methodProps[ 'is_static' ] === false ) {
                 return;
             } else {
-                $methodName = $phpcsFile->getDeclarationName($stackPtr);
-                if ($methodName === '__call') {
+                $methodName = $phpcsFile->getDeclarationName( $stackPtr );
+                if ( $methodName === '__call' ) {
                     /*
                      * This is an exception.
                      * @link https://wiki.php.net/rfc/this_var#always_show_true_this_value_in_magic_method_call
@@ -379,37 +379,37 @@ 
             }
         }
 
-        for ($i = ($tokens[$stackPtr]['scope_opener'] + 1); $i < $tokens[$stackPtr]['scope_closer']; $i++) {
-            if (isset($this->skipOverScopes[$tokens[$i]['type']])) {
-                if (isset($tokens[$i]['scope_closer']) === false) {
+        for ( $i = ( $tokens[ $stackPtr ][ 'scope_opener' ] + 1 ); $i < $tokens[ $stackPtr ][ 'scope_closer' ]; $i++ ) {
+            if ( isset( $this->skipOverScopes[ $tokens[ $i ][ 'type' ] ] ) ) {
+                if ( isset( $tokens[ $i ][ 'scope_closer' ] ) === false ) {
                     // Live coding or parse error, will only lead to inaccurate results.
                     return;
                 }
 
                 // Skip over nested structures.
-                $i = $tokens[$i]['scope_closer'];
+                $i = $tokens[ $i ][ 'scope_closer' ];
                 continue;
             }
 
-            if ($tokens[$i]['code'] !== \T_VARIABLE || $tokens[$i]['content'] !== '$this') {
+            if ( $tokens[ $i ][ 'code' ] !== \T_VARIABLE || $tokens[ $i ][ 'content' ] !== '$this' ) {
                 continue;
             }
 
-            if (isset($tokens[$i]['nested_parenthesis']) === true) {
-                $nestedParenthesis     = $tokens[$i]['nested_parenthesis'];
-                $nestedOpenParenthesis = array_keys($nestedParenthesis);
-                $lastOpenParenthesis   = array_pop($nestedOpenParenthesis);
+            if ( isset( $tokens[ $i ][ 'nested_parenthesis' ] ) === true ) {
+                $nestedParenthesis     = $tokens[ $i ][ 'nested_parenthesis' ];
+                $nestedOpenParenthesis = array_keys( $nestedParenthesis );
+                $lastOpenParenthesis   = array_pop( $nestedOpenParenthesis );
 
                 $previousNonEmpty = $phpcsFile->findPrevious(
                     Tokens::$emptyTokens,
-                    ($lastOpenParenthesis - 1),
+                    ( $lastOpenParenthesis - 1 ),
                     null,
                     true,
                     null,
                     true
                 );
 
-                if (isset($this->validUseOutsideObject[$tokens[$previousNonEmpty]['code']])) {
+                if ( isset( $this->validUseOutsideObject[ $tokens[ $previousNonEmpty ][ 'code' ] ] ) ) {
                     continue;
                 }
             }

Braces +5 added lines, -10 removed lines

@@ -47,8 +47,7 @@ 
  *
  * @since 9.1.0
  */
-class ForbiddenThisUseContextsSniff extends Sniff
-{
+class ForbiddenThisUseContextsSniff extends Sniff {
 
     /**
      * OO scope tokens.
@@ -96,8 +95,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         if (\defined('T_ANON_CLASS')) {
             $this->ooScopeTokens['T_ANON_CLASS'] = \T_ANON_CLASS;
         }
@@ -125,8 +123,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         if ($this->supportsAbove('7.1') === false) {
             return;
         }
@@ -303,8 +300,7 @@ 
      *
      * @return void
      */
-    protected function isThisUsedAsParameter(File $phpcsFile, $stackPtr)
-    {
+    protected function isThisUsedAsParameter(File $phpcsFile, $stackPtr) {
         if ($this->validDirectScope($phpcsFile, $stackPtr, $this->ooScopeTokens) !== false) {
             return;
         }
@@ -355,8 +351,7 @@ 
      *
      * @return void
      */
-    protected function isThisUsedOutsideObjectContext(File $phpcsFile, $stackPtr)
-    {
+    protected function isThisUsedOutsideObjectContext(File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         if (isset($tokens[$stackPtr]['scope_opener'], $tokens[$stackPtr]['scope_closer']) === false) {

vendor/phpcompatibility/php-compatibility/PHPCompatibility/Sniffs/Variables/NewUniformVariableSyntaxSniff.php

Indentation +70 added lines, -70 removed lines

@@ -28,84 +28,84 @@
  */
 class NewUniformVariableSyntaxSniff extends Sniff
 {
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(\T_VARIABLE);
-    }
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return array(\T_VARIABLE);
+	}
 
-    /**
-     * 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(File $phpcsFile, $stackPtr)
-    {
-        if ($this->supportsAbove('7.0') === false) {
-            return;
-        }
+	/**
+	 * 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(File $phpcsFile, $stackPtr)
+	{
+		if ($this->supportsAbove('7.0') === false) {
+			return;
+		}
 
-        $tokens = $phpcsFile->getTokens();
+		$tokens = $phpcsFile->getTokens();
 
-        // Verify that the next token is a square open bracket. If not, bow out.
-        $nextToken = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true, null, true);
+		// Verify that the next token is a square open bracket. If not, bow out.
+		$nextToken = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true, null, true);
 
-        if ($nextToken === false || $tokens[$nextToken]['code'] !== \T_OPEN_SQUARE_BRACKET || isset($tokens[$nextToken]['bracket_closer']) === false) {
-            return;
-        }
+		if ($nextToken === false || $tokens[$nextToken]['code'] !== \T_OPEN_SQUARE_BRACKET || isset($tokens[$nextToken]['bracket_closer']) === false) {
+			return;
+		}
 
-        // The previous non-empty token has to be a $, -> or ::.
-        $prevToken = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true, null, true);
-        if ($prevToken === false || \in_array($tokens[$prevToken]['code'], array(\T_DOLLAR, \T_OBJECT_OPERATOR, \T_DOUBLE_COLON), true) === false) {
-            return;
-        }
+		// The previous non-empty token has to be a $, -> or ::.
+		$prevToken = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true, null, true);
+		if ($prevToken === false || \in_array($tokens[$prevToken]['code'], array(\T_DOLLAR, \T_OBJECT_OPERATOR, \T_DOUBLE_COLON), true) === false) {
+			return;
+		}
 
-        // For static object calls, it only applies when this is a function call.
-        if ($tokens[$prevToken]['code'] === \T_DOUBLE_COLON) {
-            $hasBrackets = $tokens[$nextToken]['bracket_closer'];
-            while (($hasBrackets = $phpcsFile->findNext(Tokens::$emptyTokens, ($hasBrackets + 1), null, true, null, true)) !== false) {
-                if ($tokens[$hasBrackets]['code'] === \T_OPEN_SQUARE_BRACKET) {
-                    if (isset($tokens[$hasBrackets]['bracket_closer'])) {
-                        $hasBrackets = $tokens[$hasBrackets]['bracket_closer'];
-                        continue;
-                    } else {
-                        // Live coding.
-                        return;
-                    }
+		// For static object calls, it only applies when this is a function call.
+		if ($tokens[$prevToken]['code'] === \T_DOUBLE_COLON) {
+			$hasBrackets = $tokens[$nextToken]['bracket_closer'];
+			while (($hasBrackets = $phpcsFile->findNext(Tokens::$emptyTokens, ($hasBrackets + 1), null, true, null, true)) !== false) {
+				if ($tokens[$hasBrackets]['code'] === \T_OPEN_SQUARE_BRACKET) {
+					if (isset($tokens[$hasBrackets]['bracket_closer'])) {
+						$hasBrackets = $tokens[$hasBrackets]['bracket_closer'];
+						continue;
+					} else {
+						// Live coding.
+						return;
+					}
 
-                } elseif ($tokens[$hasBrackets]['code'] === \T_OPEN_PARENTHESIS) {
-                    // Caught!
-                    break;
+				} elseif ($tokens[$hasBrackets]['code'] === \T_OPEN_PARENTHESIS) {
+					// Caught!
+					break;
 
-                } else {
-                    // Not a function call, so bow out.
-                    return;
-                }
-            }
+				} else {
+					// Not a function call, so bow out.
+					return;
+				}
+			}
 
-            // Now let's also prevent false positives when used with self and static which still work fine.
-            $classToken = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($prevToken - 1), null, true, null, true);
-            if ($classToken !== false) {
-                if ($tokens[$classToken]['code'] === \T_STATIC || $tokens[$classToken]['code'] === \T_SELF) {
-                    return;
-                } elseif ($tokens[$classToken]['code'] === \T_STRING && $tokens[$classToken]['content'] === 'self') {
-                    return;
-                }
-            }
-        }
+			// Now let's also prevent false positives when used with self and static which still work fine.
+			$classToken = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($prevToken - 1), null, true, null, true);
+			if ($classToken !== false) {
+				if ($tokens[$classToken]['code'] === \T_STATIC || $tokens[$classToken]['code'] === \T_SELF) {
+					return;
+				} elseif ($tokens[$classToken]['code'] === \T_STRING && $tokens[$classToken]['content'] === 'self') {
+					return;
+				}
+			}
+		}
 
-        $phpcsFile->addError(
-            'Indirect access to variables, properties and methods will be evaluated strictly in left-to-right order since PHP 7.0. Use curly braces to remove ambiguity.',
-            $stackPtr,
-            'Found'
-        );
-    }
+		$phpcsFile->addError(
+			'Indirect access to variables, properties and methods will be evaluated strictly in left-to-right order since PHP 7.0. Use curly braces to remove ambiguity.',
+			$stackPtr,
+			'Found'
+		);
+	}
 }

Spacing +18 added lines, -18 removed lines

@@ -35,7 +35,7 @@ 
      */
     public function register()
     {
-        return array(\T_VARIABLE);
+        return array( \T_VARIABLE );
     }
 
     /**
@@ -47,41 +47,41 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
-        if ($this->supportsAbove('7.0') === false) {
+        if ( $this->supportsAbove( '7.0' ) === false ) {
             return;
         }
 
         $tokens = $phpcsFile->getTokens();
 
         // Verify that the next token is a square open bracket. If not, bow out.
-        $nextToken = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true, null, true);
+        $nextToken = $phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true, null, true );
 
-        if ($nextToken === false || $tokens[$nextToken]['code'] !== \T_OPEN_SQUARE_BRACKET || isset($tokens[$nextToken]['bracket_closer']) === false) {
+        if ( $nextToken === false || $tokens[ $nextToken ][ 'code' ] !== \T_OPEN_SQUARE_BRACKET || isset( $tokens[ $nextToken ][ 'bracket_closer' ] ) === false ) {
             return;
         }
 
         // The previous non-empty token has to be a $, -> or ::.
-        $prevToken = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true, null, true);
-        if ($prevToken === false || \in_array($tokens[$prevToken]['code'], array(\T_DOLLAR, \T_OBJECT_OPERATOR, \T_DOUBLE_COLON), true) === false) {
+        $prevToken = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true, null, true );
+        if ( $prevToken === false || \in_array( $tokens[ $prevToken ][ 'code' ], array( \T_DOLLAR, \T_OBJECT_OPERATOR, \T_DOUBLE_COLON ), true ) === false ) {
             return;
         }
 
         // For static object calls, it only applies when this is a function call.
-        if ($tokens[$prevToken]['code'] === \T_DOUBLE_COLON) {
-            $hasBrackets = $tokens[$nextToken]['bracket_closer'];
-            while (($hasBrackets = $phpcsFile->findNext(Tokens::$emptyTokens, ($hasBrackets + 1), null, true, null, true)) !== false) {
-                if ($tokens[$hasBrackets]['code'] === \T_OPEN_SQUARE_BRACKET) {
-                    if (isset($tokens[$hasBrackets]['bracket_closer'])) {
-                        $hasBrackets = $tokens[$hasBrackets]['bracket_closer'];
+        if ( $tokens[ $prevToken ][ 'code' ] === \T_DOUBLE_COLON ) {
+            $hasBrackets = $tokens[ $nextToken ][ 'bracket_closer' ];
+            while ( ( $hasBrackets = $phpcsFile->findNext( Tokens::$emptyTokens, ( $hasBrackets + 1 ), null, true, null, true ) ) !== false ) {
+                if ( $tokens[ $hasBrackets ][ 'code' ] === \T_OPEN_SQUARE_BRACKET ) {
+                    if ( isset( $tokens[ $hasBrackets ][ 'bracket_closer' ] ) ) {
+                        $hasBrackets = $tokens[ $hasBrackets ][ 'bracket_closer' ];
                         continue;
                     } else {
                         // Live coding.
                         return;
                     }
 
-                } elseif ($tokens[$hasBrackets]['code'] === \T_OPEN_PARENTHESIS) {
+                } elseif ( $tokens[ $hasBrackets ][ 'code' ] === \T_OPEN_PARENTHESIS ) {
                     // Caught!
                     break;
 
@@ -92,11 +92,11 @@ 
             }
 
             // Now let's also prevent false positives when used with self and static which still work fine.
-            $classToken = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($prevToken - 1), null, true, null, true);
-            if ($classToken !== false) {
-                if ($tokens[$classToken]['code'] === \T_STATIC || $tokens[$classToken]['code'] === \T_SELF) {
+            $classToken = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $prevToken - 1 ), null, true, null, true );
+            if ( $classToken !== false ) {
+                if ( $tokens[ $classToken ][ 'code' ] === \T_STATIC || $tokens[ $classToken ][ 'code' ] === \T_SELF ) {
                     return;
-                } elseif ($tokens[$classToken]['code'] === \T_STRING && $tokens[$classToken]['content'] === 'self') {
+                } elseif ( $tokens[ $classToken ][ 'code' ] === \T_STRING && $tokens[ $classToken ][ 'content' ] === 'self' ) {
                     return;
                 }
             }

Braces +3 added lines, -6 removed lines

@@ -26,15 +26,13 @@ 
  * @package  PHPCompatibility
  * @author   Juliette Reinders Folmer <phpcompatibility_nospam@adviesenzo.nl>
  */
-class NewUniformVariableSyntaxSniff extends Sniff
-{
+class NewUniformVariableSyntaxSniff extends Sniff {
     /**
      * Returns an array of tokens this test wants to listen for.
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(\T_VARIABLE);
     }
 
@@ -47,8 +45,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         if ($this->supportsAbove('7.0') === false) {
             return;
         }

Doc Comments +1 added lines, -1 removed lines

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

vendor/phpcompatibility/php-compatibility/PHPCompatibility/Sniffs/Variables/ForbiddenGlobalVariableVariableSniff.php

Indentation +82 added lines, -82 removed lines

@@ -29,96 +29,96 @@
 class ForbiddenGlobalVariableVariableSniff extends Sniff
 {
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(\T_GLOBAL);
-    }
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return array(\T_GLOBAL);
+	}
 
-    /**
-     * 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(File $phpcsFile, $stackPtr)
-    {
-        if ($this->supportsAbove('7.0') === false) {
-            return;
-        }
+	/**
+	 * 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(File $phpcsFile, $stackPtr)
+	{
+		if ($this->supportsAbove('7.0') === false) {
+			return;
+		}
 
-        $tokens         = $phpcsFile->getTokens();
-        $endOfStatement = $phpcsFile->findNext(array(\T_SEMICOLON, \T_CLOSE_TAG), ($stackPtr + 1));
-        if ($endOfStatement === false) {
-            // No semi-colon - live coding.
-            return;
-        }
+		$tokens         = $phpcsFile->getTokens();
+		$endOfStatement = $phpcsFile->findNext(array(\T_SEMICOLON, \T_CLOSE_TAG), ($stackPtr + 1));
+		if ($endOfStatement === false) {
+			// No semi-colon - live coding.
+			return;
+		}
 
-        for ($ptr = ($stackPtr + 1); $ptr <= $endOfStatement; $ptr++) {
-            $errorThrown = false;
-            $nextComma   = $phpcsFile->findNext(\T_COMMA, $ptr, $endOfStatement, false, null, true);
-            $varEnd      = ($nextComma === false) ? $endOfStatement : $nextComma;
-            $variable    = $phpcsFile->findNext(\T_VARIABLE, $ptr, $varEnd);
-            $varString   = trim($phpcsFile->getTokensAsString($ptr, ($varEnd - $ptr)));
-            $data        = array($varString);
+		for ($ptr = ($stackPtr + 1); $ptr <= $endOfStatement; $ptr++) {
+			$errorThrown = false;
+			$nextComma   = $phpcsFile->findNext(\T_COMMA, $ptr, $endOfStatement, false, null, true);
+			$varEnd      = ($nextComma === false) ? $endOfStatement : $nextComma;
+			$variable    = $phpcsFile->findNext(\T_VARIABLE, $ptr, $varEnd);
+			$varString   = trim($phpcsFile->getTokensAsString($ptr, ($varEnd - $ptr)));
+			$data        = array($varString);
 
-            if ($variable !== false) {
+			if ($variable !== false) {
 
-                $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($variable - 1), $ptr, true);
+				$prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($variable - 1), $ptr, true);
 
-                if ($prev !== false && $tokens[$prev]['type'] === 'T_DOLLAR') {
+				if ($prev !== false && $tokens[$prev]['type'] === 'T_DOLLAR') {
 
-                    $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($variable + 1), $varEnd, true);
+					$next = $phpcsFile->findNext(Tokens::$emptyTokens, ($variable + 1), $varEnd, true);
 
-                    if ($next !== false
-                        && \in_array($tokens[$next]['code'], array(\T_OPEN_SQUARE_BRACKET, \T_OBJECT_OPERATOR, \T_DOUBLE_COLON), true) === true
-                    ) {
-                        $phpcsFile->addError(
-                            'Global with variable variables is not allowed since PHP 7.0. Found %s',
-                            $variable,
-                            'Found',
-                            $data
-                        );
-                        $errorThrown = true;
-                    } else {
-                        $phpcsFile->addWarning(
-                            'Global with anything other than bare variables is discouraged since PHP 7.0. Found %s',
-                            $variable,
-                            'NonBareVariableFound',
-                            $data
-                        );
-                        $errorThrown = true;
-                    }
-                }
-            }
+					if ($next !== false
+						&& \in_array($tokens[$next]['code'], array(\T_OPEN_SQUARE_BRACKET, \T_OBJECT_OPERATOR, \T_DOUBLE_COLON), true) === true
+					) {
+						$phpcsFile->addError(
+							'Global with variable variables is not allowed since PHP 7.0. Found %s',
+							$variable,
+							'Found',
+							$data
+						);
+						$errorThrown = true;
+					} else {
+						$phpcsFile->addWarning(
+							'Global with anything other than bare variables is discouraged since PHP 7.0. Found %s',
+							$variable,
+							'NonBareVariableFound',
+							$data
+						);
+						$errorThrown = true;
+					}
+				}
+			}
 
-            if ($errorThrown === false) {
-                $dollar = $phpcsFile->findNext(\T_DOLLAR, $ptr, $varEnd);
-                if ($dollar !== false) {
-                    $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($dollar + 1), $varEnd, true);
-                    if ($tokens[$next]['code'] === \T_OPEN_CURLY_BRACKET) {
-                        $phpcsFile->addWarning(
-                            'Global with anything other than bare variables is discouraged since PHP 7.0. Found %s',
-                            $dollar,
-                            'NonBareVariableFound',
-                            $data
-                        );
-                    }
-                }
-            }
+			if ($errorThrown === false) {
+				$dollar = $phpcsFile->findNext(\T_DOLLAR, $ptr, $varEnd);
+				if ($dollar !== false) {
+					$next = $phpcsFile->findNext(Tokens::$emptyTokens, ($dollar + 1), $varEnd, true);
+					if ($tokens[$next]['code'] === \T_OPEN_CURLY_BRACKET) {
+						$phpcsFile->addWarning(
+							'Global with anything other than bare variables is discouraged since PHP 7.0. Found %s',
+							$dollar,
+							'NonBareVariableFound',
+							$data
+						);
+					}
+				}
+			}
 
-            // Move the stack pointer forward to the next variable for multi-variable statements.
-            if ($nextComma === false) {
-                break;
-            }
-            $ptr = $nextComma;
-        }
-    }
+			// Move the stack pointer forward to the next variable for multi-variable statements.
+			if ($nextComma === false) {
+				break;
+			}
+			$ptr = $nextComma;
+		}
+	}
 }

Spacing +23 added lines, -23 removed lines

@@ -36,7 +36,7 @@ 
      */
     public function register()
     {
-        return array(\T_GLOBAL);
+        return array( \T_GLOBAL );
     }
 
     /**
@@ -48,37 +48,37 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
-        if ($this->supportsAbove('7.0') === false) {
+        if ( $this->supportsAbove( '7.0' ) === false ) {
             return;
         }
 
         $tokens         = $phpcsFile->getTokens();
-        $endOfStatement = $phpcsFile->findNext(array(\T_SEMICOLON, \T_CLOSE_TAG), ($stackPtr + 1));
-        if ($endOfStatement === false) {
+        $endOfStatement = $phpcsFile->findNext( array( \T_SEMICOLON, \T_CLOSE_TAG ), ( $stackPtr + 1 ) );
+        if ( $endOfStatement === false ) {
             // No semi-colon - live coding.
             return;
         }
 
-        for ($ptr = ($stackPtr + 1); $ptr <= $endOfStatement; $ptr++) {
+        for ( $ptr = ( $stackPtr + 1 ); $ptr <= $endOfStatement; $ptr++ ) {
             $errorThrown = false;
-            $nextComma   = $phpcsFile->findNext(\T_COMMA, $ptr, $endOfStatement, false, null, true);
-            $varEnd      = ($nextComma === false) ? $endOfStatement : $nextComma;
-            $variable    = $phpcsFile->findNext(\T_VARIABLE, $ptr, $varEnd);
-            $varString   = trim($phpcsFile->getTokensAsString($ptr, ($varEnd - $ptr)));
-            $data        = array($varString);
+            $nextComma   = $phpcsFile->findNext( \T_COMMA, $ptr, $endOfStatement, false, null, true );
+            $varEnd      = ( $nextComma === false ) ? $endOfStatement : $nextComma;
+            $variable    = $phpcsFile->findNext( \T_VARIABLE, $ptr, $varEnd );
+            $varString   = trim( $phpcsFile->getTokensAsString( $ptr, ( $varEnd - $ptr ) ) );
+            $data        = array( $varString );
 
-            if ($variable !== false) {
+            if ( $variable !== false ) {
 
-                $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($variable - 1), $ptr, true);
+                $prev = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $variable - 1 ), $ptr, true );
 
-                if ($prev !== false && $tokens[$prev]['type'] === 'T_DOLLAR') {
+                if ( $prev !== false && $tokens[ $prev ][ 'type' ] === 'T_DOLLAR' ) {
 
-                    $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($variable + 1), $varEnd, true);
+                    $next = $phpcsFile->findNext( Tokens::$emptyTokens, ( $variable + 1 ), $varEnd, true );
 
-                    if ($next !== false
-                        && \in_array($tokens[$next]['code'], array(\T_OPEN_SQUARE_BRACKET, \T_OBJECT_OPERATOR, \T_DOUBLE_COLON), true) === true
+                    if ( $next !== false
+                        && \in_array( $tokens[ $next ][ 'code' ], array( \T_OPEN_SQUARE_BRACKET, \T_OBJECT_OPERATOR, \T_DOUBLE_COLON ), true ) === true
                     ) {
                         $phpcsFile->addError(
                             'Global with variable variables is not allowed since PHP 7.0. Found %s',
@@ -99,11 +99,11 @@ 
                 }
             }
 
-            if ($errorThrown === false) {
-                $dollar = $phpcsFile->findNext(\T_DOLLAR, $ptr, $varEnd);
-                if ($dollar !== false) {
-                    $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($dollar + 1), $varEnd, true);
-                    if ($tokens[$next]['code'] === \T_OPEN_CURLY_BRACKET) {
+            if ( $errorThrown === false ) {
+                $dollar = $phpcsFile->findNext( \T_DOLLAR, $ptr, $varEnd );
+                if ( $dollar !== false ) {
+                    $next = $phpcsFile->findNext( Tokens::$emptyTokens, ( $dollar + 1 ), $varEnd, true );
+                    if ( $tokens[ $next ][ 'code' ] === \T_OPEN_CURLY_BRACKET ) {
                         $phpcsFile->addWarning(
                             'Global with anything other than bare variables is discouraged since PHP 7.0. Found %s',
                             $dollar,
@@ -115,7 +115,7 @@ 
             }
 
             // Move the stack pointer forward to the next variable for multi-variable statements.
-            if ($nextComma === false) {
+            if ( $nextComma === false ) {
                 break;
             }
             $ptr = $nextComma;

Braces +3 added lines, -6 removed lines

@@ -26,16 +26,14 @@ 
  * @package  PHPCompatibility
  * @author   Wim Godden <wim@cu.be>
  */
-class ForbiddenGlobalVariableVariableSniff extends Sniff
-{
+class ForbiddenGlobalVariableVariableSniff extends Sniff {
 
     /**
      * Returns an array of tokens this test wants to listen for.
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(\T_GLOBAL);
     }
 
@@ -48,8 +46,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         if ($this->supportsAbove('7.0') === false) {
             return;
         }

Doc Comments +1 added lines, -1 removed lines

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

vendor/phpcompatibility/php-compatibility/PHPCompatibility/Sniffs/Variables/RemovedPredefinedGlobalVariablesSniff.php

Indentation +260 added lines, -260 removed lines

@@ -26,268 +26,268 @@
 class RemovedPredefinedGlobalVariablesSniff extends AbstractRemovedFeatureSniff
 {
 
-    /**
-     * A list of removed global variables with their alternative, if any.
-     *
-     * The array lists : version number with false (deprecated) and true (removed).
-     * If's sufficient to list the first version where the variable was deprecated/removed.
-     *
-     * @var array(string|null)
-     */
-    protected $removedGlobalVariables = array(
-        'HTTP_POST_VARS' => array(
-            '5.3' => false,
-            '5.4' => true,
-            'alternative' => '$_POST',
-        ),
-        'HTTP_GET_VARS' => array(
-            '5.3' => false,
-            '5.4' => true,
-            'alternative' => '$_GET',
-        ),
-        'HTTP_ENV_VARS' => array(
-            '5.3' => false,
-            '5.4' => true,
-            'alternative' => '$_ENV',
-        ),
-        'HTTP_SERVER_VARS' => array(
-            '5.3' => false,
-            '5.4' => true,
-            'alternative' => '$_SERVER',
-        ),
-        'HTTP_COOKIE_VARS' => array(
-            '5.3' => false,
-            '5.4' => true,
-            'alternative' => '$_COOKIE',
-        ),
-        'HTTP_SESSION_VARS' => array(
-            '5.3' => false,
-            '5.4' => true,
-            'alternative' => '$_SESSION',
-        ),
-        'HTTP_POST_FILES' => array(
-            '5.3' => false,
-            '5.4' => true,
-            'alternative' => '$_FILES',
-        ),
-
-        'HTTP_RAW_POST_DATA' => array(
-            '5.6' => false,
-            '7.0' => true,
-            'alternative' => 'php://input',
-        ),
-
-        'php_errormsg' => array(
-            '7.2' => false,
-            'alternative' => 'error_get_last()',
-        ),
-    );
-
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(\T_VARIABLE);
-    }
-
-
-    /**
-     * 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(File $phpcsFile, $stackPtr)
-    {
-        if ($this->supportsAbove('5.3') === false) {
-            return;
-        }
-
-        $tokens  = $phpcsFile->getTokens();
-        $varName = substr($tokens[$stackPtr]['content'], 1);
-
-        if (isset($this->removedGlobalVariables[$varName]) === false) {
-            return;
-        }
-
-        if ($this->isClassProperty($phpcsFile, $stackPtr) === true) {
-            // Ok, so this was a class property declaration, not our concern.
-            return;
-        }
-
-        // Check for static usage of class properties shadowing the removed global variables.
-        if ($this->inClassScope($phpcsFile, $stackPtr, false) === true) {
-            $prevToken = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true, null, true);
-            if ($prevToken !== false && $tokens[$prevToken]['code'] === \T_DOUBLE_COLON) {
-                return;
-            }
-        }
-
-        // Do some additional checks for the $php_errormsg variable.
-        if ($varName === 'php_errormsg'
-            && $this->isTargetPHPErrormsgVar($phpcsFile, $stackPtr, $tokens) === false
-        ) {
-            return;
-        }
-
-        // Still here, so throw an error/warning.
-        $itemInfo = array(
-            'name' => $varName,
-        );
-        $this->handleFeature($phpcsFile, $stackPtr, $itemInfo);
-    }
-
-
-    /**
-     * Get the relevant sub-array for a specific item from a multi-dimensional array.
-     *
-     * @param array $itemInfo Base information about the item.
-     *
-     * @return array Version and other information about the item.
-     */
-    public function getItemArray(array $itemInfo)
-    {
-        return $this->removedGlobalVariables[$itemInfo['name']];
-    }
-
-
-    /**
-     * Get the error message template for this sniff.
-     *
-     * @return string
-     */
-    protected function getErrorMsgTemplate()
-    {
-        return "Global variable '\$%s' is ";
-    }
-
-
-    /**
-     * Filter the error message before it's passed to PHPCS.
-     *
-     * @param string $error     The error message which was created.
-     * @param array  $itemInfo  Base information about the item this error message applies to.
-     * @param array  $errorInfo Detail information about an item this error message applies to.
-     *
-     * @return string
-     */
-    protected function filterErrorMsg($error, array $itemInfo, array $errorInfo)
-    {
-        if ($itemInfo['name'] === 'php_errormsg') {
-            $error = str_replace('Global', 'The', $error);
-        }
-        return $error;
-    }
-
-    /**
-     * Run some additional checks for the `$php_errormsg` variable.
-     *
-     * @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    Token array of the current file.
-     *
-     * @return bool
-     */
-    private function isTargetPHPErrormsgVar(File $phpcsFile, $stackPtr, array $tokens)
-    {
-        $scopeStart = 0;
-
-        /*
+	/**
+	 * A list of removed global variables with their alternative, if any.
+	 *
+	 * The array lists : version number with false (deprecated) and true (removed).
+	 * If's sufficient to list the first version where the variable was deprecated/removed.
+	 *
+	 * @var array(string|null)
+	 */
+	protected $removedGlobalVariables = array(
+		'HTTP_POST_VARS' => array(
+			'5.3' => false,
+			'5.4' => true,
+			'alternative' => '$_POST',
+		),
+		'HTTP_GET_VARS' => array(
+			'5.3' => false,
+			'5.4' => true,
+			'alternative' => '$_GET',
+		),
+		'HTTP_ENV_VARS' => array(
+			'5.3' => false,
+			'5.4' => true,
+			'alternative' => '$_ENV',
+		),
+		'HTTP_SERVER_VARS' => array(
+			'5.3' => false,
+			'5.4' => true,
+			'alternative' => '$_SERVER',
+		),
+		'HTTP_COOKIE_VARS' => array(
+			'5.3' => false,
+			'5.4' => true,
+			'alternative' => '$_COOKIE',
+		),
+		'HTTP_SESSION_VARS' => array(
+			'5.3' => false,
+			'5.4' => true,
+			'alternative' => '$_SESSION',
+		),
+		'HTTP_POST_FILES' => array(
+			'5.3' => false,
+			'5.4' => true,
+			'alternative' => '$_FILES',
+		),
+
+		'HTTP_RAW_POST_DATA' => array(
+			'5.6' => false,
+			'7.0' => true,
+			'alternative' => 'php://input',
+		),
+
+		'php_errormsg' => array(
+			'7.2' => false,
+			'alternative' => 'error_get_last()',
+		),
+	);
+
+
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return array(\T_VARIABLE);
+	}
+
+
+	/**
+	 * 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(File $phpcsFile, $stackPtr)
+	{
+		if ($this->supportsAbove('5.3') === false) {
+			return;
+		}
+
+		$tokens  = $phpcsFile->getTokens();
+		$varName = substr($tokens[$stackPtr]['content'], 1);
+
+		if (isset($this->removedGlobalVariables[$varName]) === false) {
+			return;
+		}
+
+		if ($this->isClassProperty($phpcsFile, $stackPtr) === true) {
+			// Ok, so this was a class property declaration, not our concern.
+			return;
+		}
+
+		// Check for static usage of class properties shadowing the removed global variables.
+		if ($this->inClassScope($phpcsFile, $stackPtr, false) === true) {
+			$prevToken = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true, null, true);
+			if ($prevToken !== false && $tokens[$prevToken]['code'] === \T_DOUBLE_COLON) {
+				return;
+			}
+		}
+
+		// Do some additional checks for the $php_errormsg variable.
+		if ($varName === 'php_errormsg'
+			&& $this->isTargetPHPErrormsgVar($phpcsFile, $stackPtr, $tokens) === false
+		) {
+			return;
+		}
+
+		// Still here, so throw an error/warning.
+		$itemInfo = array(
+			'name' => $varName,
+		);
+		$this->handleFeature($phpcsFile, $stackPtr, $itemInfo);
+	}
+
+
+	/**
+	 * Get the relevant sub-array for a specific item from a multi-dimensional array.
+	 *
+	 * @param array $itemInfo Base information about the item.
+	 *
+	 * @return array Version and other information about the item.
+	 */
+	public function getItemArray(array $itemInfo)
+	{
+		return $this->removedGlobalVariables[$itemInfo['name']];
+	}
+
+
+	/**
+	 * Get the error message template for this sniff.
+	 *
+	 * @return string
+	 */
+	protected function getErrorMsgTemplate()
+	{
+		return "Global variable '\$%s' is ";
+	}
+
+
+	/**
+	 * Filter the error message before it's passed to PHPCS.
+	 *
+	 * @param string $error     The error message which was created.
+	 * @param array  $itemInfo  Base information about the item this error message applies to.
+	 * @param array  $errorInfo Detail information about an item this error message applies to.
+	 *
+	 * @return string
+	 */
+	protected function filterErrorMsg($error, array $itemInfo, array $errorInfo)
+	{
+		if ($itemInfo['name'] === 'php_errormsg') {
+			$error = str_replace('Global', 'The', $error);
+		}
+		return $error;
+	}
+
+	/**
+	 * Run some additional checks for the `$php_errormsg` variable.
+	 *
+	 * @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    Token array of the current file.
+	 *
+	 * @return bool
+	 */
+	private function isTargetPHPErrormsgVar(File $phpcsFile, $stackPtr, array $tokens)
+	{
+		$scopeStart = 0;
+
+		/*
          * If the variable is detected within the scope of a function/closure, limit the checking.
          */
-        $function = $phpcsFile->getCondition($stackPtr, \T_CLOSURE);
-        if ($function === false) {
-            $function = $phpcsFile->getCondition($stackPtr, \T_FUNCTION);
-        }
-
-        // It could also be a function param, which is not in the function scope.
-        if ($function === false && isset($tokens[$stackPtr]['nested_parenthesis']) === true) {
-            $nestedParentheses = $tokens[$stackPtr]['nested_parenthesis'];
-            $parenthesisCloser = end($nestedParentheses);
-            if (isset($tokens[$parenthesisCloser]['parenthesis_owner'])
-                && ($tokens[$tokens[$parenthesisCloser]['parenthesis_owner']]['code'] === \T_FUNCTION
-                    || $tokens[$tokens[$parenthesisCloser]['parenthesis_owner']]['code'] === \T_CLOSURE)
-            ) {
-                $function = $tokens[$parenthesisCloser]['parenthesis_owner'];
-            }
-        }
-
-        if ($function !== false) {
-            $scopeStart = $tokens[$function]['scope_opener'];
-        }
-
-        /*
+		$function = $phpcsFile->getCondition($stackPtr, \T_CLOSURE);
+		if ($function === false) {
+			$function = $phpcsFile->getCondition($stackPtr, \T_FUNCTION);
+		}
+
+		// It could also be a function param, which is not in the function scope.
+		if ($function === false && isset($tokens[$stackPtr]['nested_parenthesis']) === true) {
+			$nestedParentheses = $tokens[$stackPtr]['nested_parenthesis'];
+			$parenthesisCloser = end($nestedParentheses);
+			if (isset($tokens[$parenthesisCloser]['parenthesis_owner'])
+				&& ($tokens[$tokens[$parenthesisCloser]['parenthesis_owner']]['code'] === \T_FUNCTION
+					|| $tokens[$tokens[$parenthesisCloser]['parenthesis_owner']]['code'] === \T_CLOSURE)
+			) {
+				$function = $tokens[$parenthesisCloser]['parenthesis_owner'];
+			}
+		}
+
+		if ($function !== false) {
+			$scopeStart = $tokens[$function]['scope_opener'];
+		}
+
+		/*
          * Now, let's do some additional checks.
          */
-        $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
-
-        // Is the variable being used as an array ?
-        if ($nextNonEmpty !== false && $tokens[$nextNonEmpty]['code'] === \T_OPEN_SQUARE_BRACKET) {
-            // The PHP native variable is a string, so this is probably not it
-            // (except for array access to string, but why would you in this case ?).
-            return false;
-        }
-
-        // Is this a variable assignment ?
-        if ($nextNonEmpty !== false
-            && isset(Tokens::$assignmentTokens[$tokens[$nextNonEmpty]['code']]) === true
-        ) {
-            return false;
-        }
-
-        // Is this a function param shadowing the PHP native one ?
-        if ($function !== false) {
-            $parameters = PHPCSHelper::getMethodParameters($phpcsFile, $function);
-            if (\is_array($parameters) === true && empty($parameters) === false) {
-                foreach ($parameters as $param) {
-                    if ($param['name'] === '$php_errormsg') {
-                        return false;
-                    }
-                }
-            }
-        }
-
-        $skipPast = array(
-            'T_CLASS'      => true,
-            'T_ANON_CLASS' => true,
-            'T_INTERFACE'  => true,
-            'T_TRAIT'      => true,
-            'T_FUNCTION'   => true,
-            'T_CLOSURE'    => true,
-        );
-
-        // Walk back and see if there is an assignment to the variable within the same scope.
-        for ($i = ($stackPtr - 1); $i >= $scopeStart; $i--) {
-            if ($tokens[$i]['code'] === \T_CLOSE_CURLY_BRACKET
-                && isset($tokens[$i]['scope_condition'])
-                && isset($skipPast[$tokens[$tokens[$i]['scope_condition']]['type']])
-            ) {
-                // Skip past functions, classes etc.
-                $i = $tokens[$i]['scope_condition'];
-                continue;
-            }
-
-            if ($tokens[$i]['code'] !== \T_VARIABLE || $tokens[$i]['content'] !== '$php_errormsg') {
-                continue;
-            }
-
-            $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($i + 1), null, true);
-
-            if ($nextNonEmpty !== false
-                && isset(Tokens::$assignmentTokens[$tokens[$nextNonEmpty]['code']]) === true
-            ) {
-                return false;
-            }
-        }
-
-        return true;
-    }
+		$nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
+
+		// Is the variable being used as an array ?
+		if ($nextNonEmpty !== false && $tokens[$nextNonEmpty]['code'] === \T_OPEN_SQUARE_BRACKET) {
+			// The PHP native variable is a string, so this is probably not it
+			// (except for array access to string, but why would you in this case ?).
+			return false;
+		}
+
+		// Is this a variable assignment ?
+		if ($nextNonEmpty !== false
+			&& isset(Tokens::$assignmentTokens[$tokens[$nextNonEmpty]['code']]) === true
+		) {
+			return false;
+		}
+
+		// Is this a function param shadowing the PHP native one ?
+		if ($function !== false) {
+			$parameters = PHPCSHelper::getMethodParameters($phpcsFile, $function);
+			if (\is_array($parameters) === true && empty($parameters) === false) {
+				foreach ($parameters as $param) {
+					if ($param['name'] === '$php_errormsg') {
+						return false;
+					}
+				}
+			}
+		}
+
+		$skipPast = array(
+			'T_CLASS'      => true,
+			'T_ANON_CLASS' => true,
+			'T_INTERFACE'  => true,
+			'T_TRAIT'      => true,
+			'T_FUNCTION'   => true,
+			'T_CLOSURE'    => true,
+		);
+
+		// Walk back and see if there is an assignment to the variable within the same scope.
+		for ($i = ($stackPtr - 1); $i >= $scopeStart; $i--) {
+			if ($tokens[$i]['code'] === \T_CLOSE_CURLY_BRACKET
+				&& isset($tokens[$i]['scope_condition'])
+				&& isset($skipPast[$tokens[$tokens[$i]['scope_condition']]['type']])
+			) {
+				// Skip past functions, classes etc.
+				$i = $tokens[$i]['scope_condition'];
+				continue;
+			}
+
+			if ($tokens[$i]['code'] !== \T_VARIABLE || $tokens[$i]['content'] !== '$php_errormsg') {
+				continue;
+			}
+
+			$nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($i + 1), null, true);
+
+			if ($nextNonEmpty !== false
+				&& isset(Tokens::$assignmentTokens[$tokens[$nextNonEmpty]['code']]) === true
+			) {
+				return false;
+			}
+		}
+
+		return true;
+	}
 }

Spacing +48 added lines, -48 removed lines

@@ -91,7 +91,7 @@ 
      */
     public function register()
     {
-        return array(\T_VARIABLE);
+        return array( \T_VARIABLE );
     }
 
 
@@ -104,35 +104,35 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
-        if ($this->supportsAbove('5.3') === false) {
+        if ( $this->supportsAbove( '5.3' ) === false ) {
             return;
         }
 
         $tokens  = $phpcsFile->getTokens();
-        $varName = substr($tokens[$stackPtr]['content'], 1);
+        $varName = substr( $tokens[ $stackPtr ][ 'content' ], 1 );
 
-        if (isset($this->removedGlobalVariables[$varName]) === false) {
+        if ( isset( $this->removedGlobalVariables[ $varName ] ) === false ) {
             return;
         }
 
-        if ($this->isClassProperty($phpcsFile, $stackPtr) === true) {
+        if ( $this->isClassProperty( $phpcsFile, $stackPtr ) === true ) {
             // Ok, so this was a class property declaration, not our concern.
             return;
         }
 
         // Check for static usage of class properties shadowing the removed global variables.
-        if ($this->inClassScope($phpcsFile, $stackPtr, false) === true) {
-            $prevToken = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true, null, true);
-            if ($prevToken !== false && $tokens[$prevToken]['code'] === \T_DOUBLE_COLON) {
+        if ( $this->inClassScope( $phpcsFile, $stackPtr, false ) === true ) {
+            $prevToken = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true, null, true );
+            if ( $prevToken !== false && $tokens[ $prevToken ][ 'code' ] === \T_DOUBLE_COLON ) {
                 return;
             }
         }
 
         // Do some additional checks for the $php_errormsg variable.
-        if ($varName === 'php_errormsg'
-            && $this->isTargetPHPErrormsgVar($phpcsFile, $stackPtr, $tokens) === false
+        if ( $varName === 'php_errormsg'
+            && $this->isTargetPHPErrormsgVar( $phpcsFile, $stackPtr, $tokens ) === false
         ) {
             return;
         }
@@ -141,7 +141,7 @@ 
         $itemInfo = array(
             'name' => $varName,
         );
-        $this->handleFeature($phpcsFile, $stackPtr, $itemInfo);
+        $this->handleFeature( $phpcsFile, $stackPtr, $itemInfo );
     }
 
 
@@ -152,9 +152,9 @@ 
      *
      * @return array Version and other information about the item.
      */
-    public function getItemArray(array $itemInfo)
+    public function getItemArray( array $itemInfo )
     {
-        return $this->removedGlobalVariables[$itemInfo['name']];
+        return $this->removedGlobalVariables[ $itemInfo[ 'name' ] ];
     }
 
 
@@ -178,10 +178,10 @@ 
      *
      * @return string
      */
-    protected function filterErrorMsg($error, array $itemInfo, array $errorInfo)
+    protected function filterErrorMsg( $error, array $itemInfo, array $errorInfo )
     {
-        if ($itemInfo['name'] === 'php_errormsg') {
-            $error = str_replace('Global', 'The', $error);
+        if ( $itemInfo[ 'name' ] === 'php_errormsg' ) {
+            $error = str_replace( 'Global', 'The', $error );
         }
         return $error;
     }
@@ -196,59 +196,59 @@ 
      *
      * @return bool
      */
-    private function isTargetPHPErrormsgVar(File $phpcsFile, $stackPtr, array $tokens)
+    private function isTargetPHPErrormsgVar( File $phpcsFile, $stackPtr, array $tokens )
     {
         $scopeStart = 0;
 
         /*
          * If the variable is detected within the scope of a function/closure, limit the checking.
          */
-        $function = $phpcsFile->getCondition($stackPtr, \T_CLOSURE);
-        if ($function === false) {
-            $function = $phpcsFile->getCondition($stackPtr, \T_FUNCTION);
+        $function = $phpcsFile->getCondition( $stackPtr, \T_CLOSURE );
+        if ( $function === false ) {
+            $function = $phpcsFile->getCondition( $stackPtr, \T_FUNCTION );
         }
 
         // It could also be a function param, which is not in the function scope.
-        if ($function === false && isset($tokens[$stackPtr]['nested_parenthesis']) === true) {
-            $nestedParentheses = $tokens[$stackPtr]['nested_parenthesis'];
-            $parenthesisCloser = end($nestedParentheses);
-            if (isset($tokens[$parenthesisCloser]['parenthesis_owner'])
-                && ($tokens[$tokens[$parenthesisCloser]['parenthesis_owner']]['code'] === \T_FUNCTION
-                    || $tokens[$tokens[$parenthesisCloser]['parenthesis_owner']]['code'] === \T_CLOSURE)
+        if ( $function === false && isset( $tokens[ $stackPtr ][ 'nested_parenthesis' ] ) === true ) {
+            $nestedParentheses = $tokens[ $stackPtr ][ 'nested_parenthesis' ];
+            $parenthesisCloser = end( $nestedParentheses );
+            if ( isset( $tokens[ $parenthesisCloser ][ 'parenthesis_owner' ] )
+                && ( $tokens[ $tokens[ $parenthesisCloser ][ 'parenthesis_owner' ] ][ 'code' ] === \T_FUNCTION
+                    || $tokens[ $tokens[ $parenthesisCloser ][ 'parenthesis_owner' ] ][ 'code' ] === \T_CLOSURE )
             ) {
-                $function = $tokens[$parenthesisCloser]['parenthesis_owner'];
+                $function = $tokens[ $parenthesisCloser ][ 'parenthesis_owner' ];
             }
         }
 
-        if ($function !== false) {
-            $scopeStart = $tokens[$function]['scope_opener'];
+        if ( $function !== false ) {
+            $scopeStart = $tokens[ $function ][ 'scope_opener' ];
         }
 
         /*
          * Now, let's do some additional checks.
          */
-        $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
+        $nextNonEmpty = $phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
 
         // Is the variable being used as an array ?
-        if ($nextNonEmpty !== false && $tokens[$nextNonEmpty]['code'] === \T_OPEN_SQUARE_BRACKET) {
+        if ( $nextNonEmpty !== false && $tokens[ $nextNonEmpty ][ 'code' ] === \T_OPEN_SQUARE_BRACKET ) {
             // The PHP native variable is a string, so this is probably not it
             // (except for array access to string, but why would you in this case ?).
             return false;
         }
 
         // Is this a variable assignment ?
-        if ($nextNonEmpty !== false
-            && isset(Tokens::$assignmentTokens[$tokens[$nextNonEmpty]['code']]) === true
+        if ( $nextNonEmpty !== false
+            && isset( Tokens::$assignmentTokens[ $tokens[ $nextNonEmpty ][ 'code' ] ] ) === true
         ) {
             return false;
         }
 
         // Is this a function param shadowing the PHP native one ?
-        if ($function !== false) {
-            $parameters = PHPCSHelper::getMethodParameters($phpcsFile, $function);
-            if (\is_array($parameters) === true && empty($parameters) === false) {
-                foreach ($parameters as $param) {
-                    if ($param['name'] === '$php_errormsg') {
+        if ( $function !== false ) {
+            $parameters = PHPCSHelper::getMethodParameters( $phpcsFile, $function );
+            if ( \is_array( $parameters ) === true && empty( $parameters ) === false ) {
+                foreach ( $parameters as $param ) {
+                    if ( $param[ 'name' ] === '$php_errormsg' ) {
                         return false;
                     }
                 }
@@ -265,24 +265,24 @@ 
         );
 
         // Walk back and see if there is an assignment to the variable within the same scope.
-        for ($i = ($stackPtr - 1); $i >= $scopeStart; $i--) {
-            if ($tokens[$i]['code'] === \T_CLOSE_CURLY_BRACKET
-                && isset($tokens[$i]['scope_condition'])
-                && isset($skipPast[$tokens[$tokens[$i]['scope_condition']]['type']])
+        for ( $i = ( $stackPtr - 1 ); $i >= $scopeStart; $i-- ) {
+            if ( $tokens[ $i ][ 'code' ] === \T_CLOSE_CURLY_BRACKET
+                && isset( $tokens[ $i ][ 'scope_condition' ] )
+                && isset( $skipPast[ $tokens[ $tokens[ $i ][ 'scope_condition' ] ][ 'type' ] ] )
             ) {
                 // Skip past functions, classes etc.
-                $i = $tokens[$i]['scope_condition'];
+                $i = $tokens[ $i ][ 'scope_condition' ];
                 continue;
             }
 
-            if ($tokens[$i]['code'] !== \T_VARIABLE || $tokens[$i]['content'] !== '$php_errormsg') {
+            if ( $tokens[ $i ][ 'code' ] !== \T_VARIABLE || $tokens[ $i ][ 'content' ] !== '$php_errormsg' ) {
                 continue;
             }
 
-            $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($i + 1), null, true);
+            $nextNonEmpty = $phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), null, true );
 
-            if ($nextNonEmpty !== false
-                && isset(Tokens::$assignmentTokens[$tokens[$nextNonEmpty]['code']]) === true
+            if ( $nextNonEmpty !== false
+                && isset( Tokens::$assignmentTokens[ $tokens[ $nextNonEmpty ][ 'code' ] ] ) === true
             ) {
                 return false;
             }

Braces +7 added lines, -14 removed lines

@@ -23,8 +23,7 @@ 
  * @package  PHPCompatibility
  * @author   Wim Godden <wim.godden@cu.be>
  */
-class RemovedPredefinedGlobalVariablesSniff extends AbstractRemovedFeatureSniff
-{
+class RemovedPredefinedGlobalVariablesSniff extends AbstractRemovedFeatureSniff {
 
     /**
      * A list of removed global variables with their alternative, if any.
@@ -89,8 +88,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(\T_VARIABLE);
     }
 
@@ -104,8 +102,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         if ($this->supportsAbove('5.3') === false) {
             return;
         }
@@ -152,8 +149,7 @@ 
      *
      * @return array Version and other information about the item.
      */
-    public function getItemArray(array $itemInfo)
-    {
+    public function getItemArray(array $itemInfo) {
         return $this->removedGlobalVariables[$itemInfo['name']];
     }
 
@@ -163,8 +159,7 @@ 
      *
      * @return string
      */
-    protected function getErrorMsgTemplate()
-    {
+    protected function getErrorMsgTemplate() {
         return "Global variable '\$%s' is ";
     }
 
@@ -178,8 +173,7 @@ 
      *
      * @return string
      */
-    protected function filterErrorMsg($error, array $itemInfo, array $errorInfo)
-    {
+    protected function filterErrorMsg($error, array $itemInfo, array $errorInfo) {
         if ($itemInfo['name'] === 'php_errormsg') {
             $error = str_replace('Global', 'The', $error);
         }
@@ -196,8 +190,7 @@ 
      *
      * @return bool
      */
-    private function isTargetPHPErrormsgVar(File $phpcsFile, $stackPtr, array $tokens)
-    {
+    private function isTargetPHPErrormsgVar(File $phpcsFile, $stackPtr, array $tokens) {
         $scopeStart = 0;
 
         /*

Doc Comments +1 added lines, -1 removed lines

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

vendor/phpcompatibility/php-compatibility/PHPCompatibility/Sniffs/FunctionUse/ArgumentFunctionsReportCurrentValueSniff.php

Indentation +363 added lines, -363 removed lines

@@ -30,191 +30,191 @@ 
 class ArgumentFunctionsReportCurrentValueSniff extends Sniff
 {
 
-    /**
-     * A list of functions that, when called, can behave differently in PHP 7
-     * when dealing with parameters of the function they're called in.
-     *
-     * @var array
-     */
-    protected $changedFunctions = array(
-        'func_get_arg'          => true,
-        'func_get_args'         => true,
-        'debug_backtrace'       => true,
-        'debug_print_backtrace' => true,
-    );
-
-    /**
-     * Tokens to look out for to allow us to skip past nested scoped structures.
-     *
-     * @var array
-     */
-    private $skipPastNested = array(
-        'T_CLASS'      => true,
-        'T_ANON_CLASS' => true,
-        'T_INTERFACE'  => true,
-        'T_TRAIT'      => true,
-        'T_FUNCTION'   => true,
-        'T_CLOSURE'    => true,
-    );
-
-    /**
-     * List of tokens which when they preceed a T_STRING *within a function* indicate
-     * this is not a call to a PHP native function.
-     *
-     * This list already takes into account that nested scoped structures are being
-     * skipped over, so doesn't check for those again.
-     * Similarly, as constants won't have parentheses, those don't need to be checked
-     * for either.
-     *
-     * @var array
-     */
-    private $noneFunctionCallIndicators = array(
-        \T_DOUBLE_COLON    => true,
-        \T_OBJECT_OPERATOR => true,
-    );
-
-    /**
-     * The tokens for variable incrementing/decrementing.
-     *
-     * @var array
-     */
-    private $plusPlusMinusMinus = array(
-        \T_DEC => true,
-        \T_INC => true,
-    );
-
-    /**
-     * Tokens to ignore when determining the start of a statement.
-     *
-     * @var array
-     */
-    private $ignoreForStartOfStatement = array(
-        \T_COMMA,
-        \T_DOUBLE_ARROW,
-        \T_OPEN_SQUARE_BRACKET,
-        \T_OPEN_PARENTHESIS,
-    );
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-            \T_FUNCTION,
-            \T_CLOSURE,
-        );
-    }
-
-    /**
-     * 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(File $phpcsFile, $stackPtr)
-    {
-        if ($this->supportsAbove('7.0') === false) {
-            return;
-        }
-
-        $tokens = $phpcsFile->getTokens();
-
-        if (isset($tokens[$stackPtr]['scope_opener'], $tokens[$stackPtr]['scope_closer']) === false) {
-            // Abstract function, interface function, live coding or parse error.
-            return;
-        }
-
-        $scopeOpener = $tokens[$stackPtr]['scope_opener'];
-        $scopeCloser = $tokens[$stackPtr]['scope_closer'];
-
-        // Does the function declaration have parameters ?
-        $params = PHPCSHelper::getMethodParameters($phpcsFile, $stackPtr);
-        if (empty($params)) {
-            // No named arguments found, so no risk of them being changed.
-            return;
-        }
-
-        $paramNames = array();
-        foreach ($params as $param) {
-            $paramNames[] = $param['name'];
-        }
-
-        for ($i = ($scopeOpener + 1); $i < $scopeCloser; $i++) {
-            if (isset($this->skipPastNested[$tokens[$i]['type']]) && isset($tokens[$i]['scope_closer'])) {
-                // Skip past nested structures.
-                $i = $tokens[$i]['scope_closer'];
-                continue;
-            }
-
-            if ($tokens[$i]['code'] !== \T_STRING) {
-                continue;
-            }
-
-            $foundFunctionName = strtolower($tokens[$i]['content']);
-
-            if (isset($this->changedFunctions[$foundFunctionName]) === false) {
-                // Not one of the target functions.
-                continue;
-            }
-
-            /*
+	/**
+	 * A list of functions that, when called, can behave differently in PHP 7
+	 * when dealing with parameters of the function they're called in.
+	 *
+	 * @var array
+	 */
+	protected $changedFunctions = array(
+		'func_get_arg'          => true,
+		'func_get_args'         => true,
+		'debug_backtrace'       => true,
+		'debug_print_backtrace' => true,
+	);
+
+	/**
+	 * Tokens to look out for to allow us to skip past nested scoped structures.
+	 *
+	 * @var array
+	 */
+	private $skipPastNested = array(
+		'T_CLASS'      => true,
+		'T_ANON_CLASS' => true,
+		'T_INTERFACE'  => true,
+		'T_TRAIT'      => true,
+		'T_FUNCTION'   => true,
+		'T_CLOSURE'    => true,
+	);
+
+	/**
+	 * List of tokens which when they preceed a T_STRING *within a function* indicate
+	 * this is not a call to a PHP native function.
+	 *
+	 * This list already takes into account that nested scoped structures are being
+	 * skipped over, so doesn't check for those again.
+	 * Similarly, as constants won't have parentheses, those don't need to be checked
+	 * for either.
+	 *
+	 * @var array
+	 */
+	private $noneFunctionCallIndicators = array(
+		\T_DOUBLE_COLON    => true,
+		\T_OBJECT_OPERATOR => true,
+	);
+
+	/**
+	 * The tokens for variable incrementing/decrementing.
+	 *
+	 * @var array
+	 */
+	private $plusPlusMinusMinus = array(
+		\T_DEC => true,
+		\T_INC => true,
+	);
+
+	/**
+	 * Tokens to ignore when determining the start of a statement.
+	 *
+	 * @var array
+	 */
+	private $ignoreForStartOfStatement = array(
+		\T_COMMA,
+		\T_DOUBLE_ARROW,
+		\T_OPEN_SQUARE_BRACKET,
+		\T_OPEN_PARENTHESIS,
+	);
+
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return array(
+			\T_FUNCTION,
+			\T_CLOSURE,
+		);
+	}
+
+	/**
+	 * 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(File $phpcsFile, $stackPtr)
+	{
+		if ($this->supportsAbove('7.0') === false) {
+			return;
+		}
+
+		$tokens = $phpcsFile->getTokens();
+
+		if (isset($tokens[$stackPtr]['scope_opener'], $tokens[$stackPtr]['scope_closer']) === false) {
+			// Abstract function, interface function, live coding or parse error.
+			return;
+		}
+
+		$scopeOpener = $tokens[$stackPtr]['scope_opener'];
+		$scopeCloser = $tokens[$stackPtr]['scope_closer'];
+
+		// Does the function declaration have parameters ?
+		$params = PHPCSHelper::getMethodParameters($phpcsFile, $stackPtr);
+		if (empty($params)) {
+			// No named arguments found, so no risk of them being changed.
+			return;
+		}
+
+		$paramNames = array();
+		foreach ($params as $param) {
+			$paramNames[] = $param['name'];
+		}
+
+		for ($i = ($scopeOpener + 1); $i < $scopeCloser; $i++) {
+			if (isset($this->skipPastNested[$tokens[$i]['type']]) && isset($tokens[$i]['scope_closer'])) {
+				// Skip past nested structures.
+				$i = $tokens[$i]['scope_closer'];
+				continue;
+			}
+
+			if ($tokens[$i]['code'] !== \T_STRING) {
+				continue;
+			}
+
+			$foundFunctionName = strtolower($tokens[$i]['content']);
+
+			if (isset($this->changedFunctions[$foundFunctionName]) === false) {
+				// Not one of the target functions.
+				continue;
+			}
+
+			/*
              * Ok, so is this really a function call to one of the PHP native functions ?
              */
-            $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($i + 1), null, true);
-            if ($next === false || $tokens[$next]['code'] !== \T_OPEN_PARENTHESIS) {
-                // Live coding, parse error or not a function call.
-                continue;
-            }
-
-            $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($i - 1), null, true);
-            if ($prev !== false) {
-                if (isset($this->noneFunctionCallIndicators[$tokens[$prev]['code']])) {
-                    continue;
-                }
-
-                // Check for namespaced functions, ie: \foo\bar() not \bar().
-                if ($tokens[ $prev ]['code'] === \T_NS_SEPARATOR) {
-                    $pprev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($prev - 1), null, true);
-                    if ($pprev !== false && $tokens[ $pprev ]['code'] === \T_STRING) {
-                        continue;
-                    }
-                }
-            }
-
-            /*
+			$next = $phpcsFile->findNext(Tokens::$emptyTokens, ($i + 1), null, true);
+			if ($next === false || $tokens[$next]['code'] !== \T_OPEN_PARENTHESIS) {
+				// Live coding, parse error or not a function call.
+				continue;
+			}
+
+			$prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($i - 1), null, true);
+			if ($prev !== false) {
+				if (isset($this->noneFunctionCallIndicators[$tokens[$prev]['code']])) {
+					continue;
+				}
+
+				// Check for namespaced functions, ie: \foo\bar() not \bar().
+				if ($tokens[ $prev ]['code'] === \T_NS_SEPARATOR) {
+					$pprev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($prev - 1), null, true);
+					if ($pprev !== false && $tokens[ $pprev ]['code'] === \T_STRING) {
+						continue;
+					}
+				}
+			}
+
+			/*
              * Address some special cases.
              */
-            if ($foundFunctionName !== 'func_get_args') {
-                $paramOne = $this->getFunctionCallParameter($phpcsFile, $i, 1);
-                if ($paramOne !== false) {
-                    switch ($foundFunctionName) {
-                        /*
+			if ($foundFunctionName !== 'func_get_args') {
+				$paramOne = $this->getFunctionCallParameter($phpcsFile, $i, 1);
+				if ($paramOne !== false) {
+					switch ($foundFunctionName) {
+						/*
                          * Check if `debug_(print_)backtrace()` is called with the
                          * `DEBUG_BACKTRACE_IGNORE_ARGS` option.
                          */
-                        case 'debug_backtrace':
-                        case 'debug_print_backtrace':
-                            $hasIgnoreArgs = $phpcsFile->findNext(
-                                \T_STRING,
-                                $paramOne['start'],
-                                ($paramOne['end'] + 1),
-                                false,
-                                'DEBUG_BACKTRACE_IGNORE_ARGS'
-                            );
-
-                            if ($hasIgnoreArgs !== false) {
-                                // Debug_backtrace() called with ignore args option.
-                                continue 2;
-                            }
-                            break;
-
-                        /*
+						case 'debug_backtrace':
+						case 'debug_print_backtrace':
+							$hasIgnoreArgs = $phpcsFile->findNext(
+								\T_STRING,
+								$paramOne['start'],
+								($paramOne['end'] + 1),
+								false,
+								'DEBUG_BACKTRACE_IGNORE_ARGS'
+							);
+
+							if ($hasIgnoreArgs !== false) {
+								// Debug_backtrace() called with ignore args option.
+								continue 2;
+							}
+							break;
+
+						/*
                          * Collect the necessary information to only throw a notice if the argument
                          * touched/changed is in line with the passed $arg_num.
                          *
@@ -224,21 +224,21 @@ 
                          * {@internal Note: This does not take calculations into account!
                          *  Should be exceptionally rare and can - if needs be - be addressed at a later stage.}}
                          */
-                        case 'func_get_arg':
-                            $number = $phpcsFile->findNext(\T_LNUMBER, $paramOne['start'], ($paramOne['end'] + 1));
-                            if ($number !== false) {
-                                $argNumber = $tokens[$number]['content'];
-
-                                if (isset($paramNames[$argNumber]) === false) {
-                                    // Requesting a non-named additional parameter. Ignore.
-                                    continue 2;
-                                }
-                            }
-                            break;
-                    }
-                }
-            } else {
-                /*
+						case 'func_get_arg':
+							$number = $phpcsFile->findNext(\T_LNUMBER, $paramOne['start'], ($paramOne['end'] + 1));
+							if ($number !== false) {
+								$argNumber = $tokens[$number]['content'];
+
+								if (isset($paramNames[$argNumber]) === false) {
+									// Requesting a non-named additional parameter. Ignore.
+									continue 2;
+								}
+							}
+							break;
+					}
+				}
+			} else {
+				/*
                  * Check if the call to func_get_args() happens to be in an array_slice() or
                  * array_splice() with an $offset higher than the number of named parameters.
                  * In that case, we can ignore it.
@@ -246,33 +246,33 @@ 
                  * {@internal Note: This does not take offset calculations into account!
                  *  Should be exceptionally rare and can - if needs be - be addressed at a later stage.}}
                  */
-                if ($prev !== false && $tokens[$prev]['code'] === \T_OPEN_PARENTHESIS) {
-
-                    $maybeFunctionCall = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($prev - 1), null, true);
-                    if ($maybeFunctionCall !== false
-                        && $tokens[$maybeFunctionCall]['code'] === \T_STRING
-                        && ($tokens[$maybeFunctionCall]['content'] === 'array_slice'
-                        || $tokens[$maybeFunctionCall]['content'] === 'array_splice')
-                    ) {
-                        $parentFuncParamTwo = $this->getFunctionCallParameter($phpcsFile, $maybeFunctionCall, 2);
-                        $number             = $phpcsFile->findNext(
-                            \T_LNUMBER,
-                            $parentFuncParamTwo['start'],
-                            ($parentFuncParamTwo['end'] + 1)
-                        );
-
-                        if ($number !== false && isset($paramNames[$tokens[$number]['content']]) === false) {
-                            // Requesting non-named additional parameters. Ignore.
-                            continue ;
-                        }
-
-                        // Slice starts at a named argument, but we know which params are being accessed.
-                        $paramNamesSubset = \array_slice($paramNames, $tokens[$number]['content']);
-                    }
-                }
-            }
-
-            /*
+				if ($prev !== false && $tokens[$prev]['code'] === \T_OPEN_PARENTHESIS) {
+
+					$maybeFunctionCall = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($prev - 1), null, true);
+					if ($maybeFunctionCall !== false
+						&& $tokens[$maybeFunctionCall]['code'] === \T_STRING
+						&& ($tokens[$maybeFunctionCall]['content'] === 'array_slice'
+						|| $tokens[$maybeFunctionCall]['content'] === 'array_splice')
+					) {
+						$parentFuncParamTwo = $this->getFunctionCallParameter($phpcsFile, $maybeFunctionCall, 2);
+						$number             = $phpcsFile->findNext(
+							\T_LNUMBER,
+							$parentFuncParamTwo['start'],
+							($parentFuncParamTwo['end'] + 1)
+						);
+
+						if ($number !== false && isset($paramNames[$tokens[$number]['content']]) === false) {
+							// Requesting non-named additional parameters. Ignore.
+							continue ;
+						}
+
+						// Slice starts at a named argument, but we know which params are being accessed.
+						$paramNamesSubset = \array_slice($paramNames, $tokens[$number]['content']);
+					}
+				}
+			}
+
+			/*
              * For debug_backtrace(), check if the result is being dereferenced and if so,
              * whether the `args` index is used.
              * I.e. whether `$index` in `debug_backtrace()[$stackFrame][$index]` is a string
@@ -280,160 +280,160 @@ 
              *
              * Note: We already know that $next is the open parenthesis of the function call.
              */
-            if ($foundFunctionName === 'debug_backtrace' && isset($tokens[$next]['parenthesis_closer'])) {
-                $afterParenthesis = $phpcsFile->findNext(
-                    Tokens::$emptyTokens,
-                    ($tokens[$next]['parenthesis_closer'] + 1),
-                    null,
-                    true
-                );
-
-                if ($tokens[$afterParenthesis]['code'] === \T_OPEN_SQUARE_BRACKET
-                    && isset($tokens[$afterParenthesis]['bracket_closer'])
-                ) {
-                    $afterStackFrame = $phpcsFile->findNext(
-                        Tokens::$emptyTokens,
-                        ($tokens[$afterParenthesis]['bracket_closer'] + 1),
-                        null,
-                        true
-                    );
-
-                    if ($tokens[$afterStackFrame]['code'] === \T_OPEN_SQUARE_BRACKET
-                        && isset($tokens[$afterStackFrame]['bracket_closer'])
-                    ) {
-                        $arrayIndex = $phpcsFile->findNext(
-                            \T_CONSTANT_ENCAPSED_STRING,
-                            ($afterStackFrame + 1),
-                            $tokens[$afterStackFrame]['bracket_closer']
-                        );
-
-                        if ($arrayIndex !== false && $this->stripQuotes($tokens[$arrayIndex]['content']) !== 'args') {
-                            continue;
-                        }
-                    }
-                }
-            }
-
-            /*
+			if ($foundFunctionName === 'debug_backtrace' && isset($tokens[$next]['parenthesis_closer'])) {
+				$afterParenthesis = $phpcsFile->findNext(
+					Tokens::$emptyTokens,
+					($tokens[$next]['parenthesis_closer'] + 1),
+					null,
+					true
+				);
+
+				if ($tokens[$afterParenthesis]['code'] === \T_OPEN_SQUARE_BRACKET
+					&& isset($tokens[$afterParenthesis]['bracket_closer'])
+				) {
+					$afterStackFrame = $phpcsFile->findNext(
+						Tokens::$emptyTokens,
+						($tokens[$afterParenthesis]['bracket_closer'] + 1),
+						null,
+						true
+					);
+
+					if ($tokens[$afterStackFrame]['code'] === \T_OPEN_SQUARE_BRACKET
+						&& isset($tokens[$afterStackFrame]['bracket_closer'])
+					) {
+						$arrayIndex = $phpcsFile->findNext(
+							\T_CONSTANT_ENCAPSED_STRING,
+							($afterStackFrame + 1),
+							$tokens[$afterStackFrame]['bracket_closer']
+						);
+
+						if ($arrayIndex !== false && $this->stripQuotes($tokens[$arrayIndex]['content']) !== 'args') {
+							continue;
+						}
+					}
+				}
+			}
+
+			/*
              * Only check for variables before the start of the statement to
              * prevent false positives on the return value of the function call
              * being assigned to one of the parameters, i.e.:
              * `$param = func_get_args();`.
              */
-            $startOfStatement = PHPCSHelper::findStartOfStatement($phpcsFile, $i, $this->ignoreForStartOfStatement);
+			$startOfStatement = PHPCSHelper::findStartOfStatement($phpcsFile, $i, $this->ignoreForStartOfStatement);
 
-            /*
+			/*
              * Ok, so we've found one of the target functions in the right scope.
              * Now, let's check if any of the passed parameters were touched.
              */
-            $scanResult = 'clean';
-            for ($j = ($scopeOpener + 1); $j < $startOfStatement; $j++) {
-                if (isset($this->skipPastNested[$tokens[$j]['type']])
-                    && isset($tokens[$j]['scope_closer'])
-                ) {
-                    // Skip past nested structures.
-                    $j = $tokens[$j]['scope_closer'];
-                    continue;
-                }
-
-                if ($tokens[$j]['code'] !== \T_VARIABLE) {
-                    continue;
-                }
-
-                if ($foundFunctionName === 'func_get_arg' && isset($argNumber)) {
-                    if (isset($paramNames[$argNumber])
-                        && $tokens[$j]['content'] !== $paramNames[$argNumber]
-                    ) {
-                        // Different param than the one requested by func_get_arg().
-                        continue;
-                    }
-                } elseif ($foundFunctionName === 'func_get_args' && isset($paramNamesSubset)) {
-                    if (\in_array($tokens[$j]['content'], $paramNamesSubset, true) === false) {
-                        // Different param than the ones requested by func_get_args().
-                        continue;
-                    }
-                } elseif (\in_array($tokens[$j]['content'], $paramNames, true) === false) {
-                    // Variable is not one of the function parameters.
-                    continue;
-                }
-
-                /*
+			$scanResult = 'clean';
+			for ($j = ($scopeOpener + 1); $j < $startOfStatement; $j++) {
+				if (isset($this->skipPastNested[$tokens[$j]['type']])
+					&& isset($tokens[$j]['scope_closer'])
+				) {
+					// Skip past nested structures.
+					$j = $tokens[$j]['scope_closer'];
+					continue;
+				}
+
+				if ($tokens[$j]['code'] !== \T_VARIABLE) {
+					continue;
+				}
+
+				if ($foundFunctionName === 'func_get_arg' && isset($argNumber)) {
+					if (isset($paramNames[$argNumber])
+						&& $tokens[$j]['content'] !== $paramNames[$argNumber]
+					) {
+						// Different param than the one requested by func_get_arg().
+						continue;
+					}
+				} elseif ($foundFunctionName === 'func_get_args' && isset($paramNamesSubset)) {
+					if (\in_array($tokens[$j]['content'], $paramNamesSubset, true) === false) {
+						// Different param than the ones requested by func_get_args().
+						continue;
+					}
+				} elseif (\in_array($tokens[$j]['content'], $paramNames, true) === false) {
+					// Variable is not one of the function parameters.
+					continue;
+				}
+
+				/*
                  * Ok, so we've found a variable which was passed as one of the parameters.
                  * Now, is this variable being changed, i.e. incremented, decremented or
                  * assigned something ?
                  */
-                $scanResult = 'warning';
-                if (isset($variableToken) === false) {
-                    $variableToken = $j;
-                }
-
-                $beforeVar = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($j - 1), null, true);
-                if ($beforeVar !== false && isset($this->plusPlusMinusMinus[$tokens[$beforeVar]['code']])) {
-                    // Variable is being (pre-)incremented/decremented.
-                    $scanResult    = 'error';
-                    $variableToken = $j;
-                    break;
-                }
-
-                $afterVar = $phpcsFile->findNext(Tokens::$emptyTokens, ($j + 1), null, true);
-                if ($afterVar === false) {
-                    // Shouldn't be possible, but just in case.
-                    continue;
-                }
-
-                if (isset($this->plusPlusMinusMinus[$tokens[$afterVar]['code']])) {
-                    // Variable is being (post-)incremented/decremented.
-                    $scanResult    = 'error';
-                    $variableToken = $j;
-                    break;
-                }
-
-                if ($tokens[$afterVar]['code'] === \T_OPEN_SQUARE_BRACKET
-                    && isset($tokens[$afterVar]['bracket_closer'])
-                ) {
-                    // Skip past array access on the variable.
-                    while (($afterVar = $phpcsFile->findNext(Tokens::$emptyTokens, ($tokens[$afterVar]['bracket_closer'] + 1), null, true)) !== false) {
-                        if ($tokens[$afterVar]['code'] !== \T_OPEN_SQUARE_BRACKET
-                            || isset($tokens[$afterVar]['bracket_closer']) === false
-                        ) {
-                            break;
-                        }
-                    }
-                }
-
-                if ($afterVar !== false
-                    && isset(Tokens::$assignmentTokens[$tokens[$afterVar]['code']])
-                ) {
-                    // Variable is being assigned something.
-                    $scanResult    = 'error';
-                    $variableToken = $j;
-                    break;
-                }
-            }
-
-            unset($argNumber, $paramNamesSubset);
-
-            if ($scanResult === 'clean') {
-                continue;
-            }
-
-            $error = 'Since PHP 7.0, functions inspecting arguments, like %1$s(), no longer report the original value as passed to a parameter, but will instead provide the current value. The parameter "%2$s" was %4$s on line %3$s.';
-            $data  = array(
-                $foundFunctionName,
-                $tokens[$variableToken]['content'],
-                $tokens[$variableToken]['line'],
-            );
-
-            if ($scanResult === 'error') {
-                $data[] = 'changed';
-                $phpcsFile->addError($error, $i, 'Changed', $data);
-
-            } elseif ($scanResult === 'warning') {
-                $data[] = 'used, and possibly changed (by reference),';
-                $phpcsFile->addWarning($error, $i, 'NeedsInspection', $data);
-            }
-
-            unset($variableToken);
-        }
-    }
+				$scanResult = 'warning';
+				if (isset($variableToken) === false) {
+					$variableToken = $j;
+				}
+
+				$beforeVar = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($j - 1), null, true);
+				if ($beforeVar !== false && isset($this->plusPlusMinusMinus[$tokens[$beforeVar]['code']])) {
+					// Variable is being (pre-)incremented/decremented.
+					$scanResult    = 'error';
+					$variableToken = $j;
+					break;
+				}
+
+				$afterVar = $phpcsFile->findNext(Tokens::$emptyTokens, ($j + 1), null, true);
+				if ($afterVar === false) {
+					// Shouldn't be possible, but just in case.
+					continue;
+				}
+
+				if (isset($this->plusPlusMinusMinus[$tokens[$afterVar]['code']])) {
+					// Variable is being (post-)incremented/decremented.
+					$scanResult    = 'error';
+					$variableToken = $j;
+					break;
+				}
+
+				if ($tokens[$afterVar]['code'] === \T_OPEN_SQUARE_BRACKET
+					&& isset($tokens[$afterVar]['bracket_closer'])
+				) {
+					// Skip past array access on the variable.
+					while (($afterVar = $phpcsFile->findNext(Tokens::$emptyTokens, ($tokens[$afterVar]['bracket_closer'] + 1), null, true)) !== false) {
+						if ($tokens[$afterVar]['code'] !== \T_OPEN_SQUARE_BRACKET
+							|| isset($tokens[$afterVar]['bracket_closer']) === false
+						) {
+							break;
+						}
+					}
+				}
+
+				if ($afterVar !== false
+					&& isset(Tokens::$assignmentTokens[$tokens[$afterVar]['code']])
+				) {
+					// Variable is being assigned something.
+					$scanResult    = 'error';
+					$variableToken = $j;
+					break;
+				}
+			}
+
+			unset($argNumber, $paramNamesSubset);
+
+			if ($scanResult === 'clean') {
+				continue;
+			}
+
+			$error = 'Since PHP 7.0, functions inspecting arguments, like %1$s(), no longer report the original value as passed to a parameter, but will instead provide the current value. The parameter "%2$s" was %4$s on line %3$s.';
+			$data  = array(
+				$foundFunctionName,
+				$tokens[$variableToken]['content'],
+				$tokens[$variableToken]['line'],
+			);
+
+			if ($scanResult === 'error') {
+				$data[] = 'changed';
+				$phpcsFile->addError($error, $i, 'Changed', $data);
+
+			} elseif ($scanResult === 'warning') {
+				$data[] = 'used, and possibly changed (by reference),';
+				$phpcsFile->addWarning($error, $i, 'NeedsInspection', $data);
+			}
+
+			unset($variableToken);
+		}
+	}
 }

Spacing +92 added lines, -92 removed lines

@@ -117,48 +117,48 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
-        if ($this->supportsAbove('7.0') === false) {
+        if ( $this->supportsAbove( '7.0' ) === false ) {
             return;
         }
 
         $tokens = $phpcsFile->getTokens();
 
-        if (isset($tokens[$stackPtr]['scope_opener'], $tokens[$stackPtr]['scope_closer']) === false) {
+        if ( isset( $tokens[ $stackPtr ][ 'scope_opener' ], $tokens[ $stackPtr ][ 'scope_closer' ] ) === false ) {
             // Abstract function, interface function, live coding or parse error.
             return;
         }
 
-        $scopeOpener = $tokens[$stackPtr]['scope_opener'];
-        $scopeCloser = $tokens[$stackPtr]['scope_closer'];
+        $scopeOpener = $tokens[ $stackPtr ][ 'scope_opener' ];
+        $scopeCloser = $tokens[ $stackPtr ][ 'scope_closer' ];
 
         // Does the function declaration have parameters ?
-        $params = PHPCSHelper::getMethodParameters($phpcsFile, $stackPtr);
-        if (empty($params)) {
+        $params = PHPCSHelper::getMethodParameters( $phpcsFile, $stackPtr );
+        if ( empty( $params ) ) {
             // No named arguments found, so no risk of them being changed.
             return;
         }
 
         $paramNames = array();
-        foreach ($params as $param) {
-            $paramNames[] = $param['name'];
+        foreach ( $params as $param ) {
+            $paramNames[ ] = $param[ 'name' ];
         }
 
-        for ($i = ($scopeOpener + 1); $i < $scopeCloser; $i++) {
-            if (isset($this->skipPastNested[$tokens[$i]['type']]) && isset($tokens[$i]['scope_closer'])) {
+        for ( $i = ( $scopeOpener + 1 ); $i < $scopeCloser; $i++ ) {
+            if ( isset( $this->skipPastNested[ $tokens[ $i ][ 'type' ] ] ) && isset( $tokens[ $i ][ 'scope_closer' ] ) ) {
                 // Skip past nested structures.
-                $i = $tokens[$i]['scope_closer'];
+                $i = $tokens[ $i ][ 'scope_closer' ];
                 continue;
             }
 
-            if ($tokens[$i]['code'] !== \T_STRING) {
+            if ( $tokens[ $i ][ 'code' ] !== \T_STRING ) {
                 continue;
             }
 
-            $foundFunctionName = strtolower($tokens[$i]['content']);
+            $foundFunctionName = strtolower( $tokens[ $i ][ 'content' ] );
 
-            if (isset($this->changedFunctions[$foundFunctionName]) === false) {
+            if ( isset( $this->changedFunctions[ $foundFunctionName ] ) === false ) {
                 // Not one of the target functions.
                 continue;
             }
@@ -166,22 +166,22 @@ 
             /*
              * Ok, so is this really a function call to one of the PHP native functions ?
              */
-            $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($i + 1), null, true);
-            if ($next === false || $tokens[$next]['code'] !== \T_OPEN_PARENTHESIS) {
+            $next = $phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), null, true );
+            if ( $next === false || $tokens[ $next ][ 'code' ] !== \T_OPEN_PARENTHESIS ) {
                 // Live coding, parse error or not a function call.
                 continue;
             }
 
-            $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($i - 1), null, true);
-            if ($prev !== false) {
-                if (isset($this->noneFunctionCallIndicators[$tokens[$prev]['code']])) {
+            $prev = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $i - 1 ), null, true );
+            if ( $prev !== false ) {
+                if ( isset( $this->noneFunctionCallIndicators[ $tokens[ $prev ][ 'code' ] ] ) ) {
                     continue;
                 }
 
                 // Check for namespaced functions, ie: \foo\bar() not \bar().
-                if ($tokens[ $prev ]['code'] === \T_NS_SEPARATOR) {
-                    $pprev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($prev - 1), null, true);
-                    if ($pprev !== false && $tokens[ $pprev ]['code'] === \T_STRING) {
+                if ( $tokens[ $prev ][ 'code' ] === \T_NS_SEPARATOR ) {
+                    $pprev = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $prev - 1 ), null, true );
+                    if ( $pprev !== false && $tokens[ $pprev ][ 'code' ] === \T_STRING ) {
                         continue;
                     }
                 }
@@ -190,10 +190,10 @@ 
             /*
              * Address some special cases.
              */
-            if ($foundFunctionName !== 'func_get_args') {
-                $paramOne = $this->getFunctionCallParameter($phpcsFile, $i, 1);
-                if ($paramOne !== false) {
-                    switch ($foundFunctionName) {
+            if ( $foundFunctionName !== 'func_get_args' ) {
+                $paramOne = $this->getFunctionCallParameter( $phpcsFile, $i, 1 );
+                if ( $paramOne !== false ) {
+                    switch ( $foundFunctionName ) {
                         /*
                          * Check if `debug_(print_)backtrace()` is called with the
                          * `DEBUG_BACKTRACE_IGNORE_ARGS` option.
@@ -202,13 +202,13 @@ 
                         case 'debug_print_backtrace':
                             $hasIgnoreArgs = $phpcsFile->findNext(
                                 \T_STRING,
-                                $paramOne['start'],
-                                ($paramOne['end'] + 1),
+                                $paramOne[ 'start' ],
+                                ( $paramOne[ 'end' ] + 1 ),
                                 false,
                                 'DEBUG_BACKTRACE_IGNORE_ARGS'
                             );
 
-                            if ($hasIgnoreArgs !== false) {
+                            if ( $hasIgnoreArgs !== false ) {
                                 // Debug_backtrace() called with ignore args option.
                                 continue 2;
                             }
@@ -225,11 +225,11 @@ 
                          *  Should be exceptionally rare and can - if needs be - be addressed at a later stage.}}
                          */
                         case 'func_get_arg':
-                            $number = $phpcsFile->findNext(\T_LNUMBER, $paramOne['start'], ($paramOne['end'] + 1));
-                            if ($number !== false) {
-                                $argNumber = $tokens[$number]['content'];
+                            $number = $phpcsFile->findNext( \T_LNUMBER, $paramOne[ 'start' ], ( $paramOne[ 'end' ] + 1 ) );
+                            if ( $number !== false ) {
+                                $argNumber = $tokens[ $number ][ 'content' ];
 
-                                if (isset($paramNames[$argNumber]) === false) {
+                                if ( isset( $paramNames[ $argNumber ] ) === false ) {
                                     // Requesting a non-named additional parameter. Ignore.
                                     continue 2;
                                 }
@@ -246,28 +246,28 @@ 
                  * {@internal Note: This does not take offset calculations into account!
                  *  Should be exceptionally rare and can - if needs be - be addressed at a later stage.}}
                  */
-                if ($prev !== false && $tokens[$prev]['code'] === \T_OPEN_PARENTHESIS) {
+                if ( $prev !== false && $tokens[ $prev ][ 'code' ] === \T_OPEN_PARENTHESIS ) {
 
-                    $maybeFunctionCall = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($prev - 1), null, true);
-                    if ($maybeFunctionCall !== false
-                        && $tokens[$maybeFunctionCall]['code'] === \T_STRING
-                        && ($tokens[$maybeFunctionCall]['content'] === 'array_slice'
-                        || $tokens[$maybeFunctionCall]['content'] === 'array_splice')
+                    $maybeFunctionCall = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $prev - 1 ), null, true );
+                    if ( $maybeFunctionCall !== false
+                        && $tokens[ $maybeFunctionCall ][ 'code' ] === \T_STRING
+                        && ( $tokens[ $maybeFunctionCall ][ 'content' ] === 'array_slice'
+                        || $tokens[ $maybeFunctionCall ][ 'content' ] === 'array_splice' )
                     ) {
-                        $parentFuncParamTwo = $this->getFunctionCallParameter($phpcsFile, $maybeFunctionCall, 2);
+                        $parentFuncParamTwo = $this->getFunctionCallParameter( $phpcsFile, $maybeFunctionCall, 2 );
                         $number             = $phpcsFile->findNext(
                             \T_LNUMBER,
-                            $parentFuncParamTwo['start'],
-                            ($parentFuncParamTwo['end'] + 1)
+                            $parentFuncParamTwo[ 'start' ],
+                            ( $parentFuncParamTwo[ 'end' ] + 1 )
                         );
 
-                        if ($number !== false && isset($paramNames[$tokens[$number]['content']]) === false) {
+                        if ( $number !== false && isset( $paramNames[ $tokens[ $number ][ 'content' ] ] ) === false ) {
                             // Requesting non-named additional parameters. Ignore.
-                            continue ;
+                            continue;
                         }
 
                         // Slice starts at a named argument, but we know which params are being accessed.
-                        $paramNamesSubset = \array_slice($paramNames, $tokens[$number]['content']);
+                        $paramNamesSubset = \array_slice( $paramNames, $tokens[ $number ][ 'content' ] );
                     }
                 }
             }
@@ -280,34 +280,34 @@ 
              *
              * Note: We already know that $next is the open parenthesis of the function call.
              */
-            if ($foundFunctionName === 'debug_backtrace' && isset($tokens[$next]['parenthesis_closer'])) {
+            if ( $foundFunctionName === 'debug_backtrace' && isset( $tokens[ $next ][ 'parenthesis_closer' ] ) ) {
                 $afterParenthesis = $phpcsFile->findNext(
                     Tokens::$emptyTokens,
-                    ($tokens[$next]['parenthesis_closer'] + 1),
+                    ( $tokens[ $next ][ 'parenthesis_closer' ] + 1 ),
                     null,
                     true
                 );
 
-                if ($tokens[$afterParenthesis]['code'] === \T_OPEN_SQUARE_BRACKET
-                    && isset($tokens[$afterParenthesis]['bracket_closer'])
+                if ( $tokens[ $afterParenthesis ][ 'code' ] === \T_OPEN_SQUARE_BRACKET
+                    && isset( $tokens[ $afterParenthesis ][ 'bracket_closer' ] )
                 ) {
                     $afterStackFrame = $phpcsFile->findNext(
                         Tokens::$emptyTokens,
-                        ($tokens[$afterParenthesis]['bracket_closer'] + 1),
+                        ( $tokens[ $afterParenthesis ][ 'bracket_closer' ] + 1 ),
                         null,
                         true
                     );
 
-                    if ($tokens[$afterStackFrame]['code'] === \T_OPEN_SQUARE_BRACKET
-                        && isset($tokens[$afterStackFrame]['bracket_closer'])
+                    if ( $tokens[ $afterStackFrame ][ 'code' ] === \T_OPEN_SQUARE_BRACKET
+                        && isset( $tokens[ $afterStackFrame ][ 'bracket_closer' ] )
                     ) {
                         $arrayIndex = $phpcsFile->findNext(
                             \T_CONSTANT_ENCAPSED_STRING,
-                            ($afterStackFrame + 1),
-                            $tokens[$afterStackFrame]['bracket_closer']
+                            ( $afterStackFrame + 1 ),
+                            $tokens[ $afterStackFrame ][ 'bracket_closer' ]
                         );
 
-                        if ($arrayIndex !== false && $this->stripQuotes($tokens[$arrayIndex]['content']) !== 'args') {
+                        if ( $arrayIndex !== false && $this->stripQuotes( $tokens[ $arrayIndex ][ 'content' ] ) !== 'args' ) {
                             continue;
                         }
                     }
@@ -320,39 +320,39 @@ 
              * being assigned to one of the parameters, i.e.:
              * `$param = func_get_args();`.
              */
-            $startOfStatement = PHPCSHelper::findStartOfStatement($phpcsFile, $i, $this->ignoreForStartOfStatement);
+            $startOfStatement = PHPCSHelper::findStartOfStatement( $phpcsFile, $i, $this->ignoreForStartOfStatement );
 
             /*
              * Ok, so we've found one of the target functions in the right scope.
              * Now, let's check if any of the passed parameters were touched.
              */
             $scanResult = 'clean';
-            for ($j = ($scopeOpener + 1); $j < $startOfStatement; $j++) {
-                if (isset($this->skipPastNested[$tokens[$j]['type']])
-                    && isset($tokens[$j]['scope_closer'])
+            for ( $j = ( $scopeOpener + 1 ); $j < $startOfStatement; $j++ ) {
+                if ( isset( $this->skipPastNested[ $tokens[ $j ][ 'type' ] ] )
+                    && isset( $tokens[ $j ][ 'scope_closer' ] )
                 ) {
                     // Skip past nested structures.
-                    $j = $tokens[$j]['scope_closer'];
+                    $j = $tokens[ $j ][ 'scope_closer' ];
                     continue;
                 }
 
-                if ($tokens[$j]['code'] !== \T_VARIABLE) {
+                if ( $tokens[ $j ][ 'code' ] !== \T_VARIABLE ) {
                     continue;
                 }
 
-                if ($foundFunctionName === 'func_get_arg' && isset($argNumber)) {
-                    if (isset($paramNames[$argNumber])
-                        && $tokens[$j]['content'] !== $paramNames[$argNumber]
+                if ( $foundFunctionName === 'func_get_arg' && isset( $argNumber ) ) {
+                    if ( isset( $paramNames[ $argNumber ] )
+                        && $tokens[ $j ][ 'content' ] !== $paramNames[ $argNumber ]
                     ) {
                         // Different param than the one requested by func_get_arg().
                         continue;
                     }
-                } elseif ($foundFunctionName === 'func_get_args' && isset($paramNamesSubset)) {
-                    if (\in_array($tokens[$j]['content'], $paramNamesSubset, true) === false) {
+                } elseif ( $foundFunctionName === 'func_get_args' && isset( $paramNamesSubset ) ) {
+                    if ( \in_array( $tokens[ $j ][ 'content' ], $paramNamesSubset, true ) === false ) {
                         // Different param than the ones requested by func_get_args().
                         continue;
                     }
-                } elseif (\in_array($tokens[$j]['content'], $paramNames, true) === false) {
+                } elseif ( \in_array( $tokens[ $j ][ 'content' ], $paramNames, true ) === false ) {
                     // Variable is not one of the function parameters.
                     continue;
                 }
@@ -363,46 +363,46 @@ 
                  * assigned something ?
                  */
                 $scanResult = 'warning';
-                if (isset($variableToken) === false) {
+                if ( isset( $variableToken ) === false ) {
                     $variableToken = $j;
                 }
 
-                $beforeVar = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($j - 1), null, true);
-                if ($beforeVar !== false && isset($this->plusPlusMinusMinus[$tokens[$beforeVar]['code']])) {
+                $beforeVar = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $j - 1 ), null, true );
+                if ( $beforeVar !== false && isset( $this->plusPlusMinusMinus[ $tokens[ $beforeVar ][ 'code' ] ] ) ) {
                     // Variable is being (pre-)incremented/decremented.
                     $scanResult    = 'error';
                     $variableToken = $j;
                     break;
                 }
 
-                $afterVar = $phpcsFile->findNext(Tokens::$emptyTokens, ($j + 1), null, true);
-                if ($afterVar === false) {
+                $afterVar = $phpcsFile->findNext( Tokens::$emptyTokens, ( $j + 1 ), null, true );
+                if ( $afterVar === false ) {
                     // Shouldn't be possible, but just in case.
                     continue;
                 }
 
-                if (isset($this->plusPlusMinusMinus[$tokens[$afterVar]['code']])) {
+                if ( isset( $this->plusPlusMinusMinus[ $tokens[ $afterVar ][ 'code' ] ] ) ) {
                     // Variable is being (post-)incremented/decremented.
                     $scanResult    = 'error';
                     $variableToken = $j;
                     break;
                 }
 
-                if ($tokens[$afterVar]['code'] === \T_OPEN_SQUARE_BRACKET
-                    && isset($tokens[$afterVar]['bracket_closer'])
+                if ( $tokens[ $afterVar ][ 'code' ] === \T_OPEN_SQUARE_BRACKET
+                    && isset( $tokens[ $afterVar ][ 'bracket_closer' ] )
                 ) {
                     // Skip past array access on the variable.
-                    while (($afterVar = $phpcsFile->findNext(Tokens::$emptyTokens, ($tokens[$afterVar]['bracket_closer'] + 1), null, true)) !== false) {
-                        if ($tokens[$afterVar]['code'] !== \T_OPEN_SQUARE_BRACKET
-                            || isset($tokens[$afterVar]['bracket_closer']) === false
+                    while ( ( $afterVar = $phpcsFile->findNext( Tokens::$emptyTokens, ( $tokens[ $afterVar ][ 'bracket_closer' ] + 1 ), null, true ) ) !== false ) {
+                        if ( $tokens[ $afterVar ][ 'code' ] !== \T_OPEN_SQUARE_BRACKET
+                            || isset( $tokens[ $afterVar ][ 'bracket_closer' ] ) === false
                         ) {
                             break;
                         }
                     }
                 }
 
-                if ($afterVar !== false
-                    && isset(Tokens::$assignmentTokens[$tokens[$afterVar]['code']])
+                if ( $afterVar !== false
+                    && isset( Tokens::$assignmentTokens[ $tokens[ $afterVar ][ 'code' ] ] )
                 ) {
                     // Variable is being assigned something.
                     $scanResult    = 'error';
@@ -411,29 +411,29 @@ 
                 }
             }
 
-            unset($argNumber, $paramNamesSubset);
+            unset( $argNumber, $paramNamesSubset );
 
-            if ($scanResult === 'clean') {
+            if ( $scanResult === 'clean' ) {
                 continue;
             }
 
             $error = 'Since PHP 7.0, functions inspecting arguments, like %1$s(), no longer report the original value as passed to a parameter, but will instead provide the current value. The parameter "%2$s" was %4$s on line %3$s.';
             $data  = array(
                 $foundFunctionName,
-                $tokens[$variableToken]['content'],
-                $tokens[$variableToken]['line'],
+                $tokens[ $variableToken ][ 'content' ],
+                $tokens[ $variableToken ][ 'line' ],
             );
 
-            if ($scanResult === 'error') {
-                $data[] = 'changed';
-                $phpcsFile->addError($error, $i, 'Changed', $data);
+            if ( $scanResult === 'error' ) {
+                $data[ ] = 'changed';
+                $phpcsFile->addError( $error, $i, 'Changed', $data );
 
-            } elseif ($scanResult === 'warning') {
-                $data[] = 'used, and possibly changed (by reference),';
-                $phpcsFile->addWarning($error, $i, 'NeedsInspection', $data);
+            } elseif ( $scanResult === 'warning' ) {
+                $data[ ] = 'used, and possibly changed (by reference),';
+                $phpcsFile->addWarning( $error, $i, 'NeedsInspection', $data );
             }
 
-            unset($variableToken);
+            unset( $variableToken );
         }
     }
 }

Braces +3 added lines, -6 removed lines

@@ -27,8 +27,7 @@ 
  *
  * @since 9.1.0
  */
-class ArgumentFunctionsReportCurrentValueSniff extends Sniff
-{
+class ArgumentFunctionsReportCurrentValueSniff extends Sniff {
 
     /**
      * A list of functions that, when called, can behave differently in PHP 7
@@ -100,8 +99,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(
             \T_FUNCTION,
             \T_CLOSURE,
@@ -117,8 +115,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         if ($this->supportsAbove('7.0') === false) {
             return;
         }