Merge branch 'dev' into main

Author: wilsenhc

.github/workflows/run-tests.yml

@@ -46,6 +46,7 @@ jobs:
                     php-version: ${{ matrix.php }}
                     extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
                     coverage: none
+                    tools: composer:v2
 
             -   name: Setup problem matchers
                 run: |

README.md

@@ -20,7 +20,7 @@ The package will automatically register itself.
 
 ### Translations
 
-If you wish to edit the package translations, you can run the following command to publish them into your `resources/lang` folder
+If you wish to edit the package translations, you can run the following command to publish them into your `lang/` folder
 
 ```bash
 php artisan vendor:publish --provider="Wilsenhc\RifValidation\RifValidationServiceProvider"

resources/lang/en/messages.php renamed to lang/en/messages.php

@@ -3,15 +3,20 @@
 namespace Wilsenhc\RifValidation;
 
 use Illuminate\Support\ServiceProvider;
+use Illuminate\Validation\Rule;
+use Wilsenhc\RifValidation\Rules\Rif;
 
 class RifValidationServiceProvider extends ServiceProvider
 {
     public function boot()
     {
         $this->publishes([
-            __DIR__.'/../resources/lang' => resource_path('lang/vendor/validateRif'),
+            __DIR__.'/../lang' => $this->app->langPath().'/vendor/validateRif',
         ]);
 
-        $this->loadTranslationsFrom(__DIR__.'/../resources/lang/', 'validateRif');
+        $this->loadTranslationsFrom(__DIR__.'/../lang/', 'validateRif');
+
+        // Register custom validation rule
+        $this->app['validator']->extend('rif', Rif::class . '@passes');
     }
 }

resources/lang/es/messages.php renamed to lang/es/messages.php

@@ -14,6 +14,11 @@ class RifTest extends TestCase
      */
     protected $rule;
 
+    /**
+     * @var  \Illuminate\Validation\Factory  $validator
+     */
+    protected $validator;
+
     /**
      * Setup the test environment.
      */
@@ -22,6 +27,8 @@ protected function setUp(): void
         parent::setUp();
 
         $this->rule = new Rif();
+
+        $this->validator = $this->app['validator'];
     }
 
     protected function getPackageProviders($app)
@@ -92,4 +99,48 @@ public function it_will_convert_values_to_uppercase_before_testing()
 
         $this->assertTrue($this->rule->passes('rif', $rif));
     }
+
+    /** @test */
+    public function it_will_validate_using_class()
+    {
+        // Valid RIF of "Universidad de Carabobo"
+        $this->assertTrue($this->validator->make(
+           ['rif' => 'G-20000041-4'],
+           ['rif' => new Rif],
+        )->passes());
+
+        // Valid RIF of "Banesco Banco Universal"
+        $this->assertTrue($this->validator->make(
+            ['rif' => 'J-07013380-5'],
+            ['rif' => new Rif],
+        )->passes());
+
+        // Valid RIF of "Nicolas Maduro Moros"
+        $this->assertTrue($this->validator->make(
+            ['rif' => 'V-05892464-0'],
+            ['rif' => new Rif],
+        )->passes());
+    }
+
+    /** @test */
+    public function it_will_validate_using_shortname()
+    {
+        // Valid RIF of "Universidad de Carabobo"
+        $this->assertTrue($this->validator->make(
+           ['rif' => 'G-20000041-4'],
+           ['rif' => 'rif'],
+        )->passes());
+
+        // Valid RIF of "Banesco Banco Universal"
+        $this->assertTrue($this->validator->make(
+            ['rif' => 'J-07013380-5'],
+            ['rif' => 'rif'],
+        )->passes());
+
+        // Valid RIF of "Nicolas Maduro Moros"
+        $this->assertTrue($this->validator->make(
+            ['rif' => 'V-05892464-0'],
+            ['rif' => 'rif'],
+        )->passes());
+    }
 }