Merge pull request #5 from openpesa/hotfix/service-provider

fix: service provider
openpesa · Apr 1, 2021 · 7e0f70b · 7e0f70b
2 parents 87c0740 + 0f72e18
commit 7e0f70b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 111 deletions.
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
   "require": {
     "php": "^7.1",
     "illuminate/support": "^7.0|^8.0",
-    "openpesa/pesa": "dev-develop"
+    "openpesa/pesa": "dev-main"
   },
   "require-dev": {
     "phpunit/phpunit": "^7.1",
@@ -34,7 +34,7 @@
       "Openpesa\\Pesa\\": "src/"
     },
     "files": [
-      "src/Openpesa/Pesa/functions.php"
+      "src/functions.php"
     ]
   },
   "autoload-dev": {

diff --git a/src/config/laravel-pesa.php → config/laravel-pesa.php b/src/config/laravel-pesa.php → config/laravel-pesa.php
diff --git a/src/Openpesa/Pesa/Pesa.php b/src/Openpesa/Pesa/Pesa.php
diff --git a/src/Openpesa/Pesa/PesaFacade.php → src/PesaFacade.php b/src/Openpesa/Pesa/PesaFacade.php → src/PesaFacade.php
diff --git a/src/Openpesa/Pesa/PesaServiceProvider.php → src/PesaServiceProvider.php b/src/Openpesa/Pesa/PesaServiceProvider.php → src/PesaServiceProvider.php
@@ -3,19 +3,13 @@
 namespace Openpesa\Pesa;
 
 use Exception;
-use Openpesa\SDK\Pesa as PesaSDK;
+use Openpesa\SDK\Pesa;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\ServiceProvider;
 
 class PesaServiceProvider extends ServiceProvider
 {
-    /**
-     * Indicates if loading of the provider is deferred.
-     *
-     * @var bool
-     */
-    protected $defer = false;
-
+
     /**
      * Register the service provider.
      *
@@ -26,14 +20,16 @@ public function register()
         $this->app->singleton('pesa', function () {
             $public_key = Config::get('services.pesa.public_key');
             $apikey = Config::get('services.pesa.api_key');
+            $env = Config::get('services.pesa.env');
 
             if (is_null($public_key))  throw new Exception("InvalidConfiguration: PUBLIC KEY is required");
             if (is_null($apikey)) throw new Exception("InvalidConfiguration: API KEY is required");
 
-            return new Pesa(new PesaSDK([
+            return new Pesa([
                 'api_key' => $apikey,
                 'public_key' => $public_key,
-            ]));
+                'env' => $env
+            ]);
         });
     }
 
@@ -45,8 +41,5 @@ public function register()
     public function boot()
     {
 
-        $this->publishes([
-            __DIR__ . '/../config/laravel-pesa.php' => config_path('laravel-pesa.php'),
-        ], 'config');
     }
 }
diff --git a/src/Openpesa/Pesa/functions.php → src/functions.php b/src/Openpesa/Pesa/functions.php → src/functions.php
@@ -7,7 +7,7 @@
      */
     function pesa()
     {
-        return app('Pesa');
+        return app('pesa');
     }
 
-}
+}