Refactoring and added placeholder support

New syntax [The :name field is required]
SkyWalkerGhost · Sep 12, 2024 · bc63120 · bc63120
1 parent 74a21e4
commit bc63120
Show file tree

Hide file tree

Showing 8 changed files with 81 additions and 40 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to `shergela/validation-rule` will be documented in this file.
 
+## 1.0.7 | 12 September - 2024
+- Refactoring code.
+- Added support for substitutions in messages, This is needed to be able to write good messages.
+  Placeholder will allow you to write messages using positioning.
+- New syntax for messages "The :name field is required.", or "The :email field is required."
+
+
 ## 1.0.6 | 06 September - 2024
 
 - add new `uppercaseWord()` method.

diff --git a/README.md b/README.md
@@ -1,5 +1,8 @@
 # Build custom laravel validation rules easily
 
+> This package is under development, please do not use in production.
+> You can download and test it.
+
 ## Installation
 Require the package with composer using the following command:
 

diff --git a/src/Constants/ValidationRule.php b/src/Constants/ValidationRule.php
@@ -44,10 +44,10 @@ class ValidationRule
     /**
      * The field under validation must be included in the given list of values in:foo,bar...
      */
-    public const IN = 'in:';
+    public const IN = 'in';
 
     /**
      * The field under validation must not be included in the given list of values not_in:foo,bar,bar...
      */
-    public const NOT_IN = 'not_in:';
+    public const NOT_IN = 'not_in';
 }
diff --git a/src/Rules/SeparateIntegersByComma.php b/src/Rules/SeparateIntegersByComma.php
@@ -4,7 +4,6 @@
 
 use Closure;
 use Illuminate\Contracts\Validation\ValidationRule;
-use Illuminate\Support\Str;
 use Shergela\Validations\Constants\ValidationRegex as Regex;
 
 class SeparateIntegersByComma implements ValidationRule

diff --git a/src/Rules/SeparateStringsByComma.php b/src/Rules/SeparateStringsByComma.php
@@ -4,7 +4,6 @@
 
 use Closure;
 use Illuminate\Contracts\Validation\ValidationRule;
-use Illuminate\Support\Str;
 use Shergela\Validations\Constants\ValidationRegex as Regex;
 
 class SeparateStringsByComma implements ValidationRule

diff --git a/src/Rules/SeparateStringsByUnderscore.php b/src/Rules/SeparateStringsByUnderscore.php
@@ -4,7 +4,6 @@
 
 use Closure;
 use Illuminate\Contracts\Validation\ValidationRule;
-use Illuminate\Support\Str;
 use Shergela\Validations\Constants\ValidationRegex as Regex;
 
 class SeparateStringsByUnderscore implements ValidationRule

diff --git a/src/Validation/BuildValidationRule.php b/src/Validation/BuildValidationRule.php
@@ -339,7 +339,7 @@ class BuildValidationRule
     /**
      * @var bool
      */
-    protected ?bool $distinctStinct = false;
+    protected ?bool $distinctStrict = false;
 
     /**
      * @var bool
@@ -468,8 +468,10 @@ protected function buildValidationRules(): array
                 ? [DateRule::DATE_BEFORE_OR_EQUAL . $this->dateBeforeOrEqual]
                 : []
             ),
+
             ...($this->dateAfterOrEqualToday === true ? [DateRule::DATE_AFTER_OR_EQUAL_TODAY] : []),
             ...($this->dateAfter !== null ? [DateRule::DATE_AFTER . $this->dateAfter] : []),
+
             ...($this->dateAfterOrEqual !== null
                 ? [DateRule::DATE_AFTER_OR_EQUAL . $this->dateAfterOrEqual]
                 : []
@@ -507,7 +509,7 @@ protected function buildValidationRules(): array
              */
             ...($this->array === true ? [ArrayRule::ARRAY] : []),
             ...($this->arrayDistinct === true ? [ArrayRule::DISTINCT] : []),
-            ...($this->distinctStinct === true ? [ArrayRule::DISTINCT_STRICT] : []),
+            ...($this->distinctStrict === true ? [ArrayRule::DISTINCT_STRICT] : []),
             ...($this->distinctIgnoreCase === true ? [ArrayRule::DISTINCT_IGNORE_CASE] : []),
         ];