minor #6171 Fix tests and CS (SpacePossum)

This PR was merged into the master branch. Discussion ---------- Fix tests and CS Commits ------- e4c4b9f Fix tests and CS.
PHP-CS-Fixer · Dec 14, 2021 · ea5a185 · ea5a185
2 parents 4ecba58 + e4c4b9f
commit ea5a185
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -124,7 +124,9 @@ jobs:
         env:
           PHP_CS_FIXER_IGNORE_ENV: ${{ matrix.PHP_CS_FIXER_IGNORE_ENV }}
           FAST_LINT_TEST_CASES: ${{ matrix.FAST_LINT_TEST_CASES }}
-        run: vendor/bin/phpunit ${{ matrix.phpunit-flags }}
+        run: |
+          php -v
+          vendor/bin/phpunit ${{ matrix.phpunit-flags }}
 
       - name: Upload coverage results to Coveralls
         if: matrix.calculate-code-coverage == 'yes'

diff --git a/src/Tokenizer/Tokens.php b/src/Tokenizer/Tokens.php
@@ -859,8 +859,10 @@ public function insertSlices(array $slices): void
 
         krsort($slices);
 
-        if (array_key_first($slices) > $oldSize) {
-            throw new \OutOfBoundsException('Cannot insert outside of collection.');
+        $firstIndex = key($slices);
+
+        if (!\is_int($firstIndex) || $firstIndex > $oldSize) {
+            throw new \OutOfBoundsException(sprintf('Invalid index "%s".', $firstIndex));
         }
 
         $insertBound = $oldSize - 1;

diff --git a/src/Tokenizer/Transformer/ReturnRefTransformer.php b/src/Tokenizer/Transformer/ReturnRefTransformer.php
@@ -46,7 +46,7 @@ public function process(Tokens $tokens, Token $token, int $index): void
             $prevKinds[] = T_FN;
         }
 
-        if (($token->equals('&')) && $tokens[$tokens->getPrevMeaningfulToken($index)]->isGivenKind($prevKinds)) {
+        if ($token->equals('&') && $tokens[$tokens->getPrevMeaningfulToken($index)]->isGivenKind($prevKinds)) {
             $tokens[$index] = new Token([CT::T_RETURN_REF, '&']);
         }
     }

diff --git a/tests/Fixer/ClassNotation/VisibilityRequiredFixerTest.php b/tests/Fixer/ClassNotation/VisibilityRequiredFixerTest.php
@@ -518,7 +518,6 @@ public function testInvalidConfigurationValue(): void
     }
 
     /**
-     * @requires PHP 7.1
      * @dataProvider provideFixClassConstCases
      */
     public function testFixClassConst(string $expected, string $input): void

diff --git a/tests/Tokenizer/TokensTest.php b/tests/Tokenizer/TokensTest.php
@@ -1485,8 +1485,8 @@ public function provideInsertSlicesCases(): iterable
 
         $slices = [
             [0 => $openTagToken],
-            [0 => [$openTagToken]],
-            [0 => Tokens::fromArray([$openTagToken])],
+            [0 => [clone $openTagToken]],
+            [0 => clone Tokens::fromArray([$openTagToken])],
         ];
 
         foreach ($slices as $i => $slice) {