diff --git a/src/Form/Mod/Dto/ModFormDto.php b/src/Form/Mod/Dto/ModFormDto.php index 8e2e3094..abbb1f8f 100644 --- 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 deleted file mode 100644 index ab49025e..00000000 --- a/src/Validator/Mod/ModSourceAndType.php +++ /dev/null @@ -1,32 +0,0 @@ -message = $message ?? $this->message; - $this->errorPath = $errorPath ?? $this->errorPath; - } - - public function getTargets(): array|string - { - return parent::CLASS_CONSTRAINT; - } -} diff --git a/src/Validator/Mod/ModSourceAndTypeValidator.php b/src/Validator/Mod/ModSourceAndTypeValidator.php deleted file mode 100644 index 3d8cba21..00000000 --- a/src/Validator/Mod/ModSourceAndTypeValidator.php +++ /dev/null @@ -1,32 +0,0 @@ -value === $value->getSource() && ModTypeEnum::SERVER_SIDE->value === $value->getType()) { - return; - } - - $this->addViolation($constraint->message, [], $constraint->errorPath); - } -} diff --git a/src/Validator/Mod/SteamWorkshopArma3ModUrlValidator.php b/src/Validator/Mod/SteamWorkshopArma3ModUrlValidator.php index b30d3b4e..678cfd55 100644 --- 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 index 42a9ac02..b745fdec 100644 --- 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