Refactor package configuration and validation rules

Author: hebertcisco

.env.ci

@@ -27,31 +27,32 @@
     },
     "require": {
         "php": "^8.1",
-        "illuminate/support": "^8.12|^9.0|^10.0|^11.0",
-        "illuminate/container": "^8.12|^9.0|^10.0|^11.0",
-        "illuminate/contracts": "^8.12|^9.0|^10.0|^11.0",
+        "illuminate/console": "^10.0|^11.0",
+        "illuminate/contracts": "^10.0|^11.0",
+        "illuminate/pagination": "^10.0|^11.0",
+        "illuminate/support": "^10.0|^11.0",
         "usevalid-email/php-sdk": "^1.0"
     },
     "require-dev": {
         "pestphp/pest": "^2.0",
         "laravel/pint": "^1.0",
         "phpunit/phpunit": "^9.4|^10.1|^11.5",
         "mockery/mockery": "^1.6",
-        "orchestra/testbench": "^6.23|^7.0|^8.0|^9.0|^10.0"
+        "orchestra/testbench": "^8.0|^9.0",
+        "orchestra/testbench-dusk": "^8.0|^9.0"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "autoload": {
         "psr-4": {
             "UseValidEmail\\LaravelSdk\\": "src/"
         },
-        "files": [
-            "src/helpers.php"
-        ]
+        "files": []
     },
     "autoload-dev": {
         "psr-4": {
-            "UseValidEmail\\LaravelSdk\\Tests\\": "tests/"
+            "UseValidEmail\\LaravelSdk\\Tests\\": "tests/",
+            "App\\": "vendor/orchestra/testbench-core/laravel/app"
         },
         "files": [
             "tests/bootstrap.php"
@@ -69,10 +70,7 @@
         "laravel": {
             "providers": [
                 "UseValidEmail\\LaravelSdk\\Providers\\UseValidEmailServiceProvider"
-            ],
-            "config": {
-                "usevalid-email": "config/usevalid-email.php"
-            }
+            ]
         }
     }
 }

composer.json

@@ -8,16 +8,18 @@ class UseValidEmailServiceProvider extends ServiceProvider
 {
     public function boot()
     {
-        $this->publishes([
-            __DIR__ . "/../../config/usevalid-email.php" => config_path("usevalid-email.php"),
-        ], "config");
+        // Load helpers after app is initialized
+        require_once __DIR__.'/../helpers.php';
 
-        // Register the validation rule
-        valid_email_rule();
+        if ($this->app->runningInConsole()) {
+            $this->publishes([
+                __DIR__.'/../config/usevalidemail.php' => config_path('usevalidemail.php'),
+            ], 'config');
+        }
     }
 
     public function register()
     {
-        $this->mergeConfigFrom(__DIR__ . "/../../config/usevalid-email.php", "usevalid-email");
+        $this->mergeConfigFrom(__DIR__.'/../config/usevalidemail.php', 'usevalidemail');
     }
 }

src/Providers/UseValidEmailServiceProvider.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace UseValidEmail\LaravelSdk\Rules;
+
+use Illuminate\Contracts\Validation\Rule;
+use UseValidEmail\Sdk\Sdk as EmailValidator;
+
+class ValidEmailRule implements Rule
+{
+    public function __construct(protected string $accessToken) {}
+
+    public function passes($attribute, $value)
+    {
+        return (new EmailValidator($this->accessToken))
+            ->emailValidator->validate($value)->status === 'valid';
+    }
+
+    public function message()
+    {
+        return 'The :attribute must be a valid email address.';
+    }
+}

src/Rules/ValidEmailRule.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'access_token' => env('USE_VALID_EMAIL_TOKEN'),
+    'api_endpoint' => 'https://api.usevalid.email/v1/',
+    'timeout' => 10,
+];

config/usevalid-email.php renamed to src/config.php

@@ -1,9 +1,9 @@
 <?php
 
 use GuzzleHttp\Exception\GuzzleException;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Validator;
 use UseValidEmail\LaravelSdk\LaravelSdk;
+use UseValidEmail\LaravelSdk\Rules\ValidEmailRule;
 
 if (! function_exists('validateEmail')) {
     /**
@@ -16,9 +16,6 @@ function validateEmail(string $email)
 
             return $sdk->emailValidator->validate($email);
         } catch (Exception $e) {
-            if (class_exists('Illuminate\Support\Facades\Log')) {
-                Log::error($e->getMessage());
-            }
             throw $e;
         }
     }
@@ -35,11 +32,16 @@ function ($attribute, $value, $parameters, $validator) {
 
             return $validation->status === 'valid';
         } catch (Exception $e) {
-            if (class_exists('Illuminate\Support\Facades\Log')) {
-                Log::error($e->getMessage());
-            }
-
             return false;
         }
     }
 );
+
+if (! function_exists('valid_email_rule')) {
+    function valid_email_rule()
+    {
+        return function () {
+            return new ValidEmailRule(config('usevalidemail.access_token'));
+        };
+    }
+}