Merge branch '2.15' into 2.16

Author: julienfalque

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2
 jobs:
     build:
         macos:
-            xcode: '11.3.1'
+            xcode: '11.4.0'
         steps:
             - checkout
 
@@ -12,7 +12,6 @@ jobs:
                     - cache-{{ checksum "composer.json" }}
 
             - run: brew update
-            - run: brew remove python@2
             - run: brew install php@7.4
             - run: echo "memory_limit = 512M" > $(brew --prefix)/etc/php/7.4/conf.d/memory.ini
             - run: curl -sS https://getcomposer.org/installer | php

src/Fixer/Phpdoc/NoSuperfluousPhpdocTagsFixer.php

@@ -256,32 +256,25 @@ private function fixFunctionDocComment($content, Tokens $tokens, $functionIndex,
 
     /**
      * @param string $content
-     * @param int    $docCommentIndex
+     * @param int    $index   Index of the DocComment token
      *
      * @return string
      */
-    private function fixPropertyDocComment($content, Tokens $tokens, $docCommentIndex, array $shortNames)
+    private function fixPropertyDocComment($content, Tokens $tokens, $index, array $shortNames)
     {
         $docBlock = new DocBlock($content);
 
-        $index = $tokens->getNextMeaningfulToken($docCommentIndex);
-
-        $kindsBeforeProperty = [T_STATIC, T_PRIVATE, T_PROTECTED, T_PUBLIC];
-
-        if (!$tokens[$index]->isGivenKind($kindsBeforeProperty)) {
-            return $content;
-        }
-
         do {
             $index = $tokens->getNextMeaningfulToken($index);
+        } while ($tokens[$index]->isGivenKind([T_STATIC, T_PRIVATE, T_PROTECTED, T_PUBLIC]));
 
-            $propertyTypeInfo = $this->parseTypeHint($tokens, $index);
-            foreach ($docBlock->getAnnotationsOfType('var') as $annotation) {
-                if ($this->annotationIsSuperfluous($annotation, $propertyTypeInfo, $shortNames)) {
-                    $annotation->remove();
-                }
+        $propertyTypeInfo = $this->getPropertyTypeInfo($tokens, $index);
+
+        foreach ($docBlock->getAnnotationsOfType('var') as $annotation) {
+            if ($this->annotationIsSuperfluous($annotation, $propertyTypeInfo, $shortNames)) {
+                $annotation->remove();
             }
-        } while ($tokens[$index]->isGivenKind($kindsBeforeProperty));
+        }
 
         return $docBlock->getContent();
     }
@@ -344,6 +337,23 @@ private function getReturnTypeInfo(Tokens $tokens, $closingParenthesisIndex)
         ];
     }
 
+    /**
+     * @param int $index The index of the first token of the type hint
+     *
+     * @return array
+     */
+    private function getPropertyTypeInfo(Tokens $tokens, $index)
+    {
+        if ($tokens[$index]->isGivenKind(T_VARIABLE)) {
+            return [
+                'type' => null,
+                'allows_null' => true,
+            ];
+        }
+
+        return $this->parseTypeHint($tokens, $index);
+    }
+
     /**
      * @param int $index The index of the first token of the type hint
      *

tests/Fixer/Phpdoc/NoSuperfluousPhpdocTagsFixerTest.php

@@ -1051,6 +1051,25 @@ public function doFoo($foo) {}
                 null,
                 ['remove_inheritdoc' => true],
             ],
+            'property with unsupported type' => [
+                '<?php
+class Foo {
+    /**
+     * @var foo:bar
+     */
+    private $foo;
+}',
+            ],
+            'method with unsupported types' => [
+                '<?php
+class Foo {
+    /**
+     * @param foo:bar $foo
+     * @return foo:bar
+     */
+    public function foo($foo) {}
+}',
+            ],
         ];
     }