Skip to content

Commit

Permalink
Replace checkout's providable with serviceable one
Browse files Browse the repository at this point in the history
  • Loading branch information
r-kujawa committed Aug 14, 2023
1 parent dcc2902 commit 207eee9
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 47 deletions.
18 changes: 0 additions & 18 deletions src/Contracts/Providable.php

This file was deleted.

2 changes: 1 addition & 1 deletion src/DataTransferObjects/Provider.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace Payavel\Checkout\DataTransferObjects;

use Payavel\Checkout\Contracts\Providable;
use Payavel\Checkout\Traits\SimulateAttributes;
use Payavel\Serviceable\Contracts\Providable;

class Provider implements Providable
{
Expand Down
10 changes: 5 additions & 5 deletions src/Drivers/ConfigDriver.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ public function __construct()
/**
* Resolve the providable instance.
*
* @param \Payavel\Checkout\Contracts\Providable|string $provider
* @return \Payavel\Checkout\Contracts\Providable|null
* @param \Payavel\Serviceable\Contracts\Providable|string $provider
* @return \Payavel\Serviceable\Contracts\Providable|null
*/
public function resolveProvider($provider)
{
Expand All @@ -56,7 +56,7 @@ public function resolveProvider($provider)
* Get the default providable identifier.
*
* @param \Payavel\Checkout\Contracts\Merchantable|null $merchant
* @return string|int|\Payavel\Checkout\Contracts\Providable
* @return string|int|\Payavel\Serviceable\Contracts\Providable
*/
public function getDefaultProvider(Merchantable $merchant = null)
{
Expand Down Expand Up @@ -92,7 +92,7 @@ public function resolveMerchant($merchant)
/**
* Verify that the merchant is compatible with the provider.
*
* @param \Payavel\Checkout\Contracts\Providable
* @param \Payavel\Serviceable\Contracts\Providable
* @param \Payavel\Checkout\Contracts\Merchantable
* @return bool
*/
Expand All @@ -104,7 +104,7 @@ public function check($provider, $merchant)
/**
* Resolve the gateway class.
*
* @param \Payavel\Checkout\Contracts\Providable $provider
* @param \Payavel\Serviceable\Contracts\Providable $provider
* @return string
*/
public function resolveGatewayClass($provider)
Expand Down
8 changes: 4 additions & 4 deletions src/Drivers/DatabaseDriver.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ class DatabaseDriver extends PaymentServiceDriver
/**
* Resolve the providable instance.
*
* @param \Payavel\Checkout\Contracts\Providable|string $provider
* @return \Payavel\Checkout\Contracts\Providable|null
* @param \Payavel\Serviceable\Contracts\Providable|string $provider
* @return \Payavel\Serviceable\Contracts\Providable|null
*/
public function resolveProvider($provider)
{
Expand Down Expand Up @@ -69,7 +69,7 @@ public function resolveMerchant($merchant)
/**
* Verify that the merchant is compatible with the provider.
*
* @param \Payavel\Checkout\Contracts\Providable
* @param \Payavel\Serviceable\Contracts\Providable
* @param \Payavel\Checkout\Contracts\Merchantable
* @return bool
*/
Expand All @@ -85,7 +85,7 @@ public function check($provider, $merchant)
/**
* Resolve the gateway class.
*
* @param \Payavel\Checkout\Contracts\Providable $provider
* @param \Payavel\Serviceable\Contracts\Providable $provider
* @return string
*/
public function resolveGatewayClass($provider)
Expand Down
4 changes: 2 additions & 2 deletions src/Facades/Payment.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@

/**
* @method static \Payavel\Checkout\PaymentGateway provider($provider)
* @method static \Payavel\Checkout\Contracts\Providable getProvider()
* @method static \Payavel\Serviceable\Contracts\Providable getProvider()
* @method static void setProvider($provider)
* @method static string|int|\Payavel\Checkout\Contracts\Providable getDefaultProvider()
* @method static string|int|\Payavel\Serviceable\Contracts\Providable getDefaultProvider()
* @method static \Payavel\Checkout\PaymentGateway merchant($merchant)
* @method static \Payavel\Checkout\Contracts\Merchantable getMerchant()
* @method static void setMerchant($merchant, $strict = true)
Expand Down
2 changes: 1 addition & 1 deletion src/Models/PaymentProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Payavel\Checkout\Contracts\Providable;
use Payavel\Checkout\Database\Factories\PaymentProviderFactory;
use Payavel\Serviceable\Contracts\Providable;

class PaymentProvider extends Model implements Providable
{
Expand Down
6 changes: 3 additions & 3 deletions src/PaymentRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

use Payavel\Checkout\Contracts\Merchantable;
use Payavel\Checkout\Contracts\PaymentRequestor;
use Payavel\Checkout\Contracts\Providable;
use Payavel\Checkout\Traits\PaymentRequests;
use Payavel\Serviceable\Contracts\Providable;

abstract class PaymentRequest implements PaymentRequestor
{
Expand All @@ -14,7 +14,7 @@ abstract class PaymentRequest implements PaymentRequestor
/**
* The payment provider.
*
* @var \Payavel\Checkout\Contracts\Providable
* @var \Payavel\Serviceable\Contracts\Providable
*/
protected $provider;

Expand All @@ -26,7 +26,7 @@ abstract class PaymentRequest implements PaymentRequestor
protected $merchant;

/**
* @param \Payavel\Checkout\Contracts\Providable $provider
* @param \Payavel\Serviceable\Contracts\Providable $provider
* @param \Payavel\Checkout\Contracts\Merchantable $merchant
*/
public function __construct(Providable $provider, Merchantable $merchant)
Expand Down
6 changes: 3 additions & 3 deletions src/PaymentResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

use Payavel\Checkout\Contracts\Merchantable;
use Payavel\Checkout\Contracts\PaymentResponder;
use Payavel\Checkout\Contracts\Providable;
use Payavel\Checkout\Traits\PaymentResponses;
use Payavel\Checkout\Traits\SimulateAttributes;
use Payavel\Serviceable\Contracts\Providable;
use RuntimeException;

abstract class PaymentResponse implements PaymentResponder
Expand Down Expand Up @@ -67,7 +67,7 @@ abstract class PaymentResponse implements PaymentResponder
/**
* The provider that the $request was made towards.
*
* @var \Payavel\Checkout\Contracts\Providable
* @var \Payavel\Serviceable\Contracts\Providable
*/
public $provider;

Expand Down Expand Up @@ -111,7 +111,7 @@ protected function setUp()
* Configure the response based on the request.
*
* @param string $requestMethod
* @param \Payavel\Checkout\Contracts\Providable $provider
* @param \Payavel\Serviceable\Contracts\Providable $provider
* @param \Payavel\Checkout\Contracts\Merchantable $merchant
* @return void
*/
Expand Down
8 changes: 4 additions & 4 deletions src/PaymentService.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class PaymentService
/**
* The payment provider requests will be forwarded to.
*
* @var \Payavel\Checkout\Contracts\Providable
* @var \Payavel\Serviceable\Contracts\Providable
*/
private $provider;

Expand Down Expand Up @@ -56,7 +56,7 @@ public function __construct()
/**
* Fluent provider setter.
*
* @param \Payavel\Checkout\Contracts\Providable|string|int $provider
* @param \Payavel\Serviceable\Contracts\Providable|string|int $provider
* @return \Payavel\Checkout\PaymentService
*/
public function provider($provider)
Expand All @@ -83,7 +83,7 @@ public function getProvider()
/**
* Set the payment provider.
*
* @param \Payavel\Checkout\Contracts\Providable|string|int $provider
* @param \Payavel\Serviceable\Contracts\Providable|string|int $provider
* @return void
*
* @throws Exception
Expand All @@ -102,7 +102,7 @@ public function setProvider($provider)
/**
* Get the default payment provider.
*
* @return string|int|\Payavel\Checkout\Contracts\Providable
* @return string|int|\Payavel\Serviceable\Contracts\Providable
*/
public function getDefaultProvider()
{
Expand Down
12 changes: 6 additions & 6 deletions src/PaymentServiceDriver.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
namespace Payavel\Checkout;

use Payavel\Checkout\Contracts\Merchantable;
use Payavel\Checkout\Contracts\Providable;
use Payavel\Serviceable\Contracts\Providable;

abstract class PaymentServiceDriver
{
/**
* Resolve the providable instance.
*
* @param \Payavel\Checkout\Contracts\Providable|string|int $provider
* @return \Payavel\Checkout\Contracts\Providable|null
* @param \Payavel\Serviceable\Contracts\Providable|string|int $provider
* @return \Payavel\Serviceable\Contracts\Providable|null
*/
abstract public function resolveProvider($provider);

Expand All @@ -37,7 +37,7 @@ abstract public function resolveMerchant($merchant);
/**
* Get the default merchantable identifier.
*
* @param \Payavel\Checkout\Contracts\Providable|null $provider
* @param \Payavel\Serviceable\Contracts\Providable|null $provider
* @return string|int
*/
public function getDefaultMerchant(Providable $provider = null)
Expand All @@ -48,7 +48,7 @@ public function getDefaultMerchant(Providable $provider = null)
/**
* Verify that the merchant is compatible with the provider.
*
* @param \Payavel\Checkout\Contracts\Providable
* @param \Payavel\Serviceable\Contracts\Providable
* @param \Payavel\Checkout\Contracts\Merchantable
* @return bool
*/
Expand All @@ -57,7 +57,7 @@ abstract public function check($provider, $merchant);
/**
* Resolve the gateway class.
*
* @param \Payavel\Checkout\Contracts\Providable $provider
* @param \Payavel\Serviceable\Contracts\Providable $provider
* @return string
*/
abstract public function resolveGatewayClass($provider);
Expand Down

0 comments on commit 207eee9

Please sign in to comment.