diff --git a/doc/rules/function_notation/phpdoc_to_property_type.rst b/doc/rules/function_notation/phpdoc_to_property_type.rst
new file mode 100644
index 00000000000..0f0b95360f6
--- /dev/null
+++ b/doc/rules/function_notation/phpdoc_to_property_type.rst
@@ -0,0 +1,67 @@
+================================
+Rule ``phpdoc_to_property_type``
+================================
+
+EXPERIMENTAL: Takes ``@var`` annotation of non-mixed types and adjusts
+accordingly the property signature. Requires PHP >= 7.4.
+
+.. warning:: Using this rule is risky.
+
+   This rule is EXPERIMENTAL and [1] is not covered with backward compatibility
+   promise. [2] ``@var`` annotation is mandatory for the fixer to make changes,
+   signatures of properties without it (no docblock) will not be fixed. [3]
+   Manual actions might be required for newly typed properties that are read
+   before initialization.
+
+Configuration
+-------------
+
+``scalar_types``
+~~~~~~~~~~~~~~~~
+
+Fix also scalar types; may have unexpected behaviour due to PHP bad type
+coercion system.
+
+Allowed types: ``bool``
+
+Default value: ``true``
+
+Examples
+--------
+
+Example #1
+~~~~~~~~~~
+
+*Default* configuration.
+
+.. code-block:: diff
+
+   --- Original
+   +++ New
+    <?php
+    class Foo {
+        /** @var int */
+   -    private $foo;
+   +    private int $foo;
+        /** @var \Traversable */
+   -    private $bar;
+   +    private \Traversable $bar;
+    }
+
+Example #2
+~~~~~~~~~~
+
+With configuration: ``['scalar_types' => false]``.
+
+.. code-block:: diff
+
+   --- Original
+   +++ New
+    <?php
+    class Foo {
+        /** @var int */
+        private $foo;
+        /** @var \Traversable */
+   -    private $bar;
+   +    private \Traversable $bar;
+    }
diff --git a/doc/rules/function_notation/phpdoc_to_return_type.rst b/doc/rules/function_notation/phpdoc_to_return_type.rst
index 127c4b12652..d3bc97f1c39 100644
--- a/doc/rules/function_notation/phpdoc_to_return_type.rst
+++ b/doc/rules/function_notation/phpdoc_to_return_type.rst
@@ -11,7 +11,7 @@ accordingly the function signature. Requires PHP >= 7.0.
    promise. [2] ``@return`` annotation is mandatory for the fixer to make
    changes, signatures of methods without it (no docblock, inheritdocs) will not
    be fixed. [3] Manual actions are required if inherited signatures are not
-   properly documented. [4] ``@inheritdocs`` support is under construction.
+   properly documented.
 
 Configuration
 -------------
diff --git a/doc/rules/index.rst b/doc/rules/index.rst
index b4dd904671d..f42f06f6df6 100644
--- a/doc/rules/index.rst
+++ b/doc/rules/index.rst
@@ -249,6 +249,8 @@ Function Notation
     Adds or removes ``?`` before type declarations for parameters with a default ``null`` value.
 - `phpdoc_to_param_type <./function_notation/phpdoc_to_param_type.rst>`_ *(risky)*
     EXPERIMENTAL: Takes ``@param`` annotations of non-mixed types and adjusts accordingly the function signature. Requires PHP >= 7.0.
+- `phpdoc_to_property_type <./function_notation/phpdoc_to_property_type.rst>`_ *(risky)*
+    EXPERIMENTAL: Takes ``@var`` annotation of non-mixed types and adjusts accordingly the property signature. Requires PHP >= 7.4.
 - `phpdoc_to_return_type <./function_notation/phpdoc_to_return_type.rst>`_ *(risky)*
     EXPERIMENTAL: Takes ``@return`` annotation of non-mixed types and adjusts accordingly the function signature. Requires PHP >= 7.0.
 - `regular_callable_call <./function_notation/regular_callable_call.rst>`_ *(risky)*
diff --git a/src/AbstractPhpdocToTypeDeclarationFixer.php b/src/AbstractPhpdocToTypeDeclarationFixer.php
index 7dde8fab792..88da3c9a2d5 100644
--- a/src/AbstractPhpdocToTypeDeclarationFixer.php
+++ b/src/AbstractPhpdocToTypeDeclarationFixer.php
@@ -87,14 +87,11 @@ protected function createConfigurationDefinition()
     }
 
     /**
-     * Find all the annotations of given type in the function's PHPDoc comment.
+     * @param int $index The index of the function token
      *
-     * @param string $name
-     * @param int    $index The index of the function token
-     *
-     * @return Annotation[]
+     * @return null|int
      */
-    protected function findAnnotations($name, Tokens $tokens, $index)
+    protected function findFunctionDocComment(Tokens $tokens, $index)
     {
         do {
             $index = $tokens->getPrevNonWhitespace($index);
@@ -108,18 +105,29 @@ protected function findAnnotations($name, Tokens $tokens, $index)
             T_STATIC,
         ]));
 
-        if (!$tokens[$index]->isGivenKind(T_DOC_COMMENT)) {
-            return [];
+        if ($tokens[$index]->isGivenKind(T_DOC_COMMENT)) {
+            return $index;
         }
 
+        return null;
+    }
+
+    /**
+     * @param string $name
+     * @param int    $docCommentIndex
+     *
+     * @return Annotation[]
+     */
+    protected function getAnnotationsFromDocComment($name, Tokens $tokens, $docCommentIndex)
+    {
         $namespacesAnalyzer = new NamespacesAnalyzer();
-        $namespace = $namespacesAnalyzer->getNamespaceAt($tokens, $index);
+        $namespace = $namespacesAnalyzer->getNamespaceAt($tokens, $docCommentIndex);
 
         $namespaceUsesAnalyzer = new NamespaceUsesAnalyzer();
         $namespaceUses = $namespaceUsesAnalyzer->getDeclarationsInNamespace($tokens, $namespace);
 
         $doc = new DocBlock(
-            $tokens[$index]->getContent(),
+            $tokens[$docCommentIndex]->getContent(),
             $namespace,
             $namespaceUses
         );
diff --git a/src/Fixer/Comment/CommentToPhpdocFixer.php b/src/Fixer/Comment/CommentToPhpdocFixer.php
index 69ae0cc7c9e..3d8d068af00 100644
--- a/src/Fixer/Comment/CommentToPhpdocFixer.php
+++ b/src/Fixer/Comment/CommentToPhpdocFixer.php
@@ -54,7 +54,7 @@ public function isRisky()
     /**
      * {@inheritdoc}
      *
-     * Must run before GeneralPhpdocAnnotationRemoveFixer, GeneralPhpdocTagRenameFixer, NoBlankLinesAfterPhpdocFixer, NoEmptyPhpdocFixer, NoSuperfluousPhpdocTagsFixer, PhpdocAddMissingParamAnnotationFixer, PhpdocAlignFixer, PhpdocAlignFixer, PhpdocAnnotationWithoutDotFixer, PhpdocInlineTagFixer, PhpdocInlineTagNormalizerFixer, PhpdocLineSpanFixer, PhpdocNoAccessFixer, PhpdocNoAliasTagFixer, PhpdocNoEmptyReturnFixer, PhpdocNoPackageFixer, PhpdocNoUselessInheritdocFixer, PhpdocOrderByValueFixer, PhpdocOrderFixer, PhpdocReturnSelfReferenceFixer, PhpdocSeparationFixer, PhpdocSingleLineVarSpacingFixer, PhpdocSummaryFixer, PhpdocTagCasingFixer, PhpdocTagTypeFixer, PhpdocToCommentFixer, PhpdocToParamTypeFixer, PhpdocToReturnTypeFixer, PhpdocTrimConsecutiveBlankLineSeparationFixer, PhpdocTrimFixer, PhpdocTypesOrderFixer, PhpdocVarAnnotationCorrectOrderFixer, PhpdocVarWithoutNameFixer.
+     * Must run before GeneralPhpdocAnnotationRemoveFixer, GeneralPhpdocTagRenameFixer, NoBlankLinesAfterPhpdocFixer, NoEmptyPhpdocFixer, NoSuperfluousPhpdocTagsFixer, PhpdocAddMissingParamAnnotationFixer, PhpdocAlignFixer, PhpdocAlignFixer, PhpdocAnnotationWithoutDotFixer, PhpdocInlineTagFixer, PhpdocInlineTagNormalizerFixer, PhpdocLineSpanFixer, PhpdocNoAccessFixer, PhpdocNoAliasTagFixer, PhpdocNoEmptyReturnFixer, PhpdocNoPackageFixer, PhpdocNoUselessInheritdocFixer, PhpdocOrderByValueFixer, PhpdocOrderFixer, PhpdocReturnSelfReferenceFixer, PhpdocSeparationFixer, PhpdocSingleLineVarSpacingFixer, PhpdocSummaryFixer, PhpdocTagCasingFixer, PhpdocTagTypeFixer, PhpdocToCommentFixer, PhpdocToParamTypeFixer, PhpdocToPropertyTypeFixer, PhpdocToReturnTypeFixer, PhpdocTrimConsecutiveBlankLineSeparationFixer, PhpdocTrimFixer, PhpdocTypesOrderFixer, PhpdocVarAnnotationCorrectOrderFixer, PhpdocVarWithoutNameFixer.
      * Must run after AlignMultilineCommentFixer.
      */
     public function getPriority()
diff --git a/src/Fixer/FunctionNotation/PhpdocToParamTypeFixer.php b/src/Fixer/FunctionNotation/PhpdocToParamTypeFixer.php
index a9e2a8661c0..b4398f5c9dc 100644
--- a/src/Fixer/FunctionNotation/PhpdocToParamTypeFixer.php
+++ b/src/Fixer/FunctionNotation/PhpdocToParamTypeFixer.php
@@ -124,9 +124,13 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
                 continue;
             }
 
-            $paramTypeAnnotations = $this->findAnnotations('param', $tokens, $index);
+            $docCommentIndex = $this->findFunctionDocComment($tokens, $index);
 
-            foreach ($paramTypeAnnotations as $paramTypeAnnotation) {
+            if (null === $docCommentIndex) {
+                continue;
+            }
+
+            foreach ($this->getAnnotationsFromDocComment('param', $tokens, $docCommentIndex) as $paramTypeAnnotation) {
                 $typeInfo = $this->getCommonTypeFromAnnotation($paramTypeAnnotation, false);
 
                 if (null === $typeInfo) {
diff --git a/src/Fixer/FunctionNotation/PhpdocToPropertyTypeFixer.php b/src/Fixer/FunctionNotation/PhpdocToPropertyTypeFixer.php
new file mode 100644
index 00000000000..5e7fb17f97d
--- /dev/null
+++ b/src/Fixer/FunctionNotation/PhpdocToPropertyTypeFixer.php
@@ -0,0 +1,244 @@
+<?php
+
+/*
+ * This file is part of PHP CS Fixer.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *     Dariusz Rumiński <dariusz.ruminski@gmail.com>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace PhpCsFixer\Fixer\FunctionNotation;
+
+use PhpCsFixer\AbstractPhpdocToTypeDeclarationFixer;
+use PhpCsFixer\DocBlock\Annotation;
+use PhpCsFixer\FixerDefinition\FixerDefinition;
+use PhpCsFixer\FixerDefinition\VersionSpecification;
+use PhpCsFixer\FixerDefinition\VersionSpecificCodeSample;
+use PhpCsFixer\Tokenizer\Token;
+use PhpCsFixer\Tokenizer\Tokens;
+
+final class PhpdocToPropertyTypeFixer extends AbstractPhpdocToTypeDeclarationFixer
+{
+    /**
+     * @var array<string, true>
+     */
+    private $skippedTypes = [
+        'mixed' => true,
+        'resource' => true,
+        'null' => true,
+    ];
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getDefinition()
+    {
+        return new FixerDefinition(
+            'EXPERIMENTAL: Takes `@var` annotation of non-mixed types and adjusts accordingly the property signature. Requires PHP >= 7.4.',
+            [
+                new VersionSpecificCodeSample(
+                    '<?php
+class Foo {
+    /** @var int */
+    private $foo;
+    /** @var \Traversable */
+    private $bar;
+}
+',
+                    new VersionSpecification(70400)
+                ),
+                new VersionSpecificCodeSample(
+                    '<?php
+class Foo {
+    /** @var int */
+    private $foo;
+    /** @var \Traversable */
+    private $bar;
+}
+',
+                    new VersionSpecification(70400),
+                    ['scalar_types' => false]
+                ),
+            ],
+            null,
+            'This rule is EXPERIMENTAL and [1] is not covered with backward compatibility promise. [2] `@var` annotation is mandatory for the fixer to make changes, signatures of properties without it (no docblock) will not be fixed. [3] Manual actions might be required for newly typed properties that are read before initialization.'
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isCandidate(Tokens $tokens)
+    {
+        return \PHP_VERSION_ID >= 70400 && $tokens->isTokenKindFound(T_DOC_COMMENT);
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * Must run before PhpdocAlignFixer.
+     * Must run after AlignMultilineCommentFixer, CommentToPhpdocFixer, PhpdocIndentFixer, PhpdocScalarFixer, PhpdocToCommentFixer, PhpdocTypesFixer.
+     */
+    public function getPriority()
+    {
+        return parent::getPriority();
+    }
+
+    protected function isSkippedType($type)
+    {
+        return isset($this->skippedTypes[$type]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function applyFix(\SplFileInfo $file, Tokens $tokens)
+    {
+        for ($index = $tokens->count() - 1; 0 < $index; --$index) {
+            if ($tokens[$index]->isGivenKind([T_CLASS, T_TRAIT])) {
+                $this->fixClass($tokens, $index);
+            }
+        }
+    }
+
+    /**
+     * @param int $index
+     */
+    private function fixClass(Tokens $tokens, $index)
+    {
+        $index = $tokens->getNextTokenOfKind($index, ['{']);
+        $classEndIndex = $tokens->findBlockEnd(Tokens::BLOCK_TYPE_CURLY_BRACE, $index);
+
+        for (; $index < $classEndIndex; ++$index) {
+            if ($tokens[$index]->isGivenKind(T_FUNCTION)) {
+                $index = $tokens->getNextTokenOfKind($index, ['{', ';']);
+
+                if ($tokens[$index]->equals('{')) {
+                    $index = $tokens->findBlockEnd(Tokens::BLOCK_TYPE_CURLY_BRACE, $index);
+                }
+
+                continue;
+            }
+
+            if (!$tokens[$index]->isGivenKind(T_DOC_COMMENT)) {
+                continue;
+            }
+
+            $docCommentIndex = $index;
+            $propertyIndexes = $this->findNextUntypedPropertiesDeclaration($tokens, $docCommentIndex);
+
+            if ([] === $propertyIndexes) {
+                continue;
+            }
+
+            $typeInfo = $this->resolveAppliableType(
+                $propertyIndexes,
+                $this->getAnnotationsFromDocComment('var', $tokens, $docCommentIndex)
+            );
+
+            if (null === $typeInfo) {
+                continue;
+            }
+
+            list($propertyType, $isNullable) = $typeInfo;
+
+            if (\in_array($propertyType, ['void', 'callable'], true)) {
+                continue;
+            }
+
+            $newTokens = array_merge(
+                $this->createTypeDeclarationTokens($propertyType, $isNullable),
+                [new Token([T_WHITESPACE, ' '])]
+            );
+
+            $tokens->insertAt(current($propertyIndexes), $newTokens);
+
+            $index = max($propertyIndexes) + \count($newTokens) + 1;
+            $classEndIndex += \count($newTokens);
+        }
+    }
+
+    /**
+     * @param int $index
+     *
+     * @return array<string, int>
+     */
+    private function findNextUntypedPropertiesDeclaration(Tokens $tokens, $index)
+    {
+        do {
+            $index = $tokens->getNextMeaningfulToken($index);
+        } while ($tokens[$index]->isGivenKind([
+            T_PRIVATE,
+            T_PROTECTED,
+            T_PUBLIC,
+            T_STATIC,
+            T_VAR,
+        ]));
+
+        if (!$tokens[$index]->isGivenKind(T_VARIABLE)) {
+            return [];
+        }
+
+        $properties = [];
+        while (!$tokens[$index]->equals(';')) {
+            if ($tokens[$index]->isGivenKind(T_VARIABLE)) {
+                $properties[$tokens[$index]->getContent()] = $index;
+            }
+
+            $index = $tokens->getNextMeaningfulToken($index);
+        }
+
+        return $properties;
+    }
+
+    /**
+     * @param array<string, int> $propertyIndexes
+     * @param Annotation[]       $annotations
+     */
+    private function resolveAppliableType(array $propertyIndexes, array $annotations)
+    {
+        $propertyTypes = [];
+
+        foreach ($annotations as $annotation) {
+            $propertyName = $annotation->getVariableName();
+
+            if (null === $propertyName) {
+                if (1 !== \count($propertyIndexes)) {
+                    continue;
+                }
+
+                $propertyName = key($propertyIndexes);
+            }
+
+            if (!isset($propertyIndexes[$propertyName])) {
+                continue;
+            }
+
+            $typeInfo = $this->getCommonTypeFromAnnotation($annotation, false);
+
+            if (!isset($propertyTypes[$propertyName])) {
+                $propertyTypes[$propertyName] = [];
+            } elseif ($typeInfo !== $propertyTypes[$propertyName]) {
+                return null;
+            }
+
+            $propertyTypes[$propertyName] = $typeInfo;
+        }
+
+        if (\count($propertyTypes) !== \count($propertyIndexes)) {
+            return null;
+        }
+
+        $type = array_shift($propertyTypes);
+        foreach ($propertyTypes as $propertyType) {
+            if ($propertyType !== $type) {
+                return null;
+            }
+        }
+
+        return $type;
+    }
+}
diff --git a/src/Fixer/FunctionNotation/PhpdocToReturnTypeFixer.php b/src/Fixer/FunctionNotation/PhpdocToReturnTypeFixer.php
index 05b9c2a54f5..7bd21b451b1 100644
--- a/src/Fixer/FunctionNotation/PhpdocToReturnTypeFixer.php
+++ b/src/Fixer/FunctionNotation/PhpdocToReturnTypeFixer.php
@@ -103,7 +103,7 @@ public function create($prototype) {
                 ),
             ],
             null,
-            'This rule is EXPERIMENTAL and [1] is not covered with backward compatibility promise. [2] `@return` annotation is mandatory for the fixer to make changes, signatures of methods without it (no docblock, inheritdocs) will not be fixed. [3] Manual actions are required if inherited signatures are not properly documented. [4] `@inheritdocs` support is under construction.'
+            'This rule is EXPERIMENTAL and [1] is not covered with backward compatibility promise. [2] `@return` annotation is mandatory for the fixer to make changes, signatures of methods without it (no docblock, inheritdocs) will not be fixed. [3] Manual actions are required if inherited signatures are not properly documented.'
         );
     }
 
@@ -158,8 +158,12 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
                 continue;
             }
 
-            $returnTypeAnnotation = $this->findAnnotations('return', $tokens, $index);
+            $docCommentIndex = $this->findFunctionDocComment($tokens, $index);
+            if (null === $docCommentIndex) {
+                continue;
+            }
 
+            $returnTypeAnnotation = $this->getAnnotationsFromDocComment('return', $tokens, $docCommentIndex);
             if (1 !== \count($returnTypeAnnotation)) {
                 continue;
             }
diff --git a/src/Fixer/Phpdoc/AlignMultilineCommentFixer.php b/src/Fixer/Phpdoc/AlignMultilineCommentFixer.php
index 66265280f3b..9154b5af79c 100644
--- a/src/Fixer/Phpdoc/AlignMultilineCommentFixer.php
+++ b/src/Fixer/Phpdoc/AlignMultilineCommentFixer.php
@@ -86,7 +86,7 @@ public function getDefinition()
     /**
      * {@inheritdoc}
      *
-     * Must run before CommentToPhpdocFixer, GeneralPhpdocAnnotationRemoveFixer, GeneralPhpdocTagRenameFixer, NoBlankLinesAfterPhpdocFixer, NoEmptyPhpdocFixer, NoSuperfluousPhpdocTagsFixer, PhpdocAddMissingParamAnnotationFixer, PhpdocAlignFixer, PhpdocAnnotationWithoutDotFixer, PhpdocInlineTagFixer, PhpdocInlineTagNormalizerFixer, PhpdocLineSpanFixer, PhpdocNoAccessFixer, PhpdocNoAliasTagFixer, PhpdocNoEmptyReturnFixer, PhpdocNoPackageFixer, PhpdocNoUselessInheritdocFixer, PhpdocOrderByValueFixer, PhpdocOrderFixer, PhpdocReturnSelfReferenceFixer, PhpdocSeparationFixer, PhpdocSingleLineVarSpacingFixer, PhpdocSummaryFixer, PhpdocTagCasingFixer, PhpdocTagTypeFixer, PhpdocToParamTypeFixer, PhpdocToReturnTypeFixer, PhpdocTrimConsecutiveBlankLineSeparationFixer, PhpdocTrimConsecutiveBlankLineSeparationFixer, PhpdocTrimFixer, PhpdocTypesOrderFixer, PhpdocVarAnnotationCorrectOrderFixer, PhpdocVarWithoutNameFixer.
+     * Must run before CommentToPhpdocFixer, GeneralPhpdocAnnotationRemoveFixer, GeneralPhpdocTagRenameFixer, NoBlankLinesAfterPhpdocFixer, NoEmptyPhpdocFixer, NoSuperfluousPhpdocTagsFixer, PhpdocAddMissingParamAnnotationFixer, PhpdocAlignFixer, PhpdocAnnotationWithoutDotFixer, PhpdocInlineTagFixer, PhpdocInlineTagNormalizerFixer, PhpdocLineSpanFixer, PhpdocNoAccessFixer, PhpdocNoAliasTagFixer, PhpdocNoEmptyReturnFixer, PhpdocNoPackageFixer, PhpdocNoUselessInheritdocFixer, PhpdocOrderByValueFixer, PhpdocOrderFixer, PhpdocReturnSelfReferenceFixer, PhpdocSeparationFixer, PhpdocSingleLineVarSpacingFixer, PhpdocSummaryFixer, PhpdocTagCasingFixer, PhpdocTagTypeFixer, PhpdocToParamTypeFixer, PhpdocToPropertyTypeFixer, PhpdocToReturnTypeFixer, PhpdocTrimConsecutiveBlankLineSeparationFixer, PhpdocTrimConsecutiveBlankLineSeparationFixer, PhpdocTrimFixer, PhpdocTypesOrderFixer, PhpdocVarAnnotationCorrectOrderFixer, PhpdocVarWithoutNameFixer.
      * Must run after ArrayIndentationFixer.
      */
     public function getPriority()
diff --git a/src/Fixer/Phpdoc/PhpdocAlignFixer.php b/src/Fixer/Phpdoc/PhpdocAlignFixer.php
index 7b2afd325ae..71f4a81dbc9 100644
--- a/src/Fixer/Phpdoc/PhpdocAlignFixer.php
+++ b/src/Fixer/Phpdoc/PhpdocAlignFixer.php
@@ -146,7 +146,7 @@ public function getDefinition()
     /**
      * {@inheritdoc}
      *
-     * Must run after AlignMultilineCommentFixer, CommentToPhpdocFixer, CommentToPhpdocFixer, GeneralPhpdocAnnotationRemoveFixer, GeneralPhpdocTagRenameFixer, NoBlankLinesAfterPhpdocFixer, NoEmptyPhpdocFixer, NoSuperfluousPhpdocTagsFixer, PhpdocAddMissingParamAnnotationFixer, PhpdocAddMissingParamAnnotationFixer, PhpdocAnnotationWithoutDotFixer, PhpdocIndentFixer, PhpdocIndentFixer, PhpdocInlineTagFixer, PhpdocInlineTagNormalizerFixer, PhpdocLineSpanFixer, PhpdocNoAccessFixer, PhpdocNoAliasTagFixer, PhpdocNoEmptyReturnFixer, PhpdocNoPackageFixer, PhpdocNoUselessInheritdocFixer, PhpdocOrderByValueFixer, PhpdocOrderFixer, PhpdocReturnSelfReferenceFixer, PhpdocScalarFixer, PhpdocScalarFixer, PhpdocSeparationFixer, PhpdocSingleLineVarSpacingFixer, PhpdocSummaryFixer, PhpdocTagCasingFixer, PhpdocTagTypeFixer, PhpdocToCommentFixer, PhpdocToCommentFixer, PhpdocToParamTypeFixer, PhpdocToReturnTypeFixer, PhpdocTrimConsecutiveBlankLineSeparationFixer, PhpdocTrimFixer, PhpdocTypesFixer, PhpdocTypesFixer, PhpdocTypesOrderFixer, PhpdocVarAnnotationCorrectOrderFixer, PhpdocVarWithoutNameFixer.
+     * Must run after AlignMultilineCommentFixer, CommentToPhpdocFixer, CommentToPhpdocFixer, GeneralPhpdocAnnotationRemoveFixer, GeneralPhpdocTagRenameFixer, NoBlankLinesAfterPhpdocFixer, NoEmptyPhpdocFixer, NoSuperfluousPhpdocTagsFixer, PhpdocAddMissingParamAnnotationFixer, PhpdocAddMissingParamAnnotationFixer, PhpdocAnnotationWithoutDotFixer, PhpdocIndentFixer, PhpdocIndentFixer, PhpdocInlineTagFixer, PhpdocInlineTagNormalizerFixer, PhpdocLineSpanFixer, PhpdocNoAccessFixer, PhpdocNoAliasTagFixer, PhpdocNoEmptyReturnFixer, PhpdocNoPackageFixer, PhpdocNoUselessInheritdocFixer, PhpdocOrderByValueFixer, PhpdocOrderFixer, PhpdocReturnSelfReferenceFixer, PhpdocScalarFixer, PhpdocScalarFixer, PhpdocSeparationFixer, PhpdocSingleLineVarSpacingFixer, PhpdocSummaryFixer, PhpdocTagCasingFixer, PhpdocTagTypeFixer, PhpdocToCommentFixer, PhpdocToCommentFixer, PhpdocToParamTypeFixer, PhpdocToPropertyTypeFixer, PhpdocToReturnTypeFixer, PhpdocTrimConsecutiveBlankLineSeparationFixer, PhpdocTrimFixer, PhpdocTypesFixer, PhpdocTypesFixer, PhpdocTypesOrderFixer, PhpdocVarAnnotationCorrectOrderFixer, PhpdocVarWithoutNameFixer.
      */
     public function getPriority()
     {
diff --git a/src/Fixer/Phpdoc/PhpdocIndentFixer.php b/src/Fixer/Phpdoc/PhpdocIndentFixer.php
index 0f2931bf1f9..d5db6164d16 100644
--- a/src/Fixer/Phpdoc/PhpdocIndentFixer.php
+++ b/src/Fixer/Phpdoc/PhpdocIndentFixer.php
@@ -48,7 +48,7 @@ class DocBlocks
     /**
      * {@inheritdoc}
      *
-     * Must run before GeneralPhpdocAnnotationRemoveFixer, GeneralPhpdocTagRenameFixer, NoBlankLinesAfterPhpdocFixer, NoEmptyPhpdocFixer, NoSuperfluousPhpdocTagsFixer, PhpdocAddMissingParamAnnotationFixer, PhpdocAlignFixer, PhpdocAlignFixer, PhpdocAnnotationWithoutDotFixer, PhpdocInlineTagFixer, PhpdocInlineTagNormalizerFixer, PhpdocLineSpanFixer, PhpdocNoAccessFixer, PhpdocNoAliasTagFixer, PhpdocNoEmptyReturnFixer, PhpdocNoPackageFixer, PhpdocNoUselessInheritdocFixer, PhpdocOrderByValueFixer, PhpdocOrderFixer, PhpdocReturnSelfReferenceFixer, PhpdocSeparationFixer, PhpdocSingleLineVarSpacingFixer, PhpdocSummaryFixer, PhpdocTagCasingFixer, PhpdocTagTypeFixer, PhpdocToParamTypeFixer, PhpdocToReturnTypeFixer, PhpdocTrimConsecutiveBlankLineSeparationFixer, PhpdocTrimFixer, PhpdocTypesFixer, PhpdocTypesOrderFixer, PhpdocVarAnnotationCorrectOrderFixer, PhpdocVarWithoutNameFixer.
+     * Must run before GeneralPhpdocAnnotationRemoveFixer, GeneralPhpdocTagRenameFixer, NoBlankLinesAfterPhpdocFixer, NoEmptyPhpdocFixer, NoSuperfluousPhpdocTagsFixer, PhpdocAddMissingParamAnnotationFixer, PhpdocAlignFixer, PhpdocAlignFixer, PhpdocAnnotationWithoutDotFixer, PhpdocInlineTagFixer, PhpdocInlineTagNormalizerFixer, PhpdocLineSpanFixer, PhpdocNoAccessFixer, PhpdocNoAliasTagFixer, PhpdocNoEmptyReturnFixer, PhpdocNoPackageFixer, PhpdocNoUselessInheritdocFixer, PhpdocOrderByValueFixer, PhpdocOrderFixer, PhpdocReturnSelfReferenceFixer, PhpdocSeparationFixer, PhpdocSingleLineVarSpacingFixer, PhpdocSummaryFixer, PhpdocTagCasingFixer, PhpdocTagTypeFixer, PhpdocToParamTypeFixer, PhpdocToPropertyTypeFixer, PhpdocToReturnTypeFixer, PhpdocTrimConsecutiveBlankLineSeparationFixer, PhpdocTrimFixer, PhpdocTypesFixer, PhpdocTypesOrderFixer, PhpdocVarAnnotationCorrectOrderFixer, PhpdocVarWithoutNameFixer.
      * Must run after IndentationTypeFixer, PhpdocToCommentFixer.
      */
     public function getPriority()
diff --git a/src/Fixer/Phpdoc/PhpdocScalarFixer.php b/src/Fixer/Phpdoc/PhpdocScalarFixer.php
index 642336be99f..2e683816f1d 100644
--- a/src/Fixer/Phpdoc/PhpdocScalarFixer.php
+++ b/src/Fixer/Phpdoc/PhpdocScalarFixer.php
@@ -81,7 +81,7 @@ function sample($a, $b, $c)
     /**
      * {@inheritdoc}
      *
-     * Must run before GeneralPhpdocAnnotationRemoveFixer, GeneralPhpdocTagRenameFixer, NoBlankLinesAfterPhpdocFixer, NoEmptyPhpdocFixer, NoSuperfluousPhpdocTagsFixer, PhpdocAddMissingParamAnnotationFixer, PhpdocAlignFixer, PhpdocAlignFixer, PhpdocInlineTagFixer, PhpdocInlineTagNormalizerFixer, PhpdocLineSpanFixer, PhpdocNoAccessFixer, PhpdocNoAliasTagFixer, PhpdocNoEmptyReturnFixer, PhpdocNoPackageFixer, PhpdocNoUselessInheritdocFixer, PhpdocOrderByValueFixer, PhpdocOrderFixer, PhpdocReturnSelfReferenceFixer, PhpdocSeparationFixer, PhpdocSingleLineVarSpacingFixer, PhpdocSummaryFixer, PhpdocTagCasingFixer, PhpdocTagTypeFixer, PhpdocToParamTypeFixer, PhpdocToReturnTypeFixer, PhpdocToReturnTypeFixer, PhpdocTrimConsecutiveBlankLineSeparationFixer, PhpdocTrimFixer, PhpdocTypesOrderFixer, PhpdocVarAnnotationCorrectOrderFixer, PhpdocVarWithoutNameFixer.
+     * Must run before GeneralPhpdocAnnotationRemoveFixer, GeneralPhpdocTagRenameFixer, NoBlankLinesAfterPhpdocFixer, NoEmptyPhpdocFixer, NoSuperfluousPhpdocTagsFixer, PhpdocAddMissingParamAnnotationFixer, PhpdocAlignFixer, PhpdocAlignFixer, PhpdocInlineTagFixer, PhpdocInlineTagNormalizerFixer, PhpdocLineSpanFixer, PhpdocNoAccessFixer, PhpdocNoAliasTagFixer, PhpdocNoEmptyReturnFixer, PhpdocNoPackageFixer, PhpdocNoUselessInheritdocFixer, PhpdocOrderByValueFixer, PhpdocOrderFixer, PhpdocReturnSelfReferenceFixer, PhpdocSeparationFixer, PhpdocSingleLineVarSpacingFixer, PhpdocSummaryFixer, PhpdocTagCasingFixer, PhpdocTagTypeFixer, PhpdocToParamTypeFixer, PhpdocToPropertyTypeFixer, PhpdocToReturnTypeFixer, PhpdocToReturnTypeFixer, PhpdocTrimConsecutiveBlankLineSeparationFixer, PhpdocTrimFixer, PhpdocTypesOrderFixer, PhpdocVarAnnotationCorrectOrderFixer, PhpdocVarWithoutNameFixer.
      * Must run after PhpdocTypesFixer.
      */
     public function getPriority()
diff --git a/src/Fixer/Phpdoc/PhpdocToCommentFixer.php b/src/Fixer/Phpdoc/PhpdocToCommentFixer.php
index e001df5c7a0..dcb2236878f 100644
--- a/src/Fixer/Phpdoc/PhpdocToCommentFixer.php
+++ b/src/Fixer/Phpdoc/PhpdocToCommentFixer.php
@@ -36,7 +36,7 @@ public function isCandidate(Tokens $tokens)
     /**
      * {@inheritdoc}
      *
-     * Must run before GeneralPhpdocAnnotationRemoveFixer, GeneralPhpdocTagRenameFixer, NoBlankLinesAfterPhpdocFixer, NoEmptyCommentFixer, NoEmptyPhpdocFixer, NoSuperfluousPhpdocTagsFixer, PhpdocAddMissingParamAnnotationFixer, PhpdocAlignFixer, PhpdocAlignFixer, PhpdocAnnotationWithoutDotFixer, PhpdocIndentFixer, PhpdocInlineTagFixer, PhpdocInlineTagNormalizerFixer, PhpdocLineSpanFixer, PhpdocNoAccessFixer, PhpdocNoAliasTagFixer, PhpdocNoEmptyReturnFixer, PhpdocNoPackageFixer, PhpdocNoUselessInheritdocFixer, PhpdocNoUselessInheritdocFixer, PhpdocOrderByValueFixer, PhpdocOrderFixer, PhpdocReturnSelfReferenceFixer, PhpdocSeparationFixer, PhpdocSingleLineVarSpacingFixer, PhpdocSummaryFixer, PhpdocTagCasingFixer, PhpdocTagTypeFixer, PhpdocToParamTypeFixer, PhpdocToReturnTypeFixer, PhpdocTrimConsecutiveBlankLineSeparationFixer, PhpdocTrimFixer, PhpdocTypesOrderFixer, PhpdocVarAnnotationCorrectOrderFixer, PhpdocVarWithoutNameFixer.
+     * Must run before GeneralPhpdocAnnotationRemoveFixer, GeneralPhpdocTagRenameFixer, NoBlankLinesAfterPhpdocFixer, NoEmptyCommentFixer, NoEmptyPhpdocFixer, NoSuperfluousPhpdocTagsFixer, PhpdocAddMissingParamAnnotationFixer, PhpdocAlignFixer, PhpdocAlignFixer, PhpdocAnnotationWithoutDotFixer, PhpdocIndentFixer, PhpdocInlineTagFixer, PhpdocInlineTagNormalizerFixer, PhpdocLineSpanFixer, PhpdocNoAccessFixer, PhpdocNoAliasTagFixer, PhpdocNoEmptyReturnFixer, PhpdocNoPackageFixer, PhpdocNoUselessInheritdocFixer, PhpdocNoUselessInheritdocFixer, PhpdocOrderByValueFixer, PhpdocOrderFixer, PhpdocReturnSelfReferenceFixer, PhpdocSeparationFixer, PhpdocSingleLineVarSpacingFixer, PhpdocSummaryFixer, PhpdocTagCasingFixer, PhpdocTagTypeFixer, PhpdocToParamTypeFixer, PhpdocToPropertyTypeFixer, PhpdocToReturnTypeFixer, PhpdocTrimConsecutiveBlankLineSeparationFixer, PhpdocTrimFixer, PhpdocTypesOrderFixer, PhpdocVarAnnotationCorrectOrderFixer, PhpdocVarWithoutNameFixer.
      * Must run after CommentToPhpdocFixer.
      */
     public function getPriority()
diff --git a/src/Fixer/Phpdoc/PhpdocTypesFixer.php b/src/Fixer/Phpdoc/PhpdocTypesFixer.php
index 81bc1cb4aac..9bb1fa7c1b9 100644
--- a/src/Fixer/Phpdoc/PhpdocTypesFixer.php
+++ b/src/Fixer/Phpdoc/PhpdocTypesFixer.php
@@ -115,7 +115,7 @@ public function getDefinition()
     /**
      * {@inheritdoc}
      *
-     * Must run before GeneralPhpdocAnnotationRemoveFixer, GeneralPhpdocTagRenameFixer, NoBlankLinesAfterPhpdocFixer, NoEmptyPhpdocFixer, NoSuperfluousPhpdocTagsFixer, PhpdocAddMissingParamAnnotationFixer, PhpdocAlignFixer, PhpdocAlignFixer, PhpdocInlineTagFixer, PhpdocInlineTagNormalizerFixer, PhpdocLineSpanFixer, PhpdocNoAccessFixer, PhpdocNoAliasTagFixer, PhpdocNoEmptyReturnFixer, PhpdocNoPackageFixer, PhpdocNoUselessInheritdocFixer, PhpdocOrderByValueFixer, PhpdocOrderFixer, PhpdocReturnSelfReferenceFixer, PhpdocScalarFixer, PhpdocSeparationFixer, PhpdocSingleLineVarSpacingFixer, PhpdocSummaryFixer, PhpdocTagCasingFixer, PhpdocTagTypeFixer, PhpdocToParamTypeFixer, PhpdocToReturnTypeFixer, PhpdocToReturnTypeFixer, PhpdocTrimConsecutiveBlankLineSeparationFixer, PhpdocTrimFixer, PhpdocTypesOrderFixer, PhpdocVarAnnotationCorrectOrderFixer, PhpdocVarWithoutNameFixer.
+     * Must run before GeneralPhpdocAnnotationRemoveFixer, GeneralPhpdocTagRenameFixer, NoBlankLinesAfterPhpdocFixer, NoEmptyPhpdocFixer, NoSuperfluousPhpdocTagsFixer, PhpdocAddMissingParamAnnotationFixer, PhpdocAlignFixer, PhpdocAlignFixer, PhpdocInlineTagFixer, PhpdocInlineTagNormalizerFixer, PhpdocLineSpanFixer, PhpdocNoAccessFixer, PhpdocNoAliasTagFixer, PhpdocNoEmptyReturnFixer, PhpdocNoPackageFixer, PhpdocNoUselessInheritdocFixer, PhpdocOrderByValueFixer, PhpdocOrderFixer, PhpdocReturnSelfReferenceFixer, PhpdocScalarFixer, PhpdocSeparationFixer, PhpdocSingleLineVarSpacingFixer, PhpdocSummaryFixer, PhpdocTagCasingFixer, PhpdocTagTypeFixer, PhpdocToParamTypeFixer, PhpdocToPropertyTypeFixer, PhpdocToReturnTypeFixer, PhpdocToReturnTypeFixer, PhpdocTrimConsecutiveBlankLineSeparationFixer, PhpdocTrimFixer, PhpdocTypesOrderFixer, PhpdocVarAnnotationCorrectOrderFixer, PhpdocVarWithoutNameFixer.
      * Must run after PhpdocAnnotationWithoutDotFixer, PhpdocIndentFixer.
      */
     public function getPriority()
diff --git a/tests/Fixer/FunctionNotation/PhpdocToPropertyTypeFixerTest.php b/tests/Fixer/FunctionNotation/PhpdocToPropertyTypeFixerTest.php
new file mode 100644
index 00000000000..ff35fb94e9c
--- /dev/null
+++ b/tests/Fixer/FunctionNotation/PhpdocToPropertyTypeFixerTest.php
@@ -0,0 +1,477 @@
+<?php
+
+/*
+ * This file is part of PHP CS Fixer.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *     Dariusz Rumiński <dariusz.ruminski@gmail.com>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace PhpCsFixer\Tests\Fixer\FunctionNotation;
+
+use PhpCsFixer\Tests\Test\AbstractFixerTestCase;
+
+/**
+ * @internal
+ *
+ * @covers \PhpCsFixer\Fixer\FunctionNotation\PhpdocToPropertyTypeFixer
+ */
+final class PhpdocToPropertyTypeFixerTest extends AbstractFixerTestCase
+{
+    /**
+     * @param string      $expected
+     * @param null|string $input
+     *
+     * @dataProvider provideFixCases
+     */
+    public function testFix($expected, $input = null, array $config = [])
+    {
+        if (null !== $input && \PHP_VERSION_ID < 70400) {
+            $expected = $input;
+            $input = null;
+        }
+
+        $this->fixer->configure($config);
+
+        $this->doTest($expected, $input);
+    }
+
+    public function provideFixCases()
+    {
+        return [
+            'no phpdoc return' => [
+                '<?php class Foo { private $foo; }',
+            ],
+            'invalid return' => [
+                '<?php class Foo { /** @var */ private $foo; }',
+            ],
+            'invalid class 1' => [
+                '<?php class Foo { /** @var \9 */ private $foo; }',
+            ],
+            'invalid class 2' => [
+                '<?php class Foo { /** @var \\Foo\\\\Bar */ private $foo; }',
+            ],
+            'multiple returns' => [
+                '<?php
+                    class Foo {
+                        /**
+                         * @var Bar
+                         * @var Baz
+                         */
+                        private $foo;
+                    }
+                ',
+            ],
+            'non-root class' => [
+                '<?php class Foo { /** @var Bar */ private Bar $foo; }',
+                '<?php class Foo { /** @var Bar */ private $foo; }',
+            ],
+            'non-root namespaced class' => [
+                '<?php class Foo { /** @var My\Bar */ private My\Bar $foo; }',
+                '<?php class Foo { /** @var My\Bar */ private $foo; }',
+            ],
+            'root class' => [
+                '<?php class Foo { /** @var \My\Bar */ private \My\Bar $foo; }',
+                '<?php class Foo { /** @var \My\Bar */ private $foo; }',
+            ],
+            'void' => [
+                '<?php class Foo { /** @var void */ private $foo; }',
+            ],
+            'iterable' => [
+                '<?php class Foo { /** @var iterable */ private iterable $foo; }',
+                '<?php class Foo { /** @var iterable */ private $foo; }',
+            ],
+            'object' => [
+                '<?php class Foo { /** @var object */ private object $foo; }',
+                '<?php class Foo { /** @var object */ private $foo; }',
+            ],
+            'fix scalar types by default, int' => [
+                '<?php class Foo { /** @var int */ private int $foo; }',
+                '<?php class Foo { /** @var int */ private $foo; }',
+            ],
+            'fix scalar types by default, float' => [
+                '<?php class Foo { /** @var float */ private float $foo; }',
+                '<?php class Foo { /** @var float */ private $foo; }',
+            ],
+            'fix scalar types by default, string' => [
+                '<?php class Foo { /** @var string */ private string $foo; }',
+                '<?php class Foo { /** @var string */ private $foo; }',
+            ],
+            'fix scalar types by default, bool' => [
+                '<?php class Foo { /** @var bool */ private bool $foo; }',
+                '<?php class Foo { /** @var bool */ private $foo; }',
+            ],
+            'fix scalar types by default, false' => [
+                '<?php class Foo { /** @var false */ private bool $foo; }',
+                '<?php class Foo { /** @var false */ private $foo; }',
+            ],
+            'fix scalar types by default, true' => [
+                '<?php class Foo { /** @var true */ private bool $foo; }',
+                '<?php class Foo { /** @var true */ private $foo; }',
+            ],
+            'do not fix scalar types when configured as such' => [
+                '<?php class Foo { /** @var int */ private $foo; }',
+                null,
+                ['scalar_types' => false],
+            ],
+            'array native type' => [
+                '<?php class Foo { /** @var array */ private array $foo; }',
+                '<?php class Foo { /** @var array */ private $foo; }',
+            ],
+            'callable type' => [
+                '<?php class Foo { /** @var callable */ private $foo; }',
+            ],
+            'self accessor' => [
+                '<?php class Foo { /** @var self */ private self $foo; }',
+                '<?php class Foo { /** @var self */ private $foo; }',
+            ],
+            'report static as self' => [
+                '<?php class Foo { /** @var static */ private self $foo; }',
+                '<?php class Foo { /** @var static */ private $foo; }',
+            ],
+            'skip resource special type' => [
+                '<?php class Foo { /** @var resource */ private $foo; }',
+            ],
+            'skip mixed special type' => [
+                '<?php class Foo { /** @var mixed */ private $foo; }',
+            ],
+            'null alone cannot be a property type' => [
+                '<?php class Foo { /** @var null */ private $foo; }',
+            ],
+            'skip mixed types' => [
+                '<?php class Foo { /** @var Foo|Bar */ private $foo; }',
+            ],
+            'nullable type' => [
+                '<?php class Foo { /** @var null|Bar */ private ?Bar $foo; }',
+                '<?php class Foo { /** @var null|Bar */ private $foo; }',
+            ],
+            'nullable type reverse order' => [
+                '<?php class Foo { /** @var Bar|null */ private ?Bar $foo; }',
+                '<?php class Foo { /** @var Bar|null */ private $foo; }',
+            ],
+            'nullable native type' => [
+                '<?php class Foo { /** @var null|array */ private ?array $foo; }',
+                '<?php class Foo { /** @var null|array */ private $foo; }',
+            ],
+            'skip mixed nullable types' => [
+                '<?php class Foo { /** @var null|Foo|Bar */ private $foo; }',
+            ],
+            'generics' => [
+                '<?php class Foo { /** @var array<int, bool> */ private array $foo; }',
+                '<?php class Foo { /** @var array<int, bool> */ private $foo; }',
+            ],
+            'array of types' => [
+                '<?php class Foo { /** @var Foo[] */ private array $foo; }',
+                '<?php class Foo { /** @var Foo[] */ private $foo; }',
+            ],
+            'array of array of types' => [
+                '<?php class Foo { /** @var Foo[][] */ private array $foo; }',
+                '<?php class Foo { /** @var Foo[][] */ private $foo; }',
+            ],
+            'nullable array of types' => [
+                '<?php class Foo { /** @var null|Foo[] */ private ?array $foo; }',
+                '<?php class Foo { /** @var null|Foo[] */ private $foo; }',
+            ],
+            'comments' => [
+                '<?php
+                    class Foo
+                    {
+                        // comment 0
+                        /** @var Foo */ # comment 1
+                        public/**/Foo $foo/**/;# comment 2
+                    }
+                ',
+                '<?php
+                    class Foo
+                    {
+                        // comment 0
+                        /** @var Foo */ # comment 1
+                        public/**/$foo/**/;# comment 2
+                    }
+                ',
+            ],
+            'array and traversable' => [
+                '<?php class Foo { /** @var array|Traversable */ private iterable $foo; }',
+                '<?php class Foo { /** @var array|Traversable */ private $foo; }',
+            ],
+            'array and traversable with leading slash' => [
+                '<?php class Foo { /** @var array|\Traversable */ private iterable $foo; }',
+                '<?php class Foo { /** @var array|\Traversable */ private $foo; }',
+            ],
+            'array and traversable in a namespace' => [
+                '<?php
+                     namespace App;
+                     class Foo {
+                         /** @var array|Traversable */
+                         private $foo;
+                     }
+                ',
+            ],
+            'array and traversable with leading slash in a namespace' => [
+                '<?php
+                     namespace App;
+                     class Foo {
+                         /** @var array|\Traversable */
+                         private iterable $foo;
+                     }
+                ',
+                '<?php
+                     namespace App;
+                     class Foo {
+                         /** @var array|\Traversable */
+                         private $foo;
+                     }
+                ',
+            ],
+            'array and imported traversable in a namespace' => [
+                '<?php
+                     namespace App;
+                     use Traversable;
+                     class Foo {
+                         /** @var array|Traversable */
+                         private iterable $foo;
+                     }
+                ',
+                '<?php
+                     namespace App;
+                     use Traversable;
+                     class Foo {
+                         /** @var array|Traversable */
+                         private $foo;
+                     }
+                ',
+            ],
+            'array and object aliased as traversable in a namespace' => [
+                '<?php
+                     namespace App;
+                     use Bar as Traversable;
+                     class Foo {
+                         /** @var array|Traversable */
+                         private $foo;
+                     }
+                ',
+                null,
+            ],
+            'array of object and traversable' => [
+                '<?php class Foo { /** @var Foo[]|Traversable */ private iterable $foo; }',
+                '<?php class Foo { /** @var Foo[]|Traversable */ private $foo; }',
+            ],
+            'array of object and iterable' => [
+                '<?php class Foo { /** @var Foo[]|iterable */ private iterable $foo; }',
+                '<?php class Foo { /** @var Foo[]|iterable */ private $foo; }',
+            ],
+            'array of string and array of int' => [
+                '<?php class Foo { /** @var string[]|int[] */ private array $foo; }',
+                '<?php class Foo { /** @var string[]|int[] */ private $foo; }',
+            ],
+            'trait' => [
+                '<?php trait Foo { /** @var int */ private int $foo; }',
+                '<?php trait Foo { /** @var int */ private $foo; }',
+            ],
+            'static property' => [
+                '<?php class Foo { /** @var int */ private static int $foo; }',
+                '<?php class Foo { /** @var int */ private static $foo; }',
+            ],
+            'static property reverse order' => [
+                '<?php class Foo { /** @var int */ static private int $foo; }',
+                '<?php class Foo { /** @var int */ static private $foo; }',
+            ],
+            'var' => [
+                '<?php class Foo { /** @var int */ var int $foo; }',
+                '<?php class Foo { /** @var int */ var $foo; }',
+            ],
+            'with default value' => [
+                '<?php class Foo { /** @var int */ public int $foo = 1; }',
+                '<?php class Foo { /** @var int */ public $foo = 1; }',
+            ],
+            'multiple properties of the same type' => [
+                '<?php class Foo {
+                    /**
+                     * @var int $foo
+                     * @var int $bar
+                     */
+                    public int $foo, $bar;
+                }',
+                '<?php class Foo {
+                    /**
+                     * @var int $foo
+                     * @var int $bar
+                     */
+                    public $foo, $bar;
+                }',
+            ],
+            'multiple properties of different types' => [
+                '<?php class Foo {
+                    /**
+                     * @var int    $foo
+                     * @var string $bar
+                     */
+                    public $foo, $bar;
+                }',
+            ],
+            'single property with different annotations' => [
+                '<?php class Foo {
+                    /**
+                     * @var int    $foo
+                     * @var string $foo
+                     */
+                    public $foo;
+                }',
+            ],
+            'multiple properties with missing annotation' => [
+                '<?php class Foo {
+                    /**
+                     * @var int $foo
+                     */
+                    public $foo, $bar;
+                }',
+            ],
+            'multiple properties with annotation without name' => [
+                '<?php class Foo {
+                    /**
+                     * @var int
+                     * @var int $bar
+                     */
+                    public $foo, $bar;
+                }',
+            ],
+            'multiple properties with annotation without name reverse order' => [
+                '<?php class Foo {
+                    /**
+                     * @var int $foo
+                     * @var int
+                     */
+                    public $foo, $bar;
+                }',
+            ],
+            'multiple properties with extra annotations' => [
+                '<?php class Foo {
+                    /**
+                     * @var string
+                     * @var int $foo
+                     * @var int $bar
+                     * @var int
+                     */
+                    public int $foo, $bar;
+                }',
+                '<?php class Foo {
+                    /**
+                     * @var string
+                     * @var int $foo
+                     * @var int $bar
+                     * @var int
+                     */
+                    public $foo, $bar;
+                }',
+            ],
+            'abstract method' => [
+                '<?php abstract class Foo {
+                    /** @var Bar */ private Bar $foo;
+
+                    public abstract function getFoo();
+                }',
+                '<?php abstract class Foo {
+                    /** @var Bar */ private $foo;
+
+                    public abstract function getFoo();
+                }',
+            ],
+            'great number of properties' => [
+                '<?php class Foo {
+                    /** @var string */
+                    private string $foo1;
+
+                    /** @var string */
+                    private string $foo2;
+
+                    /** @var int */
+                    private int $foo3;
+
+                    /** @var string */
+                    private string $foo4;
+
+                    /** @var string */
+                    private string $foo5;
+
+                    /** @var string */
+                    private string $foo6;
+
+                    /** @var string */
+                    private string $foo7;
+
+                    /** @var int */
+                    private int $foo8;
+
+                    /** @var string */
+                    private string $foo9;
+
+                    /** @var int|null */
+                    private ?int $foo10;
+                }',
+                '<?php class Foo {
+                    /** @var string */
+                    private $foo1;
+
+                    /** @var string */
+                    private $foo2;
+
+                    /** @var int */
+                    private $foo3;
+
+                    /** @var string */
+                    private $foo4;
+
+                    /** @var string */
+                    private $foo5;
+
+                    /** @var string */
+                    private $foo6;
+
+                    /** @var string */
+                    private $foo7;
+
+                    /** @var int */
+                    private $foo8;
+
+                    /** @var string */
+                    private $foo9;
+
+                    /** @var int|null */
+                    private $foo10;
+                }',
+            ],
+        ];
+    }
+
+    /**
+     * @param string      $expected
+     * @param null|string $input
+     *
+     * @dataProvider provideFixPhp70Cases
+     * @requires PHP 7.0
+     */
+    public function testFixPhp70($expected, $input = null, array $config = [])
+    {
+        if (null !== $input && \PHP_VERSION_ID < 70400) {
+            $expected = $input;
+            $input = null;
+        }
+
+        $this->fixer->configure($config);
+
+        $this->doTest($expected, $input);
+    }
+
+    public function provideFixPhp70Cases()
+    {
+        return [
+            'anonymous class' => [
+                '<?php new class { /** @var int */ private int $foo; };',
+                '<?php new class { /** @var int */ private $foo; };',
+            ],
+        ];
+    }
+}
diff --git a/tests/Fixer/FunctionNotation/PhpdocToReturnTypeFixerTest.php b/tests/Fixer/FunctionNotation/PhpdocToReturnTypeFixerTest.php
index a4901a323fb..435ab6d7f53 100644
--- a/tests/Fixer/FunctionNotation/PhpdocToReturnTypeFixerTest.php
+++ b/tests/Fixer/FunctionNotation/PhpdocToReturnTypeFixerTest.php
@@ -33,7 +33,13 @@ final class PhpdocToReturnTypeFixerTest extends AbstractFixerTestCase
      */
     public function testFix($expected, $input = null, $versionSpecificFix = null, array $config = [])
     {
-        if (null !== $input && null !== $versionSpecificFix && \PHP_VERSION_ID < $versionSpecificFix) {
+        if (
+            null !== $input
+            && (
+                \PHP_VERSION_ID < 70000
+                || (null !== $versionSpecificFix && \PHP_VERSION_ID < $versionSpecificFix)
+            )
+        ) {
             $expected = $input;
             $input = null;
         }
diff --git a/tests/Test/AbstractFixerTestCase.php b/tests/Test/AbstractFixerTestCase.php
index 24fcf314853..a05a0564335 100644
--- a/tests/Test/AbstractFixerTestCase.php
+++ b/tests/Test/AbstractFixerTestCase.php
@@ -323,6 +323,7 @@ public function testFixerUseInsertSlicesWhenOnlyInsertionsArePerformed()
                 'php_unit_test_annotation',
                 'php_unit_test_class_requires_covers',
                 'phpdoc_to_param_type',
+                'phpdoc_to_property_type',
                 'phpdoc_to_return_type',
                 'random_api_migration',
                 'semicolon_after_instruction',