gravityview / GravityView

vendor/phpcompatibility/php-compatibility/PHPCompatibility/Sniffs/Lists/NewListReferenceAssignmentSniff.php

Indentation +37 added lines, -37 removed lines

@@ -25,43 +25,43 @@
  */
 class NewListReferenceAssignmentSniff extends NewKeyedListSniff
 {
-    /**
-     * The token(s) within the list construct which is being targeted.
-     *
-     * @var array
-     */
-    protected $targetsInList = array(
-        \T_BITWISE_AND => \T_BITWISE_AND,
-    );
+	/**
+	 * The token(s) within the list construct which is being targeted.
+	 *
+	 * @var array
+	 */
+	protected $targetsInList = array(
+		\T_BITWISE_AND => \T_BITWISE_AND,
+	);
 
-    /**
-     * Do a version check to determine if this sniff needs to run at all.
-     *
-     * @return bool
-     */
-    protected function bowOutEarly()
-    {
-        return ($this->supportsBelow('7.2') === false);
-    }
+	/**
+	 * Do a version check to determine if this sniff needs to run at all.
+	 *
+	 * @return bool
+	 */
+	protected function bowOutEarly()
+	{
+		return ($this->supportsBelow('7.2') === false);
+	}
 
-    /**
-     * 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(
-                'Reference assignments within list constructs are not supported in PHP 7.2 or earlier.',
-                $start,
-                'Found'
-            );
-        }
-    }
+	/**
+	 * 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(
+				'Reference assignments within list constructs are not supported in PHP 7.2 or earlier.',
+				$start,
+				'Found'
+			);
+		}
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -41,7 +41,7 @@ 
      */
     protected function bowOutEarly()
     {
-        return ($this->supportsBelow('7.2') === false);
+        return ( $this->supportsBelow( '7.2' ) === false );
     }
 
     /**
@@ -53,10 +53,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(
                 'Reference assignments within list constructs are not supported in PHP 7.2 or earlier.',
                 $start,

Braces +3 added lines, -6 removed lines

@@ -23,8 +23,7 @@ 
  * @package  PHPCompatibility
  * @author   Juliette Reinders Folmer <phpcompatibility_nospam@adviesenzo.nl>
  */
-class NewListReferenceAssignmentSniff extends NewKeyedListSniff
-{
+class NewListReferenceAssignmentSniff extends NewKeyedListSniff {
     /**
      * The token(s) within the list construct which is being targeted.
      *
@@ -39,8 +38,7 @@ 
      *
      * @return bool
      */
-    protected function bowOutEarly()
-    {
+    protected function bowOutEarly() {
         return ($this->supportsBelow('7.2') === false);
     }
 
@@ -53,8 +51,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(

vendor/phpcompatibility/php-compatibility/PHPCompatibility/Sniffs/Lists/AssignmentOrderSniff.php

Indentation +131 added lines, -131 removed lines

@@ -30,154 +30,154 @@
 class AssignmentOrderSniff extends Sniff
 {
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        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|int Void if not a valid list. If a list construct has been
-     *                  examined, the stack pointer to the list closer to skip
-     *                  passed any nested lists which don't need to be examined again.
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        if ($this->supportsAbove('7.0') === false) {
-            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;
-        }
-
-        /*
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		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|int Void if not a valid list. If a list construct has been
+	 *                  examined, the stack pointer to the list closer to skip
+	 *                  passed any nested lists which don't need to be examined again.
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		if ($this->supportsAbove('7.0') === false) {
+			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;
+		}
+
+		/*
          * OK, so we have the opener & closer, now we need to check all the variables in the
          * list() to see if there are duplicates as that's the problem.
          */
-        $hasVars = $phpcsFile->findNext(array(\T_VARIABLE, \T_DOLLAR), ($opener + 1), $closer);
-        if ($hasVars === false) {
-            // Empty list, not our concern.
-            return ($closer + 1);
-        }
-
-        // Set the variable delimiters based on the list type being examined.
-        $stopPoints = array(\T_COMMA);
-        if ($tokens[$stackPtr]['code'] === \T_OPEN_SHORT_ARRAY) {
-            $stopPoints[] = \T_CLOSE_SHORT_ARRAY;
-        } else {
-            $stopPoints[] = \T_CLOSE_PARENTHESIS;
-        }
-
-        $listVars      = array();
-        $lastStopPoint = $opener;
-
-        /*
+		$hasVars = $phpcsFile->findNext(array(\T_VARIABLE, \T_DOLLAR), ($opener + 1), $closer);
+		if ($hasVars === false) {
+			// Empty list, not our concern.
+			return ($closer + 1);
+		}
+
+		// Set the variable delimiters based on the list type being examined.
+		$stopPoints = array(\T_COMMA);
+		if ($tokens[$stackPtr]['code'] === \T_OPEN_SHORT_ARRAY) {
+			$stopPoints[] = \T_CLOSE_SHORT_ARRAY;
+		} else {
+			$stopPoints[] = \T_CLOSE_PARENTHESIS;
+		}
+
+		$listVars      = array();
+		$lastStopPoint = $opener;
+
+		/*
          * Create a list of all variables used within the `list()` construct.
          * We're not concerned with whether these are nested or not, as any duplicate
          * variable name used will be problematic, independent of nesting.
          */
-        do {
-            $nextStopPoint = $phpcsFile->findNext($stopPoints, ($lastStopPoint + 1), $closer);
-            if ($nextStopPoint === false) {
-                $nextStopPoint = $closer;
-            }
-
-            // Also detect this in PHP 7.1 keyed lists.
-            $hasDoubleArrow = $phpcsFile->findNext(\T_DOUBLE_ARROW, ($lastStopPoint + 1), $nextStopPoint);
-            if ($hasDoubleArrow !== false) {
-                $lastStopPoint = $hasDoubleArrow;
-            }
-
-            // Find the start of the variable, allowing for variable variables.
-            $nextStartPoint = $phpcsFile->findNext(array(\T_VARIABLE, \T_DOLLAR), ($lastStopPoint + 1), $nextStopPoint);
-            if ($nextStartPoint === false) {
-                // Skip past empty bits in the list, i.e. `list( $a, , ,)`.
-                $lastStopPoint = $nextStopPoint;
-                continue;
-            }
-
-            /*
+		do {
+			$nextStopPoint = $phpcsFile->findNext($stopPoints, ($lastStopPoint + 1), $closer);
+			if ($nextStopPoint === false) {
+				$nextStopPoint = $closer;
+			}
+
+			// Also detect this in PHP 7.1 keyed lists.
+			$hasDoubleArrow = $phpcsFile->findNext(\T_DOUBLE_ARROW, ($lastStopPoint + 1), $nextStopPoint);
+			if ($hasDoubleArrow !== false) {
+				$lastStopPoint = $hasDoubleArrow;
+			}
+
+			// Find the start of the variable, allowing for variable variables.
+			$nextStartPoint = $phpcsFile->findNext(array(\T_VARIABLE, \T_DOLLAR), ($lastStopPoint + 1), $nextStopPoint);
+			if ($nextStartPoint === false) {
+				// Skip past empty bits in the list, i.e. `list( $a, , ,)`.
+				$lastStopPoint = $nextStopPoint;
+				continue;
+			}
+
+			/*
              * Gather the content of all non-empty tokens to determine the "variable name".
              * Variable name in this context includes array or object property syntaxes, such
              * as `$a['name']` and `$b->property`.
              */
-            $varContent = '';
+			$varContent = '';
 
-            for ($i = $nextStartPoint; $i < $nextStopPoint; $i++) {
-                if (isset(Tokens::$emptyTokens[$tokens[$i]['code']])) {
-                    continue;
-                }
+			for ($i = $nextStartPoint; $i < $nextStopPoint; $i++) {
+				if (isset(Tokens::$emptyTokens[$tokens[$i]['code']])) {
+					continue;
+				}
 
-                $varContent .= $tokens[$i]['content'];
-            }
+				$varContent .= $tokens[$i]['content'];
+			}
 
-            if ($varContent !== '') {
-                $listVars[] = $varContent;
-            }
+			if ($varContent !== '') {
+				$listVars[] = $varContent;
+			}
 
-            $lastStopPoint = $nextStopPoint;
+			$lastStopPoint = $nextStopPoint;
 
-        } while ($lastStopPoint < $closer);
+		} while ($lastStopPoint < $closer);
 
-        if (empty($listVars)) {
-            // Shouldn't be possible, but just in case.
-            return ($closer + 1);
-        }
+		if (empty($listVars)) {
+			// Shouldn't be possible, but just in case.
+			return ($closer + 1);
+		}
 
-        // Verify that all variables used in the list() construct are unique.
-        if (\count($listVars) !== \count(array_unique($listVars))) {
-            $phpcsFile->addError(
-                'list() will assign variable from left-to-right since PHP 7.0. Ensure all variables in list() are unique to prevent unexpected results.',
-                $stackPtr,
-                'Affected'
-            );
-        }
+		// Verify that all variables used in the list() construct are unique.
+		if (\count($listVars) !== \count(array_unique($listVars))) {
+			$phpcsFile->addError(
+				'list() will assign variable from left-to-right since PHP 7.0. Ensure all variables in list() are unique to prevent unexpected results.',
+				$stackPtr,
+				'Affected'
+			);
+		}
 
-        return ($closer + 1);
-    }
+		return ($closer + 1);
+	}
 }

Spacing +36 added lines, -36 removed lines

@@ -55,43 +55,43 @@ 
      *                  examined, the stack pointer to the list closer to skip
      *                  passed any nested lists which don't need to be examined again.
      */
-    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
-            && $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;
         }
 
@@ -99,18 +99,18 @@ 
          * OK, so we have the opener & closer, now we need to check all the variables in the
          * list() to see if there are duplicates as that's the problem.
          */
-        $hasVars = $phpcsFile->findNext(array(\T_VARIABLE, \T_DOLLAR), ($opener + 1), $closer);
-        if ($hasVars === false) {
+        $hasVars = $phpcsFile->findNext( array( \T_VARIABLE, \T_DOLLAR ), ( $opener + 1 ), $closer );
+        if ( $hasVars === false ) {
             // Empty list, not our concern.
-            return ($closer + 1);
+            return ( $closer + 1 );
         }
 
         // Set the variable delimiters based on the list type being examined.
-        $stopPoints = array(\T_COMMA);
-        if ($tokens[$stackPtr]['code'] === \T_OPEN_SHORT_ARRAY) {
-            $stopPoints[] = \T_CLOSE_SHORT_ARRAY;
+        $stopPoints = array( \T_COMMA );
+        if ( $tokens[ $stackPtr ][ 'code' ] === \T_OPEN_SHORT_ARRAY ) {
+            $stopPoints[ ] = \T_CLOSE_SHORT_ARRAY;
         } else {
-            $stopPoints[] = \T_CLOSE_PARENTHESIS;
+            $stopPoints[ ] = \T_CLOSE_PARENTHESIS;
         }
 
         $listVars      = array();
@@ -122,20 +122,20 @@ 
          * variable name used will be problematic, independent of nesting.
          */
         do {
-            $nextStopPoint = $phpcsFile->findNext($stopPoints, ($lastStopPoint + 1), $closer);
-            if ($nextStopPoint === false) {
+            $nextStopPoint = $phpcsFile->findNext( $stopPoints, ( $lastStopPoint + 1 ), $closer );
+            if ( $nextStopPoint === false ) {
                 $nextStopPoint = $closer;
             }
 
             // Also detect this in PHP 7.1 keyed lists.
-            $hasDoubleArrow = $phpcsFile->findNext(\T_DOUBLE_ARROW, ($lastStopPoint + 1), $nextStopPoint);
-            if ($hasDoubleArrow !== false) {
+            $hasDoubleArrow = $phpcsFile->findNext( \T_DOUBLE_ARROW, ( $lastStopPoint + 1 ), $nextStopPoint );
+            if ( $hasDoubleArrow !== false ) {
                 $lastStopPoint = $hasDoubleArrow;
             }
 
             // Find the start of the variable, allowing for variable variables.
-            $nextStartPoint = $phpcsFile->findNext(array(\T_VARIABLE, \T_DOLLAR), ($lastStopPoint + 1), $nextStopPoint);
-            if ($nextStartPoint === false) {
+            $nextStartPoint = $phpcsFile->findNext( array( \T_VARIABLE, \T_DOLLAR ), ( $lastStopPoint + 1 ), $nextStopPoint );
+            if ( $nextStartPoint === false ) {
                 // Skip past empty bits in the list, i.e. `list( $a, , ,)`.
                 $lastStopPoint = $nextStopPoint;
                 continue;
@@ -148,29 +148,29 @@ 
              */
             $varContent = '';
 
-            for ($i = $nextStartPoint; $i < $nextStopPoint; $i++) {
-                if (isset(Tokens::$emptyTokens[$tokens[$i]['code']])) {
+            for ( $i = $nextStartPoint; $i < $nextStopPoint; $i++ ) {
+                if ( isset( Tokens::$emptyTokens[ $tokens[ $i ][ 'code' ] ] ) ) {
                     continue;
                 }
 
-                $varContent .= $tokens[$i]['content'];
+                $varContent .= $tokens[ $i ][ 'content' ];
             }
 
-            if ($varContent !== '') {
-                $listVars[] = $varContent;
+            if ( $varContent !== '' ) {
+                $listVars[ ] = $varContent;
             }
 
             $lastStopPoint = $nextStopPoint;
 
-        } while ($lastStopPoint < $closer);
+        } while ( $lastStopPoint < $closer );
 
-        if (empty($listVars)) {
+        if ( empty( $listVars ) ) {
             // Shouldn't be possible, but just in case.
-            return ($closer + 1);
+            return ( $closer + 1 );
         }
 
         // Verify that all variables used in the list() construct are unique.
-        if (\count($listVars) !== \count(array_unique($listVars))) {
+        if ( \count( $listVars ) !== \count( array_unique( $listVars ) ) ) {
             $phpcsFile->addError(
                 'list() will assign variable from left-to-right since PHP 7.0. Ensure all variables in list() are unique to prevent unexpected results.',
                 $stackPtr,
@@ -178,6 +178,6 @@ 
             );
         }
 
-        return ($closer + 1);
+        return ( $closer + 1 );
     }
 }

Braces +3 added lines, -6 removed lines

@@ -27,16 +27,14 @@ 
  * @package  PHPCompatibility
  * @author   Juliette Reinders Folmer <phpcompatibility_nospam@adviesenzo.nl>
  */
-class AssignmentOrderSniff extends Sniff
-{
+class AssignmentOrderSniff extends Sniff {
 
     /**
      * Returns an array of tokens this test wants to listen for.
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(
             \T_LIST,
             \T_OPEN_SHORT_ARRAY,
@@ -55,8 +53,7 @@ 
      *                  examined, the stack pointer to the list closer to skip
      *                  passed any nested lists which don't need to be examined again.
      */
-    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/Syntax/NewDynamicAccessToStaticSniff.php

Indentation +46 added lines, -46 removed lines

@@ -30,56 +30,56 @@
 class NewDynamicAccessToStaticSniff extends Sniff
 {
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-            \T_DOUBLE_COLON,
-        );
-    }
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return array(
+			\T_DOUBLE_COLON,
+		);
+	}
 
-    /**
-     * 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.2') === 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.2') === false) {
+			return;
+		}
 
-        $tokens       = $phpcsFile->getTokens();
-        $prevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+		$tokens       = $phpcsFile->getTokens();
+		$prevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
 
-        // Disregard `static::` as well. Late static binding is reported by another sniff.
-        if ($tokens[$prevNonEmpty]['code'] === \T_SELF
-            || $tokens[$prevNonEmpty]['code'] === \T_PARENT
-            || $tokens[$prevNonEmpty]['code'] === \T_STATIC
-        ) {
-            return;
-        }
+		// Disregard `static::` as well. Late static binding is reported by another sniff.
+		if ($tokens[$prevNonEmpty]['code'] === \T_SELF
+			|| $tokens[$prevNonEmpty]['code'] === \T_PARENT
+			|| $tokens[$prevNonEmpty]['code'] === \T_STATIC
+		) {
+			return;
+		}
 
-        if ($tokens[$prevNonEmpty]['code'] === \T_STRING) {
-            $prevPrevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($prevNonEmpty - 1), null, true);
+		if ($tokens[$prevNonEmpty]['code'] === \T_STRING) {
+			$prevPrevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($prevNonEmpty - 1), null, true);
 
-            if ($tokens[$prevPrevNonEmpty]['code'] !== \T_OBJECT_OPERATOR) {
-                return;
-            }
-        }
+			if ($tokens[$prevPrevNonEmpty]['code'] !== \T_OBJECT_OPERATOR) {
+				return;
+			}
+		}
 
-        $phpcsFile->addError(
-            'Static class properties and methods, as well as class constants, could not be accessed using a dynamic (variable) classname in PHP 5.2 or earlier.',
-            $stackPtr,
-            'Found'
-        );
-    }
+		$phpcsFile->addError(
+			'Static class properties and methods, as well as class constants, could not be accessed using a dynamic (variable) classname in PHP 5.2 or earlier.',
+			$stackPtr,
+			'Found'
+		);
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -51,27 +51,27 @@
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
-        if ($this->supportsBelow('5.2') === false) {
+        if ( $this->supportsBelow( '5.2' ) === false ) {
             return;
         }
 
         $tokens       = $phpcsFile->getTokens();
-        $prevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+        $prevNonEmpty = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
 
         // Disregard `static::` as well. Late static binding is reported by another sniff.
-        if ($tokens[$prevNonEmpty]['code'] === \T_SELF
-            || $tokens[$prevNonEmpty]['code'] === \T_PARENT
-            || $tokens[$prevNonEmpty]['code'] === \T_STATIC
+        if ( $tokens[ $prevNonEmpty ][ 'code' ] === \T_SELF
+            || $tokens[ $prevNonEmpty ][ 'code' ] === \T_PARENT
+            || $tokens[ $prevNonEmpty ][ 'code' ] === \T_STATIC
         ) {
             return;
         }
 
-        if ($tokens[$prevNonEmpty]['code'] === \T_STRING) {
-            $prevPrevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($prevNonEmpty - 1), null, true);
+        if ( $tokens[ $prevNonEmpty ][ 'code' ] === \T_STRING ) {
+            $prevPrevNonEmpty = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $prevNonEmpty - 1 ), null, true );
 
-            if ($tokens[$prevPrevNonEmpty]['code'] !== \T_OBJECT_OPERATOR) {
+            if ( $tokens[ $prevPrevNonEmpty ][ 'code' ] !== \T_OBJECT_OPERATOR ) {
                 return;
             }
         }

Braces +3 added lines, -6 removed lines

@@ -27,16 +27,14 @@ 
  * @package  PHPCompatibility
  * @author   Juliette Reinders Folmer <phpcompatibility_nospam@adviesenzo.nl>
  */
-class NewDynamicAccessToStaticSniff extends Sniff
-{
+class NewDynamicAccessToStaticSniff extends Sniff {
 
     /**
      * Returns an array of tokens this test wants to listen for.
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(
             \T_DOUBLE_COLON,
         );
@@ -51,8 +49,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         if ($this->supportsBelow('5.2') === 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/Syntax/NewShortArraySniff.php

Indentation +37 added lines, -37 removed lines

@@ -28,47 +28,47 @@
 class NewShortArraySniff extends Sniff
 {
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-            \T_OPEN_SHORT_ARRAY,
-            \T_CLOSE_SHORT_ARRAY,
-        );
-    }
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return array(
+			\T_OPEN_SHORT_ARRAY,
+			\T_CLOSE_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->supportsBelow('5.3') === 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.3') === false) {
+			return;
+		}
 
-        $tokens = $phpcsFile->getTokens();
-        $token  = $tokens[$stackPtr];
+		$tokens = $phpcsFile->getTokens();
+		$token  = $tokens[$stackPtr];
 
-        $error = '%s is available since 5.4';
-        $data  = array();
+		$error = '%s is available since 5.4';
+		$data  = array();
 
-        if ($token['type'] === 'T_OPEN_SHORT_ARRAY') {
-            $data[] = 'Short array syntax (open)';
-        } elseif ($token['type'] === 'T_CLOSE_SHORT_ARRAY') {
-            $data[] = 'Short array syntax (close)';
-        }
+		if ($token['type'] === 'T_OPEN_SHORT_ARRAY') {
+			$data[] = 'Short array syntax (open)';
+		} elseif ($token['type'] === 'T_CLOSE_SHORT_ARRAY') {
+			$data[] = 'Short array syntax (close)';
+		}
 
-        $phpcsFile->addError($error, $stackPtr, 'Found', $data);
-    }
+		$phpcsFile->addError($error, $stackPtr, 'Found', $data);
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -51,24 +51,24 @@
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
-        if ($this->supportsBelow('5.3') === false) {
+        if ( $this->supportsBelow( '5.3' ) === false ) {
             return;
         }
 
         $tokens = $phpcsFile->getTokens();
-        $token  = $tokens[$stackPtr];
+        $token  = $tokens[ $stackPtr ];
 
         $error = '%s is available since 5.4';
         $data  = array();
 
-        if ($token['type'] === 'T_OPEN_SHORT_ARRAY') {
-            $data[] = 'Short array syntax (open)';
-        } elseif ($token['type'] === 'T_CLOSE_SHORT_ARRAY') {
-            $data[] = 'Short array syntax (close)';
+        if ( $token[ 'type' ] === 'T_OPEN_SHORT_ARRAY' ) {
+            $data[ ] = 'Short array syntax (open)';
+        } elseif ( $token[ 'type' ] === 'T_CLOSE_SHORT_ARRAY' ) {
+            $data[ ] = 'Short array syntax (close)';
         }
 
-        $phpcsFile->addError($error, $stackPtr, 'Found', $data);
+        $phpcsFile->addError( $error, $stackPtr, 'Found', $data );
     }
 }

Braces +3 added lines, -6 removed lines

@@ -25,16 +25,14 @@ 
  * @package  PHPCompatibility
  * @author   Alex Miroshnikov <unknown@example.com>
  */
-class NewShortArraySniff extends Sniff
-{
+class NewShortArraySniff extends Sniff {
 
     /**
      * Returns an array of tokens this test wants to listen for.
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(
             \T_OPEN_SHORT_ARRAY,
             \T_CLOSE_SHORT_ARRAY,
@@ -51,8 +49,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         if ($this->supportsBelow('5.3') === false) {
             return;
         }

Doc Comments +1 added lines, -1 removed lines

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

vendor/phpcompatibility/php-compatibility/PHPCompatibility/Sniffs/Syntax/RemovedNewReferenceSniff.php

Indentation +38 added lines, -38 removed lines

@@ -31,47 +31,47 @@
 class RemovedNewReferenceSniff extends Sniff
 {
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(\T_NEW);
-    }
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		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->supportsAbove('5.3') === false) {
-            return;
-        }
+	/**
+	 * Processes this test, when one of its tokens is encountered.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of the current token in the
+	 *                                         stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		if ($this->supportsAbove('5.3') === false) {
+			return;
+		}
 
-        $tokens       = $phpcsFile->getTokens();
-        $prevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
-        if ($prevNonEmpty === false || $tokens[$prevNonEmpty]['type'] !== 'T_BITWISE_AND') {
-            return;
-        }
+		$tokens       = $phpcsFile->getTokens();
+		$prevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+		if ($prevNonEmpty === false || $tokens[$prevNonEmpty]['type'] !== 'T_BITWISE_AND') {
+			return;
+		}
 
-        $error     = 'Assigning the return value of new by reference is deprecated in PHP 5.3';
-        $isError   = false;
-        $errorCode = 'Deprecated';
+		$error     = 'Assigning the return value of new by reference is deprecated in PHP 5.3';
+		$isError   = false;
+		$errorCode = 'Deprecated';
 
-        if ($this->supportsAbove('7.0') === true) {
-            $error    .= ' and has been removed in PHP 7.0';
-            $isError   = true;
-            $errorCode = 'Removed';
-        }
+		if ($this->supportsAbove('7.0') === true) {
+			$error    .= ' and has been removed in PHP 7.0';
+			$isError   = true;
+			$errorCode = 'Removed';
+		}
 
-        $this->addMessage($phpcsFile, $error, $stackPtr, $isError, $errorCode);
-    }
+		$this->addMessage($phpcsFile, $error, $stackPtr, $isError, $errorCode);
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -38,7 +38,7 @@ 
      */
     public function register()
     {
-        return array(\T_NEW);
+        return array( \T_NEW );
     }
 
     /**
@@ -50,15 +50,15 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
-        if ($this->supportsAbove('5.3') === false) {
+        if ( $this->supportsAbove( '5.3' ) === false ) {
             return;
         }
 
         $tokens       = $phpcsFile->getTokens();
-        $prevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
-        if ($prevNonEmpty === false || $tokens[$prevNonEmpty]['type'] !== 'T_BITWISE_AND') {
+        $prevNonEmpty = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
+        if ( $prevNonEmpty === false || $tokens[ $prevNonEmpty ][ 'type' ] !== 'T_BITWISE_AND' ) {
             return;
         }
 
@@ -66,12 +66,12 @@ 
         $isError   = false;
         $errorCode = 'Deprecated';
 
-        if ($this->supportsAbove('7.0') === true) {
+        if ( $this->supportsAbove( '7.0' ) === true ) {
             $error    .= ' and has been removed in PHP 7.0';
             $isError   = true;
             $errorCode = 'Removed';
         }
 
-        $this->addMessage($phpcsFile, $error, $stackPtr, $isError, $errorCode);
+        $this->addMessage( $phpcsFile, $error, $stackPtr, $isError, $errorCode );
     }
 }

Braces +3 added lines, -6 removed lines

@@ -28,16 +28,14 @@ 
  * @author    Wim Godden <wim.godden@cu.be>
  * @copyright 2012 Cu.be Solutions bvba
  */
-class RemovedNewReferenceSniff extends Sniff
-{
+class RemovedNewReferenceSniff extends Sniff {
 
     /**
      * Returns an array of tokens this test wants to listen for.
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(\T_NEW);
     }
 
@@ -50,8 +48,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         if ($this->supportsAbove('5.3') === false) {
             return;
         }

Doc Comments +1 added lines, -1 removed lines

@@ -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/Syntax/NewFunctionCallTrailingCommaSniff.php

Indentation +74 added lines, -74 removed lines

@@ -26,90 +26,90 @@
  */
 class NewFunctionCallTrailingCommaSniff extends Sniff
 {
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-            \T_STRING,
-            \T_VARIABLE,
-            \T_ISSET,
-            \T_UNSET,
-        );
-    }
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return array(
+			\T_STRING,
+			\T_VARIABLE,
+			\T_ISSET,
+			\T_UNSET,
+		);
+	}
 
 
-    /**
-     * 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.2') === 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.2') === false) {
+			return;
+		}
 
-        $tokens = $phpcsFile->getTokens();
+		$tokens = $phpcsFile->getTokens();
 
-        $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
-        if ($tokens[$nextNonEmpty]['code'] !== \T_OPEN_PARENTHESIS
-            || isset($tokens[$nextNonEmpty]['parenthesis_closer']) === false
-        ) {
-            return;
-        }
+		$nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
+		if ($tokens[$nextNonEmpty]['code'] !== \T_OPEN_PARENTHESIS
+			|| isset($tokens[$nextNonEmpty]['parenthesis_closer']) === false
+		) {
+			return;
+		}
 
-        if ($tokens[$stackPtr]['code'] === \T_STRING) {
-            $ignore = array(
-                \T_FUNCTION        => true,
-                \T_CONST           => true,
-                \T_USE             => true,
-            );
+		if ($tokens[$stackPtr]['code'] === \T_STRING) {
+			$ignore = array(
+				\T_FUNCTION        => true,
+				\T_CONST           => true,
+				\T_USE             => true,
+			);
 
-            $prevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
-            if (isset($ignore[$tokens[$prevNonEmpty]['code']]) === true) {
-                // Not a function call.
-                return;
-            }
-        }
+			$prevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+			if (isset($ignore[$tokens[$prevNonEmpty]['code']]) === true) {
+				// Not a function call.
+				return;
+			}
+		}
 
-        $closer            = $tokens[$nextNonEmpty]['parenthesis_closer'];
-        $lastInParenthesis = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($closer - 1), $nextNonEmpty, true);
+		$closer            = $tokens[$nextNonEmpty]['parenthesis_closer'];
+		$lastInParenthesis = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($closer - 1), $nextNonEmpty, true);
 
-        if ($tokens[$lastInParenthesis]['code'] !== \T_COMMA) {
-            return;
-        }
+		if ($tokens[$lastInParenthesis]['code'] !== \T_COMMA) {
+			return;
+		}
 
-        $data = array();
-        switch ($tokens[$stackPtr]['code']) {
-            case \T_ISSET:
-                $data[]    = 'calls to isset()';
-                $errorCode = 'FoundInIsset';
-                break;
+		$data = array();
+		switch ($tokens[$stackPtr]['code']) {
+			case \T_ISSET:
+				$data[]    = 'calls to isset()';
+				$errorCode = 'FoundInIsset';
+				break;
 
-            case \T_UNSET:
-                $data[]    = 'calls to unset()';
-                $errorCode = 'FoundInUnset';
-                break;
+			case \T_UNSET:
+				$data[]    = 'calls to unset()';
+				$errorCode = 'FoundInUnset';
+				break;
 
-            default:
-                $data[]    = 'function calls';
-                $errorCode = 'FoundInFunctionCall';
-                break;
-        }
+			default:
+				$data[]    = 'function calls';
+				$errorCode = 'FoundInFunctionCall';
+				break;
+		}
 
-        $phpcsFile->addError(
-            'Trailing comma\'s are not allowed in %s in PHP 7.2 or earlier',
-            $lastInParenthesis,
-            $errorCode,
-            $data
-        );
-    }
+		$phpcsFile->addError(
+			'Trailing comma\'s are not allowed in %s in PHP 7.2 or earlier',
+			$lastInParenthesis,
+			$errorCode,
+			$data
+		);
+	}
 }

Spacing +15 added lines, -15 removed lines

@@ -51,56 +51,56 @@
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
-        if ($this->supportsBelow('7.2') === false) {
+        if ( $this->supportsBelow( '7.2' ) === false ) {
             return;
         }
 
         $tokens = $phpcsFile->getTokens();
 
-        $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
-        if ($tokens[$nextNonEmpty]['code'] !== \T_OPEN_PARENTHESIS
-            || isset($tokens[$nextNonEmpty]['parenthesis_closer']) === false
+        $nextNonEmpty = $phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
+        if ( $tokens[ $nextNonEmpty ][ 'code' ] !== \T_OPEN_PARENTHESIS
+            || isset( $tokens[ $nextNonEmpty ][ 'parenthesis_closer' ] ) === false
         ) {
             return;
         }
 
-        if ($tokens[$stackPtr]['code'] === \T_STRING) {
+        if ( $tokens[ $stackPtr ][ 'code' ] === \T_STRING ) {
             $ignore = array(
                 \T_FUNCTION        => true,
                 \T_CONST           => true,
                 \T_USE             => true,
             );
 
-            $prevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
-            if (isset($ignore[$tokens[$prevNonEmpty]['code']]) === true) {
+            $prevNonEmpty = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
+            if ( isset( $ignore[ $tokens[ $prevNonEmpty ][ 'code' ] ] ) === true ) {
                 // Not a function call.
                 return;
             }
         }
 
-        $closer            = $tokens[$nextNonEmpty]['parenthesis_closer'];
-        $lastInParenthesis = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($closer - 1), $nextNonEmpty, true);
+        $closer            = $tokens[ $nextNonEmpty ][ 'parenthesis_closer' ];
+        $lastInParenthesis = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $closer - 1 ), $nextNonEmpty, true );
 
-        if ($tokens[$lastInParenthesis]['code'] !== \T_COMMA) {
+        if ( $tokens[ $lastInParenthesis ][ 'code' ] !== \T_COMMA ) {
             return;
         }
 
         $data = array();
-        switch ($tokens[$stackPtr]['code']) {
+        switch ( $tokens[ $stackPtr ][ 'code' ] ) {
             case \T_ISSET:
-                $data[]    = 'calls to isset()';
+                $data[ ]    = 'calls to isset()';
                 $errorCode = 'FoundInIsset';
                 break;
 
             case \T_UNSET:
-                $data[]    = 'calls to unset()';
+                $data[ ]    = 'calls to unset()';
                 $errorCode = 'FoundInUnset';
                 break;
 
             default:
-                $data[]    = 'function calls';
+                $data[ ]    = 'function calls';
                 $errorCode = 'FoundInFunctionCall';
                 break;
         }

Braces +3 added lines, -6 removed lines

@@ -24,15 +24,13 @@ 
  * @package  PHPCompatibility
  * @author   Juliette Reinders Folmer <phpcompatibility_nospam@adviesenzo.nl>
  */
-class NewFunctionCallTrailingCommaSniff extends Sniff
-{
+class NewFunctionCallTrailingCommaSniff 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,
             \T_VARIABLE,
@@ -51,8 +49,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         if ($this->supportsBelow('7.2') === 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/Syntax/NewFlexibleHeredocNowdocSniff.php

Indentation +190 added lines, -190 removed lines

@@ -33,215 +33,215 @@
 class NewFlexibleHeredocNowdocSniff extends Sniff
 {
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        $targets = array(
-            \T_END_HEREDOC,
-            \T_END_NOWDOC,
-        );
-
-        if (version_compare(\PHP_VERSION_ID, '70299', '>') === false) {
-            // Start identifier of a PHP 7.3 flexible heredoc/nowdoc.
-            $targets[] = \T_STRING;
-        }
-
-        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)
-    {
-        /*
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		$targets = array(
+			\T_END_HEREDOC,
+			\T_END_NOWDOC,
+		);
+
+		if (version_compare(\PHP_VERSION_ID, '70299', '>') === false) {
+			// Start identifier of a PHP 7.3 flexible heredoc/nowdoc.
+			$targets[] = \T_STRING;
+		}
+
+		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)
+	{
+		/*
          * Due to a tokenizer bug which gets hit when the PHP 7.3 heredoc/nowdoc syntax
          * is used, this part of the sniff cannot possibly work on PHPCS < 2.6.0.
          * See upstream issue #928.
          */
-        if ($this->supportsBelow('7.2') === true && version_compare(PHPCSHelper::getVersion(), '2.6.0', '>=')) {
-            $this->detectIndentedNonStandAloneClosingMarker($phpcsFile, $stackPtr);
-        }
-
-        $tokens = $phpcsFile->getTokens();
-        if ($this->supportsAbove('7.3') === true && $tokens[$stackPtr]['code'] !== \T_STRING) {
-            $this->detectClosingMarkerInBody($phpcsFile, $stackPtr);
-        }
-    }
-
-
-    /**
-     * Detect indented and/or non-stand alone closing markers.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of the current token in the
-     *                                         stack passed in $tokens.
-     *
-     * @return void
-     */
-    protected function detectIndentedNonStandAloneClosingMarker(File $phpcsFile, $stackPtr)
-    {
-        $tokens            = $phpcsFile->getTokens();
-        $indentError       = 'Heredoc/nowdoc with an indented closing marker is not supported in PHP 7.2 or earlier.';
-        $indentErrorCode   = 'IndentedClosingMarker';
-        $trailingError     = 'Having code - other than a semi-colon or new line - after the closing marker of a heredoc/nowdoc is not supported in PHP 7.2 or earlier.';
-        $trailingErrorCode = 'ClosingMarkerNoNewLine';
-
-        if (version_compare(\PHP_VERSION_ID, '70299', '>') === true) {
-
-            /*
+		if ($this->supportsBelow('7.2') === true && version_compare(PHPCSHelper::getVersion(), '2.6.0', '>=')) {
+			$this->detectIndentedNonStandAloneClosingMarker($phpcsFile, $stackPtr);
+		}
+
+		$tokens = $phpcsFile->getTokens();
+		if ($this->supportsAbove('7.3') === true && $tokens[$stackPtr]['code'] !== \T_STRING) {
+			$this->detectClosingMarkerInBody($phpcsFile, $stackPtr);
+		}
+	}
+
+
+	/**
+	 * Detect indented and/or non-stand alone closing markers.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of the current token in the
+	 *                                         stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	protected function detectIndentedNonStandAloneClosingMarker(File $phpcsFile, $stackPtr)
+	{
+		$tokens            = $phpcsFile->getTokens();
+		$indentError       = 'Heredoc/nowdoc with an indented closing marker is not supported in PHP 7.2 or earlier.';
+		$indentErrorCode   = 'IndentedClosingMarker';
+		$trailingError     = 'Having code - other than a semi-colon or new line - after the closing marker of a heredoc/nowdoc is not supported in PHP 7.2 or earlier.';
+		$trailingErrorCode = 'ClosingMarkerNoNewLine';
+
+		if (version_compare(\PHP_VERSION_ID, '70299', '>') === true) {
+
+			/*
              * Check for indented closing marker.
              */
-            if (ltrim($tokens[$stackPtr]['content']) !== $tokens[$stackPtr]['content']) {
-                $phpcsFile->addError($indentError, $stackPtr, $indentErrorCode);
-            }
+			if (ltrim($tokens[$stackPtr]['content']) !== $tokens[$stackPtr]['content']) {
+				$phpcsFile->addError($indentError, $stackPtr, $indentErrorCode);
+			}
 
-            /*
+			/*
              * Check for tokens after the closing marker.
              */
-            $nextNonWhitespace = $phpcsFile->findNext(array(\T_WHITESPACE, \T_SEMICOLON), ($stackPtr + 1), null, true);
-            if ($tokens[$stackPtr]['line'] === $tokens[$nextNonWhitespace]['line']) {
-                $phpcsFile->addError($trailingError, $stackPtr, $trailingErrorCode);
-            }
-        } else {
-            // For PHP < 7.3, we're only interested in T_STRING tokens.
-            if ($tokens[$stackPtr]['code'] !== \T_STRING) {
-                return;
-            }
+			$nextNonWhitespace = $phpcsFile->findNext(array(\T_WHITESPACE, \T_SEMICOLON), ($stackPtr + 1), null, true);
+			if ($tokens[$stackPtr]['line'] === $tokens[$nextNonWhitespace]['line']) {
+				$phpcsFile->addError($trailingError, $stackPtr, $trailingErrorCode);
+			}
+		} else {
+			// For PHP < 7.3, we're only interested in T_STRING tokens.
+			if ($tokens[$stackPtr]['code'] !== \T_STRING) {
+				return;
+			}
 
-            if (preg_match('`^<<<([\'"]?)([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)\1[\r\n]+`', $tokens[$stackPtr]['content'], $matches) !== 1) {
-                // Not the start of a PHP 7.3 flexible heredoc/nowdoc.
-                return;
-            }
+			if (preg_match('`^<<<([\'"]?)([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)\1[\r\n]+`', $tokens[$stackPtr]['content'], $matches) !== 1) {
+				// Not the start of a PHP 7.3 flexible heredoc/nowdoc.
+				return;
+			}
 
-            $identifier = $matches[2];
+			$identifier = $matches[2];
 
-            for ($i = ($stackPtr + 1); $i <= $phpcsFile->numTokens; $i++) {
-                if ($tokens[$i]['code'] !== \T_ENCAPSED_AND_WHITESPACE) {
-                    continue;
-                }
+			for ($i = ($stackPtr + 1); $i <= $phpcsFile->numTokens; $i++) {
+				if ($tokens[$i]['code'] !== \T_ENCAPSED_AND_WHITESPACE) {
+					continue;
+				}
 
-                $trimmed = ltrim($tokens[$i]['content']);
+				$trimmed = ltrim($tokens[$i]['content']);
 
-                if (strpos($trimmed, $identifier) !== 0) {
-                    continue;
-                }
+				if (strpos($trimmed, $identifier) !== 0) {
+					continue;
+				}
 
-                // OK, we've found the PHP 7.3 flexible heredoc/nowdoc closing marker.
+				// OK, we've found the PHP 7.3 flexible heredoc/nowdoc closing marker.
 
-                /*
+				/*
                  * Check for indented closing marker.
                  */
-                if ($trimmed !== $tokens[$i]['content']) {
-                    // Indent found before closing marker.
-                    $phpcsFile->addError($indentError, $i, $indentErrorCode);
-                }
+				if ($trimmed !== $tokens[$i]['content']) {
+					// Indent found before closing marker.
+					$phpcsFile->addError($indentError, $i, $indentErrorCode);
+				}
 
-                /*
+				/*
                  * Check for tokens after the closing marker.
                  */
-                // Remove the identifier.
-                $afterMarker = substr($trimmed, \strlen($identifier));
-                // Remove a potential semi-colon at the beginning of what's left of the string.
-                $afterMarker = ltrim($afterMarker, ';');
-                // Remove new line characters at the end of the string.
-                $afterMarker = rtrim($afterMarker, "\r\n");
-
-                if ($afterMarker !== '') {
-                    $phpcsFile->addError($trailingError, $i, $trailingErrorCode);
-                }
-
-                break;
-            }
-        }
-    }
-
-
-    /**
-     * Detect heredoc/nowdoc identifiers at the start of lines in the heredoc/nowdoc body.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of the current token in the
-     *                                         stack passed in $tokens.
-     *
-     * @return void
-     */
-    protected function detectClosingMarkerInBody(File $phpcsFile, $stackPtr)
-    {
-        $tokens    = $phpcsFile->getTokens();
-        $error     = 'The body of a heredoc/nowdoc can not contain the heredoc/nowdoc closing marker as text at the start of a line since PHP 7.3.';
-        $errorCode = 'ClosingMarkerNoNewLine';
-
-        if (version_compare(\PHP_VERSION_ID, '70299', '>') === true) {
-            $nextNonWhitespace = $phpcsFile->findNext(\T_WHITESPACE, ($stackPtr + 1), null, true, null, true);
-            if ($nextNonWhitespace === false
-                || $tokens[$nextNonWhitespace]['code'] === \T_SEMICOLON
-                || (($tokens[$nextNonWhitespace]['code'] === \T_COMMA
-                    || $tokens[$nextNonWhitespace]['code'] === \T_STRING_CONCAT)
-                    && $tokens[$nextNonWhitespace]['line'] !== $tokens[$stackPtr]['line'])
-            ) {
-                // This is most likely a correctly identified closing marker.
-                return;
-            }
-
-            // The real closing tag has to be before the next heredoc/nowdoc.
-            $nextHereNowDoc = $phpcsFile->findNext(array(\T_START_HEREDOC, \T_START_NOWDOC), ($stackPtr + 1));
-            if ($nextHereNowDoc === false) {
-                $nextHereNowDoc = null;
-            }
-
-            $identifier        = trim($tokens[$stackPtr]['content']);
-            $realClosingMarker = $stackPtr;
-
-            while (($realClosingMarker = $phpcsFile->findNext(\T_STRING, ($realClosingMarker + 1), $nextHereNowDoc, false, $identifier)) !== false) {
-
-                $prevNonWhitespace = $phpcsFile->findPrevious(\T_WHITESPACE, ($realClosingMarker - 1), null, true);
-                if ($prevNonWhitespace === false
-                    || $tokens[$prevNonWhitespace]['line'] === $tokens[$realClosingMarker]['line']
-                ) {
-                    // Marker text found, but not at the start of the line.
-                    continue;
-                }
-
-                // The original T_END_HEREDOC/T_END_NOWDOC was most likely incorrect as we've found
-                // a possible alternative closing marker.
-                $phpcsFile->addError($error, $stackPtr, $errorCode);
-
-                break;
-            }
-
-        } else {
-            if (isset($tokens[$stackPtr]['scope_closer'], $tokens[$stackPtr]['scope_opener']) === true
-                && $tokens[$stackPtr]['scope_closer'] === $stackPtr
-            ) {
-                $opener = $tokens[$stackPtr]['scope_opener'];
-            } else {
-                // PHPCS < 3.0.2 did not add scope_* values for Nowdocs.
-                $opener = $phpcsFile->findPrevious(\T_START_NOWDOC, ($stackPtr - 1));
-                if ($opener === false) {
-                    return;
-                }
-            }
-
-            $quotedIdentifier = preg_quote($tokens[$stackPtr]['content'], '`');
-
-            // Throw an error for each line in the body which starts with the identifier.
-            for ($i = ($opener + 1); $i < $stackPtr; $i++) {
-                if (preg_match('`^[ \t]*' . $quotedIdentifier . '\b`', $tokens[$i]['content']) === 1) {
-                    $phpcsFile->addError($error, $i, $errorCode);
-                }
-            }
-        }
-    }
+				// Remove the identifier.
+				$afterMarker = substr($trimmed, \strlen($identifier));
+				// Remove a potential semi-colon at the beginning of what's left of the string.
+				$afterMarker = ltrim($afterMarker, ';');
+				// Remove new line characters at the end of the string.
+				$afterMarker = rtrim($afterMarker, "\r\n");
+
+				if ($afterMarker !== '') {
+					$phpcsFile->addError($trailingError, $i, $trailingErrorCode);
+				}
+
+				break;
+			}
+		}
+	}
+
+
+	/**
+	 * Detect heredoc/nowdoc identifiers at the start of lines in the heredoc/nowdoc body.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of the current token in the
+	 *                                         stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	protected function detectClosingMarkerInBody(File $phpcsFile, $stackPtr)
+	{
+		$tokens    = $phpcsFile->getTokens();
+		$error     = 'The body of a heredoc/nowdoc can not contain the heredoc/nowdoc closing marker as text at the start of a line since PHP 7.3.';
+		$errorCode = 'ClosingMarkerNoNewLine';
+
+		if (version_compare(\PHP_VERSION_ID, '70299', '>') === true) {
+			$nextNonWhitespace = $phpcsFile->findNext(\T_WHITESPACE, ($stackPtr + 1), null, true, null, true);
+			if ($nextNonWhitespace === false
+				|| $tokens[$nextNonWhitespace]['code'] === \T_SEMICOLON
+				|| (($tokens[$nextNonWhitespace]['code'] === \T_COMMA
+					|| $tokens[$nextNonWhitespace]['code'] === \T_STRING_CONCAT)
+					&& $tokens[$nextNonWhitespace]['line'] !== $tokens[$stackPtr]['line'])
+			) {
+				// This is most likely a correctly identified closing marker.
+				return;
+			}
+
+			// The real closing tag has to be before the next heredoc/nowdoc.
+			$nextHereNowDoc = $phpcsFile->findNext(array(\T_START_HEREDOC, \T_START_NOWDOC), ($stackPtr + 1));
+			if ($nextHereNowDoc === false) {
+				$nextHereNowDoc = null;
+			}
+
+			$identifier        = trim($tokens[$stackPtr]['content']);
+			$realClosingMarker = $stackPtr;
+
+			while (($realClosingMarker = $phpcsFile->findNext(\T_STRING, ($realClosingMarker + 1), $nextHereNowDoc, false, $identifier)) !== false) {
+
+				$prevNonWhitespace = $phpcsFile->findPrevious(\T_WHITESPACE, ($realClosingMarker - 1), null, true);
+				if ($prevNonWhitespace === false
+					|| $tokens[$prevNonWhitespace]['line'] === $tokens[$realClosingMarker]['line']
+				) {
+					// Marker text found, but not at the start of the line.
+					continue;
+				}
+
+				// The original T_END_HEREDOC/T_END_NOWDOC was most likely incorrect as we've found
+				// a possible alternative closing marker.
+				$phpcsFile->addError($error, $stackPtr, $errorCode);
+
+				break;
+			}
+
+		} else {
+			if (isset($tokens[$stackPtr]['scope_closer'], $tokens[$stackPtr]['scope_opener']) === true
+				&& $tokens[$stackPtr]['scope_closer'] === $stackPtr
+			) {
+				$opener = $tokens[$stackPtr]['scope_opener'];
+			} else {
+				// PHPCS < 3.0.2 did not add scope_* values for Nowdocs.
+				$opener = $phpcsFile->findPrevious(\T_START_NOWDOC, ($stackPtr - 1));
+				if ($opener === false) {
+					return;
+				}
+			}
+
+			$quotedIdentifier = preg_quote($tokens[$stackPtr]['content'], '`');
+
+			// Throw an error for each line in the body which starts with the identifier.
+			for ($i = ($opener + 1); $i < $stackPtr; $i++) {
+				if (preg_match('`^[ \t]*' . $quotedIdentifier . '\b`', $tokens[$i]['content']) === 1) {
+					$phpcsFile->addError($error, $i, $errorCode);
+				}
+			}
+		}
+	}
 }

Spacing +53 added lines, -53 removed lines

@@ -45,9 +45,9 @@ 
             \T_END_NOWDOC,
         );
 
-        if (version_compare(\PHP_VERSION_ID, '70299', '>') === false) {
+        if ( version_compare( \PHP_VERSION_ID, '70299', '>' ) === false ) {
             // Start identifier of a PHP 7.3 flexible heredoc/nowdoc.
-            $targets[] = \T_STRING;
+            $targets[ ] = \T_STRING;
         }
 
         return $targets;
@@ -63,20 +63,20 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
         /*
          * Due to a tokenizer bug which gets hit when the PHP 7.3 heredoc/nowdoc syntax
          * is used, this part of the sniff cannot possibly work on PHPCS < 2.6.0.
          * See upstream issue #928.
          */
-        if ($this->supportsBelow('7.2') === true && version_compare(PHPCSHelper::getVersion(), '2.6.0', '>=')) {
-            $this->detectIndentedNonStandAloneClosingMarker($phpcsFile, $stackPtr);
+        if ( $this->supportsBelow( '7.2' ) === true && version_compare( PHPCSHelper::getVersion(), '2.6.0', '>=' ) ) {
+            $this->detectIndentedNonStandAloneClosingMarker( $phpcsFile, $stackPtr );
         }
 
         $tokens = $phpcsFile->getTokens();
-        if ($this->supportsAbove('7.3') === true && $tokens[$stackPtr]['code'] !== \T_STRING) {
-            $this->detectClosingMarkerInBody($phpcsFile, $stackPtr);
+        if ( $this->supportsAbove( '7.3' ) === true && $tokens[ $stackPtr ][ 'code' ] !== \T_STRING ) {
+            $this->detectClosingMarkerInBody( $phpcsFile, $stackPtr );
         }
     }
 
@@ -90,7 +90,7 @@ 
      *
      * @return void
      */
-    protected function detectIndentedNonStandAloneClosingMarker(File $phpcsFile, $stackPtr)
+    protected function detectIndentedNonStandAloneClosingMarker( File $phpcsFile, $stackPtr )
     {
         $tokens            = $phpcsFile->getTokens();
         $indentError       = 'Heredoc/nowdoc with an indented closing marker is not supported in PHP 7.2 or earlier.';
@@ -98,43 +98,43 @@ 
         $trailingError     = 'Having code - other than a semi-colon or new line - after the closing marker of a heredoc/nowdoc is not supported in PHP 7.2 or earlier.';
         $trailingErrorCode = 'ClosingMarkerNoNewLine';
 
-        if (version_compare(\PHP_VERSION_ID, '70299', '>') === true) {
+        if ( version_compare( \PHP_VERSION_ID, '70299', '>' ) === true ) {
 
             /*
              * Check for indented closing marker.
              */
-            if (ltrim($tokens[$stackPtr]['content']) !== $tokens[$stackPtr]['content']) {
-                $phpcsFile->addError($indentError, $stackPtr, $indentErrorCode);
+            if ( ltrim( $tokens[ $stackPtr ][ 'content' ] ) !== $tokens[ $stackPtr ][ 'content' ] ) {
+                $phpcsFile->addError( $indentError, $stackPtr, $indentErrorCode );
             }
 
             /*
              * Check for tokens after the closing marker.
              */
-            $nextNonWhitespace = $phpcsFile->findNext(array(\T_WHITESPACE, \T_SEMICOLON), ($stackPtr + 1), null, true);
-            if ($tokens[$stackPtr]['line'] === $tokens[$nextNonWhitespace]['line']) {
-                $phpcsFile->addError($trailingError, $stackPtr, $trailingErrorCode);
+            $nextNonWhitespace = $phpcsFile->findNext( array( \T_WHITESPACE, \T_SEMICOLON ), ( $stackPtr + 1 ), null, true );
+            if ( $tokens[ $stackPtr ][ 'line' ] === $tokens[ $nextNonWhitespace ][ 'line' ] ) {
+                $phpcsFile->addError( $trailingError, $stackPtr, $trailingErrorCode );
             }
         } else {
             // For PHP < 7.3, we're only interested in T_STRING tokens.
-            if ($tokens[$stackPtr]['code'] !== \T_STRING) {
+            if ( $tokens[ $stackPtr ][ 'code' ] !== \T_STRING ) {
                 return;
             }
 
-            if (preg_match('`^<<<([\'"]?)([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)\1[\r\n]+`', $tokens[$stackPtr]['content'], $matches) !== 1) {
+            if ( preg_match( '`^<<<([\'"]?)([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)\1[\r\n]+`', $tokens[ $stackPtr ][ 'content' ], $matches ) !== 1 ) {
                 // Not the start of a PHP 7.3 flexible heredoc/nowdoc.
                 return;
             }
 
-            $identifier = $matches[2];
+            $identifier = $matches[ 2 ];
 
-            for ($i = ($stackPtr + 1); $i <= $phpcsFile->numTokens; $i++) {
-                if ($tokens[$i]['code'] !== \T_ENCAPSED_AND_WHITESPACE) {
+            for ( $i = ( $stackPtr + 1 ); $i <= $phpcsFile->numTokens; $i++ ) {
+                if ( $tokens[ $i ][ 'code' ] !== \T_ENCAPSED_AND_WHITESPACE ) {
                     continue;
                 }
 
-                $trimmed = ltrim($tokens[$i]['content']);
+                $trimmed = ltrim( $tokens[ $i ][ 'content' ] );
 
-                if (strpos($trimmed, $identifier) !== 0) {
+                if ( strpos( $trimmed, $identifier ) !== 0 ) {
                     continue;
                 }
 
@@ -143,23 +143,23 @@ 
                 /*
                  * Check for indented closing marker.
                  */
-                if ($trimmed !== $tokens[$i]['content']) {
+                if ( $trimmed !== $tokens[ $i ][ 'content' ] ) {
                     // Indent found before closing marker.
-                    $phpcsFile->addError($indentError, $i, $indentErrorCode);
+                    $phpcsFile->addError( $indentError, $i, $indentErrorCode );
                 }
 
                 /*
                  * Check for tokens after the closing marker.
                  */
                 // Remove the identifier.
-                $afterMarker = substr($trimmed, \strlen($identifier));
+                $afterMarker = substr( $trimmed, \strlen( $identifier ) );
                 // Remove a potential semi-colon at the beginning of what's left of the string.
-                $afterMarker = ltrim($afterMarker, ';');
+                $afterMarker = ltrim( $afterMarker, ';' );
                 // Remove new line characters at the end of the string.
-                $afterMarker = rtrim($afterMarker, "\r\n");
+                $afterMarker = rtrim( $afterMarker, "\r\n" );
 
-                if ($afterMarker !== '') {
-                    $phpcsFile->addError($trailingError, $i, $trailingErrorCode);
+                if ( $afterMarker !== '' ) {
+                    $phpcsFile->addError( $trailingError, $i, $trailingErrorCode );
                 }
 
                 break;
@@ -177,38 +177,38 @@ 
      *
      * @return void
      */
-    protected function detectClosingMarkerInBody(File $phpcsFile, $stackPtr)
+    protected function detectClosingMarkerInBody( File $phpcsFile, $stackPtr )
     {
         $tokens    = $phpcsFile->getTokens();
         $error     = 'The body of a heredoc/nowdoc can not contain the heredoc/nowdoc closing marker as text at the start of a line since PHP 7.3.';
         $errorCode = 'ClosingMarkerNoNewLine';
 
-        if (version_compare(\PHP_VERSION_ID, '70299', '>') === true) {
-            $nextNonWhitespace = $phpcsFile->findNext(\T_WHITESPACE, ($stackPtr + 1), null, true, null, true);
-            if ($nextNonWhitespace === false
-                || $tokens[$nextNonWhitespace]['code'] === \T_SEMICOLON
-                || (($tokens[$nextNonWhitespace]['code'] === \T_COMMA
-                    || $tokens[$nextNonWhitespace]['code'] === \T_STRING_CONCAT)
-                    && $tokens[$nextNonWhitespace]['line'] !== $tokens[$stackPtr]['line'])
+        if ( version_compare( \PHP_VERSION_ID, '70299', '>' ) === true ) {
+            $nextNonWhitespace = $phpcsFile->findNext( \T_WHITESPACE, ( $stackPtr + 1 ), null, true, null, true );
+            if ( $nextNonWhitespace === false
+                || $tokens[ $nextNonWhitespace ][ 'code' ] === \T_SEMICOLON
+                || ( ( $tokens[ $nextNonWhitespace ][ 'code' ] === \T_COMMA
+                    || $tokens[ $nextNonWhitespace ][ 'code' ] === \T_STRING_CONCAT )
+                    && $tokens[ $nextNonWhitespace ][ 'line' ] !== $tokens[ $stackPtr ][ 'line' ] )
             ) {
                 // This is most likely a correctly identified closing marker.
                 return;
             }
 
             // The real closing tag has to be before the next heredoc/nowdoc.
-            $nextHereNowDoc = $phpcsFile->findNext(array(\T_START_HEREDOC, \T_START_NOWDOC), ($stackPtr + 1));
-            if ($nextHereNowDoc === false) {
+            $nextHereNowDoc = $phpcsFile->findNext( array( \T_START_HEREDOC, \T_START_NOWDOC ), ( $stackPtr + 1 ) );
+            if ( $nextHereNowDoc === false ) {
                 $nextHereNowDoc = null;
             }
 
-            $identifier        = trim($tokens[$stackPtr]['content']);
+            $identifier        = trim( $tokens[ $stackPtr ][ 'content' ] );
             $realClosingMarker = $stackPtr;
 
-            while (($realClosingMarker = $phpcsFile->findNext(\T_STRING, ($realClosingMarker + 1), $nextHereNowDoc, false, $identifier)) !== false) {
+            while ( ( $realClosingMarker = $phpcsFile->findNext( \T_STRING, ( $realClosingMarker + 1 ), $nextHereNowDoc, false, $identifier ) ) !== false ) {
 
-                $prevNonWhitespace = $phpcsFile->findPrevious(\T_WHITESPACE, ($realClosingMarker - 1), null, true);
-                if ($prevNonWhitespace === false
-                    || $tokens[$prevNonWhitespace]['line'] === $tokens[$realClosingMarker]['line']
+                $prevNonWhitespace = $phpcsFile->findPrevious( \T_WHITESPACE, ( $realClosingMarker - 1 ), null, true );
+                if ( $prevNonWhitespace === false
+                    || $tokens[ $prevNonWhitespace ][ 'line' ] === $tokens[ $realClosingMarker ][ 'line' ]
                 ) {
                     // Marker text found, but not at the start of the line.
                     continue;
@@ -216,30 +216,30 @@ 
 
                 // The original T_END_HEREDOC/T_END_NOWDOC was most likely incorrect as we've found
                 // a possible alternative closing marker.
-                $phpcsFile->addError($error, $stackPtr, $errorCode);
+                $phpcsFile->addError( $error, $stackPtr, $errorCode );
 
                 break;
             }
 
         } else {
-            if (isset($tokens[$stackPtr]['scope_closer'], $tokens[$stackPtr]['scope_opener']) === true
-                && $tokens[$stackPtr]['scope_closer'] === $stackPtr
+            if ( isset( $tokens[ $stackPtr ][ 'scope_closer' ], $tokens[ $stackPtr ][ 'scope_opener' ] ) === true
+                && $tokens[ $stackPtr ][ 'scope_closer' ] === $stackPtr
             ) {
-                $opener = $tokens[$stackPtr]['scope_opener'];
+                $opener = $tokens[ $stackPtr ][ 'scope_opener' ];
             } else {
                 // PHPCS < 3.0.2 did not add scope_* values for Nowdocs.
-                $opener = $phpcsFile->findPrevious(\T_START_NOWDOC, ($stackPtr - 1));
-                if ($opener === false) {
+                $opener = $phpcsFile->findPrevious( \T_START_NOWDOC, ( $stackPtr - 1 ) );
+                if ( $opener === false ) {
                     return;
                 }
             }
 
-            $quotedIdentifier = preg_quote($tokens[$stackPtr]['content'], '`');
+            $quotedIdentifier = preg_quote( $tokens[ $stackPtr ][ 'content' ], '`' );
 
             // Throw an error for each line in the body which starts with the identifier.
-            for ($i = ($opener + 1); $i < $stackPtr; $i++) {
-                if (preg_match('`^[ \t]*' . $quotedIdentifier . '\b`', $tokens[$i]['content']) === 1) {
-                    $phpcsFile->addError($error, $i, $errorCode);
+            for ( $i = ( $opener + 1 ); $i < $stackPtr; $i++ ) {
+                if ( preg_match( '`^[ \t]*' . $quotedIdentifier . '\b`', $tokens[ $i ][ 'content' ] ) === 1 ) {
+                    $phpcsFile->addError( $error, $i, $errorCode );
                 }
             }
         }

Braces +5 added lines, -10 removed lines

@@ -30,16 +30,14 @@ 
  * @package  PHPCompatibility
  * @author   Juliette Reinders Folmer <phpcompatibility_nospam@adviesenzo.nl>
  */
-class NewFlexibleHeredocNowdocSniff extends Sniff
-{
+class NewFlexibleHeredocNowdocSniff extends Sniff {
 
     /**
      * Returns an array of tokens this test wants to listen for.
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         $targets = array(
             \T_END_HEREDOC,
             \T_END_NOWDOC,
@@ -63,8 +61,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         /*
          * Due to a tokenizer bug which gets hit when the PHP 7.3 heredoc/nowdoc syntax
          * is used, this part of the sniff cannot possibly work on PHPCS < 2.6.0.
@@ -90,8 +87,7 @@ 
      *
      * @return void
      */
-    protected function detectIndentedNonStandAloneClosingMarker(File $phpcsFile, $stackPtr)
-    {
+    protected function detectIndentedNonStandAloneClosingMarker(File $phpcsFile, $stackPtr) {
         $tokens            = $phpcsFile->getTokens();
         $indentError       = 'Heredoc/nowdoc with an indented closing marker is not supported in PHP 7.2 or earlier.';
         $indentErrorCode   = 'IndentedClosingMarker';
@@ -177,8 +173,7 @@ 
      *
      * @return void
      */
-    protected function detectClosingMarkerInBody(File $phpcsFile, $stackPtr)
-    {
+    protected function detectClosingMarkerInBody(File $phpcsFile, $stackPtr) {
         $tokens    = $phpcsFile->getTokens();
         $error     = 'The body of a heredoc/nowdoc can not contain the heredoc/nowdoc closing marker as text at the start of a line since PHP 7.3.';
         $errorCode = 'ClosingMarkerNoNewLine';

vendor/phpcompatibility/php-compatibility/PHPCompatibility/Sniffs/Syntax/ForbiddenCallTimePassByReferenceSniff.php

Indentation +217 added lines, -217 removed lines

@@ -33,221 +33,221 @@
 class ForbiddenCallTimePassByReferenceSniff extends Sniff
 {
 
-    /**
-     * Tokens that represent assignments or equality comparisons.
-     *
-     * Near duplicate of Tokens::$assignmentTokens + Tokens::$equalityTokens.
-     * Copied in for PHPCS cross-version compatibility.
-     *
-     * @var array
-     */
-    private $assignOrCompare = array(
-        // Equality tokens.
-        'T_IS_EQUAL'            => true,
-        'T_IS_NOT_EQUAL'        => true,
-        'T_IS_IDENTICAL'        => true,
-        'T_IS_NOT_IDENTICAL'    => true,
-        'T_IS_SMALLER_OR_EQUAL' => true,
-        'T_IS_GREATER_OR_EQUAL' => true,
-
-        // Assignment tokens.
-        'T_EQUAL'          => true,
-        'T_AND_EQUAL'      => true,
-        'T_OR_EQUAL'       => true,
-        'T_CONCAT_EQUAL'   => true,
-        'T_DIV_EQUAL'      => true,
-        'T_MINUS_EQUAL'    => true,
-        'T_POW_EQUAL'      => true,
-        'T_MOD_EQUAL'      => true,
-        'T_MUL_EQUAL'      => true,
-        'T_PLUS_EQUAL'     => true,
-        'T_XOR_EQUAL'      => true,
-        'T_DOUBLE_ARROW'   => true,
-        'T_SL_EQUAL'       => true,
-        'T_SR_EQUAL'       => true,
-        'T_COALESCE_EQUAL' => true,
-        'T_ZSR_EQUAL'      => true,
-    );
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-            \T_STRING,
-            \T_VARIABLE,
-        );
-    }
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                   $stackPtr  The position of the current token
-     *                                         in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(File $phpcsFile, $stackPtr)
-    {
-        if ($this->supportsAbove('5.3') === false) {
-            return;
-        }
-
-        $tokens = $phpcsFile->getTokens();
-
-        // Skip tokens that are the names of functions or classes
-        // within their definitions. For example: function myFunction...
-        // "myFunction" is T_STRING but we should skip because it is not a
-        // function or method *call*.
-        $findTokens   = Tokens::$emptyTokens;
-        $findTokens[] = \T_BITWISE_AND;
-
-        $prevNonEmpty = $phpcsFile->findPrevious(
-            $findTokens,
-            ($stackPtr - 1),
-            null,
-            true
-        );
-
-        if ($prevNonEmpty !== false && \in_array($tokens[$prevNonEmpty]['type'], array('T_FUNCTION', 'T_CLASS', 'T_INTERFACE', 'T_TRAIT'), true)) {
-            return;
-        }
-
-        // If the next non-whitespace token after the function or method call
-        // is not an opening parenthesis then it can't really be a *call*.
-        $openBracket = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
-
-        if ($openBracket === false || $tokens[$openBracket]['code'] !== \T_OPEN_PARENTHESIS
-            || isset($tokens[$openBracket]['parenthesis_closer']) === false
-        ) {
-            return;
-        }
-
-        // Get the function call parameters.
-        $parameters = $this->getFunctionCallParameters($phpcsFile, $stackPtr);
-        if (\count($parameters) === 0) {
-            return;
-        }
-
-        // Which nesting level is the one we are interested in ?
-        $nestedParenthesisCount = 1;
-        if (isset($tokens[$openBracket]['nested_parenthesis'])) {
-            $nestedParenthesisCount = \count($tokens[$openBracket]['nested_parenthesis']) + 1;
-        }
-
-        foreach ($parameters as $parameter) {
-            if ($this->isCallTimePassByReferenceParam($phpcsFile, $parameter, $nestedParenthesisCount) === true) {
-                // T_BITWISE_AND represents a pass-by-reference.
-                $error     = 'Using a call-time pass-by-reference is deprecated since PHP 5.3';
-                $isError   = false;
-                $errorCode = 'Deprecated';
-
-                if ($this->supportsAbove('5.4')) {
-                    $error    .= ' and prohibited since PHP 5.4';
-                    $isError   = true;
-                    $errorCode = 'NotAllowed';
-                }
-
-                $this->addMessage($phpcsFile, $error, $parameter['start'], $isError, $errorCode);
-            }
-        }
-    }
-
-
-    /**
-     * Determine whether a parameter is passed by reference.
-     *
-     * @param \PHP_CodeSniffer_File $phpcsFile    The file being scanned.
-     * @param array                 $parameter    Information on the current parameter
-     *                                            to be examined.
-     * @param int                   $nestingLevel Target nesting level.
-     *
-     * @return bool
-     */
-    protected function isCallTimePassByReferenceParam(File $phpcsFile, $parameter, $nestingLevel)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        $searchStartToken = $parameter['start'] - 1;
-        $searchEndToken   = $parameter['end'] + 1;
-        $nextVariable     = $searchStartToken;
-        do {
-            $nextVariable = $phpcsFile->findNext(array(\T_VARIABLE, \T_OPEN_SHORT_ARRAY, \T_CLOSURE), ($nextVariable + 1), $searchEndToken);
-            if ($nextVariable === false) {
-                return false;
-            }
-
-            // Ignore anything within short array definition brackets.
-            if ($tokens[$nextVariable]['type'] === 'T_OPEN_SHORT_ARRAY'
-                && (isset($tokens[$nextVariable]['bracket_opener'])
-                    && $tokens[$nextVariable]['bracket_opener'] === $nextVariable)
-                && isset($tokens[$nextVariable]['bracket_closer'])
-            ) {
-                // Skip forward to the end of the short array definition.
-                $nextVariable = $tokens[$nextVariable]['bracket_closer'];
-                continue;
-            }
-
-            // Skip past closures passed as function parameters.
-            if ($tokens[$nextVariable]['type'] === 'T_CLOSURE'
-                && (isset($tokens[$nextVariable]['scope_condition'])
-                    && $tokens[$nextVariable]['scope_condition'] === $nextVariable)
-                && isset($tokens[$nextVariable]['scope_closer'])
-            ) {
-                // Skip forward to the end of the closure declaration.
-                $nextVariable = $tokens[$nextVariable]['scope_closer'];
-                continue;
-            }
-
-            // Make sure the variable belongs directly to this function call
-            // and is not inside a nested function call or array.
-            if (isset($tokens[$nextVariable]['nested_parenthesis']) === false
-                || (\count($tokens[$nextVariable]['nested_parenthesis']) !== $nestingLevel)
-            ) {
-                continue;
-            }
-
-            // Checking this: $value = my_function(...[*]$arg...).
-            $tokenBefore = $phpcsFile->findPrevious(
-                Tokens::$emptyTokens,
-                ($nextVariable - 1),
-                $searchStartToken,
-                true
-            );
-
-            if ($tokenBefore === false || $tokens[$tokenBefore]['code'] !== \T_BITWISE_AND) {
-                // Nothing before the token or no &.
-                continue;
-            }
-
-            if ($phpcsFile->isReference($tokenBefore) === false) {
-                continue;
-            }
-
-            // Checking this: $value = my_function(...[*]&$arg...).
-            $tokenBefore = $phpcsFile->findPrevious(
-                Tokens::$emptyTokens,
-                ($tokenBefore - 1),
-                $searchStartToken,
-                true
-            );
-
-            // Prevent false positive on assign by reference and compare with reference
-            // within function call parameters.
-            if (isset($this->assignOrCompare[$tokens[$tokenBefore]['type']])) {
-                continue;
-            }
-
-            // The found T_BITWISE_AND represents a pass-by-reference.
-            return true;
-
-        } while ($nextVariable < $searchEndToken);
-
-        // This code should never be reached, but here in case of weird bugs.
-        return false;
-    }
+	/**
+	 * Tokens that represent assignments or equality comparisons.
+	 *
+	 * Near duplicate of Tokens::$assignmentTokens + Tokens::$equalityTokens.
+	 * Copied in for PHPCS cross-version compatibility.
+	 *
+	 * @var array
+	 */
+	private $assignOrCompare = array(
+		// Equality tokens.
+		'T_IS_EQUAL'            => true,
+		'T_IS_NOT_EQUAL'        => true,
+		'T_IS_IDENTICAL'        => true,
+		'T_IS_NOT_IDENTICAL'    => true,
+		'T_IS_SMALLER_OR_EQUAL' => true,
+		'T_IS_GREATER_OR_EQUAL' => true,
+
+		// Assignment tokens.
+		'T_EQUAL'          => true,
+		'T_AND_EQUAL'      => true,
+		'T_OR_EQUAL'       => true,
+		'T_CONCAT_EQUAL'   => true,
+		'T_DIV_EQUAL'      => true,
+		'T_MINUS_EQUAL'    => true,
+		'T_POW_EQUAL'      => true,
+		'T_MOD_EQUAL'      => true,
+		'T_MUL_EQUAL'      => true,
+		'T_PLUS_EQUAL'     => true,
+		'T_XOR_EQUAL'      => true,
+		'T_DOUBLE_ARROW'   => true,
+		'T_SL_EQUAL'       => true,
+		'T_SR_EQUAL'       => true,
+		'T_COALESCE_EQUAL' => true,
+		'T_ZSR_EQUAL'      => true,
+	);
+
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return array(
+			\T_STRING,
+			\T_VARIABLE,
+		);
+	}
+
+	/**
+	 * Processes this test, when one of its tokens is encountered.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile The file being scanned.
+	 * @param int                   $stackPtr  The position of the current token
+	 *                                         in the stack passed in $tokens.
+	 *
+	 * @return void
+	 */
+	public function process(File $phpcsFile, $stackPtr)
+	{
+		if ($this->supportsAbove('5.3') === false) {
+			return;
+		}
+
+		$tokens = $phpcsFile->getTokens();
+
+		// Skip tokens that are the names of functions or classes
+		// within their definitions. For example: function myFunction...
+		// "myFunction" is T_STRING but we should skip because it is not a
+		// function or method *call*.
+		$findTokens   = Tokens::$emptyTokens;
+		$findTokens[] = \T_BITWISE_AND;
+
+		$prevNonEmpty = $phpcsFile->findPrevious(
+			$findTokens,
+			($stackPtr - 1),
+			null,
+			true
+		);
+
+		if ($prevNonEmpty !== false && \in_array($tokens[$prevNonEmpty]['type'], array('T_FUNCTION', 'T_CLASS', 'T_INTERFACE', 'T_TRAIT'), true)) {
+			return;
+		}
+
+		// If the next non-whitespace token after the function or method call
+		// is not an opening parenthesis then it can't really be a *call*.
+		$openBracket = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
+
+		if ($openBracket === false || $tokens[$openBracket]['code'] !== \T_OPEN_PARENTHESIS
+			|| isset($tokens[$openBracket]['parenthesis_closer']) === false
+		) {
+			return;
+		}
+
+		// Get the function call parameters.
+		$parameters = $this->getFunctionCallParameters($phpcsFile, $stackPtr);
+		if (\count($parameters) === 0) {
+			return;
+		}
+
+		// Which nesting level is the one we are interested in ?
+		$nestedParenthesisCount = 1;
+		if (isset($tokens[$openBracket]['nested_parenthesis'])) {
+			$nestedParenthesisCount = \count($tokens[$openBracket]['nested_parenthesis']) + 1;
+		}
+
+		foreach ($parameters as $parameter) {
+			if ($this->isCallTimePassByReferenceParam($phpcsFile, $parameter, $nestedParenthesisCount) === true) {
+				// T_BITWISE_AND represents a pass-by-reference.
+				$error     = 'Using a call-time pass-by-reference is deprecated since PHP 5.3';
+				$isError   = false;
+				$errorCode = 'Deprecated';
+
+				if ($this->supportsAbove('5.4')) {
+					$error    .= ' and prohibited since PHP 5.4';
+					$isError   = true;
+					$errorCode = 'NotAllowed';
+				}
+
+				$this->addMessage($phpcsFile, $error, $parameter['start'], $isError, $errorCode);
+			}
+		}
+	}
+
+
+	/**
+	 * Determine whether a parameter is passed by reference.
+	 *
+	 * @param \PHP_CodeSniffer_File $phpcsFile    The file being scanned.
+	 * @param array                 $parameter    Information on the current parameter
+	 *                                            to be examined.
+	 * @param int                   $nestingLevel Target nesting level.
+	 *
+	 * @return bool
+	 */
+	protected function isCallTimePassByReferenceParam(File $phpcsFile, $parameter, $nestingLevel)
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		$searchStartToken = $parameter['start'] - 1;
+		$searchEndToken   = $parameter['end'] + 1;
+		$nextVariable     = $searchStartToken;
+		do {
+			$nextVariable = $phpcsFile->findNext(array(\T_VARIABLE, \T_OPEN_SHORT_ARRAY, \T_CLOSURE), ($nextVariable + 1), $searchEndToken);
+			if ($nextVariable === false) {
+				return false;
+			}
+
+			// Ignore anything within short array definition brackets.
+			if ($tokens[$nextVariable]['type'] === 'T_OPEN_SHORT_ARRAY'
+				&& (isset($tokens[$nextVariable]['bracket_opener'])
+					&& $tokens[$nextVariable]['bracket_opener'] === $nextVariable)
+				&& isset($tokens[$nextVariable]['bracket_closer'])
+			) {
+				// Skip forward to the end of the short array definition.
+				$nextVariable = $tokens[$nextVariable]['bracket_closer'];
+				continue;
+			}
+
+			// Skip past closures passed as function parameters.
+			if ($tokens[$nextVariable]['type'] === 'T_CLOSURE'
+				&& (isset($tokens[$nextVariable]['scope_condition'])
+					&& $tokens[$nextVariable]['scope_condition'] === $nextVariable)
+				&& isset($tokens[$nextVariable]['scope_closer'])
+			) {
+				// Skip forward to the end of the closure declaration.
+				$nextVariable = $tokens[$nextVariable]['scope_closer'];
+				continue;
+			}
+
+			// Make sure the variable belongs directly to this function call
+			// and is not inside a nested function call or array.
+			if (isset($tokens[$nextVariable]['nested_parenthesis']) === false
+				|| (\count($tokens[$nextVariable]['nested_parenthesis']) !== $nestingLevel)
+			) {
+				continue;
+			}
+
+			// Checking this: $value = my_function(...[*]$arg...).
+			$tokenBefore = $phpcsFile->findPrevious(
+				Tokens::$emptyTokens,
+				($nextVariable - 1),
+				$searchStartToken,
+				true
+			);
+
+			if ($tokenBefore === false || $tokens[$tokenBefore]['code'] !== \T_BITWISE_AND) {
+				// Nothing before the token or no &.
+				continue;
+			}
+
+			if ($phpcsFile->isReference($tokenBefore) === false) {
+				continue;
+			}
+
+			// Checking this: $value = my_function(...[*]&$arg...).
+			$tokenBefore = $phpcsFile->findPrevious(
+				Tokens::$emptyTokens,
+				($tokenBefore - 1),
+				$searchStartToken,
+				true
+			);
+
+			// Prevent false positive on assign by reference and compare with reference
+			// within function call parameters.
+			if (isset($this->assignOrCompare[$tokens[$tokenBefore]['type']])) {
+				continue;
+			}
+
+			// The found T_BITWISE_AND represents a pass-by-reference.
+			return true;
+
+		} while ($nextVariable < $searchEndToken);
+
+		// This code should never be reached, but here in case of weird bugs.
+		return false;
+	}
 }

Spacing +39 added lines, -39 removed lines

@@ -91,9 +91,9 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
-        if ($this->supportsAbove('5.3') === false) {
+        if ( $this->supportsAbove( '5.3' ) === false ) {
             return;
         }
 
@@ -104,55 +104,55 @@ 
         // "myFunction" is T_STRING but we should skip because it is not a
         // function or method *call*.
         $findTokens   = Tokens::$emptyTokens;
-        $findTokens[] = \T_BITWISE_AND;
+        $findTokens[ ] = \T_BITWISE_AND;
 
         $prevNonEmpty = $phpcsFile->findPrevious(
             $findTokens,
-            ($stackPtr - 1),
+            ( $stackPtr - 1 ),
             null,
             true
         );
 
-        if ($prevNonEmpty !== false && \in_array($tokens[$prevNonEmpty]['type'], array('T_FUNCTION', 'T_CLASS', 'T_INTERFACE', 'T_TRAIT'), true)) {
+        if ( $prevNonEmpty !== false && \in_array( $tokens[ $prevNonEmpty ][ 'type' ], array( 'T_FUNCTION', 'T_CLASS', 'T_INTERFACE', 'T_TRAIT' ), true ) ) {
             return;
         }
 
         // If the next non-whitespace token after the function or method call
         // is not an opening parenthesis then it can't really be a *call*.
-        $openBracket = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
+        $openBracket = $phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
 
-        if ($openBracket === false || $tokens[$openBracket]['code'] !== \T_OPEN_PARENTHESIS
-            || isset($tokens[$openBracket]['parenthesis_closer']) === false
+        if ( $openBracket === false || $tokens[ $openBracket ][ 'code' ] !== \T_OPEN_PARENTHESIS
+            || isset( $tokens[ $openBracket ][ 'parenthesis_closer' ] ) === false
         ) {
             return;
         }
 
         // Get the function call parameters.
-        $parameters = $this->getFunctionCallParameters($phpcsFile, $stackPtr);
-        if (\count($parameters) === 0) {
+        $parameters = $this->getFunctionCallParameters( $phpcsFile, $stackPtr );
+        if ( \count( $parameters ) === 0 ) {
             return;
         }
 
         // Which nesting level is the one we are interested in ?
         $nestedParenthesisCount = 1;
-        if (isset($tokens[$openBracket]['nested_parenthesis'])) {
-            $nestedParenthesisCount = \count($tokens[$openBracket]['nested_parenthesis']) + 1;
+        if ( isset( $tokens[ $openBracket ][ 'nested_parenthesis' ] ) ) {
+            $nestedParenthesisCount = \count( $tokens[ $openBracket ][ 'nested_parenthesis' ] ) + 1;
         }
 
-        foreach ($parameters as $parameter) {
-            if ($this->isCallTimePassByReferenceParam($phpcsFile, $parameter, $nestedParenthesisCount) === true) {
+        foreach ( $parameters as $parameter ) {
+            if ( $this->isCallTimePassByReferenceParam( $phpcsFile, $parameter, $nestedParenthesisCount ) === true ) {
                 // T_BITWISE_AND represents a pass-by-reference.
                 $error     = 'Using a call-time pass-by-reference is deprecated since PHP 5.3';
                 $isError   = false;
                 $errorCode = 'Deprecated';
 
-                if ($this->supportsAbove('5.4')) {
+                if ( $this->supportsAbove( '5.4' ) ) {
                     $error    .= ' and prohibited since PHP 5.4';
                     $isError   = true;
                     $errorCode = 'NotAllowed';
                 }
 
-                $this->addMessage($phpcsFile, $error, $parameter['start'], $isError, $errorCode);
+                $this->addMessage( $phpcsFile, $error, $parameter[ 'start' ], $isError, $errorCode );
             }
         }
     }
@@ -168,45 +168,45 @@ 
      *
      * @return bool
      */
-    protected function isCallTimePassByReferenceParam(File $phpcsFile, $parameter, $nestingLevel)
+    protected function isCallTimePassByReferenceParam( File $phpcsFile, $parameter, $nestingLevel )
     {
         $tokens = $phpcsFile->getTokens();
 
-        $searchStartToken = $parameter['start'] - 1;
-        $searchEndToken   = $parameter['end'] + 1;
+        $searchStartToken = $parameter[ 'start' ] - 1;
+        $searchEndToken   = $parameter[ 'end' ] + 1;
         $nextVariable     = $searchStartToken;
         do {
-            $nextVariable = $phpcsFile->findNext(array(\T_VARIABLE, \T_OPEN_SHORT_ARRAY, \T_CLOSURE), ($nextVariable + 1), $searchEndToken);
-            if ($nextVariable === false) {
+            $nextVariable = $phpcsFile->findNext( array( \T_VARIABLE, \T_OPEN_SHORT_ARRAY, \T_CLOSURE ), ( $nextVariable + 1 ), $searchEndToken );
+            if ( $nextVariable === false ) {
                 return false;
             }
 
             // Ignore anything within short array definition brackets.
-            if ($tokens[$nextVariable]['type'] === 'T_OPEN_SHORT_ARRAY'
-                && (isset($tokens[$nextVariable]['bracket_opener'])
-                    && $tokens[$nextVariable]['bracket_opener'] === $nextVariable)
-                && isset($tokens[$nextVariable]['bracket_closer'])
+            if ( $tokens[ $nextVariable ][ 'type' ] === 'T_OPEN_SHORT_ARRAY'
+                && ( isset( $tokens[ $nextVariable ][ 'bracket_opener' ] )
+                    && $tokens[ $nextVariable ][ 'bracket_opener' ] === $nextVariable )
+                && isset( $tokens[ $nextVariable ][ 'bracket_closer' ] )
             ) {
                 // Skip forward to the end of the short array definition.
-                $nextVariable = $tokens[$nextVariable]['bracket_closer'];
+                $nextVariable = $tokens[ $nextVariable ][ 'bracket_closer' ];
                 continue;
             }
 
             // Skip past closures passed as function parameters.
-            if ($tokens[$nextVariable]['type'] === 'T_CLOSURE'
-                && (isset($tokens[$nextVariable]['scope_condition'])
-                    && $tokens[$nextVariable]['scope_condition'] === $nextVariable)
-                && isset($tokens[$nextVariable]['scope_closer'])
+            if ( $tokens[ $nextVariable ][ 'type' ] === 'T_CLOSURE'
+                && ( isset( $tokens[ $nextVariable ][ 'scope_condition' ] )
+                    && $tokens[ $nextVariable ][ 'scope_condition' ] === $nextVariable )
+                && isset( $tokens[ $nextVariable ][ 'scope_closer' ] )
             ) {
                 // Skip forward to the end of the closure declaration.
-                $nextVariable = $tokens[$nextVariable]['scope_closer'];
+                $nextVariable = $tokens[ $nextVariable ][ 'scope_closer' ];
                 continue;
             }
 
             // Make sure the variable belongs directly to this function call
             // and is not inside a nested function call or array.
-            if (isset($tokens[$nextVariable]['nested_parenthesis']) === false
-                || (\count($tokens[$nextVariable]['nested_parenthesis']) !== $nestingLevel)
+            if ( isset( $tokens[ $nextVariable ][ 'nested_parenthesis' ] ) === false
+                || ( \count( $tokens[ $nextVariable ][ 'nested_parenthesis' ] ) !== $nestingLevel )
             ) {
                 continue;
             }
@@ -214,38 +214,38 @@ 
             // Checking this: $value = my_function(...[*]$arg...).
             $tokenBefore = $phpcsFile->findPrevious(
                 Tokens::$emptyTokens,
-                ($nextVariable - 1),
+                ( $nextVariable - 1 ),
                 $searchStartToken,
                 true
             );
 
-            if ($tokenBefore === false || $tokens[$tokenBefore]['code'] !== \T_BITWISE_AND) {
+            if ( $tokenBefore === false || $tokens[ $tokenBefore ][ 'code' ] !== \T_BITWISE_AND ) {
                 // Nothing before the token or no &.
                 continue;
             }
 
-            if ($phpcsFile->isReference($tokenBefore) === false) {
+            if ( $phpcsFile->isReference( $tokenBefore ) === false ) {
                 continue;
             }
 
             // Checking this: $value = my_function(...[*]&$arg...).
             $tokenBefore = $phpcsFile->findPrevious(
                 Tokens::$emptyTokens,
-                ($tokenBefore - 1),
+                ( $tokenBefore - 1 ),
                 $searchStartToken,
                 true
             );
 
             // Prevent false positive on assign by reference and compare with reference
             // within function call parameters.
-            if (isset($this->assignOrCompare[$tokens[$tokenBefore]['type']])) {
+            if ( isset( $this->assignOrCompare[ $tokens[ $tokenBefore ][ 'type' ] ] ) ) {
                 continue;
             }
 
             // The found T_BITWISE_AND represents a pass-by-reference.
             return true;
 
-        } while ($nextVariable < $searchEndToken);
+        } while ( $nextVariable < $searchEndToken );
 
         // This code should never be reached, but here in case of weird bugs.
         return false;

Braces +4 added lines, -8 removed lines

@@ -30,8 +30,7 @@ 
  * @author    Florian Grandel <jerico.dev@gmail.com>
  * @copyright 2009 Florian Grandel
  */
-class ForbiddenCallTimePassByReferenceSniff extends Sniff
-{
+class ForbiddenCallTimePassByReferenceSniff extends Sniff {
 
     /**
      * Tokens that represent assignments or equality comparisons.
@@ -74,8 +73,7 @@ 
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(
             \T_STRING,
             \T_VARIABLE,
@@ -91,8 +89,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         if ($this->supportsAbove('5.3') === false) {
             return;
         }
@@ -168,8 +165,7 @@ 
      *
      * @return bool
      */
-    protected function isCallTimePassByReferenceParam(File $phpcsFile, $parameter, $nestingLevel)
-    {
+    protected function isCallTimePassByReferenceParam(File $phpcsFile, $parameter, $nestingLevel) {
         $tokens = $phpcsFile->getTokens();
 
         $searchStartToken = $parameter['start'] - 1;

Doc Comments +1 added lines, -1 removed lines

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

vendor/phpcompatibility/php-compatibility/PHPCompatibility/Sniffs/Syntax/NewClassMemberAccessSniff.php

Indentation +67 added lines, -67 removed lines

@@ -32,82 +32,82 @@
 class NewClassMemberAccessSniff extends Sniff
 {
 
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return array(
-            \T_NEW,
-            \T_CLONE,
-        );
-    }
+	/**
+	 * Returns an array of tokens this test wants to listen for.
+	 *
+	 * @return array
+	 */
+	public function register()
+	{
+		return array(
+			\T_NEW,
+			\T_CLONE,
+		);
+	}
 
-    /**
-     * 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();
+	/**
+	 * 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();
 
-        if ($tokens[$stackPtr]['code'] === \T_NEW && $this->supportsBelow('5.3') !== true) {
-            return;
-        } elseif ($tokens[$stackPtr]['code'] === \T_CLONE && $this->supportsBelow('5.6') !== true) {
-            return;
-        }
+		if ($tokens[$stackPtr]['code'] === \T_NEW && $this->supportsBelow('5.3') !== true) {
+			return;
+		} elseif ($tokens[$stackPtr]['code'] === \T_CLONE && $this->supportsBelow('5.6') !== true) {
+			return;
+		}
 
-        if (isset($tokens[$stackPtr]['nested_parenthesis']) === false) {
-            // The `new className/clone $a` has to be in parentheses, without is not supported.
-            return;
-        }
+		if (isset($tokens[$stackPtr]['nested_parenthesis']) === false) {
+			// The `new className/clone $a` has to be in parentheses, without is not supported.
+			return;
+		}
 
-        $parenthesisCloser = end($tokens[$stackPtr]['nested_parenthesis']);
-        $parenthesisOpener = key($tokens[$stackPtr]['nested_parenthesis']);
+		$parenthesisCloser = end($tokens[$stackPtr]['nested_parenthesis']);
+		$parenthesisOpener = key($tokens[$stackPtr]['nested_parenthesis']);
 
-        if (isset($tokens[$parenthesisOpener]['parenthesis_owner']) === true) {
-            // If there is an owner, these parentheses are for a different purpose.
-            return;
-        }
+		if (isset($tokens[$parenthesisOpener]['parenthesis_owner']) === true) {
+			// If there is an owner, these parentheses are for a different purpose.
+			return;
+		}
 
-        $prevBeforeParenthesis = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($parenthesisOpener - 1), null, true);
-        if ($prevBeforeParenthesis !== false && $tokens[$prevBeforeParenthesis]['code'] === \T_STRING) {
-            // This is most likely a function call with the new/cloned object as a parameter.
-            return;
-        }
+		$prevBeforeParenthesis = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($parenthesisOpener - 1), null, true);
+		if ($prevBeforeParenthesis !== false && $tokens[$prevBeforeParenthesis]['code'] === \T_STRING) {
+			// This is most likely a function call with the new/cloned object as a parameter.
+			return;
+		}
 
-        $nextAfterParenthesis = $phpcsFile->findNext(Tokens::$emptyTokens, ($parenthesisCloser + 1), null, true);
-        if ($nextAfterParenthesis === false) {
-            // Live coding.
-            return;
-        }
+		$nextAfterParenthesis = $phpcsFile->findNext(Tokens::$emptyTokens, ($parenthesisCloser + 1), null, true);
+		if ($nextAfterParenthesis === false) {
+			// Live coding.
+			return;
+		}
 
-        if ($tokens[$nextAfterParenthesis]['code'] !== \T_OBJECT_OPERATOR
-            && $tokens[$nextAfterParenthesis]['code'] !== \T_OPEN_SQUARE_BRACKET
-        ) {
-            return;
-        }
+		if ($tokens[$nextAfterParenthesis]['code'] !== \T_OBJECT_OPERATOR
+			&& $tokens[$nextAfterParenthesis]['code'] !== \T_OPEN_SQUARE_BRACKET
+		) {
+			return;
+		}
 
-        $data      = array('instantiation', '5.3');
-        $errorCode = 'OnNewFound';
+		$data      = array('instantiation', '5.3');
+		$errorCode = 'OnNewFound';
 
-        if ($tokens[$stackPtr]['code'] === \T_CLONE) {
-            $data      = array('cloning', '5.6');
-            $errorCode = 'OnCloneFound';
-        }
+		if ($tokens[$stackPtr]['code'] === \T_CLONE) {
+			$data      = array('cloning', '5.6');
+			$errorCode = 'OnCloneFound';
+		}
 
-        $phpcsFile->addError(
-            'Class member access on object %s was not supported in PHP %s or earlier',
-            $parenthesisCloser,
-            $errorCode,
-            $data
-        );
-    }
+		$phpcsFile->addError(
+			'Class member access on object %s was not supported in PHP %s or earlier',
+			$parenthesisCloser,
+			$errorCode,
+			$data
+		);
+	}
 }

Spacing +16 added lines, -16 removed lines

@@ -54,52 +54,52 @@
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
-        if ($tokens[$stackPtr]['code'] === \T_NEW && $this->supportsBelow('5.3') !== true) {
+        if ( $tokens[ $stackPtr ][ 'code' ] === \T_NEW && $this->supportsBelow( '5.3' ) !== true ) {
             return;
-        } elseif ($tokens[$stackPtr]['code'] === \T_CLONE && $this->supportsBelow('5.6') !== true) {
+        } elseif ( $tokens[ $stackPtr ][ 'code' ] === \T_CLONE && $this->supportsBelow( '5.6' ) !== true ) {
             return;
         }
 
-        if (isset($tokens[$stackPtr]['nested_parenthesis']) === false) {
+        if ( isset( $tokens[ $stackPtr ][ 'nested_parenthesis' ] ) === false ) {
             // The `new className/clone $a` has to be in parentheses, without is not supported.
             return;
         }
 
-        $parenthesisCloser = end($tokens[$stackPtr]['nested_parenthesis']);
-        $parenthesisOpener = key($tokens[$stackPtr]['nested_parenthesis']);
+        $parenthesisCloser = end( $tokens[ $stackPtr ][ 'nested_parenthesis' ] );
+        $parenthesisOpener = key( $tokens[ $stackPtr ][ 'nested_parenthesis' ] );
 
-        if (isset($tokens[$parenthesisOpener]['parenthesis_owner']) === true) {
+        if ( isset( $tokens[ $parenthesisOpener ][ 'parenthesis_owner' ] ) === true ) {
             // If there is an owner, these parentheses are for a different purpose.
             return;
         }
 
-        $prevBeforeParenthesis = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($parenthesisOpener - 1), null, true);
-        if ($prevBeforeParenthesis !== false && $tokens[$prevBeforeParenthesis]['code'] === \T_STRING) {
+        $prevBeforeParenthesis = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $parenthesisOpener - 1 ), null, true );
+        if ( $prevBeforeParenthesis !== false && $tokens[ $prevBeforeParenthesis ][ 'code' ] === \T_STRING ) {
             // This is most likely a function call with the new/cloned object as a parameter.
             return;
         }
 
-        $nextAfterParenthesis = $phpcsFile->findNext(Tokens::$emptyTokens, ($parenthesisCloser + 1), null, true);
-        if ($nextAfterParenthesis === false) {
+        $nextAfterParenthesis = $phpcsFile->findNext( Tokens::$emptyTokens, ( $parenthesisCloser + 1 ), null, true );
+        if ( $nextAfterParenthesis === false ) {
             // Live coding.
             return;
         }
 
-        if ($tokens[$nextAfterParenthesis]['code'] !== \T_OBJECT_OPERATOR
-            && $tokens[$nextAfterParenthesis]['code'] !== \T_OPEN_SQUARE_BRACKET
+        if ( $tokens[ $nextAfterParenthesis ][ 'code' ] !== \T_OBJECT_OPERATOR
+            && $tokens[ $nextAfterParenthesis ][ 'code' ] !== \T_OPEN_SQUARE_BRACKET
         ) {
             return;
         }
 
-        $data      = array('instantiation', '5.3');
+        $data      = array( 'instantiation', '5.3' );
         $errorCode = 'OnNewFound';
 
-        if ($tokens[$stackPtr]['code'] === \T_CLONE) {
-            $data      = array('cloning', '5.6');
+        if ( $tokens[ $stackPtr ][ 'code' ] === \T_CLONE ) {
+            $data      = array( 'cloning', '5.6' );
             $errorCode = 'OnCloneFound';
         }
 

Braces +3 added lines, -6 removed lines

@@ -29,16 +29,14 @@ 
  * @package  PHPCompatibility
  * @author   Juliette Reinders Folmer <phpcompatibility_nospam@adviesenzo.nl>
  */
-class NewClassMemberAccessSniff extends Sniff
-{
+class NewClassMemberAccessSniff extends Sniff {
 
     /**
      * Returns an array of tokens this test wants to listen for.
      *
      * @return array
      */
-    public function register()
-    {
+    public function register() {
         return array(
             \T_NEW,
             \T_CLONE,
@@ -54,8 +52,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
-    {
+    public function process(File $phpcsFile, $stackPtr) {
         $tokens = $phpcsFile->getTokens();
 
         if ($tokens[$stackPtr]['code'] === \T_NEW && $this->supportsBelow('5.3') !== true) {

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()
     {