bug #5137 DoctrineAnnotationSpacesFixer - fix for typed properties (kubawerlos)

This PR was squashed before being merged into the 2.15 branch (closes #5137).

Discussion
----------

DoctrineAnnotationSpacesFixer - fix for typed properties

Fixes #5135

Pinging @enumag for review (as reporter of bug).

Commits
-------

b58ee56 DoctrineAnnotationSpacesFixer - fix for typed properties

Author: SpacePossum

src/AbstractDoctrineAnnotationFixer.php

@@ -16,6 +16,7 @@
 use PhpCsFixer\Fixer\ConfigurationDefinitionFixerInterface;
 use PhpCsFixer\FixerConfiguration\FixerConfigurationResolver;
 use PhpCsFixer\FixerConfiguration\FixerOptionBuilder;
+use PhpCsFixer\Tokenizer\CT;
 use PhpCsFixer\Tokenizer\Token as PhpToken;
 use PhpCsFixer\Tokenizer\Tokens as PhpTokens;
 use PhpCsFixer\Tokenizer\TokensAnalyzer;
@@ -212,7 +213,7 @@ private function nextElementAcceptsDoctrineAnnotations(PhpTokens $tokens, $index
             return true;
         }
 
-        while ($tokens[$index]->isGivenKind([T_PUBLIC, T_PROTECTED, T_PRIVATE, T_FINAL, T_ABSTRACT])) {
+        while ($tokens[$index]->isGivenKind([T_PUBLIC, T_PROTECTED, T_PRIVATE, T_FINAL, T_ABSTRACT, T_NS_SEPARATOR, T_STRING, CT::T_NULLABLE_TYPE])) {
             $index = $tokens->getNextMeaningfulToken($index);
         }
 

tests/Fixer/DoctrineAnnotation/DoctrineAnnotationSpacesFixerTest.php

@@ -2198,4 +2198,42 @@ public function provideFixWithoutSpaceAfterArrayAssignmentColonOnlyCases()
  */'],
         ]);
     }
+
+    /**
+     * @param string $element
+     *
+     * @requires PHP 7.4
+     * @dataProvider provideElementDiscoveringCases
+     */
+    public function testElementDiscovering($element)
+    {
+        $this->doTest(
+            sprintf('<?php
+                class Foo
+                {
+                    /**
+                     * @Foo(foo="foo")
+                     */
+                    %s
+                }
+            ', $element),
+            sprintf('<?php
+                class Foo
+                {
+                    /**
+                     * @Foo(foo = "foo")
+                     */
+                    %s
+                }
+            ', $element)
+        );
+    }
+
+    public static function provideElementDiscoveringCases()
+    {
+        yield ['private $foo;'];
+        yield ['private string $foo;'];
+        yield ['private Foo\Bar $foo;'];
+        yield ['private ?Foo\Bar $foo;'];
+    }
 }