Merge branch 'master' into 3.0

src/Fixer/ClassNotation/ClassAttributesSeparationFixer.php

@@ -229,7 +229,7 @@ class Sample
      */
     private function fixSpaceAboveClassElement(Tokens $tokens, $classStartIndex, $elementIndex)
     {
-        static $methodAttr = [T_PRIVATE, T_PROTECTED, T_PUBLIC, T_ABSTRACT, T_FINAL, T_STATIC, T_STRING, T_NS_SEPARATOR, T_VAR, CT::T_NULLABLE_TYPE];
+        static $methodAttr = [T_PRIVATE, T_PROTECTED, T_PUBLIC, T_ABSTRACT, T_FINAL, T_STATIC, T_STRING, T_NS_SEPARATOR, T_VAR, CT::T_NULLABLE_TYPE, CT::T_ARRAY_TYPEHINT];
 
         $nonWhiteAbove = null;
 

src/Fixer/ClassNotation/SingleClassElementPerStatementFixer.php

@@ -209,7 +209,7 @@ final class Example
     private function getModifiersSequences(Tokens $tokens, $type, $startIndex, $endIndex)
     {
         if ('property' === $type) {
-            $tokenKinds = [T_PUBLIC, T_PROTECTED, T_PRIVATE, T_STATIC, T_VAR, T_STRING, T_NS_SEPARATOR, CT::T_NULLABLE_TYPE];
+            $tokenKinds = [T_PUBLIC, T_PROTECTED, T_PRIVATE, T_STATIC, T_VAR, T_STRING, T_NS_SEPARATOR, CT::T_NULLABLE_TYPE, CT::T_ARRAY_TYPEHINT];
         } else {
             $tokenKinds = [T_PUBLIC, T_PROTECTED, T_PRIVATE, T_CONST];
         }

src/Fixer/Phpdoc/PhpdocVarAnnotationCorrectOrderFixer.php

@@ -52,7 +52,7 @@ $foo = 2 + 2;
             }
 
             $newContent = Preg::replace(
-                '/(@(?:type|var)\s*)(\$\S+)(\s+)([^\$](?:[^<\s]|<[^>]*>)*)(\s|\*)/i',
+                '/(@(?:type|var)\s*)(\$\S+)(\h+)([^\$](?:[^<\s]|<[^>]*>)*)(\s|\*)/i',
                 '$1$4$3$2$5',
                 $token->getContent()
             );

src/Fixer/StringNotation/ExplicitStringVariableFixer.php

@@ -92,7 +92,9 @@ EOT
             $nextIndex = $index + 1;
             $squareBracketCount = 0;
             while (!$this->isStringPartToken($tokens[$nextIndex])) {
-                if ($tokens[$nextIndex]->isGivenKind(T_VARIABLE) && 1 !== $squareBracketCount) {
+                if ($tokens[$nextIndex]->isGivenKind(T_CURLY_OPEN)) {
+                    $nextIndex = $tokens->getNextTokenOfKind($nextIndex, [[CT::T_CURLY_CLOSE]]);
+                } elseif ($tokens[$nextIndex]->isGivenKind(T_VARIABLE) && 1 !== $squareBracketCount) {
                     $distinctVariableIndex = $nextIndex;
                     $variableTokens[$distinctVariableIndex] = [
                         'tokens' => [$nextIndex => $tokens[$nextIndex]],

src/Tokenizer/TokensAnalyzer.php

@@ -331,7 +331,7 @@ final class TokensAnalyzer
             $prevIndex = $this->tokens->getPrevMeaningfulToken($prevIndex);
         }
 
-        if ($this->tokens[$prevIndex]->isGivenKind([CT::T_CONST_IMPORT, T_EXTENDS, CT::T_FUNCTION_IMPORT, T_IMPLEMENTS, T_INSTANCEOF, T_INSTEADOF, T_NAMESPACE, T_NEW, CT::T_NULLABLE_TYPE, T_USE, CT::T_USE_TRAIT])) {
+        if ($this->tokens[$prevIndex]->isGivenKind([CT::T_CONST_IMPORT, T_EXTENDS, CT::T_FUNCTION_IMPORT, T_IMPLEMENTS, T_INSTANCEOF, T_INSTEADOF, T_NAMESPACE, T_NEW, CT::T_NULLABLE_TYPE, CT::T_TYPE_COLON, T_USE, CT::T_USE_TRAIT])) {
             return false;
         }
 
@@ -353,7 +353,7 @@ final class TokensAnalyzer
                 $checkIndex = $this->tokens->getPrevMeaningfulToken($checkIndex);
             }
 
-            if ($this->tokens[$checkIndex]->isGivenKind([T_EXTENDS, CT::T_GROUP_IMPORT_BRACE_OPEN, T_IMPLEMENTS, CT::T_USE_TRAIT])) {
+            if ($this->tokens[$checkIndex]->isGivenKind([T_EXTENDS, CT::T_GROUP_IMPORT_BRACE_OPEN, T_IMPLEMENTS, T_USE, CT::T_USE_TRAIT])) {
                 return false;
             }
         }

tests/Fixer/ClassNotation/ClassAttributesSeparationFixerTest.php

@@ -1115,5 +1115,19 @@ private $d = 123;
                 var ? Foo\Bar $qux;
             }',
         ];
+
+        yield [
+            '<?php
+            class Foo {
+                private array $foo;
+
+                private array $bar;
+            }',
+            '<?php
+            class Foo {
+                private array $foo;
+                private array $bar;
+            }',
+        ];
     }
 }

tests/Fixer/ClassNotation/NoNullPropertyInitializationFixerTest.php

@@ -220,5 +220,8 @@ null;#13
         yield [
             '<?php class Foo { protected ? string $bar = null; }',
         ];
+        yield [
+            '<?php class Foo { protected ? array $bar = null; }',
+        ];
     }
 }

tests/Fixer/ClassNotation/OrderedClassElementsFixerTest.php

@@ -815,13 +815,13 @@ EOT
             '<?php
             class Foo {
                 public string $bar;
-                public iterable $baz;
+                public array $baz;
                 public ?int $foo;
                 public ? Foo\Bar $qux;
             }',
             '<?php
             class Foo {
-                public iterable $baz;
+                public array $baz;
                 public ? Foo\Bar $qux;
                 public string $bar;
                 public ?int $foo;

tests/Fixer/ClassNotation/ProtectedToPrivateFixerTest.php

@@ -162,6 +162,10 @@ final class Foo
             '<?php final class Foo { private ?string $foo; }',
             '<?php final class Foo { protected ?string $foo; }',
         ];
+        yield [
+            '<?php final class Foo { private array $foo; }',
+            '<?php final class Foo { protected array $foo; }',
+        ];
     }
 
     private function getAttributesAndMethods($original)

tests/Fixer/ClassNotation/SingleClassElementPerStatementFixerTest.php

@@ -851,5 +851,14 @@ EOT
                 var ? Foo\Bar $foo, $bar;
             }',
         ];
+        yield [
+            '<?php class Foo {
+                var array $foo;
+                var array $bar;
+            }',
+            '<?php class Foo {
+                var array $foo, $bar;
+            }',
+        ];
     }
 }