diff --git a/Extension/Validator/Constraints/FormValidator.php b/Extension/Validator/Constraints/FormValidator.php
index 2e3748df..944fc2d6 100644
--- a/Extension/Validator/Constraints/FormValidator.php
+++ b/Extension/Validator/Constraints/FormValidator.php
@@ -42,7 +42,7 @@ class FormValidator extends ConstraintValidator
             return;
         }
 
-        /* @var FormInterface $form */
+        /** @var FormInterface $form */
         $config = $form->getConfig();
 
         $validator = $this->context->getValidator()->inContext($this->context);
diff --git a/Extension/Validator/ValidatorExtension.php b/Extension/Validator/ValidatorExtension.php
index d7745be0..51ba5258 100644
--- a/Extension/Validator/ValidatorExtension.php
+++ b/Extension/Validator/ValidatorExtension.php
@@ -43,7 +43,7 @@ class ValidatorExtension extends AbstractExtension
         // the DIC, where the XML file is loaded automatically. Thus the following
         // code must be kept synchronized with validation.xml
 
-        /* @var $metadata ClassMetadata */
+        /** @var ClassMetadata $metadata */
         $metadata->addConstraint(new Form());
         $metadata->addConstraint(new Traverse(false));
 
diff --git a/Extension/Validator/ViolationMapper/ViolationMapper.php b/Extension/Validator/ViolationMapper/ViolationMapper.php
index fd53697b..ccad21fe 100644
--- a/Extension/Validator/ViolationMapper/ViolationMapper.php
+++ b/Extension/Validator/ViolationMapper/ViolationMapper.php
@@ -253,7 +253,7 @@ class ViolationMapper implements ViolationMapperInterface
 
             // Test mapping rules as long as we have any
             foreach ($rules as $key => $rule) {
-                /* @var MappingRule $rule */
+                /** @var MappingRule $rule */
 
                 // Mapping rule matches completely, terminate.
                 if (null !== ($form = $rule->match($chunk))) {
@@ -317,7 +317,7 @@ class ViolationMapper implements ViolationMapperInterface
                 // Cut the piece out of the property path and proceed
                 $propertyPathBuilder->remove($i);
             } else {
-                /* @var \Symfony\Component\PropertyAccess\PropertyPathInterface $propertyPath */
+                /** @var \Symfony\Component\PropertyAccess\PropertyPathInterface $propertyPath */
                 $propertyPath = $scope->getPropertyPath();
 
                 if (null === $propertyPath) {
diff --git a/FormBuilder.php b/FormBuilder.php
index f405c811..3c0f4e21 100644
--- a/FormBuilder.php
+++ b/FormBuilder.php
@@ -147,7 +147,7 @@ class FormBuilder extends FormConfigBuilder implements \IteratorAggregate, FormB
 
     public function getFormConfig(): FormConfigInterface
     {
-        /** @var $config self */
+        /** @var self $config */
         $config = parent::getFormConfig();
 
         $config->children = [];
diff --git a/FormErrorIterator.php b/FormErrorIterator.php
index ded0bbed..e563c9b2 100644
--- a/FormErrorIterator.php
+++ b/FormErrorIterator.php
@@ -77,7 +77,7 @@ class FormErrorIterator implements \RecursiveIterator, \SeekableIterator, \Array
             if ($error instanceof FormError) {
                 $string .= 'ERROR: '.$error->getMessage()."\n";
             } else {
-                /* @var self $error */
+                /** @var self $error */
                 $string .= $error->getForm()->getName().":\n";
                 $string .= self::indent((string) $error);
             }
diff --git a/ResolvedFormType.php b/ResolvedFormType.php
index 16a175fc..84921b4f 100644
--- a/ResolvedFormType.php
+++ b/ResolvedFormType.php
@@ -130,7 +130,7 @@ class ResolvedFormType implements ResolvedFormTypeInterface
         $this->innerType->finishView($view, $form, $options);
 
         foreach ($this->typeExtensions as $extension) {
-            /* @var FormTypeExtensionInterface $extension */
+            /** @var FormTypeExtensionInterface $extension */
             $extension->finishView($view, $form, $options);
         }
     }
diff --git a/Tests/SimpleFormTest.php b/Tests/SimpleFormTest.php
index d5d3549d..0f9a6dc4 100644
--- a/Tests/SimpleFormTest.php
+++ b/Tests/SimpleFormTest.php
@@ -1052,7 +1052,7 @@ class SimpleFormTest extends TestCase
         $config = $this->getBuilder()->setData('DEFAULT')->getFormConfig();
         $form = new Form($config);
 
-        /* @var Form $form */
+        /** @var Form $form */
         $form->initialize();
 
         $this->assertSame('DEFAULT', $form->getData());