Merge branch '2.15' into 2.16

julienfalque · julienfalque · commit 50a3a5859e5f · 2019-12-09T20:03:59.000+01:00
diff --git a/src/Fixer/ClassNotation/ClassAttributesSeparationFixer.php b/src/Fixer/ClassNotation/ClassAttributesSeparationFixer.php
@@ -229,7 +229,7 @@ private function fixSpaceBelowClassMethod(Tokens $tokens, $classEndIndex, $eleme
      */
     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;
 
diff --git a/src/Fixer/ClassNotation/SingleClassElementPerStatementFixer.php b/src/Fixer/ClassNotation/SingleClassElementPerStatementFixer.php
@@ -209,7 +209,7 @@ private function expandElement(Tokens $tokens, $type, $startIndex, $endIndex)
     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];
         }
diff --git a/src/Fixer/Phpdoc/PhpdocVarAnnotationCorrectOrderFixer.php b/src/Fixer/Phpdoc/PhpdocVarAnnotationCorrectOrderFixer.php
@@ -52,7 +52,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
             }
 
             $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()
             );
diff --git a/src/Fixer/StringNotation/ExplicitStringVariableFixer.php b/src/Fixer/StringNotation/ExplicitStringVariableFixer.php
@@ -92,7 +92,9 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
             $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]],
diff --git a/src/Tokenizer/TokensAnalyzer.php b/src/Tokenizer/TokensAnalyzer.php
@@ -331,7 +331,7 @@ public function isConstantInvocation($index)
             $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 @@ public function isConstantInvocation($index)
                 $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;
             }
         }
diff --git a/tests/Fixer/ClassNotation/ClassAttributesSeparationFixerTest.php b/tests/Fixer/ClassNotation/ClassAttributesSeparationFixerTest.php
@@ -1115,5 +1115,19 @@ class Foo {
                 var ? Foo\Bar $qux;
             }',
         ];
+
+        yield [
+            '<?php
+            class Foo {
+                private array $foo;
+
+                private array $bar;
+            }',
+            '<?php
+            class Foo {
+                private array $foo;
+                private array $bar;
+            }',
+        ];
     }
 }
diff --git a/tests/Fixer/ClassNotation/NoNullPropertyInitializationFixerTest.php b/tests/Fixer/ClassNotation/NoNullPropertyInitializationFixerTest.php
@@ -220,5 +220,8 @@ public function provideFix74Cases()
         yield [
             '<?php class Foo { protected ? string $bar = null; }',
         ];
+        yield [
+            '<?php class Foo { protected ? array $bar = null; }',
+        ];
     }
 }
diff --git a/tests/Fixer/ClassNotation/OrderedClassElementsFixerTest.php b/tests/Fixer/ClassNotation/OrderedClassElementsFixerTest.php
@@ -862,13 +862,13 @@ class Foo {
             '<?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;
diff --git a/tests/Fixer/ClassNotation/ProtectedToPrivateFixerTest.php b/tests/Fixer/ClassNotation/ProtectedToPrivateFixerTest.php
@@ -162,6 +162,10 @@ public function provideFix74Cases()
             '<?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)
diff --git a/tests/Fixer/ClassNotation/SingleClassElementPerStatementFixerTest.php b/tests/Fixer/ClassNotation/SingleClassElementPerStatementFixerTest.php
@@ -874,5 +874,14 @@ public function provideTestFix74Cases()
                 var ? Foo\Bar $foo, $bar;
             }',
         ];
+        yield [
+            '<?php class Foo {
+                var array $foo;
+                var array $bar;
+            }',
+            '<?php class Foo {
+                var array $foo, $bar;
+            }',
+        ];
     }
 }
diff --git a/tests/Fixer/Naming/NoHomoglyphNamesFixerTest.php b/tests/Fixer/Naming/NoHomoglyphNamesFixerTest.php
@@ -125,6 +125,10 @@ public function provideFix74Cases()
                 '<?php class A { private ? Foo\Bar $name; }',
                 '<?php class A { private ? Foo\Bar $nаmе; }',
             ],
+            [
+                '<?php class A { private array $name; }',
+                '<?php class A { private array $nаmе; }',
+            ],
         ];
     }
 }
diff --git a/tests/Fixer/Phpdoc/PhpdocToCommentFixerTest.php b/tests/Fixer/Phpdoc/PhpdocToCommentFixerTest.php
@@ -702,6 +702,15 @@ class Foo {
                     var ? Foo\Bar $foo;
                 }',
             ],
+            [
+                '<?php
+                class Foo {
+                    /**
+                     * Do not convert this
+                     */
+                    var ? array $foo;
+                }',
+            ],
         ];
     }
 }
diff --git a/tests/Fixer/Phpdoc/PhpdocVarAnnotationCorrectOrderFixerTest.php b/tests/Fixer/Phpdoc/PhpdocVarAnnotationCorrectOrderFixerTest.php
@@ -161,5 +161,17 @@ public function provideFixCases()
 /** @var $foo Foo|array<int, int>|null */
 ',
         ];
+
+        yield [
+            '<?php
+                class Foo
+                {
+                    /**
+                     * @var $bar
+                     */
+                    private $bar;
+                }
+            ',
+        ];
     }
 }
diff --git a/tests/Fixer/StringNotation/ExplicitStringVariableFixerTest.php b/tests/Fixer/StringNotation/ExplicitStringVariableFixerTest.php
@@ -208,6 +208,14 @@ public function provideTestFixCases()
                 '<?php $mobileNumberVisible = "***-***-{$last4Digits[0]}{$last4Digits[1]}-{$last4Digits[2]}{$last4Digits[3]}";',
                 '<?php $mobileNumberVisible = "***-***-$last4Digits[0]$last4Digits[1]-$last4Digits[2]$last4Digits[3]";',
             ],
+            [
+                '<?php $pair = "${foo} {$bar[0]}";',
+                '<?php $pair = "$foo {$bar[0]}";',
+            ],
+            [
+                '<?php $pair = "${foo}{$bar[0]}";',
+                '<?php $pair = "$foo{$bar[0]}";',
+            ],
         ];
     }
 
diff --git a/tests/Tokenizer/TokensAnalyzerTest.php b/tests/Tokenizer/TokensAnalyzerTest.php
@@ -131,7 +131,7 @@ public function testGetClassyElementsWithNullableProperties()
 class Foo
 {
     public int $prop0;
-    protected ?int $prop1;
+    protected ?array $prop1;
     private string $prop2 = 1;
     var ? Foo\Bar $prop3 = array(1,2,3);
 }
@@ -786,6 +786,10 @@ public function provideIsConstantInvocationCases()
                 '<?php interface Foo extends Bar, Baz, Qux {}',
                 [7 => false, 10 => false, 13 => false],
             ],
+            [
+                '<?php use Foo\Bar, Foo\Baz, Foo\Qux;',
+                [3 => false, 5 => false, 8 => false, 10 => false, 13 => false, 15 => false],
+            ],
         ];
     }
 
@@ -852,6 +856,10 @@ public function provideIsConstantInvocation71Cases()
                 '<?php interface Foo { public function bar(): Baz; }',
                 [16 => false],
             ],
+            [
+                '<?php interface Foo { public function bar(): \Baz; }',
+                [17 => false],
+            ],
             [
                 '<?php interface Foo { public function bar(): ?Baz; }',
                 [17 => false],

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ private function fixSpaceBelowClassMethod(Tokens $tokens, $classEndIndex, $eleme`
`229`	`229`	`*/`
`230`	`230`	`private function fixSpaceAboveClassElement(Tokens $tokens, $classStartIndex, $elementIndex)`
`231`	`231`	`{`
`232`		`- 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];`
	`232`	`+ 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];`
`233`	`233`
`234`	`234`	`$nonWhiteAbove = null;`
`235`	`235`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ private function expandElement(Tokens $tokens, $type, $startIndex, $endIndex)`
`209`	`209`	`private function getModifiersSequences(Tokens $tokens, $type, $startIndex, $endIndex)`
`210`	`210`	`{`
`211`	`211`	`if ('property' === $type) {`
`212`		`- $tokenKinds = [T_PUBLIC, T_PROTECTED, T_PRIVATE, T_STATIC, T_VAR, T_STRING, T_NS_SEPARATOR, CT::T_NULLABLE_TYPE];`
	`212`	`+ $tokenKinds = [T_PUBLIC, T_PROTECTED, T_PRIVATE, T_STATIC, T_VAR, T_STRING, T_NS_SEPARATOR, CT::T_NULLABLE_TYPE, CT::T_ARRAY_TYPEHINT];`
`213`	`213`	`} else {`
`214`	`214`	`$tokenKinds = [T_PUBLIC, T_PROTECTED, T_PRIVATE, T_CONST];`
`215`	`215`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`$newContent = Preg::replace(`
`55`		`- '/(@(?:type\|var)\s)(\$\S+)(\s+)([^\$](?:[^<\s]\|<[^>]>))(\s\|\)/i',`
	`55`	`+ '/(@(?:type\|var)\s)(\$\S+)(\h+)([^\$](?:[^<\s]\|<[^>]>))(\s\|\)/i',`
`56`	`56`	`'$1$4$3$2$5',`
`57`	`57`	`$token->getContent()`
`58`	`58`	`);`
Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ public function isConstantInvocation($index)`
`331`	`331`	`$prevIndex = $this->tokens->getPrevMeaningfulToken($prevIndex);`
`332`	`332`	`}`
`333`	`333`
`334`		`- 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])) {`
	`334`	`+ 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])) {`
`335`	`335`	`return false;`
`336`	`336`	`}`
`337`	`337`
`@@ -353,7 +353,7 @@ public function isConstantInvocation($index)`
`353`	`353`	`$checkIndex = $this->tokens->getPrevMeaningfulToken($checkIndex);`
`354`	`354`	`}`
`355`	`355`
`356`		`- if ($this->tokens[$checkIndex]->isGivenKind([T_EXTENDS, CT::T_GROUP_IMPORT_BRACE_OPEN, T_IMPLEMENTS, CT::T_USE_TRAIT])) {`
	`356`	`+ if ($this->tokens[$checkIndex]->isGivenKind([T_EXTENDS, CT::T_GROUP_IMPORT_BRACE_OPEN, T_IMPLEMENTS, T_USE, CT::T_USE_TRAIT])) {`
`357`	`357`	`return false;`
`358`	`358`	`}`
`359`	`359`	`}`
Original file line number	Diff line number	Diff line change
`@@ -220,5 +220,8 @@ public function provideFix74Cases()`
`220`	`220`	`yield [`
`221`	`221`	`'<?php class Foo { protected ? string $bar = null; }',`
`222`	`222`	`];`
	`223`	`+ yield [`
	`224`	`+ '<?php class Foo { protected ? array $bar = null; }',`
	`225`	`+ ];`
`223`	`226`	`}`
`224`	`227`	`}`