From 5289872de4da2ac49d931dbcc456a87250ba3f9b Mon Sep 17 00:00:00 2001 From: Robert Kujawa Date: Fri, 28 Jun 2024 17:32:31 -0600 Subject: [PATCH] Adapt to `payavel/orchestration` changes --- database/factories/TransactionEventFactory.php | 2 +- .../2024_01_01_000010_create_base_checkout_tables.php | 2 +- src/Models/Dispute.php | 2 +- src/Models/Payment.php | 2 +- src/Models/PaymentInstrument.php | 2 +- src/Models/PaymentRail.php | 2 +- src/Models/PaymentType.php | 2 +- src/Models/Refund.php | 2 +- src/Models/TransactionEvent.php | 2 +- src/Models/Wallet.php | 2 +- src/Traits/Billable.php | 2 +- tests/TestCase.php | 2 +- tests/Unit/Database/PaymentModelTest.php | 2 +- tests/Unit/Database/WalletModelTest.php | 2 +- tests/Unit/TestBillableTrait.php | 2 +- tests/Unit/TestDisputeModel.php | 4 ++-- tests/Unit/TestPaymentInstrumentModel.php | 2 +- tests/Unit/TestPaymentModel.php | 2 +- tests/Unit/TestPaymentRailModel.php | 2 +- tests/Unit/TestPaymentTypeModel.php | 2 +- tests/Unit/TestRefundModel.php | 2 +- tests/Unit/TestTransactionEventModel.php | 2 +- tests/Unit/TestWalletModel.php | 2 +- 23 files changed, 24 insertions(+), 24 deletions(-) diff --git a/database/factories/TransactionEventFactory.php b/database/factories/TransactionEventFactory.php index 398035f..a1f297e 100644 --- a/database/factories/TransactionEventFactory.php +++ b/database/factories/TransactionEventFactory.php @@ -8,7 +8,7 @@ use Payavel\Checkout\Models\Payment; use Payavel\Checkout\Models\Refund; use Payavel\Checkout\Models\TransactionEvent; -use Payavel\Orchestration\Fluent\ServiceConfig; +use Payavel\Orchestration\ServiceConfig; class TransactionEventFactory extends Factory { diff --git a/database/migrations/2024_01_01_000010_create_base_checkout_tables.php b/database/migrations/2024_01_01_000010_create_base_checkout_tables.php index c445042..adfbaa8 100644 --- a/database/migrations/2024_01_01_000010_create_base_checkout_tables.php +++ b/database/migrations/2024_01_01_000010_create_base_checkout_tables.php @@ -3,7 +3,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -use Payavel\Orchestration\Fluent\ServiceConfig; +use Payavel\Orchestration\ServiceConfig; return new class () extends Migration { /** diff --git a/src/Models/Dispute.php b/src/Models/Dispute.php index 07fce3e..8f868d0 100644 --- a/src/Models/Dispute.php +++ b/src/Models/Dispute.php @@ -3,7 +3,7 @@ namespace Payavel\Checkout\Models; use Illuminate\Database\Eloquent\Model; -use Payavel\Orchestration\Fluent\ServiceConfig; +use Payavel\Orchestration\ServiceConfig; use Payavel\Orchestration\Traits\HasFactory; class Dispute extends Model diff --git a/src/Models/Payment.php b/src/Models/Payment.php index aa5eea0..aa52fcd 100644 --- a/src/Models/Payment.php +++ b/src/Models/Payment.php @@ -6,7 +6,7 @@ use Payavel\Orchestration\Contracts\Orchestrable; use Payavel\Orchestration\Models\Account; use Payavel\Orchestration\Models\Provider; -use Payavel\Orchestration\Fluent\ServiceConfig; +use Payavel\Orchestration\ServiceConfig; use Payavel\Orchestration\Traits\OrchestratesService; use Payavel\Orchestration\Traits\HasFactory; diff --git a/src/Models/PaymentInstrument.php b/src/Models/PaymentInstrument.php index ccf25dd..bc765c0 100644 --- a/src/Models/PaymentInstrument.php +++ b/src/Models/PaymentInstrument.php @@ -3,7 +3,7 @@ namespace Payavel\Checkout\Models; use Illuminate\Database\Eloquent\Model; -use Payavel\Orchestration\Fluent\ServiceConfig; +use Payavel\Orchestration\ServiceConfig; use Payavel\Orchestration\Traits\HasFactory; class PaymentInstrument extends Model diff --git a/src/Models/PaymentRail.php b/src/Models/PaymentRail.php index f36f5e3..d9679ea 100644 --- a/src/Models/PaymentRail.php +++ b/src/Models/PaymentRail.php @@ -3,7 +3,7 @@ namespace Payavel\Checkout\Models; use Illuminate\Database\Eloquent\Model; -use Payavel\Orchestration\Fluent\ServiceConfig; +use Payavel\Orchestration\ServiceConfig; use Payavel\Orchestration\Traits\HasFactory; class PaymentRail extends Model diff --git a/src/Models/PaymentType.php b/src/Models/PaymentType.php index 1f3f763..f61dbdb 100644 --- a/src/Models/PaymentType.php +++ b/src/Models/PaymentType.php @@ -3,7 +3,7 @@ namespace Payavel\Checkout\Models; use Illuminate\Database\Eloquent\Model; -use Payavel\Orchestration\Fluent\ServiceConfig; +use Payavel\Orchestration\ServiceConfig; use Payavel\Orchestration\Traits\HasFactory; class PaymentType extends Model diff --git a/src/Models/Refund.php b/src/Models/Refund.php index c4e77e5..b84d879 100644 --- a/src/Models/Refund.php +++ b/src/Models/Refund.php @@ -3,7 +3,7 @@ namespace Payavel\Checkout\Models; use Illuminate\Database\Eloquent\Model; -use Payavel\Orchestration\Fluent\ServiceConfig; +use Payavel\Orchestration\ServiceConfig; use Payavel\Orchestration\Traits\HasFactory; class Refund extends Model diff --git a/src/Models/TransactionEvent.php b/src/Models/TransactionEvent.php index 5103e44..366cb1e 100644 --- a/src/Models/TransactionEvent.php +++ b/src/Models/TransactionEvent.php @@ -3,7 +3,7 @@ namespace Payavel\Checkout\Models; use Illuminate\Database\Eloquent\Model; -use Payavel\Orchestration\Fluent\ServiceConfig; +use Payavel\Orchestration\ServiceConfig; use Payavel\Orchestration\Traits\HasFactory; class TransactionEvent extends Model diff --git a/src/Models/Wallet.php b/src/Models/Wallet.php index 69a28b0..4dffa95 100644 --- a/src/Models/Wallet.php +++ b/src/Models/Wallet.php @@ -7,7 +7,7 @@ use Payavel\Orchestration\Traits\OrchestratesService; use Payavel\Orchestration\Models\Account; use Payavel\Orchestration\Models\Provider; -use Payavel\Orchestration\Fluent\ServiceConfig; +use Payavel\Orchestration\ServiceConfig; use Payavel\Orchestration\Traits\HasFactory; class Wallet extends Model implements Orchestrable diff --git a/src/Traits/Billable.php b/src/Traits/Billable.php index ee95b69..ae5fdad 100644 --- a/src/Traits/Billable.php +++ b/src/Traits/Billable.php @@ -3,7 +3,7 @@ namespace Payavel\Checkout\Traits; use Payavel\Checkout\Models\Wallet; -use Payavel\Orchestration\Fluent\ServiceConfig; +use Payavel\Orchestration\ServiceConfig; trait Billable { diff --git a/tests/TestCase.php b/tests/TestCase.php index 4d25c6f..2f7b849 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -5,7 +5,7 @@ use Payavel\Checkout\Contracts\Billable; use Payavel\Checkout\CheckoutServiceProvider; use Payavel\Checkout\Traits\Billable as BillableTrait; -use Payavel\Orchestration\Fluent\ServiceConfig; +use Payavel\Orchestration\ServiceConfig; use Payavel\Orchestration\OrchestrationServiceProvider; use Payavel\Orchestration\Tests\Traits\CreatesServices; diff --git a/tests/Unit/Database/PaymentModelTest.php b/tests/Unit/Database/PaymentModelTest.php index 2c684a5..d8092b8 100644 --- a/tests/Unit/Database/PaymentModelTest.php +++ b/tests/Unit/Database/PaymentModelTest.php @@ -8,7 +8,7 @@ use Payavel\Checkout\Tests\Unit\TestPaymentModel; use Payavel\Orchestration\Models\Account; use Payavel\Orchestration\Models\Provider; -use Payavel\Orchestration\Fluent\ServiceConfig; +use Payavel\Orchestration\ServiceConfig; use Payavel\Orchestration\Tests\Traits\CreatesDatabaseServiceables; use Payavel\Orchestration\Tests\Traits\SetsDatabaseDriver; use PHPUnit\Framework\Attributes\Test; diff --git a/tests/Unit/Database/WalletModelTest.php b/tests/Unit/Database/WalletModelTest.php index 0313f76..4aa9e02 100644 --- a/tests/Unit/Database/WalletModelTest.php +++ b/tests/Unit/Database/WalletModelTest.php @@ -8,7 +8,7 @@ use Payavel\Checkout\Tests\Unit\TestWalletModel; use Payavel\Orchestration\Models\Account; use Payavel\Orchestration\Models\Provider; -use Payavel\Orchestration\Fluent\ServiceConfig; +use Payavel\Orchestration\ServiceConfig; use Payavel\Orchestration\Tests\Traits\CreatesDatabaseServiceables; use Payavel\Orchestration\Tests\Traits\SetsDatabaseDriver; use PHPUnit\Framework\Attributes\Test; diff --git a/tests/Unit/TestBillableTrait.php b/tests/Unit/TestBillableTrait.php index 54087e8..465f35c 100644 --- a/tests/Unit/TestBillableTrait.php +++ b/tests/Unit/TestBillableTrait.php @@ -6,7 +6,7 @@ use Payavel\Checkout\Tests\Models\TestWallet; use Payavel\Checkout\Tests\TestCase; use Payavel\Checkout\Tests\User; -use Payavel\Orchestration\Fluent\ServiceConfig; +use Payavel\Orchestration\ServiceConfig; use Payavel\Orchestration\Tests\Contracts\CreatesServiceables; use PHPUnit\Framework\Attributes\Test; diff --git a/tests/Unit/TestDisputeModel.php b/tests/Unit/TestDisputeModel.php index db2247c..d2d3c3e 100644 --- a/tests/Unit/TestDisputeModel.php +++ b/tests/Unit/TestDisputeModel.php @@ -8,7 +8,7 @@ use Payavel\Checkout\Tests\Models\TestPayment; use Payavel\Checkout\Tests\Models\TestTransactionEvent; use Payavel\Checkout\Tests\TestCase; -use Payavel\Orchestration\Fluent\ServiceConfig; +use Payavel\Orchestration\ServiceConfig; use Payavel\Orchestration\Tests\Contracts\CreatesServiceables; use PHPUnit\Framework\Attributes\Test; @@ -19,7 +19,7 @@ public function retrieve_dispute_payment() { $usingServiceables = [ 'provider_id' => $this->createProvider($this->checkoutConfig)->getId(), - 'account_id' => $this->createAccount($this->checkoutConfig)->getID(), + 'account_id' => $this->createAccount($this->checkoutConfig)->getId(), ]; $disputeWithPayment = Dispute::factory()->for(Payment::factory()->create($usingServiceables))->create(); diff --git a/tests/Unit/TestPaymentInstrumentModel.php b/tests/Unit/TestPaymentInstrumentModel.php index dace523..5d3f8f1 100644 --- a/tests/Unit/TestPaymentInstrumentModel.php +++ b/tests/Unit/TestPaymentInstrumentModel.php @@ -10,7 +10,7 @@ use Payavel\Checkout\Tests\Models\TestPaymentType; use Payavel\Checkout\Tests\Models\TestWallet; use Payavel\Checkout\Tests\TestCase; -use Payavel\Orchestration\Fluent\ServiceConfig; +use Payavel\Orchestration\ServiceConfig; use Payavel\Orchestration\Tests\Contracts\CreatesServiceables; use PHPUnit\Framework\Attributes\Test; diff --git a/tests/Unit/TestPaymentModel.php b/tests/Unit/TestPaymentModel.php index c5a863f..6384511 100644 --- a/tests/Unit/TestPaymentModel.php +++ b/tests/Unit/TestPaymentModel.php @@ -14,7 +14,7 @@ use Payavel\Checkout\Tests\TestCase; use Payavel\Orchestration\Contracts\Accountable; use Payavel\Orchestration\Contracts\Providable; -use Payavel\Orchestration\Fluent\ServiceConfig; +use Payavel\Orchestration\ServiceConfig; use Payavel\Orchestration\Tests\Contracts\CreatesServiceables; use PHPUnit\Framework\Attributes\Test; diff --git a/tests/Unit/TestPaymentRailModel.php b/tests/Unit/TestPaymentRailModel.php index d9b2332..340254a 100644 --- a/tests/Unit/TestPaymentRailModel.php +++ b/tests/Unit/TestPaymentRailModel.php @@ -8,7 +8,7 @@ use Payavel\Checkout\Tests\Models\TestPayment; use Payavel\Checkout\Tests\Models\TestPaymentType; use Payavel\Checkout\Tests\TestCase; -use Payavel\Orchestration\Fluent\ServiceConfig; +use Payavel\Orchestration\ServiceConfig; use Payavel\Orchestration\Tests\Contracts\CreatesServiceables; use PHPUnit\Framework\Attributes\Test; diff --git a/tests/Unit/TestPaymentTypeModel.php b/tests/Unit/TestPaymentTypeModel.php index a575221..e0aa9af 100644 --- a/tests/Unit/TestPaymentTypeModel.php +++ b/tests/Unit/TestPaymentTypeModel.php @@ -9,7 +9,7 @@ use Payavel\Checkout\Tests\Models\TestPaymentInstrument; use Payavel\Checkout\Tests\Models\TestPaymentRail; use Payavel\Checkout\Tests\TestCase; -use Payavel\Orchestration\Fluent\ServiceConfig; +use Payavel\Orchestration\ServiceConfig; use Payavel\Orchestration\Tests\Contracts\CreatesServiceables; use PHPUnit\Framework\Attributes\Test; diff --git a/tests/Unit/TestRefundModel.php b/tests/Unit/TestRefundModel.php index 12ad7b5..4e0154e 100644 --- a/tests/Unit/TestRefundModel.php +++ b/tests/Unit/TestRefundModel.php @@ -8,7 +8,7 @@ use Payavel\Checkout\Tests\Models\TestPayment; use Payavel\Checkout\Tests\Models\TestTransactionEvent; use Payavel\Checkout\Tests\TestCase; -use Payavel\Orchestration\Fluent\ServiceConfig; +use Payavel\Orchestration\ServiceConfig; use Payavel\Orchestration\Tests\Contracts\CreatesServiceables; use PHPUnit\Framework\Attributes\Test; diff --git a/tests/Unit/TestTransactionEventModel.php b/tests/Unit/TestTransactionEventModel.php index 66662b2..2b67af3 100644 --- a/tests/Unit/TestTransactionEventModel.php +++ b/tests/Unit/TestTransactionEventModel.php @@ -10,7 +10,7 @@ use Payavel\Checkout\Tests\Models\TestDispute; use Payavel\Checkout\Tests\Models\TestPayment; use Payavel\Checkout\Tests\TestCase; -use Payavel\Orchestration\Fluent\ServiceConfig; +use Payavel\Orchestration\ServiceConfig; use Payavel\Orchestration\Tests\Contracts\CreatesServiceables; use PHPUnit\Framework\Attributes\Test; diff --git a/tests/Unit/TestWalletModel.php b/tests/Unit/TestWalletModel.php index 81d302f..d141f68 100644 --- a/tests/Unit/TestWalletModel.php +++ b/tests/Unit/TestWalletModel.php @@ -10,7 +10,7 @@ use Payavel\Checkout\Tests\User; use Payavel\Orchestration\Contracts\Accountable; use Payavel\Orchestration\Contracts\Providable; -use Payavel\Orchestration\Fluent\ServiceConfig; +use Payavel\Orchestration\ServiceConfig; use Payavel\Orchestration\Tests\Contracts\CreatesServiceables; use PHPUnit\Framework\Attributes\Test;