diff --git a/src/Doctrine/DoctrineHelper.php b/src/Doctrine/DoctrineHelper.php
index 961d42981..8c05db245 100644
--- a/src/Doctrine/DoctrineHelper.php
+++ b/src/Doctrine/DoctrineHelper.php
@@ -161,7 +161,6 @@ public function getEntitiesForAutocomplete(): array
         if ($this->isDoctrineInstalled()) {
             $allMetadata = $this->getMetadata();
 
-            /* @var ClassMetadata $metadata */
             foreach (array_keys($allMetadata) as $classname) {
                 $entityClassDetails = new ClassNameDetails($classname, $this->entityNamespace);
                 $entities[] = $entityClassDetails->getRelativeName();
diff --git a/src/Doctrine/EntityRegenerator.php b/src/Doctrine/EntityRegenerator.php
index be1bbee41..b5caadee7 100644
--- a/src/Doctrine/EntityRegenerator.php
+++ b/src/Doctrine/EntityRegenerator.php
@@ -241,7 +241,7 @@ private function generateRepository(ClassMetadata $metadata): void
 
     private function getMappedFieldsInEntity(ClassMetadata $classMetadata): array
     {
-        /* @var $classReflection \ReflectionClass */
+        /** @var \ReflectionClass $classReflection */
         $classReflection = $classMetadata->reflClass;
 
         $targetFields = array_merge(
diff --git a/src/Resources/skeleton/validator/Validator.tpl.php b/src/Resources/skeleton/validator/Validator.tpl.php
index 52701e03c..b32219ef4 100644
--- a/src/Resources/skeleton/validator/Validator.tpl.php
+++ b/src/Resources/skeleton/validator/Validator.tpl.php
@@ -9,7 +9,7 @@ class <?= $class_name ?> extends ConstraintValidator
 {
     public function validate($value, Constraint $constraint)
     {
-        /* @var $constraint \<?= $constraint_class_name ?> */
+        /* @var <?= $constraint_class_name ?> $constraint */
 
         if (null === $value || '' === $value) {
             return;