Merge pull request #1 from wilsenhc/dev

Support Laravel 9

Author: wilsenhc

.github/workflows/run-tests.yml

@@ -10,7 +10,7 @@ jobs:
             matrix:
                 os: [ubuntu-latest]
                 php: [7.3, 7.4, 8.0, 8.1]
-                laravel: [6.*, 7.*, 8.*]
+                laravel: [6.*, 7.*, 8.*, 9.*]
                 dependency-version: [prefer-lowest, prefer-stable]
                 include:
                     -   laravel: 6.*
@@ -19,6 +19,8 @@ jobs:
                         testbench: 5.*
                     -   laravel: 8.*
                         testbench: 6.*
+                    -   laravel: 9.*
+                        testbench: 7.*
                 exclude:
                     -   php: 8.1
                         laravel: 6.*
@@ -27,6 +29,10 @@ jobs:
                     -   php: 8.1
                         laravel: 8.*
                         dependency-version: prefer-lowest
+                    -   php: 7.3
+                        laravel: 9.*
+                    -   php: 7.4
+                        laravel: 9.*
 
         name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
 

composer.json

@@ -18,11 +18,11 @@
     ],
     "require": {
         "php": "^7.3|^8.0",
-        "illuminate/support": "^6.0|^7.0|^8.0",
-        "illuminate/contracts": "^6.0|^7.0|^8.0"
+        "illuminate/support": "^6.0|^7.0|^8.0|^9.0",
+        "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^4.5|^5.0|^6.0",
+        "orchestra/testbench": "^4.5|^5.0|^6.0|^7.0",
         "phpunit/phpunit": "^9.4"
     },
     "autoload": {

src/Rules/Rif.php

@@ -3,6 +3,7 @@
 namespace Wilsenhc\RifValidation\Rules;
 
 use Illuminate\Contracts\Validation\Rule;
+use Illuminate\Support\Str;
 
 class Rif implements Rule
 {
@@ -40,6 +41,8 @@ public function passes($attribute, $value): bool
     {
         $this->attribute = $attribute;
 
+        $value = Str::upper($value);
+
         // Verificar si el RIF tiene el formato valido
         if (!preg_match('/^[VEPJGC]-?[\d]{8}-?[\d]$/i', $value))
         {

tests/Rules/RifTest.php

@@ -73,4 +73,23 @@ public function it_will_return_false_if_format_is_invalid()
 
         $this->assertFalse($this->rule->passes('rif', $rif));
     }
+
+    /** @test */
+    public function it_will_convert_values_to_uppercase_before_testing()
+    {
+        // Valid RIF of "Universidad de Carabobo"
+        $rif = 'g-20000041-4';
+
+        $this->assertTrue($this->rule->passes('rif', $rif));
+
+        // Valid RIF of "Banesco Banco Universal"
+        $rif = 'j-07013380-5';
+
+        $this->assertTrue($this->rule->passes('rif', $rif));
+
+        // Valid RIF of "Nicolas Maduro Moros"
+        $rif = 'v-05892464-0';
+
+        $this->assertTrue($this->rule->passes('rif', $rif));
+    }
 }