Reduce common control flows

Author: alexandre-daubois

Mapping/Loader/PropertyInfoLoader.php

@@ -133,10 +133,6 @@ public function loadClassMetadata(ClassMetadata $metadata): bool
                         $metadata->addPropertyConstraint($property, new Type(['type' => 'scalar']));
                     }
                 }
-
-                if (!$nullable && !$hasNotBlankConstraint && !$hasNotNullConstraint) {
-                    $metadata->addPropertyConstraint($property, new NotNull());
-                }
             } else {
                 if ($hasTypeConstraint) {
                     continue;
@@ -157,10 +153,10 @@ public function loadClassMetadata(ClassMetadata $metadata): bool
                 if (null !== $typeConstraint = $this->getTypeConstraint($type)) {
                     $metadata->addPropertyConstraint($property, $typeConstraint);
                 }
+            }
 
-                if (!$nullable && !$hasNotBlankConstraint && !$hasNotNullConstraint) {
-                    $metadata->addPropertyConstraint($property, new NotNull());
-                }
+            if (!$nullable && !$hasNotBlankConstraint && !$hasNotNullConstraint) {
+                $metadata->addPropertyConstraint($property, new NotNull());
             }
         }