bug #3924 FullyQualifiedStrictTypesFixer - space bug (dmvdbrugge)

This PR was merged into the 2.12 branch. Discussion ---------- FullyQualifiedStrictTypesFixer - space bug This fixes #3861 Commits ------- 51d1199 Fix ArgumentsAnalyzer
PHP-CS-Fixer · Aug 10, 2018 · b64651d · b64651d
2 parents 1c10240 + 51d1199
commit b64651d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/src/Tokenizer/Analyzer/ArgumentsAnalyzer.php b/src/Tokenizer/Analyzer/ArgumentsAnalyzer.php
@@ -107,7 +107,7 @@ public function getArgumentInfo(Tokens $tokens, $argumentStart, $argumentEnd)
         $sawName = false;
         for ($index = $argumentStart; $index <= $argumentEnd; ++$index) {
             $token = $tokens[$index];
-            if ($token->isComment() || $token->isWhitespace() || $token->isGivenKind(T_ELLIPSIS)) {
+            if ($token->isComment() || $token->isWhitespace() || $token->isGivenKind(T_ELLIPSIS) || $token->equals('&')) {
                 continue;
             }
             if ($token->isGivenKind(T_VARIABLE)) {

diff --git a/tests/Fixer/Import/FullyQualifiedStrictTypesFixerTest.php b/tests/Fixer/Import/FullyQualifiedStrictTypesFixerTest.php
@@ -371,6 +371,13 @@ public function doSomething(
     ){}
 }',
             ],
+            // Test reference
+            [
+                '<?php
+function withReference(Exception &$e) {}',
+                '<?php
+function withReference(\Exception &$e) {}',
+            ],
         ];
     }
 }
diff --git a/tests/Tokenizer/Analyzer/ArgumentsAnalyzerTest.php b/tests/Tokenizer/Analyzer/ArgumentsAnalyzerTest.php
@@ -116,6 +116,16 @@ public function provideArgumentsInfoCases()
                     3
                 )
             )],
+            ['<?php function(array &$a = array()){};', 3, 12, new ArgumentAnalysis(
+                '$a',
+                6,
+                'array()',
+                new TypeAnalysis(
+                    'array',
+                    3,
+                    3
+                )
+            )],
             ['<?php function(array ... $a){};', 3, 7, new ArgumentAnalysis(
                 '$a',
                 7,