Fix test

Author: julienfalque

src/Fixer/ClassNotation/VisibilityRequiredFixer.php

@@ -108,6 +108,8 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
         $tokensAnalyzer = new TokensAnalyzer($tokens);
         $elements = $tokensAnalyzer->getClassyElements();
 
+        $propertyTypeDeclarationKinds = [T_STRING, T_NS_SEPARATOR, CT::T_NULLABLE_TYPE, CT::T_ARRAY_TYPEHINT];
+
         foreach (array_reverse($elements, true) as $index => $element) {
             if (!\in_array($element['type'], $this->configuration['elements'], true)) {
                 continue;
@@ -121,15 +123,15 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
 
             $expectedKinds = [T_ABSTRACT, T_FINAL, T_PRIVATE, T_PROTECTED, T_PUBLIC, T_STATIC, T_VAR];
             if ('property' === $element['type']) {
-                $expectedKinds = array_merge($expectedKinds, [T_STRING, T_NS_SEPARATOR, CT::T_NULLABLE_TYPE]);
+                $expectedKinds = array_merge($expectedKinds, $propertyTypeDeclarationKinds);
             }
 
             while ($tokens[$prevIndex]->isGivenKind($expectedKinds)) {
                 if ($tokens[$prevIndex]->isGivenKind([T_ABSTRACT, T_FINAL])) {
                     $abstractFinalIndex = $prevIndex;
                 } elseif ($tokens[$prevIndex]->isGivenKind(T_STATIC)) {
                     $staticIndex = $prevIndex;
-                } elseif ($tokens[$prevIndex]->isGivenKind([T_STRING, T_NS_SEPARATOR, CT::T_NULLABLE_TYPE])) {
+                } elseif ($tokens[$prevIndex]->isGivenKind($propertyTypeDeclarationKinds)) {
                     $typeIndex = $prevIndex;
                 } else {
                     $visibilityIndex = $prevIndex;

src/Tokenizer/Transformer/NullableTypeTransformer.php

@@ -63,7 +63,7 @@ public function process(Tokens $tokens, Token $token, $index)
         $prevIndex = $tokens->getPrevMeaningfulToken($index);
         $prevToken = $tokens[$prevIndex];
 
-        if ($prevToken->equalsAny(['(', ',', [CT::T_TYPE_COLON], [T_PRIVATE], [T_PROTECTED], [T_PUBLIC], [T_VAR]])) {
+        if ($prevToken->equalsAny(['(', ',', [CT::T_TYPE_COLON], [T_PRIVATE], [T_PROTECTED], [T_PUBLIC], [T_VAR], [T_STATIC]])) {
             $tokens[$index] = new Token([CT::T_NULLABLE_TYPE, '?']);
         }
     }

tests/Fixer/ClassNotation/VisibilityRequiredFixerTest.php

@@ -819,6 +819,7 @@ public function provideFix74Cases()
         ];
         yield [
             '<?php class Foo { public static ?array $foo; }',
+            '<?php class Foo { static public ?array $foo; }',
         ];
     }
 }

tests/Tokenizer/Transformer/NullableTypeTransformerTest.php

@@ -149,6 +149,13 @@ public function provideProcessPhp74Cases()
                     16 => CT::T_NULLABLE_TYPE,
                 ],
             ],
+            [
+                '<?php class Foo { public ?array $foo; public static ?array $bar; }',
+                [
+                    9 => CT::T_NULLABLE_TYPE,
+                    19 => CT::T_NULLABLE_TYPE,
+                ],
+            ],
         ];
     }
 }