Merge pull request #234 from mewebstudio/working-on-test-coverage

Working on test coverage
mewebstudio · Sep 24, 2024 · 11d97a2 · 11d97a2
2 parents 5b9b15a + c7cac71
commit 11d97a2
Show file tree

Hide file tree

Showing 42 changed files with 1,640 additions and 301 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -3,6 +3,7 @@ root = true
 
 # Unix-style newlines with a newline ending every file
 [*]
+charset = utf-8
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
@@ -11,5 +12,10 @@ trim_trailing_whitespace = true
 indent_style = space
 indent_size = 4
 
+ij_php_align_assignments = true
+ij_php_align_class_constants = true
+ij_php_align_key_value_pairs = true
+ij_php_phpdoc_param_spaces_between_tag_and_type = 1
+
 [*.md]
 max_line_length = 80
diff --git a/composer.json b/composer.json
@@ -49,6 +49,9 @@
         "symfony/http-client": "^5.4",
         "symfony/var-dumper": "^5.1"
     },
+    "suggest": {
+        "ext-soap": "KuveytPos ile iptal/iade gibi ödeme olmayan işlemleri yapacaksanız."
+    },
     "config": {
         "sort-packages": true,
         "allow-plugins": {

diff --git a/src/Crypt/PosNetV1PosCrypt.php b/src/Crypt/PosNetV1PosCrypt.php
@@ -26,13 +26,15 @@ public function create3DHash(AbstractPosAccount $posAccount, array $requestData,
         $hashData = [
             $posAccount->getClientId(),
             $posAccount->getTerminalId(),
-            $requestData['CardNo'],
-            $requestData['Cvv'],
-            $requestData['ExpiredDate'],
+            // no card data for 3D host payment
+            $requestData['CardNo'] ?? null,
+            $requestData['Cvv'] ?? null,
+            $requestData['ExpiredDate'] ?? null,
+
             $requestData['Amount'],
             $posAccount->getStoreKey(),
         ];
-        $hashStr  = implode(static::HASH_SEPARATOR, $hashData);
+        $hashStr  = \implode(static::HASH_SEPARATOR, $hashData);
 
         return $this->hashString($hashStr);
     }

diff --git a/src/DataMapper/RequestDataMapper/PosNetV1PosRequestDataMapper.php b/src/DataMapper/RequestDataMapper/PosNetV1PosRequestDataMapper.php
@@ -382,7 +382,8 @@ public function create3DFormData(AbstractPosAccount $posAccount, array $order, s
                  * UseOOS alanını 1 yaparak bankanın ortak ödeme sayfasının açılmasını ve
                  * bu ortak ödeme sayfası ile müşterinin kart bilgilerini girmesini sağlatabilir.
                  */
-                'UseOOS' => '1',
+                'UseOOS'    => '1',
+                'MacParams' => 'MerchantNo:TerminalNo:Amount',
             ];
         }
 

diff --git a/src/DataMapper/ResponseDataMapper/PosNetResponseDataMapper.php b/src/DataMapper/ResponseDataMapper/PosNetResponseDataMapper.php
@@ -154,15 +154,15 @@ public function map3DPaymentData(array $raw3DAuthResponseData, ?array $rawPaymen
      */
     public function map3DPayResponseData(array $raw3DAuthResponseData, string $txType, array $order): array
     {
-        return $this->map3DPaymentData($raw3DAuthResponseData, $raw3DAuthResponseData, $txType, $order);
+        throw new NotImplementedException();
     }
 
     /**
      * {@inheritdoc}
      */
     public function map3DHostResponseData(array $raw3DAuthResponseData, string $txType, array $order): array
     {
-        return $this->map3DPayResponseData($raw3DAuthResponseData, $txType, $order);
+        throw new NotImplementedException();
     }
 
     /**

diff --git a/src/DataMapper/ResponseDataMapper/PosNetV1PosResponseDataMapper.php b/src/DataMapper/ResponseDataMapper/PosNetV1PosResponseDataMapper.php
@@ -158,15 +158,15 @@ public function map3DPaymentData(array $raw3DAuthResponseData, ?array $rawPaymen
      */
     public function map3DPayResponseData(array $raw3DAuthResponseData, string $txType, array $order): array
     {
-        return $this->map3DPaymentData($raw3DAuthResponseData, $raw3DAuthResponseData, $txType, $order);
+        throw new NotImplementedException();
     }
 
     /**
      * {@inheritdoc}
      */
     public function map3DHostResponseData(array $raw3DAuthResponseData, string $txType, array $order): array
     {
-        return $this->map3DPayResponseData($raw3DAuthResponseData, $txType, $order);
+        throw new NotImplementedException();
     }
 
     /**

diff --git a/src/Gateways/AbstractGateway.php b/src/Gateways/AbstractGateway.php
@@ -238,7 +238,8 @@ public function makeRegularPayment(array $order, CreditCardInterface $creditCard
             $order,
             PosInterface::MODEL_NON_SECURE
         );
-        $this->eventDispatcher->dispatch($event);
+        /** @var RequestDataPreparedEvent $event */
+        $event = $this->eventDispatcher->dispatch($event);
         if ($requestData !== $event->getRequestData()) {
             $this->logger->debug('Request data is changed via listeners', [
                 'txType'      => $event->getTxType(),
@@ -282,7 +283,8 @@ public function makeRegularPostPayment(array $order): PosInterface
             $order,
             PosInterface::MODEL_NON_SECURE
         );
-        $this->eventDispatcher->dispatch($event);
+        /** @var RequestDataPreparedEvent $event */
+        $event = $this->eventDispatcher->dispatch($event);
         if ($requestData !== $event->getRequestData()) {
             $this->logger->debug('Request data is changed via listeners', [
                 'txType'      => $event->getTxType(),
@@ -325,7 +327,8 @@ public function refund(array $order): PosInterface
             $order,
             PosInterface::MODEL_NON_SECURE
         );
-        $this->eventDispatcher->dispatch($event);
+        /** @var RequestDataPreparedEvent $event */
+        $event = $this->eventDispatcher->dispatch($event);
         if ($requestData !== $event->getRequestData()) {
             $this->logger->debug('Request data is changed via listeners', [
                 'txType'      => $event->getTxType(),
@@ -368,7 +371,8 @@ public function cancel(array $order): PosInterface
             $order,
             PosInterface::MODEL_NON_SECURE
         );
-        $this->eventDispatcher->dispatch($event);
+        /** @var RequestDataPreparedEvent $event */
+        $event = $this->eventDispatcher->dispatch($event);
         if ($requestData !== $event->getRequestData()) {
             $this->logger->debug('Request data is changed via listeners', [
                 'txType'      => $event->getTxType(),
@@ -411,7 +415,8 @@ public function status(array $order): PosInterface
             $order,
             PosInterface::MODEL_NON_SECURE
         );
-        $this->eventDispatcher->dispatch($event);
+        /** @var RequestDataPreparedEvent $event */
+        $event = $this->eventDispatcher->dispatch($event);
         if ($requestData !== $event->getRequestData()) {
             $this->logger->debug('Request data is changed via listeners', [
                 'txType'      => $event->getTxType(),
@@ -450,7 +455,8 @@ public function history(array $data): PosInterface
             $data,
             PosInterface::MODEL_NON_SECURE
         );
-        $this->eventDispatcher->dispatch($event);
+        /** @var RequestDataPreparedEvent $event */
+        $event = $this->eventDispatcher->dispatch($event);
         if ($requestData !== $event->getRequestData()) {
             $this->logger->debug('Request data is changed via listeners', [
                 'txType'      => $event->getTxType(),
@@ -489,7 +495,8 @@ public function orderHistory(array $order): PosInterface
             $order,
             PosInterface::MODEL_NON_SECURE
         );
-        $this->eventDispatcher->dispatch($event);
+        /** @var RequestDataPreparedEvent $event */
+        $event = $this->eventDispatcher->dispatch($event);
         if ($requestData !== $event->getRequestData()) {
             $this->logger->debug('Request data is changed via listeners', [
                 'txType'      => $event->getTxType(),

diff --git a/src/Gateways/AkbankPos.php b/src/Gateways/AkbankPos.php
@@ -45,14 +45,16 @@ class AkbankPos extends AbstractGateway
 
     /**
      * @inheritDoc
+     *
+     * @throws \InvalidArgumentException when transaction type is not provided
      */
     public function getApiURL(string $txType = null, string $paymentModel = null, ?string $orderTxType = null): string
     {
         if (null !== $txType) {
             return parent::getApiURL().'/'.$this->getRequestURIByTransactionType($txType);
         }
 
-        return parent::getApiURL();
+        throw new \InvalidArgumentException('Transaction type is required to generate API URL');
     }
 
     /** @return AkbankPosAccount */
@@ -93,7 +95,8 @@ public function make3DPayment(Request $request, array $order, string $txType, Cr
             $order,
             PosInterface::MODEL_3D_SECURE
         );
-        $this->eventDispatcher->dispatch($event);
+        /** @var RequestDataPreparedEvent $event */
+        $event = $this->eventDispatcher->dispatch($event);
         if ($requestData !== $event->getRequestData()) {
             $this->logger->debug('Request data is changed via listeners', [
                 'txType'      => $event->getTxType(),

diff --git a/src/Gateways/EstPos.php b/src/Gateways/EstPos.php
@@ -92,7 +92,8 @@ public function make3DPayment(Request $request, array $order, string $txType, Cr
             $order,
             PosInterface::MODEL_3D_SECURE
         );
-        $this->eventDispatcher->dispatch($event);
+        /** @var RequestDataPreparedEvent $event */
+        $event = $this->eventDispatcher->dispatch($event);
         if ($requestData !== $event->getRequestData()) {
             $this->logger->debug('Request data is changed via listeners', [
                 'txType'      => $event->getTxType(),

diff --git a/src/Gateways/GarantiPos.php b/src/Gateways/GarantiPos.php
@@ -85,7 +85,8 @@ public function make3DPayment(Request $request, array $order, string $txType, Cr
             $order,
             PosInterface::MODEL_3D_SECURE
         );
-        $this->eventDispatcher->dispatch($event);
+        /** @var RequestDataPreparedEvent $event */
+        $event = $this->eventDispatcher->dispatch($event);
         if ($requestData !== $event->getRequestData()) {
             $this->logger->debug('Request data is changed via listeners', [
                 'txType'      => $event->getTxType(),

diff --git a/src/Gateways/InterPos.php b/src/Gateways/InterPos.php
@@ -92,7 +92,8 @@ public function make3DPayment(Request $request, array $order, string $txType, Cr
             $order,
             PosInterface::MODEL_3D_SECURE
         );
-        $this->eventDispatcher->dispatch($event);
+        /** @var RequestDataPreparedEvent $event */
+        $event = $this->eventDispatcher->dispatch($event);
         if ($requestData !== $event->getRequestData()) {
             $this->logger->debug('Request data is changed via listeners', [
                 'txType'      => $event->getTxType(),

diff --git a/src/Gateways/KuveytPos.php b/src/Gateways/KuveytPos.php
@@ -67,6 +67,7 @@ public function getAccount(): AbstractPosAccount
      * @inheritDoc
      *
      * @throws UnsupportedTransactionTypeException
+     * @throws \InvalidArgumentException when transaction type is not provided
      */
     public function getApiURL(string $txType = null, string $paymentModel = null, ?string $orderTxType = null): string
     {
@@ -87,7 +88,7 @@ public function getApiURL(string $txType = null, string $paymentModel = null, ?s
             return parent::getApiURL().'/'.$this->getRequestURIByTransactionType($txType, $paymentModel);
         }
 
-        return parent::getApiURL();
+        throw new \InvalidArgumentException('Transaction type is required to generate API URL');
     }
 
     /**
@@ -178,7 +179,8 @@ public function make3DPayment(Request $request, array $order, string $txType, Cr
             $order,
             PosInterface::MODEL_3D_SECURE
         );
-        $this->eventDispatcher->dispatch($event);
+        /** @var RequestDataPreparedEvent $event */
+        $event = $this->eventDispatcher->dispatch($event);
         if ($requestData !== $event->getRequestData()) {
             $this->logger->debug('Request data is changed via listeners', [
                 'txType'      => $event->getTxType(),
@@ -345,7 +347,8 @@ private function getCommon3DFormData(KuveytPosAccount $kuveytPosAccount, array $
             $order,
             $paymentModel
         );
-        $this->eventDispatcher->dispatch($event);
+        /** @var RequestDataPreparedEvent $event */
+        $event = $this->eventDispatcher->dispatch($event);
         if ($requestData !== $event->getRequestData()) {
             $this->logger->debug('Request data is changed via listeners', [
                 'txType'      => $event->getTxType(),

diff --git a/src/Gateways/PayFlexCPV4Pos.php b/src/Gateways/PayFlexCPV4Pos.php
@@ -97,7 +97,8 @@ public function make3DPayPayment(Request $request, array $order, string $txType)
             $order,
             PosInterface::MODEL_3D_PAY
         );
-        $this->eventDispatcher->dispatch($event);
+        /** @var RequestDataPreparedEvent $event */
+        $event = $this->eventDispatcher->dispatch($event);
         if ($requestData !== $event->getRequestData()) {
             $this->logger->debug('Request data is changed via listeners', [
                 'txType'      => $event->getTxType(),
@@ -254,7 +255,8 @@ private function registerPayment(array $order, string $txType, string $paymentMo
             $order,
             $paymentModel
         );
-        $this->eventDispatcher->dispatch($event);
+        /** @var RequestDataPreparedEvent $event */
+        $event = $this->eventDispatcher->dispatch($event);
         if ($requestData !== $event->getRequestData()) {
             $this->logger->debug('Request data is changed via listeners', [
                 'txType'      => $event->getTxType(),

diff --git a/src/Gateways/PayFlexV4Pos.php b/src/Gateways/PayFlexV4Pos.php
@@ -87,7 +87,8 @@ public function make3DPayment(Request $request, array $order, string $txType, Cr
             $order,
             PosInterface::MODEL_3D_SECURE
         );
-        $this->eventDispatcher->dispatch($event);
+        /** @var RequestDataPreparedEvent $event */
+        $event = $this->eventDispatcher->dispatch($event);
         if ($requestData !== $event->getRequestData()) {
             $this->logger->debug('Request data is changed via listeners', [
                 'txType'      => $event->getTxType(),
@@ -231,7 +232,8 @@ private function sendEnrollmentRequest(array $order, CreditCardInterface $credit
             $order,
             $paymentModel
         );
-        $this->eventDispatcher->dispatch($event);
+        /** @var RequestDataPreparedEvent $event */
+        $event = $this->eventDispatcher->dispatch($event);
         if ($requestData !== $event->getRequestData()) {
             $this->logger->debug('Request data is changed via listeners', [
                 'txType'      => $event->getTxType(),

diff --git a/src/Gateways/PayForPos.php b/src/Gateways/PayForPos.php
@@ -86,7 +86,8 @@ public function make3DPayment(Request $request, array $order, string $txType, Cr
             $order,
             PosInterface::MODEL_3D_SECURE
         );
-        $this->eventDispatcher->dispatch($event);
+        /** @var RequestDataPreparedEvent $event */
+        $event = $this->eventDispatcher->dispatch($event);
         if ($requestData !== $event->getRequestData()) {
             $this->logger->debug('Request data is changed via listeners', [
                 'txType'      => $event->getTxType(),
@@ -131,12 +132,7 @@ public function make3DHostPayment(Request $request, array $order, string $txType
     }
 
     /**
-     * Refund Order
-     * refund amount should be exactly the same with order amount.
-     * otherwise operation will be rejected
-     *
-     * Warning: You can not use refund for purchases made at the same date.
-     * Instead, you need to use cancel.
+     * Satış işlemi ile farklı batchtlerde olmalıdır.
      *
      * @inheritDoc
      */

diff --git a/src/Gateways/PosNet.php b/src/Gateways/PosNet.php
@@ -78,7 +78,8 @@ public function make3DPayment(Request $request, array $order, string $txType, Cr
             $order,
             PosInterface::MODEL_3D_SECURE
         );
-        $this->eventDispatcher->dispatch($event);
+        /** @var RequestDataPreparedEvent $event */
+        $event = $this->eventDispatcher->dispatch($event);
         if ($requestData !== $event->getRequestData()) {
             $this->logger->debug('Request data is changed via listeners', [
                 'txType'      => $event->getTxType(),
@@ -118,7 +119,8 @@ public function make3DPayment(Request $request, array $order, string $txType, Cr
             $order,
             PosInterface::MODEL_3D_SECURE
         );
-        $this->eventDispatcher->dispatch($event);
+        /** @var RequestDataPreparedEvent $event */
+        $event = $this->eventDispatcher->dispatch($event);
         if ($requestData !== $event->getRequestData()) {
             $this->logger->debug('Request data is changed via listeners', [
                 'txType'      => $event->getTxType(),
@@ -266,7 +268,8 @@ private function getOosTransactionData(array $order, string $txType, string $pay
             $order,
             $paymentModel
         );
-        $this->eventDispatcher->dispatch($event);
+        /** @var RequestDataPreparedEvent $event */
+        $event = $this->eventDispatcher->dispatch($event);
         if ($requestData !== $event->getRequestData()) {
             $this->logger->debug('Request data is changed via listeners', [
                 'txType'      => $event->getTxType(),

diff --git a/src/Gateways/PosNetV1Pos.php b/src/Gateways/PosNetV1Pos.php
@@ -60,14 +60,15 @@ public function getAccount(): AbstractPosAccount
      * @inheritDoc
      *
      * @throws UnsupportedTransactionTypeException
+     * @throws \InvalidArgumentException when transaction type is not provided
      */
     public function getApiURL(string $txType = null, string $paymentModel = null, ?string $orderTxType = null): string
     {
         if (null !== $txType) {
             return parent::getApiURL().'/'.$this->requestDataMapper->mapTxType($txType);
         }
 
-        return parent::getApiURL();
+        throw new \InvalidArgumentException('Transaction type is required to generate API URL');
     }
 
     /**
@@ -98,7 +99,8 @@ public function make3DPayment(Request $request, array $order, string $txType, Cr
             $order,
             PosInterface::MODEL_3D_SECURE
         );
-        $this->eventDispatcher->dispatch($event);
+        /** @var RequestDataPreparedEvent $event */
+        $event = $this->eventDispatcher->dispatch($event);
         if ($requestData !== $event->getRequestData()) {
             $this->logger->debug('Request data is changed via listeners', [
                 'txType'      => $event->getTxType(),