Improve handling of empty values in validators

ArmaForces · Jan 7, 2024 · 663b938 · 663b938
1 parent 9ba4259
commit 663b938
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 6 deletions.
diff --git a/src/Form/Dlc/Dto/DlcFormDto.php b/src/Form/Dlc/Dto/DlcFormDto.php
@@ -25,6 +25,7 @@ class DlcFormDto extends AbstractFormDto
     #[Assert\Length(min: 1, max: 255)]
     protected ?string $description = null;
 
+    #[Assert\NotBlank]
     protected ?string $url = null;
 
     #[Assert\NotBlank]

diff --git a/src/Validator/Dlc/SteamStoreArma3DlcUrlValidator.php b/src/Validator/Dlc/SteamStoreArma3DlcUrlValidator.php
@@ -36,6 +36,9 @@ public function validate(mixed $value, Constraint $constraint): void
         }
 
         $url = $value->getUrl();
+        if ('' === $url || null === $url) {
+            return;
+        }
 
         try {
             $appId = SteamHelper::appUrlToAppId($url);

diff --git a/src/Validator/Dlc/UniqueDirectoryDlcValidator.php b/src/Validator/Dlc/UniqueDirectoryDlcValidator.php
@@ -23,8 +23,12 @@ public function validate(mixed $value, Constraint $constraint): void
         }
 
         $directory = $value->getDirectory();
+        if ('' === $directory || null === $directory) {
+            return;
+        }
+
         $id = $value->getId();
-        if (!$directory || $this->isColumnValueUnique(Dlc::class, ['directory' => $directory], $id)) {
+        if ($this->isColumnValueUnique(Dlc::class, ['directory' => $directory], $id)) {
             return;
         }
 

diff --git a/src/Validator/Mod/UniqueDirectoryModValidator.php b/src/Validator/Mod/UniqueDirectoryModValidator.php
@@ -23,8 +23,12 @@ public function validate(mixed $value, Constraint $constraint): void
         }
 
         $directory = $value->getDirectory();
+        if ('' === $directory || null === $directory) {
+            return;
+        }
+
         $id = $value->getId();
-        if (!$directory || $this->isColumnValueUnique(DirectoryMod::class, ['directory' => $directory], $id)) {
+        if ($this->isColumnValueUnique(DirectoryMod::class, ['directory' => $directory], $id)) {
             return;
         }
 

diff --git a/src/Validator/ModGroup/UniqueModGroupNameValidator.php b/src/Validator/ModGroup/UniqueModGroupNameValidator.php
@@ -23,8 +23,12 @@ public function validate(mixed $value, Constraint $constraint): void
         }
 
         $name = $value->getName();
+        if ('' === $name || null === $name) {
+            return;
+        }
+
         $id = $value->getId();
-        if (!$name || $this->isColumnValueUnique(ModGroup::class, ['name' => $name], $id)) {
+        if ($this->isColumnValueUnique(ModGroup::class, ['name' => $name], $id)) {
             return;
         }
 

diff --git a/src/Validator/ModList/UniqueModListNameValidator.php b/src/Validator/ModList/UniqueModListNameValidator.php
@@ -23,8 +23,12 @@ public function validate(mixed $value, Constraint $constraint): void
         }
 
         $name = $value->getName();
+        if ('' === $name || null === $name) {
+            return;
+        }
+
         $id = $value->getId();
-        if (!$name || $this->isColumnValueUnique(ModList::class, ['name' => $name], $id)) {
+        if ($this->isColumnValueUnique(ModList::class, ['name' => $name], $id)) {
             return;
         }
 

diff --git a/src/Validator/User/UniqueUserSteamIdValidator.php b/src/Validator/User/UniqueUserSteamIdValidator.php
@@ -24,8 +24,12 @@ public function validate(mixed $value, Constraint $constraint): void
         }
 
         $steamId = $value->getSteamId();
+        if (null === $steamId) {
+            return;
+        }
+
         $id = $value->getId();
-        if (!$steamId || $this->isColumnValueUnique(User::class, ['steamId' => $steamId], $id)) {
+        if ($this->isColumnValueUnique(User::class, ['steamId' => $steamId], $id)) {
             return;
         }
 

diff --git a/src/Validator/UserGroup/UniqueUserGroupNameValidator.php b/src/Validator/UserGroup/UniqueUserGroupNameValidator.php
@@ -23,8 +23,12 @@ public function validate(mixed $value, Constraint $constraint): void
         }
 
         $name = $value->getName();
+        if ('' === $name || null === $name) {
+            return;
+        }
+
         $id = $value->getId();
-        if (!$name || $this->isColumnValueUnique(UserGroup::class, ['name' => $name], $id)) {
+        if ($this->isColumnValueUnique(UserGroup::class, ['name' => $name], $id)) {
             return;
         }