Update Serviceable to Orchestration

composer.json

@@ -18,14 +18,14 @@
     "autoload-dev": {
         "psr-4": {
             "Payavel\\Checkout\\Tests\\": "tests/",
-            "Payavel\\Serviceable\\Tests\\Traits\\": "vendor/payavel/serviceable/tests/Traits"
+            "Payavel\\Orchestration\\Tests\\Traits\\": "vendor/payavel/serviceable/tests/Traits"
         }
     },
     "scripts": {
         "test": "vendor/bin/phpunit"
     },
     "require": {
-        "payavel/serviceable": "dev-master"
+        "payavel/orchestration": "dev-master"
     },
     "require-dev": {
         "orchestra/testbench": "^6.0|^7.0"

src/Console/Commands/Install.php

@@ -2,7 +2,7 @@
 
 namespace Payavel\Checkout\Console\Commands;
 
-use Payavel\Serviceable\Console\Commands\Install as Command;
+use Payavel\Orchestration\Console\Commands\Install as Command;
 use Illuminate\Support\Facades\Artisan;
 
 class Install extends Command

src/Console/Commands/MakeProvider.php

@@ -2,7 +2,7 @@
 
 namespace Payavel\Checkout\Console\Commands;
 
-use Payavel\Serviceable\Console\Commands\MakeProvider as Command;
+use Payavel\Orchestration\Console\Commands\MakeProvider as Command;
 use Illuminate\Support\Facades\Artisan;
 
 class MakeProvider extends Command

src/Facades/Payment.php

@@ -7,14 +7,14 @@
 
 /**
  * @method static \Payavel\Checkout\PaymentGateway provider($provider)
- * @method static \Payavel\Serviceable\Contracts\Providable getProvider()
+ * @method static \Payavel\Orchestration\Contracts\Providable getProvider()
  * @method static void setProvider($provider)
- * @method static string|int|\Payavel\Serviceable\Contracts\Providable getDefaultProvider()
+ * @method static string|int|\Payavel\Orchestration\Contracts\Providable getDefaultProvider()
  * @method static \Payavel\Checkout\PaymentGateway merchant($merchant)
- * @method static \Payavel\Serviceable\Contracts\Merchantable getMerchant()
+ * @method static \Payavel\Orchestration\Contracts\Merchantable getMerchant()
  * @method static void setMerchant($merchant, $strict = true)
  * @method static void reset()
- * @method static string|int|\Payavel\Serviceable\Contracts\Merchantable getDefaultMerchant()
+ * @method static string|int|\Payavel\Orchestration\Contracts\Merchantable getDefaultMerchant()
  * @method static \Payavel\Checkout\PaymentResponse getWallet(\Payavel\Checkout\Models\Wallet $wallet)
  * @method static \Payavel\Checkout\PaymentResponse getPaymentMethod(\Payavel\Checkout\Models\PaymentMethod $paymentMethod)
  * @method static \Payavel\Checkout\PaymentResponse tokenizePaymentMethod(\Payavel\Checkout\Contracts\Billable $billable, $data)
@@ -35,7 +35,7 @@ class Payment extends Facade
      *
      * @return string
      */
-    protected static function getFacadeAccessor()
+    protected static function getFacadeAccessor(): string
     {
         return PaymentGateway::class;
     }

src/Models/PaymentMethod.php

@@ -51,7 +51,7 @@ protected static function newFactory()
     /**
      * Get the payment method's provider.
      *
-     * @return \Payavel\Serviceable\Models\Provider
+     * @return \Payavel\Orchestration\Models\Provider
      */
     public function getProviderAttribute()
     {
@@ -61,7 +61,7 @@ public function getProviderAttribute()
     /**
      * Get the payment method's merchant.
      *
-     * @return \Payavel\Serviceable\Models\Merchant
+     * @return \Payavel\Orchestration\Models\Merchant
      */
     public function getMerchantAttribute()
     {

src/Models/PaymentTransaction.php

@@ -6,8 +6,8 @@
 use Illuminate\Database\Eloquent\Model;
 use Payavel\Checkout\Database\Factories\PaymentTransactionFactory;
 use Payavel\Checkout\Models\Traits\PaymentTransactionRequests;
-use Payavel\Serviceable\Models\Merchant;
-use Payavel\Serviceable\Models\Provider;
+use Payavel\Orchestration\Models\Merchant;
+use Payavel\Orchestration\Models\Provider;
 
 class PaymentTransaction extends Model
 {

src/Models/Wallet.php

@@ -6,8 +6,8 @@
 use Illuminate\Database\Eloquent\Model;
 use Payavel\Checkout\Database\Factories\WalletFactory;
 use Payavel\Checkout\Models\Traits\WalletRequests;
-use Payavel\Serviceable\Models\Merchant;
-use Payavel\Serviceable\Models\Provider;
+use Payavel\Orchestration\Models\Merchant;
+use Payavel\Orchestration\Models\Provider;
 
 class Wallet extends Model
 {

src/PaymentGateway.php

@@ -8,10 +8,15 @@
 use Payavel\Checkout\Models\PaymentMethod;
 use Payavel\Checkout\Models\PaymentTransaction;
 use Payavel\Checkout\Models\Wallet;
-use Payavel\Serviceable\Service;
+use Payavel\Orchestration\Service;
 
 class PaymentGateway extends Service implements PaymentRequestor
 {
+    public function __construct()
+    {
+        parent::__construct(Service::find('checkout'));
+    }
+
     /**
      * Retrieve the wallet's details from the provider.
      *

src/PaymentRequest.php

@@ -4,8 +4,8 @@
 
 use Payavel\Checkout\Contracts\PaymentRequestor;
 use Payavel\Checkout\Traits\PaymentRequests;
-use Payavel\Serviceable\Contracts\Merchantable;
-use Payavel\Serviceable\Contracts\Providable;
+use Payavel\Orchestration\Contracts\Merchantable;
+use Payavel\Orchestration\Contracts\Providable;
 
 abstract class PaymentRequest implements PaymentRequestor
 {
@@ -14,20 +14,20 @@ abstract class PaymentRequest implements PaymentRequestor
     /**
      * The payment provider.
      *
-     * @var \Payavel\Serviceable\Contracts\Providable
+     * @var \Payavel\Orchestration\Contracts\Providable
      */
     protected $provider;
 
     /**
      * The payment merchant.
      *
-     * @var \Payavel\Serviceable\Contracts\Merchantable
+     * @var \Payavel\Orchestration\Contracts\Merchantable
      */
     protected $merchant;
 
     /**
-     * @param  \Payavel\Serviceable\Contracts\Providable $provider
-     * @param  \Payavel\Serviceable\Contracts\Merchantable $merchant
+     * @param  \Payavel\Orchestration\Contracts\Providable $provider
+     * @param  \Payavel\Orchestration\Contracts\Merchantable $merchant
      */
     public function __construct(Providable $provider, Merchantable $merchant)
     {

src/PaymentResponse.php

@@ -4,14 +4,14 @@
 
 use Payavel\Checkout\Contracts\PaymentResponder;
 use Payavel\Checkout\Traits\PaymentResponses;
-use Payavel\Serviceable\Contracts\Merchantable;
-use Payavel\Serviceable\Contracts\Providable;
-use Payavel\Serviceable\Traits\SimulateAttributes;
+use Payavel\Orchestration\Contracts\Merchantable;
+use Payavel\Orchestration\Contracts\Providable;
+use Payavel\Orchestration\Traits\SimulatesAttributes;
 use RuntimeException;
 
 abstract class PaymentResponse implements PaymentResponder
 {
-    use SimulateAttributes,
+    use SimulatesAttributes,
         PaymentResponses;
 
     /**
@@ -67,14 +67,14 @@ abstract class PaymentResponse implements PaymentResponder
     /**
      * The provider that the $request was made towards.
      *
-     * @var \Payavel\Serviceable\Contracts\Providable
+     * @var \Payavel\Orchestration\Contracts\Providable
      */
     public $provider;
 
     /**
      * The merchant that was used to make the $request.
      *
-     * @var \Payavel\Serviceable\Contracts\Merchantable
+     * @var \Payavel\Orchestration\Contracts\Merchantable
      */
     public $merchant;
 
@@ -111,8 +111,8 @@ protected function setUp()
      * Configure the response based on the request.
      *
      * @param string $requestMethod
-     * @param \Payavel\Serviceable\Contracts\Providable $provider
-     * @param \Payavel\Serviceable\Contracts\Merchantable $merchant
+     * @param \Payavel\Orchestration\Contracts\Providable $provider
+     * @param \Payavel\Orchestration\Contracts\Merchantable $merchant
      * @return void
      */
     public function configure(string $requestMethod, Providable $provider, Merchantable $merchant)

src/PaymentServiceProvider.php

@@ -6,7 +6,7 @@
 use Illuminate\Support\ServiceProvider;
 use Payavel\Checkout\Console\Commands\Install;
 use Payavel\Checkout\Console\Commands\MakeProvider;
-use Payavel\Serviceable\Service;
+use Payavel\Orchestration\Service;
 
 class PaymentServiceProvider extends ServiceProvider
 {
@@ -26,7 +26,7 @@ public function boot()
     public function register()
     {
         $this->app->singleton(PaymentGateway::class, function ($app) {
-            return new PaymentGateway(Service::find('checkout'));
+            return new PaymentGateway;
         });
 
         $this->mergeConfigFrom(

src/Traits/PaymentRequests.php

@@ -6,7 +6,7 @@
 use Payavel\Checkout\Models\PaymentMethod;
 use Payavel\Checkout\Models\PaymentTransaction;
 use Payavel\Checkout\Models\Wallet;
-use Payavel\Serviceable\Traits\ThrowsRuntimeException;
+use Payavel\Orchestration\Traits\ThrowsRuntimeException;
 
 trait PaymentRequests
 {

src/Traits/PaymentResponses.php

@@ -3,7 +3,7 @@
 namespace Payavel\Checkout\Traits;
 
 use Exception;
-use Payavel\Serviceable\Traits\ThrowsRuntimeException;
+use Payavel\Orchestration\Traits\ThrowsRuntimeException;
 use RuntimeException;
 
 trait PaymentResponses

src/database/factories/PaymentTransactionFactory.php

@@ -5,8 +5,8 @@
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Payavel\Checkout\Models\PaymentTransaction;
 use Payavel\Checkout\PaymentStatus;
-use Payavel\Serviceable\Models\Merchant;
-use Payavel\Serviceable\Models\Provider;
+use Payavel\Orchestration\Models\Merchant;
+use Payavel\Orchestration\Models\Provider;
 
 class PaymentTransactionFactory extends Factory
 {

src/database/factories/WalletFactory.php

@@ -4,8 +4,8 @@
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Payavel\Checkout\Models\Wallet;
-use Payavel\Serviceable\Models\Merchant;
-use Payavel\Serviceable\Models\Provider;
+use Payavel\Orchestration\Models\Merchant;
+use Payavel\Orchestration\Models\Provider;
 
 class WalletFactory extends Factory
 {

src/database/migrations/2021_01_01_000000_create_base_payment_tables.php

@@ -3,11 +3,11 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-use Payavel\Serviceable\Traits\ServiceableConfig;
+use Payavel\Orchestration\Traits\ServesConfig;
 
 class CreateBasePaymentTables extends Migration
 {
-    use ServiceableConfig;
+    use ServesConfig;
 
     /**
      * Run the migrations.

tests/Feature/Console/Commands/InstallCommandTest.php

@@ -4,14 +4,14 @@
 
 use Illuminate\Support\Str;
 use Payavel\Checkout\Tests\TestCase;
-use Payavel\Serviceable\Service;
-use Payavel\Serviceable\Tests\Traits\AssertGatewayExists;
-use Payavel\Serviceable\Tests\Traits\CreateServiceables;
+use Payavel\Orchestration\Service;
+use Payavel\Orchestration\Tests\Traits\AssertsGatewayExists;
+use Payavel\Orchestration\Tests\Traits\CreatesServiceables;
 
 class InstallCommandTest extends TestCase
 {
-    use AssertGatewayExists,
-        CreateServiceables;
+    use AssertsGatewayExists,
+        CreatesServiceables;
 
     /** @test */
     public function install_command_defaults_to_checkout_service()

tests/Feature/Console/Commands/MakeProviderCommandTest.php

@@ -3,14 +3,14 @@
 namespace Payavel\Checkout\Tests\Feature\Console\Commands;
 
 use Payavel\Checkout\Tests\TestCase;
-use Payavel\Serviceable\Service;
-use Payavel\Serviceable\Tests\Traits\AssertGatewayExists;
-use Payavel\Serviceable\Tests\Traits\CreateServiceables;
+use Payavel\Orchestration\Service;
+use Payavel\Orchestration\Tests\Traits\AssertsGatewayExists;
+use Payavel\Orchestration\Tests\Traits\CreatesServiceables;
 
 class MakeProviderCommandTest extends TestCase
 {
-    use AssertGatewayExists,
-        CreateServiceables;
+    use AssertsGatewayExists,
+        CreatesServiceables;
 
     /** @test */
     public function make_provider_command_defaults_to_checkout_service()

tests/GatewayTestCase.php

@@ -10,9 +10,9 @@
 use Payavel\Checkout\PaymentRequest;
 use Payavel\Checkout\PaymentResponse;
 use Payavel\Checkout\PaymentStatus;
-use Payavel\Serviceable\Models\Merchant;
-use Payavel\Serviceable\Models\Provider;
-use Payavel\Serviceable\Models\Service;
+use Payavel\Orchestration\Models\Merchant;
+use Payavel\Orchestration\Models\Provider;
+use Payavel\Orchestration\Models\Service;
 
 abstract class GatewayTestCase extends TestCase
 {
@@ -29,16 +29,16 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->{"{$this->driver}DriverSetUp"}();
+        $this->{"set{$this->driver}Driver"}();
     }
 
     protected function getEnvironmentSetUp($app)
     {
         parent::getEnvironmentSetUp($app);
 
         config([
-            'serviceable.defaults.driver' => $this->driver,
-            'serviceable.services.checkout' => [
+            'orchestration.defaults.driver' => $this->driver,
+            'orchestration.services.checkout' => [
                 'name' => 'Checkout',
                 'config' => 'payment',
             ],
@@ -50,7 +50,7 @@ protected function getEnvironmentSetUp($app)
         ]);
     }
 
-    protected function configDriverSetUp()
+    protected function setConfigDriver()
     {
         config([
             'payment.providers' => [
@@ -83,7 +83,7 @@ protected function configDriverSetUp()
         ]);
     }
 
-    protected function databaseDriverSetUp()
+    protected function setDatabaseDriver()
     {
         $service = Service::create([
             'id' => 'checkout',