gravityview / GravityView

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";
     }
 }

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

Indentation +60 added lines, -60 removed lines

@@ -28,70 +28,70 @@
 class ForbiddenToStringParametersSniff extends Sniff
 {
 
-    /**
-     * Valid scopes for the __toString() method to live in.
-     *
-     * @since 9.2.0
-     *
-     * @var array
-     */
-    public $ooScopeTokens = array(
-        'T_CLASS'      => true,
-        'T_INTERFACE'  => true,
-        'T_TRAIT'      => true,
-        'T_ANON_CLASS' => true,
-    );
+	/**
+	 * Valid scopes for the __toString() method to live in.
+	 *
+	 * @since 9.2.0
+	 *
+	 * @var array
+	 */
+	public $ooScopeTokens = array(
+		'T_CLASS'      => true,
+		'T_INTERFACE'  => true,
+		'T_TRAIT'      => true,
+		'T_ANON_CLASS' => true,
+	);
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @since 9.2.0
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(\T_FUNCTION);
-    }
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @since 9.2.0
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return array(\T_FUNCTION);
+	}
 
-    /**
-     * 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('5.3') === false) {
-            return;
-        }
+	/**
+	 * 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('5.3') === false) {
+			return;
+		}
 
-        $functionName = $phpcsFile->getDeclarationName($stackPtr);
-        if (strtolower($functionName) !== '__tostring') {
-            // Not the right function.
-            return;
-        }
+		$functionName = $phpcsFile->getDeclarationName($stackPtr);
+		if (strtolower($functionName) !== '__tostring') {
+			// Not the right function.
+			return;
+		}
 
-        if ($this->validDirectScope($phpcsFile, $stackPtr, $this->ooScopeTokens) === false) {
-            // Function, not method.
-            return;
-        }
+		if ($this->validDirectScope($phpcsFile, $stackPtr, $this->ooScopeTokens) === false) {
+			// Function, not method.
+			return;
+		}
 
-        $params = PHPCSHelper::getMethodParameters($phpcsFile, $stackPtr);
-        if (empty($params)) {
-            // Function declared without parameters.
-            return;
-        }
+		$params = PHPCSHelper::getMethodParameters($phpcsFile, $stackPtr);
+		if (empty($params)) {
+			// Function declared without parameters.
+			return;
+		}
 
-        $phpcsFile->addError(
-            'The __toString() magic method can no longer accept arguments since PHP 5.3',
-            $stackPtr,
-            'Declared'
-        );
-    }
+		$phpcsFile->addError(
+			'The __toString() magic method can no longer accept arguments since PHP 5.3',
+			$stackPtr,
+			'Declared'
+		);
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -51,7 +51,7 @@ 
      */
     public function register()
     {
-        return array(\T_FUNCTION);
+        return array( \T_FUNCTION );
     }
 
     /**
@@ -65,25 +65,25 @@ 
      *
      * @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;
         }
 
-        $functionName = $phpcsFile->getDeclarationName($stackPtr);
-        if (strtolower($functionName) !== '__tostring') {
+        $functionName = $phpcsFile->getDeclarationName( $stackPtr );
+        if ( strtolower( $functionName ) !== '__tostring' ) {
             // Not the right function.
             return;
         }
 
-        if ($this->validDirectScope($phpcsFile, $stackPtr, $this->ooScopeTokens) === false) {
+        if ( $this->validDirectScope( $phpcsFile, $stackPtr, $this->ooScopeTokens ) === false ) {
             // Function, not method.
             return;
         }
 
-        $params = PHPCSHelper::getMethodParameters($phpcsFile, $stackPtr);
-        if (empty($params)) {
+        $params = PHPCSHelper::getMethodParameters( $phpcsFile, $stackPtr );
+        if ( empty( $params ) ) {
             // Function declared without parameters.
             return;
         }

Braces +3 added lines, -6 removed lines

@@ -25,8 +25,7 @@ 
  *
  * @since 9.2.0
  */
-class ForbiddenToStringParametersSniff extends Sniff
-{
+class ForbiddenToStringParametersSniff extends Sniff {
 
     /**
      * Valid scopes for the __toString() method to live in.
@@ -49,8 +48,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(\T_FUNCTION);
     }
 
@@ -65,8 +63,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         if ($this->supportsAbove('5.3') === false) {
             return;
         }

Doc Comments +1 added lines, -1 removed lines

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

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

Indentation +84 added lines, -84 removed lines

@@ -31,88 +31,88 @@
 class ForbiddenVariableNamesInClosureUseSniff extends Sniff
 {
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(\T_USE);
-    }
-
-    /**
-     * 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.1') === false) {
-            return;
-        }
-
-        $tokens = $phpcsFile->getTokens();
-
-        // Verify this use statement is used with a closure - if so, it has to have parenthesis before it.
-        $previousNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true, null, true);
-        if ($previousNonEmpty === false || $tokens[$previousNonEmpty]['code'] !== \T_CLOSE_PARENTHESIS
-            || isset($tokens[$previousNonEmpty]['parenthesis_opener']) === false
-        ) {
-            return;
-        }
-
-        // ... and (a variable within) parenthesis after it.
-        $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true, null, true);
-        if ($nextNonEmpty === false || $tokens[$nextNonEmpty]['code'] !== \T_OPEN_PARENTHESIS) {
-            return;
-        }
-
-        if (isset($tokens[$nextNonEmpty]['parenthesis_closer']) === false) {
-            // Live coding.
-            return;
-        }
-
-        $closurePtr = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($tokens[$previousNonEmpty]['parenthesis_opener'] - 1), null, true);
-        if ($closurePtr === false || $tokens[$closurePtr]['code'] !== \T_CLOSURE) {
-            return;
-        }
-
-        // Get the parameters declared by the closure.
-        $closureParams = PHPCSHelper::getMethodParameters($phpcsFile, $closurePtr);
-
-        $errorMsg = 'Variables bound to a closure via the use construct cannot use the same name as superglobals, $this, or a declared parameter since PHP 7.1. Found: %s';
-
-        for ($i = ($nextNonEmpty + 1); $i < $tokens[$nextNonEmpty]['parenthesis_closer']; $i++) {
-            if ($tokens[$i]['code'] !== \T_VARIABLE) {
-                continue;
-            }
-
-            $variableName = $tokens[$i]['content'];
-
-            if ($variableName === '$this') {
-                $phpcsFile->addError($errorMsg, $i, 'FoundThis', array($variableName));
-                continue;
-            }
-
-            if (isset($this->superglobals[$variableName]) === true) {
-                $phpcsFile->addError($errorMsg, $i, 'FoundSuperglobal', array($variableName));
-                continue;
-            }
-
-            // Check whether it is one of the parameters declared by the closure.
-            if (empty($closureParams) === false) {
-                foreach ($closureParams as $param) {
-                    if ($param['name'] === $variableName) {
-                        $phpcsFile->addError($errorMsg, $i, 'FoundShadowParam', array($variableName));
-                        continue 2;
-                    }
-                }
-            }
-        }
-    }
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return array(\T_USE);
+	}
+
+	/**
+	 * 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.1') === false) {
+			return;
+		}
+
+		$tokens = $phpcsFile->getTokens();
+
+		// Verify this use statement is used with a closure - if so, it has to have parenthesis before it.
+		$previousNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true, null, true);
+		if ($previousNonEmpty === false || $tokens[$previousNonEmpty]['code'] !== \T_CLOSE_PARENTHESIS
+			|| isset($tokens[$previousNonEmpty]['parenthesis_opener']) === false
+		) {
+			return;
+		}
+
+		// ... and (a variable within) parenthesis after it.
+		$nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true, null, true);
+		if ($nextNonEmpty === false || $tokens[$nextNonEmpty]['code'] !== \T_OPEN_PARENTHESIS) {
+			return;
+		}
+
+		if (isset($tokens[$nextNonEmpty]['parenthesis_closer']) === false) {
+			// Live coding.
+			return;
+		}
+
+		$closurePtr = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($tokens[$previousNonEmpty]['parenthesis_opener'] - 1), null, true);
+		if ($closurePtr === false || $tokens[$closurePtr]['code'] !== \T_CLOSURE) {
+			return;
+		}
+
+		// Get the parameters declared by the closure.
+		$closureParams = PHPCSHelper::getMethodParameters($phpcsFile, $closurePtr);
+
+		$errorMsg = 'Variables bound to a closure via the use construct cannot use the same name as superglobals, $this, or a declared parameter since PHP 7.1. Found: %s';
+
+		for ($i = ($nextNonEmpty + 1); $i < $tokens[$nextNonEmpty]['parenthesis_closer']; $i++) {
+			if ($tokens[$i]['code'] !== \T_VARIABLE) {
+				continue;
+			}
+
+			$variableName = $tokens[$i]['content'];
+
+			if ($variableName === '$this') {
+				$phpcsFile->addError($errorMsg, $i, 'FoundThis', array($variableName));
+				continue;
+			}
+
+			if (isset($this->superglobals[$variableName]) === true) {
+				$phpcsFile->addError($errorMsg, $i, 'FoundSuperglobal', array($variableName));
+				continue;
+			}
+
+			// Check whether it is one of the parameters declared by the closure.
+			if (empty($closureParams) === false) {
+				foreach ($closureParams as $param) {
+					if ($param['name'] === $variableName) {
+						$phpcsFile->addError($errorMsg, $i, 'FoundShadowParam', array($variableName));
+						continue 2;
+					}
+				}
+			}
+		}
+	}
 }

Spacing +23 added lines, -23 removed lines

@@ -38,7 +38,7 @@ 
      */
     public function register()
     {
-        return array(\T_USE);
+        return array( \T_USE );
     }
 
     /**
@@ -50,65 +50,65 @@ 
      *
      * @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();
 
         // Verify this use statement is used with a closure - if so, it has to have parenthesis before it.
-        $previousNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true, null, true);
-        if ($previousNonEmpty === false || $tokens[$previousNonEmpty]['code'] !== \T_CLOSE_PARENTHESIS
-            || isset($tokens[$previousNonEmpty]['parenthesis_opener']) === false
+        $previousNonEmpty = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true, null, true );
+        if ( $previousNonEmpty === false || $tokens[ $previousNonEmpty ][ 'code' ] !== \T_CLOSE_PARENTHESIS
+            || isset( $tokens[ $previousNonEmpty ][ 'parenthesis_opener' ] ) === false
         ) {
             return;
         }
 
         // ... and (a variable within) parenthesis after it.
-        $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true, null, true);
-        if ($nextNonEmpty === false || $tokens[$nextNonEmpty]['code'] !== \T_OPEN_PARENTHESIS) {
+        $nextNonEmpty = $phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true, null, true );
+        if ( $nextNonEmpty === false || $tokens[ $nextNonEmpty ][ 'code' ] !== \T_OPEN_PARENTHESIS ) {
             return;
         }
 
-        if (isset($tokens[$nextNonEmpty]['parenthesis_closer']) === false) {
+        if ( isset( $tokens[ $nextNonEmpty ][ 'parenthesis_closer' ] ) === false ) {
             // Live coding.
             return;
         }
 
-        $closurePtr = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($tokens[$previousNonEmpty]['parenthesis_opener'] - 1), null, true);
-        if ($closurePtr === false || $tokens[$closurePtr]['code'] !== \T_CLOSURE) {
+        $closurePtr = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $tokens[ $previousNonEmpty ][ 'parenthesis_opener' ] - 1 ), null, true );
+        if ( $closurePtr === false || $tokens[ $closurePtr ][ 'code' ] !== \T_CLOSURE ) {
             return;
         }
 
         // Get the parameters declared by the closure.
-        $closureParams = PHPCSHelper::getMethodParameters($phpcsFile, $closurePtr);
+        $closureParams = PHPCSHelper::getMethodParameters( $phpcsFile, $closurePtr );
 
         $errorMsg = 'Variables bound to a closure via the use construct cannot use the same name as superglobals, $this, or a declared parameter since PHP 7.1. Found: %s';
 
-        for ($i = ($nextNonEmpty + 1); $i < $tokens[$nextNonEmpty]['parenthesis_closer']; $i++) {
-            if ($tokens[$i]['code'] !== \T_VARIABLE) {
+        for ( $i = ( $nextNonEmpty + 1 ); $i < $tokens[ $nextNonEmpty ][ 'parenthesis_closer' ]; $i++ ) {
+            if ( $tokens[ $i ][ 'code' ] !== \T_VARIABLE ) {
                 continue;
             }
 
-            $variableName = $tokens[$i]['content'];
+            $variableName = $tokens[ $i ][ 'content' ];
 
-            if ($variableName === '$this') {
-                $phpcsFile->addError($errorMsg, $i, 'FoundThis', array($variableName));
+            if ( $variableName === '$this' ) {
+                $phpcsFile->addError( $errorMsg, $i, 'FoundThis', array( $variableName ) );
                 continue;
             }
 
-            if (isset($this->superglobals[$variableName]) === true) {
-                $phpcsFile->addError($errorMsg, $i, 'FoundSuperglobal', array($variableName));
+            if ( isset( $this->superglobals[ $variableName ] ) === true ) {
+                $phpcsFile->addError( $errorMsg, $i, 'FoundSuperglobal', array( $variableName ) );
                 continue;
             }
 
             // Check whether it is one of the parameters declared by the closure.
-            if (empty($closureParams) === false) {
-                foreach ($closureParams as $param) {
-                    if ($param['name'] === $variableName) {
-                        $phpcsFile->addError($errorMsg, $i, 'FoundShadowParam', array($variableName));
+            if ( empty( $closureParams ) === false ) {
+                foreach ( $closureParams as $param ) {
+                    if ( $param[ 'name' ] === $variableName ) {
+                        $phpcsFile->addError( $errorMsg, $i, 'FoundShadowParam', array( $variableName ) );
                         continue 2;
                     }
                 }

Braces +3 added lines, -6 removed lines

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

Indentation +39 added lines, -39 removed lines

@@ -33,47 +33,47 @@
 class ForbiddenParameterShadowSuperGlobalsSniff extends Sniff
 {
 
-    /**
-     * Register the tokens to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-            \T_FUNCTION,
-            \T_CLOSURE,
-        );
-    }
+	/**
+	 * Register the tokens to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return array(
+			\T_FUNCTION,
+			\T_CLOSURE,
+		);
+	}
 
-    /**
-     * Processes the test.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of the current token.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        if ($this->supportsAbove('5.4') === false) {
-            return;
-        }
+	/**
+	 * Processes the test.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of the current token.
+	 *
+	 * @return void
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		if ($this->supportsAbove('5.4') === false) {
+			return;
+		}
 
-        // Get all parameters from function signature.
-        $parameters = PHPCSHelper::getMethodParameters($phpcsFile, $stackPtr);
-        if (empty($parameters) || \is_array($parameters) === false) {
-            return;
-        }
+		// Get all parameters from function signature.
+		$parameters = PHPCSHelper::getMethodParameters($phpcsFile, $stackPtr);
+		if (empty($parameters) || \is_array($parameters) === false) {
+			return;
+		}
 
-        foreach ($parameters as $param) {
-            if (isset($this->superglobals[$param['name']]) === true) {
-                $error     = 'Parameter shadowing super global (%s) causes fatal error since PHP 5.4';
-                $errorCode = $this->stringToErrorCode(substr($param['name'], 1)) . 'Found';
-                $data      = array($param['name']);
+		foreach ($parameters as $param) {
+			if (isset($this->superglobals[$param['name']]) === true) {
+				$error     = 'Parameter shadowing super global (%s) causes fatal error since PHP 5.4';
+				$errorCode = $this->stringToErrorCode(substr($param['name'], 1)) . 'Found';
+				$data      = array($param['name']);
 
-                $phpcsFile->addError($error, $param['token'], $errorCode, $data);
-            }
-        }
-    }
+				$phpcsFile->addError($error, $param['token'], $errorCode, $data);
+			}
+		}
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -54,25 +54,25 @@
      *
      * @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;
         }
 
         // Get all parameters from function signature.
-        $parameters = PHPCSHelper::getMethodParameters($phpcsFile, $stackPtr);
-        if (empty($parameters) || \is_array($parameters) === false) {
+        $parameters = PHPCSHelper::getMethodParameters( $phpcsFile, $stackPtr );
+        if ( empty( $parameters ) || \is_array( $parameters ) === false ) {
             return;
         }
 
-        foreach ($parameters as $param) {
-            if (isset($this->superglobals[$param['name']]) === true) {
+        foreach ( $parameters as $param ) {
+            if ( isset( $this->superglobals[ $param[ 'name' ] ] ) === true ) {
                 $error     = 'Parameter shadowing super global (%s) causes fatal error since PHP 5.4';
-                $errorCode = $this->stringToErrorCode(substr($param['name'], 1)) . 'Found';
-                $data      = array($param['name']);
+                $errorCode = $this->stringToErrorCode( substr( $param[ 'name' ], 1 ) ) . 'Found';
+                $data      = array( $param[ 'name' ] );
 
-                $phpcsFile->addError($error, $param['token'], $errorCode, $data);
+                $phpcsFile->addError( $error, $param[ 'token' ], $errorCode, $data );
             }
         }
     }

Braces +3 added lines, -6 removed lines

@@ -30,16 +30,14 @@ 
  * @author    Declan Kelly <declankelly90@gmail.com>
  * @copyright 2015 Declan Kelly
  */
-class ForbiddenParameterShadowSuperGlobalsSniff extends Sniff
-{
+class ForbiddenParameterShadowSuperGlobalsSniff extends Sniff {
 
     /**
      * Register the tokens to listen for.
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(
             \T_FUNCTION,
             \T_CLOSURE,
@@ -54,8 +52,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         if ($this->supportsAbove('5.4') === false) {
             return;
         }

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

Indentation +49 added lines, -49 removed lines

@@ -29,58 +29,58 @@
 class ForbiddenParametersWithSameNameSniff extends Sniff
 {
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-            \T_FUNCTION,
-            \T_CLOSURE,
-        );
-    }
+	/**
+	 * 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;
-        }
+	/**
+	 * 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();
-        $token  = $tokens[$stackPtr];
-        // Skip function without body.
-        if (isset($token['scope_opener']) === false) {
-            return;
-        }
+		$tokens = $phpcsFile->getTokens();
+		$token  = $tokens[$stackPtr];
+		// Skip function without body.
+		if (isset($token['scope_opener']) === false) {
+			return;
+		}
 
-        // Get all parameters from method signature.
-        $parameters = PHPCSHelper::getMethodParameters($phpcsFile, $stackPtr);
-        if (empty($parameters) || \is_array($parameters) === false) {
-            return;
-        }
+		// Get all parameters from method signature.
+		$parameters = PHPCSHelper::getMethodParameters($phpcsFile, $stackPtr);
+		if (empty($parameters) || \is_array($parameters) === false) {
+			return;
+		}
 
-        $paramNames = array();
-        foreach ($parameters as $param) {
-            $paramNames[] = strtolower($param['name']);
-        }
+		$paramNames = array();
+		foreach ($parameters as $param) {
+			$paramNames[] = strtolower($param['name']);
+		}
 
-        if (\count($paramNames) !== \count(array_unique($paramNames))) {
-            $phpcsFile->addError(
-                'Functions can not have multiple parameters with the same name since PHP 7.0',
-                $stackPtr,
-                'Found'
-            );
-        }
-    }
+		if (\count($paramNames) !== \count(array_unique($paramNames))) {
+			$phpcsFile->addError(
+				'Functions can not have multiple parameters with the same name since PHP 7.0',
+				$stackPtr,
+				'Found'
+			);
+		}
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -51,31 +51,31 @@
      *
      * @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();
-        $token  = $tokens[$stackPtr];
+        $token  = $tokens[ $stackPtr ];
         // Skip function without body.
-        if (isset($token['scope_opener']) === false) {
+        if ( isset( $token[ 'scope_opener' ] ) === false ) {
             return;
         }
 
         // Get all parameters from method signature.
-        $parameters = PHPCSHelper::getMethodParameters($phpcsFile, $stackPtr);
-        if (empty($parameters) || \is_array($parameters) === false) {
+        $parameters = PHPCSHelper::getMethodParameters( $phpcsFile, $stackPtr );
+        if ( empty( $parameters ) || \is_array( $parameters ) === false ) {
             return;
         }
 
         $paramNames = array();
-        foreach ($parameters as $param) {
-            $paramNames[] = strtolower($param['name']);
+        foreach ( $parameters as $param ) {
+            $paramNames[ ] = strtolower( $param[ 'name' ] );
         }
 
-        if (\count($paramNames) !== \count(array_unique($paramNames))) {
+        if ( \count( $paramNames ) !== \count( array_unique( $paramNames ) ) ) {
             $phpcsFile->addError(
                 'Functions can not have multiple parameters with the same name since PHP 7.0',
                 $stackPtr,

Braces +3 added lines, -6 removed lines

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

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

Indentation +64 added lines, -64 removed lines

@@ -25,76 +25,76 @@
 class NewExceptionsFromToStringSniff extends Sniff
 {
 
-    /**
-     * Valid scopes for the __toString() method to live in.
-     *
-     * @since 9.2.0
-     *
-     * @var array
-     */
-    public $ooScopeTokens = array(
-        'T_CLASS'      => true,
-        'T_TRAIT'      => true,
-        'T_ANON_CLASS' => true,
-    );
+	/**
+	 * Valid scopes for the __toString() method to live in.
+	 *
+	 * @since 9.2.0
+	 *
+	 * @var array
+	 */
+	public $ooScopeTokens = array(
+		'T_CLASS'      => true,
+		'T_TRAIT'      => true,
+		'T_ANON_CLASS' => true,
+	);
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @since 9.2.0
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(\T_FUNCTION);
-    }
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @since 9.2.0
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return array(\T_FUNCTION);
+	}
 
-    /**
-     * 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->supportsBelow('7.3') === false) {
-            return;
-        }
+	/**
+	 * 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->supportsBelow('7.3') === 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;
-        }
+		$tokens = $phpcsFile->getTokens();
+		if (isset($tokens[$stackPtr]['scope_opener'], $tokens[$stackPtr]['scope_closer']) === false) {
+			// Abstract function, interface function, live coding or parse error.
+			return;
+		}
 
-        $functionName = $phpcsFile->getDeclarationName($stackPtr);
-        if (strtolower($functionName) !== '__tostring') {
-            // Not the right function.
-            return;
-        }
+		$functionName = $phpcsFile->getDeclarationName($stackPtr);
+		if (strtolower($functionName) !== '__tostring') {
+			// Not the right function.
+			return;
+		}
 
-        if ($this->validDirectScope($phpcsFile, $stackPtr, $this->ooScopeTokens) === false) {
-            // Function, not method.
-            return;
-        }
+		if ($this->validDirectScope($phpcsFile, $stackPtr, $this->ooScopeTokens) === false) {
+			// Function, not method.
+			return;
+		}
 
-        $hasThrow = $phpcsFile->findNext(\T_THROW, ($tokens[$stackPtr]['scope_opener'] + 1), $tokens[$stackPtr]['scope_closer']);
+		$hasThrow = $phpcsFile->findNext(\T_THROW, ($tokens[$stackPtr]['scope_opener'] + 1), $tokens[$stackPtr]['scope_closer']);
 
-        if ($hasThrow === false) {
-            // No exception is being thrown.
-            return;
-        }
+		if ($hasThrow === false) {
+			// No exception is being thrown.
+			return;
+		}
 
-        $phpcsFile->addError(
-            'Throwing exceptions from __toString() was not allowed prior to PHP 7.4',
-            $hasThrow,
-            'Found'
-        );
-    }
+		$phpcsFile->addError(
+			'Throwing exceptions from __toString() was not allowed prior to PHP 7.4',
+			$hasThrow,
+			'Found'
+		);
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -47,7 +47,7 @@ 
      */
     public function register()
     {
-        return array(\T_FUNCTION);
+        return array( \T_FUNCTION );
     }
 
     /**
@@ -61,32 +61,32 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
-        if ($this->supportsBelow('7.3') === false) {
+        if ( $this->supportsBelow( '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 ) {
             // Abstract function, interface function, live coding or parse error.
             return;
         }
 
-        $functionName = $phpcsFile->getDeclarationName($stackPtr);
-        if (strtolower($functionName) !== '__tostring') {
+        $functionName = $phpcsFile->getDeclarationName( $stackPtr );
+        if ( strtolower( $functionName ) !== '__tostring' ) {
             // Not the right function.
             return;
         }
 
-        if ($this->validDirectScope($phpcsFile, $stackPtr, $this->ooScopeTokens) === false) {
+        if ( $this->validDirectScope( $phpcsFile, $stackPtr, $this->ooScopeTokens ) === false ) {
             // Function, not method.
             return;
         }
 
-        $hasThrow = $phpcsFile->findNext(\T_THROW, ($tokens[$stackPtr]['scope_opener'] + 1), $tokens[$stackPtr]['scope_closer']);
+        $hasThrow = $phpcsFile->findNext( \T_THROW, ( $tokens[ $stackPtr ][ 'scope_opener' ] + 1 ), $tokens[ $stackPtr ][ 'scope_closer' ] );
 
-        if ($hasThrow === false) {
+        if ( $hasThrow === false ) {
             // No exception is being thrown.
             return;
         }

Braces +3 added lines, -6 removed lines

@@ -22,8 +22,7 @@ 
  *
  * @since 9.2.0
  */
-class NewExceptionsFromToStringSniff extends Sniff
-{
+class NewExceptionsFromToStringSniff extends Sniff {
 
     /**
      * Valid scopes for the __toString() method to live in.
@@ -45,8 +44,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(\T_FUNCTION);
     }
 
@@ -61,8 +59,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         if ($this->supportsBelow('7.3') === false) {
             return;
         }

Doc Comments +1 added lines, -1 removed lines

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

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

Indentation +130 added lines, -130 removed lines

@@ -29,134 +29,134 @@
  */
 class NewNullableTypesSniff extends Sniff
 {
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * {@internal Not sniffing for T_NULLABLE which was introduced in PHPCS 2.7.2
-     * as in that case we can't distinguish between parameter type hints and
-     * return type hints for the error message.}}
-     *
-     * @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)
-    {
-        if ($this->supportsBelow('7.0') === false) {
-            return;
-        }
-
-        $tokens    = $phpcsFile->getTokens();
-        $tokenCode = $tokens[$stackPtr]['code'];
-
-        if ($tokenCode === \T_FUNCTION || $tokenCode === \T_CLOSURE) {
-            $this->processFunctionDeclaration($phpcsFile, $stackPtr);
-
-            // 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.
-            $returnTypeHint = $this->getReturnTypeHintToken($phpcsFile, $stackPtr);
-            if ($returnTypeHint !== false) {
-                $this->processReturnType($phpcsFile, $returnTypeHint);
-            }
-        } else {
-            $this->processReturnType($phpcsFile, $stackPtr);
-        }
-    }
-
-
-    /**
-     * Process this test for function tokens.
-     *
-     * @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 processFunctionDeclaration(File $phpcsFile, $stackPtr)
-    {
-        $params = PHPCSHelper::getMethodParameters($phpcsFile, $stackPtr);
-
-        if (empty($params) === false && \is_array($params)) {
-            foreach ($params as $param) {
-                if ($param['nullable_type'] === true) {
-                    $phpcsFile->addError(
-                        'Nullable type declarations are not supported in PHP 7.0 or earlier. Found: %s',
-                        $param['token'],
-                        'typeDeclarationFound',
-                        array($param['type_hint'])
-                    );
-                }
-            }
-        }
-    }
-
-
-    /**
-     * Process this test for return type tokens.
-     *
-     * @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 processReturnType(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        if (isset($tokens[($stackPtr - 1)]['code']) === false) {
-            return;
-        }
-
-        $previous = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
-
-        // Deal with namespaced class names.
-        if ($tokens[$previous]['code'] === \T_NS_SEPARATOR) {
-            $validTokens                  = Tokens::$emptyTokens;
-            $validTokens[\T_STRING]       = true;
-            $validTokens[\T_NS_SEPARATOR] = true;
-
-            $stackPtr--;
-
-            while (isset($validTokens[$tokens[($stackPtr - 1)]['code']]) === true) {
-                $stackPtr--;
-            }
-
-            $previous = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
-        }
-
-        // T_NULLABLE token was introduced in PHPCS 2.7.2. Before that it identified as T_INLINE_THEN.
-        if ((\defined('T_NULLABLE') === true && $tokens[$previous]['type'] === 'T_NULLABLE')
-            || (\defined('T_NULLABLE') === false && $tokens[$previous]['code'] === \T_INLINE_THEN)
-        ) {
-            $phpcsFile->addError(
-                'Nullable return types are not supported in PHP 7.0 or earlier.',
-                $stackPtr,
-                'returnTypeFound'
-            );
-        }
-    }
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * {@internal Not sniffing for T_NULLABLE which was introduced in PHPCS 2.7.2
+	 * as in that case we can't distinguish between parameter type hints and
+	 * return type hints for the error message.}}
+	 *
+	 * @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)
+	{
+		if ($this->supportsBelow('7.0') === false) {
+			return;
+		}
+
+		$tokens    = $phpcsFile->getTokens();
+		$tokenCode = $tokens[$stackPtr]['code'];
+
+		if ($tokenCode === \T_FUNCTION || $tokenCode === \T_CLOSURE) {
+			$this->processFunctionDeclaration($phpcsFile, $stackPtr);
+
+			// 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.
+			$returnTypeHint = $this->getReturnTypeHintToken($phpcsFile, $stackPtr);
+			if ($returnTypeHint !== false) {
+				$this->processReturnType($phpcsFile, $returnTypeHint);
+			}
+		} else {
+			$this->processReturnType($phpcsFile, $stackPtr);
+		}
+	}
+
+
+	/**
+	 * Process this test for function tokens.
+	 *
+	 * @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 processFunctionDeclaration(File $phpcsFile, $stackPtr)
+	{
+		$params = PHPCSHelper::getMethodParameters($phpcsFile, $stackPtr);
+
+		if (empty($params) === false && \is_array($params)) {
+			foreach ($params as $param) {
+				if ($param['nullable_type'] === true) {
+					$phpcsFile->addError(
+						'Nullable type declarations are not supported in PHP 7.0 or earlier. Found: %s',
+						$param['token'],
+						'typeDeclarationFound',
+						array($param['type_hint'])
+					);
+				}
+			}
+		}
+	}
+
+
+	/**
+	 * Process this test for return type tokens.
+	 *
+	 * @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 processReturnType(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		if (isset($tokens[($stackPtr - 1)]['code']) === false) {
+			return;
+		}
+
+		$previous = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+
+		// Deal with namespaced class names.
+		if ($tokens[$previous]['code'] === \T_NS_SEPARATOR) {
+			$validTokens                  = Tokens::$emptyTokens;
+			$validTokens[\T_STRING]       = true;
+			$validTokens[\T_NS_SEPARATOR] = true;
+
+			$stackPtr--;
+
+			while (isset($validTokens[$tokens[($stackPtr - 1)]['code']]) === true) {
+				$stackPtr--;
+			}
+
+			$previous = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+		}
+
+		// T_NULLABLE token was introduced in PHPCS 2.7.2. Before that it identified as T_INLINE_THEN.
+		if ((\defined('T_NULLABLE') === true && $tokens[$previous]['type'] === 'T_NULLABLE')
+			|| (\defined('T_NULLABLE') === false && $tokens[$previous]['code'] === \T_INLINE_THEN)
+		) {
+			$phpcsFile->addError(
+				'Nullable return types are not supported in PHP 7.0 or earlier.',
+				$stackPtr,
+				'returnTypeFound'
+			);
+		}
+	}
 }

Spacing +28 added lines, -28 removed lines

@@ -45,8 +45,8 @@ 
             \T_CLOSURE,
         );
 
-        if (\defined('T_RETURN_TYPE')) {
-            $tokens[] = \T_RETURN_TYPE;
+        if ( \defined( 'T_RETURN_TYPE' ) ) {
+            $tokens[ ] = \T_RETURN_TYPE;
         }
 
         return $tokens;
@@ -62,26 +62,26 @@ 
      *
      * @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();
-        $tokenCode = $tokens[$stackPtr]['code'];
+        $tokenCode = $tokens[ $stackPtr ][ 'code' ];
 
-        if ($tokenCode === \T_FUNCTION || $tokenCode === \T_CLOSURE) {
-            $this->processFunctionDeclaration($phpcsFile, $stackPtr);
+        if ( $tokenCode === \T_FUNCTION || $tokenCode === \T_CLOSURE ) {
+            $this->processFunctionDeclaration( $phpcsFile, $stackPtr );
 
             // 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.
-            $returnTypeHint = $this->getReturnTypeHintToken($phpcsFile, $stackPtr);
-            if ($returnTypeHint !== false) {
-                $this->processReturnType($phpcsFile, $returnTypeHint);
+            $returnTypeHint = $this->getReturnTypeHintToken( $phpcsFile, $stackPtr );
+            if ( $returnTypeHint !== false ) {
+                $this->processReturnType( $phpcsFile, $returnTypeHint );
             }
         } else {
-            $this->processReturnType($phpcsFile, $stackPtr);
+            $this->processReturnType( $phpcsFile, $stackPtr );
         }
     }
 
@@ -95,18 +95,18 @@ 
      *
      * @return void
      */
-    protected function processFunctionDeclaration(File $phpcsFile, $stackPtr)
+    protected function processFunctionDeclaration( File $phpcsFile, $stackPtr )
     {
-        $params = PHPCSHelper::getMethodParameters($phpcsFile, $stackPtr);
+        $params = PHPCSHelper::getMethodParameters( $phpcsFile, $stackPtr );
 
-        if (empty($params) === false && \is_array($params)) {
-            foreach ($params as $param) {
-                if ($param['nullable_type'] === true) {
+        if ( empty( $params ) === false && \is_array( $params ) ) {
+            foreach ( $params as $param ) {
+                if ( $param[ 'nullable_type' ] === true ) {
                     $phpcsFile->addError(
                         'Nullable type declarations are not supported in PHP 7.0 or earlier. Found: %s',
-                        $param['token'],
+                        $param[ 'token' ],
                         'typeDeclarationFound',
-                        array($param['type_hint'])
+                        array( $param[ 'type_hint' ] )
                     );
                 }
             }
@@ -123,34 +123,34 @@ 
      *
      * @return void
      */
-    protected function processReturnType(File $phpcsFile, $stackPtr)
+    protected function processReturnType( File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
-        if (isset($tokens[($stackPtr - 1)]['code']) === false) {
+        if ( isset( $tokens[ ( $stackPtr - 1 ) ][ 'code' ] ) === false ) {
             return;
         }
 
-        $previous = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+        $previous = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
 
         // Deal with namespaced class names.
-        if ($tokens[$previous]['code'] === \T_NS_SEPARATOR) {
+        if ( $tokens[ $previous ][ 'code' ] === \T_NS_SEPARATOR ) {
             $validTokens                  = Tokens::$emptyTokens;
-            $validTokens[\T_STRING]       = true;
-            $validTokens[\T_NS_SEPARATOR] = true;
+            $validTokens[ \T_STRING ]       = true;
+            $validTokens[ \T_NS_SEPARATOR ] = true;
 
             $stackPtr--;
 
-            while (isset($validTokens[$tokens[($stackPtr - 1)]['code']]) === true) {
+            while ( isset( $validTokens[ $tokens[ ( $stackPtr - 1 ) ][ 'code' ] ] ) === true ) {
                 $stackPtr--;
             }
 
-            $previous = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+            $previous = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
         }
 
         // T_NULLABLE token was introduced in PHPCS 2.7.2. Before that it identified as T_INLINE_THEN.
-        if ((\defined('T_NULLABLE') === true && $tokens[$previous]['type'] === 'T_NULLABLE')
-            || (\defined('T_NULLABLE') === false && $tokens[$previous]['code'] === \T_INLINE_THEN)
+        if ( ( \defined( 'T_NULLABLE' ) === true && $tokens[ $previous ][ 'type' ] === 'T_NULLABLE' )
+            || ( \defined( 'T_NULLABLE' ) === false && $tokens[ $previous ][ 'code' ] === \T_INLINE_THEN )
         ) {
             $phpcsFile->addError(
                 'Nullable return types are not supported in PHP 7.0 or earlier.',

Braces +5 added lines, -10 removed lines

@@ -27,8 +27,7 @@ 
  * @package  PHPCompatibility
  * @author   Juliette Reinders Folmer <phpcompatibility_nospam@adviesenzo.nl>
  */
-class NewNullableTypesSniff extends Sniff
-{
+class NewNullableTypesSniff extends Sniff {
     /**
      * Returns an array of tokens this test wants to listen for.
      *
@@ -38,8 +37,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         $tokens = array(
             \T_FUNCTION,
             \T_CLOSURE,
@@ -62,8 +60,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         if ($this->supportsBelow('7.0') === false) {
             return;
         }
@@ -95,8 +92,7 @@ 
      *
      * @return void
      */
-    protected function processFunctionDeclaration(File $phpcsFile, $stackPtr)
-    {
+    protected function processFunctionDeclaration(File $phpcsFile, $stackPtr) {
         $params = PHPCSHelper::getMethodParameters($phpcsFile, $stackPtr);
 
         if (empty($params) === false && \is_array($params)) {
@@ -123,8 +119,7 @@ 
      *
      * @return void
      */
-    protected function processReturnType(File $phpcsFile, $stackPtr)
-    {
+    protected function processReturnType(File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         if (isset($tokens[($stackPtr - 1)]['code']) === false) {