fixes

HichemTab-tech · Aug 12, 2023 · c23b4b8 · c23b4b8
1 parent 8608d11
commit c23b4b8
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 10 deletions.
diff --git a/src/Laravel/Providers/TokensValidationProvider.php b/src/Laravel/Providers/TokensValidationProvider.php
@@ -2,7 +2,6 @@
 
 namespace HichemtabTech\TokensValidation\Laravel\Providers;
 
-use HichemtabTech\TokensValidation\TokensValidation;
 use Illuminate\Support\ServiceProvider;
 
 class TokensValidationProvider extends ServiceProvider
@@ -15,9 +14,6 @@ class TokensValidationProvider extends ServiceProvider
     public function register(): void
     {
         $this->publishConfig();
-        $this->app->singleton(TokensValidation::class, function () {
-            return TokensValidation::class;
-        });
     }
 
     /**
@@ -29,11 +25,6 @@ public function register(): void
     public function boot(): void
     {
         $this->mergeConfigFrom(__DIR__.'/../config/tokensvalidation.php', 'tokensvalidation');
-        TokensValidation::setConfig(config('tokensvalidation'));
-        TokensValidation::prepare();
-        $this->app->singleton(TokensValidation::class, function () {
-            return TokensValidation::class;
-        });
     }
 
     /** @noinspection PhpUndefinedFunctionInspection */
@@ -42,7 +33,7 @@ private function publishConfig(): void
         $configPath = __DIR__.'/../config/tokensvalidation.php';
         $publishPath = config_path('tokensvalidation.php');
         $this->publishes([$configPath => $publishPath], 'tokensvalidation-config');
-        $providerPath = __DIR__.'/../Providers/TokensValidationProvider.php';
+        $providerPath = __DIR__.'/../stubs/TokensValidationProvider.php';
         $publishPath2 = app_path('Providers/TokensValidationProvider.php');
         $this->publishes([$providerPath => $publishPath2], 'tokensvalidation-provider');
         $controllerPath = __DIR__.'/../Http/Controllers/InvitationAnswererController.php';

diff --git a/src/Laravel/stubs/TokensValidationProvider.php b/src/Laravel/stubs/TokensValidationProvider.php
@@ -0,0 +1,36 @@
+<?php /** @noinspection PhpUnused */
+
+namespace HichemtabTech\TokensValidation\Laravel\stubs;
+
+use HichemtabTech\TokensValidation\TokensValidation;
+use Illuminate\Support\ServiceProvider;
+
+class TokensValidationProvider extends ServiceProvider
+{
+    /**
+     * Register services.
+     *
+     * @return void
+     */
+    public function register(): void
+    {
+        $this->app->singleton(TokensValidation::class, function () {
+            return TokensValidation::class;
+        });
+    }
+
+    /**
+     * Bootstrap services.
+     *
+     * @return void
+     * @noinspection PhpUndefinedFunctionInspection
+     */
+    public function boot(): void
+    {
+        TokensValidation::setConfig(config('tokensvalidation'));
+        TokensValidation::prepare();
+        $this->app->singleton(TokensValidation::class, function () {
+            return TokensValidation::class;
+        });
+    }
+}