Merge pull request mewebstudio#66 from nuryagdym/refactor-methods-for…

…-better-testing

Refactor methods for better testing

examples/akbank/_payment_config.php

@@ -1,5 +1,6 @@
 <?php
 
+use Mews\Pos\Entity\Card\AbstractCreditCard;
 use Mews\Pos\Gateways\AbstractGateway;
 
 require __DIR__.'/../_main_config.php';
@@ -105,6 +106,6 @@ function doPayment(\Mews\Pos\PosInterface $pos, string $transaction, ?\Mews\Pos\
         12,
         '000',
         'John Doe',
-        'visa'
+        AbstractCreditCard::CARD_TYPE_VISA
     ),
 ];

examples/finansbank-payfor/_payment_config.php

@@ -1,5 +1,6 @@
 <?php
 
+use Mews\Pos\Entity\Card\AbstractCreditCard;
 use Mews\Pos\Gateways\AbstractGateway;
 
 require __DIR__.'/../_main_config.php';
@@ -98,6 +99,6 @@ function doPayment(\Mews\Pos\PosInterface $pos, string $transaction, ?\Mews\Pos\
         1,
         '123',
         'John Doe',
-        'visa'
+        AbstractCreditCard::CARD_TYPE_VISA
     ),
 ];

examples/garanti/_payment_config.php

@@ -1,5 +1,6 @@
 <?php
 
+use Mews\Pos\Entity\Card\AbstractCreditCard;
 use Mews\Pos\Gateways\AbstractGateway;
 
 require __DIR__.'/../_main_config.php';
@@ -93,6 +94,6 @@ function doPayment(\Mews\Pos\PosInterface $pos, string $transaction, ?\Mews\Pos\
         12,
         '000',
         'John Doe',
-        'visa'
+        AbstractCreditCard::CARD_TYPE_VISA
     ),
 ];

examples/interpos/_payment_config.php

@@ -1,5 +1,6 @@
 <?php
 
+use Mews\Pos\Entity\Card\AbstractCreditCard;
 use Mews\Pos\Gateways\AbstractGateway;
 
 require __DIR__.'/../_main_config.php';
@@ -92,14 +93,14 @@ function doPayment(\Mews\Pos\PosInterface $pos, string $transaction, ?\Mews\Pos\
         11,
         592,
         'John Doe',
-        'visa'
+        AbstractCreditCard::CARD_TYPE_VISA
     ),
     'visa2' => new \Mews\Pos\Entity\Card\CreditCardInterPos(
         '4090700101174272',
         22,
         12,
         104,
         'John Doe',
-        'visa'
+        AbstractCreditCard::CARD_TYPE_VISA
     ),
 ];

examples/vakifbank/_payment_config.php

@@ -1,5 +1,6 @@
 <?php
 
+use Mews\Pos\Entity\Card\AbstractCreditCard;
 use Mews\Pos\Gateways\AbstractGateway;
 
 require __DIR__.'/../_main_config.php';
@@ -90,6 +91,6 @@ function doPayment(\Mews\Pos\PosInterface $pos, string $transaction, ?\Mews\Pos\
         11,
         454,
         'John Doe',
-        'visa'
+        AbstractCreditCard::CARD_TYPE_VISA
     ),
 ];

examples/ykb/3d/_config.php

@@ -5,7 +5,7 @@
 
 require '../_payment_config.php';
 
-$baseUrl = $hostUrl.'/3d/';
+$baseUrl = $bankTestsUrl.'/3d/';
 
 $account = AccountFactory::createPosNetAccount(
     'yapikredi',

examples/ykb/_payment_config.php

@@ -1,5 +1,6 @@
 <?php
 
+use Mews\Pos\Entity\Card\AbstractCreditCard;
 use Mews\Pos\Gateways\AbstractGateway;
 
 require __DIR__.'/../_main_config.php';
@@ -78,6 +79,6 @@ function doPayment(\Mews\Pos\PosInterface $pos, string $transaction, ?\Mews\Pos\
         11,
         454,
         'John Doe',
-        'visa'
+        AbstractCreditCard::CARD_TYPE_VISA
     ),
 ];

src/Entity/Card/AbstractCreditCard.php

@@ -7,6 +7,11 @@
  */
 abstract class AbstractCreditCard
 {
+    public const CARD_TYPE_VISA = 'visa';
+    public const CARD_TYPE_MASTERCARD = 'master';
+    public const CARD_TYPE_AMEX = 'amex';
+    public const CARD_TYPE_TROY = 'troy';
+
     /**
      * 16 digit credit card number without spaces
      * @var string

src/Entity/Card/CreditCardEstPos.php

@@ -8,8 +8,8 @@
 class CreditCardEstPos extends AbstractCreditCard
 {
     private $cardTypeToCodeMapping = [
-        'visa'   => '1',
-        'master' => '2',
+        self::CARD_TYPE_VISA       => '1',
+        self::CARD_TYPE_MASTERCARD => '2',
     ];
 
     /**

src/Entity/Card/CreditCardInterPos.php

@@ -8,9 +8,9 @@
 class CreditCardInterPos extends AbstractCreditCard
 {
     private $cardTypeToCodeMapping = [
-        'visa'   => '0',
-        'master' => '1',
-        'amex'   => '3',
+        self::CARD_TYPE_VISA       => '0',
+        self::CARD_TYPE_MASTERCARD => '1',
+        self::CARD_TYPE_AMEX       => '3',
     ];
 
     /**

src/Entity/Card/CreditCardVakifBank.php

@@ -9,10 +9,10 @@
 class CreditCardVakifBank extends AbstractCreditCard
 {
     private static $cardTypeToCodeMapping = [
-        'visa'   => '100',
-        'master' => '200',
-        'troy'   => '300',
-        'amex'   => '400',
+        self::CARD_TYPE_VISA       => '100',
+        self::CARD_TYPE_MASTERCARD => '200',
+        self::CARD_TYPE_TROY       => '300',
+        self::CARD_TYPE_AMEX       => '400',
     ];
 
     /**

src/Gateways/AbstractGateway.php

@@ -7,6 +7,7 @@
 use Mews\Pos\Exceptions\UnsupportedPaymentModelException;
 use Mews\Pos\Exceptions\UnsupportedTransactionTypeException;
 use Mews\Pos\PosInterface;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Serializer\Encoder\XmlEncoder;
 
 /**
@@ -309,18 +310,19 @@ public function setTxType(string $txType)
      */
     public function payment($card = null)
     {
+        $request = Request::createFromGlobals();
         $this->card = $card;
 
         $model = $this->account->getModel();
 
         if (self::MODEL_NON_SECURE === $model) {
             $this->makeRegularPayment();
         } elseif (self::MODEL_3D_SECURE === $model) {
-            $this->make3DPayment();
+            $this->make3DPayment($request);
         } elseif (self::MODEL_3D_PAY === $model) {
-            $this->make3DPayPayment();
+            $this->make3DPayPayment($request);
         } elseif (self::MODEL_3D_HOST === $model) {
-            $this->make3DHostPayment();
+            $this->make3DHostPayment($request);
         } else {
             throw new UnsupportedPaymentModelException();
         }
@@ -340,9 +342,9 @@ public function makeRegularPayment()
             $contents = $this->createRegularPostXML();
         }
 
-        $this->send($contents);
+        $bankResponse = $this->send($contents);
 
-        $this->response = (object) $this->mapPaymentResponse($this->data);
+        $this->response = (object) $this->mapPaymentResponse($bankResponse);
 
         return $this;
     }
@@ -353,9 +355,9 @@ public function makeRegularPayment()
     public function refund()
     {
         $xml = $this->createRefundXML();
-        $this->send($xml);
+        $bankResponse = $this->send($xml);
 
-        $this->response = $this->mapRefundResponse($this->data);
+        $this->response = $this->mapRefundResponse($bankResponse);
 
         return $this;
     }
@@ -366,9 +368,9 @@ public function refund()
     public function cancel()
     {
         $xml = $this->createCancelXML();
-        $this->send($xml);
+        $bankResponse = $this->send($xml);
 
-        $this->response = $this->mapCancelResponse($this->data);
+        $this->response = $this->mapCancelResponse($bankResponse);
 
         return $this;
     }
@@ -380,9 +382,9 @@ public function status()
     {
         $xml = $this->createStatusXML();
 
-        $this->send($xml);
+        $bankResponse = $this->send($xml);
 
-        $this->response = $this->mapStatusResponse($this->data);
+        $this->response = $this->mapStatusResponse($bankResponse);
 
         return $this;
     }
@@ -394,9 +396,9 @@ public function history(array $meta)
     {
         $xml = $this->createHistoryXML($meta);
 
-        $this->send($xml);
+        $bankResponse = $this->send($xml);
 
-        $this->response = $this->mapHistoryResponse($this->data);
+        $this->response = $this->mapHistoryResponse($bankResponse);
 
         return $this;
     }

src/Gateways/EstPos.php

@@ -160,11 +160,9 @@ public function check3DHash(array $data): bool
     /**
      * @inheritDoc
      */
-    public function make3DPayment()
+    public function make3DPayment(Request $request)
     {
-        $request = Request::createFromGlobals();
-
-
+        $provisionResponse = null;
         if ($this->check3DHash($request->request->all())) {
             if ($request->request->get('ProcReturnCode') !== '00') {
                 /**
@@ -175,21 +173,19 @@ public function make3DPayment()
                  */
             }
             $contents = $this->create3DPaymentXML($request->request->all());
-            $this->send($contents);
+            $provisionResponse = $this->send($contents);
         }
 
-        $this->response = $this->map3DPaymentData($request->request->all(), $this->data);
+        $this->response = $this->map3DPaymentData($request->request->all(), $provisionResponse);
 
         return $this;
     }
 
     /**
      * @inheritDoc
      */
-    public function make3DPayPayment()
+    public function make3DPayPayment(Request $request)
     {
-        $request = Request::createFromGlobals();
-
         $this->response = $this->map3DPayResponseData($request->request->all());
 
         return $this;
@@ -198,9 +194,9 @@ public function make3DPayPayment()
     /**
      * @inheritDoc
      */
-    public function make3DHostPayment()
+    public function make3DHostPayment(Request $request)
     {
-        return $this->make3DPayPayment();
+        return $this->make3DPayPayment($request);
     }
 
     /**
@@ -253,7 +249,7 @@ public function get3DFormData(): array
     /**
      * @inheritDoc
      */
-    public function send($contents)
+    public function send($contents, ?string $url = null)
     {
         $client = new Client();
 
@@ -263,7 +259,7 @@ public function send($contents)
 
         $this->data = $this->XMLStringToObject($response->getBody()->getContents());
 
-        return $this;
+        return $this->data;
     }
 
     /**
@@ -273,9 +269,9 @@ public function history(array $meta)
     {
         $xml = $this->createHistoryXML($meta);
 
-        $this->send($xml);
+        $bankResponse = $this->send($xml);
 
-        $this->response = $this->mapHistoryResponse($this->data);
+        $this->response = $this->mapHistoryResponse($bankResponse);
 
         return $this;
     }