[skeleton] Remove deprecated features from skeleton.

Payum · Sep 12, 2016 · 67a7cab · 67a7cab
1 parent 5fdd462
commit 67a7cab
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 29 deletions.
diff --git a/Action/Api/BaseApiAwareAction.php b/Action/Api/BaseApiAwareAction.php
@@ -3,25 +3,18 @@
 
 use Payum\Core\Action\ActionInterface;
 use Payum\Core\ApiAwareInterface;
-use Payum\Core\Exception\UnsupportedApiException;
+use Payum\Core\ApiAwareTrait;
+use Payum\Core\GatewayAwareInterface;
+use Payum\Core\GatewayAwareTrait;
 use Payum\Skeleton\Api;
 
-abstract class BaseApiAwareAction implements ActionInterface, ApiAwareInterface
+abstract class BaseApiAwareAction implements ActionInterface, GatewayAwareInterface, ApiAwareInterface
 {
-    /**
-     * @var Api
-     */
-    protected $api;
+    use GatewayAwareTrait;
+    use ApiAwareTrait;
 
-    /**
-     * {@inheritDoc}
-     */
-    public function setApi($api)
+    public function __construct()
     {
-        if (false == $api instanceof Api) {
-            throw new UnsupportedApiException(sprintf('Not supported. Expected %s instance to be set as api.', Api::class));
-        }
-
-        $this->api = $api;
+        $this->apiClass = Api::class;
     }
 }
diff --git a/Action/AuthorizeAction.php b/Action/AuthorizeAction.php
@@ -1,13 +1,16 @@
 <?php
 namespace Payum\Skeleton\Action;
 
-use Payum\Core\Action\GatewayAwareAction;
+use Payum\Core\Action\ActionInterface;
 use Payum\Core\Bridge\Spl\ArrayObject;
+use Payum\Core\GatewayAwareTrait;
 use Payum\Core\Request\Authorize;
 use Payum\Core\Exception\RequestNotSupportedException;
 
-class AuthorizeAction extends GatewayAwareAction
+class AuthorizeAction implements ActionInterface
 {
+    use GatewayAwareTrait;
+
     /**
      * {@inheritDoc}
      *

diff --git a/Action/CancelAction.php b/Action/CancelAction.php
@@ -1,13 +1,16 @@
 <?php
 namespace Payum\Skeleton\Action;
 
-use Payum\Core\Action\GatewayAwareAction;
+use Payum\Core\Action\ActionInterface;
 use Payum\Core\Bridge\Spl\ArrayObject;
 use Payum\Core\Exception\RequestNotSupportedException;
+use Payum\Core\GatewayAwareTrait;
 use Payum\Core\Request\Cancel;
 
-class CancelAction extends GatewayAwareAction
+class CancelAction implements ActionInterface
 {
+    use GatewayAwareTrait;
+
     /**
      * {@inheritDoc}
      *

diff --git a/Action/CaptureAction.php b/Action/CaptureAction.php
@@ -1,13 +1,16 @@
 <?php
 namespace Payum\Skeleton\Action;
 
-use Payum\Core\Action\GatewayAwareAction;
+use Payum\Core\Action\ActionInterface;
 use Payum\Core\Bridge\Spl\ArrayObject;
+use Payum\Core\GatewayAwareTrait;
 use Payum\Core\Request\Capture;
 use Payum\Core\Exception\RequestNotSupportedException;
 
-class CaptureAction extends GatewayAwareAction
+class CaptureAction implements ActionInterface
 {
+    use GatewayAwareTrait;
+
     /**
      * {@inheritDoc}
      *

diff --git a/Action/ConvertPaymentAction.php b/Action/ConvertPaymentAction.php
@@ -2,15 +2,15 @@
 namespace Payum\Skeleton\Action;
 
 use Payum\Core\Action\ActionInterface;
-use Payum\Core\Action\GatewayAwareAction;
-use Payum\Core\Bridge\Spl\ArrayObject;
 use Payum\Core\Exception\RequestNotSupportedException;
+use Payum\Core\GatewayAwareTrait;
 use Payum\Core\Model\PaymentInterface;
 use Payum\Core\Request\Convert;
-use Payum\Core\Request\GetCurrency;
 
-class ConvertPaymentAction extends GatewayAwareAction
+class ConvertPaymentAction implements ActionInterface
 {
+    use GatewayAwareTrait;
+
     /**
      * {@inheritDoc}
      *

diff --git a/Action/NotifyAction.php b/Action/NotifyAction.php
@@ -1,13 +1,16 @@
 <?php
 namespace Payum\Skeleton\Action;
 
-use Payum\Core\Action\GatewayAwareAction;
+use Payum\Core\Action\ActionInterface;
 use Payum\Core\Bridge\Spl\ArrayObject;
 use Payum\Core\Exception\RequestNotSupportedException;
+use Payum\Core\GatewayAwareTrait;
 use Payum\Core\Request\Notify;
 
-class NotifyAction extends GatewayAwareAction
+class NotifyAction implements ActionInterface
 {
+    use GatewayAwareTrait;
+
     /**
      * {@inheritDoc}
      *

diff --git a/Action/RefundAction.php b/Action/RefundAction.php
@@ -1,13 +1,16 @@
 <?php
 namespace Payum\Skeleton\Action;
 
-use Payum\Core\Action\GatewayAwareAction;
+use Payum\Core\Action\ActionInterface;
 use Payum\Core\Bridge\Spl\ArrayObject;
 use Payum\Core\Exception\RequestNotSupportedException;
+use Payum\Core\GatewayAwareTrait;
 use Payum\Core\Request\Refund;
 
-class RefundAction extends GatewayAwareAction
+class RefundAction implements ActionInterface
 {
+    use GatewayAwareTrait;
+
     /**
      * {@inheritDoc}
      *