refactor

Author: Can Sözeri

composer.json

@@ -20,10 +20,5 @@
     "omnipay/tests": "^3",
     "squizlabs/php_codesniffer": "^3"
   },
-  "extra": {
-    "branch-alias": {
-      "dev-master": "3.0.x-dev"
-    }
-  },
   "prefer-stable": true
 }

src/Gateway.php

@@ -13,7 +13,6 @@
 use Omnipay\Gvp\Messages\CompletePurchaseRequest;
 use Omnipay\Gvp\Messages\PurchaseRequest;
 
-
 /**
  * @method \Omnipay\Common\Message\NotificationInterface acceptNotification(array $options = array())
  * @method \Omnipay\Common\Message\RequestInterface completeAuthorize(array $options = array())
@@ -71,6 +70,40 @@ public function setTerminalId(string $value): Gateway
         return $this->setParameter('terminalId', $value);
     }
 
+    /**
+     * @return string
+     */
+    public function getUserName(): string
+    {
+        return $this->getParameter('username');
+    }
+
+    /**
+     * @param string $value
+     * @return Gateway
+     */
+    public function setUserName(string $value): Gateway
+    {
+        return $this->setParameter('username', $value);
+    }
+
+    /**
+     * @return string
+     */
+    public function getPassword(): string
+    {
+        return $this->getParameter('password');
+    }
+
+    /**
+     * @param string $value
+     * @return Gateway
+     */
+    public function setPassword(string $value): Gateway
+    {
+        return $this->setParameter('password', $value);
+    }
+
     /**
      * @param array $parameters
      * @return AbstractRequest|RequestInterface

src/Messages/AbstractRequest.php

@@ -41,7 +41,7 @@ abstract class AbstractRequest extends \Omnipay\Common\Message\AbstractRequest
      */
     public function getEndpoint(): string
     {
-        $paymentType = $this->getPaymentType() == '3d' ? '3d' : 'direct';
+        $paymentType = $this->getPaymentType() === '3d' ? '3d' : 'direct';
 
         return $this->getTestMode() ? $this->endpoints[$paymentType]["test"] : $this->endpoints[$paymentType]["prod"];
     }
@@ -140,12 +140,12 @@ public function setPaymentType(string $value = ""): AbstractRequest
     public function sendData($data)
     {
         try {
-            if ($this->getPaymentType() == '3d') {
+            if ($this->getPaymentType() === '3d') {
                 $body = http_build_query($data, '', '&');
             } else {
                 $document = new \DOMDocument('1.0', 'UTF-8');
                 $root = $document->createElement('GVPSRequest');
-                $xml = function ($root, $data) use ($document, &$xml) {
+                $xml = static function ($root, $data) use ($document, &$xml) {
                     foreach ($data as $key => $value) {
                         if (is_array($value)) {
                             $subs = $document->createElement($key);
@@ -377,7 +377,6 @@ protected function getSalesRequestParamsFor3d(): array
         $params['cardnumber'] = $this->getCard()->getNumber();
         $params['cardexpiredatemonth'] = $this->getCard()->getExpiryMonth();
         $params['cardexpiredateyear'] = $this->getCard()->getExpiryYear();
-        $params['cardexpiredateyear'] = $this->getCard()->getExpiryYear();
         $params['cardcvv2'] = $this->getCard()->getCvv();
         $params['secure3dsecuritylevel'] = '3D';
 

src/Messages/AbstractResponse.php

@@ -7,7 +7,7 @@
 
 use Omnipay\Common\Message\RequestInterface;
 
-class AbstractResponse extends \Omnipay\Common\Message\AbstractResponse
+abstract class AbstractResponse extends \Omnipay\Common\Message\AbstractResponse
 {
     public function __construct(RequestInterface $request, $data)
     {
@@ -29,7 +29,7 @@ public function getMessage(): string
 
     public function getCode(): ?string
     {
-        return (string)$this->data["Transaction"]->Response->Code ?? null;
+        return (string)($this->data["Transaction"]->Response->Code ?? null);
     }
 
     /**
@@ -46,14 +46,4 @@ public function setData(string $data): array
 
         return $this->data = $content;
     }
-
-    /**
-     * Is the response successful?
-     *
-     * @return bool
-     */
-    public function isSuccessful()
-    {
-
-    }
 }

src/Messages/AuthorizeRequest.php

@@ -5,10 +5,6 @@
 
 namespace Omnipay\Gvp\Messages;
 
-use Exception;
-use Omnipay\Common\Exception\InvalidResponseException;
-use Omnipay\Common\Message\ResponseInterface;
-
 class AuthorizeRequest extends AbstractRequest
 {
     /**

src/Messages/AuthorizeResponse.php

@@ -5,15 +5,13 @@
 
 namespace Omnipay\Gvp\Messages;
 
-
 class AuthorizeResponse extends AbstractResponse
 {
-
     /**
      * @return boolean
      */
     public function isSuccessful(): bool
     {
-        return isset($this->data["Transaction"]) ? $this->data["Transaction"]->Response->Code == '00' : false;
+        return isset($this->data["Transaction"]) ? $this->data["Transaction"]->Response->Code === '00' : false;
     }
 }

src/Messages/CaptureRequest.php

@@ -5,10 +5,8 @@
 
 namespace Omnipay\Gvp\Messages;
 
-
 class CaptureRequest extends AbstractRequest
 {
-
     /**
      * @return array
      */

src/Messages/CaptureResponse.php

@@ -7,12 +7,11 @@
 
 class CaptureResponse extends AbstractResponse
 {
-
     /**
      * @return boolean
      */
     public function isSuccessful(): bool
     {
-        return isset($this->data["Transaction"]) ? $this->data["Transaction"]->Response->Code == '00' : false;
+        return isset($this->data["Transaction"]) ? $this->data["Transaction"]->Response->Code === '00' : false;
     }
 }

src/Messages/CompletePurchaseRequest.php

@@ -18,14 +18,14 @@ public function getData()
     {
         $this->setPaymentType();
 
-        if (!in_array($this->getMd(), array(1, 2, 3, 4))) {
+        if (!in_array($this->getMd(), array(1, 2, 3, 4), false)) {
             throw new RuntimeException('3DSecure verification error');
         }
 
         $data = $this->getSalesRequestParams();
         $data['Transaction']['CardholderPresentCode'] = "13";
         $secure3d = [
-            "AuthenticationCode" => $this->getCavv(),
+            "AuthenticationCode" => $this->getCvv(),
             "SecurityLevel" => $this->getEci(),
             "TxnID" => $this->getXid(),
             "Md" => $this->getMd(),
@@ -38,18 +38,18 @@ public function getData()
     /**
      * @return string
      */
-    public function getCavv(): string
+    public function getCvv(): string
     {
-        return $this->getParameter('cavv');
+        return $this->getParameter('cvv');
     }
 
     /**
      * @param string $value
      * @return CompletePurchaseRequest
      */
-    public function setCavv(string $value): CompletePurchaseRequest
+    public function setCvv(string $value): CompletePurchaseRequest
     {
-        return $this->setParameter('cavv', $value);
+        return $this->setParameter('cvv', $value);
     }
 
     /**

src/Messages/CompletePurchaseResponse.php

@@ -12,6 +12,6 @@ class CompletePurchaseResponse extends AbstractResponse
      */
     public function isSuccessful(): bool
     {
-        return isset($this->data["Transaction"]) ? $this->data["Transaction"]->Response->Code == '00' : false;
+        return isset($this->data["Transaction"]) ? $this->data["Transaction"]->Response->Code === '00' : false;
     }
 }