-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
PES-2068 CR refactor - introduce constants PES-2068 CR fix - unused getters removed PES-2068 CR fix - format table using css PES-2068 CR fix - typehints & annotations PES-2068 CR fix - introduce updateZasilkovnaConfig PES-2068 CR fix - introduce configuration defaults PES-2068 final minor CR fixes PES-2068 CS fixes and minor improvement PES-2068 Use ConfigValidator::KEY_PAYMENT_METHOD_PREFIX in template PES-2068 CR - final fix for strange VM null handling
- Loading branch information
Showing
12 changed files
with
341 additions
and
165 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
149 changes: 149 additions & 0 deletions
149
...com_virtuemart/models/zasilkovna_src/VirtueMartModelZasilkovna/ConfigurationValidator.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| <?php | ||
| namespace VirtueMartModelZasilkovna; | ||
|
|
||
| class ConfigurationValidator | ||
| { | ||
| public const KEY_USE_DEFAULT_WEIGHT = 'zasilkovna_use_default_weight'; | ||
| public const KEY_DEFAULT_WEIGHT = 'zasilkovna_default_weight'; | ||
| public const KEY_USE_DEFAULT_DIMENSIONS = 'zasilkovna_use_default_dimensions'; | ||
| public const KEY_API_PASS = 'zasilkovna_api_pass'; | ||
| public const KEY_ESHOP_LABEL = 'zasilkovna_eshop_label'; | ||
| public const KEY_DEFAULT_LENGTH = 'zasilkovna_default_length'; | ||
| public const KEY_DEFAULT_WIDTH = 'zasilkovna_default_width'; | ||
| public const KEY_DEFAULT_HEIGHT = 'zasilkovna_default_height'; | ||
| public const KEY_PAYMENT_METHOD_PREFIX = 'zasilkovna_payment_method_'; | ||
| public const CONFIG_DEFAULTS = [ | ||
| self::KEY_USE_DEFAULT_WEIGHT => false, | ||
| self::KEY_DEFAULT_WEIGHT => 0, | ||
| self::KEY_USE_DEFAULT_DIMENSIONS => false, | ||
| self::KEY_DEFAULT_LENGTH => 0, | ||
| self::KEY_DEFAULT_WIDTH => 0, | ||
| self::KEY_DEFAULT_HEIGHT => 0, | ||
| self::KEY_API_PASS => '', | ||
| self::KEY_ESHOP_LABEL => '', | ||
| ]; | ||
|
|
||
|
|
||
| /** | ||
| * @var array<string, mixed> | ||
| */ | ||
| private array $configuration; | ||
|
|
||
| /** | ||
| * @var array <string, string>|array<string, array<string>> | ||
| */ | ||
| private array $errors = []; | ||
|
|
||
| /** | ||
| * @var array<string, mixed> | ||
| */ | ||
| private array $validData = []; | ||
|
|
||
| /** | ||
| * @param array<string, mixed> $configuration | ||
| */ | ||
| public function __construct(array $configuration) | ||
| { | ||
| $this->configuration = $configuration; | ||
| } | ||
|
|
||
| public function validate(): void { | ||
| $this->validateApiPassword(); | ||
| $this->validateWeight(); | ||
| $this->validateDimensions(); | ||
| $this->setValidDataForNotValidatedFields(); | ||
| } | ||
|
|
||
| private function validateWeight(): void { | ||
| if ($this->configuration[self::KEY_USE_DEFAULT_WEIGHT] === '1') { | ||
| if (empty($this->configuration[self::KEY_DEFAULT_WEIGHT]) | ||
| || (float)$this->configuration[self::KEY_DEFAULT_WEIGHT] < 0.001) { | ||
| $this->errors[self::KEY_DEFAULT_WEIGHT] = [ | ||
| 'PLG_VMPSHIPMENT_PACKETERY_DEFAULT_FIELD_MUST_BE_POSITIVE', | ||
| 'PLG_VMSHIPMENT_PACKETERY_DEFAULT_WEIGHT', | ||
| ]; | ||
| return; | ||
| } | ||
| $this->validData[self::KEY_DEFAULT_WEIGHT] = round((float)$this->configuration[self::KEY_DEFAULT_WEIGHT], 3); | ||
| $this->validData[self::KEY_USE_DEFAULT_WEIGHT] = true; | ||
| return; | ||
| } | ||
| $this->validData[self::KEY_USE_DEFAULT_WEIGHT] = false; | ||
| $this->validData[self::KEY_DEFAULT_WEIGHT] = self::CONFIG_DEFAULTS[self::KEY_DEFAULT_WEIGHT]; | ||
| } | ||
|
|
||
| private function validateDimensions(): void { | ||
| $fields = [ | ||
| self::KEY_DEFAULT_LENGTH => 'PLG_VMSHIPMENT_PACKETERY_DEFAULT_DIMENSIONS_LENGTH', | ||
| self::KEY_DEFAULT_WIDTH => 'PLG_VMSHIPMENT_PACKETERY_DEFAULT_DIMENSIONS_WIDTH', | ||
| self::KEY_DEFAULT_HEIGHT => 'PLG_VMSHIPMENT_PACKETERY_DEFAULT_DIMENSIONS_HEIGHT', | ||
| ]; | ||
|
|
||
| if (!isset($this->configuration[self::KEY_USE_DEFAULT_DIMENSIONS]) | ||
| || $this->configuration[self::KEY_USE_DEFAULT_DIMENSIONS] === '0' | ||
| ) { | ||
| $this->validData[self::KEY_USE_DEFAULT_DIMENSIONS] = false; | ||
| foreach (array_keys($fields) as $field) { | ||
| $this->validData[$field] = self::CONFIG_DEFAULTS[$field]; | ||
| } | ||
| return; | ||
| } | ||
|
|
||
| $validDimensions = []; | ||
| foreach ($fields as $field => $label) { | ||
| if (!isset($this->configuration[$field]) || (int)$this->configuration[$field] < 1) { | ||
| $this->errors[$field] = ['PLG_VMPSHIPMENT_PACKETERY_DEFAULT_FIELD_MUST_BE_POSITIVE', $label]; | ||
| } else { | ||
| $validDimensions[$field] = (int)$this->configuration[$field]; | ||
| } | ||
| } | ||
| if (count($validDimensions) === count($fields)) { | ||
| $this->validData[self::KEY_USE_DEFAULT_DIMENSIONS] = true; | ||
| $this->validData = array_merge($this->validData, $validDimensions); | ||
| } | ||
| } | ||
|
|
||
| private function validateApiPassword(): void { | ||
| if ($this->configuration[self::KEY_API_PASS] === '') { | ||
| $this->errors[self::KEY_API_PASS] = 'PLG_VMSHIPMENT_PACKETERY_API_PASS_NOT_SET'; | ||
| return; | ||
| } | ||
| if (strlen($this->configuration[self::KEY_API_PASS]) !== 32) { | ||
| $this->errors[self::KEY_API_PASS] = 'PLG_VMSHIPMENT_PACKETERY_API_PASS_INVALID'; | ||
| return; | ||
| } | ||
|
|
||
| $this->validData[self::KEY_API_PASS] = $this->configuration[self::KEY_API_PASS]; | ||
| } | ||
|
|
||
| public function isValid(): bool { | ||
| return empty($this->errors); | ||
| } | ||
|
|
||
| /** | ||
| * @return array<string, string>|array<string, array<string>> | ||
| */ | ||
| public function getErrors(): array { | ||
| return $this->errors; | ||
| } | ||
|
|
||
| /** | ||
| * @return array<string, mixed> | ||
| */ | ||
| public function getValidData(): array { | ||
| return $this->validData; | ||
| } | ||
|
|
||
| private function setValidDataForNotValidatedFields(): void { | ||
| $this->validData[self::KEY_ESHOP_LABEL] = $this->configuration[self::KEY_ESHOP_LABEL] ?? self::CONFIG_DEFAULTS[self::KEY_ESHOP_LABEL]; | ||
|
|
||
| $paymentMethods = array_filter( | ||
| $this->configuration, | ||
| static function ($key) { | ||
| return str_starts_with($key, self::KEY_PAYMENT_METHOD_PREFIX); | ||
| }, | ||
| ARRAY_FILTER_USE_KEY | ||
| ); | ||
| $this->validData = array_merge($this->validData, $paymentMethods); | ||
| } | ||
| } |
Oops, something went wrong.