Changed namespace to use Sawirricardo\Midtrans\Laravel\Midtrans

sawirricardo · Feb 19, 2022 · 82972ca · 82972ca
1 parent a6b3920
commit 82972ca
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -69,7 +69,7 @@ php artisan vendor:publish --tag="laravel-midtrans-views"
 ## Usage
 
 ```php
-use Sawirricardo\MidtransClient\Facades\Midtrans;
+use Sawirricardo\Midtrans\Laravel\Facades\Midtrans;
 $transactionToken = Midtrans::client()->snap()->create(new TransactionDto());
 echo $transactionToken->token;
 echo $transactionToken->redirect_url;

diff --git a/composer.json b/composer.json
@@ -38,13 +38,16 @@
     },
     "autoload": {
         "psr-4": {
-            "Sawirricardo\\MidtransClient\\": "src",
-            "Sawirricardo\\MidtransClient\\Database\\Factories\\": "database/factories"
-        }
+            "Sawirricardo\\Midtrans\\Laravel\\": "src",
+            "Sawirricardo\\Midtrans\\Laravel\\Database\\Factories\\": "database/factories"
+        },
+        "files": [
+            "src/helpers.php"
+        ]
     },
     "autoload-dev": {
         "psr-4": {
-            "Sawirricardo\\MidtransClient\\Tests\\": "tests"
+            "Sawirricardo\\Midtrans\\Laravel\\Tests\\": "tests"
         }
     },
     "scripts": {
@@ -62,10 +65,10 @@
     "extra": {
         "laravel": {
             "providers": [
-                "Sawirricardo\\MidtransClient\\MidtransServiceProvider"
+                "Sawirricardo\\Midtrans\\Laravel\\MidtransServiceProvider"
             ],
             "aliases": {
-                "Midtrans": "Sawirricardo\\MidtransClient\\Facades\\Midtrans"
+                "Midtrans": "Sawirricardo\\Midtrans\\Laravel\\Facades\\Midtrans"
             }
         }
     },

diff --git a/config/midtrans.php b/config/midtrans.php
@@ -1,5 +1,5 @@
 <?php
-// config for Sawirricardo/MidtransClient
+// config for Sawirricardo/Midtrans/Laravel
 return [
     'server_key' => env('MIDTRANS_SERVER_KEY'),
     'client_key' => env('MIDTRANS_CLIENT_KEY'),

diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sawirricardo\MidtransClient\Database\Factories;
+namespace Sawirricardo\Midtrans\Laravel\Database\Factories;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 

diff --git a/src/Commands/MidtransCommand.php b/src/Commands/MidtransCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sawirricardo\MidtransClient\Commands;
+namespace Sawirricardo\Midtrans\Laravel\Commands;
 
 use Illuminate\Console\Command;
 

diff --git a/src/Facades/Midtrans.php b/src/Facades/Midtrans.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Sawirricardo\MidtransClient\Facades;
+namespace Sawirricardo\Midtrans\Laravel\Facades;
 
 use Illuminate\Support\Facades\Facade;
 
 /**
  * @see \Sawirricardo\Midtrans\Midtrans
- * @method static \Sawirricardo\Midtrans\Midtrans client()
+ * @method static \Sawirricardo\Midtrans\Midtrans new()
  */
 class Midtrans extends Facade
 {

diff --git a/src/MidtransClient.php → src/Midtrans.php b/src/MidtransClient.php → src/Midtrans.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sawirricardo\MidtransClient;
+namespace Sawirricardo\Midtrans\Laravel;
 
-class MidtransClient
+class Midtrans
 {
     private $client;
 
@@ -27,7 +27,7 @@ public static function makeFromConfig($config)
         );
     }
 
-    public function client(): \Sawirricardo\Midtrans\Midtrans
+    public function new(): \Sawirricardo\Midtrans\Midtrans
     {
         return $this->client;
     }

diff --git a/src/MidtransServiceProvider.php b/src/MidtransServiceProvider.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace Sawirricardo\MidtransClient;
+namespace Sawirricardo\Midtrans\Laravel;
 
 use Illuminate\Support\Facades\Blade;
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
+use Sawirricardo\Midtrans\Laravel\Midtrans;
 
 class MidtransServiceProvider extends PackageServiceProvider
 {
@@ -18,18 +19,18 @@ public function configurePackage(Package $package): void
     public function registeringPackage()
     {
         $this->app->singleton('laravel-midtrans', function ($app) {
-            return MidtransClient::makeFromConfig($app['config']->get('midtrans'));
+            return Midtrans::makeFromConfig($app['config']->get('midtrans'));
         });
     }
 
     public function boot()
     {
         Blade::directive('midtransSnapScripts', function ($expression) {
-            return "{!! \Sawirricardo\Midtrans::snapScripts($expression) !!}";
+            return "{!! \Sawirricardo\Midtrans\Laravel\Midtrans::snapScripts($expression) !!}";
         });
 
         Blade::directive('midtransCardScripts', function ($expression) {
-            return "{!! \Sawirricardo\Midtrans::cardScripts($expression) !!}";
+            return "{!! \Sawirricardo\Midtrans\Laravel\Midtrans::cardScripts($expression) !!}";
         });
     }
 }
diff --git a/src/helpers.php b/src/helpers.php
@@ -0,0 +1,10 @@
+<?php
+
+use Sawirricardo\Midtrans\Laravel\Facades\Midtrans as LaravelMidtrans;
+
+if (!function_exists('midtrans')) {
+    function midtrans(): \Sawirricardo\Midtrans\Midtrans
+    {
+        return app(LaravelMidtrans::class)::new();
+    }
+}
diff --git a/tests/MidtransTest.php b/tests/MidtransTest.php
@@ -1,18 +1,17 @@
 <?php
 
 use Sawirricardo\Midtrans\Dto\TransactionDto;
-use Sawirricardo\MidtransClient\Facades\Midtrans;
-use Sawirricardo\MidtransClient\MidtransClient;
+use Sawirricardo\Midtrans\Laravel\Midtrans;
 
 it('can switch environment based on config is_production', function () {
     config()->set('midtrans.is_production', true);
-    expect(MidtransClient::snapScripts())->toBe('<script src="https://app.midtrans.com/snap/snap.js" data-client-key="' . config('midtrans.client_key') . '"></script>');
+    expect(Midtrans::snapScripts())->toBe('<script src="https://app.midtrans.com/snap/snap.js" data-client-key="' . config('midtrans.client_key') . '"></script>');
     config()->set('midtrans.is_production', false);
-    expect(MidtransClient::snapScripts())->toBe('<script src="https://app.sandbox.midtrans.com/snap/snap.js" data-client-key="' . config('midtrans.sandbox_client_key') . '"></script>');
+    expect(Midtrans::snapScripts())->toBe('<script src="https://app.sandbox.midtrans.com/snap/snap.js" data-client-key="' . config('midtrans.sandbox_client_key') . '"></script>');
 });
 
 it('can create a transaction', function () {
-    $token = Midtrans::client()->snap()->create(new TransactionDto([
+    $token = midtrans()->snap()->create(new TransactionDto([
         'transaction_details' => [
             'order_id' => 'order-id-123',
             'gross_amount' => 10000,

diff --git a/tests/Pest.php b/tests/Pest.php
@@ -1,5 +1,5 @@
 <?php
 
-use Sawirricardo\MidtransClient\Tests\TestCase;
+use Sawirricardo\Midtrans\Laravel\Tests\TestCase;
 
 uses(TestCase::class)->in(__DIR__);
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Sawirricardo\MidtransClient\Tests;
+namespace Sawirricardo\Midtrans\Laravel\Tests;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Foundation\Bootstrap\LoadEnvironmentVariables;
 use Orchestra\Testbench\TestCase as Orchestra;
-use Sawirricardo\MidtransClient\MidtransServiceProvider;
+use Sawirricardo\Midtrans\Laravel\MidtransServiceProvider;
 
 class TestCase extends Orchestra
 {
@@ -19,7 +19,7 @@ protected function setUp(): void
         parent::setUp();
 
         Factory::guessFactoryNamesUsing(
-            fn (string $modelName) => 'Sawirricardo\\MidtransClient\\Database\\Factories\\' . class_basename($modelName) . 'Factory'
+            fn (string $modelName) => 'Sawirricardo\\Midtrans\\Laravel\\Database\\Factories\\' . class_basename($modelName) . 'Factory'
         );
     }