Merge branch '1.x' of https://github.com/milwad-dev/laravel-validate into upgrade-dependencies

Author: milwad-dev

README.md

@@ -40,6 +40,12 @@ composer require milwad/laravel-validate
 
 # Publish
 
+If you want to publish config file, you can run below command on your terminal:
+
+```shell
+php artisan vendor:publish --tag="laravel-validate-config"
+```
+
 If you want to publish a lang file for a custom validation message you can run this command in the terminal:
 
 ```shell
@@ -54,6 +60,24 @@ php artisan vendor:publish --tag="validate-lang-en"
 
 If you don't know about langs name you can see [Support Languages](#support-languages) section.
 
+# Configurations
+
+If you may use rules with string like `ValidPhone`, you need to change the config option to `true`:
+
+```php
+/*
+ * If you want to use rules like 'required|ValidPhone' in your validations, you can change it to true.
+ */
+'using_container' => false,
+```
+
+If `using_container` is set to true, you might have rules like this:
+
+```php
+'phone_number' => 'required|ValidPhone',
+```
+And `ValidPhone` would be a class that is resolved via the service container to check the validity of the phone number.
+
 # Usage
 
 You can use `Laravel-Validate Rules` very simply. You can use the `new` keyword before the rule name.
@@ -141,6 +165,58 @@ Also, you can make <a href="https://github.com/milwad-dev/laravel-validate/pulls
 - [x] Ukrainian (uk)
 - [x] Chinese (zh_CN)
 
+# Adding Custom Phone Country Validator
+
+If you need to add a custom phone number validator for a specific country, follow the steps below.
+
+### 1. Create Your Custom Validator Class
+
+First, you need to create a custom validator class that implements the `Milwad\LaravelValidate\Utils\CountryPhoneValidator` contract. This contract ensures that your custom validator adheres to the required structure and functionality.
+
+```php
+namespace App\Validators;
+
+use Milwad\LaravelValidate\Utils\CountryPhoneValidator;
+
+class CustomPhoneValidator implements CountryPhoneValidator
+{
+    /**
+     * Validate the phone number for the custom country.
+     */
+    public function validate(string $phoneNumber): bool
+    {
+        // Implement the phone number validation logic for your country
+        // Example: Check if the phone number matches a specific pattern
+        return preg_match('/^\+1234\d{10}$/', $phoneNumber);
+    }
+}
+```
+
+### 2. Add the Validator to the Configuration File
+
+Once you've created the custom validator class, add it to the configuration file (`config/laravel-validate.php`) under the `'phone-country'` array.
+
+For example, if you're adding a validator for the country `XY`:
+
+```php
+'phone-country' => [
+    // Existing validators...
+    'XY' => \App\Validators\CustomPhoneValidator::class, // Custom country
+],
+```
+
+This tells the system to use your custom validator for phone numbers from country `XY`.
+
+### 3. Validation Usage
+
+Once your custom validator is set up, you can use it in your application like any other validator:
+
+```php
+return [
+    'phone_ir' => [new ValidPhoneNumber('XY')],
+];
+```
+
 # License
 
 * This package is created and modified by <a href="https://github.com/milwad-dev" target="_blank">Milwad Khosravi</a> for Laravel over more than 9 and has been released under the MIT License.

docs/1.x/valid-even-number.md

@@ -9,3 +9,5 @@ return [
     'number' => ['required', new ValidEvenNumber()], // number => 1024
 ];
 ```
+
+> Consider installing the `gmp` extension to significantly enhance performance when working with large numbers. It can greatly optimize your calculations and improve efficiency.

docs/1.x/valid-odd-number.md

@@ -9,3 +9,5 @@ return [
     'number' => ['required', new ValidOddNumber()], // number => 4321
 ];
 ```
+
+> Consider installing the `gmp` extension to significantly enhance performance when working with large numbers. It can greatly optimize your calculations and improve efficiency.

src/Rules/ValidEvenNumber.php

@@ -11,7 +11,25 @@ class ValidEvenNumber implements Rule
      */
     public function passes($attribute, $value): bool
     {
-        return preg_match('/^\d*[02468]$/', $value);
+        if (! is_numeric($value)) {
+            return false;
+        }
+
+        $number = strval($value);
+        $number = explode('.', $number);
+
+        // Check if there is a decimal part and it's not zero
+        if (isset($number[1]) && $number[1] != 0) {
+            return false;
+        }
+
+        $number = $number[0];
+
+        if (extension_loaded('gmp')) {
+            return gmp_cmp(gmp_mod($number, '2'), '0') === 0;
+        }
+
+        return $number % 2 === 0;
     }
 
     /**

src/Rules/ValidOddNumber.php

@@ -11,7 +11,25 @@ class ValidOddNumber implements Rule
      */
     public function passes($attribute, $value): bool
     {
-        return preg_match('/^\d*[13579]$/', $value);
+        if (! is_numeric($value)) {
+            return false;
+        }
+
+        $number = strval($value);
+        $number = explode('.', $number);
+
+        // Check if there is a decimal part and it's not zero
+        if (isset($number[1]) && $number[1] != 0) {
+            return false;
+        }
+
+        $number = $number[0];
+
+        if (extension_loaded('gmp')) {
+            return gmp_cmp(gmp_mod($number, '2'), '0') !== 0;
+        }
+
+        return $number % 2 !== 0;
     }
 
     /**

tests/Rules/ValidEvenNumberTest.php

@@ -30,4 +30,52 @@ public function test_check_number_is_not_even()
 
         $this->assertFalse($passes);
     }
+
+    /**
+     * Test float number is even.
+     *
+     * @test
+     *
+     * @return void
+     */
+    public function check_float_number_is_even()
+    {
+        $rules = ['even_number' => [new ValidEvenNumber]];
+        $data = ['even_number' => '754.00'];
+        $passes = $this->app['validator']->make($data, $rules)->passes();
+
+        $this->assertTrue($passes);
+    }
+
+    /**
+     * Test float number is not even.
+     *
+     * @test
+     *
+     * @return void
+     */
+    public function check_float_number_is_not_even()
+    {
+        $rules = ['even_number' => [new ValidEvenNumber]];
+        $data = ['even_number' => '333.13'];
+        $passes = $this->app['validator']->make($data, $rules)->passes();
+
+        $this->assertFalse($passes);
+    }
+
+    /**
+     * Test non-numeric values.
+     *
+     * @test
+     *
+     * @return void
+     */
+    public function check_non_numeric_values()
+    {
+        $rules = ['even_number' => [new ValidEvenNumber]];
+        $data = ['even_number' => 'abc'];
+        $passes = $this->app['validator']->make($data, $rules)->passes();
+
+        $this->assertFalse($passes);
+    }
 }

tests/Rules/ValidOddNumberTest.php

@@ -30,4 +30,58 @@ public function test_number_is_not_odd()
 
         $this->assertFalse($passes);
     }
+
+    /**
+     * Test float number is odd.
+     *
+     * @test
+     *
+     * @return void
+     */
+    public function check_float_number_is_odd()
+    {
+        $rules = ['odd_number' => [new ValidOddNumber]];
+        $data = ['odd_number' => '753.00'];
+        $passes = $this->app['validator']->make($data, $rules)->passes();
+
+        $this->assertTrue($passes);
+    }
+
+    /**
+     * Test float number is not odd.
+     *
+     * @test
+     *
+     * @return void
+     */
+    public function check_float_number_is_not_odd()
+    {
+        $rules = ['odd_number' => [new ValidOddNumber]];
+        $data = ['odd_number' => '333.14'];
+        $passes = $this->app['validator']->make($data, $rules)->passes();
+
+        $this->assertFalse($passes);
+
+        $rules = ['odd_number' => [new ValidOddNumber]];
+        $data = ['odd_number' => '322.00'];
+        $passes = $this->app['validator']->make($data, $rules)->passes();
+
+        $this->assertFalse($passes);
+    }
+
+    /**
+     * Test non-numeric values.
+     *
+     * @test
+     *
+     * @return void
+     */
+    public function check_non_numeric_values()
+    {
+        $rules = ['odd_number' => [new ValidOddNumber]];
+        $data = ['odd_number' => 'abc'];
+        $passes = $this->app['validator']->make($data, $rules)->passes();
+
+        $this->assertFalse($passes);
+    }
 }

tests/Rules/ValidPhoneNumberTest.php

@@ -31,11 +31,11 @@ public function test_phone_number_is_not_valid()
     {
         $rules = [
             'phone_number' => [new ValidPhoneNumber],
-            'phone_bj' => [new ValidPhoneNumber(Country::IRAN)],
+            'phone_ir' => [new ValidPhoneNumber(Country::IRAN)],
         ];
         $data = [
             'phone_number' => '123456789',
-            'phone_bj' => '09120000000',
+            'phone_ir' => '09120000000',
         ];
         $passes = $this->app['validator']->make($data, $rules)->passes();