Merge branch '2.17'

PHP-CS-Fixer · Jan 18, 2021 · adf246f · adf246f
2 parents f5f4639 + f209e6d
commit adf246f
Show file tree

Hide file tree

Showing 9 changed files with 418 additions and 8 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -15,14 +15,14 @@
     convertErrorsToExceptions="true"
     convertNoticesToExceptions="true"
     convertWarningsToExceptions="true"
-    defaultTimeLimit="3"
+    defaultTimeLimit="10"
     enforceTimeLimit="true"
     failOnWarning="true"
     processIsolation="false"
     stopOnFailure="false"
-    timeoutForSmallTests="3"
-    timeoutForMediumTests="6"
-    timeoutForLargeTests="9"
+    timeoutForSmallTests="10"
+    timeoutForMediumTests="20"
+    timeoutForLargeTests="30"
     verbose="false"
 >
     <testsuites>

diff --git a/src/Fixer/PhpUnit/PhpUnitTestCaseStaticMethodCallsFixer.php b/src/Fixer/PhpUnit/PhpUnitTestCaseStaticMethodCallsFixer.php
@@ -473,8 +473,10 @@ private function needsConversion(Tokens $tokens, $index, $referenceIndex, $callT
      */
     private function findEndOfNextBlock(Tokens $tokens, $index)
     {
-        $index = $tokens->getNextTokenOfKind($index, ['{']);
+        $nextIndex = $tokens->getNextTokenOfKind($index, [';', '{']);
 
-        return $tokens->findBlockEnd(Tokens::BLOCK_TYPE_CURLY_BRACE, $index);
+        return $tokens[$nextIndex]->equals('{')
+            ? $tokens->findBlockEnd(Tokens::BLOCK_TYPE_CURLY_BRACE, $nextIndex)
+            : $nextIndex;
     }
 }
diff --git a/src/Tokenizer/Analyzer/ArgumentsAnalyzer.php b/src/Tokenizer/Analyzer/ArgumentsAnalyzer.php
@@ -54,12 +54,14 @@ public function getArguments(Tokens $tokens, $openParenthesis, $closeParenthesis
     {
         $arguments = [];
         $firstSensibleToken = $tokens->getNextMeaningfulToken($openParenthesis);
+
         if ($tokens[$firstSensibleToken]->equals(')')) {
             return $arguments;
         }
 
         $paramContentIndex = $openParenthesis + 1;
         $argumentsStart = $paramContentIndex;
+
         for (; $paramContentIndex < $closeParenthesis; ++$paramContentIndex) {
             $token = $tokens[$paramContentIndex];
 
@@ -106,21 +108,26 @@ public function getArgumentInfo(Tokens $tokens, $argumentStart, $argumentEnd)
         ];
 
         $sawName = false;
+
         for ($index = $argumentStart; $index <= $argumentEnd; ++$index) {
             $token = $tokens[$index];
+
             if ($token->isComment() || $token->isWhitespace() || $token->isGivenKind(T_ELLIPSIS) || $token->equals('&')) {
                 continue;
             }
+
             if ($token->isGivenKind(T_VARIABLE)) {
                 $sawName = true;
                 $info['name_index'] = $index;
                 $info['name'] = $token->getContent();
 
                 continue;
             }
+
             if ($token->equals('=')) {
                 continue;
             }
+
             if ($sawName) {
                 $info['default'] .= $token->getContent();
             } else {

diff --git a/src/Tokenizer/Analyzer/FunctionsAnalyzer.php b/src/Tokenizer/Analyzer/FunctionsAnalyzer.php
@@ -153,14 +153,16 @@ public function getFunctionReturnType(Tokens $tokens, $methodIndex)
         $argumentsStart = $tokens->getNextTokenOfKind($methodIndex, ['(']);
         $argumentsEnd = $tokens->findBlockEnd(Tokens::BLOCK_TYPE_PARENTHESIS_BRACE, $argumentsStart);
         $typeColonIndex = $tokens->getNextMeaningfulToken($argumentsEnd);
-        if (':' !== $tokens[$typeColonIndex]->getContent()) {
+
+        if (!$tokens[$typeColonIndex]->isGivenKind(CT::T_TYPE_COLON)) {
             return null;
         }
 
         $type = '';
         $typeStartIndex = $tokens->getNextMeaningfulToken($typeColonIndex);
         $typeEndIndex = $typeStartIndex;
         $functionBodyStart = $tokens->getNextTokenOfKind($typeColonIndex, ['{', ';', [T_DOUBLE_ARROW]]);
+
         for ($i = $typeStartIndex; $i < $functionBodyStart; ++$i) {
             if ($tokens[$i]->isWhitespace() || $tokens[$i]->isComment()) {
                 continue;

diff --git a/src/Tokenizer/Transformer/TypeAlternationTransformer.php b/src/Tokenizer/Transformer/TypeAlternationTransformer.php
@@ -101,6 +101,12 @@ public function process(Tokens $tokens, Token $token, $index)
             return;
         }
 
+        if (\PHP_VERSION_ID >= 70400 && $prePrevToken->isGivenKind(T_FN)) {
+            $this->replaceToken($tokens, $index); // `|` is part of an array function variable `fn(int|null`
+
+            return;
+        }
+
         if (
             $prePrevToken->isGivenKind(T_STRING)
             && $tokens[$tokens->getPrevMeaningfulToken($prevPrevTokenIndex)]->isGivenKind(T_FUNCTION)

diff --git a/tests/Fixer/PhpUnit/PhpUnitTestCaseStaticMethodCallsFixerTest.php b/tests/Fixer/PhpUnit/PhpUnitTestCaseStaticMethodCallsFixerTest.php
@@ -466,6 +466,20 @@ public function foo()
 EOF
                 ,
             ],
+            'do not crash on abstract static function' => [
+                <<<'EOF'
+<?php
+abstract class FooTest extends TestCase
+{
+    abstract public static function dataProvider();
+}
+EOF
+                ,
+                null,
+                [
+                    'call_type' => PhpUnitTestCaseStaticMethodCallsFixer::CALL_TYPE_THIS,
+                ],
+            ],
         ];
     }