gravityview / GravityView

vendor/phpcompatibility/php-compatibility/PHPCompatibility/Sniffs/InitialValue/NewConstantArraysUsingDefineSniff.php

Indentation +58 added lines, -58 removed lines

@@ -28,70 +28,70 @@
 class NewConstantArraysUsingDefineSniff extends Sniff
 {
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(\T_STRING);
-    }
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return array(\T_STRING);
+	}
 
-    /**
-     * 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.6') !== true) {
-            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.6') !== true) {
+			return;
+		}
 
-        $tokens = $phpcsFile->getTokens();
+		$tokens = $phpcsFile->getTokens();
 
-        $ignore = array(
-            \T_DOUBLE_COLON    => true,
-            \T_OBJECT_OPERATOR => true,
-            \T_FUNCTION        => true,
-            \T_CONST           => true,
-        );
+		$ignore = array(
+			\T_DOUBLE_COLON    => true,
+			\T_OBJECT_OPERATOR => true,
+			\T_FUNCTION        => true,
+			\T_CONST           => true,
+		);
 
-        $prevToken = $phpcsFile->findPrevious(\T_WHITESPACE, ($stackPtr - 1), null, true);
-        if (isset($ignore[$tokens[$prevToken]['code']]) === true) {
-            // Not a call to a PHP function.
-            return;
-        }
+		$prevToken = $phpcsFile->findPrevious(\T_WHITESPACE, ($stackPtr - 1), null, true);
+		if (isset($ignore[$tokens[$prevToken]['code']]) === true) {
+			// Not a call to a PHP function.
+			return;
+		}
 
-        $functionLc = strtolower($tokens[$stackPtr]['content']);
-        if ($functionLc !== 'define') {
-            return;
-        }
+		$functionLc = strtolower($tokens[$stackPtr]['content']);
+		if ($functionLc !== 'define') {
+			return;
+		}
 
-        $secondParam = $this->getFunctionCallParameter($phpcsFile, $stackPtr, 2);
-        if (isset($secondParam['start'], $secondParam['end']) === false) {
-            return;
-        }
+		$secondParam = $this->getFunctionCallParameter($phpcsFile, $stackPtr, 2);
+		if (isset($secondParam['start'], $secondParam['end']) === false) {
+			return;
+		}
 
-        $targetNestingLevel = 0;
-        if (isset($tokens[$secondParam['start']]['nested_parenthesis'])) {
-            $targetNestingLevel = \count($tokens[$secondParam['start']]['nested_parenthesis']);
-        }
+		$targetNestingLevel = 0;
+		if (isset($tokens[$secondParam['start']]['nested_parenthesis'])) {
+			$targetNestingLevel = \count($tokens[$secondParam['start']]['nested_parenthesis']);
+		}
 
-        $array = $phpcsFile->findNext(array(\T_ARRAY, \T_OPEN_SHORT_ARRAY), $secondParam['start'], ($secondParam['end'] + 1));
-        if ($array !== false) {
-            if ((isset($tokens[$array]['nested_parenthesis']) === false && $targetNestingLevel === 0) || \count($tokens[$array]['nested_parenthesis']) === $targetNestingLevel) {
-                $phpcsFile->addError(
-                    'Constant arrays using define are not allowed in PHP 5.6 or earlier',
-                    $array,
-                    'Found'
-                );
-            }
-        }
-    }
+		$array = $phpcsFile->findNext(array(\T_ARRAY, \T_OPEN_SHORT_ARRAY), $secondParam['start'], ($secondParam['end'] + 1));
+		if ($array !== false) {
+			if ((isset($tokens[$array]['nested_parenthesis']) === false && $targetNestingLevel === 0) || \count($tokens[$array]['nested_parenthesis']) === $targetNestingLevel) {
+				$phpcsFile->addError(
+					'Constant arrays using define are not allowed in PHP 5.6 or earlier',
+					$array,
+					'Found'
+				);
+			}
+		}
+	}
 }

Spacing +14 added lines, -14 removed lines

@@ -35,7 +35,7 @@ 
      */
     public function register()
     {
-        return array(\T_STRING);
+        return array( \T_STRING );
     }
 
     /**
@@ -47,9 +47,9 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
-        if ($this->supportsBelow('5.6') !== true) {
+        if ( $this->supportsBelow( '5.6' ) !== true ) {
             return;
         }
 
@@ -62,30 +62,30 @@ 
             \T_CONST           => true,
         );
 
-        $prevToken = $phpcsFile->findPrevious(\T_WHITESPACE, ($stackPtr - 1), null, true);
-        if (isset($ignore[$tokens[$prevToken]['code']]) === true) {
+        $prevToken = $phpcsFile->findPrevious( \T_WHITESPACE, ( $stackPtr - 1 ), null, true );
+        if ( isset( $ignore[ $tokens[ $prevToken ][ 'code' ] ] ) === true ) {
             // Not a call to a PHP function.
             return;
         }
 
-        $functionLc = strtolower($tokens[$stackPtr]['content']);
-        if ($functionLc !== 'define') {
+        $functionLc = strtolower( $tokens[ $stackPtr ][ 'content' ] );
+        if ( $functionLc !== 'define' ) {
             return;
         }
 
-        $secondParam = $this->getFunctionCallParameter($phpcsFile, $stackPtr, 2);
-        if (isset($secondParam['start'], $secondParam['end']) === false) {
+        $secondParam = $this->getFunctionCallParameter( $phpcsFile, $stackPtr, 2 );
+        if ( isset( $secondParam[ 'start' ], $secondParam[ 'end' ] ) === false ) {
             return;
         }
 
         $targetNestingLevel = 0;
-        if (isset($tokens[$secondParam['start']]['nested_parenthesis'])) {
-            $targetNestingLevel = \count($tokens[$secondParam['start']]['nested_parenthesis']);
+        if ( isset( $tokens[ $secondParam[ 'start' ] ][ 'nested_parenthesis' ] ) ) {
+            $targetNestingLevel = \count( $tokens[ $secondParam[ 'start' ] ][ 'nested_parenthesis' ] );
         }
 
-        $array = $phpcsFile->findNext(array(\T_ARRAY, \T_OPEN_SHORT_ARRAY), $secondParam['start'], ($secondParam['end'] + 1));
-        if ($array !== false) {
-            if ((isset($tokens[$array]['nested_parenthesis']) === false && $targetNestingLevel === 0) || \count($tokens[$array]['nested_parenthesis']) === $targetNestingLevel) {
+        $array = $phpcsFile->findNext( array( \T_ARRAY, \T_OPEN_SHORT_ARRAY ), $secondParam[ 'start' ], ( $secondParam[ 'end' ] + 1 ) );
+        if ( $array !== false ) {
+            if ( ( isset( $tokens[ $array ][ 'nested_parenthesis' ] ) === false && $targetNestingLevel === 0 ) || \count( $tokens[ $array ][ 'nested_parenthesis' ] ) === $targetNestingLevel ) {
                 $phpcsFile->addError(
                     'Constant arrays using define are not allowed in PHP 5.6 or earlier',
                     $array,

Braces +3 added lines, -6 removed lines

@@ -25,16 +25,14 @@ 
  * @package  PHPCompatibility
  * @author   Wim Godden <wim@cu.be>
  */
-class NewConstantArraysUsingDefineSniff extends Sniff
-{
+class NewConstantArraysUsingDefineSniff extends Sniff {
 
     /**
      * Returns an array of tokens this test wants to listen for.
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(\T_STRING);
     }
 
@@ -47,8 +45,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         if ($this->supportsBelow('5.6') !== true) {
             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/InitialValue/NewHeredocSniff.php

Indentation +46 added lines, -46 removed lines

@@ -35,56 +35,56 @@
 class NewHeredocSniff extends NewConstantScalarExpressionsSniff
 {
 
-    /**
-     * Error message.
-     *
-     * @var string
-     */
-    const ERROR_PHRASE = 'Initializing %s using the Heredoc syntax was not supported in PHP 5.2 or earlier';
+	/**
+	 * Error message.
+	 *
+	 * @var string
+	 */
+	const ERROR_PHRASE = 'Initializing %s using the Heredoc syntax was not supported in PHP 5.2 or earlier';
 
-    /**
-     * Partial error phrases to be used in combination with the error message constant.
-     *
-     * @var array
-     */
-    protected $errorPhrases = array(
-        'const'     => 'constants',
-        'property'  => 'class properties',
-        'staticvar' => 'static variables',
-        'default'   => 'default parameter values',
-    );
+	/**
+	 * Partial error phrases to be used in combination with the error message constant.
+	 *
+	 * @var array
+	 */
+	protected $errorPhrases = array(
+		'const'     => 'constants',
+		'property'  => 'class properties',
+		'staticvar' => 'static variables',
+		'default'   => 'default parameter values',
+	);
 
 
-    /**
-     * Do a version check to determine if this sniff needs to run at all.
-     *
-     * @return bool
-     */
-    protected function bowOutEarly()
-    {
-        return ($this->supportsBelow('5.2') !== true);
-    }
+	/**
+	 * Do a version check to determine if this sniff needs to run at all.
+	 *
+	 * @return bool
+	 */
+	protected function bowOutEarly()
+	{
+		return ($this->supportsBelow('5.2') !== true);
+	}
 
 
-    /**
-     * Is a value declared and does the declared value not contain an heredoc ?
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of the current token in the
-     *                                         stack passed in $tokens.
-     * @param int                   $end       The end of the value definition.
-     *
-     * @return bool True if no heredoc (or assignment) is found, false otherwise.
-     */
-    protected function isValidAssignment(File $phpcsFile, $stackPtr, $end)
-    {
-        $tokens = $phpcsFile->getTokens();
-        $next   = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), $end, true);
-        if ($next === false || $tokens[$next]['code'] !== \T_EQUAL) {
-            // No value assigned.
-            return true;
-        }
+	/**
+	 * Is a value declared and does the declared value not contain an heredoc ?
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of the current token in the
+	 *                                         stack passed in $tokens.
+	 * @param int                   $end       The end of the value definition.
+	 *
+	 * @return bool True if no heredoc (or assignment) is found, false otherwise.
+	 */
+	protected function isValidAssignment(File $phpcsFile, $stackPtr, $end)
+	{
+		$tokens = $phpcsFile->getTokens();
+		$next   = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), $end, true);
+		if ($next === false || $tokens[$next]['code'] !== \T_EQUAL) {
+			// No value assigned.
+			return true;
+		}
 
-        return ($phpcsFile->findNext(\T_START_HEREDOC, ($next + 1), $end, false, null, true) === false);
-    }
+		return ($phpcsFile->findNext(\T_START_HEREDOC, ($next + 1), $end, false, null, true) === false);
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -62,7 +62,7 @@ 
      */
     protected function bowOutEarly()
     {
-        return ($this->supportsBelow('5.2') !== true);
+        return ( $this->supportsBelow( '5.2' ) !== true );
     }
 
 
@@ -76,15 +76,15 @@ 
      *
      * @return bool True if no heredoc (or assignment) is found, false otherwise.
      */
-    protected function isValidAssignment(File $phpcsFile, $stackPtr, $end)
+    protected function isValidAssignment( File $phpcsFile, $stackPtr, $end )
     {
         $tokens = $phpcsFile->getTokens();
-        $next   = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), $end, true);
-        if ($next === false || $tokens[$next]['code'] !== \T_EQUAL) {
+        $next   = $phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), $end, true );
+        if ( $next === false || $tokens[ $next ][ 'code' ] !== \T_EQUAL ) {
             // No value assigned.
             return true;
         }
 
-        return ($phpcsFile->findNext(\T_START_HEREDOC, ($next + 1), $end, false, null, true) === false);
+        return ( $phpcsFile->findNext( \T_START_HEREDOC, ( $next + 1 ), $end, false, null, true ) === false );
     }
 }

Braces +3 added lines, -6 removed lines

@@ -32,8 +32,7 @@ 
  * @package  PHPCompatibility
  * @author   Juliette Reinders Folmer <phpcompatibility_nospam@adviesenzo.nl>
  */
-class NewHeredocSniff extends NewConstantScalarExpressionsSniff
-{
+class NewHeredocSniff extends NewConstantScalarExpressionsSniff {
 
     /**
      * Error message.
@@ -60,8 +59,7 @@ 
      *
      * @return bool
      */
-    protected function bowOutEarly()
-    {
+    protected function bowOutEarly() {
         return ($this->supportsBelow('5.2') !== true);
     }
 
@@ -76,8 +74,7 @@ 
      *
      * @return bool True if no heredoc (or assignment) is found, false otherwise.
      */
-    protected function isValidAssignment(File $phpcsFile, $stackPtr, $end)
-    {
+    protected function isValidAssignment(File $phpcsFile, $stackPtr, $end) {
         $tokens = $phpcsFile->getTokens();
         $next   = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), $end, true);
         if ($next === false || $tokens[$next]['code'] !== \T_EQUAL) {

vendor/phpcompatibility/php-compatibility/PHPCompatibility/Sniffs/Classes/NewAnonymousClassesSniff.php

Indentation +49 added lines, -49 removed lines

@@ -29,59 +29,59 @@
 class NewAnonymousClassesSniff extends Sniff
 {
 
-    /**
-     * Tokens which in various PHP versions indicate the `class` keyword.
-     *
-     * The dedicated anonymous class token is added from the `register()`
-     * method if the token is available.
-     *
-     * @var array
-     */
-    private $indicators = array(
-        \T_CLASS => \T_CLASS,
-    );
+	/**
+	 * Tokens which in various PHP versions indicate the `class` keyword.
+	 *
+	 * The dedicated anonymous class token is added from the `register()`
+	 * method if the token is available.
+	 *
+	 * @var array
+	 */
+	private $indicators = array(
+		\T_CLASS => \T_CLASS,
+	);
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        if (\defined('T_ANON_CLASS')) {
-            $this->indicators[\T_ANON_CLASS] = \T_ANON_CLASS;
-        }
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		if (\defined('T_ANON_CLASS')) {
+			$this->indicators[\T_ANON_CLASS] = \T_ANON_CLASS;
+		}
 
-        return array(\T_NEW);
-    }
+		return array(\T_NEW);
+	}
 
 
-    /**
-     * 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.6') === 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.6') === false) {
+			return;
+		}
 
-        $tokens       = $phpcsFile->getTokens();
-        $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, $stackPtr + 1, null, true, null, true);
-        if ($nextNonEmpty === false || isset($this->indicators[$tokens[$nextNonEmpty]['code']]) === false) {
-            return;
-        }
+		$tokens       = $phpcsFile->getTokens();
+		$nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, $stackPtr + 1, null, true, null, true);
+		if ($nextNonEmpty === false || isset($this->indicators[$tokens[$nextNonEmpty]['code']]) === false) {
+			return;
+		}
 
-        // Still here ? In that case, it is an anonymous class.
-        $phpcsFile->addError(
-            'Anonymous classes are not supported in PHP 5.6 or earlier',
-            $stackPtr,
-            'Found'
-        );
-    }
+		// Still here ? In that case, it is an anonymous class.
+		$phpcsFile->addError(
+			'Anonymous classes are not supported in PHP 5.6 or earlier',
+			$stackPtr,
+			'Found'
+		);
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -48,11 +48,11 @@ 
      */
     public function register()
     {
-        if (\defined('T_ANON_CLASS')) {
-            $this->indicators[\T_ANON_CLASS] = \T_ANON_CLASS;
+        if ( \defined( 'T_ANON_CLASS' ) ) {
+            $this->indicators[ \T_ANON_CLASS ] = \T_ANON_CLASS;
         }
 
-        return array(\T_NEW);
+        return array( \T_NEW );
     }
 
 
@@ -65,15 +65,15 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
-        if ($this->supportsBelow('5.6') === false) {
+        if ( $this->supportsBelow( '5.6' ) === false ) {
             return;
         }
 
         $tokens       = $phpcsFile->getTokens();
-        $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, $stackPtr + 1, null, true, null, true);
-        if ($nextNonEmpty === false || isset($this->indicators[$tokens[$nextNonEmpty]['code']]) === false) {
+        $nextNonEmpty = $phpcsFile->findNext( Tokens::$emptyTokens, $stackPtr + 1, null, true, null, true );
+        if ( $nextNonEmpty === false || isset( $this->indicators[ $tokens[ $nextNonEmpty ][ 'code' ] ] ) === false ) {
             return;
         }
 

Braces +3 added lines, -6 removed lines

@@ -26,8 +26,7 @@ 
  * @package  PHPCompatibility
  * @author   Wim Godden <wim.godden@cu.be>
  */
-class NewAnonymousClassesSniff extends Sniff
-{
+class NewAnonymousClassesSniff extends Sniff {
 
     /**
      * Tokens which in various PHP versions indicate the `class` keyword.
@@ -46,8 +45,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         if (\defined('T_ANON_CLASS')) {
             $this->indicators[\T_ANON_CLASS] = \T_ANON_CLASS;
         }
@@ -65,8 +63,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         if ($this->supportsBelow('5.6') === 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/Classes/NewConstVisibilitySniff.php

Indentation +42 added lines, -42 removed lines

@@ -28,51 +28,51 @@
  */
 class NewConstVisibilitySniff extends Sniff
 {
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(\T_CONST);
-    }
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return array(\T_CONST);
+	}
 
-    /**
-     * 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();
-        $prevToken = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true, null, true);
+		$tokens    = $phpcsFile->getTokens();
+		$prevToken = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true, null, true);
 
-        // Is the previous token a visibility indicator ?
-        if ($prevToken === false || isset(Tokens::$scopeModifiers[$tokens[$prevToken]['code']]) === false) {
-            return;
-        }
+		// Is the previous token a visibility indicator ?
+		if ($prevToken === false || isset(Tokens::$scopeModifiers[$tokens[$prevToken]['code']]) === false) {
+			return;
+		}
 
-        // Is this a class constant ?
-        if ($this->isClassConstant($phpcsFile, $stackPtr) === false) {
-            // This may be a constant declaration in the global namespace with visibility,
-            // but that would throw a parse error, i.e. not our concern.
-            return;
-        }
+		// Is this a class constant ?
+		if ($this->isClassConstant($phpcsFile, $stackPtr) === false) {
+			// This may be a constant declaration in the global namespace with visibility,
+			// but that would throw a parse error, i.e. not our concern.
+			return;
+		}
 
-        $phpcsFile->addError(
-            'Visibility indicators for class constants are not supported in PHP 7.0 or earlier. Found "%s const"',
-            $stackPtr,
-            'Found',
-            array($tokens[$prevToken]['content'])
-        );
-    }
+		$phpcsFile->addError(
+			'Visibility indicators for class constants are not supported in PHP 7.0 or earlier. Found "%s const"',
+			$stackPtr,
+			'Found',
+			array($tokens[$prevToken]['content'])
+		);
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -35,7 +35,7 @@ 
      */
     public function register()
     {
-        return array(\T_CONST);
+        return array( \T_CONST );
     }
 
     /**
@@ -47,22 +47,22 @@ 
      *
      * @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();
-        $prevToken = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true, null, true);
+        $prevToken = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true, null, true );
 
         // Is the previous token a visibility indicator ?
-        if ($prevToken === false || isset(Tokens::$scopeModifiers[$tokens[$prevToken]['code']]) === false) {
+        if ( $prevToken === false || isset( Tokens::$scopeModifiers[ $tokens[ $prevToken ][ 'code' ] ] ) === false ) {
             return;
         }
 
         // Is this a class constant ?
-        if ($this->isClassConstant($phpcsFile, $stackPtr) === false) {
+        if ( $this->isClassConstant( $phpcsFile, $stackPtr ) === false ) {
             // This may be a constant declaration in the global namespace with visibility,
             // but that would throw a parse error, i.e. not our concern.
             return;
@@ -72,7 +72,7 @@ 
             'Visibility indicators for class constants are not supported in PHP 7.0 or earlier. Found "%s const"',
             $stackPtr,
             'Found',
-            array($tokens[$prevToken]['content'])
+            array( $tokens[ $prevToken ][ 'content' ] )
         );
     }
 }

Braces +3 added lines, -6 removed lines

@@ -26,15 +26,13 @@ 
  * @package  PHPCompatibility
  * @author   Juliette Reinders Folmer <phpcompatibility_nospam@adviesenzo.nl>
  */
-class NewConstVisibilitySniff extends Sniff
-{
+class NewConstVisibilitySniff extends Sniff {
     /**
      * Returns an array of tokens this test wants to listen for.
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(\T_CONST);
     }
 
@@ -47,8 +45,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/Classes/NewClassesSniff.php

Indentation +820 added lines, -820 removed lines

@@ -24,824 +24,824 @@
 class NewClassesSniff extends AbstractNewFeatureSniff
 {
 
-    /**
-     * A list of new classes, not present in older versions.
-     *
-     * The array lists : version number with false (not present) or true (present).
-     * If's sufficient to list the first version where the class appears.
-     *
-     * @var array(string => array(string => bool))
-     */
-    protected $newClasses = array(
-        'ArrayObject' => array(
-            '4.4' => false,
-            '5.0' => true,
-        ),
-        'ArrayIterator' => array(
-            '4.4' => false,
-            '5.0' => true,
-        ),
-        'CachingIterator' => array(
-            '4.4' => false,
-            '5.0' => true,
-        ),
-        'DirectoryIterator' => array(
-            '4.4' => false,
-            '5.0' => true,
-        ),
-        'RecursiveDirectoryIterator' => array(
-            '4.4' => false,
-            '5.0' => true,
-        ),
-        'RecursiveIteratorIterator' => array(
-            '4.4' => false,
-            '5.0' => true,
-        ),
-        'php_user_filter' => array(
-            '4.4' => false,
-            '5.0' => true,
-        ),
-        'tidy' => array(
-            '4.4' => false,
-            '5.0' => true,
-        ),
-
-        'SimpleXMLElement' => array(
-            '5.0.0' => false,
-            '5.0.1' => true,
-        ),
-        'tidyNode' => array(
-            '5.0.0' => false,
-            '5.0.1' => true,
-        ),
-
-        'libXMLError' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'PDO' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'PDOStatement' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'AppendIterator' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'EmptyIterator' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'FilterIterator' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'InfiniteIterator' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'IteratorIterator' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'LimitIterator' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'NoRewindIterator' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'ParentIterator' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'RecursiveArrayIterator' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'RecursiveCachingIterator' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'RecursiveFilterIterator' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'SimpleXMLIterator' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'SplFileObject' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'XMLReader' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-
-        'SplFileInfo' => array(
-            '5.1.1' => false,
-            '5.1.2' => true,
-        ),
-        'SplTempFileObject' => array(
-            '5.1.1' => false,
-            '5.1.2' => true,
-        ),
-        'XMLWriter' => array(
-            '5.1.1' => false,
-            '5.1.2' => true,
-        ),
-
-        'DateTime' => array(
-            '5.1' => false,
-            '5.2' => true,
-        ),
-        'DateTimeZone' => array(
-            '5.1' => false,
-            '5.2' => true,
-        ),
-        'RegexIterator' => array(
-            '5.1' => false,
-            '5.2' => true,
-        ),
-        'RecursiveRegexIterator' => array(
-            '5.1' => false,
-            '5.2' => true,
-        ),
-        'ReflectionFunctionAbstract' => array(
-            '5.1' => false,
-            '5.2' => true,
-        ),
-        'ZipArchive' => array(
-            '5.1' => false,
-            '5.2' => true,
-        ),
-
-        'Closure' => array(
-            '5.2' => false,
-            '5.3' => true,
-        ),
-        'DateInterval' => array(
-            '5.2' => false,
-            '5.3' => true,
-        ),
-        'DatePeriod' => array(
-            '5.2' => false,
-            '5.3' => true,
-        ),
-        'finfo' => array(
-            '5.2' => false,
-            '5.3' => true,
-        ),
-        'Collator' => array(
-            '5.2' => false,
-            '5.3' => true,
-        ),
-        'NumberFormatter' => array(
-            '5.2' => false,
-            '5.3' => true,
-        ),
-        'Locale' => array(
-            '5.2' => false,
-            '5.3' => true,
-        ),
-        'Normalizer' => array(
-            '5.2' => false,
-            '5.3' => true,
-        ),
-        'MessageFormatter' => array(
-            '5.2' => false,
-            '5.3' => true,
-        ),
-        'IntlDateFormatter' => array(
-            '5.2' => false,
-            '5.3' => true,
-        ),
-        'Phar' => array(
-            '5.2' => false,
-            '5.3' => true,
-        ),
-        'PharData' => array(
-            '5.2' => false,
-            '5.3' => true,
-        ),
-        'PharFileInfo' => array(
-            '5.2' => false,
-            '5.3' => true,
-        ),
-        'FilesystemIterator' => array(
-            '5.2' => false,
-            '5.3' => true,
-        ),
-        'GlobIterator' => array(
-            '5.2' => false,
-            '5.3' => true,
-        ),
-        'MultipleIterator' => array(
-            '5.2' => false,
-            '5.3' => true,
-        ),
-        'RecursiveTreeIterator' => array(
-            '5.2' => false,
-            '5.3' => true,
-        ),
-        'SplDoublyLinkedList' => array(
-            '5.2' => false,
-            '5.3' => true,
-        ),
-        'SplFixedArray' => array(
-            '5.2' => false,
-            '5.3' => true,
-        ),
-        'SplHeap' => array(
-            '5.2' => false,
-            '5.3' => true,
-        ),
-        'SplMaxHeap' => array(
-            '5.2' => false,
-            '5.3' => true,
-        ),
-        'SplMinHeap' => array(
-            '5.2' => false,
-            '5.3' => true,
-        ),
-        'SplObjectStorage' => array(
-            '5.2' => false,
-            '5.3' => true,
-        ),
-        'SplPriorityQueue' => array(
-            '5.2' => false,
-            '5.3' => true,
-        ),
-        'SplQueue' => array(
-            '5.2' => false,
-            '5.3' => true,
-        ),
-        'SplStack' => array(
-            '5.2' => false,
-            '5.3' => true,
-        ),
-
-        'ResourceBundle' => array(
-            '5.3.1' => false,
-            '5.3.2' => true,
-        ),
-
-        'CallbackFilterIterator' => array(
-            '5.3' => false,
-            '5.4' => true,
-        ),
-        'RecursiveCallbackFilterIterator' => array(
-            '5.3' => false,
-            '5.4' => true,
-        ),
-        'ReflectionZendExtension' => array(
-            '5.3' => false,
-            '5.4' => true,
-        ),
-        'SessionHandler' => array(
-            '5.3' => false,
-            '5.4' => true,
-        ),
-        'SNMP' => array(
-            '5.3' => false,
-            '5.4' => true,
-        ),
-        'Transliterator' => array(
-            '5.3' => false,
-            '5.4' => true,
-        ),
-        'Spoofchecker' => array(
-            '5.3' => false,
-            '5.4' => true,
-        ),
-
-        'Generator' => array(
-            '5.4' => false,
-            '5.5' => true,
-        ),
-        'CURLFile' => array(
-            '5.4' => false,
-            '5.5' => true,
-        ),
-        'DateTimeImmutable' => array(
-            '5.4' => false,
-            '5.5' => true,
-        ),
-        'IntlCalendar' => array(
-            '5.4' => false,
-            '5.5' => true,
-        ),
-        'IntlGregorianCalendar' => array(
-            '5.4' => false,
-            '5.5' => true,
-        ),
-        'IntlTimeZone' => array(
-            '5.4' => false,
-            '5.5' => true,
-        ),
-        'IntlBreakIterator' => array(
-            '5.4' => false,
-            '5.5' => true,
-        ),
-        'IntlRuleBasedBreakIterator' => array(
-            '5.4' => false,
-            '5.5' => true,
-        ),
-        'IntlCodePointBreakIterator' => array(
-            '5.4' => false,
-            '5.5' => true,
-        ),
-        'UConverter' => array(
-            '5.4' => false,
-            '5.5' => true,
-        ),
-
-        'GMP' => array(
-            '5.5' => false,
-            '5.6' => true,
-        ),
-
-        'IntlChar' => array(
-            '5.6' => false,
-            '7.0' => true,
-        ),
-        'ReflectionType' => array(
-            '5.6' => false,
-            '7.0' => true,
-        ),
-        'ReflectionGenerator' => array(
-            '5.6' => false,
-            '7.0' => true,
-        ),
-
-        'ReflectionClassConstant' => array(
-            '7.0' => false,
-            '7.1' => true,
-        ),
-
-    );
-
-    /**
-     * A list of new Exception classes, not present in older versions.
-     *
-     * The array lists : version number with false (not present) or true (present).
-     * If's sufficient to list the first version where the class appears.
-     *
-     * {@internal Classes listed here do not need to be added to the $newClasses
-     *            property as well.
-     *            This list is automatically added to the $newClasses property
-     *            in the `register()` method.}}
-     *
-     * {@internal Helper to update this list: https://3v4l.org/MhlUp}}
-     *
-     * @var array(string => array(string => bool))
-     */
-    protected $newExceptions = array(
-        'com_exception' => array(
-            '4.4' => false,
-            '5.0' => true,
-        ),
-        'DOMException' => array(
-            '4.4' => false,
-            '5.0' => true,
-        ),
-        'Exception' => array(
-            // According to the docs introduced in PHP 5.1, but this appears to be.
-            // an error.  Class was introduced with try/catch keywords in PHP 5.0.
-            '4.4' => false,
-            '5.0' => true,
-        ),
-        'ReflectionException' => array(
-            '4.4' => false,
-            '5.0' => true,
-        ),
-        'SoapFault' => array(
-            '4.4' => false,
-            '5.0' => true,
-        ),
-        'SQLiteException' => array(
-            '4.4' => false,
-            '5.0' => true,
-        ),
-
-        'ErrorException' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'BadFunctionCallException' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'BadMethodCallException' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'DomainException' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'InvalidArgumentException' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'LengthException' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'LogicException' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'mysqli_sql_exception' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'OutOfBoundsException' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'OutOfRangeException' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'OverflowException' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'PDOException' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'RangeException' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'RuntimeException' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'UnderflowException' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-        'UnexpectedValueException' => array(
-            '5.0' => false,
-            '5.1' => true,
-        ),
-
-        'PharException' => array(
-            '5.2' => false,
-            '5.3' => true,
-        ),
-
-        'SNMPException' => array(
-            '5.3' => false,
-            '5.4' => true,
-        ),
-
-        'IntlException' => array(
-            '5.4' => false,
-            '5.5' => true,
-        ),
-
-        'Error' => array(
-            '5.6' => false,
-            '7.0' => true,
-        ),
-        'ArithmeticError' => array(
-            '5.6' => false,
-            '7.0' => true,
-        ),
-        'AssertionError' => array(
-            '5.6' => false,
-            '7.0' => true,
-        ),
-        'DivisionByZeroError' => array(
-            '5.6' => false,
-            '7.0' => true,
-        ),
-        'ParseError' => array(
-            '5.6' => false,
-            '7.0' => true,
-        ),
-        'TypeError' => array(
-            '5.6' => false,
-            '7.0' => true,
-        ),
-        'ClosedGeneratorException' => array(
-            '5.6' => false,
-            '7.0' => true,
-        ),
-        'UI\Exception\InvalidArgumentException' => array(
-            '5.6' => false,
-            '7.0' => true,
-        ),
-        'UI\Exception\RuntimeException' => array(
-            '5.6' => false,
-            '7.0' => true,
-        ),
-
-        'ArgumentCountError' => array(
-            '7.0' => false,
-            '7.1' => true,
-        ),
-
-        'SodiumException' => array(
-            '7.1' => false,
-            '7.2' => true,
-        ),
-
-        'CompileError' => array(
-            '7.2' => false,
-            '7.3' => true,
-        ),
-        'JsonException' => array(
-            '7.2' => false,
-            '7.3' => true,
-        ),
-
-        'ReflectionReference' => array(
-            '7.3' => false,
-            '7.4' => true,
-        ),
-    );
-
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        // Handle case-insensitivity of class names.
-        $this->newClasses    = $this->arrayKeysToLowercase($this->newClasses);
-        $this->newExceptions = $this->arrayKeysToLowercase($this->newExceptions);
-
-        // Add the Exception classes to the Classes list.
-        $this->newClasses = array_merge($this->newClasses, $this->newExceptions);
-
-        $targets = array(
-            \T_NEW,
-            \T_CLASS,
-            \T_DOUBLE_COLON,
-            \T_FUNCTION,
-            \T_CLOSURE,
-            \T_CATCH,
-        );
-
-        if (\defined('T_ANON_CLASS')) {
-            $targets[] = \T_ANON_CLASS;
-        }
-
-        if (\defined('T_RETURN_TYPE')) {
-            $targets[] = \T_RETURN_TYPE;
-        }
-
-        return $targets;
-    }
-
-
-    /**
-     * 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();
-
-        switch ($tokens[$stackPtr]['type']) {
-            case 'T_FUNCTION':
-            case 'T_CLOSURE':
-                $this->processFunctionToken($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->processReturnTypeToken($phpcsFile, $returnTypeHint);
-                }
-                break;
-
-            case 'T_CATCH':
-                $this->processCatchToken($phpcsFile, $stackPtr);
-                break;
-
-            case 'T_RETURN_TYPE':
-                $this->processReturnTypeToken($phpcsFile, $stackPtr);
-                break;
-
-            default:
-                $this->processSingularToken($phpcsFile, $stackPtr);
-                break;
-        }
-    }
-
-
-    /**
-     * Processes this test for when a token resulting in a singular class name 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
-     */
-    private function processSingularToken(File $phpcsFile, $stackPtr)
-    {
-        $tokens      = $phpcsFile->getTokens();
-        $FQClassName = '';
-
-        if ($tokens[$stackPtr]['type'] === 'T_NEW') {
-            $FQClassName = $this->getFQClassNameFromNewToken($phpcsFile, $stackPtr);
-
-        } elseif ($tokens[$stackPtr]['type'] === 'T_CLASS' || $tokens[$stackPtr]['type'] === 'T_ANON_CLASS') {
-            $FQClassName = $this->getFQExtendedClassName($phpcsFile, $stackPtr);
-
-        } elseif ($tokens[$stackPtr]['type'] === 'T_DOUBLE_COLON') {
-            $FQClassName = $this->getFQClassNameFromDoubleColonToken($phpcsFile, $stackPtr);
-        }
-
-        if ($FQClassName === '') {
-            return;
-        }
-
-        $className   = substr($FQClassName, 1); // Remove global namespace indicator.
-        $classNameLc = strtolower($className);
-
-        if (isset($this->newClasses[$classNameLc]) === false) {
-            return;
-        }
-
-        $itemInfo = array(
-            'name'   => $className,
-            'nameLc' => $classNameLc,
-        );
-        $this->handleFeature($phpcsFile, $stackPtr, $itemInfo);
-    }
-
-
-    /**
-     * Processes this test for when a function token is encountered.
-     *
-     * - Detect new classes when used as a type hint.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of the current token in
-     *                                         the stack passed in $tokens.
-     *
-     * @return void
-     */
-    private function processFunctionToken(File $phpcsFile, $stackPtr)
-    {
-        // Retrieve typehints stripped of global NS indicator and/or nullable indicator.
-        $typeHints = $this->getTypeHintsFromFunctionDeclaration($phpcsFile, $stackPtr);
-        if (empty($typeHints) || \is_array($typeHints) === false) {
-            return;
-        }
-
-        foreach ($typeHints as $hint) {
-
-            $typeHintLc = strtolower($hint);
-
-            if (isset($this->newClasses[$typeHintLc]) === true) {
-                $itemInfo = array(
-                    'name'   => $hint,
-                    'nameLc' => $typeHintLc,
-                );
-                $this->handleFeature($phpcsFile, $stackPtr, $itemInfo);
-            }
-        }
-    }
-
-
-    /**
-     * Processes this test for when a catch token is encountered.
-     *
-     * - Detect exceptions when used in a catch statement.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of the current token in
-     *                                         the stack passed in $tokens.
-     *
-     * @return void
-     */
-    private function processCatchToken(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // Bow out during live coding.
-        if (isset($tokens[$stackPtr]['parenthesis_opener'], $tokens[$stackPtr]['parenthesis_closer']) === false) {
-            return;
-        }
-
-        $opener = $tokens[$stackPtr]['parenthesis_opener'];
-        $closer = ($tokens[$stackPtr]['parenthesis_closer'] + 1);
-        $name   = '';
-        $listen = array(
-            // Parts of a (namespaced) class name.
-            \T_STRING              => true,
-            \T_NS_SEPARATOR        => true,
-            // End/split tokens.
-            \T_VARIABLE            => false,
-            \T_BITWISE_OR          => false,
-            \T_CLOSE_CURLY_BRACKET => false, // Shouldn't be needed as we expect a var before this.
-        );
-
-        for ($i = ($opener + 1); $i < $closer; $i++) {
-            if (isset($listen[$tokens[$i]['code']]) === false) {
-                continue;
-            }
-
-            if ($listen[$tokens[$i]['code']] === true) {
-                $name .= $tokens[$i]['content'];
-                continue;
-            } else {
-                if (empty($name) === true) {
-                    // Weird, we should have a name by the time we encounter a variable or |.
-                    // So this may be the closer.
-                    continue;
-                }
-
-                $name   = ltrim($name, '\\');
-                $nameLC = strtolower($name);
-
-                if (isset($this->newExceptions[$nameLC]) === true) {
-                    $itemInfo = array(
-                        'name'   => $name,
-                        'nameLc' => $nameLC,
-                    );
-                    $this->handleFeature($phpcsFile, $i, $itemInfo);
-                }
-
-                // Reset for a potential multi-catch.
-                $name = '';
-            }
-        }
-    }
-
-
-    /**
-     * Processes this test for when a return type token is encountered.
-     *
-     * - Detect new classes when used as a return type declaration.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of the current token in
-     *                                         the stack passed in $tokens.
-     *
-     * @return void
-     */
-    private function processReturnTypeToken(File $phpcsFile, $stackPtr)
-    {
-        $returnTypeHint   = $this->getReturnTypeHintName($phpcsFile, $stackPtr);
-        $returnTypeHint   = ltrim($returnTypeHint, '\\');
-        $returnTypeHintLc = strtolower($returnTypeHint);
-
-        if (isset($this->newClasses[$returnTypeHintLc]) === false) {
-            return;
-        }
-
-        // Still here ? Then this is a return type declaration using a new class.
-        $itemInfo = array(
-            'name'   => $returnTypeHint,
-            'nameLc' => $returnTypeHintLc,
-        );
-        $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->newClasses[$itemInfo['nameLc']];
-    }
-
-
-    /**
-     * Get the error message template for this sniff.
-     *
-     * @return string
-     */
-    protected function getErrorMsgTemplate()
-    {
-        return 'The built-in class ' . parent::getErrorMsgTemplate();
-    }
+	/**
+	 * A list of new classes, not present in older versions.
+	 *
+	 * The array lists : version number with false (not present) or true (present).
+	 * If's sufficient to list the first version where the class appears.
+	 *
+	 * @var array(string => array(string => bool))
+	 */
+	protected $newClasses = array(
+		'ArrayObject' => array(
+			'4.4' => false,
+			'5.0' => true,
+		),
+		'ArrayIterator' => array(
+			'4.4' => false,
+			'5.0' => true,
+		),
+		'CachingIterator' => array(
+			'4.4' => false,
+			'5.0' => true,
+		),
+		'DirectoryIterator' => array(
+			'4.4' => false,
+			'5.0' => true,
+		),
+		'RecursiveDirectoryIterator' => array(
+			'4.4' => false,
+			'5.0' => true,
+		),
+		'RecursiveIteratorIterator' => array(
+			'4.4' => false,
+			'5.0' => true,
+		),
+		'php_user_filter' => array(
+			'4.4' => false,
+			'5.0' => true,
+		),
+		'tidy' => array(
+			'4.4' => false,
+			'5.0' => true,
+		),
+
+		'SimpleXMLElement' => array(
+			'5.0.0' => false,
+			'5.0.1' => true,
+		),
+		'tidyNode' => array(
+			'5.0.0' => false,
+			'5.0.1' => true,
+		),
+
+		'libXMLError' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'PDO' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'PDOStatement' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'AppendIterator' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'EmptyIterator' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'FilterIterator' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'InfiniteIterator' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'IteratorIterator' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'LimitIterator' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'NoRewindIterator' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'ParentIterator' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'RecursiveArrayIterator' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'RecursiveCachingIterator' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'RecursiveFilterIterator' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'SimpleXMLIterator' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'SplFileObject' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'XMLReader' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+
+		'SplFileInfo' => array(
+			'5.1.1' => false,
+			'5.1.2' => true,
+		),
+		'SplTempFileObject' => array(
+			'5.1.1' => false,
+			'5.1.2' => true,
+		),
+		'XMLWriter' => array(
+			'5.1.1' => false,
+			'5.1.2' => true,
+		),
+
+		'DateTime' => array(
+			'5.1' => false,
+			'5.2' => true,
+		),
+		'DateTimeZone' => array(
+			'5.1' => false,
+			'5.2' => true,
+		),
+		'RegexIterator' => array(
+			'5.1' => false,
+			'5.2' => true,
+		),
+		'RecursiveRegexIterator' => array(
+			'5.1' => false,
+			'5.2' => true,
+		),
+		'ReflectionFunctionAbstract' => array(
+			'5.1' => false,
+			'5.2' => true,
+		),
+		'ZipArchive' => array(
+			'5.1' => false,
+			'5.2' => true,
+		),
+
+		'Closure' => array(
+			'5.2' => false,
+			'5.3' => true,
+		),
+		'DateInterval' => array(
+			'5.2' => false,
+			'5.3' => true,
+		),
+		'DatePeriod' => array(
+			'5.2' => false,
+			'5.3' => true,
+		),
+		'finfo' => array(
+			'5.2' => false,
+			'5.3' => true,
+		),
+		'Collator' => array(
+			'5.2' => false,
+			'5.3' => true,
+		),
+		'NumberFormatter' => array(
+			'5.2' => false,
+			'5.3' => true,
+		),
+		'Locale' => array(
+			'5.2' => false,
+			'5.3' => true,
+		),
+		'Normalizer' => array(
+			'5.2' => false,
+			'5.3' => true,
+		),
+		'MessageFormatter' => array(
+			'5.2' => false,
+			'5.3' => true,
+		),
+		'IntlDateFormatter' => array(
+			'5.2' => false,
+			'5.3' => true,
+		),
+		'Phar' => array(
+			'5.2' => false,
+			'5.3' => true,
+		),
+		'PharData' => array(
+			'5.2' => false,
+			'5.3' => true,
+		),
+		'PharFileInfo' => array(
+			'5.2' => false,
+			'5.3' => true,
+		),
+		'FilesystemIterator' => array(
+			'5.2' => false,
+			'5.3' => true,
+		),
+		'GlobIterator' => array(
+			'5.2' => false,
+			'5.3' => true,
+		),
+		'MultipleIterator' => array(
+			'5.2' => false,
+			'5.3' => true,
+		),
+		'RecursiveTreeIterator' => array(
+			'5.2' => false,
+			'5.3' => true,
+		),
+		'SplDoublyLinkedList' => array(
+			'5.2' => false,
+			'5.3' => true,
+		),
+		'SplFixedArray' => array(
+			'5.2' => false,
+			'5.3' => true,
+		),
+		'SplHeap' => array(
+			'5.2' => false,
+			'5.3' => true,
+		),
+		'SplMaxHeap' => array(
+			'5.2' => false,
+			'5.3' => true,
+		),
+		'SplMinHeap' => array(
+			'5.2' => false,
+			'5.3' => true,
+		),
+		'SplObjectStorage' => array(
+			'5.2' => false,
+			'5.3' => true,
+		),
+		'SplPriorityQueue' => array(
+			'5.2' => false,
+			'5.3' => true,
+		),
+		'SplQueue' => array(
+			'5.2' => false,
+			'5.3' => true,
+		),
+		'SplStack' => array(
+			'5.2' => false,
+			'5.3' => true,
+		),
+
+		'ResourceBundle' => array(
+			'5.3.1' => false,
+			'5.3.2' => true,
+		),
+
+		'CallbackFilterIterator' => array(
+			'5.3' => false,
+			'5.4' => true,
+		),
+		'RecursiveCallbackFilterIterator' => array(
+			'5.3' => false,
+			'5.4' => true,
+		),
+		'ReflectionZendExtension' => array(
+			'5.3' => false,
+			'5.4' => true,
+		),
+		'SessionHandler' => array(
+			'5.3' => false,
+			'5.4' => true,
+		),
+		'SNMP' => array(
+			'5.3' => false,
+			'5.4' => true,
+		),
+		'Transliterator' => array(
+			'5.3' => false,
+			'5.4' => true,
+		),
+		'Spoofchecker' => array(
+			'5.3' => false,
+			'5.4' => true,
+		),
+
+		'Generator' => array(
+			'5.4' => false,
+			'5.5' => true,
+		),
+		'CURLFile' => array(
+			'5.4' => false,
+			'5.5' => true,
+		),
+		'DateTimeImmutable' => array(
+			'5.4' => false,
+			'5.5' => true,
+		),
+		'IntlCalendar' => array(
+			'5.4' => false,
+			'5.5' => true,
+		),
+		'IntlGregorianCalendar' => array(
+			'5.4' => false,
+			'5.5' => true,
+		),
+		'IntlTimeZone' => array(
+			'5.4' => false,
+			'5.5' => true,
+		),
+		'IntlBreakIterator' => array(
+			'5.4' => false,
+			'5.5' => true,
+		),
+		'IntlRuleBasedBreakIterator' => array(
+			'5.4' => false,
+			'5.5' => true,
+		),
+		'IntlCodePointBreakIterator' => array(
+			'5.4' => false,
+			'5.5' => true,
+		),
+		'UConverter' => array(
+			'5.4' => false,
+			'5.5' => true,
+		),
+
+		'GMP' => array(
+			'5.5' => false,
+			'5.6' => true,
+		),
+
+		'IntlChar' => array(
+			'5.6' => false,
+			'7.0' => true,
+		),
+		'ReflectionType' => array(
+			'5.6' => false,
+			'7.0' => true,
+		),
+		'ReflectionGenerator' => array(
+			'5.6' => false,
+			'7.0' => true,
+		),
+
+		'ReflectionClassConstant' => array(
+			'7.0' => false,
+			'7.1' => true,
+		),
+
+	);
+
+	/**
+	 * A list of new Exception classes, not present in older versions.
+	 *
+	 * The array lists : version number with false (not present) or true (present).
+	 * If's sufficient to list the first version where the class appears.
+	 *
+	 * {@internal Classes listed here do not need to be added to the $newClasses
+	 *            property as well.
+	 *            This list is automatically added to the $newClasses property
+	 *            in the `register()` method.}}
+	 *
+	 * {@internal Helper to update this list: https://3v4l.org/MhlUp}}
+	 *
+	 * @var array(string => array(string => bool))
+	 */
+	protected $newExceptions = array(
+		'com_exception' => array(
+			'4.4' => false,
+			'5.0' => true,
+		),
+		'DOMException' => array(
+			'4.4' => false,
+			'5.0' => true,
+		),
+		'Exception' => array(
+			// According to the docs introduced in PHP 5.1, but this appears to be.
+			// an error.  Class was introduced with try/catch keywords in PHP 5.0.
+			'4.4' => false,
+			'5.0' => true,
+		),
+		'ReflectionException' => array(
+			'4.4' => false,
+			'5.0' => true,
+		),
+		'SoapFault' => array(
+			'4.4' => false,
+			'5.0' => true,
+		),
+		'SQLiteException' => array(
+			'4.4' => false,
+			'5.0' => true,
+		),
+
+		'ErrorException' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'BadFunctionCallException' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'BadMethodCallException' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'DomainException' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'InvalidArgumentException' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'LengthException' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'LogicException' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'mysqli_sql_exception' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'OutOfBoundsException' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'OutOfRangeException' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'OverflowException' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'PDOException' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'RangeException' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'RuntimeException' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'UnderflowException' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+		'UnexpectedValueException' => array(
+			'5.0' => false,
+			'5.1' => true,
+		),
+
+		'PharException' => array(
+			'5.2' => false,
+			'5.3' => true,
+		),
+
+		'SNMPException' => array(
+			'5.3' => false,
+			'5.4' => true,
+		),
+
+		'IntlException' => array(
+			'5.4' => false,
+			'5.5' => true,
+		),
+
+		'Error' => array(
+			'5.6' => false,
+			'7.0' => true,
+		),
+		'ArithmeticError' => array(
+			'5.6' => false,
+			'7.0' => true,
+		),
+		'AssertionError' => array(
+			'5.6' => false,
+			'7.0' => true,
+		),
+		'DivisionByZeroError' => array(
+			'5.6' => false,
+			'7.0' => true,
+		),
+		'ParseError' => array(
+			'5.6' => false,
+			'7.0' => true,
+		),
+		'TypeError' => array(
+			'5.6' => false,
+			'7.0' => true,
+		),
+		'ClosedGeneratorException' => array(
+			'5.6' => false,
+			'7.0' => true,
+		),
+		'UI\Exception\InvalidArgumentException' => array(
+			'5.6' => false,
+			'7.0' => true,
+		),
+		'UI\Exception\RuntimeException' => array(
+			'5.6' => false,
+			'7.0' => true,
+		),
+
+		'ArgumentCountError' => array(
+			'7.0' => false,
+			'7.1' => true,
+		),
+
+		'SodiumException' => array(
+			'7.1' => false,
+			'7.2' => true,
+		),
+
+		'CompileError' => array(
+			'7.2' => false,
+			'7.3' => true,
+		),
+		'JsonException' => array(
+			'7.2' => false,
+			'7.3' => true,
+		),
+
+		'ReflectionReference' => array(
+			'7.3' => false,
+			'7.4' => true,
+		),
+	);
+
+
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		// Handle case-insensitivity of class names.
+		$this->newClasses    = $this->arrayKeysToLowercase($this->newClasses);
+		$this->newExceptions = $this->arrayKeysToLowercase($this->newExceptions);
+
+		// Add the Exception classes to the Classes list.
+		$this->newClasses = array_merge($this->newClasses, $this->newExceptions);
+
+		$targets = array(
+			\T_NEW,
+			\T_CLASS,
+			\T_DOUBLE_COLON,
+			\T_FUNCTION,
+			\T_CLOSURE,
+			\T_CATCH,
+		);
+
+		if (\defined('T_ANON_CLASS')) {
+			$targets[] = \T_ANON_CLASS;
+		}
+
+		if (\defined('T_RETURN_TYPE')) {
+			$targets[] = \T_RETURN_TYPE;
+		}
+
+		return $targets;
+	}
+
+
+	/**
+	 * 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();
+
+		switch ($tokens[$stackPtr]['type']) {
+			case 'T_FUNCTION':
+			case 'T_CLOSURE':
+				$this->processFunctionToken($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->processReturnTypeToken($phpcsFile, $returnTypeHint);
+				}
+				break;
+
+			case 'T_CATCH':
+				$this->processCatchToken($phpcsFile, $stackPtr);
+				break;
+
+			case 'T_RETURN_TYPE':
+				$this->processReturnTypeToken($phpcsFile, $stackPtr);
+				break;
+
+			default:
+				$this->processSingularToken($phpcsFile, $stackPtr);
+				break;
+		}
+	}
+
+
+	/**
+	 * Processes this test for when a token resulting in a singular class name 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
+	 */
+	private function processSingularToken(File $phpcsFile, $stackPtr)
+	{
+		$tokens      = $phpcsFile->getTokens();
+		$FQClassName = '';
+
+		if ($tokens[$stackPtr]['type'] === 'T_NEW') {
+			$FQClassName = $this->getFQClassNameFromNewToken($phpcsFile, $stackPtr);
+
+		} elseif ($tokens[$stackPtr]['type'] === 'T_CLASS' || $tokens[$stackPtr]['type'] === 'T_ANON_CLASS') {
+			$FQClassName = $this->getFQExtendedClassName($phpcsFile, $stackPtr);
+
+		} elseif ($tokens[$stackPtr]['type'] === 'T_DOUBLE_COLON') {
+			$FQClassName = $this->getFQClassNameFromDoubleColonToken($phpcsFile, $stackPtr);
+		}
+
+		if ($FQClassName === '') {
+			return;
+		}
+
+		$className   = substr($FQClassName, 1); // Remove global namespace indicator.
+		$classNameLc = strtolower($className);
+
+		if (isset($this->newClasses[$classNameLc]) === false) {
+			return;
+		}
+
+		$itemInfo = array(
+			'name'   => $className,
+			'nameLc' => $classNameLc,
+		);
+		$this->handleFeature($phpcsFile, $stackPtr, $itemInfo);
+	}
+
+
+	/**
+	 * Processes this test for when a function token is encountered.
+	 *
+	 * - Detect new classes when used as a type hint.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of the current token in
+	 *                                         the stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	private function processFunctionToken(File $phpcsFile, $stackPtr)
+	{
+		// Retrieve typehints stripped of global NS indicator and/or nullable indicator.
+		$typeHints = $this->getTypeHintsFromFunctionDeclaration($phpcsFile, $stackPtr);
+		if (empty($typeHints) || \is_array($typeHints) === false) {
+			return;
+		}
+
+		foreach ($typeHints as $hint) {
+
+			$typeHintLc = strtolower($hint);
+
+			if (isset($this->newClasses[$typeHintLc]) === true) {
+				$itemInfo = array(
+					'name'   => $hint,
+					'nameLc' => $typeHintLc,
+				);
+				$this->handleFeature($phpcsFile, $stackPtr, $itemInfo);
+			}
+		}
+	}
+
+
+	/**
+	 * Processes this test for when a catch token is encountered.
+	 *
+	 * - Detect exceptions when used in a catch statement.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of the current token in
+	 *                                         the stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	private function processCatchToken(File $phpcsFile, $stackPtr)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		// Bow out during live coding.
+		if (isset($tokens[$stackPtr]['parenthesis_opener'], $tokens[$stackPtr]['parenthesis_closer']) === false) {
+			return;
+		}
+
+		$opener = $tokens[$stackPtr]['parenthesis_opener'];
+		$closer = ($tokens[$stackPtr]['parenthesis_closer'] + 1);
+		$name   = '';
+		$listen = array(
+			// Parts of a (namespaced) class name.
+			\T_STRING              => true,
+			\T_NS_SEPARATOR        => true,
+			// End/split tokens.
+			\T_VARIABLE            => false,
+			\T_BITWISE_OR          => false,
+			\T_CLOSE_CURLY_BRACKET => false, // Shouldn't be needed as we expect a var before this.
+		);
+
+		for ($i = ($opener + 1); $i < $closer; $i++) {
+			if (isset($listen[$tokens[$i]['code']]) === false) {
+				continue;
+			}
+
+			if ($listen[$tokens[$i]['code']] === true) {
+				$name .= $tokens[$i]['content'];
+				continue;
+			} else {
+				if (empty($name) === true) {
+					// Weird, we should have a name by the time we encounter a variable or |.
+					// So this may be the closer.
+					continue;
+				}
+
+				$name   = ltrim($name, '\\');
+				$nameLC = strtolower($name);
+
+				if (isset($this->newExceptions[$nameLC]) === true) {
+					$itemInfo = array(
+						'name'   => $name,
+						'nameLc' => $nameLC,
+					);
+					$this->handleFeature($phpcsFile, $i, $itemInfo);
+				}
+
+				// Reset for a potential multi-catch.
+				$name = '';
+			}
+		}
+	}
+
+
+	/**
+	 * Processes this test for when a return type token is encountered.
+	 *
+	 * - Detect new classes when used as a return type declaration.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of the current token in
+	 *                                         the stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	private function processReturnTypeToken(File $phpcsFile, $stackPtr)
+	{
+		$returnTypeHint   = $this->getReturnTypeHintName($phpcsFile, $stackPtr);
+		$returnTypeHint   = ltrim($returnTypeHint, '\\');
+		$returnTypeHintLc = strtolower($returnTypeHint);
+
+		if (isset($this->newClasses[$returnTypeHintLc]) === false) {
+			return;
+		}
+
+		// Still here ? Then this is a return type declaration using a new class.
+		$itemInfo = array(
+			'name'   => $returnTypeHint,
+			'nameLc' => $returnTypeHintLc,
+		);
+		$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->newClasses[$itemInfo['nameLc']];
+	}
+
+
+	/**
+	 * Get the error message template for this sniff.
+	 *
+	 * @return string
+	 */
+	protected function getErrorMsgTemplate()
+	{
+		return 'The built-in class ' . parent::getErrorMsgTemplate();
+	}
 }

Spacing +56 added lines, -56 removed lines

@@ -581,11 +581,11 @@ 
     public function register()
     {
         // Handle case-insensitivity of class names.
-        $this->newClasses    = $this->arrayKeysToLowercase($this->newClasses);
-        $this->newExceptions = $this->arrayKeysToLowercase($this->newExceptions);
+        $this->newClasses    = $this->arrayKeysToLowercase( $this->newClasses );
+        $this->newExceptions = $this->arrayKeysToLowercase( $this->newExceptions );
 
         // Add the Exception classes to the Classes list.
-        $this->newClasses = array_merge($this->newClasses, $this->newExceptions);
+        $this->newClasses = array_merge( $this->newClasses, $this->newExceptions );
 
         $targets = array(
             \T_NEW,
@@ -596,12 +596,12 @@ 
             \T_CATCH,
         );
 
-        if (\defined('T_ANON_CLASS')) {
-            $targets[] = \T_ANON_CLASS;
+        if ( \defined( 'T_ANON_CLASS' ) ) {
+            $targets[ ] = \T_ANON_CLASS;
         }
 
-        if (\defined('T_RETURN_TYPE')) {
-            $targets[] = \T_RETURN_TYPE;
+        if ( \defined( 'T_RETURN_TYPE' ) ) {
+            $targets[ ] = \T_RETURN_TYPE;
         }
 
         return $targets;
@@ -617,33 +617,33 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
-        switch ($tokens[$stackPtr]['type']) {
+        switch ( $tokens[ $stackPtr ][ 'type' ] ) {
             case 'T_FUNCTION':
             case 'T_CLOSURE':
-                $this->processFunctionToken($phpcsFile, $stackPtr);
+                $this->processFunctionToken( $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->processReturnTypeToken($phpcsFile, $returnTypeHint);
+                $returnTypeHint = $this->getReturnTypeHintToken( $phpcsFile, $stackPtr );
+                if ( $returnTypeHint !== false ) {
+                    $this->processReturnTypeToken( $phpcsFile, $returnTypeHint );
                 }
                 break;
 
             case 'T_CATCH':
-                $this->processCatchToken($phpcsFile, $stackPtr);
+                $this->processCatchToken( $phpcsFile, $stackPtr );
                 break;
 
             case 'T_RETURN_TYPE':
-                $this->processReturnTypeToken($phpcsFile, $stackPtr);
+                $this->processReturnTypeToken( $phpcsFile, $stackPtr );
                 break;
 
             default:
-                $this->processSingularToken($phpcsFile, $stackPtr);
+                $this->processSingularToken( $phpcsFile, $stackPtr );
                 break;
         }
     }
@@ -658,29 +658,29 @@ 
      *
      * @return void
      */
-    private function processSingularToken(File $phpcsFile, $stackPtr)
+    private function processSingularToken( File $phpcsFile, $stackPtr )
     {
         $tokens      = $phpcsFile->getTokens();
         $FQClassName = '';
 
-        if ($tokens[$stackPtr]['type'] === 'T_NEW') {
-            $FQClassName = $this->getFQClassNameFromNewToken($phpcsFile, $stackPtr);
+        if ( $tokens[ $stackPtr ][ 'type' ] === 'T_NEW' ) {
+            $FQClassName = $this->getFQClassNameFromNewToken( $phpcsFile, $stackPtr );
 
-        } elseif ($tokens[$stackPtr]['type'] === 'T_CLASS' || $tokens[$stackPtr]['type'] === 'T_ANON_CLASS') {
-            $FQClassName = $this->getFQExtendedClassName($phpcsFile, $stackPtr);
+        } elseif ( $tokens[ $stackPtr ][ 'type' ] === 'T_CLASS' || $tokens[ $stackPtr ][ 'type' ] === 'T_ANON_CLASS' ) {
+            $FQClassName = $this->getFQExtendedClassName( $phpcsFile, $stackPtr );
 
-        } elseif ($tokens[$stackPtr]['type'] === 'T_DOUBLE_COLON') {
-            $FQClassName = $this->getFQClassNameFromDoubleColonToken($phpcsFile, $stackPtr);
+        } elseif ( $tokens[ $stackPtr ][ 'type' ] === 'T_DOUBLE_COLON' ) {
+            $FQClassName = $this->getFQClassNameFromDoubleColonToken( $phpcsFile, $stackPtr );
         }
 
-        if ($FQClassName === '') {
+        if ( $FQClassName === '' ) {
             return;
         }
 
-        $className   = substr($FQClassName, 1); // Remove global namespace indicator.
-        $classNameLc = strtolower($className);
+        $className   = substr( $FQClassName, 1 ); // Remove global namespace indicator.
+        $classNameLc = strtolower( $className );
 
-        if (isset($this->newClasses[$classNameLc]) === false) {
+        if ( isset( $this->newClasses[ $classNameLc ] ) === false ) {
             return;
         }
 
@@ -688,7 +688,7 @@ 
             'name'   => $className,
             'nameLc' => $classNameLc,
         );
-        $this->handleFeature($phpcsFile, $stackPtr, $itemInfo);
+        $this->handleFeature( $phpcsFile, $stackPtr, $itemInfo );
     }
 
 
@@ -703,24 +703,24 @@ 
      *
      * @return void
      */
-    private function processFunctionToken(File $phpcsFile, $stackPtr)
+    private function processFunctionToken( File $phpcsFile, $stackPtr )
     {
         // Retrieve typehints stripped of global NS indicator and/or nullable indicator.
-        $typeHints = $this->getTypeHintsFromFunctionDeclaration($phpcsFile, $stackPtr);
-        if (empty($typeHints) || \is_array($typeHints) === false) {
+        $typeHints = $this->getTypeHintsFromFunctionDeclaration( $phpcsFile, $stackPtr );
+        if ( empty( $typeHints ) || \is_array( $typeHints ) === false ) {
             return;
         }
 
-        foreach ($typeHints as $hint) {
+        foreach ( $typeHints as $hint ) {
 
-            $typeHintLc = strtolower($hint);
+            $typeHintLc = strtolower( $hint );
 
-            if (isset($this->newClasses[$typeHintLc]) === true) {
+            if ( isset( $this->newClasses[ $typeHintLc ] ) === true ) {
                 $itemInfo = array(
                     'name'   => $hint,
                     'nameLc' => $typeHintLc,
                 );
-                $this->handleFeature($phpcsFile, $stackPtr, $itemInfo);
+                $this->handleFeature( $phpcsFile, $stackPtr, $itemInfo );
             }
         }
     }
@@ -737,17 +737,17 @@ 
      *
      * @return void
      */
-    private function processCatchToken(File $phpcsFile, $stackPtr)
+    private function processCatchToken( File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
         // Bow out during live coding.
-        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'] + 1);
+        $opener = $tokens[ $stackPtr ][ 'parenthesis_opener' ];
+        $closer = ( $tokens[ $stackPtr ][ 'parenthesis_closer' ] + 1 );
         $name   = '';
         $listen = array(
             // Parts of a (namespaced) class name.
@@ -759,30 +759,30 @@ 
             \T_CLOSE_CURLY_BRACKET => false, // Shouldn't be needed as we expect a var before this.
         );
 
-        for ($i = ($opener + 1); $i < $closer; $i++) {
-            if (isset($listen[$tokens[$i]['code']]) === false) {
+        for ( $i = ( $opener + 1 ); $i < $closer; $i++ ) {
+            if ( isset( $listen[ $tokens[ $i ][ 'code' ] ] ) === false ) {
                 continue;
             }
 
-            if ($listen[$tokens[$i]['code']] === true) {
-                $name .= $tokens[$i]['content'];
+            if ( $listen[ $tokens[ $i ][ 'code' ] ] === true ) {
+                $name .= $tokens[ $i ][ 'content' ];
                 continue;
             } else {
-                if (empty($name) === true) {
+                if ( empty( $name ) === true ) {
                     // Weird, we should have a name by the time we encounter a variable or |.
                     // So this may be the closer.
                     continue;
                 }
 
-                $name   = ltrim($name, '\\');
-                $nameLC = strtolower($name);
+                $name   = ltrim( $name, '\\' );
+                $nameLC = strtolower( $name );
 
-                if (isset($this->newExceptions[$nameLC]) === true) {
+                if ( isset( $this->newExceptions[ $nameLC ] ) === true ) {
                     $itemInfo = array(
                         'name'   => $name,
                         'nameLc' => $nameLC,
                     );
-                    $this->handleFeature($phpcsFile, $i, $itemInfo);
+                    $this->handleFeature( $phpcsFile, $i, $itemInfo );
                 }
 
                 // Reset for a potential multi-catch.
@@ -803,13 +803,13 @@ 
      *
      * @return void
      */
-    private function processReturnTypeToken(File $phpcsFile, $stackPtr)
+    private function processReturnTypeToken( File $phpcsFile, $stackPtr )
     {
-        $returnTypeHint   = $this->getReturnTypeHintName($phpcsFile, $stackPtr);
-        $returnTypeHint   = ltrim($returnTypeHint, '\\');
-        $returnTypeHintLc = strtolower($returnTypeHint);
+        $returnTypeHint   = $this->getReturnTypeHintName( $phpcsFile, $stackPtr );
+        $returnTypeHint   = ltrim( $returnTypeHint, '\\' );
+        $returnTypeHintLc = strtolower( $returnTypeHint );
 
-        if (isset($this->newClasses[$returnTypeHintLc]) === false) {
+        if ( isset( $this->newClasses[ $returnTypeHintLc ] ) === false ) {
             return;
         }
 
@@ -818,7 +818,7 @@ 
             'name'   => $returnTypeHint,
             'nameLc' => $returnTypeHintLc,
         );
-        $this->handleFeature($phpcsFile, $stackPtr, $itemInfo);
+        $this->handleFeature( $phpcsFile, $stackPtr, $itemInfo );
     }
 
 
@@ -829,9 +829,9 @@ 
      *
      * @return array Version and other information about the item.
      */
-    public function getItemArray(array $itemInfo)
+    public function getItemArray( array $itemInfo )
     {
-        return $this->newClasses[$itemInfo['nameLc']];
+        return $this->newClasses[ $itemInfo[ 'nameLc' ] ];
     }
 
 

Braces +9 added lines, -18 removed lines

@@ -21,8 +21,7 @@ 
  * @author    Wim Godden <wim.godden@cu.be>
  * @copyright 2013 Cu.be Solutions bvba
  */
-class NewClassesSniff extends AbstractNewFeatureSniff
-{
+class NewClassesSniff extends AbstractNewFeatureSniff {
 
     /**
      * A list of new classes, not present in older versions.
@@ -578,8 +577,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         // Handle case-insensitivity of class names.
         $this->newClasses    = $this->arrayKeysToLowercase($this->newClasses);
         $this->newExceptions = $this->arrayKeysToLowercase($this->newExceptions);
@@ -617,8 +615,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         switch ($tokens[$stackPtr]['type']) {
@@ -658,8 +655,7 @@ 
      *
      * @return void
      */
-    private function processSingularToken(File $phpcsFile, $stackPtr)
-    {
+    private function processSingularToken(File $phpcsFile, $stackPtr) {
         $tokens      = $phpcsFile->getTokens();
         $FQClassName = '';
 
@@ -703,8 +699,7 @@ 
      *
      * @return void
      */
-    private function processFunctionToken(File $phpcsFile, $stackPtr)
-    {
+    private function processFunctionToken(File $phpcsFile, $stackPtr) {
         // Retrieve typehints stripped of global NS indicator and/or nullable indicator.
         $typeHints = $this->getTypeHintsFromFunctionDeclaration($phpcsFile, $stackPtr);
         if (empty($typeHints) || \is_array($typeHints) === false) {
@@ -737,8 +732,7 @@ 
      *
      * @return void
      */
-    private function processCatchToken(File $phpcsFile, $stackPtr)
-    {
+    private function processCatchToken(File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         // Bow out during live coding.
@@ -803,8 +797,7 @@ 
      *
      * @return void
      */
-    private function processReturnTypeToken(File $phpcsFile, $stackPtr)
-    {
+    private function processReturnTypeToken(File $phpcsFile, $stackPtr) {
         $returnTypeHint   = $this->getReturnTypeHintName($phpcsFile, $stackPtr);
         $returnTypeHint   = ltrim($returnTypeHint, '\\');
         $returnTypeHintLc = strtolower($returnTypeHint);
@@ -829,8 +822,7 @@ 
      *
      * @return array Version and other information about the item.
      */
-    public function getItemArray(array $itemInfo)
-    {
+    public function getItemArray(array $itemInfo) {
         return $this->newClasses[$itemInfo['nameLc']];
     }
 
@@ -840,8 +832,7 @@ 
      *
      * @return string
      */
-    protected function getErrorMsgTemplate()
-    {
+    protected function getErrorMsgTemplate() {
         return 'The built-in class ' . parent::getErrorMsgTemplate();
     }
 }

vendor/phpcompatibility/php-compatibility/PHPCompatibility/Sniffs/Classes/NewTypedPropertiesSniff.php

Indentation +86 added lines, -86 removed lines

@@ -26,100 +26,100 @@
 class NewTypedPropertiesSniff extends Sniff
 {
 
-    /**
-     * Valid property modifier keywords.
-     *
-     * @var array
-     */
-    private $modifierKeywords = array(
-        \T_PRIVATE   => \T_PRIVATE,
-        \T_PROTECTED => \T_PROTECTED,
-        \T_PUBLIC    => \T_PUBLIC,
-        \T_STATIC    => \T_STATIC,
-        \T_VAR       => \T_VAR,
-    );
+	/**
+	 * Valid property modifier keywords.
+	 *
+	 * @var array
+	 */
+	private $modifierKeywords = array(
+		\T_PRIVATE   => \T_PRIVATE,
+		\T_PROTECTED => \T_PROTECTED,
+		\T_PUBLIC    => \T_PUBLIC,
+		\T_STATIC    => \T_STATIC,
+		\T_VAR       => \T_VAR,
+	);
 
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(\T_VARIABLE);
-    }
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return array(\T_VARIABLE);
+	}
 
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of the current token in the
-     *                                         stack passed in $tokens.
-     *
-     * @return int|void Integer stack pointer to skip forward or void to continue
-     *                  normal file processing.
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        if ($this->isClassProperty($phpcsFile, $stackPtr) === 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 int|void Integer stack pointer to skip forward or void to continue
+	 *                  normal file processing.
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		if ($this->isClassProperty($phpcsFile, $stackPtr) === false) {
+			return;
+		}
 
-        $find  = $this->modifierKeywords;
-        $find += array(
-            \T_SEMICOLON          => \T_SEMICOLON,
-            \T_OPEN_CURLY_BRACKET => \T_OPEN_CURLY_BRACKET,
-        );
+		$find  = $this->modifierKeywords;
+		$find += array(
+			\T_SEMICOLON          => \T_SEMICOLON,
+			\T_OPEN_CURLY_BRACKET => \T_OPEN_CURLY_BRACKET,
+		);
 
-        $tokens   = $phpcsFile->getTokens();
-        $modifier = $phpcsFile->findPrevious($find, ($stackPtr - 1));
-        if ($modifier === false
-            || $tokens[$modifier]['code'] === \T_SEMICOLON
-            || $tokens[$modifier]['code'] === \T_OPEN_CURLY_BRACKET
-        ) {
-            // Parse error. Ignore.
-            return;
-        }
+		$tokens   = $phpcsFile->getTokens();
+		$modifier = $phpcsFile->findPrevious($find, ($stackPtr - 1));
+		if ($modifier === false
+			|| $tokens[$modifier]['code'] === \T_SEMICOLON
+			|| $tokens[$modifier]['code'] === \T_OPEN_CURLY_BRACKET
+		) {
+			// Parse error. Ignore.
+			return;
+		}
 
-        $type = $phpcsFile->findNext(Tokens::$emptyTokens, ($modifier + 1), null, true);
-        if ($tokens[$type]['code'] === \T_VARIABLE) {
-            return;
-        }
+		$type = $phpcsFile->findNext(Tokens::$emptyTokens, ($modifier + 1), null, true);
+		if ($tokens[$type]['code'] === \T_VARIABLE) {
+			return;
+		}
 
-        // Still here ? In that case, this will be a typed property.
-        if ($this->supportsBelow('7.3') === true) {
-            $phpcsFile->addError(
-                'Typed properties are not supported in PHP 7.3 or earlier',
-                $type,
-                'Found'
-            );
-        }
+		// Still here ? In that case, this will be a typed property.
+		if ($this->supportsBelow('7.3') === true) {
+			$phpcsFile->addError(
+				'Typed properties are not supported in PHP 7.3 or earlier',
+				$type,
+				'Found'
+			);
+		}
 
-        if ($this->supportsAbove('7.4') === true) {
-            // Examine the type to verify it's valid.
-            if ($tokens[$type]['type'] === 'T_NULLABLE'
-                // Needed to support PHPCS < 3.5.0 which doesn't correct to the nullable token type yet.
-                || $tokens[$type]['code'] === \T_INLINE_THEN
-            ) {
-                $type = $phpcsFile->findNext(Tokens::$emptyTokens, ($type + 1), null, true);
-            }
+		if ($this->supportsAbove('7.4') === true) {
+			// Examine the type to verify it's valid.
+			if ($tokens[$type]['type'] === 'T_NULLABLE'
+				// Needed to support PHPCS < 3.5.0 which doesn't correct to the nullable token type yet.
+				|| $tokens[$type]['code'] === \T_INLINE_THEN
+			) {
+				$type = $phpcsFile->findNext(Tokens::$emptyTokens, ($type + 1), null, true);
+			}
 
-            $content = $tokens[$type]['content'];
-            if ($content === 'void' || $content === 'callable') {
-                $phpcsFile->addError(
-                    '%s is not supported as a type declaration for properties',
-                    $type,
-                    'InvalidType',
-                    array($content)
-                );
-            }
-        }
+			$content = $tokens[$type]['content'];
+			if ($content === 'void' || $content === 'callable') {
+				$phpcsFile->addError(
+					'%s is not supported as a type declaration for properties',
+					$type,
+					'InvalidType',
+					array($content)
+				);
+			}
+		}
 
-        $endOfStatement = $phpcsFile->findNext(\T_SEMICOLON, ($stackPtr + 1));
-        if ($endOfStatement !== false) {
-            // Don't throw the same error multiple times for multi-property declarations.
-            return ($endOfStatement + 1);
-        }
-    }
+		$endOfStatement = $phpcsFile->findNext(\T_SEMICOLON, ($stackPtr + 1));
+		if ($endOfStatement !== false) {
+			// Don't throw the same error multiple times for multi-property declarations.
+			return ($endOfStatement + 1);
+		}
+	}
 }

Spacing +20 added lines, -20 removed lines

@@ -47,7 +47,7 @@ 
      */
     public function register()
     {
-        return array(\T_VARIABLE);
+        return array( \T_VARIABLE );
     }
 
     /**
@@ -60,9 +60,9 @@ 
      * @return int|void Integer stack pointer to skip forward or void to continue
      *                  normal file processing.
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
-        if ($this->isClassProperty($phpcsFile, $stackPtr) === false) {
+        if ( $this->isClassProperty( $phpcsFile, $stackPtr ) === false ) {
             return;
         }
 
@@ -73,22 +73,22 @@ 
         );
 
         $tokens   = $phpcsFile->getTokens();
-        $modifier = $phpcsFile->findPrevious($find, ($stackPtr - 1));
-        if ($modifier === false
-            || $tokens[$modifier]['code'] === \T_SEMICOLON
-            || $tokens[$modifier]['code'] === \T_OPEN_CURLY_BRACKET
+        $modifier = $phpcsFile->findPrevious( $find, ( $stackPtr - 1 ) );
+        if ( $modifier === false
+            || $tokens[ $modifier ][ 'code' ] === \T_SEMICOLON
+            || $tokens[ $modifier ][ 'code' ] === \T_OPEN_CURLY_BRACKET
         ) {
             // Parse error. Ignore.
             return;
         }
 
-        $type = $phpcsFile->findNext(Tokens::$emptyTokens, ($modifier + 1), null, true);
-        if ($tokens[$type]['code'] === \T_VARIABLE) {
+        $type = $phpcsFile->findNext( Tokens::$emptyTokens, ( $modifier + 1 ), null, true );
+        if ( $tokens[ $type ][ 'code' ] === \T_VARIABLE ) {
             return;
         }
 
         // Still here ? In that case, this will be a typed property.
-        if ($this->supportsBelow('7.3') === true) {
+        if ( $this->supportsBelow( '7.3' ) === true ) {
             $phpcsFile->addError(
                 'Typed properties are not supported in PHP 7.3 or earlier',
                 $type,
@@ -96,30 +96,30 @@ 
             );
         }
 
-        if ($this->supportsAbove('7.4') === true) {
+        if ( $this->supportsAbove( '7.4' ) === true ) {
             // Examine the type to verify it's valid.
-            if ($tokens[$type]['type'] === 'T_NULLABLE'
+            if ( $tokens[ $type ][ 'type' ] === 'T_NULLABLE'
                 // Needed to support PHPCS < 3.5.0 which doesn't correct to the nullable token type yet.
-                || $tokens[$type]['code'] === \T_INLINE_THEN
+                || $tokens[ $type ][ 'code' ] === \T_INLINE_THEN
             ) {
-                $type = $phpcsFile->findNext(Tokens::$emptyTokens, ($type + 1), null, true);
+                $type = $phpcsFile->findNext( Tokens::$emptyTokens, ( $type + 1 ), null, true );
             }
 
-            $content = $tokens[$type]['content'];
-            if ($content === 'void' || $content === 'callable') {
+            $content = $tokens[ $type ][ 'content' ];
+            if ( $content === 'void' || $content === 'callable' ) {
                 $phpcsFile->addError(
                     '%s is not supported as a type declaration for properties',
                     $type,
                     'InvalidType',
-                    array($content)
+                    array( $content )
                 );
             }
         }
 
-        $endOfStatement = $phpcsFile->findNext(\T_SEMICOLON, ($stackPtr + 1));
-        if ($endOfStatement !== false) {
+        $endOfStatement = $phpcsFile->findNext( \T_SEMICOLON, ( $stackPtr + 1 ) );
+        if ( $endOfStatement !== false ) {
             // Don't throw the same error multiple times for multi-property declarations.
-            return ($endOfStatement + 1);
+            return ( $endOfStatement + 1 );
         }
     }
 }

Braces +3 added lines, -6 removed lines

@@ -23,8 +23,7 @@ 
  *
  * @since 9.2.0
  */
-class NewTypedPropertiesSniff extends Sniff
-{
+class NewTypedPropertiesSniff extends Sniff {
 
     /**
      * Valid property modifier keywords.
@@ -45,8 +44,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(\T_VARIABLE);
     }
 
@@ -60,8 +58,7 @@ 
      * @return int|void Integer stack pointer to skip forward or void to continue
      *                  normal file processing.
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         if ($this->isClassProperty($phpcsFile, $stackPtr) === 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/Classes/NewLateStaticBindingSniff.php

Indentation +44 added lines, -44 removed lines

@@ -26,54 +26,54 @@
  */
 class NewLateStaticBindingSniff extends Sniff
 {
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(\T_STATIC);
-    }
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return array(\T_STATIC);
+	}
 
 
-    /**
-     * 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)
-    {
-        $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, $stackPtr + 1, null, true, null, true);
-        if ($nextNonEmpty === 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)
+	{
+		$nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, $stackPtr + 1, null, true, null, true);
+		if ($nextNonEmpty === false) {
+			return;
+		}
 
-        $tokens = $phpcsFile->getTokens();
-        if ($tokens[$nextNonEmpty]['code'] !== \T_DOUBLE_COLON) {
-            return;
-        }
+		$tokens = $phpcsFile->getTokens();
+		if ($tokens[$nextNonEmpty]['code'] !== \T_DOUBLE_COLON) {
+			return;
+		}
 
-        $inClass = $this->inClassScope($phpcsFile, $stackPtr, false);
+		$inClass = $this->inClassScope($phpcsFile, $stackPtr, false);
 
-        if ($inClass === true && $this->supportsBelow('5.2') === true) {
-            $phpcsFile->addError(
-                'Late static binding is not supported in PHP 5.2 or earlier.',
-                $stackPtr,
-                'Found'
-            );
-        }
+		if ($inClass === true && $this->supportsBelow('5.2') === true) {
+			$phpcsFile->addError(
+				'Late static binding is not supported in PHP 5.2 or earlier.',
+				$stackPtr,
+				'Found'
+			);
+		}
 
-        if ($inClass === false) {
-            $phpcsFile->addError(
-                'Late static binding is not supported outside of class scope.',
-                $stackPtr,
-                'OutsideClassScope'
-            );
-        }
-    }
+		if ($inClass === false) {
+			$phpcsFile->addError(
+				'Late static binding is not supported outside of class scope.',
+				$stackPtr,
+				'OutsideClassScope'
+			);
+		}
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -33,7 +33,7 @@ 
      */
     public function register()
     {
-        return array(\T_STATIC);
+        return array( \T_STATIC );
     }
 
 
@@ -46,21 +46,21 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
-        $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, $stackPtr + 1, null, true, null, true);
-        if ($nextNonEmpty === false) {
+        $nextNonEmpty = $phpcsFile->findNext( Tokens::$emptyTokens, $stackPtr + 1, null, true, null, true );
+        if ( $nextNonEmpty === false ) {
             return;
         }
 
         $tokens = $phpcsFile->getTokens();
-        if ($tokens[$nextNonEmpty]['code'] !== \T_DOUBLE_COLON) {
+        if ( $tokens[ $nextNonEmpty ][ 'code' ] !== \T_DOUBLE_COLON ) {
             return;
         }
 
-        $inClass = $this->inClassScope($phpcsFile, $stackPtr, false);
+        $inClass = $this->inClassScope( $phpcsFile, $stackPtr, false );
 
-        if ($inClass === true && $this->supportsBelow('5.2') === true) {
+        if ( $inClass === true && $this->supportsBelow( '5.2' ) === true ) {
             $phpcsFile->addError(
                 'Late static binding is not supported in PHP 5.2 or earlier.',
                 $stackPtr,
@@ -68,7 +68,7 @@ 
             );
         }
 
-        if ($inClass === false) {
+        if ( $inClass === false ) {
             $phpcsFile->addError(
                 'Late static binding is not supported outside of class scope.',
                 $stackPtr,

Braces +3 added lines, -6 removed lines

@@ -24,15 +24,13 @@ 
  * @package  PHPCompatibility
  * @author   Juliette Reinders Folmer <phpcompatibility_nospam@adviesenzo.nl>
  */
-class NewLateStaticBindingSniff extends Sniff
-{
+class NewLateStaticBindingSniff extends Sniff {
     /**
      * Returns an array of tokens this test wants to listen for.
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(\T_STATIC);
     }
 
@@ -46,8 +44,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, $stackPtr + 1, null, true, null, true);
         if ($nextNonEmpty === 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/Lists/ForbiddenEmptyListAssignmentSniff.php

Indentation +70 added lines, -70 removed lines

@@ -29,83 +29,83 @@
 class ForbiddenEmptyListAssignmentSniff extends Sniff
 {
 
-    /**
-     * List of tokens to disregard when determining whether the list() is empty.
-     *
-     * @var array
-     */
-    protected $ignoreTokens = array();
+	/**
+	 * List of tokens to disregard when determining whether the list() is empty.
+	 *
+	 * @var array
+	 */
+	protected $ignoreTokens = array();
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        // Set up a list of tokens to disregard when determining whether the list() is empty.
-        // Only needs to be set up once.
-        $this->ignoreTokens                       = Tokens::$emptyTokens;
-        $this->ignoreTokens[\T_COMMA]             = \T_COMMA;
-        $this->ignoreTokens[\T_OPEN_PARENTHESIS]  = \T_OPEN_PARENTHESIS;
-        $this->ignoreTokens[\T_CLOSE_PARENTHESIS] = \T_CLOSE_PARENTHESIS;
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		// Set up a list of tokens to disregard when determining whether the list() is empty.
+		// Only needs to be set up once.
+		$this->ignoreTokens                       = Tokens::$emptyTokens;
+		$this->ignoreTokens[\T_COMMA]             = \T_COMMA;
+		$this->ignoreTokens[\T_OPEN_PARENTHESIS]  = \T_OPEN_PARENTHESIS;
+		$this->ignoreTokens[\T_CLOSE_PARENTHESIS] = \T_CLOSE_PARENTHESIS;
 
-        return array(
-            \T_LIST,
-            \T_OPEN_SHORT_ARRAY,
-        );
-    }
+		return array(
+			\T_LIST,
+			\T_OPEN_SHORT_ARRAY,
+		);
+	}
 
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of the current token in the
-     *                                         stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        if ($this->supportsAbove('7.0') === false) {
-            return;
-        }
+	/**
+	 * Processes this test, when one of its tokens is encountered.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of the current token in the
+	 *                                         stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		if ($this->supportsAbove('7.0') === false) {
+			return;
+		}
 
-        $tokens = $phpcsFile->getTokens();
+		$tokens = $phpcsFile->getTokens();
 
-        if ($tokens[$stackPtr]['code'] === \T_OPEN_SHORT_ARRAY) {
-            if ($this->isShortList($phpcsFile, $stackPtr) === false) {
-                return;
-            }
+		if ($tokens[$stackPtr]['code'] === \T_OPEN_SHORT_ARRAY) {
+			if ($this->isShortList($phpcsFile, $stackPtr) === false) {
+				return;
+			}
 
-            $open  = $stackPtr;
-            $close = $tokens[$stackPtr]['bracket_closer'];
-        } else {
-            // T_LIST.
-            $open = $phpcsFile->findNext(\T_OPEN_PARENTHESIS, $stackPtr, null, false, null, true);
-            if ($open === false || isset($tokens[$open]['parenthesis_closer']) === false) {
-                return;
-            }
+			$open  = $stackPtr;
+			$close = $tokens[$stackPtr]['bracket_closer'];
+		} else {
+			// T_LIST.
+			$open = $phpcsFile->findNext(\T_OPEN_PARENTHESIS, $stackPtr, null, false, null, true);
+			if ($open === false || isset($tokens[$open]['parenthesis_closer']) === false) {
+				return;
+			}
 
-            $close = $tokens[$open]['parenthesis_closer'];
-        }
+			$close = $tokens[$open]['parenthesis_closer'];
+		}
 
-        $error = true;
-        if (($close - $open) > 1) {
-            for ($cnt = $open + 1; $cnt < $close; $cnt++) {
-                if (isset($this->ignoreTokens[$tokens[$cnt]['code']]) === false) {
-                    $error = false;
-                    break;
-                }
-            }
-        }
+		$error = true;
+		if (($close - $open) > 1) {
+			for ($cnt = $open + 1; $cnt < $close; $cnt++) {
+				if (isset($this->ignoreTokens[$tokens[$cnt]['code']]) === false) {
+					$error = false;
+					break;
+				}
+			}
+		}
 
-        if ($error === true) {
-            $phpcsFile->addError(
-                'Empty list() assignments are not allowed since PHP 7.0',
-                $stackPtr,
-                'Found'
-            );
-        }
-    }
+		if ($error === true) {
+			$phpcsFile->addError(
+				'Empty list() assignments are not allowed since PHP 7.0',
+				$stackPtr,
+				'Found'
+			);
+		}
+	}
 }

Spacing +15 added lines, -15 removed lines

@@ -46,9 +46,9 @@ 
         // Set up a list of tokens to disregard when determining whether the list() is empty.
         // Only needs to be set up once.
         $this->ignoreTokens                       = Tokens::$emptyTokens;
-        $this->ignoreTokens[\T_COMMA]             = \T_COMMA;
-        $this->ignoreTokens[\T_OPEN_PARENTHESIS]  = \T_OPEN_PARENTHESIS;
-        $this->ignoreTokens[\T_CLOSE_PARENTHESIS] = \T_CLOSE_PARENTHESIS;
+        $this->ignoreTokens[ \T_COMMA ]             = \T_COMMA;
+        $this->ignoreTokens[ \T_OPEN_PARENTHESIS ]  = \T_OPEN_PARENTHESIS;
+        $this->ignoreTokens[ \T_CLOSE_PARENTHESIS ] = \T_CLOSE_PARENTHESIS;
 
         return array(
             \T_LIST,
@@ -65,42 +65,42 @@ 
      *
      * @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 ($tokens[$stackPtr]['code'] === \T_OPEN_SHORT_ARRAY) {
-            if ($this->isShortList($phpcsFile, $stackPtr) === false) {
+        if ( $tokens[ $stackPtr ][ 'code' ] === \T_OPEN_SHORT_ARRAY ) {
+            if ( $this->isShortList( $phpcsFile, $stackPtr ) === false ) {
                 return;
             }
 
             $open  = $stackPtr;
-            $close = $tokens[$stackPtr]['bracket_closer'];
+            $close = $tokens[ $stackPtr ][ 'bracket_closer' ];
         } else {
             // T_LIST.
-            $open = $phpcsFile->findNext(\T_OPEN_PARENTHESIS, $stackPtr, null, false, null, true);
-            if ($open === false || isset($tokens[$open]['parenthesis_closer']) === false) {
+            $open = $phpcsFile->findNext( \T_OPEN_PARENTHESIS, $stackPtr, null, false, null, true );
+            if ( $open === false || isset( $tokens[ $open ][ 'parenthesis_closer' ] ) === false ) {
                 return;
             }
 
-            $close = $tokens[$open]['parenthesis_closer'];
+            $close = $tokens[ $open ][ 'parenthesis_closer' ];
         }
 
         $error = true;
-        if (($close - $open) > 1) {
-            for ($cnt = $open + 1; $cnt < $close; $cnt++) {
-                if (isset($this->ignoreTokens[$tokens[$cnt]['code']]) === false) {
+        if ( ( $close - $open ) > 1 ) {
+            for ( $cnt = $open + 1; $cnt < $close; $cnt++ ) {
+                if ( isset( $this->ignoreTokens[ $tokens[ $cnt ][ 'code' ] ] ) === false ) {
                     $error = false;
                     break;
                 }
             }
         }
 
-        if ($error === true) {
+        if ( $error === true ) {
             $phpcsFile->addError(
                 'Empty list() assignments are not allowed since PHP 7.0',
                 $stackPtr,

Braces +3 added lines, -6 removed lines

@@ -26,8 +26,7 @@ 
  * @package  PHPCompatibility
  * @author   Wim Godden <wim@cu.be>
  */
-class ForbiddenEmptyListAssignmentSniff extends Sniff
-{
+class ForbiddenEmptyListAssignmentSniff extends Sniff {
 
     /**
      * List of tokens to disregard when determining whether the list() is empty.
@@ -41,8 +40,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         // Set up a list of tokens to disregard when determining whether the list() is empty.
         // Only needs to be set up once.
         $this->ignoreTokens                       = Tokens::$emptyTokens;
@@ -65,8 +63,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/Lists/NewKeyedListSniff.php

Indentation +180 added lines, -180 removed lines

@@ -28,184 +28,184 @@
  */
 class NewKeyedListSniff extends Sniff
 {
-    /**
-     * Tokens which represent the start of a list construct.
-     *
-     * @var array
-     */
-    protected $sniffTargets =  array(
-        \T_LIST             => \T_LIST,
-        \T_OPEN_SHORT_ARRAY => \T_OPEN_SHORT_ARRAY,
-    );
-
-    /**
-     * The token(s) within the list construct which is being targeted.
-     *
-     * @var array
-     */
-    protected $targetsInList = array(
-        \T_DOUBLE_ARROW => \T_DOUBLE_ARROW,
-    );
-
-    /**
-     * All tokens needed to walk through the list construct and
-     * determine whether the target token is contained within.
-     *
-     * Set by the setUpAllTargets() method which is called from within register().
-     *
-     * @var array
-     */
-    protected $allTargets;
-
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        $this->setUpAllTargets();
-
-        return $this->sniffTargets;
-    }
-
-    /**
-     * Prepare the $allTargets array only once.
-     *
-     * @return array
-     */
-    public function setUpAllTargets()
-    {
-        $this->allTargets = $this->sniffTargets + $this->targetsInList;
-    }
-
-    /**
-     * Do a version check to determine if this sniff needs to run at all.
-     *
-     * @return bool
-     */
-    protected function bowOutEarly()
-    {
-        return ($this->supportsBelow('7.0') === false);
-    }
-
-    /**
-     * 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->bowOutEarly() === true) {
-            return;
-        }
-
-        $tokens = $phpcsFile->getTokens();
-
-        if ($tokens[$stackPtr]['code'] === \T_OPEN_SHORT_ARRAY
-            && $this->isShortList($phpcsFile, $stackPtr) === false
-        ) {
-            // Short array, not short list.
-            return;
-        }
-
-        if ($tokens[$stackPtr]['code'] === \T_LIST) {
-            $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
-            if ($nextNonEmpty === false
-                || $tokens[$nextNonEmpty]['code'] !== \T_OPEN_PARENTHESIS
-                || isset($tokens[$nextNonEmpty]['parenthesis_closer']) === false
-            ) {
-                // Parse error or live coding.
-                return;
-            }
-
-            $opener = $nextNonEmpty;
-            $closer = $tokens[$nextNonEmpty]['parenthesis_closer'];
-        } else {
-            // Short list syntax.
-            $opener = $stackPtr;
-
-            if (isset($tokens[$stackPtr]['bracket_closer'])) {
-                $closer = $tokens[$stackPtr]['bracket_closer'];
-            }
-        }
-
-        if (isset($opener, $closer) === false) {
-            return;
-        }
-
-        $this->examineList($phpcsFile, $opener, $closer);
-    }
-
-
-    /**
-     * Examine the contents of a list construct to determine whether an error needs to be thrown.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $opener    The position of the list open token.
-     * @param int                   $closer    The position of the list close token.
-     *
-     * @return void
-     */
-    protected function examineList(File $phpcsFile, $opener, $closer)
-    {
-        $start = $opener;
-        while (($start = $this->hasTargetInList($phpcsFile, $start, $closer)) !== false) {
-            $phpcsFile->addError(
-                'Specifying keys in list constructs is not supported in PHP 7.0 or earlier.',
-                $start,
-                'Found'
-            );
-        }
-    }
-
-
-    /**
-     * Check whether a certain target token exists within a list construct.
-     *
-     * Skips past nested list constructs, so these can be examined based on their own token.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $start     The position of the list open token or a token
-     *                                         within the list to start (resume) the examination from.
-     * @param int                   $closer    The position of the list close token.
-     *
-     * @return int|bool Stack pointer to the target token if encountered. False otherwise.
-     */
-    protected function hasTargetInList(File $phpcsFile, $start, $closer)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        for ($i = ($start + 1); $i < $closer; $i++) {
-            if (isset($this->allTargets[$tokens[$i]['code']]) === false) {
-                continue;
-            }
-
-            if (isset($this->targetsInList[$tokens[$i]['code']]) === true) {
-                return $i;
-            }
-
-            // Skip past nested list constructs.
-            if ($tokens[$i]['code'] === \T_LIST) {
-                $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($i + 1), null, true);
-                if ($nextNonEmpty !== false
-                    && $tokens[$nextNonEmpty]['code'] === \T_OPEN_PARENTHESIS
-                    && isset($tokens[$nextNonEmpty]['parenthesis_closer']) === true
-                ) {
-                    $i = $tokens[$nextNonEmpty]['parenthesis_closer'];
-                }
-            } elseif ($tokens[$i]['code'] === \T_OPEN_SHORT_ARRAY
-                && isset($tokens[$i]['bracket_closer'])
-            ) {
-                $i = $tokens[$i]['bracket_closer'];
-            }
-        }
-
-        return false;
-    }
+	/**
+	 * Tokens which represent the start of a list construct.
+	 *
+	 * @var array
+	 */
+	protected $sniffTargets =  array(
+		\T_LIST             => \T_LIST,
+		\T_OPEN_SHORT_ARRAY => \T_OPEN_SHORT_ARRAY,
+	);
+
+	/**
+	 * The token(s) within the list construct which is being targeted.
+	 *
+	 * @var array
+	 */
+	protected $targetsInList = array(
+		\T_DOUBLE_ARROW => \T_DOUBLE_ARROW,
+	);
+
+	/**
+	 * All tokens needed to walk through the list construct and
+	 * determine whether the target token is contained within.
+	 *
+	 * Set by the setUpAllTargets() method which is called from within register().
+	 *
+	 * @var array
+	 */
+	protected $allTargets;
+
+
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		$this->setUpAllTargets();
+
+		return $this->sniffTargets;
+	}
+
+	/**
+	 * Prepare the $allTargets array only once.
+	 *
+	 * @return array
+	 */
+	public function setUpAllTargets()
+	{
+		$this->allTargets = $this->sniffTargets + $this->targetsInList;
+	}
+
+	/**
+	 * Do a version check to determine if this sniff needs to run at all.
+	 *
+	 * @return bool
+	 */
+	protected function bowOutEarly()
+	{
+		return ($this->supportsBelow('7.0') === false);
+	}
+
+	/**
+	 * 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->bowOutEarly() === true) {
+			return;
+		}
+
+		$tokens = $phpcsFile->getTokens();
+
+		if ($tokens[$stackPtr]['code'] === \T_OPEN_SHORT_ARRAY
+			&& $this->isShortList($phpcsFile, $stackPtr) === false
+		) {
+			// Short array, not short list.
+			return;
+		}
+
+		if ($tokens[$stackPtr]['code'] === \T_LIST) {
+			$nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
+			if ($nextNonEmpty === false
+				|| $tokens[$nextNonEmpty]['code'] !== \T_OPEN_PARENTHESIS
+				|| isset($tokens[$nextNonEmpty]['parenthesis_closer']) === false
+			) {
+				// Parse error or live coding.
+				return;
+			}
+
+			$opener = $nextNonEmpty;
+			$closer = $tokens[$nextNonEmpty]['parenthesis_closer'];
+		} else {
+			// Short list syntax.
+			$opener = $stackPtr;
+
+			if (isset($tokens[$stackPtr]['bracket_closer'])) {
+				$closer = $tokens[$stackPtr]['bracket_closer'];
+			}
+		}
+
+		if (isset($opener, $closer) === false) {
+			return;
+		}
+
+		$this->examineList($phpcsFile, $opener, $closer);
+	}
+
+
+	/**
+	 * Examine the contents of a list construct to determine whether an error needs to be thrown.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $opener    The position of the list open token.
+	 * @param int                   $closer    The position of the list close token.
+	 *
+	 * @return void
+	 */
+	protected function examineList(File $phpcsFile, $opener, $closer)
+	{
+		$start = $opener;
+		while (($start = $this->hasTargetInList($phpcsFile, $start, $closer)) !== false) {
+			$phpcsFile->addError(
+				'Specifying keys in list constructs is not supported in PHP 7.0 or earlier.',
+				$start,
+				'Found'
+			);
+		}
+	}
+
+
+	/**
+	 * Check whether a certain target token exists within a list construct.
+	 *
+	 * Skips past nested list constructs, so these can be examined based on their own token.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $start     The position of the list open token or a token
+	 *                                         within the list to start (resume) the examination from.
+	 * @param int                   $closer    The position of the list close token.
+	 *
+	 * @return int|bool Stack pointer to the target token if encountered. False otherwise.
+	 */
+	protected function hasTargetInList(File $phpcsFile, $start, $closer)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		for ($i = ($start + 1); $i < $closer; $i++) {
+			if (isset($this->allTargets[$tokens[$i]['code']]) === false) {
+				continue;
+			}
+
+			if (isset($this->targetsInList[$tokens[$i]['code']]) === true) {
+				return $i;
+			}
+
+			// Skip past nested list constructs.
+			if ($tokens[$i]['code'] === \T_LIST) {
+				$nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($i + 1), null, true);
+				if ($nextNonEmpty !== false
+					&& $tokens[$nextNonEmpty]['code'] === \T_OPEN_PARENTHESIS
+					&& isset($tokens[$nextNonEmpty]['parenthesis_closer']) === true
+				) {
+					$i = $tokens[$nextNonEmpty]['parenthesis_closer'];
+				}
+			} elseif ($tokens[$i]['code'] === \T_OPEN_SHORT_ARRAY
+				&& isset($tokens[$i]['bracket_closer'])
+			) {
+				$i = $tokens[$i]['bracket_closer'];
+			}
+		}
+
+		return false;
+	}
 }

Spacing +31 added lines, -31 removed lines

@@ -33,7 +33,7 @@ 
      *
      * @var array
      */
-    protected $sniffTargets =  array(
+    protected $sniffTargets = array(
         \T_LIST             => \T_LIST,
         \T_OPEN_SHORT_ARRAY => \T_OPEN_SHORT_ARRAY,
     );
@@ -87,7 +87,7 @@ 
      */
     protected function bowOutEarly()
     {
-        return ($this->supportsBelow('7.0') === false);
+        return ( $this->supportsBelow( '7.0' ) === false );
     }
 
     /**
@@ -99,47 +99,47 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
-        if ($this->bowOutEarly() === true) {
+        if ( $this->bowOutEarly() === true ) {
             return;
         }
 
         $tokens = $phpcsFile->getTokens();
 
-        if ($tokens[$stackPtr]['code'] === \T_OPEN_SHORT_ARRAY
-            && $this->isShortList($phpcsFile, $stackPtr) === false
+        if ( $tokens[ $stackPtr ][ 'code' ] === \T_OPEN_SHORT_ARRAY
+            && $this->isShortList( $phpcsFile, $stackPtr ) === false
         ) {
             // Short array, not short list.
             return;
         }
 
-        if ($tokens[$stackPtr]['code'] === \T_LIST) {
-            $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
-            if ($nextNonEmpty === false
-                || $tokens[$nextNonEmpty]['code'] !== \T_OPEN_PARENTHESIS
-                || isset($tokens[$nextNonEmpty]['parenthesis_closer']) === false
+        if ( $tokens[ $stackPtr ][ 'code' ] === \T_LIST ) {
+            $nextNonEmpty = $phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
+            if ( $nextNonEmpty === false
+                || $tokens[ $nextNonEmpty ][ 'code' ] !== \T_OPEN_PARENTHESIS
+                || isset( $tokens[ $nextNonEmpty ][ 'parenthesis_closer' ] ) === false
             ) {
                 // Parse error or live coding.
                 return;
             }
 
             $opener = $nextNonEmpty;
-            $closer = $tokens[$nextNonEmpty]['parenthesis_closer'];
+            $closer = $tokens[ $nextNonEmpty ][ 'parenthesis_closer' ];
         } else {
             // Short list syntax.
             $opener = $stackPtr;
 
-            if (isset($tokens[$stackPtr]['bracket_closer'])) {
-                $closer = $tokens[$stackPtr]['bracket_closer'];
+            if ( isset( $tokens[ $stackPtr ][ 'bracket_closer' ] ) ) {
+                $closer = $tokens[ $stackPtr ][ 'bracket_closer' ];
             }
         }
 
-        if (isset($opener, $closer) === false) {
+        if ( isset( $opener, $closer ) === false ) {
             return;
         }
 
-        $this->examineList($phpcsFile, $opener, $closer);
+        $this->examineList( $phpcsFile, $opener, $closer );
     }
 
 
@@ -152,10 +152,10 @@ 
      *
      * @return void
      */
-    protected function examineList(File $phpcsFile, $opener, $closer)
+    protected function examineList( File $phpcsFile, $opener, $closer )
     {
         $start = $opener;
-        while (($start = $this->hasTargetInList($phpcsFile, $start, $closer)) !== false) {
+        while ( ( $start = $this->hasTargetInList( $phpcsFile, $start, $closer ) ) !== false ) {
             $phpcsFile->addError(
                 'Specifying keys in list constructs is not supported in PHP 7.0 or earlier.',
                 $start,
@@ -177,32 +177,32 @@ 
      *
      * @return int|bool Stack pointer to the target token if encountered. False otherwise.
      */
-    protected function hasTargetInList(File $phpcsFile, $start, $closer)
+    protected function hasTargetInList( File $phpcsFile, $start, $closer )
     {
         $tokens = $phpcsFile->getTokens();
 
-        for ($i = ($start + 1); $i < $closer; $i++) {
-            if (isset($this->allTargets[$tokens[$i]['code']]) === false) {
+        for ( $i = ( $start + 1 ); $i < $closer; $i++ ) {
+            if ( isset( $this->allTargets[ $tokens[ $i ][ 'code' ] ] ) === false ) {
                 continue;
             }
 
-            if (isset($this->targetsInList[$tokens[$i]['code']]) === true) {
+            if ( isset( $this->targetsInList[ $tokens[ $i ][ 'code' ] ] ) === true ) {
                 return $i;
             }
 
             // Skip past nested list constructs.
-            if ($tokens[$i]['code'] === \T_LIST) {
-                $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($i + 1), null, true);
-                if ($nextNonEmpty !== false
-                    && $tokens[$nextNonEmpty]['code'] === \T_OPEN_PARENTHESIS
-                    && isset($tokens[$nextNonEmpty]['parenthesis_closer']) === true
+            if ( $tokens[ $i ][ 'code' ] === \T_LIST ) {
+                $nextNonEmpty = $phpcsFile->findNext( Tokens::$emptyTokens, ( $i + 1 ), null, true );
+                if ( $nextNonEmpty !== false
+                    && $tokens[ $nextNonEmpty ][ 'code' ] === \T_OPEN_PARENTHESIS
+                    && isset( $tokens[ $nextNonEmpty ][ 'parenthesis_closer' ] ) === true
                 ) {
-                    $i = $tokens[$nextNonEmpty]['parenthesis_closer'];
+                    $i = $tokens[ $nextNonEmpty ][ 'parenthesis_closer' ];
                 }
-            } elseif ($tokens[$i]['code'] === \T_OPEN_SHORT_ARRAY
-                && isset($tokens[$i]['bracket_closer'])
+            } elseif ( $tokens[ $i ][ 'code' ] === \T_OPEN_SHORT_ARRAY
+                && isset( $tokens[ $i ][ 'bracket_closer' ] )
             ) {
-                $i = $tokens[$i]['bracket_closer'];
+                $i = $tokens[ $i ][ 'bracket_closer' ];
             }
         }
 

Braces +7 added lines, -14 removed lines

@@ -26,8 +26,7 @@ 
  * @package  PHPCompatibility
  * @author   Juliette Reinders Folmer <phpcompatibility_nospam@adviesenzo.nl>
  */
-class NewKeyedListSniff extends Sniff
-{
+class NewKeyedListSniff extends Sniff {
     /**
      * Tokens which represent the start of a list construct.
      *
@@ -63,8 +62,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         $this->setUpAllTargets();
 
         return $this->sniffTargets;
@@ -75,8 +73,7 @@ 
      *
      * @return array
      */
-    public function setUpAllTargets()
-    {
+    public function setUpAllTargets() {
         $this->allTargets = $this->sniffTargets + $this->targetsInList;
     }
 
@@ -85,8 +82,7 @@ 
      *
      * @return bool
      */
-    protected function bowOutEarly()
-    {
+    protected function bowOutEarly() {
         return ($this->supportsBelow('7.0') === false);
     }
 
@@ -99,8 +95,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         if ($this->bowOutEarly() === true) {
             return;
         }
@@ -152,8 +147,7 @@ 
      *
      * @return void
      */
-    protected function examineList(File $phpcsFile, $opener, $closer)
-    {
+    protected function examineList(File $phpcsFile, $opener, $closer) {
         $start = $opener;
         while (($start = $this->hasTargetInList($phpcsFile, $start, $closer)) !== false) {
             $phpcsFile->addError(
@@ -177,8 +171,7 @@ 
      *
      * @return int|bool Stack pointer to the target token if encountered. False otherwise.
      */
-    protected function hasTargetInList(File $phpcsFile, $start, $closer)
-    {
+    protected function hasTargetInList(File $phpcsFile, $start, $closer) {
         $tokens = $phpcsFile->getTokens();
 
         for ($i = ($start + 1); $i < $closer; $i++) {