Merge branch 'master' into 172-kuveyt-turk-api-versiyon-guncellemesi

# Conflicts:
#	tests/Unit/Serializer/KuveytPosSerializerTest.php

README.md

@@ -139,7 +139,7 @@ return [
 Bundan sonra nesnemizi, yeni ayarlarımıza göre oluşturup kullanmamız gerekir. Örnek:
 ```php
 //yeni ayar yolu ya da degeri
-$yeniAyarlar = require './pos_ayarlar.php';
+$yeniAyarlar = require __DIR__ . '/pos_ayarlar.php';
 $pos = \Mews\Pos\Factory\PosFactory::createPosGateway($account, $yeniAyarlar, $eventDispatcher);
 ```
 

docs/CHANGELOG.md

@@ -17,7 +17,7 @@ Bu method ile kütüphanenin ilgili gateway için hangi işlemleri desteklediği
 
 ### Changed
 - Kütüphane PHP sürümü **v7.4**'e yükseltildi.
-- Deprecated olan `VakifBankCPPos` ve `PayFlexAccount` gateway sınıflar kaldırıldı.
+- Deprecated olan `VakifBankCPPos` ve `VakifBankPos` gateway sınıflar kaldırıldı.
 Yerine `PayFlexCPV4Pos` ve `PayFlexV4Pos` kullanabilirsiniz.
 - `AccountFactory::createVakifBankAccount()` method silindi, yerine `AccountFactory::createPayFlexAccount()` kullanabilirsiniz.
 - Constant'lar `AbstractGateway` sınıfından `PosInterface`'e taşındı.

src/Gateways/InterPos.php

@@ -119,7 +119,9 @@ public function make3DPayPayment(Request $request, array $order, string $txType)
      */
     public function make3DHostPayment(Request $request, array $order, string $txType): PosInterface
     {
-        return $this->make3DPayPayment($request, $order, $txType);
+        $this->response = $this->responseDataMapper->map3DHostResponseData($request->request->all(), $txType, $order);
+
+        return $this;
     }
 
     /**

src/Gateways/KuveytPos.php

@@ -17,7 +17,6 @@
 use Mews\Pos\Entity\Card\CreditCardInterface;
 use Mews\Pos\Event\RequestDataPreparedEvent;
 use Mews\Pos\Exceptions\HashMismatchException;
-use Mews\Pos\Exceptions\NotImplementedException;
 use Mews\Pos\Exceptions\UnsupportedPaymentModelException;
 use Mews\Pos\Exceptions\UnsupportedTransactionTypeException;
 use Mews\Pos\PosInterface;
@@ -114,7 +113,15 @@ public function get3DFormData(array $order, string $paymentModel, string $txType
      */
     public function makeRegularPayment(array $order, CreditCardInterface $creditCard, string $txType): PosInterface
     {
-        throw new NotImplementedException();
+        throw new UnsupportedPaymentModelException();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function makeRegularPostPayment(array $order): PosInterface
+    {
+        throw new UnsupportedPaymentModelException();
     }
 
     /**

src/Gateways/PayFlexCPV4Pos.php

@@ -128,12 +128,20 @@ public function make3DHostPayment(Request $request, array $order, string $txType
         return $this->make3DPayPayment($request, $order, $txType);
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function status(array $order): PosInterface
+    {
+        throw new UnsupportedTransactionTypeException();
+    }
+
     /**
      * @inheritDoc
      */
     public function history(array $data): PosInterface
     {
-        throw new UnsupportedPaymentModelException();
+        throw new UnsupportedTransactionTypeException();
     }
 
     /**

src/Gateways/PayForPos.php

@@ -112,7 +112,9 @@ public function make3DPayPayment(Request $request, array $order, string $txType)
      */
     public function make3DHostPayment(Request $request, array $order, string $txType): PosInterface
     {
-        return $this->make3DPayPayment($request, $order, $txType);
+        $this->response = $this->responseDataMapper->map3DHostResponseData($request->request->all(), $txType, $order);
+
+        return $this;
     }
 
     /**

src/Gateways/PosNetV1Pos.php

@@ -158,7 +158,7 @@ public function orderHistory(array $order): PosInterface
      */
     protected function send($contents, string $txType, string $paymentModel, ?string $url = null): array
     {
-        $url = $this->getApiURL();
+        $url = $this->getApiURL($txType);
         $this->logger->debug('sending request', ['url' => $url]);
 
         if (!is_string($contents)) {

src/Gateways/ToslaPos.php

@@ -114,7 +114,17 @@ public function make3DPayPayment(Request $request, array $order, string $txType)
      */
     public function make3DHostPayment(Request $request, array $order, string $txType): PosInterface
     {
-        return $this->make3DPayPayment($request, $order, $txType);
+        $request = $request->request;
+
+        if ($this->is3DAuthSuccess($request->all()) && !$this->requestDataMapper->getCrypt()->check3DHash($this->account, $request->all())) {
+            throw new HashMismatchException();
+        }
+
+        $this->response = $this->responseDataMapper->map3DHostResponseData($request->all(), $txType, $order);
+
+        $this->logger->debug('finished 3D payment', ['mapped_response' => $this->response]);
+
+        return $this;
     }
 
     /**

src/Serializer/KuveytPosSerializer.php

@@ -16,8 +16,8 @@
 use Mews\Pos\PosInterface;
 use Symfony\Component\Serializer\Encoder\JsonEncoder;
 use Symfony\Component\Serializer\Encoder\XmlEncoder;
+use Symfony\Component\Serializer\Exception\NotEncodableValueException;
 use Symfony\Component\Serializer\Serializer;
-use Throwable;
 
 class KuveytPosSerializer implements SerializerInterface
 {
@@ -75,13 +75,13 @@ public function decode(string $data, string $txType): array
 
         try {
             return $this->serializer->decode($data, XmlEncoder::FORMAT);
-        } catch (Throwable $throwable) {
+        } catch (NotEncodableValueException $notEncodableValueException) {
             if ($this->isHTML($data)) {
                 // 3D form data icin enrollment istegi gonderiyoruz, o istegin cevabi icinde form olan HTML donuyor.
                 return $this->transformReceived3DFormData($data);
             }
 
-            throw new Exception($data, $throwable->getCode(), $throwable);
+            throw new Exception($data, $notEncodableValueException->getCode(), $notEncodableValueException);
         }
     }
 

src/Serializer/PayFlexV4PosSerializer.php

@@ -12,7 +12,6 @@
 use Symfony\Component\Serializer\Encoder\XmlEncoder;
 use Symfony\Component\Serializer\Exception\NotEncodableValueException;
 use Symfony\Component\Serializer\Serializer;
-use function sprintf;
 use function strip_tags;
 
 class PayFlexV4PosSerializer implements SerializerInterface
@@ -46,7 +45,7 @@ public static function supports(string $gatewayClass): bool
     public function encode(array $data, string $txType): string
     {
         if (PosInterface::TX_TYPE_HISTORY === $txType || PosInterface::TX_TYPE_ORDER_HISTORY === $txType) {
-            throw new DomainException(sprintf('Serialization of the transaction %s is not supported', $txType));
+            throw new DomainException(\sprintf('Serialization of the transaction %s is not supported', $txType));
         }
 
         if (PosInterface::TX_TYPE_STATUS === $txType) {

tests/Unit/Crypt/PayFlexCP4CryptTest.php

@@ -17,9 +17,6 @@
  */
 class PayFlexCP4CryptTest extends TestCase
 {
-    /** @var array<string, string>|array<string, float> */
-    public array $order = [];
-
     public PayFlexCPV4Crypt $crypt;
 
     private PayFlexAccount $account;

tests/Unit/DataMapper/RequestDataMapper/GarantiPosRequestDataMapperTest.php

@@ -31,7 +31,7 @@ class GarantiPosRequestDataMapperTest extends TestCase
 
     private GarantiPosRequestDataMapper $requestDataMapper;
 
-    private $order;
+    private array $order;
 
     private $config;
 

tests/Unit/DataMapper/ResponseDataMapper/PayFlexV4PosResponseDataMapperTest.php

@@ -470,7 +470,7 @@ public static function paymentDataProvider(): iterable
     public static function threeDPaymentDataProvider(): array
     {
         return [
-            'authFail1'                 => [
+            '3d_auth_fail'                 => [
                 'order'              => [],
                 'txType'             => PosInterface::TX_TYPE_PAY_AUTH,
                 'threeDResponseData' => [
@@ -517,7 +517,7 @@ public static function threeDPaymentDataProvider(): array
                     'installment_count'    => 0,
                 ],
             ],
-            'auth_success_payment_fail' => [
+            '3d_auth_success_payment_fail' => [
                 'order'              => [],
                 'txType'             => PosInterface::TX_TYPE_PAY_PRE_AUTH,
                 'threeDResponseData' => [
@@ -584,7 +584,7 @@ public static function threeDPaymentDataProvider(): array
                     'installment_count'    => 0,
                 ],
             ],
-            'success1'                  => [
+            'success1'                     => [
                 'order'              => [],
                 'txType'             => PosInterface::TX_TYPE_PAY_PRE_AUTH,
                 'threeDResponseData' => [