Fixed di:compile issues (#84)

- fixed issue with dependency generations
vippsas · Dec 3, 2020 · e02f3d2 · e02f3d2
1 parent f140477
commit e02f3d2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/Controller/Payment/Klarna/InitRegular.php b/Controller/Payment/Klarna/InitRegular.php
@@ -31,7 +31,7 @@
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Api\Data\CartInterface;
 use Magento\Quote\Model\Quote;
-use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\Quote\Model\QuoteIdMaskFactory;
 use Psr\Log\LoggerInterface;
 use Vipps\Payment\Api\CommandManagerInterface;
 use Vipps\Payment\Gateway\Request\Initiate\InitiateBuilderInterface;
@@ -92,9 +92,9 @@ class InitRegular extends Action
     private $paymentInformationManagement;
 
     /**
-     * @var QuoteIdToMaskedQuoteIdInterface
+     * @var QuoteIdMaskFactory
      */
-    private $quoteIdToMaskedQuoteId;
+    private $quoteIdMaskFactory;
 
     /**
      * InitRegular constructor.
@@ -109,7 +109,7 @@ class InitRegular extends Action
      * @param CartManagementInterface $cartManagement
      * @param GuestPaymentInformationManagementInterface $guestPaymentInformationManagement
      * @param PaymentInformationManagementInterface $paymentInformationManagement
-     * @param QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedQuoteId
+     * @param QuoteIdMaskFactory $quoteIdMaskFactory
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -124,7 +124,7 @@ public function __construct(
         CartManagementInterface $cartManagement,
         GuestPaymentInformationManagementInterface $guestPaymentInformationManagement,
         PaymentInformationManagementInterface $paymentInformationManagement,
-        QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedQuoteId
+        QuoteIdMaskFactory $quoteIdMaskFactory
     ) {
         parent::__construct($context);
         $this->commandManager = $commandManager;
@@ -136,7 +136,7 @@ public function __construct(
         $this->cartManagement = $cartManagement;
         $this->guestPaymentInformationManagement = $guestPaymentInformationManagement;
         $this->paymentInformationManagement = $paymentInformationManagement;
-        $this->quoteIdToMaskedQuoteId = $quoteIdToMaskedQuoteId;
+        $this->quoteIdMaskFactory = $quoteIdMaskFactory;
     }
 
     /**
@@ -204,17 +204,17 @@ private function placeOrder(CartInterface $quote)
 
         $this->setCheckoutMethod($quote);
 
-        $maskedQuoteId = $this->quoteIdToMaskedQuoteId->execute($quote->getId());
+        $quoteIdMask = $this->quoteIdMaskFactory->create()->load($quote->getId(), 'quote_id');
         switch ($quote->getCheckoutMethod()) {
             case Onepage::METHOD_CUSTOMER:
                 $this->paymentInformationManagement->savePaymentInformationAndPlaceOrder(
-                    $maskedQuoteId,
+                    $quoteIdMask->getMaskedId(),
                     $quote->getPayment()
                 );
                 break;
             case Onepage::METHOD_GUEST:
                 $this->guestPaymentInformationManagement->savePaymentInformationAndPlaceOrder(
-                    $maskedQuoteId,
+                    $quoteIdMask->getMaskedId(),
                     $quote->getCustomerEmail(),
                     $quote->getPayment()
                 );

diff --git a/Model/LockManagerInterface.php b/Model/LockManagerInterface.php
@@ -31,7 +31,7 @@ interface LockManagerInterface
      * @return bool
      * @api
      */
-    public function lock(string $name, int $timeout = -1): bool;
+    public function lock(string $name, int $timeout = -1);
 
     /**
      * Releases a lock
@@ -40,7 +40,7 @@ public function lock(string $name, int $timeout = -1): bool;
      * @return bool
      * @api
      */
-    public function unlock(string $name): bool;
+    public function unlock(string $name);
 
     /**
      * Tests if lock is set
@@ -49,5 +49,5 @@ public function unlock(string $name): bool;
      * @return bool
      * @api
      */
-    public function isLocked(string $name): bool;
+    public function isLocked(string $name);
 }
diff --git a/Model/ModuleMetadataInterface.php b/Model/ModuleMetadataInterface.php
@@ -37,5 +37,5 @@ interface ModuleMetadataInterface
      *
      * @return array
      */
-    public function addOptionalHeaders(array $headers): array;
+    public function addOptionalHeaders(array $headers);
 }
diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "type": "magento2-module",
     "description": "Vipps Payment Method",
     "license": "proprietary",
-    "version": "2.2.11",
+    "version": "2.2.12",
     "require": {
         "magento/framework": "101.0.*",
         "magento/module-sales": "101.0.*",