Merge pull request #1251 from PHPCSStandards/feature/assorted-minor-fixes

Assorted minor fixes

Author: jrfnl

src/Reports/Junit.php

@@ -115,7 +115,7 @@ public function generate(
         $tests   = 0;
         $matches = [];
         preg_match_all('/tests="([0-9]+)"/', $cachedData, $matches);
-        if (isset($matches[1]) === true) {
+        if (empty($matches[1]) === false) {
             foreach ($matches[1] as $match) {
                 $tests += $match;
             }

src/Standards/Generic/Sniffs/ControlStructures/DisallowYodaConditionsSniff.php

@@ -110,9 +110,7 @@ public function process(File $phpcsFile, $stackPtr)
                 if ($prev === false) {
                     return;
                 }
-            } else if ($tokens[$beforeOpeningParenthesisIndex]['code'] === T_ARRAY
-                && $this->isArrayStatic($phpcsFile, $beforeOpeningParenthesisIndex) === false
-            ) {
+            } else if ($this->isArrayStatic($phpcsFile, $beforeOpeningParenthesisIndex) === false) {
                 return;
             }//end if
         }//end if

src/Standards/PEAR/Sniffs/Formatting/MultiLineAssignmentSniff.php

@@ -62,7 +62,7 @@ public function process(File $phpcsFile, $stackPtr)
         }
 
         // Make sure it is the first thing on the line, otherwise we ignore it.
-        $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), false, true);
+        $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
         if ($prev === false) {
             // Bad assignment.
             return;

src/Standards/PEAR/Sniffs/Functions/FunctionDeclarationSniff.php

@@ -66,8 +66,6 @@ public function process(File $phpcsFile, $stackPtr)
 
         if (isset($tokens[$stackPtr]['parenthesis_opener']) === false
             || isset($tokens[$stackPtr]['parenthesis_closer']) === false
-            || $tokens[$stackPtr]['parenthesis_opener'] === null
-            || $tokens[$stackPtr]['parenthesis_closer'] === null
         ) {
             return;
         }

src/Standards/PSR12/Sniffs/Functions/ReturnTypeDeclarationSniff.php

@@ -47,8 +47,6 @@ public function process(File $phpcsFile, $stackPtr)
 
         if (isset($tokens[$stackPtr]['parenthesis_opener']) === false
             || isset($tokens[$stackPtr]['parenthesis_closer']) === false
-            || $tokens[$stackPtr]['parenthesis_opener'] === null
-            || $tokens[$stackPtr]['parenthesis_closer'] === null
         ) {
             return;
         }

src/Standards/Squiz/Sniffs/Commenting/VariableCommentSniff.php

@@ -68,9 +68,8 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
             break;
         }
 
-        if ($commentEnd === false
-            || ($tokens[$commentEnd]['code'] !== T_DOC_COMMENT_CLOSE_TAG
-            && $tokens[$commentEnd]['code'] !== T_COMMENT)
+        if ($tokens[$commentEnd]['code'] !== T_DOC_COMMENT_CLOSE_TAG
+            && $tokens[$commentEnd]['code'] !== T_COMMENT
         ) {
             $phpcsFile->addError('Missing member variable doc comment', $stackPtr, 'Missing');
             return;

src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php

@@ -70,8 +70,6 @@ public function process(File $phpcsFile, $stackPtr)
 
         if (isset($tokens[$stackPtr]['parenthesis_opener']) === false
             || isset($tokens[$stackPtr]['parenthesis_closer']) === false
-            || $tokens[$stackPtr]['parenthesis_opener'] === null
-            || $tokens[$stackPtr]['parenthesis_closer'] === null
         ) {
             return;
         }