add new methods

modify some code

Author: SkyWalkerGhost

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to `shergela/validation-rule` will be documented in this file.
 
+## 1.0.5 | 30 August - 2024
+
+- add new `array()` method.
+- add new `arrayDistinct()` method.
+- add new `arrayDistinctStrict()` method.
+- add new `arrayDistinctIgnoreCase()` method.
+
 ## 1.0.4 | 26 August - 2024
 
 - add new `length()` method.

README.md

@@ -94,7 +94,10 @@ return [
 |      ->timezoneAustralia()      |  new TimezoneRegionValidation()   |
 |       ->timezoneIndian()        |  new TimezoneRegionValidation()   |
 |       ->timezonePacific()       |  new TimezoneRegionValidation()   |
-|           ->length()            |               size                |
+|            ->array()            |               array               |
+|        ->arrayDistinct()        |             distinct              |
+|     ->arrayDistinctStrict()     |          distinct:strict          |
+|   ->arrayDistinctIgnoreCase()   |       distinct:ignore_case        |
 </div>
 
 

src/Enums/ValidationArrayEnum.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Shergela\Validations\Enums;
+
+enum ValidationArrayEnum: string
+{
+    /**
+     * Input value must be a date.
+     * Date validations
+     */
+    public const ARRAY = 'array';
+    public const DISTINCT = 'distinct';
+    public const DISTINCT_STRICT = 'distinct:strict';
+    public const DISTINCT_IGNORE_CASE = 'distinct:ignore_case';
+}

src/Enums/ValidationStringEnum.php

@@ -18,6 +18,8 @@ enum ValidationStringEnum: string
      */
     public const ALPHA = 'alpha';
 
+    public const ASCII = 'ascii';
+
     /**
      * The field under validation must be entirely Unicode alphanumeric characters contained in \p{L}, \p{M}, \p{N},
      * as well as ASCII dashes (-) and ASCII underscores (_).

src/Rules/TimezoneRegionValidation.php

@@ -46,13 +46,17 @@ public function validate(string $attribute, mixed $value, Closure $fail): void
         };
 
         if (! in_array($search, $this->getTimezoneLists())) {
-            $fail(
-                sprintf(
-                    "The city name [input: :attribute] (%s) is not in the valid timezone for (%s) list.",
-                    ucfirst($toString),
-                    ucfirst($this->timezoneGroup)
-                )
-            );
+            if ($this->customMessage !== null) {
+                $fail($this->customMessage);
+            } else {
+                $fail(
+                    sprintf(
+                        "The city name [:attribute] (%s) is not in the valid timezone for (%s) list.",
+                        ucfirst($toString),
+                        ucfirst($this->timezoneGroup)
+                    )
+                );
+            }
         }
     }
 

src/Validation/BuildValidationRule.php

@@ -12,6 +12,7 @@
 use Shergela\Validations\Rules\SeparateIntegersByComma as IntegerByComma;
 use Shergela\Validations\Rules\SeparateStringsByComma as StringByComma;
 use Shergela\Validations\Rules\SeparateStringsByUnderscore as StringByUnderscore;
+use Shergela\Validations\Enums\ValidationArrayEnum as ArrayEnum;
 use Shergela\Validations\Rules\TimezoneRegionValidation;
 use Shergela\Validations\Rules\TimezoneValidation;
 use Shergela\Validations\Rules\UppercaseFirstLetter;
@@ -37,7 +38,7 @@ class BuildValidationRule
      * @var string|null
      * Set custom message
      */
-    protected static ?string $customMessage = null;
+    protected static ?string $validationMessage = null;
 
     /**
      * @var int|null
@@ -317,6 +318,26 @@ class BuildValidationRule
      */
     protected static ?string $notIn = null;
 
+    /**
+     * @var bool
+     */
+    protected bool $array = false;
+
+    /**
+     * @var bool
+     */
+    protected bool $arrayDistinct = false;
+
+    /**
+     * @var bool
+     */
+    protected ?bool $distinctStinct = false;
+
+    /**
+     * @var bool
+     */
+    protected bool $distinctIgnoreCase = false;
+
     /**
      * @return array<string>
      */
@@ -384,13 +405,13 @@ protected function buildValidationRules(): array
 
             ...(
                 $this->uppercaseFirstLetter === true
-                    ? [new UppercaseFirstLetter(message: static::$customMessage)]
+                    ? [new UppercaseFirstLetter(message: static::$validationMessage)]
                     : []
             ),
 
             ...(
                 $this->lowercaseFirstLetter === true
-                    ? [new LowercaseFirstLetter(message: static::$customMessage)]
+                    ? [new LowercaseFirstLetter(message: static::$validationMessage)]
                     : []
             ),
 
@@ -407,7 +428,7 @@ protected function buildValidationRules(): array
 
             ...(
                 $this->timezones !== null
-                    ? [new TimezoneValidation(timezones: $this->timezones, message: static::$customMessage)]
+                    ? [new TimezoneValidation(timezones: $this->timezones, message: static::$validationMessage)]
                     : []
             ),
 
@@ -418,7 +439,7 @@ protected function buildValidationRules(): array
                         cities: $this->timezoneIdentifierCities,
                         timezoneGroupNumber: $this->dateTimezoneGroupNumber,
                         timezoneGroup: $this->dateTimezoneGroupName,
-                        customMessage: static::$customMessage,
+                        customMessage: static::$validationMessage,
                     )
                 ]
                 : []
@@ -439,14 +460,22 @@ protected function buildValidationRules(): array
              * Regex validations
              */
             ...($this->regexPattern !== null ? [RegexRule::RULE . $this->regexPattern] : []),
-            ...($this->separateIntegersByComma === true ? [new IntegerByComma(message: static::$customMessage)] : []),
-            ...($this->separateStringsByComma === true ? [new StringByComma(message: static::$customMessage)] : []),
+            ...($this->separateIntegersByComma === true ? [new IntegerByComma(message: static::$validationMessage)] : []),
+            ...($this->separateStringsByComma === true ? [new StringByComma(message: static::$validationMessage)] : []),
 
             ...(
                 $this->separateStringsByUnderscore === true
-                    ? [new StringByUnderscore(message: static::$customMessage)]
+                    ? [new StringByUnderscore(message: static::$validationMessage)]
                     : []
             ),
+
+            /**
+             * Array validations
+             */
+            ...($this->array === true ? [ArrayEnum::ARRAY] : []),
+            ...($this->arrayDistinct === true ? [ArrayEnum::DISTINCT] : []),
+            ...($this->distinctStinct === true ? [ArrayEnum::DISTINCT_STRICT] : []),
+            ...($this->distinctIgnoreCase === true ? [ArrayEnum::DISTINCT_IGNORE_CASE] : []),
         ];
 
         return $rules;