Fix validators

ArmaForces · Oct 22, 2023 · 4647951 · 4647951
1 parent 340df3c
commit 4647951
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 69 deletions.
diff --git a/src/Form/Mod/Dto/ModFormDto.php b/src/Form/Mod/Dto/ModFormDto.php
@@ -6,7 +6,6 @@
 
 use App\Entity\Mod\Enum\ModSourceEnum;
 use App\Form\AbstractFormDto;
-use App\Validator\Mod\ModSourceAndType;
 use App\Validator\Mod\SteamWorkshopArma3ModUrl;
 use App\Validator\Mod\UniqueDirectoryMod;
 use App\Validator\Mod\UniqueSteamWorkshopMod;
@@ -17,7 +16,6 @@
 #[UniqueSteamWorkshopMod(groups: [ModSourceEnum::STEAM_WORKSHOP->value])]
 #[SteamWorkshopArma3ModUrl(groups: [ModSourceEnum::STEAM_WORKSHOP->value], errorPath: 'url', nameErrorPath: 'name')]
 #[UniqueDirectoryMod(groups: [ModSourceEnum::DIRECTORY->value])]
-#[ModSourceAndType(errorPath: 'source')]
 class ModFormDto extends AbstractFormDto
 {
     protected ?UuidInterface $id = null;

diff --git a/src/Validator/Mod/ModSourceAndType.php b/src/Validator/Mod/ModSourceAndType.php
diff --git a/src/Validator/Mod/ModSourceAndTypeValidator.php b/src/Validator/Mod/ModSourceAndTypeValidator.php
diff --git a/src/Validator/Mod/SteamWorkshopArma3ModUrlValidator.php b/src/Validator/Mod/SteamWorkshopArma3ModUrlValidator.php
@@ -37,6 +37,9 @@ public function validate(mixed $value, Constraint $constraint): void
 
         $name = $value->getName();
         $url = $value->getUrl();
+        if ('' === $url || null === $url) {
+            return;
+        }
 
         try {
             $itemId = SteamHelper::itemUrlToItemId($url);

diff --git a/translations/validators.pl.yaml b/translations/validators.pl.yaml
@@ -38,6 +38,3 @@ Mod group with the same name "{{ modGroupName }}" already exist: Grupa modów o
 
 # Unique User Group Name Validator
 User group with the same name "{{ userGroupName }}" already exist: Grupa użytkowników o nazwie "{{ userGroupName }}" już istnieje
-
-# Mod Source And Type Validator
-Mod from a directory must be a server side mod: Mod pochodzący z katalogu musi być serwerowy