Merge pull request #1 from anush/XOL-4975

XOL-4975 Upgrade to Omnipay 3
xola · Jan 22, 2020 · 36dffe9 · 36dffe9
2 parents 9fa3145 + dec0269
commit 36dffe9
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 20 deletions.
diff --git a/composer.json b/composer.json
@@ -1,19 +1,20 @@
 {
     "name": "medlmobileenterprises/omnipay-cybersource-so",
+    "description": "CyberSource Simple Order gateway for the Omnipay payment processing library",
+    "license": "MIT",
     "type": "library",
     "require": {
-        "omnipay/common": "^2.0",
-        "ext-json": "*",
-        "cybersource/sdk-php": "^1.0"
+        "omnipay/common": "^3",
+        "cybersource/sdk-php": "^1"
     },
     "require-dev": {
-        "omnipay/tests": "^2.0",
-        "squizlabs/php_codesniffer": "^1",
-        "phpunit/phpunit": "^3"
+        "omnipay/tests": "^3",
+        "squizlabs/php_codesniffer": "^3"
     },
-    "license": "MIT",
     "autoload": {
-        "psr-4": { "Omnipay\\CyberSourceSimpleOrder\\" : "src/" }
+        "psr-4": {
+            "Omnipay\\CyberSourceSimpleOrder\\": "src/"
+        }
     },
     "authors": [
         {

diff --git a/src/Gateway.php b/src/Gateway.php
@@ -1,17 +1,17 @@
 <?php
 
-
 namespace Omnipay\CyberSourceSimpleOrder;
 
-
 use Omnipay\Common\AbstractGateway;
+use Omnipay\Common\Message\AbstractRequest;
+use Omnipay\Common\Message\RequestInterface;
 
 /**
- * @method \Omnipay\Common\Message\RequestInterface completeAuthorize(array $options = array())
- * @method \Omnipay\Common\Message\RequestInterface completePurchase(array $options = array())
- * @method \Omnipay\Common\Message\RequestInterface createCard(array $options = array())
- * @method \Omnipay\Common\Message\RequestInterface updateCard(array $options = array())
- * @method \Omnipay\Common\Message\RequestInterface deleteCard(array $options = array())
+ * @method RequestInterface completeAuthorize(array $options = array())
+ * @method RequestInterface completePurchase(array $options = array())
+ * @method RequestInterface createCard(array $options = array())
+ * @method RequestInterface updateCard(array $options = array())
+ * @method RequestInterface deleteCard(array $options = array())
  */
 class Gateway extends AbstractGateway
 {
@@ -58,7 +58,7 @@ public function setMerchantKey($value)
     /**
      * Processes a payment authorization for a tokenized card payment.
      * @param array $parameters
-     * @return \Omnipay\Common\Message\AbstractRequest|\Omnipay\Common\Message\RequestInterface
+     * @return AbstractRequest|RequestInterface
      */
     public function authorize(array $parameters = array())
     {
@@ -68,7 +68,7 @@ public function authorize(array $parameters = array())
     /**
      * Processes a capture on a payment authorization.
      * @param array $parameters
-     * @return \Omnipay\Common\Message\AbstractRequest|\Omnipay\Common\Message\RequestInterface
+     * @return AbstractRequest|RequestInterface
      */
     public function capture(array $parameters = array())
     {
@@ -78,7 +78,7 @@ public function capture(array $parameters = array())
     /**
      * Processes a payment to be authorized and captured at the same time.
      * @param array $parameters
-     * @return \Omnipay\Common\Message\AbstractRequest|\Omnipay\Common\Message\RequestInterface
+     * @return AbstractRequest|RequestInterface
      */
     public function purchase(array $parameters = array())
     {
@@ -88,7 +88,7 @@ public function purchase(array $parameters = array())
     /**
      * Process a Void request for a previous Capture or Credit (Refund) request.
      * @param array $parameters
-     * @return \Omnipay\Common\Message\AbstractRequest|\Omnipay\Common\Message\RequestInterface
+     * @return AbstractRequest|RequestInterface
      */
     public function void(array $parameters = array())
     {
@@ -98,7 +98,7 @@ public function void(array $parameters = array())
     /**
      * Process a Credit (Refund) for a submitted payment.
      * @param array $parameters
-     * @return \Omnipay\Common\Message\AbstractRequest|\Omnipay\Common\Message\RequestInterface
+     * @return AbstractRequest|RequestInterface
      */
     public function refund(array $parameters = array())
     {