gravityview / GravityView

vendor/phpcompatibility/php-compatibility/PHPCompatibility/Sniffs/ControlStructures/DiscouragedSwitchContinueSniff.php

Indentation +191 added lines, -191 removed lines

@@ -29,195 +29,195 @@
 class DiscouragedSwitchContinueSniff extends Sniff
 {
 
-    /**
-     * Token codes of control structures which can be targeted using continue.
-     *
-     * @var array
-     */
-    protected $loopStructures = array(
-        \T_FOR     => \T_FOR,
-        \T_FOREACH => \T_FOREACH,
-        \T_WHILE   => \T_WHILE,
-        \T_DO      => \T_DO,
-        \T_SWITCH  => \T_SWITCH,
-    );
-
-    /**
-     * Tokens which start a new case within a switch.
-     *
-     * @var array
-     */
-    protected $caseTokens = array(
-        \T_CASE    => \T_CASE,
-        \T_DEFAULT => \T_DEFAULT,
-    );
-
-    /**
-     * Token codes which are accepted to determine the level for the continue.
-     *
-     * This array is enriched with the arithmetic operators in the register() method.
-     *
-     * @var array
-     */
-    protected $acceptedLevelTokens = array(
-        \T_LNUMBER           => \T_LNUMBER,
-        \T_OPEN_PARENTHESIS  => \T_OPEN_PARENTHESIS,
-        \T_CLOSE_PARENTHESIS => \T_CLOSE_PARENTHESIS,
-    );
-
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        $this->acceptedLevelTokens += Tokens::$arithmeticTokens;
-        $this->acceptedLevelTokens += Tokens::$emptyTokens;
-
-        return array(\T_SWITCH);
-    }
-
-    /**
-     * 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.3') === false) {
-            return;
-        }
-
-        $tokens = $phpcsFile->getTokens();
-
-        if (isset($tokens[$stackPtr]['scope_opener'], $tokens[$stackPtr]['scope_closer']) === false) {
-            return;
-        }
-
-        $switchOpener = $tokens[$stackPtr]['scope_opener'];
-        $switchCloser = $tokens[$stackPtr]['scope_closer'];
-
-        // Quick check whether we need to bother with the more complex logic.
-        $hasContinue = $phpcsFile->findNext(\T_CONTINUE, ($switchOpener + 1), $switchCloser);
-        if ($hasContinue === false) {
-            return;
-        }
-
-        $caseDefault = $switchOpener;
-
-        do {
-            $caseDefault = $phpcsFile->findNext($this->caseTokens, ($caseDefault + 1), $switchCloser);
-            if ($caseDefault === false) {
-                break;
-            }
-
-            if (isset($tokens[$caseDefault]['scope_opener']) === false) {
-                // Unknown start of the case, skip.
-                continue;
-            }
-
-            $caseOpener      = $tokens[$caseDefault]['scope_opener'];
-            $nextCaseDefault = $phpcsFile->findNext($this->caseTokens, ($caseDefault + 1), $switchCloser);
-            if ($nextCaseDefault === false) {
-                $caseCloser = $switchCloser;
-            } else {
-                $caseCloser = $nextCaseDefault;
-            }
-
-            // Check for unscoped control structures within the case.
-            $controlStructure = $caseOpener;
-            $doCount          = 0;
-            while (($controlStructure = $phpcsFile->findNext($this->loopStructures, ($controlStructure + 1), $caseCloser)) !== false) {
-                if ($tokens[$controlStructure]['code'] === \T_DO) {
-                    $doCount++;
-                }
-
-                if (isset($tokens[$controlStructure]['scope_opener'], $tokens[$controlStructure]['scope_closer']) === false) {
-                    if ($tokens[$controlStructure]['code'] === \T_WHILE && $doCount > 0) {
-                        // While in a do-while construct.
-                        $doCount--;
-                        continue;
-                    }
-
-                    // Control structure without braces found within the case, ignore this case.
-                    continue 2;
-                }
-            }
-
-            // Examine the contents of the case.
-            $continue = $caseOpener;
-
-            do {
-                $continue = $phpcsFile->findNext(\T_CONTINUE, ($continue + 1), $caseCloser);
-                if ($continue === false) {
-                    break;
-                }
-
-                $nextSemicolon = $phpcsFile->findNext(array(\T_SEMICOLON, \T_CLOSE_TAG), ($continue + 1), $caseCloser);
-                $codeString    = '';
-                for ($i = ($continue + 1); $i < $nextSemicolon; $i++) {
-                    if (isset($this->acceptedLevelTokens[$tokens[$i]['code']]) === false) {
-                        // Function call/variable or other token which make numeric level impossible to determine.
-                        continue 2;
-                    }
-
-                    if (isset(Tokens::$emptyTokens[$tokens[$i]['code']]) === true) {
-                        continue;
-                    }
-
-                    $codeString .= $tokens[$i]['content'];
-                }
-
-                $level = null;
-                if ($codeString !== '') {
-                    if (is_numeric($codeString)) {
-                        $level = (int) $codeString;
-                    } else {
-                        // With the above logic, the string can only contain digits and operators, eval!
-                        $level = eval("return ( $codeString );");
-                    }
-                }
-
-                if (isset($level) === false || $level === 0) {
-                    $level = 1;
-                }
-
-                // Examine which control structure is being targeted by the continue statement.
-                if (isset($tokens[$continue]['conditions']) === false) {
-                    continue;
-                }
-
-                $conditions = array_reverse($tokens[$continue]['conditions'], true);
-                // PHPCS adds more structures to the conditions array than we want to take into
-                // consideration, so clean up the array.
-                foreach ($conditions as $tokenPtr => $tokenCode) {
-                    if (isset($this->loopStructures[$tokenCode]) === false) {
-                        unset($conditions[$tokenPtr]);
-                    }
-                }
-
-                $targetCondition = \array_slice($conditions, ($level - 1), 1, true);
-                if (empty($targetCondition)) {
-                    continue;
-                }
-
-                $conditionToken = key($targetCondition);
-                if ($conditionToken === $stackPtr) {
-                    $phpcsFile->addWarning(
-                        "Targeting a 'switch' control structure with a 'continue' statement is strongly discouraged and will throw a warning as of PHP 7.3.",
-                        $continue,
-                        'Found'
-                    );
-                }
-
-            } while ($continue < $caseCloser);
-
-        } while ($caseDefault < $switchCloser);
-    }
+	/**
+	 * Token codes of control structures which can be targeted using continue.
+	 *
+	 * @var array
+	 */
+	protected $loopStructures = array(
+		\T_FOR     => \T_FOR,
+		\T_FOREACH => \T_FOREACH,
+		\T_WHILE   => \T_WHILE,
+		\T_DO      => \T_DO,
+		\T_SWITCH  => \T_SWITCH,
+	);
+
+	/**
+	 * Tokens which start a new case within a switch.
+	 *
+	 * @var array
+	 */
+	protected $caseTokens = array(
+		\T_CASE    => \T_CASE,
+		\T_DEFAULT => \T_DEFAULT,
+	);
+
+	/**
+	 * Token codes which are accepted to determine the level for the continue.
+	 *
+	 * This array is enriched with the arithmetic operators in the register() method.
+	 *
+	 * @var array
+	 */
+	protected $acceptedLevelTokens = array(
+		\T_LNUMBER           => \T_LNUMBER,
+		\T_OPEN_PARENTHESIS  => \T_OPEN_PARENTHESIS,
+		\T_CLOSE_PARENTHESIS => \T_CLOSE_PARENTHESIS,
+	);
+
+
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		$this->acceptedLevelTokens += Tokens::$arithmeticTokens;
+		$this->acceptedLevelTokens += Tokens::$emptyTokens;
+
+		return array(\T_SWITCH);
+	}
+
+	/**
+	 * 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.3') === false) {
+			return;
+		}
+
+		$tokens = $phpcsFile->getTokens();
+
+		if (isset($tokens[$stackPtr]['scope_opener'], $tokens[$stackPtr]['scope_closer']) === false) {
+			return;
+		}
+
+		$switchOpener = $tokens[$stackPtr]['scope_opener'];
+		$switchCloser = $tokens[$stackPtr]['scope_closer'];
+
+		// Quick check whether we need to bother with the more complex logic.
+		$hasContinue = $phpcsFile->findNext(\T_CONTINUE, ($switchOpener + 1), $switchCloser);
+		if ($hasContinue === false) {
+			return;
+		}
+
+		$caseDefault = $switchOpener;
+
+		do {
+			$caseDefault = $phpcsFile->findNext($this->caseTokens, ($caseDefault + 1), $switchCloser);
+			if ($caseDefault === false) {
+				break;
+			}
+
+			if (isset($tokens[$caseDefault]['scope_opener']) === false) {
+				// Unknown start of the case, skip.
+				continue;
+			}
+
+			$caseOpener      = $tokens[$caseDefault]['scope_opener'];
+			$nextCaseDefault = $phpcsFile->findNext($this->caseTokens, ($caseDefault + 1), $switchCloser);
+			if ($nextCaseDefault === false) {
+				$caseCloser = $switchCloser;
+			} else {
+				$caseCloser = $nextCaseDefault;
+			}
+
+			// Check for unscoped control structures within the case.
+			$controlStructure = $caseOpener;
+			$doCount          = 0;
+			while (($controlStructure = $phpcsFile->findNext($this->loopStructures, ($controlStructure + 1), $caseCloser)) !== false) {
+				if ($tokens[$controlStructure]['code'] === \T_DO) {
+					$doCount++;
+				}
+
+				if (isset($tokens[$controlStructure]['scope_opener'], $tokens[$controlStructure]['scope_closer']) === false) {
+					if ($tokens[$controlStructure]['code'] === \T_WHILE && $doCount > 0) {
+						// While in a do-while construct.
+						$doCount--;
+						continue;
+					}
+
+					// Control structure without braces found within the case, ignore this case.
+					continue 2;
+				}
+			}
+
+			// Examine the contents of the case.
+			$continue = $caseOpener;
+
+			do {
+				$continue = $phpcsFile->findNext(\T_CONTINUE, ($continue + 1), $caseCloser);
+				if ($continue === false) {
+					break;
+				}
+
+				$nextSemicolon = $phpcsFile->findNext(array(\T_SEMICOLON, \T_CLOSE_TAG), ($continue + 1), $caseCloser);
+				$codeString    = '';
+				for ($i = ($continue + 1); $i < $nextSemicolon; $i++) {
+					if (isset($this->acceptedLevelTokens[$tokens[$i]['code']]) === false) {
+						// Function call/variable or other token which make numeric level impossible to determine.
+						continue 2;
+					}
+
+					if (isset(Tokens::$emptyTokens[$tokens[$i]['code']]) === true) {
+						continue;
+					}
+
+					$codeString .= $tokens[$i]['content'];
+				}
+
+				$level = null;
+				if ($codeString !== '') {
+					if (is_numeric($codeString)) {
+						$level = (int) $codeString;
+					} else {
+						// With the above logic, the string can only contain digits and operators, eval!
+						$level = eval("return ( $codeString );");
+					}
+				}
+
+				if (isset($level) === false || $level === 0) {
+					$level = 1;
+				}
+
+				// Examine which control structure is being targeted by the continue statement.
+				if (isset($tokens[$continue]['conditions']) === false) {
+					continue;
+				}
+
+				$conditions = array_reverse($tokens[$continue]['conditions'], true);
+				// PHPCS adds more structures to the conditions array than we want to take into
+				// consideration, so clean up the array.
+				foreach ($conditions as $tokenPtr => $tokenCode) {
+					if (isset($this->loopStructures[$tokenCode]) === false) {
+						unset($conditions[$tokenPtr]);
+					}
+				}
+
+				$targetCondition = \array_slice($conditions, ($level - 1), 1, true);
+				if (empty($targetCondition)) {
+					continue;
+				}
+
+				$conditionToken = key($targetCondition);
+				if ($conditionToken === $stackPtr) {
+					$phpcsFile->addWarning(
+						"Targeting a 'switch' control structure with a 'continue' statement is strongly discouraged and will throw a warning as of PHP 7.3.",
+						$continue,
+						'Found'
+					);
+				}
+
+			} while ($continue < $caseCloser);
+
+		} while ($caseDefault < $switchCloser);
+	}
 }

Spacing +41 added lines, -41 removed lines

@@ -76,7 +76,7 @@ 
         $this->acceptedLevelTokens += Tokens::$arithmeticTokens;
         $this->acceptedLevelTokens += Tokens::$emptyTokens;
 
-        return array(\T_SWITCH);
+        return array( \T_SWITCH );
     }
 
     /**
@@ -88,43 +88,43 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
-        if ($this->supportsAbove('7.3') === false) {
+        if ( $this->supportsAbove( '7.3' ) === 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 ) {
             return;
         }
 
-        $switchOpener = $tokens[$stackPtr]['scope_opener'];
-        $switchCloser = $tokens[$stackPtr]['scope_closer'];
+        $switchOpener = $tokens[ $stackPtr ][ 'scope_opener' ];
+        $switchCloser = $tokens[ $stackPtr ][ 'scope_closer' ];
 
         // Quick check whether we need to bother with the more complex logic.
-        $hasContinue = $phpcsFile->findNext(\T_CONTINUE, ($switchOpener + 1), $switchCloser);
-        if ($hasContinue === false) {
+        $hasContinue = $phpcsFile->findNext( \T_CONTINUE, ( $switchOpener + 1 ), $switchCloser );
+        if ( $hasContinue === false ) {
             return;
         }
 
         $caseDefault = $switchOpener;
 
         do {
-            $caseDefault = $phpcsFile->findNext($this->caseTokens, ($caseDefault + 1), $switchCloser);
-            if ($caseDefault === false) {
+            $caseDefault = $phpcsFile->findNext( $this->caseTokens, ( $caseDefault + 1 ), $switchCloser );
+            if ( $caseDefault === false ) {
                 break;
             }
 
-            if (isset($tokens[$caseDefault]['scope_opener']) === false) {
+            if ( isset( $tokens[ $caseDefault ][ 'scope_opener' ] ) === false ) {
                 // Unknown start of the case, skip.
                 continue;
             }
 
-            $caseOpener      = $tokens[$caseDefault]['scope_opener'];
-            $nextCaseDefault = $phpcsFile->findNext($this->caseTokens, ($caseDefault + 1), $switchCloser);
-            if ($nextCaseDefault === false) {
+            $caseOpener      = $tokens[ $caseDefault ][ 'scope_opener' ];
+            $nextCaseDefault = $phpcsFile->findNext( $this->caseTokens, ( $caseDefault + 1 ), $switchCloser );
+            if ( $nextCaseDefault === false ) {
                 $caseCloser = $switchCloser;
             } else {
                 $caseCloser = $nextCaseDefault;
@@ -133,13 +133,13 @@ 
             // Check for unscoped control structures within the case.
             $controlStructure = $caseOpener;
             $doCount          = 0;
-            while (($controlStructure = $phpcsFile->findNext($this->loopStructures, ($controlStructure + 1), $caseCloser)) !== false) {
-                if ($tokens[$controlStructure]['code'] === \T_DO) {
+            while ( ( $controlStructure = $phpcsFile->findNext( $this->loopStructures, ( $controlStructure + 1 ), $caseCloser ) ) !== false ) {
+                if ( $tokens[ $controlStructure ][ 'code' ] === \T_DO ) {
                     $doCount++;
                 }
 
-                if (isset($tokens[$controlStructure]['scope_opener'], $tokens[$controlStructure]['scope_closer']) === false) {
-                    if ($tokens[$controlStructure]['code'] === \T_WHILE && $doCount > 0) {
+                if ( isset( $tokens[ $controlStructure ][ 'scope_opener' ], $tokens[ $controlStructure ][ 'scope_closer' ] ) === false ) {
+                    if ( $tokens[ $controlStructure ][ 'code' ] === \T_WHILE && $doCount > 0 ) {
                         // While in a do-while construct.
                         $doCount--;
                         continue;
@@ -154,61 +154,61 @@ 
             $continue = $caseOpener;
 
             do {
-                $continue = $phpcsFile->findNext(\T_CONTINUE, ($continue + 1), $caseCloser);
-                if ($continue === false) {
+                $continue = $phpcsFile->findNext( \T_CONTINUE, ( $continue + 1 ), $caseCloser );
+                if ( $continue === false ) {
                     break;
                 }
 
-                $nextSemicolon = $phpcsFile->findNext(array(\T_SEMICOLON, \T_CLOSE_TAG), ($continue + 1), $caseCloser);
+                $nextSemicolon = $phpcsFile->findNext( array( \T_SEMICOLON, \T_CLOSE_TAG ), ( $continue + 1 ), $caseCloser );
                 $codeString    = '';
-                for ($i = ($continue + 1); $i < $nextSemicolon; $i++) {
-                    if (isset($this->acceptedLevelTokens[$tokens[$i]['code']]) === false) {
+                for ( $i = ( $continue + 1 ); $i < $nextSemicolon; $i++ ) {
+                    if ( isset( $this->acceptedLevelTokens[ $tokens[ $i ][ 'code' ] ] ) === false ) {
                         // Function call/variable or other token which make numeric level impossible to determine.
                         continue 2;
                     }
 
-                    if (isset(Tokens::$emptyTokens[$tokens[$i]['code']]) === true) {
+                    if ( isset( Tokens::$emptyTokens[ $tokens[ $i ][ 'code' ] ] ) === true ) {
                         continue;
                     }
 
-                    $codeString .= $tokens[$i]['content'];
+                    $codeString .= $tokens[ $i ][ 'content' ];
                 }
 
                 $level = null;
-                if ($codeString !== '') {
-                    if (is_numeric($codeString)) {
-                        $level = (int) $codeString;
+                if ( $codeString !== '' ) {
+                    if ( is_numeric( $codeString ) ) {
+                        $level = (int)$codeString;
                     } else {
                         // With the above logic, the string can only contain digits and operators, eval!
-                        $level = eval("return ( $codeString );");
+                        $level = eval( "return ( $codeString );" );
                     }
                 }
 
-                if (isset($level) === false || $level === 0) {
+                if ( isset( $level ) === false || $level === 0 ) {
                     $level = 1;
                 }
 
                 // Examine which control structure is being targeted by the continue statement.
-                if (isset($tokens[$continue]['conditions']) === false) {
+                if ( isset( $tokens[ $continue ][ 'conditions' ] ) === false ) {
                     continue;
                 }
 
-                $conditions = array_reverse($tokens[$continue]['conditions'], true);
+                $conditions = array_reverse( $tokens[ $continue ][ 'conditions' ], true );
                 // PHPCS adds more structures to the conditions array than we want to take into
                 // consideration, so clean up the array.
-                foreach ($conditions as $tokenPtr => $tokenCode) {
-                    if (isset($this->loopStructures[$tokenCode]) === false) {
-                        unset($conditions[$tokenPtr]);
+                foreach ( $conditions as $tokenPtr => $tokenCode ) {
+                    if ( isset( $this->loopStructures[ $tokenCode ] ) === false ) {
+                        unset( $conditions[ $tokenPtr ] );
                     }
                 }
 
-                $targetCondition = \array_slice($conditions, ($level - 1), 1, true);
-                if (empty($targetCondition)) {
+                $targetCondition = \array_slice( $conditions, ( $level - 1 ), 1, true );
+                if ( empty( $targetCondition ) ) {
                     continue;
                 }
 
-                $conditionToken = key($targetCondition);
-                if ($conditionToken === $stackPtr) {
+                $conditionToken = key( $targetCondition );
+                if ( $conditionToken === $stackPtr ) {
                     $phpcsFile->addWarning(
                         "Targeting a 'switch' control structure with a 'continue' statement is strongly discouraged and will throw a warning as of PHP 7.3.",
                         $continue,
@@ -216,8 +216,8 @@ 
                     );
                 }
 
-            } while ($continue < $caseCloser);
+            } while ( $continue < $caseCloser );
 
-        } while ($caseDefault < $switchCloser);
+        } while ( $caseDefault < $switchCloser );
     }
 }

Braces +3 added lines, -6 removed lines

@@ -26,8 +26,7 @@ 
  * @package  PHPCompatibility
  * @author   Juliette Reinders Folmer <phpcompatibility_nospam@adviesenzo.nl>
  */
-class DiscouragedSwitchContinueSniff extends Sniff
-{
+class DiscouragedSwitchContinueSniff extends Sniff {
 
     /**
      * Token codes of control structures which can be targeted using continue.
@@ -71,8 +70,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         $this->acceptedLevelTokens += Tokens::$arithmeticTokens;
         $this->acceptedLevelTokens += Tokens::$emptyTokens;
 
@@ -88,8 +86,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         if ($this->supportsAbove('7.3') === 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/ControlStructures/ForbiddenBreakContinueVariableArgumentsSniff.php

Indentation +61 added lines, -61 removed lines

@@ -30,72 +30,72 @@
  */
 class ForbiddenBreakContinueVariableArgumentsSniff extends Sniff
 {
-    /**
-     * Error types this sniff handles for forbidden break/continue arguments.
-     *
-     * Array key is the error code. Array value will be used as part of the error message.
-     *
-     * @var array
-     */
-    private $errorTypes = array(
-        'variableArgument' => 'a variable argument',
-        'zeroArgument'     => '0 as an argument',
-    );
+	/**
+	 * Error types this sniff handles for forbidden break/continue arguments.
+	 *
+	 * Array key is the error code. Array value will be used as part of the error message.
+	 *
+	 * @var array
+	 */
+	private $errorTypes = array(
+		'variableArgument' => 'a variable argument',
+		'zeroArgument'     => '0 as an argument',
+	);
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(\T_BREAK, \T_CONTINUE);
-    }
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return array(\T_BREAK, \T_CONTINUE);
+	}
 
-    /**
-     * 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.4') === 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('5.4') === false) {
+			return;
+		}
 
-        $tokens             = $phpcsFile->getTokens();
-        $nextSemicolonToken = $phpcsFile->findNext(array(\T_SEMICOLON, \T_CLOSE_TAG), ($stackPtr), null, false);
-        $errorType          = '';
-        for ($curToken = $stackPtr + 1; $curToken < $nextSemicolonToken; $curToken++) {
-            if ($tokens[$curToken]['type'] === 'T_STRING') {
-                // If the next non-whitespace token after the string
-                // is an opening parenthesis then it's a function call.
-                $openBracket = $phpcsFile->findNext(Tokens::$emptyTokens, $curToken + 1, null, true);
-                if ($tokens[$openBracket]['code'] === \T_OPEN_PARENTHESIS) {
-                    $errorType = 'variableArgument';
-                    break;
-                }
+		$tokens             = $phpcsFile->getTokens();
+		$nextSemicolonToken = $phpcsFile->findNext(array(\T_SEMICOLON, \T_CLOSE_TAG), ($stackPtr), null, false);
+		$errorType          = '';
+		for ($curToken = $stackPtr + 1; $curToken < $nextSemicolonToken; $curToken++) {
+			if ($tokens[$curToken]['type'] === 'T_STRING') {
+				// If the next non-whitespace token after the string
+				// is an opening parenthesis then it's a function call.
+				$openBracket = $phpcsFile->findNext(Tokens::$emptyTokens, $curToken + 1, null, true);
+				if ($tokens[$openBracket]['code'] === \T_OPEN_PARENTHESIS) {
+					$errorType = 'variableArgument';
+					break;
+				}
 
-            } elseif (\in_array($tokens[$curToken]['type'], array('T_VARIABLE', 'T_FUNCTION', 'T_CLOSURE'), true)) {
-                $errorType = 'variableArgument';
-                break;
+			} elseif (\in_array($tokens[$curToken]['type'], array('T_VARIABLE', 'T_FUNCTION', 'T_CLOSURE'), true)) {
+				$errorType = 'variableArgument';
+				break;
 
-            } elseif ($tokens[$curToken]['type'] === 'T_LNUMBER' && $tokens[$curToken]['content'] === '0') {
-                $errorType = 'zeroArgument';
-                break;
-            }
-        }
+			} elseif ($tokens[$curToken]['type'] === 'T_LNUMBER' && $tokens[$curToken]['content'] === '0') {
+				$errorType = 'zeroArgument';
+				break;
+			}
+		}
 
-        if ($errorType !== '') {
-            $error     = 'Using %s on break or continue is forbidden since PHP 5.4';
-            $errorCode = $errorType . 'Found';
-            $data      = array($this->errorTypes[$errorType]);
+		if ($errorType !== '') {
+			$error     = 'Using %s on break or continue is forbidden since PHP 5.4';
+			$errorCode = $errorType . 'Found';
+			$data      = array($this->errorTypes[$errorType]);
 
-            $phpcsFile->addError($error, $stackPtr, $errorCode, $data);
-        }
-    }
+			$phpcsFile->addError($error, $stackPtr, $errorCode, $data);
+		}
+	}
 }

Spacing +13 added lines, -13 removed lines

@@ -49,7 +49,7 @@ 
      */
     public function register()
     {
-        return array(\T_BREAK, \T_CONTINUE);
+        return array( \T_BREAK, \T_CONTINUE );
     }
 
     /**
@@ -61,41 +61,41 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
-        if ($this->supportsAbove('5.4') === false) {
+        if ( $this->supportsAbove( '5.4' ) === false ) {
             return;
         }
 
         $tokens             = $phpcsFile->getTokens();
-        $nextSemicolonToken = $phpcsFile->findNext(array(\T_SEMICOLON, \T_CLOSE_TAG), ($stackPtr), null, false);
+        $nextSemicolonToken = $phpcsFile->findNext( array( \T_SEMICOLON, \T_CLOSE_TAG ), ( $stackPtr ), null, false );
         $errorType          = '';
-        for ($curToken = $stackPtr + 1; $curToken < $nextSemicolonToken; $curToken++) {
-            if ($tokens[$curToken]['type'] === 'T_STRING') {
+        for ( $curToken = $stackPtr + 1; $curToken < $nextSemicolonToken; $curToken++ ) {
+            if ( $tokens[ $curToken ][ 'type' ] === 'T_STRING' ) {
                 // If the next non-whitespace token after the string
                 // is an opening parenthesis then it's a function call.
-                $openBracket = $phpcsFile->findNext(Tokens::$emptyTokens, $curToken + 1, null, true);
-                if ($tokens[$openBracket]['code'] === \T_OPEN_PARENTHESIS) {
+                $openBracket = $phpcsFile->findNext( Tokens::$emptyTokens, $curToken + 1, null, true );
+                if ( $tokens[ $openBracket ][ 'code' ] === \T_OPEN_PARENTHESIS ) {
                     $errorType = 'variableArgument';
                     break;
                 }
 
-            } elseif (\in_array($tokens[$curToken]['type'], array('T_VARIABLE', 'T_FUNCTION', 'T_CLOSURE'), true)) {
+            } elseif ( \in_array( $tokens[ $curToken ][ 'type' ], array( 'T_VARIABLE', 'T_FUNCTION', 'T_CLOSURE' ), true ) ) {
                 $errorType = 'variableArgument';
                 break;
 
-            } elseif ($tokens[$curToken]['type'] === 'T_LNUMBER' && $tokens[$curToken]['content'] === '0') {
+            } elseif ( $tokens[ $curToken ][ 'type' ] === 'T_LNUMBER' && $tokens[ $curToken ][ 'content' ] === '0' ) {
                 $errorType = 'zeroArgument';
                 break;
             }
         }
 
-        if ($errorType !== '') {
+        if ( $errorType !== '' ) {
             $error     = 'Using %s on break or continue is forbidden since PHP 5.4';
             $errorCode = $errorType . 'Found';
-            $data      = array($this->errorTypes[$errorType]);
+            $data      = array( $this->errorTypes[ $errorType ] );
 
-            $phpcsFile->addError($error, $stackPtr, $errorCode, $data);
+            $phpcsFile->addError( $error, $stackPtr, $errorCode, $data );
         }
     }
 }

Braces +3 added lines, -6 removed lines

@@ -28,8 +28,7 @@ 
  * @author    Wim Godden <wim.godden@cu.be>
  * @copyright 2012 Cu.be Solutions bvba
  */
-class ForbiddenBreakContinueVariableArgumentsSniff extends Sniff
-{
+class ForbiddenBreakContinueVariableArgumentsSniff extends Sniff {
     /**
      * Error types this sniff handles for forbidden break/continue arguments.
      *
@@ -47,8 +46,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(\T_BREAK, \T_CONTINUE);
     }
 
@@ -61,8 +59,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         if ($this->supportsAbove('5.4') === 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/ControlStructures/ForbiddenSwitchWithMultipleDefaultBlocksSniff.php

Indentation +44 added lines, -44 removed lines

@@ -28,52 +28,52 @@
 class ForbiddenSwitchWithMultipleDefaultBlocksSniff extends Sniff
 {
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(\T_SWITCH);
-    }
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return array(\T_SWITCH);
+	}
 
-    /**
-     * 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();
-        if (isset($tokens[$stackPtr]['scope_closer']) === false) {
-            return;
-        }
+		$tokens = $phpcsFile->getTokens();
+		if (isset($tokens[$stackPtr]['scope_closer']) === false) {
+			return;
+		}
 
-        $defaultToken = $stackPtr;
-        $defaultCount = 0;
-        $targetLevel  = $tokens[$stackPtr]['level'] + 1;
-        while ($defaultCount < 2 && ($defaultToken = $phpcsFile->findNext(array(\T_DEFAULT), $defaultToken + 1, $tokens[$stackPtr]['scope_closer'])) !== false) {
-            // Same level or one below (= two default cases after each other).
-            if ($tokens[$defaultToken]['level'] === $targetLevel || $tokens[$defaultToken]['level'] === ($targetLevel + 1)) {
-                $defaultCount++;
-            }
-        }
+		$defaultToken = $stackPtr;
+		$defaultCount = 0;
+		$targetLevel  = $tokens[$stackPtr]['level'] + 1;
+		while ($defaultCount < 2 && ($defaultToken = $phpcsFile->findNext(array(\T_DEFAULT), $defaultToken + 1, $tokens[$stackPtr]['scope_closer'])) !== false) {
+			// Same level or one below (= two default cases after each other).
+			if ($tokens[$defaultToken]['level'] === $targetLevel || $tokens[$defaultToken]['level'] === ($targetLevel + 1)) {
+				$defaultCount++;
+			}
+		}
 
-        if ($defaultCount > 1) {
-            $phpcsFile->addError(
-                'Switch statements can not have multiple default blocks since PHP 7.0',
-                $stackPtr,
-                'Found'
-            );
-        }
-    }
+		if ($defaultCount > 1) {
+			$phpcsFile->addError(
+				'Switch statements can not have multiple default blocks since PHP 7.0',
+				$stackPtr,
+				'Found'
+			);
+		}
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -35,7 +35,7 @@ 
      */
     public function register()
     {
-        return array(\T_SWITCH);
+        return array( \T_SWITCH );
     }
 
     /**
@@ -47,28 +47,28 @@ 
      *
      * @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_closer']) === false) {
+        if ( isset( $tokens[ $stackPtr ][ 'scope_closer' ] ) === false ) {
             return;
         }
 
         $defaultToken = $stackPtr;
         $defaultCount = 0;
-        $targetLevel  = $tokens[$stackPtr]['level'] + 1;
-        while ($defaultCount < 2 && ($defaultToken = $phpcsFile->findNext(array(\T_DEFAULT), $defaultToken + 1, $tokens[$stackPtr]['scope_closer'])) !== false) {
+        $targetLevel  = $tokens[ $stackPtr ][ 'level' ] + 1;
+        while ( $defaultCount < 2 && ( $defaultToken = $phpcsFile->findNext( array( \T_DEFAULT ), $defaultToken + 1, $tokens[ $stackPtr ][ 'scope_closer' ] ) ) !== false ) {
             // Same level or one below (= two default cases after each other).
-            if ($tokens[$defaultToken]['level'] === $targetLevel || $tokens[$defaultToken]['level'] === ($targetLevel + 1)) {
+            if ( $tokens[ $defaultToken ][ 'level' ] === $targetLevel || $tokens[ $defaultToken ][ 'level' ] === ( $targetLevel + 1 ) ) {
                 $defaultCount++;
             }
         }
 
-        if ($defaultCount > 1) {
+        if ( $defaultCount > 1 ) {
             $phpcsFile->addError(
                 'Switch statements can not have multiple default blocks since PHP 7.0',
                 $stackPtr,

Braces +3 added lines, -6 removed lines

@@ -25,16 +25,14 @@ 
  * @package  PHPCompatibility
  * @author   Wim Godden <wim@cu.be>
  */
-class ForbiddenSwitchWithMultipleDefaultBlocksSniff extends Sniff
-{
+class ForbiddenSwitchWithMultipleDefaultBlocksSniff extends Sniff {
 
     /**
      * Returns an array of tokens this test wants to listen for.
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(\T_SWITCH);
     }
 
@@ -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/ControlStructures/ForbiddenBreakContinueOutsideLoopSniff.php

Indentation +71 added lines, -71 removed lines

@@ -28,82 +28,82 @@
 class ForbiddenBreakContinueOutsideLoopSniff extends Sniff
 {
 
-    /**
-     * Token codes of control structure in which usage of break/continue is valid.
-     *
-     * @var array
-     */
-    protected $validLoopStructures = array(
-        \T_FOR     => true,
-        \T_FOREACH => true,
-        \T_WHILE   => true,
-        \T_DO      => true,
-        \T_SWITCH  => true,
-    );
+	/**
+	 * Token codes of control structure in which usage of break/continue is valid.
+	 *
+	 * @var array
+	 */
+	protected $validLoopStructures = array(
+		\T_FOR     => true,
+		\T_FOREACH => true,
+		\T_WHILE   => true,
+		\T_DO      => true,
+		\T_SWITCH  => true,
+	);
 
-    /**
-     * Token codes which did not correctly get a condition assigned in older PHPCS versions.
-     *
-     * @var array
-     */
-    protected $backCompat = array(
-        \T_CASE    => true,
-        \T_DEFAULT => true,
-    );
+	/**
+	 * Token codes which did not correctly get a condition assigned in older PHPCS versions.
+	 *
+	 * @var array
+	 */
+	protected $backCompat = array(
+		\T_CASE    => true,
+		\T_DEFAULT => true,
+	);
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-            \T_BREAK,
-            \T_CONTINUE,
-        );
-    }
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return array(
+			\T_BREAK,
+			\T_CONTINUE,
+		);
+	}
 
-    /**
-     * 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();
-        $token  = $tokens[$stackPtr];
+	/**
+	 * 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();
+		$token  = $tokens[$stackPtr];
 
-        // Check if the break/continue is within a valid loop structure.
-        if (empty($token['conditions']) === false) {
-            foreach ($token['conditions'] as $tokenCode) {
-                if (isset($this->validLoopStructures[$tokenCode]) === true) {
-                    return;
-                }
-            }
-        } else {
-            // Deal with older PHPCS versions.
-            if (isset($token['scope_condition']) === true && isset($this->backCompat[$tokens[$token['scope_condition']]['code']]) === true) {
-                return;
-            }
-        }
+		// Check if the break/continue is within a valid loop structure.
+		if (empty($token['conditions']) === false) {
+			foreach ($token['conditions'] as $tokenCode) {
+				if (isset($this->validLoopStructures[$tokenCode]) === true) {
+					return;
+				}
+			}
+		} else {
+			// Deal with older PHPCS versions.
+			if (isset($token['scope_condition']) === true && isset($this->backCompat[$tokens[$token['scope_condition']]['code']]) === true) {
+				return;
+			}
+		}
 
-        // If we're still here, no valid loop structure container has been found, so throw an error.
-        $error     = "Using '%s' outside of a loop or switch structure is invalid";
-        $isError   = false;
-        $errorCode = 'Found';
-        $data      = array($token['content']);
+		// If we're still here, no valid loop structure container has been found, so throw an error.
+		$error     = "Using '%s' outside of a loop or switch structure is invalid";
+		$isError   = false;
+		$errorCode = 'Found';
+		$data      = array($token['content']);
 
-        if ($this->supportsAbove('7.0')) {
-            $error    .= ' and will throw a fatal error since PHP 7.0';
-            $isError   = true;
-            $errorCode = 'FatalError';
-        }
+		if ($this->supportsAbove('7.0')) {
+			$error    .= ' and will throw a fatal error since PHP 7.0';
+			$isError   = true;
+			$errorCode = 'FatalError';
+		}
 
-        $this->addMessage($phpcsFile, $error, $stackPtr, $isError, $errorCode, $data);
-    }
+		$this->addMessage($phpcsFile, $error, $stackPtr, $isError, $errorCode, $data);
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -73,21 +73,21 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
-        $token  = $tokens[$stackPtr];
+        $token  = $tokens[ $stackPtr ];
 
         // Check if the break/continue is within a valid loop structure.
-        if (empty($token['conditions']) === false) {
-            foreach ($token['conditions'] as $tokenCode) {
-                if (isset($this->validLoopStructures[$tokenCode]) === true) {
+        if ( empty( $token[ 'conditions' ] ) === false ) {
+            foreach ( $token[ 'conditions' ] as $tokenCode ) {
+                if ( isset( $this->validLoopStructures[ $tokenCode ] ) === true ) {
                     return;
                 }
             }
         } else {
             // Deal with older PHPCS versions.
-            if (isset($token['scope_condition']) === true && isset($this->backCompat[$tokens[$token['scope_condition']]['code']]) === true) {
+            if ( isset( $token[ 'scope_condition' ] ) === true && isset( $this->backCompat[ $tokens[ $token[ 'scope_condition' ] ][ 'code' ] ] ) === true ) {
                 return;
             }
         }
@@ -96,14 +96,14 @@ 
         $error     = "Using '%s' outside of a loop or switch structure is invalid";
         $isError   = false;
         $errorCode = 'Found';
-        $data      = array($token['content']);
+        $data      = array( $token[ 'content' ] );
 
-        if ($this->supportsAbove('7.0')) {
+        if ( $this->supportsAbove( '7.0' ) ) {
             $error    .= ' and will throw a fatal error since PHP 7.0';
             $isError   = true;
             $errorCode = 'FatalError';
         }
 
-        $this->addMessage($phpcsFile, $error, $stackPtr, $isError, $errorCode, $data);
+        $this->addMessage( $phpcsFile, $error, $stackPtr, $isError, $errorCode, $data );
     }
 }

Braces +3 added lines, -6 removed lines

@@ -25,8 +25,7 @@ 
  * @package  PHPCompatibility
  * @author   Juliette Reinders Folmer <phpcompatibility_nospam@adviesenzo.nl>
  */
-class ForbiddenBreakContinueOutsideLoopSniff extends Sniff
-{
+class ForbiddenBreakContinueOutsideLoopSniff extends Sniff {
 
     /**
      * Token codes of control structure in which usage of break/continue is valid.
@@ -56,8 +55,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(
             \T_BREAK,
             \T_CONTINUE,
@@ -73,8 +71,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
         $token  = $tokens[$stackPtr];
 

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/ControlStructures/NewMultiCatchSniff.php

Indentation +39 added lines, -39 removed lines

@@ -27,49 +27,49 @@
  */
 class NewMultiCatchSniff extends Sniff
 {
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(\T_CATCH);
-    }
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return array(\T_CATCH);
+	}
 
-    /**
-     * 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->supportsBelow('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->supportsBelow('7.0') === false) {
+			return;
+		}
 
-        $tokens = $phpcsFile->getTokens();
-        $token  = $tokens[$stackPtr];
+		$tokens = $phpcsFile->getTokens();
+		$token  = $tokens[$stackPtr];
 
-        // Bow out during live coding.
-        if (isset($token['parenthesis_opener'], $token['parenthesis_closer']) === false) {
-            return;
-        }
+		// Bow out during live coding.
+		if (isset($token['parenthesis_opener'], $token['parenthesis_closer']) === false) {
+			return;
+		}
 
-        $hasBitwiseOr = $phpcsFile->findNext(\T_BITWISE_OR, $token['parenthesis_opener'], $token['parenthesis_closer']);
+		$hasBitwiseOr = $phpcsFile->findNext(\T_BITWISE_OR, $token['parenthesis_opener'], $token['parenthesis_closer']);
 
-        if ($hasBitwiseOr === false) {
-            return;
-        }
+		if ($hasBitwiseOr === false) {
+			return;
+		}
 
-        $phpcsFile->addError(
-            'Catching multiple exceptions within one statement is not supported in PHP 7.0 or earlier.',
-            $hasBitwiseOr,
-            'Found'
-        );
-    }
+		$phpcsFile->addError(
+			'Catching multiple exceptions within one statement is not supported in PHP 7.0 or earlier.',
+			$hasBitwiseOr,
+			'Found'
+		);
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -34,7 +34,7 @@ 
      */
     public function register()
     {
-        return array(\T_CATCH);
+        return array( \T_CATCH );
     }
 
     /**
@@ -46,23 +46,23 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
-        if ($this->supportsBelow('7.0') === false) {
+        if ( $this->supportsBelow( '7.0' ) === false ) {
             return;
         }
 
         $tokens = $phpcsFile->getTokens();
-        $token  = $tokens[$stackPtr];
+        $token  = $tokens[ $stackPtr ];
 
         // Bow out during live coding.
-        if (isset($token['parenthesis_opener'], $token['parenthesis_closer']) === false) {
+        if ( isset( $token[ 'parenthesis_opener' ], $token[ 'parenthesis_closer' ] ) === false ) {
             return;
         }
 
-        $hasBitwiseOr = $phpcsFile->findNext(\T_BITWISE_OR, $token['parenthesis_opener'], $token['parenthesis_closer']);
+        $hasBitwiseOr = $phpcsFile->findNext( \T_BITWISE_OR, $token[ 'parenthesis_opener' ], $token[ 'parenthesis_closer' ] );
 
-        if ($hasBitwiseOr === false) {
+        if ( $hasBitwiseOr === false ) {
             return;
         }
 

Braces +3 added lines, -6 removed lines

@@ -25,15 +25,13 @@ 
  * @package  PHPCompatibility
  * @author   Juliette Reinders Folmer <phpcompatibility_nospam@adviesenzo.nl>
  */
-class NewMultiCatchSniff extends Sniff
-{
+class NewMultiCatchSniff extends Sniff {
     /**
      * Returns an array of tokens this test wants to listen for.
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(\T_CATCH);
     }
 
@@ -46,8 +44,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         if ($this->supportsBelow('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/ControlStructures/NewListInForeachSniff.php

Indentation +43 added lines, -43 removed lines

@@ -26,54 +26,54 @@
 class NewListInForeachSniff extends Sniff
 {
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(\T_FOREACH);
-    }
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return array(\T_FOREACH);
+	}
 
-    /**
-     * 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->supportsBelow('5.4') === 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->supportsBelow('5.4') === false) {
+			return;
+		}
 
-        $tokens = $phpcsFile->getTokens();
+		$tokens = $phpcsFile->getTokens();
 
-        if (isset($tokens[$stackPtr]['parenthesis_opener'], $tokens[$stackPtr]['parenthesis_closer']) === false) {
-            return;
-        }
+		if (isset($tokens[$stackPtr]['parenthesis_opener'], $tokens[$stackPtr]['parenthesis_closer']) === false) {
+			return;
+		}
 
-        $opener = $tokens[$stackPtr]['parenthesis_opener'];
-        $closer = $tokens[$stackPtr]['parenthesis_closer'];
+		$opener = $tokens[$stackPtr]['parenthesis_opener'];
+		$closer = $tokens[$stackPtr]['parenthesis_closer'];
 
-        $asToken = $phpcsFile->findNext(\T_AS, ($opener + 1), $closer);
-        if ($asToken === false) {
-            return;
-        }
+		$asToken = $phpcsFile->findNext(\T_AS, ($opener + 1), $closer);
+		if ($asToken === false) {
+			return;
+		}
 
-        $hasList = $phpcsFile->findNext(array(\T_LIST, \T_OPEN_SHORT_ARRAY), ($asToken + 1), $closer);
-        if ($hasList === false) {
-            return;
-        }
+		$hasList = $phpcsFile->findNext(array(\T_LIST, \T_OPEN_SHORT_ARRAY), ($asToken + 1), $closer);
+		if ($hasList === false) {
+			return;
+		}
 
-        $phpcsFile->addError(
-            'Unpacking nested arrays with list() in a foreach is not supported in PHP 5.4 or earlier.',
-            $hasList,
-            'Found'
-        );
-    }
+		$phpcsFile->addError(
+			'Unpacking nested arrays with list() in a foreach is not supported in PHP 5.4 or earlier.',
+			$hasList,
+			'Found'
+		);
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -33,7 +33,7 @@ 
      */
     public function register()
     {
-        return array(\T_FOREACH);
+        return array( \T_FOREACH );
     }
 
     /**
@@ -45,28 +45,28 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
-        if ($this->supportsBelow('5.4') === false) {
+        if ( $this->supportsBelow( '5.4' ) === false ) {
             return;
         }
 
         $tokens = $phpcsFile->getTokens();
 
-        if (isset($tokens[$stackPtr]['parenthesis_opener'], $tokens[$stackPtr]['parenthesis_closer']) === false) {
+        if ( isset( $tokens[ $stackPtr ][ 'parenthesis_opener' ], $tokens[ $stackPtr ][ 'parenthesis_closer' ] ) === false ) {
             return;
         }
 
-        $opener = $tokens[$stackPtr]['parenthesis_opener'];
-        $closer = $tokens[$stackPtr]['parenthesis_closer'];
+        $opener = $tokens[ $stackPtr ][ 'parenthesis_opener' ];
+        $closer = $tokens[ $stackPtr ][ 'parenthesis_closer' ];
 
-        $asToken = $phpcsFile->findNext(\T_AS, ($opener + 1), $closer);
-        if ($asToken === false) {
+        $asToken = $phpcsFile->findNext( \T_AS, ( $opener + 1 ), $closer );
+        if ( $asToken === false ) {
             return;
         }
 
-        $hasList = $phpcsFile->findNext(array(\T_LIST, \T_OPEN_SHORT_ARRAY), ($asToken + 1), $closer);
-        if ($hasList === false) {
+        $hasList = $phpcsFile->findNext( array( \T_LIST, \T_OPEN_SHORT_ARRAY ), ( $asToken + 1 ), $closer );
+        if ( $hasList === false ) {
             return;
         }
 

Braces +3 added lines, -6 removed lines

@@ -23,16 +23,14 @@ 
  * @package  PHPCompatibility
  * @author   Juliette Reinders Folmer <phpcompatibility_nospam@adviesenzo.nl>
  */
-class NewListInForeachSniff extends Sniff
-{
+class NewListInForeachSniff extends Sniff {
 
     /**
      * Returns an array of tokens this test wants to listen for.
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(\T_FOREACH);
     }
 
@@ -45,8 +43,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         if ($this->supportsBelow('5.4') === 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/ControlStructures/NewForeachExpressionReferencingSniff.php

Indentation +52 added lines, -52 removed lines

@@ -29,68 +29,68 @@
 class NewForeachExpressionReferencingSniff extends Sniff
 {
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(\T_FOREACH);
-    }
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return array(\T_FOREACH);
+	}
 
-    /**
-     * 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->supportsBelow('5.4') === 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->supportsBelow('5.4') === false) {
+			return;
+		}
 
-        $tokens = $phpcsFile->getTokens();
+		$tokens = $phpcsFile->getTokens();
 
-        if (isset($tokens[$stackPtr]['parenthesis_opener'], $tokens[$stackPtr]['parenthesis_closer']) === false) {
-            return;
-        }
+		if (isset($tokens[$stackPtr]['parenthesis_opener'], $tokens[$stackPtr]['parenthesis_closer']) === false) {
+			return;
+		}
 
-        $opener = $tokens[$stackPtr]['parenthesis_opener'];
-        $closer = $tokens[$stackPtr]['parenthesis_closer'];
+		$opener = $tokens[$stackPtr]['parenthesis_opener'];
+		$closer = $tokens[$stackPtr]['parenthesis_closer'];
 
-        $asToken = $phpcsFile->findNext(\T_AS, ($opener + 1), $closer);
-        if ($asToken === false) {
-            return;
-        }
+		$asToken = $phpcsFile->findNext(\T_AS, ($opener + 1), $closer);
+		if ($asToken === false) {
+			return;
+		}
 
-        /*
+		/*
          * Note: referencing $key is not allowed in any version, so this should only find referenced $values.
          * If it does find a referenced key, it would be a parse error anyway.
          */
-        $hasReference = $phpcsFile->findNext(\T_BITWISE_AND, ($asToken + 1), $closer);
-        if ($hasReference === false) {
-            return;
-        }
+		$hasReference = $phpcsFile->findNext(\T_BITWISE_AND, ($asToken + 1), $closer);
+		if ($hasReference === false) {
+			return;
+		}
 
-        $nestingLevel = 0;
-        if ($asToken !== ($opener + 1) && isset($tokens[$opener + 1]['nested_parenthesis'])) {
-            $nestingLevel = \count($tokens[$opener + 1]['nested_parenthesis']);
-        }
+		$nestingLevel = 0;
+		if ($asToken !== ($opener + 1) && isset($tokens[$opener + 1]['nested_parenthesis'])) {
+			$nestingLevel = \count($tokens[$opener + 1]['nested_parenthesis']);
+		}
 
-        if ($this->isVariable($phpcsFile, ($opener + 1), $asToken, $nestingLevel) === true) {
-            return;
-        }
+		if ($this->isVariable($phpcsFile, ($opener + 1), $asToken, $nestingLevel) === true) {
+			return;
+		}
 
-        // Non-variable detected before the `as` keyword.
-        $phpcsFile->addError(
-            'Referencing $value is only possible if the iterated array is a variable in PHP 5.4 or earlier.',
-            $hasReference,
-            'Found'
-        );
-    }
+		// Non-variable detected before the `as` keyword.
+		$phpcsFile->addError(
+			'Referencing $value is only possible if the iterated array is a variable in PHP 5.4 or earlier.',
+			$hasReference,
+			'Found'
+		);
+	}
 }

Spacing +13 added lines, -13 removed lines

@@ -36,7 +36,7 @@ 
      */
     public function register()
     {
-        return array(\T_FOREACH);
+        return array( \T_FOREACH );
     }
 
     /**
@@ -48,23 +48,23 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
-        if ($this->supportsBelow('5.4') === false) {
+        if ( $this->supportsBelow( '5.4' ) === false ) {
             return;
         }
 
         $tokens = $phpcsFile->getTokens();
 
-        if (isset($tokens[$stackPtr]['parenthesis_opener'], $tokens[$stackPtr]['parenthesis_closer']) === false) {
+        if ( isset( $tokens[ $stackPtr ][ 'parenthesis_opener' ], $tokens[ $stackPtr ][ 'parenthesis_closer' ] ) === false ) {
             return;
         }
 
-        $opener = $tokens[$stackPtr]['parenthesis_opener'];
-        $closer = $tokens[$stackPtr]['parenthesis_closer'];
+        $opener = $tokens[ $stackPtr ][ 'parenthesis_opener' ];
+        $closer = $tokens[ $stackPtr ][ 'parenthesis_closer' ];
 
-        $asToken = $phpcsFile->findNext(\T_AS, ($opener + 1), $closer);
-        if ($asToken === false) {
+        $asToken = $phpcsFile->findNext( \T_AS, ( $opener + 1 ), $closer );
+        if ( $asToken === false ) {
             return;
         }
 
@@ -72,17 +72,17 @@ 
          * Note: referencing $key is not allowed in any version, so this should only find referenced $values.
          * If it does find a referenced key, it would be a parse error anyway.
          */
-        $hasReference = $phpcsFile->findNext(\T_BITWISE_AND, ($asToken + 1), $closer);
-        if ($hasReference === false) {
+        $hasReference = $phpcsFile->findNext( \T_BITWISE_AND, ( $asToken + 1 ), $closer );
+        if ( $hasReference === false ) {
             return;
         }
 
         $nestingLevel = 0;
-        if ($asToken !== ($opener + 1) && isset($tokens[$opener + 1]['nested_parenthesis'])) {
-            $nestingLevel = \count($tokens[$opener + 1]['nested_parenthesis']);
+        if ( $asToken !== ( $opener + 1 ) && isset( $tokens[ $opener + 1 ][ 'nested_parenthesis' ] ) ) {
+            $nestingLevel = \count( $tokens[ $opener + 1 ][ 'nested_parenthesis' ] );
         }
 
-        if ($this->isVariable($phpcsFile, ($opener + 1), $asToken, $nestingLevel) === true) {
+        if ( $this->isVariable( $phpcsFile, ( $opener + 1 ), $asToken, $nestingLevel ) === true ) {
             return;
         }
 

Braces +3 added lines, -6 removed lines

@@ -26,16 +26,14 @@ 
  * @package  PHPCompatibility
  * @author   Juliette Reinders Folmer <phpcompatibility_nospam@adviesenzo.nl>
  */
-class NewForeachExpressionReferencingSniff extends Sniff
-{
+class NewForeachExpressionReferencingSniff extends Sniff {
 
     /**
      * Returns an array of tokens this test wants to listen for.
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(\T_FOREACH);
     }
 
@@ -48,8 +46,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         if ($this->supportsBelow('5.4') === 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/FunctionDeclarations/NewReturnTypeDeclarationsSniff.php

Indentation +144 added lines, -144 removed lines

@@ -26,148 +26,148 @@
 class NewReturnTypeDeclarationsSniff extends AbstractNewFeatureSniff
 {
 
-    /**
-     * A list of new types
-     *
-     * 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 $newTypes = array(
-        'int' => array(
-            '5.6' => false,
-            '7.0' => true,
-        ),
-        'float' => array(
-            '5.6' => false,
-            '7.0' => true,
-        ),
-        'bool' => array(
-            '5.6' => false,
-            '7.0' => true,
-        ),
-        'string' => array(
-            '5.6' => false,
-            '7.0' => true,
-        ),
-        'array' => array(
-            '5.6' => false,
-            '7.0' => true,
-        ),
-        'callable' => array(
-            '5.6' => false,
-            '7.0' => true,
-        ),
-        'parent' => array(
-            '5.6' => false,
-            '7.0' => true,
-        ),
-        'self' => array(
-            '5.6' => false,
-            '7.0' => true,
-        ),
-        'Class name' => array(
-            '5.6' => false,
-            '7.0' => true,
-        ),
-
-        'iterable' => array(
-            '7.0' => false,
-            '7.1' => true,
-        ),
-        'void' => array(
-            '7.0' => false,
-            '7.1' => true,
-        ),
-
-        'object' => array(
-            '7.1' => false,
-            '7.2' => true,
-        ),
-    );
-
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        $tokens = array(
-            \T_FUNCTION,
-            \T_CLOSURE,
-        );
-
-        if (\defined('T_RETURN_TYPE')) {
-            $tokens[] = \T_RETURN_TYPE;
-        }
-
-        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();
-
-        // Deal with older PHPCS version which don't recognize return type hints
-        // as well as newer PHPCS versions (3.3.0+) where the tokenization has changed.
-        if ($tokens[$stackPtr]['code'] === \T_FUNCTION || $tokens[$stackPtr]['code'] === \T_CLOSURE) {
-            $returnTypeHint = $this->getReturnTypeHintToken($phpcsFile, $stackPtr);
-            if ($returnTypeHint !== false) {
-                $stackPtr = $returnTypeHint;
-            }
-        }
-
-        if (isset($this->newTypes[$tokens[$stackPtr]['content']]) === true) {
-            $itemInfo = array(
-                'name' => $tokens[$stackPtr]['content'],
-            );
-            $this->handleFeature($phpcsFile, $stackPtr, $itemInfo);
-        }
-        // Handle class name based return types.
-        elseif ($tokens[$stackPtr]['code'] === \T_STRING
-            || (\defined('T_RETURN_TYPE') && $tokens[$stackPtr]['code'] === \T_RETURN_TYPE)
-        ) {
-            $itemInfo = array(
-                'name'   => 'Class name',
-            );
-            $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->newTypes[$itemInfo['name']];
-    }
-
-
-    /**
-     * Get the error message template for this sniff.
-     *
-     * @return string
-     */
-    protected function getErrorMsgTemplate()
-    {
-        return '%s return type is not present in PHP version %s or earlier';
-    }
+	/**
+	 * A list of new types
+	 *
+	 * 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 $newTypes = array(
+		'int' => array(
+			'5.6' => false,
+			'7.0' => true,
+		),
+		'float' => array(
+			'5.6' => false,
+			'7.0' => true,
+		),
+		'bool' => array(
+			'5.6' => false,
+			'7.0' => true,
+		),
+		'string' => array(
+			'5.6' => false,
+			'7.0' => true,
+		),
+		'array' => array(
+			'5.6' => false,
+			'7.0' => true,
+		),
+		'callable' => array(
+			'5.6' => false,
+			'7.0' => true,
+		),
+		'parent' => array(
+			'5.6' => false,
+			'7.0' => true,
+		),
+		'self' => array(
+			'5.6' => false,
+			'7.0' => true,
+		),
+		'Class name' => array(
+			'5.6' => false,
+			'7.0' => true,
+		),
+
+		'iterable' => array(
+			'7.0' => false,
+			'7.1' => true,
+		),
+		'void' => array(
+			'7.0' => false,
+			'7.1' => true,
+		),
+
+		'object' => array(
+			'7.1' => false,
+			'7.2' => true,
+		),
+	);
+
+
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		$tokens = array(
+			\T_FUNCTION,
+			\T_CLOSURE,
+		);
+
+		if (\defined('T_RETURN_TYPE')) {
+			$tokens[] = \T_RETURN_TYPE;
+		}
+
+		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();
+
+		// Deal with older PHPCS version which don't recognize return type hints
+		// as well as newer PHPCS versions (3.3.0+) where the tokenization has changed.
+		if ($tokens[$stackPtr]['code'] === \T_FUNCTION || $tokens[$stackPtr]['code'] === \T_CLOSURE) {
+			$returnTypeHint = $this->getReturnTypeHintToken($phpcsFile, $stackPtr);
+			if ($returnTypeHint !== false) {
+				$stackPtr = $returnTypeHint;
+			}
+		}
+
+		if (isset($this->newTypes[$tokens[$stackPtr]['content']]) === true) {
+			$itemInfo = array(
+				'name' => $tokens[$stackPtr]['content'],
+			);
+			$this->handleFeature($phpcsFile, $stackPtr, $itemInfo);
+		}
+		// Handle class name based return types.
+		elseif ($tokens[$stackPtr]['code'] === \T_STRING
+			|| (\defined('T_RETURN_TYPE') && $tokens[$stackPtr]['code'] === \T_RETURN_TYPE)
+		) {
+			$itemInfo = array(
+				'name'   => 'Class name',
+			);
+			$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->newTypes[$itemInfo['name']];
+	}
+
+
+	/**
+	 * Get the error message template for this sniff.
+	 *
+	 * @return string
+	 */
+	protected function getErrorMsgTemplate()
+	{
+		return '%s return type is not present in PHP version %s or earlier';
+	}
 }

Spacing +14 added lines, -14 removed lines

@@ -100,8 +100,8 @@ 
             \T_CLOSURE,
         );
 
-        if (\defined('T_RETURN_TYPE')) {
-            $tokens[] = \T_RETURN_TYPE;
+        if ( \defined( 'T_RETURN_TYPE' ) ) {
+            $tokens[ ] = \T_RETURN_TYPE;
         }
 
         return $tokens;
@@ -117,33 +117,33 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
         // Deal with older PHPCS version which don't recognize return type hints
         // as well as newer PHPCS versions (3.3.0+) where the tokenization has changed.
-        if ($tokens[$stackPtr]['code'] === \T_FUNCTION || $tokens[$stackPtr]['code'] === \T_CLOSURE) {
-            $returnTypeHint = $this->getReturnTypeHintToken($phpcsFile, $stackPtr);
-            if ($returnTypeHint !== false) {
+        if ( $tokens[ $stackPtr ][ 'code' ] === \T_FUNCTION || $tokens[ $stackPtr ][ 'code' ] === \T_CLOSURE ) {
+            $returnTypeHint = $this->getReturnTypeHintToken( $phpcsFile, $stackPtr );
+            if ( $returnTypeHint !== false ) {
                 $stackPtr = $returnTypeHint;
             }
         }
 
-        if (isset($this->newTypes[$tokens[$stackPtr]['content']]) === true) {
+        if ( isset( $this->newTypes[ $tokens[ $stackPtr ][ 'content' ] ] ) === true ) {
             $itemInfo = array(
-                'name' => $tokens[$stackPtr]['content'],
+                'name' => $tokens[ $stackPtr ][ 'content' ],
             );
-            $this->handleFeature($phpcsFile, $stackPtr, $itemInfo);
+            $this->handleFeature( $phpcsFile, $stackPtr, $itemInfo );
         }
         // Handle class name based return types.
-        elseif ($tokens[$stackPtr]['code'] === \T_STRING
-            || (\defined('T_RETURN_TYPE') && $tokens[$stackPtr]['code'] === \T_RETURN_TYPE)
+        elseif ( $tokens[ $stackPtr ][ 'code' ] === \T_STRING
+            || ( \defined( 'T_RETURN_TYPE' ) && $tokens[ $stackPtr ][ 'code' ] === \T_RETURN_TYPE )
         ) {
             $itemInfo = array(
                 'name'   => 'Class name',
             );
-            $this->handleFeature($phpcsFile, $stackPtr, $itemInfo);
+            $this->handleFeature( $phpcsFile, $stackPtr, $itemInfo );
         }
     }
 
@@ -155,9 +155,9 @@ 
      *
      * @return array Version and other information about the item.
      */
-    public function getItemArray(array $itemInfo)
+    public function getItemArray( array $itemInfo )
     {
-        return $this->newTypes[$itemInfo['name']];
+        return $this->newTypes[ $itemInfo[ 'name' ] ];
     }
 
 

Braces +5 added lines, -10 removed lines

@@ -23,8 +23,7 @@ 
  * @package  PHPCompatibility
  * @author   Wim Godden <wim.godden@cu.be>
  */
-class NewReturnTypeDeclarationsSniff extends AbstractNewFeatureSniff
-{
+class NewReturnTypeDeclarationsSniff extends AbstractNewFeatureSniff {
 
     /**
      * A list of new types
@@ -93,8 +92,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         $tokens = array(
             \T_FUNCTION,
             \T_CLOSURE,
@@ -117,8 +115,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         // Deal with older PHPCS version which don't recognize return type hints
@@ -155,8 +152,7 @@ 
      *
      * @return array Version and other information about the item.
      */
-    public function getItemArray(array $itemInfo)
-    {
+    public function getItemArray(array $itemInfo) {
         return $this->newTypes[$itemInfo['name']];
     }
 
@@ -166,8 +162,7 @@ 
      *
      * @return string
      */
-    protected function getErrorMsgTemplate()
-    {
+    protected function getErrorMsgTemplate() {
         return '%s return type is not present in PHP version %s or earlier';
     }
 }

vendor/phpcompatibility/php-compatibility/PHPCompatibility/Sniffs/FunctionDeclarations/NewParamTypeDeclarationsSniff.php

Indentation +169 added lines, -169 removed lines

@@ -23,173 +23,173 @@
 class NewParamTypeDeclarationsSniff extends AbstractNewFeatureSniff
 {
 
-    /**
-     * A list of new types.
-     *
-     * 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 $newTypes = array(
-        'array' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'self' => array(
-            '5.1' => false,
-            '5.2' => true,
-        ),
-        'parent' => array(
-            '5.1' => false,
-            '5.2' => true,
-        ),
-        'callable' => array(
-            '5.3' => false,
-            '5.4' => true,
-        ),
-        'int' => array(
-            '5.6' => false,
-            '7.0' => true,
-        ),
-        'float' => array(
-            '5.6' => false,
-            '7.0' => true,
-        ),
-        'bool' => array(
-            '5.6' => false,
-            '7.0' => true,
-        ),
-        'string' => array(
-            '5.6' => false,
-            '7.0' => true,
-        ),
-        'iterable' => array(
-            '7.0' => false,
-            '7.1' => true,
-        ),
-        'object' => array(
-            '7.1' => false,
-            '7.2' => true,
-        ),
-    );
-
-
-    /**
-     * Invalid types
-     *
-     * The array lists : the invalid type hint => what was probably intended/alternative.
-     *
-     * @var array(string => string)
-     */
-    protected $invalidTypes = array(
-        'static'  => 'self',
-        'boolean' => 'bool',
-        'integer' => 'int',
-    );
-
-
-    /**
-     * 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)
-    {
-        // Get all parameters from method signature.
-        $paramNames = PHPCSHelper::getMethodParameters($phpcsFile, $stackPtr);
-        if (empty($paramNames)) {
-            return;
-        }
-
-        $supportsPHP4 = $this->supportsBelow('4.4');
-
-        foreach ($paramNames as $param) {
-            if ($param['type_hint'] === '') {
-                continue;
-            }
-
-            // Strip off potential nullable indication.
-            $typeHint = ltrim($param['type_hint'], '?');
-
-            if ($supportsPHP4 === true) {
-                $phpcsFile->addError(
-                    'Type declarations were not present in PHP 4.4 or earlier.',
-                    $param['token'],
-                    'TypeHintFound'
-                );
-
-            } elseif (isset($this->newTypes[$typeHint])) {
-                $itemInfo = array(
-                    'name' => $typeHint,
-                );
-                $this->handleFeature($phpcsFile, $param['token'], $itemInfo);
-
-                // As of PHP 7.0, using `self` or `parent` outside class scope throws a fatal error.
-                // Only throw this error for PHP 5.2+ as before that the "type hint not supported" error
-                // will be thrown.
-                if (($typeHint === 'self' || $typeHint === 'parent')
-                    && $this->inClassScope($phpcsFile, $stackPtr, false) === false
-                    && $this->supportsAbove('5.2') !== false
-                ) {
-                    $phpcsFile->addError(
-                        "'%s' type cannot be used outside of class scope",
-                        $param['token'],
-                        ucfirst($typeHint) . 'OutsideClassScopeFound',
-                        array($typeHint)
-                    );
-                }
-            } elseif (isset($this->invalidTypes[$typeHint])) {
-                $error = "'%s' is not a valid type declaration. Did you mean %s ?";
-                $data  = array(
-                    $typeHint,
-                    $this->invalidTypes[$typeHint],
-                );
-
-                $phpcsFile->addError($error, $param['token'], 'InvalidTypeHintFound', $data);
-            }
-        }
-    }
-
-
-    /**
-     * 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->newTypes[$itemInfo['name']];
-    }
-
-
-    /**
-     * Get the error message template for this sniff.
-     *
-     * @return string
-     */
-    protected function getErrorMsgTemplate()
-    {
-        return "'%s' type declaration is not present in PHP version %s or earlier";
-    }
+	/**
+	 * A list of new types.
+	 *
+	 * 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 $newTypes = array(
+		'array' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'self' => array(
+			'5.1' => false,
+			'5.2' => true,
+		),
+		'parent' => array(
+			'5.1' => false,
+			'5.2' => true,
+		),
+		'callable' => array(
+			'5.3' => false,
+			'5.4' => true,
+		),
+		'int' => array(
+			'5.6' => false,
+			'7.0' => true,
+		),
+		'float' => array(
+			'5.6' => false,
+			'7.0' => true,
+		),
+		'bool' => array(
+			'5.6' => false,
+			'7.0' => true,
+		),
+		'string' => array(
+			'5.6' => false,
+			'7.0' => true,
+		),
+		'iterable' => array(
+			'7.0' => false,
+			'7.1' => true,
+		),
+		'object' => array(
+			'7.1' => false,
+			'7.2' => true,
+		),
+	);
+
+
+	/**
+	 * Invalid types
+	 *
+	 * The array lists : the invalid type hint => what was probably intended/alternative.
+	 *
+	 * @var array(string => string)
+	 */
+	protected $invalidTypes = array(
+		'static'  => 'self',
+		'boolean' => 'bool',
+		'integer' => 'int',
+	);
+
+
+	/**
+	 * 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)
+	{
+		// Get all parameters from method signature.
+		$paramNames = PHPCSHelper::getMethodParameters($phpcsFile, $stackPtr);
+		if (empty($paramNames)) {
+			return;
+		}
+
+		$supportsPHP4 = $this->supportsBelow('4.4');
+
+		foreach ($paramNames as $param) {
+			if ($param['type_hint'] === '') {
+				continue;
+			}
+
+			// Strip off potential nullable indication.
+			$typeHint = ltrim($param['type_hint'], '?');
+
+			if ($supportsPHP4 === true) {
+				$phpcsFile->addError(
+					'Type declarations were not present in PHP 4.4 or earlier.',
+					$param['token'],
+					'TypeHintFound'
+				);
+
+			} elseif (isset($this->newTypes[$typeHint])) {
+				$itemInfo = array(
+					'name' => $typeHint,
+				);
+				$this->handleFeature($phpcsFile, $param['token'], $itemInfo);
+
+				// As of PHP 7.0, using `self` or `parent` outside class scope throws a fatal error.
+				// Only throw this error for PHP 5.2+ as before that the "type hint not supported" error
+				// will be thrown.
+				if (($typeHint === 'self' || $typeHint === 'parent')
+					&& $this->inClassScope($phpcsFile, $stackPtr, false) === false
+					&& $this->supportsAbove('5.2') !== false
+				) {
+					$phpcsFile->addError(
+						"'%s' type cannot be used outside of class scope",
+						$param['token'],
+						ucfirst($typeHint) . 'OutsideClassScopeFound',
+						array($typeHint)
+					);
+				}
+			} elseif (isset($this->invalidTypes[$typeHint])) {
+				$error = "'%s' is not a valid type declaration. Did you mean %s ?";
+				$data  = array(
+					$typeHint,
+					$this->invalidTypes[$typeHint],
+				);
+
+				$phpcsFile->addError($error, $param['token'], 'InvalidTypeHintFound', $data);
+			}
+		}
+	}
+
+
+	/**
+	 * 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->newTypes[$itemInfo['name']];
+	}
+
+
+	/**
+	 * Get the error message template for this sniff.
+	 *
+	 * @return string
+	 */
+	protected function getErrorMsgTemplate()
+	{
+		return "'%s' type declaration is not present in PHP version %s or earlier";
+	}
 }

Spacing +22 added lines, -22 removed lines

@@ -112,59 +112,59 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
         // Get all parameters from method signature.
-        $paramNames = PHPCSHelper::getMethodParameters($phpcsFile, $stackPtr);
-        if (empty($paramNames)) {
+        $paramNames = PHPCSHelper::getMethodParameters( $phpcsFile, $stackPtr );
+        if ( empty( $paramNames ) ) {
             return;
         }
 
-        $supportsPHP4 = $this->supportsBelow('4.4');
+        $supportsPHP4 = $this->supportsBelow( '4.4' );
 
-        foreach ($paramNames as $param) {
-            if ($param['type_hint'] === '') {
+        foreach ( $paramNames as $param ) {
+            if ( $param[ 'type_hint' ] === '' ) {
                 continue;
             }
 
             // Strip off potential nullable indication.
-            $typeHint = ltrim($param['type_hint'], '?');
+            $typeHint = ltrim( $param[ 'type_hint' ], '?' );
 
-            if ($supportsPHP4 === true) {
+            if ( $supportsPHP4 === true ) {
                 $phpcsFile->addError(
                     'Type declarations were not present in PHP 4.4 or earlier.',
-                    $param['token'],
+                    $param[ 'token' ],
                     'TypeHintFound'
                 );
 
-            } elseif (isset($this->newTypes[$typeHint])) {
+            } elseif ( isset( $this->newTypes[ $typeHint ] ) ) {
                 $itemInfo = array(
                     'name' => $typeHint,
                 );
-                $this->handleFeature($phpcsFile, $param['token'], $itemInfo);
+                $this->handleFeature( $phpcsFile, $param[ 'token' ], $itemInfo );
 
                 // As of PHP 7.0, using `self` or `parent` outside class scope throws a fatal error.
                 // Only throw this error for PHP 5.2+ as before that the "type hint not supported" error
                 // will be thrown.
-                if (($typeHint === 'self' || $typeHint === 'parent')
-                    && $this->inClassScope($phpcsFile, $stackPtr, false) === false
-                    && $this->supportsAbove('5.2') !== false
+                if ( ( $typeHint === 'self' || $typeHint === 'parent' )
+                    && $this->inClassScope( $phpcsFile, $stackPtr, false ) === false
+                    && $this->supportsAbove( '5.2' ) !== false
                 ) {
                     $phpcsFile->addError(
                         "'%s' type cannot be used outside of class scope",
-                        $param['token'],
-                        ucfirst($typeHint) . 'OutsideClassScopeFound',
-                        array($typeHint)
+                        $param[ 'token' ],
+                        ucfirst( $typeHint ) . 'OutsideClassScopeFound',
+                        array( $typeHint )
                     );
                 }
-            } elseif (isset($this->invalidTypes[$typeHint])) {
+            } elseif ( isset( $this->invalidTypes[ $typeHint ] ) ) {
                 $error = "'%s' is not a valid type declaration. Did you mean %s ?";
                 $data  = array(
                     $typeHint,
-                    $this->invalidTypes[$typeHint],
+                    $this->invalidTypes[ $typeHint ],
                 );
 
-                $phpcsFile->addError($error, $param['token'], 'InvalidTypeHintFound', $data);
+                $phpcsFile->addError( $error, $param[ 'token' ], 'InvalidTypeHintFound', $data );
             }
         }
     }
@@ -177,9 +177,9 @@ 
      *
      * @return array Version and other information about the item.
      */
-    public function getItemArray(array $itemInfo)
+    public function getItemArray( array $itemInfo )
     {
-        return $this->newTypes[$itemInfo['name']];
+        return $this->newTypes[ $itemInfo[ 'name' ] ];
     }
 
 

Braces +5 added lines, -10 removed lines

@@ -20,8 +20,7 @@ 
  * @package  PHPCompatibility
  * @author   Wim Godden <wim.godden@cu.be>
  */
-class NewParamTypeDeclarationsSniff extends AbstractNewFeatureSniff
-{
+class NewParamTypeDeclarationsSniff extends AbstractNewFeatureSniff {
 
     /**
      * A list of new types.
@@ -94,8 +93,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(
             \T_FUNCTION,
             \T_CLOSURE,
@@ -112,8 +110,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         // Get all parameters from method signature.
         $paramNames = PHPCSHelper::getMethodParameters($phpcsFile, $stackPtr);
         if (empty($paramNames)) {
@@ -177,8 +174,7 @@ 
      *
      * @return array Version and other information about the item.
      */
-    public function getItemArray(array $itemInfo)
-    {
+    public function getItemArray(array $itemInfo) {
         return $this->newTypes[$itemInfo['name']];
     }
 
@@ -188,8 +184,7 @@ 
      *
      * @return string
      */
-    protected function getErrorMsgTemplate()
-    {
+    protected function getErrorMsgTemplate() {
         return "'%s' type declaration is not present in PHP version %s or earlier";
     }
 }