gravityview / GravityView

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

Spacing +48 added lines, -48 removed lines

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

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

Spacing +92 added lines, -92 removed lines

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

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

Spacing +32 added lines, -32 removed lines

@@ -157,9 +157,9 @@ 
     public function register()
     {
         // Handle case-insensitivity of function names.
-        $this->functionParameters = $this->arrayKeysToLowercase($this->functionParameters);
+        $this->functionParameters = $this->arrayKeysToLowercase( $this->functionParameters );
 
-        return array(\T_STRING);
+        return array( \T_STRING );
     }
 
     /**
@@ -171,7 +171,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
@@ -182,37 +182,37 @@ 
             \T_CONST           => true,
         );
 
-        $prevToken = $phpcsFile->findPrevious(\T_WHITESPACE, ($stackPtr - 1), null, true);
-        if (isset($ignore[$tokens[$prevToken]['code']]) === true) {
+        $prevToken = $phpcsFile->findPrevious( \T_WHITESPACE, ( $stackPtr - 1 ), null, true );
+        if ( isset( $ignore[ $tokens[ $prevToken ][ 'code' ] ] ) === true ) {
             // Not a call to a PHP function.
             return;
         }
 
-        $function   = $tokens[$stackPtr]['content'];
-        $functionLc = strtolower($function);
+        $function   = $tokens[ $stackPtr ][ 'content' ];
+        $functionLc = strtolower( $function );
 
-        if (isset($this->functionParameters[$functionLc]) === false) {
+        if ( isset( $this->functionParameters[ $functionLc ] ) === false ) {
             return;
         }
 
-        $parameterCount  = $this->getFunctionCallParameterCount($phpcsFile, $stackPtr);
-        $openParenthesis = $phpcsFile->findNext(Tokens::$emptyTokens, $stackPtr + 1, null, true, null, true);
+        $parameterCount  = $this->getFunctionCallParameterCount( $phpcsFile, $stackPtr );
+        $openParenthesis = $phpcsFile->findNext( Tokens::$emptyTokens, $stackPtr + 1, null, true, null, true );
 
         // If the parameter count returned > 0, we know there will be valid open parenthesis.
-        if ($parameterCount === 0 && $tokens[$openParenthesis]['code'] !== \T_OPEN_PARENTHESIS) {
+        if ( $parameterCount === 0 && $tokens[ $openParenthesis ][ 'code' ] !== \T_OPEN_PARENTHESIS ) {
             return;
         }
 
         $parameterOffsetFound = $parameterCount - 1;
 
-        foreach ($this->functionParameters[$functionLc] as $offset => $parameterDetails) {
-            if ($offset > $parameterOffsetFound) {
+        foreach ( $this->functionParameters[ $functionLc ] as $offset => $parameterDetails ) {
+            if ( $offset > $parameterOffsetFound ) {
                 $itemInfo = array(
                     'name'   => $function,
                     'nameLc' => $functionLc,
                     'offset' => $offset,
                 );
-                $this->handleFeature($phpcsFile, $openParenthesis, $itemInfo);
+                $this->handleFeature( $phpcsFile, $openParenthesis, $itemInfo );
             }
         }
     }
@@ -225,9 +225,9 @@ 
      *
      * @return bool
      */
-    protected function shouldThrowError(array $errorInfo)
+    protected function shouldThrowError( array $errorInfo )
     {
-        return ($errorInfo['requiredVersion'] !== '');
+        return ( $errorInfo[ 'requiredVersion' ] !== '' );
     }
 
 
@@ -238,9 +238,9 @@ 
      *
      * @return array Version and other information about the item.
      */
-    public function getItemArray(array $itemInfo)
+    public function getItemArray( array $itemInfo )
     {
-        return $this->functionParameters[$itemInfo['nameLc']][$itemInfo['offset']];
+        return $this->functionParameters[ $itemInfo[ 'nameLc' ] ][ $itemInfo[ 'offset' ] ];
     }
 
 
@@ -251,7 +251,7 @@ 
      */
     protected function getNonVersionArrayKeys()
     {
-        return array('name');
+        return array( 'name' );
     }
 
 
@@ -263,24 +263,24 @@ 
      *
      * @return array
      */
-    public function getErrorInfo(array $itemArray, array $itemInfo)
+    public function getErrorInfo( array $itemArray, array $itemInfo )
     {
         $errorInfo = array(
             'paramName'       => '',
             'requiredVersion' => '',
         );
 
-        $versionArray = $this->getVersionArray($itemArray);
+        $versionArray = $this->getVersionArray( $itemArray );
 
-        if (empty($versionArray) === false) {
-            foreach ($versionArray as $version => $required) {
-                if ($required === true && $this->supportsBelow($version) === true) {
-                    $errorInfo['requiredVersion'] = $version;
+        if ( empty( $versionArray ) === false ) {
+            foreach ( $versionArray as $version => $required ) {
+                if ( $required === true && $this->supportsBelow( $version ) === true ) {
+                    $errorInfo[ 'requiredVersion' ] = $version;
                 }
             }
         }
 
-        $errorInfo['paramName'] = $itemArray['name'];
+        $errorInfo[ 'paramName' ] = $itemArray[ 'name' ];
 
         return $errorInfo;
     }
@@ -309,16 +309,16 @@ 
      *
      * @return void
      */
-    public function addError(File $phpcsFile, $stackPtr, array $itemInfo, array $errorInfo)
+    public function addError( File $phpcsFile, $stackPtr, array $itemInfo, array $errorInfo )
     {
         $error     = $this->getErrorMsgTemplate();
-        $errorCode = $this->stringToErrorCode($itemInfo['name'] . '_' . $errorInfo['paramName']) . 'Missing';
+        $errorCode = $this->stringToErrorCode( $itemInfo[ 'name' ] . '_' . $errorInfo[ 'paramName' ] ) . 'Missing';
         $data      = array(
-            $errorInfo['paramName'],
-            $itemInfo['name'],
-            $errorInfo['requiredVersion'],
+            $errorInfo[ 'paramName' ],
+            $itemInfo[ 'name' ],
+            $errorInfo[ 'requiredVersion' ],
         );
 
-        $phpcsFile->addError($error, $stackPtr, $errorCode, $data);
+        $phpcsFile->addError( $error, $stackPtr, $errorCode, $data );
     }
 }

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

Spacing +24 added lines, -24 removed lines

@@ -54,7 +54,7 @@ 
      */
     public function register()
     {
-        return array(\T_STRING);
+        return array( \T_STRING );
     }
 
 
@@ -67,17 +67,17 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
         $tokens     = $phpcsFile->getTokens();
-        $functionLc = strtolower($tokens[$stackPtr]['content']);
-        if (isset($this->targetFunctions[$functionLc]) === false) {
+        $functionLc = strtolower( $tokens[ $stackPtr ][ 'content' ] );
+        if ( isset( $this->targetFunctions[ $functionLc ] ) === false ) {
             return;
         }
 
         // Next non-empty token should be the open parenthesis.
-        $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true, null, true);
-        if ($nextNonEmpty === false || $tokens[$nextNonEmpty]['code'] !== \T_OPEN_PARENTHESIS) {
+        $nextNonEmpty = $phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true, null, true );
+        if ( $nextNonEmpty === false || $tokens[ $nextNonEmpty ][ 'code' ] !== \T_OPEN_PARENTHESIS ) {
             return;
         }
 
@@ -88,16 +88,16 @@ 
             \T_NEW             => 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 call to a PHP function.
             return;
-        } elseif ($tokens[$prevNonEmpty]['code'] === \T_NS_SEPARATOR && $tokens[$prevNonEmpty - 1]['code'] === \T_STRING) {
+        } elseif ( $tokens[ $prevNonEmpty ][ 'code' ] === \T_NS_SEPARATOR && $tokens[ $prevNonEmpty - 1 ][ 'code' ] === \T_STRING ) {
             // Namespaced function.
             return;
         }
 
-        $data = $tokens[$stackPtr]['content'];
+        $data = $tokens[ $stackPtr ][ 'content' ];
 
         /*
          * Check for usage of the functions in the global scope.
@@ -105,52 +105,52 @@ 
          * As PHPCS can not determine whether a file is included from within a function in
          * another file, so always throw a warning/error.
          */
-        if ($phpcsFile->hasCondition($stackPtr, array(\T_FUNCTION, \T_CLOSURE)) === false) {
+        if ( $phpcsFile->hasCondition( $stackPtr, array( \T_FUNCTION, \T_CLOSURE ) ) === false ) {
             $isError = false;
             $message = 'Use of %s() outside of a user-defined function is only supported if the file is included from within a user-defined function in another file prior to PHP 5.3.';
 
-            if ($this->supportsAbove('5.3') === true) {
+            if ( $this->supportsAbove( '5.3' ) === true ) {
                 $isError  = true;
                 $message .= ' As of PHP 5.3, it is no longer supported at all.';
             }
 
-            $this->addMessage($phpcsFile, $message, $stackPtr, $isError, 'OutsideFunctionScope', $data);
+            $this->addMessage( $phpcsFile, $message, $stackPtr, $isError, 'OutsideFunctionScope', $data );
         }
 
         /*
          * Check for usage of the functions as a parameter in a function call.
          */
-        if ($this->supportsBelow('5.2') === false) {
+        if ( $this->supportsBelow( '5.2' ) === false ) {
             return;
         }
 
-        if (isset($tokens[$stackPtr]['nested_parenthesis']) === false) {
+        if ( isset( $tokens[ $stackPtr ][ 'nested_parenthesis' ] ) === false ) {
             return;
         }
 
         $throwError = false;
 
-        $closer = end($tokens[$stackPtr]['nested_parenthesis']);
-        if (isset($tokens[$closer]['parenthesis_owner'])
-            && $tokens[$tokens[$closer]['parenthesis_owner']]['type'] === 'T_CLOSURE'
+        $closer = end( $tokens[ $stackPtr ][ 'nested_parenthesis' ] );
+        if ( isset( $tokens[ $closer ][ 'parenthesis_owner' ] )
+            && $tokens[ $tokens[ $closer ][ 'parenthesis_owner' ] ][ 'type' ] === 'T_CLOSURE'
         ) {
             $throwError = true;
         } else {
-            $opener       = key($tokens[$stackPtr]['nested_parenthesis']);
-            $prevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($opener - 1), null, true);
-            if ($tokens[$prevNonEmpty]['code'] !== \T_STRING) {
+            $opener       = key( $tokens[ $stackPtr ][ 'nested_parenthesis' ] );
+            $prevNonEmpty = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $opener - 1 ), null, true );
+            if ( $tokens[ $prevNonEmpty ][ 'code' ] !== \T_STRING ) {
                 return;
             }
 
-            $prevPrevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($prevNonEmpty - 1), null, true);
-            if ($tokens[$prevPrevNonEmpty]['code'] === \T_FUNCTION) {
+            $prevPrevNonEmpty = $phpcsFile->findPrevious( Tokens::$emptyTokens, ( $prevNonEmpty - 1 ), null, true );
+            if ( $tokens[ $prevPrevNonEmpty ][ 'code' ] === \T_FUNCTION ) {
                 return;
             }
 
             $throwError = true;
         }
 
-        if ($throwError === false) {
+        if ( $throwError === false ) {
             return;
         }
 

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

Spacing +11 added lines, -11 removed lines

@@ -963,9 +963,9 @@ 
     public function register()
     {
         // Handle case-insensitivity of function names.
-        $this->removedFunctions = $this->arrayKeysToLowercase($this->removedFunctions);
+        $this->removedFunctions = $this->arrayKeysToLowercase( $this->removedFunctions );
 
-        return array(\T_STRING);
+        return array( \T_STRING );
     }
 
 
@@ -978,7 +978,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
@@ -992,16 +992,16 @@ 
             \T_NS_SEPARATOR    => true,
         );
 
-        $prevToken = $phpcsFile->findPrevious(\T_WHITESPACE, ($stackPtr - 1), null, true);
-        if (isset($ignore[$tokens[$prevToken]['code']]) === true) {
+        $prevToken = $phpcsFile->findPrevious( \T_WHITESPACE, ( $stackPtr - 1 ), null, true );
+        if ( isset( $ignore[ $tokens[ $prevToken ][ 'code' ] ] ) === true ) {
             // Not a call to a PHP function.
             return;
         }
 
-        $function   = $tokens[$stackPtr]['content'];
-        $functionLc = strtolower($function);
+        $function   = $tokens[ $stackPtr ][ 'content' ];
+        $functionLc = strtolower( $function );
 
-        if (isset($this->removedFunctions[$functionLc]) === false) {
+        if ( isset( $this->removedFunctions[ $functionLc ] ) === false ) {
             return;
         }
 
@@ -1009,7 +1009,7 @@ 
             'name'   => $function,
             'nameLc' => $functionLc,
         );
-        $this->handleFeature($phpcsFile, $stackPtr, $itemInfo);
+        $this->handleFeature( $phpcsFile, $stackPtr, $itemInfo );
     }
 
 
@@ -1020,9 +1020,9 @@ 
      *
      * @return array Version and other information about the item.
      */
-    public function getItemArray(array $itemInfo)
+    public function getItemArray( array $itemInfo )
     {
-        return $this->removedFunctions[$itemInfo['nameLc']];
+        return $this->removedFunctions[ $itemInfo[ 'nameLc' ] ];
     }
 
 

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

Spacing +25 added lines, -25 removed lines

@@ -75,9 +75,9 @@ 
     public function register()
     {
         // Handle case-insensitivity of function names.
-        $this->removedFunctionParameters = $this->arrayKeysToLowercase($this->removedFunctionParameters);
+        $this->removedFunctionParameters = $this->arrayKeysToLowercase( $this->removedFunctionParameters );
 
-        return array(\T_STRING);
+        return array( \T_STRING );
     }
 
     /**
@@ -89,7 +89,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
@@ -100,36 +100,36 @@ 
             \T_CONST           => true,
         );
 
-        $prevToken = $phpcsFile->findPrevious(\T_WHITESPACE, ($stackPtr - 1), null, true);
-        if (isset($ignore[$tokens[$prevToken]['code']]) === true) {
+        $prevToken = $phpcsFile->findPrevious( \T_WHITESPACE, ( $stackPtr - 1 ), null, true );
+        if ( isset( $ignore[ $tokens[ $prevToken ][ 'code' ] ] ) === true ) {
             // Not a call to a PHP function.
             return;
         }
 
-        $function   = $tokens[$stackPtr]['content'];
-        $functionLc = strtolower($function);
+        $function   = $tokens[ $stackPtr ][ 'content' ];
+        $functionLc = strtolower( $function );
 
-        if (isset($this->removedFunctionParameters[$functionLc]) === false) {
+        if ( isset( $this->removedFunctionParameters[ $functionLc ] ) === false ) {
             return;
         }
 
-        $parameterCount = $this->getFunctionCallParameterCount($phpcsFile, $stackPtr);
-        if ($parameterCount === 0) {
+        $parameterCount = $this->getFunctionCallParameterCount( $phpcsFile, $stackPtr );
+        if ( $parameterCount === 0 ) {
             return;
         }
 
         // If the parameter count returned > 0, we know there will be valid open parenthesis.
-        $openParenthesis      = $phpcsFile->findNext(Tokens::$emptyTokens, $stackPtr + 1, null, true, null, true);
+        $openParenthesis      = $phpcsFile->findNext( Tokens::$emptyTokens, $stackPtr + 1, null, true, null, true );
         $parameterOffsetFound = $parameterCount - 1;
 
-        foreach ($this->removedFunctionParameters[$functionLc] as $offset => $parameterDetails) {
-            if ($offset <= $parameterOffsetFound) {
+        foreach ( $this->removedFunctionParameters[ $functionLc ] as $offset => $parameterDetails ) {
+            if ( $offset <= $parameterOffsetFound ) {
                 $itemInfo = array(
                     'name'   => $function,
                     'nameLc' => $functionLc,
                     'offset' => $offset,
                 );
-                $this->handleFeature($phpcsFile, $openParenthesis, $itemInfo);
+                $this->handleFeature( $phpcsFile, $openParenthesis, $itemInfo );
             }
         }
     }
@@ -142,9 +142,9 @@ 
      *
      * @return array Version and other information about the item.
      */
-    public function getItemArray(array $itemInfo)
+    public function getItemArray( array $itemInfo )
     {
-        return $this->removedFunctionParameters[$itemInfo['nameLc']][$itemInfo['offset']];
+        return $this->removedFunctionParameters[ $itemInfo[ 'nameLc' ] ][ $itemInfo[ 'offset' ] ];
     }
 
 
@@ -155,7 +155,7 @@ 
      */
     protected function getNonVersionArrayKeys()
     {
-        return array('name');
+        return array( 'name' );
     }
 
 
@@ -167,10 +167,10 @@ 
      *
      * @return array
      */
-    public function getErrorInfo(array $itemArray, array $itemInfo)
+    public function getErrorInfo( array $itemArray, array $itemInfo )
     {
-        $errorInfo              = parent::getErrorInfo($itemArray, $itemInfo);
-        $errorInfo['paramName'] = $itemArray['name'];
+        $errorInfo              = parent::getErrorInfo( $itemArray, $itemInfo );
+        $errorInfo[ 'paramName' ] = $itemArray[ 'name' ];
 
         return $errorInfo;
     }
@@ -184,9 +184,9 @@ 
      *
      * @return string
      */
-    protected function getItemName(array $itemInfo, array $errorInfo)
+    protected function getItemName( array $itemInfo, array $errorInfo )
     {
-        return $itemInfo['name'] . '_' . $errorInfo['paramName'];
+        return $itemInfo[ 'name' ] . '_' . $errorInfo[ 'paramName' ];
     }
 
 
@@ -210,10 +210,10 @@ 
      *
      * @return array
      */
-    protected function filterErrorData(array $data, array $itemInfo, array $errorInfo)
+    protected function filterErrorData( array $data, array $itemInfo, array $errorInfo )
     {
-        array_shift($data);
-        array_unshift($data, $errorInfo['paramName'], $itemInfo['name']);
+        array_shift( $data );
+        array_unshift( $data, $errorInfo[ 'paramName' ], $itemInfo[ 'name' ] );
         return $data;
     }
 }

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

Spacing +31 added lines, -31 removed lines

@@ -57,11 +57,11 @@ 
      *
      * @return bool
      */
-    protected function shouldThrowError(array $errorInfo)
+    protected function shouldThrowError( array $errorInfo )
     {
-        return ($errorInfo['optionalDeprecated'] !== ''
-            || $errorInfo['optionalRemoved'] !== ''
-            || $errorInfo['optionalRecommended'] !== '');
+        return ( $errorInfo[ 'optionalDeprecated' ] !== ''
+            || $errorInfo[ 'optionalRemoved' ] !== ''
+            || $errorInfo[ 'optionalRecommended' ] !== '' );
     }
 
 
@@ -73,7 +73,7 @@ 
      *
      * @return array
      */
-    public function getErrorInfo(array $itemArray, array $itemInfo)
+    public function getErrorInfo( array $itemArray, array $itemInfo )
     {
         $errorInfo = array(
             'paramName'           => '',
@@ -83,24 +83,24 @@ 
             'error'               => false,
         );
 
-        $versionArray = $this->getVersionArray($itemArray);
-
-        if (empty($versionArray) === false) {
-            foreach ($versionArray as $version => $required) {
-                if ($this->supportsAbove($version) === true) {
-                    if ($required === true && $errorInfo['optionalRemoved'] === '') {
-                        $errorInfo['optionalRemoved'] = $version;
-                        $errorInfo['error']           = true;
-                    } elseif ($required === 'recommended' && $errorInfo['optionalRecommended'] === '') {
-                        $errorInfo['optionalRecommended'] = $version;
-                    } elseif ($errorInfo['optionalDeprecated'] === '') {
-                        $errorInfo['optionalDeprecated'] = $version;
+        $versionArray = $this->getVersionArray( $itemArray );
+
+        if ( empty( $versionArray ) === false ) {
+            foreach ( $versionArray as $version => $required ) {
+                if ( $this->supportsAbove( $version ) === true ) {
+                    if ( $required === true && $errorInfo[ 'optionalRemoved' ] === '' ) {
+                        $errorInfo[ 'optionalRemoved' ] = $version;
+                        $errorInfo[ 'error' ]           = true;
+                    } elseif ( $required === 'recommended' && $errorInfo[ 'optionalRecommended' ] === '' ) {
+                        $errorInfo[ 'optionalRecommended' ] = $version;
+                    } elseif ( $errorInfo[ 'optionalDeprecated' ] === '' ) {
+                        $errorInfo[ 'optionalDeprecated' ] = $version;
                     }
                 }
             }
         }
 
-        $errorInfo['paramName'] = $itemArray['name'];
+        $errorInfo[ 'paramName' ] = $itemArray[ 'name' ];
 
         return $errorInfo;
     }
@@ -118,42 +118,42 @@ 
      *
      * @return void
      */
-    public function addError(File $phpcsFile, $stackPtr, array $itemInfo, array $errorInfo)
+    public function addError( File $phpcsFile, $stackPtr, array $itemInfo, array $errorInfo )
     {
         $error = 'The "%s" parameter for function %s() is missing. Passing this parameter is ';
-        if ($errorInfo['optionalRecommended'] === '') {
+        if ( $errorInfo[ 'optionalRecommended' ] === '' ) {
             $error .= 'no longer optional. The optional nature of the parameter is ';
         } else {
             $error .= 'strongly recommended ';
         }
 
-        $errorCode = $this->stringToErrorCode($itemInfo['name'] . '_' . $errorInfo['paramName']);
+        $errorCode = $this->stringToErrorCode( $itemInfo[ 'name' ] . '_' . $errorInfo[ 'paramName' ] );
         $data      = array(
-            $errorInfo['paramName'],
-            $itemInfo['name'],
+            $errorInfo[ 'paramName' ],
+            $itemInfo[ 'name' ],
         );
 
-        if ($errorInfo['optionalRecommended'] !== '') {
+        if ( $errorInfo[ 'optionalRecommended' ] !== '' ) {
             $error     .= 'since PHP %s ';
             $errorCode .= 'SoftRecommended';
-            $data[]     = $errorInfo['optionalRecommended'];
+            $data[ ]     = $errorInfo[ 'optionalRecommended' ];
         } else {
-            if ($errorInfo['optionalDeprecated'] !== '') {
+            if ( $errorInfo[ 'optionalDeprecated' ] !== '' ) {
                 $error     .= 'deprecated since PHP %s and ';
                 $errorCode .= 'SoftRequired';
-                $data[]     = $errorInfo['optionalDeprecated'];
+                $data[ ]     = $errorInfo[ 'optionalDeprecated' ];
             }
 
-            if ($errorInfo['optionalRemoved'] !== '') {
+            if ( $errorInfo[ 'optionalRemoved' ] !== '' ) {
                 $error     .= 'removed since PHP %s and ';
                 $errorCode .= 'HardRequired';
-                $data[]     = $errorInfo['optionalRemoved'];
+                $data[ ]     = $errorInfo[ 'optionalRemoved' ];
             }
 
             // Remove the last 'and' from the message.
-            $error = substr($error, 0, (\strlen($error) - 5));
+            $error = substr( $error, 0, ( \strlen( $error ) - 5 ) );
         }
 
-        $this->addMessage($phpcsFile, $error, $stackPtr, $errorInfo['error'], $errorCode, $data);
+        $this->addMessage( $phpcsFile, $error, $stackPtr, $errorInfo[ 'error' ], $errorCode, $data );
     }
 }

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

Spacing +12 added lines, -12 removed lines

@@ -1889,9 +1889,9 @@ 
     public function register()
     {
         // Handle case-insensitivity of function names.
-        $this->newFunctions = $this->arrayKeysToLowercase($this->newFunctions);
+        $this->newFunctions = $this->arrayKeysToLowercase( $this->newFunctions );
 
-        return array(\T_STRING);
+        return array( \T_STRING );
     }
 
     /**
@@ -1903,7 +1903,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
@@ -1914,20 +1914,20 @@ 
             \T_CONST           => true,
         );
 
-        $prevToken = $phpcsFile->findPrevious(\T_WHITESPACE, ($stackPtr - 1), null, true);
-        if (isset($ignore[$tokens[$prevToken]['code']]) === true) {
+        $prevToken = $phpcsFile->findPrevious( \T_WHITESPACE, ( $stackPtr - 1 ), null, true );
+        if ( isset( $ignore[ $tokens[ $prevToken ][ 'code' ] ] ) === true ) {
             // Not a call to a PHP function.
             return;
 
-        } elseif ($tokens[$prevToken]['code'] === \T_NS_SEPARATOR && $tokens[$prevToken - 1]['code'] === \T_STRING) {
+        } elseif ( $tokens[ $prevToken ][ 'code' ] === \T_NS_SEPARATOR && $tokens[ $prevToken - 1 ][ 'code' ] === \T_STRING ) {
             // Namespaced function.
             return;
         }
 
-        $function   = $tokens[$stackPtr]['content'];
-        $functionLc = strtolower($function);
+        $function   = $tokens[ $stackPtr ][ 'content' ];
+        $functionLc = strtolower( $function );
 
-        if (isset($this->newFunctions[$functionLc]) === false) {
+        if ( isset( $this->newFunctions[ $functionLc ] ) === false ) {
             return;
         }
 
@@ -1935,7 +1935,7 @@ 
             'name'   => $function,
             'nameLc' => $functionLc,
         );
-        $this->handleFeature($phpcsFile, $stackPtr, $itemInfo);
+        $this->handleFeature( $phpcsFile, $stackPtr, $itemInfo );
     }
 
 
@@ -1946,9 +1946,9 @@ 
      *
      * @return array Version and other information about the item.
      */
-    public function getItemArray(array $itemInfo)
+    public function getItemArray( array $itemInfo )
     {
-        return $this->newFunctions[$itemInfo['nameLc']];
+        return $this->newFunctions[ $itemInfo[ 'nameLc' ] ];
     }
 
 

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

Spacing +25 added lines, -25 removed lines

@@ -942,9 +942,9 @@ 
     public function register()
     {
         // Handle case-insensitivity of function names.
-        $this->newFunctionParameters = $this->arrayKeysToLowercase($this->newFunctionParameters);
+        $this->newFunctionParameters = $this->arrayKeysToLowercase( $this->newFunctionParameters );
 
-        return array(\T_STRING);
+        return array( \T_STRING );
     }
 
     /**
@@ -956,7 +956,7 @@ 
      *
      * @return void
      */
-    public function process(File $phpcsFile, $stackPtr)
+    public function process( File $phpcsFile, $stackPtr )
     {
         $tokens = $phpcsFile->getTokens();
 
@@ -967,36 +967,36 @@ 
             \T_CONST           => true,
         );
 
-        $prevToken = $phpcsFile->findPrevious(\T_WHITESPACE, ($stackPtr - 1), null, true);
-        if (isset($ignore[$tokens[$prevToken]['code']]) === true) {
+        $prevToken = $phpcsFile->findPrevious( \T_WHITESPACE, ( $stackPtr - 1 ), null, true );
+        if ( isset( $ignore[ $tokens[ $prevToken ][ 'code' ] ] ) === true ) {
             // Not a call to a PHP function.
             return;
         }
 
-        $function   = $tokens[$stackPtr]['content'];
-        $functionLc = strtolower($function);
+        $function   = $tokens[ $stackPtr ][ 'content' ];
+        $functionLc = strtolower( $function );
 
-        if (isset($this->newFunctionParameters[$functionLc]) === false) {
+        if ( isset( $this->newFunctionParameters[ $functionLc ] ) === false ) {
             return;
         }
 
-        $parameterCount = $this->getFunctionCallParameterCount($phpcsFile, $stackPtr);
-        if ($parameterCount === 0) {
+        $parameterCount = $this->getFunctionCallParameterCount( $phpcsFile, $stackPtr );
+        if ( $parameterCount === 0 ) {
             return;
         }
 
         // If the parameter count returned > 0, we know there will be valid open parenthesis.
-        $openParenthesis      = $phpcsFile->findNext(Tokens::$emptyTokens, $stackPtr + 1, null, true, null, true);
+        $openParenthesis      = $phpcsFile->findNext( Tokens::$emptyTokens, $stackPtr + 1, null, true, null, true );
         $parameterOffsetFound = $parameterCount - 1;
 
-        foreach ($this->newFunctionParameters[$functionLc] as $offset => $parameterDetails) {
-            if ($offset <= $parameterOffsetFound) {
+        foreach ( $this->newFunctionParameters[ $functionLc ] as $offset => $parameterDetails ) {
+            if ( $offset <= $parameterOffsetFound ) {
                 $itemInfo = array(
                     'name'   => $function,
                     'nameLc' => $functionLc,
                     'offset' => $offset,
                 );
-                $this->handleFeature($phpcsFile, $openParenthesis, $itemInfo);
+                $this->handleFeature( $phpcsFile, $openParenthesis, $itemInfo );
             }
         }
     }
@@ -1009,9 +1009,9 @@ 
      *
      * @return array Version and other information about the item.
      */
-    public function getItemArray(array $itemInfo)
+    public function getItemArray( array $itemInfo )
     {
-        return $this->newFunctionParameters[$itemInfo['nameLc']][$itemInfo['offset']];
+        return $this->newFunctionParameters[ $itemInfo[ 'nameLc' ] ][ $itemInfo[ 'offset' ] ];
     }
 
 
@@ -1022,7 +1022,7 @@ 
      */
     protected function getNonVersionArrayKeys()
     {
-        return array('name');
+        return array( 'name' );
     }
 
 
@@ -1034,10 +1034,10 @@ 
      *
      * @return array
      */
-    public function getErrorInfo(array $itemArray, array $itemInfo)
+    public function getErrorInfo( array $itemArray, array $itemInfo )
     {
-        $errorInfo              = parent::getErrorInfo($itemArray, $itemInfo);
-        $errorInfo['paramName'] = $itemArray['name'];
+        $errorInfo              = parent::getErrorInfo( $itemArray, $itemInfo );
+        $errorInfo[ 'paramName' ] = $itemArray[ 'name' ];
 
         return $errorInfo;
     }
@@ -1051,9 +1051,9 @@ 
      *
      * @return string
      */
-    protected function getItemName(array $itemInfo, array $errorInfo)
+    protected function getItemName( array $itemInfo, array $errorInfo )
     {
-        return $itemInfo['name'] . '_' . $errorInfo['paramName'];
+        return $itemInfo[ 'name' ] . '_' . $errorInfo[ 'paramName' ];
     }
 
 
@@ -1077,10 +1077,10 @@ 
      *
      * @return array
      */
-    protected function filterErrorData(array $data, array $itemInfo, array $errorInfo)
+    protected function filterErrorData( array $data, array $itemInfo, array $errorInfo )
     {
-        array_shift($data);
-        array_unshift($data, $itemInfo['name'], $errorInfo['paramName']);
+        array_shift( $data );
+        array_unshift( $data, $itemInfo[ 'name' ], $errorInfo[ 'paramName' ] );
         return $data;
     }
 }