Browse Source

chore: tests/Tokenizer/Transformer - better typehinting (#8243)

Dariusz Rumiński 5 months ago
parent
commit
60618e4681

+ 5 - 2
tests/Test/AbstractTransformerTestCase.php

@@ -24,6 +24,9 @@ use PhpCsFixer\Tokenizer\TransformerInterface;
  * @author Dariusz Rumiński <dariusz.ruminski@gmail.com>
  *
  * @internal
+ *
+ * @phpstan-type _TransformerTestExpectedTokens array<int, int|string>
+ * @phpstan-type _TransformerTestObservedKindsOrPrototypes list<int|string>
  */
 abstract class AbstractTransformerTestCase extends TestCase
 {
@@ -108,8 +111,8 @@ abstract class AbstractTransformerTestCase extends TestCase
     }
 
     /**
-     * @param array<int, int|string> $expectedTokens
-     * @param list<int>              $observedKindsOrPrototypes
+     * @param _TransformerTestExpectedTokens            $expectedTokens
+     * @param _TransformerTestObservedKindsOrPrototypes $observedKindsOrPrototypes
      */
     protected function doTest(string $source, array $expectedTokens, array $observedKindsOrPrototypes = []): void
     {

+ 3 - 1
tests/Tokenizer/Transformer/ArrayTypehintTransformerTest.php

@@ -23,11 +23,13 @@ use PhpCsFixer\Tokenizer\CT;
  * @internal
  *
  * @covers \PhpCsFixer\Tokenizer\Transformer\ArrayTypehintTransformer
+ *
+ * @phpstan-import-type _TransformerTestExpectedTokens from AbstractTransformerTestCase
  */
 final class ArrayTypehintTransformerTest extends AbstractTransformerTestCase
 {
     /**
-     * @param array<int, int> $expectedTokens
+     * @param _TransformerTestExpectedTokens $expectedTokens
      *
      * @dataProvider provideProcessCases
      */

+ 3 - 1
tests/Tokenizer/Transformer/AttributeTransformerTest.php

@@ -22,11 +22,13 @@ use PhpCsFixer\Tokenizer\Tokens;
  * @internal
  *
  * @covers \PhpCsFixer\Tokenizer\Transformer\AttributeTransformer
+ *
+ * @phpstan-import-type _TransformerTestExpectedTokens from AbstractTransformerTestCase
  */
 final class AttributeTransformerTest extends AbstractTransformerTestCase
 {
     /**
-     * @param array<int, int> $expectedTokens
+     * @param _TransformerTestExpectedTokens $expectedTokens
      *
      * @dataProvider provideProcessCases
      *

+ 12 - 9
tests/Tokenizer/Transformer/BraceClassInstantiationTransformerTest.php

@@ -23,12 +23,15 @@ use PhpCsFixer\Tokenizer\CT;
  * @internal
  *
  * @covers \PhpCsFixer\Tokenizer\Transformer\BraceClassInstantiationTransformer
+ *
+ * @phpstan-import-type _TransformerTestExpectedTokens from AbstractTransformerTestCase
+ * @phpstan-import-type _TransformerTestObservedKindsOrPrototypes from AbstractTransformerTestCase
  */
 final class BraceClassInstantiationTransformerTest extends AbstractTransformerTestCase
 {
     /**
-     * @param array<int, int|string> $expectedTokens
-     * @param list<int>              $observedKinds
+     * @param _TransformerTestExpectedTokens            $expectedTokens
+     * @param _TransformerTestObservedKindsOrPrototypes $observedKinds
      *
      * @dataProvider provideProcessCases
      */
@@ -381,8 +384,8 @@ final class BraceClassInstantiationTransformerTest extends AbstractTransformerTe
     }
 
     /**
-     * @param array<int, int|string> $expectedTokens
-     * @param list<int>              $observedKinds
+     * @param _TransformerTestExpectedTokens            $expectedTokens
+     * @param _TransformerTestObservedKindsOrPrototypes $observedKinds
      *
      * @dataProvider provideProcessPhp80Cases
      *
@@ -432,8 +435,8 @@ final class BraceClassInstantiationTransformerTest extends AbstractTransformerTe
     }
 
     /**
-     * @param array<int, int|string> $expectedTokens
-     * @param list<int>              $observedKinds
+     * @param _TransformerTestExpectedTokens            $expectedTokens
+     * @param _TransformerTestObservedKindsOrPrototypes $observedKinds
      *
      * @dataProvider provideProcessPhp81Cases
      *
@@ -488,8 +491,8 @@ function test2($param = (new Foo)) {}
     }
 
     /**
-     * @param array<int, int|string> $expectedTokens
-     * @param list<int>              $observedKinds
+     * @param _TransformerTestExpectedTokens            $expectedTokens
+     * @param _TransformerTestObservedKindsOrPrototypes $observedKinds
      *
      * @dataProvider provideProcessPrePhp84Cases
      *
@@ -505,7 +508,7 @@ function test2($param = (new Foo)) {}
     }
 
     /**
-     * @return iterable<array{string, array<int, string>, list<int|string>}>
+     * @return iterable<array{string, _TransformerTestExpectedTokens, _TransformerTestObservedKindsOrPrototypes}>
      */
     public static function provideProcessPrePhp84Cases(): iterable
     {

+ 7 - 5
tests/Tokenizer/Transformer/BraceTransformerTest.php

@@ -24,11 +24,13 @@ use PhpCsFixer\Tokenizer\Tokens;
  * @internal
  *
  * @covers \PhpCsFixer\Tokenizer\Transformer\BraceTransformer
+ *
+ * @phpstan-import-type _TransformerTestExpectedTokens from AbstractTransformerTestCase
  */
 final class BraceTransformerTest extends AbstractTransformerTestCase
 {
     /**
-     * @param array<int, int> $expectedTokens
+     * @param _TransformerTestExpectedTokens $expectedTokens
      *
      * @dataProvider provideProcessCases
      */
@@ -159,7 +161,7 @@ final class BraceTransformerTest extends AbstractTransformerTestCase
     }
 
     /**
-     * @param array<int, int> $expectedTokens
+     * @param _TransformerTestExpectedTokens $expectedTokens
      *
      * @dataProvider provideProcess80Cases
      *
@@ -199,7 +201,7 @@ final class BraceTransformerTest extends AbstractTransformerTestCase
     }
 
     /**
-     * @param array<int, int> $expectedTokens
+     * @param _TransformerTestExpectedTokens $expectedTokens
      *
      * @dataProvider providePre84ProcessCases
      *
@@ -339,7 +341,7 @@ final class BraceTransformerTest extends AbstractTransformerTestCase
     }
 
     /**
-     * @param array<int, int> $expectedTokens
+     * @param _TransformerTestExpectedTokens $expectedTokens
      *
      * @dataProvider provideDynamicClassConstantFetchCases
      *
@@ -437,7 +439,7 @@ final class BraceTransformerTest extends AbstractTransformerTestCase
     }
 
     /**
-     * @param array<int, int> $expectedTokens
+     * @param _TransformerTestExpectedTokens $expectedTokens
      *
      * @dataProvider provideDynamicClassConstantFetchPhp83Cases
      *

+ 3 - 1
tests/Tokenizer/Transformer/ClassConstantTransformerTest.php

@@ -23,11 +23,13 @@ use PhpCsFixer\Tokenizer\CT;
  * @internal
  *
  * @covers \PhpCsFixer\Tokenizer\Transformer\ClassConstantTransformer
+ *
+ * @phpstan-import-type _TransformerTestExpectedTokens from AbstractTransformerTestCase
  */
 final class ClassConstantTransformerTest extends AbstractTransformerTestCase
 {
     /**
-     * @param array<int, int> $expectedTokens
+     * @param _TransformerTestExpectedTokens $expectedTokens
      *
      * @dataProvider provideProcessCases
      */

+ 4 - 2
tests/Tokenizer/Transformer/ConstructorPromotionTransformerTest.php

@@ -22,11 +22,13 @@ use PhpCsFixer\Tokenizer\Tokens;
  * @internal
  *
  * @covers \PhpCsFixer\Tokenizer\Transformer\ConstructorPromotionTransformer
+ *
+ * @phpstan-import-type _TransformerTestExpectedTokens from AbstractTransformerTestCase
  */
 final class ConstructorPromotionTransformerTest extends AbstractTransformerTestCase
 {
     /**
-     * @param array<int, int> $expectedTokens
+     * @param _TransformerTestExpectedTokens $expectedTokens
      *
      * @dataProvider provideProcessCases
      *
@@ -127,7 +129,7 @@ class Point {
     }
 
     /**
-     * @param array<int, int> $expectedTokens
+     * @param _TransformerTestExpectedTokens $expectedTokens
      *
      * @dataProvider provideFix81Cases
      *

+ 4 - 2
tests/Tokenizer/Transformer/DisjunctiveNormalFormTypeParenthesisTransformerTest.php

@@ -22,12 +22,14 @@ use PhpCsFixer\Tokenizer\CT;
  *
  * @internal
  *
+ * @phpstan-import-type _TransformerTestExpectedTokens from AbstractTransformerTestCase
+ *
  * @requires PHP 8.2
  */
 final class DisjunctiveNormalFormTypeParenthesisTransformerTest extends AbstractTransformerTestCase
 {
     /**
-     * @param array<int, int> $expectedTokens
+     * @param _TransformerTestExpectedTokens $expectedTokens
      *
      * @dataProvider provideProcessCases
      */
@@ -326,7 +328,7 @@ return new static();
     }
 
     /**
-     * @param array<int, int> $expectedTokens
+     * @param _TransformerTestExpectedTokens $expectedTokens
      *
      * @dataProvider provideProcess83Cases
      *

+ 3 - 1
tests/Tokenizer/Transformer/FirstClassCallableTransformerTest.php

@@ -21,11 +21,13 @@ use PhpCsFixer\Tokenizer\CT;
  * @internal
  *
  * @covers \PhpCsFixer\Tokenizer\Transformer\FirstClassCallableTransformer
+ *
+ * @phpstan-import-type _TransformerTestExpectedTokens from AbstractTransformerTestCase
  */
 final class FirstClassCallableTransformerTest extends AbstractTransformerTestCase
 {
     /**
-     * @param array<int, int> $expectedTokens
+     * @param _TransformerTestExpectedTokens $expectedTokens
      *
      * @dataProvider provideProcessCases
      *

+ 3 - 1
tests/Tokenizer/Transformer/ImportTransformerTest.php

@@ -23,11 +23,13 @@ use PhpCsFixer\Tokenizer\CT;
  * @internal
  *
  * @covers \PhpCsFixer\Tokenizer\Transformer\ImportTransformer
+ *
+ * @phpstan-import-type _TransformerTestExpectedTokens from AbstractTransformerTestCase
  */
 final class ImportTransformerTest extends AbstractTransformerTestCase
 {
     /**
-     * @param array<int, int> $expectedTokens
+     * @param _TransformerTestExpectedTokens $expectedTokens
      *
      * @dataProvider provideProcessCases
      */

Some files were not shown because too many files changed in this diff