Merge pull request #102 from milwad-dev/improve-even-odd-rules

[1.x] Improve even odd rules

Author: milwad-dev

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

@@ -18,6 +18,7 @@ public function passes($attribute, $value): bool
         $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;
         }

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/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);
+    }
 }