chore: updated Config validation and removed old validator

Author: andrepimpao

src/Config.php

@@ -2,21 +2,17 @@
 
 namespace ProgrammatorDev\OpenWeatherMap;
 
-use ProgrammatorDev\OpenWeatherMap\Exception\ValidationException;
 use ProgrammatorDev\OpenWeatherMap\HttpClient\HttpClientBuilder;
 use ProgrammatorDev\OpenWeatherMap\Language\Language;
 use ProgrammatorDev\OpenWeatherMap\UnitSystem\UnitSystem;
-use ProgrammatorDev\OpenWeatherMap\Validator\BlankValidatorTrait;
-use ProgrammatorDev\OpenWeatherMap\Validator\ChoiceValidatorTrait;
+use ProgrammatorDev\YetAnotherPhpValidator\Exception\ValidationException;
+use ProgrammatorDev\YetAnotherPhpValidator\Validator;
 use Psr\Cache\CacheItemPoolInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class Config
 {
-    use BlankValidatorTrait;
-    use ChoiceValidatorTrait;
-
     private array $options;
 
     public function __construct(array $options = [])
@@ -62,7 +58,7 @@ public function getApplicationKey(): string
      */
     public function setApplicationKey(string $applicationKey): self
     {
-        $this->validateBlank('applicationKey', $applicationKey);
+        Validator::notBlank()->assert($applicationKey, 'applicationKey');
 
         $this->options['applicationKey'] = $applicationKey;
 
@@ -79,7 +75,7 @@ public function getUnitSystem(): string
      */
     public function setUnitSystem(string $unitSystem): self
     {
-        $this->validateChoice('unitSystem', $unitSystem, UnitSystem::getList());
+        Validator::choice(UnitSystem::getList())->assert($unitSystem, 'unitSystem');
 
         $this->options['unitSystem'] = $unitSystem;
 
@@ -96,7 +92,7 @@ public function getLanguage(): string
      */
     public function setLanguage(string $language): self
     {
-        $this->validateChoice('language', $language, Language::getList());
+        Validator::choice(Language::getList())->assert($language, 'language');
 
         $this->options['language'] = $language;
 

src/Endpoint/OneCallEndpoint.php

@@ -13,17 +13,13 @@
 use ProgrammatorDev\OpenWeatherMap\Exception\TooManyRequestsException;
 use ProgrammatorDev\OpenWeatherMap\Exception\UnauthorizedException;
 use ProgrammatorDev\OpenWeatherMap\Exception\UnexpectedErrorException;
-use ProgrammatorDev\OpenWeatherMap\Validator\CoordinateValidatorTrait;
-use ProgrammatorDev\OpenWeatherMap\Validator\LessThanValidatorTrait;
 use ProgrammatorDev\YetAnotherPhpValidator\Exception\ValidationException;
 use ProgrammatorDev\YetAnotherPhpValidator\Validator;
 
 class OneCallEndpoint extends AbstractEndpoint
 {
     use WithUnitSystemTrait;
     use WithLanguageTrait;
-    use CoordinateValidatorTrait;
-    use LessThanValidatorTrait;
 
     private string $urlOneCall = 'https://api.openweathermap.org/data/3.0/onecall';
 

src/Endpoint/Util/WithLanguageTrait.php

@@ -3,14 +3,11 @@
 namespace ProgrammatorDev\OpenWeatherMap\Endpoint\Util;
 
 use ProgrammatorDev\OpenWeatherMap\Language\Language;
-use ProgrammatorDev\OpenWeatherMap\Validator\ChoiceValidatorTrait;
 use ProgrammatorDev\YetAnotherPhpValidator\Exception\ValidationException;
 use ProgrammatorDev\YetAnotherPhpValidator\Validator;
 
 trait WithLanguageTrait
 {
-    use ChoiceValidatorTrait;
-
     /**
      * @throws ValidationException
      */

src/Endpoint/Util/WithUnitSystemTrait.php

@@ -3,14 +3,11 @@
 namespace ProgrammatorDev\OpenWeatherMap\Endpoint\Util;
 
 use ProgrammatorDev\OpenWeatherMap\UnitSystem\UnitSystem;
-use ProgrammatorDev\OpenWeatherMap\Validator\ChoiceValidatorTrait;
 use ProgrammatorDev\YetAnotherPhpValidator\Exception\ValidationException;
 use ProgrammatorDev\YetAnotherPhpValidator\Validator;
 
 trait WithUnitSystemTrait
 {
-    use ChoiceValidatorTrait;
-
     /**
      * @throws ValidationException
      */

src/Endpoint/WeatherEndpoint.php

@@ -12,17 +12,13 @@
 use ProgrammatorDev\OpenWeatherMap\Exception\TooManyRequestsException;
 use ProgrammatorDev\OpenWeatherMap\Exception\UnauthorizedException;
 use ProgrammatorDev\OpenWeatherMap\Exception\UnexpectedErrorException;
-use ProgrammatorDev\OpenWeatherMap\Validator\CoordinateValidatorTrait;
-use ProgrammatorDev\OpenWeatherMap\Validator\GreaterThanValidatorTrait;
 use ProgrammatorDev\YetAnotherPhpValidator\Exception\ValidationException;
 use ProgrammatorDev\YetAnotherPhpValidator\Validator;
 
 class WeatherEndpoint extends AbstractEndpoint
 {
     use WithUnitSystemTrait;
     use WithLanguageTrait;
-    use CoordinateValidatorTrait;
-    use GreaterThanValidatorTrait;
 
     private const NUM_RESULTS = 40;