ECO-2252: Fix code style issues. [skip ci]

Author: Aleksey Kotsuba

phpstan.json

@@ -1,3 +1,3 @@
 {
-  "defaultLevel": 6
-}
+  "defaultLevel": 5
+}

phpstan.neon

@@ -1,9 +1,6 @@
 parameters:
     bootstrap: %rootDir%/../../../phpstan-bootstrap.php
 
-    ignoreErrors:
-    - '#Call to an undefined method .+LocatorLocatorInterface::.+\(\).#'
-
 services:
     -
         class: PhpStan\DynamicType\FacadeDynamicTypeExtension

src/SprykerEco/Client/Heidelpay/HeidelpayFactory.php

@@ -75,7 +75,7 @@ public function createExternalResponseValidator(): CreditCardRegistrationRespons
     /**
      * @return \SprykerEco\Client\Heidelpay\Mapper\ApiResponseToRegistrationResponseTransferInterface
      */
-    protected function createApiResponseToRegistrationResponseTransferMapper(): ApiResponseToRegistrationResponseTransferInterface
+    public function createApiResponseToRegistrationResponseTransferMapper(): ApiResponseToRegistrationResponseTransferInterface
     {
         return new ApiResponseToRegistrationRequestTransfer();
     }

src/SprykerEco/Client/Heidelpay/Zed/HeidelpayStub.php

@@ -65,9 +65,8 @@ public function getCreditCardPaymentOptions(QuoteTransfer $quoteTransfer): Heide
      *
      * @return \Generated\Shared\Transfer\HeidelpayPaymentProcessingResponseTransfer
      */
-    public function processExternalPaymentResponse(
-        HeidelpayExternalPaymentRequestTransfer $externalPaymentRequestTransfer
-    ): HeidelpayPaymentProcessingResponseTransfer {
+    public function processExternalPaymentResponse(HeidelpayExternalPaymentRequestTransfer $externalPaymentRequestTransfer): HeidelpayPaymentProcessingResponseTransfer
+    {
         /** @var \Generated\Shared\Transfer\HeidelpayPaymentProcessingResponseTransfer $responseTransfer */
         $responseTransfer = $this->zedStub->call(
             static::ZED_GET_PROCESS_EXTERNAL_PAYMENT_RESPONSE,

src/SprykerEco/Client/Heidelpay/Zed/HeidelpayStubInterface.php

@@ -10,8 +10,10 @@
 use Generated\Shared\Transfer\HeidelpayCreditCardPaymentOptionsTransfer;
 use Generated\Shared\Transfer\HeidelpayCreditCardRegistrationTransfer;
 use Generated\Shared\Transfer\HeidelpayExternalPaymentRequestTransfer;
+use Generated\Shared\Transfer\HeidelpayPaymentProcessingResponseTransfer;
 use Generated\Shared\Transfer\HeidelpayRegistrationByIdAndQuoteRequestTransfer;
 use Generated\Shared\Transfer\HeidelpayRegistrationRequestTransfer;
+use Generated\Shared\Transfer\HeidelpayRegistrationSaveResponseTransfer;
 use Generated\Shared\Transfer\HeidelpayTransactionLogTransfer;
 use Generated\Shared\Transfer\QuoteTransfer;
 
@@ -34,11 +36,9 @@ public function getCreditCardPaymentOptions(QuoteTransfer $quoteTransfer): Heide
     /**
      * @param \Generated\Shared\Transfer\HeidelpayExternalPaymentRequestTransfer $externalPaymentRequestTransfer
      *
-     * @return \Generated\Shared\Transfer\HeidelpayPaymentProcessingResponseTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
+     * @return \Generated\Shared\Transfer\HeidelpayPaymentProcessingResponseTransfer
      */
-    public function processExternalPaymentResponse(
-        HeidelpayExternalPaymentRequestTransfer $externalPaymentRequestTransfer
-    );
+    public function processExternalPaymentResponse(HeidelpayExternalPaymentRequestTransfer $externalPaymentRequestTransfer): HeidelpayPaymentProcessingResponseTransfer;
 
     /**
      * @param \Generated\Shared\Transfer\HeidelpayRegistrationByIdAndQuoteRequestTransfer $findRegistrationRequestTransfer
@@ -52,9 +52,7 @@ public function findCreditCardRegistrationByIdAndQuote(
     /**
      * @param \Generated\Shared\Transfer\HeidelpayRegistrationRequestTransfer $registrationRequestTransfer
      *
-     * @return \Generated\Shared\Transfer\HeidelpayRegistrationSaveResponseTransfer|\Spryker\Shared\Kernel\Transfer\TransferInterface
+     * @return \Generated\Shared\Transfer\HeidelpayRegistrationSaveResponseTransfer
      */
-    public function saveCreditCardRegistration(
-        HeidelpayRegistrationRequestTransfer $registrationRequestTransfer
-    );
+    public function saveCreditCardRegistration(HeidelpayRegistrationRequestTransfer $registrationRequestTransfer): HeidelpayRegistrationSaveResponseTransfer;
 }

src/SprykerEco/Yves/Heidelpay/Dependency/Client/HeidelpayToCalculationClientBridge.php

@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * MIT License
+ * For full license information, please view the LICENSE file that was distributed with this source code.
+ */
+
+namespace SprykerEco\Yves\Heidelpay\Dependency\Client;
+
+use Generated\Shared\Transfer\QuoteTransfer;
+
+class HeidelpayToCalculationClientBridge implements HeidelpayToCalculationClientInterface
+{
+    /**
+     * @var \Spryker\Client\Calculation\CalculationClientInterface
+     */
+    protected $calculationClient;
+
+    /**
+     * @param \Spryker\Client\Calculation\CalculationClientInterface $calculationClient
+     */
+    public function __construct($calculationClient)
+    {
+        $this->calculationClient = $calculationClient;
+    }
+
+    /**
+     * @api
+     *
+     * @param \Generated\Shared\Transfer\QuoteTransfer $quoteTransfer
+     *
+     * @return \Generated\Shared\Transfer\QuoteTransfer
+     */
+    public function recalculate(QuoteTransfer $quoteTransfer)
+    {
+        return $this->calculationClient->recalculate($quoteTransfer);
+    }
+}

src/SprykerEco/Yves/Heidelpay/Dependency/Client/HeidelpayToCalculationClientInterface.php

@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * MIT License
+ * For full license information, please view the LICENSE file that was distributed with this source code.
+ */
+
+namespace SprykerEco\Yves\Heidelpay\Dependency\Client;
+
+use Generated\Shared\Transfer\QuoteTransfer;
+
+interface HeidelpayToCalculationClientInterface
+{
+    /**
+     * @api
+     *
+     * @param \Generated\Shared\Transfer\QuoteTransfer $quoteTransfer
+     *
+     * @return \Generated\Shared\Transfer\QuoteTransfer
+     */
+    public function recalculate(QuoteTransfer $quoteTransfer);
+}

src/SprykerEco/Yves/Heidelpay/Dependency/Client/HeidelpayToQuoteClientBridge.php

@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * MIT License
+ * For full license information, please view the LICENSE file that was distributed with this source code.
+ */
+
+namespace SprykerEco\Yves\Heidelpay\Dependency\Client;
+
+use Generated\Shared\Transfer\QuoteTransfer;
+
+class HeidelpayToQuoteClientBridge implements HeidelpayToQuoteClientInterface
+{
+    /**
+     * @var \Spryker\Client\Quote\QuoteClientInterface
+     */
+    protected $quoteClient;
+
+    /**
+     * @param \Spryker\Client\Quote\QuoteClientInterface $quoteClient
+     */
+    public function __construct($quoteClient)
+    {
+        $this->quoteClient = $quoteClient;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @api
+     *
+     * @param \Generated\Shared\Transfer\QuoteTransfer $quoteTransfer
+     *
+     * @return void
+     */
+    public function setQuote(QuoteTransfer $quoteTransfer)
+    {
+        $this->quoteClient->setQuote($quoteTransfer);
+    }
+}

src/SprykerEco/Yves/Heidelpay/Dependency/Client/HeidelpayToQuoteClientInterface.php

@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * MIT License
+ * For full license information, please view the LICENSE file that was distributed with this source code.
+ */
+
+namespace SprykerEco\Yves\Heidelpay\Dependency\Client;
+
+use Generated\Shared\Transfer\QuoteTransfer;
+
+interface HeidelpayToQuoteClientInterface
+{
+    /**
+     * Specification:
+     * - Set quote in session.
+     *
+     * @api
+     *
+     * @param \Generated\Shared\Transfer\QuoteTransfer $quoteTransfer
+     *
+     * @return void
+     */
+    public function setQuote(QuoteTransfer $quoteTransfer);
+}

src/SprykerEco/Yves/Heidelpay/Handler/HeidelpayCreditCardHandler.php

@@ -8,23 +8,23 @@
 namespace SprykerEco\Yves\Heidelpay\Handler;
 
 use Generated\Shared\Transfer\QuoteTransfer;
-use Spryker\Client\Calculation\CalculationClientInterface;
-use Spryker\Client\Quote\QuoteClientInterface;
 use Spryker\Shared\Kernel\Transfer\AbstractTransfer;
 use SprykerEco\Shared\Heidelpay\HeidelpayConfig;
+use SprykerEco\Yves\Heidelpay\Dependency\Client\HeidelpayToCalculationClientInterface;
+use SprykerEco\Yves\Heidelpay\Dependency\Client\HeidelpayToQuoteClientInterface;
 
 class HeidelpayCreditCardHandler extends HeidelpayHandler
 {
     public const PAYMENT_PROVIDER = HeidelpayConfig::PROVIDER_NAME;
     public const CHECKOUT_PARTIAL_SUMMARY_PATH = 'Heidelpay/partial/summary';
 
     /**
-     * @var \Spryker\Client\Calculation\CalculationClientInterface
+     * @var \SprykerEco\Yves\Heidelpay\Dependency\Client\HeidelpayToCalculationClientInterface
      */
     protected $calculationClient;
 
     /**
-     * @var \Spryker\Client\Quote\QuoteClientInterface
+     * @var \SprykerEco\Yves\Heidelpay\Dependency\Client\HeidelpayToQuoteClientInterface
      */
     protected $quoteClient;
 
@@ -39,12 +39,12 @@ class HeidelpayCreditCardHandler extends HeidelpayHandler
     ];
 
     /**
-     * @param \Spryker\Client\Calculation\CalculationClientInterface $calculationClient
-     * @param \Spryker\Client\Quote\QuoteClientInterface $quoteClient
+     * @param \SprykerEco\Yves\Heidelpay\Dependency\Client\HeidelpayToCalculationClientInterface $calculationClient
+     * @param \SprykerEco\Yves\Heidelpay\Dependency\Client\HeidelpayToQuoteClientInterface $quoteClient
      */
     public function __construct(
-        CalculationClientInterface $calculationClient,
-        QuoteClientInterface $quoteClient
+        HeidelpayToCalculationClientInterface $calculationClient,
+        HeidelpayToQuoteClientInterface $quoteClient
     ) {
         $this->calculationClient = $calculationClient;
         $this->quoteClient = $quoteClient;

src/SprykerEco/Yves/Heidelpay/HeidelpayDependencyProvider.php

@@ -9,6 +9,8 @@
 
 use Spryker\Yves\Kernel\AbstractBundleDependencyProvider;
 use Spryker\Yves\Kernel\Container;
+use SprykerEco\Yves\Heidelpay\Dependency\Client\HeidelpayToCalculationClientBridge;
+use SprykerEco\Yves\Heidelpay\Dependency\Client\HeidelpayToQuoteClientBridge;
 
 class HeidelpayDependencyProvider extends AbstractBundleDependencyProvider
 {
@@ -23,7 +25,10 @@ class HeidelpayDependencyProvider extends AbstractBundleDependencyProvider
      */
     public function provideDependencies(Container $container): Container
     {
-        $container = $this->provideClients($container);
+        $container = parent::provideDependencies($container);
+        $container = $this->addHeidelpayClient($container);
+        $container = $this->addQuoteClient($container);
+        $container = $this->addCalculationClient($container);
 
         return $container;
     }
@@ -33,18 +38,38 @@ public function provideDependencies(Container $container): Container
      *
      * @return \Spryker\Yves\Kernel\Container
      */
-    protected function provideClients(Container $container): Container
+    protected function addHeidelpayClient(Container $container): Container
     {
         $container[static::CLIENT_HEIDELPAY] = function (Container $container) {
             return $container->getLocator()->heidelpay()->client();
         };
 
+        return $container;
+    }
+
+    /**
+     * @param \Spryker\Yves\Kernel\Container $container
+     *
+     * @return \Spryker\Yves\Kernel\Container
+     */
+    protected function addQuoteClient(Container $container): Container
+    {
         $container[static::CLIENT_QUOTE] = function (Container $container) {
-            return $container->getLocator()->quote()->client();
+            return new HeidelpayToQuoteClientBridge($container->getLocator()->quote()->client());
         };
 
+        return $container;
+    }
+
+    /**
+     * @param \Spryker\Yves\Kernel\Container $container
+     *
+     * @return \Spryker\Yves\Kernel\Container
+     */
+    protected function addCalculationClient(Container $container): Container
+    {
         $container[static::CLIENT_CALCULATION] = function (Container $container) {
-            return $container->getLocator()->calculation()->client();
+            return new HeidelpayToCalculationClientBridge($container->getLocator()->calculation()->client());
         };
 
         return $container;

src/SprykerEco/Yves/Heidelpay/HeidelpayFactory.php

@@ -7,14 +7,14 @@
 
 namespace SprykerEco\Yves\Heidelpay;
 
-use Spryker\Client\Calculation\CalculationClientInterface;
-use Spryker\Client\Quote\QuoteClientInterface;
 use Spryker\Yves\Kernel\AbstractFactory;
 use Spryker\Yves\StepEngine\Dependency\Form\StepEngineFormDataProviderInterface;
 use Spryker\Yves\StepEngine\Dependency\Form\SubFormInterface;
 use SprykerEco\Client\Heidelpay\HeidelpayClientInterface;
 use SprykerEco\Yves\Heidelpay\CreditCard\RegistrationToQuoteHydrator;
 use SprykerEco\Yves\Heidelpay\CreditCard\RegistrationToQuoteHydratorInterface;
+use SprykerEco\Yves\Heidelpay\Dependency\Client\HeidelpayToCalculationClientInterface;
+use SprykerEco\Yves\Heidelpay\Dependency\Client\HeidelpayToQuoteClientInterface;
 use SprykerEco\Yves\Heidelpay\Form\CreditCardSecureSubForm;
 use SprykerEco\Yves\Heidelpay\Form\DataProvider\CreditCardSecureDataProvider;
 use SprykerEco\Yves\Heidelpay\Form\DataProvider\IdealDataProvider;
@@ -161,17 +161,17 @@ public function getHeidelpayClient(): HeidelpayClientInterface
     }
 
     /**
-     * @return \Spryker\Client\Calculation\CalculationClientInterface
+     * @return \SprykerEco\Yves\Heidelpay\Dependency\Client\HeidelpayToCalculationClientInterface
      */
-    public function getCalculationClient(): CalculationClientInterface
+    public function getCalculationClient(): HeidelpayToCalculationClientInterface
     {
         return $this->getProvidedDependency(HeidelpayDependencyProvider::CLIENT_CALCULATION);
     }
 
     /**
-     * @return \Spryker\Client\Quote\QuoteClientInterface
+     * @return \SprykerEco\Yves\Heidelpay\Dependency\Client\HeidelpayToQuoteClientInterface
      */
-    public function getQuoteClient(): QuoteClientInterface
+    public function getQuoteClient(): HeidelpayToQuoteClientInterface
     {
         return $this->getProvidedDependency(HeidelpayDependencyProvider::CLIENT_QUOTE);
     }
@@ -205,7 +205,7 @@ public function getYvesConfig(): HeidelpayConfigInterface
     /**
      * @return \SprykerEco\Yves\Heidelpay\Hydrator\CreditCardPaymentOptionsToQuoteInterface
      */
-    protected function createCreditCardPaymentOptionsToQuoteHydrator(): CreditCardPaymentOptionsToQuoteInterface
+    public function createCreditCardPaymentOptionsToQuoteHydrator(): CreditCardPaymentOptionsToQuoteInterface
     {
         return new CreditCardPaymentOptionsToQuote(
             $this->getHeidelpayClient()

src/SprykerEco/Zed/Heidelpay/Business/Encrypter/AesEncrypter.php

@@ -52,7 +52,7 @@ public function encryptData(string $data): string
     /**
      * @param string $data
      *
-     * @return string
+     * @return string|null
      */
     public function decryptData(string $data)
     {