Publication 2.4.2 (#75)

- fixed issue with di:compile - changed config section
vippsas · Oct 19, 2020 · d7c5d77 · d7c5d77
1 parent 5037e52
commit d7c5d77
Show file tree

Hide file tree

Showing 26 changed files with 43 additions and 343 deletions.
diff --git a/Controller/Payment/Callback.php b/Controller/Payment/Callback.php
@@ -32,7 +32,7 @@
 use Vipps\Payment\Gateway\Command\PaymentDetailsProvider;
 use Vipps\Payment\Model\Gdpr\Compliance;
 use Vipps\Payment\Model\TransactionProcessor;
-use Zend\Http\Response as ZendResponse;
+use Laminas\Http\Response as Response;
 
 /**
  * Class Callback
@@ -122,15 +122,15 @@ public function execute()
             $this->transactionProcessor->process($this->getVippsQuote($requestData), $transaction);
 
             /** @var Json $result */
-            $result->setHttpResponseCode(ZendResponse::STATUS_CODE_200);
-            $result->setData(['status' => ZendResponse::STATUS_CODE_200, 'message' => 'success']);
+            $result->setHttpResponseCode(Response::STATUS_CODE_200);
+            $result->setData(['status' => Response::STATUS_CODE_200, 'message' => 'success']);
         } catch (\Exception $e) {
             $orderId = $requestData['orderId'] ?? 'Missing';
             $message = 'OrderID: ' . $orderId . ' . Exception message: ' . $e->getMessage();
             $this->logger->critical($message);
-            $result->setHttpResponseCode(ZendResponse::STATUS_CODE_500);
+            $result->setHttpResponseCode(Response::STATUS_CODE_500);
             $result->setData([
-                'status' => ZendResponse::STATUS_CODE_500,
+                'status' => Response::STATUS_CODE_500,
                 'message' => $message
             ]);
         } finally {

diff --git a/Controller/Payment/ConsentRemoval.php b/Controller/Payment/ConsentRemoval.php
@@ -21,7 +21,7 @@
 use Magento\Framework\Controller\Result\Json;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Controller\ResultInterface;
-use Zend\Http\Response as ZendResponse;
+use Laminas\Http\Response;
 
 /**
  * Class ConsentRemoval
@@ -38,7 +38,7 @@ public function execute()
     {
         $result = $this->resultFactory->create(ResultFactory::TYPE_JSON);
         /** @var Json $result */
-        $result->setHttpResponseCode(ZendResponse::STATUS_CODE_200);
+        $result->setHttpResponseCode(Response::STATUS_CODE_200);
 
         return $result;
     }

diff --git a/Controller/Payment/ShippingDetails.php b/Controller/Payment/ShippingDetails.php
@@ -37,7 +37,7 @@
 use Vipps\Payment\Model\Quote\AddressUpdater;
 use Vipps\Payment\Model\QuoteLocator;
 use Vipps\Payment\Model\Quote\ShippingMethodValidator;
-use Zend\Http\Response as ZendResponse;
+use Laminas\Http\Response;
 
 /**
  * Class ShippingDetails
@@ -177,20 +177,20 @@ public function execute()
                     'shippingMethodId' => $methodFullCode,
                 ];
             }
-            $result->setHttpResponseCode(ZendResponse::STATUS_CODE_200);
+            $result->setHttpResponseCode(Response::STATUS_CODE_200);
             $result->setData($responseData);
         } catch (LocalizedException $e) {
             $this->logger->critical($this->enlargeMessage($e));
-            $result->setHttpResponseCode(ZendResponse::STATUS_CODE_500);
+            $result->setHttpResponseCode(Response::STATUS_CODE_500);
             $result->setData([
-                'status' => ZendResponse::STATUS_CODE_500,
+                'status' => Response::STATUS_CODE_500,
                 'message' => $e->getMessage()
             ]);
         } catch (\Exception $e) {
             $this->logger->critical($this->enlargeMessage($e));
-            $result->setHttpResponseCode(ZendResponse::STATUS_CODE_500);
+            $result->setHttpResponseCode(Response::STATUS_CODE_500);
             $result->setData([
-                'status' => ZendResponse::STATUS_CODE_500,
+                'status' => Response::STATUS_CODE_500,
                 'message' => __('An error occurred during Shipping Details processing.')
             ]);
         } finally {
@@ -265,4 +265,4 @@ public function validateForCsrf(RequestInterface $request): ?bool //@codingStand
     {
         return true;
     }
-}
+}
diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md
@@ -89,7 +89,7 @@ Vipps Payments configuration is divided by sections. It helps to quickly find an
 
 ![Screenshot of Vipps Settings](docs/images/vipps_method.png)
 
-Please ensure you check all configuration settings prior to using Vipps Payment. Pay attention to the Vipps Basic Settings section, namely `Saleunit Serial Number`, `Client ID`, `Client Secret`, `Subscription Key 1`, `Subscription Key 2`.
+Please ensure you check all configuration settings prior to using Vipps Payment. Pay attention to the Vipps Basic Settings section, namely `Saleunit Serial Number`, `Client ID`, `Client Secret`, `Subscription Key`.
 
 For information about how to find the above values, see the [Vipps Developer Portal documentation](https://github.com/vippsas/vipps-developers/blob/master/vipps-developer-portal-getting-started.md).
 

diff --git a/Gateway/Command/GatewayCommand.php b/Gateway/Command/GatewayCommand.php
@@ -32,7 +32,7 @@
 use Vipps\Payment\Gateway\Exception\ExceptionFactory;
 use Vipps\Payment\Gateway\Exception\VippsException;
 use Vipps\Payment\Model\Profiling\ProfilerInterface;
-use Zend\Http\Response as ZendResponse;
+use Laminas\Http\Response;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -143,7 +143,7 @@ public function execute(array $commandSubject)
 
         $result = $this->client->placeRequest($transfer);
 
-        /** @var ZendResponse $response */
+        /** @var Response $response */
         $response = $result['response'];
         $responseBody = $this->jsonDecoder->decode($response->getContent());
 

diff --git a/Gateway/Config/CanVoidHandler.php b/Gateway/Config/CanVoidHandler.php
diff --git a/Gateway/Http/Client/Curl.php b/Gateway/Http/Client/Curl.php
@@ -22,8 +22,8 @@
 use Magento\Payment\Gateway\Http\TransferInterface;
 use Vipps\Payment\Gateway\Exception\AuthenticationException;
 use Vipps\Payment\Model\TokenProviderInterface;
-use Zend\Http\Request;
-use Zend\Http\Response as ZendResponse;
+use Laminas\Http\Request;
+use Laminas\Http\Response;
 use Psr\Log\LoggerInterface;
 use Vipps\Payment\Model\ModuleMetadataInterface;
 
@@ -101,7 +101,7 @@ public function placeRequest(TransferInterface $transfer)
     {
         try {
             $response = $this->place($transfer);
-            if ($response->getStatusCode() == ZendResponse::STATUS_CODE_401) {
+            if ($response->getStatusCode() == Response::STATUS_CODE_401) {
                 $this->tokenProvider->regenerate();
                 $response = $this->place($transfer);
             }
@@ -116,7 +116,7 @@ public function placeRequest(TransferInterface $transfer)
     /**
      * @param TransferInterface $transfer
      *
-     * @return ZendResponse
+     * @return Response
      * @throws AuthenticationException
      */
     private function place(TransferInterface $transfer)
@@ -146,10 +146,8 @@ private function place(TransferInterface $transfer)
                 $requestHeaders,
                 $this->jsonEncoder->encode($transfer->getBody())
             );
-            $responseSting = $adapter->read();
-            $response = ZendResponse::fromString($responseSting);
 
-            return $response;
+            return Response::fromString($adapter->read());
         } finally {
             $adapter ? $adapter->close() : null;
         }
@@ -170,7 +168,7 @@ private function getHeaders($headers)
                 self::HEADER_PARAM_X_REQUEST_ID => '',
                 self::HEADER_PARAM_X_SOURCE_ADDRESS => '',
                 self::HEADER_PARAM_X_TIMESTAMP => '',
-                self::HEADER_PARAM_SUBSCRIPTION_KEY => $this->config->getValue('subscription_key2'),
+                self::HEADER_PARAM_SUBSCRIPTION_KEY => $this->config->getValue('subscription_key1'),
             ],
             $headers
         );

diff --git a/INSTALL.md b/INSTALL.md
@@ -59,7 +59,7 @@ Vipps Payments configuration is divided by sections. It helps to quickly find an
 
 ![Screenshot of Vipps Settings](docs/images/vipps_method.png)
 
-Please ensure you check all configuration settings prior to using Vipps Payment. Pay attention to the Vipps Basic Settings section, namely `Saleunit Serial Number`, `Client ID`, `Client Secret`, `Subscription Key 1`, `Subscription Key 2`.
+Please ensure you check all configuration settings prior to using Vipps Payment. Pay attention to the Vipps Basic Settings section, namely `Saleunit Serial Number`, `Client ID`, `Client Secret`, `Subscription Key`.
 
 For information about how to find the above values, see the [Vipps Developer Portal documentation](https://github.com/vippsas/vipps-developers/blob/master/vipps-developer-portal-getting-started.md).
 

diff --git a/Model/Profiling/Profiler.php b/Model/Profiling/Profiler.php
@@ -22,7 +22,7 @@
 use Vipps\Payment\Api\Profiling\Data\ItemInterfaceFactory;
 use Vipps\Payment\Api\Profiling\ItemRepositoryInterface;
 
-use Zend\Http\Response;
+use Laminas\Http\Response;
 use Magento\Framework\Json\DecoderInterface;
 use Vipps\Payment\Model\Gdpr\Compliance;
 

diff --git a/Model/Profiling/ProfilerInterface.php b/Model/Profiling/ProfilerInterface.php
@@ -17,7 +17,7 @@
 
 use Magento\Payment\Gateway\Http\TransferInterface;
 use Vipps\Payment\Api\Profiling\Data\ItemInterface;
-use Zend\Http\Response;
+use Laminas\Http\Response;
 
 interface ProfilerInterface
 {

diff --git a/Model/TokenProvider.php b/Model/TokenProvider.php
@@ -194,6 +194,7 @@ private function readJwt()
             $this->logger->critical($e->getMessage());
             throw new AuthenticationException(__('Can\'t retrieve access token from Vipps.'));
         }
+
         return $jwt;
     }
 

diff --git a/Observer/AvailabilityByShippingMethod.php b/Observer/AvailabilityByShippingMethod.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright Vipps
+ * Copyright 2020 Vipps
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
  * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
@@ -15,7 +15,8 @@
  */
 namespace Vipps\Payment\Observer;
 
-use Magento\Framework\Event\{Observer, ObserverInterface};
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Quote\Model\Quote;
 use Vipps\Payment\Model\Quote\ShippingMethodValidator;

diff --git a/Plugin/Config/Model/Config.php b/Plugin/Config/Model/Config.php
@@ -32,7 +32,7 @@ class Config
      * @var array
      */
     private static $encryptedFields = [
-        'client_id', 'merchant_serial_number', 'client_secret', 'subscription_key1', 'subscription_key2'
+        'client_id', 'merchant_serial_number', 'client_secret', 'subscription_key1'
     ];
 
     /**

diff --git a/Plugin/Klarna/Kco/Model/Api/Builder/KasperPlugin.php b/Plugin/Klarna/Kco/Model/Api/Builder/KasperPlugin.php
-Original file line number
+Diff line change
@@ Expand Up / @@ -194,6 +194,7 @@ private function readJwt() @@
                 $this->logger->critical($e->getMessage());
                 throw new AuthenticationException(__('Can\'t retrieve access token from Vipps.'));
             }
             return $jwt;
         }
@@ Expand Down @@